Merge branch 'main' into feature/kuba_nowakowski/add_switch_animation…

…s_to_acounting

.env.example

@@ -30,6 +30,7 @@ EXPENSIFY_ACCOUNT_ID_RECEIPTS=-1
 EXPENSIFY_ACCOUNT_ID_REWARDS=-1
 EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR=-1
 EXPENSIFY_ACCOUNT_ID_SVFG=-1
+EXPENSIFY_ACCOUNT_ID_MANAGER_MCTEST=-1
 
 FB_API_KEY=YOUR_API_KEY
 FB_APP_ID=YOUR_APP_ID

.eslintrc.changed.js

@@ -20,12 +20,6 @@ module.exports = {
         ],
     },
     overrides: [
-        {
-            files: ['src/pages/workspace/WorkspaceInitialPage.tsx', 'src/pages/home/report/PureReportActionItem.tsx', 'src/libs/SidebarUtils.ts'],
-            rules: {
-                'rulesdir/no-default-id-values': 'off',
-            },
-        },
         {
             files: ['**/libs/**/*.{ts,tsx}'],
             rules: {

.eslintrc.js

@@ -3,14 +3,26 @@ const path = require('path');
 const restrictedImportPaths = [
     {
         name: 'react-native',
-        importNames: ['useWindowDimensions', 'StatusBar', 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', 'Text', 'ScrollView'],
+        importNames: [
+            'useWindowDimensions',
+            'StatusBar',
+            'TouchableOpacity',
+            'TouchableWithoutFeedback',
+            'TouchableNativeFeedback',
+            'TouchableHighlight',
+            'Pressable',
+            'Text',
+            'ScrollView',
+            'Animated',
+        ],
         message: [
             '',
             "For 'useWindowDimensions', please use '@src/hooks/useWindowDimensions' instead.",
             "For 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', please use 'PressableWithFeedback' and/or 'PressableWithoutFeedback' from '@components/Pressable' instead.",
             "For 'StatusBar', please use '@libs/StatusBar' instead.",
             "For 'Text', please use '@components/Text' instead.",
             "For 'ScrollView', please use '@components/ScrollView' instead.",
+            "For 'Animated', please use 'Animated' from 'react-native-reanimated' instead.",
         ].join('\n'),
     },
     {
@@ -75,6 +87,10 @@ const restrictedImportPaths = [
         importNames: ['memoize'],
         message: "Please use '@src/libs/memoize' instead.",
     },
+    {
+        name: 'react-native-animatable',
+        message: "Please use 'react-native-reanimated' instead.",
+    },
 ];
 
 const restrictedImportPatterns = [

.github/ISSUE_TEMPLATE/TooltipsTemplate.md

@@ -0,0 +1,28 @@
+---
+name: 'Tooltips Template'
+about: Create this issue when adding a new tooltip to New Expensify
+labels: Daily, Design, WaitingForCopy
+title: 'Tooltips Template'
+---
+Refer to https://stackoverflowteams.com/c/expensify/questions/20762 for the full process to add a tooltip.
+
+### Problem
+Enter the problem that currently exists without the tooltip.
+
+### Solution
+Enter the solution that implementing the tooltip will achieve. 
+
+### What is the purpose of the tooltip? 
+Enter the purpose.
+
+### How should the tooltip look
+Add the Figma Mock Up that Design builds.
+
+### Condition
+We should show this tooltip to:
+
+### Decide the prioritisation
+
+Priority score:
+
+NOTE: Only one tooltip is shown at a time.

.github/actions/composite/setupNode/action.yml

@@ -31,8 +31,8 @@ runs:
       uses: actions/cache@v4
       with:
         path: node_modules
-        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
-
+        key: ${{ inputs.IS_HYBRID_BUILD == 'true' && format('{0}-node-modules-{1}', runner.os, hashFiles('package-lock.json', 'patches/**', 'Mobile-Expensify/patches/**')) || format('{0}-node-modules-{1}', runner.os, hashFiles('package-lock.json', 'patches/**'))}}
+    
     - id: cache-old-dot-node-modules
       if: inputs.IS_HYBRID_BUILD == 'true'
       uses: actions/cache@v4

.github/workflows/README.md

@@ -94,6 +94,7 @@ The GitHub workflows require a large list of secrets to deploy, notify and test
 1. `CSC_LINK` - Required to be set for desktop code signing: https://www.electron.build/code-signing.html#travis-appveyor-and-other-ci-servers
 1. `CSC_KEY_PASSWORD` - Required to be set for desktop code signing: https://www.electron.build/code-signing.html#travis-appveyor-and-other-ci-servers
 1. `APPLE_ID` - Required for notarizing desktop code in `desktop/notarize.js`
+1. `APPLE_TEAM_ID` - Required for notarizing desktop code in `desktop/notarize.js`
 1. `APPLE_ID_PASSWORD` - Required for notarizing desktop code in `desktop/notarize.js`
 1. `AWS_ACCESS_KEY_ID` - Required for hosting website and desktop compiled code
 1. `AWS_SECRET_ACCESS_KEY` - Required for hosting website and desktop compiled code

.github/workflows/compareNDandODbuilds.yml

@@ -0,0 +1,77 @@
+name: Build and profile Android apps
+
+on:
+  workflow_dispatch:
+
+jobs:
+  buildHybridAppAndroid:
+    name: Build HybridApp Android
+    runs-on: macos-15-xlarge
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+      - name: Update submodule to match main
+        run: |
+          git submodule update --init --remote
+          cd Mobile-Expensify
+          git fetch
+          git checkout main
+
+      - name: Configure MapBox SDK
+        run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+
+      - name: Setup Node
+        id: setup-node
+        uses: ./.github/actions/composite/setupNode
+        with:
+          IS_HYBRID_BUILD: 'true'
+
+      - name: Build Android Release
+        working-directory: Mobile-Expensify/Android
+        run: |
+          if ! ./gradlew --profile assembleRelease
+          then
+            echo "❌ Android HybridApp failed to build: Please reach out to Contributor+ and/or Expensify engineers for help in #expensify-open-source to resolve."
+            exit 1
+          else
+            echo "✅ Build succeeded. Printing Gradle profile report:"
+            # Print the latest generated profile report
+            PROFILE_REPORT=$(find build/reports/profile -maxdepth 1 -type f)
+            cat "$PROFILE_REPORT"
+          fi
+
+  buildStandaloneAndroid:
+    name: Build Standalone Android
+    runs-on: macos-15-xlarge
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+      - name: Configure MapBox SDK
+        run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+
+      - name: Setup Node
+        id: setup-node
+        uses: ./.github/actions/composite/setupNode
+        with:
+          IS_HYBRID_BUILD: 'false'
+
+      - name: Build Android Release
+        working-directory: android
+        run: |
+          if ! ./gradlew --profile assembleProductionRelease
+          then
+            echo "❌ Android Standalone failed to build: Please reach out to Contributor+ and/or Expensify engineers for help in #expensify-open-source to resolve."
+            exit 1
+          else
+            echo "✅ Build succeeded. Printing Gradle profile report:"
+            # Print the latest generated profile report
+            PROFILE_REPORT=$(find build/reports/profile -maxdepth 1 -type f)
+            cat "$PROFILE_REPORT"
+          fi

.github/workflows/deploy.yml

@@ -318,6 +318,7 @@ jobs:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/testBuild.yml

@@ -266,6 +266,7 @@ jobs:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/testBuildHybrid.yml

@@ -77,29 +77,35 @@ jobs:
             const pullRequest = await github.rest.pulls.get({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              pull_number: env.PULL_REQUEST_NUMBER,
+              pull_number: '${{ env.PULL_REQUEST_NUMBER }}',
             });
             
             const body = pullRequest.data.body;
-            const regex = /MOBILE-EXPENSIFY:(?<prNumber>.*)/;
+            const regex = /MOBILE-EXPENSIFY:(?<prNumber>\d+)/;
             const found = body.match(regex)?.groups?.prNumber || "";
 
             return found.trim();
 
   getOldDotBranchRef:
       runs-on: ubuntu-latest
       needs: getOldDotPR
-      if: ${{ needs.getOldDotPR.outputs.OLD_DOT_PR != '' }}
       outputs:
         OLD_DOT_REF: ${{ steps.getHeadRef.outputs.REF }}
       steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+
         - name: Check if pull request number is correct
           id: getHeadRef
           run: |
             set -e
-            echo "REF=$(gh pr view ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
+            if [[ ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} == '' ]]; then
+              echo "REF=" >> "$GITHUB_OUTPUT"
+            else
+              echo "REF=$(gh pr view ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} -R Expensify/Mobile-Expensify --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
+            fi
           env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
 
   postGitHubCommentBuildStarted:
@@ -145,7 +151,7 @@ jobs:
         if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
         run: |
           cd Mobile-Expensify
-          git fetch
+          git fetch origin ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
           git checkout ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
       
       - name: Configure MapBox SDK
@@ -256,7 +262,7 @@ jobs:
         if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
         run: |
           cd Mobile-Expensify
-          git fetch
+          git fetch origin ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
           git checkout ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
 
       - name: Configure MapBox SDK
@@ -308,9 +314,9 @@ jobs:
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          op document get --output ./OldApp_AdHoc.mobileprovision OldApp_AdHoc
-          op document get --output ./OldApp_AdHoc_Share_Extension.mobileprovision OldApp_AdHoc_Share_Extension
-          op document get --output ./OldApp_AdHoc_Notification_Service.mobileprovision OldApp_AdHoc_Notification_Service
+          op read op://Mobile-Deploy-CI/OldApp_AdHoc/OldApp_AdHoc.mobileprovision --force --out-file ./OldApp_AdHoc.mobileprovision
+          op read op://Mobile-Deploy-CI/OldApp_AdHoc_Share_Extension/OldApp_AdHoc_Share_Extension.mobileprovision --force --out-file ./OldApp_AdHoc_Share_Extension.mobileprovision
+          op read op://Mobile-Deploy-CI/OldApp_AdHoc_Notification_Service/OldApp_AdHoc_Notification_Service.mobileprovision --force --out-file ./OldApp_AdHoc_Notification_Service.mobileprovision
 
       - name: Decrypt certificate
         run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output Certificates.p12 Certificates.p12.gpg