Merge branch 'develop' into bugfix/17945

.clj-kondo/nubank/matcher-combinators/config.edn

@@ -0,0 +1,4 @@
+{:linters
+ {:unresolved-symbol
+  {:exclude [(cljs.test/is [match? thrown-match?])
+             (clojure.test/is [match? thrown-match?])]}}}

.eslintrc.js

@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: '@react-native-community',
+  extends: '@react-native',
 };

.gitignore

@@ -36,6 +36,10 @@ project.xcworkspace
 **/android/.project
 **/android/.settings/org.eclipse.buildship.core.prefs
 local.properties
+*.hprof
+.cxx/
+*.keystore
+!debug.keystore
 
 # Atom
 .tags*
@@ -194,3 +198,4 @@ lefthook.yml
 ## clj-kondo
 /.clj-kondo/taoensso/*
 /.clj-kondo/babashka/*
+/.clj-kondo/rewrite-clj/rewrite-clj/config.edn

Makefile

@@ -263,7 +263,7 @@ run-clojure: export TARGET := clojure
 run-clojure: ##@run Watch for and build Clojure changes for mobile
 	yarn shadow-cljs watch mobile
 
-run-metro: export TARGET := clojure
+run-metro: export TARGET := android
 run-metro: ##@run Start Metro to build React Native changes
 	@scripts/start-react-native.sh
 
@@ -368,7 +368,7 @@ component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 	@@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
 	yarn install
-	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js' -e cljs
+	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs
 
 component-test: export TARGET := clojure
 component-test: export COMPONENT_TEST := true
@@ -378,7 +378,7 @@ component-test: ##@test Run component tests once in NodeJS
 	rm -rf ./component-spec
 	yarn install
 	yarn shadow-cljs compile component-test && \
-	jest --config=test/jest/jest.config.js
+	jest --clearCache && jest --config=test/jest/jest.config.js --testEnvironment node
 
 #--------------
 # Other

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          android:installLocation="auto"
-          package="im.status.ethereum">
+          android:installLocation="auto">
 
     <!-- non-dangerous permissions -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -17,11 +16,11 @@
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-                     android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application

android/app/src/main/java/im/status/ethereum/MainActivity.java

@@ -23,7 +23,8 @@
 import android.os.Bundle;
 import android.os.Handler;
 import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactRootView;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactActivityDelegate;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
@@ -32,7 +33,6 @@
 import com.reactnativenavigation.NavigationActivity;
 import com.facebook.react.modules.core.PermissionListener;
 import androidx.core.splashscreen.SplashScreen;
-import com.facebook.react.ReactActivity;
 
 import java.util.Properties;
 import im.status.ethereum.module.StatusThreadPoolExecutor;
@@ -46,6 +46,14 @@ public class MainActivity extends NavigationActivity
     private boolean keepSplash = true;
     private final int SPLASH_DELAY = 3200;
 
+     /**
+       * Returns the name of the main component registered from JavaScript. This is used to schedule
+       * rendering of the component.
+       */
+      protected String getMainComponentName() {
+        return "StatusIm";
+      }
+
     private static void registerUncaughtExceptionHandler(final Context context) {
         final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {

android/app/src/main/java/im/status/ethereum/MainApplication.java

@@ -1,21 +1,17 @@
 package im.status.ethereum;
 
 import androidx.multidex.MultiDexApplication;
-import android.content.Context;
 import android.webkit.WebView;
-import im.status.ethereum.newarchitecture.MainApplicationReactNativeHost;
 import java.lang.reflect.InvocationTargetException;
 import com.facebook.react.PackageList;
 
-import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage;
 import com.facebook.react.ReactApplication;
 import cl.json.RNSharePackage;
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.config.ReactFeatureFlags;
-import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.modules.network.OkHttpClientProvider;
 import com.reactnativecommunity.blurview.BlurViewPackage;
 
@@ -27,7 +23,6 @@
 import im.status.ethereum.StatusOkHttpClientFactory;
 
 import com.facebook.react.bridge.JSIModulePackage;
-import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 
 public class MainApplication extends NavigationApplication {
 
@@ -44,7 +39,6 @@ protected List<ReactPackage> getPackages() {
 
             List<ReactPackage> packages = new PackageList(this).getPackages();
             packages.add(statusPackage);
-            packages.add(new ReactNativeDialogsPackage());
             packages.add(new RNStatusKeycardPackage());
             packages.add(new PushNotificationPackage());
             packages.add(new BlurViewPackage());
@@ -56,32 +50,38 @@ protected String getJSMainModuleName() {
             return "index";
         }
 
-	@Override
-	protected JSIModulePackage getJSIModulePackage() {
-	    return new ReanimatedJSIModulePackage();
-	}
+
+        @Override
+        protected boolean isNewArchEnabled() {
+            return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+        }
+
+        @Override
+        protected Boolean isHermesEnabled() {
+            return BuildConfig.IS_HERMES_ENABLED;
+        }
+
     };
 
-    private final ReactNativeHost mNewArchitectureNativeHost = new MainApplicationReactNativeHost(this);
 
     @Override
     public ReactNativeHost getReactNativeHost() {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-          return mNewArchitectureNativeHost;
-        } else {
-          return mReactNativeHost;
-        }
+       return mReactNativeHost;
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        // If you opted-in for the New Architecture, we enable the TurboModule system
-        ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
 
         OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());
 
         WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
+
+        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();
+        }
+
     }
 
 }