refactor: modularise network manager

* Update wallet events and subs to handle collectibles per account

Additionally,
 - Move collectibles related events to a new events namespace (`status-im.contexts.wallet.events.collectibles`).
 - Update tests to consider collectibles per account.

* Update collectibles tab to handle a current viewing account

.clj-kondo/status-im/config.edn

@@ -1,2 +1,8 @@
-{:hooks   {:analyze-call {utils.i18n/label utils.i18n/label}}
+{:hooks
+ {:analyze-call
+  {utils.i18n/label                                     utils.i18n/label
+   test-helpers.component/get-all-by-translation-text   utils.i18n/label
+   test-helpers.component/get-by-translation-text       utils.i18n/label
+   test-helpers.component/query-all-by-translation-text utils.i18n/label
+   test-helpers.component/query-by-translation-text     utils.i18n/label}}
  :linters {:status-im.linter/invalid-translation-keyword {:level :error}}}

.zprintrc

@@ -18,13 +18,17 @@
              ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-bl
              :respect-bl
 
-             ;; hang multiline left-hand-thing 
+             ;; hang multiline left-hand-thing
              ;; https://github.com/kkinnear/zprint/issues/273
              :multi-lhs-hang]
  :fn-map
  {"reg-sub"         :arg1-pair
   "h/describe"      :arg1-body
+  "h/describe-skip" :arg1-body
+  "h/describe-only" :arg1-body
   "h/test"          :arg1-body
+  "h/test-skip"     :arg1-body
+  "h/test-only"     :arg1-body
   "global.describe" :arg1-body
   "global.test"     :arg1-body
   "list-comp"       :binding

Makefile

@@ -327,7 +327,7 @@ lint-fix: ##@test Run code style checks and fix issues
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
-	clojure-lsp --ns-exclude-regex ".*/src/status_im/core\.cljs$$" clean-ns && \
+	clojure-lsp --ns-exclude-regex ".*/src/status_im/core\.cljs|.*/src/test_helpers/component_tests_preload\.cljs$$" clean-ns && \
 	sh scripts/lint/trailing-newline.sh --fix && \
 	node_modules/.bin/prettier --write .
 
@@ -364,6 +364,7 @@ android-test:
 component-test-watch: export TARGET := clojure
 component-test-watch: export COMPONENT_TEST := true
 component-test-watch: export BABEL_ENV := test
+component-test-watch: export JEST_USE_SILENT_REPORTER := false
 component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 	@@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
@@ -373,6 +374,7 @@ component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 component-test: export TARGET := clojure
 component-test: export COMPONENT_TEST := true
 component-test: export BABEL_ENV := test
+component-test: export JEST_USE_SILENT_REPORTER := false
 component-test: ##@test Run component tests once in NodeJS
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec

android/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"

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

@@ -1,268 +0,0 @@
-package im.status.ethereum;
-
-import android.content.Context;
-import android.annotation.TargetApi;
-import androidx.annotation.Nullable;
-import android.app.AlertDialog;
-import android.app.ActivityManager;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.DialogInterface.OnClickListener;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Looper;
-import android.preference.PreferenceManager;
-import androidx.core.app.ActivityCompat;
-import android.util.Log;
-import android.view.WindowManager;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.provider.Settings;
-import android.os.Bundle;
-import android.os.Handler;
-import com.facebook.react.ReactActivityDelegate;
-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;
-import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
-
-import com.reactnativenavigation.NavigationActivity;
-import com.facebook.react.modules.core.PermissionListener;
-import androidx.core.splashscreen.SplashScreen;
-
-import java.util.Properties;
-import im.status.ethereum.module.StatusThreadPoolExecutor;
-import im.status.ethereum.MainApplication;
-
-public class MainActivity extends NavigationActivity
-        implements ActivityCompat.OnRequestPermissionsResultCallback{
-
-
-    @Nullable private PermissionListener mPermissionListener;
-    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() {
-            @Override
-            public void uncaughtException(final Thread thread, final Throwable t) {
-                // High priority, so don't use StatusThreadPoolExecutor
-                new Thread() {
-                    @Override
-                    public void run() {
-                        Looper.prepare();
-
-                        new AlertDialog.Builder(context)
-                                .setTitle("Error")
-                                .setMessage(t.toString())
-                                .setNegativeButton("Exit", new DialogInterface.OnClickListener() {
-                                    public void onClick(final DialogInterface dialog, final int id) {
-                                        dialog.dismiss();
-                                        defaultUncaughtExceptionHandler.uncaughtException(thread, t);
-                                    }
-                                }).show();
-
-                        Looper.loop();
-                    }
-                }.start();
-            }
-        });
-    }
-
-    private ActivityManager getActivityManager() {
-        return (ActivityManager) this.getSystemService(ACTIVITY_SERVICE);
-    }
-
-    private ActivityManager.MemoryInfo getAvailableMemory(final ActivityManager activityManager) {
-        final ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
-        activityManager.getMemoryInfo(memoryInfo);
-        return memoryInfo;
-    }
-
-    protected void configureStatus() {
-        // Required because of crazy APN settings redirecting localhost (found in GB)
-        Properties properties = System.getProperties();
-        properties.setProperty("http.nonProxyHosts", "localhost|127.0.0.1");
-        properties.setProperty("https.nonProxyHosts", "localhost|127.0.0.1");
-    }
-
-    private Intent createNotificationSettingsIntent() {
-        final Intent intent = new Intent();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
-            intent.putExtra(Settings.EXTRA_APP_PACKAGE, getPackageName());
-        } else {
-            intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-            intent.addCategory(Intent.CATEGORY_DEFAULT);
-            intent.setData(Uri.parse("package:" + getPackageName()));
-        }
-        return intent;
-    }
-
-    private void tryToEmit(String eventName, WritableMap event) {
-        try {
-            ((MainApplication) getApplication()).getReactNativeHost()
-                                                .getReactInstanceManager()
-                                                .getCurrentReactContext()
-                                                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                                                .emit("url", event);
-        } catch(Exception e) {/* we expect NPE on first start, which is OK because we have a fallback */}
-    }
-
-    @Override
-    public void onNewIntent(final Intent intent) {
-        super.onNewIntent(intent);
-        if (intent.getDataString() != null && intent.getData().getScheme().startsWith("app-settings")) {
-          startActivity(createNotificationSettingsIntent());
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
-        setTheme(R.style.DarkTheme);
-        // Make sure we get an Alert for every uncaught exceptions
-        registerUncaughtExceptionHandler(MainActivity.this);
-
-        // Report memory details for this application
-        final ActivityManager activityManager = getActivityManager();
-        Log.v("RNBootstrap", "Available system memory "+getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.getLargeMemoryClass()+"M");
-
-        setSecureFlag();
-
-        // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
-        super.onCreate(null);
-
-        if (!shouldShowRootedNotification()) {
-            configureStatus();
-        } else {
-            AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
-                    .setMessage(getResources().getString(R.string.root_warning))
-                    .setPositiveButton(getResources().getString(R.string.root_okay), new OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            rejectRootedNotification();
-                            dialog.dismiss();
-                            configureStatus();
-                        }
-                    })
-                    .setNegativeButton(getResources().getString(R.string.root_cancel), new OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            dialog.dismiss();
-                            MainActivity.this.finishAffinity();
-                        }
-                    })
-                    .setOnCancelListener(new OnCancelListener() {
-                        @Override
-                        public void onCancel(DialogInterface dialog) {
-                            dialog.dismiss();
-                            MainActivity.this.finishAffinity();
-                        }
-                    })
-                    .create();
-
-            dialog.show();
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                System.loadLibrary("status-logs");
-
-                // when app is started but the Activity has been destroyed, the deep linking url event is
-                // not emitted when coming back to foreground. This is a workaround. If the problem is
-                // resolved in react-native this code should be removed
-                if (getIntent().getData() != null) {
-                    WritableMap event = Arguments.createMap();
-                    event.putString("url", getIntent().getDataString());
-                    // on first start emit will (silently) fail, but the regular deep linking handler will work
-                    tryToEmit("url", event);
-                }
-            }
-        };
-
-        splashScreen.setKeepOnScreenCondition(() -> keepSplash);
-
-        Handler handler = new Handler();
-        handler.postDelayed(() -> keepSplash = false, SPLASH_DELAY);
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
-
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        Intent intent = new Intent("onConfigurationChanged");
-        intent.putExtra("newConfig", newConfig);
-        this.sendBroadcast(intent);
-    }
-
-    private static final String REJECTED_ROOTED_NOTIFICATION = "rejectedRootedNotification";
-    private static final Integer FREQUENCY_OF_REMINDER_IN_PERCENT = 5;
-
-    private boolean shouldShowRootedNotification() {
-        if (RootUtil.isDeviceRooted() && BuildConfig.ENABLE_ROOT_ALERT == "1") {
-            if (userRejectedRootedNotification()) {
-                return ((Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT);
-            } else return true;
-        } else {
-            return false;
-        }
-    }
-
-    private boolean userRejectedRootedNotification() {
-        SharedPreferences preferences = getPreferences(0);
-        return preferences.getBoolean(REJECTED_ROOTED_NOTIFICATION, false);
-    }
-
-    private void rejectRootedNotification() {
-        SharedPreferences preferences = getPreferences(0);
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.putBoolean(REJECTED_ROOTED_NOTIFICATION, true);
-        editor.commit();
-    }
-
-    private void setSecureFlag() {
-        final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-        final boolean setSecure = sharedPrefs.getBoolean("BLANK_PREVIEW", false);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && setSecure) {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
-        } else {
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.M)
-    public void requestPermissions(String[] permissions, int requestCode, PermissionListener listener) {
-        mPermissionListener = listener;
-        requestPermissions(permissions, requestCode);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        if (mPermissionListener != null && mPermissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
-            mPermissionListener = null;
-        }
-    }
-}

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

@@ -0,0 +1,236 @@
+package im.status.ethereum
+
+import android.annotation.TargetApi
+import android.app.ActivityManager
+import android.app.AlertDialog
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.preference.PreferenceManager
+import android.provider.Settings
+import android.util.Log
+import android.view.WindowManager
+import androidx.annotation.Nullable
+import androidx.core.app.ActivityCompat
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.facebook.react.modules.core.PermissionListener
+import com.reactnativenavigation.NavigationActivity
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView
+import im.status.ethereum.MainApplication
+import im.status.ethereum.module.StatusThreadPoolExecutor
+import java.util.Properties
+
+class MainActivity : NavigationActivity(), ActivityCompat.OnRequestPermissionsResultCallback {
+
+    @Nullable
+    private var mPermissionListener: PermissionListener? = null
+    private var keepSplash = true
+    private val SPLASH_DELAY = 3200
+
+    /**
+     * Returns the name of the main component registered from JavaScript. This is used to schedule
+     * rendering of the component.
+     */
+    protected fun getMainComponentName(): String {
+        return "StatusIm"
+    }
+
+    private fun registerUncaughtExceptionHandler(context: Context) {
+        val defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler()
+        // High priority, so don't use StatusThreadPoolExecutor
+        Thread.setDefaultUncaughtExceptionHandler { thread, t ->
+            Thread {
+                Looper.prepare()
+                AlertDialog.Builder(context)
+                    .setTitle("Error")
+                    .setMessage(t.toString())
+                    .setNegativeButton("Exit") { dialog, id ->
+                        dialog.dismiss()
+                        defaultUncaughtExceptionHandler.uncaughtException(thread, t)
+                    }.show()
+                Looper.loop()
+            }.start()
+        }
+    }
+
+    private fun getActivityManager(): ActivityManager {
+        return getSystemService(ACTIVITY_SERVICE) as ActivityManager
+    }
+
+    private fun getAvailableMemory(activityManager: ActivityManager): ActivityManager.MemoryInfo {
+        val memoryInfo = ActivityManager.MemoryInfo()
+        activityManager.getMemoryInfo(memoryInfo)
+        return memoryInfo
+    }
+
+    protected fun configureStatus() {
+        // Required because of crazy APN settings redirecting localhost (found in GB)
+        val properties = System.getProperties()
+        properties.setProperty("http.nonProxyHosts", "localhost|127.0.0.1")
+        properties.setProperty("https.nonProxyHosts", "localhost|127.0.0.1")
+    }
+
+    private fun createNotificationSettingsIntent(): Intent {
+        val intent = Intent()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
+        } else {
+            intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+            intent.addCategory(Intent.CATEGORY_DEFAULT)
+            intent.data = Uri.parse("package:$packageName")
+        }
+        return intent
+    }
+
+    private fun tryToEmit(eventName: String, event: WritableMap) {
+        try {
+                (getApplication() as MainApplication).getReactNativeHost()
+                .getReactInstanceManager()
+                .getCurrentReactContext()
+                ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                ?.emit("url", event)
+            } catch (e: Exception) { // we expect NPE on first start, which is OK because we have a fallback
+            }
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        if (intent.dataString != null && intent.data!!.scheme!!.startsWith("app-settings")) {
+            startActivity(createNotificationSettingsIntent())
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        val splashScreen = installSplashScreen();
+        setTheme(R.style.DarkTheme)
+        // Make sure we get an Alert for every uncaught exceptions
+        registerUncaughtExceptionHandler(this)
+
+        // Report memory details for this application
+        val activityManager = getActivityManager()
+        Log.v("RNBootstrap", "Available system memory " + getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.largeMemoryClass + "M")
+
+        setSecureFlag()
+
+        // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
+        super.onCreate(null)
+
+        if (!shouldShowRootedNotification()) {
+            configureStatus()
+        } else {
+            val dialog = AlertDialog.Builder(this)
+                .setMessage(resources.getString(R.string.root_warning))
+                .setPositiveButton(resources.getString(R.string.root_okay)) { dialog, which ->
+                    rejectRootedNotification()
+                    dialog.dismiss()
+                    configureStatus()
+                }
+                .setNegativeButton(resources.getString(R.string.root_cancel)) { dialog, which ->
+                    dialog.dismiss()
+                    finishAffinity()
+                }
+                .setOnCancelListener {
+                    it.dismiss()
+                    finishAffinity()
+                }
+                .create()
+
+            dialog.show()
+        }
+
+        val r = Runnable {
+            System.loadLibrary("status-logs")
+
+            // when app is started but the Activity has been destroyed, the deep linking url event is
+            // not emitted when coming back to foreground. This is a workaround. If the problem is
+            // resolved in react-native this code should be removed
+            if (intent.data != null) {
+                val event = Arguments.createMap()
+                event.putString("url", intent.dataString)
+                // on first start emit will (silently) fail, but the regular deep linking handler will work
+                tryToEmit("url", event)
+            }
+        }
+
+        splashScreen.setKeepOnScreenCondition { keepSplash }
+
+        val handler = Handler()
+        handler.postDelayed({ keepSplash = false }, SPLASH_DELAY.toLong())
+
+        StatusThreadPoolExecutor.getInstance().execute(r)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        val intent = Intent("onConfigurationChanged")
+        intent.putExtra("newConfig", newConfig)
+        sendBroadcast(intent)
+    }
+
+    private val REJECTED_ROOTED_NOTIFICATION = "rejectedRootedNotification"
+    private val FREQUENCY_OF_REMINDER_IN_PERCENT = 5
+
+    private fun shouldShowRootedNotification(): Boolean {
+        if (RootUtil.isDeviceRooted() && BuildConfig.ENABLE_ROOT_ALERT == "1") {
+            return if (userRejectedRootedNotification()) {
+                (Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT
+            } else true
+        } else {
+            return false
+        }
+    }
+
+    private fun userRejectedRootedNotification(): Boolean {
+        val preferences = getPreferences(0)
+        return preferences.getBoolean(REJECTED_ROOTED_NOTIFICATION, false)
+    }
+
+    private fun rejectRootedNotification() {
+        val preferences = getPreferences(0)
+        val editor = preferences.edit()
+        editor.putBoolean(REJECTED_ROOTED_NOTIFICATION, true)
+        editor.commit()
+    }
+
+    private fun setSecureFlag() {
+        val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this)
+        val setSecure = sharedPrefs.getBoolean("BLANK_PREVIEW", false)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && setSecure) {
+            window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+        } else {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+        }
+    }
+
+   @TargetApi(Build.VERSION_CODES.M)
+   override fun requestPermissions(permissions: Array<String>, requestCode: Int, listener: PermissionListener) {
+       mPermissionListener = listener
+       super.requestPermissions(permissions, requestCode)
+   }
+
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        if (mPermissionListener != null && mPermissionListener!!.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
+            mPermissionListener = null
+        }
+    }
+}

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

@@ -1,87 +0,0 @@
-package im.status.ethereum;
-
-import androidx.multidex.MultiDexApplication;
-import android.webkit.WebView;
-import java.lang.reflect.InvocationTargetException;
-import com.facebook.react.PackageList;
-
-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.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.modules.network.OkHttpClientProvider;
-import com.reactnativecommunity.blurview.BlurViewPackage;
-
-import java.util.List;
-
-import im.status.ethereum.keycard.RNStatusKeycardPackage;
-import im.status.ethereum.module.StatusPackage;
-import im.status.ethereum.pushnotifications.PushNotificationPackage;
-import im.status.ethereum.StatusOkHttpClientFactory;
-
-import com.facebook.react.bridge.JSIModulePackage;
-
-public class MainApplication extends NavigationApplication {
-
-    private final ReactNativeHost mReactNativeHost = new NavigationReactNativeHost(this) {
-        @Override
-        public boolean getUseDeveloperSupport() {
-            return BuildConfig.DEBUG;
-        }
-
-        @Override
-        protected List<ReactPackage> getPackages() {
-
-            StatusPackage statusPackage = new StatusPackage(RootUtil.isDeviceRooted());
-
-            List<ReactPackage> packages = new PackageList(this).getPackages();
-            packages.add(statusPackage);
-            packages.add(new RNStatusKeycardPackage());
-            packages.add(new PushNotificationPackage());
-            packages.add(new BlurViewPackage());
-            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();
-
-        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();
-        }
-
-    }
-
-}

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

@@ -0,0 +1,61 @@
+package im.status.ethereum
+
+import android.webkit.WebView
+import androidx.multidex.MultiDexApplication
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.JSIModulePackage
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
+import com.facebook.react.modules.network.OkHttpClientProvider
+import com.reactnativenavigation.NavigationApplication
+import com.reactnativenavigation.react.NavigationReactNativeHost
+import cl.json.RNSharePackage
+import com.reactnativecommunity.blurview.BlurViewPackage
+import im.status.ethereum.keycard.RNStatusKeycardPackage
+import im.status.ethereum.module.StatusPackage
+import im.status.ethereum.pushnotifications.PushNotificationPackage
+import im.status.ethereum.StatusOkHttpClientFactory
+
+class MainApplication : NavigationApplication() {
+
+    private val mReactNativeHost = object : NavigationReactNativeHost(this) {
+        override fun getUseDeveloperSupport(): Boolean {
+            return BuildConfig.DEBUG
+        }
+
+        override fun getPackages(): List<ReactPackage> {
+            val statusPackage = StatusPackage(RootUtil.isDeviceRooted())
+            val packages = PackageList(this).getPackages()
+            packages.add(statusPackage)
+            packages.add(RNStatusKeycardPackage())
+            packages.add(PushNotificationPackage())
+            packages.add(BlurViewPackage())
+            return packages
+        }
+
+        override fun getJSMainModuleName(): String = "index"
+
+        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+
+        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
+    }
+
+    override fun getReactNativeHost(): ReactNativeHost {
+        return mReactNativeHost
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+
+        OkHttpClientProvider.setOkHttpClientFactory(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()
+        }
+    }
+}

android/app/src/main/java/im/status/ethereum/StatusOKHttpClientFactory.kt

@@ -0,0 +1,88 @@
+package im.status.ethereum
+
+import android.util.Log
+import com.facebook.react.modules.network.OkHttpClientFactory
+import com.facebook.react.modules.network.OkHttpClientProvider
+import okhttp3.OkHttpClient
+import okhttp3.tls.HandshakeCertificates
+import java.io.ByteArrayInputStream
+import java.lang.RuntimeException
+import java.lang.reflect.Field
+import java.lang.reflect.Method
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import im.status.ethereum.module.StatusPackage
+
+class StatusOkHttpClientFactory : OkHttpClientFactory {
+
+    companion object {
+        private const val TAG = "StatusOkHttpClientFactory"
+        private const val SLEEP_DURATION = 500L // milliseconds
+    }
+
+    override fun createNewNetworkModuleClient(): OkHttpClient? {
+        val certPem = getCertificatePem().takeIf { it.isNotEmpty() }
+            ?: return logAndReturnNull("Certificate is empty, cannot create OkHttpClient without a valid certificate")
+
+        val cert = try {
+            induceSleep()
+            // Convert PEM certificate string to X509Certificate object
+            CertificateFactory.getInstance("X.509")
+                .generateCertificate(ByteArrayInputStream(certPem.toByteArray())) as? X509Certificate
+                ?: return logAndReturnNull("Certificate could not be parsed as non-null")
+        } catch (e: Exception) {
+            return logAndReturnNull("Could not parse certificate", e)
+        }
+
+        val clientCertificates = try {
+            induceSleep()
+            // Create HandshakeCertificates object with our certificate
+            HandshakeCertificates.Builder()
+                .addPlatformTrustedCertificates()
+                .addTrustedCertificate(cert)
+                .build()
+        } catch (e: Exception) {
+            return logAndReturnNull("Could not build HandshakeCertificates", e)
+        }
+
+        return try {
+            OkHttpClientProvider.createClientBuilder()
+                .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager)
+                .build()
+        } catch (e: Exception) {
+            logAndReturnNull("Could not create OkHttpClient", e)
+        }
+    }
+
+    private fun getCertificatePem(): String {
+        return try {
+            // Create OkHttpClient with custom SSL socket factory and trust manager
+            StatusPackage.getImageTLSCert().takeIf { !it.isNullOrBlank() }
+                ?: logAndReturnEmpty("Certificate PEM string is null or empty")
+        } catch (e: Exception) {
+            logAndReturnEmpty("Could not getImageTLSCert", e)
+        }
+    }
+
+    private fun induceSleep() {
+        try {
+            // induce half second sleep because sometimes a cert is not immediately available
+            // TODO : remove sleep if App no longer crashes on Android 10 devices with
+            // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
+            Thread.sleep(SLEEP_DURATION)
+        } catch (e: InterruptedException) {
+            Log.e(TAG, "Sleep interrupted", e)
+        }
+    }
+
+    private fun logAndReturnNull(message: String, e: Exception? = null): Nothing? {
+        Log.e(TAG, message, e)
+        return null
+    }
+
+    private fun logAndReturnEmpty(message: String, e: Exception? = null): String {
+        Log.e(TAG, message, e)
+        return ""
+    }
+}
+

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

@@ -1,95 +0,0 @@
-package im.status.ethereum;
-
-import android.util.Log;
-
-import com.facebook.react.modules.network.OkHttpClientFactory;
-import com.facebook.react.modules.network.OkHttpClientProvider;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Interceptor;
-import okhttp3.tls.HandshakeCertificates;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.lang.RuntimeException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-
-import im.status.ethereum.module.StatusPackage;
-
-class StatusOkHttpClientFactory implements OkHttpClientFactory {
-
-  private static final String TAG = "StatusOkHttpClientFactory";
-
-  public OkHttpClient createNewNetworkModuleClient() {
-      X509Certificate cert = null;
-      HandshakeCertificates clientCertificates;
-      String certPem = "";
-      // Get TLS PEM certificate from status-go
-      try {
-         // induce half second sleep because sometimes a cert is not immediately available
-         // TODO : remove sleep if App no longer crashes on Android 10 devices with
-         // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-         Thread.sleep(500);
-         certPem = getCertificatePem();
-      } catch(Exception e) {
-          Log.e(TAG, "Could not getImageTLSCert",e);
-      }
-
-      if (certPem.isEmpty()) {
-          Log.e(TAG, "Certificate is empty, cannot create OkHttpClient without a valid certificate");
-          return null;
-      }
-
-      // Convert PEM certificate string to X509Certificate object
-    try {
-      // induce half second sleep because sometimes a cert is not immediately available
-      // TODO : remove sleep if App no longer crashes on Android 10 devices
-      // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-      Thread.sleep(500);
-      CertificateFactory cf = CertificateFactory.getInstance("X.509");
-      cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(certPem.getBytes()));
-    } catch(Exception e) {
-      Log.e(TAG, "Could not parse certificate",e);
-    }
-    // Create HandshakeCertificates object with our certificate
-    try {
-      // induce half second sleep because sometimes a cert is not immediately available
-      // TODO : remove sleep if App no longer crashes on Android 10 devices
-      // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-      Thread.sleep(500);
-      clientCertificates = new HandshakeCertificates.Builder()
-        .addPlatformTrustedCertificates()
-        .addTrustedCertificate(cert)
-        .build();
-    } catch(Exception e) {
-      Log.e(TAG, "Could not build HandshakeCertificates", e);
-      return null;
-    }
-
-    // Create OkHttpClient with custom SSL socket factory and trust manager
-    try {
-       return OkHttpClientProvider.createClientBuilder()
-        .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager())
-        .build();
-    } catch(Exception e) {
-      Log.e(TAG, "Could not create OkHttpClient", e);
-      return null;
-    }
-  }
-    private String getCertificatePem() {
-        try {
-            String certPem = StatusPackage.getImageTLSCert();
-            if (certPem == null || certPem.trim().isEmpty()) {
-                Log.e(TAG, "Certificate PEM string is null or empty");
-                return "";
-            }
-            return certPem;
-        } catch (Exception e) {
-            Log.e(TAG, "Could not getImageTLSCert", e);
-            return "";
-        }
-    }
-}

android/build.gradle

@@ -5,7 +5,7 @@
 */
 ext {
     // kotlin_version is needed for react-native-camera-kit library
-    kotlin_version      = project.kotlinVersion
+    kotlin_version      = project.kotlinPluginVersion
     RNNKotlinVersion    = project.kotlinPluginVersion
     RNGH_kotlinVersion  = project.kotlinPluginVersion
     buildToolsVersion   = project.buildToolsVersion
@@ -14,8 +14,7 @@ ext {
     targetSdkVersion    = Integer.valueOf(project.targetSdkVersion)
     supportLibVersion   = project.supportLibVersion
     gradlePluginVersion = project.gradlePluginVersion
-    kotlinPluginVersion = project.kotlinPluginVersion
-
+    kotlinVersion       = project.kotlinPluginVersion
     ndkVersion = "25.2.9519653"
 }
 

android/gradle.properties

@@ -21,7 +21,6 @@
 # $keytool -genkey -v -keystore ./status-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias status
 
 # Version requirements used throughout the Gradle scripts
-kotlinVersion=1.7.22
 minSdkVersion=24
 compileSdkVersion=33
 targetSdkVersion=33

ios/Podfile.lock

@@ -340,7 +340,7 @@ PODS:
     - React
   - react-native-transparent-video (0.1.0):
     - React-Core
-  - react-native-webview (13.3.1):
+  - react-native-webview (13.6.3):
     - React-Core
   - React-NativeModulesApple (0.72.5):
     - React-callinvoker
@@ -838,7 +838,7 @@ SPEC CHECKSUMS:
   react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
   react-native-status-keycard: f1c1227b2d5984c10fb44db68e4bfd2937f31e98
   react-native-transparent-video: e484ad11ace8e5f62516e2c5e15efd3cb4df24b0
-  react-native-webview: c2b70afb1d910cdd8810375aecc6c2894e2ba061
+  react-native-webview: 88293a0f23eca8465c0433c023ec632930e644d0
   React-NativeModulesApple: c6529c637f2e886aab44c48d66cabef2d4fd1138
   React-perflogger: cd8886513f68e1c135a1e79d20575c6489641597
   React-RCTActionSheet: 726d2615ca62a77ce3e2c13d87f65379cdc73498

modules/react-native-status/android/src/main/java/im/status/ethereum/module/AccountManager.java

@@ -0,0 +1,402 @@
+package im.status.ethereum.module;
+
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import statusgo.Statusgo;
+import android.net.Uri;
+import android.os.Environment;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.IOException;
+import org.json.JSONObject;
+import org.json.JSONException;
+import android.util.Log;
+import android.content.Context;
+import android.app.Activity;
+
+public class AccountManager extends ReactContextBaseJavaModule {
+    private static final String TAG = "AccountManager";
+    private static final String gethLogFileName = "geth.log";
+    private ReactApplicationContext reactContext;
+
+    private Utils utils;
+    private LogManager logManager;
+
+    public AccountManager(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+        this.utils = new Utils(reactContext);
+        this.logManager = new LogManager(reactContext);
+    }
+
+    @Override
+    public String getName() {
+        return "AccountManager";
+    }
+
+    private String getTestnetDataDir(final String absRootDirPath) {
+        return this.utils.pathCombine(absRootDirPath, "ethereum/testnet");
+    }
+
+    @ReactMethod
+    public void createAccountAndLogin(final String createAccountRequest) {
+        Log.d(TAG, "createAccountAndLogin");
+        String result = Statusgo.createAccountAndLogin(createAccountRequest);
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "createAccountAndLogin success: " + result);
+            Log.d(TAG, "Geth node started");
+        } else {
+            Log.e(TAG, "createAccountAndLogin failed: " + result);
+        }
+    }
+
+    @ReactMethod
+    public void restoreAccountAndLogin(final String restoreAccountRequest) {
+        Log.d(TAG, "restoreAccountAndLogin");
+        String result = Statusgo.restoreAccountAndLogin(restoreAccountRequest);
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "restoreAccountAndLogin success: " + result);
+            Log.d(TAG, "Geth node started");
+        } else {
+            Log.e(TAG, "restoreAccountAndLogin failed: " + result);
+        }
+    }
+
+    private String updateConfig(final String jsonConfigString, final String absRootDirPath, final String keystoreDirPath) throws JSONException {
+        final JSONObject jsonConfig = new JSONObject(jsonConfigString);
+        // retrieve parameters from app config, that will be applied onto the Go-side config later on
+        final String dataDirPath = jsonConfig.getString("DataDir");
+        final Boolean logEnabled = jsonConfig.getBoolean("LogEnabled");
+        final Context context = this.getReactApplicationContext();
+        final File gethLogFile = logEnabled ? this.logManager.prepareLogsFile(context) : null;
+        String gethLogDirPath = null;
+        if (gethLogFile != null) {
+            gethLogDirPath = gethLogFile.getParent();
+        }
+
+        Log.d(TAG, "log dir: " + gethLogDirPath + " log name: " + gethLogFileName);
+
+        jsonConfig.put("DataDir", dataDirPath);
+        jsonConfig.put("KeyStoreDir", keystoreDirPath);
+        jsonConfig.put("LogDir", gethLogDirPath);
+        jsonConfig.put("LogFile", gethLogFileName);
+
+        return jsonConfig.toString();
+    }
+
+    private static void prettyPrintConfig(final String config) {
+        Log.d(TAG, "startNode() with config (see below)");
+        String configOutput = config;
+        final int maxOutputLen = 4000;
+        Log.d(TAG, "********************** NODE CONFIG ****************************");
+        while (!configOutput.isEmpty()) {
+            Log.d(TAG, "Node config:" + configOutput.substring(0, Math.min(maxOutputLen, configOutput.length())));
+            if (configOutput.length() > maxOutputLen) {
+                configOutput = configOutput.substring(maxOutputLen);
+            } else {
+                break;
+            }
+        }
+        Log.d(TAG, "******************* ENDOF NODE CONFIG *************************");
+    }
+
+    private void copyDirectory(File sourceLocation, File targetLocation) throws IOException {
+        if (sourceLocation.isDirectory()) {
+            if (!targetLocation.exists() && !targetLocation.mkdirs()) {
+                throw new IOException("Cannot create dir " + targetLocation.getAbsolutePath());
+            }
+
+            String[] children = sourceLocation.list();
+            for (int i = 0; i < children.length; i++) {
+                copyDirectory(new File(sourceLocation, children[i]), new File(targetLocation, children[i]));
+            }
+        } else {
+            File directory = targetLocation.getParentFile();
+            if (directory != null && !directory.exists() && !directory.mkdirs()) {
+                throw new IOException("Cannot create dir " + directory.getAbsolutePath());
+            }
+
+            InputStream in = new FileInputStream(sourceLocation);
+            OutputStream out = new FileOutputStream(targetLocation);
+
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = in.read(buf)) > 0) {
+                out.write(buf, 0, len);
+            }
+            in.close();
+            out.close();
+        }
+    }
+
+    private String prepareDirAndUpdateConfig(final String jsonConfigString, final String keyUID) {
+
+        final String absRootDirPath = this.utils.getNoBackupDirectory();
+        final String dataFolder = this.getTestnetDataDir(absRootDirPath);
+        Log.d(TAG, "Starting Geth node in folder: " + dataFolder);
+
+        try {
+            final File newFile = new File(dataFolder);
+            // todo handle error?
+            newFile.mkdir();
+        } catch (Exception e) {
+            Log.e(TAG, "error making folder: " + dataFolder, e);
+        }
+
+        final String ropstenFlagPath = this.utils.pathCombine(absRootDirPath, "ropsten_flag");
+        final File ropstenFlag = new File(ropstenFlagPath);
+        if (!ropstenFlag.exists()) {
+            try {
+                final String chaindDataFolderPath = this.utils.pathCombine(dataFolder, "StatusIM/lightchaindata");
+                final File lightChainFolder = new File(chaindDataFolderPath);
+                if (lightChainFolder.isDirectory()) {
+                    String[] children = lightChainFolder.list();
+                    for (int i = 0; i < children.length; i++) {
+                        new File(lightChainFolder, children[i]).delete();
+                    }
+                }
+                lightChainFolder.delete();
+                ropstenFlag.createNewFile();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        String testnetDataDir = dataFolder;
+        String oldKeystoreDir = this.utils.pathCombine(testnetDataDir, "keystore");
+        String newKeystoreDir = this.utils.pathCombine(absRootDirPath, "keystore");
+        final File oldKeystore = new File(oldKeystoreDir);
+        if (oldKeystore.exists()) {
+            try {
+                final File newKeystore = new File(newKeystoreDir);
+                copyDirectory(oldKeystore, newKeystore);
+
+                if (oldKeystore.isDirectory()) {
+                    String[] children = oldKeystore.list();
+                    for (int i = 0; i < children.length; i++) {
+                        new File(oldKeystoreDir, children[i]).delete();
+                    }
+                }
+                oldKeystore.delete();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        try {
+            final String multiaccountKeystoreDir = this.utils.pathCombine("/keystore", keyUID);
+            final String updatedJsonConfigString = this.updateConfig(jsonConfigString, absRootDirPath, multiaccountKeystoreDir);
+
+            prettyPrintConfig(updatedJsonConfigString);
+
+            return updatedJsonConfigString;
+        } catch (JSONException e) {
+            Log.e(TAG, "updateConfig failed: " + e.getMessage());
+            System.exit(1);
+
+            return "";
+        }
+    }
+
+    @ReactMethod
+    public void prepareDirAndUpdateConfig(final String keyUID, final String config, final Callback callback) {
+        Log.d(TAG, "prepareDirAndUpdateConfig");
+        String finalConfig = prepareDirAndUpdateConfig(config, keyUID);
+        callback.invoke(finalConfig);
+    }
+
+    //TODO : maybe nuke since it is not called anywhere in status-mobile code
+    @ReactMethod
+    public void saveAccountAndLogin(final String multiaccountData, final String password, final String settings, final String config, final String accountsData) {
+        try {
+            Log.d(TAG, "saveAccountAndLogin");
+            String finalConfig = prepareDirAndUpdateConfig(config, this.utils.getKeyUID(multiaccountData));
+            String result = Statusgo.saveAccountAndLogin(multiaccountData, password, settings, finalConfig, accountsData);
+            if (result.startsWith("{\"error\":\"\"")) {
+                Log.d(TAG, "saveAccountAndLogin result: " + result);
+                Log.d(TAG, "Geth node started");
+            } else {
+                Log.e(TAG, "saveAccountAndLogin failed: " + result);
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, "JSON conversion failed: " + e.getMessage());
+        }
+    }
+
+    @ReactMethod
+    public void saveAccountAndLoginWithKeycard(final String multiaccountData, final String password, final String settings, final String config, final String accountsData, final String chatKey) {
+        try {
+            Log.d(TAG, "saveAccountAndLoginWithKeycard");
+            String finalConfig = prepareDirAndUpdateConfig(config, this.utils.getKeyUID(multiaccountData));
+            String result = Statusgo.saveAccountAndLoginWithKeycard(multiaccountData, password, settings, finalConfig, accountsData, chatKey);
+            if (result.startsWith("{\"error\":\"\"")) {
+                Log.d(TAG, "saveAccountAndLoginWithKeycard result: " + result);
+                Log.d(TAG, "Geth node started");
+            } else {
+                Log.e(TAG, "saveAccountAndLoginWithKeycard failed: " + result);
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, "JSON conversion failed: " + e.getMessage());
+        }
+    }
+
+    //TODO : maybe nuke since it is not called anywhere in status-mobile code
+    @ReactMethod
+    public void login(final String accountData, final String password) {
+        Log.d(TAG, "login");
+        this.utils.migrateKeyStoreDir(accountData, password);
+        String result = Statusgo.login(accountData, password);
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "Login result: " + result);
+        } else {
+            Log.e(TAG, "Login failed: " + result);
+        }
+    }
+
+    @ReactMethod
+    public void loginWithKeycard(final String accountData, final String password, final String chatKey, final String nodeConfigJSON) {
+        Log.d(TAG, "loginWithKeycard");
+        this.utils.migrateKeyStoreDir(accountData, password);
+        String result = Statusgo.loginWithKeycard(accountData, password, chatKey, nodeConfigJSON);
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "LoginWithKeycard result: " + result);
+        } else {
+            Log.e(TAG, "LoginWithKeycard failed: " + result);
+        }
+    }
+
+    @ReactMethod
+    public void loginWithConfig(final String accountData, final String password, final String configJSON) {
+        Log.d(TAG, "loginWithConfig");
+        this.utils.migrateKeyStoreDir(accountData, password);
+        String result = Statusgo.loginWithConfig(accountData, password, configJSON);
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "LoginWithConfig result: " + result);
+        } else {
+            Log.e(TAG, "LoginWithConfig failed: " + result);
+        }
+    }
+
+    @ReactMethod
+    public void loginAccount(final String request) {
+        Log.d(TAG, "loginAccount");
+        String result = Statusgo.loginAccount(request);
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "loginAccount result: " + result);
+        } else {
+            Log.e(TAG, "loginAccount failed: " + result);
+        }
+    }
+
+    @ReactMethod
+    public void verify(final String address, final String password, final Callback callback) throws JSONException {
+        Activity currentActivity = getCurrentActivity();
+
+        final String absRootDirPath = this.utils.getNoBackupDirectory();
+        final String newKeystoreDir = this.utils.pathCombine(absRootDirPath, "keystore");
+
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.verifyAccountPassword(newKeystoreDir, address, password), callback);
+    }
+
+    @ReactMethod
+    public void verifyDatabasePassword(final String keyUID, final String password, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.verifyDatabasePassword(keyUID, password), callback);
+    }
+
+    //TODO : use this.utils.executeRunnableStatusGoMethod
+    @ReactMethod
+    private void openAccounts(final Callback callback) {
+        Activity currentActivity = getCurrentActivity();
+
+        final String rootDir = this.utils.getNoBackupDirectory();
+        Log.d(TAG, "openAccounts");
+        if (!this.utils.checkAvailability()) {
+            Log.e(TAG, "[openAccounts] Activity doesn't exist, cannot call openAccounts");
+            System.exit(0);
+            return;
+        }
+
+        Log.d(TAG, "[Opening accounts" + rootDir);
+
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                String result = Statusgo.openAccounts(rootDir);
+                callback.invoke(result);
+            }
+        };
+
+        StatusThreadPoolExecutor.getInstance().execute(r);
+    }
+
+    //TODO : use this.utils.executeRunnableStatusGoMethod
+    @ReactMethod
+    public void logout() {
+        Log.d(TAG, "logout");
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                String result = Statusgo.logout();
+                if (result.startsWith("{\"error\":\"\"")) {
+                    Log.d(TAG, "Logout result: " + result);
+                } else {
+                    Log.e(TAG, "Logout failed: " + result);
+                }
+            }
+        };
+
+        StatusThreadPoolExecutor.getInstance().execute(r);
+    }
+
+    @ReactMethod
+    public void multiAccountStoreAccount(final String json, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountStoreAccount(json), callback);
+    }
+
+    @ReactMethod
+    public void multiAccountLoadAccount(final String json, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountLoadAccount(json), callback);
+    }
+    //TODO: maybe nuke this method since this is not called anywhere in status-mobile
+    @ReactMethod
+    public void multiAccountReset(final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountReset(), callback);
+
+    }
+
+    @ReactMethod
+    public void multiAccountDeriveAddresses(final String json, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountDeriveAddresses(json), callback);
+    }
+
+    @ReactMethod
+    public void multiAccountGenerateAndDeriveAddresses(final String json, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountGenerateAndDeriveAddresses(json), callback);
+    }
+
+    @ReactMethod
+    public void multiAccountStoreDerived(final String json, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountStoreDerivedAccounts(json), callback);
+    }
+
+    @ReactMethod
+    public void multiAccountImportMnemonic(final String json, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountImportMnemonic(json), callback);
+    }
+
+    @ReactMethod
+    public void multiAccountImportPrivateKey(final String json, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountImportPrivateKey(json), callback);
+    }
+
+    @ReactMethod
+    public void deleteMultiaccount(final String keyUID, final Callback callback) throws JSONException {
+        final String keyStoreDir = this.utils.getKeyStorePath(keyUID);
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.deleteMultiaccount(keyUID, keyStoreDir), callback);
+    }
+}

modules/react-native-status/android/src/main/java/im/status/ethereum/module/DatabaseManager.java

@@ -0,0 +1,66 @@
+package im.status.ethereum.module;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.Callback;
+import statusgo.Statusgo;
+import android.util.Log;
+import java.io.File;
+import android.os.Environment;
+import android.content.Context;
+public class DatabaseManager extends ReactContextBaseJavaModule {
+    private static final String TAG = "DatabaseManager";
+    private ReactApplicationContext reactContext;
+    private static final String exportDBFileName = "export.db";
+    private Utils utils;
+    public DatabaseManager(ReactApplicationContext reactContext) {
+        this.reactContext = reactContext;
+        this.utils = new Utils(reactContext);
+    }
+    @Override
+    public String getName() {
+        return "DatabaseManager";
+    }
+
+    private File getExportDBFile() {
+        final Context context = this.getReactApplicationContext();
+        // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
+        // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
+        final File pubDirectory = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
+        final File filename = new File(pubDirectory, exportDBFileName);
+
+        return filename;
+    }
+
+    @ReactMethod
+    public void exportUnencryptedDatabase(final String accountData, final String password, final Callback callback) {
+        Log.d(TAG, "login");
+
+        final File newFile = getExportDBFile();
+
+        this.utils.migrateKeyStoreDir(accountData, password);
+        String result = Statusgo.exportUnencryptedDatabase(accountData, password, newFile.getAbsolutePath());
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "Login result: " + result);
+        } else {
+            Log.e(TAG, "Login failed: " + result);
+        }
+    }
+
+    @ReactMethod
+    public void importUnencryptedDatabase(final String accountData, final String password) {
+        Log.d(TAG, "importUnencryptedDatabase");
+
+        final File newFile = getExportDBFile();
+
+        this.utils.migrateKeyStoreDir(accountData, password);
+        String result = Statusgo.importUnencryptedDatabase(accountData, password, newFile.getAbsolutePath());
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "import result: " + result);
+        } else {
+            Log.e(TAG, "import failed: " + result);
+        }
+    }
+
+}

modules/react-native-status/android/src/main/java/im/status/ethereum/module/EncryptionUtils.java

@@ -0,0 +1,199 @@
+package im.status.ethereum.module;
+
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.Callback;
+import android.util.Log;
+import statusgo.Statusgo;
+import org.json.JSONException;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import android.app.Activity;
+import android.view.WindowManager;
+import android.os.Build;
+import android.view.Window;
+import android.preference.PreferenceManager;
+import android.content.SharedPreferences;
+
+public class EncryptionUtils extends ReactContextBaseJavaModule {
+    private static final String TAG = "EncryptionUtils";
+
+    private ReactApplicationContext reactContext;
+    private Utils utils;
+
+    public EncryptionUtils(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+        this.utils = new Utils(reactContext);
+    }
+
+    @Override
+    public String getName() {
+        return "EncryptionUtils";
+    }
+
+    @ReactMethod
+    private void initKeystore(final String keyUID, final Callback callback) throws JSONException {
+        Log.d(TAG, "initKeystore");
+
+        final String commonKeydir = this.utils.pathCombine(this.utils.getNoBackupDirectory(), "/keystore");
+        final String keydir = this.utils.pathCombine(commonKeydir, keyUID);
+
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.initKeystore(keydir), callback);
+    }
+
+    @ReactMethod
+    public void reEncryptDbAndKeystore(final String keyUID, final String password, final String newPassword, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.changeDatabasePassword(keyUID, password, newPassword), callback);
+    }
+
+    @ReactMethod
+    public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String keycardUID, final String password,
+                                        final String newPassword, final Callback callback) throws JSONException {
+        final String keyStoreDir = this.utils.getKeyStorePath(keyUID);
+        this.utils.executeRunnableStatusGoMethod(() -> {
+            Statusgo.initKeystore(keyStoreDir);
+            return Statusgo.convertToKeycardAccount(accountData, options, keycardUID, password, newPassword);
+        }, callback);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String encodeTransfer(final String to, final String value) {
+        return Statusgo.encodeTransfer(to, value);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String encodeFunctionCall(final String method, final String paramsJSON) {
+        return Statusgo.encodeFunctionCall(method, paramsJSON);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String decodeParameters(final String decodeParamJSON) {
+        return Statusgo.decodeParameters(decodeParamJSON);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String hexToNumber(final String hex) {
+        return Statusgo.hexToNumber(hex);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String numberToHex(final String numString) {
+        return Statusgo.numberToHex(numString);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String sha3(final String str) {
+        return Statusgo.sha3(str);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String utf8ToHex(final String str) {
+        return Statusgo.utf8ToHex(str);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String hexToUtf8(final String str) {
+        return Statusgo.hexToUtf8(str);
+    }
+
+    @ReactMethod
+    public void setBlankPreviewFlag(final Boolean blankPreview) {
+        final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this.reactContext);
+        sharedPrefs.edit().putBoolean("BLANK_PREVIEW", blankPreview).commit();
+        setSecureFlag();
+    }
+
+    private void setSecureFlag() {
+        final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this.reactContext);
+        final boolean setSecure = sharedPrefs.getBoolean("BLANK_PREVIEW", true);
+        final Activity activity = this.reactContext.getCurrentActivity();
+        if (activity != null) {
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    final Window window = activity.getWindow();
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && setSecure) {
+                        window.addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+                    } else {
+                        window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+                    }
+                }
+            });
+        }
+    }
+
+    @ReactMethod
+    public void hashTransaction(final String txArgsJSON, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.hashTransaction(txArgsJSON), callback);
+    }
+
+    @ReactMethod
+    public void hashMessage(final String message, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.hashMessage(message), callback);
+    }
+
+    @ReactMethod
+    public void multiformatSerializePublicKey(final String multiCodecKey, final String base58btc, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiformatSerializePublicKey(multiCodecKey,base58btc), callback);
+    }
+
+    @ReactMethod
+    public void multiformatDeserializePublicKey(final String multiCodecKey, final String base58btc, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiformatDeserializePublicKey(multiCodecKey,base58btc), callback);
+    }
+
+    @ReactMethod
+    public void compressPublicKey(final String multiCodecKey, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.compressPublicKey(multiCodecKey), callback);
+    }
+
+    @ReactMethod
+    public void decompressPublicKey(final String multiCodecKey, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.decompressPublicKey(multiCodecKey), callback);
+    }
+
+    @ReactMethod
+    public void deserializeAndCompressKey(final String desktopKey, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.deserializeAndCompressKey(desktopKey), callback);
+    }
+
+    @ReactMethod
+    public void hashTypedData(final String data, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.hashTypedData(data), callback);
+    }
+
+    @ReactMethod
+    public void hashTypedDataV4(final String data, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.hashTypedDataV4(data), callback);
+    }
+
+    @ReactMethod
+    public void signMessage(final String rpcParams, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.signMessage(rpcParams), callback);
+    }
+
+    @ReactMethod
+    public void signTypedData(final String data, final String account, final String password, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.signTypedData(data, account, password), callback);
+    }
+
+    @ReactMethod
+    public void signTypedDataV4(final String data, final String account, final String password, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.signTypedDataV4(data, account, password), callback);
+
+    }
+
+    @ReactMethod
+    public void extractGroupMembershipSignatures(final String signaturePairs, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.extractGroupMembershipSignatures(signaturePairs), callback);
+    }
+
+    @ReactMethod
+    public void signGroupMembership(final String content, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.signGroupMembership(content), callback);
+    }
+
+
+}

modules/react-native-status/android/src/main/java/im/status/ethereum/module/LogManager.java

@@ -0,0 +1,228 @@
+package im.status.ethereum.module;
+
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.Callback;
+import java.io.File;
+import java.util.Stack;
+import android.util.Log;
+import android.net.Uri;
+import java.io.OutputStreamWriter;
+import java.io.IOException;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import androidx.core.content.FileProvider;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.util.zip.ZipOutputStream;
+import java.io.FileInputStream;
+import java.util.zip.ZipEntry;
+import org.json.JSONObject;
+import statusgo.Statusgo;
+import android.content.Context;
+import org.json.JSONException;
+public class LogManager extends ReactContextBaseJavaModule {
+    private static final String TAG = "LogManager";
+    private static final String gethLogFileName = "geth.log";
+    private static final String statusLogFileName = "Status.log";
+    private static final String logsZipFileName = "Status-debug-logs.zip";
+    private ReactApplicationContext reactContext;
+    private Utils utils;
+
+    public LogManager(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+        this.utils = new Utils(reactContext);
+    }
+
+    @Override
+    public String getName() {
+        return "LogManager";
+    }
+
+    private File getLogsFile() {
+        final File pubDirectory = this.utils.getPublicStorageDirectory();
+        final File logFile = new File(pubDirectory, gethLogFileName);
+
+        return logFile;
+    }
+
+    public File prepareLogsFile(final Context context) {
+        final File logFile = this.utils.getLogsFile();
+
+        try {
+            logFile.setReadable(true);
+            File parent = logFile.getParentFile();
+            if (!parent.canWrite()) {
+                return null;
+            }
+            if (!parent.exists()) {
+                parent.mkdirs();
+            }
+            logFile.createNewFile();
+            logFile.setWritable(true);
+            Log.d(TAG, "Can write " + logFile.canWrite());
+            Uri gethLogUri = Uri.fromFile(logFile);
+
+            String gethLogFilePath = logFile.getAbsolutePath();
+            Log.d(TAG, gethLogFilePath);
+
+            return logFile;
+        } catch (Exception e) {
+            Log.d(TAG, "Can't create geth.log file! " + e.getMessage());
+        }
+
+        return null;
+    }
+
+    private void showErrorMessage(final String message) {
+        final Activity activity = getCurrentActivity();
+
+        new AlertDialog.Builder(activity)
+                .setTitle("Error")
+                .setMessage(message)
+                .setNegativeButton("Exit", new DialogInterface.OnClickListener() {
+                    public void onClick(final DialogInterface dialog, final int id) {
+                        dialog.dismiss();
+                    }
+                }).show();
+    }
+
+    private void dumpAdbLogsTo(final FileOutputStream statusLogStream) throws IOException {
+        final String filter = "logcat -d -b main ReactNativeJS:D StatusModule:D StatusService:D StatusNativeLogs:D *:S";
+        final java.lang.Process p = Runtime.getRuntime().exec(filter);
+        final java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(p.getInputStream()));
+        final java.io.BufferedWriter out = new java.io.BufferedWriter(new java.io.OutputStreamWriter(statusLogStream));
+        String line;
+        while ((line = in.readLine()) != null) {
+            out.write(line);
+            out.newLine();
+        }
+        out.close();
+        in.close();
+    }
+
+    private Boolean zip(File[] _files, File zipFile, Stack<String> errorList) {
+        final int BUFFER = 0x8000;
+
+        try {
+            BufferedInputStream origin = null;
+            FileOutputStream dest = new FileOutputStream(zipFile);
+            ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(dest));
+            byte data[] = new byte[BUFFER];
+
+            for (int i = 0; i < _files.length; i++) {
+                final File file = _files[i];
+                if (file == null || !file.exists()) {
+                    continue;
+                }
+
+                Log.v("Compress", "Adding: " + file.getAbsolutePath());
+                try {
+                    FileInputStream fi = new FileInputStream(file);
+                    origin = new BufferedInputStream(fi, BUFFER);
+
+                    ZipEntry entry = new ZipEntry(file.getName());
+                    out.putNextEntry(entry);
+                    int count;
+
+                    while ((count = origin.read(data, 0, BUFFER)) != -1) {
+                        out.write(data, 0, count);
+                    }
+                    origin.close();
+                } catch (IOException e) {
+                    Log.e(TAG, e.getMessage());
+                    errorList.push(e.getMessage());
+                }
+            }
+
+            out.close();
+
+            return true;
+        } catch (Exception e) {
+            Log.e(TAG, e.getMessage());
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    @ReactMethod
+    public void sendLogs(final String dbJson, final String jsLogs, final Callback callback) {
+        Log.d(TAG, "sendLogs");
+        if (!this.utils.checkAvailability()) {
+            return;
+        }
+
+        final Context context = this.getReactApplicationContext();
+        final File logsTempDir = new File(context.getCacheDir(), "logs"); // This path needs to be in sync with android/app/src/main/res/xml/file_provider_paths.xml
+        logsTempDir.mkdir();
+
+        final File dbFile = new File(logsTempDir, "db.json");
+        try {
+            OutputStreamWriter outputStreamWriter = new OutputStreamWriter(new FileOutputStream(dbFile));
+            outputStreamWriter.write(dbJson);
+            outputStreamWriter.close();
+        } catch (IOException e) {
+            Log.e(TAG, "File write failed: " + e.toString());
+            showErrorMessage(e.getLocalizedMessage());
+        }
+
+        final File zipFile = new File(logsTempDir, logsZipFileName);
+        final File statusLogFile = new File(logsTempDir, statusLogFileName);
+        final File gethLogFile = getLogsFile();
+
+        try {
+            if (zipFile.exists() || zipFile.createNewFile()) {
+                final long usableSpace = zipFile.getUsableSpace();
+                if (usableSpace < 20 * 1024 * 1024) {
+                    final String message = String.format("Insufficient space available on device (%s) to write logs.\nPlease free up some space.", android.text.format.Formatter.formatShortFileSize(context, usableSpace));
+                    Log.e(TAG, message);
+                    showErrorMessage(message);
+                    return;
+                }
+            }
+
+            dumpAdbLogsTo(new FileOutputStream(statusLogFile));
+
+            final Stack<String> errorList = new Stack<String>();
+            final Boolean zipped = zip(new File[]{dbFile, gethLogFile, statusLogFile}, zipFile, errorList);
+            if (zipped && zipFile.exists()) {
+                zipFile.setReadable(true, false);
+                Uri extUri = FileProvider.getUriForFile(context, context.getPackageName() + ".provider", zipFile);
+                callback.invoke(extUri.toString());
+            } else {
+                Log.d(TAG, "File " + zipFile.getAbsolutePath() + " does not exist");
+            }
+        } catch (Exception e) {
+            Log.e(TAG, e.getMessage());
+            showErrorMessage(e.getLocalizedMessage());
+            e.printStackTrace();
+            return;
+        } finally {
+            dbFile.delete();
+            statusLogFile.delete();
+            zipFile.deleteOnExit();
+        }
+    }
+
+    @ReactMethod
+    public void initLogging(final boolean enabled, final boolean mobileSystem, final String logLevel, final Callback callback) throws JSONException {
+        final JSONObject jsonConfig = new JSONObject();
+        jsonConfig.put("Enabled", enabled);
+        jsonConfig.put("MobileSystem", mobileSystem);
+        jsonConfig.put("Level", logLevel);
+        jsonConfig.put("File", getLogsFile().getAbsolutePath());
+        final String config = jsonConfig.toString();
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.initLogging(config), callback);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String logFileDirectory() {
+        return this.utils.getPublicStorageDirectory().getAbsolutePath();
+    }
+
+
+}

modules/react-native-status/android/src/main/java/im/status/ethereum/module/NetworkManager.java

@@ -0,0 +1,84 @@
+package im.status.ethereum.module;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.Callback;
+import org.json.JSONException;
+import statusgo.Statusgo;
+import org.json.JSONObject;
+
+public class NetworkManager extends ReactContextBaseJavaModule {
+    private static final String TAG = "NetworkManager";
+    private ReactApplicationContext reactContext;
+    private Utils utils;
+
+    public NetworkManager(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+        this.utils = new Utils(reactContext);
+    }
+
+    @Override
+    public String getName() {
+        return "NetworkManager";
+    }
+
+    @ReactMethod
+    public void addPeer(final String enode, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.addPeer(enode), callback);
+    }
+
+    @ReactMethod
+    public void startSearchForLocalPairingPeers(final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.startSearchForLocalPairingPeers(), callback);
+    }
+
+    @ReactMethod
+    public void getConnectionStringForBootstrappingAnotherDevice(final String configJSON, final Callback callback) throws JSONException {
+        final JSONObject jsonConfig = new JSONObject(configJSON);
+        final JSONObject senderConfig = jsonConfig.getJSONObject("senderConfig");
+        final String keyUID = senderConfig.getString("keyUID");
+        final String keyStorePath = this.utils.getKeyStorePath(keyUID);
+        senderConfig.put("keystorePath", keyStorePath);
+
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.getConnectionStringForBootstrappingAnotherDevice(jsonConfig.toString()), callback);
+    }
+
+    @ReactMethod
+    public void inputConnectionStringForBootstrapping(final String connectionString, final String configJSON, final Callback callback) throws JSONException {
+        final JSONObject jsonConfig = new JSONObject(configJSON);
+        final JSONObject receiverConfig = jsonConfig.getJSONObject("receiverConfig");
+        final String keyStorePath = this.utils.pathCombine(this.utils.getNoBackupDirectory(), "/keystore");
+        receiverConfig.put("keystorePath", keyStorePath);
+        receiverConfig.getJSONObject("nodeConfig").put("rootDataDir", this.utils.getNoBackupDirectory());
+
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.inputConnectionStringForBootstrapping(connectionString, jsonConfig.toString()), callback);
+    }
+
+    @ReactMethod
+    public void sendTransactionWithSignature(final String txArgsJSON, final String signature, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.sendTransactionWithSignature(txArgsJSON, signature), callback);
+    }
+
+    @ReactMethod
+    public void sendTransaction(final String txArgsJSON, final String password, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.sendTransaction(txArgsJSON, password), callback);
+    }
+
+    @ReactMethod
+    public void callRPC(final String payload, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.callRPC(payload), callback);
+    }
+
+    @ReactMethod
+    public void callPrivateRPC(final String payload, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.callPrivateRPC(payload), callback);
+    }
+
+    @ReactMethod
+    public void recover(final String rpcParams, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.recover(rpcParams), callback);
+    }
+
+}

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusPackage.java

@@ -30,6 +30,13 @@ public class StatusPackage implements ReactPackage {
         List<NativeModule> modules = new ArrayList<>();
 
         modules.add(new StatusModule(reactContext, this.rootedDevice));
+        modules.add(new AccountManager(reactContext));
+        modules.add(new EncryptionUtils(reactContext));
+        modules.add(new DatabaseManager(reactContext));
+        modules.add(new UIHelper(reactContext));
+        modules.add(new LogManager(reactContext));
+        modules.add(new Utils(reactContext));
+        modules.add(new NetworkManager(reactContext));
         modules.add(new RNSelectableTextInputModule(reactContext));
 
         return modules;

modules/react-native-status/android/src/main/java/im/status/ethereum/module/UIHelper.java

@@ -0,0 +1,159 @@
+package im.status.ethereum.module;
+
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import android.app.Activity;
+import android.util.Log;
+import android.os.Build;
+import android.webkit.WebView;
+import android.webkit.CookieManager;
+import android.webkit.CookieSyncManager;
+import android.webkit.WebStorage;
+import android.view.WindowManager;
+import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIBlock;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
+import android.view.inputmethod.InputMethodManager;
+import android.view.View;
+import android.widget.EditText;
+import android.content.Context;
+
+public class UIHelper extends ReactContextBaseJavaModule {
+    private static final String TAG = "UIHelper";
+    private ReactApplicationContext reactContext;
+
+    public UIHelper(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+    }
+
+    @Override
+    public String getName() {
+        return "UIHelper";
+    }
+
+    //TODO : maybe nuke since it is not called anywhere in status-mobile code
+    @ReactMethod
+    public void setAdjustResize() {
+        Log.d(TAG, "setAdjustResize");
+        final Activity activity = getCurrentActivity();
+        if (activity == null) {
+            return;
+        }
+
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+            }
+        });
+    }
+
+    //TODO : maybe nuke since it is not called anywhere in status-mobile code
+    @ReactMethod
+    public void setAdjustPan() {
+        Log.d(TAG, "setAdjustPan");
+        final Activity activity = getCurrentActivity();
+        if (activity == null) {
+            return;
+        }
+
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void setSoftInputMode(final int mode) {
+        Log.d(TAG, "setSoftInputMode");
+        final Activity activity = getCurrentActivity();
+        if (activity == null) {
+            return;
+        }
+
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                activity.getWindow().setSoftInputMode(mode);
+            }
+        });
+    }
+
+    @SuppressWarnings("deprecation")
+    @ReactMethod
+    public void clearCookies() {
+        Log.d(TAG, "clearCookies");
+        final Activity activity = getCurrentActivity();
+        if (activity == null) {
+            return;
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            CookieManager.getInstance().removeAllCookies(null);
+            CookieManager.getInstance().flush();
+        } else {
+            CookieSyncManager cookieSyncManager = CookieSyncManager.createInstance(activity);
+            cookieSyncManager.startSync();
+            CookieManager cookieManager = CookieManager.getInstance();
+            cookieManager.removeAllCookie();
+            cookieManager.removeSessionCookie();
+            cookieSyncManager.stopSync();
+            cookieSyncManager.sync();
+        }
+    }
+
+    @ReactMethod
+    public void toggleWebviewDebug(final boolean val) {
+        Log.d(TAG, "toggleWebviewDebug");
+        final Activity activity = getCurrentActivity();
+        if (activity == null) {
+            return;
+        }
+
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                WebView.setWebContentsDebuggingEnabled(val);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void clearStorageAPIs() {
+        Log.d(TAG, "clearStorageAPIs");
+        final Activity activity = getCurrentActivity();
+        if (activity == null) {
+            return;
+        }
+
+        WebStorage storage = WebStorage.getInstance();
+        if (storage != null) {
+            storage.deleteAllData();
+        }
+    }
+
+    @ReactMethod
+    public void resetKeyboardInputCursor(final int reactTagToReset, final int selection) {
+        UIManagerModule uiManager = getReactApplicationContext().getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            @Override
+            public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
+                InputMethodManager imm = (InputMethodManager) getReactApplicationContext().getBaseContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                if (imm != null) {
+                    View viewToReset = nativeViewHierarchyManager.resolveView(reactTagToReset);
+                    imm.restartInput(viewToReset);
+                    try {
+                        EditText textView = (EditText) viewToReset;
+                        textView.setSelection(selection);
+                    } catch (Exception e) {}
+                }
+            }
+        });
+    }
+
+
+}

modules/react-native-status/android/src/main/java/im/status/ethereum/module/Utils.java

@@ -0,0 +1,155 @@
+package im.status.ethereum.module;
+
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import android.util.Log;
+import java.util.function.Supplier;
+import java.io.File;
+import android.content.Context;
+import android.os.Environment;
+import org.json.JSONObject;
+import org.json.JSONException;
+import statusgo.Statusgo;
+
+public class Utils extends ReactContextBaseJavaModule  {
+    private static final String gethLogFileName = "geth.log";
+
+    private static final String TAG = "Utils";
+    private ReactApplicationContext reactContext;
+
+    public Utils(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+    }
+
+    @Override
+    public String getName() {
+        return "Utils";
+    }
+    public String getNoBackupDirectory() {
+        return this.getReactApplicationContext().getNoBackupFilesDir().getAbsolutePath();
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String backupDisabledDataDir() {
+        return getNoBackupDirectory();
+    }
+
+    public File getPublicStorageDirectory() {
+        final Context context = this.getReactApplicationContext();
+        // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
+        // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
+        return context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
+    }
+
+    public File getLogsFile() {
+        final File pubDirectory = getPublicStorageDirectory();
+        final File logFile = new File(pubDirectory, gethLogFileName);
+
+        return logFile;
+    }
+
+    public String getKeyUID(final String json) throws JSONException {
+        final JSONObject jsonObj = new JSONObject(json);
+        return jsonObj.getString("key-uid");
+    }
+
+    public String pathCombine(final String path1, final String path2) {
+        // Replace this logic with Paths.get(path1, path2) once API level 26+ becomes the minimum supported API level
+        final File file = new File(path1, path2);
+        return file.getAbsolutePath();
+    }
+
+    public String getKeyStorePath(String keyUID) {
+        final String commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore");
+        final String keydir = pathCombine(commonKeydir, keyUID);
+
+        return keydir;
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String keystoreDir() {
+        final String absRootDirPath = getNoBackupDirectory();
+        return pathCombine(absRootDirPath, "keystore");
+    }
+
+    public void migrateKeyStoreDir(final String accountData, final String password) {
+        try {
+            final String commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore");
+            final String keydir = getKeyStorePath(getKeyUID(accountData));
+            Log.d(TAG, "before migrateKeyStoreDir " + keydir);
+
+            File keydirFile = new File(keydir);
+            if(!keydirFile.exists() || keydirFile.list().length == 0) {
+                Log.d(TAG, "migrateKeyStoreDir");
+                Statusgo.migrateKeyStoreDir(accountData, password, commonKeydir, keydir);
+                Statusgo.initKeystore(keydir);
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, "JSON conversion failed: " + e.getMessage());
+        }
+    }
+
+    public boolean checkAvailability() {
+        // We wait at least 10s for getCurrentActivity to return a value,
+        // otherwise we give up
+        for (int attempts = 0; attempts < 100; attempts++) {
+            if (getCurrentActivity() != null) {
+                return true;
+            }
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ex) {
+                if (getCurrentActivity() != null) {
+                    return true;
+                }
+                Log.d(TAG, "Activity doesn't exist");
+                return false;
+            }
+        }
+
+        Log.d(TAG, "Activity doesn't exist");
+        return false;
+    }
+
+    public void executeRunnableStatusGoMethod(Supplier<String> method, Callback callback) throws JSONException {
+        if (!checkAvailability()) {
+            callback.invoke(false);
+            return;
+        }
+
+        Runnable runnableTask = () -> {
+            String res = method.get();
+            callback.invoke(res);
+        };
+
+        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
+    }
+
+    @ReactMethod
+    public void validateMnemonic(final String seed, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.validateMnemonic(seed), callback);
+    }
+
+    public Boolean is24Hour() {
+        return android.text.format.DateFormat.is24HourFormat(this.reactContext.getApplicationContext());
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String checkAddressChecksum(final String address) {
+        return Statusgo.checkAddressChecksum(address);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String isAddress(final String address) {
+        return Statusgo.isAddress(address);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String toChecksumAddress(final String address) {
+        return Statusgo.toChecksumAddress(address);
+    }
+
+}

nix/deps/gradle/deps.list

@@ -1,19 +1,23 @@
 androidx.activity:activity:1.0.0
+androidx.activity:activity:1.0.0-rc01
 androidx.activity:activity:1.2.4
 androidx.annotation:annotation-experimental:1.1.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
+androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
 androidx.appcompat:appcompat-resources:1.4.1
 androidx.appcompat:appcompat-resources:1.4.2
+androidx.appcompat:appcompat:1.1.0-rc01
 androidx.appcompat:appcompat:1.2.0
 androidx.appcompat:appcompat:1.3.1
 androidx.appcompat:appcompat:1.4.1
 androidx.appcompat:appcompat:1.4.2
 androidx.arch.core:core-common:2.0.0
 androidx.arch.core:core-common:2.1.0
+androidx.arch.core:core-common:2.1.0-rc01
 androidx.arch.core:core-runtime:2.0.0
 androidx.arch.core:core-runtime:2.1.0
 androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
@@ -35,6 +39,7 @@ androidx.coordinatorlayout:coordinatorlayout:1.1.0
 androidx.core:core-ktx:1.6.0
 androidx.core:core-splashscreen:1.0.0
 androidx.core:core:1.1.0
+androidx.core:core:1.1.0-rc01
 androidx.core:core:1.2.0
 androidx.core:core:1.6.0
 androidx.core:core:1.7.0
@@ -67,6 +72,7 @@ androidx.exifinterface:exifinterface:1.2.0
 androidx.exifinterface:exifinterface:1.3.2
 androidx.fragment:fragment:1.0.0
 androidx.fragment:fragment:1.1.0
+androidx.fragment:fragment:1.1.0-rc01
 androidx.fragment:fragment:1.3.6
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-ui:1.0.0
@@ -74,6 +80,7 @@ androidx.legacy:legacy-support-core-utils:1.0.0
 androidx.legacy:legacy-support-v4:1.0.0
 androidx.lifecycle:lifecycle-common:2.0.0
 androidx.lifecycle:lifecycle-common:2.1.0
+androidx.lifecycle:lifecycle-common:2.1.0-rc01
 androidx.lifecycle:lifecycle-common:2.3.1
 androidx.lifecycle:lifecycle-common:2.4.0
 androidx.lifecycle:lifecycle-livedata-core:2.0.0
@@ -84,11 +91,13 @@ androidx.lifecycle:lifecycle-livedata:2.1.0
 androidx.lifecycle:lifecycle-process:2.4.0
 androidx.lifecycle:lifecycle-runtime:2.0.0
 androidx.lifecycle:lifecycle-runtime:2.1.0
+androidx.lifecycle:lifecycle-runtime:2.1.0-rc01
 androidx.lifecycle:lifecycle-runtime:2.3.1
 androidx.lifecycle:lifecycle-runtime:2.4.0
 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1
 androidx.lifecycle:lifecycle-viewmodel:2.0.0
 androidx.lifecycle:lifecycle-viewmodel:2.1.0
+androidx.lifecycle:lifecycle-viewmodel:2.1.0-rc01
 androidx.lifecycle:lifecycle-viewmodel:2.3.1
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
@@ -99,6 +108,7 @@ androidx.recyclerview:recyclerview:1.0.0
 androidx.recyclerview:recyclerview:1.1.0
 androidx.resourceinspection:resourceinspection-annotation:1.0.0
 androidx.savedstate:savedstate:1.0.0
+androidx.savedstate:savedstate:1.0.0-rc01
 androidx.savedstate:savedstate:1.1.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
 androidx.startup:startup-runtime:1.0.0
@@ -116,8 +126,11 @@ androidx.transition:transition:1.1.0
 androidx.transition:transition:1.2.0
 androidx.transition:transition:1.2.0-rc01
 androidx.vectordrawable:vectordrawable-animated:1.1.0
+androidx.vectordrawable:vectordrawable-animated:1.1.0-rc01
 androidx.vectordrawable:vectordrawable:1.1.0
+androidx.vectordrawable:vectordrawable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.1.0
+androidx.versionedparcelable:versionedparcelable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager2:viewpager2:1.0.0
 androidx.viewpager:viewpager:1.0.0
@@ -605,6 +618,8 @@ com.parse.bolts:bolts-tasks:1.4.0
 com.squareup.okhttp3:okhttp-tls:4.9.2
 com.squareup.okhttp3:okhttp-urlconnection:4.9.2
 com.squareup.okhttp3:okhttp:4.9.2
+com.squareup.okio:okio-metadata:2.8.0
+com.squareup.okio:okio:2.8.0
 com.squareup.okio:okio:2.9.0
 com.squareup:javapoet:1.8.0
 com.squareup:javapoet:1.10.0

nix/deps/gradle/deps.urls

@@ -1,3 +1,4 @@
+https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0-rc01/activity-1.0.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.1.0/activity-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.2.4/activity-1.2.4.pom
@@ -10,12 +11,14 @@ https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0-rc0
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0/annotation-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.3.0/annotation-1.3.0.pom
+https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0-rc01/appcompat-resources-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.3.1/appcompat-resources-1.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.4.1/appcompat-resources-1.4.1.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.4.2/appcompat-resources-1.4.2.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.0/appcompat-1.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0-rc01/appcompat-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.3.1/appcompat-1.3.1.pom
@@ -23,6 +26,7 @@ https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.4.1/appco
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.4.2/appcompat-1.4.2.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.0/core-common-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.1/core-common-2.0.1.pom
+https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0-rc01/core-common-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.0.0/core-runtime-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.pom
@@ -83,6 +87,7 @@ https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.2.0/exifinterface-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.3.2/exifinterface-1.3.2.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fragment-1.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0-rc01/fragment-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.5/fragment-1.2.5.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.3.6/fragment-1.3.6.pom
@@ -91,6 +96,7 @@ https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-ui/1
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-utils/1.0.0/legacy-support-core-utils-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-v4/1.0.0/legacy-support-v4-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.0.0/lifecycle-common-2.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0-rc01/lifecycle-common-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.2.0/lifecycle-common-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.3.1/lifecycle-common-2.3.1.pom
@@ -103,6 +109,7 @@ https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.1.0/lifecycle-livedata-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-process/2.4.0/lifecycle-process-2.4.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.0.0/lifecycle-runtime-2.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0-rc01/lifecycle-runtime-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.2.0/lifecycle-runtime-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.3.1/lifecycle-runtime-2.3.1.pom
@@ -111,6 +118,7 @@ https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-s
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.2.0/lifecycle-viewmodel-savedstate-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.3.1/lifecycle-viewmodel-savedstate-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.0.0/lifecycle-viewmodel-2.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0-rc01/lifecycle-viewmodel-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.2.0/lifecycle-viewmodel-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.3.1/lifecycle-viewmodel-2.3.1.pom
@@ -122,6 +130,7 @@ https://dl.google.com/dl/android/maven2/androidx/print/print/1.0.0/print-1.0.0.p
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.0.0/recyclerview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.1.0/recyclerview-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/resourceinspection/resourceinspection-annotation/1.0.0/resourceinspection-annotation-1.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0-rc01/savedstate-1.0.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.1.0/savedstate-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/slidingpanelayout/slidingpanelayout/1.0.0/slidingpanelayout-1.0.0.pom
@@ -143,8 +152,10 @@ https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.1.0/tra
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0-rc01/transition-1.2.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0/transition-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.0.0/vectordrawable-animated-1.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0-rc01/vectordrawable-animated-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0/vectordrawable-animated-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.0.0/vectordrawable-1.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0-rc01/vectordrawable-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0/vectordrawable-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.0.0/versionedparcelable-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.0-rc01/versionedparcelable-1.1.0-rc01.pom
@@ -526,6 +537,7 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.0/commons-
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.0/commons-logging-1.3.0.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
@@ -609,25 +621,25 @@ https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloa
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.5/soloader-0.10.5.pom
 https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.16.0-rc1/jackson-annotations-2.16.0-rc1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.16.1/jackson-annotations-2.16.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.16.0-rc1/jackson-core-2.16.0-rc1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.16.1/jackson-core-2.16.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.16.0-rc1/jackson-databind-2.16.0-rc1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.16.1/jackson-databind-2.16.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.1/jackson-dataformat-xml-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.11.1/jackson-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.16.0-rc1/jackson-base-2.16.0-rc1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.16.1/jackson-base-2.16.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.11.1/jackson-bom-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.16.0-rc1/jackson-bom-2.16.0-rc1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.16.1/jackson-bom-2.16.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.11/jackson-parent-2.11.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.16-rc1/jackson-parent-2.16-rc1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.16/jackson-parent-2.16.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.11.1/jackson-modules-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.16.0-rc1/jackson-modules-base-2.16.0-rc1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.16.1/jackson-modules-base-2.16.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.1/jackson-module-jaxb-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.16.0-rc1/jackson-module-jaxb-annotations-2.16.0-rc1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.16.1/jackson-module-jaxb-annotations-2.16.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/55/oss-parent-55.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/56/oss-parent-56.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/woodstox/woodstox-core/6.2.1/woodstox-core-6.2.1.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.pom
@@ -685,7 +697,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.24.0/error_prone_annotations-2.24.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -694,10 +706,11 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.4.0/error_prone_parent-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.7.1/error_prone_parent-2.7.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.23.0/error_prone_parent-2.23.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.24.0/error_prone_parent-2.24.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
+https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/17.0/guava-parent-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/22.0/guava-parent-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/23.0/guava-parent-23.0.pom
@@ -709,8 +722,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/29.0-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-android/guava-parent-30.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guava-parent-30.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/32.1.3-jre/guava-parent-32.1.3-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.1.3-jre/guava-testlib-32.1.3-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.0.0-jre/guava-parent-33.0.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.0.0-jre/guava-testlib-33.0.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -722,7 +735,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/29.0-jre/guava-29.0-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-android/guava-30.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/32.1.3-jre/guava-32.1.3-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.0.0-jre/guava-33.0.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -756,8 +769,8 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.10.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/protobuf-parent-3.13.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.0.0-rc-2/protobuf-parent-4.0.0-rc-2.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.1.5/truth-parent-1.1.5.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth/1.1.5/truth-1.1.5.pom
+https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.2.0/truth-parent-1.2.0.pom
+https://repo.maven.apache.org/maven2/com/google/truth/truth/1.2.0/truth-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
 https://repo.maven.apache.org/maven2/com/intellij/annotations/12.0/annotations-12.0.pom
 https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0.pom
@@ -772,7 +785,8 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.9.2/okhttp-4.9.2.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.7.0/okio-jvm-3.7.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-metadata/2.8.0/okio-metadata-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.13.0/okio-parent-1.13.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.4/okio-parent-1.17.4.pom
@@ -781,7 +795,7 @@ https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.p
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.4/okio-1.17.4.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.6.0/okio-3.6.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.7.0/okio-3.7.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.1/all-1.2.1.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.2/all-1.2.2.pom
@@ -899,13 +913,13 @@ https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.13/byte-buddy-agent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.19/byte-buddy-agent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.9/byte-buddy-agent-1.14.9.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.10/byte-buddy-agent-1.14.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.19/byte-buddy-parent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.9/byte-buddy-parent-1.14.9.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.10/byte-buddy-parent-1.14.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.19/byte-buddy-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.9/byte-buddy-1.14.9.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.10/byte-buddy-1.14.10.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -949,6 +963,7 @@ https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/29/apache-29.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.pom
@@ -966,6 +981,7 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/58/commons-parent-58.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/65/commons-parent-65.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -1018,7 +1034,7 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.40.0/checker-qual-3.40.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.42.0/checker-qual-3.42.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.10/groovy-xml-3.0.10.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.10/groovy-3.0.10.pom
@@ -1140,7 +1156,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.5.31/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.9.20/kotlin-reflect-1.9.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta2/kotlin-reflect-2.0.0-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.6.20/kotlin-scripting-compiler-embeddable-1.6.20.pom
@@ -1171,7 +1187,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.22/kotlin-stdlib-common-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.10/kotlin-stdlib-common-1.9.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20/kotlin-stdlib-jdk7-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50/kotlin-stdlib-jdk7-1.3.50.pom
@@ -1184,7 +1199,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.10/kotlin-stdlib-jdk7-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.22/kotlin-stdlib-jdk7-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.10/kotlin-stdlib-jdk7-1.9.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
@@ -1196,7 +1210,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.31/kotlin-stdlib-jdk8-1.5.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.10/kotlin-stdlib-jdk8-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.22/kotlin-stdlib-jdk8-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.10/kotlin-stdlib-jdk8-1.9.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.0/kotlin-stdlib-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.20/kotlin-stdlib-1.2.20.pom
@@ -1220,8 +1233,8 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.20/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.22/kotlin-stdlib-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.10/kotlin-stdlib-1.9.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.20/kotlin-stdlib-1.9.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta2/kotlin-stdlib-2.0.0-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20/kotlin-tooling-metadata-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.6.20/kotlin-util-io-1.6.20.pom
@@ -1236,14 +1249,14 @@ https://repo.maven.apache.org/maven2/org/json/json/20231013/json-20231013.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
 https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.2/junit-bom-5.9.2.pom
 https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.3/junit-bom-5.9.3.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.0/junit-bom-5.10.0.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.1/junit-bom-5.10.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.12.4/mockito-core-3.12.4.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.7.0/mockito-core-5.7.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.8.0/mockito-core-5.8.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-inline/4.0.0/mockito-inline-4.0.0.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom

nix/deps/nodejs-patched/default.nix

@@ -12,8 +12,7 @@ stdenv.mkDerivation {
     "patchBuildIdPhase"
     "patchKeyChainPhase"
     "patchGlogPhase"
-    "patchJestPhase"
-    "installPhase"    
+    "installPhase"
   ];
 
   # First symlink all modules as is
@@ -56,13 +55,6 @@ stdenv.mkDerivation {
       '-Wl,--build-id=none'
   '';
 
-  # Remove when we upgrade jest to 29
-  patchJestPhase = ''
-    substituteInPlace ./node_modules/react-native/jest/setup.js --replace \
-      'jest.now()' \
-      'Date.now'
-  '';
-
   installPhase = ''
     mkdir -p $out
     cp -R node_modules $out/

package.json

@@ -26,6 +26,7 @@
     "create-react-class": "^15.6.2",
     "emojilib": "^2.4.0",
     "eth-phishing-detect": "^1.2.0",
+    "form-data": "^4.0.0",
     "functional-red-black-tree": "^1.0.1",
     "i18n-js": "^3.3.0",
     "jsc-android": "^250231.0.0",
@@ -66,7 +67,7 @@
     "react-native-svg": "13.10.0",
     "react-native-touch-id": "^4.4.1",
     "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1",
-    "react-native-webview": "13.3.1",
+    "react-native-webview": "13.6.3",
     "react-syntax-highlighter": "^15.5.0",
     "rn-emoji-keyboard": "0.7.0",
     "tdigest": "^0.1.1"
@@ -81,18 +82,17 @@
     "@babel/register": "7.0.0",
     "@jest/globals": "^25.1.0",
     "@mapbox/node-pre-gyp": "^1.0.9",
-    "@testing-library/jest-native": "^5.0.0",
-    "@testing-library/react-native": "^11.2.0",
+    "@testing-library/jest-native": "^5.4.3",
+    "@testing-library/react-native": "^12.4.2",
     "@tsconfig/react-native": "^3.0.0",
     "@types/jest": "^28.1.6",
     "@types/react": "^18.0.24",
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.7.0",
     "concurrently": "^7.6.0",
-    "jest": "^26.6.3",
-    "jest-circus": "^26.0.0",
-    "jest-environment-node": "^26.6.2",
+    "jest": "^29.7.0",
     "jest-image-snapshot": "^5.1.0",
+    "jest-silent-reporter": "^0.5.0",
     "metro-react-native-babel-preset": "0.76.8",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",

scripts/lint/require-i18n-resource-first.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-if rg --quiet --multiline '^\(ns.*\n^\s*\(:require\n(^\s*(;|#_).*\n)*(^\s*\[status-im\.setup\.i18n-resources\W)' src/status_im/core.cljs; then
+if rg --quiet --multiline '^\(ns.*\n^\s*\(:require\n(^\s*(;|#_).*\n)*(^\s*\[status-im\.setup\.i18n-resources\W)' src/status_im/core.cljs src/test_helpers/component_tests_preload.cljs; then
   exit 0
 elif [ $? -eq 1 ]; then
   echo "status-im.setup.i18n-resources must be loaded first (be the first one in ns :require form) in status-im.core"

shadow-cljs.edn

@@ -150,9 +150,10 @@
                       :source-map    false}}
   :component-test {:target           :npm-module
                    :entries          [;; We need to tell shadow-cljs to compile
-                                      ;; the preloads namespace because it will
-                                      ;; be used directly by Jest in the option
-                                      ;; setupFilesAfterEnv.
+                                      ;; the preloads namespaces because they
+                                      ;; will be used directly by Jest in the
+                                      ;; option setupFilesAfterEnv.
+                                      test-helpers.component-tests-preload
                                       status-im.setup.schema-preload
 
                                       quo.core-spec
@@ -161,5 +162,6 @@
                    :output-dir       "component-spec"
                    :closure-defines  {schema.core/throw-on-error? true}
                    :compiler-options {:warnings-as-errors false
+                                      :warnings           {:fn-deprecated false}
                                       :static-fns         false
                                       :infer-externs      true}}}}

src/legacy/status_im/contact/block.cljs

@@ -4,8 +4,8 @@
     [legacy.status-im.data-store.chats :as chats-store]
     [legacy.status-im.utils.deprecated-types :as types]
     [re-frame.core :as re-frame]
+    [status-im.contexts.chat.contacts.events :as contacts-store]
     [status-im.contexts.chat.messages.list.events :as message-list]
-    [status-im.contexts.contacts.events :as contacts-store]
     [status-im.contexts.shell.activity-center.events :as activity-center]
     [status-im.navigation.events :as navigation]
     [utils.re-frame :as rf]))

src/legacy/status_im/mobile_sync_settings/core.cljs

@@ -6,7 +6,7 @@
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
     [legacy.status-im.utils.mobile-sync :as utils]
     [legacy.status-im.wallet.core :as wallet]
-    [status-im.contexts.add-new-contact.events :as add-new-contact]
+    [status-im.contexts.chat.home.add-new-contact.events :as add-new-contact]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))

src/native_module/core.cljs

@@ -11,6 +11,41 @@
   (when (exists? (.-NativeModules react-native))
     (.-Status ^js (.-NativeModules react-native))))
 
+(defn account
+  []
+  (when (exists? (.-NativeModules react-native))
+        (.-AccountManager ^js (.-NativeModules react-native))))
+
+(defn encryption
+  []
+  (when (exists? (.-NativeModules react-native))
+        (.-EncryptionUtils ^js (.-NativeModules react-native))))
+
+(defn database
+  []
+  (when (exists? (.-NativeModules react-native))
+        (.-DatabaseManager ^js (.-NativeModules react-native))))
+
+(defn ui-helper
+  []
+  (when (exists? (.-NativeModules react-native))
+        (.-UIHelper ^js (.-NativeModules react-native))))
+
+(defn log-manager
+  []
+  (when (exists? (.-NativeModules react-native))
+        (.-LogManager ^js (.-NativeModules react-native))))
+
+(defn utils
+  []
+  (when (exists? (.-NativeModules react-native))
+        (.-Utils ^js (.-NativeModules react-native))))
+
+(defn network
+  []
+  (when (exists? (.-NativeModules react-native))
+        (.-NetworkManager ^js (.-NativeModules react-native))))
+
 (defn init
   [handler]
   (.addListener ^js (.-DeviceEventEmitter ^js react-native) "gethEvent" #(handler (.-jsonEvent ^js %))))
@@ -19,23 +54,23 @@
   []
   (log/debug "[native-module] clear-web-data")
   (when (status)
-    (.clearCookies ^js (status))
-    (.clearStorageAPIs ^js (status))))
+    (.clearCookies ^js (ui-helper))
+    (.clearStorageAPIs ^js (ui-helper))))
 
 (defn init-keystore
   [key-uid callback]
   (log/debug "[native-module] init-keystore" key-uid)
-  (.initKeystore ^js (status) key-uid callback))
+  (.initKeystore ^js (encryption) key-uid callback))
 
 (defn open-accounts
   [callback]
   (log/debug "[native-module] open-accounts")
-  (.openAccounts ^js (status) #(callback (types/json->clj %))))
+  (.openAccounts ^js (account) #(callback (types/json->clj %))))
 
 (defn prepare-dir-and-update-config
   [key-uid config callback]
   (log/debug "[native-module] prepare-dir-and-update-config")
-  (.prepareDirAndUpdateConfig ^js (status)
+  (.prepareDirAndUpdateConfig ^js (account)
                               key-uid
                               config
                               #(callback (types/json->clj %))))
@@ -47,7 +82,7 @@
   (init-keystore
    key-uid
    #(.saveAccountAndLoginWithKeycard
-     ^js (status)
+     ^js (account)
      multiaccount-data
      password
      settings
@@ -63,24 +98,24 @@
   (let [config (if config (types/clj->json config) "")]
     (init-keystore
      key-uid
-     #(.loginWithConfig ^js (status) account-data hashed-password config))))
+     #(.loginWithConfig ^js (account) account-data hashed-password config))))
 
 (defn login-account
   "NOTE: beware, the password has to be sha3 hashed"
   [{:keys [keyUid] :as request}]
-  (log/debug "[native-module] loginWithConfig")
+  (log/debug "[native-module] loginAccount")
   (clear-web-data)
   (init-keystore
    keyUid
-   #(.loginAccount ^js (status) (types/clj->json request))))
+   #(.loginAccount ^js (account) (types/clj->json request))))
 
 (defn create-account-and-login
   [request]
-  (.createAccountAndLogin ^js (status) (types/clj->json request)))
+  (.createAccountAndLogin ^js (account) (types/clj->json request)))
 
 (defn restore-account-and-login
   [request]
-  (.restoreAccountAndLogin ^js (status) (types/clj->json request)))
+  (.restoreAccountAndLogin ^js (account) (types/clj->json request)))
 
 (defn export-db
   "NOTE: beware, the password has to be sha3 hashed"
@@ -89,7 +124,7 @@
   (clear-web-data)
   (init-keystore
    key-uid
-   #(.exportUnencryptedDatabase ^js (status) account-data hashed-password callback)))
+   #(.exportUnencryptedDatabase ^js (database) account-data hashed-password callback)))
 
 (defn import-db
   "NOTE: beware, the password has to be sha3 hashed"
@@ -98,13 +133,13 @@
   (clear-web-data)
   (init-keystore
    key-uid
-   #(.importUnencryptedDatabase ^js (status) account-data hashed-password)))
+   #(.importUnencryptedDatabase ^js (database) account-data hashed-password)))
 
 (defn logout
   []
   (log/debug "[native-module] logout")
   (clear-web-data)
-  (.logout ^js (status)))
+  (.logout ^js (account)))
 
 (defn multiaccount-load-account
   "NOTE: beware, the password has to be sha3 hashed
@@ -114,7 +149,7 @@
    from memory"
   [address hashed-password callback]
   (log/debug "[native-module] multiaccount-load-account")
-  (.multiAccountLoadAccount ^js (status)
+  (.multiAccountLoadAccount ^js (account)
                             (types/clj->json {:address  address
                                               :password hashed-password})
                             callback))
@@ -127,7 +162,7 @@
   [account-id paths callback]
   (log/debug "[native-module]  multiaccount-derive-addresses")
   (when (status)
-    (.multiAccountDeriveAddresses ^js (status)
+    (.multiAccountDeriveAddresses ^js (account)
                                   (types/clj->json {:accountID account-id
                                                     :paths     paths})
                                   callback)))
@@ -145,7 +180,7 @@
   (when (status)
     (init-keystore
      key-uid
-     #(.multiAccountStoreAccount ^js (status)
+     #(.multiAccountStoreAccount ^js (account)
                                  (types/clj->json {:accountID account-id
                                                    :password  hashed-password})
                                  callback))))
@@ -158,7 +193,7 @@
              account-id)
   (init-keystore
    key-uid
-   #(.multiAccountStoreDerived ^js (status)
+   #(.multiAccountStoreDerived ^js (account)
                                (types/clj->json {:accountID account-id
                                                  :paths     paths
                                                  :password  hashed-password})
@@ -171,7 +206,7 @@
    to store the key"
   [n mnemonic-length paths callback]
   (log/debug "[native-module]  multiaccount-generate-and-derive-addresses")
-  (.multiAccountGenerateAndDeriveAddresses ^js (status)
+  (.multiAccountGenerateAndDeriveAddresses ^js (account)
                                            (types/clj->json {:n                    n
                                                              :mnemonicPhraseLength mnemonic-length
                                                              :bip39Passphrase      ""
@@ -181,7 +216,7 @@
 (defn multiaccount-import-mnemonic
   [mnemonic password callback]
   (log/debug "[native-module] multiaccount-import-mnemonic")
-  (.multiAccountImportMnemonic ^js (status)
+  (.multiAccountImportMnemonic ^js (account)
                                (types/clj->json {:mnemonicPhrase  mnemonic
                                                  ;;NOTE this is not the multiaccount password
                                                  :Bip39Passphrase password})
@@ -190,7 +225,7 @@
 (defn multiaccount-import-private-key
   [private-key callback]
   (log/debug "[native-module] multiaccount-import-private-key")
-  (.multiAccountImportPrivateKey ^js (status)
+  (.multiAccountImportPrivateKey ^js (account)
                                  (types/clj->json {:privateKey private-key})
                                  callback))
 
@@ -198,13 +233,13 @@
   "NOTE: beware, the password has to be sha3 hashed"
   [address hashed-password callback]
   (log/debug "[native-module] verify")
-  (.verify ^js (status) address hashed-password callback))
+  (.verify ^js (account) address hashed-password callback))
 
 (defn verify-database-password
   "NOTE: beware, the password has to be sha3 hashed"
   [key-uid hashed-password callback]
   (log/debug "[native-module] verify-database-password")
-  (.verifyDatabasePassword ^js (status) key-uid hashed-password callback))
+  (.verifyDatabasePassword ^js (account) key-uid hashed-password callback))
 
 (defn login-with-keycard
   [{:keys [key-uid multiaccount-data password chat-key node-config]}]
@@ -212,40 +247,40 @@
   (clear-web-data)
   (init-keystore
    key-uid
-   #(.loginWithKeycard ^js (status) multiaccount-data password chat-key (types/clj->json node-config))))
+   #(.loginWithKeycard ^js (account) multiaccount-data password chat-key (types/clj->json node-config))))
 
 (defn set-soft-input-mode
   [mode]
   (log/debug "[native-module]  set-soft-input-mode")
-  (.setSoftInputMode ^js (status) mode))
+  (.setSoftInputMode ^js (ui-helper) mode))
 
 (defn call-rpc
   [payload callback]
   (log/debug "[native-module] call-rpc")
-  (.callRPC ^js (status) payload callback))
+  (.callRPC ^js (network) payload callback))
 
 (defn call-private-rpc
   [payload callback]
-  (.callPrivateRPC ^js (status) payload callback))
+  (.callPrivateRPC ^js (network) payload callback))
 
 (defn hash-transaction
   "used for keycard"
   [rpcParams callback]
   (log/debug "[native-module] hash-transaction")
-  (.hashTransaction ^js (status) rpcParams callback))
+  (.hashTransaction ^js (encryption) rpcParams callback))
 
 (defn hash-message
   "used for keycard"
   [message callback]
   (log/debug "[native-module] hash-message")
-  (.hashMessage ^js (status) message callback))
+  (.hashMessage ^js (encryption) message callback))
 
 (defn start-searching-for-local-pairing-peers
   "starts a UDP multicast beacon that both listens for and broadcasts to LAN peers"
   [callback]
   (log/info "[native-module] Start Searching for Local Pairing Peers"
             {:fn :start-searching-for-local-pairing-peers})
-  (.startSearchForLocalPairingPeers ^js (status) callback))
+  (.startSearchForLocalPairingPeers ^js (network) callback))
 
 (defn local-pairing-preflight-outbound-check
   "Checks whether the device has allows connecting to the local server"
@@ -260,7 +295,7 @@
   (log/info "[native-module] Fetching Connection String"
             {:fn          :get-connection-string-for-bootstrapping-another-device
              :config-json config-json})
-  (.getConnectionStringForBootstrappingAnotherDevice ^js (status) config-json callback))
+  (.getConnectionStringForBootstrappingAnotherDevice ^js (network) config-json callback))
 
 (defn input-connection-string-for-bootstrapping
   "Provides connection string to status-go for the purpose of local pairing on the receiver end"
@@ -269,7 +304,7 @@
             {:fn                :input-connection-string-for-bootstrapping
              :config-json       config-json
              :connection-string connection-string})
-  (.inputConnectionStringForBootstrapping ^js (status) connection-string config-json callback))
+  (.inputConnectionStringForBootstrapping ^js (network) connection-string config-json callback))
 
 (defn deserialize-and-compress-key
   "Provides a community id (public key) to status-go which is first deserialized
@@ -280,7 +315,7 @@
   (log/info "[native-module] Deserializing and then compressing public key"
             {:fn  :deserialize-and-compress-key
              :key input-key})
-  (.deserializeAndCompressKey ^js (status) input-key callback))
+  (.deserializeAndCompressKey ^js (encryption) input-key callback))
 
 (defn compressed-key->public-key
   "Provides compressed key to status-go and gets back the uncompressed public key via deserialization"
@@ -288,59 +323,59 @@
   (log/info "[native-module] Deserializing compressed key"
             {:fn         :compressed-key->public-key
              :public-key public-key})
-  (.multiformatDeserializePublicKey ^js (status) public-key deserialization-key callback))
+  (.multiformatDeserializePublicKey ^js (encryption) public-key deserialization-key callback))
 
 (defn hash-typed-data
   "used for keycard"
   [data callback]
   (log/debug "[native-module] hash-typed-data")
-  (.hashTypedData ^js (status) data callback))
+  (.hashTypedData ^js (encryption) data callback))
 
 (defn hash-typed-data-v4
   "used for keycard"
   [data callback]
   (log/debug "[native-module] hash-typed-data-v4")
-  (.hashTypedDataV4 ^js (status) data callback))
+  (.hashTypedDataV4 ^js (encryption) data callback))
 
 (defn send-transaction-with-signature
   "used for keycard"
   [rpcParams sig callback]
   (log/debug "[native-module] send-transaction-with-signature")
-  (.sendTransactionWithSignature ^js (status) rpcParams sig callback))
+  (.sendTransactionWithSignature ^js (network) rpcParams sig callback))
 
 (defn sign-message
   "NOTE: beware, the password in rpcParams has to be sha3 hashed"
   [rpcParams callback]
   (log/debug "[native-module] sign-message")
-  (.signMessage ^js (status) rpcParams callback))
+  (.signMessage ^js (encryption) rpcParams callback))
 
 (defn recover-message
   [rpcParams callback]
   (log/debug "[native-module] recover")
-  (.recover ^js (status) rpcParams callback))
+  (.recover ^js (network) rpcParams callback))
 
 (defn send-transaction
   "NOTE: beware, the password has to be sha3 hashed"
   [rpcParams hashed-password callback]
   (log/debug "[native-module] send-transaction")
-  (.sendTransaction ^js (status) rpcParams hashed-password callback))
+  (.sendTransaction ^js (network) rpcParams hashed-password callback))
 
 (defn sign-typed-data
   "NOTE: beware, the password has to be sha3 hashed"
   [data account hashed-password callback]
   (log/debug "[native-module] sign-typed-data")
-  (.signTypedData ^js (status) data account hashed-password callback))
+  (.signTypedData ^js (encryption) data account hashed-password callback))
 
 (defn sign-typed-data-v4
   "NOTE: beware, the password has to be sha3 hashed"
   [data account hashed-password callback]
   (log/debug "[native-module] sign-typed-data-v4")
-  (.signTypedDataV4 ^js (status) data account hashed-password callback))
+  (.signTypedDataV4 ^js (encryption) data account hashed-password callback))
 
 (defn send-logs
   [dbJson js-logs callback]
   (log/debug "[native-module] send-logs")
-  (.sendLogs ^js (status) dbJson js-logs callback))
+  (.sendLogs ^js (log-manager) dbJson js-logs callback))
 
 (defn close-application
   []
@@ -365,7 +400,7 @@
 (defn set-blank-preview-flag
   [flag]
   (log/debug "[native-module] set-blank-preview-flag")
-  (.setBlankPreviewFlag ^js (status) flag))
+  (.setBlankPreviewFlag ^js (encryption) flag))
 
 (defn get-device-model-info
   []
@@ -393,7 +428,7 @@
 (defn toggle-webview-debug
   [on]
   (log/debug "[native-module] toggle-webview-debug" on)
-  (.toggleWebviewDebug ^js (status) on))
+  (.toggleWebviewDebug ^js (ui-helper) on))
 
 (defn rooted-device?
   [callback]
@@ -416,72 +451,72 @@
 (defn encode-transfer
   [to-norm amount-hex]
   (log/debug "[native-module] encode-transfer")
-  (.encodeTransfer ^js (status) to-norm amount-hex))
+  (.encodeTransfer ^js (encryption) to-norm amount-hex))
 
 (defn decode-parameters
   [bytes-string types]
   (log/debug "[native-module] decode-parameters")
-  (let [json-str (.decodeParameters ^js (status)
+  (let [json-str (.decodeParameters ^js (encryption)
                                     (types/clj->json {:bytesString bytes-string :types types}))]
     (types/json->clj json-str)))
 
 (defn hex-to-number
   [hex]
   (log/debug "[native-module] hex-to-number")
-  (let [json-str (.hexToNumber ^js (status) hex)]
+  (let [json-str (.hexToNumber ^js (encryption) hex)]
     (types/json->clj json-str)))
 
 (defn number-to-hex
   [num]
   (log/debug "[native-module] number-to-hex")
-  (.numberToHex ^js (status) (str num)))
+  (.numberToHex ^js (encryption) (str num)))
 
 (defn sha3
   [s]
   (log/debug "[native-module] sha3")
   (when s
-    (.sha3 ^js (status) (str s))))
+    (.sha3 ^js (encryption) (str s))))
 
 (defn utf8-to-hex
   [s]
   (log/debug "[native-module] utf8-to-hex")
-  (.utf8ToHex ^js (status) s))
+  (.utf8ToHex ^js (encryption) s))
 
 (defn hex-to-utf8
   [s]
   (log/debug "[native-module] hex-to-utf8")
-  (.hexToUtf8 ^js (status) s))
+  (.hexToUtf8 ^js (encryption) s))
 
 (defn check-address-checksum
   [address]
   (log/debug "[native-module] check-address-checksum")
-  (let [result (.checkAddressChecksum ^js (status) address)]
+  (let [result (.checkAddressChecksum ^js (utils) address)]
     (types/json->clj result)))
 
 (defn address?
   [address]
   (log/debug "[native-module] address?")
   (when address
-    (let [result (.isAddress ^js (status) address)]
+    (let [result (.isAddress ^js (utils) address)]
       (types/json->clj result))))
 
 (defn to-checksum-address
   [address]
   (log/debug "[native-module] to-checksum-address")
-  (.toChecksumAddress ^js (status) address))
+  (.toChecksumAddress ^js (utils) address))
 
 (defn validate-mnemonic
   "Validate that a mnemonic conforms to BIP39 dictionary/checksum standards"
   [mnemonic callback]
   (log/debug "[native-module] validate-mnemonic")
-  (.validateMnemonic ^js (status) mnemonic callback))
+  (.validateMnemonic ^js (utils) mnemonic callback))
 
 (defn delete-multiaccount
   "Delete multiaccount from database, deletes multiaccount's database and
   key files."
   [key-uid callback]
   (log/debug "[native-module] delete-multiaccount")
-  (.deleteMultiaccount ^js (status) key-uid callback))
+  (.deleteMultiaccount ^js (account) key-uid callback))
 
 (defn delete-imported-key
   "Delete imported key file."
@@ -493,7 +528,7 @@
   [input selection]
   (log/debug "[native-module] resetKeyboardInput")
   (when platform/android?
-    (.resetKeyboardInputCursor ^js (status) input selection)))
+    (.resetKeyboardInputCursor ^js (ui-helper) input selection)))
 
 ;; passwords are hashed
 (defn reset-password
@@ -501,12 +536,12 @@
   (log/debug "[native-module] change-database-password")
   (init-keystore
    key-uid
-   #(.reEncryptDbAndKeystore ^js (status) key-uid current-password# new-password# callback)))
+   #(.reEncryptDbAndKeystore ^js (encryption) key-uid current-password# new-password# callback)))
 
 (defn convert-to-keycard-account
   [{:keys [key-uid] :as multiaccount-data} settings current-password# new-password callback]
   (log/debug "[native-module] convert-to-keycard-account")
-  (.convertToKeycardAccount ^js (status)
+  (.convertToKeycardAccount ^js (encryption)
                             key-uid
                             (types/clj->json multiaccount-data)
                             (types/clj->json settings)
@@ -517,7 +552,7 @@
 
 (defn backup-disabled-data-dir
   []
-  (.backupDisabledDataDir ^js (status)))
+  (.backupDisabledDataDir ^js (utils)))
 
 (defn fleets
   []
@@ -525,12 +560,12 @@
 
 (defn keystore-dir
   []
-  (.keystoreDir ^js (status)))
+  (.keystoreDir ^js (utils)))
 
 (defn log-file-directory
   []
-  (.logFileDirectory ^js (status)))
+  (.logFileDirectory ^js (log-manager)))
 
 (defn init-status-go-logging
   [{:keys [enable? mobile-system? log-level callback]}]
-  (.initLogging ^js (status) enable? mobile-system? log-level callback))
+  (.initLogging ^js (log-manager) enable? mobile-system? log-level callback))

src/quo/components/buttons/slide_button/component_spec.cljs

@@ -63,14 +63,7 @@
    :track-icon  :face-id})
 
 (h/describe "slide-button"
-  (h/before-each
-   (fn []
-     (h/use-fake-timers)))
-
-  (h/after-each
-   (fn []
-     (h/clear-all-timers)
-     (h/use-real-timers)))
+  (h/setup-fake-timers)
 
   (h/test "render the correct text"
     (h/render [slide-button/view default-props])

src/quo/components/colors/color_picker/component_spec.cljs

@@ -17,5 +17,3 @@
       (h/fire-event :press (get (h/get-all-by-label-text :color-picker-item) 0))
       (-> (h/expect @selected)
           (.toStrictEqual :blue)))))
-
-

src/quo/components/colors/color_picker/view.cljs

@@ -27,14 +27,18 @@
   (let [selected              (reagent/atom default-selected)
         {window-width :width} (rn/get-window)
         ref                   (atom nil)]
-    (rn/use-effect #(js/setTimeout (fn []
-                                     (.scrollToIndex ^js @ref
-                                                     #js
-                                                      {:animated     true
-                                                       :index        (.indexOf colors/account-colors
-                                                                               default-selected)
-                                                       :viewPosition 0.5}))
-                                   50))
+    (rn/use-effect
+     (fn []
+       (js/setTimeout
+        (fn []
+          (let [index (.indexOf colors/account-colors default-selected)]
+            (when (and @ref (>= index 0))
+              (some-> ^js @ref
+                      (.scrollToIndex #js
+                                       {:animated     true
+                                        :index        index
+                                        :viewPosition 0.5})))))
+        50)))
     [rn/flat-list
      {:ref                               #(reset! ref %)
       ;; TODO: using :feng-shui? temporarily while b & w is being developed.

src/quo/components/dividers/strength_divider/component_spec.cljs

@@ -6,34 +6,25 @@
 (h/describe "select-profile component"
   (h/test "render component"
     (h/render [strength-divider/view {:type :okay}])
-    (-> (h/expect (h/get-by-label-text :strength-divider))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-label-text :strength-divider)))
   (h/test "render component with :type :very-weak"
     (h/render [strength-divider/view {:type :very-weak}])
-    (-> (h/expect (h/get-by-translation-text :strength-divider-very-weak-label))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/strength-divider-very-weak-label)))
   (h/test "render component with :type :weak"
     (h/render [strength-divider/view {:type :weak}])
-    (-> (h/expect (h/get-by-translation-text :strength-divider-weak-label))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/strength-divider-weak-label)))
   (h/test "render component with :type :okay"
     (h/render [strength-divider/view {:type :okay}])
-    (-> (h/expect (h/get-by-translation-text :strength-divider-okay-label))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/strength-divider-okay-label)))
   (h/test "render component with :type :strong"
     (h/render [strength-divider/view {:type :strong}])
-    (-> (h/expect (h/get-by-translation-text :strength-divider-strong-label))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/strength-divider-strong-label)))
   (h/test "render component with :type :very-strong"
     (h/render [strength-divider/view {:type :very-strong}])
-    (-> (h/expect (h/get-by-translation-text :strength-divider-very-strong-label))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/strength-divider-very-strong-label)))
   (h/test "render component with :type :alert"
     (h/render [strength-divider/view {:type :alert} "Text message"])
-    (-> (h/expect (h/get-by-text "Text message"))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-text "Text message")))
   (h/test "render component with :type :info"
     (h/render [strength-divider/view {:type :info} "Text Info"])
-    (-> (h/expect (h/get-by-text "Text Info"))
-        (.toBeTruthy))))
-
+    (h/is-truthy (h/get-by-text "Text Info"))))

src/quo/components/drawers/drawer_buttons/component_spec.cljs

@@ -6,14 +6,7 @@
     [test-helpers.component :as h]))
 
 (h/describe "drawer-buttons"
-  (h/before-each
-   (fn []
-     (h/use-fake-timers)))
-
-  (h/after-each
-   (fn []
-     (h/clear-all-timers)
-     (h/use-real-timers)))
+  (h/setup-fake-timers)
 
   (h/test "the top heading and subheading render"
     (h/render [drawer-buttons/view
@@ -37,7 +30,6 @@
     (-> (js/expect (h/get-by-text "bottom-sub-heading"))
         (.toBeTruthy)))
 
-
   (h/test "it clicks the top card"
     (let [event (h/mock-fn)]
       (with-redefs [safe-area/get-top (fn [] 10)]

src/quo/components/drawers/drawer_top/component_spec.cljs

@@ -71,7 +71,7 @@
                 :icon-avatar :i/placeholder
                 :type        :keypair}])
     (h/is-truthy (h/get-by-text "Title"))
-    (-> (h/expect (h/get-by-translation-text :on-device))
+    (-> (h/expect (h/get-by-translation-text :t/on-device))
         (.toBeTruthy)))
 
   (h/test "component renders in keypair type when keycard? is true"
@@ -81,7 +81,7 @@
                 :icon-avatar :i/placeholder
                 :type        :keypair}])
     (h/is-truthy (h/get-by-text "Title"))
-    (-> (h/expect (h/get-by-translation-text :on-keycard))
+    (-> (h/expect (h/get-by-translation-text :t/on-keycard))
         (.toBeTruthy)))
 
   (h/test "component renders in default-keypair type"

src/quo/components/graph/wallet_graph/component_spec.cljs

@@ -13,7 +13,10 @@
                {:time-frame :empty}])
     (h/is-truthy (h/get-by-label-text :illustration)))
 
-  (h/test "render 1 week wallet graph"
+  ;; NOTE: Throws error:
+  ;;   _reactNative.Animated.timing(widthValue2, {
+  ;;   Cannot read properties of undefined (reading 'timing')
+  (h/test-skip "render 1 week wallet graph"
     (h/render [wallet-graph/view
                {:time-frame :1-week
                 :data       (data 7)}])

src/quo/components/inputs/address_input/component_spec.cljs

@@ -18,7 +18,9 @@
     (with-redefs [clipboard/get-string #(% "")]
       (h/render [address-input/address-input {:ens-regex ens-regex}])
       (h/fire-event :on-focus (h/get-by-label-text :address-text-input))
-      (h/has-prop (h/get-by-label-text :address-text-input) :placeholder-text-color colors/neutral-40)))
+      (h/has-prop (h/get-by-label-text :address-text-input)
+                  :placeholder-text-color
+                  colors/neutral-40)))
 
   (h/test "on focus with blur? true"
     (with-redefs [clipboard/get-string #(% "")]
@@ -38,27 +40,33 @@
                    {:scanned-value  scanned-value
                     :on-change-text on-change-text
                     :ens-regex      ens-regex}])
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :clear-button)))
-        (h/was-called-with on-change-text scanned-value)
-        (h/has-prop (h/get-by-label-text :address-text-input) :default-value scanned-value))))
+        (-> (h/wait-for #(h/get-by-label-text :clear-button))
+            (.then (fn []
+                     (h/was-called-with on-change-text scanned-value)
+                     (h/has-prop (h/get-by-label-text :address-text-input)
+                                 :default-value
+                                 scanned-value)))))))
 
   (h/test "clear icon is shown when input has text"
     (with-redefs [clipboard/get-string #(% "")]
       (h/render [address-input/address-input
                  {:scanned-value "scanned value"
                   :ens-regex     ens-regex}])
-      (h/wait-for #(h/is-truthy (h/get-by-label-text :clear-button-container)))
-      (h/wait-for #(h/is-truthy (h/get-by-label-text :clear-button)))))
+      (-> (h/wait-for #(h/get-by-label-text :clear-button-container))
+          (.then #(h/is-truthy (h/get-by-label-text :clear-button))))))
 
   (h/test "on blur with text and blur? false"
     (with-redefs [clipboard/get-string #(% "")]
       (h/render [address-input/address-input
                  {:scanned-value "scanned value"
                   :ens-regex     ens-regex}])
-      (h/wait-for #(h/is-truthy (h/get-by-label-text :clear-button)))
-      (h/fire-event :on-focus (h/get-by-label-text :address-text-input))
-      (h/fire-event :on-blur (h/get-by-label-text :address-text-input))
-      (h/has-prop (h/get-by-label-text :address-text-input) :placeholder-text-color colors/neutral-30)))
+      (-> (h/wait-for #(h/get-by-label-text :clear-button))
+          (.then (fn []
+                   (h/fire-event :on-focus (h/get-by-label-text :address-text-input))
+                   (h/fire-event :on-blur (h/get-by-label-text :address-text-input))
+                   (h/has-prop (h/get-by-label-text :address-text-input)
+                               :placeholder-text-color
+                               colors/neutral-30))))))
 
   (h/test "on blur with text blur? true"
     (with-redefs [clipboard/get-string #(% "")]
@@ -66,19 +74,22 @@
                  {:scanned-value "scanned value"
                   :blur?         true
                   :ens-regex     ens-regex}])
-      (h/wait-for #(h/is-truthy (h/get-by-label-text :clear-button)))
-      (h/fire-event :on-focus (h/get-by-label-text :address-text-input))
-      (h/fire-event :on-blur (h/get-by-label-text :address-text-input))
-      (h/has-prop (h/get-by-label-text :address-text-input)
-                  :placeholder-text-color
-                  colors/neutral-80-opa-20)))
+      (-> (h/wait-for #(h/get-by-label-text :clear-button))
+          (.then (fn []
+                   (h/fire-event :on-focus (h/get-by-label-text :address-text-input))
+                   (h/fire-event :on-blur (h/get-by-label-text :address-text-input))
+                   (h/has-prop (h/get-by-label-text :address-text-input)
+                               :placeholder-text-color
+                               colors/neutral-80-opa-20))))))
 
   (h/test "on blur with no text and blur? false"
     (with-redefs [clipboard/get-string #(% "")]
       (h/render [address-input/address-input {:ens-regex ens-regex}])
       (h/fire-event :on-focus (h/get-by-label-text :address-text-input))
       (h/fire-event :on-blur (h/get-by-label-text :address-text-input))
-      (h/has-prop (h/get-by-label-text :address-text-input) :placeholder-text-color colors/neutral-40)))
+      (h/has-prop (h/get-by-label-text :address-text-input)
+                  :placeholder-text-color
+                  colors/neutral-40)))
 
   (h/test "on blur with no text blur? true"
     (with-redefs [clipboard/get-string #(% "")]
@@ -98,9 +109,10 @@
                    {:scanned-value "scanned value"
                     :on-clear      on-clear
                     :ens-regex     ens-regex}])
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :clear-button)))
-        (h/fire-event :press (h/get-by-label-text :clear-button))
-        (h/was-called on-clear))))
+        (-> (h/wait-for #(h/get-by-label-text :clear-button))
+            (.then (fn []
+                     (h/fire-event :press (h/get-by-label-text :clear-button))
+                     (h/was-called on-clear)))))))
 
   (h/test "on-focus is called"
     (let [on-focus (h/mock-fn)]
@@ -122,18 +134,22 @@
     (let [on-scan (h/mock-fn)]
       (with-redefs [clipboard/get-string #(% "")]
         (h/render [address-input/address-input {:on-scan on-scan}])
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :scan-button)))
-        (h/fire-event :press (h/get-by-label-text :scan-button))
-        (h/was-called on-scan))))
+        (-> (h/wait-for #(h/get-by-label-text :scan-button))
+            (.then (fn []
+                     (h/fire-event :press (h/get-by-label-text :scan-button))
+                     (h/was-called on-scan)))))))
 
   (h/test "paste from clipboard"
     (let [clipboard "clipboard"]
       (with-redefs [clipboard/get-string #(% clipboard)]
         (h/render [address-input/address-input {:ens-regex ens-regex}])
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
+        (h/is-truthy (h/query-by-label-text :paste-button))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :clear-button)))
-        (h/has-prop (h/get-by-label-text :address-text-input) :default-value clipboard))))
+        (-> (h/wait-for #(h/get-by-label-text :clear-button))
+            (.then (fn []
+                     (h/has-prop (h/get-by-label-text :address-text-input)
+                                 :default-value
+                                 clipboard)))))))
 
   (h/test "ENS loading state and call on-detect-ens"
     (let [clipboard     "test.eth"
@@ -142,11 +158,12 @@
         (h/render [address-input/address-input
                    {:on-detect-ens on-detect-ens
                     :ens-regex     ens-regex}])
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
+        (h/is-truthy (h/query-by-label-text :paste-button))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (h/wait-for #(h/is-falsy (h/get-by-label-text :clear-button)))
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :loading-button-container)))
-        (h/was-called on-detect-ens))))
+        (-> (h/wait-for #(h/is-falsy (h/query-by-label-text :clear-button)))
+            (.then (fn []
+                     (h/wait-for #(h/get-by-label-text :loading-button-container))))
+            (.then #(h/was-called on-detect-ens))))))
 
   (h/test "ENS valid state and call on-detect-ens"
     (let [clipboard     "test.eth"
@@ -156,11 +173,12 @@
                    {:on-detect-ens         on-detect-ens
                     :valid-ens-or-address? true
                     :ens-regex             ens-regex}])
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
+        (h/is-truthy (h/query-by-label-text :paste-button))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (h/wait-for #(h/is-falsy (h/get-by-label-text :clear-button)))
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :positive-button-container)))
-        (h/was-called on-detect-ens))))
+        (-> (h/wait-for #(h/is-falsy (h/query-by-label-text :clear-button)))
+            (.then (fn []
+                     (h/wait-for #(h/get-by-label-text :positive-button-container))))
+            (.then #(h/was-called on-detect-ens))))))
 
   (h/test "address loading state and call on-detect-address"
     (let [clipboard         "0x2f88d65f3cb52605a54a833ae118fb1363acccd2"
@@ -169,21 +187,24 @@
         (h/render [address-input/address-input
                    {:on-detect-address on-detect-address
                     :address-regex     address-regex}])
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
+        (h/is-truthy (h/query-by-label-text :paste-button))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (h/wait-for #(h/is-falsy (h/get-by-label-text :clear-button)))
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :loading-button-container)))
-        (h/was-called on-detect-address))))
+        (-> (h/wait-for #(h/is-falsy (h/query-by-label-text :clear-button)))
+            (.then (fn []
+                     (h/wait-for #(h/get-by-label-text :loading-button-container))))
+            (.then #(h/was-called on-detect-address))))))
 
   (h/test "address valid state and call on-detect-address"
     (let [clipboard         "0x2f88d65f3cb52605a54a833ae118fb1363acccd2"
           on-detect-address (h/mock-fn)]
       (with-redefs [clipboard/get-string #(% clipboard)]
         (h/render [address-input/address-input
-                   {:on-detect-address on-detect-address
-                    :address-regex     address-regex}])
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
+                   {:on-detect-address     on-detect-address
+                    :address-regex         address-regex
+                    :valid-ens-or-address? true}])
+        (h/is-truthy (h/query-by-label-text :paste-button))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (h/wait-for #(h/is-falsy (h/get-by-label-text :clear-button)))
-        (h/wait-for #(h/is-truthy (h/get-by-label-text :positive-button-container)))
-        (h/was-called on-detect-address)))))
+        (-> (h/wait-for #(h/is-falsy (h/query-by-label-text :clear-button)))
+            (.then (fn []
+                     (h/wait-for #(h/get-by-label-text :positive-button-container))))
+            (.then #(h/was-called on-detect-address)))))))

src/quo/components/inputs/title_input/component_spec.cljs

@@ -13,16 +13,17 @@
                {:value      ""
                 :max-length 24}])
     (h/fire-event :on-focus (h/query-by-label-text :profile-title-input))
-    (h/wait-for #(h/is-truthy (h/query-by-text "00")))
-    (h/is-truthy (h/query-by-text "/24")))
+    (-> (h/wait-for #(h/get-by-text "00"))
+        (.then #(h/is-truthy (h/query-by-text "/24")))))
 
   (h/test "renders with max length digits and character count"
     (h/render [title-input/view
                {:default-value "abc"
-                :max-length    24} "abc"])
+                :max-length    24}
+               "abc"])
     (h/fire-event :on-focus (h/query-by-label-text :profile-title-input))
-    (h/wait-for #(h/is-truthy (h/query-by-text "03")))
-    (h/is-truthy (h/query-by-text "/24")))
+    (-> (h/wait-for #(h/get-by-text "03"))
+        (.then #(h/is-truthy (h/query-by-text "/24")))))
 
   (h/test "text updates on change"
     (let [on-change-text (h/mock-fn)]

src/quo/components/keycard/component_spec.cljs

@@ -6,7 +6,9 @@
 (h/describe "keycard component"
   (h/test "Render of keycard component when: holder-name prop is not set"
     (h/render [keycard/keycard])
-    (h/is-truthy (h/get-by-translation-text :empty-keycard)))
+    (h/is-truthy (h/get-by-translation-text :t/empty-keycard)))
+
   (h/test "Render of keycard component when: holder-name prop is set"
-    (h/render [keycard/keycard {:holder-name "Alisha"}])
-    (h/is-truthy (h/get-by-translation-text :user-keycard))))
+    (let [holder-name "Alisha"]
+      (h/render [keycard/keycard {:holder-name holder-name}])
+      (h/is-truthy (h/get-by-translation-text :t/user-keycard {:name holder-name})))))

src/quo/components/list_items/account/component_spec.cljs

@@ -47,11 +47,11 @@
     (h/render [account/view {:type :tag}])
     (h/is-truthy (h/query-by-label-text :tag-container)))
 
-  (h/test "renders keycard icon if title-icon? is true"
-    (h/render [account/view {:title-icon? true}])
+  (h/test "renders keycard icon if title-icon is present"
+    (h/render [account/view {:title-icon :i/placeholder}])
     (h/is-truthy (h/query-by-label-text :title-icon)))
 
-  (h/test "doesn't render keycard icon if title-icon? is false"
+  (h/test "doesn't render keycard icon if title-icon is missing"
     (h/render [account/view])
     (h/is-falsy (h/query-by-label-text :title-icon)))
 

src/quo/components/list_items/address/component_spec.cljs

@@ -22,14 +22,14 @@
                               {:backgroundColor colors/white-opa-5})))
 
   (h/test "on-press-out changes state to :active"
-    (h/render [address/view])
+    (h/render [address/view {:active-state? true}])
     (h/fire-event :on-press-in (h/get-by-label-text :container))
     (h/fire-event :on-press-out (h/get-by-label-text :container))
     (h/wait-for #(h/has-style (h/query-by-label-text :container)
                               {:backgroundColor (colors/custom-color :blue 50 10)})))
 
   (h/test "on-press-out changes state to :active with blur? enabled"
-    (h/render [address/view {:blur? true}])
+    (h/render [address/view {:active-state? true :blur? true}])
     (h/fire-event :on-press-in (h/get-by-label-text :container))
     (h/fire-event :on-press-out (h/get-by-label-text :container))
     (h/wait-for #(h/has-style (h/query-by-label-text :container)

src/quo/components/list_items/quiz_item/component_spec.cljs

@@ -0,0 +1,24 @@
+(ns quo.components.list-items.quiz-item.component-spec
+  (:require
+    [quo.components.list-items.quiz-item.view :as quiz-item]
+    [test-helpers.component :as h]))
+
+(h/describe "List Items: Token Value"
+  (h/test "Number label renders"
+    (h/render [quiz-item/view
+               {:state  :empty
+                :word   "collapse"
+                :number 2}])
+    (h/is-truthy (h/get-by-label-text :number-container)))
+  (h/test "Success icon renders"
+    (h/render [quiz-item/view
+               {:state  :success
+                :word   "collapse"
+                :number 2}])
+    (h/is-truthy (h/get-by-label-text :success-icon)))
+  (h/test "Error icon renders"
+    (h/render [quiz-item/view
+               {:state  :error
+                :word   "collapse"
+                :number 2}])
+    (h/is-truthy (h/get-by-label-text :error-icon))))

src/quo/components/list_items/quiz_item/style.cljs

@@ -0,0 +1,45 @@
+(ns quo.components.list-items.quiz-item.style
+  (:require [quo.foundations.colors :as colors]))
+
+(defn container
+  [{:keys [blur? theme state]}]
+  {:flex             1
+   :flex-direction   :row
+   :justify-content  :space-between
+   :align-items      :center
+   :max-height       56
+   :padding          12
+   :border-radius    12
+   :opacity          (if (= state :disabled) 0.3 1)
+   :border-width     (if (and blur? (or (= state :empty) (= state :disabled))) 0 1)
+   :border-color     (case state
+                       :success colors/success-50-opa-20
+                       :error   colors/danger-50-opa-20
+                       (colors/theme-colors colors/neutral-20 colors/neutral-80 theme))
+   :background-color (case state
+                       :empty    (if blur?
+                                   colors/white-opa-5
+                                   (colors/theme-colors colors/white colors/neutral-80-opa-40 theme))
+                       :disabled (if blur?
+                                   colors/white-opa-5
+                                   (colors/theme-colors colors/neutral-5 colors/neutral-80-opa-40 theme))
+                       :success  (colors/resolve-color :success theme 10)
+                       :error    (colors/resolve-color :danger theme 10))})
+
+(defn num-container
+  [{:keys [blur? theme]}]
+  {:width           32
+   :height          32
+   :justify-content :center
+   :align-items     :center
+   :border-radius   10
+   :border-width    1
+   :border-color    (if blur?
+                      colors/white-opa-10
+                      (colors/theme-colors colors/neutral-20 colors/neutral-70 theme))})
+
+(defn text
+  [{:keys [theme state]}]
+  {:color (case state
+            :success (colors/theme-colors colors/success-50 colors/success-60 theme)
+            :error   (colors/theme-colors colors/danger-50 colors/danger-60 theme))})

src/quo/components/list_items/quiz_item/view.cljs

@@ -0,0 +1,30 @@
+(ns quo.components.list-items.quiz-item.view
+  (:require
+    [quo.components.icon :as icon]
+    [quo.components.list-items.quiz-item.style :as style]
+    [quo.components.markdown.text :as text]
+    [quo.foundations.colors :as colors]
+    [quo.theme :as quo.theme]
+    [react-native.core :as rn]
+    [utils.i18n :as i18n]))
+
+(defn- view-internal
+  [{:keys [state theme number word] :as props}]
+  [rn/view {:style (style/container props)}
+   (if (or (= state :empty) (= state :disabled))
+     [rn/view
+      {:style               (style/num-container props)
+       :accessibility-label :number-container}
+      [text/text {:weight :semi-bold} number]]
+     [text/text {:style (style/text props)}
+      (if (= state :success) word (i18n/label :t/oops-wrong-word))])
+   (when (= state :success)
+     [icon/icon :i/check
+      {:color               (colors/theme-colors colors/success-50 colors/success-60 theme)
+       :accessibility-label :success-icon}])
+   (when (= state :error)
+     [icon/icon :i/incorrect
+      {:color               (colors/theme-colors colors/danger-50 colors/danger-60 theme)
+       :accessibility-label :error-icon}])])
+
+(def view (quo.theme/with-theme view-internal))

src/quo/components/record_audio/record_audio/component_spec.cljs

@@ -7,14 +7,7 @@
     [utils.datetime :as datetime]))
 
 (h/describe "record audio component"
-  (h/before-each
-   (fn []
-     (h/use-fake-timers)))
-
-  (h/after-each
-   (fn []
-     (h/clear-all-timers)
-     (h/use-real-timers)))
+  (h/setup-fake-timers)
 
   (h/test "renders record-audio"
     (h/render [record-audio/record-audio])

src/quo/components/record_audio/soundtrack/component_spec.cljs

@@ -6,14 +6,7 @@
     [test-helpers.component :as h]))
 
 (h/describe "soundtrack component"
-  (h/before-each
-   (fn []
-     (h/use-fake-timers)))
-
-  (h/after-each
-   (fn []
-     (h/clear-all-timers)
-     (h/use-real-timers)))
+  (h/setup-fake-timers)
 
   (h/test "renders soundtrack"
     (with-redefs [audio/get-player-duration (fn [] 2000)]

src/quo/components/settings/category/settings/view.cljs

@@ -15,10 +15,12 @@
        :size   :paragraph-2
        :style  (style/label props)}
       label])
-   [rn/flat-list
-    {:data      data
-     :style     (style/settings-items props)
-     :render-fn settings-item/view
-     :separator [rn/view {:style (style/settings-separator props)}]}]])
+   [rn/view {:style (style/settings-items props)}
+    (for [item data]
+      ^{:key item}
+      [:<>
+       [settings-item/view item]
+       (when-not (= item (last data))
+         [rn/view {:style (style/settings-separator props)}])])]])
 
 (def settings-category (quo.theme/with-theme category-internal))

src/quo/components/tags/permission_tag.cljs

@@ -74,8 +74,8 @@
       [rn/view
        {:flex-direction :row
         :align-items    :center}
-       (for [{:keys [token-icon]} selected-tokens]
-         ^{:key token-icon}
+       (for [{:keys [token-icon id]} selected-tokens]
+         ^{:key id}
          [rn/view {:flex-direction :row}
           [rn/view (outer-resource-container size background-color)
            [rn/image

src/quo/components/utilities/token/loader.cljs

@@ -3,12 +3,13 @@
   (:require [clojure.string :as string]))
 
 (def ^:private tokens (loader/resolve-tokens))
+(def ^:private safe-lower-case (comp string/lower-case str))
 
 (defn- get-token-image*
   [token]
   (let [token-symbol (cond-> token
                        (keyword? token) name
-                       :always          (comp string/lower-case str))]
+                       :always          safe-lower-case)]
     (get tokens token-symbol)))
 
 (def get-token-image (memoize get-token-image*))

src/quo/components/wallet/account_card/view.cljs

@@ -126,9 +126,13 @@
              [text/text {:style style/emoji} emoji]]
             [rn/view {:style style/watch-only-container}
              [text/text
-              {:size   :paragraph-2
-               :weight :medium
-               :style  (style/account-name type theme)}
+              {:size            :paragraph-2
+               :weight          :medium
+               :number-of-lines 1
+               :max-width       110
+               :margin-right    4
+               :ellipis-mode    :tail
+               :style           (style/account-name type theme)}
               name]
              (when watch-only? [icon/icon :i/reveal {:color colors/neutral-50 :size 12}])
              (when missing-keypair?

src/quo/components/wallet/account_origin/component_spec.cljs

@@ -10,7 +10,7 @@
                 :stored          :on-keycard
                 :derivation-path "m / 44’ / 60’ / 0’ / 0’ / 2"
                 :user-name       "Test Name"}])
-    (-> (h/expect (h/get-by-translation-text :origin))
+    (-> (h/expect (h/get-by-translation-text :t/origin))
         (.toBeTruthy)))
 
   (h/test "recovery phrase icon is visible when :type is :recovery-phrase"
@@ -59,7 +59,7 @@
                 :stored          :on-device
                 :derivation-path "m / 44’ / 60’ / 0’ / 0’ / 2"
                 :user-name       "Test Name"}])
-    (-> (h/expect (h/get-by-translation-text :on-device))
+    (-> (h/expect (h/get-by-translation-text :t/on-device))
         (.toBeTruthy)))
 
   (h/test "on-keycard text is visible when :stored is :on-keycard"
@@ -68,7 +68,7 @@
                 :stored          :on-keycard
                 :derivation-path "m / 44’ / 60’ / 0’ / 0’ / 2"
                 :user-name       "Test Name"}])
-    (-> (h/expect (h/get-by-translation-text :on-keycard))
+    (-> (h/expect (h/get-by-translation-text :t/on-keycard))
         (.toBeTruthy)))
 
   (h/test "on-press is called when :type is :recovery-phrase"

src/quo/components/wallet/network_bridge/view.cljs

@@ -9,48 +9,52 @@
     [quo.theme :as quo.theme]
     [react-native.core :as rn]))
 
-
 (defn network-bridge-add
   [{:keys [network state theme]}]
   [rn/view {:style (merge (style/container network state theme) (style/add-container theme))}
    [icon/icon :i/add-circle {:size 12 :no-color true}]])
 
+(defn- network->text
+  [network]
+  (cond (not network)         ""
+        (= network :ethereum) "Mainnet"
+        :else                 (string/capitalize (name network))))
+
 (defn view-internal
   [{:keys [theme network status amount container-style] :as args}]
-  (let [network-text (if (= network :ethereum) "Mainnet" (string/capitalize (name network)))]
-    (if (= status :add)
-      [network-bridge-add args]
-      [rn/view
-       {:style               (merge (style/container network status theme) container-style)
-        :accessible          true
-        :accessibility-label :container}
-       (if (= status :loading)
-         [rn/view
-          {:style               (style/loading-skeleton theme)
-           :accessible          true
-           :accessibility-label :loading}]
-         [rn/view
-          {:style {:flex-direction  :row
-                   :justify-content :space-between}}
-          [text/text
-           {:size   :paragraph-2
-            :weight :medium} amount]
-          (when (= status :locked)
-            [icon/icon :i/locked
-             {:size                12
-              :color               (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
-              :accessible          true
-              :accessibility-label :lock}])])
+  (if (= status :add)
+    [network-bridge-add args]
+    [rn/view
+     {:style               (merge (style/container network status theme) container-style)
+      :accessible          true
+      :accessibility-label :container}
+     (if (= status :loading)
        [rn/view
-        {:style {:flex-direction :row
-                 :align-items    :center}}
-        [rn/image
-         {:source (resources/get-network network)
-          :style  style/network-icon}]
+        {:style               (style/loading-skeleton theme)
+         :accessible          true
+         :accessibility-label :loading}]
+       [rn/view
+        {:style {:flex-direction  :row
+                 :justify-content :space-between}}
         [text/text
-         {:size   :label
-          :weight :medium
-          :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
-         network-text]]])))
+         {:size   :paragraph-2
+          :weight :medium} amount]
+        (when (= status :locked)
+          [icon/icon :i/locked
+           {:size                12
+            :color               (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+            :accessible          true
+            :accessibility-label :lock}])])
+     [rn/view
+      {:style {:flex-direction :row
+               :align-items    :center}}
+      [rn/image
+       {:source (resources/get-network network)
+        :style  style/network-icon}]
+      [text/text
+       {:size   :label
+        :weight :medium
+        :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
+       (network->text network)]]]))
 
 (def view (quo.theme/with-theme view-internal))

src/quo/components/wallet/network_routing/view.cljs

@@ -86,10 +86,10 @@
 
 (defn- dashed-line
   [network-name]
-  [rn/view {:style style/dashed-line}
-   (take 19
-         (interleave (repeat [rn/view {:style (style/dashed-line-line network-name)}])
-                     (repeat [rn/view {:style style/dashed-line-space}])))])
+  (into [rn/view {:style style/dashed-line}]
+        (take 19
+              (interleave (repeat [rn/view {:style (style/dashed-line-line network-name)}])
+                          (repeat [rn/view {:style style/dashed-line-space}])))))
 
 (defn f-network-routing-bars
   [_]

src/quo/components/wallet/transaction_progress/view.cljs

@@ -180,8 +180,8 @@
       :networks networks}]
     [tag-internal tag-photo tag-name tag-number theme]
     (for [network networks]
-      ^{:key (:network network)}
       (let [assoc-props #(get-network networks %)]
+        ^{:key (:network network)}
         [view-network (assoc-props (:network network))]))]])
 
 (def view (quo.theme/with-theme view-internal))

src/quo/core.cljs

@@ -80,6 +80,7 @@
     quo.components.list-items.dapp.view
     quo.components.list-items.menu-item
     quo.components.list-items.preview-list.view
+    quo.components.list-items.quiz-item.view
     quo.components.list-items.saved-address.view
     quo.components.list-items.saved-contact-address.view
     quo.components.list-items.token-network.view
@@ -296,15 +297,16 @@
 (def account-list-card quo.components.list-items.account-list-card.view/view)
 (def address quo.components.list-items.address.view/view)
 (def channel quo.components.list-items.channel.view/view)
+(def community-list-item quo.components.list-items.community.view/view)
 (def dapp quo.components.list-items.dapp.view/view)
 (def menu-item quo.components.list-items.menu-item/menu-item)
 (def preview-list quo.components.list-items.preview-list.view/view)
-(def user-list quo.components.list-items.user-list/user-list)
-(def community-list-item quo.components.list-items.community.view/view)
+(def quiz-item quo.components.list-items.quiz-item.view/view)
 (def saved-address quo.components.list-items.saved-address.view/view)
 (def saved-contact-address quo.components.list-items.saved-contact-address.view/view)
 (def token-network quo.components.list-items.token-network.view/view)
 (def token-value quo.components.list-items.token-value.view/view)
+(def user-list quo.components.list-items.user-list/user-list)
 
 ;;;; Loaders
 (def skeleton-list quo.components.loaders.skeleton-list.view/view)

src/quo/core_spec.cljs

@@ -1,107 +1,102 @@
 (ns quo.core-spec
-  (:require ;; [quo.components.list-items.account.component-spec]
-    ;; [quo.components.list-items.address.component-spec]
-    ;; [quo.components.list-items.saved-address.component-spec]
-    ;; [quo.components.list-items.saved-contact-address.component-spec]
-    ;; [quo.components.list-items.saved-contact-address.component-spec]
-    ;; [quo.components.list-items.token-network.component-spec]
-    [quo.components.avatars.account-avatar.component-spec]
-    [quo.components.avatars.user-avatar.component-spec]
-    [quo.components.banners.banner.component-spec]
-    [quo.components.browser.browser-input.component-spec]
-    [quo.components.buttons.button.component-spec]
-    [quo.components.buttons.composer-button.component-spec]
-    [quo.components.buttons.logout-button.component-spec]
-    [quo.components.buttons.predictive-keyboard.component-spec]
-    [quo.components.buttons.slide-button.component-spec]
-    [quo.components.buttons.wallet-button.component-spec]
-    [quo.components.buttons.wallet-ctas.component-spec]
-    [quo.components.calendar.calendar-day.component-spec]
-    [quo.components.calendar.calendar-year.component-spec]
-    [quo.components.calendar.calendar.component-spec]
-    [quo.components.calendar.calendar.month-picker.component-spec]
-    [quo.components.colors.color-picker.component-spec]
-    [quo.components.community.community-stat.component-spec]
-    [quo.components.counter.counter.component-spec]
-    [quo.components.counter.step.component-spec]
-    [quo.components.dividers.divider-label.component-spec]
-    [quo.components.dividers.strength-divider.component-spec]
-    [quo.components.drawers.action-drawers.component-spec]
-    [quo.components.drawers.bottom-actions.component-spec]
-    [quo.components.drawers.documentation-drawers.component-spec]
-    [quo.components.drawers.drawer-buttons.component-spec]
-    [quo.components.drawers.drawer-top.component-spec]
-    [quo.components.drawers.permission-context.component-spec]
-    [quo.components.dropdowns.dropdown-input.component-spec]
-    [quo.components.dropdowns.dropdown.component-spec]
-    [quo.components.dropdowns.network-dropdown.component-spec]
-    [quo.components.gradient.gradient-cover.component-spec]
-    [quo.components.graph.wallet-graph.component-spec]
-    [quo.components.inputs.input.component-spec]
-    [quo.components.inputs.locked-input.component-spec]
-    [quo.components.inputs.profile-input.component-spec]
-    [quo.components.inputs.recovery-phrase.component-spec]
-    [quo.components.keycard.component-spec]
-    [quo.components.links.link-preview.component-spec]
-    [quo.components.links.url-preview-list.component-spec]
-    [quo.components.links.url-preview.component-spec]
-    [quo.components.list-items.channel.component-spec]
-    [quo.components.list-items.community.component-spec]
-    [quo.components.list-items.dapp.component-spec]
-    [quo.components.list-items.token-value.component-spec]
-    [quo.components.loaders.skeleton-list.component-spec]
-    [quo.components.markdown.list.component-spec]
-    [quo.components.markdown.text-component-spec]
-    [quo.components.navigation.top-nav.component-spec]
-    [quo.components.notifications.notification.component-spec]
-    [quo.components.numbered-keyboard.keyboard-key.component-spec]
-    [quo.components.onboarding.small-option-card.component-spec]
-    [quo.components.password.tips.component-spec]
-    [quo.components.profile.link-card.component-spec]
-    [quo.components.profile.select-profile.component-spec]
-    [quo.components.profile.showcase-nav.component-spec]
-    [quo.components.record-audio.record-audio.component-spec]
-    [quo.components.record-audio.soundtrack.component-spec]
-    [quo.components.selectors.disclaimer.component-spec]
-    [quo.components.selectors.filter.component-spec]
-    [quo.components.selectors.reactions-selector.component-spec]
-    [quo.components.selectors.selectors.component-spec]
-    [quo.components.settings.category.component-spec]
-    [quo.components.settings.data-item.component-spec]
-    [quo.components.settings.reorder-item.component-spec]
-    [quo.components.settings.settings-item.component-spec]
-    [quo.components.share.share-qr-code.component-spec]
-    [quo.components.switchers.base-card.component-spec]
-    [quo.components.switchers.group-messaging-card.component-spec]
-    [quo.components.tags.network-tags.component-spec]
-    [quo.components.tags.status-tags-component-spec]
-    [quo.components.tags.summary-tag.component-spec]
-    [quo.components.tags.tiny-tag.component-spec]
-    [quo.components.text-combinations.channel-name.component-spec]
-    [quo.components.text-combinations.page-top.component-spec]
-    [quo.components.text-combinations.username.component-spec]
-    [quo.components.wallet.account-card.component-spec]
-    [quo.components.wallet.account-origin.component-spec]
-    [quo.components.wallet.account-overview.component-spec]
-    [quo.components.wallet.account-permissions.component-spec]
-    [quo.components.wallet.confirmation-progress.component-spec]
-    [quo.components.wallet.keypair.component-spec]
-    [quo.components.wallet.network-amount.component-spec]
-    [quo.components.wallet.network-bridge.component-spec]
-    [quo.components.wallet.network-routing.component-spec]
-    [quo.components.wallet.progress-bar.component-spec]
-    [quo.components.wallet.required-tokens.component-spec]
-    [quo.components.wallet.summary-info.component-spec]
-    [quo.components.wallet.token-input.component-spec]
-    [quo.components.wallet.transaction-progress.component-spec]
-    [quo.components.wallet.transaction-summary.component-spec]
-    [quo.components.wallet.wallet-activity.component-spec]
-    [quo.components.wallet.wallet-overview.component-spec]))
-
-  ;; [quo.components.inputs.address-input.component-spec]
-  ;; [quo.components.inputs.title-input.component-spec]
-  ;; [quo.components.list-items.account.component-spec]
-  ;; [quo.components.list-items.address.component-spec]
-  ;; [quo.components.list-items.saved-address.component-spec]
-  ;; [quo.components.list-items.saved-contact-address.component-spec]
-  ;; [quo.components.list-items.token-network.component-spec]
+  (:require
+    quo.components.avatars.account-avatar.component-spec
+    quo.components.avatars.user-avatar.component-spec
+    quo.components.banners.banner.component-spec
+    quo.components.browser.browser-input.component-spec
+    quo.components.buttons.button.component-spec
+    quo.components.buttons.composer-button.component-spec
+    quo.components.buttons.logout-button.component-spec
+    quo.components.buttons.predictive-keyboard.component-spec
+    quo.components.buttons.slide-button.component-spec
+    quo.components.buttons.wallet-button.component-spec
+    quo.components.buttons.wallet-ctas.component-spec
+    quo.components.calendar.calendar-day.component-spec
+    quo.components.calendar.calendar-year.component-spec
+    quo.components.calendar.calendar.component-spec
+    quo.components.calendar.calendar.month-picker.component-spec
+    quo.components.colors.color-picker.component-spec
+    quo.components.community.community-stat.component-spec
+    quo.components.counter.counter.component-spec
+    quo.components.counter.step.component-spec
+    quo.components.dividers.divider-label.component-spec
+    quo.components.dividers.strength-divider.component-spec
+    quo.components.drawers.action-drawers.component-spec
+    quo.components.drawers.bottom-actions.component-spec
+    quo.components.drawers.documentation-drawers.component-spec
+    quo.components.drawers.drawer-buttons.component-spec
+    quo.components.drawers.drawer-top.component-spec
+    quo.components.drawers.permission-context.component-spec
+    quo.components.dropdowns.dropdown-input.component-spec
+    quo.components.dropdowns.dropdown.component-spec
+    quo.components.dropdowns.network-dropdown.component-spec
+    quo.components.gradient.gradient-cover.component-spec
+    quo.components.graph.wallet-graph.component-spec
+    quo.components.inputs.address-input.component-spec
+    quo.components.inputs.input.component-spec
+    quo.components.inputs.locked-input.component-spec
+    quo.components.inputs.profile-input.component-spec
+    quo.components.inputs.recovery-phrase.component-spec
+    quo.components.inputs.title-input.component-spec
+    quo.components.keycard.component-spec
+    quo.components.links.link-preview.component-spec
+    quo.components.links.url-preview-list.component-spec
+    quo.components.links.url-preview.component-spec
+    quo.components.list-items.account.component-spec
+    quo.components.list-items.address.component-spec
+    quo.components.list-items.channel.component-spec
+    quo.components.list-items.community.component-spec
+    quo.components.list-items.dapp.component-spec
+    quo.components.list-items.quiz-item.component-spec
+    quo.components.list-items.saved-address.component-spec
+    quo.components.list-items.saved-contact-address.component-spec
+    quo.components.list-items.token-network.component-spec
+    quo.components.list-items.token-value.component-spec
+    quo.components.loaders.skeleton-list.component-spec
+    quo.components.markdown.list.component-spec
+    quo.components.markdown.text-component-spec
+    quo.components.navigation.top-nav.component-spec
+    quo.components.notifications.notification.component-spec
+    quo.components.numbered-keyboard.keyboard-key.component-spec
+    quo.components.onboarding.small-option-card.component-spec
+    quo.components.password.tips.component-spec
+    quo.components.profile.link-card.component-spec
+    quo.components.profile.select-profile.component-spec
+    quo.components.profile.showcase-nav.component-spec
+    quo.components.record-audio.record-audio.component-spec
+    quo.components.record-audio.soundtrack.component-spec
+    quo.components.selectors.disclaimer.component-spec
+    quo.components.selectors.filter.component-spec
+    quo.components.selectors.reactions-selector.component-spec
+    quo.components.selectors.selectors.component-spec
+    quo.components.settings.category.component-spec
+    quo.components.settings.data-item.component-spec
+    quo.components.settings.reorder-item.component-spec
+    quo.components.settings.settings-item.component-spec
+    quo.components.share.share-qr-code.component-spec
+    quo.components.switchers.base-card.component-spec
+    quo.components.switchers.group-messaging-card.component-spec
+    quo.components.tags.network-tags.component-spec
+    quo.components.tags.status-tags-component-spec
+    quo.components.tags.summary-tag.component-spec
+    quo.components.tags.tiny-tag.component-spec
+    quo.components.text-combinations.channel-name.component-spec
+    quo.components.text-combinations.page-top.component-spec
+    quo.components.text-combinations.username.component-spec
+    quo.components.wallet.account-card.component-spec
+    quo.components.wallet.account-origin.component-spec
+    quo.components.wallet.account-overview.component-spec
+    quo.components.wallet.account-permissions.component-spec
+    quo.components.wallet.confirmation-progress.component-spec
+    quo.components.wallet.keypair.component-spec
+    quo.components.wallet.network-amount.component-spec
+    quo.components.wallet.network-bridge.component-spec
+    quo.components.wallet.network-routing.component-spec
+    quo.components.wallet.progress-bar.component-spec
+    quo.components.wallet.required-tokens.component-spec
+    quo.components.wallet.summary-info.component-spec
+    quo.components.wallet.token-input.component-spec
+    quo.components.wallet.transaction-progress.component-spec
+    quo.components.wallet.transaction-summary.component-spec
+    quo.components.wallet.wallet-activity.component-spec
+    quo.components.wallet.wallet-overview.component-spec))

src/quo/foundations/colors.cljs

@@ -203,6 +203,9 @@
 (def danger-50-opa-30 (alpha danger-50 0.3))
 (def danger-50-opa-40 (alpha danger-50 0.4))
 
+;;60 with transparency
+(def danger-60-opa-10 (alpha danger-60 0.1))
+
 ;;;;Warning
 (def warning-50 "#FF7D46")
 (def warning-60 "#CC6438")

src/status_im/common/emoji_picker/constants.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.emoji-picker.constants
+(ns status-im.common.emoji-picker.constants
   (:require
     [react-native.core :as rn]))
 

src/status_im/common/emoji_picker/data.cljs

@@ -1,6 +1,6 @@
-(ns status-im.contexts.emoji-picker.data
+(ns status-im.common.emoji-picker.data
   (:require
-    [status-im.contexts.emoji-picker.constants :as constants]
+    [status-im.common.emoji-picker.constants :as constants]
     [utils.transforms :as transforms]))
 
 ;; Emoji data is pulled from the `emojibase` (https://emojibase.dev).

src/status_im/common/emoji_picker/events.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.emoji-picker.events
+(ns status-im.common.emoji-picker.events
   (:require
     [utils.re-frame :as rf]))
 

src/status_im/common/emoji_picker/style.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.emoji-picker.style
+(ns status-im.common.emoji-picker.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.safe-area :as safe-area]
-    [status-im.contexts.emoji-picker.constants :as constants]))
+    [status-im.common.emoji-picker.constants :as constants]))
 
 (def flex-spacer {:flex 1})
 

src/status_im/common/emoji_picker/utils.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.emoji-picker.utils
+(ns status-im.common.emoji-picker.utils
   (:require
     [clojure.string :as string]
-    [status-im.contexts.emoji-picker.constants :as constants]
-    [status-im.contexts.emoji-picker.data :refer [emoji-data]]))
+    [status-im.common.emoji-picker.constants :as constants]
+    [status-im.common.emoji-picker.data :refer [emoji-data]]))
 
 (defn search-emoji
   [search-query]

src/status_im/common/emoji_picker/utils_test.cljs

@@ -1,7 +1,7 @@
-(ns status-im.contexts.emoji-picker.utils-test
+(ns status-im.common.emoji-picker.utils-test
   (:require
     [cljs.test :refer [deftest is testing]]
-    [status-im.contexts.emoji-picker.utils :as utils]))
+    [status-im.common.emoji-picker.utils :as utils]))
 
 (deftest emoji-search-test
   (testing "search for emojis with name"

src/status_im/common/emoji_picker/view.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.emoji-picker.view
+(ns status-im.common.emoji-picker.view
   (:require
     [clojure.string :as string]
     [oops.core :as oops]
@@ -10,10 +10,10 @@
     [react-native.gesture :as gesture]
     [react-native.platform :as platform]
     [reagent.core :as reagent]
-    [status-im.contexts.emoji-picker.constants :as constants]
-    [status-im.contexts.emoji-picker.data :as emoji-picker.data]
-    [status-im.contexts.emoji-picker.style :as style]
-    [status-im.contexts.emoji-picker.utils :as emoji-picker.utils]
+    [status-im.common.emoji-picker.constants :as constants]
+    [status-im.common.emoji-picker.data :as emoji-picker.data]
+    [status-im.common.emoji-picker.style :as style]
+    [status-im.common.emoji-picker.utils :as emoji-picker.utils]
     [utils.debounce :as debounce]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))

src/status_im/common/home/actions/view.cljs

@@ -8,8 +8,8 @@
     [status-im.config :as config]
     [status-im.constants :as constants]
     [status-im.contexts.chat.actions.view :as chat-actions]
+    [status-im.contexts.chat.contacts.drawers.nickname-drawer.view :as nickname-drawer]
     [status-im.contexts.communities.actions.chat.view :as communities-chat-actions]
-    [status-im.contexts.contacts.drawers.nickname-drawer.view :as nickname-drawer]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 

src/status_im/common/scan_qr_code/view.cljs

@@ -180,6 +180,11 @@
         app-state-listener (.addEventListener rn/app-state "change" set-torch-off-fn)]
     #(.remove app-state-listener)))
 
+(defn- navigate-back-handler
+  []
+  (rf/dispatch [:navigate-back])
+  true)
+
 (defn f-view-internal
   [{:keys [title subtitle validate-fn on-success-scan error-message]}]
   (let [insets             (safe-area/get-insets)
@@ -197,15 +202,16 @@
                                        (boolean (not-empty @qr-view-finder)))
             camera-ready-to-scan? (and show-camera?
                                        (not @qr-code-succeed?))]
-        (rn/use-effect
-         #(set-listener-torch-off-on-app-inactive torch?))
-
         (rn/use-effect
          (fn []
+           (rn/hw-back-add-listener navigate-back-handler)
+           (set-listener-torch-off-on-app-inactive torch?)
            (when-not @camera-permission-granted?
-             (permissions/permission-granted? :camera
-                                              #(reset! camera-permission-granted? %)
-                                              #(reset! camera-permission-granted? false)))))
+             (permissions/permission-granted?
+              :camera
+              #(reset! camera-permission-granted? %)
+              #(reset! camera-permission-granted? false)))
+           #(rn/hw-back-remove-listener navigate-back-handler)))
         [:<>
          [rn/view {:style style/background}]
          (when camera-ready-to-scan?

src/status_im/common/signals/events.cljs

@@ -9,7 +9,7 @@
     [status-im.contexts.chat.messages.transport.events :as messages.transport]
     [status-im.contexts.communities.discover.events]
     [status-im.contexts.profile.login.events :as profile.login]
-    [status-im.contexts.push-notifications.local.events :as local-notifications]
+    [status-im.contexts.profile.push-notifications.local.events :as local-notifications]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]
     [utils.transforms :as transforms]))

src/status_im/contexts/chat/contacts/drawers/nickname_drawer/style.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.contacts.drawers.nickname-drawer.style
+(ns status-im.contexts.chat.contacts.drawers.nickname-drawer.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.platform :as platform]))

src/status_im/contexts/chat/contacts/drawers/nickname_drawer/view.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.contacts.drawers.nickname-drawer.view
+(ns status-im.contexts.chat.contacts.drawers.nickname-drawer.view
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
@@ -7,7 +7,7 @@
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
     [status-im.constants :as constants]
-    [status-im.contexts.contacts.drawers.nickname-drawer.style :as style]
+    [status-im.contexts.chat.contacts.drawers.nickname-drawer.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 

src/status_im/contexts/chat/contacts/events.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.contacts.events
+(ns status-im.contexts.chat.contacts.events
   (:require
     [oops.core :as oops]
     [status-im.constants :as constants]

src/status_im/contexts/chat/events.cljs

@@ -8,13 +8,13 @@
     [status-im.common.muting.helpers :refer [format-mute-till]]
     [status-im.constants :as constants]
     [status-im.contexts.chat.composer.link-preview.events :as link-preview]
+    [status-im.contexts.chat.contacts.events :as contacts-store]
     status-im.contexts.chat.effects
     status-im.contexts.chat.lightbox.events
     status-im.contexts.chat.messages.content.reactions.events
     [status-im.contexts.chat.messages.delete-message-for-me.events :as delete-for-me]
     [status-im.contexts.chat.messages.delete-message.events :as delete-message]
     [status-im.contexts.chat.messages.list.state :as chat.state]
-    [status-im.contexts.contacts.events :as contacts-store]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.datetime :as datetime]

src/status_im/contexts/chat/home/add_new_contact/effects.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.add-new-contact.effects
+(ns status-im.contexts.chat.home.add-new-contact.effects
   (:require
     [legacy.status-im.ethereum.ens :as ens]
     [native-module.core :as native-module]

src/status_im/contexts/chat/home/add_new_contact/events.cljs

@@ -1,9 +1,9 @@
-(ns status-im.contexts.add-new-contact.events
+(ns status-im.contexts.chat.home.add-new-contact.events
   (:require
     [clojure.string :as string]
     [status-im.common.validators :as validators]
-    status-im.contexts.add-new-contact.effects
-    [status-im.contexts.contacts.events :as data-store.contacts]
+    [status-im.contexts.chat.contacts.events :as data-store.contacts]
+    status-im.contexts.chat.home.add-new-contact.effects
     [status-im.navigation.events :as navigation]
     [utils.ens.stateofus :as stateofus]
     [utils.ethereum.chain :as chain]

src/status_im/contexts/chat/home/add_new_contact/events_test.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.add-new-contact.events-test
+(ns status-im.contexts.chat.home.add-new-contact.events-test
   (:require
     [cljs.test :refer-macros [deftest are]]
     matcher-combinators.test
-    [status-im.contexts.add-new-contact.events :as events]))
+    [status-im.contexts.chat.home.add-new-contact.events :as events]))
 
 (def user-ukey
   "0x04ca27ed9c7c4099d230c6d8853ad0cfaf084a019c543e9e433d3c04fac6de9147cf572b10e247cfe52f396b5aa10456b56dd1cf1d8a681e2b93993d44594b2e85")

src/status_im/contexts/chat/home/add_new_contact/scan/scan_profile_qr_page.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.add-new-contact.scan.scan-profile-qr-page
+(ns status-im.contexts.chat.home.add-new-contact.scan.scan-profile-qr-page
   (:require [react-native.core :as rn]
             [react-native.hooks :as hooks]
             [status-im.common.scan-qr-code.view :as scan-qr-code]

src/status_im/contexts/chat/home/add_new_contact/style.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.add-new-contact.style
+(ns status-im.contexts.chat.home.add-new-contact.style
   (:require [quo.foundations.colors :as colors]
             [react-native.safe-area :as safe-area]))
 

src/status_im/contexts/chat/home/add_new_contact/views.cljs

@@ -1,10 +1,10 @@
-(ns status-im.contexts.add-new-contact.views
+(ns status-im.contexts.chat.home.add-new-contact.views
   (:require [clojure.string :as string]
             [quo.core :as quo]
             [react-native.clipboard :as clipboard]
             [react-native.core :as rn]
             [reagent.core :as reagent]
-            [status-im.contexts.add-new-contact.style :as style]
+            [status-im.contexts.chat.home.add-new-contact.style :as style]
             [utils.address :as address]
             [utils.debounce :as debounce]
             [utils.i18n :as i18n]

src/status_im/contexts/chat/messages/content/audio/component_spec.cljs

@@ -1,10 +1,12 @@
 (ns status-im.contexts.chat.messages.content.audio.component-spec
   (:require
-    [re-frame.core :as re-frame]
     [react-native.audio-toolkit :as audio]
     [status-im.contexts.chat.messages.content.audio.view :as audio-message]
     [test-helpers.component :as h]))
 
+;; We can't rely on `with-redefs` with async code.
+(set! audio/destroy-player #())
+
 (def message
   {:audio-duration-ms 5000
    :message-id        "message-id"})
@@ -12,17 +14,13 @@
 (def context
   {:in-pinned-view? false})
 
-(defn setup-subs
-  [subscriptions]
-  (doseq [keyval subscriptions]
-    (re-frame/reg-sub
-     (key keyval)
-     (fn [_] (val keyval)))))
-
 (h/describe "audio message"
+  (h/setup-restorable-re-frame)
+
   (h/before-each
-   #(setup-subs {:mediaserver/port 1000
-                 :app-state        "active"}))
+   (fn []
+     (h/setup-subs {:mediaserver/port 1000
+                    :app-state        "active"})))
 
   (h/test "renders correctly"
     (h/render [audio-message/audio-message message context])
@@ -31,24 +29,19 @@
   (h/test "press play calls audio/toggle-playpause-player"
     (with-redefs [audio/toggle-playpause-player     (js/jest.fn)
                   audio/new-player                  (fn [_ _ _] {})
-                  audio/destroy-player              #()
                   audio/prepare-player              (fn [_ on-success _] (on-success))
                   audio-message/download-audio-http (fn [_ on-success] (on-success "audio-uri"))]
       (h/render [audio-message/audio-message message context])
-      (h/fire-event
-       :on-press
-       (h/get-by-label-text :play-pause-audio-message-button))
+      (h/fire-event :on-press (h/get-by-label-text :play-pause-audio-message-button))
       (-> (h/expect audio/toggle-playpause-player)
           (.toHaveBeenCalledTimes 1))))
 
   (h/test "press play renders error"
-    (h/render [audio-message/audio-message message context])
-    (with-redefs [audio/toggle-playpause-player     (fn [_ _ _ on-error] (on-error))
-                  audio/new-player                  (fn [_ _ _] {})
-                  audio/destroy-player              #()
+    (with-redefs [audio/new-player                  (fn [_ _ _] {})
                   audio/prepare-player              (fn [_ on-success _] (on-success))
                   audio-message/download-audio-http (fn [_ on-success] (on-success "audio-uri"))]
-      (h/fire-event
-       :on-press
-       (h/get-by-label-text :play-pause-audio-message-button))
-      (h/wait-for #(h/is-truthy (h/get-by-label-text :audio-error-label))))))
+      (h/render [audio-message/audio-message message context])
+      (h/fire-event :on-press (h/get-by-label-text :play-pause-audio-message-button)))
+    (with-redefs [audio/toggle-playpause-player (fn [_ _ _ on-error] (on-error))]
+      (h/fire-event :on-press (h/get-by-label-text :play-pause-audio-message-button))
+      (h/wait-for #(h/get-by-label-text :audio-error-label)))))

src/status_im/contexts/chat/messages/content/reactions/view.cljs

@@ -64,9 +64,10 @@
          :use-case        (when pinned-by :pinned)
          :on-press        #(on-press (assoc % :message-id message-id))
          :on-long-press   #(on-long-press (assoc %
-                                                 :message-id      message-id
-                                                 :theme           theme
-                                                 :reactions-order (map :emoji-id reactions)))
+                                                 :message-id           message-id
+                                                 :theme                theme
+                                                 :reactions-order      (map :emoji-id reactions)
+                                                 :user-message-content user-message-content))
          :on-press-add    #(on-press-add {:chat-id              chat-id
                                           :message-id           message-id
                                           :user-message-content user-message-content})}])]))

src/status_im/contexts/chat/messages/transport/events.cljs

@@ -14,11 +14,11 @@
     [legacy.status-im.visibility-status-updates.core :as models.visibility-status-updates]
     [legacy.status-im.wallet.core :as wallet]
     [status-im.constants :as constants]
+    [status-im.contexts.chat.contacts.events :as models.contact]
     [status-im.contexts.chat.events :as chat.events]
     [status-im.contexts.chat.messages.content.reactions.events :as reactions]
     [status-im.contexts.chat.messages.pin.events :as messages.pin]
     [status-im.contexts.communities.events :as communities]
-    [status-im.contexts.contacts.events :as models.contact]
     [status-im.contexts.shell.activity-center.events :as activity-center]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))

src/status_im/contexts/chat/messages/view.cljs

@@ -13,8 +13,7 @@
 
 ;; NOTE(parvesh) - I am working on refactoring/optimization of the chat screen for performance
 ;; improvement. Please avoid refactoring these files. Also if you are not already working on bug
-;; fixes related to the chat navigation bar, please skip them.
-;; And ping me, so I can address them while refactoring
+;; fixes related to the composer, please skip them. And ping me, so I can address them while refactoring
 (defn- f-chat-screen
   [calculations-complete?]
   (let [insets                            (safe-area/get-insets)
@@ -47,6 +46,8 @@
 (defn lazy-chat-screen
   [calculations-complete?]
   (let [screen-loaded? (rf/sub [:shell/chat-screen-loaded?])]
+    (when-not screen-loaded?
+      (reanimated/set-shared-value calculations-complete? false))
     (when screen-loaded?
       [:f> f-chat-screen calculations-complete?])))
 

src/status_im/contexts/communities/actions/accounts_selection/view.cljs

@@ -36,10 +36,7 @@
   []
   (let [{id :community-id}          (rf/sub [:get-screen-params])
         {:keys [name color images]} (rf/sub [:communities/community id])
-        accounts                    (->> (rf/sub [:wallet])
-                                         :accounts
-                                         vals
-                                         (map #(assoc % :customization-color (:color %))))]
+        accounts                    (rf/sub [:wallet/accounts-with-customization-color])]
     [rn/view {:style style/container}
      [quo/page-nav
       {:text-align          :left

src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs

@@ -24,10 +24,7 @@
   []
   (let [{id :community-id}          (rf/sub [:get-screen-params])
         {:keys [name color images]} (rf/sub [:communities/community id])
-        accounts                    (->> (rf/sub [:wallet])
-                                         :accounts
-                                         vals
-                                         (map #(assoc % :customization-color (:color %))))]
+        accounts                    (rf/sub [:wallet/accounts-with-customization-color])]
     [rn/safe-area-view {:style style/container}
 
      [quo/drawer-top
@@ -42,7 +39,7 @@
      [rn/flat-list
       {:render-fn               account-item
        :content-container-style {:padding 20}
-       :key-fn                  :key-uid
+       :key-fn                  :address
        :data                    accounts}]
 
      [rn/view {:style style/buttons}

src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs

@@ -27,10 +27,7 @@
   (let [{id :community-id}          (rf/sub [:get-screen-params])
         {:keys [name images color]} (rf/sub [:communities/community id])
         logo-uri                    (get-in images [:thumbnail :uri])
-        accounts                    (->> (rf/sub [:wallet])
-                                         :accounts
-                                         vals
-                                         (map #(assoc % :customization-color (:color %))))]
+        accounts                    (rf/sub [:wallet/accounts-with-customization-color])]
     [:<>
      [quo/drawer-top
       {:type                :context-tag

src/status_im/contexts/communities/actions/community_options/component_spec.cljs

@@ -1,189 +1,123 @@
 (ns status-im.contexts.communities.actions.community-options.component-spec
   (:require
-    [re-frame.core :as re-frame]
     [status-im.contexts.communities.actions.community-options.view :as options]
     [test-helpers.component :as h]))
 
-(defn setup-subs
-  [subscriptions]
-  (doseq [keyval subscriptions]
-    (re-frame/reg-sub
-     (key keyval)
-     (fn [_] (val keyval)))))
-
 (h/describe "community options for bottom sheets"
+  (h/setup-restorable-re-frame)
+
   (h/test "joined options - Non token Gated"
-    (setup-subs {:communities/my-pending-request-to-join nil
-                 :communities/community                  {:joined true}})
+    (h/setup-subs {:communities/my-pending-request-to-join nil
+                   :communities/community                  {:joined true}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :view-members))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-community-rules))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :mark-as-read))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :mute-community))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :notification-settings))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :invite-people-from-contacts))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :show-qr))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :share-community))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :leave-community))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/view-members))
+    (h/is-truthy (h/get-by-translation-text :t/view-community-rules))
+    (h/is-truthy (h/get-by-translation-text :t/mark-as-read))
+    (h/is-truthy (h/get-by-translation-text :t/mute-community))
+    (h/is-truthy (h/get-by-translation-text :t/notification-settings))
+    (h/is-truthy (h/get-by-translation-text :t/invite-people-from-contacts))
+    (h/is-truthy (h/get-by-translation-text :t/show-qr))
+    (h/is-truthy (h/get-by-translation-text :t/share-community))
+    (h/is-truthy (h/get-by-translation-text :t/leave-community)))
 
   (h/test "joined options - Token Gated"
-    (setup-subs {:communities/my-pending-request-to-join nil
-                 :communities/community                  {:joined            true
-                                                          :token-permissions []}})
+    (h/setup-subs {:communities/my-pending-request-to-join nil
+                   :communities/community                  {:joined            true
+                                                            :token-permissions []}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :view-members))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-community-rules))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-token-gating))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :mark-as-read))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :mute-community))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :notification-settings))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :invite-people-from-contacts))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :show-qr))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :share-community))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :leave-community))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/view-members))
+    (h/is-truthy (h/get-by-translation-text :t/view-community-rules))
+    (h/is-truthy (h/get-by-translation-text :t/view-token-gating))
+    (h/is-truthy (h/get-by-translation-text :t/mark-as-read))
+    (h/is-truthy (h/get-by-translation-text :t/mute-community))
+    (h/is-truthy (h/get-by-translation-text :t/notification-settings))
+    (h/is-truthy (h/get-by-translation-text :t/invite-people-from-contacts))
+    (h/is-truthy (h/get-by-translation-text :t/show-qr))
+    (h/is-truthy (h/get-by-translation-text :t/share-community))
+    (h/is-truthy (h/get-by-translation-text :t/leave-community)))
 
   (h/test "admin options - Non token Gated"
-    (setup-subs {:communities/my-pending-request-to-join nil
-                 :communities/community                  {:admin true}})
+    (h/setup-subs {:communities/my-pending-request-to-join nil
+                   :communities/community                  {:admin true}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :view-members))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-community-rules))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :mark-as-read))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :mute-community))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :notification-settings))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :invite-people-from-contacts))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :show-qr))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :share-community))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/view-members))
+    (h/is-truthy (h/get-by-translation-text :t/view-community-rules))
+    (h/is-truthy (h/get-by-translation-text :t/mark-as-read))
+    (h/is-truthy (h/get-by-translation-text :t/mute-community))
+    (h/is-truthy (h/get-by-translation-text :t/notification-settings))
+    (h/is-truthy (h/get-by-translation-text :t/invite-people-from-contacts))
+    (h/is-truthy (h/get-by-translation-text :t/show-qr))
+    (h/is-truthy (h/get-by-translation-text :t/share-community)))
 
   (h/test "admin options - Token Gated"
-    (setup-subs {:communities/my-pending-request-to-join nil
-                 :communities/community                  {:admin             true
-                                                          :token-permissions []}})
+    (h/setup-subs {:communities/my-pending-request-to-join nil
+                   :communities/community                  {:admin             true
+                                                            :token-permissions []}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :view-members))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-community-rules))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :mark-as-read))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :mute-community))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :notification-settings))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :invite-people-from-contacts))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :show-qr))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :share-community))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/view-members))
+    (h/is-truthy (h/get-by-translation-text :t/view-community-rules))
+    (h/is-truthy (h/get-by-translation-text :t/mark-as-read))
+    (h/is-truthy (h/get-by-translation-text :t/mute-community))
+    (h/is-truthy (h/get-by-translation-text :t/notification-settings))
+    (h/is-truthy (h/get-by-translation-text :t/invite-people-from-contacts))
+    (h/is-truthy (h/get-by-translation-text :t/show-qr))
+    (h/is-truthy (h/get-by-translation-text :t/share-community)))
 
   (h/test "request sent options - Non token Gated"
-    (setup-subs {:communities/my-pending-request-to-join "mock-id"
-                 :communities/community                  {}})
+    (h/setup-subs {:communities/my-pending-request-to-join "mock-id"
+                   :communities/community                  {}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :view-members))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-community-rules))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :invite-people-from-contacts))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :show-qr))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :share-community))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :cancel-request-to-join))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/view-members))
+    (h/is-truthy (h/get-by-translation-text :t/view-community-rules))
+    (h/is-truthy (h/get-by-translation-text :t/invite-people-from-contacts))
+    (h/is-truthy (h/get-by-translation-text :t/show-qr))
+    (h/is-truthy (h/get-by-translation-text :t/share-community))
+    (h/is-truthy (h/get-by-translation-text :t/cancel-request-to-join)))
 
   (h/test "request sent options - Token Gated"
-    (setup-subs {:communities/my-pending-request-to-join "mock-id"
-                 :communities/community                  {:token-permissions []}})
+    (h/setup-subs {:communities/my-pending-request-to-join "mock-id"
+                   :communities/community                  {:token-permissions []}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :invite-people-from-contacts))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-token-gating))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :show-qr))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :share-community))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :cancel-request-to-join))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/invite-people-from-contacts))
+    (h/is-truthy (h/get-by-translation-text :t/view-token-gating))
+    (h/is-truthy (h/get-by-translation-text :t/show-qr))
+    (h/is-truthy (h/get-by-translation-text :t/share-community))
+    (h/is-truthy (h/get-by-translation-text :t/cancel-request-to-join)))
 
   (h/test "banned options - Non token Gated"
-    (setup-subs {:communities/my-pending-request-to-join nil
-                 :communities/community                  {:banList true}})
+    (h/setup-subs {:communities/my-pending-request-to-join nil
+                   :communities/community                  {:banList true}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :view-members))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-community-rules))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :invite-people-from-contacts))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :show-qr))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :share-community))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/view-members))
+    (h/is-truthy (h/get-by-translation-text :t/view-community-rules))
+    (h/is-truthy (h/get-by-translation-text :t/invite-people-from-contacts))
+    (h/is-truthy (h/get-by-translation-text :t/show-qr))
+    (h/is-truthy (h/get-by-translation-text :t/share-community)))
 
   (h/test "banned options - Token Gated"
-    (setup-subs {:communities/my-pending-request-to-join nil
-                 :communities/community                  {:banList           100
-                                                          :token-permissions []}})
+    (h/setup-subs {:communities/my-pending-request-to-join nil
+                   :communities/community                  {:banList           100
+                                                            :token-permissions []}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :invite-people-from-contacts))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-token-gating))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :show-qr))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :share-community))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/invite-people-from-contacts))
+    (h/is-truthy (h/get-by-translation-text :t/view-token-gating))
+    (h/is-truthy (h/get-by-translation-text :t/show-qr))
+    (h/is-truthy (h/get-by-translation-text :t/share-community)))
 
   (h/test "banned options - Token Gated"
-    (setup-subs {:communities/my-pending-request-to-join nil
-                 :communities/community                  {:banList           100
-                                                          :token-permissions []}})
+    (h/setup-subs {:communities/my-pending-request-to-join nil
+                   :communities/community                  {:banList           100
+                                                            :token-permissions []}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :invite-people-from-contacts))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :view-token-gating))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :show-qr))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :share-community))
-        (.toBeTruthy)))
+    (h/is-truthy (h/get-by-translation-text :t/invite-people-from-contacts))
+    (h/is-truthy (h/get-by-translation-text :t/view-token-gating))
+    (h/is-truthy (h/get-by-translation-text :t/show-qr))
+    (h/is-truthy (h/get-by-translation-text :t/share-community)))
 
   (h/test "joined and muted community"
-    (setup-subs {:communities/my-pending-request-to-join nil
-                 :communities/community                  {:joined            true
-                                                          :muted             true
-                                                          :token-permissions []}})
+    (h/setup-subs {:communities/my-pending-request-to-join nil
+                   :communities/community                  {:joined            true
+                                                            :muted             true
+                                                            :token-permissions []}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (-> (h/expect (h/get-by-translation-text :unmute-community))
-        (.toBeTruthy))))
+    (h/is-truthy (h/get-by-translation-text :t/unmute-community))))

src/status_im/contexts/preview/quo/animated_header_list/animated_header_list.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.quo-preview.animated-header-list.animated-header-list
+(ns status-im.contexts.preview.quo.animated-header-list.animated-header-list
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]

src/status_im/contexts/preview/quo/avatars/account_avatar.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.quo-preview.avatars.account-avatar
+(ns status-im.contexts.preview.quo.avatars.account-avatar
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.quo-preview.preview :as preview]
+    [status-im.contexts.preview.quo.preview :as preview]
     [utils.re-frame :as rf]))
 
 (def descriptor

src/status_im/contexts/preview/quo/avatars/channel_avatar.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.quo-preview.avatars.channel-avatar
+(ns status-im.contexts.preview.quo.avatars.channel-avatar
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key     :size

src/status_im/contexts/preview/quo/avatars/collection_avatar.cljs

@@ -1,10 +1,10 @@
-(ns status-im.contexts.quo-preview.avatars.collection-avatar
+(ns status-im.contexts.preview.quo.avatars.collection-avatar
 
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
     [status-im.common.resources :as resources]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key     :image

src/status_im/contexts/preview/quo/avatars/group_avatar.cljs

@@ -1,9 +1,9 @@
-(ns status-im.contexts.quo-preview.avatars.group-avatar
+(ns status-im.contexts.preview.quo.avatars.group-avatar
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
     [status-im.common.resources :as resources]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key     :size

src/status_im/contexts/preview/quo/avatars/icon_avatar.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.quo-preview.avatars.icon-avatar
+(ns status-im.contexts.preview.quo.avatars.icon-avatar
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key     :size

src/status_im/contexts/preview/quo/avatars/user_avatar.cljs

@@ -1,9 +1,9 @@
-(ns status-im.contexts.quo-preview.avatars.user-avatar
+(ns status-im.contexts.preview.quo.avatars.user-avatar
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
     [status-im.common.resources :as resources]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key     :size

src/status_im/contexts/preview/quo/avatars/wallet_user_avatar.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.quo-preview.avatars.wallet-user-avatar
+(ns status-im.contexts.preview.quo.avatars.wallet-user-avatar
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key  :full-name

src/status_im/contexts/preview/quo/banners/banner.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.quo-preview.banners.banner
+(ns status-im.contexts.preview.quo.banners.banner
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key  :latest-pin-text

src/status_im/contexts/preview/quo/browser/browser_input.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.quo-preview.browser.browser-input
+(ns status-im.contexts.preview.quo.browser.browser-input
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key :favicon? :type :boolean}

src/status_im/contexts/preview/quo/buttons/button.cljs

@@ -1,10 +1,10 @@
-(ns status-im.contexts.quo-preview.buttons.button
+(ns status-im.contexts.preview.quo.buttons.button
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
     [reagent.core :as reagent]
     [status-im.common.resources :as resources]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key     :type

src/status_im/contexts/preview/quo/buttons/composer_button.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.quo-preview.buttons.composer-button
+(ns status-im.contexts.preview.quo.buttons.composer-button
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.quo-preview.preview :as preview]))
+    [status-im.contexts.preview.quo.preview :as preview]))
 
 (def descriptor
   [{:key  :blur?