diff --git a/android/app/src/main/java/me/rainbow/MainActivity.kt b/android/app/src/main/java/me/rainbow/MainActivity.kt index 6d3ffcc3f98..76afa93e4a9 100644 --- a/android/app/src/main/java/me/rainbow/MainActivity.kt +++ b/android/app/src/main/java/me/rainbow/MainActivity.kt @@ -7,6 +7,7 @@ import android.webkit.WebView import com.facebook.react.ReactActivity import com.facebook.react.ReactActivityDelegate import com.facebook.react.modules.network.OkHttpClientProvider +import com.swmansion.rnscreens.fragment.restoration.RNScreensFragmentFactory import com.zoontek.rnbootsplash.RNBootSplash import io.branch.rnbranch.RNBranchModule import me.rainbow.NativeModules.Internals.CustomNetworkModule @@ -18,7 +19,8 @@ class MainActivity : ReactActivity() { if (!isE2ETest) { RNBootSplash.init(this, R.style.BootTheme) // Initialize the splash screen } - super.onCreate(null) // Pass null here as required by react-native-screens + supportFragmentManager.fragmentFactory = RNScreensFragmentFactory() + super.onCreate(savedInstanceState) OkHttpClientProvider.setOkHttpClientFactory(CustomNetworkModule()) WebView.setWebContentsDebuggingEnabled(false) } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0b4d0176619..20ac9f2e655 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2658,7 +2658,7 @@ PODS: - RNRudderSdk (2.0.0): - React - Rudder (< 2.0.0, >= 1.31.0) - - RNScreens (4.10.0): + - RNScreens (4.16.0): - DoubleConversion - glog - hermes-engine @@ -3443,7 +3443,7 @@ SPEC CHECKSUMS: react-native-screen-corner-radius: ebd0d3258fcc894571b41d25ee3db7569d375153 react-native-skia: 3467bce4be38029a4af437022b88a45e68f4210e react-native-text-input-mask: b83b8b571cba4bf18fb9b7a0bb8319a14201db9e - react-native-udp: 33844c2b4a0430271e46cd069a6152cc4c482095 + react-native-udp: afd81d997ff141501da6ac680667fd8319545da1 react-native-version-number: 3d74b5224ca4e1032b1593937d86d3f3c94bf95c react-native-video: 9c4c3eae02d1582907c5262f90bf8194ec1b6683 react-native-view-shot: 44e13d0424a6b0375eae31d89e161fc1153512e5 @@ -3503,7 +3503,7 @@ SPEC CHECKSUMS: RNPermissions: bd0d9ca7969ff7b999aa605ee2e5919c12522bfe RNReanimated: 3e727b205ad6d3d48f9f5b07887ebefb4b20e9a4 RNRudderSdk: cea1f6a95ceab29ceaf75bdadccba5f78121a4ce - RNScreens: 586139d98cad59cc4c56443b9bd5c8b9b0b6da0e + RNScreens: 0cba9551497bcf6ceaa75878c08f5cb9a2fac6a4 RNSentry: 5903eefdcd6446708f27c2a7035f019b59d54a9a RNShare: e374836177ff2675dbc659f2e52a59bf6060d200 RNSound: 314cc5226453ef4a3314a196c65e8a65e5106a7b diff --git a/package.json b/package.json index 16f9e4c1a73..4ef946998d9 100644 --- a/package.json +++ b/package.json @@ -324,7 +324,7 @@ "react-native-restart": "0.0.22", "react-native-safe-area-context": "5.4.0", "react-native-screen-corner-radius": "0.2.3", - "react-native-screens": "4.10.0", + "react-native-screens": "4.16.0", "react-native-share": "12.2.5", "react-native-sound": "0.11.2", "react-native-storage": "1.0.1", diff --git a/yarn.lock b/yarn.lock index b2f8bee407e..4c5e9043523 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9755,7 +9755,7 @@ __metadata: react-native-restart: "npm:0.0.22" react-native-safe-area-context: "npm:5.4.0" react-native-screen-corner-radius: "npm:0.2.3" - react-native-screens: "npm:4.10.0" + react-native-screens: "npm:4.16.0" react-native-share: "npm:12.2.5" react-native-sound: "npm:0.11.2" react-native-storage: "npm:1.0.1" @@ -23272,16 +23272,17 @@ __metadata: languageName: node linkType: hard -"react-native-screens@npm:4.10.0": - version: 4.10.0 - resolution: "react-native-screens@npm:4.10.0" +"react-native-screens@npm:4.16.0": + version: 4.16.0 + resolution: "react-native-screens@npm:4.16.0" dependencies: react-freeze: "npm:^1.0.0" + react-native-is-edge-to-edge: "npm:^1.2.1" warn-once: "npm:^0.1.0" peerDependencies: react: "*" react-native: "*" - checksum: 10c0/09d1f55431b85e556ef7b5efd776ac5e85303e47d9138f910cb8c25ff3804effc43185f84e8842bcae2219e8fee12366b3725f955f638c109387efb82e0260f3 + checksum: 10c0/8ec459ff52cbd317bfca598843a0010b4ca9070d05664f28d792594d8ceabb398b9d68abb578f40295e41f906308efe7ac7359046fba7aaf318a0d9d65446102 languageName: node linkType: hard