Merge branch 'Expensify:main' into krishna2323/issue/37236

.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 1001044400
-        versionName "1.4.44-0"
+        versionCode 1001044412
+        versionName "1.4.44-12"
     }
 
     flavorDimensions "default"

babel.config.js

@@ -68,6 +68,7 @@ const metro = {
                     // This path is provide alias for files like `ONYXKEYS` and `CONST`.
                     '@src': './src',
                     '@userActions': './src/libs/actions',
+                    '@desktop': './desktop',
                 },
             },
         ],

config/webpack/webpack.common.js

@@ -219,6 +219,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
             // This path is provide alias for files like `ONYXKEYS` and `CONST`.
             '@src': path.resolve(__dirname, '../../src/'),
             '@userActions': path.resolve(__dirname, '../../src/libs/actions/'),
+            '@desktop': path.resolve(__dirname, '../../desktop'),
         },
 
         // React Native libraries may have web-specific module implementations that appear with the extension `.web.js`

docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md

@@ -81,7 +81,7 @@ Follow the below steps to run reconciliation on the Expensify Card settlements:
     - Entry ID: a unique number grouping card payments and transactions settled by those payments
     - Amount: the amount debited from the Business Bank Account for payments
     - Merchant: the business where a purchase was made
-    - Card: refers to the Expensify credit card number and cardholder's email address
+    - Card: refers to the Expensify Card number and cardholder's email address
     - Business Account: the business bank account connected to Expensify that the settlement is paid from
     - Transaction ID: a special ID that helps Expensify support locate transactions if there's an issue
 

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.44.0</string>
+	<string>1.4.44.12</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.44.0</string>
+	<string>1.4.44.12</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.44</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.44.0</string>
+	<string>1.4.44.12</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/Podfile.lock

@@ -1432,7 +1432,7 @@ PODS:
     - React-Core
   - RNReactNativeHapticFeedback (2.2.0):
     - React-Core
-  - RNReanimated (3.6.1):
+  - RNReanimated (3.7.1):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1986,7 +1986,7 @@ SPEC CHECKSUMS:
   rnmapbox-maps: fcf7f1cbdc8bd7569c267d07284e8a5c7bee06ed
   RNPermissions: 9b086c8f05b2e2faa587fdc31f4c5ab4509728aa
   RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9
-  RNReanimated: 57f436e7aa3d277fbfed05e003230b43428157c0
+  RNReanimated: beb07f7f900543928467da8107c175d1e57a1049
   RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2
   RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
   RNSVG: ba3e7232f45e34b7b47e74472386cf4e1a676d0a

jest/setup.ts

@@ -31,7 +31,12 @@ jest.spyOn(console, 'debug').mockImplementation((...params) => {
 
 // This mock is required for mocking file systems when running tests
 jest.mock('react-native-fs', () => ({
-    unlink: jest.fn(() => new Promise<void>((res) => res())),
+    unlink: jest.fn(
+        () =>
+            new Promise<void>((res) => {
+                res();
+            }),
+    ),
     CachesDirectoryPath: jest.fn(),
 }));