Merge branch 'main' of github.com:Expensify/App into parasharrajat/ea…

…rly-discount

.eslintrc.changed.js

@@ -21,13 +21,7 @@ module.exports = {
     },
     overrides: [
         {
-            files: [
-                'src/libs/actions/IOU.ts',
-                'src/libs/actions/Report.ts',
-                'src/pages/workspace/WorkspaceInitialPage.tsx',
-                'src/pages/home/report/PureReportActionItem.tsx',
-                'src/libs/SidebarUtils.ts',
-            ],
+            files: ['src/libs/actions/IOU.ts', 'src/pages/workspace/WorkspaceInitialPage.tsx', 'src/pages/home/report/PureReportActionItem.tsx', 'src/libs/SidebarUtils.ts'],
             rules: {
                 'rulesdir/no-default-id-values': 'off',
             },

.github/actions/javascript/proposalPoliceComment/index.js

@@ -18007,6 +18007,11 @@ async function run() {
         console.log('Comment body is either empty or doesn\'t contain the keyword "Proposal": ', payload.comment?.body);
         return;
     }
+    // If event is `edited` and comment was already edited by the bot, return early
+    if (isCommentEditedEvent(payload) && payload.comment?.body.trim().includes('Edited by **proposal-police**')) {
+        console.log('Comment was already edited by proposal-police once.\n', payload.comment?.body);
+        return;
+    }
     console.log('ProposalPolice™ Action triggered for comment:', payload.comment?.body);
     console.log('-> GitHub Action Type: ', payload.action?.toUpperCase());
     if (!isCommentCreatedEvent(payload) && !isCommentEditedEvent(payload)) {
@@ -18033,12 +18038,7 @@ async function run() {
     if (isCommentCreatedEvent(payload) && isActionRequired) {
         const formattedResponse = message
             // replace {user} from response template with @username
-            .replaceAll('{user}', `@${payload.comment?.user.login}`)
-            // replace {proposalLink} from response template with the link to the comment
-            .replaceAll('{proposalLink}', payload.comment?.html_url)
-            // remove any double quotes from the final comment because sometimes the assistant's
-            // response contains double quotes / sometimes it doesn't
-            .replaceAll('"', '');
+            .replaceAll('{user}', `@${payload.comment?.user.login}`);
         // Create a comment with the assistant's response
         console.log('ProposalPolice™ commenting on issue...');
         await GithubUtils_1.default.createComment(CONST_1.default.APP_REPO, github_1.context.issue.number, formattedResponse);

.github/actions/javascript/proposalPoliceComment/proposalPoliceComment.ts

@@ -41,6 +41,12 @@ async function run() {
         return;
     }
 
+    // If event is `edited` and comment was already edited by the bot, return early
+    if (isCommentEditedEvent(payload) && payload.comment?.body.trim().includes('Edited by **proposal-police**')) {
+        console.log('Comment was already edited by proposal-police once.\n', payload.comment?.body);
+        return;
+    }
+
     console.log('ProposalPolice™ Action triggered for comment:', payload.comment?.body);
     console.log('-> GitHub Action Type: ', payload.action?.toUpperCase());
 
@@ -73,14 +79,7 @@ async function run() {
     if (isCommentCreatedEvent(payload) && isActionRequired) {
         const formattedResponse = message
             // replace {user} from response template with @username
-            .replaceAll('{user}', `@${payload.comment?.user.login}`)
-
-            // replace {proposalLink} from response template with the link to the comment
-            .replaceAll('{proposalLink}', payload.comment?.html_url)
-
-            // remove any double quotes from the final comment because sometimes the assistant's
-            // response contains double quotes / sometimes it doesn't
-            .replaceAll('"', '');
+            .replaceAll('{user}', `@${payload.comment?.user.login}`);
 
         // Create a comment with the assistant's response
         console.log('ProposalPolice™ commenting on issue...');

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009008700
-        versionName "9.0.87-0"
+        versionCode 1009008804
+        versionName "9.0.88-4"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

docs/articles/new-expensify/getting-started/Create-a-company-workspace.md

@@ -21,6 +21,8 @@ You can get support any time by locating your chat with Concierge in your chat i
 
 # 2. Create a new workspace
 
+Members can submit and manage their expenses in a workspace in Expensify. Each workspace has its own set of rules, settings, and integrations.
+
 <ol type="a">
    <li>Click your profile photo or icon in the bottom left menu.</li>
    <li>Scroll down and click <b>Workspaces</b> in the left menu.</li>

docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md

@@ -16,7 +16,7 @@ Get started by downloading Expensify mobile or desktop apps and ensure you’re
 - **Mobile Devices:** Download the Expensify app for [Android](https://play.google.com/store/apps/details?id=com.expensify.chat) or [iOS](https://apps.apple.com/us/app/expensify-cash/id1530278510).
 - **Desktop Devices:** Download the Expensify app for [macOS](https://new.expensify.com/NewExpensify.dmg).
 
-## Use Expensify on the Web: 
+## Use Expensify on the web: 
 
 Expensify is also accessible via the web and supports the following browsers: 
 
@@ -76,9 +76,9 @@ By using a compatible device or browser, you’ll ensure the best experience wit
 # 3. Meet Concierge
 
 Concierge is your personal assistant that walks you through setting up your account and also provides:
-- Reminders to do things like submit your expenses
-- Alerts when more information is needed on an expense report
-- Updates on new and improved account features
+- Reminders to do things like submit your expenses.
+- Alerts when more information is needed on an expense report.
+- Updates on new and improved account features.
 
 You can get support any time by locating your chat with Concierge in your chat inbox. You can ask questions and receive direct support in this thread.
 
@@ -92,7 +92,7 @@ You can create an expense by SmartScanning a receipt to automatically capture th
 
 {% include option.html value="desktop" %}
 <ol type="a">
-   <li>Click the + icon in the bottom left menu and select <b>Submit Expense</b>.</li>
+   <li>Click the + icon in the bottom left menu and select <b>Create Expense</b>.</li>
    <li>Click <b>Scan</b>.</li>
    <li>Drag and drop the receipt into Expensify, or click <b>Choose File</b> to select it from your saved files. <i>Note: The SmartScan process will auto-populate the merchant, date, and amount.</i></li>
    <li>Use the search field to find the desired workspace or an individual’s name, email, or phone number.</li>
@@ -104,7 +104,7 @@ You can create an expense by SmartScanning a receipt to automatically capture th
 
 {% include option.html value="mobile" %}
 <ol type="a">
-   <li>Tap the + icon at the bottom of the screen and select <b>Submit Expense</b>.</li>
+   <li>Tap the + icon at the bottom of the screen and select <b>Create Expense</b>.</li>
    <li>Tap <b>Scan</b>.</li>
    <li>Tap the green button to take a photo of a receipt, or tap the Image icon to the left of it to upload a receipt from your phone. <i>Note: The SmartScan process will auto-populate the merchant, date, and amount</i>.</li>
    <li>Use the search field to find the desired workspace or an individual’s name, email, or phone number.</li>

ios/NewExpensify/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.87</string>
+	<string>9.0.88</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.87.0</string>
+	<string>9.0.88.4</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.87</string>
+	<string>9.0.88</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.87.0</string>
+	<string>9.0.88.4</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.87</string>
+	<string>9.0.88</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.87.0</string>
+	<string>9.0.88.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

modules/background-task/android/src/main/java/com/expensify/reactnativebackgroundtask/ReactNativeBackgroundTaskModule.kt

@@ -11,6 +11,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.os.Build
 import android.os.PersistableBundle
 import android.util.Log
 
@@ -27,7 +28,13 @@ class ReactNativeBackgroundTaskModule internal constructor(context: ReactApplica
 
   init {
     val filter = IntentFilter("com.expensify.reactnativebackgroundtask.TASK_ACTION")
-    reactApplicationContext.registerReceiver(taskReceiver, filter)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        reactApplicationContext.registerReceiver(
+          taskReceiver,
+          filter,
+          Context.RECEIVER_EXPORTED
+        )
+    }
   }
 
   override fun getName(): String {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.87-0",
+  "version": "9.0.88-4",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

scripts/applyPatches.sh

@@ -15,12 +15,18 @@ function patchPackage {
 
   OS="$(uname)"
   if [[ "$OS" == "Darwin" || "$OS" == "Linux" ]]; then
-    npx patch-package --error-on-fail --color=always
-    EXIT_CODE=$?
     if [[ "$IS_HYBRID_APP_REPO" == "true" && "$NEW_DOT_FLAG" == "false" ]]; then
-      echo -e "\n${GREEN}Applying HybridApp patches!${NC}"
-      npx patch-package --patch-dir 'Mobile-Expensify/patches' --error-on-fail --color=always
-      EXIT_CODE+=$?
+      TEMP_PATCH_DIR=$(mktemp -d ./tmp-patches-XXX)
+      cp -r ./patches/* "$TEMP_PATCH_DIR"
+      cp -r ./Mobile-Expensify/patches/* "$TEMP_PATCH_DIR"
+
+      npx patch-package --patch-dir "$TEMP_PATCH_DIR" --error-on-fail --color=always
+      EXIT_CODE=$?
+
+      rm -rf "$TEMP_PATCH_DIR"
+    else
+      npx patch-package --error-on-fail --color=always
+      EXIT_CODE=$?
     fi
     exit $EXIT_CODE
   else

src/CONST.ts

@@ -661,6 +661,7 @@ const CONST = {
         PER_DIEM: 'newDotPerDiem',
         NEWDOT_MERGE_ACCOUNTS: 'newDotMergeAccounts',
         NEWDOT_MANAGER_MCTEST: 'newDotManagerMcTest',
+        NSQS: 'nsqs',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',

src/ONYXKEYS.ts

@@ -558,6 +558,8 @@ const ONYXKEYS = {
         ADD_PAYMENT_CARD_FORM_DRAFT: 'addPaymentCardFormDraft',
         WORKSPACE_SETTINGS_FORM: 'workspaceSettingsForm',
         WORKSPACE_CATEGORY_FORM: 'workspaceCategoryForm',
+        WORKSPACE_CONFIRMATION_FORM: 'workspaceConfirmationForm',
+        WORKSPACE_CONFIRMATION_FORM_DRAFT: 'workspaceConfirmationFormDraft',
         WORKSPACE_CATEGORY_FORM_DRAFT: 'workspaceCategoryFormDraft',
         WORKSPACE_CATEGORY_DESCRIPTION_HINT_FORM: 'workspaceCategoryDescriptionHintForm',
         WORKSPACE_CATEGORY_DESCRIPTION_HINT_FORM_DRAFT: 'workspaceCategoryDescriptionHintFormDraft',
@@ -743,6 +745,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM]: FormTypes.AddPaymentCardForm;
     [ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM]: FormTypes.WorkspaceSettingsForm;
     [ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM]: FormTypes.WorkspaceCategoryForm;
+    [ONYXKEYS.FORMS.WORKSPACE_CONFIRMATION_FORM]: FormTypes.WorkspaceConfirmationForm;
     [ONYXKEYS.FORMS.WORKSPACE_TAG_FORM]: FormTypes.WorkspaceTagForm;
     [ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME]: FormTypes.WorkspaceTaxCustomName;
     [ONYXKEYS.FORMS.WORKSPACE_COMPANY_CARD_FEED_NAME]: FormTypes.WorkspaceCompanyCardFeedName;