Merge branch 'main' into fix/64065-composer-not-refocused-after-add-emoji

Author: bernhardoj

.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 = [
@@ -225,6 +230,7 @@ module.exports = {
         'rulesdir/no-multiple-onyx-in-file': 'off',
         'rulesdir/prefer-underscore-method': 'off',
         'rulesdir/prefer-import-module-contents': 'off',
+        'rulesdir/no-beta-handler': 'error',
 
         // React and React Native specific rules
         'react-native-a11y/has-accessibility-hint': ['off'],

.github/workflows/publishReactNativeAndroidArtifacts.yml

@@ -18,6 +18,8 @@ on:
       - package.json
       - patches/react-native+*.patch
       - patches/@react-native+*.patch
+      - patches/react-native/react-native+*.patch
+      - patches/react-native/@react-native+*.patch
       - Mobile-Expensify
 
 jobs:

Mobile-Expensify

@@ -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

@@ -13,7 +13,7 @@ apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.grad
 /* Fullstory settings */
 fullstory {
     org 'o-1WN56P-na1'
-    enabledVariants 'production'
+    enabledVariants 'all'
     logcatLevel 'debug'
     recordOnStart false
 }
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017409
-        versionName "9.1.74-9"
+        versionCode 1009017800
+        versionName "9.1.78-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"

android/app/build.gradle

@@ -32,7 +32,7 @@ buildscript {
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
         classpath("com.google.firebase:perf-plugin:1.4.1")
         // Fullstory integration
-        classpath ("com.fullstory:gradle-plugin-local:1.52.0")
+        classpath ("com.fullstory:gradle-plugin-local:1.61.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files