Upgrade to React Native 0.85.3 / Expo SDK 56 (new architecture)

android/app/build.gradle

@@ -91,6 +91,14 @@ android {
     compileSdk rootProject.ext.compileSdkVersion
 
     namespace "co.edgesecure.app"
+
+    lint {
+        // Release lint (lintVital) OOMs on this large project and isn't needed
+        // for benchmark/release APKs; CI runs lint separately.
+        checkReleaseBuilds false
+        abortOnError false
+    }
+
     defaultConfig {
         applicationId "co.edgesecure.app"
         minSdkVersion rootProject.ext.minSdkVersion

android/app/src/main/java/co/edgesecure/app/MainApplication.kt

@@ -15,7 +15,6 @@ import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
 import expo.modules.ApplicationLifecycleDispatcher.onApplicationCreate
 import expo.modules.ApplicationLifecycleDispatcher.onConfigurationChanged
-import expo.modules.ReactNativeHostWrapper
 import io.sentry.Hint
 import io.sentry.SentryEvent
 import io.sentry.SentryLevel
@@ -27,24 +26,21 @@ class MainApplication :
   Application(),
   ReactApplication {
   override val reactNativeHost: ReactNativeHost =
-    ReactNativeHostWrapper(
-      this,
-      object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> {
-          // Packages that cannot be autolinked yet can be added manually here, for
-          // example:
-          // packages.add(new MyReactNativePackage());
-          return PackageList(this).packages
-        }
+    object : DefaultReactNativeHost(this) {
+      override fun getPackages(): List<ReactPackage> {
+        // Packages that cannot be autolinked yet can be added manually here, for
+        // example:
+        // packages.add(new MyReactNativePackage());
+        return PackageList(this).packages
+      }
 
-        override fun getJSMainModuleName(): String = "index"
+      override fun getJSMainModuleName(): String = "index"
 
-        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+      override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
 
-        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-      },
-    )
+      override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+      override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
+    }
 
   override val reactHost: ReactHost
     get() = getDefaultReactHost(applicationContext, reactNativeHost)

android/build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.1.0"
         minSdkVersion = 28 // Edge modified from 21
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 36
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
         kotlinVersion = "2.3.20" // Required by zcash-android-sdk >= 2.4.8 (Kotlin 2.3 metadata)
     }

android/gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=1g
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -37,7 +37,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/settings.gradle

@@ -1,9 +1,39 @@
-pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
-plugins { id("com.facebook.react.settings") }
-extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
+pluginManagement {
+  def reactNativeGradlePlugin = new File(
+    providers.exec {
+      workingDir(rootDir)
+      commandLine("node", "--print", "require.resolve('@react-native/gradle-plugin/package.json', { paths: [require.resolve('react-native/package.json')] })")
+    }.standardOutput.asText.get().trim()
+  ).getParentFile().absolutePath
+  includeBuild(reactNativeGradlePlugin)
+
+  def expoPluginsPath = new File(
+    providers.exec {
+      workingDir(rootDir)
+      commandLine("node", "--print", "require.resolve('expo-modules-autolinking/package.json', { paths: [require.resolve('expo/package.json')] })")
+    }.standardOutput.asText.get().trim(),
+    "../android/expo-gradle-plugin"
+  ).absolutePath
+  includeBuild(expoPluginsPath)
+}
+
+plugins {
+  id("com.facebook.react.settings")
+  id("expo-autolinking-settings")
+}
+
+extensions.configure(com.facebook.react.ReactSettingsExtension) { ex ->
+  if (System.getenv('EXPO_USE_COMMUNITY_AUTOLINKING') == '1') {
+    ex.autolinkLibrariesFromCommand()
+  } else {
+    ex.autolinkLibrariesFromCommand(expoAutolinking.rnConfigCommand)
+  }
+}
+expoAutolinking.useExpoModules()
+
 rootProject.name = 'co.edgesecure.app'
-include ':app'
-includeBuild('../node_modules/@react-native/gradle-plugin')
 
-apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
-useExpoModules()
+expoAutolinking.useExpoVersionCatalog()
+
+include ':app'
+includeBuild(expoAutolinking.reactNativeGradlePlugin)

app.json

@@ -1,4 +1,8 @@
 {
   "name": "edge",
-  "displayName": "edge"
+  "displayName": "edge",
+  "plugins": [
+    "@react-native-community/datetimepicker",
+    "@sentry/react-native"
+  ]
 }

babel.config.js

@@ -1,12 +1,7 @@
 module.exports = function (api) {
-  const isAndroid = api.caller(c => c.platform === 'android')
-
+  api.cache(true)
   return {
     presets: ['module:@react-native/babel-preset'],
-    plugins: [
-      isAndroid
-        ? './node_modules/r3-hack/node_modules/react-native-reanimated/plugin'
-        : 'react-native-worklets/plugin'
-    ]
+    plugins: ['react-native-worklets/plugin']
   }
 }

eslint.config.mjs

@@ -170,7 +170,7 @@ export default [
       'src/components/charts/SwipeChart.tsx',
 
       'src/components/common/AnimatedNumber.tsx',
-      'src/components/common/BlurBackground.tsx',
+
       'src/components/common/CrossFade.tsx',
       'src/components/common/DotsBackground.tsx',
 
@@ -184,7 +184,7 @@ export default [
       'src/components/FioAddress/FioActionSubmit.tsx',
       'src/components/FioAddress/FioName.tsx',
       'src/components/hoc/maybeComponent.tsx',
-      'src/components/hoc/styled.tsx',
+
       'src/components/hoc/withExtendedTouchable.tsx',
 
       'src/components/icons/FiatIcon.tsx',
@@ -238,7 +238,7 @@ export default [
       'src/components/navigation/EdgeLogoHeader.tsx',
       'src/components/navigation/FlashNotification.tsx',
       'src/components/navigation/GuiPluginBackButton.tsx',
-      'src/components/navigation/HeaderBackground.tsx',
+
       'src/components/navigation/HeaderTextButton.tsx',
       'src/components/navigation/HeaderTitle.tsx',
       'src/components/navigation/NavigationButton.tsx',
@@ -361,12 +361,10 @@ export default [
       'src/components/themed/ExplorerCard.tsx',
       'src/components/themed/Fade.tsx',
 
-      'src/components/themed/FioRequestRow.tsx',
-
       'src/components/themed/LineTextDivider.tsx',
       'src/components/themed/MainButton.tsx',
       'src/components/themed/ManageTokensRow.tsx',
-      'src/components/themed/MenuTabs.tsx',
+
       'src/components/themed/ModalParts.tsx',
       'src/components/themed/PinDots.tsx',
 
@@ -494,7 +492,7 @@ export default [
       'src/styles/common/textStyles.tsx',
       'src/styles/common/textStylesThemed.ts',
       'src/types/reactRedux.ts',
-      'src/util/borrowUtils.ts',
+
       'src/util/cleaners.ts',
 
       'src/util/crypto.ts',

ios/Podfile

@@ -13,10 +13,8 @@ require_relative '../node_modules/react-native-permissions/scripts/setup'
 $RNFirebaseAnalyticsWithoutAdIdSupport = true
 $RNFirebaseAsStaticFramework = true
 
-# The min_ios_version_supported is iOS 13.4 for RN 74:
-# However any device that can use iOS 13.4 can also upgrade to iOS 15.6 which
-# is still supported by the latest version of Xcode for debugging
-ios_platform_version = '15.6'
+# Expo SDK 56 / React Native 0.85 require a minimum deployment target of iOS 16.4.
+ios_platform_version = '16.4'
 platform :ios, ios_platform_version
 prepare_react_native_project!
 
@@ -44,7 +42,25 @@ target 'edge' do
       Pod::UI.warn e
     end
   end
-  config = use_native_modules!
+  # Expo SDK 56 autolinking: feed expo's unified native-module config (which
+  # registers ExpoModulesCore + expo modules + RN community modules) into
+  # use_native_modules!.
+  if ENV['EXPO_USE_COMMUNITY_AUTOLINKING'] == '1'
+    config_command = ['node', '-e', "process.argv=['', '', 'config'];require('@react-native-community/cli').run()"]
+  else
+    config_command = [
+      'node',
+      '--no-warnings',
+      '--eval',
+      'require(\'expo/bin/autolinking\')',
+      'expo-modules-autolinking',
+      'react-native-config',
+      '--json',
+      '--platform',
+      'ios'
+    ]
+  end
+  config = use_native_modules!(config_command)
 
   use_react_native!(
     :path => config[:reactNativePath],
@@ -61,6 +77,20 @@ target 'edge' do
       target.build_configurations.each do |config|
         config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_platform_version
 
+        # Allow non-modular includes (e.g. @react-native-firebase headers that
+        # include <React/RCTConvert.h>) under use_frameworks! + Xcode 26's strict
+        # explicit-modules scanning, which otherwise errors on RNFBApp.
+        config.build_settings['CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES'] = 'YES'
+
+        # @react-native-firebase wrappers import React/Firebase headers
+        # textually (#import, not @import). Under clang modules + use_frameworks
+        # on Xcode 26 this fails ("RCTPromiseRejectBlock must be imported from
+        # module RNFBApp.RNFBAppModule"). Build the RNFB pods without modules so
+        # their textual imports resolve directly.
+        if target.name.start_with?('RNFB')
+          config.build_settings['CLANG_ENABLE_MODULES'] = 'NO'
+        end
+
         # Xcode 17+ / iOS 26 SDK workaround: Re-enable std::allocator<const T>
         # which was removed for stricter C++ standard compliance.
         # See: https://github.com/getsentry/sentry-cocoa/issues/5172