Merge branch 'main' into ts-migration/tests-g7

# Conflicts:
#	src/libs/E2E/client.ts

.eslintignore

@@ -1,4 +1,5 @@
 **/node_modules/*
 **/dist/*
+android/**/build/*
 .github/actions/**/index.js"
 docs/vendor/**

.eslintrc.js

@@ -72,8 +72,8 @@ const restrictedImportPatterns = [
 ];
 
 module.exports = {
-    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'plugin:react-native-a11y/basic', 'plugin:@dword-design/import-alias/recommended', 'prettier'],
-    plugins: ['react-hooks', 'react-native-a11y'],
+    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-native-a11y/basic', 'plugin:@dword-design/import-alias/recommended', 'prettier'],
+    plugins: ['react-native-a11y'],
     parser: 'babel-eslint',
     ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', 'node_modules/.cache/**', '.git/**'],
     env: {
@@ -87,6 +87,7 @@ module.exports = {
             files: ['*.js', '*.jsx', '*.ts', '*.tsx'],
             plugins: ['react'],
             rules: {
+                'prefer-regex-literals': 'off',
                 'rulesdir/no-multiple-onyx-in-file': 'off',
                 'rulesdir/onyx-props-must-have-default': 'off',
                 'react-native-a11y/has-accessibility-hint': ['off'],
@@ -112,6 +113,7 @@ module.exports = {
                             '@styles': './src/styles',
                             // This path is provide alias for files like `ONYXKEYS` and `CONST`.
                             '@src': './src',
+                            '@desktop': './desktop',
                         },
                     },
                 ],

.github/workflows/platformDeploy.yml

@@ -198,7 +198,7 @@ jobs:
         id: pods-cache
         with:
           path: ios/Pods
-          key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock') }}
+          key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock', 'firebase.json') }}
           restore-keys: ${{ runner.os }}-pods-cache-
 
       - name: Compare Podfile.lock and Manifest.lock

.github/workflows/testBuild.yml

@@ -154,6 +154,7 @@ jobs:
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
       - name: Setup Node
+        id: setup-node
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup XCode
@@ -170,7 +171,7 @@ jobs:
         id: pods-cache
         with:
           path: ios/Pods
-          key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock') }}
+          key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock', 'firebase.json') }}
           restore-keys: ${{ runner.os }}-pods-cache-
 
       - name: Compare Podfile.lock and Manifest.lock
@@ -179,7 +180,7 @@ jobs:
 
       - name: Install cocoapods
         uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
-        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true'
+        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true' || steps.setup-node.outputs.cache-hit != 'true'
         with:
           timeout_minutes: 10
           max_attempts: 5

.prettierrc.js

@@ -6,7 +6,20 @@ module.exports = {
     arrowParens: 'always',
     printWidth: 190,
     singleAttributePerLine: true,
-    importOrder: ['@assets/(.*)$', '@components/(.*)$', '@hooks/(.*)$', '@libs/(.*)$', '@navigation/(.*)$', '@pages/(.*)$', '@styles/(.*)$', '@userActions/(.*)$', '@src/(.*)$', '^[./]'],
+    /** `importOrder` should be defined in an alphabetical order. */
+    importOrder: [
+        '@assets/(.*)$',
+        '@components/(.*)$',
+        '@desktop/(.*)$',
+        '@hooks/(.*)$',
+        '@libs/(.*)$',
+        '@navigation/(.*)$',
+        '@pages/(.*)$',
+        '@styles/(.*)$',
+        '@userActions/(.*)$',
+        '@src/(.*)$',
+        '^[./]',
+    ],
     importOrderSortSpecifiers: true,
     importOrderCaseInsensitive: true,
 };

__mocks__/react-native-localize.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-import-module-exports
 import mockRNLocalize from 'react-native-localize/mock';
 
 module.exports = mockRNLocalize;

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

@@ -1,6 +1,8 @@
+import type {View as RNView} from 'react-native';
+
 jest.mock('react-native-webview', () => {
     const {View} = require('react-native');
     return {
-        WebView: () => View,
+        WebView: () => View as RNView,
     };
 });

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001044401
-        versionName "1.4.44-1"
+        versionCode 1001044600
+        versionName "1.4.46-0"
     }
 
     flavorDimensions "default"