e2e: fix for driver creation error

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

@@ -1,8 +1,2 @@
-{: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}}
+{:hooks   {:analyze-call {utils.i18n/label utils.i18n/label}}
  :linters {:status-im.linter/invalid-translation-keyword {:level :error}}}

.zprintrc

@@ -18,17 +18,13 @@
              ;; 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|.*/src/test_helpers/component_tests_preload\.cljs$$" clean-ns && \
+	clojure-lsp --ns-exclude-regex ".*/src/status_im/core\.cljs$$" clean-ns && \
 	sh scripts/lint/trailing-newline.sh --fix && \
 	node_modules/.bin/prettier --write .
 
@@ -364,7 +364,6 @@ 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
@@ -374,7 +373,6 @@ 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,5 +1,4 @@
 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

@@ -0,0 +1,268 @@
+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

@@ -1,236 +0,0 @@
-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

@@ -0,0 +1,87 @@
+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

@@ -1,61 +0,0 @@
-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

@@ -1,88 +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.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

@@ -0,0 +1,95 @@
+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.kotlinPluginVersion
+    kotlin_version      = project.kotlinVersion
     RNNKotlinVersion    = project.kotlinPluginVersion
     RNGH_kotlinVersion  = project.kotlinPluginVersion
     buildToolsVersion   = project.buildToolsVersion
@@ -14,7 +14,8 @@ ext {
     targetSdkVersion    = Integer.valueOf(project.targetSdkVersion)
     supportLibVersion   = project.supportLibVersion
     gradlePluginVersion = project.gradlePluginVersion
-    kotlinVersion       = project.kotlinPluginVersion
+    kotlinPluginVersion = project.kotlinPluginVersion
+
     ndkVersion = "25.2.9519653"
 }
 

android/gradle.properties

@@ -21,6 +21,7 @@
 # $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.6.3):
+  - react-native-webview (13.3.1):
     - 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: 88293a0f23eca8465c0433c023ec632930e644d0
+  react-native-webview: c2b70afb1d910cdd8810375aecc6c2894e2ba061
   React-NativeModulesApple: c6529c637f2e886aab44c48d66cabef2d4fd1138
   React-perflogger: cd8886513f68e1c135a1e79d20575c6489641597
   React-RCTActionSheet: 726d2615ca62a77ce3e2c13d87f65379cdc73498

nix/deps/gradle/deps.list

@@ -1,23 +1,19 @@
 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
@@ -39,7 +35,6 @@ 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
@@ -72,7 +67,6 @@ 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
@@ -80,7 +74,6 @@ 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
@@ -91,13 +84,11 @@ 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
@@ -108,7 +99,6 @@ 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
@@ -126,11 +116,8 @@ 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
@@ -618,8 +605,6 @@ 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,4 +1,3 @@
-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
@@ -11,14 +10,12 @@ 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
@@ -26,7 +23,6 @@ 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
@@ -87,7 +83,6 @@ 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
@@ -96,7 +91,6 @@ 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
@@ -109,7 +103,6 @@ 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
@@ -118,7 +111,6 @@ 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
@@ -130,7 +122,6 @@ 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
@@ -152,10 +143,8 @@ 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
@@ -537,7 +526,6 @@ 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
@@ -621,25 +609,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.1/jackson-annotations-2.16.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-core/2.11.1/jackson-core-2.11.1.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-core/2.16.0-rc1/jackson-core-2.16.0-rc1.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.1/jackson-databind-2.16.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/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.1/jackson-base-2.16.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-bom/2.11.1/jackson-bom-2.11.1.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-bom/2.16.0-rc1/jackson-bom-2.16.0-rc1.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/jackson-parent-2.16.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/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.1/jackson-modules-base-2.16.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-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.1/jackson-module-jaxb-annotations-2.16.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-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/56/oss-parent-56.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/55/oss-parent-55.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
@@ -697,7 +685,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.24.0/error_prone_annotations-2.24.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_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
@@ -706,11 +694,10 @@ 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.24.0/error_prone_parent-2.24.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/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
@@ -722,8 +709,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/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-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/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
@@ -735,7 +722,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/33.0.0-jre/guava-33.0.0-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/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
@@ -769,8 +756,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.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/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/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
@@ -785,8 +772,7 @@ 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.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-jvm/3.6.0/okio-jvm-3.6.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
@@ -795,7 +781,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.7.0/okio-3.7.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/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
@@ -913,13 +899,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.10/byte-buddy-agent-1.14.10.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-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.10/byte-buddy-parent-1.14.10.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/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.10/byte-buddy-1.14.10.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/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
@@ -963,7 +949,6 @@ 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
@@ -981,7 +966,6 @@ 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
@@ -1034,7 +1018,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.42.0/checker-qual-3.42.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/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
@@ -1156,7 +1140,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/2.0.0-Beta2/kotlin-reflect-2.0.0-Beta2.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-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
@@ -1187,6 +1171,7 @@ 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
@@ -1199,6 +1184,7 @@ 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
@@ -1210,6 +1196,7 @@ 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
@@ -1233,8 +1220,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.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-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-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
@@ -1249,14 +1236,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.1/junit-bom-5.10.1.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/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.8.0/mockito-core-5.8.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-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,7 +12,8 @@ stdenv.mkDerivation {
     "patchBuildIdPhase"
     "patchKeyChainPhase"
     "patchGlogPhase"
-    "installPhase"
+    "patchJestPhase"
+    "installPhase"    
   ];
 
   # First symlink all modules as is
@@ -55,6 +56,13 @@ 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,7 +26,6 @@
     "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",
@@ -67,7 +66,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.6.3",
+    "react-native-webview": "13.3.1",
     "react-syntax-highlighter": "^15.5.0",
     "rn-emoji-keyboard": "0.7.0",
     "tdigest": "^0.1.1"
@@ -82,17 +81,18 @@
     "@babel/register": "7.0.0",
     "@jest/globals": "^25.1.0",
     "@mapbox/node-pre-gyp": "^1.0.9",
-    "@testing-library/jest-native": "^5.4.3",
-    "@testing-library/react-native": "^12.4.2",
+    "@testing-library/jest-native": "^5.0.0",
+    "@testing-library/react-native": "^11.2.0",
     "@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": "^29.7.0",
+    "jest": "^26.6.3",
+    "jest-circus": "^26.0.0",
+    "jest-environment-node": "^26.6.2",
     "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 src/test_helpers/component_tests_preload.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; 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,10 +150,9 @@
                       :source-map    false}}
   :component-test {:target           :npm-module
                    :entries          [;; We need to tell shadow-cljs to compile
-                                      ;; the preloads namespaces because they
-                                      ;; will be used directly by Jest in the
-                                      ;; option setupFilesAfterEnv.
-                                      test-helpers.component-tests-preload
+                                      ;; the preloads namespace because it will
+                                      ;; be used directly by Jest in the option
+                                      ;; setupFilesAfterEnv.
                                       status-im.setup.schema-preload
 
                                       quo.core-spec
@@ -162,6 +161,5 @@
                    :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/quo/components/buttons/slide_button/component_spec.cljs

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

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

@@ -17,3 +17,5 @@
       (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,18 +27,14 @@
   (let [selected              (reagent/atom default-selected)
         {window-width :width} (rn/get-window)
         ref                   (atom nil)]
-    (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/use-effect #(js/setTimeout (fn []
+                                     (.scrollToIndex ^js @ref
+                                                     #js
+                                                      {:animated     true
+                                                       :index        (.indexOf colors/account-colors
+                                                                               default-selected)
+                                                       :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,25 +6,34 @@
 (h/describe "select-profile component"
   (h/test "render component"
     (h/render [strength-divider/view {:type :okay}])
-    (h/is-truthy (h/get-by-label-text :strength-divider)))
+    (-> (h/expect (h/get-by-label-text :strength-divider))
+        (.toBeTruthy)))
   (h/test "render component with :type :very-weak"
     (h/render [strength-divider/view {:type :very-weak}])
-    (h/is-truthy (h/get-by-translation-text :t/strength-divider-very-weak-label)))
+    (-> (h/expect (h/get-by-translation-text :strength-divider-very-weak-label))
+        (.toBeTruthy)))
   (h/test "render component with :type :weak"
     (h/render [strength-divider/view {:type :weak}])
-    (h/is-truthy (h/get-by-translation-text :t/strength-divider-weak-label)))
+    (-> (h/expect (h/get-by-translation-text :strength-divider-weak-label))
+        (.toBeTruthy)))
   (h/test "render component with :type :okay"
     (h/render [strength-divider/view {:type :okay}])
-    (h/is-truthy (h/get-by-translation-text :t/strength-divider-okay-label)))
+    (-> (h/expect (h/get-by-translation-text :strength-divider-okay-label))
+        (.toBeTruthy)))
   (h/test "render component with :type :strong"
     (h/render [strength-divider/view {:type :strong}])
-    (h/is-truthy (h/get-by-translation-text :t/strength-divider-strong-label)))
+    (-> (h/expect (h/get-by-translation-text :strength-divider-strong-label))
+        (.toBeTruthy)))
   (h/test "render component with :type :very-strong"
     (h/render [strength-divider/view {:type :very-strong}])
-    (h/is-truthy (h/get-by-translation-text :t/strength-divider-very-strong-label)))
+    (-> (h/expect (h/get-by-translation-text :strength-divider-very-strong-label))
+        (.toBeTruthy)))
   (h/test "render component with :type :alert"
     (h/render [strength-divider/view {:type :alert} "Text message"])
-    (h/is-truthy (h/get-by-text "Text message")))
+    (-> (h/expect (h/get-by-text "Text message"))
+        (.toBeTruthy)))
   (h/test "render component with :type :info"
     (h/render [strength-divider/view {:type :info} "Text Info"])
-    (h/is-truthy (h/get-by-text "Text Info"))))
+    (-> (h/expect (h/get-by-text "Text Info"))
+        (.toBeTruthy))))
+

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

@@ -6,7 +6,14 @@
     [test-helpers.component :as h]))
 
 (h/describe "drawer-buttons"
-  (h/setup-fake-timers)
+  (h/before-each
+   (fn []
+     (h/use-fake-timers)))
+
+  (h/after-each
+   (fn []
+     (h/clear-all-timers)
+     (h/use-real-timers)))
 
   (h/test "the top heading and subheading render"
     (h/render [drawer-buttons/view
@@ -30,6 +37,7 @@
     (-> (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 :t/on-device))
+    (-> (h/expect (h/get-by-translation-text :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 :t/on-keycard))
+    (-> (h/expect (h/get-by-translation-text :on-keycard))
         (.toBeTruthy)))
 
   (h/test "component renders in default-keypair type"

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

@@ -13,10 +13,7 @@
                {:time-frame :empty}])
     (h/is-truthy (h/get-by-label-text :illustration)))
 
-  ;; NOTE: Throws error:
-  ;;   _reactNative.Animated.timing(widthValue2, {
-  ;;   Cannot read properties of undefined (reading 'timing')
-  (h/test-skip "render 1 week wallet graph"
+  (h/test "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,9 +18,7 @@
     (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 #(% "")]
@@ -40,33 +38,27 @@
                    {:scanned-value  scanned-value
                     :on-change-text on-change-text
                     :ens-regex      ens-regex}])
-        (-> (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/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/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/get-by-label-text :clear-button-container))
-          (.then #(h/is-truthy (h/get-by-label-text :clear-button))))))
+      (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/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/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/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/test "on blur with text blur? true"
     (with-redefs [clipboard/get-string #(% "")]
@@ -74,22 +66,19 @@
                  {:scanned-value "scanned value"
                   :blur?         true
                   :ens-regex     ens-regex}])
-      (-> (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/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/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 #(% "")]
@@ -109,10 +98,9 @@
                    {:scanned-value "scanned value"
                     :on-clear      on-clear
                     :ens-regex     ens-regex}])
-        (-> (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/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/test "on-focus is called"
     (let [on-focus (h/mock-fn)]
@@ -134,22 +122,18 @@
     (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/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/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/test "paste from clipboard"
     (let [clipboard "clipboard"]
       (with-redefs [clipboard/get-string #(% clipboard)]
         (h/render [address-input/address-input {:ens-regex ens-regex}])
-        (h/is-truthy (h/query-by-label-text :paste-button))
+        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (-> (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/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/test "ENS loading state and call on-detect-ens"
     (let [clipboard     "test.eth"
@@ -158,12 +142,11 @@
         (h/render [address-input/address-input
                    {:on-detect-ens on-detect-ens
                     :ens-regex     ens-regex}])
-        (h/is-truthy (h/query-by-label-text :paste-button))
+        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (-> (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/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/test "ENS valid state and call on-detect-ens"
     (let [clipboard     "test.eth"
@@ -173,12 +156,11 @@
                    {:on-detect-ens         on-detect-ens
                     :valid-ens-or-address? true
                     :ens-regex             ens-regex}])
-        (h/is-truthy (h/query-by-label-text :paste-button))
+        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (-> (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/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/test "address loading state and call on-detect-address"
     (let [clipboard         "0x2f88d65f3cb52605a54a833ae118fb1363acccd2"
@@ -187,24 +169,21 @@
         (h/render [address-input/address-input
                    {:on-detect-address on-detect-address
                     :address-regex     address-regex}])
-        (h/is-truthy (h/query-by-label-text :paste-button))
+        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (-> (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/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/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
-                    :valid-ens-or-address? true}])
-        (h/is-truthy (h/query-by-label-text :paste-button))
+                   {:on-detect-address on-detect-address
+                    :address-regex     address-regex}])
+        (h/wait-for #(h/is-truthy (h/get-by-label-text :paste-button)))
         (h/fire-event :press (h/get-by-label-text :paste-button))
-        (-> (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)))))))
+        (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)))))

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

@@ -13,17 +13,16 @@
                {:value      ""
                 :max-length 24}])
     (h/fire-event :on-focus (h/query-by-label-text :profile-title-input))
-    (-> (h/wait-for #(h/get-by-text "00"))
-        (.then #(h/is-truthy (h/query-by-text "/24")))))
+    (h/wait-for #(h/is-truthy (h/query-by-text "00")))
+    (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/get-by-text "03"))
-        (.then #(h/is-truthy (h/query-by-text "/24")))))
+    (h/wait-for #(h/is-truthy (h/query-by-text "03")))
+    (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,9 +6,7 @@
 (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 :t/empty-keycard)))
-
+    (h/is-truthy (h/get-by-translation-text :empty-keycard)))
   (h/test "Render of keycard component when: holder-name prop is set"
-    (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})))))
+    (h/render [keycard/keycard {:holder-name "Alisha"}])
+    (h/is-truthy (h/get-by-translation-text :user-keycard))))

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 present"
-    (h/render [account/view {:title-icon :i/placeholder}])
+  (h/test "renders keycard icon if title-icon? is true"
+    (h/render [account/view {:title-icon? true}])
     (h/is-truthy (h/query-by-label-text :title-icon)))
 
-  (h/test "doesn't render keycard icon if title-icon is missing"
+  (h/test "doesn't render keycard icon if title-icon? is false"
     (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 {:active-state? true}])
+    (h/render [address/view])
     (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 {:active-state? true :blur? true}])
+    (h/render [address/view {: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/record_audio/record_audio/component_spec.cljs

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

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

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

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

@@ -15,12 +15,10 @@
        :size   :paragraph-2
        :style  (style/label props)}
       label])
-   [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)}])])]])
+   [rn/flat-list
+    {:data      data
+     :style     (style/settings-items props)
+     :render-fn settings-item/view
+     :separator [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 id]} selected-tokens]
-         ^{:key id}
+       (for [{:keys [token-icon]} selected-tokens]
+         ^{:key token-icon}
          [rn/view {:flex-direction :row}
           [rn/view (outer-resource-container size background-color)
            [rn/image

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

@@ -3,13 +3,12 @@
   (: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          safe-lower-case)]
+                       :always          (comp string/lower-case str))]
     (get tokens token-symbol)))
 
 (def get-token-image (memoize get-token-image*))

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

@@ -126,13 +126,9 @@
              [text/text {:style style/emoji} emoji]]
             [rn/view {:style style/watch-only-container}
              [text/text
-              {:size            :paragraph-2
-               :weight          :medium
-               :number-of-lines 1
-               :max-width       110
-               :margin-right    4
-               :ellipis-mode    :tail
-               :style           (style/account-name type theme)}
+              {:size   :paragraph-2
+               :weight :medium
+               :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 :t/origin))
+    (-> (h/expect (h/get-by-translation-text :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 :t/on-device))
+    (-> (h/expect (h/get-by-translation-text :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 :t/on-keycard))
+    (-> (h/expect (h/get-by-translation-text :on-keycard))
         (.toBeTruthy)))
 
   (h/test "on-press is called when :type is :recovery-phrase"

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

@@ -9,52 +9,48 @@
     [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}]
-  (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)
+  (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}])])
        [rn/view
-        {:style               (style/loading-skeleton theme)
-         :accessible          true
-         :accessibility-label :loading}]
-       [rn/view
-        {:style {:flex-direction  :row
-                 :justify-content :space-between}}
+        {:style {:flex-direction :row
+                 :align-items    :center}}
+        [rn/image
+         {:source (resources/get-network network)
+          :style  style/network-icon}]
         [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}])])
-     [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)]]]))
+         {:size   :label
+          :weight :medium
+          :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
+         network-text]]])))
 
 (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]
-  (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}])))))
+  [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_spec.cljs

@@ -1,101 +1,107 @@
 (ns quo.core-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.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))
+  (: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]

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

@@ -1,12 +1,10 @@
 (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"})
@@ -14,13 +12,17 @@
 (def context
   {:in-pinned-view? false})
 
-(h/describe "audio message"
-  (h/setup-restorable-re-frame)
+(defn setup-subs
+  [subscriptions]
+  (doseq [keyval subscriptions]
+    (re-frame/reg-sub
+     (key keyval)
+     (fn [_] (val keyval)))))
 
+(h/describe "audio message"
   (h/before-each
-   (fn []
-     (h/setup-subs {:mediaserver/port 1000
-                    :app-state        "active"})))
+   #(setup-subs {:mediaserver/port 1000
+                 :app-state        "active"}))
 
   (h/test "renders correctly"
     (h/render [audio-message/audio-message message context])
@@ -29,19 +31,24 @@
   (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"
-    (with-redefs [audio/new-player                  (fn [_ _ _] {})
+    (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              #()
                   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)))
-    (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)))))
+      (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))))))

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

@@ -64,10 +64,9 @@
          :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)
-                                                 :user-message-content user-message-content))
+                                                 :message-id      message-id
+                                                 :theme           theme
+                                                 :reactions-order (map :emoji-id reactions)))
          :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/view.cljs

@@ -13,7 +13,8 @@
 
 ;; 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 composer, please skip them. And ping me, so I can address them while refactoring
+;; fixes related to the chat navigation bar, 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)
@@ -46,8 +47,6 @@
 (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,7 +36,10 @@
   []
   (let [{id :community-id}          (rf/sub [:get-screen-params])
         {:keys [name color images]} (rf/sub [:communities/community id])
-        accounts                    (rf/sub [:wallet/accounts-with-customization-color])]
+        accounts                    (->> (rf/sub [:wallet])
+                                         :accounts
+                                         vals
+                                         (map #(assoc % :customization-color (:color %))))]
     [rn/view {:style style/container}
      [quo/page-nav
       {:text-align          :left

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

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

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

@@ -27,7 +27,10 @@
   (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-with-customization-color])]
+        accounts                    (->> (rf/sub [:wallet])
+                                         :accounts
+                                         vals
+                                         (map #(assoc % :customization-color (:color %))))]
     [:<>
      [quo/drawer-top
       {:type                :context-tag

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

@@ -1,123 +1,189 @@
 (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]))
 
-(h/describe "community options for bottom sheets"
-  (h/setup-restorable-re-frame)
+(defn setup-subs
+  [subscriptions]
+  (doseq [keyval subscriptions]
+    (re-frame/reg-sub
+     (key keyval)
+     (fn [_] (val keyval)))))
 
+(h/describe "community options for bottom sheets"
   (h/test "joined options - Non token Gated"
-    (h/setup-subs {:communities/my-pending-request-to-join nil
-                   :communities/community                  {:joined true}})
+    (setup-subs {:communities/my-pending-request-to-join nil
+                 :communities/community                  {:joined true}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (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/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/test "joined options - Token Gated"
-    (h/setup-subs {:communities/my-pending-request-to-join nil
-                   :communities/community                  {:joined            true
-                                                            :token-permissions []}})
+    (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/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/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/test "admin options - Non token Gated"
-    (h/setup-subs {:communities/my-pending-request-to-join nil
-                   :communities/community                  {:admin true}})
+    (setup-subs {:communities/my-pending-request-to-join nil
+                 :communities/community                  {:admin true}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (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/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/test "admin options - Token Gated"
-    (h/setup-subs {:communities/my-pending-request-to-join nil
-                   :communities/community                  {:admin             true
-                                                            :token-permissions []}})
+    (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/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/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/test "request sent options - Non token Gated"
-    (h/setup-subs {:communities/my-pending-request-to-join "mock-id"
-                   :communities/community                  {}})
+    (setup-subs {:communities/my-pending-request-to-join "mock-id"
+                 :communities/community                  {}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (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/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/test "request sent options - Token Gated"
-    (h/setup-subs {:communities/my-pending-request-to-join "mock-id"
-                   :communities/community                  {:token-permissions []}})
+    (setup-subs {:communities/my-pending-request-to-join "mock-id"
+                 :communities/community                  {:token-permissions []}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (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/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/test "banned options - Non token Gated"
-    (h/setup-subs {:communities/my-pending-request-to-join nil
-                   :communities/community                  {:banList true}})
+    (setup-subs {:communities/my-pending-request-to-join nil
+                 :communities/community                  {:banList true}})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (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/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/test "banned options - Token Gated"
-    (h/setup-subs {:communities/my-pending-request-to-join nil
-                   :communities/community                  {:banList           100
-                                                            :token-permissions []}})
+    (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/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/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/test "banned options - Token Gated"
-    (h/setup-subs {:communities/my-pending-request-to-join nil
-                   :communities/community                  {:banList           100
-                                                            :token-permissions []}})
+    (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/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/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/test "joined and muted community"
-    (h/setup-subs {:communities/my-pending-request-to-join nil
-                   :communities/community                  {:joined            true
-                                                            :muted             true
-                                                            :token-permissions []}})
+    (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/is-truthy (h/get-by-translation-text :t/unmute-community))))
+    (-> (h/expect (h/get-by-translation-text :unmute-community))
+        (.toBeTruthy))))

src/status_im/contexts/communities/events.cljs

@@ -48,8 +48,7 @@
                         :tokenPermissions            :token-permissions
                         :communityTokensMetadata     :tokens-metadata
                         :introMessage                :intro-message
-                        :muteTill                    :muted-till
-                        :lastOpenedAt                :last-opened-at})
+                        :muteTill                    :muted-till})
       (update :admin-settings
               set/rename-keys
               {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
@@ -170,13 +169,6 @@
                 {}
                 categories))}))
 
-(rf/reg-event-fx :communities/update-last-opened-at
- (fn [_ [community-id]]
-   {:json-rpc/call [{:method     "wakuext_communityUpdateLastOpenedAt"
-                     :params     [community-id]
-                     :on-success #(rf/dispatch [:communities/handle-community (first (:communities %))])
-                     :on-error   #(log/error (str "failed to update last opened at for community " %))}]}))
-
 (rf/reg-event-fx :community/fetch
  (fn [_]
    {:json-rpc/call [{:method     "wakuext_communities"

src/status_im/contexts/communities/overview/view.cljs

@@ -374,11 +374,10 @@
       (rf/dispatch [:activity-center.notifications/dismiss-community-overview id]))
     [community-scroll-page community pending?]))
 
-(defn internal-overview
+(defn overview
   [id]
   (let [id                  (or id (rf/sub [:get-screen-params :community-overview]))
         customization-color (rf/sub [:profile/customization-color])]
-    (rn/use-effect #(rf/dispatch [:communities/update-last-opened-at id]) [id])
     [rn/view {:style style/community-overview-container}
      [community-card-page-view id]
      [quo/floating-shell-button
@@ -386,5 +385,3 @@
                  :customization-color customization-color
                  :label               (i18n/label :t/jump-to)}}
       style/floating-shell-button]]))
-
-(defn overview [id] [:f> internal-overview id])

src/status_im/contexts/profile/settings/view.cljs

@@ -16,12 +16,11 @@
 
 (defn- settings-item-view
   [data]
-  [rf/delay-render
-   [quo/category
-    {:list-type       :settings
-     :container-style {:padding-bottom 0}
-     :blur?           true
-     :data            data}]])
+  [quo/category
+   {:list-type       :settings
+    :container-style {:padding-bottom 0}
+    :blur?           true
+    :data            data}])
 
 (defn scroll-handler
   [event scroll-y]
@@ -30,13 +29,12 @@
 
 (defn- footer
   [logout-press]
-  [rf/delay-render
-   [rn/view {:style style/footer-container}
-    [quo/logout-button {:on-press logout-press}]]])
+  [rn/view {:style style/footer-container}
+   [quo/logout-button {:on-press logout-press}]])
 
 (defn- get-item-layout
   [_ index]
-  #js {:length 100 :offset (* 100 index) :index index})
+  #js {:length 48 :offset (* 48 index) :index index})
 
 (defn- settings-view
   [theme]
@@ -62,9 +60,12 @@
       {:key                             :list
        :header                          [settings.header/view {:scroll-y scroll-y}]
        :data                            settings.items/items
+       :key-fn                          :title
+       :get-item-layout                 get-item-layout
+       :initial-num-to-render           6
+       :max-to-render-per-batch         6
        :shows-vertical-scroll-indicator false
        :render-fn                       settings-item-view
-       :get-item-layout                 get-item-layout
        :footer                          [footer logout-press]
        :scroll-event-throttle           16
        :on-scroll                       #(scroll-handler % scroll-y)

src/status_im/contexts/shell/jump_to/animation.cljs

@@ -1,5 +1,6 @@
 (ns status-im.contexts.shell.jump-to.animation
   (:require
+    [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [status-im.contexts.shell.jump-to.constants :as shell.constants]
     [status-im.contexts.shell.jump-to.state :as state]
@@ -46,6 +47,11 @@
 
 ;;;; Floating Screen
 
+;; Dispatch Delay - Animation time for the opening of a screen is 200 ms,
+;; But starting and completion of animation sometimes takes a little extra time,
+;; according to the performance of the device. And if before the animation is
+;; complete we start other tasks like rendering messages or opening of the home screen
+;; in the background then the animation breaks. So we are adding a small delay for that dispatch.
 (defn animate-floating-screen
   [screen-id {:keys [id animation community-id hidden-screen?]}]
   (when (not= animation (get @state/floating-screens-state screen-id))
@@ -60,7 +66,13 @@
                                        shell.constants/close-screen-without-animation}
                                      animation)
                                   0
-                                  shell.constants/shell-animation-time)]
+                                  shell.constants/shell-animation-time)
+          dispatch-delay        (cond
+                                  (not floating-screen-open?) 0
+                                  js/goog.DEBUG               100
+                                  platform/android?           75
+                                  :else                       50)
+          dispatch-time         (+ animation-time dispatch-delay)]
       (js/setTimeout
        (fn [floating-screen-open?]
          (if floating-screen-open?
@@ -69,7 +81,7 @@
                          id community-id hidden-screen?])
            ;; Events realted to closing of a screen
            (rf/dispatch [:shell/floating-screen-closed screen-id])))
-       animation-time
+       dispatch-time
        floating-screen-open?))))
 
 (defn set-floating-screen-position

src/status_im/contexts/shell/jump_to/components/floating_screens/view.cljs

@@ -33,9 +33,12 @@
      [rn/view
       {:style               (style/screen-container (utils/dimensions))
        :accessibility-label (str screen-id "-floating-screen")
-       :accessible          true}
+       :accessible          true
+       :key                 id}
       [(get screens-map screen-id) id]]]))
 
+;; Currently chat screen and events both depends on current-chat-id, once we remove
+;; use of current-chat-id from view then we can keep last chat loaded, for fast navigation
 (defn lazy-screen
   [screen-id]
   (let [screen-param (rf/sub [:shell/floating-screen screen-id])]

src/status_im/contexts/shell/jump_to/events.cljs

@@ -201,9 +201,9 @@
 (rf/defn floating-screen-closed
   {:events [:shell/floating-screen-closed]}
   [{:keys [db]} screen-id]
-  {:db         (cond-> (update db :shell/loaded-screens dissoc screen-id)
-                 (= screen-id shell.constants/discover-communities-screen)
-                 (update :shell/floating-screen dissoc screen-id))
-   :dispatch-n (cond-> [[:set-view-id :shell-stack]]
-                 (= screen-id shell.constants/chat-screen)
-                 (conj [:chat/close]))})
+  (merge
+   {:db         (-> (update db :shell/floating-screens dissoc screen-id)
+                    (update :shell/loaded-screens dissoc screen-id))
+    :dispatch-n (cond-> [[:set-view-id :shell-stack]]
+                  (= screen-id shell.constants/chat-screen)
+                  (conj [:chat/close]))}))

src/status_im/contexts/wallet/account/tabs/about/view.cljs

@@ -1,7 +1,6 @@
 (ns status-im.contexts.wallet.account.tabs.about.view
   (:require
     [quo.core :as quo]
-    [react-native.clipboard :as clipboard]
     [react-native.core :as rn]
     [react-native.platform :as platform]
     [react-native.share :as share]
@@ -29,12 +28,7 @@
         :right-icon          :i/external}
        {:icon                :i/copy
         :accessibility-label :copy-address
-        :label               (i18n/label :t/copy-address)
-        :on-press            (fn []
-                               (clipboard/set-string address)
-                               (rf/dispatch [:toasts/upsert
-                                             {:type :positive
-                                              :text (i18n/label :t/address-copied)}]))}
+        :label               (i18n/label :t/copy-address)}
        {:icon                :i/qr-code
         :accessibility-label :show-address-qr
         :label               (i18n/label :t/show-address-qr)}
@@ -62,9 +56,7 @@
   (let [{:keys [customization-color] :as profile} (rf/sub [:profile/profile-with-image])
         {:keys [address path watch-only?]}        (rf/sub [:wallet/current-viewing-account])
         networks                                  (rf/sub [:wallet/network-details])]
-    [rn/scroll-view
-     {:style                   style/about-tab
-      :content-container-style {:padding-bottom 20}}
+    [rn/view {:style style/about-tab}
      [quo/data-item
       {:description     :default
        :icon-right?     true

src/status_im/contexts/wallet/add_address_to_watch/component_spec.cljs

@@ -1,30 +1,38 @@
 (ns status-im.contexts.wallet.add-address-to-watch.component-spec
   (:require
+    [re-frame.core :as re-frame]
     [status-im.contexts.wallet.add-address-to-watch.view :as add-address-to-watch]
-    status-im.contexts.wallet.events
     [test-helpers.component :as h]))
 
+(defn setup-subs
+  [subscriptions]
+  (doseq [keyval subscriptions]
+    (re-frame/reg-sub
+     (key keyval)
+     (fn [_] (val keyval)))))
+
 (h/describe "select address for watch only account"
-  (h/setup-restorable-re-frame)
-
-  (h/before-each
-   (fn []
-     (h/setup-subs {:wallet/scanned-address              nil
-                    :wallet/addresses                    #{"0x12E838Ae1f769147b12956485dc56e57138f3AC8"
-                                                           "0x22E838Ae1f769147b12956485dc56e57138f3AC8"}
-                    :wallet/watch-address-activity-state nil
-                    :profile/customization-color         :blue})))
-
   (h/test "validation messages show for already used addressed"
+    (setup-subs {:wallet/scanned-address              nil
+                 :wallet/addresses                    #{"0x12E838Ae1f769147b12956485dc56e57138f3AC8"
+                                                        "0x22E838Ae1f769147b12956485dc56e57138f3AC8"}
+                 :wallet/watch-address-activity-state nil
+                 :profile/customization-color         :blue})
     (h/render [add-address-to-watch/view])
     (h/is-falsy (h/query-by-label-text :error-message))
     (h/fire-event :change-text
                   (h/get-by-label-text :add-address-to-watch)
                   "0x12E838Ae1f769147b12956485dc56e57138f3AC8")
-    (h/is-truthy (h/get-by-translation-text :t/address-already-in-use)))
+    (h/is-truthy (h/get-by-translation-text :address-already-in-use))))
+
+(h/test "validation messages show for invalid address"
+  (setup-subs {:wallet/scanned-address              nil
+               :wallet/addresses                    #{"0x12E838Ae1f769147b12956485dc56e57138f3AC8"
+                                                      "0x22E838Ae1f769147b12956485dc56e57138f3AC8"}
+               :wallet/watch-address-activity-state nil
+               :profile/customization-color         :blue})
+  (h/render [add-address-to-watch/view])
+  (h/is-falsy (h/query-by-label-text :error-message))
+  (h/fire-event :change-text (h/get-by-label-text :add-address-to-watch) "0x12E838Ae1f769147b")
+  (h/is-truthy (h/get-by-translation-text :invalid-address)))
 
-  (h/test "validation messages show for invalid address"
-    (h/render [add-address-to-watch/view])
-    (h/is-falsy (h/query-by-label-text :error-message))
-    (h/fire-event :change-text (h/get-by-label-text :add-address-to-watch) "0x12E838Ae1f769147b")
-    (h/is-truthy (h/get-by-translation-text :t/invalid-address))))

src/status_im/contexts/wallet/add_address_to_watch/confirm_address/component_spec.cljs

@@ -1,17 +1,23 @@
 (ns status-im.contexts.wallet.add-address-to-watch.confirm-address.component-spec
   (:require
+    [re-frame.core :as re-frame]
     [status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address]
     [test-helpers.component :as h]
     [utils.re-frame :as rf]))
 
-(h/describe "Add Watch Only Account Page"
-  (h/setup-restorable-re-frame)
+(defn setup-subs
+  [subscriptions]
+  (doseq [keyval subscriptions]
+    (re-frame/reg-sub
+     (key keyval)
+     (fn [_] (val keyval)))))
 
+(h/describe "Add Watch Only Account Page"
   (h/test "Create Account button is disabled while no account name exists"
     (let [callback (h/mock-fn)]
       (with-redefs [rf/dispatch #(callback)]
-        (h/setup-subs {:profile/wallet-accounts []
-                       :get-screen-params       {:address "0xmock-address"}})
+        (setup-subs {:profile/wallet-accounts []
+                     :get-screen-params       {:address "0xmock-address"}})
         (h/render [confirm-address/view {}])
         (h/is-truthy (h/get-by-text "0xmock-address"))
         (h/was-not-called callback)

src/status_im/contexts/wallet/send/events.cljs

@@ -48,6 +48,7 @@
 
 (rf/reg-event-fx :wallet/send-select-amount
  (fn [{:keys [db]} [{:keys [amount]}]]
+   (js/alert "Not implemented yet")
    {:db (assoc-in db [:wallet :ui :send :amount] amount)}))
 
 (rf/reg-event-fx :wallet/get-suggested-routes

src/status_im/contexts/wallet/send/input_amount/component_spec.cljs

@@ -1,14 +1,15 @@
 (ns status-im.contexts.wallet.send.input-amount.component-spec
   (:require
-    status-im.contexts.wallet.events
-    status-im.contexts.wallet.send.events
+    [re-frame.core :as re-frame]
     [status-im.contexts.wallet.send.input-amount.view :as input-amount]
-    [test-helpers.component :as h]
-    [utils.debounce :as debounce]
-    [utils.re-frame :as rf]))
+    [test-helpers.component :as h]))
 
-(set! rf/dispatch #())
-(set! debounce/debounce-and-dispatch #())
+(defn setup-subs
+  [subscriptions]
+  (doseq [keyval subscriptions]
+    (re-frame/reg-sub
+     (key keyval)
+     (fn [_] (val keyval)))))
 
 (def sub-mocks
   {:profile/profile                              {:currency :usd}
@@ -44,111 +45,74 @@
    :wallet/wallet-send-route                     {:route []}})
 
 (h/describe "Send > input amount screen"
-  (h/setup-restorable-re-frame)
-
   (h/test "Default render"
-    (h/setup-subs sub-mocks)
-    (h/render [input-amount/view {}])
-    (h/is-truthy (h/get-by-text "0"))
-    (h/is-truthy (h/get-by-text "ETH"))
-    (h/is-truthy (h/get-by-text "$0.00"))
-    (h/is-disabled (h/get-by-label-text :button-one)))
+    (with-redefs [re-frame/dispatch #()]
+      (setup-subs sub-mocks)
+      (h/render [input-amount/view {}])
+      (h/is-truthy (h/get-by-text "0"))
+      (h/is-truthy (h/get-by-text "ETH"))
+      (h/is-truthy (h/get-by-text "$0.00"))
+      (h/is-disabled (h/get-by-label-text :button-one))))
 
   (h/test "Fill token input and confirm"
-    (h/setup-subs sub-mocks)
-    (let [on-confirm (h/mock-fn)]
-      (h/render [input-amount/view
-                 {:on-confirm on-confirm
-                  :rate       10
-                  :limit      1000}])
+    (with-redefs [re-frame/dispatch #()]
+      (setup-subs sub-mocks)
+      (let [on-confirm (h/mock-fn)]
+        (h/render [input-amount/view
+                   {:on-confirm on-confirm
+                    :rate       10
+                    :limit      1000}])
 
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-1))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-3))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-.))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-4))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
+        (h/fire-event :press (h/query-by-label-text :keyboard-key-1))
+        (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
+        (h/fire-event :press (h/query-by-label-text :keyboard-key-3))
+        (h/fire-event :press (h/query-by-label-text :keyboard-key-.))
+        (h/fire-event :press (h/query-by-label-text :keyboard-key-4))
+        (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
 
-      (-> (h/wait-for #(h/get-by-text "$1234.50"))
-          (.then (fn []
-                   (h/is-truthy (h/get-by-label-text :button-one))
-                   (h/fire-event :press (h/get-by-label-text :button-one))
-                   (h/was-called on-confirm))))))
+        (h/wait-for #(h/is-truthy (h/get-by-text "$1234.50")))
 
-  (h/test "Fill token input and confirm"
-    (h/setup-subs sub-mocks)
+        (h/is-truthy (h/get-by-label-text :button-one))
 
-    (let [on-confirm (h/mock-fn)]
-      (h/render [input-amount/view
-                 {:rate       10
-                  :limit      1000
-                  :on-confirm on-confirm}])
-
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-1))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-3))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-.))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-4))
-      (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-
-      (-> (h/wait-for #(h/get-by-text "$1234.50"))
-          (.then (fn []
-                   (h/is-truthy (h/get-by-label-text :button-one))
-                   (h/fire-event :press (h/get-by-label-text :button-one))
-                   (h/was-called on-confirm))))))
+        (h/fire-event :press (h/get-by-label-text :button-one))
+        (h/was-called on-confirm))))
 
   (h/test "Try to fill more than limit"
-    (h/setup-subs sub-mocks)
-    (h/render [input-amount/view
-               {:rate  10
-                :limit 286}])
+    (with-redefs [re-frame/dispatch #()]
+      (setup-subs sub-mocks)
+      (h/render [input-amount/view
+                 {:rate  10
+                  :limit 286}])
 
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-9))
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-9))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
 
-    (-> (h/wait-for #(h/is-truthy (h/get-by-text "$290.00")))
-        (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-backspace))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-8))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/wait-for #(h/get-by-text "$2850.00"))))))
+      (h/wait-for #(h/is-truthy (h/get-by-text "$290.00")))
 
-  (h/test "Try to fill more than limit"
-    (h/setup-subs sub-mocks)
-    (h/render [input-amount/view
-               {:rate       10
-                :limit      286
-                :on-confirm #()}])
-
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-9))
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-
-    (-> (h/wait-for #(h/get-by-text "$290.00"))
-        (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-backspace))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-8))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/wait-for #(h/get-by-text "$2850.00"))))))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-backspace))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-8))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
+      (h/wait-for #(h/is-truthy (h/get-by-text "$2850.00")))))
 
   (h/test "Switch from crypto to fiat and check limit"
-    (h/setup-subs sub-mocks)
-    (h/render [input-amount/view
-               {:rate       10
-                :limit      250
-                :on-confirm #()}])
+    (with-redefs [re-frame/dispatch #()]
+      (setup-subs sub-mocks)
+      (h/render [input-amount/view
+                 {:rate  10
+                  :limit 250}])
 
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-0))
-    (-> (h/wait-for #(h/get-by-text "$200.00"))
-        (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :reorder))
-                 (h/wait-for #(h/get-by-text "2.00 ETH"))))
-        (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/wait-for #(h/get-by-text "205.50 ETH"))))
-        (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/wait-for #(h/get-by-text "205.50 ETH")))))))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-0))
+      (h/wait-for #(h/is-truthy (h/get-by-text "$200.00")))
+
+      (h/fire-event :press (h/query-by-label-text :reorder))
+
+      (h/wait-for #(h/is-truthy (h/get-by-text "2.00 ETH")))
+
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
+
+      (h/wait-for #(h/is-truthy (h/get-by-text "205.50 ETH")))
+      (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
+      (h/wait-for #(h/is-truthy (h/get-by-text "205.50 ETH"))))))

src/status_im/core_spec.cljs

@@ -4,6 +4,7 @@
     [status-im.contexts.chat.messages.content.audio.component-spec]
     [status-im.contexts.communities.actions.community-options.component-spec]
     [status-im.contexts.wallet.add-address-to-watch.component-spec]
-    [status-im.contexts.wallet.add-address-to-watch.confirm-address.component-spec]
-    [status-im.contexts.wallet.create-account.edit-derivation-path.component-spec]
-    [status-im.contexts.wallet.send.input-amount.component-spec]))
+    [status-im.contexts.wallet.add-address-to-watch.confirm-address.component-spec]))
+
+  ;; [status-im.contexts.wallet.create-account.edit-derivation-path.component-spec]
+  ;; [status-im.contexts.wallet.send.input-amount.component-spec]

src/status_im/setup/schema.cljs

@@ -97,7 +97,7 @@
     (malli.instrument/unstrument!)
 
     (malli.dev/start! {:report (schema/reporter)})
-    (log/debug "Schemas initialized.")
+    (println "Schemas initialized.")
 
     ;; It is relatively easy to write invalid schemas, but we don't want to
     ;; block the app from initializing if such errors happen, at least not until

src/status_im/subs/wallet/wallet.cljs

@@ -198,11 +198,3 @@
  (fn [[current-viewing-account network-details]]
    (let [network-preferences-names (:network-preferences-names current-viewing-account)]
      (filter #(contains? network-preferences-names (:network-name %)) network-details))))
-
-(rf/reg-sub
- :wallet/accounts-with-customization-color
- :<- [:wallet/accounts]
- (fn [accounts]
-   (map (fn [{:keys [color] :as account}]
-          (assoc account :customization-color color))
-        accounts)))

src/test_helpers/component.clj

@@ -10,40 +10,12 @@
        ;; warning: "Describe callback must not return a value".
        js/undefined)))
 
-(defmacro describe-skip
-  [description & body]
-  `(js/global.describe.skip
-    ~description
-    (fn []
-      ~@body
-      js/undefined)))
-
-(defmacro describe-only
-  [description & body]
-  `(js/global.describe.only
-    ~description
-    (fn []
-      ~@body
-      js/undefined)))
-
 (defmacro test
   [description & body]
   `(js/global.test
      ~description
      (fn [] ~@body)))
 
-(defmacro test-skip
-  [description & body]
-  `(js/global.test.skip
-    ~description
-    (fn [] ~@body)))
-
-(defmacro test-only
-  [description & body]
-  `(js/global.test.only
-    ~description
-    (fn [] ~@body)))
-
 (defmacro before-each
   [description & body]
   `(js/beforeEach

src/test_helpers/component.cljs

@@ -5,7 +5,6 @@
             [camel-snake-kebab.core :as camel-snake-kebab]
             [oops.core :as oops]
             [quo.theme :as quo.theme]
-            [re-frame.core :as re-frame]
             [reagent.core :as reagent]
             [utils.i18n :as i18n]))
 
@@ -125,49 +124,37 @@
 (def query-all-by-test-id (with-node-or-screen :query-all-by-test-id))
 (def query-by-test-id (with-node-or-screen :query-by-test-id))
 
+(defn- prepare-translation
+  [translation]
+  (if (exists? js/jest)
+    ;; Translations are treated differently when running with Jest. See
+    ;; test/jest/jestSetup.js for more details.
+    (str "tx:" (name translation))
+    (i18n/label translation)))
+
 (defn get-all-by-translation-text
   ([translation]
-   (get-all-by-translation-text rtl/screen translation nil))
-  ([translation translation-opts]
-   (get-all-by-translation-text rtl/screen translation translation-opts))
-  ([^js node translation translation-opts & args]
-   (apply (with-node-or-screen :get-all-by-text)
-          node
-          (i18n/label translation translation-opts)
-          args)))
+   (get-all-by-translation-text rtl/screen translation))
+  ([^js node translation & args]
+   (apply (with-node-or-screen :get-all-by-text) node (prepare-translation translation) args)))
 
 (defn get-by-translation-text
   ([translation]
-   (get-by-translation-text rtl/screen translation nil))
-  ([translation translation-opts]
-   (get-by-translation-text rtl/screen translation translation-opts))
-  ([^js node translation translation-opts & args]
-   (apply (with-node-or-screen :get-by-text)
-          node
-          (i18n/label translation translation-opts)
-          args)))
+   (get-by-translation-text rtl/screen translation))
+  ([^js node translation & args]
+   (apply (with-node-or-screen :get-by-text) node (prepare-translation translation) args)))
 
 (defn query-by-translation-text
   ([translation]
-   (query-by-translation-text rtl/screen translation nil))
-  ([translation translation-opts]
-   (query-by-translation-text rtl/screen translation translation-opts))
-  ([^js node translation translation-opts & args]
-   (apply (with-node-or-screen :query-by-text)
-          node
-          (i18n/label translation translation-opts)
-          args)))
+   (query-by-translation-text rtl/screen translation))
+  ([^js node translation & args]
+   (apply (with-node-or-screen :query-by-text) node (prepare-translation translation) args)))
 
 (defn query-all-by-translation-text
   ([translation]
-   (query-all-by-translation-text rtl/screen translation nil))
-  ([translation translation-opts]
-   (query-all-by-translation-text rtl/screen translation translation-opts))
-  ([^js node translation translation-opts & args]
-   (apply (with-node-or-screen :query-all-by-text)
-          node
-          (i18n/label translation translation-opts)
-          args)))
+   (query-all-by-translation-text rtl/screen translation))
+  ([^js node translation & args]
+   (apply (with-node-or-screen :query-all-by-text) node (prepare-translation translation) args)))
 
 ;;; Jest utilities
 
@@ -264,32 +251,3 @@
     (let [rerender-fn   (oops/oget component "rerender")
           react-element (reagent/as-element component-updated)]
       (rerender-fn react-element))))
-
-(defn setup-subs
-  "Registers `subscriptions`, a map of key (sub ID) to value (sub computation)."
-  [subscriptions]
-  (doseq [[sub-id v] subscriptions]
-    (re-frame/reg-sub sub-id
-     (fn [_] v))))
-
-(defn setup-restorable-re-frame
-  []
-  (let [restorer (atom nil)]
-    (js/beforeEach
-     (fn []
-       (reset! restorer (re-frame/make-restore-fn))))
-
-    (js/afterEach
-     (fn []
-       (@restorer)))))
-
-(defn setup-fake-timers
-  []
-  (js/beforeEach
-   (fn []
-     (use-fake-timers)))
-
-  (js/afterEach
-   (fn []
-     (clear-all-timers)
-     (use-real-timers))))

src/test_helpers/component_tests_preload.cljs

@@ -1,22 +0,0 @@
-(ns test-helpers.component-tests-preload
-  {:dev/always true}
-  (:require
-    ;; NOTE: Do NOT sort i18n-resources because it MUST be loaded first.
-    [status-im.setup.i18n-resources :as i18n-resources]
-    #_{:clj-kondo/ignore [:unsorted-required-namespaces]}
-    [status-im.setup.interceptors :as interceptors]
-    [utils.i18n :as i18n]))
-
-(defn- setup
-  "Prerequisites to run some component tests, for example, the ones in
-  `status-im.contexts.wallet.send.input-amount.component-spec`.
-
-  Because of the way Jest and ShadowCLJS are set up, this is a preload file that
-  should never be directly required. However, it will be loaded automatically
-  before any component test runs."
-  []
-  (interceptors/register-global-interceptors)
-  (i18n/set-language "en")
-  (i18n-resources/load-language "en"))
-
-(setup)

src/utils/re_frame.cljs

@@ -3,7 +3,6 @@
   (:require
     [re-frame.core :as re-frame]
     [re-frame.interceptor :as interceptor]
-    [reagent.core :as reagent]
     [taoensso.timbre :as log]
     [utils.datetime :as datetime])
   (:refer-clojure :exclude [merge reduce]))
@@ -77,14 +76,6 @@
     (swap! handler-nesting-level dec)
     res))
 
-(defn delay-render
-  [content]
-  (let [render? (reagent/atom false)]
-    (js/setTimeout #(reset! render? true) 0)
-    (fn []
-      (when @render?
-        content))))
-
 (def sub (comp deref re-frame/subscribe))
 
 (def dispatch re-frame/dispatch)

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "4479",
-    "commit-sha1": "5d5a8edc1697df8879ab587a8e89436907373581",
-    "src-sha256": "1629dm4bjnl39fhxh6hgvs3wjv0m0c0a717f3xnprfjxn0vhpq5z"
+    "version": "v0.171.37",
+    "commit-sha1": "1adcf02f867effe39199e383d80681f47db9cef8",
+    "src-sha256": "1mhz0rgd3r6jvgy78ljwq2vjha5rnp5dqhh3ggbp8hpww7nqv4v3"
 }

test/appium/tests/activity_center/test_activity_center.py

@@ -92,6 +92,8 @@ class TestActivityCenterContactRequestMultipleDevicePR(MultipleSharedDeviceTestC
     @marks.testrail_id(702851)
     def test_activity_center_contact_request_accept_swipe_mark_all_as_read(self):
         self.device_2.just_fyi('Creating a new user on Device2')
+        # self.home_2.navigate_back_to_home_view()
+        # self.home_2.profile_button.click()
         self.home_2.reopen_app(sign_in=False)
         new_username = "new user"
         self.device_2.create_user(username=new_username, first_user=False)
@@ -151,22 +153,10 @@ class TestActivityCenterContactRequestMultipleDevicePR(MultipleSharedDeviceTestC
                     self.username_2, self.profile_link_2, decoded_username))
         public_key_2 = self.profile_link_2.split("#")[-1]
 
+        self.home_1.just_fyi("Device 1 creates a new user")
+        self.profile_1.driver.reset()
         new_username_1 = "test user 123"
-
-        def _device_1_creates_user():
-            self.home_1.just_fyi("Device 1 creates a new user")
-            self.profile_1.driver.reset()
-            self.device_1.create_user(username=new_username_1)
-
-        def _device_2_sign_in():
-            self.home_2.just_fyi("Device 2 sign in, user name is " + self.username_2)
-            self.home_2.reopen_app(sign_in=False)
-            self.device_2.show_profiles_button.wait_and_click()
-            self.device_2.get_user(username=self.username_2).click()
-            self.device_2.sign_in()
-
-        self.loop.run_until_complete(run_in_parallel(((_device_1_creates_user, {}),
-                                                      (_device_2_sign_in, {}))))
+        self.device_1.create_user(username=new_username_1)
 
         self.device_1.just_fyi('Device1 sends a contact request to Device2 using his profile link')
         self.home_1.chats_tab.click()

test/appium/tests/base_test_case.py

@@ -415,12 +415,12 @@ class SauceSharedMultipleDeviceTestCase(AbstractTestCase):
                 session_id = driver.session_id
                 try:
                     sauce.jobs.update_job(username=sauce_username, job_id=session_id, name=cls.__name__)
-                except (RemoteDisconnected, SauceException, requests.exceptions.ConnectionError):
-                    pass
+                except (RemoteDisconnected, SauceException, requests.exceptions.ConnectionError) as e:
+                    raise e
                 try:
                     driver.quit()
-                except WebDriverException:
-                    pass
+                except WebDriverException as e:
+                    raise e
                 url = 'https://api.%s/rest/v1/%s/jobs/%s/assets/%s' % (apibase, sauce_username, session_id, "log.json")
                 try:
                     WebDriverWait(driver, 60, 2).until(lambda _: requests_session.get(url).status_code == 200)
@@ -433,10 +433,10 @@ class SauceSharedMultipleDeviceTestCase(AbstractTestCase):
                                         test.testruns[-1].first_commands[session_id] = commands.index(command) + 1
                         except KeyError:
                             continue
-                except (RemoteDisconnected, requests.exceptions.ConnectionError, TimeoutException):
-                    pass
-        except AttributeError:
-            pass
+                except (RemoteDisconnected, requests.exceptions.ConnectionError, TimeoutException) as e:
+                    raise e
+        except AttributeError as e:
+            raise e
         finally:
             try:
                 cls.loop.close()

test/appium/tests/critical/chats/test_1_1_public_chats.py

@@ -282,7 +282,7 @@ class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
         messages = ['hello', '¿Cómo estás tu año?', 'ё, доброго вечерочка', '®	æ ç ♥']
         for message in messages:
             self.chat_2.send_message(message)
-            if not self.chat_1.chat_element_by_text(message).is_element_displayed(30):
+            if not self.chat_1.chat_element_by_text(message).is_element_displayed(10):
                 self.errors.append("Message with text '%s' was not received" % message)
 
         self.chat_2.just_fyi("Checking updated member photo, timestamp and username on message")
@@ -348,9 +348,9 @@ class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
         chat_2.send_message(emoji.emojize(emoji_message))
 
         self.device_1.just_fyi("Device 1 checks PN with emoji")
-        if not self.device_1.element_by_text_part(emoji_unicode).is_element_displayed(120):
+        if not self.device_1.element_by_text_part(emoji_unicode).is_element_displayed(60):
             self.device_1.click_system_back_button()
-            self.device_1.driver.activate_app(app_package)
+            self.device_2.driver.activate_app(app_package)
             self.device_1.driver.fail("Push notification with emoji was not received")
         chat_1 = self.device_1.click_upon_push_notification_by_text(emoji_unicode)
 

test/appium/tests/critical/chats/test_public_chat_browsing.py

@@ -285,7 +285,7 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
                                                                                    'username': self.username_1}),
                                                       (self.device_2.create_user, {'username': self.username_2}))))
         self.homes = self.home_1, self.home_2 = self.device_1.get_home_view(), self.device_2.get_home_view()
-        self.public_key_2 = self.home_2.get_public_key()
+        self.public_key_2 = self.home_2.get_public_key_via_share_profile_tab()
         self.profile_1 = self.home_1.get_profile_view()
         [home.navigate_back_to_home_view() for home in self.homes]
         [home.chats_tab.click() for home in self.homes]
@@ -682,8 +682,6 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
         profile_1 = self.home_1.get_profile_view()
         self.home_1.navigate_back_to_home_view()
         self.chat_1.profile_button.click()
-        profile_1.logout_button.scroll_to_element()
-        profile_1.profile_legacy_button.click()
         profile_1.contacts_button.wait_and_click()
         profile_1.blocked_users_button.wait_and_click()
         profile_1.element_by_text(self.username_2).click()
@@ -775,8 +773,8 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
         self.community_1.get_channel(self.channel_name).click()
         self.channel_1.just_fyi("Receiver is checking if initial messages were delivered")
         for message in message_to_edit, message_to_delete:
-            if not self.channel_1.chat_element_by_text(message).is_element_displayed(30):
-                self.channel_1.driver.fail("Message '%s' was not received")
+            if not self.channel_2.chat_element_by_text(message).is_element_displayed(30):
+                self.channel_2.driver.fail("Message '%s' was not received")
 
         self.channel_2.just_fyi("Turning on airplane mode and editing/deleting messages")
         self.channel_2.driver.set_network_connection(ConnectionType.AIRPLANE_MODE)

test/appium/views/base_view.py

@@ -675,6 +675,21 @@ class BaseView(object):
         TouchAction(self.driver).tap(None, 255, 104, 1).perform()
         time.sleep(3)
 
+    def get_public_key(self):
+        self.driver.info("Get public key via Share QR button")
+
+        self.show_qr_button.click_until_presence_of_element(self.link_to_profile_button)
+        self.link_to_profile_button.click()
+        public_key = self.driver.get_clipboard_text()
+        # Legacy profile view
+        # profile_view = self.get_profile_view()
+        # self.profile_button.click_until_presence_of_element(profile_view.default_username_text)
+        # profile_view.share_my_profile_button.click()
+        # profile_view.public_key_text.wait_for_visibility_of_element(20)
+        # public_key = profile_view.public_key_text.text
+        self.click_system_back_button()
+        return public_key
+
     def tap_mutual_cr_switcher(self):
         profile_view = self.profile_button.click()
         profile_view.advanced_button.scroll_and_click()

test/appium/views/chat_view.py

@@ -425,7 +425,7 @@ class CommunityView(HomeView):
     def join_community(self, password=common_password, open_community=True):
         self.driver.info("Joining community")
         ChatView(self.driver).chat_element_by_text("https://status.app/c/").click_on_link_inside_message_body()
-        self.join_button.wait_and_click(120)
+        self.join_button.click()
         self.join_community_button.scroll_and_click()
         self.password_input.send_keys(password)
         Button(self.driver,
@@ -1083,7 +1083,7 @@ class ChatView(BaseView):
         self.driver.info("Adding one more '%s' reaction or removing an added one" % emoji)
         key = emojis[emoji]
         element = Button(self.driver, accessibility_id='emoji-reaction-%s' % key)
-        element.wait_and_click()
+        element.click()
 
     def view_profile_long_press(self, message=str):
         self.chat_element_by_text(message).long_press_element()

test/appium/views/dbs/waku_backup/user.py

@@ -1,7 +1,7 @@
 seed = 'staff actress trash route grab crime leaf uniform dizzy reform issue keep'
 display_name = 'End to end'
 communities = {
-    'admin_open': 'open community',
+    'admin_open': 'Open-comm-adm',
     'member_open': 'e2e_open',
     'admin_closed': 'closed community',
     'member_closed': 'test_comm_enc',
@@ -10,5 +10,5 @@ communities = {
 
 # contacts = ['Test_contact', 'MyCustomNickname'] # enable back when https://github.com/status-im/status-mobile/issues/15500 is fixed
 
-contacts = ['zQ3...dWXh5', 'zQ3...Vacac']
+contacts = ['zQ3...pJN5P', 'zQ3...UxXqE']
 blocked_user = 'Clear Flat Milkweedbug'

test/appium/views/home_view.py

@@ -323,7 +323,9 @@ class HomeView(BaseView):
         self.mark_all_read_activity_button = Button(self.driver, translation_id="mark-all-notifications-as-read")
 
         # Share tab
-        self.link_to_profile_text = Text(self.driver, accessibility_id="share-qr-code-info-text")
+        self.link_to_profile_text = Text(
+            self.driver,
+            xpath="(//*[@content-desc='link-to-profile']/preceding-sibling::*[1]/android.widget.TextView)[1]")
         self.close_share_tab_button = Button(self.driver, accessibility_id="close-shell-share-tab")
 
         # Discover communities
@@ -566,7 +568,7 @@ class HomeView(BaseView):
         self.link_to_profile_text.click()
         return self.driver.get_clipboard_text()
 
-    def get_public_key(self):
+    def get_public_key_via_share_profile_tab(self):
         self.driver.info("Getting public key via Share tab")
         link_to_profile = self.get_link_to_profile()
         self.click_system_back_button()

test/appium/views/sign_in_view.py

@@ -285,11 +285,20 @@ class SignInView(BaseView):
         self.driver.info("## Multiaccount is recovered successfully!", device=False)
         return self.get_home_view()
 
-    def sign_in(self, password=common_password):
-        self.driver.info("## Sign in (password: %s)" % password, device=False)
-        self.password_input.wait_for_visibility_of_element(10)
-        self.password_input.send_keys(password)
-        self.login_button.click()
+    def sign_in(self, password=common_password, keycard=False, position=1):
+        self.driver.info("## Sign in (password:%s, keycard:%s)" % (password, str(keycard)), device=False)
+
+        if keycard:
+            from views.keycard_view import KeycardView
+            keycard_view = KeycardView(self.driver)
+            keycard_view.one_button.wait_for_visibility_of_element(10)
+            keycard_view.enter_default_pin()
+            if keycard_view.connect_selected_card_button.is_element_displayed():
+                keycard_view.connect_selected_card_button.click()
+        else:
+            self.password_input.wait_for_visibility_of_element(10)
+            self.password_input.send_keys(password)
+            self.login_button.click()
         self.driver.info("## Signed in successfully!", device=False)
         return self.get_home_view()
 

test/jest/jest.config.js

@@ -1,51 +1,10 @@
-const transformIgnorePatterns = () => {
-  const libs = [
-    '@react-native',
-    '@react-native-community',
-    '@react-native-community/blur',
-    'react-native',
-    'react-native-background-timer',
-    'react-native-gifted-charts',
-    'react-native-haptic-feedback',
-    'react-native-hole-view',
-    'react-native-image-crop-picker',
-    'react-native-languages',
-    'react-native-linear-gradient',
-    'react-native-permissions',
-    'react-native-reanimated',
-    'react-native-redash',
-    'react-native-redash',
-    'react-native-shake',
-    'react-native-static-safe-area-insets',
-    'rn-emoji-keyboard',
-  ].join('|');
-
-  return [`/node_modules/(?!(${libs})/).*/`];
-};
-
-const shouldUseSilentReporter = () => {
-  return process.env.JEST_USE_SILENT_REPORTER === 'true';
-};
-
-const reporters = () => {
-  let reporters = [];
-  if (shouldUseSilentReporter()) {
-    reporters.push(['jest-silent-reporter', { useDots: true }]);
-  } else {
-    reporters.push('default');
-  }
-  return reporters;
-};
-
 module.exports = {
   preset: 'react-native',
   setupFilesAfterEnv: [
     '@testing-library/jest-native/extend-expect',
     '../component-spec/status_im.setup.schema_preload.js',
-    '../component-spec/test_helpers.component_tests_preload.js',
     '../test/jest/jestSetup.js',
   ],
-  reporters: reporters(),
   setupFiles: [],
   testPathIgnorePatterns: [],
   moduleNameMapper: {
@@ -53,19 +12,14 @@ module.exports = {
       '<rootDir>/../node_modules/react-native/Libraries/Image/RelativeImageStub',
   },
   testTimeout: 60000,
-  transformIgnorePatterns: transformIgnorePatterns(),
-  // This is a workaround after upgrading to Jest 29.7.0, otherwise we get:
-  //
-  //   SyntaxError: node_modules/@react-native/js-polyfills/error-guard.js:
-  //   Missing semicolon. (14:4)
-  //
-  transform: {
-    '^.+\\.(js|jsx|ts|tsx)$': ['babel-jest', { configFile: './babel.config.js' }],
-  },
+  transformIgnorePatterns: [
+    '/node_modules/(?!(@react-native|react-native-haptic-feedback|react-native-redash|react-native-image-crop-picker|@react-native-community|react-native-linear-gradient|react-native-background-timer|react-native|rn-emoji-keyboard|react-native-languages|react-native-shake|react-native-reanimated|react-native-redash|react-native-permissions|@react-native-community/blur|react-native-static-safe-area-insets|react-native-hole-view|react-native-gifted-charts)/).*/',
+  ],
   globals: {
     __TEST__: true,
   },
   testEnvironment: 'node',
+  timers: 'fake',
   rootDir: '../../component-spec',
   testMatch: ['**/*__tests__*', '**/*.component_spec.js'],
 };

test/jest/jestSetup.js

@@ -7,10 +7,6 @@ require('react-native-reanimated/src/reanimated2/jestUtils').setUpTests();
 
 jest.mock('@react-native-async-storage/async-storage', () => mockAsyncStorage);
 
-jest.mock('react-native-fs', () => ({
-  default: {},
-}));
-
 jest.mock('react-native-navigation', () => ({
   getNavigationConstants: () => ({ constants: [] }),
   Navigation: {