[Gekidou] Upgrade to RN 0.70 (#6690)

* Upgrade to RN 0.70 * fix assembleAndroidTest
2022-10-20 10:18:25 -03:00
parent 6b2d8ceff3
commit cae9dc21d2
27 changed files with 3811 additions and 4394 deletions
--- a/.flowconfig
+++ b/.flowconfig
@@ -67,4 +67,4 @@ untyped-import
 untyped-type-import

 [version]
-^0.176.3
+^0.182.0
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,8 @@ ios/.xcode.env.local
 .gradle
 local.properties
 *.iml
+*.hprof
+.cxx/
 android/app/bin
 android/app/build
 android/build
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: 'kotlin-android'
 import com.android.build.OutputFile
+import org.apache.tools.ant.taskdefs.condition.Os

 /**
 * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -151,26 +152,14 @@ android {
        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

        if (isNewArchitectureEnabled()) {
-            // We configure the NDK build only if you decide to opt-in for the New Architecture.
+            // We configure the CMake build only if you decide to opt-in for the New Architecture.
            externalNativeBuild {
-                ndkBuild {
-                    arguments "APP_PLATFORM=android-21",
-                        "APP_STL=c++_shared",
-                        "NDK_TOOLCHAIN_VERSION=clang",
-                        "GENERATED_SRC_DIR=$buildDir/generated/source",
-                        "PROJECT_BUILD_DIR=$buildDir",
-                        "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
-                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
-                        "NODE_MODULES_DIR=$rootDir/../node_modules"
-                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-                    cppFlags "-std=c++17"
-                    // Make sure this target name is the same you specify inside the
-                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
-                    targets "rndiffapp_appmodules"
-                    // Fix for windows limit on number of character in file paths and in command lines
-                    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                        arguments "NDK_APP_SHORT_COMMANDS=true"
-                    }
+                cmake {
+                    arguments "-DPROJECT_BUILD_DIR=$buildDir",
+                        "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+                        "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
+                        "-DNODE_MODULES_DIR=$rootDir/../node_modules",
+                        "-DANDROID_STL=c++_shared"
                }
            }
            if (!enableSeparateBuildPerCPUArchitecture) {
@@ -184,8 +173,8 @@ android {
    if (isNewArchitectureEnabled()) {
        // We configure the NDK build only if you decide to opt-in for the New Architecture.
        externalNativeBuild {
-            ndkBuild {
-                path "$projectDir/src/main/jni/Android.mk"
+            cmake {
+                path "$projectDir/src/main/jni/CMakeLists.txt"
            }
        }
        def reactAndroidProjectDir = project(':ReactAndroid').projectDir
@@ -207,15 +196,15 @@ android {
            preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)

            // Due to a bug inside AGP, we have to explicitly set a dependency
-            // between configureNdkBuild* tasks and the preBuild tasks.
+            // between configureCMakeDebug* tasks and the preBuild tasks.
            // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
-            configureNdkBuildRelease.dependsOn(preReleaseBuild)
-            configureNdkBuildDebug.dependsOn(preDebugBuild)
+            configureCMakeDebugRelease.dependsOn(preReleaseBuild)
+            configureCMakeDebugDebug.dependsOn(preDebugBuild)
            reactNativeArchitectures().each { architecture ->
-                tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+                tasks.findByName("configureCMakeDebugDebug[${architecture}]")?.configure {
                    dependsOn("preDebugBuild")
                }
-                tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+                tasks.findByName("configureCMakeDebugRelease[${architecture}]")?.configure {
                    dependsOn("preReleaseBuild")
                }
            }
--- a/android/app/src/main/jni/Android.mk
+++ b/android/app/src/main/jni/Android.mk
@@ -1,48 +0,0 @@
-THIS_DIR := $(call my-dir)
-
-include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
-
-# If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to include the following autogenerated makefile.
-# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk
-include $(CLEAR_VARS)
-
-LOCAL_PATH := $(THIS_DIR)
-
-# You can customize the name of your application .so file here.
-LOCAL_MODULE := mattermost_appmodules
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-
-# If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to uncomment those lines to include the generated source
-# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
-#
-# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
-# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
-# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
-
-# Here you should add any native library you wish to depend on.
-LOCAL_SHARED_LIBRARIES := \
-  libfabricjni \
-  libfbjni \
-  libfolly_runtime \
-  libglog \
-  libjsi \
-  libreact_codegen_rncore \
-  libreact_debug \
-  libreact_nativemodule_core \
-  libreact_render_componentregistry \
-  libreact_render_core \
-  libreact_render_debug \
-  libreact_render_graphics \
-  librrc_view \
-  libruntimeexecutor \
-  libturbomodulejsijni \
-  libyoga
-
-LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
-
-include $(BUILD_SHARED_LIBRARY)
--- a/android/app/src/main/jni/CMakeLists.txt
+++ b/android/app/src/main/jni/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.13)
+
+# Define the library name here.
+project(rndiffapp_appmodules)
+
+# This file includes all the necessary to let you build your application with the New Architecture.
+include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)
--- a/android/app/src/main/jni/MainApplicationModuleProvider.cpp
+++ b/android/app/src/main/jni/MainApplicationModuleProvider.cpp
@@ -1,12 +1,13 @@
 #include "MainApplicationModuleProvider.h"

+#include <rncli.h>
 #include <rncore.h>

 namespace facebook {
 namespace react {

 std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string moduleName,
+    const std::string &moduleName,
    const JavaTurboModule::InitParams &params) {
  // Here you can provide your own module provider for TurboModules coming from
  // either your application or from external libraries. The approach to follow
@@ -17,6 +18,13 @@ std::shared_ptr<TurboModule> MainApplicationModuleProvider(
  //    return module;
  // }
  // return rncore_ModuleProvider(moduleName, params);
+
+  // Module providers autolinked by RN CLI
+  auto rncli_module = rncli_ModuleProvider(moduleName, params);
+  if (rncli_module != nullptr) {
+    return rncli_module;
+  }
+
  return rncore_ModuleProvider(moduleName, params);
 }

--- a/android/app/src/main/jni/MainApplicationModuleProvider.h
+++ b/android/app/src/main/jni/MainApplicationModuleProvider.h
@@ -9,7 +9,7 @@ namespace facebook {
 namespace react {

 std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string moduleName,
+    const std::string &moduleName,
    const JavaTurboModule::InitParams &params);

 } // namespace react
--- a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
+++ b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
@@ -22,24 +22,24 @@ void MainApplicationTurboModuleManagerDelegate::registerNatives() {

 std::shared_ptr<TurboModule>
 MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string name,
-    const std::shared_ptr<CallInvoker> jsInvoker) {
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
  // Not implemented yet: provide pure-C++ NativeModules here.
  return nullptr;
 }

 std::shared_ptr<TurboModule>
 MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string name,
+    const std::string &name,
    const JavaTurboModule::InitParams &params) {
  return MainApplicationModuleProvider(name, params);
 }

 bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
-    std::string name) {
+    const std::string &name) {
  return getTurboModule(name, nullptr) != nullptr ||
      getTurboModule(name, {.moduleName = name}) != nullptr;
 }

 } // namespace react
-} // namespace facebook
+} // namespace facebook
--- a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
+++ b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
@@ -14,25 +14,25 @@ class MainApplicationTurboModuleManagerDelegate
 public:
  // Adapt it to the package you used for your Java class.
  static constexpr auto kJavaDescriptor =
-      "Lcom/mattermost/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
+      "Lcom/rndiffapp/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";

  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);

  static void registerNatives();

  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string name,
-      const std::shared_ptr<CallInvoker> jsInvoker) override;
+      const std::string &name,
+      const std::shared_ptr<CallInvoker> &jsInvoker) override;
  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string name,
+      const std::string &name,
      const JavaTurboModule::InitParams &params) override;

  /**
   * Test-only method. Allows user to verify whether a TurboModule can be
   * created by instances of this class.
   */
-  bool canCreateTurboModule(std::string name);
+  bool canCreateTurboModule(const std::string &name);
 };

 } // namespace react
-} // namespace facebook
+} // namespace facebook
--- a/android/app/src/main/jni/MainComponentsRegistry.cpp
+++ b/android/app/src/main/jni/MainComponentsRegistry.cpp
@@ -4,6 +4,7 @@
 #include <fbjni/fbjni.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <react/renderer/components/rncore/ComponentDescriptors.h>
+#include <rncli.h>

 namespace facebook {
 namespace react {
@@ -14,6 +15,9 @@ std::shared_ptr<ComponentDescriptorProviderRegistry const>
 MainComponentsRegistry::sharedProviderRegistry() {
  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();

+  // Autolinked providers registered by RN CLI
+  rncli_registerProviders(providerRegistry);
+
  // Custom Fabric Components go here. You can register custom
  // components coming from your App or from 3rd party libraries here.
  //
@@ -58,4 +62,4 @@ void MainComponentsRegistry::registerNatives() {
 }

 } // namespace react
-} // namespace facebook
+} // namespace facebook
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,3 @@
-import org.apache.tools.ant.taskdefs.condition.Os
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 buildscript {
@@ -27,7 +25,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath("com.android.tools.build:gradle:7.1.1")
+        classpath("com.android.tools.build:gradle:7.2.1")
        classpath("com.facebook.react:react-native-gradle-plugin")
        classpath("de.undercouch:gradle-download-task:5.0.1")
        classpath('com.google.gms:google-services:4.3.10')
--- a/android/gradle/wrapper/gradle-wrapper.jar
+++ b/android/gradle/wrapper/gradle-wrapper.jar
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
--- a/detox/package-lock.json
+++ b/detox/package-lock.json
--- a/detox/package.json
+++ b/detox/package.json
@@ -7,28 +7,28 @@
    "@babel/plugin-proposal-class-properties": "7.18.6",
    "@babel/plugin-transform-modules-commonjs": "7.18.6",
    "@babel/plugin-transform-runtime": "7.19.1",
-    "@babel/preset-env": "7.19.3",
-    "@jest/test-sequencer": "29.1.2",
-    "@types/jest": "29.1.1",
+    "@babel/preset-env": "7.19.4",
+    "@jest/test-sequencer": "29.2.0",
+    "@types/jest": "29.1.2",
    "@types/tough-cookie": "4.0.2",
    "@types/uuid": "8.3.4",
-    "aws-sdk": "2.1230.0",
-    "axios": "1.0.0",
+    "aws-sdk": "2.1233.0",
+    "axios": "1.1.2",
    "axios-cookiejar-support": "4.0.3",
-    "babel-jest": "29.1.2",
+    "babel-jest": "29.2.0",
    "babel-plugin-module-resolver": "4.1.0",
    "client-oauth2": "4.3.3",
    "deepmerge": "4.2.2",
-    "detox": "19.12.5",
+    "detox": "19.12.6",
    "form-data": "4.0.0",
-    "jest": "29.1.2",
-    "jest-circus": "29.1.2",
-    "jest-cli": "29.1.2",
+    "jest": "29.2.0",
+    "jest-circus": "29.2.0",
+    "jest-cli": "29.2.0",
    "jest-html-reporters": "3.0.11",
    "jest-junit": "14.0.1",
    "jest-stare": "2.4.1",
    "junit-report-merger": "4.0.0",
-    "moment-timezone": "0.5.37",
+    "moment-timezone": "0.5.38",
    "recursive-readdir": "2.2.2",
    "sanitize-filename": "1.6.3",
    "shelljs": "0.8.5",
--- a/index.ts
+++ b/index.ts
@@ -6,6 +6,7 @@ import {DeviceEventEmitter, LogBox} from 'react-native';
 import {RUNNING_E2E} from 'react-native-dotenv';
 import 'react-native-gesture-handler';
 import {ComponentDidAppearEvent, ComponentDidDisappearEvent, ModalDismissedEvent, Navigation, ScreenPoppedEvent} from 'react-native-navigation';
+import ViewReactNativeStyleAttributes from 'react-native/Libraries/Components/View/ReactNativeStyleAttributes';

 import {Events, Screens} from './app/constants';
 import {OVERLAY_SCREENS} from './app/constants/screens';
@@ -25,6 +26,9 @@ import {logInfo} from './app/utils/log';

 declare const global: { HermesInternal: null | {} };

+// Add scaleY back to work around its removal in React Native 0.70.
+ViewReactNativeStyleAttributes.scaleY = true;
+
 TurboLogger.configure({
    dailyRolling: false,
    logToFile: !__DEV__,
--- a/ios/Mattermost/AppDelegate.mm
+++ b/ios/Mattermost/AppDelegate.mm
@@ -71,38 +71,32 @@ NSString* const NOTIFICATION_TEST_ACTION = @"test";
    [[NSUserDefaults standardUserDefaults] synchronize];
  }

-  [ReactNativeNavigation bootstrapWithDelegate:self launchOptions:launchOptions];
-
  [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error: nil];

  [RNNotifications startMonitorNotifications];

+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  if (@available(iOS 13.0, *)) {
+     self.window.backgroundColor = [UIColor systemBackgroundColor];
+  } else {
+     self.window.backgroundColor = [UIColor whiteColor];
+  }
+  [self.window makeKeyWindow];
+
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+
+  #if RCT_NEW_ARCH_ENABLED
+   _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
+   _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
+   _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
+   _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
+   bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
+  #endif
+
+  [ReactNativeNavigation bootstrapWithBridge:bridge];
+
  os_log(OS_LOG_DEFAULT, "Mattermost started!!");

-  // New Architecture
-  //  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
-  //  #if RCT_NEW_ARCH_ENABLED
-  //    _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
-  //    _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
-  //    _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
-  //    _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
-  //    bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
-  //  #endif
-  //
-  //  NSDictionary *initProps = [self prepareInitialProps];
-  //  UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"Mattermost", initProps);
-  //    if (@available(iOS 13.0, *)) {
-  //      rootView.backgroundColor = [UIColor systemBackgroundColor];
-  //    } else {
-  //      rootView.backgroundColor = [UIColor whiteColor];
-  //    }
-  //    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  //    UIViewController *rootViewController = [UIViewController new];
-  //    rootViewController.view = rootView;
-  //    self.window.rootViewController = rootViewController;
-  //    [self.window makeKeyAndVisible];
-
-
  return YES;
 }

--- a/ios/Podfile
+++ b/ios/Podfile
@@ -4,8 +4,6 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 platform :ios, '12.4'
 install! 'cocoapods', :deterministic_uuids => false

-production = ENV["PRODUCTION"] == "1"
-
 target 'Mattermost' do
  # Pods for Mattermost

@@ -16,10 +14,15 @@ target 'Mattermost' do

  use_react_native!(
    :path => config[:reactNativePath],
-    # to enable hermes on iOS, change `false` to `true` and then install pods
-    :production => production,
+    # Hermes is now enabled by default. Disable by setting this flag to false.
+    # Upcoming versions of React Native may rely on get_default_flags(), but
+    # we make it explicit here to aid in the React Native upgrade process.
    :hermes_enabled => true,
    :fabric_enabled => false,
+    # Enables Flipper.
+    #
+    # Note that if you have use_frameworks! enabled, Flipper will not work and
+    # you should disable the next line.
    :flipper_configuration => FlipperConfiguration.enabled,
    # An absolute path to your application root.
    :app_path => "#{Pod::Config.instance.installation_root}/.."
@@ -38,7 +41,12 @@ target 'Mattermost' do
 end

 post_install do |installer|
-  react_native_post_install(installer)
+  react_native_post_install(
+    installer,
+    # Set `mac_catalyst_enabled` to `true` in order to apply patches
+    # necessary for Mac Catalyst builds
+    :mac_catalyst_enabled => false
+  )
  __apply_Xcode_12_5_M1_post_install_workaround(installer)

  puts 'Patching Alamofire to include X-Uncompressed-Content-Length to measure download progress'
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Alamofire (5.5.0)
+  - Alamofire (5.6.2)
  - boost (1.76.0)
  - BVLinearGradient (2.6.2):
    - React-Core
@@ -8,14 +8,14 @@ PODS:
    - CocoaLumberjack/Core (= 3.7.4)
  - CocoaLumberjack/Core (3.7.4)
  - DoubleConversion (1.1.6)
-  - FBLazyVector (0.69.3)
-  - FBReactNativeSpec (0.69.3):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.69.3)
-    - RCTTypeSafety (= 0.69.3)
-    - React-Core (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
+  - FBLazyVector (0.70.3)
+  - FBReactNativeSpec (0.70.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTRequired (= 0.70.3)
+    - RCTTypeSafety (= 0.70.3)
+    - React-Core (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
  - Flipper (0.125.0):
    - Flipper-Folly (~> 2.6)
    - Flipper-RSocket (~> 1.4)
@@ -79,20 +79,20 @@ PODS:
    - FlipperKit/FlipperKitNetworkPlugin
  - fmt (6.2.1)
  - glog (0.3.5)
-  - hermes-engine (0.69.3)
+  - hermes-engine (0.70.3)
  - HMSegmentedControl (1.5.6)
  - jail-monkey (2.7.0):
    - React-Core
  - libevent (2.1.12)
-  - libwebp (1.2.1):
-    - libwebp/demux (= 1.2.1)
-    - libwebp/mux (= 1.2.1)
-    - libwebp/webp (= 1.2.1)
-  - libwebp/demux (1.2.1):
+  - libwebp (1.2.3):
+    - libwebp/demux (= 1.2.3)
+    - libwebp/mux (= 1.2.3)
+    - libwebp/webp (= 1.2.3)
+  - libwebp/demux (1.2.3):
    - libwebp/webp
-  - libwebp/mux (1.2.1):
+  - libwebp/mux (1.2.3):
    - libwebp/demux
-  - libwebp/webp (1.2.1)
+  - libwebp/webp (1.2.3)
  - mattermost-react-native-turbo-log (0.2.0):
    - CocoaLumberjack
    - React-Core
@@ -103,241 +103,241 @@ PODS:
    - RNPermissions
  - Permission-PhotoLibrary (3.6.1):
    - RNPermissions
-  - RCT-Folly (2021.06.28.00-v2):
+  - RCT-Folly (2021.07.22.00):
    - boost
    - DoubleConversion
    - fmt (~> 6.2.1)
    - glog
-    - RCT-Folly/Default (= 2021.06.28.00-v2)
-  - RCT-Folly/Default (2021.06.28.00-v2):
+    - RCT-Folly/Default (= 2021.07.22.00)
+  - RCT-Folly/Default (2021.07.22.00):
    - boost
    - DoubleConversion
    - fmt (~> 6.2.1)
    - glog
-  - RCT-Folly/Futures (2021.06.28.00-v2):
+  - RCT-Folly/Futures (2021.07.22.00):
    - boost
    - DoubleConversion
    - fmt (~> 6.2.1)
    - glog
    - libevent
-  - RCTRequired (0.69.3)
-  - RCTTypeSafety (0.69.3):
-    - FBLazyVector (= 0.69.3)
-    - RCTRequired (= 0.69.3)
-    - React-Core (= 0.69.3)
-  - React (0.69.3):
-    - React-Core (= 0.69.3)
-    - React-Core/DevSupport (= 0.69.3)
-    - React-Core/RCTWebSocket (= 0.69.3)
-    - React-RCTActionSheet (= 0.69.3)
-    - React-RCTAnimation (= 0.69.3)
-    - React-RCTBlob (= 0.69.3)
-    - React-RCTImage (= 0.69.3)
-    - React-RCTLinking (= 0.69.3)
-    - React-RCTNetwork (= 0.69.3)
-    - React-RCTSettings (= 0.69.3)
-    - React-RCTText (= 0.69.3)
-    - React-RCTVibration (= 0.69.3)
-  - React-bridging (0.69.3):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi (= 0.69.3)
-  - React-callinvoker (0.69.3)
-  - React-Codegen (0.69.3):
-    - FBReactNativeSpec (= 0.69.3)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.69.3)
-    - RCTTypeSafety (= 0.69.3)
-    - React-Core (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
-  - React-Core (0.69.3):
+  - RCTRequired (0.70.3)
+  - RCTTypeSafety (0.70.3):
+    - FBLazyVector (= 0.70.3)
+    - RCTRequired (= 0.70.3)
+    - React-Core (= 0.70.3)
+  - React (0.70.3):
+    - React-Core (= 0.70.3)
+    - React-Core/DevSupport (= 0.70.3)
+    - React-Core/RCTWebSocket (= 0.70.3)
+    - React-RCTActionSheet (= 0.70.3)
+    - React-RCTAnimation (= 0.70.3)
+    - React-RCTBlob (= 0.70.3)
+    - React-RCTImage (= 0.70.3)
+    - React-RCTLinking (= 0.70.3)
+    - React-RCTNetwork (= 0.70.3)
+    - React-RCTSettings (= 0.70.3)
+    - React-RCTText (= 0.70.3)
+    - React-RCTVibration (= 0.70.3)
+  - React-bridging (0.70.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-jsi (= 0.70.3)
+  - React-callinvoker (0.70.3)
+  - React-Codegen (0.70.3):
+    - FBReactNativeSpec (= 0.70.3)
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTRequired (= 0.70.3)
+    - RCTTypeSafety (= 0.70.3)
+    - React-Core (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
+  - React-Core (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.69.3)
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Core/Default (= 0.70.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.69.3):
+  - React-Core/CoreModulesHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/Default (0.69.3):
+  - React-Core/Default (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - RCT-Folly (= 2021.07.22.00)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/DevSupport (0.69.3):
+  - React-Core/DevSupport (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.69.3)
-    - React-Core/RCTWebSocket (= 0.69.3)
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-jsinspector (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Core/Default (= 0.70.3)
+    - React-Core/RCTWebSocket (= 0.70.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-jsinspector (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.69.3):
+  - React-Core/RCTActionSheetHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.69.3):
+  - React-Core/RCTAnimationHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.69.3):
+  - React-Core/RCTBlobHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTImageHeaders (0.69.3):
+  - React-Core/RCTImageHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.69.3):
+  - React-Core/RCTLinkingHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.69.3):
+  - React-Core/RCTNetworkHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.69.3):
+  - React-Core/RCTSettingsHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTTextHeaders (0.69.3):
+  - React-Core/RCTTextHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.69.3):
+  - React-Core/RCTVibrationHeaders (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-Core/RCTWebSocket (0.69.3):
+  - React-Core/RCTWebSocket (0.70.3):
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.69.3)
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Core/Default (= 0.70.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-perflogger (= 0.70.3)
    - Yoga
-  - React-CoreModules (0.69.3):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.3)
-    - React-Codegen (= 0.69.3)
-    - React-Core/CoreModulesHeaders (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-RCTImage (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
-  - React-cxxreact (0.69.3):
+  - React-CoreModules (0.70.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.70.3)
+    - React-Codegen (= 0.70.3)
+    - React-Core/CoreModulesHeaders (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-RCTImage (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
+  - React-cxxreact (0.70.3):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsinspector (= 0.69.3)
-    - React-logger (= 0.69.3)
-    - React-perflogger (= 0.69.3)
-    - React-runtimeexecutor (= 0.69.3)
-  - React-hermes (0.69.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-callinvoker (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsinspector (= 0.70.3)
+    - React-logger (= 0.70.3)
+    - React-perflogger (= 0.70.3)
+    - React-runtimeexecutor (= 0.70.3)
+  - React-hermes (0.70.3):
    - DoubleConversion
    - glog
    - hermes-engine
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCT-Folly/Futures (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-jsiexecutor (= 0.69.3)
-    - React-jsinspector (= 0.69.3)
-    - React-perflogger (= 0.69.3)
-  - React-jsi (0.69.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly/Futures (= 2021.07.22.00)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-jsiexecutor (= 0.70.3)
+    - React-jsinspector (= 0.70.3)
+    - React-perflogger (= 0.70.3)
+  - React-jsi (0.70.3):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi/Default (= 0.69.3)
-  - React-jsi/Default (0.69.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-jsi/Default (= 0.70.3)
+  - React-jsi/Default (0.70.3):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.69.3):
+    - RCT-Folly (= 2021.07.22.00)
+  - React-jsiexecutor (0.70.3):
    - DoubleConversion
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-perflogger (= 0.69.3)
-  - React-jsinspector (0.69.3)
-  - React-logger (0.69.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-perflogger (= 0.70.3)
+  - React-jsinspector (0.70.3)
+  - React-logger (0.70.3):
    - glog
  - react-native-background-timer (2.4.1):
    - React-Core
-  - react-native-cameraroll (5.0.3):
+  - react-native-cameraroll (5.0.4):
    - React-Core
  - react-native-cookies (6.2.1):
    - React-Core
  - react-native-create-thumbnail (1.6.3):
    - React-Core
-  - react-native-document-picker (8.1.1):
+  - react-native-document-picker (8.1.2):
    - React-Core
  - react-native-emm (1.3.2):
    - React-Core
@@ -345,7 +345,7 @@ PODS:
    - React
  - react-native-image-picker (4.10.0):
    - React-Core
-  - react-native-netinfo (9.3.4):
+  - react-native-netinfo (9.3.5):
    - React-Core
  - react-native-network-client (1.0.0):
    - Alamofire (~> 5.4)
@@ -374,72 +374,72 @@ PODS:
    - React
  - react-native-webview (11.23.1):
    - React-Core
-  - React-perflogger (0.69.3)
-  - React-RCTActionSheet (0.69.3):
-    - React-Core/RCTActionSheetHeaders (= 0.69.3)
-  - React-RCTAnimation (0.69.3):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.3)
-    - React-Codegen (= 0.69.3)
-    - React-Core/RCTAnimationHeaders (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
-  - React-RCTBlob (0.69.3):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.69.3)
-    - React-Core/RCTBlobHeaders (= 0.69.3)
-    - React-Core/RCTWebSocket (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-RCTNetwork (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
-  - React-RCTImage (0.69.3):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.3)
-    - React-Codegen (= 0.69.3)
-    - React-Core/RCTImageHeaders (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-RCTNetwork (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
-  - React-RCTLinking (0.69.3):
-    - React-Codegen (= 0.69.3)
-    - React-Core/RCTLinkingHeaders (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
-  - React-RCTNetwork (0.69.3):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.3)
-    - React-Codegen (= 0.69.3)
-    - React-Core/RCTNetworkHeaders (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
-  - React-RCTSettings (0.69.3):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.3)
-    - React-Codegen (= 0.69.3)
-    - React-Core/RCTSettingsHeaders (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
-  - React-RCTText (0.69.3):
-    - React-Core/RCTTextHeaders (= 0.69.3)
-  - React-RCTVibration (0.69.3):
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.69.3)
-    - React-Core/RCTVibrationHeaders (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - ReactCommon/turbomodule/core (= 0.69.3)
-  - React-runtimeexecutor (0.69.3):
-    - React-jsi (= 0.69.3)
-  - ReactCommon/turbomodule/core (0.69.3):
+  - React-perflogger (0.70.3)
+  - React-RCTActionSheet (0.70.3):
+    - React-Core/RCTActionSheetHeaders (= 0.70.3)
+  - React-RCTAnimation (0.70.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.70.3)
+    - React-Codegen (= 0.70.3)
+    - React-Core/RCTAnimationHeaders (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
+  - React-RCTBlob (0.70.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Codegen (= 0.70.3)
+    - React-Core/RCTBlobHeaders (= 0.70.3)
+    - React-Core/RCTWebSocket (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-RCTNetwork (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
+  - React-RCTImage (0.70.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.70.3)
+    - React-Codegen (= 0.70.3)
+    - React-Core/RCTImageHeaders (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-RCTNetwork (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
+  - React-RCTLinking (0.70.3):
+    - React-Codegen (= 0.70.3)
+    - React-Core/RCTLinkingHeaders (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
+  - React-RCTNetwork (0.70.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.70.3)
+    - React-Codegen (= 0.70.3)
+    - React-Core/RCTNetworkHeaders (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
+  - React-RCTSettings (0.70.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.70.3)
+    - React-Codegen (= 0.70.3)
+    - React-Core/RCTSettingsHeaders (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
+  - React-RCTText (0.70.3):
+    - React-Core/RCTTextHeaders (= 0.70.3)
+  - React-RCTVibration (0.70.3):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Codegen (= 0.70.3)
+    - React-Core/RCTVibrationHeaders (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - ReactCommon/turbomodule/core (= 0.70.3)
+  - React-runtimeexecutor (0.70.3):
+    - React-jsi (= 0.70.3)
+  - ReactCommon/turbomodule/core (0.70.3):
    - DoubleConversion
    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-bridging (= 0.69.3)
-    - React-callinvoker (= 0.69.3)
-    - React-Core (= 0.69.3)
-    - React-cxxreact (= 0.69.3)
-    - React-jsi (= 0.69.3)
-    - React-logger (= 0.69.3)
-    - React-perflogger (= 0.69.3)
+    - RCT-Folly (= 2021.07.22.00)
+    - React-bridging (= 0.70.3)
+    - React-callinvoker (= 0.70.3)
+    - React-Core (= 0.70.3)
+    - React-cxxreact (= 0.70.3)
+    - React-jsi (= 0.70.3)
+    - React-logger (= 0.70.3)
+    - React-perflogger (= 0.70.3)
  - ReactNativeExceptionHandler (2.10.10):
    - React-Core
  - ReactNativeIncallManager (4.0.0):
@@ -448,18 +448,20 @@ PODS:
    - React
  - ReactNativeNavigation (7.29.0):
    - HMSegmentedControl
+    - RCT-Folly
    - React-Core
    - React-RCTImage
    - React-RCTText
    - ReactNativeNavigation/Core (= 7.29.0)
  - ReactNativeNavigation/Core (7.29.0):
    - HMSegmentedControl
+    - RCT-Folly
    - React-Core
    - React-RCTImage
    - React-RCTText
-  - RNCClipboard (1.11.0):
+  - RNCClipboard (1.11.1):
    - React-Core
-  - RNDateTimePicker (6.5.0):
+  - RNDateTimePicker (6.5.2):
    - React-Core
  - RNDeviceInfo (10.2.1):
    - React-Core
@@ -471,7 +473,7 @@ PODS:
    - React-Core
  - RNFS (2.20.0):
    - React-Core
-  - RNGestureHandler (2.7.0):
+  - RNGestureHandler (2.7.1):
    - React-Core
  - RNKeychain (8.1.1):
    - React-Core
@@ -511,28 +513,28 @@ PODS:
  - RNRudderSdk (1.0.0):
    - React
    - Rudder (~> 1.6.0)
-  - RNScreens (3.18.0):
+  - RNScreens (3.18.2):
    - React-Core
    - React-RCTImage
-  - RNSentry (4.6.0):
+  - RNSentry (4.6.1):
    - React-Core
-    - Sentry (= 7.27.0)
-  - RNShare (7.9.0):
+    - Sentry (= 7.27.1)
+  - RNShare (7.9.1):
    - React-Core
-  - RNSVG (13.3.0):
+  - RNSVG (13.4.0):
    - React-Core
  - RNVectorIcons (9.2.0):
    - React-Core
-  - Rudder (1.6.3)
-  - SDWebImage (5.12.3):
-    - SDWebImage/Core (= 5.12.3)
-  - SDWebImage/Core (5.12.3)
-  - SDWebImageWebPCoder (0.8.4):
+  - Rudder (1.6.4)
+  - SDWebImage (5.12.6):
+    - SDWebImage/Core (= 5.12.6)
+  - SDWebImage/Core (5.12.6)
+  - SDWebImageWebPCoder (0.8.5):
    - libwebp (~> 1.0)
    - SDWebImage/Core (~> 5.10)
-  - Sentry (7.27.0):
-    - Sentry/Core (= 7.27.0)
-  - Sentry/Core (7.27.0)
+  - Sentry (7.27.1):
+    - Sentry/Core (= 7.27.1)
+  - Sentry/Core (7.27.1)
  - simdjson (1.0.0)
  - SocketRocket (0.6.0)
  - Starscream (4.0.4)
@@ -855,14 +857,14 @@ CHECKOUT OPTIONS:
    :git: https://github.com/mattermost/Starscream.git

 SPEC CHECKSUMS:
-  Alamofire: 1c4fb5369c3fe93d2857c780d8bbe09f06f97e7c
+  Alamofire: d368e1ff8a298e6dde360e35a3e68e6c610e7204
  boost: a7c83b31436843459a1961bfd74b96033dc77234
  BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
  CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  FBLazyVector: 1d83d91816fa605d16227a83f1b2e71c8df09d22
-  FBReactNativeSpec: 626e35e73f83c637ff166f906d584f4c6750c251
+  FBLazyVector: 3b313c3fb52b597f7a9b430798e6367d2b9f07e5
+  FBReactNativeSpec: 99a7ecb7e9665d96f2fea706b0844e2f3117f381
  Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
  Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
  Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
@@ -873,41 +875,41 @@ SPEC CHECKSUMS:
  Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
  FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
-  hermes-engine: ff1ba576165861a94a0d101b0a351a8ca2149f36
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  hermes-engine: bb344d89a0d14c2c91ad357480a79698bb80e186
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  jail-monkey: de7eab0c9cbe4e7cdd2f80d04f812337ae94b2e0
  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
+  libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
  mattermost-react-native-turbo-log: 5c269c7c27d7f1db3d03300cf50d659d0d269126
  OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
  Permission-Camera: bf6791b17c7f614b6826019fcfdcc286d3a107f6
  Permission-Microphone: 48212dd4d28025d9930d583e3c7a56da7268665c
  Permission-PhotoLibrary: 5b34ca67279f7201ae109cef36f9806a6596002d
-  RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a
-  RCTRequired: 66822c147facf02f7774af99825e0a31e39df42e
-  RCTTypeSafety: 309306c4e711b14a83c55c2816a6cc490ec19827
-  React: a779632422a918b26db4f1b57225a41c14d20525
-  React-bridging: 96055aa45f0417898d7833e251f4ae79d28acef7
-  React-callinvoker: 02df4d620df286381ff3f99180fb24feceaf01cc
-  React-Codegen: 06613a5e753c3af2dca0d6e7dd02944a3d77c3f6
-  React-Core: 638d54d64048aa635e7c583fb0d8425206f446b4
-  React-CoreModules: f706ec2a1939387517cadc6ce0d2ef0f20fccb53
-  React-cxxreact: ec183b7f6fec01e7167f38c1c64a03f68dca7fb2
-  React-hermes: a97962948f74aaefffd4fe00bdafafbc245b08af
-  React-jsi: ed7dc77f5193dca9c73cec90bfec409e7ddfe401
-  React-jsiexecutor: 1842ca163b160aeb224d2c65b2a60c393b273c67
-  React-jsinspector: bb2605f98aada5d81f3494690da3ef3b4ff3b716
-  React-logger: 23a50ef4c18bf9adbb51e2c979318e6b3a2e44a1
+  RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
+  RCTRequired: 5cf7e7d2f12699724b59f90350257a422eaa9492
+  RCTTypeSafety: 3f3ead9673d1ab8bb1aea85b0894ab3220f8f06e
+  React: 30a333798d1fcf595e8a4108bbaa0f125a655f4a
+  React-bridging: 92396c03ab446756ddfb7a8e2baff3bcf19eec7d
+  React-callinvoker: bb66a41b41fa0b7c5f3cc626693a63c9ea0d6252
+  React-Codegen: a2a944a9688fae870be0a2ecdca37284034b25c2
+  React-Core: a689b4d1bd13e15915a05c9918c2b01df96cd811
+  React-CoreModules: d262214db6b704b042bc5c0735b06c346a371d7f
+  React-cxxreact: 81d5bf256313bf96cb925eb0e654103291161a17
+  React-hermes: 1c35cbfbdc7a888c3a1aa05e6d0ca004d92c923c
+  React-jsi: 7f99dc3055bec9a0eeb4230f8b6ac873514c8421
+  React-jsiexecutor: 7e2e1772ef7b97168c880eeaf3749d8c145ffd6e
+  React-jsinspector: 0553c9fe7218e1f127be070bd5a4d2fc19fb8190
+  React-logger: cffcc09e8aba8a3014be8d18da7f922802e9f19e
  react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
-  react-native-cameraroll: db9ebe8fc29baf68defdb1691fb6642e8a8ad04d
+  react-native-cameraroll: 38b40d9033e4077b6c603f92f95c6d05fa7907df
  react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c
  react-native-create-thumbnail: 94e68f6cc050a870f830352d1a924c1e8d38b52f
-  react-native-document-picker: f68191637788994baed5f57d12994aa32cf8bf88
+  react-native-document-picker: f5ec1a712ca2a975c233117f044817bb8393cad4
  react-native-emm: aefc8a2ff2063b4356212711dcfc2d29cf2a4491
  react-native-hw-keyboard-event: b517cefb8d5c659a38049c582de85ff43337dc53
  react-native-image-picker: 4bc9ed38c8be255b515d8c88babbaf74973f91a8
-  react-native-netinfo: 6ac9bcc7c88dc51717bda3484eb99093acb755e0
+  react-native-netinfo: 85b2a435c4d3705c08b0c42ff2d6ef6b9622ea0a
  react-native-network-client: 2b1370725abbbc1a7bfb1845d44bd3d4e73041b2
  react-native-notifications: 33ec77006f7987bb22de8f1665889abc633b9196
  react-native-paste-input: 183ad7dc224e192719616f4258dde5b548627d08
@@ -916,53 +918,53 @@ SPEC CHECKSUMS:
  react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
  react-native-webrtc: 86d841823e66d68cc1f86712db1c2956056bf0c2
  react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581
-  React-perflogger: 39d2ba8cbcac54d1bb1d9a980dab348e96aef467
-  React-RCTActionSheet: b1ad907a2c8f8e4d037148ca507b7f2d6ab1c66d
-  React-RCTAnimation: 914a9ba46fb6e7376f7709c7ce825d53b47ca2ee
-  React-RCTBlob: de62fd5edc5c36951f0b113bf252eb43b7131f79
-  React-RCTImage: aa0749a8d748b34942c7e71ac5d9f42be8b70cf3
-  React-RCTLinking: 595a9f8fbf4d6634bff28d1175b3523b61466612
-  React-RCTNetwork: 0559fd0fccb01f89c638baa43c8d185dc8008626
-  React-RCTSettings: 8e492a25a62f1ef6323f82ce652ae87fa59c82ca
-  React-RCTText: 17457cde6ef8832ba43c886baebb6627c5d7ed18
-  React-RCTVibration: dd8099eb46e9cee4692934bc8cbe5e9a4f5e8d31
-  React-runtimeexecutor: 607eb048e22a16388c908ee1f6644200e8d1e19b
-  ReactCommon: af7636436b382db7cde4583bbd642f0978e6e3ed
+  React-perflogger: 082b4293f0b3914ff41da35a6c06ac4490fcbcc8
+  React-RCTActionSheet: 83da3030deb5dea54b398129f56540a44e64d3ae
+  React-RCTAnimation: bac3a4f4c0436554d9f7fbb1352a0cdcb1fb0f1c
+  React-RCTBlob: d2c8830ac6b4d55d5624469829fe6d0ef1d534d1
+  React-RCTImage: 26ad032b09f90ae5d2283ec19f0c455c444c8189
+  React-RCTLinking: 4a8d16586df11fff515a6c52ff51a02c47a20499
+  React-RCTNetwork: 843fc75a70f0b5760de0bf59468585f41209bcf0
+  React-RCTSettings: 54e59255f94462951b45f84c3f81aedc27cf8615
+  React-RCTText: c32e2a60827bd232b2bc95941b9926ccf1c2be4c
+  React-RCTVibration: b9a58ffdd18446f43d493a4b0ecd603ee86be847
+  React-runtimeexecutor: e9b1f9310158a1e265bcdfdfd8c62d6174b947a2
+  ReactCommon: 01064177e66d652192c661de899b1076da962fd9
  ReactNativeExceptionHandler: b11ff67c78802b2f62eed0e10e75cb1ef7947c60
  ReactNativeIncallManager: b169b57d3064d8f62478f8fc3c485da6c75045d1
  ReactNativeKeyboardTrackingView: 02137fac3b2ebd330d74fa54ead48b14750a2306
-  ReactNativeNavigation: 3b09d0b7a64326dbcea7e64231287c766b18adf0
-  RNCClipboard: 4b8bec7c195e27bcec746f52dff7601161683249
-  RNDateTimePicker: 154f8246e9c32fd663995647a7f9f667a8c6b258
+  ReactNativeNavigation: 7037343e18e1fbdf6e22c24a80e455a83ac7d65c
+  RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd
+  RNDateTimePicker: 3f32aa2247836c12618d346113e5e82ea60ddd9c
  RNDeviceInfo: c31137f22ee779fe3931d1a8d60cc1af80ef4077
  RNFastImage: 7ef39e3f1987edefc0b546a8637bd469de0709fa
  RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
  RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
-  RNGestureHandler: 7673697e7c0e9391adefae4faa087442bc04af33
+  RNGestureHandler: b7a872907ee289ada902127f2554fa1d2c076122
  RNKeychain: ff836453cba46938e0e9e4c22e43d43fa2c90333
  RNLocalize: 0df7970cfc60389f00eb62fd7c097dc75af3fb4f
  RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c
  RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c
-  RNReanimated: 7faa787e8d4493fbc95fab2ad331fa7625828cfa
+  RNReanimated: 60e291d42c77752a0f6d6f358387bdf225a87c6e
  RNRudderSdk: 14c176adb1557f3832cb385fcd14250f76a7e268
-  RNScreens: f3230dd008a7d0ce5c0a8bc78ff12cf2315bda24
-  RNSentry: 73f65d6ef3e5a313d6bb225e2c92c84be2e17921
-  RNShare: be91a5c149585affb02c25b351bd07ba927c7006
-  RNSVG: 1869ad9534459f24caaa0416a4764548c2aeedad
+  RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d
+  RNSentry: f8591057d48d4f6d64196a76cbca67895667b033
+  RNShare: a5dc3b9c53ddc73e155b8cd9a94c70c91913c43c
+  RNSVG: 07dbd870b0dcdecc99b3a202fa37c8ca163caec2
  RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
-  Rudder: 59634aec6dd26a4672f74f40fc45bc17f91af3f0
-  SDWebImage: 53179a2dba77246efa8a9b85f5c5b21f8f43e38f
-  SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815
-  Sentry: 026b36fdc09531604db9279e55f047fe652e3f4a
+  Rudder: 7c080303528ea612f58c9f9e8fcfab92b5dbcca8
+  SDWebImage: a47aea9e3d8816015db4e523daff50cfd294499d
+  SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
+  Sentry: bc644307e2eb6a4c9c55cf117a80b895bb2a25a7
  simdjson: c96317b3a50dff3468a42f586ab7ed22c6ab2fd9
  SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
  Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
  SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e
  Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
  WatermelonDB: baec390a1039dcebeee959218900c978af3407c9
-  Yoga: 44c64131616253fa83366295acdbce3d14926041
+  Yoga: 2ed968a4f060a92834227c036279f2736de0fce3
  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

-PODFILE CHECKSUM: c4a26405512f49602486732d3f2890dfb2a51ca8
+PODFILE CHECKSUM: 62c761c9aec9bb4ef459a75ab630937696026291

 COCOAPODS: 1.11.3
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -7,12 +7,12 @@
  "license": "Apache 2.0",
  "private": true,
  "dependencies": {
-    "@formatjs/intl-datetimeformat": "6.2.0",
+    "@formatjs/intl-datetimeformat": "6.3.1",
    "@formatjs/intl-getcanonicallocales": "2.0.4",
-    "@formatjs/intl-locale": "3.0.6",
-    "@formatjs/intl-numberformat": "8.1.3",
-    "@formatjs/intl-pluralrules": "5.1.3",
-    "@formatjs/intl-relativetimeformat": "11.1.3",
+    "@formatjs/intl-locale": "3.0.7",
+    "@formatjs/intl-numberformat": "8.2.0",
+    "@formatjs/intl-pluralrules": "5.1.4",
+    "@formatjs/intl-relativetimeformat": "11.1.4",
    "@mattermost/compass-icons": "0.1.28",
    "@mattermost/react-native-emm": "1.3.2",
    "@mattermost/react-native-network-client": "1.0.0",
@@ -21,15 +21,15 @@
    "@msgpack/msgpack": "2.8.0",
    "@nozbe/watermelondb": "0.24.0",
    "@nozbe/with-observables": "1.4.1",
-    "@react-native-camera-roll/camera-roll": "5.0.3",
-    "@react-native-clipboard/clipboard": "1.11.0",
-    "@react-native-community/datetimepicker": "6.5.0",
-    "@react-native-community/netinfo": "9.3.4",
+    "@react-native-camera-roll/camera-roll": "5.0.4",
+    "@react-native-clipboard/clipboard": "1.11.1",
+    "@react-native-community/datetimepicker": "6.5.2",
+    "@react-native-community/netinfo": "9.3.5",
    "@react-native-cookies/cookies": "6.2.1",
    "@react-navigation/bottom-tabs": "6.4.0",
    "@react-navigation/native": "6.0.13",
    "@rudderstack/rudder-sdk-react-native": "1.5.1",
-    "@sentry/react-native": "4.6.0",
+    "@sentry/react-native": "4.6.1",
    "@stream-io/flat-list-mvcp": "0.10.2",
    "base-64": "1.0.0",
    "commonmark": "npm:@mattermost/commonmark@0.30.1-0",
@@ -40,12 +40,12 @@
    "fuse.js": "6.6.2",
    "jail-monkey": "2.7.0",
    "mime-db": "1.52.0",
-    "moment-timezone": "0.5.37",
+    "moment-timezone": "0.5.38",
    "pako": "2.0.4",
    "react": "18.2.0",
    "react-freeze": "1.0.3",
-    "react-intl": "6.1.2",
-    "react-native": "0.69.3",
+    "react-intl": "6.2.1",
+    "react-native": "0.70.3",
    "react-native-android-open-settings": "1.3.0",
    "react-native-animated-numbers": "0.4.1",
    "react-native-background-timer": "2.4.1",
@@ -53,14 +53,14 @@
    "react-native-calendars": "1.1289.0",
    "react-native-create-thumbnail": "1.6.3",
    "react-native-device-info": "10.2.1",
-    "react-native-document-picker": "8.1.1",
+    "react-native-document-picker": "8.1.2",
    "react-native-dotenv": "3.4.0",
    "react-native-elements": "3.4.2",
    "react-native-exception-handler": "2.10.10",
    "react-native-fast-image": "8.6.1",
    "react-native-file-viewer": "2.1.5",
    "react-native-fs": "2.20.0",
-    "react-native-gesture-handler": "2.7.0",
+    "react-native-gesture-handler": "2.7.1",
    "react-native-haptic-feedback": "1.14.0",
    "react-native-hw-keyboard-event": "0.0.4",
    "react-native-image-picker": "4.10.0",
@@ -76,11 +76,11 @@
    "react-native-permissions": "3.6.1",
    "react-native-reanimated": "2.10.0",
    "react-native-safe-area-context": "4.4.1",
-    "react-native-screens": "3.18.0",
+    "react-native-screens": "3.18.2",
    "react-native-section-list-get-item-layout": "2.2.3",
    "react-native-shadow-2": "7.0.6",
-    "react-native-share": "7.9.0",
-    "react-native-svg": "13.3.0",
+    "react-native-share": "7.9.1",
+    "react-native-svg": "13.4.0",
    "react-native-user-agent": "2.3.1",
    "react-native-vector-icons": "9.2.0",
    "react-native-video": "5.2.1",
@@ -103,22 +103,22 @@
    "@babel/plugin-proposal-decorators": "7.19.3",
    "@babel/plugin-transform-flow-strip-types": "7.19.0",
    "@babel/plugin-transform-runtime": "7.19.1",
-    "@babel/preset-env": "7.19.3",
+    "@babel/preset-env": "7.19.4",
    "@babel/preset-typescript": "7.18.6",
    "@babel/register": "7.18.9",
-    "@babel/runtime": "7.19.0",
+    "@babel/runtime": "7.19.4",
    "@react-native-community/eslint-config": "3.1.0",
    "@testing-library/react-hooks": "8.0.1",
-    "@testing-library/react-native": "11.2.0",
+    "@testing-library/react-native": "11.3.0",
    "@types/base-64": "1.0.0",
    "@types/commonmark": "0.27.5",
    "@types/commonmark-react-renderer": "4.3.1",
    "@types/deep-equal": "1.0.1",
-    "@types/jest": "29.1.2",
+    "@types/jest": "29.2.0",
    "@types/lodash": "4.14.186",
    "@types/mime-db": "1.43.1",
    "@types/react": "18.0.21",
-    "@types/react-native": "0.70.4",
+    "@types/react-native": "0.70.5",
    "@types/react-native-background-timer": "2.0.0",
    "@types/react-native-button": "3.0.1",
    "@types/react-native-dotenv": "0.2.0",
@@ -133,39 +133,39 @@
    "@types/tough-cookie": "4.0.2",
    "@types/url-parse": "1.4.8",
    "@types/uuid": "8.3.4",
-    "@typescript-eslint/eslint-plugin": "5.39.0",
-    "@typescript-eslint/parser": "5.39.0",
-    "axios": "1.1.2",
+    "@typescript-eslint/eslint-plugin": "5.40.1",
+    "@typescript-eslint/parser": "5.40.1",
+    "axios": "1.1.3",
    "axios-cookiejar-support": "4.0.3",
-    "babel-jest": "29.1.2",
+    "babel-jest": "29.2.0",
    "babel-loader": "8.2.5",
    "babel-plugin-module-resolver": "4.1.0",
    "deep-freeze": "0.0.1",
-    "detox": "19.12.5",
-    "eslint": "8.24.0",
+    "detox": "19.12.6",
+    "eslint": "8.25.0",
    "eslint-plugin-header": "3.1.1",
    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-jest": "27.1.1",
-    "eslint-plugin-react": "7.31.8",
+    "eslint-plugin-jest": "27.1.2",
+    "eslint-plugin-react": "7.31.10",
    "eslint-plugin-react-hooks": "4.6.0",
    "husky": "8.0.1",
    "isomorphic-fetch": "3.0.0",
-    "jest": "29.1.2",
-    "jest-cli": "29.1.2",
+    "jest": "29.2.0",
+    "jest-cli": "29.2.0",
    "jetifier": "2.0.0",
-    "metro-react-native-babel-preset": "0.73.1",
+    "metro-react-native-babel-preset": "0.73.2",
    "mmjstool": "github:mattermost/mattermost-utilities#010f456ea8be5beebafdb8776177cba515c1969e",
    "mock-async-storage": "2.2.0",
    "nock": "13.2.9",
    "patch-package": "6.4.7",
-    "react-devtools-core": "4.26.0",
+    "react-devtools-core": "4.26.1",
    "react-native-svg-transformer": "1.0.0",
    "react-test-renderer": "18.2.0",
    "tough-cookie": "4.1.2",
    "ts-jest": "29.0.3",
    "typescript": "4.8.4",
    "underscore": "1.13.6",
-    "util": "0.12.4",
+    "util": "0.12.5",
    "uuid": "9.0.0"
  },
  "scripts": {
@@ -208,6 +208,9 @@
    "@react-native-community/cameraroll": {
      "react": "^18.2.0"
    },
+    "@rudderstack/rudder-sdk-react-native": {
+      "react-native": "^0.70.0"
+    },
    "@testing-library/react-hooks": {
      "@types/react": "^18.0.15",
      "react": "^18.2.0",
--- a/patches/@react-native-community+netinfo+9.3.5.patch
+++ b/patches/@react-native-community+netinfo+9.3.5.patch
--- a/patches/react-native+0.69.3.patch
+++ b/patches/react-native+0.69.3.patch
@@ -1,119 +0,0 @@
-diff --git a/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js b/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js
-index c3eccd2..77c9e13 100644
--- a/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js
-+++ b/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js
-@@ -1784,9 +1784,15 @@ class ScrollView extends React.Component<Props, State> {
-         // Note: we should split props.style on the inner and outer props
-         // however, the ScrollView still needs the baseStyle to be scrollable
-         const {outer, inner} = splitLayoutProps(flattenStyle(props.style));
-+        let inverted;
-+        if (inner.scaleY) {
-+          inverted = {scaleY: -1};
-+          delete inner['scaleY']
-+        }
-+
-         return React.cloneElement(
-           refreshControl,
-          {style: StyleSheet.compose(baseStyle, outer)},
-+          {style: [baseStyle, outer, inverted]},
-           <NativeDirectionalScrollView
-             {...props}
-             style={StyleSheet.compose(baseStyle, inner)}
-diff --git a/node_modules/react-native/Libraries/Lists/VirtualizedList.js b/node_modules/react-native/Libraries/Lists/VirtualizedList.js
-index 258a12e..a756dc3 100644
--- a/node_modules/react-native/Libraries/Lists/VirtualizedList.js
-+++ b/node_modules/react-native/Libraries/Lists/VirtualizedList.js
-@@ -10,6 +10,7 @@
- 
- const Batchinator = require('../Interaction/Batchinator');
- const FillRateHelper = require('./FillRateHelper');
-+const Platform = require('../Utilities/Platform');
- const ReactNative = require('../Renderer/shims/ReactNative');
- const RefreshControl = require('../Components/RefreshControl/RefreshControl');
- const ScrollView = require('../Components/ScrollView/ScrollView');
-@@ -1932,7 +1933,7 @@ type CellRendererState = {
-   ...
- };
- 
-class CellRenderer extends React.Component<
-+class CellRenderer extends React.PureComponent<
-   CellRendererProps,
-   CellRendererState,
- > {
-@@ -1947,12 +1948,16 @@ class CellRenderer extends React.Component<
-     props: CellRendererProps,
-     prevState: CellRendererState,
-   ): ?CellRendererState {
-    return {
-      separatorProps: {
-        ...prevState.separatorProps,
-        leadingItem: props.item,
-      },
-    };
-+    if (prevState.separatorProps.leadingItem !== props.item) {
-+      return {
-+        separatorProps: {
-+          ...prevState.separatorProps,
-+          leadingItem: props.item,
-+        },
-+      };
-+    } else {
-+      return prevState;
-+    }
-   }
- 
-   // TODO: consider factoring separator stuff out of VirtualizedList into FlatList since it's not
-@@ -2125,7 +2130,14 @@ function describeNestedLists(childList: {
- 
- const styles = StyleSheet.create({
-   verticallyInverted: {
-    transform: [{scaleY: -1}],
-+    ...Platform.select({
-+      android: {
-+        scaleY: -1,
-+      },
-+      ios: {
-+        transform: [{scaleY: -1}],
-+      },
-+    }),
-   },
-   horizontallyInverted: {
-     transform: [{scaleX: -1}],
-diff --git a/node_modules/react-native/react.gradle b/node_modules/react-native/react.gradle
-index 2e9d8e5..8d6c26d 100644
--- a/node_modules/react-native/react.gradle
-+++ b/node_modules/react-native/react.gradle
-@@ -139,7 +139,7 @@ def enableHermesForVariant = config.enableHermesForVariant ?: {
- def hermesFlagsForVariant = config.hermesFlagsForVariant ?: {
-     def variant ->
-         def hermesFlags;
-        if (variant.name.toLowerCase().contains("release")) {
-+        if (variant.name.toLowerCase().contains("release") || variant.name.toLowerCase().contains("unsigned")) {
-             // Can't use ?: since that will also substitute valid empty lists
-             hermesFlags = config.hermesFlagsRelease
-             if (hermesFlags == null) hermesFlags = ["-O", "-output-source-map"]
-@@ -155,7 +155,7 @@ def hermesFlagsForVariant = config.hermesFlagsForVariant ?: {
- def disableDevForVariant = config.disableDevForVariant ?: {
-     def variant ->
-       config."devDisabledIn${variant.name.capitalize()}" ||
-      variant.name.toLowerCase().contains("release")
-+      variant.name.toLowerCase().contains("release") || variant.name.toLowerCase().contains("unsigned")
- }
- 
- // Set bundleForVariant to a function to configure per variant,
-@@ -164,13 +164,13 @@ def bundleForVariant = config.bundleForVariant ?: {
-     def variant ->
-       config."bundleIn${variant.name.capitalize()}" ||
-       config."bundleIn${variant.buildType.name.capitalize()}" ||
-      variant.name.toLowerCase().contains("release")
-+      variant.name.toLowerCase().contains("release") || variant.name.toLowerCase().contains("unsigned")
- }
- 
- // Set deleteDebugFilesForVariant to a function to configure per variant,
- // defaults to True for Release variants and False for debug variants
- def deleteDebugFilesForVariant = config.deleteDebugFilesForVariant ?: {
-    def variant -> variant.name.toLowerCase().contains("release")
-+    def variant -> variant.name.toLowerCase().contains("release") || variant.name.toLowerCase().contains("unsigned")
- }
- 
- android {
--- a/patches/react-native+0.70.3.patch
+++ b/patches/react-native+0.70.3.patch
@@ -0,0 +1,205 @@
+diff --git a/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js b/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js
+index 698b62a..c855146 100644
+--- a/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js
+++ b/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js
+@@ -1780,9 +1780,15 @@ class ScrollView extends React.Component<Props, State> {
+         // Note: we should split props.style on the inner and outer props
+         // however, the ScrollView still needs the baseStyle to be scrollable
+         const {outer, inner} = splitLayoutProps(flattenStyle(props.style));
+        let inverted;
+        if (inner.scaleY) {
+          inverted = {scaleY: -1};
+          delete inner['scaleY']
+        }
+
+         return React.cloneElement(
+           refreshControl,
+-          {style: StyleSheet.compose(baseStyle, outer)},
+          {style: [baseStyle, outer, inverted]},
+           <NativeDirectionalScrollView
+             {...props}
+             style={StyleSheet.compose(baseStyle, inner)}
+diff --git a/node_modules/react-native/Libraries/Lists/VirtualizedList.js b/node_modules/react-native/Libraries/Lists/VirtualizedList.js
+index 69e6309..c96ca5a 100644
+--- a/node_modules/react-native/Libraries/Lists/VirtualizedList.js
+++ b/node_modules/react-native/Libraries/Lists/VirtualizedList.js
+@@ -39,6 +39,7 @@ const flattenStyle = require('../StyleSheet/flattenStyle');
+ const StyleSheet = require('../StyleSheet/StyleSheet');
+ const infoLog = require('../Utilities/infoLog');
+ const FillRateHelper = require('./FillRateHelper');
+const Platform = require('../Utilities/Platform');
+ const ViewabilityHelper = require('./ViewabilityHelper');
+ const invariant = require('invariant');
+ 
+@@ -1971,7 +1972,7 @@ type CellRendererState = {
+   ...
+ };
+ 
+-class CellRenderer extends React.Component<
+class CellRenderer extends React.PureComponent<
+   CellRendererProps,
+   CellRendererState,
+ > {
+@@ -1986,12 +1987,16 @@ class CellRenderer extends React.Component<
+     props: CellRendererProps,
+     prevState: CellRendererState,
+   ): ?CellRendererState {
+-    return {
+-      separatorProps: {
+-        ...prevState.separatorProps,
+-        leadingItem: props.item,
+-      },
+-    };
+    if (prevState.separatorProps.leadingItem !== props.item) {
+      return {
+        separatorProps: {
+          ...prevState.separatorProps,
+          leadingItem: props.item,
+        },
+      };
+    } else {
+      return prevState;
+    }
+   }
+ 
+   // TODO: consider factoring separator stuff out of VirtualizedList into FlatList since it's not
+@@ -2171,7 +2176,10 @@ function describeNestedLists(childList: {
+ 
+ const styles = StyleSheet.create({
+   verticallyInverted: {
+-    transform: [{scaleY: -1}],
+    ...Platform.select({
+      android: {scaleY: -1},
+      ios: {transform: [{scaleY: -1}]},
+    }),
+   },
+   horizontallyInverted: {
+     transform: [{scaleX: -1}],
+diff --git a/node_modules/react-native/react.gradle b/node_modules/react-native/react.gradle
+index 912a407..01fa3ba 100644
+--- a/node_modules/react-native/react.gradle
+++ b/node_modules/react-native/react.gradle
+@@ -141,7 +141,7 @@ def enableHermesForVariant = config.enableHermesForVariant ?: {
+ def hermesFlagsForVariant = config.hermesFlagsForVariant ?: {
+     def variant ->
+         def hermesFlags;
+-        if (variant.name.toLowerCase().contains("release")) {
+        if (variant.name.toLowerCase().contains("release") || variant.name.toLowerCase().contains("unsigned")) {
+             // Can't use ?: since that will also substitute valid empty lists
+             hermesFlags = config.hermesFlagsRelease
+             if (hermesFlags == null) hermesFlags = ["-O", "-output-source-map"]
+@@ -157,7 +157,7 @@ def hermesFlagsForVariant = config.hermesFlagsForVariant ?: {
+ def disableDevForVariant = config.disableDevForVariant ?: {
+     def variant ->
+       config."devDisabledIn${variant.name.capitalize()}" ||
+-      variant.name.toLowerCase().contains("release")
+      variant.name.toLowerCase().contains("release") || variant.name.toLowerCase().contains("unsigned")
+ }
+ 
+ // Set bundleForVariant to a function to configure per variant,
+@@ -166,13 +166,13 @@ def bundleForVariant = config.bundleForVariant ?: {
+     def variant ->
+       config."bundleIn${variant.name.capitalize()}" ||
+       config."bundleIn${variant.buildType.name.capitalize()}" ||
+-      variant.name.toLowerCase().contains("release")
+      variant.name.toLowerCase().contains("release") || variant.name.toLowerCase().contains("unsigned")
+ }
+ 
+ // Set deleteDebugFilesForVariant to a function to configure per variant,
+ // defaults to True for Release variants and False for debug variants
+ def deleteDebugFilesForVariant = config.deleteDebugFilesForVariant ?: {
+-    def variant -> variant.name.toLowerCase().contains("release")
+    def variant -> variant.name.toLowerCase().contains("release") || variant.name.toLowerCase().contains("unsigned")
+ }
+ 
+ android {
+diff --git a/node_modules/react-native/sdks/hermes/hermes-engine.podspec b/node_modules/react-native/sdks/hermes/hermes-engine.podspec
+new file mode 100644
+index 0000000..8d331e0
+--- /dev/null
+++ b/node_modules/react-native/sdks/hermes/hermes-engine.podspec
+@@ -0,0 +1,84 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+require "json"
+require "open3"
+
+# sdks/hermesc/osx-bin/ImportHermesc.cmake
+import_hermesc_file=File.join(__dir__, "..", "hermesc", "osx-bin", "ImportHermesc.cmake")
+
+# package.json
+package_file = File.join(__dir__, "..", "..", "package.json")
+package = JSON.parse(File.read(package_file))
+version = package['version']
+
+# We need to check the current git branch/remote to verify if
+# we're on a React Native release branch to actually build Hermes.
+currentbranch, err = Open3.capture3("git rev-parse --abbrev-ref HEAD")
+currentremote, err = Open3.capture3("git config --get remote.origin.url")
+
+source = {}
+git = "https://github.com/facebook/hermes.git"
+
+if ENV.has_key?('HERMES_ENGINE_TARBALL_PATH')
+  Pod::UI.puts '[Hermes] Using pre-built Hermes binaries from local path.' if Object.const_defined?("Pod::UI")
+  source[:http] = "file://#{ENV['HERMES_ENGINE_TARBALL_PATH']}"
+elsif version == '1000.0.0'
+  Pod::UI.puts '[Hermes] Hermes needs to be compiled, installing hermes-engine may take a while...'.yellow if Object.const_defined?("Pod::UI")
+  source[:git] = git
+  source[:commit] = `git ls-remote https://github.com/facebook/hermes main | cut -f 1`.strip
+elsif currentremote.strip.end_with?("facebook/react-native.git") and currentbranch.strip.end_with?("-stable")
+  Pod::UI.puts '[Hermes] Detected that you are on a React Native release branch, building Hermes from source...'.yellow if Object.const_defined?("Pod::UI")
+  hermestag_file = File.join(__dir__, "..", ".hermesversion")
+  hermestag = File.read(hermestag_file).strip
+  source[:git] = git
+  source[:tag] = hermestag
+else
+  source[:http] = "https://github.com/facebook/react-native/releases/download/v#{version}/hermes-runtime-darwin-v#{version}.tar.gz"
+end
+
+module HermesHelper
+  # BUILD_TYPE = :debug
+  BUILD_TYPE = :release
+end
+
+Pod::Spec.new do |spec|
+  spec.name        = "hermes-engine"
+  spec.version     = version
+  spec.summary     = "Hermes is a small and lightweight JavaScript engine optimized for running React Native."
+  spec.description = "Hermes is a JavaScript engine optimized for fast start-up of React Native apps. It features ahead-of-time static optimization and compact bytecode."
+  spec.homepage    = "https://hermesengine.dev"
+  spec.license     = package["license"]
+  spec.author      = "Facebook"
+  spec.source      = source
+  spec.platforms   = { :osx => "10.13", :ios => "12.4" }
+
+  spec.preserve_paths      = ["destroot/bin/*"].concat(HermesHelper::BUILD_TYPE == :debug ? ["**/*.{h,c,cpp}"] : [])
+  spec.source_files        = "destroot/include/**/*.h"
+  spec.header_mappings_dir = "destroot/include"
+
+  spec.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
+  spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
+
+  spec.xcconfig            = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", "CLANG_CXX_LIBRARY" => "compiler-default", "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" }
+
+  if source[:git] then
+    spec.prepare_command = <<-EOS
+      # When true, debug build will be used.
+      # See `build-apple-framework.sh` for details
+      DEBUG=#{HermesHelper::BUILD_TYPE == :debug}
+
+      # Set HERMES_OVERRIDE_HERMESC_PATH if pre-built HermesC is available
+      #{File.exist?(import_hermesc_file) ? "export HERMES_OVERRIDE_HERMESC_PATH=#{import_hermesc_file}" : ""}
+      #{File.exist?(import_hermesc_file) ? "echo \"Overriding HermesC path...\"" : ""}
+
+      # Build iOS framework
+      ./utils/build-ios-framework.sh
+
+      # Build Mac framework
+      ./utils/build-mac-framework.sh
+    EOS
+  end
+end
--- a/patches/react-native-navigation+7.29.0.patch
+++ b/patches/react-native-navigation+7.29.0.patch
@@ -1,3 +1,80 @@
+diff --git a/node_modules/react-native-navigation/ReactNativeNavigation.podspec b/node_modules/react-native-navigation/ReactNativeNavigation.podspec
+index fab147d..3c66b80 100644
+--- a/node_modules/react-native-navigation/ReactNativeNavigation.podspec
+++ b/node_modules/react-native-navigation/ReactNativeNavigation.podspec
+@@ -17,18 +17,65 @@ Pod::Spec.new do |s|
+   
+   s.subspec 'Core' do |ss|
+     s.source              = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
+-    s.source_files        = "lib/ios/**/*.{h,m,mm}"
+    # s.source_files        = "lib/ios/**/*.{h,m,mm}"
+     s.exclude_files       = "lib/ios/ReactNativeNavigationTests/**/*.*", "lib/ios/OCMock/**/*.*"
+   end
+   
+-  s.subspec 'Fabric' do |ss|
+-    ss.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RCT-Folly\"",
+-                    "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1" }
+-    ss.dependency 'React-RCTFabric'
+-    ss.dependency 'React-Fabric'
+-    ss.dependency 'RCT-Folly/Fabric'
+  reactJson = JSON.parse(File.read(File.join(__dir__, "..", "react-native", "package.json")))
+  reactVersion = reactJson["version"]
+  rnVersion = reactVersion.split('.')[1]
+
+  fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+
+  folly_prefix = ""
+  if rnVersion.to_i >= 64
+    folly_prefix = "RCT-"
+  end
+
+  folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DRNVERSION=' + rnVersion
+  folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
+  boost_compiler_flags = '-Wno-documentation'
+  fabric_flags = ''
+  if fabric_enabled
+    fabric_flags = '-DRN_FABRIC_ENABLED -DRCT_NEW_ARCH_ENABLED'
+  end
+  # s.subspec 'Fabric' do |ss|
+  #   ss.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RCT-Folly\"",
+  #                   "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1" }
+  #   ss.dependency 'React-RCTFabric'
+  #   ss.dependency 'React-Fabric'
+  #   ss.dependency 'RCT-Folly/Fabric'
+  # end
+  s.source_files = [
+    "lib/ios/**/*.{mm,h,m}",
+    "Common/cpp/**/*.cpp",
+    "Common/cpp/headers/**/*.h"
+  ]
+
+  s.preserve_paths = [
+    "Common/cpp/hidden_headers/**"
+  ]
+
+  s.pod_target_xcconfig    = {
+    "USE_HEADERMAP" => "YES",
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+  }
+
+  s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
+  s.xcconfig               = {
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"",
+                               "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags }
+
+  if fabric_enabled
+    s.dependency "React-RCTFabric"
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly"
+  else
+    s.dependency "#{folly_prefix}Folly"
+   end
+ 
+
+   s.dependency 'React-Core'
+   s.dependency 'React-RCTImage'
+   s.dependency 'React-RCTText'
 diff --git a/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java b/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java
 index a34598c..b035a76 100644
 --- a/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java
@@ -101,6 +178,18 @@ index 035ec31..38109c1 100644
 	public void onActivityPaused(NavigationActivity activity) {
 		initializer.onActivityPaused(activity);
 		jsDevReloadHandler.onActivityPaused(activity);
+diff --git a/node_modules/react-native-navigation/lib/ios/RNNComponentViewController.m b/node_modules/react-native-navigation/lib/ios/RNNComponentViewController.m
+index 3ce9674..ae34704 100644
+--- a/node_modules/react-native-navigation/lib/ios/RNNComponentViewController.m
+++ b/node_modules/react-native-navigation/lib/ios/RNNComponentViewController.m
+@@ -94,6 +94,7 @@
+                                                                }];
+                                   }];
+         self.reactView.backgroundColor = UIColor.clearColor;
+        self.reactView.frame = UIScreen.mainScreen.bounds;
+         self.reactView.translatesAutoresizingMaskIntoConstraints = NO;
+         [self.view addSubview:self.reactView];
+         [self updateReactViewConstraints];
 diff --git a/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m b/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
 index 934e7e7..19169a3 100644
 --- a/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
@@ -123,3 +212,29 @@ index 934e7e7..19169a3 100644
         [hitTestResult isKindOfClass:[RCTModalHostView class]]) {
         return nil;
     }
+diff --git a/node_modules/react-native-navigation/lib/ios/RNNReactView.h b/node_modules/react-native-navigation/lib/ios/RNNReactView.h
+index f814815..bb39a10 100644
+--- a/node_modules/react-native-navigation/lib/ios/RNNReactView.h
+++ b/node_modules/react-native-navigation/lib/ios/RNNReactView.h
+@@ -4,6 +4,12 @@
+ #import <React/RCTRootView.h>
+ #endif
+ 
+#if RCT_NEW_ARCH_ENABLED
+
+// Fabric
+#import <React/RCTFabricSurfaceHostingProxyRootView.h>
+#endif
+
+ #import "RNNEventEmitter.h"
+ #import "UIView+Utils.h"
+ #import <React/RCTRootViewDelegate.h>
+@@ -30,7 +36,7 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
+ 
+ @end
+ 
+-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
+ @interface RNNReactView
+     : RCTFabricSurfaceHostingProxyRootView <RCTRootViewDelegate, RNNComponentProtocol>
+ #else
--- a/patches/react-native-reanimated+2.10.0.patch
+++ b/patches/react-native-reanimated+2.10.0.patch
@@ -1,3 +1,15 @@
+diff --git a/node_modules/react-native-reanimated/android/build.gradle b/node_modules/react-native-reanimated/android/build.gradle
+index 6b5e3fc..d419b5e 100644
+--- a/node_modules/react-native-reanimated/android/build.gradle
+++ b/node_modules/react-native-reanimated/android/build.gradle
+@@ -301,6 +301,7 @@ android {
+                 "**/libreactnativejni.so",
+                 "**/libjscexecutor.so",
+                 "**/libv8executor.so",
+                "META-INF/MANIFEST.MF",
+         ]
+     }
+     tasks.withType(JavaCompile) {
 diff --git a/node_modules/react-native-reanimated/lib/reanimated2/jestUtils.js b/node_modules/react-native-reanimated/lib/reanimated2/jestUtils.js
 index d8befd8..6357426 100644
 --- a/node_modules/react-native-reanimated/lib/reanimated2/jestUtils.js
--- a/patches/react-native-svg+13.4.0.patch
+++ b/patches/react-native-svg+13.4.0.patch