Merge branch 'main' into fix/issue-16186

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

@@ -18,13 +18,13 @@ runs:
           desktop/package-lock.json
 
     - id: cache-node-modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: node_modules
         key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
 
     - id: cache-desktop-node-modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: desktop/node_modules
         key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}

.github/actions/javascript/bumpVersion/index.js

@@ -2657,12 +2657,17 @@ createToken('XRANGELOOSE', `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAINLOOSE]}$`)
 
 // Coercion.
 // Extract anything that could conceivably be a part of a valid semver
-createToken('COERCE', `${'(^|[^\\d])' +
+createToken('COERCEPLAIN', `${'(^|[^\\d])' +
               '(\\d{1,'}${MAX_SAFE_COMPONENT_LENGTH}})` +
               `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?` +
-              `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?` +
+              `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?`)
+createToken('COERCE', `${src[t.COERCEPLAIN]}(?:$|[^\\d])`)
+createToken('COERCEFULL', src[t.COERCEPLAIN] +
+              `(?:${src[t.PRERELEASE]})?` +
+              `(?:${src[t.BUILD]})?` +
               `(?:$|[^\\d])`)
 createToken('COERCERTL', src[t.COERCE], true)
+createToken('COERCERTLFULL', src[t.COERCEFULL], true)
 
 // Tilde ranges.
 // Meaning is "reasonably at or greater than"

.github/workflows/checkE2ETestCode.yml

@@ -0,0 +1,23 @@
+name: Check e2e test code builds correctly
+
+on:
+  workflow_call:
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - 'tests/e2e/**'
+      - 'src/libs/E2E/**'
+
+jobs:
+  lint:
+    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+
+      - name: Verify e2e tests compile correctly
+        run: npm run e2e-test-runner-build

.github/workflows/e2ePerformanceTests.yml

@@ -15,6 +15,10 @@ on:
         type: string
         required: true
 
+concurrency:
+  group: "${{ github.ref }}-e2e"
+  cancel-in-progress: true
+
 jobs:
   buildBaseline:
     runs-on: ubuntu-latest-xl
@@ -175,23 +179,11 @@ jobs:
       - name: Rename delta APK
         run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2edelta-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2edeltaRelease.apk"
 
-      - name: Copy e2e code into zip folder
-        run: cp -r tests/e2e zip
+      - name: Compile test runner to be executable in a nodeJS environment
+        run: npm run e2e-test-runner-build
 
-      # Note: we can't reuse the apps tsconfig, as it depends on modules that aren't available in the AWS Device Farm environment
-      - name: Write tsconfig.json to zip folder
-        run: |
-          echo '{
-            "compilerOptions": {
-              "target": "ESNext",
-              "module": "commonjs",
-              "strict": true,
-              "esModuleInterop": true,
-              "skipLibCheck": true,
-              "forceConsistentCasingInFileNames": true,
-              "allowJs": true,
-            }
-          }' > zip/tsconfig.json
+      - name: Copy e2e code into zip folder
+        run: cp tests/e2e/dist/index.js zip/testRunner.js
 
       - name: Zip everything in the zip directory up
         run: zip -qr App.zip ./zip

.github/workflows/lint.yml

@@ -7,8 +7,13 @@ on:
     branches-ignore: [staging, production]
     paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
 
+concurrency:
+  group: "${{ github.ref }}-lint"
+  cancel-in-progress: true
+
 jobs:
   lint:
+    name: Run ESLint
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:

.github/workflows/platformDeploy.yml

@@ -194,7 +194,7 @@ jobs:
           bundler-cache: true
 
       - name: Cache Pod dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: pods-cache
         with:
           path: ios/Pods

.github/workflows/test.yml

@@ -7,6 +7,10 @@ on:
     branches-ignore: [staging, production]
     paths: ['**.js', '**.ts', '**.tsx', '**.sh', 'package.json', 'package-lock.json']
 
+concurrency:
+  group: "${{ github.ref }}-jest"
+  cancel-in-progress: true
+
 jobs:
   jest:
     if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
@@ -31,7 +35,7 @@ jobs:
 
       - name: Cache Jest cache
         id: cache-jest-cache
-        uses: actions/cache@ac25611caef967612169ab7e95533cf932c32270
+        uses: actions/cache@v4
         with:
           path: .jest-cache
           key: ${{ runner.os }}-jest

.github/workflows/testBuild.yml

@@ -167,7 +167,7 @@ jobs:
           bundler-cache: true
 
       - name: Cache Pod dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: pods-cache
         with:
           path: ios/Pods

__mocks__/react-native.js → __mocks__/react-native.ts

@@ -1,27 +1,47 @@
 // eslint-disable-next-line no-restricted-imports
 import * as ReactNative from 'react-native';
-import _ from 'underscore';
+import type StartupTimer from '@libs/StartupTimer/types';
+
+const {BootSplash} = ReactNative.NativeModules;
 
 jest.doMock('react-native', () => {
     let url = 'https://new.expensify.com/';
     const getInitialURL = () => Promise.resolve(url);
 
-    let appState = 'active';
+    let appState: ReactNative.AppStateStatus = 'active';
     let count = 0;
-    const changeListeners = {};
+    const changeListeners: Record<number, (state: ReactNative.AppStateStatus) => void> = {};
 
     // Tests will run with the app in a typical small screen size by default. We do this since the react-native test renderer
     // runs against index.native.js source and so anything that is testing a component reliant on withWindowDimensions()
     // would be most commonly assumed to be on a mobile phone vs. a tablet or desktop style view. This behavior can be
     // overridden by explicitly setting the dimensions inside a test via Dimensions.set()
-    let dimensions = {
+    let dimensions: Record<string, number> = {
         width: 300,
         height: 700,
         scale: 1,
         fontScale: 1,
     };
 
-    return Object.setPrototypeOf(
+    type ReactNativeMock = typeof ReactNative & {
+        NativeModules: typeof ReactNative.NativeModules & {
+            BootSplash: {
+                getVisibilityStatus: typeof BootSplash.getVisibilityStatus;
+                hide: typeof BootSplash.hide;
+                logoSizeRatio: number;
+                navigationBarHeight: number;
+            };
+            StartupTimer: StartupTimer;
+        };
+        Linking: typeof ReactNative.Linking & {
+            setInitialURL: (newUrl: string) => void;
+        };
+        AppState: typeof ReactNative.AppState & {
+            emitCurrentTestState: (state: ReactNative.AppStateStatus) => void;
+        };
+    };
+
+    const reactNativeMock: ReactNativeMock = Object.setPrototypeOf(
         {
             NativeModules: {
                 ...ReactNative.NativeModules,
@@ -36,7 +56,7 @@ jest.doMock('react-native', () => {
             Linking: {
                 ...ReactNative.Linking,
                 getInitialURL,
-                setInitialURL(newUrl) {
+                setInitialURL(newUrl: string) {
                     url = newUrl;
                 },
             },
@@ -45,11 +65,11 @@ jest.doMock('react-native', () => {
                 get currentState() {
                     return appState;
                 },
-                emitCurrentTestState(state) {
+                emitCurrentTestState(state: ReactNative.AppStateStatus) {
                     appState = state;
-                    _.each(changeListeners, (listener) => listener(appState));
+                    Object.entries(changeListeners).forEach(([, listener]) => listener(appState));
                 },
-                addEventListener(type, listener) {
+                addEventListener(type: ReactNative.AppStateEvent, listener: (state: ReactNative.AppStateStatus) => void) {
                     if (type === 'change') {
                         const originalCount = count;
                         changeListeners[originalCount] = listener;
@@ -68,7 +88,7 @@ jest.doMock('react-native', () => {
                 ...ReactNative.Dimensions,
                 addEventListener: jest.fn(),
                 get: () => dimensions,
-                set: (newDimensions) => {
+                set: (newDimensions: Record<string, number>) => {
                     dimensions = newDimensions;
                 },
             },
@@ -78,9 +98,11 @@ jest.doMock('react-native', () => {
             // so it seems easier to just run the callback immediately in tests.
             InteractionManager: {
                 ...ReactNative.InteractionManager,
-                runAfterInteractions: (callback) => callback(),
+                runAfterInteractions: (callback: () => void) => callback(),
             },
         },
         ReactNative,
     );
+
+    return reactNativeMock;
 });

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001044407
-        versionName "1.4.44-7"
+        versionCode 1001044601
+        versionName "1.4.46-1"
     }
 
     flavorDimensions "default"