OPS: Update RN

Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 ruby '>= 2.6.10'
 
 gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
 gem "fastlane"

android/app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
+apply plugin: "org.jetbrains.kotlin.android"
 
 /**
  * This is the configuration block to customize your React Native Android app.
@@ -70,7 +71,7 @@ def jscFlavor = 'org.webkit:android-jsc-intl:+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
-
+    buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     namespace "io.bluewallet.bluewallet"

android/app/src/debug/AndroidManifest.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
     <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
     </application>
 </manifest>

android/app/src/main/java/io/bluewallet/bluewallet/MainActivity.java

@@ -1,42 +0,0 @@
-package io.bluewallet.bluewallet;
-
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactActivityDelegate;
-
-public class MainActivity extends ReactActivity {
-
-    /**
-     * Returns the name of the main component registered from JavaScript.
-     * This is used to schedule rendering of the component.
-     */
-    @Override
-    protected String getMainComponentName() {
-        return "BlueWallet";
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(null);
-        if (getResources().getBoolean(R.bool.portrait_only)) {
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        }
-    }
-
-    /**
-     * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
-     * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
-     * (aka React 18) with two boolean flags.
-     */
-    @Override
-    protected ReactActivityDelegate createReactActivityDelegate() {
-        return new DefaultReactActivityDelegate(
-                this,
-                getMainComponentName(),
-                // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-                DefaultNewArchitectureEntryPoint.getFabricEnabled());
-    }
-}

android/app/src/main/java/io/bluewallet/bluewallet/MainActivity.kt

@@ -0,0 +1,39 @@
+package io.bluewallet.bluewallet
+
+import android.content.pm.ActivityInfo
+import android.os.Bundle
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+
+class MainActivity : ReactActivity() {
+
+    /**
+     * Returns the name of the main component registered from JavaScript.
+     * This is used to schedule rendering of the component.
+     */
+    override fun getMainComponentName(): String {
+        return "BlueWallet"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(null)
+        if (resources.getBoolean(R.bool.portrait_only)) {
+            requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+        }
+    }
+
+    /**
+     * Returns the instance of the [ReactActivityDelegate]. Here we use a util class [DefaultReactActivityDelegate]
+     * which allows you to easily enable Fabric and Concurrent React (aka React 18) with two boolean flags.
+     */
+    override fun createReactActivityDelegate(): ReactActivityDelegate {
+        return DefaultReactActivityDelegate(
+            this,
+            mainComponentName,
+            // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+            DefaultNewArchitectureEntryPoint.getFabricEnabled()
+        )
+    }
+}

android/app/src/main/java/io/bluewallet/bluewallet/MainApplication.java

@@ -1,80 +0,0 @@
-package io.bluewallet.bluewallet;
-
-import android.app.Application;
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.bugsnag.android.Bugsnag;
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactNativeHost;
-import com.facebook.soloader.SoLoader;
-import java.lang.reflect.InvocationTargetException;
-import com.facebook.react.modules.i18nmanager.I18nUtil;
-import java.util.List;
-
-public class MainApplication extends Application implements ReactApplication {
-
-  private final ReactNativeHost mReactNativeHost =
-      new DefaultReactNativeHost(this) {
-        @Override
-        public boolean getUseDeveloperSupport() {
-          return BuildConfig.DEBUG;
-        }
-
-        @Override
-        protected List<ReactPackage> getPackages() {
-          @SuppressWarnings("UnnecessaryLocalVariable")
-          List<ReactPackage> packages = new PackageList(this).getPackages();
-          // Packages that cannot be autolinked yet can be added manually here, for example:
-          // packages.add(new MyReactNativePackage());
-          return packages;
-        }
-
-        @Override
-        protected String getJSMainModuleName() {
-          return "index";
-        }
-
-           @Override
-	        protected boolean isNewArchEnabled() {
-	          return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-	        }
-	
-	        @Override
-	        protected Boolean isHermesEnabled() {
-	          return BuildConfig.IS_HERMES_ENABLED;
-	        }
-      };
-
-  @Override
-  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance();
-    sharedI18nUtilInstance.allowRTL(getApplicationContext(), true);
-    SoLoader.init(this, /* native exopackage */ false);
-      if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-	      // If you opted-in for the New Architecture, we load the native entry point for this app.
-	      DefaultNewArchitectureEntryPoint.load();
-	    }
-      SharedPreferences sharedPref = getApplicationContext().getSharedPreferences("group.io.bluewallet.bluewallet", Context.MODE_PRIVATE);
-
-      // Retrieve the "donottrack" value. Default to "0" if not found.
-      String isDoNotTrackEnabled = sharedPref.getString("donottrack", "0");
-
-      // Check if do not track is not enabled and initialize Bugsnag if so
-      if (!isDoNotTrackEnabled.equals("1")) {
-          // Initialize Bugsnag or your error tracking here
-          Bugsnag.start(this);
-      }
-  }
-}

android/app/src/main/java/io/bluewallet/bluewallet/MainApplication.kt

@@ -0,0 +1,69 @@
+package io.bluewallet.bluewallet
+
+import android.app.Application
+import android.content.Context
+import android.content.SharedPreferences
+import com.bugsnag.android.Bugsnag
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactInstanceManager
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
+import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.soloader.SoLoader
+import com.facebook.react.modules.i18nmanager.I18nUtil
+
+class MainApplication : Application(), ReactApplication {
+
+    private val mReactNativeHost = object : DefaultReactNativeHost(this) {
+        override fun getUseDeveloperSupport(): Boolean {
+            return BuildConfig.DEBUG
+        }
+
+        override fun getPackages(): List<ReactPackage> {
+            val packages = PackageList(this).packages
+            // Packages that cannot be autolinked yet can be added manually here, for example:
+            // packages.add(MyReactNativePackage())
+            return packages
+        }
+
+        override fun getJSMainModuleName(): String {
+            return "index"
+        }
+
+        override fun isNewArchEnabled(): Boolean {
+            return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+        }
+
+        override fun isHermesEnabled(): Boolean {
+            return BuildConfig.IS_HERMES_ENABLED
+        }
+    }
+
+    override fun getReactNativeHost(): ReactNativeHost {
+        return mReactNativeHost
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        val sharedI18nUtilInstance = I18nUtil.getInstance()
+        sharedI18nUtilInstance.allowRTL(applicationContext, true)
+        SoLoader.init(this, /* native exopackage */ false)
+        
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            // If you opted-in for the New Architecture, we load the native entry point for this app.
+            DefaultNewArchitectureEntryPoint.load()
+        }
+
+        val sharedPref = applicationContext.getSharedPreferences("group.io.bluewallet.bluewallet", Context.MODE_PRIVATE)
+
+        // Retrieve the "donottrack" value. Default to "0" if not found.
+        val isDoNotTrackEnabled = sharedPref.getString("donottrack", "0")
+
+        // Check if do not track is not enabled and initialize Bugsnag if so
+        if (isDoNotTrackEnabled != "1") {
+            // Initialize Bugsnag or your error tracking here
+            Bugsnag.start(this)
+        }
+    }
+}

android/build.gradle

@@ -5,15 +5,15 @@ buildscript {
         minSdkVersion = 24
         supportLibVersion = "28.0.0"
         buildToolsVersion = "34.0.0"
-        compileSdkVersion = 33
+        compileSdkVersion = 34
-        targetSdkVersion = 33
+        targetSdkVersion = 34
         googlePlayServicesVersion = "16.+"
         googlePlayServicesIidVersion = "16.0.1"
         firebaseVersion = "17.3.4"
         firebaseMessagingVersion = "21.1.0"
 
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-        ndkVersion = "23.1.7779620"
+        ndkVersion = "25.1.8937393"
         kotlin_version = '1.9.23'
         kotlinVersion = '1.9.20'
     }
@@ -26,7 +26,7 @@ buildscript {
         classpath("com.bugsnag:bugsnag-android-gradle-plugin:5.+")
         classpath 'com.google.gms:google-services:4.4.1'  // Google Services plugin
     	classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
 
     }
 }
@@ -89,3 +89,5 @@ subprojects { subproject ->
             project.configurations { compile { } }
         }
 }
+
+apply plugin: "com.facebook.react.rootproject"

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
-#Tue Jul 21 23:04:55 CDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
-networkTimeout=10000

android/gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

babel.config.js

@@ -1,4 +1,4 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
   plugins: ['react-native-reanimated/plugin'], // required by react-native-reanimated v2 https://docs.swmansion.com/react-native-reanimated/docs/installation/
 };

ios/BlueWallet.xcodeproj/project.pbxproj

@@ -2037,7 +2037,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -2091,6 +2091,7 @@
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 4.2;
+				USE_HERMES = true;
 			};
 			name = Debug;
 		};
@@ -2099,7 +2100,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -2149,6 +2150,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_VERSION = 4.2;
+				USE_HERMES = true;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

ios/BlueWallet/AppDelegate.mm

@@ -55,6 +55,11 @@ NSUserDefaults *group = [[NSUserDefaults alloc] initWithSuiteName:@"group.io.blu
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+  return [self getBundleURL];
+}
+
+- (NSURL *)getBundleURL
 {
 #if DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];

ios/BlueWallet/Info.plist

@@ -132,6 +132,8 @@
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
+		<false/>
+		<key>NSAllowsLocalNetworking</key>
 		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>

ios/Podfile

@@ -44,13 +44,9 @@ end
 def configure_target()
   config = use_native_modules!
 
-  flags = get_default_flags()
-
   use_react_native!(
     # Specify the path directly if use_native_modules! does not provide it
     :path => config[:reactNativePath],
-    :hermes_enabled => true,
-    :fabric_enabled => flags[:fabric_enabled],
     :app_path => "#{Pod::Config.instance.installation_root}/.."
 
   )
@@ -86,6 +82,5 @@ post_install do |installer|
         config.build_settings['DEVELOPMENT_TEAM'] = "A7W54YZ4WU"
       end
     end
-    __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
 end

metro.config.js

@@ -1,11 +1,12 @@
-/**
+const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
- * Metro configuration for React Native
- * https://github.com/facebook/react-native
- *
- * @format
- */
 
-module.exports = {
+const defaultConfig = getDefaultConfig(__dirname);
+
+const {
+  resolver: { sourceExts, assetExts },
+} = getDefaultConfig(__dirname);
+
+const config = {
   transformer: {
     getTransformOptions: async () => ({
       transform: {
@@ -14,4 +15,10 @@ module.exports = {
       },
     }),
   },
+  resolver: {
+    assetExts: assetExts.filter(ext => ext !== 'svg'),
+    sourceExts: [...sourceExts, 'svg'],
+  },
 };
+
+module.exports = mergeConfig(defaultConfig, config);

package.json

@@ -10,16 +10,16 @@
     "@babel/core": "^7.20.0",
     "@babel/runtime": "^7.20.0",
     "@jest/reporters": "^27.5.1",
-    "@react-native/eslint-config": "^0.74.0",
+    "@react-native/eslint-config": "^0.74.1",
     "@react-native/metro-config": "^0.74.0",
-    "@tsconfig/react-native": "^3.0.2",
+    "@react-native/typescript-config": "0.73.1",
     "@types/bip38": "^3.1.2",
     "@types/bs58check": "^2.1.0",
     "@types/create-hash": "^1.2.2",
     "@types/crypto-js": "^4.2.2",
-    "@types/jest": "^29.4.0",
+    "@types/jest": "^29.5.2",
     "@types/react": "^18.2.16",
-    "@types/react-native": "^0.72.0",
+    "@types/react-native": "^0.73.0",
     "@types/react-test-renderer": "^18.0.0",
     "@types/wif": "^2.0.5",
     "@typescript-eslint/eslint-plugin": "^6.2.0",
@@ -35,7 +35,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-react-native": "^4.0.0",
-    "jest": "^29.4.2",
+    "jest": "^29.5.2",
     "node-fetch": "^2.6.7",
     "prettier": "^3.0.0",
     "react-test-renderer": "18.2.0",
@@ -43,7 +43,7 @@
     "typescript": "^5.1.6"
   },
   "engines": {
-    "node": ">=16",
+    "node": ">=18",
     "npm": ">=6.9.0"
   },
   "scripts": {
@@ -126,7 +126,7 @@
     "coinselect": "3.1.13",
     "crypto-js": "4.2.0",
     "dayjs": "1.11.11",
-    "detox": "20.18.4",
+    "detox": "20.20.3",
     "ecpair": "2.0.1",
     "ecurve": "1.0.6",
     "electrum-client": "github:BlueWallet/rn-electrum-client#1bfe3cc",
@@ -142,7 +142,7 @@
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-localization": "github:BlueWallet/react-localization#ae7969a",
-    "react-native": "0.72.14",
+    "react-native": "0.73.8",
     "react-native-biometrics": "3.0.1",
     "react-native-blue-crypto": "github:BlueWallet/react-native-blue-crypto#3cb5442",
     "react-native-camera-kit": "13.0.0",

tsconfig.json

@@ -14,6 +14,6 @@
     "resolveJsonModule": true,
     "module": "esnext",
   },
-  "extends": "@tsconfig/react-native/tsconfig.json",
+  "extends": "@react-native/typescript-config/tsconfig.json",
   "exclude": ["node_modules", "babel.config.js", "metro.config.js", "jest.config.js", "components/react-native-draggable-flatlist", "scripts/maccatalystpatches"],
 }