Sync sender

https://github.com/status-im/status-go/compare/debfe1ca...7a273c8b

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 "";
+        }
+    }
+}

modules/react-native-status/android/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: "org.jetbrains.kotlin.android"
 
 def getStatusGoSHA1 = { ->
     def statusgoOverridePath = System.getenv("STATUS_GO_SRC_OVERRIDE")

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

@@ -0,0 +1,78 @@
+package im.status.ethereum.module;
+
+import android.view.ActionMode;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
+import com.facebook.react.uimanager.UIBlock;
+import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.views.textinput.ReactEditText;
+import javax.annotation.Nonnull;
+
+class RNSelectableTextInputModule extends ReactContextBaseJavaModule {
+
+    private ActionMode lastActionMode;
+
+    public RNSelectableTextInputModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @Nonnull
+    @Override
+    public String getName() {
+        return "RNSelectableTextInputManager";
+    }
+
+    @ReactMethod
+    public void setupMenuItems(final Integer selectableTextViewReactTag, final Integer textInputReactTag) {
+        ReactApplicationContext reactContext = this.getReactApplicationContext();
+        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            public void execute (NativeViewHierarchyManager nvhm) {
+                RNSelectableTextInputViewManager rnSelectableTextManager = (RNSelectableTextInputViewManager) nvhm.resolveViewManager(selectableTextViewReactTag);
+                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
+                rnSelectableTextManager.registerSelectionListener(reactTextView);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void startActionMode(final Integer textInputReactTag) {
+        ReactApplicationContext reactContext = this.getReactApplicationContext();
+        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            public void execute (NativeViewHierarchyManager nvhm) {
+                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
+                lastActionMode = reactTextView.startActionMode(reactTextView.getCustomSelectionActionModeCallback(), ActionMode.TYPE_FLOATING);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void hideLastActionMode(){
+        ReactApplicationContext reactContext = this.getReactApplicationContext();
+        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            public void execute (NativeViewHierarchyManager nvhm) {
+                if(lastActionMode!=null){
+                    lastActionMode.finish();
+                    lastActionMode = null;
+                }
+            }
+        });
+    }
+
+    @ReactMethod
+    public void setSelection(final Integer textInputReactTag, final Integer start, final Integer end){
+        ReactApplicationContext reactContext = this.getReactApplicationContext();
+        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            public void execute (NativeViewHierarchyManager nvhm) {
+                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
+                reactTextView.setSelection(start, end);
+            }
+        });
+    }
+ 
+}

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

@@ -1,72 +0,0 @@
-package im.status.ethereum.module
-
-import android.view.ActionMode
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.uimanager.NativeViewHierarchyManager
-import com.facebook.react.uimanager.UIBlock
-import com.facebook.react.uimanager.UIManagerModule
-import com.facebook.react.views.textinput.ReactEditText
-
-class RNSelectableTextInputModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-
-    private var lastActionMode: ActionMode? = null
-
-    override fun getName(): String {
-        return "RNSelectableTextInputManager"
-    }
-
-    @ReactMethod
-    fun setupMenuItems(selectableTextViewReactTag: Int?, textInputReactTag: Int?) {
-        val reactContext = reactApplicationContext
-        val uiManager = reactContext.getNativeModule(UIManagerModule::class.java)
-        selectableTextViewReactTag?.let { selectableTag ->
-            textInputReactTag?.let { inputTag ->
-                uiManager?.addUIBlock(UIBlock { nvhm: NativeViewHierarchyManager ->
-                    val rnSelectableTextManager = nvhm.resolveViewManager(selectableTag) as RNSelectableTextInputViewManager
-                    val reactTextView = nvhm.resolveView(inputTag) as ReactEditText
-                    rnSelectableTextManager.registerSelectionListener(reactTextView)
-                })
-            }
-        }
-    }
-
-    @ReactMethod
-    fun startActionMode(textInputReactTag: Int?) {
-        val reactContext = reactApplicationContext
-        val uiManager = reactContext.getNativeModule(UIManagerModule::class.java)
-        textInputReactTag?.let { inputTag ->
-            uiManager?.addUIBlock(UIBlock { nvhm: NativeViewHierarchyManager ->
-                val reactTextView = nvhm.resolveView(inputTag) as ReactEditText
-                lastActionMode = reactTextView.startActionMode(reactTextView.customSelectionActionModeCallback, ActionMode.TYPE_FLOATING)
-            })
-        }
-    }
-
-    @ReactMethod
-    fun hideLastActionMode() {
-        val reactContext = reactApplicationContext
-        val uiManager = reactContext.getNativeModule(UIManagerModule::class.java)
-        uiManager?.addUIBlock(UIBlock { _ ->
-            lastActionMode?.finish()
-            lastActionMode = null
-        })
-    }
-
-    @ReactMethod
-    fun setSelection(textInputReactTag: Int?, start: Int?, end: Int?) {
-        val reactContext = reactApplicationContext
-        val uiManager = reactContext.getNativeModule(UIManagerModule::class.java)
-        textInputReactTag?.let { inputTag ->
-            start?.let { s ->
-                end?.let { e ->
-                    uiManager?.addUIBlock(UIBlock { nvhm: NativeViewHierarchyManager ->
-                        val reactTextView = nvhm.resolveView(inputTag) as ReactEditText
-                        reactTextView.setSelection(s, e)
-                    })
-                }
-            }
-        }
-    }
-}

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

@@ -0,0 +1,102 @@
+package im.status.ethereum.module;
+
+import android.view.ActionMode;
+import android.view.ActionMode.Callback;
+import android.view.Menu;
+import android.view.MenuItem;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.facebook.react.views.textinput.ReactEditText;
+import com.facebook.react.views.view.ReactViewGroup;
+import com.facebook.react.views.view.ReactViewManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class RNSelectableTextInputViewManager extends ReactViewManager {
+    public static final String REACT_CLASS = "RNSelectableTextInput";
+    private String[] _menuItems = new String[0];
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public ReactViewGroup createViewInstance(ThemedReactContext context) {
+        return new ReactViewGroup(context);
+    }
+
+    @ReactProp(name = "menuItems")
+    public void setMenuItems(ReactViewGroup reactViewGroup, ReadableArray items) {
+        if(items != null) {
+            List<String> result = new ArrayList<String>(items.size());
+            for (int i = 0; i < items.size(); i++) {
+                result.add(items.getString(i));
+            }
+            this._menuItems = result.toArray(new String[items.size()]);
+        }
+    }
+
+    public void registerSelectionListener(final ReactEditText view) {
+        view.setCustomSelectionActionModeCallback(new Callback() {
+            @Override
+            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                menu.clear();
+                for (int i = 0; i < _menuItems.length; i++) {
+                    menu.add(0, i, 0, _menuItems[i]);
+                }
+                return true;
+            }
+
+            @Override
+            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                return true;
+            }
+
+            @Override
+            public void onDestroyActionMode(ActionMode mode) {
+            }
+
+            @Override
+            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                int selectionStart = view.getSelectionStart();
+                int selectionEnd = view.getSelectionEnd();
+                String selectedText = view.getText().toString().substring(selectionStart, selectionEnd);
+
+                // Dispatch event
+                onSelectNativeEvent(view, item.getItemId(), selectedText, selectionStart, selectionEnd);
+
+                mode.finish();
+
+                return true;
+            }
+
+        });
+    }
+
+    public void onSelectNativeEvent(ReactEditText view, int eventType, String content, int selectionStart, int selectionEnd) {
+        WritableMap event = Arguments.createMap();
+        event.putInt("eventType", eventType);
+        event.putString("content", content);
+        event.putInt("selectionStart", selectionStart);
+        event.putInt("selectionEnd", selectionEnd);
+
+        // Dispatch
+        ReactContext reactContext = (ReactContext) view.getContext();
+        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(view.getId(), "topSelection", event);
+    }
+
+    @Override
+    public Map getExportedCustomDirectEventTypeConstants() {
+        return MapBuilder.builder()
+                         .put("topSelection", MapBuilder.of("registrationName","onSelection"))
+                         .build();
+    }
+}

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

@@ -1,85 +0,0 @@
-package im.status.ethereum.module
-
-import android.view.ActionMode
-import android.view.Menu
-import android.view.MenuItem
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.common.MapBuilder
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.uimanager.events.RCTEventEmitter
-import com.facebook.react.views.textinput.ReactEditText
-import com.facebook.react.views.view.ReactViewGroup
-import com.facebook.react.views.view.ReactViewManager
-
-class RNSelectableTextInputViewManager : ReactViewManager() {
-    companion object {
-        const val REACT_CLASS = "RNSelectableTextInput"
-    }
-
-    private var _menuItems = arrayOf<String>()
-
-    override fun getName(): String {
-        return REACT_CLASS
-    }
-
-    override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
-        return ReactViewGroup(context)
-    }
-
-    @ReactProp(name = "menuItems")
-    fun setMenuItems(reactViewGroup: ReactViewGroup, items: ReadableArray?) {
-        _menuItems = items?.let {
-            Array(items.size()) { i -> items.getString(i) }
-        } ?: arrayOf()
-    }
-
-    fun registerSelectionListener(view: ReactEditText) {
-        view.customSelectionActionModeCallback = object : ActionMode.Callback {
-            override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-                menu.clear()
-                _menuItems.forEachIndexed { i, item ->
-                    menu.add(0, i, 0, item)
-                }
-                return true
-            }
-
-            override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-                return true
-            }
-
-            override fun onDestroyActionMode(mode: ActionMode) {}
-
-            override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-                val selectionStart = view.selectionStart
-                val selectionEnd = view.selectionEnd
-                val selectedText = view.text.toString().substring(selectionStart, selectionEnd)
-
-                onSelectNativeEvent(view, item.itemId, selectedText, selectionStart, selectionEnd)
-                mode.finish()
-                return true
-            }
-        }
-    }
-
-    private fun onSelectNativeEvent(view: ReactEditText, eventType: Int, content: String, selectionStart: Int, selectionEnd: Int) {
-        val event: WritableMap = Arguments.createMap().apply {
-            putInt("eventType", eventType)
-            putString("content", content)
-            putInt("selectionStart", selectionStart)
-            putInt("selectionEnd", selectionEnd)
-        }
-
-        val reactContext = view.context as ReactContext
-        reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(view.id, "topSelection", event)
-    }
-
-    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
-        return MapBuilder.builder<String, Any>()
-            .put("topSelection", MapBuilder.of("registrationName", "onSelection"))
-            .build()
-    }
-}

modules/react-native-status/ios/RCTStatus/AccountManager.h

@@ -1,9 +0,0 @@
-#import <sys/utsname.h>
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-#import "Statusgo.h"
-#import "RCTLog.h"
-
-@interface AccountManager : NSObject <RCTBridgeModule>
-
-@end

modules/react-native-status/ios/RCTStatus/AccountManager.m

@@ -1,234 +0,0 @@
-#import "AccountManager.h"
-#import "React/RCTBridge.h"
-#import "React/RCTEventDispatcher.h"
-#import "Statusgo.h"
-#import "Utils.h"
-
-@implementation AccountManager
-
-RCT_EXPORT_MODULE();
-
-RCT_EXPORT_METHOD(createAccountAndLogin:(NSString *)request) {
-#if DEBUG
-    NSLog(@"createAccountAndLogin() method called");
-#endif
-    StatusgoCreateAccountAndLogin(request);
-}
-
-RCT_EXPORT_METHOD(restoreAccountAndLogin:(NSString *)request) {
-#if DEBUG
-    NSLog(@"restoreAccountAndLogin() method called");
-#endif
-    StatusgoRestoreAccountAndLogin(request);
-}
-
--(NSString *) prepareDirAndUpdateConfig:(NSString *)config
-                             withKeyUID:(NSString *)keyUID {
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSError *error = nil;
-    NSURL *rootUrl =[[fileManager
-            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
-            lastObject];
-    NSURL *absTestnetFolderName = [rootUrl URLByAppendingPathComponent:@"ethereum/testnet"];
-
-    if (![fileManager fileExistsAtPath:absTestnetFolderName.path])
-        [fileManager createDirectoryAtPath:absTestnetFolderName.path withIntermediateDirectories:YES attributes:nil error:&error];
-
-    NSURL *flagFolderUrl = [rootUrl URLByAppendingPathComponent:@"ropsten_flag"];
-
-    if(![fileManager fileExistsAtPath:flagFolderUrl.path]){
-        NSLog(@"remove lightchaindata");
-        NSURL *absLightChainDataUrl = [absTestnetFolderName URLByAppendingPathComponent:@"StatusIM/lightchaindata"];
-        if([fileManager fileExistsAtPath:absLightChainDataUrl.path]) {
-            [fileManager removeItemAtPath:absLightChainDataUrl.path
-                                    error:nil];
-        }
-        [fileManager createDirectoryAtPath:flagFolderUrl.path
-               withIntermediateDirectories:NO
-                                attributes:nil
-                                     error:&error];
-    }
-
-    NSLog(@"after remove lightchaindata");
-
-    NSString *keystore = @"keystore";
-    NSURL *absTestnetKeystoreUrl = [absTestnetFolderName URLByAppendingPathComponent:keystore];
-    NSURL *absKeystoreUrl = [rootUrl URLByAppendingPathComponent:keystore];
-    if([fileManager fileExistsAtPath:absTestnetKeystoreUrl.path]){
-        NSLog(@"copy keystore");
-        [fileManager copyItemAtPath:absTestnetKeystoreUrl.path toPath:absKeystoreUrl.path error:nil];
-        [fileManager removeItemAtPath:absTestnetKeystoreUrl.path error:nil];
-    }
-
-    NSLog(@"after lightChainData");
-
-    NSLog(@"preconfig: %@", config);
-    NSData *configData = [config dataUsingEncoding:NSUTF8StringEncoding];
-    NSDictionary *configJSON = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil];
-    NSString *relativeDataDir = [configJSON objectForKey:@"DataDir"];
-    NSString *absDataDir = [rootUrl.path stringByAppendingString:relativeDataDir];
-    NSURL *absDataDirUrl = [NSURL fileURLWithPath:absDataDir];
-    NSString *keystoreDir = [@"/keystore/" stringByAppendingString:keyUID];
-    [configJSON setValue:keystoreDir forKey:@"KeyStoreDir"];
-    [configJSON setValue:@"" forKey:@"LogDir"];
-    [configJSON setValue:@"geth.log" forKey:@"LogFile"];
-    NSString *resultingConfig = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configJSON];
-
-    NSLog(@"node config %@", resultingConfig);
-
-    if(![fileManager fileExistsAtPath:absDataDir]) {
-        [fileManager createDirectoryAtPath:absDataDir
-               withIntermediateDirectories:YES attributes:nil error:nil];
-    }
-
-    NSLog(@"logUrlPath %@ rootDir %@", @"geth.log", rootUrl.path);
-    NSURL *absLogUrl = [absDataDirUrl URLByAppendingPathComponent:@"geth.log"];
-    if(![fileManager fileExistsAtPath:absLogUrl.path]) {
-        NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-        [dict setObject:[NSNumber numberWithInt:511] forKey:NSFilePosixPermissions];
-        [fileManager createFileAtPath:absLogUrl.path contents:nil attributes:dict];
-    }
-
-    return resultingConfig;
-
-}
-
-RCT_EXPORT_METHOD(prepareDirAndUpdateConfig:(NSString *)keyUID
-        config:(NSString *)config
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"PrepareDirAndUpdateConfig() method called");
-#endif
-    NSString *updatedConfig = [self prepareDirAndUpdateConfig:config
-                                                   withKeyUID:keyUID];
-    callback(@[updatedConfig]);
-}
-
-RCT_EXPORT_METHOD(saveAccountAndLogin:(NSString *)multiaccountData
-        password:(NSString *)password
-        settings:(NSString *)settings
-        config:(NSString *)config
-        accountsData:(NSString *)accountsData) {
-#if DEBUG
-    NSLog(@"SaveAccountAndLogin() method called");
-#endif
-    [Utils getExportDbFilePath];
-    NSString *keyUID = [Utils getKeyUID:multiaccountData];
-    NSString *finalConfig = [self prepareDirAndUpdateConfig:config
-                                                 withKeyUID:keyUID];
-    NSString *result = StatusgoSaveAccountAndLogin(multiaccountData, password, settings, finalConfig, accountsData);
-    NSLog(@"%@", result);
-}
-
-RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
-        password:(NSString *)password
-        settings:(NSString *)settings
-        config:(NSString *)config
-        accountsData:(NSString *)accountsData
-        chatKey:(NSString *)chatKey) {
-#if DEBUG
-    NSLog(@"SaveAccountAndLoginWithKeycard() method called");
-#endif
-    [Utils getExportDbFilePath];
-    NSString *keyUID = [Utils getKeyUID:multiaccountData];
-    NSString *finalConfig = [self prepareDirAndUpdateConfig:config
-                                                 withKeyUID:keyUID];
-    NSString *result = StatusgoSaveAccountAndLoginWithKeycard(multiaccountData, password, settings, finalConfig, accountsData, chatKey);
-    NSLog(@"%@", result);
-}
-
-RCT_EXPORT_METHOD(login:(NSString *)accountData
-        password:(NSString *)password) {
-#if DEBUG
-    NSLog(@"Login() method called");
-#endif
-    [Utils getExportDbFilePath];
-    [Utils migrateKeystore:accountData password:password];
-    NSString *result = StatusgoLogin(accountData, password);
-    NSLog(@"%@", result);
-}
-
-RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
-        password:(NSString *)password
-        chatKey:(NSString *)chatKey
-        nodeConfigJSON:(NSString *)nodeConfigJSON) {
-#if DEBUG
-    NSLog(@"LoginWithKeycard() method called");
-#endif
-    [Utils getExportDbFilePath];
-    [Utils migrateKeystore:accountData password:password];
-
-    NSString *result = StatusgoLoginWithKeycard(accountData, password, chatKey, nodeConfigJSON);
-
-    NSLog(@"%@", result);
-}
-
-RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData
-        password:(NSString *)password
-        configJSON:(NSString *)configJSON) {
-#if DEBUG
-    NSLog(@"LoginWithConfig() method called");
-#endif
-    [Utils getExportDbFilePath];
-    [Utils migrateKeystore:accountData password:password];
-    NSString *result = StatusgoLoginWithConfig(accountData, password, configJSON);
-    NSLog(@"%@", result);
-}
-
-RCT_EXPORT_METHOD(loginAccount:(NSString *)request) {
-#if DEBUG
-    NSLog(@"LoginAccount() method called");
-#endif
-    NSString *result = StatusgoLoginAccount(request);
-    NSLog(@"%@", result);
-}
-
-RCT_EXPORT_METHOD(verify:(NSString *)address
-        password:(NSString *)password
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"VerifyAccountPassword() method called");
-#endif
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager
-            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
-            lastObject];
-    NSURL *absKeystoreUrl = [rootUrl URLByAppendingPathComponent:@"keystore"];
-
-    NSString *result = StatusgoVerifyAccountPassword(absKeystoreUrl.path, address, password);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(verifyDatabasePassword:(NSString *)keyUID
-        password:(NSString *)password
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"VerifyDatabasePassword() method called");
-#endif
-    NSString *result = StatusgoVerifyDatabasePassword(keyUID, password);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"OpenAccounts() method called");
-#endif
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager
-            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
-            lastObject];
-
-    NSString *result = StatusgoOpenAccounts(rootUrl.path);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(logout) {
-#if DEBUG
-        NSLog(@"Logout() method called");
-#endif
-        NSString *result = StatusgoLogout();
-
-        NSLog(@"%@", result);
-}
-
-@end

modules/react-native-status/ios/RCTStatus/DatabaseManager.h

@@ -1,9 +0,0 @@
-#import <sys/utsname.h>
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-#import "Statusgo.h"
-#import "RCTLog.h"
-
-@interface DatabaseManager : NSObject <RCTBridgeModule>
-
-@end

modules/react-native-status/ios/RCTStatus/DatabaseManager.m

@@ -1,33 +0,0 @@
-#import "DatabaseManager.h"
-#import "React/RCTBridge.h"
-#import "React/RCTEventDispatcher.h"
-#import "Statusgo.h"
-#import "Utils.h"
-
-@implementation DatabaseManager
-
-RCT_EXPORT_MODULE();
-
-RCT_EXPORT_METHOD(exportUnencryptedDatabase:(NSString *)accountData
-        password:(NSString *)password
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"exportUnencryptedDatabase() method called");
-#endif
-
-    NSString *filePath = [Utils getExportDbFilePath];
-    StatusgoExportUnencryptedDatabase(accountData, password, filePath);
-
-    callback(@[filePath]);
-}
-
-RCT_EXPORT_METHOD(importUnencryptedDatabase:(NSString *)accountData
-        password:(NSString *)password) {
-#if DEBUG
-    NSLog(@"importUnencryptedDatabase() method called");
-#endif
-    "";
-}
-
-
-@end

modules/react-native-status/ios/RCTStatus/EncryptionUtils.h

@@ -1,9 +0,0 @@
-#import <sys/utsname.h>
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-#import "Statusgo.h"
-#import "RCTLog.h"
-
-@interface EncryptionUtils : NSObject <RCTBridgeModule>
-
-@end

modules/react-native-status/ios/RCTStatus/EncryptionUtils.m

@@ -1,241 +0,0 @@
-#import "EncryptionUtils.h"
-#import "React/RCTBridge.h"
-#import "React/RCTEventDispatcher.h"
-#import "Statusgo.h"
-#import "Utils.h"
-
-@implementation EncryptionUtils
-
-RCT_EXPORT_MODULE();
-
-#pragma mark - InitKeystore method
-
-RCT_EXPORT_METHOD(initKeystore:(NSString *)keyUID
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"initKeystore() method called");
-#endif
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager
-            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
-            lastObject];
-
-    NSURL *commonKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
-    NSURL *keystoreDir = [commonKeystoreDir URLByAppendingPathComponent:keyUID];
-
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
-                   ^(void)
-                   {
-                       NSString *res = StatusgoInitKeystore(keystoreDir.path);
-                       NSLog(@"InitKeyStore result %@", res);
-                       callback(@[]);
-                   });
-}
-
-RCT_EXPORT_METHOD(reEncryptDbAndKeystore:(NSString *)keyUID
-        currentPassword:(NSString *)currentPassword
-        newPassword:(NSString *)newPassword
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"reEncryptDbAndKeystore() method called");
-#endif
-    // changes password and re-encrypts keystore
-    NSString *result = StatusgoChangeDatabasePassword(keyUID, currentPassword, newPassword);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
-        accountData:(NSString *)accountData
-        settings:(NSString *)settings
-        keycardUID:(NSString *)keycardUID
-        currentPassword:(NSString *)currentPassword
-        newPassword:(NSString *)newPassword
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"convertToKeycardAccount() method called");
-#endif
-    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
-    StatusgoInitKeystore(multiaccountKeystoreDir.path);
-    NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, keycardUID, currentPassword, newPassword);
-    callback(@[result]);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeTransfer:(NSString *)to
-        value:(NSString *)value) {
-    return StatusgoEncodeTransfer(to,value);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeFunctionCall:(NSString *)method
-        paramsJSON:(NSString *)paramsJSON) {
-    return StatusgoEncodeFunctionCall(method,paramsJSON);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(decodeParameters:(NSString *)decodeParamJSON) {
-    return StatusgoDecodeParameters(decodeParamJSON);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(hexToNumber:(NSString *)hex) {
-    return StatusgoHexToNumber(hex);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(numberToHex:(NSString *)numString) {
-    return StatusgoNumberToHex(numString);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(sha3:(NSString *)str) {
-    return StatusgoSha3(str);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(utf8ToHex:(NSString *)str) {
-    return StatusgoUtf8ToHex(str);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(hexToUtf8:(NSString *)str) {
-    return StatusgoHexToUtf8(str);
-}
-
-RCT_EXPORT_METHOD(setBlankPreviewFlag:(BOOL *)newValue)
-{
-    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-
-    [userDefaults setBool:newValue forKey:@"BLANK_PREVIEW"];
-
-    [userDefaults synchronize];
-}
-
-RCT_EXPORT_METHOD(hashTransaction:(NSString *)txArgsJSON
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"HashTransaction() method called");
-#endif
-    NSString *result = StatusgoHashTransaction(txArgsJSON);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(hashMessage:(NSString *)message
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"hashMessage() method called");
-#endif
-    NSString *result = StatusgoHashMessage(message);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(multiformatSerializePublicKey:(NSString *)multiCodecKey
-        base58btc:(NSString *)base58btc
-        callback:(RCTResponseSenderBlock)callback) {
-    NSString *result = StatusgoMultiformatSerializePublicKey(multiCodecKey,base58btc);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(localPairingPreflightOutboundCheck:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"LocalPairingPreflightOutboundCheck() method called");
-#endif
-    NSString *result = StatusgoLocalPairingPreflightOutboundCheck();
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(multiformatDeserializePublicKey:(NSString *)multiCodecKey
-        base58btc:(NSString *)base58btc
-        callback:(RCTResponseSenderBlock)callback) {
-    NSString *result = StatusgoMultiformatDeserializePublicKey(multiCodecKey,base58btc);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(compressPublicKey:(NSString *)multiCodecKey
-        callback:(RCTResponseSenderBlock)callback) {
-    NSString *result = StatusgoCompressPublicKey(multiCodecKey);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(decompressPublicKey:(NSString *)multiCodecKey
-        callback:(RCTResponseSenderBlock)callback) {
-    NSString *result = StatusgoDecompressPublicKey(multiCodecKey);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(deserializeAndCompressKey:(NSString *)desktopKey
-        callback:(RCTResponseSenderBlock)callback) {
-    NSString *result = StatusgoDeserializeAndCompressKey(desktopKey);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(hashTypedData:(NSString *)data
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"hashTypedData() method called");
-#endif
-    NSString *result = StatusgoHashTypedData(data);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(hashTypedDataV4:(NSString *)data
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"hashTypedDataV4() method called");
-#endif
-    NSString *result = StatusgoHashTypedDataV4(data);
-    callback(@[result]);
-}
-
-#pragma mark - SignMessage
-
-RCT_EXPORT_METHOD(signMessage:(NSString *)message
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"SignMessage() method called");
-#endif
-    NSString *result = StatusgoSignMessage(message);
-    callback(@[result]);
-}
-
-#pragma mark - SignTypedData
-
-RCT_EXPORT_METHOD(signTypedData:(NSString *)data
-        account:(NSString *)account
-        password:(NSString *)password
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"SignTypedData() method called");
-#endif
-    NSString *result = StatusgoSignTypedData(data, account, password);
-    callback(@[result]);
-}
-
-#pragma mark - SignTypedDataV4
-
-RCT_EXPORT_METHOD(signTypedDataV4:(NSString *)data
-        account:(NSString *)account
-        password:(NSString *)password
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"SignTypedDataV4() method called");
-#endif
-    NSString *result = StatusgoSignTypedDataV4(data, account, password);
-    callback(@[result]);
-}
-
-#pragma mark - ExtractGroupMembershipSignatures
-
-RCT_EXPORT_METHOD(extractGroupMembershipSignatures:(NSString *)content
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"ExtractGroupMembershipSignatures() method called");
-#endif
-    NSString *result = StatusgoExtractGroupMembershipSignatures(content);
-    callback(@[result]);
-}
-
-#pragma mark - SignGroupMembership
-
-RCT_EXPORT_METHOD(signGroupMembership:(NSString *)content
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"SignGroupMembership() method called");
-#endif
-    NSString *result = StatusgoSignGroupMembership(content);
-    callback(@[result]);
-}
-
-@end

modules/react-native-status/ios/RCTStatus/LogManager.h

@@ -1,9 +0,0 @@
-#import <sys/utsname.h>
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-#import "Statusgo.h"
-#import "RCTLog.h"
-
-@interface LogManager : NSObject <RCTBridgeModule>
-
-@end

modules/react-native-status/ios/RCTStatus/LogManager.m

@@ -1,115 +0,0 @@
-#import "LogManager.h"
-#import "React/RCTBridge.h"
-#import "React/RCTEventDispatcher.h"
-#import "Statusgo.h"
-#import "Utils.h"
-#import "SSZipArchive.h"
-
-@implementation LogManager
-
-RCT_EXPORT_MODULE();
-
-#pragma mark - SendLogs method
-
-RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
-                  jsLogs:(NSString *)jsLogs
-                  callback:(RCTResponseSenderBlock)callback) {
-    // TODO: Implement SendLogs for iOS
-#if DEBUG
-    NSLog(@"SendLogs() method called, not implemented");
-#endif
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSError *error = nil;
-    NSURL *rootUrl =[[fileManager
-                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
-                     lastObject];
-
-    NSURL *zipFile = [rootUrl URLByAppendingPathComponent:@"logs.zip"];
-    [fileManager removeItemAtPath:zipFile.path error:nil];
-
-    NSURL *logsFolderName = [rootUrl URLByAppendingPathComponent:@"logs"];
-
-    if (![fileManager fileExistsAtPath:logsFolderName.path])
-        [fileManager createDirectoryAtPath:logsFolderName.path withIntermediateDirectories:YES attributes:nil error:&error];
-
-    NSURL *dbFile = [logsFolderName URLByAppendingPathComponent:@"db.json"];
-    NSURL *jsLogsFile = [logsFolderName URLByAppendingPathComponent:@"Status.log"];
-#if DEBUG
-    NSString *networkDirPath = @"ethereum/mainnet_rpc_dev";
-#else
-    NSString *networkDirPath = @"ethereum/mainnet_rpc";
-#endif
-
-#if DEBUG
-    NSString *goerliNetworkDirPath = @"ethereum/goerli_rpc_dev";
-#else
-    NSString *goerliNetworkDirPath = @"ethereum/goerli_rpc";
-#endif
-
-    NSURL *networkDir = [rootUrl URLByAppendingPathComponent:networkDirPath];
-    NSURL *originalGethLogsFile = [networkDir URLByAppendingPathComponent:@"geth.log"];
-    NSURL *gethLogsFile = [logsFolderName URLByAppendingPathComponent:@"mainnet_geth.log"];
-
-    NSURL *goerliNetworkDir = [rootUrl URLByAppendingPathComponent:goerliNetworkDirPath];
-    NSURL *goerliGethLogsFile = [goerliNetworkDir URLByAppendingPathComponent:@"geth.log"];
-    NSURL *goerliLogsFile = [logsFolderName URLByAppendingPathComponent:@"goerli_geth.log"];
-
-    NSURL *mainGethLogsFile = [rootUrl URLByAppendingPathComponent:@"geth.log"];
-    NSURL *mainLogsFile = [logsFolderName URLByAppendingPathComponent:@"geth.log"];
-
-    [dbJson writeToFile:dbFile.path atomically:YES encoding:NSUTF8StringEncoding error:nil];
-    [jsLogs writeToFile:jsLogsFile.path atomically:YES encoding:NSUTF8StringEncoding error:nil];
-
-    //NSString* gethLogs = StatusgoExportNodeLogs();
-    //[gethLogs writeToFile:gethLogsFile.path atomically:YES encoding:NSUTF8StringEncoding error:nil];
-    [fileManager copyItemAtPath:originalGethLogsFile.path toPath:gethLogsFile.path error:nil];
-    [fileManager copyItemAtPath:goerliGethLogsFile.path toPath:goerliLogsFile.path error:nil];
-    [fileManager copyItemAtPath:mainGethLogsFile.path toPath:mainLogsFile.path error:nil];
-
-    [SSZipArchive createZipFileAtPath:zipFile.path withContentsOfDirectory:logsFolderName.path];
-    [fileManager removeItemAtPath:logsFolderName.path error:nil];
-
-    callback(@[zipFile.absoluteString]);
-}
-
-RCT_EXPORT_METHOD(initLogging:(BOOL)enabled
-                  mobileSystem:(BOOL)mobileSystem
-                  logLevel:(NSString *)logLevel
-                  callback:(RCTResponseSenderBlock)callback)
-{
-    NSString *logDirectory = [self logFileDirectory];
-    NSString *logFilePath = [logDirectory stringByAppendingPathComponent:@"geth.log"];
-
-    NSMutableDictionary *jsonConfig = [NSMutableDictionary dictionary];
-    jsonConfig[@"Enabled"] = @(enabled);
-    jsonConfig[@"MobileSystem"] = @(mobileSystem);
-    jsonConfig[@"Level"] = logLevel;
-    jsonConfig[@"File"] = logFilePath;
-
-    NSError *error = nil;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonConfig options:0 error:&error];
-
-    if (error) {
-        // Handle JSON serialization error
-        callback(@[error.localizedDescription]);
-        return;
-    }
-
-    NSString *config = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-
-    // Call your native logging initialization method here
-    NSString *initResult = StatusgoInitLogging(config);
-
-    callback(@[initResult]);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFileDirectory) {
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager
-                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
-                     lastObject];
-    return rootUrl.path;
-}
-
-
-@end

modules/react-native-status/ios/RCTStatus/NetworkManager.h

@@ -1,9 +0,0 @@
-#import <sys/utsname.h>
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-#import "Statusgo.h"
-#import "RCTLog.h"
-
-@interface NetworkManager : NSObject <RCTBridgeModule>
-
-@end

modules/react-native-status/ios/RCTStatus/NetworkManager.m

@@ -1,118 +0,0 @@
-#import "NetworkManager.h"
-#import "React/RCTBridge.h"
-#import "React/RCTEventDispatcher.h"
-#import "Statusgo.h"
-#import "Utils.h"
-
-@implementation NetworkManager
-
-RCT_EXPORT_MODULE();
-
-RCT_EXPORT_METHOD(addPeer:(NSString *)enode
-                  callback:(RCTResponseSenderBlock)callback) {
-    NSString *result = StatusgoAddPeer(enode);
-    callback(@[result]);
-#if DEBUG
-    NSLog(@"AddPeer() method called");
-#endif
-}
-
-RCT_EXPORT_METHOD(startSearchForLocalPairingPeers:(RCTResponseSenderBlock)callback) {
-    NSString *result = StatusgoStartSearchForLocalPairingPeers();
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)configJSON
-        callback:(RCTResponseSenderBlock)callback) {
-
-    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
-    NSError *error;
-    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
-    NSMutableDictionary *senderConfig = configDict[@"senderConfig"];
-    NSString *keyUID = senderConfig[@"keyUID"];
-    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
-    NSString *keystoreDir = multiaccountKeystoreDir.path;
-
-    [senderConfig setValue:keystoreDir forKey:@"keystorePath"];
-    NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];
-
-    NSString *result = StatusgoGetConnectionStringForBootstrappingAnotherDevice(modifiedConfigJSON);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(inputConnectionStringForBootstrapping:(NSString *)cs
-        configJSON:(NSString *)configJSON
-        callback:(RCTResponseSenderBlock)callback) {
-
-    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
-    NSError *error;
-    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
-    NSMutableDictionary *receiverConfig = configDict[@"receiverConfig"];
-    NSMutableDictionary *nodeConfig = receiverConfig[@"nodeConfig"];
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
-    NSURL *multiaccountKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
-    NSString *keystoreDir = multiaccountKeystoreDir.path;
-    NSString *rootDataDir = rootUrl.path;
-
-    [receiverConfig setValue:keystoreDir forKey:@"keystorePath"];
-    [nodeConfig setValue:rootDataDir forKey:@"rootDataDir"];
-    NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];
-    NSString *result = StatusgoInputConnectionStringForBootstrapping(cs, modifiedConfigJSON);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(sendTransactionWithSignature:(NSString *)txArgsJSON
-        signature:(NSString *)signature
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"sendTransactionWithSignature() method called");
-#endif
-    NSString *result = StatusgoSendTransactionWithSignature(txArgsJSON, signature);
-    callback(@[result]);
-}
-
-#pragma mark - SendTransaction
-
-RCT_EXPORT_METHOD(sendTransaction:(NSString *)txArgsJSON
-        password:(NSString *)password
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"SendTransaction() method called");
-#endif
-    NSString *result = StatusgoSendTransaction(txArgsJSON, password);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(callRPC:(NSString *)payload
-        callback:(RCTResponseSenderBlock)callback) {
-    dispatch_async( dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSString *result = StatusgoCallRPC(payload);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(@[result]);
-        });
-    });
-}
-
-RCT_EXPORT_METHOD(callPrivateRPC:(NSString *)payload
-        callback:(RCTResponseSenderBlock)callback) {
-    dispatch_async( dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSString *result = StatusgoCallPrivateRPC(payload);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(@[result]);
-        });
-    });
-}
-
-#pragma mark - Recover
-
-RCT_EXPORT_METHOD(recover:(NSString *)message
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"Recover() method called");
-#endif
-    NSString *result = StatusgoRecover(message);
-    callback(@[result]);
-}
-
-@end

modules/react-native-status/ios/RCTStatus/RCTStatus.m

@@ -2,8 +2,48 @@
 #import "React/RCTBridge.h"
 #import "React/RCTEventDispatcher.h"
 #import "Statusgo.h"
+#import "SSZipArchive.h"
 
-#import "Utils.h"
+@interface NSDictionary (BVJSONString)
+-(NSString*) bv_jsonStringWithPrettyPrint:(BOOL) prettyPrint;
+@end
+
+@implementation NSDictionary (BVJSONString)
+
+-(NSString*) bv_jsonStringWithPrettyPrint:(BOOL) prettyPrint {
+    NSError *error;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:self
+                                                       options:(NSJSONWritingOptions)    (prettyPrint ? NSJSONWritingPrettyPrinted : 0)
+                                                         error:&error];
+
+    if (! jsonData) {
+        NSLog(@"bv_jsonStringWithPrettyPrint: error: %@", error.localizedDescription);
+        return @"{}";
+    } else {
+        return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    }
+}
+@end
+
+@interface NSArray (BVJSONString)
+- (NSString *)bv_jsonStringWithPrettyPrint:(BOOL)prettyPrint;
+@end
+
+@implementation NSArray (BVJSONString)
+-(NSString*) bv_jsonStringWithPrettyPrint:(BOOL) prettyPrint {
+    NSError *error;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:self
+                                                       options:(NSJSONWritingOptions) (prettyPrint ? NSJSONWritingPrettyPrinted : 0)
+                                                         error:&error];
+
+    if (! jsonData) {
+        NSLog(@"bv_jsonStringWithPrettyPrint: error: %@", error.localizedDescription);
+        return @"[]";
+    } else {
+        return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    }
+}
+@end
 
 static RCTBridge *bridge;
 
@@ -56,6 +96,7 @@ RCT_EXPORT_METHOD(shouldMoveToInternalStorage:(RCTResponseSenderBlock)onResultCa
     onResultCallback(@[[NSNull null]]);
 }
 
+
 #pragma mark - moveToInternalStorage
 
 RCT_EXPORT_METHOD(moveToInternalStorage:(RCTResponseSenderBlock)onResultCallback) {
@@ -63,6 +104,96 @@ RCT_EXPORT_METHOD(moveToInternalStorage:(RCTResponseSenderBlock)onResultCallback
     onResultCallback(@[[NSNull null]]);
 }
 
+
+
+#pragma mark - InitKeystore method
+
+RCT_EXPORT_METHOD(initKeystore:(NSString *)keyUID
+                      callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"initKeystore() method called");
+#endif
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
+
+    NSURL *commonKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
+    NSURL *keystoreDir = [commonKeystoreDir URLByAppendingPathComponent:keyUID];
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+                   ^(void)
+                   {
+                        NSString *res = StatusgoInitKeystore(keystoreDir.path);
+                        NSLog(@"InitKeyStore result %@", res);
+                        callback(@[]);
+                   });
+}
+
+
+#pragma mark - SendLogs method
+
+RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
+                  jsLogs:(NSString *)jsLogs
+                  callback:(RCTResponseSenderBlock)callback) {
+    // TODO: Implement SendLogs for iOS
+#if DEBUG
+    NSLog(@"SendLogs() method called, not implemented");
+#endif
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSError *error = nil;
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
+
+    NSURL *zipFile = [rootUrl URLByAppendingPathComponent:@"logs.zip"];
+    [fileManager removeItemAtPath:zipFile.path error:nil];
+
+    NSURL *logsFolderName = [rootUrl URLByAppendingPathComponent:@"logs"];
+
+    if (![fileManager fileExistsAtPath:logsFolderName.path])
+        [fileManager createDirectoryAtPath:logsFolderName.path withIntermediateDirectories:YES attributes:nil error:&error];
+
+    NSURL *dbFile = [logsFolderName URLByAppendingPathComponent:@"db.json"];
+    NSURL *jsLogsFile = [logsFolderName URLByAppendingPathComponent:@"Status.log"];
+#if DEBUG
+    NSString *networkDirPath = @"ethereum/mainnet_rpc_dev";
+#else
+    NSString *networkDirPath = @"ethereum/mainnet_rpc";
+#endif
+
+#if DEBUG
+    NSString *goerliNetworkDirPath = @"ethereum/goerli_rpc_dev";
+#else
+    NSString *goerliNetworkDirPath = @"ethereum/goerli_rpc";
+#endif
+
+    NSURL *networkDir = [rootUrl URLByAppendingPathComponent:networkDirPath];
+    NSURL *originalGethLogsFile = [networkDir URLByAppendingPathComponent:@"geth.log"];
+    NSURL *gethLogsFile = [logsFolderName URLByAppendingPathComponent:@"mainnet_geth.log"];
+
+    NSURL *goerliNetworkDir = [rootUrl URLByAppendingPathComponent:goerliNetworkDirPath];
+    NSURL *goerliGethLogsFile = [goerliNetworkDir URLByAppendingPathComponent:@"geth.log"];
+    NSURL *goerliLogsFile = [logsFolderName URLByAppendingPathComponent:@"goerli_geth.log"];
+
+    NSURL *mainGethLogsFile = [rootUrl URLByAppendingPathComponent:@"geth.log"];
+    NSURL *mainLogsFile = [logsFolderName URLByAppendingPathComponent:@"geth.log"];
+
+    [dbJson writeToFile:dbFile.path atomically:YES encoding:NSUTF8StringEncoding error:nil];
+    [jsLogs writeToFile:jsLogsFile.path atomically:YES encoding:NSUTF8StringEncoding error:nil];
+
+    //NSString* gethLogs = StatusgoExportNodeLogs();
+    //[gethLogs writeToFile:gethLogsFile.path atomically:YES encoding:NSUTF8StringEncoding error:nil];
+    [fileManager copyItemAtPath:originalGethLogsFile.path toPath:gethLogsFile.path error:nil];
+    [fileManager copyItemAtPath:goerliGethLogsFile.path toPath:goerliLogsFile.path error:nil];
+    [fileManager copyItemAtPath:mainGethLogsFile.path toPath:mainLogsFile.path error:nil];
+
+    [SSZipArchive createZipFileAtPath:zipFile.path withContentsOfDirectory:logsFolderName.path];
+    [fileManager removeItemAtPath:logsFolderName.path error:nil];
+
+    callback(@[zipFile.absoluteString]);
+}
+
 RCT_EXPORT_METHOD(exportLogs:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"exportLogs() method called");
@@ -71,12 +202,21 @@ RCT_EXPORT_METHOD(exportLogs:(RCTResponseSenderBlock)callback) {
     callback(@[result]);
 }
 
+RCT_EXPORT_METHOD(addPeer:(NSString *)enode
+                  callback:(RCTResponseSenderBlock)callback) {
+  NSString *result = StatusgoAddPeer(enode);
+  callback(@[result]);
+#if DEBUG
+  NSLog(@"AddPeer() method called");
+#endif
+}
+
 RCT_EXPORT_METHOD(deleteMultiaccount:(NSString *)keyUID
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"DeleteMultiaccount() method called");
 #endif
-    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
+    NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID];
     NSString *result = StatusgoDeleteMultiaccount(keyUID, multiaccountKeystoreDir.path);
     callback(@[result]);
 }
@@ -88,7 +228,7 @@ RCT_EXPORT_METHOD(deleteImportedKey:(NSString *)keyUID
 #if DEBUG
     NSLog(@"DeleteImportedKey() method called");
 #endif
-    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
+    NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID];
     NSString *result = StatusgoDeleteImportedKey(address, password, multiaccountKeystoreDir.path);
     callback(@[result]);
 }
@@ -146,6 +286,137 @@ RCT_EXPORT_METHOD(multiAccountImportPrivateKey:(NSString *)json
     callback(@[result]);
 }
 
+RCT_EXPORT_METHOD(hashTransaction:(NSString *)txArgsJSON
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"HashTransaction() method called");
+#endif
+    NSString *result = StatusgoHashTransaction(txArgsJSON);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(hashMessage:(NSString *)message
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"hashMessage() method called");
+#endif
+    NSString *result = StatusgoHashMessage(message);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(localPairingPreflightOutboundCheck:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"LocalPairingPreflightOutboundCheck() method called");
+#endif
+    NSString *result = StatusgoLocalPairingPreflightOutboundCheck();
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(startSearchForLocalPairingPeers:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoStartSearchForLocalPairingPeers();
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)configJSON
+                  callback:(RCTResponseSenderBlock)callback) {
+
+    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *error;
+    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
+    NSMutableDictionary *senderConfig = configDict[@"senderConfig"];
+    NSString *keyUID = senderConfig[@"keyUID"];
+    NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID];
+    NSString *keystoreDir = multiaccountKeystoreDir.path;
+
+    [senderConfig setValue:keystoreDir forKey:@"keystorePath"];
+    NSString *modifiedConfigJSON = [configDict bv_jsonStringWithPrettyPrint:NO];
+
+    NSString *result = StatusgoGetConnectionStringForBootstrappingAnotherDevice(modifiedConfigJSON);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(inputConnectionStringForBootstrapping:(NSString *)cs
+                  configJSON:(NSString *)configJSON
+                  callback:(RCTResponseSenderBlock)callback) {
+
+    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *error;
+    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
+    NSMutableDictionary *receiverConfig = configDict[@"receiverConfig"];
+    NSMutableDictionary *nodeConfig = receiverConfig[@"nodeConfig"];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
+    NSURL *multiaccountKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
+    NSString *keystoreDir = multiaccountKeystoreDir.path;
+    NSString *rootDataDir = rootUrl.path;
+
+    [receiverConfig setValue:keystoreDir forKey:@"keystorePath"];
+    [nodeConfig setValue:rootDataDir forKey:@"rootDataDir"];
+    NSString *modifiedConfigJSON = [configDict bv_jsonStringWithPrettyPrint:NO];
+    NSString *result = StatusgoInputConnectionStringForBootstrapping(cs, modifiedConfigJSON);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiformatSerializePublicKey:(NSString *)multiCodecKey
+                  base58btc:(NSString *)base58btc
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoMultiformatSerializePublicKey(multiCodecKey,base58btc);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiformatDeserializePublicKey:(NSString *)multiCodecKey
+                  base58btc:(NSString *)base58btc
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoMultiformatDeserializePublicKey(multiCodecKey,base58btc);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(decompressPublicKey:(NSString *)multiCodecKey
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoDecompressPublicKey(multiCodecKey);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(compressPublicKey:(NSString *)multiCodecKey
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoCompressPublicKey(multiCodecKey);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(deserializeAndCompressKey:(NSString *)desktopKey
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoDeserializeAndCompressKey(desktopKey);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(hashTypedData:(NSString *)data
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"hashTypedData() method called");
+#endif
+    NSString *result = StatusgoHashTypedData(data);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(hashTypedDataV4:(NSString *)data
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"hashTypedDataV4() method called");
+#endif
+    NSString *result = StatusgoHashTypedDataV4(data);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(sendTransactionWithSignature:(NSString *)txArgsJSON
+                  signature:(NSString *)signature
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"sendTransactionWithSignature() method called");
+#endif
+    NSString *result = StatusgoSendTransactionWithSignature(txArgsJSON, signature);
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(multiAccountImportMnemonic:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -164,6 +435,388 @@ RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
     callback(@[result]);
 }
 
+-(NSString *) getKeyUID:(NSString *)jsonString {
+    NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+    NSDictionary *json = [NSJSONSerialization
+                          JSONObjectWithData:data
+                          options:NSJSONReadingMutableContainers
+                          error:nil];
+
+    return [json valueForKey:@"key-uid"];
+}
+
+-(NSString *) prepareDirAndUpdateConfig:(NSString *)config
+                             withKeyUID:(NSString *)keyUID {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSError *error = nil;
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
+    NSURL *absTestnetFolderName = [rootUrl URLByAppendingPathComponent:@"ethereum/testnet"];
+
+    if (![fileManager fileExistsAtPath:absTestnetFolderName.path])
+        [fileManager createDirectoryAtPath:absTestnetFolderName.path withIntermediateDirectories:YES attributes:nil error:&error];
+
+    NSURL *flagFolderUrl = [rootUrl URLByAppendingPathComponent:@"ropsten_flag"];
+
+    if(![fileManager fileExistsAtPath:flagFolderUrl.path]){
+        NSLog(@"remove lightchaindata");
+        NSURL *absLightChainDataUrl = [absTestnetFolderName URLByAppendingPathComponent:@"StatusIM/lightchaindata"];
+        if([fileManager fileExistsAtPath:absLightChainDataUrl.path]) {
+            [fileManager removeItemAtPath:absLightChainDataUrl.path
+                                    error:nil];
+        }
+        [fileManager createDirectoryAtPath:flagFolderUrl.path
+               withIntermediateDirectories:NO
+                                attributes:nil
+                                     error:&error];
+    }
+
+    NSLog(@"after remove lightchaindata");
+
+    NSString *keystore = @"keystore";
+    NSURL *absTestnetKeystoreUrl = [absTestnetFolderName URLByAppendingPathComponent:keystore];
+    NSURL *absKeystoreUrl = [rootUrl URLByAppendingPathComponent:keystore];
+    if([fileManager fileExistsAtPath:absTestnetKeystoreUrl.path]){
+        NSLog(@"copy keystore");
+        [fileManager copyItemAtPath:absTestnetKeystoreUrl.path toPath:absKeystoreUrl.path error:nil];
+        [fileManager removeItemAtPath:absTestnetKeystoreUrl.path error:nil];
+    }
+
+    NSLog(@"after lightChainData");
+
+    NSLog(@"preconfig: %@", config);
+    NSData *configData = [config dataUsingEncoding:NSUTF8StringEncoding];
+    NSDictionary *configJSON = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil];
+    NSString *relativeDataDir = [configJSON objectForKey:@"DataDir"];
+    NSString *absDataDir = [rootUrl.path stringByAppendingString:relativeDataDir];
+    NSURL *absDataDirUrl = [NSURL fileURLWithPath:absDataDir];
+    NSString *keystoreDir = [@"/keystore/" stringByAppendingString:keyUID];
+    [configJSON setValue:keystoreDir forKey:@"KeyStoreDir"];
+    [configJSON setValue:@"" forKey:@"LogDir"];
+    [configJSON setValue:@"geth.log" forKey:@"LogFile"];
+
+    NSString *resultingConfig = [configJSON bv_jsonStringWithPrettyPrint:NO];
+    NSLog(@"node config %@", resultingConfig);
+
+    if(![fileManager fileExistsAtPath:absDataDir]) {
+        [fileManager createDirectoryAtPath:absDataDir
+               withIntermediateDirectories:YES attributes:nil error:nil];
+    }
+
+    NSLog(@"logUrlPath %@ rootDir %@", @"geth.log", rootUrl.path);
+    NSURL *absLogUrl = [absDataDirUrl URLByAppendingPathComponent:@"geth.log"];
+    if(![fileManager fileExistsAtPath:absLogUrl.path]) {
+        NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
+        [dict setObject:[NSNumber numberWithInt:511] forKey:NSFilePosixPermissions];
+        [fileManager createFileAtPath:absLogUrl.path contents:nil attributes:dict];
+    }
+
+    return resultingConfig;
+
+}
+
+
+RCT_EXPORT_METHOD(prepareDirAndUpdateConfig:(NSString *)keyUID
+                                     config:(NSString *)config
+                                   callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"PrepareDirAndUpdateConfig() method called");
+#endif
+    NSString *updatedConfig = [self prepareDirAndUpdateConfig:config
+                                                   withKeyUID:keyUID];
+    callback(@[updatedConfig]);
+}
+
+RCT_EXPORT_METHOD(saveAccountAndLogin:(NSString *)multiaccountData
+                  password:(NSString *)password
+                  settings:(NSString *)settings
+                  config:(NSString *)config
+                  accountsData:(NSString *)accountsData) {
+#if DEBUG
+    NSLog(@"SaveAccountAndLogin() method called");
+#endif
+    [self getExportDbFilePath];
+    NSString *keyUID = [self getKeyUID:multiaccountData];
+    NSString *finalConfig = [self prepareDirAndUpdateConfig:config
+                                                 withKeyUID:keyUID];
+    NSString *result = StatusgoSaveAccountAndLogin(multiaccountData, password, settings, finalConfig, accountsData);
+    NSLog(@"%@", result);
+}
+
+RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
+                  password:(NSString *)password
+                  settings:(NSString *)settings
+                  config:(NSString *)config
+                  accountsData:(NSString *)accountsData
+                  chatKey:(NSString *)chatKey) {
+#if DEBUG
+    NSLog(@"SaveAccountAndLoginWithKeycard() method called");
+#endif
+    [self getExportDbFilePath];
+    NSString *keyUID = [self getKeyUID:multiaccountData];
+    NSString *finalConfig = [self prepareDirAndUpdateConfig:config
+                                                 withKeyUID:keyUID];
+    NSString *result = StatusgoSaveAccountAndLoginWithKeycard(multiaccountData, password, settings, finalConfig, accountsData, chatKey);
+    NSLog(@"%@", result);
+}
+
+- (NSString *) getExportDbFilePath {
+    NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"export.db"];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+
+    if ([fileManager fileExistsAtPath:filePath]) {
+        [fileManager removeItemAtPath:filePath error:nil];
+    }
+
+    return filePath;
+}
+
+- (NSURL *) getKeyStoreDir:(NSString *)keyUID {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
+
+    NSURL *oldKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
+    NSURL *multiaccountKeystoreDir = [oldKeystoreDir URLByAppendingPathComponent:keyUID];
+
+    return multiaccountKeystoreDir;
+}
+
+- (void) migrateKeystore:(NSString *)accountData
+                password:(NSString *)password {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
+
+    NSString *keyUID = [self getKeyUID:accountData];
+    NSURL *oldKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
+    NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID];
+
+    NSArray *keys = [fileManager contentsOfDirectoryAtPath:multiaccountKeystoreDir.path error:nil];
+    if (keys.count == 0) {
+        NSString *migrationResult = StatusgoMigrateKeyStoreDir(accountData, password, oldKeystoreDir.path, multiaccountKeystoreDir.path);
+        NSLog(@"keystore migration result %@", migrationResult);
+
+        NSString *initKeystoreResult = StatusgoInitKeystore(multiaccountKeystoreDir.path);
+        NSLog(@"InitKeyStore result %@", initKeystoreResult);
+    }
+}
+
+RCT_EXPORT_METHOD(login:(NSString *)accountData
+                  password:(NSString *)password) {
+#if DEBUG
+    NSLog(@"Login() method called");
+#endif
+    [self getExportDbFilePath];
+    [self migrateKeystore:accountData password:password];
+    NSString *result = StatusgoLogin(accountData, password);
+    NSLog(@"%@", result);
+}
+
+RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData
+                  password:(NSString *)password
+                  configJSON:(NSString *)configJSON) {
+#if DEBUG
+    NSLog(@"LoginWithConfig() method called");
+#endif
+    [self getExportDbFilePath];
+    [self migrateKeystore:accountData password:password];
+    NSString *result = StatusgoLoginWithConfig(accountData, password, configJSON);
+    NSLog(@"%@", result);
+}
+
+RCT_EXPORT_METHOD(loginAccount:(NSString *)request) {
+#if DEBUG
+    NSLog(@"LoginAccount() method called");
+#endif
+    NSString *result = StatusgoLoginAccount(request);
+    NSLog(@"%@", result);
+}
+
+RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
+                  password:(NSString *)password
+                  chatKey:(NSString *)chatKey
+                  nodeConfigJSON:(NSString *)nodeConfigJSON) {
+#if DEBUG
+    NSLog(@"LoginWithKeycard() method called");
+#endif
+    [self getExportDbFilePath];
+    [self migrateKeystore:accountData password:password];
+
+    NSString *result = StatusgoLoginWithKeycard(accountData, password, chatKey, nodeConfigJSON);
+
+    NSLog(@"%@", result);
+}
+
+RCT_EXPORT_METHOD(logout) {
+#if DEBUG
+    NSLog(@"Logout() method called");
+#endif
+    NSString *result = StatusgoLogout();
+
+    NSLog(@"%@", result);
+}
+
+RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"OpenAccounts() method called");
+#endif
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
+
+    NSString *result = StatusgoOpenAccounts(rootUrl.path);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(verify:(NSString *)address
+                  password:(NSString *)password
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"VerifyAccountPassword() method called");
+#endif
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager
+		      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+		      lastObject];
+    NSURL *absKeystoreUrl = [rootUrl URLByAppendingPathComponent:@"keystore"];
+
+    NSString *result = StatusgoVerifyAccountPassword(absKeystoreUrl.path, address, password);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(verifyDatabasePassword:(NSString *)keyUID
+                  password:(NSString *)password
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"VerifyDatabasePassword() method called");
+#endif
+    NSString *result = StatusgoVerifyDatabasePassword(keyUID, password);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(reEncryptDbAndKeystore:(NSString *)keyUID
+                  currentPassword:(NSString *)currentPassword
+                  newPassword:(NSString *)newPassword
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"reEncryptDbAndKeystore() method called");
+#endif
+    // changes password and re-encrypts keystore
+    NSString *result = StatusgoChangeDatabasePassword(keyUID, currentPassword, newPassword);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
+                  accountData:(NSString *)accountData
+                  settings:(NSString *)settings
+                  keycardUID:(NSString *)keycardUID
+                  currentPassword:(NSString *)currentPassword
+                  newPassword:(NSString *)newPassword
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"convertToKeycardAccount() method called");
+#endif
+    NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID];
+    StatusgoInitKeystore(multiaccountKeystoreDir.path);
+    NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, keycardUID, currentPassword, newPassword);
+    callback(@[result]);
+}
+
+
+#pragma mark - SendTransaction
+
+RCT_EXPORT_METHOD(sendTransaction:(NSString *)txArgsJSON
+                  password:(NSString *)password
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"SendTransaction() method called");
+#endif
+    NSString *result = StatusgoSendTransaction(txArgsJSON, password);
+    callback(@[result]);
+}
+
+
+#pragma mark - SignMessage
+
+RCT_EXPORT_METHOD(signMessage:(NSString *)message
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"SignMessage() method called");
+#endif
+    NSString *result = StatusgoSignMessage(message);
+    callback(@[result]);
+}
+
+
+#pragma mark - Recover
+
+RCT_EXPORT_METHOD(recover:(NSString *)message
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"Recover() method called");
+#endif
+    NSString *result = StatusgoRecover(message);
+    callback(@[result]);
+}
+
+
+#pragma mark - SignTypedData
+
+RCT_EXPORT_METHOD(signTypedData:(NSString *)data
+                  account:(NSString *)account
+                  password:(NSString *)password
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"SignTypedData() method called");
+#endif
+    NSString *result = StatusgoSignTypedData(data, account, password);
+    callback(@[result]);
+}
+
+
+#pragma mark - SignTypedDataV4
+
+RCT_EXPORT_METHOD(signTypedDataV4:(NSString *)data
+                  account:(NSString *)account
+                  password:(NSString *)password
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"SignTypedDataV4() method called");
+#endif
+    NSString *result = StatusgoSignTypedDataV4(data, account, password);
+    callback(@[result]);
+}
+
+
+#pragma mark - SignGroupMembership
+
+RCT_EXPORT_METHOD(signGroupMembership:(NSString *)content
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"SignGroupMembership() method called");
+#endif
+    NSString *result = StatusgoSignGroupMembership(content);
+    callback(@[result]);
+}
+
+
+#pragma mark - ExtractGroupMembershipSignatures
+
+RCT_EXPORT_METHOD(extractGroupMembershipSignatures:(NSString *)content
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"ExtractGroupMembershipSignatures() method called");
+#endif
+    NSString *result = StatusgoExtractGroupMembershipSignatures(content);
+    callback(@[result]);
+}
+
+
 #pragma mark - GetNodeConfig
 
 RCT_EXPORT_METHOD(getNodeConfig:(RCTResponseSenderBlock)callback) {
@@ -174,14 +827,206 @@ RCT_EXPORT_METHOD(getNodeConfig:(RCTResponseSenderBlock)callback) {
     callback(@[result]);
 }
 
+
+
+#pragma mark - only android methods
+
+RCT_EXPORT_METHOD(setAdjustResize) {
+#if DEBUG
+    NSLog(@"setAdjustResize() works only on Android");
+#endif
+}
+
+RCT_EXPORT_METHOD(setAdjustPan) {
+#if DEBUG
+    NSLog(@"setAdjustPan() works only on Android");
+#endif
+}
+
+RCT_EXPORT_METHOD(setSoftInputMode: (NSInteger) i) {
+#if DEBUG
+    NSLog(@"setSoftInputMode() works only on Android");
+#endif
+}
+
+RCT_EXPORT_METHOD(clearCookies) {
+    NSHTTPCookie *cookie;
+    NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+
+    for (cookie in [storage cookies]) {
+        [storage deleteCookie:cookie];
+    }
+}
+
+RCT_EXPORT_METHOD(clearStorageAPIs) {
+    [[NSURLCache sharedURLCache] removeAllCachedResponses];
+
+    NSString *path = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject];
+    NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
+    for (NSString *string in array) {
+        NSLog(@"Removing %@", [path stringByAppendingPathComponent:string]);
+        if ([[string pathExtension] isEqualToString:@"localstorage"])
+            [[NSFileManager defaultManager] removeItemAtPath:[path stringByAppendingPathComponent:string] error:nil];
+    }
+}
+
+RCT_EXPORT_METHOD(callRPC:(NSString *)payload
+                  callback:(RCTResponseSenderBlock)callback) {
+    dispatch_async( dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        NSString *result = StatusgoCallRPC(payload);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            callback(@[result]);
+        });
+    });
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(keystoreDir) {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
+
+    NSURL *commonKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
+
+    return commonKeystoreDir.path;
+}
+
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(backupDisabledDataDir) {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
+    return rootUrl.path;
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFileDirectory) {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
+    return rootUrl.path;
+}
+
+RCT_EXPORT_METHOD(initLogging:(BOOL)enabled
+                  mobileSystem:(BOOL)mobileSystem
+                  logLevel:(NSString *)logLevel
+                  callback:(RCTResponseSenderBlock)callback)
+{
+    NSString *logDirectory = [self logFileDirectory];
+    NSString *logFilePath = [logDirectory stringByAppendingPathComponent:@"geth.log"];
+
+    NSMutableDictionary *jsonConfig = [NSMutableDictionary dictionary];
+    jsonConfig[@"Enabled"] = @(enabled);
+    jsonConfig[@"MobileSystem"] = @(mobileSystem);
+    jsonConfig[@"Level"] = logLevel;
+    jsonConfig[@"File"] = logFilePath;
+
+    NSError *error = nil;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonConfig options:0 error:&error];
+
+    if (error) {
+        // Handle JSON serialization error
+        callback(@[error.localizedDescription]);
+        return;
+    }
+
+    NSString *config = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+
+    // Call your native logging initialization method here
+    NSString *initResult = StatusgoInitLogging(config);
+
+    callback(@[initResult]);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeTransfer:(NSString *)to
+                                       value:(NSString *)value) {
+  return StatusgoEncodeTransfer(to,value);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeFunctionCall:(NSString *)method
+                                       paramsJSON:(NSString *)paramsJSON) {
+  return StatusgoEncodeFunctionCall(method,paramsJSON);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(decodeParameters:(NSString *)decodeParamJSON) {
+  return StatusgoDecodeParameters(decodeParamJSON);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(hexToNumber:(NSString *)hex) {
+  return StatusgoHexToNumber(hex);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(numberToHex:(NSString *)numString) {
+  return StatusgoNumberToHex(numString);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(sha3:(NSString *)str) {
+  return StatusgoSha3(str);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(utf8ToHex:(NSString *)str) {
+  return StatusgoUtf8ToHex(str);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(hexToUtf8:(NSString *)str) {
+  return StatusgoHexToUtf8(str);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(checkAddressChecksum:(NSString *)address) {
+  return StatusgoCheckAddressChecksum(address);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(isAddress:(NSString *)address) {
+  return StatusgoIsAddress(address);
+}
+
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(fleets) {
   return StatusgoFleets();
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(toChecksumAddress:(NSString *)address) {
+  return StatusgoToChecksumAddress(address);
+}
+
+RCT_EXPORT_METHOD(validateMnemonic:(NSString *)seed
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"validateMnemonic() method called");
+#endif
+    NSString *result = StatusgoValidateMnemonic(seed);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(createAccountAndLogin:(NSString *)request) {
+#if DEBUG
+    NSLog(@"createAccountAndLogin() method called");
+#endif
+    StatusgoCreateAccountAndLogin(request);
+}
+
+RCT_EXPORT_METHOD(restoreAccountAndLogin:(NSString *)request) {
+#if DEBUG
+    NSLog(@"restoreAccountAndLogin() method called");
+#endif
+    StatusgoRestoreAccountAndLogin(request);
+}
+
+RCT_EXPORT_METHOD(callPrivateRPC:(NSString *)payload
+                  callback:(RCTResponseSenderBlock)callback) {
+    dispatch_async( dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        NSString *result = StatusgoCallPrivateRPC(payload);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            callback(@[result]);
+        });
+    });
+}
+
 RCT_EXPORT_METHOD(closeApplication) {
     exit(0);
 }
 
+
 RCT_EXPORT_METHOD(connectionChange:(NSString *)type
                        isExpensive:(BOOL)isExpensive) {
 #if DEBUG
@@ -211,6 +1056,36 @@ RCT_EXPORT_METHOD(startLocalNotifications) {
 StatusgoStartLocalNotifications();
 }
 
+RCT_EXPORT_METHOD(exportUnencryptedDatabase:(NSString *)accountData
+                  password:(NSString *)password
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"exportUnencryptedDatabase() method called");
+#endif
+
+    NSString *filePath = [self getExportDbFilePath];
+    StatusgoExportUnencryptedDatabase(accountData, password, filePath);
+
+    callback(@[filePath]);
+}
+
+RCT_EXPORT_METHOD(importUnencryptedDatabase:(NSString *)accountData
+                  password:(NSString *)password) {
+#if DEBUG
+    NSLog(@"importUnencryptedDatabase() method called");
+#endif
+    "";
+}
+
+RCT_EXPORT_METHOD(setBlankPreviewFlag:(BOOL *)newValue)
+{
+  NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+
+  [userDefaults setBool:newValue forKey:@"BLANK_PREVIEW"];
+
+  [userDefaults synchronize];
+}
+
 RCT_EXPORT_METHOD(activateKeepAwake)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -255,7 +1130,7 @@ RCT_EXPORT_METHOD(deactivateKeepAwake)
 
 - (NSString*) deviceName
 {
-    return [[UIDevice currentDevice] name];
+    return [[UIDevice currentDevice] name];;
 }
 
 - (NSDictionary *)constantsToExport

modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj

@@ -3,20 +3,13 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		206C9F3E1D474E910063E3E6 /* RCTStatus.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 206C9F3D1D474E910063E3E6 /* RCTStatus.h */; };
 		206C9F401D474E910063E3E6 /* RCTStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 206C9F3F1D474E910063E3E6 /* RCTStatus.m */; };
 		CE4E31B11D86951A0033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B01D86951A0033ED64 /* Statusgo.xcframework */; };
-		E92244EB2B485F2400915F4C /* UIHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E92244E92B485F2400915F4C /* UIHelper.m */; };
-		E967A3AC2B47BD5A00FB19B2 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = E967A3AB2B47BD5A00FB19B2 /* Utils.m */; };
-		E9BEF3602B470BF1001F6755 /* NetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9BEF35E2B470BF1001F6755 /* NetworkManager.m */; };
-		E9C33AA62B4828A60074B1C5 /* DatabaseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9C33AA52B4828A60074B1C5 /* DatabaseManager.m */; };
-		E9DB08932B4858B400F51053 /* LogManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9DB08912B4858B400F51053 /* LogManager.m */; };
-		E9F5C3322B483B6C001A7F40 /* EncryptionUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F5C3312B483B6C001A7F40 /* EncryptionUtils.m */; };
-		E9FC4ED12B47EEFF00E834DB /* AccountManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9FC4ECF2B47EEFF00E834DB /* AccountManager.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -38,20 +31,6 @@
 		206C9F3D1D474E910063E3E6 /* RCTStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTStatus.h; sourceTree = "<group>"; };
 		206C9F3F1D474E910063E3E6 /* RCTStatus.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTStatus.m; sourceTree = "<group>"; };
 		CE4E31B01D86951A0033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Statusgo.xcframework; sourceTree = "<group>"; };
-		E92244E92B485F2400915F4C /* UIHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIHelper.m; sourceTree = "<group>"; };
-		E92244EA2B485F2400915F4C /* UIHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIHelper.h; sourceTree = "<group>"; };
-		E967A3AA2B47BD5A00FB19B2 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
-		E967A3AB2B47BD5A00FB19B2 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
-		E9BEF35E2B470BF1001F6755 /* NetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkManager.m; sourceTree = "<group>"; };
-		E9BEF35F2B470BF1001F6755 /* NetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkManager.h; sourceTree = "<group>"; };
-		E9C33AA42B4828A60074B1C5 /* DatabaseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseManager.h; sourceTree = "<group>"; };
-		E9C33AA52B4828A60074B1C5 /* DatabaseManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DatabaseManager.m; sourceTree = "<group>"; };
-		E9DB08912B4858B400F51053 /* LogManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogManager.m; sourceTree = "<group>"; };
-		E9DB08922B4858B400F51053 /* LogManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogManager.h; sourceTree = "<group>"; };
-		E9F5C3302B483B6C001A7F40 /* EncryptionUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncryptionUtils.h; sourceTree = "<group>"; };
-		E9F5C3312B483B6C001A7F40 /* EncryptionUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EncryptionUtils.m; sourceTree = "<group>"; };
-		E9FC4ECF2B47EEFF00E834DB /* AccountManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccountManager.m; sourceTree = "<group>"; };
-		E9FC4ED02B47EEFF00E834DB /* AccountManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccountManager.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -86,20 +65,6 @@
 		206C9F3C1D474E910063E3E6 /* Status */ = {
 			isa = PBXGroup;
 			children = (
-				E92244EA2B485F2400915F4C /* UIHelper.h */,
-				E92244E92B485F2400915F4C /* UIHelper.m */,
-				E9DB08922B4858B400F51053 /* LogManager.h */,
-				E9DB08912B4858B400F51053 /* LogManager.m */,
-				E9F5C3302B483B6C001A7F40 /* EncryptionUtils.h */,
-				E9F5C3312B483B6C001A7F40 /* EncryptionUtils.m */,
-				E9C33AA42B4828A60074B1C5 /* DatabaseManager.h */,
-				E9C33AA52B4828A60074B1C5 /* DatabaseManager.m */,
-				E9FC4ED02B47EEFF00E834DB /* AccountManager.h */,
-				E9FC4ECF2B47EEFF00E834DB /* AccountManager.m */,
-				E967A3AA2B47BD5A00FB19B2 /* Utils.h */,
-				E967A3AB2B47BD5A00FB19B2 /* Utils.m */,
-				E9BEF35F2B470BF1001F6755 /* NetworkManager.h */,
-				E9BEF35E2B470BF1001F6755 /* NetworkManager.m */,
 				206C9F3D1D474E910063E3E6 /* RCTStatus.h */,
 				206C9F3F1D474E910063E3E6 /* RCTStatus.m */,
 			);
@@ -162,14 +127,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E9DB08932B4858B400F51053 /* LogManager.m in Sources */,
-				E9F5C3322B483B6C001A7F40 /* EncryptionUtils.m in Sources */,
-				E967A3AC2B47BD5A00FB19B2 /* Utils.m in Sources */,
-				E92244EB2B485F2400915F4C /* UIHelper.m in Sources */,
-				E9BEF3602B470BF1001F6755 /* NetworkManager.m in Sources */,
 				206C9F401D474E910063E3E6 /* RCTStatus.m in Sources */,
-				E9C33AA62B4828A60074B1C5 /* DatabaseManager.m in Sources */,
-				E9FC4ED12B47EEFF00E834DB /* AccountManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

modules/react-native-status/ios/RCTStatus/UIHelper.h

@@ -1,9 +0,0 @@
-#import <sys/utsname.h>
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-#import "Statusgo.h"
-#import "RCTLog.h"
-
-@interface UIHelper : NSObject <RCTBridgeModule>
-
-@end

modules/react-native-status/ios/RCTStatus/UIHelper.m

@@ -1,51 +0,0 @@
-#import "UIHelper.h"
-#import "React/RCTBridge.h"
-#import "React/RCTEventDispatcher.h"
-
-@implementation UIHelper
-
-RCT_EXPORT_MODULE();
-
-#pragma mark - only android methods
-
-RCT_EXPORT_METHOD(setAdjustResize) {
-#if DEBUG
-    NSLog(@"setAdjustResize() works only on Android");
-#endif
-}
-
-RCT_EXPORT_METHOD(setAdjustPan) {
-#if DEBUG
-    NSLog(@"setAdjustPan() works only on Android");
-#endif
-}
-
-RCT_EXPORT_METHOD(setSoftInputMode: (NSInteger) i) {
-#if DEBUG
-    NSLog(@"setSoftInputMode() works only on Android");
-#endif
-}
-
-RCT_EXPORT_METHOD(clearCookies) {
-    NSHTTPCookie *cookie;
-    NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
-
-    for (cookie in [storage cookies]) {
-        [storage deleteCookie:cookie];
-    }
-}
-
-RCT_EXPORT_METHOD(clearStorageAPIs) {
-    [[NSURLCache sharedURLCache] removeAllCachedResponses];
-
-    NSString *path = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject];
-    NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
-    for (NSString *string in array) {
-        NSLog(@"Removing %@", [path stringByAppendingPathComponent:string]);
-        if ([[string pathExtension] isEqualToString:@"localstorage"])
-            [[NSFileManager defaultManager] removeItemAtPath:[path stringByAppendingPathComponent:string] error:nil];
-    }
-}
-
-
-@end

modules/react-native-status/ios/RCTStatus/Utils.h

@@ -1,16 +0,0 @@
-#import <sys/utsname.h>
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-#import "Statusgo.h"
-#import "RCTLog.h"
-
-@interface Utils : NSObject <RCTBridgeModule>
-
-+ (NSString *)jsonStringWithPrettyPrint:(BOOL)prettyPrint fromDictionary:(NSDictionary *)dictionary;
-+ (NSString *)jsonStringWithPrettyPrint:(BOOL)prettyPrint fromArray:(NSArray *)array;
-+ (NSURL *)getKeyStoreDirForKeyUID:(NSString *)keyUID;
-+ (NSString *)getExportDbFilePath;
-+ (NSString *)getKeyUID:(NSString *)jsonString;
-+ (void)migrateKeystore:(NSString *)accountData password:(NSString *)password;
-
-@end

modules/react-native-status/ios/RCTStatus/Utils.m

@@ -1,128 +0,0 @@
-#import "Utils.h"
-#import "React/RCTBridge.h"
-#import "React/RCTEventDispatcher.h"
-#import "Statusgo.h"
-#import "Utils.h"
-
-@implementation Utils
-
-RCT_EXPORT_MODULE();
-
-+ (NSString *)jsonStringWithPrettyPrint:(BOOL)prettyPrint fromDictionary:(NSDictionary *)dictionary {
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dictionary
-                                                       options:(NSJSONWritingOptions)(prettyPrint ? NSJSONWritingPrettyPrinted : 0)
-                                                         error:&error];
-
-    if (!jsonData) {
-        NSLog(@"jsonStringWithPrettyPrint: error: %@", error.localizedDescription);
-        return @"{}";
-    } else {
-        return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    }
-}
-
-+ (NSString *)jsonStringWithPrettyPrint:(BOOL)prettyPrint fromArray:(NSArray *)array {
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:array
-                                                       options:(NSJSONWritingOptions)(prettyPrint ? NSJSONWritingPrettyPrinted : 0)
-                                                         error:&error];
-
-    if (!jsonData) {
-        NSLog(@"jsonStringWithPrettyPrint: error: %@", error.localizedDescription);
-        return @"[]";
-    } else {
-        return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    }
-}
-
-+ (NSURL *)getKeyStoreDirForKeyUID:(NSString *)keyUID {
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl = [[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
-
-    NSURL *oldKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
-    NSURL *multiaccountKeystoreDir = [oldKeystoreDir URLByAppendingPathComponent:keyUID];
-
-    return multiaccountKeystoreDir;
-}
-
-+ (NSString *) getKeyUID:(NSString *)jsonString {
-    NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-    NSDictionary *json = [NSJSONSerialization
-            JSONObjectWithData:data
-                       options:NSJSONReadingMutableContainers
-                         error:nil];
-
-    return [json valueForKey:@"key-uid"];
-}
-
-+ (NSString *) getExportDbFilePath {
-    NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"export.db"];
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-
-    if ([fileManager fileExistsAtPath:filePath]) {
-        [fileManager removeItemAtPath:filePath error:nil];
-    }
-
-    return filePath;
-}
-
-+ (void) migrateKeystore:(NSString *)accountData
-                password:(NSString *)password {
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager
-            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
-            lastObject];
-
-    NSURL *keyUID = [self getKeyStoreDirForKeyUID:accountData];
-    NSURL *oldKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
-    NSURL *multiaccountKeystoreDir = [self getKeyStoreDirForKeyUID:keyUID.path];
-
-    NSArray *keys = [fileManager contentsOfDirectoryAtPath:multiaccountKeystoreDir.path error:nil];
-    if (keys.count == 0) {
-        NSString *migrationResult = StatusgoMigrateKeyStoreDir(accountData, password, oldKeystoreDir.path, multiaccountKeystoreDir.path);
-        NSLog(@"keystore migration result %@", migrationResult);
-
-        NSString *initKeystoreResult = StatusgoInitKeystore(multiaccountKeystoreDir.path);
-        NSLog(@"InitKeyStore result %@", initKeystoreResult);
-    }
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(backupDisabledDataDir) {
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager
-            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
-            lastObject];
-    return rootUrl.path;
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(keystoreDir) {
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager
-            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
-            lastObject];
-
-    NSURL *commonKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
-
-    return commonKeystoreDir.path;
-}
-
-RCT_EXPORT_METHOD(validateMnemonic:(NSString *)seed
-    callback:(RCTResponseSenderBlock)callback) {
-    #if DEBUG
-        NSLog(@"validateMnemonic() method called");
-    #endif
-    NSString *result = StatusgoValidateMnemonic(seed);
-    callback(@[result]);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(checkAddressChecksum:(NSString *)address) {
-    return StatusgoCheckAddressChecksum(address);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(toChecksumAddress:(NSString *)address) {
-    return StatusgoToChecksumAddress(address);
-}
-
-
-@end

src/legacy/status_im/contact/block.cljs

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

src/legacy/status_im/mobile_sync_settings/core.cljs

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

src/native_module/core.cljs

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

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

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

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

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

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

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

src/quo/core.cljs

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

src/quo/core_spec.cljs

@@ -47,7 +47,6 @@
     quo.components.list-items.channel.component-spec
     quo.components.list-items.community.component-spec
     quo.components.list-items.dapp.component-spec
-    quo.components.list-items.quiz-item.component-spec
     quo.components.list-items.saved-address.component-spec
     quo.components.list-items.saved-contact-address.component-spec
     quo.components.list-items.token-network.component-spec

src/quo/foundations/colors.cljs

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

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

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

src/status_im/common/scan_qr_code/view.cljs

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

src/status_im/common/signals/events.cljs

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

src/status_im/contexts/add_new_contact/effects.cljs

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

src/status_im/contexts/add_new_contact/events.cljs

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

src/status_im/contexts/add_new_contact/events_test.cljs

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

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

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

src/status_im/contexts/add_new_contact/style.cljs

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

src/status_im/contexts/add_new_contact/views.cljs

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

src/status_im/contexts/chat/events.cljs

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

src/status_im/contexts/chat/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/transport/events.cljs

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

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

@@ -13,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/contacts/drawers/nickname_drawer/style.cljs

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

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

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

src/status_im/contexts/contacts/events.cljs

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

src/status_im/contexts/emoji_picker/constants.cljs

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

src/status_im/contexts/emoji_picker/data.cljs

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

src/status_im/contexts/emoji_picker/events.cljs

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

src/status_im/contexts/emoji_picker/style.cljs

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

src/status_im/contexts/emoji_picker/utils.cljs

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

src/status_im/contexts/emoji_picker/utils_test.cljs

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

src/status_im/contexts/emoji_picker/view.cljs

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

src/status_im/contexts/preview/quo/ios/drawer_bar.cljs

@@ -1,9 +0,0 @@
-(ns status-im.contexts.preview.quo.ios.drawer-bar
-  (:require
-    [quo.core :as quo]
-    [status-im.contexts.preview.quo.preview :as preview]))
-
-(defn view
-  []
-  [preview/preview-container {}
-   [quo/drawer-bar]])

src/status_im/contexts/preview/quo/list_items/quiz_item.cljs

@@ -1,28 +0,0 @@
-(ns status-im.contexts.preview.quo.list-items.quiz-item
-  (:require [quo.core :as quo]
-            [reagent.core :as reagent]
-            [status-im.contexts.preview.quo.preview :as preview]))
-
-(def descriptor
-  [{:key     :state
-    :type    :select
-    :options [{:key :empty}
-              {:key :disabled}
-              {:key :success}
-              {:key :error}]}
-   {:key :blur? :type :boolean}])
-
-(defn view
-  []
-  (let [state (reagent/atom {:state  :empty
-                             :word   "collapse"
-                             :number 8
-                             :blur?  false})]
-    (fn []
-      [preview/preview-container
-       {:state                 state
-        :descriptor            descriptor
-        :blur?                 (:blur? @state)
-        :show-blur-background? true
-        :blur-dark-only?       true}
-       [quo/quiz-item @state]])))

src/status_im/contexts/profile/create/events.cljs

@@ -1,7 +1,7 @@
 (ns status-im.contexts.profile.create.events
   (:require
     [native-module.core :as native-module]
-    [status-im.common.emoji-picker.utils :as emoji-picker.utils]
+    [status-im.contexts.emoji-picker.utils :as emoji-picker.utils]
     [status-im.contexts.profile.config :as profile.config]
     status-im.contexts.profile.create.effects
     [utils.re-frame :as rf]

src/status_im/contexts/profile/login/events.cljs

@@ -17,13 +17,13 @@
     [status-im.common.universal-links :as universal-links]
     [status-im.config :as config]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.contacts.events :as contacts]
     [status-im.contexts.chat.messages.link-preview.events :as link-preview]
+    [status-im.contexts.contacts.events :as contacts]
     [status-im.contexts.profile.config :as profile.config]
     status-im.contexts.profile.login.effects
-    [status-im.contexts.profile.push-notifications.events :as notifications]
     [status-im.contexts.profile.rpc :as profile.rpc]
     [status-im.contexts.profile.settings.events :as profile.settings.events]
+    [status-im.contexts.push-notifications.events :as notifications]
     [status-im.contexts.shell.activity-center.events :as activity-center]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]

src/status_im/contexts/profile/recover/events.cljs

@@ -1,7 +1,7 @@
 (ns status-im.contexts.profile.recover.events
   (:require
     [native-module.core :as native-module]
-    [status-im.common.emoji-picker.utils :as emoji-picker.utils]
+    [status-im.contexts.emoji-picker.utils :as emoji-picker.utils]
     [status-im.contexts.profile.config :as profile.config]
     status-im.contexts.profile.recover.effects
     [utils.re-frame :as rf]

src/status_im/contexts/push_notifications/effects.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.profile.push-notifications.effects
+(ns status-im.contexts.push-notifications.effects
   (:require
     [native-module.push-notifications :as native-module.pn]
     [react-native.platform :as platform]

src/status_im/contexts/push_notifications/events.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.profile.push-notifications.events
+(ns status-im.contexts.push-notifications.events
   (:require
     [cljs-bean.core :as bean]
     [native-module.push-notifications :as native-module.pn]
@@ -6,7 +6,7 @@
     [react-native.platform :as platform]
     [react-native.push-notification-ios :as pn-ios]
     [status-im.config :as config]
-    status-im.contexts.profile.push-notifications.effects
+    status-im.contexts.push-notifications.effects
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]
     [utils.transforms :as transforms]))

src/status_im/contexts/push_notifications/local/effects.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.profile.push-notifications.local.effects
+(ns status-im.contexts.push-notifications.local.effects
   (:require
     [cljs-bean.core :as bean]
     [native-module.push-notifications :as native-module.pn]

src/status_im/contexts/push_notifications/local/events.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.profile.push-notifications.local.events
+(ns status-im.contexts.push-notifications.local.events
   (:require
     [legacy.status-im.notifications.wallet :as notifications.wallet]
     [react-native.platform :as platform]
-    status-im.contexts.profile.push-notifications.local.effects
+    status-im.contexts.push-notifications.local.effects
     [utils.re-frame :as rf]))
 
 

src/status_im/contexts/quo_preview/animated_header_list/animated_header_list.cljs

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

src/status_im/contexts/quo_preview/avatars/account_avatar.cljs

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

src/status_im/contexts/quo_preview/avatars/channel_avatar.cljs

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

src/status_im/contexts/quo_preview/avatars/collection_avatar.cljs

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

src/status_im/contexts/quo_preview/avatars/group_avatar.cljs

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

src/status_im/contexts/quo_preview/avatars/icon_avatar.cljs

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

src/status_im/contexts/quo_preview/avatars/user_avatar.cljs

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

src/status_im/contexts/quo_preview/avatars/wallet_user_avatar.cljs

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

src/status_im/contexts/quo_preview/banners/banner.cljs

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

src/status_im/contexts/quo_preview/browser/browser_input.cljs

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

src/status_im/contexts/quo_preview/buttons/button.cljs

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

src/status_im/contexts/quo_preview/buttons/composer_button.cljs

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

src/status_im/contexts/quo_preview/buttons/dynamic_button.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.buttons.dynamic-button
+(ns status-im.contexts.quo-preview.buttons.dynamic-button
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]
+    [status-im.contexts.quo-preview.preview :as preview]
     [utils.i18n :as i18n]))
 
 (def descriptor

src/status_im/contexts/quo_preview/buttons/predictive_keyboard.cljs

@@ -1,9 +1,9 @@
-(ns status-im.contexts.preview.quo.buttons.predictive-keyboard
+(ns status-im.contexts.quo-preview.buttons.predictive-keyboard
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def descriptor
   [{:key     :type

src/status_im/contexts/quo_preview/buttons/slide_button.cljs

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

src/status_im/contexts/quo_preview/buttons/wallet_button.cljs

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

src/status_im/contexts/quo_preview/buttons/wallet_ctas.cljs

@@ -1,7 +1,7 @@
-(ns status-im.contexts.preview.quo.buttons.wallet-ctas
+(ns status-im.contexts.quo-preview.buttons.wallet-ctas
   (:require
     [quo.core :as quo]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (defn view
   []

src/status_im/contexts/quo_preview/calendar/calendar.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.calendar.calendar
+(ns status-im.contexts.quo-preview.calendar.calendar
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]
+    [status-im.contexts.quo-preview.preview :as preview]
     [utils.datetime :as datetime]))
 
 (def descriptor

src/status_im/contexts/quo_preview/calendar/calendar_day.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.calendar.calendar-day
+(ns status-im.contexts.quo-preview.calendar.calendar-day
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def descriptor
   [(preview/customization-color-option)

src/status_im/contexts/quo_preview/calendar/calendar_year.cljs

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

src/status_im/contexts/quo_preview/code/snippet.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.code.snippet
+(ns status-im.contexts.quo-preview.code.snippet
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def go-example
   "func (s *Server) listenAndServe() {

src/status_im/contexts/quo_preview/code/snippet_preview.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.code.snippet-preview
+(ns status-im.contexts.quo-preview.code.snippet-preview
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def go-example
   "for(let ind")

src/status_im/contexts/quo_preview/colors/color.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.colors.color
+(ns status-im.contexts.quo-preview.colors.color
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def descriptor
   [(preview/customization-color-option {:feng-shui? true})

src/status_im/contexts/quo_preview/colors/color_picker.cljs

@@ -1,9 +1,9 @@
-(ns status-im.contexts.preview.quo.colors.color-picker
+(ns status-im.contexts.quo-preview.colors.color-picker
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def descriptor
   [{:key  :blur?

src/status_im/contexts/quo_preview/common.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.preview.quo.common
+(ns status-im.contexts.quo-preview.common
   (:require
     [quo.core :as quo]
     [quo.theme :as quo.theme]

src/status_im/contexts/quo_preview/community/channel_actions.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.community.channel-actions
+(ns status-im.contexts.quo-preview.community.channel-actions
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (defn view
   []

src/status_im/contexts/quo_preview/community/community_card_view.cljs

@@ -1,9 +1,9 @@
-(ns status-im.contexts.preview.quo.community.community-card-view
+(ns status-im.contexts.quo-preview.community.community-card-view
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
     [status-im.common.resources :as resources]
-    [status-im.contexts.preview.quo.preview :as preview]
+    [status-im.contexts.quo-preview.preview :as preview]
     [utils.i18n :as i18n]))
 
 (def community-data

src/status_im/contexts/quo_preview/community/community_membership_list_view.cljs

@@ -1,9 +1,9 @@
-(ns status-im.contexts.preview.quo.community.community-membership-list-view
+(ns status-im.contexts.quo-preview.community.community-membership-list-view
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.community.data :as data]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.community.data :as data]
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def descriptor
   [{:key     :notifications

src/status_im/contexts/quo_preview/community/community_stat.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.community.community-stat
+(ns status-im.contexts.quo-preview.community.community-stat
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def descriptor
   [{:key  :value

src/status_im/contexts/quo_preview/community/data.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.preview.quo.community.data
+(ns status-im.contexts.quo-preview.community.data
   (:require
     [status-im.common.resources :as resources]
     [utils.i18n :as i18n]))

src/status_im/contexts/quo_preview/community/discover_card.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.community.discover-card
+(ns status-im.contexts.quo-preview.community.discover-card
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def descriptor
   [{:key :title :type :text}

src/status_im/contexts/quo_preview/community/token_gating.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.community.token-gating
+(ns status-im.contexts.quo-preview.community.token-gating
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def descriptor
   [{:label "Tokens sufficient?"

src/status_im/contexts/quo_preview/component_preview/events.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.preview.quo.component-preview.events
+(ns status-im.contexts.quo-preview.component-preview.events
   (:require
     [quo.core :as quo]
     [re-frame.core :as re-frame]))

src/status_im/contexts/quo_preview/component_preview/view.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.preview.quo.component-preview.view
+(ns status-im.contexts.quo-preview.component-preview.view
   (:require
     [react-native.core :as rn]
     [utils.re-frame :as rf]))

src/status_im/contexts/quo_preview/counter/counter.cljs

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

src/status_im/contexts/quo_preview/counter/step.cljs

@@ -1,8 +1,8 @@
-(ns status-im.contexts.preview.quo.counter.step
+(ns status-im.contexts.quo-preview.counter.step
   (:require
     [quo.core :as quo]
     [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.contexts.quo-preview.preview :as preview]))
 
 (def descriptor
   [{:key     :type