Merge branch 'main' of github.com:Expensify/App into arosiclair-gtm-e…

…vents
Expensify · Oct 30, 2024 · 78e2a82 · 78e2a82
2 parents edada2d + b5561d9
commit 78e2a82
Show file tree

Hide file tree

Showing 401 changed files with 6,539 additions and 6,873 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -294,6 +294,7 @@ module.exports = {
             files: ['*.ts', '*.tsx'],
             rules: {
                 'rulesdir/prefer-at': 'error',
+                'rulesdir/boolean-conditional-rendering': 'error',
             },
         },
     ],

diff --git a/.github/ISSUE_TEMPLATE/Standard.md b/.github/ISSUE_TEMPLATE/Standard.md
@@ -16,7 +16,7 @@ ___
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
 **Expensify/Expensify Issue URL:**
 **Issue reported by:**
-**Slack conversation:**
+**Slack conversation** (hyperlinked to channel name):
 
 ## Action Performed:
 Break down in numbered steps

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!-- If necessary, assign reviewers that know the area or changes well. Feel free to tag any additional reviewers you see fit. -->
 
-### Details
-<!-- Explanation of the change or anything fishy that is going on -->
+### Explanation of Change
+<!-- Explain what your change does and how it addresses the linked issue -->
 
 ### Fixed Issues
 <!---
@@ -79,7 +79,6 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
 - [ ] I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
 - [ ] I followed proper code patterns (see [Reviewing the code](https://github.com/Expensify/App/blob/main/contributingGuides/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
     - [ ] I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. `toggleReport` and not `onIconClick`)
-    - [ ] I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. `myBool && <MyComponent />`.
     - [ ] I verified that comments were added to code that is not self explanatory
     - [ ] I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
     - [ ] I verified any copy / text shown in the product is localized by adding it to `src/languages/*` files and using the [translation method](https://github.com/Expensify/App/blob/4bd99402cebdf4d7394e0d1f260879ea238197eb/src/components/withLocalize.js#L60)

diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
@@ -163,15 +163,15 @@ jobs:
               echo "APK_PATH=$apkPath"
               echo "APK_FILE_NAME=$(basename "$apkPath")"
               echo "SHOULD_UPLOAD_SOURCEMAPS=$SHOULD_UPLOAD_SOURCEMAPS"
-              echo "APK_ARTIFACT_NAME=${{ inputs.artifact-prefix }}android-artifact-apk" >> "$GITHUB_OUTPUT"
+              echo "APK_ARTIFACT_NAME=${{ inputs.artifact-prefix }}android-apk-artifact" >> "$GITHUB_OUTPUT"
             } >> "$GITHUB_OUTPUT"    
 
       - name: Upload Android AAB artifact
         if: ${{ steps.build.outputs.AAB_PATH != '' }}
         continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.artifact-prefix }}android-artifact-aab
+          name: ${{ inputs.artifact-prefix }}android-aab-artifact
           path: ${{ steps.build.outputs.AAB_PATH }}
 
       - name: Upload Android APK artifact
@@ -187,5 +187,5 @@ jobs:
         continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.artifact-prefix }}android-artifact-sourcemaps
+          name: ${{ inputs.artifact-prefix }}android-sourcemaps-artifact
           path: ./android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
@@ -179,7 +179,7 @@ jobs:
             ./Android/AndroidManifest.xml \
             ./app/config/config.json \
             ./iOS/Expensify/Expensify-Info.plist\
-            ./iOS/SmartScanExtension/Info.plist \
+            ./iOS/SmartScanExtension/Info.plist
           git commit -m "Update version to ${{ needs.createNewVersion.outputs.NEW_VERSION }}"
 
       - name: Update main branch

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -96,7 +96,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: /tmp/artifacts
-          pattern: android-artifact-*
+          pattern: android-*-artifact
           merge-multiple: true
 
       - name: Log downloaded artifact paths
@@ -182,10 +182,14 @@ jobs:
           submodules: true
           path: 'Mobile-Expensify'
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
+          fetch-depth: 0
 
       - name: Update submodule
         run: |
           git submodule update --init
+          # Update submodule to latest on staging
+          git fetch
+          git checkout staging
 
       - name: Configure MapBox SDK
         run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
@@ -200,6 +204,9 @@ jobs:
         run: |
           npm install
           cd .. && npm install
+          
+          # Fixes https://github.com/Expensify/App/issues/51682
+          npm run grunt:build:shared
 
       - name: Setup Java
         uses: actions/setup-java@v4
@@ -266,7 +273,7 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4
         with:
-          name: android-build-artifact
+          name: android-hybrid-build-artifact
           path: ${{ env.aabPath }}
 
       - name: Set current App version in Env
@@ -475,10 +482,14 @@ jobs:
           submodules: true
           path: 'Mobile-Expensify'
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
+          fetch-depth: 0
 
       - name: Update submodule
         run: |
           git submodule update --init
+          # Update submodule to latest on staging
+          git fetch
+          git checkout staging
 
       - name: Configure MapBox SDK
         run: |
@@ -583,7 +594,7 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4
         with:
-          name: ios-build-artifact
+          name: ios-hybrid-build-artifact
           path: ${{ env.ipaPath }}
 
       - name: Warn deployers if iOS production deploy failed
@@ -690,7 +701,7 @@ jobs:
     name: Post a Slack message when any platform fails to build or deploy
     runs-on: ubuntu-latest
     if: ${{ failure() }}
-    needs: [buildAndroid, uploadAndroid, submitAndroid, desktop, iOS, web]
+    needs: [buildAndroid, uploadAndroid, submitAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -788,13 +799,13 @@ jobs:
         run: |
           gh release upload ${{ needs.prep.outputs.APP_VERSION }} --repo ${{ github.repository }} --clobber \
             ./android-sourcemaps-artifact/index.android.bundle.map#android-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
-            ./android-build-artifact/app-production-release.aab \
-            ./android-build-artifact/Expensify-release.aab#Android-HybridApp.aab \
+            ./android-aab-artifact/app-production-release.aab \
+            ./android-hybrid-build-artifact/Expensify-release.aab#Android-HybridApp.aab \
             ./desktop-staging-sourcemaps-artifact/desktop-staging-merged-source-map.js.map#desktop-staging-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
             ./desktop-staging-build-artifact/NewExpensify.dmg#NewExpensifyStaging.dmg \
             ./ios-sourcemaps-artifact/main.jsbundle.map#ios-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
             ./ios-build-artifact/New\ Expensify.ipa \
-            ./ios-build-artifact/Expensify.ipa#iOS-HybridApp.ipa \
+            ./ios-hybrid-build-artifact/Expensify.ipa#iOS-HybridApp.ipa \
             ./web-staging-sourcemaps-artifact/web-staging-merged-source-map.js.map#web-staging-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
             ./web-staging-build-tar-gz-artifact/webBuild.tar.gz#stagingWebBuild.tar.gz \
             ./web-staging-build-zip-artifact/webBuild.zip#stagingWebBuild.zip

diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml
@@ -43,6 +43,7 @@ jobs:
             previous_merge=$(git rev-list --merges HEAD~1 | head -n 1)
           else
             # On a feature branch, find the common ancestor of the current branch and main
+            git fetch origin main:main
             previous_merge=$(git merge-base HEAD main)
           fi
           echo "$previous_merge"
@@ -60,7 +61,7 @@ jobs:
         id: getDeltaRef
         run: |
           if [ '${{ steps.getPullRequestDetails.outputs.IS_MERGED }}' == 'true' ]; then
-            echo "DELTA_REF=${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}" >> "$GITHUB_OUTPUT"
+            echo "DELTA_REF=${{ steps.getPullRequestDetails.outputs.MERGE_COMMIT_SHA }}" >> "$GITHUB_OUTPUT"
           else
             # Set dummy git credentials
             git config --global user.email "test@test.com"
@@ -157,26 +158,28 @@ jobs:
           aws-region: us-west-2
 
       - name: Schedule AWS Device Farm test run on main branch
-        uses: realm/aws-devicefarm/test-application@7b9a91236c456c97e28d384c9e476035d5ea686b
+        uses: Wandalen/wretry.action@v3.5.0
         id: schedule-awsdf-main
         with:
-          name: App E2E Performance Regression Tests
-          project_arn: ${{ secrets.AWS_PROJECT_ARN }}
-          device_pool_arn: ${{ secrets.AWS_DEVICE_POOL_ARN }}
-          app_file: zip/app-e2eRelease.apk
-          app_type: ANDROID_APP
-          test_type: APPIUM_NODE
-          test_package_file: App.zip
-          test_package_type: APPIUM_NODE_TEST_PACKAGE
-          test_spec_file: tests/e2e/TestSpec.yml
-          test_spec_type: APPIUM_NODE_TEST_SPEC
-          remote_src: false
-          file_artifacts: |
-            Customer Artifacts.zip
-            Test spec output.txt
-          log_artifacts: debug.log
-          cleanup: true
-          timeout: 7200
+          action: realm/aws-devicefarm/test-application@7b9a91236c456c97e28d384c9e476035d5ea686b
+          with: |
+            name: App E2E Performance Regression Tests
+            project_arn: ${{ secrets.AWS_PROJECT_ARN }}
+            device_pool_arn: ${{ secrets.AWS_DEVICE_POOL_ARN }}
+            app_file: zip/app-e2eRelease.apk
+            app_type: ANDROID_APP
+            test_type: APPIUM_NODE
+            test_package_file: App.zip
+            test_package_type: APPIUM_NODE_TEST_PACKAGE
+            test_spec_file: tests/e2e/TestSpec.yml
+            test_spec_type: APPIUM_NODE_TEST_SPEC
+            remote_src: false
+            file_artifacts: |
+              Customer Artifacts.zip
+              Test spec output.txt
+            log_artifacts: debug.log
+            cleanup: true
+            timeout: 7200
 
       - name: Print logs if run failed
         if: failure()
@@ -229,14 +232,44 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
+      - name: Check if test has skipped tests
+        id: checkIfSkippedTestsDetected
+        run: |
+          if grep -q '⚠️' "./Host_Machine_Files/\$WORKING_DIRECTORY/output.md"; then
+            # Create an output to the GH action that the tests were skipped:
+            echo "skippedTestsDetected=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "skippedTestsDetected=false" >> "$GITHUB_OUTPUT"
+            echo '✅ no skipped tests detected'
+          fi
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: 'Announce skipped tests in Slack'
+        if: ${{ steps.checkIfSkippedTestsDetected.outputs.skippedTestsDetected == 'true' }}
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#e2e-announce',
+              attachments: [{
+                color: 'danger',
+                text: `⚠️ ${process.env.AS_REPO} Some of E2E tests were skipped on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}> workflow ⚠️`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
       - name: 'Announce regression in Slack'
         if: ${{ steps.checkIfRegressionDetected.outputs.performanceRegressionDetected == 'true' }}
         uses: 8398a7/action-slack@v3
         with:
           status: custom
           custom_payload: |
             {
-              channel: '#newdot-quality',
+              channel: '#quality',
               attachments: [{
                 color: 'danger',
                 text: `🔴 Performance regression detected in PR ${{ inputs.PR_NUMBER }}\nDetected in <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}> workflow.`,

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -92,7 +92,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: /tmp/artifacts
-          pattern: android-artifact-*
+          pattern: android-*-artifact
           merge-multiple: true
 
       - name: Log downloaded artifact paths

diff --git a/__mocks__/@react-navigation/native/index.ts b/__mocks__/@react-navigation/native/index.ts
@@ -16,9 +16,10 @@ const {triggerTransitionEnd, addListener} = isJestEnv
           addListener: () => {},
       };
 
+const realOrMockedUseNavigation = isJestEnv ? realReactNavigation.useNavigation : {};
 const useNavigation = () => ({
-    ...realReactNavigation.useNavigation,
-    navigate: jest.fn(),
+    ...realOrMockedUseNavigation,
+    navigate: isJestEnv ? jest.fn() : () => {},
     getState: () => ({
         routes: [],
     }),
@@ -30,17 +31,20 @@ type NativeNavigationMock = typeof ReactNavigation & {
 };
 
 export * from '@react-navigation/core';
-const Link = realReactNavigation.Link;
-const LinkingContext = realReactNavigation.LinkingContext;
-const NavigationContainer = realReactNavigation.NavigationContainer;
-const ServerContainer = realReactNavigation.ServerContainer;
-const DarkTheme = realReactNavigation.DarkTheme;
-const DefaultTheme = realReactNavigation.DefaultTheme;
-const ThemeProvider = realReactNavigation.ThemeProvider;
-const useLinkBuilder = realReactNavigation.useLinkBuilder;
-const useLinkProps = realReactNavigation.useLinkProps;
-const useLinkTo = realReactNavigation.useLinkTo;
-const useScrollToTop = realReactNavigation.useScrollToTop;
+const Link = isJestEnv ? realReactNavigation.Link : () => null;
+const LinkingContext = isJestEnv ? realReactNavigation.LinkingContext : () => null;
+const NavigationContainer = isJestEnv ? realReactNavigation.NavigationContainer : () => null;
+const ServerContainer = isJestEnv ? realReactNavigation.ServerContainer : () => null;
+const DarkTheme = isJestEnv ? realReactNavigation.DarkTheme : {};
+const DefaultTheme = isJestEnv ? realReactNavigation.DefaultTheme : {};
+const ThemeProvider = isJestEnv ? realReactNavigation.ThemeProvider : () => null;
+const useLinkBuilder = isJestEnv ? realReactNavigation.useLinkBuilder : () => null;
+const useLinkProps = isJestEnv ? realReactNavigation.useLinkProps : () => null;
+const useLinkTo = isJestEnv ? realReactNavigation.useLinkTo : () => null;
+const useScrollToTop = isJestEnv ? realReactNavigation.useScrollToTop : () => null;
+const useRoute = isJestEnv ? realReactNavigation.useRoute : () => ({params: {}});
+const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callback: () => void) => callback();
+
 export {
     // Overriden modules
     useIsFocused,
@@ -60,6 +64,8 @@ export {
     useLinkProps,
     useLinkTo,
     useScrollToTop,
+    useRoute,
+    useFocusEffect,
 };
 
 export type {NativeNavigationMock};
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009005405
-        versionName "9.0.54-5"
+        versionCode 1009005509
+        versionName "9.0.55-9"
         // 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"

diff --git a/assets/images/Star.svg b/assets/images/Star.svg
diff --git a/assets/images/bookmark.svg b/assets/images/bookmark.svg
diff --git a/assets/images/caret-up-down.svg b/assets/images/caret-up-down.svg