fix: tx confirmation title network color

fix: input amount fee rebase leftover
fix: tx confirmation summary-info address initials
2024-11-05 14:06:13 +02:00 · 2024-11-05 13:46:43 +02:00 · 2024-11-05 13:34:37 +02:00 · 2024-11-05 13:33:46 +02:00 · 2024-11-05 13:33:20 +02:00 · 2024-11-05 11:52:45 +02:00
148 changed files with 2433 additions and 3205 deletions
@@ -1,6 +1,5 @@
 CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
@@ -1,5 +1,4 @@
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=status.staging
@@ -22,8 +21,8 @@ KEYCARD_TEST_MENU=1
 QR_READ_TEST_MENU=1
 ENABLE_ROOT_ALERT=0
 APN_TOPIC=im.status.ethereum.pr
-VERIFY_TRANSACTION_CHAIN_ID=5
-VERIFY_ENS_CHAIN_ID=5
+VERIFY_TRANSACTION_CHAIN_ID=11155111
+VERIFY_ENS_CHAIN_ID=11155111
 TEST_STATEOFUS=1
 DATABASE_MANAGEMENT_ENABLED=1
 COMMUNITIES_ENABLED=1
@@ -1,6 +1,5 @@
 CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 GROUP_CHATS_ENABLED=1
@@ -21,8 +20,8 @@ KEYCARD_TEST_MENU=0
 ENABLE_ROOT_ALERT=1
 DISABLE_WALLET_ON_MOBILE_NETWORK=1
 APN_TOPIC=im.status.ethereum.pr
-VERIFY_TRANSACTION_CHAIN_ID=5
-VERIFY_ENS_CHAIN_ID=5
+VERIFY_TRANSACTION_CHAIN_ID=11155111
+VERIFY_ENS_CHAIN_ID=11155111
 TEST_STATEOFUS=1
 BLANK_PREVIEW=0
 DATABASE_MANAGEMENT_ENABLED=1
@@ -1,5 +1,4 @@
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 GROUP_CHATS_ENABLED=1
@@ -1,5 +1,4 @@
 DEBUG_WEBVIEW=0
-DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 GROUP_CHATS_ENABLED=1
@@ -2,7 +2,7 @@
 name: Bug Report
 about: Bug Report
 title: ''
-labels: ['bug', ':1234: low prio']
+type: 'Bug'
 assignees: ''

 ---
@@ -299,8 +299,6 @@ dependencies {
    implementation("com.squareup.okhttp3:okhttp-tls:4.11.0")
    implementation("com.google.prefab:cli:2.0.0")
    implementation("com.android.tools.build:aapt2:8.1.1-10154469")
-    implementation "com.github.bumptech.glide:okhttp3-integration:4.12.0"
-    annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"
 }


@@ -1,45 +0,0 @@
-package im.status.ethereum
-
-import android.content.Context
-import android.os.Handler
-import android.os.Looper
-import com.bumptech.glide.Glide
-import com.bumptech.glide.Registry
-import com.bumptech.glide.module.GlideModule
-import com.bumptech.glide.GlideBuilder
-import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
-import com.bumptech.glide.load.model.GlideUrl
-import java.io.InputStream
-import java.util.concurrent.Executors
-
-class CustomGlideModule : GlideModule {
-    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        // Create a single thread executor for background operations
-        val executor = Executors.newSingleThreadExecutor()
-        val mainHandler = Handler(Looper.getMainLooper())
-        
-        // Execute network operation in background
-        executor.execute {
-            val client = StatusOkHttpClientFactory().createNewNetworkModuleClient()
-            
-            // Post results back to main thread
-            mainHandler.post {
-                client?.let { 
-                    val factory = OkHttpUrlLoader.Factory(it)
-                    registry.replace(
-                        GlideUrl::class.java,
-                        InputStream::class.java,
-                        factory
-                    )
-                }
-            }
-        }
-        
-        // Clean up executor
-        executor.shutdown()
-    }
-
-    override fun applyOptions(context: Context, builder: GlideBuilder) {
-        // No additional options needed
-    }
-} 
@@ -15,10 +15,8 @@ import cl.json.RNSharePackage
 import com.reactnativecommunity.blurview.BlurViewPackage
 import im.status.ethereum.keycard.RNStatusKeycardPackage
 import im.status.ethereum.module.StatusPackage
-import im.status.ethereum.module.StatusBackendClient
 import im.status.ethereum.pushnotifications.PushNotificationPackage
 import im.status.ethereum.StatusOkHttpClientFactory
-import android.util.Log

 class MainApplication : NavigationApplication() {

@@ -41,26 +39,6 @@ class MainApplication : NavigationApplication() {
        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED

        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-
-        override fun createReactInstanceManager() = 
-            super.createReactInstanceManager().apply {
-                addReactInstanceEventListener {
-                    val serverEnabledEnv = true
-                    val statusGoEndpointEnv = "127.0.0.1:60000"
-                    val rootDataDirEnv = "/Users/frank/Downloads/tmp"
-                    val statusGoEndpoint = "http://${statusGoEndpointEnv}/statusgo/"
-                    val signalEndpoint = "ws://${statusGoEndpointEnv}/signals"
-                    Log.d("MainApplication", "Configuring StatusBackendServer with serverEnabled=$serverEnabledEnv, statusGoEndpoint=$statusGoEndpoint, signalEndpoint=$signalEndpoint, rootDataDir=$rootDataDirEnv")
-                    StatusBackendClient.getInstance()?.configStatusBackendServer(
-                        serverEnabled = serverEnabledEnv,
-                        statusGoEndpoint = statusGoEndpoint,
-                        signalEndpoint = signalEndpoint,
-                        rootDataDir = rootDataDirEnv
-                    )
-                    OkHttpClientProvider.setOkHttpClientFactory(StatusOkHttpClientFactory())
-                    Log.d("MainApplication", "StatusBackendServer configured")
-                }
-            }
    }

    override val reactNativeHost: ReactNativeHost
@@ -69,7 +47,7 @@ class MainApplication : NavigationApplication() {
    override fun onCreate() {
        super.onCreate()

-        //OkHttpClientProvider.setOkHttpClientFactory(StatusOkHttpClientFactory())
+        OkHttpClientProvider.setOkHttpClientFactory(StatusOkHttpClientFactory())

        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1")

@@ -92,7 +92,7 @@ For particular example it was failed on `Recover access(password:qwerty, keycard
 Not all features of the app could be covered by e2e at the moment:

 - Colours or place of an element on UI.
- Real ETH/token transactions. That’s the main reason we have separate .apk build for automation needs - it defaults to Goerli network. Also it has enabled keycard test menu, ENS names and chat commands are also on Goerli network (the same in PR builds, but not in nightlies / release)
+- Real ETH/token transactions. That’s the main reason we have separate .apk build for automation needs - it defaults to Sepolia network. Also it has enabled keycard test menu, ENS names and chat commands are also on Sepolia network (the same in PR builds, but not in nightlies / release)
 - Autologin/Biometric related actions (autologin available when device meets certain conditions like the it has set unlock password and device is not rooted: all emulators are rooted in SauceLabs)

 ## Brief flow for test to be automated
@@ -1,35 +0,0 @@
-## Solution to use Status Backend Server
-`StatusBackendClient` is the entry point to use Status Backend Server. We need always to call `status-im.setup.status-backend-client/init` whether `STATUS_BACKEND_SERVER_ENABLED` is `1` or not. If it's not enabled, the invocation to functions in `native-module.core` will be delegated to built-in status-go library, otherwise it will be delegated to status-go running in status-backend server. Currently, all functions has usages in `native-module.core` should be supported delegated to.
-
-related [PR](https://github.com/status-im/status-mobile/pull/21550)
-
-## Usage
-### Add environment variables to your local machine:
-```shell
-# enable using status backend server or not, otherwise it will use built-in status-go library
-export STATUS_BACKEND_SERVER_ENABLED=1
-
-#The host should contain an IP address and a port separated by a colon. 
-#The port comes from your running status backend server. 
-#If you run it by PORT=60000 make run-status-backend , then host will likely be 127.0.0.1:60000
-export STATUS_BACKEND_SERVER_HOST="127.0.0.1:60000" 
-
-export STATUS_BACKEND_SERVER_ROOT_DATA_DIR="/path/to/your/root/data/dir" 
-```
-You need to change `STATUS_BACKEND_SERVER_ROOT_DATA_DIR` to your preferred directory and ensure it exists, it should be in absolute path.
-All the db files and log files(requests.log/geth.log) and keystore files etc will be stored in this directory.
-
-### Start the status backend server:
-```shell
-PORT=60000 make run-status-backend
-```
-MAKE SURE the status-backend is checked out to a revision that's at least compatible with the revision in status-mobile/status-go-version.json before starting the server.
-
-For the Android simulator, you need to reverse the port:
-```shell
-adb reverse tcp:60000 tcp:60000
-```
-
-### Known issues
- Android devices may not display images due to TLS certificate validation issues with the image server
- exportUnencryptedDatabaseV2/import-multiaccount does not work for android, probably cause of tech debt, I found it during creating the draft PR.
@@ -1,7 +1,6 @@
 PODS:
-  - BigInt (5.2.0)
  - boost (1.83.0)
-  - CryptoSwift (1.8.3)
+  - CryptoSwift (1.5.1)
  - DoubleConversion (1.1.6)
  - FBLazyVector (0.73.5)
  - FBReactNativeSpec (0.73.5):
@@ -17,24 +16,20 @@ PODS:
    - hermes-engine/Pre-built (= 0.73.5)
  - hermes-engine/Pre-built (0.73.5)
  - HMSegmentedControl (1.5.6)
-  - Keycard (3.1.0):
-    - BigInt
+  - Keycard (3.0.6):
    - CryptoSwift
    - secp256k1
    - SSZipArchive
  - libevent (2.1.12)
-  - libwebp (1.3.2):
-    - libwebp/demux (= 1.3.2)
-    - libwebp/mux (= 1.3.2)
-    - libwebp/sharpyuv (= 1.3.2)
-    - libwebp/webp (= 1.3.2)
-  - libwebp/demux (1.3.2):
+  - libwebp (1.2.4):
+    - libwebp/demux (= 1.2.4)
+    - libwebp/mux (= 1.2.4)
+    - libwebp/webp (= 1.2.4)
+  - libwebp/demux (1.2.4):
    - libwebp/webp
-  - libwebp/mux (1.3.2):
+  - libwebp/mux (1.2.4):
    - libwebp/demux
-  - libwebp/sharpyuv (1.3.2)
-  - libwebp/webp (1.3.2):
-    - libwebp/sharpyuv
+  - libwebp/webp (1.2.4)
  - RCT-Folly (2022.05.16.00):
    - boost
    - DoubleConversion
@@ -940,6 +935,8 @@ PODS:
    - React
  - react-native-orientation-locker (1.5.0):
    - React-Core
+  - react-native-pdf (6.7.5):
+    - React-Core
  - react-native-shake (3.4.0):
    - React
  - react-native-slider (3.0.0):
@@ -1153,15 +1150,15 @@ PODS:
    - glog
    - RCT-Folly (= 2022.05.16.00)
    - React-Core
-  - RNImageCropPicker (0.41.2):
+  - RNImageCropPicker (0.40.0):
    - React-Core
    - React-RCTImage
-    - RNImageCropPicker/QBImagePickerController (= 0.41.2)
-    - TOCropViewController (~> 2.7.4)
-  - RNImageCropPicker/QBImagePickerController (0.41.2):
+    - RNImageCropPicker/QBImagePickerController (= 0.40.0)
+    - TOCropViewController
+  - RNImageCropPicker/QBImagePickerController (0.40.0):
    - React-Core
    - React-RCTImage
-    - TOCropViewController (~> 2.7.4)
+    - TOCropViewController
  - RNKeychain (8.1.2):
    - React-Core
  - RNLinearGradient (3.0.0-alpha.1):
@@ -1190,7 +1187,7 @@ PODS:
  - secp256k1 (0.1.6)
  - SocketRocket (0.6.1)
  - SSZipArchive (2.4.3)
-  - TOCropViewController (2.7.4)
+  - TOCropViewController (2.6.1)
  - Yoga (1.14.0)

 DEPENDENCIES:
@@ -1238,6 +1235,7 @@ DEPENDENCIES:
  - react-native-lottie-splash-screen (from `../node_modules/react-native-lottie-splash-screen`)
  - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
  - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
+  - react-native-pdf (from `../node_modules/react-native-pdf`)
  - react-native-shake (from `../node_modules/react-native-shake`)
  - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
  - react-native-status (from `../modules/react-native-status`)
@@ -1287,7 +1285,6 @@ DEPENDENCIES:

 SPEC REPOS:
  trunk:
-    - BigInt
    - CryptoSwift
    - fmt
    - HMSegmentedControl
@@ -1383,6 +1380,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/@react-native-community/netinfo"
  react-native-orientation-locker:
    :path: "../node_modules/react-native-orientation-locker"
+  react-native-pdf:
+    :path: "../node_modules/react-native-pdf"
  react-native-shake:
    :path: "../node_modules/react-native-shake"
  react-native-slider:
@@ -1477,27 +1476,26 @@ EXTERNAL SOURCES:

 CHECKOUT OPTIONS:
  Keycard:
-    :commit: afb19836d6730ade5035f6f86ad90715be336af2
+    :commit: 17381678bb981c3c553bb7202a26e642cecb1817
    :git: https://github.com/status-im/Keycard.swift.git
  secp256k1:
-    :commit: 4ab977cc2b2d7319be858bcb30a5d189bb149884
+    :commit: 46a1fa30d9b8babeae85ff519050f42394ab5fcc
    :git: https://github.com/status-im/secp256k1.swift.git
    :submodules: true

 SPEC CHECKSUMS:
-  BigInt: f668a80089607f521586bbe29513d708491ef2f7
  boost: d3f49c53809116a5d38da093a8aa78bf551aed09
-  CryptoSwift: 967f37cea5a3294d9cce358f78861652155be483
+  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
  FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
  FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 53cc9a00a2af0495ac1613e9fe3df6e646a3f405
+  glog: c0eca6ffed0a6fde1965ef26dcc7bf528f052af4
  hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
-  Keycard: 3bd24405b9a875b3b3cf1ab1be69b5c30c5f28bc
+  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
+  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
  RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
  RCTRequired: 2544c0f1081a5fa12e108bb8cb40e5f4581ccd87
  RCTTypeSafety: 50efabe2b115c11ed03fbf3fd79e2f163ddb5d7c
@@ -1532,6 +1530,7 @@ SPEC CHECKSUMS:
  react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b
  react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
  react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
+  react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c
  react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
  react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
  react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
@@ -1567,7 +1566,7 @@ SPEC CHECKSUMS:
  RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
  RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
  RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
-  RNImageCropPicker: 771e2ca319d2cf92e04ebf334ece892ee9a6728f
+  RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d
  RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
  RNLinearGradient: ccaaebce083b54180da61d992e7fa56abfe000d6
  RNPermissions: 08e619529cced22695f4b6d0efcc0a233e278903
@@ -1580,7 +1579,7 @@ SPEC CHECKSUMS:
  secp256k1: f61d67e6fdcb85fd727acf1bf35ace6036db540c
  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
  SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
-  TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
+  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
  Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7

 PODFILE CHECKSUM: 5dd4a5279260d370bcdf016158c825ceb404ee06
@@ -572,8 +572,6 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
@@ -581,8 +579,6 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CryptoSwift.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
@@ -618,8 +614,6 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
@@ -627,8 +621,6 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CryptoSwift.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
@@ -736,8 +728,6 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
@@ -745,8 +735,6 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CryptoSwift.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
@@ -29,8 +29,6 @@
 #import <Security/Security.h>
 #import <react/config/ReactNativeConfig.h>

-#import "StatusBackendClient.h"
-
 //TODO: properly import the framework
 extern "C" NSString* StatusgoImageServerTLSCert();

@@ -190,12 +188,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
  NSURLSessionAuthChallengeDisposition disposition = NSURLSessionAuthChallengeCancelAuthenticationChallenge;
  __block NSURLCredential *credential = nil;

-  NSString *pemCert = [StatusBackendClient executeStatusGoRequestWithResult:@"ImageServerTLSCert" 
-                                                             body:@""
-                                                 statusgoFunction:^NSString *{
-        return StatusgoImageServerTLSCert();
-    }];
-
+  NSString *pemCert = StatusgoImageServerTLSCert();
  pemCert = [pemCert stringByReplacingOccurrencesOfString:@"-----BEGIN CERTIFICATE-----\n" withString:@""];
  pemCert = [pemCert stringByReplacingOccurrencesOfString:@"\n-----END CERTIFICATE-----" withString:@""];
  NSData *derCert = [[NSData alloc] initWithBase64EncodedString:pemCert options:NSDataBase64DecodingIgnoreUnknownCharacters];
@@ -24,23 +24,25 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
    @ReactMethod
    fun createAccountAndLogin(createAccountRequest: String) {
        Log.d(TAG, "createAccountAndLogin")
-        
-        StatusBackendClient.executeStatusGoRequest(
-            endpoint = "CreateAccountAndLogin",
-            requestBody = createAccountRequest,
-            statusgoFunction = { Statusgo.createAccountAndLogin(createAccountRequest) }
-        )
+        val result = Statusgo.createAccountAndLogin(createAccountRequest)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "createAccountAndLogin success: $result")
+            Log.d(TAG, "Geth node started")
+        } else {
+            Log.e(TAG, "createAccountAndLogin failed: $result")
+        }
    }

    @ReactMethod
    fun restoreAccountAndLogin(restoreAccountRequest: String) {
        Log.d(TAG, "restoreAccountAndLogin")
-
-        StatusBackendClient.executeStatusGoRequest(
-            endpoint = "RestoreAccountAndLogin",
-            requestBody = restoreAccountRequest,
-            statusgoFunction = { Statusgo.restoreAccountAndLogin(restoreAccountRequest) }
-        )
+        val result = Statusgo.restoreAccountAndLogin(restoreAccountRequest)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "restoreAccountAndLogin success: $result")
+            Log.d(TAG, "Geth node started")
+        } else {
+            Log.e(TAG, "restoreAccountAndLogin failed: $result")
+        }
    }

    private fun updateConfig(jsonConfigString: String, absRootDirPath: String, keystoreDirPath: String): String {
@@ -171,7 +173,12 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
                accountsData,
                chatKey
            )
-            utils.handleStatusGoResponse(result, "saveAccountAndLoginWithKeycard")
+            if (result.startsWith("{\"error\":\"\"")) {
+                Log.d(TAG, "saveAccountAndLoginWithKeycard result: $result")
+                Log.d(TAG, "Geth node started")
+            } else {
+                Log.e(TAG, "saveAccountAndLoginWithKeycard failed: $result")
+            }
        } catch (e: JSONException) {
            Log.e(TAG, "JSON conversion failed: ${e.message}")
        }
@@ -182,7 +189,11 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
        Log.d(TAG, "loginWithKeycard")
        utils.migrateKeyStoreDir(accountData, password)
        val result = Statusgo.loginWithKeycard(accountData, password, chatKey, nodeConfigJSON)
-        utils.handleStatusGoResponse(result, "loginWithKeycard")
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "LoginWithKeycard result: $result")
+        } else {
+            Log.e(TAG, "LoginWithKeycard failed: $result")
+        }
    }

    @ReactMethod
@@ -190,17 +201,22 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
        Log.d(TAG, "loginWithConfig")
        utils.migrateKeyStoreDir(accountData, password)
        val result = Statusgo.loginWithConfig(accountData, password, configJSON)
-        utils.handleStatusGoResponse(result, "loginWithConfig")
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "LoginWithConfig result: $result")
+        } else {
+            Log.e(TAG, "LoginWithConfig failed: $result")
+        }
    }

    @ReactMethod
    fun loginAccount(request: String) {
        Log.d(TAG, "loginAccount")
-        StatusBackendClient.executeStatusGoRequest(
-            endpoint = "LoginAccount",
-            requestBody = request,
-            statusgoFunction = { Statusgo.loginAccount(request) }
-        )
+        val result = Statusgo.loginAccount(request)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "loginAccount result: $result")
+        } else {
+            Log.e(TAG, "loginAccount failed: $result")
+        }
    }

    @ReactMethod
@@ -208,31 +224,16 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
        val absRootDirPath = utils.getNoBackupDirectory()
        val newKeystoreDir = utils.pathCombine(absRootDirPath, "keystore")

-        val jsonParams = JSONObject()
-        jsonParams.put("keyStoreDir", newKeystoreDir)
-        jsonParams.put("address", address) 
-        jsonParams.put("password", password)
-
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "VerifyAccountPasswordV2",
-            requestBody = jsonParams.toString(),
-            statusgoFunction = { Statusgo.verifyAccountPasswordV2(jsonParams.toString()) },
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.verifyAccountPassword(newKeystoreDir, address, password) },
            callback
        )
    }

    @ReactMethod
    fun verifyDatabasePassword(keyUID: String, password: String, callback: Callback) {
-        val jsonParams = JSONObject()
-        jsonParams.put("keyUID", keyUID)
-        jsonParams.put("password", password)
-
-        val jsonString = jsonParams.toString()
-
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "VerifyDatabasePasswordV2",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.verifyDatabasePasswordV2(jsonString) },
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.verifyDatabasePassword(keyUID, password) },
            callback
        )
    }
@@ -248,136 +249,79 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
    @ReactMethod
    private fun initializeApplication(request: String, callback: Callback) {
        Log.d(TAG, "initializeApplication")
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "InitializeApplication",
-            request,
-            { Statusgo.initializeApplication(request) },
-            callback
-        )
+        Log.d(TAG, "[Initializing application $request")
+        utils.executeRunnableStatusGoMethod({ Statusgo.initializeApplication(request) }, callback)
    }

    @ReactMethod
    private fun acceptTerms(callback: Callback) {
        Log.d(TAG, "acceptTerms")
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "AcceptTerms",
-            "",
-            { Statusgo.acceptTerms() },
-            callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.acceptTerms() }, callback)
    }

    @ReactMethod
    fun logout() {
        Log.d(TAG, "logout")
-        StatusBackendClient.executeStatusGoRequest(
-            endpoint = "Logout",
-            requestBody = "",
-            statusgoFunction = { Statusgo.logout() }
-        )
+        val runnable = Runnable {
+            val result = Statusgo.logout()
+            if (result.startsWith("{\"error\":\"\"")) {
+                Log.d(TAG, "Logout result: $result")
+            } else {
+                Log.e(TAG, "Logout failed: $result")
+            }
+        }
+        StatusThreadPoolExecutor.getInstance().execute(runnable)
    }

    @ReactMethod
    fun multiAccountStoreAccount(json: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "MultiAccountStoreAccount",
-            requestBody = json,
-            statusgoFunction = { Statusgo.multiAccountStoreAccount(json) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountStoreAccount(json) }, callback)
    }

    @ReactMethod
    fun multiAccountLoadAccount(json: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "MultiAccountLoadAccount",
-            requestBody = json,
-            statusgoFunction = { Statusgo.multiAccountLoadAccount(json) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountLoadAccount(json) }, callback)
    }

    @ReactMethod
    fun multiAccountDeriveAddresses(json: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "MultiAccountDeriveAddresses",
-            requestBody = json,
-            statusgoFunction = { Statusgo.multiAccountDeriveAddresses(json) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountDeriveAddresses(json) }, callback)
    }

    @ReactMethod
    fun multiAccountGenerateAndDeriveAddresses(json: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "MultiAccountGenerateAndDeriveAddresses",
-            requestBody = json,
-            statusgoFunction = { Statusgo.multiAccountGenerateAndDeriveAddresses(json) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountGenerateAndDeriveAddresses(json) }, callback)
    }

    @ReactMethod
    fun multiAccountStoreDerived(json: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "MultiAccountStoreDerivedAccounts",
-            requestBody = json,
-            statusgoFunction = { Statusgo.multiAccountStoreDerivedAccounts(json) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountStoreDerivedAccounts(json) }, callback)
    }

    @ReactMethod
    fun multiAccountImportMnemonic(json: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "MultiAccountImportMnemonic",
-            requestBody = json,
-            statusgoFunction = { Statusgo.multiAccountImportMnemonic(json) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountImportMnemonic(json) }, callback)
    }

    @ReactMethod
    fun multiAccountImportPrivateKey(json: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "MultiAccountImportPrivateKey",
-            requestBody = json,
-            statusgoFunction = { Statusgo.multiAccountImportPrivateKey(json) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountImportPrivateKey(json) }, callback)
    }

    @ReactMethod
    fun deleteMultiaccount(keyUID: String, callback: Callback) {
        val keyStoreDir = utils.getKeyStorePath(keyUID)
-        val params = JSONObject().apply {
-            put("keyUID", keyUID)
-            put("keyStoreDir", keyStoreDir)
-        }
-        val jsonString = params.toString()
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "DeleteMultiaccountV2",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.deleteMultiaccountV2(jsonString) },
-            callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.deleteMultiaccount(keyUID, keyStoreDir) }, callback)
    }

    @ReactMethod
    fun getRandomMnemonic(callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "GetRandomMnemonic",
-            "",
-            { Statusgo.getRandomMnemonic() },
-            callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.getRandomMnemonic() }, callback)
    }

    @ReactMethod
    fun createAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "CreateAccountFromMnemonicAndDeriveAccountsForPaths",
-            mnemonic,
+        utils.executeRunnableStatusGoMethod(
            { Statusgo.createAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic) },
            callback
        )
@@ -385,12 +329,7 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC

    @ReactMethod
    fun createAccountFromPrivateKey(json: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "CreateAccountFromPrivateKey",
-            requestBody = json,
-            statusgoFunction = { Statusgo.createAccountFromPrivateKey(json) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.createAccountFromPrivateKey(json) }, callback)
    }

    companion object {
@@ -9,8 +9,6 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import statusgo.Statusgo
 import java.io.File
-import org.json.JSONObject
-import org.json.JSONException

 class DatabaseManager(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {

@@ -19,43 +17,22 @@ class DatabaseManager(private val reactContext: ReactApplicationContext) : React
    override fun getName() = "DatabaseManager"

    private fun getExportDBFile(): File {
-        StatusBackendClient.getInstance()?.let {
-            if (it.serverEnabled) {
-                return File(it.rootDataDir, exportDBFileName)
-            }
-        }
        val pubDirectory = reactContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
        return File(pubDirectory, exportDBFileName)
    }

    @ReactMethod
    fun exportUnencryptedDatabase(accountData: String, password: String, callback: Callback) {
-        Log.d(TAG, "exportUnencryptedDatabase")
+        Log.d(TAG, "login")

        val newFile = getExportDBFile()

        utils.migrateKeyStoreDir(accountData, password)
-        
-        try {
-            val accountJson = JSONObject(accountData)
-            
-            val params = JSONObject().apply {
-                put("account", accountJson)
-                put("password", password)
-                put("databasePath", newFile.absolutePath)
-            }
-            
-            val jsonParams = params.toString()
-            StatusBackendClient.executeStatusGoRequestWithCallback(
-                endpoint = "ExportUnencryptedDatabaseV2",
-                requestBody = jsonParams,
-                statusgoFunction = { Statusgo.exportUnencryptedDatabaseV2(jsonParams) },
-                callback = null
-            )
-            callback.invoke(newFile.absolutePath)
-
-        } catch (e: JSONException) {
-            Log.e(TAG, "Error parsing account data: ${e.message}")
+        val result = Statusgo.exportUnencryptedDatabase(accountData, password, newFile.absolutePath)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "Login result: $result")
+        } else {
+            Log.e(TAG, "Login failed: $result")
        }
    }

@@ -66,25 +43,11 @@ class DatabaseManager(private val reactContext: ReactApplicationContext) : React
        val newFile = getExportDBFile()

        utils.migrateKeyStoreDir(accountData, password)
-
-        try {
-            val accountJson = JSONObject(accountData)
-            
-            val params = JSONObject().apply {
-                put("account", accountJson)
-                put("password", password)
-                put("databasePath", newFile.absolutePath)
-            }
-            
-            val jsonParams = params.toString()
-            
-            StatusBackendClient.executeStatusGoRequest(
-                endpoint = "ImportUnencryptedDatabaseV2",
-                requestBody = jsonParams,
-                statusgoFunction = { Statusgo.importUnencryptedDatabaseV2(jsonParams) }
-            )
-        } catch (e: JSONException) {
-            Log.e(TAG, "Error parsing account data: ${e.message}")
+        val result = Statusgo.importUnencryptedDatabase(accountData, password, newFile.absolutePath)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "import result: $result")
+        } else {
+            Log.e(TAG, "import failed: $result")
        }
    }

@@ -7,7 +7,6 @@ import com.facebook.react.bridge.Callback;
 import android.util.Log;
 import statusgo.Statusgo;
 import org.json.JSONException;
-import org.json.JSONObject;
 import java.util.function.Function;
 import android.app.Activity;
 import android.view.WindowManager;
@@ -40,151 +39,67 @@ public class EncryptionUtils extends ReactContextBaseJavaModule {
        final String commonKeydir = this.utils.pathCombine(this.utils.getNoBackupDirectory(), "/keystore");
        final String keydir = this.utils.pathCombine(commonKeydir, keyUID);

-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "InitKeystore",
-            keydir,
-            () -> Statusgo.initKeystore(keydir),
-            callback
-        );
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.initKeystore(keydir), callback);
    }

    @ReactMethod
    public void reEncryptDbAndKeystore(final String keyUID, final String password, final String newPassword, final Callback callback) throws JSONException {
-        JSONObject params = new JSONObject();
-        params.put("keyUID", keyUID);
-        params.put("oldPassword", password);
-        params.put("newPassword", newPassword);
-        String jsonParams = params.toString();
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "ChangeDatabasePasswordV2",
-            jsonParams,
-            () -> Statusgo.changeDatabasePasswordV2(jsonParams),
-            callback
-        );
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.changeDatabasePassword(keyUID, password, newPassword), callback);
    }

    @ReactMethod
    public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String keycardUID, final String password,
                                        final String newPassword, final Callback callback) throws JSONException {
        final String keyStoreDir = this.utils.getKeyStorePath(keyUID);
-        JSONObject params = new JSONObject();
-        params.put("keyUID", keyUID);
-        params.put("account", new JSONObject(accountData));
-        params.put("settings", new JSONObject(options));
-        params.put("keycardUID", keycardUID);
-        params.put("oldPassword", password);
-        params.put("newPassword", newPassword);
-        final String jsonParams = params.toString();
-        StatusBackendClient.executeStatusGoRequest(
-            "InitKeystore",
-            keyStoreDir,
-            () -> Statusgo.initKeystore(keyStoreDir)
-        );
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "ConvertToKeycardAccountV2",
-            jsonParams,
-            () -> Statusgo.convertToKeycardAccountV2(jsonParams),
-            callback
-        );
+        this.utils.executeRunnableStatusGoMethod(() -> {
+            Statusgo.initKeystore(keyStoreDir);
+            return Statusgo.convertToKeycardAccount(accountData, options, keycardUID, password, newPassword);
+        }, callback);
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    public String encodeTransfer(final String to, final String value) {
-        try {
-            JSONObject params = new JSONObject();
-            params.put("to", to);
-            params.put("value", value);
-            String jsonParams = params.toString();
-            return StatusBackendClient.executeStatusGoRequestWithResult(
-                "EncodeTransferV2",
-                jsonParams,
-                () -> Statusgo.encodeTransferV2(jsonParams)
-            );
-        } catch (JSONException e) {
-            Log.e(TAG, "Error creating JSON for encodeTransfer: " + e.getMessage());
-            return null;
-        }
+        return Statusgo.encodeTransfer(to, value);
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    public String encodeFunctionCall(final String method, final String paramsJSON) {
-        try {
-            JSONObject params = new JSONObject();
-            params.put("method", method);
-            params.put("paramsJSON", new JSONObject(paramsJSON));
-            String jsonString = params.toString();
-            return StatusBackendClient.executeStatusGoRequestWithResult(
-                "EncodeFunctionCallV2",
-                jsonString,
-                () -> Statusgo.encodeFunctionCallV2(jsonString)
-            );
-        } catch (JSONException e) {
-            Log.e(TAG, "Error creating JSON for encodeFunctionCall: " + e.getMessage());
-            return null;
-        }
+        return Statusgo.encodeFunctionCall(method, paramsJSON);
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    public String decodeParameters(final String decodeParamJSON) {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            "DecodeParameters",
-            decodeParamJSON,
-            () -> Statusgo.decodeParameters(decodeParamJSON)
-        );
+        return Statusgo.decodeParameters(decodeParamJSON);
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    public String hexToNumber(final String hex) {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            "HexToNumber",
-            hex,
-            () -> Statusgo.hexToNumber(hex)
-        );
+        return Statusgo.hexToNumber(hex);
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    public String numberToHex(final String numString) {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            "NumberToHex",
-            numString,
-            () -> Statusgo.numberToHex(numString)
-        );
+        return Statusgo.numberToHex(numString);
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    public String sha3(final String str) {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            "Sha3",
-            str,
-            () -> Statusgo.sha3(str)
-        );
+        return Statusgo.sha3(str);
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    public String utf8ToHex(final String str) {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            "Utf8ToHex",
-            str,
-            () -> Statusgo.utf8ToHex(str)
-        );
+        return Statusgo.utf8ToHex(str);
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    public String hexToUtf8(final String str) {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            "HexToUtf8",
-            str,
-            () -> Statusgo.hexToUtf8(str)
-        );
+        return Statusgo.hexToUtf8(str);
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    public String serializeLegacyKey(final String publicKey) {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            "SerializeLegacyKey",
-            publicKey,
-            () -> Statusgo.serializeLegacyKey(publicKey)
-        );
+	return Statusgo.serializeLegacyKey(publicKey);
    }

    @ReactMethod
@@ -215,46 +130,22 @@ public class EncryptionUtils extends ReactContextBaseJavaModule {

    @ReactMethod
    public void hashTransaction(final String txArgsJSON, final Callback callback) throws JSONException {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "HashTransaction",
-            txArgsJSON,
-            () -> Statusgo.hashTransaction(txArgsJSON),
-            callback
-        );
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.hashTransaction(txArgsJSON), callback);
    }

    @ReactMethod
    public void hashMessage(final String message, final Callback callback) throws JSONException {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "HashMessage",
-            message,
-            () -> Statusgo.hashMessage(message),
-            callback
-        );
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.hashMessage(message), callback);
    }

    @ReactMethod
    public void multiformatDeserializePublicKey(final String multiCodecKey, final String base58btc, final Callback callback) throws JSONException {
-        JSONObject params = new JSONObject();
-        params.put("key", multiCodecKey);
-        params.put("outBase", base58btc);
-        String jsonParams = params.toString();
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "MultiformatDeserializePublicKeyV2",
-            jsonParams,
-            () -> Statusgo.multiformatDeserializePublicKeyV2(jsonParams),
-            callback
-        );
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiformatDeserializePublicKey(multiCodecKey,base58btc), callback);
    }

    @ReactMethod
    public void deserializeAndCompressKey(final String desktopKey, final Callback callback) throws JSONException {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "DeserializeAndCompressKey",
-            desktopKey,
-            () -> Statusgo.deserializeAndCompressKey(desktopKey),
-            callback
-        );
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.deserializeAndCompressKey(desktopKey), callback);
    }

    @ReactMethod
@@ -269,12 +160,7 @@ public class EncryptionUtils extends ReactContextBaseJavaModule {

    @ReactMethod
    public void signMessage(final String rpcParams, final Callback callback) throws JSONException {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            "SignMessage",
-            rpcParams,
-            () -> Statusgo.signMessage(rpcParams),
-            callback
-        );
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.signMessage(rpcParams), callback);
    }

    @ReactMethod
@@ -206,12 +206,7 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
            put("LogRequestFile", getRequestLogFile().absolutePath)
        }
        val config = jsonConfig.toString()
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "InitLogging",
-            requestBody = config,
-            statusgoFunction = { Statusgo.initLogging(config) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.initLogging(config) }, callback)
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
@@ -16,12 +16,7 @@ class NetworkManager(private val reactContext: ReactApplicationContext) : ReactC

    @ReactMethod
    fun startSearchForLocalPairingPeers(callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "StartSearchForLocalPairingPeers",
-            requestBody = "",
-            statusgoFunction = { Statusgo.startSearchForLocalPairingPeers() },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.startSearchForLocalPairingPeers() }, callback)
    }

    @ReactMethod
@@ -31,85 +26,48 @@ class NetworkManager(private val reactContext: ReactApplicationContext) : ReactC
        val keyUID = senderConfig.getString("keyUID")
        val keyStorePath = utils.getKeyStorePath(keyUID)
        senderConfig.put("keystorePath", keyStorePath)
-        val jsonString = jsonConfig.toString()

-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "GetConnectionStringForBootstrappingAnotherDevice",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.getConnectionStringForBootstrappingAnotherDevice(jsonString) },
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.getConnectionStringForBootstrappingAnotherDevice(jsonConfig.toString()) },
            callback
        )
    }

    @ReactMethod
    fun inputConnectionStringForBootstrapping(connectionString: String, configJSON: String, callback: Callback) {
-        val receiverClientConfig = JSONObject(configJSON)
-        val params = JSONObject().apply {
-            put("connectionString", connectionString)
-            put("receiverClientConfig", receiverClientConfig)
-        }
-        val jsonString = params.toString()
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "InputConnectionStringForBootstrappingV2",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.inputConnectionStringForBootstrappingV2(jsonString) },
+        val jsonConfig = JSONObject(configJSON)
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.inputConnectionStringForBootstrapping(connectionString, jsonConfig.toString()) },
            callback
        )
    }

    @ReactMethod
    fun sendTransactionWithSignature(txArgsJSON: String, signature: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "SendTransactionWithSignature",
-            requestBody = txArgsJSON,
-            statusgoFunction = { Statusgo.sendTransactionWithSignature(txArgsJSON, signature) },
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.sendTransactionWithSignature(txArgsJSON, signature) },
            callback
        )
    }

    @ReactMethod
    fun sendTransaction(txArgsJSON: String, password: String, callback: Callback) {
-        val jsonParams = JSONObject().apply {
-            put("txArgs", JSONObject(txArgsJSON))
-            put("password", password)
-        }
-        val jsonString = jsonParams.toString()
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "SendTransactionV2",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.sendTransactionV2(jsonString) },
-            callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.sendTransaction(txArgsJSON, password) }, callback)
    }

    @ReactMethod
    fun callRPC(payload: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "CallRPC",
-            requestBody = payload,
-            statusgoFunction = { Statusgo.callRPC(payload) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.callRPC(payload) }, callback)
    }

    @ReactMethod
    fun callPrivateRPC(payload: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "CallPrivateRPC",
-            requestBody = payload,
-            statusgoFunction = { Statusgo.callPrivateRPC(payload) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.callPrivateRPC(payload) }, callback)
    }

    @ReactMethod
    fun recover(rpcParams: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "Recover",
-            requestBody = rpcParams,
-            statusgoFunction = { Statusgo.recover(rpcParams) },
-            callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.recover(rpcParams) }, callback)
    }

    @ReactMethod
@@ -119,33 +77,22 @@ class NetworkManager(private val reactContext: ReactApplicationContext) : ReactC
        val keyUID = senderConfig.getString("loggedInKeyUid")
        val keyStorePath = utils.getKeyStorePath(keyUID)
        senderConfig.put("keystorePath", keyStorePath)
-        val jsonString = jsonConfig.toString()

-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "GetConnectionStringForExportingKeypairsKeystores",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.getConnectionStringForExportingKeypairsKeystores(jsonString) },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod(
+                { Statusgo.getConnectionStringForExportingKeypairsKeystores(jsonConfig.toString()) },
+                callback)
    }

    @ReactMethod
    fun inputConnectionStringForImportingKeypairsKeystores(connectionString: String, configJSON: String, callback: Callback) {
-        val keystoreFilesReceiverClientConfig = JSONObject(configJSON)
-        val receiverConfig = keystoreFilesReceiverClientConfig.getJSONObject("receiverConfig")
+        val jsonConfig = JSONObject(configJSON)
+        val receiverConfig = jsonConfig.getJSONObject("receiverConfig")
        val keyStorePath = utils.pathCombine(utils.getNoBackupDirectory(), "/keystore")
        receiverConfig.put("keystorePath", keyStorePath)

-        val params = JSONObject().apply {
-            put("connectionString", connectionString)
-            put("keystoreFilesReceiverClientConfig", keystoreFilesReceiverClientConfig)
-        }
-        val jsonString = params.toString()
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "InputConnectionStringForImportingKeypairsKeystoresV2",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.inputConnectionStringForImportingKeypairsKeystoresV2(jsonString) },
-            callback = callback
+        utils.executeRunnableStatusGoMethod(
+                { Statusgo.inputConnectionStringForImportingKeypairsKeystores(connectionString, jsonConfig.toString()) },
+                callback
        )
    }
 }
@@ -1,231 +0,0 @@
-package im.status.ethereum.module
-
-import android.util.Log
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
-import okhttp3.WebSocket
-import okhttp3.WebSocketListener
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.Callback
-import java.net.SocketException
-import java.net.SocketTimeoutException
-import java.util.concurrent.TimeUnit
-
-class StatusBackendClient(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-    companion object {
-        private const val TAG = "StatusBackendClient"
-        private val JSON = "application/json; charset=utf-8".toMediaType()
-        private const val TIMEOUT_SECONDS = 30L
-        @Volatile private var instance: StatusBackendClient? = null
-        private lateinit var utils: Utils
-        
-        private val initializationCallbacks = mutableListOf<() -> Unit>()
-        
-        fun getInstance(): StatusBackendClient? = instance
-
-        @JvmStatic
-        fun executeStatusGoRequest(
-            endpoint: String,
-            requestBody: String,
-            statusgoFunction: () -> String
-        ) {
-            val statusBackendClient = getInstance()
-            if (statusBackendClient?.serverEnabled == true) {
-                val result = statusBackendClient.request(endpoint, requestBody)
-                result.onSuccess { response ->
-                    utils.handleStatusGoResponse(response, endpoint)
-                }.onFailure { error ->
-                    Log.e(TAG, "request to $endpoint failed", error)
-                }
-            } else {
-                val result = statusgoFunction()
-                utils.handleStatusGoResponse(result, endpoint)
-            }
-        }
-
-        @JvmStatic
-        fun executeStatusGoRequestWithCallback(
-            endpoint: String,
-            requestBody: String,
-            statusgoFunction: () -> String,
-            callback: Callback?
-        ) {
-            val statusBackendClient = getInstance()
-            if (statusBackendClient?.serverEnabled == true) {
-                val runnable = Runnable {
-                    val result = statusBackendClient.request(endpoint, requestBody)
-                    result.onSuccess { response ->
-                        callback?.invoke(response)
-                    }.onFailure { error ->
-                        Log.e(TAG, "request to $endpoint failed", error)
-                        callback?.invoke(false)
-                    }
-                }
-                StatusThreadPoolExecutor.getInstance().execute(runnable)
-            } else {
-                utils.executeRunnableStatusGoMethod(statusgoFunction, callback)
-            }
-        }
-
-        @JvmStatic
-        fun executeStatusGoRequestWithResult(
-            endpoint: String,
-            requestBody: String,
-            statusgoFunction: () -> String
-        ): String {
-            val statusBackendClient = getInstance()
-            return if (statusBackendClient?.serverEnabled == true) {
-                val result = statusBackendClient.request(endpoint, requestBody)
-                result.getOrElse { error ->
-                    Log.e(TAG, "request to $endpoint failed", error)
-                    ""
-                }
-            } else {
-                if (endpoint == "ImageServerTLSCert") {
-                    Log.i(TAG, "ImageServerTLSCert endpoint called without server enabled - " +
-                        "stacktrace: ${Thread.currentThread().stackTrace.joinToString("\n")}")
-                }
-                statusgoFunction()
-            }
-        }
-
-        fun addInitializationCallback(callback: () -> Unit) {
-            if (instance?.initialized == true) {
-                Log.d(TAG, "Executing initialization callback immediately")
-                callback()
-            } else {
-                Log.d(TAG, "Adding initialization callback")
-                initializationCallbacks.add(callback)
-            }
-        }
-    }
-
-    init {
-        instance = this
-        utils = Utils(reactContext)
-    }
-
-    override fun getName(): String = "StatusBackendClient"
-
-    private val httpClient = OkHttpClient.Builder()
-        .connectTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
-        .writeTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
-        .readTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
-        .retryOnConnectionFailure(true)
-        .build()
-
-    private val wsClient = OkHttpClient.Builder()
-        .retryOnConnectionFailure(true)
-        .build()
-
-    private var webSocket: WebSocket? = null
-    
-    @Volatile var serverEnabled = true
-    @Volatile private var statusGoEndpoint: String? = null
-    @Volatile private var signalEndpoint: String? = null
-    @Volatile var rootDataDir: String? = null
-    @Volatile var initialized = false
-
-    @ReactMethod
-    fun configStatusBackendServer(
-        serverEnabled: Boolean,
-        statusGoEndpoint: String,
-        signalEndpoint: String,
-        rootDataDir: String
-    ) {
-        configure(serverEnabled, statusGoEndpoint, signalEndpoint, rootDataDir)
-        this.initialized = true
-        // Execute callbacks
-        initializationCallbacks.forEach { it() }
-        initializationCallbacks.clear()
-        Log.d(TAG, "StatusBackendClient initialized")
-    }
-
-    private fun configure(
-        serverEnabled: Boolean,
-        statusGoEndpoint: String,
-        signalEndpoint: String,
-        rootDataDir: String
-    ) {
-        Log.d(TAG, "configure: serverEnabled=$serverEnabled, statusGoEndpoint=$statusGoEndpoint, " +
-                   "signalEndpoint=$signalEndpoint, rootDataDir=$rootDataDir")
-        
-        this.serverEnabled = serverEnabled
-        if (serverEnabled) {
-            this.statusGoEndpoint = statusGoEndpoint
-            this.signalEndpoint = signalEndpoint
-            this.rootDataDir = rootDataDir
-            connectWebSocket()
-        } else {
-            disconnectWebSocket()
-            this.statusGoEndpoint = null
-            this.signalEndpoint = null
-            this.rootDataDir = null
-        }
-    }
-
-    private fun connectWebSocket() {
-        if (!serverEnabled || signalEndpoint == null) {
-            return
-        }
-
-        val request = Request.Builder()
-            .url("$signalEndpoint")
-            .build()
-
-        webSocket = wsClient.newWebSocket(request, object : WebSocketListener() {
-            override fun onMessage(webSocket: WebSocket, text: String) {
-                StatusModule.getInstance()?.handleSignal(text)
-            }
-
-            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-                Log.e(TAG, "WebSocket error: ${t.message}")
-            }
-        })
-    }
-
-    private fun disconnectWebSocket() {
-        webSocket?.cancel()
-        webSocket = null
-    }
-
-    fun request(endpoint: String, body: String): Result<String> {
-        if (!serverEnabled || statusGoEndpoint == null) {
-            return Result.failure(IllegalStateException("Status backend server is not enabled"))
-        }
-
-        val fullUrl = "$statusGoEndpoint$endpoint"
-        
-        return try {
-            val request = Request.Builder()
-                .url(fullUrl)
-                .post(body.toRequestBody(JSON))
-                .build()
-
-            httpClient.newCall(request).execute().use { response ->
-                val responseBody = response.body?.string() ?: ""
-                
-                if (response.isSuccessful) {
-                    Log.d(TAG, "Request to $endpoint succeeded: $responseBody")
-                    Result.success(responseBody)
-                } else {
-                    val errorMsg = "Request failed with code ${response.code}: $responseBody"
-                    Log.e(TAG, "Request to $endpoint failed: $errorMsg")
-                    Result.failure(Exception(errorMsg))
-                }
-            }
-        } catch (e: Exception) {
-            when (e) {
-                is SocketTimeoutException -> Log.e(TAG, "Request to $endpoint timed out", e)
-                is SocketException -> Log.e(TAG, "Socket error for $endpoint", e)
-                else -> Log.e(TAG, "Request to $endpoint failed with exception", e)
-            }
-            Result.failure(e)
-        }
-    }
-} 
@@ -9,17 +9,12 @@ import statusgo.SignalHandler
 import statusgo.Statusgo
 import org.json.JSONException
 import android.view.WindowManager
-import org.json.JSONObject

 class StatusModule(private val reactContext: ReactApplicationContext, private val rootedDevice: Boolean) : ReactContextBaseJavaModule(reactContext), LifecycleEventListener, SignalHandler {

    companion object {
        private const val TAG = "StatusModule"
        private var module: StatusModule? = null
-
-        fun getInstance(): StatusModule? {
-            return module
-        }
    }

    private val utils: Utils = Utils(reactContext)
@@ -61,97 +56,45 @@ class StatusModule(private val reactContext: ReactApplicationContext, private va
    @ReactMethod
    fun connectionChange(type: String, isExpensive: Boolean) {
        Log.d(TAG, "ConnectionChange: $type, is expensive $isExpensive")
-        val params = JSONObject().apply {
-            put("type", type)
-            put("expensive", isExpensive)
-        }
-
-        val jsonString = params.toString()
-        StatusBackendClient.executeStatusGoRequest(
-            endpoint = "ConnectionChangeV2",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.connectionChangeV2(jsonString) }
-        )
+        Statusgo.connectionChange(type, if (isExpensive) 1 else 0)
    }

    @ReactMethod
-    fun appStateChange(state: String) {
-        Log.d(TAG, "AppStateChange: $state")
-        val params = JSONObject().apply {
-            put("state", state)
-        }
-        val jsonString = params.toString()
-        StatusBackendClient.executeStatusGoRequest(
-            endpoint = "AppStateChangeV2",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.appStateChangeV2(jsonString) }
-        )
+    fun appStateChange(type: String) {
+        Log.d(TAG, "AppStateChange: $type")
+        Statusgo.appStateChange(type)
    }

    @ReactMethod
    fun startLocalNotifications() {
        Log.d(TAG, "startLocalNotifications")
-        StatusBackendClient.executeStatusGoRequest(
-            endpoint = "StartLocalNotifications",
-            requestBody = "",
-            statusgoFunction = { Statusgo.startLocalNotifications() }
-        )
+        Statusgo.startLocalNotifications()
    }

    @ReactMethod
    fun getNodeConfig(callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "GetNodeConfig",
-            requestBody = "",
-            statusgoFunction = { Statusgo.getNodeConfig() },
-            callback = callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.getNodeConfig() }, callback)
    }

    @ReactMethod
    fun addCentralizedMetric(request: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "AddCentralizedMetric",
-            requestBody = request,
-            statusgoFunction = { Statusgo.addCentralizedMetric(request) },
-            callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.addCentralizedMetric(request) }, callback)
    }

    @ReactMethod
    fun toggleCentralizedMetrics(request: String, callback: Callback) {
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "ToggleCentralizedMetrics",
-            requestBody = request,
-            statusgoFunction = { Statusgo.toggleCentralizedMetrics(request) },
-            callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.toggleCentralizedMetrics(request) }, callback)
    }

    @ReactMethod
    fun deleteImportedKey(keyUID: String, address: String, password: String, callback: Callback) {
        val keyStoreDir = utils.getKeyStorePath(keyUID)
-        val params = JSONObject().apply {
-            put("address", address)
-            put("password", password)
-            put("keyStoreDir", keyStoreDir)
-        }
-        val jsonString = params.toString()
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "DeleteImportedKeyV2",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.deleteImportedKeyV2(jsonString) },
-            callback
-        )
+        utils.executeRunnableStatusGoMethod({ Statusgo.deleteImportedKey(address, password, keyStoreDir) }, callback)
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    fun fleets(): String {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            endpoint = "Fleets",
-            requestBody = "",
-            statusgoFunction = { Statusgo.fleets() }
-        )
+        return Statusgo.fleets()
    }

    override fun getConstants(): Map<String, Any>? {
@@ -9,12 +9,7 @@ import statusgo.Statusgo
 class StatusPackage(private val rootedDevice: Boolean) : ReactPackage {

    companion object {
-        fun getImageTLSCert(): String = 
-            StatusBackendClient.executeStatusGoRequestWithResult(
-                endpoint = "ImageServerTLSCert",
-                requestBody = "",
-                statusgoFunction = { Statusgo.imageServerTLSCert() }
-            )
+        fun getImageTLSCert(): String = Statusgo.imageServerTLSCert()
    }

    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
@@ -31,7 +26,6 @@ class StatusPackage(private val rootedDevice: Boolean) : ReactPackage {
            add(NetworkManager(reactContext))
            add(MailManager(reactContext))
            add(RNSelectableTextInputModule(reactContext))
-            add(StatusBackendClient(reactContext))
        }

        return modules
@@ -25,11 +25,6 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas
    }

    fun getNoBackupDirectory(): String {
-        StatusBackendClient.getInstance()?.let { client ->
-            if (client.serverEnabled && client.rootDataDir != null) {
-                return client.rootDataDir!!
-            }
-        }
        return reactContext.noBackupFilesDir.absolutePath
    }

@@ -39,11 +34,6 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas
    }

    fun getPublicStorageDirectory(): File? {
-        StatusBackendClient.getInstance()?.let { client ->
-            if (client.serverEnabled && client.rootDataDir != null) {
-                return File(client.rootDataDir!!)
-            }
-        }
        // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
        // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
        return reactContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
@@ -79,22 +69,8 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas
            val keydirFile = File(keydir)
            if (!keydirFile.exists() || keydirFile.list().isEmpty()) {
                Log.d(TAG, "migrateKeyStoreDir")
-                val jsonParams = JSONObject()
-                jsonParams.put("account", JSONObject(accountData)) // Remove 'new' keyword
-                jsonParams.put("password", password)
-                jsonParams.put("oldDir", commonKeydir)
-                jsonParams.put("newDir", keydir)
-
-                StatusBackendClient.executeStatusGoRequest(
-                    endpoint = "MigrateKeyStoreDirV2",
-                    requestBody = jsonParams.toString(),
-                    statusgoFunction = { Statusgo.migrateKeyStoreDirV2(jsonParams.toString()) }
-                )
-                StatusBackendClient.executeStatusGoRequest(
-                    endpoint = "InitKeystore",
-                    requestBody = keydir,
-                    statusgoFunction = { Statusgo.initKeystore(keydir) }
-                )
+                Statusgo.migrateKeyStoreDir(accountData, password, commonKeydir, keydir)
+                Statusgo.initKeystore(keydir)
            }
        } catch (e: JSONException) {
            Log.e(TAG, "JSON conversion failed: ${e.message}")
@@ -123,15 +99,15 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas
        return false
    }

-    fun executeRunnableStatusGoMethod(method: Supplier<String>, callback: Callback?) {
+    fun executeRunnableStatusGoMethod(method: Supplier<String>, callback: Callback) {
        if (!checkAvailability()) {
-            callback?.invoke(false)
+            callback.invoke(false)
            return
        }

        val runnableTask = Runnable {
            val res = method.get()
-            callback?.invoke(res)
+            callback.invoke(res)
        }

        StatusThreadPoolExecutor.getInstance().execute(runnableTask)
@@ -139,15 +115,7 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas

    @ReactMethod
    fun validateMnemonic(seed: String, callback: Callback) {
-        val jsonParams = JSONObject()
-        jsonParams.put("mnemonic", seed)
-        val jsonString = jsonParams.toString()
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "ValidateMnemonicV2",
-            requestBody = jsonString,
-            statusgoFunction = { Statusgo.validateMnemonicV2(jsonString) },
-            callback
-        )
+        executeRunnableStatusGoMethod({ Statusgo.validateMnemonic(seed) }, callback)
    }

    fun is24Hour(): Boolean {
@@ -156,29 +124,17 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas

    @ReactMethod(isBlockingSynchronousMethod = true)
    fun checkAddressChecksum(address: String): String {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            endpoint = "CheckAddressChecksum",
-            requestBody = address,
-            statusgoFunction = { Statusgo.checkAddressChecksum(address) }
-        )
+        return Statusgo.checkAddressChecksum(address)
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    fun isAddress(address: String): String {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            endpoint = "IsAddress",
-            requestBody = address,
-            statusgoFunction = { Statusgo.isAddress(address) }
-        )
+        return Statusgo.isAddress(address)
    }

    @ReactMethod(isBlockingSynchronousMethod = true)
    fun toChecksumAddress(address: String): String {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            endpoint = "ToChecksumAddress",
-            requestBody = address,
-            statusgoFunction = { Statusgo.toChecksumAddress(address) }
-        )
+        return Statusgo.toChecksumAddress(address)
    }

    fun readableArrayToStringArray(r: ReadableArray): Array<String> {
@@ -194,19 +150,6 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas

    @ReactMethod(isBlockingSynchronousMethod = true)
    fun validateConnectionString(connectionString: String): String {
-        return StatusBackendClient.executeStatusGoRequestWithResult(
-            endpoint = "ValidateConnectionString",
-            requestBody = connectionString,
-            statusgoFunction = { Statusgo.validateConnectionString(connectionString) }
-        )
-    }
-
-    fun handleStatusGoResponse(response: String, source: String) {
-        //TODO(frank) we should remove sensitive data from the response
-        if (response.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "$source success: $response")
-        } else {
-            Log.e(TAG, "$source failed: $response")
-        }
+        return Statusgo.validateConnectionString(connectionString)
    }
 }
@@ -3,7 +3,6 @@
 #import "React/RCTEventDispatcher.h"
 #import "Statusgo.h"
 #import "Utils.h"
-#import "StatusBackendClient.h"

@implementation AccountManager

@@ -13,29 +12,23 @@ RCT_EXPORT_METHOD(createAccountAndLogin:(NSString *)request) {
 #if DEBUG
    NSLog(@"createAccountAndLogin() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequest:@"CreateAccountAndLogin" 
-                                         body:request 
-                            statusgoFunction:^NSString *{
-        return StatusgoCreateAccountAndLogin(request);
-    }];
+    StatusgoCreateAccountAndLogin(request);
 }

 RCT_EXPORT_METHOD(restoreAccountAndLogin:(NSString *)request) {
 #if DEBUG
    NSLog(@"restoreAccountAndLogin() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequest:@"RestoreAccountAndLogin" 
-                                         body:request 
-                            statusgoFunction:^NSString *{
-        return StatusgoRestoreAccountAndLogin(request);
-    }];
+    StatusgoRestoreAccountAndLogin(request);
 }

 -(NSString *) prepareDirAndUpdateConfig:(NSString *)config
                             withKeyUID:(NSString *)keyUID {
    NSFileManager *fileManager = [NSFileManager defaultManager];
    NSError *error = nil;
-    NSURL *rootUrl =[Utils getRootUrl];
+    NSURL *rootUrl =[[fileManager
+            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+            lastObject];
    NSURL *absTestnetFolderName = [rootUrl URLByAppendingPathComponent:@"ethereum/testnet"];

    if (![fileManager fileExistsAtPath:absTestnetFolderName.path])
@@ -109,24 +102,8 @@ RCT_EXPORT_METHOD(deleteMultiaccount:(NSString *)keyUID
    NSLog(@"DeleteMultiaccount() method called");
 #endif
    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
-    NSDictionary *params = @{
-        @"keyUID": keyUID,
-        @"keyStoreDir": multiaccountKeystoreDir.path
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"DeleteMultiaccountV2"
-                                                     body:jsonString
-                                        statusgoFunction:^NSString *{
-        return StatusgoDeleteMultiaccountV2(jsonString);
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoDeleteMultiaccount(keyUID, multiaccountKeystoreDir.path);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(prepareDirAndUpdateConfig:(NSString *)keyUID
@@ -186,69 +163,36 @@ RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData

 RCT_EXPORT_METHOD(loginAccount:(NSString *)request) {
 #if DEBUG
-    NSLog(@"loginAccount() method called");
+    NSLog(@"LoginAccount() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequest:@"LoginAccount" 
-                                         body:request 
-                            statusgoFunction:^NSString *{
-        return StatusgoLoginAccount(request);
-    }];
+    NSString *result = StatusgoLoginAccount(request);
+    NSLog(@"%@", result);
 }

 RCT_EXPORT_METHOD(verify:(NSString *)address
        password:(NSString *)password
        callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
-    NSLog(@"VerifyAccountPasswordV2() method called");
+    NSLog(@"VerifyAccountPassword() method called");
 #endif
-    NSURL *rootUrl = [Utils getRootUrl];
-    NSString *keystorePath = [rootUrl.path stringByAppendingPathComponent:@"keystore"];
-    
-    NSDictionary *params = @{
-        @"keyStoreDir": keystorePath,
-        @"address": address,
-        @"password": password
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"VerifyAccountPasswordV2"
-                                                     body:jsonString
-                                        statusgoFunction:^NSString *{
-        return StatusgoVerifyAccountPasswordV2(jsonString);
-    }
-                                                 callback:callback];
+    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(@"VerifyDatabasePasswordV2() method called");
+    NSLog(@"VerifyDatabasePassword() method called");
 #endif
-    NSDictionary *params = @{
-        @"keyUID": keyUID,
-        @"password": password
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"VerifyDatabasePasswordV2"
-                                                     body:jsonString
-                                        statusgoFunction:^NSString *{
-        return StatusgoVerifyDatabasePasswordV2(jsonString);
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoVerifyDatabasePassword(keyUID, password);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(initializeApplication:(NSString *)request
@@ -256,173 +200,62 @@ RCT_EXPORT_METHOD(initializeApplication:(NSString *)request
 #if DEBUG
    NSLog(@"initializeApplication() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"InitializeApplication"
-                                                     body:request
-                                        statusgoFunction:^NSString *{
-        return StatusgoInitializeApplication(request);
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoInitializeApplication(request);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(acceptTerms:(RCTResponseSenderBlock)callback) {
 #if DEBUG
    NSLog(@"acceptTerms() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"AcceptTerms"
-                                                     body:@""
-                                        statusgoFunction:^NSString *{
-        return StatusgoAcceptTerms();
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoAcceptTerms();
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
 #if DEBUG
    NSLog(@"OpenAccounts() method called");
 #endif
-    NSURL *rootUrl =[Utils getRootUrl];
+    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");
+        NSLog(@"Logout() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequest:@"Logout" 
-                                         body:@"" 
-                            statusgoFunction:^NSString *{
-        return StatusgoLogout();
-    }];
-}
+        NSString *result = StatusgoLogout();

-RCT_EXPORT_METHOD(multiAccountStoreAccount:(NSString *)json
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"MultiAccountStoreAccount() method called");
-#endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"MultiAccountStoreAccount"
-                                                     body:json
-                                        statusgoFunction:^NSString *{
-        return StatusgoMultiAccountStoreAccount(json);
-    }
-                                                 callback:callback];
-}
-
-RCT_EXPORT_METHOD(multiAccountLoadAccount:(NSString *)json
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"MultiAccountLoadAccount() method called");
-#endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"MultiAccountLoadAccount"
-                                                     body:json
-                                        statusgoFunction:^NSString *{
-        return StatusgoMultiAccountLoadAccount(json);
-    }
-                                                 callback:callback];
-}
-
-RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"multiAccountDeriveAddresses() method called");
-#endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"MultiAccountDeriveAddresses"
-                                                     body:json
-                                        statusgoFunction:^NSString *{
-        return StatusgoMultiAccountDeriveAddresses(json);
-    }
-                                                 callback:callback];
-}
-
-RCT_EXPORT_METHOD(multiAccountGenerateAndDeriveAddresses:(NSString *)json
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"MultiAccountGenerateAndDeriveAddresses() method called");
-#endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"MultiAccountGenerateAndDeriveAddresses"
-                                                     body:json
-                                        statusgoFunction:^NSString *{
-        return StatusgoMultiAccountGenerateAndDeriveAddresses(json);
-    }
-                                                 callback:callback];
-}
-
-RCT_EXPORT_METHOD(multiAccountStoreDerived:(NSString *)json
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"MultiAccountStoreDerived() method called");
-#endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"MultiAccountStoreDerivedAccounts"
-                                                     body:json
-                                        statusgoFunction:^NSString *{
-        return StatusgoMultiAccountStoreDerivedAccounts(json);
-    }
-                                                 callback:callback];
-}
-
-RCT_EXPORT_METHOD(multiAccountImportMnemonic:(NSString *)json
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"MultiAccountImportMnemonic() method called");
-#endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"MultiAccountImportMnemonic"
-                                                     body:json
-                                        statusgoFunction:^NSString *{
-        return StatusgoMultiAccountImportMnemonic(json);
-    }
-                                                 callback:callback];
-}
-
-RCT_EXPORT_METHOD(multiAccountImportPrivateKey:(NSString *)json
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"MultiAccountImportPrivateKey() method called");
-#endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"MultiAccountImportPrivateKey"
-                                                     body:json
-                                        statusgoFunction:^NSString *{
-        return StatusgoMultiAccountImportPrivateKey(json);
-    }
-                                                 callback:callback];
+        NSLog(@"%@", result);
 }

 RCT_EXPORT_METHOD(getRandomMnemonic:(RCTResponseSenderBlock)callback) {
 #if DEBUG
    NSLog(@"GetRandomMnemonic() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"GetRandomMnemonic"
-                                                     body:@""
-                                        statusgoFunction:^NSString *{
-        return StatusgoGetRandomMnemonic();
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoGetRandomMnemonic();
+    callback(@[result]);
 }

-RCT_EXPORT_METHOD(createAccountFromMnemonicAndDeriveAccountsForPaths:(NSString *)mnemonic 
-                  callback:(RCTResponseSenderBlock)callback) {
+RCT_EXPORT_METHOD(createAccountFromMnemonicAndDeriveAccountsForPaths:(NSString *)mnemonic callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
    NSLog(@"createAccountFromMnemonicAndDeriveAccountsForPaths() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"CreateAccountFromMnemonicAndDeriveAccountsForPaths"
-                                                     body:mnemonic
-                                        statusgoFunction:^NSString *{
-        return StatusgoCreateAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic);
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoCreateAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic);
+    callback(@[result]);
 }

-RCT_EXPORT_METHOD(createAccountFromPrivateKey:(NSString *)json
-                  callback:(RCTResponseSenderBlock)callback) {
+RCT_EXPORT_METHOD(createAccountFromPrivateKey:(NSString *)configJSON callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
    NSLog(@"createAccountFromPrivateKey() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"CreateAccountFromPrivateKey"
-                                                     body:json
-                                        statusgoFunction:^NSString *{
-        return StatusgoCreateAccountFromPrivateKey(json);
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoCreateAccountFromPrivateKey(configJSON);
+    callback(@[result]);
 }

@end
@@ -3,7 +3,7 @@
 #import "React/RCTEventDispatcher.h"
 #import "Statusgo.h"
 #import "Utils.h"
-#import "StatusBackendClient.h"
+
@implementation DatabaseManager

 RCT_EXPORT_MODULE();
@@ -16,31 +16,8 @@ RCT_EXPORT_METHOD(exportUnencryptedDatabase:(NSString *)accountData
 #endif

    NSString *filePath = [Utils getExportDbFilePath];
-    
-    NSDictionary *params = @{
-        @"account": [NSJSONSerialization JSONObjectWithData:[accountData dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil],
-        @"password": password,
-        @"databasePath": filePath
-    };
-    
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    
-    if (error) {
-        NSLog(@"Error creating JSON: %@", [error localizedDescription]);
-        callback(@[filePath]);
-        return;
-    }
-    
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"ExportUnencryptedDatabaseV2"
-                                                     body:jsonString
-                                        statusgoFunction:^NSString *{
-        return StatusgoExportUnencryptedDatabaseV2(jsonString);
-    }
-                                                 callback:nil];
-    
+    StatusgoExportUnencryptedDatabase(accountData, password, filePath);
+
    callback(@[filePath]);
 }

@@ -49,31 +26,7 @@ RCT_EXPORT_METHOD(importUnencryptedDatabase:(NSString *)accountData
 #if DEBUG
    NSLog(@"importUnencryptedDatabase() method called");
 #endif
-    
-    NSString *filePath = [Utils getExportDbFilePath];
-    [Utils migrateKeystore:accountData password:password];
-    
-    NSDictionary *params = @{
-        @"account": [NSJSONSerialization JSONObjectWithData:[accountData dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil],
-        @"password": password,
-        @"databasePath": filePath
-    };
-    
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    
-    if (error) {
-        NSLog(@"Error creating JSON: %@", [error localizedDescription]);
-        return;
-    }
-    
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    [StatusBackendClient executeStatusGoRequest:@"ImportUnencryptedDatabaseV2"
-                                         body:jsonString
-                             statusgoFunction:^NSString *{
-        return StatusgoImportUnencryptedDatabaseV2(jsonString);
-    }];
+    "";
 }


@@ -3,7 +3,6 @@
 #import "React/RCTEventDispatcher.h"
 #import "Statusgo.h"
 #import "Utils.h"
-#import "StatusBackendClient.h"

@implementation EncryptionUtils

@@ -16,14 +15,21 @@ RCT_EXPORT_METHOD(initKeystore:(NSString *)keyUID
 #if DEBUG
    NSLog(@"initKeystore() method called");
 #endif
-    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"InitKeystore"
-                                                     body:multiaccountKeystoreDir.path
-                                         statusgoFunction:^NSString *{
-        return StatusgoInitKeystore(multiaccountKeystoreDir.path);
-    }
-                                                 callback:callback];
+    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
@@ -33,26 +39,9 @@ RCT_EXPORT_METHOD(reEncryptDbAndKeystore:(NSString *)keyUID
 #if DEBUG
    NSLog(@"reEncryptDbAndKeystore() method called");
 #endif
-    // Construct params into JSON string
-    NSDictionary *params = @{
-        @"keyUID": keyUID,
-        @"oldPassword": currentPassword,
-        @"newPassword": newPassword
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"ChangeDatabasePasswordV2"
-                                                     body:jsonString
-                                         statusgoFunction:^NSString *{
-        return StatusgoChangeDatabasePasswordV2(jsonString);
-    }
-                                                 callback:callback];
+    // changes password and re-encrypts keystore
+    NSString *result = StatusgoChangeDatabasePassword(keyUID, currentPassword, newPassword);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
@@ -66,141 +55,47 @@ RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
    NSLog(@"convertToKeycardAccount() method called");
 #endif
    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
-    
-    // First initialize keystore
-    [StatusBackendClient executeStatusGoRequest:@"InitKeystore"
-                                         body:multiaccountKeystoreDir.path
-                             statusgoFunction:^NSString *{
-        return StatusgoInitKeystore(multiaccountKeystoreDir.path);
-    }];
-    
-    // Prepare parameters for conversion
-    NSDictionary *params = @{
-        @"keyUID": keyUID,
-        @"account": [NSJSONSerialization JSONObjectWithData:[accountData dataUsingEncoding:NSUTF8StringEncoding] 
-                                                  options:0 
-                                                    error:nil],
-        @"settings": [NSJSONSerialization JSONObjectWithData:[settings dataUsingEncoding:NSUTF8StringEncoding] 
-                                                   options:0 
-                                                     error:nil],
-        @"keycardUID": keycardUID,
-        @"oldPassword": currentPassword,
-        @"newPassword": newPassword
-    };
-    
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", [error localizedDescription]);
-        return;
-    }
-    
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"ConvertToKeycardAccountV2"
-                                                     body:jsonString
-                                         statusgoFunction:^NSString *{
-        return StatusgoConvertToKeycardAccountV2(jsonString);
-    }
-                                                 callback:callback];
+    StatusgoInitKeystore(multiaccountKeystoreDir.path);
+    NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, keycardUID, currentPassword, newPassword);
+    callback(@[result]);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeTransfer:(NSString *)to
-                                     value:(NSString *)value) {
-    NSDictionary *params = @{
-        @"to": to,
-        @"value": value
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", [error localizedDescription]);
-        return nil;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"EncodeTransferV2"
-                                                          body:jsonString
-                                              statusgoFunction:^NSString *{
-        return StatusgoEncodeTransferV2(jsonString);
-    }];
+        value:(NSString *)value) {
+    return StatusgoEncodeTransfer(to,value);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeFunctionCall:(NSString *)method
-                                     paramsJSON:(NSString *)paramsJSON) {
-    NSDictionary *params = @{
-        @"method": method,
-        @"paramsJSON": paramsJSON
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", [error localizedDescription]);
-        return nil;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"EncodeFunctionCallV2"
-                                                          body:jsonString
-                                              statusgoFunction:^NSString *{
-        return StatusgoEncodeFunctionCallV2(jsonString);
-    }];
+        paramsJSON:(NSString *)paramsJSON) {
+    return StatusgoEncodeFunctionCall(method,paramsJSON);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(decodeParameters:(NSString *)decodeParamJSON) {
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"DecodeParameters"
-                                                          body:decodeParamJSON
-                                              statusgoFunction:^NSString *{
-        return StatusgoDecodeParameters(decodeParamJSON);
-    }];
+    return StatusgoDecodeParameters(decodeParamJSON);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(hexToNumber:(NSString *)hex) {
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"HexToNumber"
-                                                          body:hex
-                                              statusgoFunction:^NSString *{
-        return StatusgoHexToNumber(hex);
-    }];
+    return StatusgoHexToNumber(hex);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(numberToHex:(NSString *)numString) {
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"NumberToHex"
-                                                          body:numString
-                                              statusgoFunction:^NSString *{
-        return StatusgoNumberToHex(numString);
-    }];
+    return StatusgoNumberToHex(numString);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(sha3:(NSString *)str) {
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"Sha3"
-                                                          body:str
-                                              statusgoFunction:^NSString *{
-        return StatusgoSha3(str);
-    }];
+    return StatusgoSha3(str);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(utf8ToHex:(NSString *)str) {
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"Utf8ToHex"
-                                                          body:str
-                                              statusgoFunction:^NSString *{
-        return StatusgoUtf8ToHex(str);
-    }];
+    return StatusgoUtf8ToHex(str);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(hexToUtf8:(NSString *)str) {
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"HexToUtf8"
-                                                          body:str
-                                              statusgoFunction:^NSString *{
-        return StatusgoHexToUtf8(str);
-    }];
+    return StatusgoHexToUtf8(str);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(serializeLegacyKey:(NSString *)str) {
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"SerializeLegacyKey"
-                                                          body:str
-                                              statusgoFunction:^NSString *{
-        return StatusgoSerializeLegacyKey(str);
-    }];
+    return StatusgoSerializeLegacyKey(str);
 }

 RCT_EXPORT_METHOD(setBlankPreviewFlag:(BOOL *)newValue)
@@ -215,14 +110,10 @@ RCT_EXPORT_METHOD(setBlankPreviewFlag:(BOOL *)newValue)
 RCT_EXPORT_METHOD(hashTransaction:(NSString *)txArgsJSON
        callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
-    NSLog(@"hashTransaction() method called");
+    NSLog(@"HashTransaction() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"HashTransaction"
-                                                     body:txArgsJSON
-                                         statusgoFunction:^NSString *{
-        return StatusgoHashTransaction(txArgsJSON);
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoHashTransaction(txArgsJSON);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(hashMessage:(NSString *)message
@@ -230,12 +121,8 @@ RCT_EXPORT_METHOD(hashMessage:(NSString *)message
 #if DEBUG
    NSLog(@"hashMessage() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"HashMessage"
-                                                     body:message
-                                         statusgoFunction:^NSString *{
-        return StatusgoHashMessage(message);
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoHashMessage(message);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(localPairingPreflightOutboundCheck:(RCTResponseSenderBlock)callback) {
@@ -249,34 +136,14 @@ RCT_EXPORT_METHOD(localPairingPreflightOutboundCheck:(RCTResponseSenderBlock)cal
 RCT_EXPORT_METHOD(multiformatDeserializePublicKey:(NSString *)multiCodecKey
        base58btc:(NSString *)base58btc
        callback:(RCTResponseSenderBlock)callback) {
-    NSDictionary *params = @{
-        @"key": multiCodecKey,
-        @"outBase": base58btc
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"MultiformatDeserializePublicKeyV2"
-                                                     body:jsonString
-                                         statusgoFunction:^NSString *{
-        return StatusgoMultiformatDeserializePublicKeyV2(jsonString);
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoMultiformatDeserializePublicKey(multiCodecKey,base58btc);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(deserializeAndCompressKey:(NSString *)desktopKey
        callback:(RCTResponseSenderBlock)callback) {
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"DeserializeAndCompressKey"
-                                                     body:desktopKey
-                                         statusgoFunction:^NSString *{
-        return StatusgoDeserializeAndCompressKey(desktopKey);
-    }
-                                                 callback:callback];
+    NSString *result = StatusgoDeserializeAndCompressKey(desktopKey);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(hashTypedData:(NSString *)data
@@ -299,14 +166,13 @@ RCT_EXPORT_METHOD(hashTypedDataV4:(NSString *)data

 #pragma mark - SignMessage

-RCT_EXPORT_METHOD(signMessage:(NSString *)rpcParams
-                  callback:(RCTResponseSenderBlock)callback) {
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"SignMessage"
-                                                     body:rpcParams
-                                         statusgoFunction:^NSString *{
-        return StatusgoSignMessage(rpcParams);
-    }
-                                                 callback:callback];
+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
@@ -4,7 +4,6 @@
 #import "Statusgo.h"
 #import "Utils.h"
 #import "SSZipArchive.h"
-#import "StatusBackendClient.h"

@implementation LogManager

@@ -15,13 +14,14 @@ RCT_EXPORT_MODULE();
 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");
+    NSLog(@"SendLogs() method called");
 #endif
    NSFileManager *fileManager = [NSFileManager defaultManager];
    NSError *error = nil;
-    NSURL *rootUrl =[Utils getRootUrl];
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];

    NSURL *zipFile = [rootUrl URLByAppendingPathComponent:@"logs.zip"];
    [fileManager removeItemAtPath:zipFile.path error:nil];
@@ -33,25 +33,6 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson

    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"];
@@ -61,10 +42,6 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
    [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];
    
    if ([fileManager fileExistsAtPath:requestsLogFile.path]) {
@@ -87,36 +64,37 @@ RCT_EXPORT_METHOD(initLogging:(BOOL)enabled
    NSString *logFilePath = [logDirectory stringByAppendingPathComponent:@"geth.log"];
    NSString *logRequestFilePath = [logDirectory stringByAppendingPathComponent:@"requests.log"];

-    NSDictionary *config = @{
-        @"Enabled": @(enabled),
-        @"MobileSystem": @(mobileSystem),
-        @"Level": logLevel,
-        @"File": logFilePath,
-        @"LogRequestGo": @(logRequestGo),
-        @"LogRequestFile": logRequestFilePath
-    };
-    
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:config options:0 error:&error];
-    
+    NSMutableDictionary *jsonConfig = [NSMutableDictionary dictionary];
+    jsonConfig[@"Enabled"] = @(enabled);
+    jsonConfig[@"MobileSystem"] = @(mobileSystem);
+    jsonConfig[@"Level"] = logLevel;
+    jsonConfig[@"File"] = logFilePath;
+    jsonConfig[@"LogRequestGo"] = @(logRequestGo);
+    jsonConfig[@"LogRequestFile"] = logRequestFilePath;
+    NSError *error = nil;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonConfig options:0 error:&error];
+
    if (error) {
-        NSLog(@"Error creating JSON: %@", [error localizedDescription]);
+        // Handle JSON serialization error
+        callback(@[error.localizedDescription]);
        return;
    }
-    
-    NSString *configJson = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];

-    [StatusBackendClient executeStatusGoRequestWithCallback:@"InitLogging"
-                                                     body:configJson
-                                         statusgoFunction:^NSString *{
-        return StatusgoInitLogging(configJson);
-    }
-                                                 callback:callback];
+    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) {
-    NSURL *rootUrl = [Utils getRootUrl];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager
+                      URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+                     lastObject];
    return rootUrl.path;
 }

+
@end
@@ -3,18 +3,14 @@
 #import "React/RCTEventDispatcher.h"
 #import "Statusgo.h"
 #import "Utils.h"
-#import "StatusBackendClient.h"
+
@implementation NetworkManager

 RCT_EXPORT_MODULE();

 RCT_EXPORT_METHOD(startSearchForLocalPairingPeers:(RCTResponseSenderBlock)callback) {
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"StartSearchForLocalPairingPeers" 
-                                                     body:@""
-                                         statusgoFunction:^NSString *{
-        return StatusgoStartSearchForLocalPairingPeers();
-    }
-                                               callback:callback];
+    NSString *result = StatusgoStartSearchForLocalPairingPeers();
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)configJSON
@@ -23,11 +19,6 @@ RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)c
    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
    NSError *error;
    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
-    if (error) {
-        NSLog(@"Error parsing JSON: %@", error);
-        return;
-    }
-
    NSMutableDictionary *senderConfig = configDict[@"senderConfig"];
    NSString *keyUID = senderConfig[@"keyUID"];
    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
@@ -36,43 +27,16 @@ RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)c
    [senderConfig setValue:keystoreDir forKey:@"keystorePath"];
    NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];

-    [StatusBackendClient executeStatusGoRequestWithCallback:@"GetConnectionStringForBootstrappingAnotherDevice"
-                                                     body:modifiedConfigJSON
-                                         statusgoFunction:^NSString *{
-        return StatusgoGetConnectionStringForBootstrappingAnotherDevice(modifiedConfigJSON);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoGetConnectionStringForBootstrappingAnotherDevice(modifiedConfigJSON);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(inputConnectionStringForBootstrapping:(NSString *)cs
        configJSON:(NSString *)configJSON
        callback:(RCTResponseSenderBlock)callback) {

-    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
-    NSError *jsonError;
-    NSDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:0 error:&jsonError];
-    if (jsonError) {
-        NSLog(@"Error parsing JSON: %@", jsonError);
-        return;
-    }
-
-    NSDictionary *params = @{
-        @"connectionString": cs,
-        @"receiverClientConfig": configDict
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"InputConnectionStringForBootstrappingV2"
-                                                     body:jsonString
-                                         statusgoFunction:^NSString *{
-        return StatusgoInputConnectionStringForBootstrappingV2(jsonString);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoInputConnectionStringForBootstrapping(cs, configJSON);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(sendTransactionWithSignature:(NSString *)txArgsJSON
@@ -81,12 +45,8 @@ RCT_EXPORT_METHOD(sendTransactionWithSignature:(NSString *)txArgsJSON
 #if DEBUG
    NSLog(@"sendTransactionWithSignature() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"SendTransactionWithSignature"
-                                                     body:txArgsJSON
-                                         statusgoFunction:^NSString *{
-        return StatusgoSendTransactionWithSignature(txArgsJSON, signature);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoSendTransactionWithSignature(txArgsJSON, signature);
+    callback(@[result]);
 }

 #pragma mark - SendTransaction
@@ -95,53 +55,30 @@ RCT_EXPORT_METHOD(sendTransaction:(NSString *)txArgsJSON
        password:(NSString *)password
        callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
-    NSLog(@"SendTransactionV2() method called");
+    NSLog(@"SendTransaction() method called");
 #endif
-    NSData *txArgsData = [txArgsJSON dataUsingEncoding:NSUTF8StringEncoding];
-    NSError *jsonError;
-    NSDictionary *txArgsDict = [NSJSONSerialization JSONObjectWithData:txArgsData options:0 error:&jsonError];
-    if (jsonError) {
-        NSLog(@"Error parsing JSON: %@", jsonError);
-        return;
-    }
-
-    NSDictionary *params = @{
-        @"txArgs": txArgsDict,
-        @"password": password
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"SendTransactionV2"
-                                                     body:jsonString
-                                         statusgoFunction:^NSString *{
-        return StatusgoSendTransactionV2(jsonString);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoSendTransaction(txArgsJSON, password);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(callRPC:(NSString *)payload
        callback:(RCTResponseSenderBlock)callback) {
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"CallRPC"
-                                                     body:payload
-                                         statusgoFunction:^NSString *{
-        return StatusgoCallRPC(payload);
-    }
-                                               callback: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) {
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"CallPrivateRPC"
-                                                     body:payload
-                                         statusgoFunction:^NSString *{
-        return StatusgoCallPrivateRPC(payload);
-    }
-                                               callback: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
@@ -151,12 +88,8 @@ RCT_EXPORT_METHOD(recover:(NSString *)message
 #if DEBUG
    NSLog(@"Recover() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"Recover"
-                                                     body:message
-                                         statusgoFunction:^NSString *{
-        return StatusgoRecover(message);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoRecover(message);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(getConnectionStringForExportingKeypairsKeystores:(NSString *)configJSON
@@ -173,12 +106,8 @@ RCT_EXPORT_METHOD(getConnectionStringForExportingKeypairsKeystores:(NSString *)c
    [senderConfig setValue:keystoreDir forKey:@"keystorePath"];
    NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];

-    [StatusBackendClient executeStatusGoRequestWithCallback:@"GetConnectionStringForExportingKeypairsKeystores"
-                                                     body:modifiedConfigJSON
-                                         statusgoFunction:^NSString *{
-        return StatusgoGetConnectionStringForExportingKeypairsKeystores(modifiedConfigJSON);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoGetConnectionStringForExportingKeypairsKeystores(modifiedConfigJSON);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(inputConnectionStringForImportingKeypairsKeystores:(NSString *)cs
@@ -190,25 +119,14 @@ RCT_EXPORT_METHOD(inputConnectionStringForImportingKeypairsKeystores:(NSString *
    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
    NSMutableDictionary *receiverConfig = configDict[@"receiverConfig"];
    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[Utils getRootUrl];
+    NSURL *rootUrl =[[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
    NSURL *multiaccountKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
    NSString *keystoreDir = multiaccountKeystoreDir.path;

    [receiverConfig setValue:keystoreDir forKey:@"keystorePath"];
    NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];
-    
-    NSDictionary *params = @{
-        @"connectionString": cs,
-        @"keystoreFilesReceiverClientConfig": modifiedConfigJSON
-    };
-    NSString *paramsJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:params];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"InputConnectionStringForImportingKeypairsKeystoresV2"
-                                                     body:paramsJSON
-                                         statusgoFunction:^NSString *{
-        return StatusgoInputConnectionStringForImportingKeypairsKeystoresV2(paramsJSON);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoInputConnectionStringForImportingKeypairsKeystores(cs, modifiedConfigJSON);
+    callback(@[result]);
 }

@end
@@ -5,6 +5,5 @@
 #import "RCTLog.h"

@interface Status : NSObject <RCTBridgeModule, StatusgoSignalHandler>
-+ (Status *)sharedInstance;
 - (void)handleSignal:(NSString *)signal;
@end
@@ -2,22 +2,13 @@
 #import "React/RCTBridge.h"
 #import "React/RCTEventDispatcher.h"
 #import "Statusgo.h"
-#import "StatusBackendClient.h"
+
 #import "Utils.h"

 static RCTBridge *bridge;

@implementation Status

-+ (Status *)sharedInstance {
-    static Status *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [[self alloc] init];
-    });
-    return sharedInstance;
-}
-
 - (instancetype)init {
    self = [super init];
    if (!self) {
@@ -82,17 +73,74 @@ RCT_EXPORT_METHOD(deleteImportedKey:(NSString *)keyUID
                  password:(NSString *)password
                  callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
-    NSLog(@"DeleteImportedKeyV2() method called");
+    NSLog(@"DeleteImportedKey() method called");
 #endif
    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
-    NSString *jsonParams = [NSString stringWithFormat:@"{\"address\":\"%@\",\"password\":\"%@\",\"keyStoreDir\":\"%@\"}", 
-                            address, password, multiaccountKeystoreDir.path];
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"DeleteImportedKeyV2"
-                                                     body:jsonParams
-                                         statusgoFunction:^NSString *{
-        return StatusgoDeleteImportedKeyV2(jsonParams);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoDeleteImportedKey(address, password, multiaccountKeystoreDir.path);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiAccountGenerateAndDeriveAddresses:(NSString *)json
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"MultiAccountGenerateAndDeriveAddresses() method called");
+#endif
+    NSString *result = StatusgoMultiAccountGenerateAndDeriveAddresses(json);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiAccountStoreAccount:(NSString *)json
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"MultiAccountStoreAccount() method called");
+#endif
+    NSString *result = StatusgoMultiAccountStoreAccount(json);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiAccountLoadAccount:(NSString *)json
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"MultiAccountLoadAccount() method called");
+#endif
+    NSString *result = StatusgoMultiAccountLoadAccount(json);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiAccountStoreDerived:(NSString *)json
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"MultiAccountStoreDerived() method called");
+#endif
+    NSString *result = StatusgoMultiAccountStoreDerivedAccounts(json);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiAccountImportPrivateKey:(NSString *)json
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"MultiAccountImportPrivateKey() method called");
+#endif
+    NSString *result = StatusgoMultiAccountImportPrivateKey(json);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiAccountImportMnemonic:(NSString *)json
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"MultiAccountImportMnemonic() method called");
+#endif
+    NSString *result = StatusgoMultiAccountImportMnemonic(json);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"MultiAccountDeriveAddresses() method called");
+#endif
+    NSString *result = StatusgoMultiAccountDeriveAddresses(json);
+    callback(@[result]);
 }

 #pragma mark - GetNodeConfig
@@ -101,20 +149,12 @@ RCT_EXPORT_METHOD(getNodeConfig:(RCTResponseSenderBlock)callback) {
 #if DEBUG
    NSLog(@"GetNodeConfig() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"GetNodeConfig"
-                                                     body:@""
-                                         statusgoFunction:^NSString *{
-        return StatusgoGetNodeConfig();
-    }
-                                               callback:callback];
+    NSString *result = StatusgoGetNodeConfig();
+    callback(@[result]);
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(fleets) {
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"Fleets"
-                                                         body:@""
-                                             statusgoFunction:^NSString *{
-        return StatusgoFleets();
-    }];
+  return StatusgoFleets();
 }

 RCT_EXPORT_METHOD(closeApplication) {
@@ -126,55 +166,14 @@ RCT_EXPORT_METHOD(connectionChange:(NSString *)type
 #if DEBUG
    NSLog(@"ConnectionChange() method called");
 #endif
-    NSDictionary *params = @{
-        @"type": type,
-        @"expensive": @(isExpensive)
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params 
-                                                       options:0
-                                                         error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    
-    if (jsonData) {
-        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-        [StatusBackendClient executeStatusGoRequest:@"ConnectionChangeV2"
-                                             body:jsonString
-                                 statusgoFunction:^NSString *{
-            return StatusgoConnectionChangeV2(jsonString);
-        }];
-    } else {
-        NSLog(@"Failed to create JSON data");
-    }
+    StatusgoConnectionChange(type, isExpensive ? 1 : 0);
 }

-RCT_EXPORT_METHOD(appStateChange:(NSString *)state) {
+RCT_EXPORT_METHOD(appStateChange:(NSString *)type) {
 #if DEBUG
    NSLog(@"AppStateChange() method called");
 #endif
-    NSDictionary *params = @{@"state": state};
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params 
-                                                       options:0
-                                                         error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    
-    if (jsonData) {
-        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-        [StatusBackendClient executeStatusGoRequest:@"AppStateChangeV2"
-                                                         body:jsonString
-                                             statusgoFunction:^NSString *{
-            return StatusgoAppStateChangeV2(jsonString);
-        }];
-    } else {
-        NSLog(@"Failed to create JSON data");
-    }
+    StatusgoAppStateChange(type);
 }

 RCT_EXPORT_METHOD(addCentralizedMetric:(NSString *)request
@@ -182,12 +181,8 @@ RCT_EXPORT_METHOD(addCentralizedMetric:(NSString *)request
 #if DEBUG
    NSLog(@"addCentralizedMetric() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"AddCentralizedMetric"
-                                                     body:request
-                                         statusgoFunction:^NSString *{
-        return StatusgoAddCentralizedMetric(request);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoAddCentralizedMetric(request);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(toggleCentralizedMetrics:(NSString *)request
@@ -195,23 +190,15 @@ RCT_EXPORT_METHOD(toggleCentralizedMetrics:(NSString *)request
 #if DEBUG
    NSLog(@"toggleCentralizedMetrics() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"ToggleCentralizedMetrics"
-                                                     body:request
-                                         statusgoFunction:^NSString *{
-        return StatusgoToggleCentralizedMetrics(request);
-    }
-                                               callback:callback];
+    NSString *result = StatusgoToggleCentralizedMetrics(request);
+    callback(@[result]);
 }

 RCT_EXPORT_METHOD(startLocalNotifications) {
 #if DEBUG
    NSLog(@"StartLocalNotifications() method called");
 #endif
-    [StatusBackendClient executeStatusGoRequest:@"StartLocalNotifications"
-                                         body:@""
-                             statusgoFunction:^NSString *{
-        return StatusgoStartLocalNotifications();
-    }];
+StatusgoStartLocalNotifications();
 }

 #pragma mark - deviceinfo
@@ -1,31 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-
-@interface StatusBackendClient : NSObject <RCTBridgeModule>
-
-@property (nonatomic) BOOL serverEnabled;
-@property (nonatomic, strong) NSString *statusGoEndpoint;
-@property (nonatomic, strong) NSString *signalEndpoint;
-@property (nonatomic, strong) NSString *rootDataDir;
-@property (nonatomic, strong) NSURLSessionWebSocketTask *webSocket;
-
-// Add sharedInstance class method declaration
-+ (instancetype)sharedInstance;
- (void)request:(NSString *)endpoint
-                  body:(NSString *)body
-             callback:(void (^)(NSString *response, NSError *error))callback;
-
-+ (void)executeStatusGoRequest:(NSString *)endpoint
-                         body:(NSString *)body
-             statusgoFunction:(NSString * (^)(void))statusgoFunction;
-
-+ (void)executeStatusGoRequestWithCallback:(NSString *)endpoint
-                                    body:(NSString *)body
-                        statusgoFunction:(NSString * (^)(void))statusgoFunction
-                              callback:(RCTResponseSenderBlock)callback;
-
-+ (NSString *)executeStatusGoRequestWithResult:(NSString *)endpoint
-                                        body:(NSString *)body
-                            statusgoFunction:(NSString * (^)(void))statusgoFunction;
-
-@end 
@@ -1,246 +0,0 @@
-#import "StatusBackendClient.h"
-#import "RCTStatus.h"
-#import "Utils.h"
-
-@implementation StatusBackendClient {
-    NSURLSessionWebSocketTask *_webSocket;
-    BOOL _serverEnabled;
-    NSString *_statusGoEndpoint;
-    NSString *_signalEndpoint;
-    NSString *_rootDataDir;
-}
-
-RCT_EXPORT_MODULE();
-
-+ (BOOL)requiresMainQueueSetup {
-    return YES;
-}
-
-+ (instancetype)allocWithZone:(NSZone *)zone {
-    static StatusBackendClient *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [super allocWithZone:zone];
-    });
-    return sharedInstance;
-}
-
-+ (instancetype)sharedInstance {
-    return [[self alloc] init];
-}
-
- (instancetype)init {
-    static StatusBackendClient *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [super init];
-        if (sharedInstance) {
-            sharedInstance->_serverEnabled = NO;
-            sharedInstance->_statusGoEndpoint = nil;
-            sharedInstance->_signalEndpoint = nil;
-            sharedInstance->_rootDataDir = nil;
-            sharedInstance->_webSocket = nil;
-        }
-    });
-    return sharedInstance;
-}
-
- (id)copyWithZone:(NSZone *)zone {
-    return self;
-}
-
- (BOOL)serverEnabled {
-    return _serverEnabled;
-}
-
- (NSString *)statusGoEndpoint {
-    return _statusGoEndpoint;
-}
-
- (NSString *)signalEndpoint {
-    return _signalEndpoint;
-}
-
- (NSString *)rootDataDir {
-    return _rootDataDir;
-}
-
- (void)connectWebSocket {
-    if (!self.serverEnabled || !self.signalEndpoint) {
-        return;
-    }
-    
-    NSString *fullUrl = [NSString stringWithFormat:@"%@", self.signalEndpoint];
-    NSURL *url = [NSURL URLWithString:fullUrl];
-    NSURLSession *session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
-    self.webSocket = [session webSocketTaskWithURL:url];
-    
-    [self.webSocket resume];
-    [self receiveMessage];
-}
-
- (void)receiveMessage {
-    __weak typeof(self) weakSelf = self;
-    [self.webSocket receiveMessageWithCompletionHandler:^(NSURLSessionWebSocketMessage *message, NSError *error) {
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-        if (!strongSelf || !strongSelf.webSocket) {
-            return;
-        }
-
-        if (error) {
-            NSLog(@"WebSocket error: %@", error);
-            // Attempt to reconnect after error
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [strongSelf connectWebSocket];
-            });
-            return;
-        }
-        
-        if (message) {
-            if (message.type == NSURLSessionWebSocketMessageTypeString && message.string) {
-                [[Status sharedInstance] handleSignal:message.string];
-            }
-            // Continue receiving messages only if the connection is still active
-            if (strongSelf.webSocket) {
-                [strongSelf receiveMessage];
-            }
-        }
-    }];
-}
-
- (void)disconnectWebSocket {
-    if (self.webSocket) {
-        [self.webSocket cancel];
-        self.webSocket = nil;
-    }
-}
-
- (void)request:(NSString *)endpoint
-                  body:(NSString *)body
-             callback:(void (^)(NSString *response, NSError *error))callback {
-    NSString *fullUrlString = [NSString stringWithFormat:@"%@%@", self.statusGoEndpoint, endpoint];
-    NSURL *url = [NSURL URLWithString:fullUrlString];
-    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url];
-    request.HTTPMethod = @"POST";
-    [request setValue:@"application/json; charset=utf-8" forHTTPHeaderField:@"Content-Type"];
-    
-    NSData *bodyData = [body dataUsingEncoding:NSUTF8StringEncoding];
-    request.HTTPBody = bodyData;
-    
-    NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
-    NSURLSession *session = [NSURLSession sessionWithConfiguration:config];
-    
-    NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                            completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-        if (error) {
-            NSLog(@"request error: %@", error);
-            callback(nil, error);
-            return;
-        }
-        
-        NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-        callback(responseString, nil);
-    }];
-    
-    [task resume];
-}
-
-RCT_EXPORT_METHOD(configStatusBackendServer:(BOOL)serverEnabled
-                  statusGoEndpoint:(NSString *)statusGoEndpoint
-                  signalEndpoint:(NSString *)signalEndpoint
-                  rootDataDir:(NSString *)rootDataDir) {
-    [self configureWithEnabled:serverEnabled
-               statusGoEndpoint:statusGoEndpoint
-                signalEndpoint:signalEndpoint
-                  rootDataDir:rootDataDir];
-}
-
- (void)configureWithEnabled:(BOOL)serverEnabled
-              statusGoEndpoint:(NSString *)statusGoEndpoint
-               signalEndpoint:(NSString *)signalEndpoint
-                 rootDataDir:(NSString *)rootDataDir {
-    _serverEnabled = serverEnabled;
-    
-    if (serverEnabled) {
-        _statusGoEndpoint = statusGoEndpoint;
-        _signalEndpoint = signalEndpoint;
-        _rootDataDir = rootDataDir;
-        [self connectWebSocket];
-    } else {
-        [self disconnectWebSocket];
-        _statusGoEndpoint = nil;
-        _signalEndpoint = nil;
-        _rootDataDir = nil;
-    }
-}
-
-+ (void)executeStatusGoRequest:(NSString *)endpoint
-                         body:(NSString *)body
-             statusgoFunction:(NSString * (^)(void))statusgoFunction {
-    StatusBackendClient *client = [StatusBackendClient sharedInstance];
-    if (client.serverEnabled) {
-        [client request:endpoint body:body callback:^(NSString *response, NSError *error) {
-            [Utils handleStatusGoResponse:response source:endpoint error:error];
-        }];
-    } else {
-        NSString *result = statusgoFunction();
-        [Utils handleStatusGoResponse:result source:endpoint error:nil];
-    }
-}
-
-+ (void)executeStatusGoRequestWithCallback:(NSString *)endpoint
-                                    body:(NSString *)body
-                        statusgoFunction:(NSString * (^)(void))statusgoFunction
-                              callback:(RCTResponseSenderBlock)callback {
-    StatusBackendClient *client = [StatusBackendClient sharedInstance];
-    if (client.serverEnabled) {
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-            [client request:endpoint body:body callback:^(NSString *response, NSError *error) {
-                if (error) {
-                    NSLog(@"request to %@ failed: %@", endpoint, error);
-                    if (callback) {
-                        callback(@[@(NO)]);
-                    }
-                } else {
-                    if (callback) {
-                        callback(@[response]);
-                    }
-                }
-            }];
-        });
-    } else {
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-            NSString *result = statusgoFunction();
-            if (callback) {
-                callback(@[result]);
-            }
-        });
-    }
-}
-
-+ (NSString *)executeStatusGoRequestWithResult:(NSString *)endpoint
-                                        body:(NSString *)body
-                            statusgoFunction:(NSString * (^)(void))statusgoFunction {
-    StatusBackendClient *client = [StatusBackendClient sharedInstance];
-    if (client.serverEnabled) {
-        dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-        __block NSString *resultString = @"";
-        
-        [client request:endpoint body:body callback:^(NSString *response, NSError *error) {
-            if (error) {
-                NSLog(@"request to %@ failed: %@", endpoint, error);
-                resultString = @"";
-            } else {
-                resultString = response;
-            }
-            dispatch_semaphore_signal(semaphore);
-        }];
-        
-        dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-        return resultString;
-    } else {
-        return statusgoFunction();
-    }
-}
-
-@end 
@@ -6,13 +6,11 @@

@interface Utils : NSObject <RCTBridgeModule>

-+ (NSURL *)getRootUrl;
 + (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;
-+ (void)handleStatusGoResponse:(NSString *)response source:(NSString *)source error:(NSError *)error;

@end
@@ -3,28 +3,11 @@
 #import "React/RCTEventDispatcher.h"
 #import "Statusgo.h"
 #import "Utils.h"
-#import "StatusBackendClient.h"

@implementation Utils

 RCT_EXPORT_MODULE();

-#pragma mark - Private Methods
-
-+ (NSURL *)getRootUrl {
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl;
-    
-    StatusBackendClient *client = [StatusBackendClient sharedInstance];
-    if (client.serverEnabled && client.rootDataDir) {
-        rootUrl = [NSURL fileURLWithPath:client.rootDataDir];
-    } else {
-        rootUrl = [[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
-    }
-    
-    return rootUrl;
-}
-
 + (NSString *)jsonStringWithPrettyPrint:(BOOL)prettyPrint fromDictionary:(NSDictionary *)dictionary {
    NSError *error;
    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dictionary
@@ -55,7 +38,7 @@ RCT_EXPORT_MODULE();

 + (NSURL *)getKeyStoreDirForKeyUID:(NSString *)keyUID {
    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl = [self getRootUrl];
+    NSURL *rootUrl = [[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];

    NSURL *oldKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
    NSURL *multiaccountKeystoreDir = [oldKeystoreDir URLByAppendingPathComponent:keyUID];
@@ -74,11 +57,6 @@ RCT_EXPORT_MODULE();
 }

 + (NSString *) getExportDbFilePath {
-    StatusBackendClient *client = [StatusBackendClient sharedInstance];
-    if (client.serverEnabled && client.rootDataDir) {
-        return [client.rootDataDir stringByAppendingPathComponent:@"export.db"];
-    }
-
    NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"export.db"];
    NSFileManager *fileManager = [NSFileManager defaultManager];

@@ -92,36 +70,17 @@ RCT_EXPORT_MODULE();
 + (void) migrateKeystore:(NSString *)accountData
                password:(NSString *)password {
    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[self getRootUrl];
+    NSURL *rootUrl =[[fileManager
+            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+            lastObject];

-    NSData *jsonData = [accountData dataUsingEncoding:NSUTF8StringEncoding];
-    NSError *error;
-    NSDictionary *accountJson = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
-    if (error) {
-        NSLog(@"Error parsing accountData: %@", error);
-        return;
-    }
-
-    NSString *keyUID = [self getKeyUID:accountData];
+    NSURL *keyUID = [self getKeyStoreDirForKeyUID:accountData];
    NSURL *oldKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
-    NSURL *multiaccountKeystoreDir = [self getKeyStoreDirForKeyUID:keyUID];
+    NSURL *multiaccountKeystoreDir = [self getKeyStoreDirForKeyUID:keyUID.path];

    NSArray *keys = [fileManager contentsOfDirectoryAtPath:multiaccountKeystoreDir.path error:nil];
    if (keys.count == 0) {
-        NSDictionary *params = @{
-            @"account": accountJson,
-            @"password": password,
-            @"oldDir": oldKeystoreDir.path,
-            @"newDir": multiaccountKeystoreDir.path
-        };
-        NSData *paramsJsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-        if (error) {
-            NSLog(@"Error creating params JSON: %@", error);
-            return;
-        }
-        NSString *jsonString = [[NSString alloc] initWithData:paramsJsonData encoding:NSUTF8StringEncoding];
-        
-        NSString *migrationResult = StatusgoMigrateKeyStoreDirV2(jsonString);
+        NSString *migrationResult = StatusgoMigrateKeyStoreDir(accountData, password, oldKeystoreDir.path, multiaccountKeystoreDir.path);
        NSLog(@"keystore migration result %@", migrationResult);

        NSString *initKeystoreResult = StatusgoInitKeystore(multiaccountKeystoreDir.path);
@@ -130,19 +89,18 @@ RCT_EXPORT_MODULE();
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(backupDisabledDataDir) {
-    StatusBackendClient *client = [StatusBackendClient sharedInstance];
-    if (client.serverEnabled && client.rootDataDir) {
-        return client.rootDataDir;
-    }
-    
    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl = [Utils getRootUrl];
+    NSURL *rootUrl =[[fileManager
+            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+            lastObject];
    return rootUrl.path;
 }

 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(keystoreDir) {
    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[Utils getRootUrl];
+    NSURL *rootUrl =[[fileManager
+            URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]
+            lastObject];

    NSURL *commonKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];

@@ -152,17 +110,9 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(keystoreDir) {
 RCT_EXPORT_METHOD(validateMnemonic:(NSString *)seed
    callback:(RCTResponseSenderBlock)callback) {
    #if DEBUG
-        NSLog(@"validateMnemonicV2() method called");
+        NSLog(@"validateMnemonic() method called");
    #endif
-    NSDictionary *params = @{@"mnemonic": seed};
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    NSString *result = StatusgoValidateMnemonicV2(jsonString);
+    NSString *result = StatusgoValidateMnemonic(seed);
    callback(@[result]);
 }

@@ -182,17 +132,4 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(validateConnectionString:(NSString *)cs)
    return StatusgoValidateConnectionString(cs);
 }

-+ (void)handleStatusGoResponse:(NSString *)response source:(NSString *)source error:(NSError *)error {
-    if (error) {
-        NSLog(@"%@ failed: %@", source, error);
-        return;
-    }
-    
-    if ([response hasPrefix:@"{\"error\":\"\""]) {
-        NSLog(@"%@ success: %@", source, response);
-    } else {
-        NSLog(@"%@ failed: %@", source, response);
-    }
-}
-
@end
@@ -56,7 +56,7 @@ in {
  yarn = super.yarn.override { nodejs = super.nodejs_20; };
  openjdk = super.openjdk17_headless;
  xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
-    versions = ["15.1" "15.2" "15.3" "15.4" "16.0"];
+    versions = ["15.1" "15.2" "15.3" "15.4"];
  };
  go = super.go_1_21;
  clang = super.clang_15;
@@ -51,7 +51,7 @@
    "react-native-get-random-values": "^1.11.0",
    "react-native-gifted-charts": "^1.3.2",
    "react-native-hole-view": "^3.0.0-alpha4",
-    "react-native-image-crop-picker": "0.41.2",
+    "react-native-image-crop-picker": "0.40.0",
    "react-native-image-resizer": "^1.2.3",
    "react-native-keychain": "8.1.2",
    "react-native-linear-gradient": "3.0.0-alpha.1",
@@ -32,12 +32,9 @@ trap "rm -vf ${SECRETS_FILE_PATH}" EXIT ERR INT QUIT
 # Names of variables containing secrets to save in env file.
 SECRETS_ENV_VARS=(
    'ALCHEMY_ETHEREUM_MAINNET_TOKEN'
-    'ALCHEMY_ETHEREUM_GOERLI_TOKEN'
    'ALCHEMY_ETHEREUM_SEPOLIA_TOKEN'
-    'ALCHEMY_ARBITRUM_GOERLI_TOKEN'
    'ALCHEMY_ARBITRUM_MAINNET_TOKEN'
    'ALCHEMY_ARBITRUM_SEPOLIA_TOKEN'
-    'ALCHEMY_OPTIMISM_GOERLI_TOKEN'
    'ALCHEMY_OPTIMISM_MAINNET_TOKEN'
    'ALCHEMY_OPTIMISM_SEPOLIA_TOKEN'
    'RARIBLE_MAINNET_API_KEY'
@@ -51,60 +51,53 @@
   ;; the target files (a.k.a hot reload). When false, you can manually
   ;; reload by calling `shadow.cljs.devtools.api/watch-compile-all!`.
   :devtools {:autobuild #shadow/env ["SHADOW_AUTOBUILD_ENABLED" :default true :as :bool]}
-   :dev
-   {:devtools {:before-load-async status-im.setup.hot-reload/before-reload
-               :after-load-async  status-im.setup.hot-reload/reload
-               :build-notify      status-im.setup.hot-reload/build-notify
-               :preloads          [;; The official recommendation is to
-                                   ;; load the debugger preload first.
-                                   flow-storm.api
-                                   re-frisk-remote.preload
-                                   status-im.setup.schema-preload
-                                   ;; In order to use component test helpers in the REPL we need to
-                                   ;; preload namespaces that are not normally required by
-                                   ;; production code, such as @testing-library/react-native.
-                                   test-helpers.component]}
-    :closure-defines
-    {status-im.config/POKT_TOKEN                          #shadow/env "POKT_TOKEN"
-     status-im.config/INFURA_TOKEN                        #shadow/env "INFURA_TOKEN"
-     status-im.config/STATUS_BUILD_PROXY_USER             #shadow/env "STATUS_BUILD_PROXY_USER"
-     status-im.config/STATUS_BUILD_PROXY_PASSWORD         #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
-     status-im.config/STATUS_BACKEND_SERVER_ENABLED              #shadow/env "STATUS_BACKEND_SERVER_ENABLED"
-     status-im.config/STATUS_BACKEND_SERVER_HOST          #shadow/env "STATUS_BACKEND_SERVER_HOST"
-     status-im.config/STATUS_BACKEND_SERVER_ROOT_DATA_DIR #shadow/env
-                                                           "STATUS_BACKEND_SERVER_ROOT_DATA_DIR"
-     status-im.config/MIXPANEL_APP_ID                     #shadow/env "MIXPANEL_APP_ID"
-     status-im.config/MIXPANEL_TOKEN                      #shadow/env "MIXPANEL_TOKEN"
-     status-im.config/OPENSEA_API_KEY                     #shadow/env "OPENSEA_API_KEY"
-     status-im.config/RARIBLE_MAINNET_API_KEY             #shadow/env "RARIBLE_MAINNET_API_KEY"
-     status-im.config/RARIBLE_TESTNET_API_KEY             #shadow/env "RARIBLE_TESTNET_API_KEY"
-     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN      #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN       #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
-     status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN      #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN      #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN       #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN      #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN      #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN       #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN      #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
-    :compiler-options {:output-feature-set :es5
-                       ;; We disable `:fn-deprecated` warnings because we
-                       ;; are managing deprecation via clj-kondo and we
-                       ;; don't want the terminal output to be littered
-                       ;; with warnings on every code reload.
-                       :warnings           {:fn-deprecated false}
-                       :closure-defines    {re-frame.trace/trace-enabled? true}
-                       :source-map         false
-                       ;; This seems to be necessary while using the REPL,
-                       ;; otherwise sometimes you'll get weird errors when
-                       ;; instrumenting functions.
-                       :static-fns         false
-                       :infer-externs      true
-                       :reader-features    #{:mobile}}
-    ;; if you want to use a real device, set your local ip
-    ;; in the SHADOW_HOST env variable to make sure that
-    ;; it will use the right interface
-    :local-ip #shadow/env "SHADOW_HOST"}
+   :dev {:devtools {:before-load-async status-im.setup.hot-reload/before-reload
+                    :after-load-async  status-im.setup.hot-reload/reload
+                    :build-notify      status-im.setup.hot-reload/build-notify
+                    :preloads          [;; The official recommendation is to
+                                        ;; load the debugger preload first.
+                                        flow-storm.api
+                                        re-frisk-remote.preload
+                                        status-im.setup.schema-preload
+                                        ;; In order to use component test helpers in the REPL we
+                                        ;; need to preload namespaces that are not normally required
+                                        ;; by production code, such as
+                                        ;; @testing-library/react-native.
+                                        test-helpers.component]}
+         :closure-defines
+         {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
+          status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
+          status-im.config/STATUS_BUILD_PROXY_USER        #shadow/env "STATUS_BUILD_PROXY_USER"
+          status-im.config/STATUS_BUILD_PROXY_PASSWORD    #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
+          status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
+          status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
+          status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
+          status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
+          status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
+          status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
+          status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
+          status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
+          status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
+          status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
+          status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+         :compiler-options {:output-feature-set :es5
+                            ;; We disable `:fn-deprecated` warnings because we
+                            ;; are managing deprecation via clj-kondo and we
+                            ;; don't want the terminal output to be littered
+                            ;; with warnings on every code reload.
+                            :warnings           {:fn-deprecated false}
+                            :closure-defines    {re-frame.trace/trace-enabled? true}
+                            :source-map         false
+                            ;; This seems to be necessary while using the REPL,
+                            ;; otherwise sometimes you'll get weird errors when
+                            ;; instrumenting functions.
+                            :static-fns         false
+                            :infer-externs      true
+                            :reader-features    #{:mobile}}
+         ;; if you want to use a real device, set your local ip
+         ;; in the SHADOW_HOST env variable to make sure that
+         ;; it will use the right interface
+         :local-ip #shadow/env "SHADOW_HOST"}
   :chunks {:fleets legacy.status-im.fleet.default-fleet/default-fleets}
   :release
   {:closure-defines
@@ -118,13 +111,10 @@
     status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
     status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
     status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
    :compiler-options {:output-feature-set :es6
                       ;;disable for android build as there
@@ -162,13 +152,10 @@
    status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
    status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
    status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
    status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
    status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
    status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
    status-im.config/WALLET_CONNECT_PROJECT_ID      #shadow/env "WALLET_CONNECT_PROJECT_ID"}
   :compiler-options
@@ -3,8 +3,7 @@
    ["react-native" :as rn]
    ["react-native-status-keycard" :default status-keycard]
    [react-native.platform :as platform]
-    [taoensso.timbre :as log]
-    [utils.address :as address]))
+    [taoensso.timbre :as log]))

 (defonce event-emitter
  (if platform/ios?
@@ -94,22 +93,14 @@
  [{:keys [on-success on-failure]}]
  (.. status-keycard
      (getApplicationInfo)
-      (then (fn [response]
-              (let [info (-> response
-                             (js->clj :keywordize-keys true)
-                             (update :key-uid address/normalized-hex))]
-                (on-success info))))
+      (then on-success)
      (catch on-failure)))

 (defn factory-reset
  [{:keys [on-success on-failure]}]
  (.. status-keycard
      (factoryReset)
-      (then (fn [response]
-              (let [info (-> response
-                             (js->clj :keywordize-keys true)
-                             (update :key-uid address/normalized-hex))]
-                (on-success info))))
+      (then on-success)
      (catch on-failure)))

 (defn install-applet
@@ -155,6 +146,13 @@
      (then on-success)
      (catch on-failure)))

+(defn save-mnemonic
+  [{:keys [mnemonic pin on-success on-failure]}]
+  (.. status-keycard
+      (saveMnemonic mnemonic pin)
+      (then on-success)
+      (catch on-failure)))
+
 (defn unblock-pin
  [{:keys [puk new-pin on-success on-failure]}]
  (when (and new-pin puk)
@@ -20,9 +20,9 @@
   {:mainnet     {:name     "Ether"
                  :symbol   :ETH
                  :decimals 18}
-    :goerli      {:name           "Goerli Ether"
+    :sepolia     {:name           "Sepolia Ether"
                  :symbol         :ETH
-                  :symbol-display :ETHgo
+                  :symbol-display :ETH
                  :decimals       18}
    :xdai        {:name            "xDAI"
                  :symbol          :ETH
@@ -15,12 +15,12 @@

 (def etherscan-supported?
  #{(chain/chain-keyword->chain-id :mainnet)
-    (chain/chain-keyword->chain-id :goerli)})
+    (chain/chain-keyword->chain-id :sepolia)})

 (def binance-mainnet-chain-id (chain/chain-keyword->chain-id :bsc))
 (def binance-testnet-chain-id (chain/chain-keyword->chain-id :bsc-testnet))

-(def network->subdomain {5 "goerli"})
+(def network->subdomain {11155111 "sepolia"})

 (defn get-transaction-details-url
  [chain-id tx-hash]
@@ -508,17 +508,16 @@
                              new-password-hashed
                              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")
+(defn convert-to-keycard-profile
+  [{:keys [key-uid] :as profile} settings password new-password callback]
  (.convertToKeycardAccount ^js (encryption)
                            key-uid
-                            (types/clj->json multiaccount-data)
+                            (types/clj->json profile)
                            (types/clj->json settings)
-                            ""
-                            current-password#
+                            (:keycard-instance-uid settings)
+                            password
                            new-password
-                            callback))
+                            #(when callback (callback (types/json->clj %)))))

 (defn backup-disabled-data-dir
  []
@@ -3,12 +3,12 @@

 (def inner-container
  {:flex-direction  :row
-   :justify-content :center
+   :justify-content :space-between
   :flex            1})

 (def button-container
  {:padding-vertical 8
-   :width            77.75
+   :flex             1
   :justify-content  :center
   :align-items      :center})

@@ -16,7 +16,7 @@
  "
  [{:keys [holder-name locked?]}]
  (let [theme (quo.theme/use-theme)
-        label (if (boolean holder-name)
+        label (if holder-name
                (i18n/label :t/user-keycard {:name holder-name})
                (i18n/label :t/empty-keycard))]
    [rn/view {:style (style/card-container locked? theme)}
@@ -3,8 +3,10 @@
 (defn container
  [container-style]
  (merge container-style
-         {:flex-direction :row
-          :align-items    :flex-start}))
+         {:padding-vertical   7
+          :padding-horizontal 20
+          :flex-direction     :row
+          :align-items        :flex-start}))

 (def index
  {:margin-left 5})
@@ -45,7 +45,7 @@
    :or   {type :bullet}}]
  (let [theme (quo.theme/use-theme)]
    [rn/view {:style (style/container container-style)}
-     [rn/view {:style style/index}
+     [rn/view
      (case type
        :step
        [step/view
@@ -55,26 +55,36 @@
                                                     theme))}])]))

 (defn- left-title
-  [{:keys [title blur?]}]
+  [{:keys [title blur? title-icon]}]
  (let [theme (quo.theme/use-theme)]
    [rn/view {:style style/title-container}
     [text/text
      {:weight :regular
       :size   :paragraph-2
       :style  (style/title blur? theme)}
-      title]]))
+      title]
+     (when title-icon
+       [icons/icon title-icon
+        {:accessibility-label :title-icon
+         :size                12
+         :color               (if blur?
+                                colors/neutral-40
+                                (colors/theme-colors colors/neutral-50
+                                                     colors/neutral-40
+                                                     theme))}])]))

 (defn- left-side
  "The description can either be given as a string `subtitle-type` or a component `custom-subtitle`"
  [{:keys [title status size blur? custom-subtitle icon subtitle subtitle-type subtitle-color icon-color
-           customization-color network-image emoji]
+           customization-color network-image emoji title-icon]
    :as   props}]
  (let [theme (quo.theme/use-theme)]
    [rn/view {:style style/left-side}
-     [left-title
-      {:title title
-       :blur? blur?
-       :theme theme}]
+     [rn/view
+      [left-title
+       {:title      title
+        :title-icon title-icon
+        :blur?      blur?}]]
     (if (= status :loading)
       [left-loading
        {:size  size
@@ -132,6 +142,7 @@
      [:subtitle {:optional true} [:maybe [:or :string :double]]]
      [:custom-subtitle {:optional true} [:maybe fn?]]
      [:icon {:optional true} [:maybe :keyword]]
+      [:title-icon {:optional true} [:maybe :keyword]]
      [:emoji {:optional true} [:maybe :string]]
      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
      [:network-image {:optional true} [:maybe :schema.common/image-source]]
@@ -59,12 +59,15 @@
    - :image-source - resource - image to display on :network, :collectible and :user
    - :theme - :light / :dark"
  [{:keys [label customization-color type container-style]
-    :as   props
-    :or   {customization-color colors/neutral-80-opa-5}}]
-  (let [theme (quo.theme/use-theme)]
+    :as   props}]
+  (let [theme         (quo.theme/use-theme)
+        default-color (if (= theme :light)
+                        colors/neutral-80-opa-5
+                        colors/white-opa-5)
+        color         (or customization-color default-color)]
    [rn/view
     {:accessibility-label :container
-      :style               (merge (style/main (assoc props :customization-color customization-color)
+      :style               (merge (style/main (assoc props :customization-color color)
                                              theme)
                                  container-style)}
     [left-view props]
@@ -8,8 +8,7 @@

 (def header
  {:flex-direction  :row
-   :justify-content :space-between
-   :height          32})
+   :justify-content :space-between})

 (def header-title
  {:flex           1
@@ -59,7 +59,6 @@
  [rn/view {:style (merge style/container container-style)}
   [text/text
    {:size                :heading-1
-     :number-of-lines     1
     :weight              :semi-bold
     :style               style/text
     :accessibility-label accessibility-label}
@@ -7,8 +7,7 @@
   :margin-bottom     8})

 (def item-text
-  {:margin-top  10
-   :margin-left -4})
+  {:margin-left -24})

 (def info-text
  {:margin-top -5})
@@ -22,6 +22,11 @@
   :qr-code                       (js/require "../resources/images/ui2/qr-code.png")
   :keycard-logo                  (js/require "../resources/images/ui2/keycard-logo.png")
   :keycard-watermark             (js/require "../resources/images/ui2/keycard-watermark.png")
+   :keycard-buy                   (js/require "../resources/images/ui2/keycard-buy.png")
+   :keycard-migration             (js/require "../resources/images/ui2/keycard-migration.png")
+   :keycard-migration-failed      (js/require "../resources/images/ui2/keycard-migration-failed.png")
+   :keycard-migration-succeeded   (js/require "../resources/images/ui2/keycard-migration-succeeded.png")
+   :not-keycard                   (js/require "../resources/images/ui2/not-keycard.png")
   :discover                      (js/require "../resources/images/ui2/discover.png")
   :invite-friends                (js/require "../resources/images/ui2/invite-friends.png")
   :transaction-progress          (js/require "../resources/images/ui2/transaction-progress.png")
@@ -1,9 +1,10 @@
 (ns status-im.common.standard-authentication.enter-password.view
  (:require
+    [clojure.string :as string]
    [quo.core :as quo]
    [react-native.core :as rn]
+    [status-im.common.standard-authentication.core :as standard-authentication]
    [status-im.common.standard-authentication.enter-password.style :as style]
-    [status-im.common.standard-authentication.password-input.view :as password-input]
    [status-im.contexts.profile.utils :as profile.utils]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -31,11 +32,12 @@
          :full-name           (profile.utils/displayed-name profile)
          :customization-color customization-color
          :size                24}]]
-       [password-input/view
+       [standard-authentication/password-input
        {:on-press-biometrics on-press-biometrics
         :blur?               true
         :processing          processing
-         :error               error
+         :error               {:error?        (not (string/blank? error))
+                               :error-message error}
         :default-password    password
         :sign-in-enabled?    sign-in-enabled?}]
       [quo/button
@@ -1,6 +1,5 @@
 (ns status-im.common.standard-authentication.password-input.view
  (:require
-    [clojure.string :as string]
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
@@ -12,14 +11,6 @@
    [utils.re-frame :as rf]
    [utils.security.core :as security]))

-(defn- get-error-message
-  [error]
-  (if (and (some? error)
-           (or (= error "file is not a database")
-               (string/starts-with? (string/lower-case error) "failed")))
-    (i18n/label :t/oops-wrong-password)
-    error))
-
 (defn- error-info
  [error-message processing shell?]
  (let [theme    (quo.theme/use-theme)
@@ -49,21 +40,21 @@
       (i18n/label :t/forgot-password)]]]))

 (defn view
-  [{:keys [shell? on-press-biometrics blur?]}]
-  (let [{:keys [error processing]} (rf/sub [:profile/login])
-        error-message              (rn/use-memo #(get-error-message error) [error])
-        error?                     (boolean (seq error-message))
-        default-value              (rn/use-ref-atom "") ;;bug on Android
-                                                        ;;https://github.com/status-im/status-mobile/issues/19004
-        theme                      (quo.theme/use-theme)
-        on-change-password         (rn/use-callback
-                                    (fn [entered-password]
-                                      (reset! default-value entered-password)
-                                      (debounce/debounce-and-dispatch [:profile/on-password-input-changed
-                                                                       {:password (security/mask-data
-                                                                                   entered-password)
-                                                                        :error    ""}]
-                                                                      100)))]
+  [{:keys [shell? on-press-biometrics blur? processing error]}]
+  (let [{:keys [error?
+                error-message]} error
+        default-value           (rn/use-ref-atom "") ;;bug on Android
+                                                     ;;https://github.com/status-im/status-mobile/issues/19004
+        theme                   (quo.theme/use-theme)
+        on-change-password      (rn/use-callback
+                                 (fn [entered-password]
+                                   (reset! default-value entered-password)
+                                   (debounce/debounce-and-dispatch
+                                    [:profile/on-password-input-changed
+                                     {:password (security/mask-data
+                                                 entered-password)
+                                      :error    ""}]
+                                    100)))]
    [:<>
     [rn/view {:style {:flex-direction :row}}
      [quo/input
@@ -18,28 +18,23 @@
 (goog-define RARIBLE_MAINNET_API_KEY "")
 (goog-define RARIBLE_TESTNET_API_KEY "")
 (goog-define ALCHEMY_ETHEREUM_MAINNET_TOKEN "")
-(goog-define ALCHEMY_ETHEREUM_GOERLI_TOKEN "")
 (goog-define ALCHEMY_ETHEREUM_SEPOLIA_TOKEN "")
 (goog-define ALCHEMY_ARBITRUM_MAINNET_TOKEN "")
-(goog-define ALCHEMY_ARBITRUM_GOERLI_TOKEN "")
 (goog-define ALCHEMY_ARBITRUM_SEPOLIA_TOKEN "")
 (goog-define ALCHEMY_OPTIMISM_MAINNET_TOKEN "")
-(goog-define ALCHEMY_OPTIMISM_GOERLI_TOKEN "")
 (goog-define ALCHEMY_OPTIMISM_SEPOLIA_TOKEN "")
 (goog-define WALLET_CONNECT_PROJECT_ID "87815d72a81d739d2a7ce15c2cfdefb3")
 (goog-define MIXPANEL_APP_ID "3350627")
 (goog-define MIXPANEL_TOKEN "5c73bda2d36a9f688a5ee45641fb6775")

 (def mainnet-rpc-url (str "https://eth-archival.rpc.grove.city/v1/" POKT_TOKEN))
-(def goerli-rpc-url (str "https://goerli-archival.gateway.pokt.network/v1/lb/" POKT_TOKEN))
+(def sepolia-rpc-url (str "https://sepolia-archival.rpc.grove.city/v1/" POKT_TOKEN))
 (def mainnet-chain-explorer-link "https://etherscan.io/address/")
 (def optimism-mainnet-chain-explorer-link "https://optimistic.etherscan.io/address/")
 (def arbitrum-mainnet-chain-explorer-link "https://arbiscan.io/address/")
 (def sepolia-chain-explorer-link "https://sepolia.etherscan.io/address/")
 (def optimism-sepolia-chain-explorer-link "https://sepolia-optimistic.etherscan.io/address/")
 (def arbitrum-sepolia-chain-explorer-link "https://sepolia.arbiscan.io/address/")
-(def goerli-chain-explorer-link "https://goerli.etherscan.io/address/")
-(def optimism-goerli-chain-explorer-link "https://goerli-optimistic.etherscan.io/address/")
 (def opensea-link "https://opensea.io")
 (def opensea-tesnet-link "https://testnets.opensea.io")

@@ -79,7 +74,6 @@
 (def log-request-go (enabled? (get-config :LOG_REQUEST_GO "0")))
 (def fleet (get-config :FLEET ""))
 (def apn-topic (get-config :APN_TOPIC "im.status.ethereum"))
-(def default-network (get-config :DEFAULT_NETWORK "goerli_rpc"))
 (def max-installations 2)
 ; currently not supported in status-go
 (def enable-remove-profile-picture? false)
@@ -100,13 +94,13 @@
 (def verify-transaction-url
  (if (= :mainnet (chain/chain-id->chain-keyword verify-transaction-chain-id))
    mainnet-rpc-url
-    goerli-rpc-url))
+    sepolia-rpc-url))

 (def verify-ens-chain-id (js/parseInt (get-config :VERIFY_ENS_CHAIN_ID "1")))
 (def verify-ens-url
  (if (= :mainnet (chain/chain-id->chain-keyword verify-ens-chain-id))
    mainnet-rpc-url
-    goerli-rpc-url))
+    sepolia-rpc-url))
 (def verify-ens-contract-address
  (get-config :VERIFY_ENS_CONTRACT_ADDRESS
              ((chain/chain-id->chain-keyword verify-ens-chain-id) utils.ens/ens-registries)))
@@ -134,14 +128,3 @@
 ;; Alert banners are disabled for debug builds because alert banners overlay
 ;; interfere with react-native debug tools, such as inspector and Perf monitor
 (def enable-alert-banner? (enabled? (get-config :ENABLE_ALERT_BANNER "0")))
-
-;; enable using status backend server or not, otherwise it will use built-in status-go library
-;; see doc/use-status-backend-server.md for more details
-(goog-define STATUS_BACKEND_SERVER_ENABLED "0")
-;; The host should contain an IP address and a port separated by a colon. 
-;; The port comes from your running status backend server. 
-;; If you run it by PORT=60000 make run-status-backend , then host will likely be 127.0.0.1:60000
-(goog-define STATUS_BACKEND_SERVER_HOST "")
-;; /path/to/root/data/dir
-;; make sure it exists, it should be in absolute path
-(goog-define STATUS_BACKEND_SERVER_ROOT_DATA_DIR "")
@@ -295,6 +295,8 @@

 (def ^:const token-sort-priority {"SNT" 1 "STT" 1 "ETH" 2 "DAI" 3})

+(def ^:const token-display-precision 6)
+
 (def ^:const dapp-permission-contact-code "contact-code")
 (def ^:const dapp-permission-web3 "web3")
 (def ^:const dapp-permission-qr-code "qr-code")
@@ -473,30 +475,22 @@

 ;; wallet
 (def ^:const ethereum-mainnet-chain-id 1)
-(def ^:const ethereum-goerli-chain-id 5)
 (def ^:const ethereum-sepolia-chain-id 11155111)
 (def ^:const arbitrum-mainnet-chain-id 42161)
-(def ^:const arbitrum-goerli-chain-id 421613)
 (def ^:const arbitrum-sepolia-chain-id 421614)
 (def ^:const optimism-mainnet-chain-id 10)
-(def ^:const optimism-goerli-chain-id 420)
 (def ^:const optimism-sepolia-chain-id 11155420)

 (def opensea-url-names
  {:ethereum "ethereum"
-   :sepolia  "sepolia"
-   :goerli   "goerli"})
+   :sepolia  "sepolia"})

 (def ^:const ethereum "ethereum")
 (def ^:const sepolia "sepolia")
-(def ^:const goerli "goerli")

 (def ^:const mainnet-chain-ids
  #{ethereum-mainnet-chain-id arbitrum-mainnet-chain-id optimism-mainnet-chain-id})

-(def ^:const goerli-chain-ids
-  #{ethereum-goerli-chain-id arbitrum-goerli-chain-id optimism-goerli-chain-id})
-
 (def ^:const sepolia-chain-ids
  #{ethereum-sepolia-chain-id arbitrum-sepolia-chain-id optimism-sepolia-chain-id})

@@ -516,7 +510,6 @@
 (def ^:const arbitrum-full-name "Arbitrum")

 (def ^:const sepolia-full-name "Sepolia")
-(def ^:const goerli-full-name "Goerli")

 (def ^:const mainnet-network-name :mainnet)
 (def ^:const ethereum-network-name :ethereum)
@@ -580,13 +573,14 @@
 (def ^:const sheet-screen-handle-height 20)

 (def ^:const status-hostname "status.app")
+(def ^:const get-keycard-url "https://get.keycard.tech/")

 (def ^:const community-joined-notification-type "communityJoined")

 (def ^:const default-telemetry-server-url "https://telemetry.status.im")

 (def ^:const contact-item-height 56)
-
+(def ^:const page-nav-height 56)
 (def ^:const currency-item-height 64)

 (def ^:const slippages [0.1 0.5 1])
@@ -4,20 +4,18 @@
            [status-im.common.events-helper :as events-helper]
            [status-im.common.standard-authentication.core :as standard-auth]
            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]
-            [utils.security.core :as security]))
+            [utils.re-frame :as rf]))

 (defn view
  []
-  (let [profile-name        (rf/sub [:profile/name])
-        profile-picture     (rf/sub [:profile/image])
-        customization-color (rf/sub [:profile/customization-color])]
+  (let [profile-name         (rf/sub [:profile/name])
+        profile-picture      (rf/sub [:profile/image])
+        customization-color  (rf/sub [:profile/customization-color])
+        {:keys [on-success]} (rf/sub [:get-screen-params])]
    [:<>
     [quo/page-nav
-      {:key        :header
-       :background :blur
-       :icon-name  :i/close
-       :on-press   events-helper/navigate-back}]
+      {:icon-name :i/close
+       :on-press  events-helper/navigate-back}]
     [quo/page-top
      {:title       (i18n/label :t/authorise-with-password)
       :description :context-tag
@@ -31,5 +29,5 @@
        :container-style     {}
        :customization-color customization-color
        :track-text          (i18n/label :t/slide-to-authorise)
-        :on-auth-success     #(println "TBD" (security/safe-unmask-data %))
+        :on-auth-success     #(when on-success (on-success %))
        :auth-button-label   (i18n/label :t/confirm)}]]]))
@@ -10,10 +10,8 @@
  []
  [:<>
   [quo/page-nav
-    {:key        :header
-     :background :blur
-     :icon-name  :i/arrow-left
-     :on-press   events-helper/navigate-back}]
+    {:icon-name :i/arrow-left
+     :on-press  events-helper/navigate-back}]
   [quo/page-top
    {:title            (i18n/label :t/check-keycard)
     :description      :text
@@ -23,14 +21,9 @@
     {:resize-mode :contain
      :source      (resources/get-image :check-your-keycard)}]]
   [quo/divider-label (i18n/label :t/tips-scan-keycard)]
-   [rn/view {:style {:padding-horizontal 10}}
-    [quo/markdown-list
-     {:container-style {:padding-vertical 10}
-      :description     (i18n/label :t/remove-phone-case)}]
-    [quo/markdown-list
-     {:container-style {:padding-bottom 25}
-      :description     (i18n/label :t/keep-card-steady)}]]
-   [quo/button
-    {:on-press        #(rf/dispatch [:keycard/connect])
-     :container-style {:margin-horizontal 20}}
-    (i18n/label :t/ready-to-scan)]])
+   [quo/markdown-list {:description (i18n/label :t/remove-phone-case)}]
+   [quo/markdown-list {:description (i18n/label :t/keep-card-steady)}]
+   [quo/bottom-actions
+    {:actions          :one-action
+     :button-one-label (i18n/label :t/ready-to-scan)
+     :button-one-props {:on-press #(rf/dispatch [:keycard/migration.check-empty-card])}}]])
@@ -3,10 +3,10 @@
            [native-module.core :as native-module]
            [react-native.async-storage :as async-storage]
            [react-native.platform :as platform]
+            status-im.contexts.keycard.nfc.effects
+            [status-im.contexts.keycard.utils :as keycard.utils]
            [status-im.contexts.profile.config :as profile.config]
-            [taoensso.timbre :as log]
-            [utils.re-frame :as rf]
-            [utils.transforms :as transforms]))
+            [utils.re-frame :as rf]))

 (defonce ^:private active-listeners (atom []))

@@ -32,106 +32,45 @@
 (rf/reg-fx :effects.keycard/register-card-events register-card-events)
 (rf/reg-fx :effects.keycard/unregister-card-events unregister-card-events)

-(defn check-nfc-enabled
-  []
-  (log/debug "[keycard] check-nfc-enabled")
-  (keycard/check-nfc-enabled
-   {:on-success
-    (fn [response]
-      (log/debug "[keycard response] check-nfc-enabled")
-      (rf/dispatch [:keycard/on-check-nfc-enabled-success response]))}))
-(rf/reg-fx :effects.keycard/check-nfc-enabled check-nfc-enabled)
+(rf/reg-fx :effects.keycard/get-application-info
+ (fn [args]
+   (keycard/get-application-info (keycard.utils/wrap-handlers args))))
+
+(rf/reg-fx :effects.keycard/get-keys
+ (fn [args]
+   (keycard/get-keys (keycard.utils/wrap-handlers args))))
+
+(rf/reg-fx :effects.keycard/sign
+ (fn [args]
+   (keycard/sign (keycard.utils/wrap-handlers args))))
+
+(rf/reg-fx :keycard/init-card
+ (fn [args]
+   (keycard/init-card (keycard.utils/wrap-handlers args))))
+
+(rf/reg-fx :effects.keycard/generate-and-load-key
+ (fn [args]
+   (keycard/generate-and-load-key (keycard.utils/wrap-handlers args))))
+
+(rf/reg-fx :effects.keycard/login-with-keycard
+ (fn [{:keys [key-uid password whisper-private-key]}]
+   (native-module/login-account
+    (assoc (profile.config/login)
+           :keyUid                   key-uid
+           :password                 password
+           :keycardWhisperPrivateKey whisper-private-key))))
+
+(rf/reg-fx :effects.keycard/set-pairing-to-keycard
+ (fn [pairings]
+   (keycard/set-pairings pairings)))

 (rf/reg-fx
- :effects.keycard.ios/start-nfc
- (fn [args]
-   (log/debug "fx start-nfc")
-   (keycard/start-nfc args)))
+ :keycard/persist-pairings
+ (fn [pairings]
+   (async-storage/set-item! "status-keycard-pairings" pairings)))

-(rf/reg-fx
- :effects.keycard.ios/stop-nfc
- (fn [args]
-   (log/debug "fx stop-nfc")
-   (keycard/stop-nfc args)))
-
-(defn- error-object->map
-  [^js object]
-  {:code  (.-code object)
-   :error (.-message object)})
-
-(defn get-application-info
-  [{:keys [on-success on-failure] :as args}]
-  (log/debug "[keycard] get-application-info")
-  (keycard/get-application-info
-   (assoc
-    args
-    :on-success
-    (fn [response]
-      (log/debug "[keycard response succ] get-application-info")
-      (when on-success
-        (on-success response)))
-    :on-failure
-    (fn [response]
-      (log/error "[keycard response fail] get-application-info")
-      (when on-failure
-        (on-failure (error-object->map response)))))))
-(rf/reg-fx :effects.keycard/get-application-info get-application-info)
-
-(defn get-keys
-  [{:keys [on-success on-failure] :as args}]
-  (log/debug "[keycard] get-keys")
-  (keycard/get-keys
-   (assoc
-    args
-    :on-success
-    (fn [response]
-      (log/debug "[keycard response succ] get-keys")
-      (when on-success
-        (on-success (transforms/js->clj response))))
-    :on-failure
-    (fn [response]
-      (log/warn "[keycard response fail] get-keys"
-                (error-object->map response))
-      (when on-failure
-        (on-failure (error-object->map response)))))))
-(rf/reg-fx :effects.keycard/get-keys get-keys)
-
-(defn login
-  [{:keys [key-uid password whisper-private-key]}]
-  (native-module/login-account
-   (assoc (profile.config/login)
-          :keyUid                   key-uid
-          :password                 password
-          :keycardWhisperPrivateKey whisper-private-key)))
-(rf/reg-fx :effects.keycard/login-with-keycard login)
-
-(defn retrieve-pairings
-  []
-  (async-storage/get-item
-   "status-keycard-pairings"
-   #(rf/dispatch [:keycard/on-retrieve-pairings-success %])))
-(rf/reg-fx :effects.keycard/retrieve-pairings retrieve-pairings)
-
-(defn set-pairing-to-keycard
-  [pairings]
-  (keycard/set-pairings pairings))
-(rf/reg-fx :effects.keycard/set-pairing-to-keycard set-pairing-to-keycard)
-
-(defn sign
-  [{:keys [on-success on-failure] :as args}]
-  (log/debug "[keycard] sign")
-  (keycard/sign
-   (assoc
-    args
-    :on-success
-    (fn [response]
-      (log/debug "[keycard response succ] sign")
-      (when on-success
-        (on-success (transforms/js->clj response))))
-    :on-failure
-    (fn [response]
-      (log/warn "[keycard response fail] sign"
-                (error-object->map response))
-      (when on-failure
-        (on-failure (error-object->map response)))))))
-(rf/reg-fx :effects.keycard/sign sign)
+(rf/reg-fx :effects.keycard/retrieve-pairings
+ (fn []
+   (async-storage/get-item
+    "status-keycard-pairings"
+    #(rf/dispatch [:keycard/on-retrieve-pairings-success %]))))
@@ -3,7 +3,7 @@
            [react-native.core :as rn]
            [status-im.common.events-helper :as events-helper]
            [status-im.common.resources :as resources]
-            [status-im.contexts.keycard.sheets.migrate.view :as sheets.migrate]
+            [status-im.contexts.keycard.migrate.sheets.view :as sheets.migrate]
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

@@ -11,10 +11,8 @@
  []
  [:<>
   [quo/page-nav
-    {:key        :header
-     :background :blur
-     :icon-name  :i/arrow-left
-     :on-press   events-helper/navigate-back}]
+    {:icon-name :i/close
+     :on-press  events-helper/navigate-back}]
   [quo/page-top
    {:title            (i18n/label :t/keycard-empty)
     :description      :text
@@ -26,10 +24,15 @@
      :subtitle            (i18n/label :t/use-keycard-login-sign)
      :button-label        (i18n/label :t/import-profile-key-pair)
      :accessibility-label :get-keycard
-      :image               (resources/get-image :generate-keys)
-      :on-press            #(rf/dispatch [:show-bottom-sheet
-                                          {:theme   :dark
-                                           :content (fn [] [sheets.migrate/view])}])}]]
+      :image               (resources/get-image :keycard-buy)
+      :on-press            (fn []
+                             (rf/dispatch
+                              [:show-bottom-sheet
+                               {:theme   :dark
+                                :content (fn []
+                                           [sheets.migrate/view
+                                            {:on-continue #(rf/dispatch
+                                                            [:keycard/migration.get-phrase])}])}]))}]]
   [quo/information-box
    {:type  :default
     :style {:margin-top 32 :margin-horizontal 28}}
@@ -1,42 +1,37 @@
 (ns status-im.contexts.keycard.error.view
  (:require [quo.core :as quo]
            [react-native.core :as rn]
-            [react-native.safe-area :as safe-area]
            [status-im.common.events-helper :as events-helper]
+            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

 (def titles
-  {:keycard/error.keycard-wrong    {:title       "Keycard is not empty"
-                                    :description "You can’t use it to store new keys right now"}
-   :keycard/error.keycard-unpaired {:title       "Keycard is full"
-                                    :description "All pairing slots are occupied"}
-   :keycard/error.keycard-frozen   {:title       "Keycard is locked"
-                                    :description "You can’t use it right now"}
-   :keycard/error.keycard-locked   {:title       "Keycard is locked"
-                                    :description "You can’t use it right now"}})
+  {:keycard/error.keycard-blank         {:title       (i18n/label :t/keycard-empty)
+                                         :description (i18n/label :t/no-key-pair-keycard)}
+   :keycard/error.keycard-wrong-profile {:title       (i18n/label :t/keycard-not-empty)
+                                         :description (i18n/label :t/cant-store-new-keys)}
+   :keycard/error.keycard-unpaired      {:title       (i18n/label :t/keycard-full)
+                                         :description (i18n/label :t/pairing-slots-occupied)}
+   :keycard/error.keycard-frozen        {:title       (i18n/label :t/keycard-locked)
+                                         :description (i18n/label :t/cant-use-right-now)}
+   :keycard/error.keycard-locked        {:title       (i18n/label :t/keycard-locked)
+                                         :description (i18n/label :t/cant-use-right-now)}})

 (defn view
  []
-  (let [{:keys [top bottom]}        (safe-area/get-insets)
-        error                       (rf/sub [:keycard/application-info-error])
+  (let [error                       (rf/sub [:keycard/application-info-error])
        {:keys [title description]} (get titles error)]
-    [quo/overlay
-     {:type            :shell
-      :container-style {:padding-top    top
-                        :padding-bottom bottom}}
+    [:<>
     [quo/page-nav
-      {:key        :header
-       :background :blur
-       :icon-name  :i/arrow-left
-       :on-press   events-helper/navigate-back}]
+      {:icon-name :i/close
+       :on-press  events-helper/navigate-back}]
     [quo/page-top
      {:title            title
       :description      :text
       :description-text description}]
-     [rn/view {:height 226}]
-     [rn/view {:padding-horizontal 20}
-      [quo/info-message
-       {:container-style {:padding-top 15}
-        :icon            :i/info
-        :size            :default}
-       "To unlock or factory reset the Keycard, please use the Status desktop app. If you'd like this features on mobile, feel free to upvote them and discuss in the Status community."]]]))
+     [rn/view {:style {:margin-horizontal 20}}
+      [quo/keycard {:holder-name ""}]
+      [quo/information-box
+       {:type  :default
+        :style {:margin-top 20}}
+       (i18n/label :t/unlock-reset-instructions)]]]))
@@ -1,116 +1,117 @@
 (ns status-im.contexts.keycard.events
  (:require [re-frame.core :as rf]
            status-im.contexts.keycard.login.events
-            status-im.contexts.keycard.nfc-sheet.events
+            status-im.contexts.keycard.migrate.events
+            status-im.contexts.keycard.migrate.re-encrypting.events
+            status-im.contexts.keycard.nfc.events
+            status-im.contexts.keycard.nfc.sheets.events
            status-im.contexts.keycard.pin.events
            status-im.contexts.keycard.sign.events
            [status-im.contexts.keycard.utils :as keycard.utils]
-            [taoensso.timbre :as log]))
-
-(rf/reg-event-fx :keycard/on-check-nfc-enabled-success
- (fn [{:keys [db]} [nfc-enabled?]]
-   {:db (assoc-in db [:keycard :nfc-enabled?] nfc-enabled?)}))
-
-(rf/reg-event-fx :keycard.ios/on-nfc-user-cancelled
- (fn [{:keys [db]}]
-   (log/debug "[keycard] nfc user cancelled")
-   {:db (-> db
-            (assoc-in [:keycard :pin :status] nil)
-            (assoc-in [:keycard :on-nfc-cancelled-event-vector] nil))
-    :fx [(when-let [on-nfc-cancelled-event-vector (get-in db [:keycard :on-nfc-cancelled-event-vector])]
-           [:dispatch on-nfc-cancelled-event-vector])]}))
+            utils.datetime))

 (rf/reg-event-fx :keycard/on-card-connected
 (fn [{:keys [db]} _]
-   (log/debug "[keycard] card globally connected")
   {:db (assoc-in db [:keycard :card-connected?] true)
    :fx [(when-let [event (get-in db [:keycard :on-card-connected-event-vector])]
           [:dispatch event])]}))

 (rf/reg-event-fx :keycard/on-card-disconnected
 (fn [{:keys [db]} _]
-   (log/debug "[keycard] card disconnected")
   {:db (assoc-in db [:keycard :card-connected?] false)
    :fx [(when-let [event (get-in db [:keycard :on-card-disconnected-event-vector])]
           [:dispatch event])]}))

-(rf/reg-event-fx :keycard.ios/start-nfc
- (fn [_]
-   {:effects.keycard.ios/start-nfc nil}))
-
-(rf/reg-event-fx :keycard.ios/on-nfc-timeout
- (fn [{:keys [db]} _]
-   (log/debug "[keycard] nfc timeout")
-   {:db (assoc-in db [:keycard :card-connected?] false)
-    :fx [[:dispatch-later [{:ms 500 :dispatch [:keycard.ios/start-nfc]}]]]}))
-
 (rf/reg-event-fx :keycard/on-retrieve-pairings-success
 (fn [{:keys [db]} [pairings]]
   {:db (assoc-in db [:keycard :pairings] pairings)
    :fx [[:effects.keycard/set-pairing-to-keycard pairings]]}))

-(rf/reg-event-fx :keycard.ios/on-start-nfc-success
- (fn [{:keys [db]} [{:keys [on-cancel-event-vector]}]]
-   (log/debug "[keycard] nfc started success")
-   {:db (assoc-in db [:keycard :on-nfc-cancelled-event-vector] on-cancel-event-vector)}))
+(rf/reg-event-fx :keycard/update-pairings
+ (fn [{:keys [db]} [instance-uid pairing]]
+   (let [pairings     (get-in db [:keycard :pairings])
+         new-pairings (assoc pairings
+                             instance-uid
+                             {:pairing   pairing
+                              :paired-on (utils.datetime/timestamp)})]
+     {:db                       (assoc-in db [:keycard :pairings] new-pairings)
+      :keycard/persist-pairings new-pairings})))

 (rf/reg-event-fx :keycard/on-action-with-pin-error
 (fn [{:keys [db]} [error]]
-   (log/debug "[keycard] on-action-with-pin-error: " error)
   (let [tag-was-lost?     (keycard.utils/tag-lost? (:error error))
         pin-retries-count (keycard.utils/pin-retries (:error error))]
-     (if tag-was-lost?
+     (if (or tag-was-lost? (nil? pin-retries-count))
       {:db (assoc-in db [:keycard :pin :status] nil)}
-       (if (nil? pin-retries-count)
-         {:effects.utils/show-popup {:title "wrong-keycard"}}
-         {:db (-> db
-                  (assoc-in [:keycard :application-info :pin-retry-counter] pin-retries-count)
-                  (assoc-in [:keycard :pin :status] :error))
-          :fx [[:dispatch [:keycard/disconnect]]
-               (when (zero? pin-retries-count)
-                 [:effects.utils/show-popup {:title "frozen-keycard"}])]})))))
-
-(rf/reg-event-fx :keycard/on-get-application-info-success
- (fn [{:keys [db]} [application-info {:keys [key-uid on-success-fx]}]]
-   (if-let [error (keycard.utils/validate-application-info key-uid application-info)]
-     (case error
-       :keycard/error.not-keycard
-       {:fx [[:dispatch [:keycard/disconnect]]
-             [:dispatch [:open-modal :screen/keycard.not-keycard]]]}
-       :keycard/error.keycard-blank
-       {:fx [[:dispatch [:keycard/disconnect]]
-             [:dispatch [:open-modal :screen/keycard.empty]]]}
-       {:db (assoc-in db [:keycard :application-info-error] error)
+       {:db (-> db
+                (assoc-in [:keycard :application-info :pin-retry-counter] pin-retries-count)
+                (assoc-in [:keycard :pin :status] :error))
        :fx [[:dispatch [:keycard/disconnect]]
-             [:dispatch [:open-modal :screen/keycard.error]]]})
-     {:db (-> db
-              (assoc-in [:keycard :application-info] application-info)
-              (assoc-in [:keycard :pin :status] :verifying))
-      :fx on-success-fx})))
+             (when (zero? pin-retries-count)
+               [:dispatch
+                [:keycard/on-application-info-error
+                 :keycard/error.keycard-locked]])]}))))

-(rf/reg-event-fx :keycard/get-application-info
- (fn [_ [{:keys [on-success on-failure]}]]
-   {:effects.keycard/get-application-info {:on-success on-success :on-failure on-failure}}))
+(rf/reg-event-fx :keycard/get-keys
+ (fn [_ [data]]
+   {:effects.keycard/get-keys data}))

 (rf/reg-event-fx :keycard/cancel-connection
 (fn [{:keys [db]}]
-   {:db (-> db
-            (assoc-in [:keycard :on-card-connected-event-vector] nil)
-            (assoc-in [:keycard :on-nfc-cancelled-event-vector] nil))}))
+   {:db (update db :keycard dissoc :on-card-connected-event-vector :on-nfc-cancelled-event-vector)}))

 (rf/reg-event-fx :keycard/disconnect
 (fn [_ _]
   {:fx [[:dispatch [:keycard/cancel-connection]]
         [:dispatch [:keycard/hide-connection-sheet]]]}))

+(rf/reg-event-fx :keycard/on-application-info-error
+ (fn [{:keys [db]} [error]]
+   {:db (assoc-in db [:keycard :application-info-error] error)
+    :fx [[:dispatch [:keycard/disconnect]]
+         [:dispatch
+          [:open-modal
+           (if (= :keycard/error.not-keycard error)
+             :screen/keycard.not-keycard
+             :screen/keycard.error)]]]}))
+
+(rf/reg-event-fx :keycard/update-application-info
+ (fn [{:keys [db]} [app-info]]
+   {:db (update db
+                :keycard
+                #(-> %
+                     (assoc :application-info app-info)
+                     (dissoc :application-info-error)))}))
+
+(rf/reg-event-fx :keycard/get-application-info
+ (fn [_ [{:keys [key-uid on-success on-error]}]]
+   {:effects.keycard/get-application-info
+    {:on-success (fn [{:keys [instance-uid new-pairing] :as app-info}]
+                   (rf/dispatch [:keycard/update-application-info app-info])
+                   (when (and instance-uid new-pairing)
+                     (rf/dispatch [:keycard/update-pairings instance-uid new-pairing]))
+                   (if-let [error (keycard.utils/validate-application-info key-uid app-info)]
+                     (if on-error
+                       (on-error error)
+                       (rf/dispatch [:keycard/on-application-info-error error]))
+                     (when on-success (on-success app-info))))
+     :on-error   (fn []
+                   (if on-error
+                     (on-error :keycard/error.not-keycard)
+                     (rf/dispatch [:keycard/on-application-info-error
+                                   :keycard/error.not-keycard])))}}))
+
 (rf/reg-event-fx :keycard/connect
- (fn [{:keys [db]} [args]]
-   (let [connected?   (get-in db [:keycard :card-connected?])
-         event-vector [:keycard/get-application-info
-                       {:on-success #(rf/dispatch [:keycard/on-get-application-info-success % args])}]]
+ (fn [{:keys [db]} [{:keys [key-uid on-success on-error on-connect-event-vector]}]]
+   (let [event-vector
+         (or on-connect-event-vector
+             [:keycard/get-application-info
+              {:key-uid    key-uid
+               :on-success on-success
+               :on-error   on-error}])]
     {:db (assoc-in db [:keycard :on-card-connected-event-vector] event-vector)
      :fx [[:dispatch
            [:keycard/show-connection-sheet
             {:on-cancel-event-vector [:keycard/cancel-connection]}]]
-           (when connected?
+           (when (get-in db [:keycard :card-connected?])
             [:dispatch event-vector])]})))
@@ -5,7 +5,6 @@
 (fn [{:keys [db]} [data]]
   (let [{:keys [key-uid encryption-public-key
                 whisper-private-key]} data
-         key-uid                       (str "0x" key-uid)
         profile                       (get-in db [:profile/profiles-overview key-uid])]
     {:db
      (-> db
@@ -0,0 +1,132 @@
+(ns status-im.contexts.keycard.migrate.events
+  (:require [clojure.string :as string]
+            [status-im.contexts.keycard.pin.view :as keycard.pin]
+            [utils.re-frame :as rf]
+            [utils.security.core :as security]))
+
+(rf/reg-event-fx :keycard/migration.check-empty-card
+ (fn [{:keys [db]}]
+   {:fx [[:dispatch
+          [:keycard/connect
+           {:key-uid (get-in db [:profile/profile :key-uid])
+            :on-success
+            (fn []
+              ;;TODO keys already on the keycard, new flow needs to be implemented
+              ;; https://github.com/status-im/status-mobile/issues/21446
+              (rf/dispatch [:keycard/disconnect])
+              (rf/dispatch [:open-modal :screen/keycard.authorise
+                            {:on-success
+                             #(rf/dispatch [:keycard/migration.authorisation-success %])}]))
+            :on-error
+            (fn [error]
+              (if (= error :keycard/error.keycard-blank)
+                (do
+                  (rf/dispatch [:keycard/disconnect])
+                  (rf/dispatch [:open-modal :screen/keycard.empty]))
+                (rf/dispatch [:keycard/on-application-info-error error])))}]]]}))
+
+(defn get-application-info-and-continue
+  [key-uid]
+  (rf/dispatch [:keycard/get-application-info
+                {:key-uid key-uid
+                 :on-success #(rf/dispatch [:keycard/migration.continue])
+                 :on-error
+                 (fn [error]
+                   (if (= error :keycard/error.keycard-blank)
+                     (rf/dispatch [:keycard/migration.continue])
+                     (rf/dispatch [:keycard/on-application-info-error error])))}]))
+
+(rf/reg-event-fx :keycard/migration.continue
+ (fn [{:keys [db]}]
+   (let [key-uid                                (get-in db [:profile/profile :key-uid])
+         {:keys [initialized? has-master-key?]} (get-in db [:keycard :application-info])
+         {:keys [masked-phrase pin]}            (get-in db [:keycard :migration])
+         on-failure                             (fn []
+                                                  (rf/dispatch [:keycard/disconnect])
+                                                  (rf/dispatch [:navigate-to
+                                                                :screen/keycard.migrate.fail]))]
+     (cond
+
+       (not initialized?)
+       {:fx [[:keycard/init-card
+              {:pin        pin
+               :on-success #(get-application-info-and-continue key-uid)
+               :on-failure on-failure}]]}
+
+       (not has-master-key?)
+       {:fx [[:effects.keycard/generate-and-load-key
+              {:mnemonic   (security/safe-unmask-data masked-phrase)
+               :pin        pin
+               :on-success #(get-application-info-and-continue key-uid)
+               :on-failure on-failure}]]}
+
+       :else
+       {:fx [[:effects.keycard/get-keys
+              {:pin        pin
+               :on-success #(rf/dispatch [:keycard/migration.convert-to-keycard-profile %])
+               :on-failure on-failure}]]}))))
+
+(rf/reg-event-fx :keycard/migration.start
+ (fn [{:keys [db]}]
+   {:fx [[:dispatch
+          [:keycard/connect
+           {:key-uid (get-in db [:profile/profile :key-uid])
+            :on-success #(rf/dispatch [:keycard/migration.continue])
+            :on-error
+            (fn [error]
+              (if (= error :keycard/error.keycard-blank)
+                (rf/dispatch [:keycard/migration.continue])
+                (rf/dispatch [:keycard/on-application-info-error error])))}]]]}))
+
+(rf/reg-event-fx :keycard/migration.get-phrase
+ (fn [{:keys [db]}]
+   {:db (assoc-in db [:keycard :migration] nil)
+    :fx [[:dispatch [:navigate-back]]
+         (if (string/blank? (get-in db [:profile/profile :mnemonic]))
+           [:dispatch
+            [:open-modal :screen/use-recovery-phrase
+             {:on-success #(rf/dispatch [:keycard/migration.phrase-entered %])}]]
+           [:dispatch
+            [:open-modal :screen/backup-recovery-phrase
+             {:on-success #(rf/dispatch [:keycard/migration.phrase-backed-up %])}]])]}))
+
+(rf/reg-event-fx :keycard/migration.phrase-entered
+ (fn [{:keys [db]} [{:keys [phrase]}]]
+   {:db (assoc-in db [:keycard :migration :masked-phrase] (security/mask-data phrase))
+    :fx [[:dispatch [:navigate-back]]
+         [:dispatch
+          [:open-modal :screen/keycard.authorise
+           {:on-success #(rf/dispatch [:keycard/migration.authorisation-success %])}]]]}))
+
+(rf/reg-event-fx :keycard/migration.phrase-backed-up
+ (fn [{:keys [db]}]
+   {:db (assoc-in db
+         [:keycard :migration :masked-phrase]
+         (security/mask-data (get-in db [:profile/profile :mnemonic])))
+    :fx [[:dispatch [:profile.settings/profile-update :mnemonic nil]]
+         [:dispatch [:navigate-back]]
+         [:dispatch
+          [:open-modal :screen/keycard.authorise
+           {:on-success #(rf/dispatch [:keycard/migration.authorisation-success %])}]]]}))
+
+(rf/reg-event-fx :keycard/migration.authorisation-success
+ (fn [{:keys [db]} [masked-password]]
+   (let [{:keys [initialized?]} (get-in db [:keycard :application-info])]
+     {:db (assoc-in db [:keycard :migration :masked-password] masked-password)
+      :fx [[:dispatch [:navigate-back]]
+           (if initialized?
+             [:dispatch
+              [:show-bottom-sheet
+               {:content (fn []
+                           [keycard.pin/auth
+                            {:on-complete #(rf/dispatch [:keycard/migration.pin-created %])}])}]]
+             [:dispatch
+              [:open-modal :screen/keycard.pin.create
+               {:on-complete (fn [new-pin]
+                               (rf/dispatch [:navigate-back])
+                               (rf/dispatch [:keycard/migration.pin-created new-pin]))}]])]})))
+
+(rf/reg-event-fx :keycard/migration.pin-created
+ (fn [{:keys [db]} [pin]]
+   {:db (assoc-in db [:keycard :migration :pin] pin)
+    :fx [[:dispatch [:open-modal :screen/keycard.migrate]]]}))
@@ -0,0 +1,32 @@
+(ns status-im.contexts.keycard.migrate.fail.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.common.resources :as resources]
+            [status-im.constants :as constants]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn view
+  []
+  (let [profile-name        (rf/sub [:profile/name])
+        profile-picture     (rf/sub [:profile/image])
+        customization-color (rf/sub [:profile/customization-color])]
+    [:<>
+     [quo/page-top
+      {:title           (i18n/label :t/failed-to-migrate-key-pair)
+       :description     :context-tag
+       :context-tag     {:full-name           profile-name
+                         :profile-picture     profile-picture
+                         :customization-color customization-color}
+       :container-style {:margin-top constants/page-nav-height}}]
+     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+      [rn/image
+       {:resize-mode :contain
+        :source      (resources/get-image :keycard-migration-failed)}]]
+     [quo/divider-label (i18n/label :t/what-you-can-do)]
+     [quo/markdown-list {:description (i18n/label :t/log-out-remove-profile)}]
+     [quo/markdown-list {:description (i18n/label :t/recover-status-profile)}]
+     [quo/bottom-actions
+      {:actions          :one-action
+       :button-one-label (i18n/label :t/log-out-remove)
+       :button-one-props {:on-press #(rf/dispatch [:logout])}}]]))
@@ -0,0 +1,31 @@
+(ns status-im.contexts.keycard.migrate.re-encrypting.events
+  (:require [clojure.string :as string]
+            [utils.re-frame :as rf]
+            [utils.security.core :as security]))
+
+(rf/reg-event-fx :keycard/migration.convert-to-keycard-profile
+ (fn [{:keys [db]} [{:keys [key-uid instance-uid encryption-public-key]}]]
+   (let [{:keys [masked-password]}   (get-in db [:keycard :migration])
+         {:keys [pairing paired-on]} (get-in db [:keycard :pairings instance-uid])
+         {:keys [kdfIterations]}     (:profile/profile db)]
+     {:fx [[:dispatch [:keycard/disconnect]]
+           [:dispatch [:navigate-back]]
+           [:dispatch [:open-modal :screen/keycard.re-encrypting]]
+           [:effects.profile/convert-to-keycard-profile
+            {:profile
+             {:key-uid         key-uid
+              :keycard-pairing pairing
+              :kdfIterations   kdfIterations}
+             :settings
+             {:keycard-instance-uid instance-uid
+              :keycard-paired-on    paired-on
+              :keycard-pairing      pairing}
+             :password
+             (security/safe-unmask-data masked-password)
+             :new-password
+             encryption-public-key
+             :callback
+             (fn [{:keys [error]}]
+               (if (string/blank? error)
+                 (rf/dispatch [:navigate-to :screen/keycard.migrate.success])
+                 (rf/dispatch [:navigate-to :screen/keycard.migrate.fail])))}]]})))
@@ -0,0 +1,27 @@
+(ns status-im.contexts.keycard.migrate.re-encrypting.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.common.resources :as resources]
+            [status-im.constants :as constants]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn view
+  []
+  (let [profile-name        (rf/sub [:profile/name])
+        profile-picture     (rf/sub [:profile/image])
+        customization-color (rf/sub [:profile/customization-color])]
+    [:<>
+     [quo/page-top
+      {:title           (i18n/label :t/re-encrypting-data)
+       :description     :context-tag
+       :context-tag     {:full-name           profile-name
+                         :profile-picture     profile-picture
+                         :customization-color customization-color}
+       :container-style {:margin-top constants/page-nav-height}}]
+     [quo/text {:style {:padding-horizontal 20}}
+      (i18n/label :t/do-not-quit)]
+     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+      [rn/image
+       {:resize-mode :contain
+        :source      (resources/get-image :keycard-migration)}]]]))
@@ -1,15 +1,14 @@
-(ns status-im.contexts.keycard.sheets.migrate.view
+(ns status-im.contexts.keycard.migrate.sheets.view
  (:require [quo.core :as quo]
            [react-native.core :as rn]
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

 (defn view
-  []
-  (let [profile-name               (rf/sub [:profile/name])
-        profile-picture            (rf/sub [:profile/image])
-        customization-color        (rf/sub [:profile/customization-color])
-        recovery-phrase-backed-up? (rf/sub [:profile/recovery-phrase-backed-up?])]
+  [{:keys [on-continue]}]
+  (let [profile-name        (rf/sub [:profile/name])
+        profile-picture     (rf/sub [:profile/image])
+        customization-color (rf/sub [:profile/customization-color])]
    [:<>
     [quo/drawer-top
      {:type                :context-tag
@@ -28,11 +27,7 @@
     [quo/bottom-actions
      {:actions          :two-actions
       :button-one-label (i18n/label :t/continue)
-       :button-one-props {:on-press #(if recovery-phrase-backed-up?
-                                       (rf/dispatch [:open-modal :screen/use-recovery-phrase
-                                                     {:on-success (fn [])}])
-                                       (rf/dispatch [:open-modal :screen/backup-recovery-phrase
-                                                     {:on-success (fn [])}]))}
+       :button-one-props {:on-press on-continue}
       :button-two-label (i18n/label :t/cancel)
       :button-two-props {:type     :grey
                          :on-press #(rf/dispatch [:hide-bottom-sheet])}}]]))
@@ -0,0 +1,31 @@
+(ns status-im.contexts.keycard.migrate.success.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.common.resources :as resources]
+            [status-im.constants :as constants]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn view
+  []
+  (let [profile-name        (rf/sub [:profile/name])
+        profile-picture     (rf/sub [:profile/image])
+        customization-color (rf/sub [:profile/customization-color])]
+    [:<>
+     [quo/page-top
+      {:title           (i18n/label :t/key-pair-migrated-successfully)
+       :description     :context-tag
+       :context-tag     {:full-name           profile-name
+                         :profile-picture     profile-picture
+                         :customization-color customization-color}
+       :container-style {:margin-top constants/page-nav-height}}]
+     [quo/text {:style {:padding-horizontal 20}}
+      (i18n/label :t/use-keycard-for-status)]
+     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+      [rn/image
+       {:resize-mode :contain
+        :source      (resources/get-image :keycard-migration-succeeded)}]]
+     [quo/button
+      {:on-press        #(rf/dispatch [:logout])
+       :container-style {:margin-horizontal 20}}
+      (i18n/label :t/logout)]]))
@@ -0,0 +1,34 @@
+(ns status-im.contexts.keycard.migrate.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.common.events-helper :as events-helper]
+            [status-im.common.resources :as resources]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn view
+  []
+  (let [profile-name        (rf/sub [:profile/name])
+        profile-picture     (rf/sub [:profile/image])
+        customization-color (rf/sub [:profile/customization-color])]
+    [:<>
+     [quo/page-nav
+      {:icon-name :i/close
+       :on-press  events-helper/navigate-back}]
+     [quo/page-top
+      {:title       (i18n/label :t/ready-to-migrate-key-pair)
+       :description :context-tag
+       :context-tag {:full-name           profile-name
+                     :profile-picture     profile-picture
+                     :customization-color customization-color}}]
+     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+      [rn/image
+       {:resize-mode :contain
+        :source      (resources/get-image :keycard-migration)}]]
+     [quo/divider-label (i18n/label :t/tips-scan-keycard)]
+     [quo/markdown-list {:description (i18n/label :t/remove-phone-case)}]
+     [quo/markdown-list {:description (i18n/label :t/keep-card-steady)}]
+     [quo/bottom-actions
+      {:actions          :one-action
+       :button-one-label (i18n/label :t/scan-keycard)
+       :button-one-props {:on-press #(rf/dispatch [:keycard/migration.start])}}]]))
@@ -0,0 +1,11 @@
+(ns status-im.contexts.keycard.nfc.effects
+  (:require [keycard.keycard :as keycard]
+            [utils.re-frame :as rf]))
+
+(rf/reg-fx :effects.keycard/check-nfc-enabled
+ (fn []
+   (keycard/check-nfc-enabled
+    {:on-success #(rf/dispatch [:keycard/on-check-nfc-enabled-success %])})))
+
+(rf/reg-fx :effects.keycard.ios/start-nfc keycard/start-nfc)
+(rf/reg-fx :effects.keycard.ios/stop-nfc keycard/stop-nfc)
@@ -0,0 +1,27 @@
+(ns status-im.contexts.keycard.nfc.events
+  (:require [utils.re-frame :as rf]))
+
+(rf/reg-event-fx :keycard.ios/start-nfc
+ (fn [_]
+   {:fx [[:effects.keycard.ios/start-nfc]]}))
+
+(rf/reg-event-fx :keycard.ios/on-start-nfc-success
+ (fn [{:keys [db]} [{:keys [on-cancel-event-vector]}]]
+   {:db (assoc-in db [:keycard :on-nfc-cancelled-event-vector] on-cancel-event-vector)}))
+
+(rf/reg-event-fx :keycard.ios/on-nfc-timeout
+ (fn [{:keys [db]} _]
+   {:db (assoc-in db [:keycard :card-connected?] false)
+    :fx [[:dispatch-later [{:ms 500 :dispatch [:keycard.ios/start-nfc]}]]]}))
+
+(rf/reg-event-fx :keycard/on-check-nfc-enabled-success
+ (fn [{:keys [db]} [nfc-enabled?]]
+   {:db (assoc-in db [:keycard :nfc-enabled?] nfc-enabled?)}))
+
+(rf/reg-event-fx :keycard.ios/on-nfc-user-cancelled
+ (fn [{:keys [db]}]
+   {:db (-> db
+            (assoc-in [:keycard :pin :status] nil)
+            (assoc-in [:keycard :on-nfc-cancelled-event-vector] nil))
+    :fx [(when-let [on-nfc-cancelled-event-vector (get-in db [:keycard :on-nfc-cancelled-event-vector])]
+           [:dispatch on-nfc-cancelled-event-vector])]}))
@@ -1,4 +1,4 @@
-(ns status-im.contexts.keycard.nfc-sheet.events
+(ns status-im.contexts.keycard.nfc.sheets.events
  (:require [re-frame.core :as rf]
            [react-native.platform :as platform]
            [taoensso.timbre :as log]))
@@ -1,4 +1,4 @@
-(ns status-im.contexts.keycard.nfc-sheet.view
+(ns status-im.contexts.keycard.nfc.sheets.view
  (:require [quo.foundations.colors :as colors]
            quo.theme
            [react-native.core :as rn]
@@ -1,28 +1,24 @@
 (ns status-im.contexts.keycard.not-keycard.view
  (:require [quo.core :as quo]
            [react-native.core :as rn]
-            [react-native.safe-area :as safe-area]
            [status-im.common.events-helper :as events-helper]
-            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]))
+            [status-im.common.resources :as resources]
+            [utils.i18n :as i18n]))

 (defn view
  []
-  (let [{:keys [top bottom]} (safe-area/get-insets)]
-    [quo/overlay
-     {:type            :shell
-      :container-style {:padding-top    top
-                        :padding-bottom bottom}}
-     [quo/page-nav
-      {:key        :header
-       :background :blur
-       :icon-name  :i/arrow-left
-       :on-press   events-helper/navigate-back}]
-     [quo/page-top
-      {:title            (i18n/label :t/oops-not-keycard)
-       :description      :text
-       :description-text (i18n/label :t/make-sure-keycard)}]
-     [rn/view {:flex 1}]
-     [rn/view {:padding-horizontal 20}
-      [quo/button {:on-press #(rf/dispatch [:keycard/connect])}
-       (i18n/label :t/try-again)]]]))
+  [:<>
+   [quo/page-nav
+    {:icon-name :i/close
+     :on-press  events-helper/navigate-back}]
+   [quo/page-top
+    {:title            (i18n/label :t/oops-not-keycard)
+     :description      :text
+     :description-text (i18n/label :t/make-sure-keycard)}]
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+    [rn/image
+     {:resize-mode :contain
+      :source      (resources/get-image :not-keycard)}]]
+   [rn/view {:padding-horizontal 20}
+    [quo/button {:on-press events-helper/navigate-back}
+     (i18n/label :t/try-again)]]])
@@ -2,12 +2,15 @@
  (:require [clojure.string :as string]
            [quo.core :as quo]
            [react-native.core :as rn]
+            [status-im.common.events-helper :as events-helper]
            [status-im.constants :as constants]
-            [utils.i18n :as i18n]))
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))

 (defn view
-  [{:keys [on-complete]}]
-  (let [[pin set-pin]             (rn/use-state "")
+  []
+  (let [{:keys [on-complete]}     (rf/sub [:get-screen-params])
+        [pin set-pin]             (rn/use-state "")
        [first-pin set-first-pin] (rn/use-state "")
        [error? set-error]        (rn/use-state false)
        [stage set-stage]         (rn/use-state :create)
@@ -38,10 +41,15 @@
                                               (set-stage :repeat)))))))
                                   [pin stage first-pin])]
    [rn/view {:style {:padding-bottom 12 :flex 1}}
-     [quo/drawer-top
-      {:title (if (= :create stage)
-                (i18n/label :t/create-keycard-pin)
-                (i18n/label :t/repeat-keycard-pin))}]
+     [quo/page-nav
+      {:icon-name :i/close
+       :on-press  events-helper/navigate-back}]
+     [quo/page-top
+      {:title            (if (= :create stage)
+                           (i18n/label :t/create-keycard-pin)
+                           (i18n/label :t/repeat-keycard-pin))
+       :description      :text
+       :description-text "You’ll need this PIN to login and sign transactions"}]
     [rn/view {:style {:flex 1 :justify-content :center :align-items :center :padding-vertical 34}}
      [quo/pin-input
       {:blur?                 false
@@ -23,3 +23,7 @@
                (assoc-in [:keycard :pin :status] nil))
        :fx [(when (and on-complete (= (dec max-numbers) (count pin)))
               [:effects.keycard.pin/dispatch-on-complete [on-complete new-pin]])]}))))
+
+(rf/reg-event-fx :keycard.pin/clear
+ (fn [{:keys [db]}]
+   {:db (assoc-in db [:keycard :pin] nil)}))
@@ -6,10 +6,12 @@
            [utils.re-frame :as rf]))

 (defn auth
-  [{:keys [on-complete]}]
-  (let [{:keys [text status]} (rf/sub [:keycard/pin])
-        pin-retry-counter     (rf/sub [:keycard/pin-retry-counter])
-        error?                (= status :error)]
+  [{:keys [on-complete error]}]
+  (let [{:keys [error? error-message]} error
+        {:keys [text status]}          (rf/sub [:keycard/pin])
+        pin-retry-counter              (rf/sub [:keycard/pin-retry-counter])
+        error?                         (or error? (= status :error))]
+    (rn/use-unmount #(rf/dispatch [:keycard.pin/clear]))
    [rn/view {:padding-bottom 12 :flex 1}
     [rn/view {:flex 1 :justify-content :center :align-items :center :padding 34}
      [quo/pin-input
@@ -18,7 +20,9 @@
        :number-of-filled-pins (count text)
        :error?                error?
        :info                  (when error?
-                                 (i18n/label :t/pin-retries-left {:number pin-retry-counter}))}]]
+                                 (if error-message
+                                   error-message
+                                   (i18n/label :t/pin-retries-left {:number pin-retry-counter})))}]]
     [quo/numbered-keyboard
      {:delete-key? true
       :on-delete   #(rf/dispatch [:keycard.pin/delete-pressed])
@@ -8,6 +8,10 @@
            :s (subs signature 64 128)
            :v (str (js/parseInt (subs signature 128 130) 16))}})

+(rf/reg-event-fx :keycard/sign
+ (fn [_ [data]]
+   {:effects.keycard/sign data}))
+
 (rf/reg-event-fx :keycard/sign-hash
 (fn [{:keys [db]} [pin-text tx-hash]]
   (let [current-address (get-in db [:wallet :current-viewing-account-address])
@@ -15,16 +19,16 @@
         key-uid         (get-in db [:profile/profile :key-uid])]
     {:fx [[:dispatch
            [:keycard/connect
-             {:key-uid       key-uid
-              :on-success-fx [[:effects.keycard/sign
-                               {:pin pin-text
-                                :path path
-                                :hash (utils.address/naked-address tx-hash)
-                                :on-success
-                                #(do
-                                   (rf/dispatch [:keycard/disconnect])
-                                   (rf/dispatch
-                                    [:wallet/proceed-with-transactions-signatures
-                                     (get-signature-map tx-hash %)]))
-                                :on-failure #(rf/dispatch [:keycard/on-action-with-pin-error
-                                                           %])}]]}]]]})))
+             {:key-uid key-uid
+              :on-success
+              (fn []
+                (rf/dispatch
+                 [:keycard/sign
+                  {:pin        pin-text
+                   :path       path
+                   :hash       (utils.address/naked-address tx-hash)
+                   :on-success (fn [signature]
+                                 (rf/dispatch [:keycard/disconnect])
+                                 (rf/dispatch [:wallet/proceed-with-transactions-signatures
+                                               (get-signature-map tx-hash signature)]))
+                   :on-failure #(rf/dispatch [:keycard/on-action-with-pin-error %])}]))}]]]})))
@@ -1,5 +1,7 @@
 (ns status-im.contexts.keycard.utils
-  (:require [taoensso.timbre :as log]))
+  (:require [clojure.string :as string]
+            [utils.address :as address]
+            [utils.transforms :as transforms]))

 (def pin-mismatch-error #"Unexpected error SW, 0x63C(\d+)|wrongPIN\(retryCounter: (\d+)\)")

@@ -16,33 +18,55 @@
   (re-matches #".*NFCError:100.*" error)))

 (defn validate-application-info
-  [profile-key-uid {:keys [key-uid paired? pin-retry-counter puk-retry-counter] :as application-info}]
-  (let [profile-mismatch? (or (nil? profile-key-uid) (not= profile-key-uid key-uid))]
-    (log/debug "[keycard]"              "login-with-keycard"
-               "empty application info" (empty? application-info)
-               "no key-uid"             (empty? key-uid)
-               "profile-mismatch?"      profile-mismatch?
-               "no pairing"             paired?)
-    (cond
-      (empty? application-info)
-      :keycard/error.not-keycard
+  [profile-key-uid
+   {:keys [key-uid has-master-key? paired? pin-retry-counter puk-retry-counter] :as application-info}]

-      (empty? (:key-uid application-info))
-      :keycard/error.keycard-blank
+  (cond
+    (empty? application-info)
+    :keycard/error.not-keycard

-      profile-mismatch?
-      :keycard/error.keycard-wrong
+    (not has-master-key?)
+    :keycard/error.keycard-blank

-      (not paired?)
-      :keycard/error.keycard-unpaired
+    (not= profile-key-uid key-uid)
+    :keycard/error.keycard-wrong-profile

-      (and (zero? pin-retry-counter)
-           (or (nil? puk-retry-counter)
-               (pos? puk-retry-counter)))
-      :keycard/error.keycard-frozen
+    (not paired?)
+    :keycard/error.keycard-unpaired

-      (zero? puk-retry-counter)
-      :keycard/error.keycard-locked
+    (and (zero? pin-retry-counter)
+         (or (nil? puk-retry-counter)
+             (pos? puk-retry-counter)))
+    :keycard/error.keycard-frozen

-      :else
-      nil)))
+    (zero? puk-retry-counter)
+    :keycard/error.keycard-locked
+
+    :else
+    nil))
+
+(defn- error-object->map
+  [^js object]
+  {:code  (.-code object)
+   :error (.-message object)})
+
+(defn normalize-key-uid
+  [{:keys [key-uid] :as data}]
+  (if (string/blank? key-uid)
+    data
+    (update data :key-uid address/normalized-hex)))
+
+(defn get-on-success
+  [{:keys [on-success]}]
+  #(when on-success (on-success (normalize-key-uid (transforms/js->clj %)))))
+
+(defn get-on-failure
+  [{:keys [on-failure]}]
+  #(when on-failure (on-failure (error-object->map %))))
+
+(defn wrap-handlers
+  [args]
+  (assoc
+   args
+   :on-success (get-on-success args)
+   :on-failure (get-on-failure args)))
@@ -37,24 +37,21 @@
 (defonce is-dragging? (atom nil))
 (defonce drag-amount (atom nil))

+;; Layout height calculation
+;; 1. Always prefer on-layout height over window height, as some devices include status bar height in
+;; the window while others do not.
+;; https://github.com/status-im/status-mobile/issues/14633#issuecomment-1366191478
+;; 2. This preference is unless on-layout is triggered with a random value.
+;; https://github.com/status-im/status-mobile/issues/14849
+;; To ensure that on-layout height falls within the actual height range, a difference between window
+;; height and the maximum possible status bar height is allowed (assumed to be 60, as the Pixel emulator
+;; has a height of 52).
 (defn store-screen-height
  [evt]
-  (let [window-height (:height (rn/get-window))
-        height        (or (oget evt "nativeEvent" "layout" "height") 0)
-        width         (or (oget evt "nativeEvent" "layout" "width") 0)]
-    ;; Layout height calculation
-    ;; 1. Make sure height is more than width, and on-layout is not fired while the
-    ;; screen is horizontal
-    ;; 2. Initialize values with 0 in case of nil
-    ;; 3. In the case of notch devices, the dimensions height will be smaller than
-    ;; on-layout,
-    ;; (without status bar height included)
-    ;; https://github.com/status-im/status-mobile/issues/14633
-    ;; 4. In the case of devices without a notch, both heights should be the same,
-    ;; but actual values differ in some pixels, so arbitrary 5 pixels is allowed
-    (when (and (> height width)
-               (>= (+ height 5) (or window-height 0))
-               (not= height @shell.state/screen-height))
+  (let [window-height (or (:height (rn/get-window)) 0)
+        height        (or (oget evt "nativeEvent" "layout" "height") 0)]
+    (when (and (not= height @shell.state/screen-height)
+               (< (Math/abs (- window-height height)) 60))
      (reset! shell.state/screen-height height)
      (async-storage/set-item! :screen-height height))))

@@ -25,6 +25,12 @@
              {:key :i/copy}
              {:key   nil
               :value "None"}]}
+   {:type    :select
+    :key     :title-icon
+    :options [{:key :i/chevron-right}
+              {:key :i/copy}
+              {:key   nil
+               :value "None"}]}
   {:type    :select
    :key     :right-content
    :options [{:key   nil
@@ -22,13 +22,10 @@
   :raribleMainnetAPIKey          config/RARIBLE_MAINNET_API_KEY
   :raribleTestnetAPIKey          config/RARIBLE_TESTNET_API_KEY
   :alchemyEthereumMainnetToken   config/ALCHEMY_ETHEREUM_MAINNET_TOKEN
-   :alchemyEthereumGoerliToken    config/ALCHEMY_ETHEREUM_GOERLI_TOKEN
   :alchemyEthereumSepoliaToken   config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN
   :alchemyOptimismMainnetToken   config/ALCHEMY_OPTIMISM_MAINNET_TOKEN
-   :alchemyOptimismGoerliToken    config/ALCHEMY_OPTIMISM_GOERLI_TOKEN
   :alchemyOptimismSepoliaToken   config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN
   :alchemyArbitrumMainnetToken   config/ALCHEMY_ARBITRUM_MAINNET_TOKEN
-   :alchemyArbitrumGoerliToken    config/ALCHEMY_ARBITRUM_GOERLI_TOKEN
   :alchemyArbitrumSepoliaToken   config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN})

 (defn create
@@ -13,3 +13,7 @@
 (rf/reg-fx :effects.profile/enable-local-notifications
 (fn []
   (native-module/start-local-notifications)))
+
+(rf/reg-fx :effects.profile/convert-to-keycard-profile
+ (fn [{:keys [profile settings password new-password callback]}]
+   (native-module/convert-to-keycard-profile profile settings password new-password callback)))
@@ -1,5 +1,6 @@
 (ns status-im.contexts.profile.profiles.view
  (:require
+    [clojure.string :as string]
    [native-module.core :as native-module]
    [quo.core :as quo]
    [react-native.core :as rn]
@@ -182,7 +183,7 @@
       :render-fn               profile-card}]]))

 (defn password-input
-  []
+  [processing error]
  (let [auth-method         (rf/sub [:auth-method])
        on-press-biometrics (fn []
                              (rf/dispatch [:biometric/authenticate
@@ -193,18 +194,31 @@
                                                            %])}]))]

    [standard-authentication/password-input
-     {:shell?              true
+     {:processing          processing
+      :error               error
+      :shell?              true
      :blur?               true
      :on-press-biometrics (when (= auth-method constants/auth-method-biometric) on-press-biometrics)}]))

+(defn- get-error-message
+  [error]
+  (if (and (some? error)
+           (or (= error "file is not a database")
+               (string/starts-with? (string/lower-case error) "failed")))
+    (i18n/label :t/oops-wrong-password)
+    error))
+
 (defn login-section
  [{:keys [show-profiles]}]
-  (let [processing                    (rf/sub [:profile/login-processing])
-        {:keys [key-uid name keycard-pairing
+  (let [{:keys [key-uid name keycard-pairing
                customization-color]} (rf/sub [:profile/login-profile])
        sign-in-enabled?              (rf/sub [:sign-in-enabled?])
        profile-picture               (rf/sub [:profile/login-profiles-picture key-uid])
-        login-multiaccount            (rn/use-callback #(rf/dispatch [:profile.login/login]))]
+        {:keys [error processing]}    (rf/sub [:profile/login])
+        error-message                 (rn/use-memo #(get-error-message error) [error])
+        error                         {:error?        (boolean (seq error-message))
+                                       :error-message error-message}
+        login-profile                 (rn/use-callback #(rf/dispatch [:profile.login/login]))]
    [rn/keyboard-avoiding-view
     {:style                    style/login-container
      :keyboard-vertical-offset (- (safe-area/get-bottom))}
@@ -239,17 +253,20 @@
        :card-style          style/login-profile-card}]
      (if keycard-pairing
        [keycard.pin/auth
-         {:on-complete
-          (fn [pin-text]
+         {:error error
+          :on-complete
+          (fn [pin]
            (rf/dispatch
             [:keycard/connect
-              {:key-uid       key-uid
-               :on-success-fx [[:effects.keycard/get-keys
-                                {:pin        pin-text
-                                 :on-success #(rf/dispatch [:keycard.login/on-get-keys-success %])
-                                 :on-failure #(rf/dispatch [:keycard/on-action-with-pin-error
-                                                            %])}]]}]))}]
-        [password-input])]
+              {:key-uid key-uid
+               :on-success
+               (fn []
+                 (rf/dispatch
+                  [:keycard/get-keys
+                   {:pin        pin
+                    :on-success #(rf/dispatch [:keycard.login/on-get-keys-success %])
+                    :on-failure #(rf/dispatch [:keycard/on-action-with-pin-error %])}]))}]))}]
+        [password-input processing error])]
     (when-not keycard-pairing
       [quo/button
        {:size                40
@@ -258,7 +275,7 @@
         :accessibility-label :login-button
         :icon-left           :i/unlocked
         :disabled?           (or (not sign-in-enabled?) processing)
-         :on-press            login-multiaccount
+         :on-press            login-profile
         :container-style     {:margin-bottom (+ (safe-area/get-bottom) 12)}}
        (i18n/label :t/log-in)])]))

@@ -50,17 +50,6 @@
                                       {:on-success on-success}])
             :on-cancel nil}]]})))

-(rf/reg-event-fx :profile.settings/toggle-goerli-test-network
- (fn [{:keys [db]}]
-   (let [value      (get-in db [:profile/profile :is-goerli-enabled?])
-         on-success #(rf/dispatch [:logout])]
-     {:fx [[:ui/show-confirmation
-            {:content   (i18n/label :t/goerli-testnet-toggle-confirmation)
-             :on-accept #(rf/dispatch [:profile.settings/profile-update :is-goerli-enabled?
-                                       (not value)
-                                       {:on-success on-success}])
-             :on-cancel nil}]]})))
-
 (rf/reg-event-fx :profile.settings/change-preview-privacy
 (fn [_ [private?]]
   (let [private?' (boolean private?)]
@@ -4,6 +4,7 @@
            [react-native.core :as rn]
            [status-im.common.events-helper :as events-helper]
            [status-im.common.resources :as resources]
+            [status-im.constants :as constants]
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

@@ -27,11 +28,11 @@
          :subtitle            (i18n/label :t/secure-wallet-card)
          :button-label        (i18n/label :t/buy-keycard)
          :accessibility-label :get-keycard
-          :image               (resources/get-image :generate-keys)
-          :on-press            #()}]
+          :image               (resources/get-image :keycard-buy)
+          :on-press            #(rf/dispatch [:browser.ui/open-url constants/get-keycard-url])}]
        [rn/view {:style {:margin-top 24}}
         [quo/text
-          {:style  {:margin-bottom 12
+          {:style  {:margin-bottom 1
                    :color         colors/white-opa-70}
           :size   :paragraph-2
           :weight :medium}
@@ -41,10 +41,9 @@
                       (for [label points]
                         ^{:key label}
                         [quo/markdown-list
-                          {:description     (i18n/label label)
-                           :blur?           true
-                           :type            (when lock? :lock)
-                           :container-style {:padding-top 8}}])]})
+                          {:description (i18n/label label)
+                           :blur?       true
+                           :type        (when lock? :lock)}])]})

 (defn- on-privacy-policy-press
  []
@@ -357,8 +357,7 @@
              {:chain-id               chain-id
               :token-id               token-id
               :contract-address       contract-address
-               :test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])
-               :is-goerli-enabled?     (get-in db [:profile/profile :is-goerli-enabled?])})]
+               :test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])})]
     {:fx [[:dispatch
            [:hide-bottom-sheet]]
           [:dispatch-later
@@ -377,5 +376,4 @@
            {:chain-id               chain-id
             :token-id               token-id
             :contract-address       contract-address
-             :test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])
-             :is-goerli-enabled?     (get-in db [:profile/profile :is-goerli-enabled?])})]]]}))
+             :test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])})]]]}))
@@ -33,17 +33,11 @@
  (when (> total 1) (str "x" total)))

 (defn- get-opensea-network-name
-  [chain-id test-networks-enabled? is-goerli-enabled?]
+  [chain-id test-networks-enabled?]
  (let [network-kw   (network-utils/id->network chain-id)
        network-name (name network-kw)
        mainnet?     (= :mainnet network-kw)]
-    (cond (and test-networks-enabled? is-goerli-enabled? mainnet?)
-          (:goerli constants/opensea-url-names)
-
-          (and test-networks-enabled? is-goerli-enabled?)
-          (str network-name "-" (:goerli constants/opensea-url-names))
-
-          (and test-networks-enabled? mainnet?)
+    (cond (and test-networks-enabled? mainnet?)
          (:sepolia constants/opensea-url-names)

          test-networks-enabled?
@@ -63,11 +57,10 @@

 (defn get-opensea-collectible-url
  [{:keys [chain-id token-id contract-address
-           test-networks-enabled? is-goerli-enabled?]}]
+           test-networks-enabled?]}]
  (let [base-link            (get-opensea-base-url test-networks-enabled?)
        opensea-network-name (get-opensea-network-name chain-id
-                                                       test-networks-enabled?
-                                                       is-goerli-enabled?)]
+                                                       test-networks-enabled?)]
    (str base-link "/assets/" opensea-network-name "/" contract-address "/" token-id)))

 (defn get-collectible-unique-id
@@ -43,26 +43,4 @@
                                               :contract-address contract-address
                                               :token-id token-id
                                               :test-networks-enabled? true})
-           "https://testnets.opensea.io/assets/optimism-sepolia/0xC/0xT")))
-  (testing "get-opensea-collectible-url goerli"
-    (is (= (utils/get-opensea-collectible-url {:chain-id               constants/ethereum-goerli-chain-id
-                                               :contract-address       contract-address
-                                               :token-id               token-id
-                                               :test-networks-enabled? true
-                                               :is-goerli-enabled?     true})
-           "https://testnets.opensea.io/assets/goerli/0xC/0xT")))
-  (testing "get-opensea-collectible-url goerli arbitrum"
-    (is (= (utils/get-opensea-collectible-url {:chain-id               constants/arbitrum-goerli-chain-id
-                                               :contract-address       contract-address
-                                               :token-id               token-id
-                                               :test-networks-enabled? true
-                                               :is-goerli-enabled?     true})
-           "https://testnets.opensea.io/assets/arbitrum-goerli/0xC/0xT")))
-
-  (testing "get-opensea-collectible-url goerli optimism"
-    (is (= (utils/get-opensea-collectible-url {:chain-id               constants/optimism-goerli-chain-id
-                                               :contract-address       contract-address
-                                               :token-id               token-id
-                                               :test-networks-enabled? true
-                                               :is-goerli-enabled?     true})
-           "https://testnets.opensea.io/assets/optimism-goerli/0xC/0xT"))))
+           "https://testnets.opensea.io/assets/optimism-sepolia/0xC/0xT"))))
@@ -445,7 +445,7 @@
 (defn transaction-path
  [{:keys [from-address to-address token-id-from token-address token-id-to route data
           slippage-percentage eth-transfer?]}]
-  (let [{:keys [bridge-name amount-in bonder-fees from
+  (let [{:keys [bridge-name amount-in from
                to]}  route
        tx-data       (transaction-data {:from-address  from-address
                                         :to-address    to-address
@@ -453,6 +453,7 @@
                                         :route         route
                                         :data          data
                                         :eth-transfer? eth-transfer?})
+        bonder-fees   (-> route :bounder-fees money/to-string)
        to-chain-id   (:chain-id to)
        from-chain-id (:chain-id from)]
    (cond-> {:BridgeName bridge-name
@@ -14,12 +14,6 @@
    (= chain-id constants/optimism-mainnet-chain-id)
    config/optimism-mainnet-chain-explorer-link

-    (= chain-id constants/ethereum-goerli-chain-id)
-    config/goerli-chain-explorer-link
-
-    (= chain-id constants/optimism-goerli-chain-id)
-    config/optimism-goerli-chain-explorer-link
-
    (= chain-id constants/ethereum-sepolia-chain-id)
    config/sepolia-chain-explorer-link

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Cristian Lungu	f3fd33d63a	fix: tx confirmation title network color	2024-11-05 14:06:13 +02:00
Cristian Lungu	08fea7fe5f	fix: input amount fee rebase leftover	2024-11-05 13:46:43 +02:00
Cristian Lungu	792caf5259	fix: tx confirmation summary-info address initials	2024-11-05 13:34:37 +02:00
Cristian Lungu	c02d97d380	fix: hide "Amount received" on collectible confirmation	2024-11-05 13:33:46 +02:00
Cristian Lungu	3001fa91e9	ref: extracted transaction title component	2024-11-05 13:33:20 +02:00
Cristian Lungu	2714c7b9e5	fix: network-values reagent warning	2024-11-05 11:52:45 +02:00
Cristian Lungu	307155a4ca	ref: split tx confirmation subs into components	2024-11-04 20:23:41 +02:00
Cristian Lungu	a5ef314d6a	ref: account summary from tx confirmation	2024-11-04 20:21:07 +02:00
Cristian Lungu	2ba16e6762	fix: refactored send confirmation title	2024-11-04 20:21:07 +02:00
Cristian Lungu	6acda08ebb	fix: network-values amount should be fixed	2024-11-04 20:16:12 +02:00
Cristian Lungu	90166ad45a	fix: sending BonderFee as string	2024-11-04 20:16:11 +02:00
Cristian Lungu	ef8490961a	fix: addressed review comments	2024-11-04 20:16:11 +02:00
Cristian Lungu	e4ae78bb25	test: added subscription tests	2024-11-04 20:16:11 +02:00
Cristian Lungu	ea07780e9c	fix: lint	2024-11-04 20:16:11 +02:00
Cristian Lungu	ff569f328a	fix: wallet input component tests	2024-11-04 20:16:11 +02:00
Cristian Lungu	e4b42fc0ca	fix: tests for estimated-received	2024-11-04 20:16:10 +02:00
Cristian Lungu	9397dd46e8	feat: added bridge bonder-fee info sheet	2024-11-04 20:16:10 +02:00
Cristian Lungu	34d6b3c1d5	feat: moved send estimated-fees in separate ns	2024-11-04 20:16:10 +02:00
Cristian Lungu	3c7d299ef7	feat: title-icon prop for quo/data-item	2024-11-04 20:16:10 +02:00
Cristian Lungu	43a8be9d52	fix: route out value not using token decimals	2024-11-04 20:16:10 +02:00
Cristian Lungu	adff7a5120	ref: moved estimated received from event to sub	2024-11-04 20:16:09 +02:00
Cristian Lungu	4db4b5c84b	test: added test cases for out amount and received	2024-11-04 20:16:09 +02:00
Cristian Lungu	23d84a54fc	fix: show correct bridge values for to/received/fees	2024-11-04 20:16:09 +02:00
Cristian Lungu	5d51ae55b5	test: estimated-received-by-chain-test tests	2024-11-04 20:16:09 +02:00
Cristian Lungu	d51d88fc0b	ref: added token precision constant	2024-11-04 20:16:09 +02:00
Cristian Lungu	bf8fa45e52	fix: using estimated received value for transactions	2024-11-04 20:16:08 +02:00
Lungu Cristian	077b885617	Fix wallet action buttons alignment (#21514 ) * fix: wallet-ctas dynamic spacing * fix: updated bridge icon according to designs	2024-11-04 20:01:54 +02:00
Tetiana Churikova	2e42da5996	gh: added Type (#21472 )	2024-11-04 16:53:18 +01:00
Tetiana Churikova	f6dc9d1ad3	e2e: skipping waku tests and fixes (#21471 )	2024-11-04 16:33:03 +01:00
Mohamed Javid	9f1eb60e21	chore_: Remove Goerli code (#21508 ) This commit removes the goerli-related code from the mobile repo. Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-11-04 18:10:36 +05:30
Mohamed Javid	8e7d5233df	fix(wallet)_: Bridging tx improvements (#21523 ) This commit fixes two issues faced in L1 to L2 tx: - fail with 'L1_ETH_BRG: Value does not match amount' error - reverted tx due to out of gas error Status go changes: https://github.com/status-im/status-go/pull/6012 Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-11-04 15:04:36 +05:30
Mohamed Javid	4f40fda6a3	fix(wallet)_: Chain prefix for ENS resolved address (#21504 ) This commit removes chain prefixes being added to ENS resolved address in send flow Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-11-01 21:09:59 +05:30
flexsurfer	f0079961f4	[#21316 ] Keycard - Allow user to migrate existing Profile to the new … (#21467 )	2024-11-01 12:48:07 +01:00
Lungu Cristian	9862abb7eb	Fix "Failed to get dApps" error when a session expired (#21531 ) * fix: pass the topic instead of entire session * chore: added logs for future debugging	2024-10-30 15:51:26 +02:00
Brian Sztamfater	6d7697870d	feat(swap): add metrics for swaps (#21485 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-10-29 12:01:47 -03:00
Parvesh Monu	4f53a2b11e	fix No tabs are available in the app on Graphene OS (#21520 )	2024-10-29 20:14:26 +05:30