resolve conflicts

.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/ISSUE_TEMPLATE/NewLibraryRequest.md

@@ -5,6 +5,8 @@ labels: Weekly, AutoAssignerAppLibraryReview
 ---
 In order to properly evaluate if a new library can be added to `package.json`, please fill out this request form. It will be automatically assigned someone from our review team that will go through and vet the library.
 
+*In order to add any new production dependency, it must be approved by the App Deployer team. They will evaluate the library and decide if it's something we want to move forward with or if other alternatives should be explored.*
+
 Note: This is only for production dependencies. While we don't want people to add packages to dev-dependencies willy-nilly, we recognize that there isn't as great of a need there to secure them.
 
 # Name of library:

.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 1001044318
-        versionName "1.4.43-18"
+        versionCode 1001044407
+        versionName "1.4.44-7"
     }
 
     flavorDimensions "default"

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

@@ -15,6 +15,8 @@
 import android.graphics.PorterDuff.Mode;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
+import android.media.AudioAttributes;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.service.notification.StatusBarNotification;
@@ -31,6 +33,7 @@
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.versionedparcelable.ParcelUtils;
 
+import com.expensify.chat.R;
 import com.urbanairship.AirshipConfigOptions;
 import com.urbanairship.json.JsonMap;
 import com.urbanairship.json.JsonValue;
@@ -105,6 +108,9 @@ protected NotificationCompat.Builder onExtendBuilder(@NonNull Context context, @
             builder.setChannelId(CHANNEL_MESSAGES_ID);
         } else {
             builder.setPriority(PRIORITY_MAX);
+            // Set sound for versions below Oreo
+            // for Oreo and above we set sound on the notification's channel level
+            builder.setSound(getSoundFile(context));
         }
 
         // Attempt to parse data and apply custom notification styling
@@ -130,6 +136,13 @@ private void createAndRegisterNotificationChannel(@NonNull Context context) {
         NotificationChannelGroup channelGroup = new NotificationChannelGroup(NOTIFICATION_GROUP_CHATS, CHANNEL_GROUP_NAME);
         NotificationChannel channel = new NotificationChannel(CHANNEL_MESSAGES_ID, CHANNEL_MESSAGES_NAME, NotificationManager.IMPORTANCE_HIGH);
 
+        AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                .setUsage(AudioAttributes.USAGE_NOTIFICATION)
+                .build();
+
+        channel.setSound(getSoundFile(context), audioAttributes);
+
         NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
         notificationManager.createNotificationChannelGroup(channelGroup);
         notificationManager.createNotificationChannel(channel);
@@ -333,4 +346,8 @@ private Bitmap fetchIcon(@NonNull Context context, String urlString) {
 
         return null;
     }
+
+    private Uri getSoundFile(Context context) {
+        return Uri.parse("android.resource://" + context.getPackageName() + "/" + R.raw.receive);
+    }
 }

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

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.43</string>
+	<string>1.4.44</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.43.18</string>
+	<string>1.4.44.7</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.43</string>
+	<string>1.4.44</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.43.18</string>
+	<string>1.4.44.7</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.43</string>
+	<string>1.4.44</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.43.18</string>
+	<string>1.4.44.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/NotificationService.swift

@@ -24,6 +24,8 @@ class NotificationService: UANotificationServiceExtension {
       return
     }
 
+    bestAttemptContent.sound = UNNotificationSound(named: UNNotificationSoundName("receive.mp3"))
+
     if #available(iOSApplicationExtension 15.0, *) {
       configureCommunicationNotification(notificationContent: bestAttemptContent, contentHandler: contentHandler)
     } else {

ios/Podfile.lock

@@ -1163,9 +1163,7 @@ PODS:
     - React-Core
   - react-native-blob-util (0.19.4):
     - React-Core
-  - react-native-cameraroll (7.4.0):
-    - glog
-    - RCT-Folly (= 2022.05.16.00)
+  - react-native-cameraroll (5.4.0):
     - React-Core
   - react-native-config (1.4.6):
     - react-native-config/App (= 1.4.6)
@@ -1931,7 +1929,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 9ee041e1d7be96da6d76a251f92e72b711c651d6
   react-native-airship: 6ded22e4ca54f2f80db80b7b911c2b9b696d9335
   react-native-blob-util: 30a6c9fd067aadf9177e61a998f2c7efb670598d
-  react-native-cameraroll: 3301d62d45616ee9da55ceed04be8d788c3de3ef
+  react-native-cameraroll: 8ffb0af7a5e5de225fd667610e2979fc1f0c2151
   react-native-config: 7cd105e71d903104e8919261480858940a6b9c0e
   react-native-document-picker: 3599b238843369026201d2ef466df53f77ae0452
   react-native-geolocation: 0f7fe8a4c2de477e278b0365cce27d089a8c5903

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(),
 }));