Merge branch 'main' into korytko/display-sender-avatar-next-to-preview

Author: JakubKorytko

.eslintrc.js

@@ -100,6 +100,11 @@ const restrictedImportPaths = [
         name: 'react-native-animatable',
         message: "Please use 'react-native-reanimated' instead.",
     },
+    {
+        name: 'react-native-onyx',
+        importNames: ['useOnyx'],
+        message: "Please use '@hooks/useOnyx' instead.",
+    },
 ];
 
 const restrictedImportPatterns = [

.github/workflows/reassurePerformanceTests.yml

@@ -48,9 +48,17 @@ jobs:
           BASELINE_BRANCH=${BASELINE_BRANCH:="main"}
           git fetch origin "$BASELINE_BRANCH" --no-tags --depth=1
           git switch "$BASELINE_BRANCH"
+          cd Mobile-Expensify
+          git checkout "$(git rev-parse HEAD)"
+          cd ..
+          git add Mobile-Expensify
           npm install --force || (rm -rf node_modules && npm install --force) 
           NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
           git switch --force --detach -
+          cd Mobile-Expensify
+          git checkout "$(git rev-parse HEAD)"
+          cd ..
+          git add Mobile-Expensify
           git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours
           git checkout --ours .
           npm install --force || (rm -rf node_modules && npm install --force)

Mobile-Expensify

@@ -6,13 +6,6 @@ enum EventType {
     PushReceived = 'com.airship.push_received',
 }
 
-// eslint-disable-next-line no-restricted-syntax
-enum PermissionStatus {
-    Granted = 'granted',
-    Denied = 'denied',
-    NotDetermined = 'not_determined',
-}
-
 // eslint-disable-next-line @typescript-eslint/no-namespace
 namespace iOS {
     /**
@@ -78,4 +71,4 @@ const Airship: Partial<AirshipRoot> = {
 
 export default Airship;
 
-export {EventType, iOS, PermissionStatus};
+export {EventType, iOS};

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

@@ -5,6 +5,7 @@
 
 /* eslint-disable rulesdir/prefer-onyx-connect-in-libs */
 import type {ConnectOptions, OnyxKey} from 'react-native-onyx';
+// eslint-disable-next-line no-restricted-imports
 import Onyx, {useOnyx, withOnyx} from 'react-native-onyx';
 
 let connectCallbackDelay = 0;

__mocks__/react-native-onyx.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017402
-        versionName "9.1.74-2"
+        versionCode 1009017600
+        versionName "9.1.76-0"
         // 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"