Merge pull request #51489 from software-mansion-labs/@wolewicki/rever…

…t-bridgeless fix: revert bridgeless on Android (cherry picked from commit 2db49d4) (CP triggered by Beamanator)
Expensify · Oct 28, 2024 · 180a8b2 · 180a8b2
1 parent b839e66
commit 180a8b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/android/app/src/main/java/com/expensify/chat/MainApplication.kt b/android/app/src/main/java/com/expensify/chat/MainApplication.kt
@@ -64,7 +64,7 @@ class MainApplication : MultiDexApplication(), ReactApplication {
         SoLoader.init(this,  /* native exopackage */false)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // If you opted-in for the New Architecture, we load the native entry point for this app.
-            load()
+            load(bridgelessEnabled = false)
         }
         if (BuildConfig.DEBUG) {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false)

diff --git a/patches/@react-native-firebase+app+12.9.3+002+bridgeless.patch b/patches/@react-native-firebase+app+12.9.3+002+bridgeless.patch
@@ -1,13 +1,13 @@
 diff --git a/node_modules/@react-native-firebase/app/lib/internal/registry/nativeModule.js b/node_modules/@react-native-firebase/app/lib/internal/registry/nativeModule.js
-index 03f001c..23d467d 100644
+index 03f001c..358c795 100644
 --- a/node_modules/@react-native-firebase/app/lib/internal/registry/nativeModule.js
 +++ b/node_modules/@react-native-firebase/app/lib/internal/registry/nativeModule.js
 @@ -65,7 +65,7 @@ function nativeModuleWrapped(namespace, NativeModule, argToPrepend) {
      return NativeModule;
    }
 
 -  const properties = Object.keys(NativeModule);
-+  const properties = Object.keys(Object.getPrototypeOf(NativeModule));
++  const properties = [...Object.keys(Object.getPrototypeOf(NativeModule)), ...Object.keys(NativeModule)];
 
    for (let i = 0, len = properties.length; i < len; i++) {
      const property = properties[i];