Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…

…imation-and-sound

.github/workflows/e2ePerformanceTests.yml

@@ -205,22 +205,61 @@ jobs:
           cat ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/debug.log || true
           cat "./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/Test spec output.txt" || true
 
+      - name: Announce failed workflow in Slack
+        if: failure()
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#expensify-margelo',
+              attachments: [{
+                color: 'danger',
+                text: `💥 ${process.env.AS_REPO} E2E Test run failed failed 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: Unzip AWS Device Farm results
-        if: ${{ always() }}
+        if: always()
         run: unzip "Customer Artifacts.zip"
 
       - name: Print AWS Device Farm run results
-        if: ${{ always() }}
+        if: always()
         run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/output.md"
 
       - name: Check if test failed, if so post the results and add the DeployBlocker label
+        id: checkIfRegressionDetected
         run: |
           if grep -q '🔴' ./output.md; then
+            # Create an output to the GH action that the test failed:
+            echo "performanceRegressionDetected=true" >> "$GITHUB_OUTPUT"
+
             gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
             gh pr comment ${{ inputs.PR_NUMBER }} -F ./output.md
             gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
           else
+            echo "performanceRegressionDetected=false" >> "$GITHUB_OUTPUT"
             echo '✅ no performance regression detected'
           fi
         env:
           GITHUB_TOKEN: ${{ github.token }}
+
+      - name: 'Announce regression in Slack'
+        if: ${{ steps.checkIfRegressionDetected.outputs.performanceRegressionDetected == 'true' }}
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#newdot-performance',
+              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.`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/failureNotifier.yml

@@ -83,13 +83,13 @@ jobs:
                   `1. **Why the PR caused the job to fail?**\n` +
                   `2. **Address any underlying issues.**\n\n` +
                   `🐛 We appreciate your help in squashing this bug!`;
-                  github.rest.issues.create({
+                  await github.rest.issues.create({
                     owner: context.repo.owner,
                     repo: context.repo.repo,
                     title: issueTitle,
                     body: issueBody,
                     labels: [failureLabel, 'Daily'],
-                    assignees: [prMerger, prAuthor]
+                    assignees: [prMerger]
                   });
                 }
               }

.storybook/webpack.config.js

@@ -25,7 +25,7 @@ module.exports = ({config}) => {
     config.resolve.alias = {
         'react-native-config': 'react-web-config',
         'react-native$': 'react-native-web',
-        '@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.js'),
+        '@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.ts'),
         '@react-navigation/native': path.resolve(__dirname, '../__mocks__/@react-navigation/native'),
 
         // Module alias support for storybook files, coping from `webpack.common.js`

__mocks__/@react-native-community/netinfo.ts

@@ -0,0 +1,31 @@
+import {NetInfoCellularGeneration, NetInfoStateType} from '@react-native-community/netinfo';
+import type {addEventListener, configure, fetch, NetInfoState, refresh, useNetInfo} from '@react-native-community/netinfo';
+
+const defaultState: NetInfoState = {
+    type: NetInfoStateType.cellular,
+    isConnected: true,
+    isInternetReachable: true,
+    details: {
+        isConnectionExpensive: true,
+        cellularGeneration: NetInfoCellularGeneration['3g'],
+        carrier: 'T-Mobile',
+    },
+};
+
+type NetInfoMock = {
+    configure: typeof configure;
+    fetch: typeof fetch;
+    refresh: typeof refresh;
+    addEventListener: typeof addEventListener;
+    useNetInfo: typeof useNetInfo;
+};
+
+const netInfoMock: NetInfoMock = {
+    configure: () => {},
+    fetch: () => Promise.resolve(defaultState),
+    refresh: () => Promise.resolve(defaultState),
+    addEventListener: () => () => {},
+    useNetInfo: () => defaultState,
+};
+
+export default netInfoMock;

__mocks__/fileMock.ts

@@ -0,0 +1,3 @@
+const fileMock = 'test-file-stub';
+
+export default fileMock;

__mocks__/react-native-blob-util.ts

@@ -0,0 +1,5 @@
+import type RNFetchBlob from 'react-native-blob-util';
+
+const ReactNativeBlobUtilMock: Partial<typeof RNFetchBlob> = {};
+
+export default ReactNativeBlobUtilMock;

__mocks__/react-native-dev-menu.ts

@@ -0,0 +1,11 @@
+import type {addItem} from 'react-native-dev-menu';
+
+type ReactNativeDevMenuMock = {
+    addItem: typeof addItem;
+};
+
+const reactNativeDevMenuMock: ReactNativeDevMenuMock = {
+    addItem: jest.fn(),
+};
+
+export default reactNativeDevMenuMock;

__mocks__/react-native-device-info.ts

@@ -0,0 +1,6 @@
+import type DeviceInfoModule from 'react-native-device-info';
+import MockDeviceInfo from 'react-native-device-info/jest/react-native-device-info-mock';
+
+const DeviceInfo: typeof DeviceInfoModule = MockDeviceInfo;
+
+export default DeviceInfo;

__mocks__/react-native-localize.ts

@@ -0,0 +1,3 @@
+import mockRNLocalize from 'react-native-localize/mock';
+
+module.exports = mockRNLocalize;

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001043802
-        versionName "1.4.38-2"
+        versionCode 1001044000
+        versionName "1.4.40-0"
     }
 
     flavorDimensions "default"

android/app/src/main/java/com/expensify/chat/customairshipextender/CustomAirshipExtender.java

@@ -14,8 +14,5 @@ public void onAirshipReady(@NonNull Context context, @NonNull UAirship airship)
 
         CustomNotificationProvider notificationProvider = new CustomNotificationProvider(context, airship.getAirshipConfigOptions());
         pushManager.setNotificationProvider(notificationProvider);
-
-        NotificationListener notificationListener = airship.getPushManager().getNotificationListener();
-        pushManager.setNotificationListener(new CustomNotificationListener(notificationListener, notificationProvider));
     }
 }