merge main

Author: borys3kk

.github/workflows/deployNewHelp.yml

@@ -58,7 +58,7 @@ jobs:
         # v4
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
         with:
-          node-version: '20.18.1'
+          node-version: '20.19.1'
 
       # Wil install the _help/package.js
       - name: Install Node.js Dependencies

.github/workflows/publishReactNativeAndroidArtifacts.yml

@@ -11,31 +11,28 @@ on:
       - Mobile-Expensify
 
 jobs:
-  publish:
-    runs-on: ${{ github.repository_owner == 'Expensify' && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
-    strategy:
-      matrix:
-        is_hybrid: [true, false]
+  verifyPatches:
+    name: Verify React Native Patches
+    runs-on: 'ubuntu-latest'
+    outputs:
+      build_targets: ${{ steps.getArtifactBuildTargets.outputs.BUILD_TARGETS }}
+      hybrid_app_patches_hash: ${{ steps.getNewPatchesHash.outputs.HYBRID_APP_HASH }}
+      standalone_patches_hash: ${{ steps.getNewPatchesHash.outputs.STANDALONE_APP_HASH }}
     steps:
-      # v4
       - name: Checkout
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
         with:
-          submodules: ${{ matrix.is_hybrid }}
+          submodules: true
           ref: ${{ github.event.before }}
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
       - name: Get previous patches hash
         id: getOldPatchesHash
         run: |
-          if [[ "${{ matrix.is_hybrid }}" == "true" ]]; then
-            echo "HASH=$(./scripts/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
-          else
-            echo "HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
-          fi
+            echo "HYBRID_APP_HASH=$(./scripts/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
+            echo "STANDALONE_APP_HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
 
       - name: Get previous react-native version
-
         id: getOldVersion
         run: echo "VERSION=$(jq -r '.dependencies["react-native"]' package.json)" >> "$GITHUB_OUTPUT"
 
@@ -48,11 +45,8 @@ jobs:
       - name: Get new patches hash
         id: getNewPatchesHash
         run: |
-          if [[ "${{ matrix.is_hybrid }}" == "true" ]]; then
-            echo "HASH=$(./scripts/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
-          else
-            echo "HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
-          fi
+            echo "HYBRID_APP_HASH=$(./scripts/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
+            echo "STANDALONE_APP_HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
 
       - name: Get new react-native version
         id: getNewVersion
@@ -70,54 +64,75 @@ jobs:
       - name: Check if patches changed
         id: didPatchesChange
         run: |
-          readonly DID_PATCHES_CHANGE=${{ steps.getOldPatchesHash.outputs.HASH != steps.getNewPatchesHash.outputs.HASH && 'true' || 'false' }}
-          echo "DID_PATCHES_CHANGE=$DID_PATCHES_CHANGE" >> "$GITHUB_OUTPUT"
-          if [[ "$DID_PATCHES_CHANGE" == 'true' ]]; then
-            echo "::notice::Detected changes in patches (${{ steps.getOldPatchesHash.outputs.HASH }} -> ${{ steps.getNewPatchesHash.outputs.HASH }})"
+          readonly DID_HYBRID_APP_PATCHES_CHANGE=${{ steps.getOldPatchesHash.outputs.HYBRID_APP_HASH != steps.getNewPatchesHash.outputs.HYBRID_APP_HASH && 'true' || 'false' }}
+          readonly DID_STANDALONE_APP_PATCHES_CHANGE=${{ steps.getOldPatchesHash.outputs.STANDALONE_APP_HASH != steps.getNewPatchesHash.outputs.STANDALONE_APP_HASH && 'true' || 'false' }}
+          echo "DID_HYBRID_APP_PATCHES_CHANGE=$DID_HYBRID_APP_PATCHES_CHANGE" >> "$GITHUB_OUTPUT"
+          echo "DID_STANDALONE_APP_PATCHES_CHANGE=$DID_STANDALONE_APP_PATCHES_CHANGE" >> "$GITHUB_OUTPUT"
+
+          if [[ "$DID_HYBRID_APP_PATCHES_CHANGE" == 'true' ]]; then
+            echo "::notice::Detected changes in HybridApp patches (${{ steps.getOldPatchesHash.outputs.HYBRID_APP_HASH }} -> ${{ steps.getNewPatchesHash.outputs.HYBRID_APP_HASH }})"
+          fi
+
+          if [[ "$DID_STANDALONE_APP_PATCHES_CHANGE" == 'true' ]]; then
+            echo "::notice::Detected changes in Standalone NewDot patches (${{ steps.getOldPatchesHash.outputs.STANDALONE_APP_HASH }} -> ${{ steps.getNewPatchesHash.outputs.STANDALONE_APP_HASH }})"
           fi
 
-      - name: Check if we should build and publish the package
-        id: shouldPublish
+      - name: Get artifact build targets
+        id: getArtifactBuildTargets
         run: |
-          if [[ '${{ steps.didVersionChange.outputs.DID_VERSION_CHANGE }}' == 'true' || '${{ steps.didPatchesChange.outputs.DID_PATCHES_CHANGE }}' == 'true' ]]; then
-            echo "SHOULD_PUBLISH=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "::notice::No relevant changes, skipping publishing a new React Native build"
-            echo "SHOULD_PUBLISH=false" >> "$GITHUB_OUTPUT"
+          # When there is a version change or standalone app patches change, we need to build for both hybrid and standalone
+          if [[ '${{ steps.didVersionChange.outputs.DID_VERSION_CHANGE }}' == 'true' || '${{ steps.didPatchesChange.outputs.DID_STANDALONE_APP_PATCHES_CHANGE }}' == 'true' ]]; then
+            echo "BUILD_TARGETS=[\"true\", \"false\"]" >> "$GITHUB_OUTPUT"
+          elif [[ '${{ steps.didPatchesChange.outputs.DID_HYBRID_APP_PATCHES_CHANGE }}' == 'true' ]]; then
+            echo "BUILD_TARGETS=[\"true\"]" >> "$GITHUB_OUTPUT"
           fi
 
+  buildAndPublishReactNativeArtifacts:
+    name: Build and Publish React Native Artifacts
+    runs-on: ${{ github.repository_owner == 'Expensify' && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
+    needs: verifyPatches
+    if: needs.verifyPatches.outputs.build_targets != '' 
+    strategy:
+      # Disable fail-fast to prevent cancelling both jobs when only one needs to be stopped due to concurrency limits
+      fail-fast: false
+      matrix:
+        # Dynamically build the matrix based on the build targets
+        is_hybrid: ${{ fromJSON(needs.verifyPatches.outputs.build_targets) }}
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.job }}-${{ matrix.is_hybrid }}
+      cancel-in-progress: true
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        with:
+          submodules: ${{ matrix.is_hybrid }}
+          token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
       - name: Setup Node
-        if: ${{ steps.shouldPublish.outputs.SHOULD_PUBLISH == 'true' }}
         uses: ./.github/actions/composite/setupNode
         with:
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid }}
 
-      # v4
       - name: Setup Java
-        if: ${{ steps.shouldPublish.outputs.SHOULD_PUBLISH == 'true' }}
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
         with:
           distribution: oracle
           java-version: 17
 
-      # v4
       - name: Setup Gradle
-        if: ${{ steps.shouldPublish.outputs.SHOULD_PUBLISH == 'true' }}
         uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
-
+      
       - name: Determine new patched RN version
-        if: ${{ steps.shouldPublish.outputs.SHOULD_PUBLISH == 'true' }}
         id: getNewPatchedVersion
         run: echo "NEW_PATCHED_VERSION=$(./.github/scripts/getNewPatchedRNVersion.sh)" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ github.token }}
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid }}
 
-      - name: Build and publish RN artifacts
-        if: ${{ steps.shouldPublish.outputs.SHOULD_PUBLISH == 'true' }}
-        working-directory: ${{ matrix.is_hybrid && 'Mobile-Expensify/Android' || 'android' }}
+      - name: Build and publish React Native artifacts
+        working-directory: ${{ matrix.is_hybrid == 'true' && 'Mobile-Expensify/Android' || 'android' }}
         run: |
-          echo "Starting artifacts build for ${{ matrix.is_hybrid && 'HybridApp' || 'NewDot Standalone' }}"
+          echo "Starting artifacts build for ${{ matrix.is_hybrid == 'true' && 'HybridApp' || 'NewDot Standalone' }}"
           echo "Version: ${{ env.PATCHED_VERSION }}"
           echo "Patches hash: ${{ env.PATCHES_HASH }}"
           export ORG_GRADLE_PROJECT_reactNativeArchitectures="armeabi-v7a,arm64-v8a,x86,x86_64"
@@ -128,7 +143,7 @@ jobs:
           GH_PUBLISH_TOKEN: ${{ github.token }}
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid }}
           PATCHED_VERSION: ${{ steps.getNewPatchedVersion.outputs.NEW_PATCHED_VERSION }}
-          PATCHES_HASH: ${{ steps.getNewPatchesHash.outputs.HASH }}
+          PATCHES_HASH: ${{ matrix.is_hybrid == 'true' && needs.verifyPatches.outputs.hybrid_app_patches_hash || needs.verifyPatches.outputs.standalone_patches_hash }}
 
       - name: Announce failed workflow in Slack
         if: ${{ failure() }}

.nvmrc

@@ -1 +1 @@
-20.18.1
+20.19.1

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009014605
-        versionName "9.1.46-5"
+        versionCode 1009014705
+        versionName "9.1.47-5"
         // 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"

android/app/build.gradle

@@ -28,13 +28,15 @@ To cancel your Expensify Card:
 
 # For Domain Admins
 
-To deactivate an employee's Expensify Card:
-1. Hover over **Settings**, then click **Domains**.  
-2. Click the name of the domain.  
-3. Next to the card, click **Edit Limit**.  
-4. Enable the **Custom Smart Limit** toggle to set a specific card limit. If not enabled, the card limit will match the group limit.  
-5. Set the **Limit Amount** to $0. Adjusting the Smart Limit to $0 temporarily deactivates the card. The card will only be reactivated if the limit is increased.  
-6. Click **Save**.  
+To deactivate an employee’s Expensify Card:
+
+1. Hover over **Settings**, then click **Domains**.
+2. Click the name of the domain.
+3. Next to the card, click **Edit Limit**.
+4. Enable the **Custom Smart Limit** toggle to set a specific card limit. If not enabled, the card limit will match the group limit.
+5. Set the **Limit Amount** to $0. Adjusting the Smart Limit to $0 temporarily deactivates the card. The card will only be reactivated if the limit is increased.
+6. Click **Save**.
+7. Instruct the cardholder to cancel their Expensify card by following the **[For Cardholders](https://help.expensify.com/articles/expensify-classic/expensify-card/Deactivate-or-cancel-an-Expensify-Card#for-cardholders)** section above.  
 
 **Important:** If you suspect fraudulent access to a Domain Admin account, contact Concierge Support via the in-app chat or email at [email protected]. If necessary, we can temporarily manually suspend cards outside of the Expensify Domain.
 

assets/images/simple-illustrations/simple-illustration__headset.svg

@@ -17,14 +17,14 @@ Follow the steps below to resolve your dispute quickly.
 
 # How to Dispute a Transaction
 
-If you find an incorrect charge on your Expensify Card:
+If you find an incorrect charge on your Expensify Card, follow the steps below. If you are a Domain Admin, follow the steps [here](https://help.expensify.com/articles/expensify-classic/expensify-card/Deactivate-or-cancel-an-Expensify-Card#for-domain-admins) before contacting Concierge Support.
 
 1. If the charge is **fraudulent**, cancel your card right away (**Settings > Account > Wallet > Request a New Card**).
 2. Contact **Concierge Support**
 3. Provide details about the transaction, including:
-   - Date and amount
-   - Merchant name
-   - Reason for the dispute
+    - Date and amount
+    - Merchant name
+    - Reason for the dispute
 4. We’ll investigate the issue and file a dispute with our card processor on your behalf.
 
 ---

docs/articles/expensify-classic/expensify-card/Deactivate-or-cancel-an-Expensify-Card.md

@@ -124,6 +124,17 @@ You can also forward receipts to [email protected] using your primary or se
 
 {% include end-selector.html %}
 
+## Bulk Upload Expenses from Desktop
+1. Check your files, they must be:
+    - Under 10MB each
+    - PDF or common image files
+    - Under 30 files in total
+2. Select and drag your files into Expensify
+    - **Scan Receipts** will add them as separate expenses
+    - **Add Attachments** will attach them to a report or chat as supporting documentation
+3. Unsupported or oversized files will trigger a pop-up — choose to skip them or cancel entirely
+4. Add details such as coding for SmartScanning receipts, or confirm Attachments
+
 # How to Delete an Expense
 
 {% include selector.html values="desktop, mobile" %}