Merge branch 'main' into fab-fix

.eslintignore

@@ -10,3 +10,4 @@ docs/vendor/**
 docs/assets/**
 web/gtm.js
 **/.expo/**
+src/libs/SearchParser/searchParser.js

.eslintrc.js

@@ -8,7 +8,7 @@ const restrictedImportPaths = [
             '',
             "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 '@src/libs/StatusBar' instead.",
+            "For 'StatusBar', please use '@libs/StatusBar' instead.",
             "For 'Text', please use '@components/Text' instead.",
             "For 'ScrollView', please use '@components/ScrollView' instead.",
         ].join('\n'),
@@ -59,8 +59,12 @@ const restrictedImportPaths = [
     },
     {
         name: 'expensify-common',
-        importNames: ['Device'],
-        message: "Do not import Device directly, it's known to make VSCode's IntelliSense crash. Please import the desired module from `expensify-common/dist/Device` instead.",
+        importNames: ['Device', 'ExpensiMark'],
+        message: [
+            '',
+            "For 'Device', do not import it directly, it's known to make VSCode's IntelliSense crash. Please import the desired module from `expensify-common/dist/Device` instead.",
+            "For 'ExpensiMark', please use '@libs/Parser' instead.",
+        ].join('\n'),
     },
 ];
 
@@ -109,7 +113,6 @@ module.exports = {
     },
     rules: {
         // TypeScript specific rules
-        '@typescript-eslint/no-unsafe-assignment': 'off',
         '@typescript-eslint/prefer-enum-initializers': 'error',
         '@typescript-eslint/no-var-requires': 'off',
         '@typescript-eslint/no-non-null-assertion': 'error',

.github/actions/javascript/bumpVersion/bumpVersion.ts

@@ -49,7 +49,7 @@ if (!semanticVersionLevel || !versionUpdater.isValidSemverLevel(semanticVersionL
     console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
 
-const {version: previousVersion}: PackageJson = JSON.parse(fs.readFileSync('./package.json').toString());
+const {version: previousVersion} = JSON.parse(fs.readFileSync('./package.json').toString()) as PackageJson;
 if (!previousVersion) {
     core.setFailed('Error: Could not read package.json');
 }

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

@@ -1928,7 +1928,7 @@ class SemVer {
     do {
       const a = this.build[i]
       const b = other.build[i]
-      debug('prerelease compare', i, a, b)
+      debug('build compare', i, a, b)
       if (a === undefined && b === undefined) {
         return 0
       } else if (b === undefined) {

.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.ts

@@ -8,13 +8,13 @@ import GitUtils from '@github/libs/GitUtils';
 
 type IssuesCreateResponse = Awaited<ReturnType<typeof GithubUtils.octokit.issues.create>>['data'];
 
-type PackageJSON = {
+type PackageJson = {
     version: string;
 };
 
 async function run(): Promise<IssuesCreateResponse | void> {
     // Note: require('package.json').version does not work because ncc will resolve that to a plain string at compile time
-    const packageJson: PackageJSON = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+    const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8')) as PackageJson;
     const newVersionTag = packageJson.version;
 
     try {

.github/actions/javascript/getGraphiteString/getGraphiteString.ts

@@ -33,7 +33,7 @@ const run = () => {
         }
 
         try {
-            const current: RegressionEntry = JSON.parse(entry);
+            const current = JSON.parse(entry) as RegressionEntry;
 
             // Extract timestamp, Graphite accepts timestamp in seconds
             if (current.metadata?.creationDate) {

.github/actions/javascript/getPreviousVersion/getPreviousVersion.ts

@@ -11,7 +11,7 @@ function run() {
         core.setFailed(`'Error: Invalid input for 'SEMVER_LEVEL': ${semverLevel}`);
     }
 
-    const {version: currentVersion}: PackageJson = JSON.parse(readFileSync('./package.json', 'utf8'));
+    const {version: currentVersion} = JSON.parse(readFileSync('./package.json', 'utf8')) as PackageJson;
     if (!currentVersion) {
         core.setFailed('Error: Could not read package.json');
     }

.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts

@@ -3,7 +3,7 @@ import type {CompareResult, PerformanceEntry} from '@callstack/reassure-compare/
 import fs from 'fs';
 
 const run = (): boolean => {
-    const regressionOutput: CompareResult = JSON.parse(fs.readFileSync('.reassure/output.json', 'utf8'));
+    const regressionOutput = JSON.parse(fs.readFileSync('.reassure/output.json', 'utf8')) as CompareResult;
     const countDeviation = Number(core.getInput('COUNT_DEVIATION', {required: true}));
     const durationDeviation = Number(core.getInput('DURATION_DEVIATION_PERCENTAGE', {required: true}));
 

.github/workflows/deploy.yml

@@ -28,6 +28,24 @@ jobs:
 
       - name: 🚀 Push tags to trigger staging deploy 🚀
         run: git push --tags
+
+      - name: Warn deployers if staging deploy failed
+        if: ${{ failure() }}
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: "#DB4545",
+                pretext: `<!subteam^S4TJJ3PSL>`,
+                text: `💥 NewDot staging deploy failed. 💥`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   deployProduction:
     runs-on: ubuntu-latest
@@ -65,6 +83,24 @@ jobs:
           PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }}
 
       - name: 🚀 Create release to trigger production deploy 🚀
-        run: gh release create ${{ env.PRODUCTION_VERSION }} --generate-notes
+        run: gh release create ${{ env.PRODUCTION_VERSION }} --notes '${{ steps.getReleaseBody.outputs.RELEASE_BODY }}'
         env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
+
+      - name: Warn deployers if production deploy failed
+        if: ${{ failure() }}
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: "#DB4545",
+                pretext: `<!subteam^S4TJJ3PSL>`,
+                text: `💥 NewDot production deploy failed. 💥`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/e2ePerformanceTests.yml

@@ -257,12 +257,12 @@ jobs:
       - name: Check if test failed, if so post the results and add the DeployBlocker label
         id: checkIfRegressionDetected
         run: |
-          if grep -q '🔴' ./output.md; then
+          if grep -q '🔴' "./Host_Machine_Files/\$WORKING_DIRECTORY/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 }} -F "./Host_Machine_Files/\$WORKING_DIRECTORY/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"

.github/workflows/reassurePerformanceTests.yml

@@ -48,12 +48,12 @@ jobs:
           git fetch origin "$BASELINE_BRANCH" --no-tags --depth=1
           git switch "$BASELINE_BRANCH"
           npm install --force
-          npx reassure --baseline
+          NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
           git switch --force --detach -
           git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours
           git checkout --ours .
           npm install --force
-          npx reassure --branch
+          NODE_OPTIONS=--experimental-vm-modules npx reassure --branch
 
       - name: Validate output.json
         id: validateReassureOutput

.github/workflows/sendReassurePerfData.yml

@@ -25,7 +25,7 @@ jobs:
         shell: bash
         run: |
           set -e
-          npx reassure --baseline
+          NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
 
       - name: Get merged pull request
         id: getMergedPullRequest

.github/workflows/typecheck.yml

@@ -34,7 +34,7 @@ jobs:
           #    - git diff is used to see the files that were added on this branch
           #    - gh pr view is used to list files touched by this PR. Git diff may give false positives if the branch isn't up-to-date with main
           #  - wc counts the words in the result of the intersection
-          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'workflow_tests/*.js' '.github/libs/*.js' '.github/scripts/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
+          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'workflow_tests/*.js' '.github/libs/*.js' '.github/scripts/*.js' ':!src/libs/SearchParser/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
           if [ "$count_new_js" -gt "0" ]; then
             echo "ERROR: Found new JavaScript files in the project; use TypeScript instead."
             exit 1

.prettierignore

@@ -19,3 +19,6 @@ package-lock.json
 src/libs/E2E/reactNativeLaunchingTest.ts
 # Temporary while we keep react-compiler in our repo
 lib/**
+
+# Automatically generated files
+src/libs/SearchParser/searchParser.js

.prettierrc.js

@@ -6,6 +6,7 @@ module.exports = {
     arrowParens: 'always',
     printWidth: 190,
     singleAttributePerLine: true,
+    plugins: [require.resolve('@trivago/prettier-plugin-sort-imports')],
     /** `importOrder` should be defined in an alphabetical order. */
     importOrder: [
         '@assets/(.*)$',

__mocks__/@react-navigation/native/index.ts

@@ -1,9 +1,65 @@
-import {useIsFocused as realUseIsFocused, useTheme as realUseTheme} from '@react-navigation/native';
+/* eslint-disable import/prefer-default-export, import/no-import-module-exports */
+import type * as ReactNavigation from '@react-navigation/native';
+import createAddListenerMock from '../../../tests/utils/createAddListenerMock';
 
-// We only want these mocked for storybook, not jest
-const useIsFocused: typeof realUseIsFocused = process.env.NODE_ENV === 'test' ? realUseIsFocused : () => true;
+const isJestEnv = process.env.NODE_ENV === 'test';
 
-const useTheme = process.env.NODE_ENV === 'test' ? realUseTheme : () => ({});
+const realReactNavigation = isJestEnv ? jest.requireActual<typeof ReactNavigation>('@react-navigation/native') : (require('@react-navigation/native') as typeof ReactNavigation);
+
+const useIsFocused = isJestEnv ? realReactNavigation.useIsFocused : () => true;
+const useTheme = isJestEnv ? realReactNavigation.useTheme : () => ({});
+
+const {triggerTransitionEnd, addListener} = isJestEnv
+    ? createAddListenerMock()
+    : {
+          triggerTransitionEnd: () => {},
+          addListener: () => {},
+      };
+
+const useNavigation = () => ({
+    ...realReactNavigation.useNavigation,
+    navigate: jest.fn(),
+    getState: () => ({
+        routes: [],
+    }),
+    addListener,
+});
+
+type NativeNavigationMock = typeof ReactNavigation & {
+    triggerTransitionEnd: () => void;
+};
 
 export * from '@react-navigation/core';
-export {useIsFocused, useTheme};
+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;
+export {
+    // Overriden modules
+    useIsFocused,
+    useTheme,
+    useNavigation,
+    triggerTransitionEnd,
+
+    // Theme modules are left alone
+    Link,
+    LinkingContext,
+    NavigationContainer,
+    ServerContainer,
+    DarkTheme,
+    DefaultTheme,
+    ThemeProvider,
+    useLinkBuilder,
+    useLinkProps,
+    useLinkTo,
+    useScrollToTop,
+};
+
+export type {NativeNavigationMock};

__mocks__/@ua/react-native-airship.ts

@@ -15,31 +15,31 @@ const iOS: Partial<typeof AirshipIOS> = {
     },
 };
 
-const pushIOS: AirshipPushIOS = jest.fn().mockImplementation(() => ({
+const pushIOS = jest.fn().mockImplementation(() => ({
     setBadgeNumber: jest.fn(),
     setForegroundPresentationOptions: jest.fn(),
     setForegroundPresentationOptionsCallback: jest.fn(),
-}))();
+}))() as AirshipPushIOS;
 
-const pushAndroid: AirshipPushAndroid = jest.fn().mockImplementation(() => ({
+const pushAndroid = jest.fn().mockImplementation(() => ({
     setForegroundDisplayPredicate: jest.fn(),
-}))();
+}))() as AirshipPushAndroid;
 
-const push: AirshipPush = jest.fn().mockImplementation(() => ({
+const push = jest.fn().mockImplementation(() => ({
     iOS: pushIOS,
     android: pushAndroid,
     enableUserNotifications: () => Promise.resolve(false),
     clearNotifications: jest.fn(),
     getNotificationStatus: () => Promise.resolve({airshipOptIn: false, systemEnabled: false, airshipEnabled: false}),
     getActiveNotifications: () => Promise.resolve([]),
-}))();
+}))() as AirshipPush;
 
-const contact: AirshipContact = jest.fn().mockImplementation(() => ({
+const contact = jest.fn().mockImplementation(() => ({
     identify: jest.fn(),
     getNamedUserId: () => Promise.resolve(undefined),
     reset: jest.fn(),
     module: jest.fn(),
-}))();
+}))() as AirshipContact;
 
 const Airship: Partial<AirshipRoot> = {
     addListener: jest.fn(),

__mocks__/fs.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 const {fs} = require('memfs');
 
 module.exports = fs;

__mocks__/react-native.ts

@@ -41,7 +41,7 @@ jest.doMock('react-native', () => {
         };
     };
 
-    const reactNativeMock: ReactNativeMock = Object.setPrototypeOf(
+    const reactNativeMock = Object.setPrototypeOf(
         {
             NativeModules: {
                 ...ReactNative.NativeModules,
@@ -86,7 +86,7 @@ jest.doMock('react-native', () => {
             },
             Dimensions: {
                 ...ReactNative.Dimensions,
-                addEventListener: jest.fn(),
+                addEventListener: jest.fn(() => ({remove: jest.fn()})),
                 get: () => dimensions,
                 set: (newDimensions: Record<string, number>) => {
                     dimensions = newDimensions;
@@ -98,11 +98,14 @@ jest.doMock('react-native', () => {
             // so it seems easier to just run the callback immediately in tests.
             InteractionManager: {
                 ...ReactNative.InteractionManager,
-                runAfterInteractions: (callback: () => void) => callback(),
+                runAfterInteractions: (callback: () => void) => {
+                    callback();
+                    return {cancel: () => {}};
+                },
             },
         },
         ReactNative,
-    );
+    ) as ReactNativeMock;
 
     return reactNativeMock;
 });

android/app/build.gradle

@@ -15,6 +15,7 @@ fullstory {
     org 'o-1WN56P-na1'
     enabledVariants 'all'
     logcatLevel 'debug'
+    recordOnStart false
 }
 
 react {
@@ -107,8 +108,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009000302
-        versionName "9.0.3-2"
+        versionCode 1009000602
+        versionName "9.0.6-2"
         // 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"