Merge branch 'main' of https://github.com/Expensify/App into feat/#Ex…

…pensify#23229-linking

.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

@@ -0,0 +1,96 @@
+name: Notify on Workflow Failure
+
+on:
+ workflow_run:
+ workflows: ["Process new code merged to main"]
+ types:
+ - completed
+
+permissions:
+ issues: write
+
+jobs:
+ notifyFailure:
+ runs-on: ubuntu-latest
+ if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+ steps:
+ - name: Fetch Workflow Run Jobs
+ id: fetch-workflow-jobs
+ uses: actions/github-script@v7
+ with:
+ script: |
+ const runId = "${{ github.event.workflow_run.id }}";
+ const jobsData = await github.rest.actions.listJobsForWorkflowRun({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ run_id: runId,
+ });
+ return jobsData.data;
+
+ - name: Process Each Failed Job
+ uses: actions/github-script@v7
+ with:
+ script: |
+ const jobs = ${{ steps.fetch-workflow-jobs.outputs.result }};
+
+ const headCommit = "${{ github.event.workflow_run.head_commit.id }}"; 
+ const prData = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ commit_sha: headCommit,
+ });
+
+ const pr = prData.data[0];
+ const prLink = pr.html_url;
+ const prAuthor = pr.user.login;
+ const prMerger = "${{ github.event.workflow_run.actor.login }}";
+
+ const failureLabel = 'Workflow Failure';
+ for (let i = 0; i < jobs.total_count; i++) {
+ if (jobs.jobs[i].conclusion == 'failure') {
+ const jobName = jobs.jobs[i].name;
+ const jobLink = jobs.jobs[i].html_url;
+ const issues = await github.rest.issues.listForRepo({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ labels: failureLabel,
+ state: 'open'
+ });
+ const existingIssue = issues.data.find(issue => issue.title.includes(jobName));
+ if (!existingIssue) {
+ const annotations = await github.rest.checks.listAnnotations({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ check_run_id: jobs.jobs[i].id,
+ });
+ let errorMessage = "";
+ for(let j = 0; j < annotations.data.length; j++) {
+ errorMessage += annotations.data[j].annotation_level + ": "; 
+ errorMessage += annotations.data[j].message + "\n"; 
+ }
+ const issueTitle = `Investigate workflow job failing on main: ${ jobName }`;
+ const issueBody = `🚨 **Failure Summary** 🚨:\n\n` +
+ `- **📋 Job Name**: [${ jobName }](${ jobLink })\n` +
+ `- **🔧 Failure in Workflow**: Process new code merged to main\n` +
+ `- **🔗 Triggered by PR**: [PR Link](${ prLink })\n` +
+ `- **👤 PR Author**: @${ prAuthor }\n` +
+ `- **🤝 Merged by**: @${ prMerger }\n` +
+ `- **🐛 Error Message**: \n ${errorMessage}\n\n` +
+ `⚠️ **Action Required** ⚠️:\n\n` +
+ `🛠️ A recent merge appears to have caused a failure in the job named [${ jobName }](${ jobLink }).\n` +
+ `This issue has been automatically created and labeled with \`${ failureLabel }\` for investigation. \n\n` +
+ `👀 **Please look into the following**:\n` +
+ `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!`;
+ await github.rest.issues.create({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ title: issueTitle,
+ body: issueBody,
+ labels: [failureLabel, 'Daily'],
+ assignees: [prMerger]
+ });
+ }
+ }
+ }

.github/workflows/preDeploy.yml

@@ -1,3 +1,4 @@
+# Reminder: If this workflow's name changes, update the name in the dependent workflow at .github/workflows/failureNotifier.yml.
 name: Process new code merged to main
 
 on:

.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__/@react-native-firebase/crashlytics.ts

@@ -0,0 +1,15 @@
+import type {FirebaseCrashlyticsTypes} from '@react-native-firebase/crashlytics';
+
+type CrashlyticsModule = Pick<FirebaseCrashlyticsTypes.Module, 'log' | 'recordError' | 'setCrashlyticsCollectionEnabled'>;
+
+type CrashlyticsMock = () => CrashlyticsModule;
+
+// <App> uses <ErrorBoundary> and we need to mock the imported crashlytics module
+// due to an error that happens otherwise https://github.com/invertase/react-native-firebase/issues/2475
+const crashlyticsMock: CrashlyticsMock = () => ({
+ log: jest.fn(),
+ recordError: jest.fn(),
+ setCrashlyticsCollectionEnabled: jest.fn(),
+});
+
+export default crashlyticsMock;

__mocks__/@react-native-firebase/perf.ts

@@ -0,0 +1,5 @@
+type PerfMock = () => void;
+
+const perfMock: PerfMock = () => {};
+
+export default perfMock;

__mocks__/react-freeze.ts

@@ -0,0 +1,8 @@
+import type {Freeze as FreezeComponent} from 'react-freeze';
+
+const Freeze: typeof FreezeComponent = (props) => props.children as JSX.Element;
+
+export {
+ // eslint-disable-next-line import/prefer-default-export
+ Freeze,
+};

__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 1001043800
- versionName "1.4.38-0"
+ versionCode 1001043907
+ versionName "1.4.39-7"
  }
 
  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));
  }
 }