Merge branch 'main' of github.com:Expensify/App into jsenyitko-release-4-reimbursable-amt

Author: JS00001

.github/workflows/androidBump.yml

@@ -21,9 +21,11 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Install 1Password CLI
-        # v1
-        uses: 1password/install-cli-action@143a85f84a90555d121cde2ff5872e393a47ab9f
+      - name: Setup 1Password CLI and certificates
+        uses: Expensify/GitHub-Actions/setup-certificate-1p@main
+        with:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+          SHOULD_LOAD_SSL_CERTIFICATES: 'false'
 
       - name: Load files from 1Password
         working-directory: android/app

.github/workflows/buildAndroid.yml

@@ -96,9 +96,11 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Install 1Password CLI
-        # v1
-        uses: 1password/install-cli-action@143a85f84a90555d121cde2ff5872e393a47ab9f
+      - name: Setup 1Password CLI and certificates
+        uses: Expensify/GitHub-Actions/setup-certificate-1p@main
+        with:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+          SHOULD_LOAD_SSL_CERTIFICATES: 'false'
 
       - name: Load files from 1Password
         working-directory: android/app

.github/workflows/deploy.yml

@@ -129,9 +129,11 @@ jobs:
       - name: Install New Expensify Gems
         run: bundle install
 
-      - name: Install 1Password CLI
-        # v1
-        uses: 1password/install-cli-action@143a85f84a90555d121cde2ff5872e393a47ab9f
+      - name: Setup 1Password CLI and certificates
+        uses: Expensify/GitHub-Actions/setup-certificate-1p@main
+        with:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+          SHOULD_LOAD_SSL_CERTIFICATES: 'false'
 
       - name: Load files from 1Password
         env:
@@ -408,9 +410,11 @@ jobs:
           max_attempts: 5
           command: npm run pod-install
 
-      - name: Install 1Password CLI
-        # v1
-        uses: 1password/install-cli-action@143a85f84a90555d121cde2ff5872e393a47ab9f
+      - name: Setup 1Password CLI and certificates
+        uses: Expensify/GitHub-Actions/setup-certificate-1p@main
+        with:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+          SHOULD_LOAD_SSL_CERTIFICATES: 'false'
 
       - name: Load files from 1Password
         env:

.github/workflows/lint.yml

@@ -26,6 +26,22 @@ jobs:
         with:
           IS_DESKTOP_BUILD: true
 
+      - name: Remove E/App version from package-lock.json (For cache invalidation)
+        shell: bash
+        # Remove App version from package-lock.json to avoid cache invalidation when the App version changes
+        run: jq 'del(.version, .packages[""].version)' package-lock.json > normalized-package-lock.json
+
+      - name: Cache ESLint
+        # v4
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
+        with:
+          path: node_modules/.cache/eslint
+          # Only invalidate the cache if the eslint ruleset change (from eslint.config.mjs or the normalized-package-lock.json), we use --cache-strategy content to handle cache invalidation
+          # See https://eslint.org/docs/latest/use/command-line-interface#--cache-strategy for more information
+          key: ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.*', 'normalized-package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-eslint-
+
       - name: Lint JavaScript and Typescript with ESLint
         run: npm run lint
         env:

.github/workflows/testBuild.yml

@@ -4,13 +4,13 @@ on:
   workflow_dispatch:
     inputs:
       # If not specified, only build iOS and Android apps from the main branch of Expensify/App
-      APP_PULL_REQUEST_NUMBER:
-        description: Expensify/App PR number for correct placement of apps. Default to main.
+      APP_PULL_REQUEST_URL:
+        description: The Expensify/App pull request URL (e.g., https://github.com/Expensify/App/pull/12345). Defaults to main.
         required: false
         default: ''
-      # Pull Request number from Mobile-Expensify repo for correct placement of OD app. It will take precedence over MOBILE-EXPENSIFY from App's PR description if both are specified. If nothing is specified defaults to Mobile-Expensify's main
-      MOBILE_EXPENSIFY_PULL_REQUEST_NUMBER:
-        description: Expensify/Mobile-Expensify PR number. Defaults to main. Overrides MOBILE-EXPENSIFY set in App's PR description.
+      # Pull Request URL from Mobile-Expensify repo for correct placement of OD app. It will take precedence over MOBILE-EXPENSIFY from App's PR description if both are specified. If nothing is specified defaults to Mobile-Expensify's main
+      MOBILE_EXPENSIFY_PULL_REQUEST_URL:
+        description: The Expensify/Mobile-Expensify pull request URL. Defaults to main. Overrides MOBILE-EXPENSIFY set in App's PR description.
         required: false
         default: ''
       REVIEWED_CODE:
@@ -35,15 +35,13 @@ on:
         type: boolean
         default: true
 
-env:
-  # This variable is needed for fastlane to construct correct path
-  PULL_REQUEST_NUMBER: ${{ inputs.APP_PULL_REQUEST_NUMBER || github.event.number }}
-
 jobs:
   prep:
     runs-on: ubuntu-latest
     outputs:
       APP_REF: ${{ steps.getHeadRef.outputs.REF || 'main' }}
+      APP_PR_NUMBER: ${{ steps.extractAppPRNumber.outputs.PR_NUMBER }}
+      MOBILE_PR_NUMBER: ${{ steps.extractMobilePRNumber.outputs.PR_NUMBER }}
     steps:
       - name: Checkout
         # v4
@@ -61,15 +59,37 @@ jobs:
           echo "::error::🕵️‍♀️ Please carefully review the pull request before running a test build to ensure it does not contain any malicious code"
           exit 1
 
+      - name: Extract App PR number from URL
+        id: extractAppPRNumber
+        if: ${{ inputs.APP_PULL_REQUEST_URL != '' }}
+        run: |
+          PR_NUMBER=$(echo '${{ inputs.APP_PULL_REQUEST_URL }}' | sed -E 's|.*/pull/([0-9]+).*|\1|')
+          if ! [[ "$PR_NUMBER" =~ ^[0-9]+$ ]]; then
+            echo "::error::❌ Could not extract PR number from URL. Please provide a valid GitHub PR URL (e.g., https://github.com/Expensify/App/pull/12345)"
+            exit 1
+          fi
+          echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_OUTPUT"
+
+      - name: Extract Mobile-Expensify PR number from URL
+        id: extractMobilePRNumber
+        if: ${{ inputs.MOBILE_EXPENSIFY_PULL_REQUEST_URL != '' }}
+        run: |
+          PR_NUMBER=$(echo '${{ inputs.MOBILE_EXPENSIFY_PULL_REQUEST_URL }}' | sed -E 's|.*/pull/([0-9]+).*|\1|')
+          if ! [[ "$PR_NUMBER" =~ ^[0-9]+$ ]]; then
+            echo "::error::❌ Could not extract PR number from URL. Please provide a valid GitHub PR URL (e.g., https://github.com/Expensify/Mobile-Expensify/pull/12345)"
+            exit 1
+          fi
+          echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_OUTPUT"
+
       - name: Check if App pull request number is correct
         if: ${{ github.event_name == 'workflow_dispatch' }}
         id: getHeadRef
         run: |
           set -e
-          if [ -z "${{ inputs.APP_PULL_REQUEST_NUMBER }}" ]; then
+          if [ -z "${{ steps.extractAppPRNumber.outputs.PR_NUMBER }}" ]; then
             echo "REF=" >> "$GITHUB_OUTPUT"
           else
-            echo "REF=$(gh pr view ${{ inputs.APP_PULL_REQUEST_NUMBER }} --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
+            echo "REF=$(gh pr view ${{ steps.extractAppPRNumber.outputs.PR_NUMBER }} --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
           fi
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -88,14 +108,14 @@ jobs:
           github-token: ${{ github.token }}
           result-encoding: string
           script: |
-            if ('${{ inputs.MOBILE_EXPENSIFY_PULL_REQUEST_NUMBER}}') return '${{ inputs.MOBILE_EXPENSIFY_PULL_REQUEST_NUMBER}}';
+            if ('${{ needs.prep.outputs.MOBILE_PR_NUMBER }}') return '${{ needs.prep.outputs.MOBILE_PR_NUMBER }}';
 
-            if (!'${{ inputs.APP_PULL_REQUEST_NUMBER }}') return '';
+            if (!'${{ needs.prep.outputs.APP_PR_NUMBER }}') return '';
 
             const pullRequest = await github.rest.pulls.get({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              pull_number: '${{ inputs.APP_PULL_REQUEST_NUMBER }}',
+              pull_number: '${{ needs.prep.outputs.APP_PR_NUMBER }}',
             });
             
             const body = pullRequest.data.body;
@@ -106,7 +126,7 @@ jobs:
 
   getMobileExpensifyRef:
       runs-on: ubuntu-latest
-      needs: [getMobileExpensifyPR]
+      needs: [prep, getMobileExpensifyPR]
       outputs:
         MOBILE_EXPENSIFY_REF: ${{ steps.getHeadRef.outputs.REF || 'main' }}
       steps:
@@ -118,11 +138,11 @@ jobs:
           id: getHeadRef
           run: |
             set -e
-            if [[ -z "${{ inputs.MOBILE_EXPENSIFY_PULL_REQUEST_NUMBER }}" && -z "${{ needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR }}" ]]; then
+            if [[ -z "${{ needs.prep.outputs.MOBILE_PR_NUMBER }}" && -z "${{ needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR }}" ]]; then
               echo "REF=" >> "$GITHUB_OUTPUT"
             else
-              echo "PR=${{ inputs.MOBILE_EXPENSIFY_PULL_REQUEST_NUMBER || needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR }}" >> "$GITHUB_OUTPUT"
-              echo "REF=$(gh pr view ${{ inputs.MOBILE_EXPENSIFY_PULL_REQUEST_NUMBER || needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR }} -R Expensify/Mobile-Expensify --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
+              echo "PR=${{ needs.prep.outputs.MOBILE_PR_NUMBER || needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR }}" >> "$GITHUB_OUTPUT"
+              echo "REF=$(gh pr view ${{ needs.prep.outputs.MOBILE_PR_NUMBER || needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR }} -R Expensify/Mobile-Expensify --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
             fi
           env:
             GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -133,7 +153,7 @@ jobs:
     needs: [prep, getMobileExpensifyPR, getMobileExpensifyRef]
     steps:
       - name: Add build start comment to Expensify/App PR
-        if: ${{ inputs.APP_PULL_REQUEST_NUMBER != ''}}
+        if: ${{ needs.prep.outputs.APP_PR_NUMBER != '' }}
         # v7
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
         with:
@@ -143,7 +163,7 @@ jobs:
               github.rest.issues.createComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              issue_number: ${{ inputs.APP_PULL_REQUEST_NUMBER }},
+              issue_number: ${{ needs.prep.outputs.APP_PR_NUMBER }},
               body: `🚧 @${{ github.actor }} has triggered a test Expensify/App build. You can view the [workflow run here](${workflowURL}).`
               });
 
@@ -164,9 +184,11 @@ jobs:
 
   desktop:
     name: Build and deploy Desktop for testing
-    if: ${{ inputs.DESKTOP && inputs.APP_PULL_REQUEST_NUMBER }}
+    if: ${{ inputs.DESKTOP && needs.prep.outputs.APP_PR_NUMBER }}
     needs: [prep]
     runs-on: macos-14-large
+    env:
+      PULL_REQUEST_NUMBER: ${{ needs.prep.outputs.APP_PR_NUMBER }}
     steps:
       - name: Checkout
         # v4
@@ -231,9 +253,11 @@ jobs:
 
   web:
     name: Build and deploy Web
-    if: ${{ inputs.WEB && inputs.APP_PULL_REQUEST_NUMBER }}
+    if: ${{ inputs.WEB && needs.prep.outputs.APP_PR_NUMBER }}
     needs: [prep]
     runs-on: ubuntu-latest-xl
+    env:
+      PULL_REQUEST_NUMBER: ${{ needs.prep.outputs.APP_PR_NUMBER }}
     steps:
       - name: Checkout
         # v4
@@ -271,6 +295,8 @@ jobs:
     if: ${{ inputs.ANDROID }}
     needs: [prep, getMobileExpensifyPR, getMobileExpensifyRef]
     runs-on: ubuntu-latest-xl
+    env:
+      PULL_REQUEST_NUMBER: ${{ needs.prep.outputs.APP_PR_NUMBER }}
     outputs:
       S3_APK_PATH: ${{ steps.exportAndroidS3Path.outputs.S3_APK_PATH }}
     steps:
@@ -327,9 +353,11 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Install 1Password CLI
-        # v1
-        uses: 1password/install-cli-action@143a85f84a90555d121cde2ff5872e393a47ab9f
+      - name: Setup 1Password CLI and certificates
+        uses: Expensify/GitHub-Actions/setup-certificate-1p@main
+        with:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+          SHOULD_LOAD_SSL_CERTIFICATES: 'false'
 
       - name: Load files from 1Password
         env:
@@ -392,6 +420,7 @@ jobs:
     needs: [prep, getMobileExpensifyPR, getMobileExpensifyRef]
     env:
       DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
+      PULL_REQUEST_NUMBER: ${{ needs.prep.outputs.APP_PR_NUMBER }}
     runs-on: macos-15-xlarge
     outputs:
       IOS_PATH: ${{ steps.export-ios-path.outputs.IOS_PATH }}
@@ -456,9 +485,11 @@ jobs:
           max_attempts: 5
           command: npm run pod-install
 
-      - name: Install 1Password CLI
-        # v1
-        uses: 1password/install-cli-action@143a85f84a90555d121cde2ff5872e393a47ab9f
+      - name: Setup 1Password CLI and certificates
+        uses: Expensify/GitHub-Actions/setup-certificate-1p@main
+        with:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+          SHOULD_LOAD_SSL_CERTIFICATES: 'false'
 
       - name: Load files from 1Password
         env:
@@ -517,21 +548,21 @@ jobs:
         uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
 
       - name: Publish links to apps for download on Expensify/App PR
-        if: ${{ inputs.APP_PULL_REQUEST_NUMBER || (!inputs.APP_PULL_REQUEST_NUMBER && !needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR) }}
+        if: ${{ needs.prep.outputs.APP_PR_NUMBER || (!needs.prep.outputs.APP_PR_NUMBER && !needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR) }}
         uses: ./.github/actions/javascript/postTestBuildComment
         with:
           REPO: App
-          APP_PR_NUMBER: ${{ inputs.APP_PULL_REQUEST_NUMBER }}
+          APP_PR_NUMBER: ${{ needs.prep.outputs.APP_PR_NUMBER }}
           MOBILE_EXPENSIFY_PR_NUMBER: ${{ needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR }}
           GITHUB_TOKEN: ${{ github.token }}
           ANDROID: ${{ needs.androidHybrid.result }}
           DESKTOP: ${{ needs.desktop.result }}
           IOS: ${{ needs.iosHybrid.result }}
           WEB: ${{ needs.web.result }}
           ANDROID_LINK: ${{ needs.androidHybrid.outputs.S3_APK_PATH }}
-          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ inputs.APP_PULL_REQUEST_NUMBER }}/NewExpensify.dmg
+          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ needs.prep.outputs.APP_PR_NUMBER }}/NewExpensify.dmg
           IOS_LINK: ${{ needs.iosHybrid.outputs.IOS_PATH }}
-          WEB_LINK: https://${{ inputs.APP_PULL_REQUEST_NUMBER }}.pr-testing.expensify.com
+          WEB_LINK: https://${{ needs.prep.outputs.APP_PR_NUMBER }}.pr-testing.expensify.com
 
       - name: Publish links to apps for download on Expensify/Mobile-Expensify PR
         if: ${{ needs.getMobileExpensifyPR.outputs.MOBILE_EXPENSIFY_PR }}

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009027808
-        versionName "9.2.78-8"
+        versionCode 1009028101
+        versionName "9.2.81-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"

android/app/build.gradle

@@ -188,6 +188,10 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                           project: 'app',
                           release: {
                               name: `${process.env.npm_package_name}@${process.env.npm_package_version}`,
+                              create: true,
+                              setCommits: {
+                                  auto: true,
+                              },
                           },
                           sourcemaps: {
                               // Use relative path from project root - works for both web (dist/) and desktop (desktop/dist/www/)

config/webpack/webpack.common.ts

@@ -863,7 +863,7 @@ const modifiedArray = someArray.filter(filterFunc).map(mapFunc);
 
 - Prefer `async/await` over `.then/.catch` across the codebase. Use raw `Promise` only when wrapping callbacks or implementing deferred signals.
 - Use `Promise.all(...)` (or `Promise.allSettled(...)`) for work that can run in parallel.
-- In UI code, start unrelated async tasks at the same time (don’t wait for one to finish before starting another), and let the UI render immediately with loading states ([see data-binding](./philosophies/DATA-BINDING.md)). 
+- In UI code, start unrelated async tasks at the same time (don’t wait for one to finish before starting another), and let the UI render immediately with loading states ([see data-binding](./philosophies/DATA-BINDING.md)).
 - See the detailed [async philosophy document](./philosophies/ASYNC.md)
 
 ## Accessing Object Properties and Default Values
@@ -1130,14 +1130,18 @@ In React Native, one **must not** attempt to falsy-check a string for an inline
 
 ### Function component style
 
-When writing a function component, you must ALWAYS add a `displayName` property and give it the same value as the name of the component (this is so it appears properly in the React dev tools)
+When writing a function component do not explicitly add `displayName` property when component name matches with displayName. A few components such as higher-order components, may need the `displayName` property (this is so it appears properly in the React dev tools)
 
 ```tsx
-function Avatar(props: AvatarProps) {...};
+export default function <TProps extends WithCurrentUserPersonalDetailsProps>(WrappedComponent: ComponentType<TProps>): ComponentType<Omit<TProps, keyof HOCProps>> {
+    function WithCurrentUserPersonalDetails(props: Omit<TProps, keyof HOCProps>) {
+       ...
+    }
 
-Avatar.displayName = 'Avatar';
+    WithCurrentUserPersonalDetails.displayName = `WithCurrentUserPersonalDetails(${getComponentDisplayName(WrappedComponent)})`;
 
-export default Avatar;
+    return WithCurrentUserPersonalDetails;
+}
 ```
 
 ### Forwarding refs
@@ -1235,7 +1239,7 @@ The correct approach is avoid using `ScrollView`. You can add props like `listHe
 </ScrollView>
 ```
 
-### Correct Approach 
+### Correct Approach
 The correct approach is to use the list component's built-in header and footer props instead of wrapping in a `ScrollView`:
 
 - Using `SelectionList`

contributingGuides/STYLE.md

@@ -116,3 +116,5 @@ Yes—if the report is a **Draft** or is **Outstanding**. **Done** or **Paid** r
 ## Can I view report details?  
 Yes. Tap the report title or select **View Details** from the **More** menu.
 
+## An employee sent an IOU before our company had a company workspace. How do we report their expenses on the workspace instead?
+The employee can move their IOU to the company workspace by selecting **More** > **Change Workspace**. This will convert the IOU into a regular expense report on the selected workspace.