fix conflicts

.github/workflows/buildAndroid.yml

@@ -118,42 +118,48 @@ jobs:
             } >> "$envFile"
           fi
 
-      - name: Build Android app
+      - name: Build Android app (retryable)
+        uses: nick-fields/retry@v3
         id: build
-        run: |
-          lane=''
-          case '${{ inputs.type }}' in
-            'release')
-              lane='build';;
-            'adhoc')
-              lane='build_adhoc';;
-            'e2e')
-              lane='build_e2e';;
-            'e2eDelta')
-              lane='build_e2eDelta';;
-          esac
-          bundle exec fastlane android "$lane"
-
-          # Refresh environment variables from GITHUB_ENV that are updated when running fastlane
-          # shellcheck disable=SC1090
-          source "$GITHUB_ENV"
-
-          SHOULD_UPLOAD_SOURCEMAPS='false'
-          if [ -f ./android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map ]; then
-            SHOULD_UPLOAD_SOURCEMAPS='true'
-          fi
-
-          {
-            # aabPath and apkPath are environment varibles set within the Fastfile
-            echo "AAB_PATH=$aabPath"
-            echo "AAB_FILE_NAME=$(basename "$aabPath")"
-            echo "APK_PATH=$apkPath"
-            echo "APK_FILE_NAME=$(basename "$apkPath")"
-            echo "SHOULD_UPLOAD_SOURCEMAPS=$SHOULD_UPLOAD_SOURCEMAPS"
-          } >> "$GITHUB_OUTPUT"
         env:
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
+        with:
+          retry_on: error
+          retry_wait_seconds: 60
+          timeout_minutes: 60
+          max_attempts: 3
+          command: |
+            lane=''
+            case '${{ inputs.type }}' in
+              'release')
+                lane='build';;
+              'adhoc')
+                lane='build_adhoc';;
+              'e2e')
+                lane='build_e2e';;
+              'e2eDelta')
+                lane='build_e2eDelta';;
+            esac
+            bundle exec fastlane android "$lane"
+
+            # Refresh environment variables from GITHUB_ENV that are updated when running fastlane
+            # shellcheck disable=SC1090
+            source "$GITHUB_ENV"
+
+            SHOULD_UPLOAD_SOURCEMAPS='false'
+            if [ -f ./android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map ]; then
+              SHOULD_UPLOAD_SOURCEMAPS='true'
+            fi
+
+            {
+              # aabPath and apkPath are environment varibles set within the Fastfile
+              echo "AAB_PATH=$aabPath"
+              echo "AAB_FILE_NAME=$(basename "$aabPath")"
+              echo "APK_PATH=$apkPath"
+              echo "APK_FILE_NAME=$(basename "$apkPath")"
+              echo "SHOULD_UPLOAD_SOURCEMAPS=$SHOULD_UPLOAD_SOURCEMAPS"
+            } >> "$GITHUB_OUTPUT"    
 
       - name: Upload Android AAB artifact
         if: ${{ steps.build.outputs.AAB_PATH != '' }}

.github/workflows/deployBlocker.yml

@@ -29,23 +29,6 @@ jobs:
           escaped_title=$(echo "$GH_ISSUE_TITLE" | sed -e 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g; s/"/\&quot;/g; s/'"'"'/\&#039;/g; s/|/\&verbar;/g')
           echo "GH_ISSUE_TITLE=$escaped_title" >> "$GITHUB_ENV"
 
-      - name: 'Post the issue in the #expensify-open-source slack room'
-        if: ${{ success() }}
-        uses: 8398a7/action-slack@v3
-        with:
-          status: custom
-          custom_payload: |
-            {
-              channel: '#expensify-open-source',
-              attachments: [{
-                color: "#DB4545",
-                text: '💥 New Deploy Blocker: <${{ github.event.issue.html_url }}|${{ env.GH_ISSUE_TITLE }}>. If you have any idea which PR could be causing this, please comment in the issue.'
-              }]
-            }
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-
       - name: Comment on deploy blocker
         run: |
           gh issue comment ${{ github.event.issue.number }} --body "$(cat <<'EOF'

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004604
-        versionName "9.0.46-4"
+        versionCode 1009004701
+        versionName "9.0.47-1"
         // 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"

desktop/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
-    "electron-updater": "^6.3.5",
+    "electron-updater": "^6.3.6",
     "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },

docs/articles/expensify-classic/expensify-card/Unlimited-Virtual-Cards.md

@@ -9,7 +9,7 @@ For admins to issue virtual cards, your company **must upgrade to Expensify’s
 
 Once upgraded to the new Expensify Card, admins can issue an unlimited number of virtual cards with a fixed or monthly limit for specific company purchases or recurring subscription payments _(e.g., Marketing purchases, Advertising, Travel, Amazon Web Services, etc.)._
 
-This feature supports businesses that require tighter controls on company spending, allowing customers to set fixed or monthly spending limits for each virtual card. 
+This feature supports businesses that require tighter controls on company spending. Customers can set fixed or monthly spending limits for each virtual card. 
 
 Use virtual cards if your company needs or wants:
 
@@ -20,7 +20,7 @@ Use virtual cards if your company needs or wants:
 
 Admins can also name each virtual card, making it easy to categorize and assign them to specific accounts upon creation. Naming the card ensures a clear and organized overview of expenses within the Expensify platform.
 
-# How to set up virtual cards
+# Set up virtual cards
 
 After adopting the new Expensify Card, domain admins can issue virtual cards to any employee using an email matching your domain. Once created and assigned, the card will be visible under the name given to the card. 
 
@@ -36,7 +36,7 @@ Head to **Settings** > **Domains** > [**Company Cards**](https://www.expensify.c
 
 ![The Issue Virtual Cards modal is open in the middle of the screen. There are four options to set; Card Name, Assignee, Card Limit, and Limit type. A cancel (left) and save (right) button are at the bottom right of the modal.]({{site.url}}/assets/images/AdminissuedVirtualCards.png){:width="100%"}
 
-# How to edit virtual cards
+# Edit virtual cards
 
 Domain admin can update the details of a virtual card on the [Company Cards](https://www.expensify.com/domain_companycards) page.
 
@@ -46,7 +46,7 @@ Domain admin can update the details of a virtual card on the [Company Cards](htt
 2. Change the editable details.
 3. Click **Edit Card** to save the changes.
 
-# How to terminate a virtual card
+# Terminate a virtual card
 
 Domain admin can also terminate a virtual card on the [Company Cards](https://www.expensify.com/domain_companycards) page by setting the limit to $0.
 
@@ -59,30 +59,29 @@ Domain admin can also terminate a virtual card on the [Company Cards](https://ww
 
 {% include faq-begin.md %}
 
-**What is the difference between a fixed limit and a monthly limit?**
+## What is the difference between a fixed limit and a monthly limit?
 
 There are two different limit types that are best suited for their intended purpose.
-
-- _Fixed limit_ spend cards are ideal for one-time expenses or providing employees access to a card for a designated purchase. 
+- _Fixed-limit_ spend cards are ideal for one-time expenses or providing employees with access to a card for a designated purchase. 
 - _Monthly_ limit spend cards are perfect for managing recurring expenses such as subscriptions and memberships.
 
 A virtual card with either of these limit types doesn't share its limit with any other cards, including the cardholder's smart limit cards. 
 
-**Where can employees see their virtual cards?**
+## Where can employees see their virtual cards?
 
 Employees can see their assigned virtual cards by navigating to **Settings** > **Account** > [**Credit Cards Import**](https://www.expensify.com/settings?param=%7B%22section%22:%22creditcards%22%7D) in their account.
 
-On this page, employees can see the remaining card limit, the type of card it is (i.e., fixed or monthly), and view the name given to the card. 
+On this page, employees can see the remaining card limit, the type of card (e.g., fixed or monthly), and the name given to the card. 
 
 When the employee needs to use the card, they’ll click the **Show Details** button to expose the card details for making purchases. 
 
 _Note: If the employee doesn’t have Two-Factor Authentication (2FA) enabled when they display the card details, they’ll be prompted to enable it. Enabling 2FA for their account provides the best protection from fraud and is **required** to dispute virtual card expenses._ 
 
-**What do I do when there is fraud on one of our virtual cards?**
+## What do I do when there is fraud on one of our virtual cards?
 
-If you or an employee loses their virtual card, experiences fraud, or suspects the card details are no longer secure, please [request a new card](https://help.expensify.com/articles/expensify-classic/expensify-card/Dispute-A-Transaction) immediately. A domain admin can also set the limit for the card to $0 to terminate the specific card immediately if the employee cannot take action.
+If you or an employee loses their virtual card, experiences fraud, or suspects the card details are no longer secure, please [request a new card](https://help.expensify.com/articles/expensify-classic/expensify-card/Request-the-Card) immediately. A domain admin can also set the limit for the card to $0 to terminate the specific card immediately if the employee cannot take action.
 
-When the employee requests a new card, the compromised card will be terminated immediately. This is best practice for any Expensify Card and if fraud is suspected, action should be taken as soon as possible to reduce financial impact on the company.
+When the employee requests a new card, the compromised card will be terminated immediately. This is best practice for any Expensify Card, and if fraud is suspected, action should be taken as soon as possible to reduce the company's financial impact.
 
 {% include faq-end.md %}
 

docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-Small-To-Medium-Sized-Businesses.md

@@ -114,7 +114,7 @@ For an efficient company, we recommend setting up [Scheduled Submit](https://hel
 - You’ll notice *Scheduled Submit* is located directly under *Report Basics*
 - Choose *Daily*
 
-Between Expensify's SmartScan technology, automatic categorization, and [Receipt Audit]([https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Approving-Reports](https://help.expensify.com/articles/expensify-classic/reports/Automatic-Receipt-Audit)) features, your employees shouldn't need to do anything more than swipe their Expensify Card or take a photo of  their receipt.
+Between Expensify's SmartScan technology, automatic categorization, and [Receipt Audit](https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings#concierge-receipt-audit) features, your employees shouldn't need to do anything more than swipe their Expensify Card or take a photo of  their receipt.
 
 Expenses with violations will stay behind for the employee to fix, while expenses that are “in-workspace” will move into an approver’s queue to mitigate any potential for delays. Scheduled Submit will ensure all expenses are submitted automatically for approval.
 

docs/redirects.csv

@@ -583,3 +583,4 @@ https://community.expensify.com/discussion/47/auto-sync-best-practices,https://h
 https://community.expensify.com/discussion/6699/faq-troubleshooting-known-bank-specific-issues,https://help.expensify.com/expensify-classic/hubs/bank-accounts-and-payments/bank-accounts
 https://community.expensify.com/discussion/4730/faq-expenses-are-exporting-to-the-wrong-accounts-whys-that,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings
 https://community.expensify.com/discussion/9000/how-to-integrate-with-deel,https://help.expensify.com/articles/expensify-classic/connections/Deel
+https://community.expensify.com/categories/expensify-classroom,https://use.expensify.com

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.46</string>
+	<string>9.0.47</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.46.4</string>
+	<string>9.0.47.1</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.46</string>
+	<string>9.0.47</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.46.4</string>
+	<string>9.0.47.1</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.46</string>
+	<string>9.0.47</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.46.4</string>
+	<string>9.0.47.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>