chore: bump release version for Fdroid

- Assets were compressed from Figma exports.
- Locale for Ukrainian fixed: from `uk` to `uk-UA` according to official reference https://android.googlesource.com/platform/frameworks/base/+/master/core/res/res/values/locale_config.xml.
- Titles for each locale are now translated.

Fixes https://github.com/status-im/status-mobile/issues/21605

VERSION

@@ -1 +1 @@
-2.30.0
+2.31.1

android/app/build.gradle

@@ -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"
 }
 
 

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

@@ -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
-    }
-} 

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

@@ -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")
 

doc/use-status-backend-server.md

@@ -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.

fastlane/metadata/android/ar-SA/full_description.txt

@@ -0,0 +1,21 @@
+يجمع Status بين برنامج مراسلة مجهول الهوية يركز على الخصوصية ومحفظة العملات المشفرة الآمنة في أداة اتصال قوية واحدة. يمكنك الدردشة مع الأصدقاء والمجتمعات المتنامية. وشراء وتخزين وتبادل الأصول الرقمية.
+
+Status هو نظام تشغيل Ethereum الخاص بك.
+
+محفظة Ethereum آمنة
+تتيح لك محفظة العملات المشفرة Status إرسال وتخزين وتبادل أصول Ethereum بأمان مثل ETH وSNT والعملات المستقرة مثل DAI، بالإضافة إلى المقتنيات. تحكم بثقة في عملاتك المشفرة والأصول الرقمية من خلال تطبيق محفظة Ethereum متعددة السلاسل، والذي يدعم الشبكة الرئيسية وArbitrum وOptimism. تدعم محفظة blockchain Status حاليًا أصول ETH وERC-20 وERC-721 وERC-1155 فقط؛ ولا تدعم Bitcoin.
+
+PRIVATE MESSENGER
+أرسل محادثات فردية وجماعية خاصة دون أن يتجسس أحد على اتصالاتك. Status هو تطبيق مراسلة يلغي عمليات نقل الرسائل المركزية لمزيد من الخصوصية والمراسلة الآمنة. يتم تشفير جميع الرسائل باستخدام تشفير من البداية إلى النهاية. بالإضافة إلى ذلك، لا تكشف أي رسالة عن هوية المؤلف أو المستلم المقصود، لذلك لا أحد، ولا حتى Status، يعرف من يتحدث إلى من أو ما قيل.
+
+اربح مع DEFI
+
+استخدم عملتك المشفرة مع أحدث تطبيقات التمويل اللامركزية والبورصات اللامركزية (DEX) مثل Maker وAave وUniswap وSynthetix وPoolTogether وZerion وKyber والمزيد.
+
+تواصل مع مجتمعك
+
+استكشف مجتمعاتك وأصدقائك المفضلين وتواصل معهم ودردش معهم. سواء كانت مجموعة صغيرة من الأصدقاء أو مجموعة فنانين أو تجار عملات مشفرة أو منظمة كبيرة قادمة - أرسل رسائل نصية وتواصل مع مجتمعات Status.
+
+إنشاء حساب خاص
+
+ابق خاصًا من خلال إنشاء حساب مجهول الهوية. عند إنشاء حسابك المجاني، لن تضطر أبدًا إلى إدخال رقم هاتف أو عنوان بريد إلكتروني أو حساب مصرفي. يتم إنشاء مفاتيح المحفظة الخاصة بك محليًا وتخزينها بشكل آمن لضمان حصولك أنت فقط على حق الوصول إلى أموالك ومعاملاتك المالية.

fastlane/metadata/android/ar-SA/short_description.txt

@@ -0,0 +1 @@
+ربط Private Finance وWeb3

fastlane/metadata/android/ar-SA/title.txt

@@ -0,0 +1 @@
+Status: محفظة تشفير اجتماعية

fastlane/metadata/android/ar/full_description.txt

@@ -1,19 +0,0 @@
-
-يجمع Status بين تطبيق مراسلة يركز على الخصوصية تحت اسم مستعار ومحفظة للعملات المشفرة آمنة في أداة تواصل قوية واحدة. تحدث مع الأصدقاء والمجتمعات المتنامية. قم بشراء وتخزين وتبادل الأصول الرقمية.
-
-Status هو نظام التشغيل الخاص بك على Ethereum.
-
-المُرَاسِل الخاص
-أرسل محادثات خاصة 1:1 ومحادثات مجموعات خاصة دون أن يتجسس أحد على اتصالاتك. يعد Status تطبيق مراسلة يلغي الحاجة إلى نقاط التوجيه المركزية للرسائل من أجل خصوصية أكبر ومراسلة آمنة. يتم تشفير جميع الرسائل بتشفير من طرف إلى طرف. بالإضافة إلى ذلك، لا تكشف أي رسالة عن هوية المؤلف أو المستلم المستهدف، لذا لا أحد، حتى Status، يعرف من يتحدث مع من أو ماذا قيل.
-
-محفظة Ethereum الآمنة
-تتيح لك محفظة Status للعملات المشفرة إرسال وتخزين وتبادل أصول Ethereum مثل ETH و SNT والعملات المستقرة مثل DAI، بالإضافة إلى الأصول الرقمية القابلة للتحصيل بأمان. تحكم بثقة في عملاتك الرقمية وأصولك الرقمية باستخدام تطبيق محفظة Ethereum متعدد السلاسل الخاص بنا، الذي يدعم mainnet و Arbitrum و Optimism. تدعم محفظة Status حاليًا فقط أصول ETH و ERC-20 و ERC-721 و ERC-1155؛ لا تدعم Bitcoin.
-
-اكسب مع DeFi
-ضع عملاتك الرقمية في العمل مع أحدث تطبيقات التمويل اللامركزي وتبادلات العملات اللامركزية (DEX) مثل Maker و Aave و Uniswap و Synthetix و PoolTogether و Zerion و Kyber وغيرها.
-
-تواصل مع مجتمعك
-استكشف وتواصل وتحدث مع أصدقائك ومجتمعاتك المفضلة. سواء كان ذلك مع مجموعة صغيرة من الأصدقاء، أو مجموعة فنية، أو متداولي العملات المشفرة، أو المنظمة الكبيرة التالية - قم بإرسال النصوص والتواصل مع مجتمعات Status.
-
-إنشاء حساب خاص
-ابقَ خاصًا مع إنشاء حساب تحت اسم مستعار. عند إنشاء حسابك المجاني، لن تضطر أبدًا إلى إدخال رقم هاتف أو عنوان بريد إلكتروني أو حساب مصرفي. يتم توليد مفاتيح محفظتك الخاصة محليًا وتخزينها بشكل آمن لضمان أنك الوحيد الذي لديه حق الوصول إلى أموالك ومعاملاتك المالية.

fastlane/metadata/android/ar/short_description.txt

@@ -1 +0,0 @@
-محفظة مشفرة و ماسنجر خاص

fastlane/metadata/android/en-GB/full_description.txt

@@ -2,17 +2,17 @@ Status combines pseudonymous privacy-focused messenger and secure crypto wallet
 
 Status is your Ethereum operating system.
 
-PRIVATE MESSENGER
-Send private 1:1 and private group chats without anyone snooping on your communications. Status is a messenger app that eliminates centralized message relays for greater privacy and secure messaging. All messages are encrypted with end-to-end encryption. Additionally, no message exposes who the author or the intended recipient is, so nobody, not even Status, knows who is talking to who or what was said.
-
 SECURE ETHEREUM WALLET
-The Status crypto wallet allows you to securely send, store, and exchange Ethereum assets such as ETH, SNT, stable coins such as DAI, as well as collectibles. Confidently take control of your cryptocurrency and digital assets with our multichain Ethereum wallet app, supporting mainnet, Arbitrum and Optimism. The Status blockchain wallet currently only supports ETH, ERC-20, ERC-721 and ERC-1155 assets; it does not support Bitcoin.
+The Status crypto wallet allows you to securely send, store, and exchange Ethereum assets such as ETH, SNT, stable coins such as DAI, as well as collectibles. Confidently take control of your cryptocurrency and digital assets with our multichain Ethereum wallet app, supporting mainnet, Arbitrum, and Optimism. The Status blockchain wallet currently only supports ETH, ERC-20, ERC-721, and ERC-1155 assets; it does not support Bitcoin.
+
+PRIVATE MESSENGER
+Send private 1:1 and private group chats without anyone snooping on your communications. Status is a messenger app that eliminates centralised message relays for greater privacy and secure messaging. All messages are encrypted with end-to-end encryption. Additionally, no message exposes who the author or the intended recipient is, so nobody, not even Status, knows who is talking to who or what was said.
 
 EARN WITH DEFI
-Put your crypto to work with the latest decentralized finance apps and decentralized exchanges (DEX) such as Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber, and more.
+Put your crypto to work with the latest decentralised finance apps and decentralised exchanges (DEX) such as Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber, and more.
 
 CONNECT WITH YOUR COMMUNITY
-Explore, connect, and chat with your favorite communities and friends. Whether it is a small group of friends, an artist collective, crypto traders, or the next big organization - text and communicate with Status communities.
+Explore, connect, and chat with your favourite communities and friends. Whether it is a small group of friends, an artist collective, crypto traders, or the next big organization - text and communicate with Status communities.
 
 PRIVATE ACCOUNT CREATION
 Stay private with pseudo-anonymous account creation. When creating your free account, you will NEVER have to enter a phone number, email address, or bank account. Your wallet private keys are locally generated and securely stored to ensure only you have access to your funds and financial transactions.

fastlane/metadata/android/en-GB/short_description.txt

@@ -0,0 +1 @@
+Connect Private Finance & Web3

fastlane/metadata/android/en-GB/title.txt

@@ -0,0 +1 @@
+Status: Social Crypto Wallet

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +0,0 @@
-Crypto Wallet & Private Messenger

fastlane/metadata/android/en-US/title.txt

@@ -1 +0,0 @@
-Status

fastlane/metadata/android/es-ES/full_description.txt

@@ -1,18 +1,18 @@
-Status combina una mensajería centrada en la privacidad pseudónima y una billetera de criptomonedas segura en una poderosa herramienta de comunicación. Chatea con amigos y comunidades en crecimiento. Compra, almacena e intercambia activos digitales.
+Status combina una mensajería seudónima centrada en la privacidad y una Billetera de criptomonedas segura en una poderosa herramienta de comunicación. Chatea con amigos y comunidades en crecimiento. Compra, almacena e intercambia activos digitales.
 
-Status es tu sistema operativo para Ethereum.
+Status es tu sistema operativo Ethereum.
+
+BILLETERA ETHEREUM SEGURA
+La Billetera de criptomonedas Status te permite enviar, almacenar e intercambiar de forma segura activos Ethereum como ETH, SNT, stablecoins como DAI, así como coleccionables. Toma el control de tu criptomoneda y activos digitales con confianza con nuestra Billetera multicadena, compatible con Ethereum Mainnet, Arbitrum y Optimism. La Billetera Status actualmente solo admite activos ETH, ERC-20, ERC-721 y ERC-1155; no admite Bitcoin.
 
 MENSAJERÍA PRIVADA
-Envía chats privados 1:1 y chats grupales privados sin que nadie espíe tus comunicaciones. Status es una aplicación de mensajería que elimina los retransmisores de mensajes centralizados para ofrecer mayor privacidad y mensajería segura. Todos los mensajes están cifrados con cifrado de extremo a extremo. Además, ningún mensaje revela quién es el autor o el destinatario previsto, por lo que nadie, ni siquiera Status, sabe quién está hablando con quién o qué se dijo.
-
-BILLETERA SEGURA DE CRIPTOMONEDAS
-La billetera de criptomonedas de Status te permite enviar, almacenar e intercambiar de forma segura activos de Ethereum como ETH, SNT, stablecoins como DAI, así como coleccionables digitales. Controla con confianza tus criptomonedas y activos digitales con nuestra aplicación de billetera multichain de Ethereum, que soporta mainnet, Arbitrum y Optimism. La billetera blockchain de Status actualmente solo soporta activos ETH, ERC-20, ERC-721 y ERC-1155; no soporta Bitcoin.
+Envía chats privados 1:1 y grupales sin que nadie espíe tus comunicaciones. Status es una aplicación de mensajería que elimina los servidores de mensajes centralizados para una mayor privacidad y una mensajería segura. Todos los mensajes están encriptados de extremo a extremo. Además, ningún mensaje expone quién es el autor o el destinatario previsto, por lo que nadie, ni siquiera Status, sabe quién está hablando con quién o qué se dijo.
 
 GANA CON DEFI
-Pon tus criptomonedas a trabajar con las últimas aplicaciones de finanzas descentralizadas y exchanges descentralizados (DEX) como Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber y más.
+Pon tus criptomonedas a trabajar con las últimas aplicaciones financieras descentralizadas y plataformas de intercambio descentralizadas (DEX) como Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber y más.
 
 CONECTA CON TU COMUNIDAD
-Explora, conecta y chatea con tus comunidades y amigos favoritos. Ya sea un pequeño grupo de amigos, un colectivo de artistas, traders de criptomonedas o la próxima gran organización, envía mensajes y comunícate con las comunidades de Status.
+Explora, conéctate y chatea con tus comunidades y amigos. Ya sea un pequeño grupo de amigos, un colectivo de artistas, traders de criptomonedas o la próxima gran organización, envía mensajes de texto y comunícate con las comunidades de Status.
 
 CREACIÓN DE CUENTAS PRIVADAS
-Mantén tu privacidad con la creación de cuentas pseudónimas. Al crear tu cuenta gratuita, NUNCA tendrás que ingresar un número de teléfono, dirección de correo electrónico o cuenta bancaria. Las claves privadas de tu billetera se generan localmente y se almacenan de manera segura para garantizar que solo tú tengas acceso a tus fondos y transacciones financieras.
+Mantén la privacidad con la creación de cuentas seudónimas. Al crear tu cuenta gratuita, NUNCA tendrás que compartir tu número de teléfono, tu dirección de correo electrónico o una cuenta bancaria. Las claves privadas de tu billetera se generan localmente y se almacenan de forma segura para garantizar que solo tú tienes acceso a tus fondos y transacciones financieras.

fastlane/metadata/android/es-ES/short_description.txt

@@ -1 +1 @@
-Criptobilletera y Chat Privado
+Conecta tus finanzas y la web3

fastlane/metadata/android/es-ES/title.txt

@@ -0,0 +1 @@
+Status: Billetera social cripto

fastlane/metadata/android/fr-FR/full_description.txt

@@ -0,0 +1,18 @@
+Status combine une messagerie pseudonyme axée sur la confidentialité et un portefeuille cryptographique sécurisé en un seul outil de communication puissant. Discutez avec des amis et des communautés en pleine croissance. Achetez, stockez et échangez des actifs numériques.
+
+Status est votre système d'exploitation Ethereum.
+
+PORTEFEUILLE ETHEREUM SÉCURISÉ
+Le portefeuille cryptographique Status vous permet d'envoyer, de stocker et d'échanger en toute sécurité des actifs Ethereum tels que ETH, SNT, des pièces stables telles que DAI, ainsi que des objets de collection. Prenez le contrôle en toute confiance de votre cryptomonnaie et de vos actifs numériques avec notre application de portefeuille Ethereum multichaîne, prenant en charge le réseau principal, Arbitrum et Optimism. Le portefeuille blockchain Status ne prend actuellement en charge que les actifs ETH, ERC-20, ERC-721 et ERC-1155 ; il ne prend pas en charge Bitcoin.
+
+MESSAGERIE PRIVÉE
+Envoyez des conversations privées en tête-à-tête et en groupe sans que personne ne surveille vos communications. Status est une application de messagerie qui élimine les relais de messages centralisés pour une plus grande confidentialité et une messagerie sécurisée. Tous les messages sont cryptés avec un cryptage de bout en bout. De plus, aucun message n'expose l'identité de l'auteur ou du destinataire prévu, de sorte que personne, pas même Status, ne sait qui parle à qui ou ce qui a été dit.
+
+GAGNEZ DE L'ARGENT AVEC DEFI
+Mettez votre crypto au travail avec les dernières applications financières décentralisées et les échanges décentralisés (DEX) tels que Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber, et plus encore.
+
+CONNECTEZ-VOUS AVEC VOTRE COMMUNAUTÉ
+Explorez, connectez-vous et discutez avec vos communautés et amis préférés. Qu'il s'agisse d'un petit groupe d'amis, d'un collectif d'artistes, de traders de crypto-monnaies ou de la prochaine grande organisation, envoyez des SMS et communiquez avec les communautés Status.
+
+CRÉATION DE COMPTE PRIVÉ
+Restez privé grâce à la création de compte pseudo-anonyme. Lors de la création de votre compte gratuit, vous n'aurez JAMAIS besoin de saisir un numéro de téléphone, une adresse e-mail ou un compte bancaire. Les clés privées de votre portefeuille sont générées localement et stockées en toute sécurité pour garantir que vous seul avez accès à vos fonds et à vos transactions financières.

fastlane/metadata/android/fr-FR/short_description.txt

@@ -0,0 +1 @@
+Finance privée + Web3

fastlane/metadata/android/fr-FR/title.txt

@@ -0,0 +1 @@
+Status : Portef. crypto social

fastlane/metadata/android/ja-JP/full_description.txt

@@ -0,0 +1,21 @@
+Statusは、匿名のプライバシー重視のメッセンジャーと安全な暗号通貨ウォレットを1つの強力なコミュニケーションツールに組み合わせています。友達や成長中のコミュニティとチャットしましょう。デジタル資産を購入、保管、交換しましょう。
+
+StatusはあなたのEthereumオペレーティングシステムです。
+
+安全なEthereumウォレット
+Status暗号通貨ウォレットを使用すると、ETH、SNT、DAIなどのステーブルコイン、収集品などのEthereum資産を安全に送信、保管、交換できます。メインネット、Arbitrum、OptimismをサポートするマルチチェーンEthereumウォレットアプリを使用して、暗号通貨とデジタル資産を自信を持って管理できます。 Status ブロックチェーン ウォレットは現在、ETH、ERC-20、ERC-721、ERC-1155 アセットのみをサポートしており、ビットコインはサポートしていません。
+
+プライベート メッセンジャー
+誰にも通信を覗かれることなく、プライベートな 1:1 チャットやプライベート グループ チャットを送信できます。Status は、集中型のメッセージ リレーを排除してプライバシーと安全なメッセージングを実現するメッセンジャー アプリです。すべてのメッセージはエンドツーエンドの暗号化で暗号化されます。さらに、メッセージの作成者や宛先の受信者が誰であるかは明らかにされないため、Status でさえ、誰が誰と話しているのか、何が話されたのかを知ることはできません。
+
+DEFI で稼ぐ
+
+Maker、Aave、Uniswap、Synthetix、PoolTogether、Zerion、Kyber などの最新の分散型金融アプリや分散型取引所 (DEX) で暗号通貨を活用しましょう。
+
+コミュニティとつながる
+
+お気に入りのコミュニティや友達を探索、接続、チャットしましょう。少人数の友人グループ、アーティスト集団、暗号通貨トレーダー、または次の大きな組織であっても、Status コミュニティとテキストでやり取りできます。
+
+プライベート アカウントの作成
+
+疑似匿名アカウントの作成でプライバシーを確保します。無料アカウントを作成するときに、電話番号、メール アドレス、銀行口座を入力する必要はありません。ウォレットの秘密鍵はローカルで生成され、安全に保管されるため、資金と金融取引にアクセスできるのはあなただけです。

fastlane/metadata/android/ja-JP/short_description.txt

@@ -0,0 +1 @@
+プライベート ファイナンスと Web3 を接続

fastlane/metadata/android/ja-JP/title.txt

@@ -0,0 +1 @@
+Status: ソーシャル クリプト ウォレット

fastlane/metadata/android/ko-KR/full_description.txt

@@ -1,18 +1,21 @@
-Status는 익명성을 보장하는 프라이버시 중심의 메신저와 안전한 암호화폐 지갑을 하나의 강력한 커뮤니케이션 도구로 결합했습니다. 친구들과 성장하는 커뮤니티와 채팅하세요. 디지털 자산을 구매, 저장, 교환할 수 있습니다.
+Status는 익명의 개인 정보 보호 중심 메신저와 안전한 암호화폐 지갑을 하나의 강력한 커뮤니케이션 도구로 결합합니다. 친구 및 성장하는 커뮤니티와 채팅하세요. 디지털 자산을 구매, 저장 및 교환하세요.
 
-Status는 당신의 Ethereum 운영체제입니다.
+Status는 귀하의 Ethereum 운영 체제입니다.
 
-프라이빗 메신저
-개인 1:1 채팅과 비공개 그룹 채팅을 통해 누구도 당신의 통신을 엿볼 수 없습니다. Status는 중앙 집중식 메시지 중계를 제거하여 더 큰 프라이버시와 안전한 메시징을 제공하는 메신저 앱입니다. 모든 메시지는 종단 간 암호화로 보호됩니다. 또한, 어떤 메시지도 작성자나 의도된 수신자의 신원을 노출하지 않기 때문에, Status조차도 누가 누구와 대화하는지, 무슨 말을 했는지 알 수 없습니다.
+안전한 이더리움 지갑
+Status 암호화폐 지갑을 사용하면 ETH, SNT, DAI와 같은 스테이블 코인, 수집품과 같은 이더리움 자산을 안전하게 보내고, 저장하고, 교환할 수 있습니다. 메인넷, Arbitrum 및 Optimism을 지원하는 멀티체인 이더리움 지갑 앱으로 암호화폐와 디지털 자산을 자신 있게 제어하세요. Status 블록체인 지갑은 현재 ETH, ERC-20, ERC-721 및 ERC-1155 자산만 지원하며 비트코인은 지원하지 않습니다.
 
-안전한 Ethereum 지갑
-Status 암호화폐 지갑을 통해 ETH, SNT, DAI와 같은 스테이블코인, 그리고 암호화 수집품과 같은 Ethereum 자산을 안전하게 송금, 저장 및 교환할 수 있습니다. 메인넷, Arbitrum, Optimism을 지원하는 우리의 멀티체인 Ethereum 지갑 앱을 사용해 당신의 암호화폐와 디지털 자산을 자신 있게 관리하세요. Status 블록체인 지갑은 현재 ETH, ERC-20, ERC-721, ERC-1155 자산만 지원하며, Bitcoin은 지원하지 않습니다.
+개인 메신저
+아무도 귀하의 커뮤니케이션을 엿보지 않고 개인 1:1 및 개인 그룹 채팅을 보내세요. Status는 중앙 집중식 메시지 릴레이를 제거하여 더 큰 프라이버시와 안전한 메시징을 제공하는 메신저 앱입니다. 모든 메시지는 종단 간 암호화로 암호화됩니다. 또한, 메시지에는 작성자 또는 의도된 수신자가 노출되지 않으므로 Status를 포함하여 아무도 누가 누구와 대화하고 있는지 또는 무슨 말을 했는지 알 수 없습니다.
 
-DeFi로 수익 창출
-Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber 등 최신 탈중앙화 금융 앱과 탈중앙화 거래소(DEX)를 사용해 암호화폐를 활용하세요.
+DEFI로 수익 창출
+
+Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber 등과 같은 최신 분산 금융 앱 및 분산 거래소(DEX)에서 암호화폐를 활용하세요.
 
 커뮤니티와 연결
-당신의 좋아하는 커뮤니티와 친구들과 탐색, 연결 및 채팅하세요. 작은 친구 모임이든, 아티스트 집단이든, 암호화폐 거래자든, 다음 큰 조직이든, Status 커뮤니티를 통해 텍스트를 보내고 소통하세요.
 
-프라이빗 계정 생성
-익명 계정 생성을 통해 프라이버시를 유지하세요. 무료 계정을 생성할 때 전화번호, 이메일 주소, 은행 계좌를 절대 입력할 필요가 없습니다. 지갑의 개인 키는 로컬에서 생성되고 안전하게 저장되어, 오직 당신만이 자금과 금융 거래에 접근할 수 있습니다.
+좋아하는 커뮤니티와 친구를 탐색하고, 연결하고, 채팅하세요. 소규모 친구 그룹, 아티스트 집단, 암호화폐 거래자 또는 차세대 대기업이든 Status 커뮤니티에 문자를 보내고 소통하세요.
+
+개인 계정 생성
+
+익명 계정을 생성하여 개인 정보를 보호하세요. 무료 계정을 만들 때 전화번호, 이메일 주소 또는 은행 계좌를 입력할 필요가 없습니다. 지갑 개인 키는 로컬에서 생성되고 안전하게 저장되어 본인만 자금과 금융 거래에 액세스할 수 있습니다.

fastlane/metadata/android/ko-KR/short_description.txt

@@ -1 +1 @@
-암호화폐 지갑 & 비밀 메신저
+개인 금융 및 Web3 연결

fastlane/metadata/android/ko-KR/title.txt

@@ -0,0 +1 @@
+Status: 소셜 크립토 지갑

fastlane/metadata/android/pt-BR/full_description.txt

@@ -2,22 +2,17 @@ Status é um app de mensagem e uma carteira de criptomoedas focado em privacidad
 
 Status é o seu sistema operacional para Ethereum.
 
-APP DE MENSAGEM PRIVADO
+CARTEIRA ETHEREUM SEGURA
+A carteira de criptomoedas Status permite que você envie, armazene e troque ativos Ethereum, como ETH, SNT, stablecoins como DAI, além de colecionáveis, de forma segura. Controle com confiança suas criptomoedas e ativos digitais com nosso aplicativo de carteira Ethereum multichain, que suporta Mainnet, Arbitrum e Optimism. A carteira blockchain da Status atualmente suporta apenas ativos ETH, ERC-20, ERC-721 e ERC-1155; não suporta Bitcoin.
 
+APP DE MENSAGEM PRIVADO
 Envie mensagens privadas em chats 1:1 ou em grupos. Status é um aplicativo de mensagem descentralizado que foca em privacidade e anonimato. Todas as mensagens são protegidas com criptografia de ponta a ponta. Além disso, nenhuma mensagem revela quem é o(a) autor(a) ou o(a) destinatário(a) pretendido(a), então ninguém, nem mesmo a Status, sabe quem está conversando com quem ou o que foi dito.
 
-CARTEIRA SEGURA DE ETHEREUM
-
-A carteira de criptomoedas Status permite que você envie, armazene e troque ativos Ethereum, como ETH, SNT, stablecoins como DAI, além de colecionáveis, de forma segura. Controle com confiança suas criptomoedas e ativos digitais com nosso aplicativo de carteira Ethereum multichain, que suporta mainnet, Arbitrum e Optimism. A carteira blockchain da Status atualmente suporta apenas ativos ETH, ERC-20, ERC-721 e ERC-1155; não suporta Bitcoin.
-
 MONETIZE COM DEFI E STAKING
-
 Coloque suas criptomoedas para trabalhar (staking) com os mais recentes aplicativos de finanças descentralizadas e exchanges descentralizadas (DEX), como Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber e mais.
 
 CONECTE-SE COM SUA COMUNIDADE
-
 Explore, conecte-se e converse com seus amigos e comunidades favoritas. Seja um grupo de amigos, de artistas, de traders de criptomoedas ou a próxima grande empresa - envie textos e comunique-se através das comunidades da Status.
 
 CRIAÇÃO DE CONTA PRIVADA
-
 Mantenha sua privacidade com a criação de conta anônima. Ao criar sua conta gratuita, você NUNCA precisará inserir um número de telefone, endereço de e-mail ou conta bancária. Suas chaves privadas da carteira são geradas localmente e armazenadas com segurança para garantir que apenas você tenha acesso aos seus fundos e transações financeiras.

fastlane/metadata/android/pt-BR/short_description.txt

@@ -1 +1 @@
-Crypto Wallet & Private Chat
+Privacidade Financeira e Web3

fastlane/metadata/android/pt-BR/title.txt

@@ -0,0 +1 @@
+Status: Carteira social cripto

fastlane/metadata/android/ru-RU/full_description.txt

@@ -1,18 +1,18 @@
-Status сочетает в себе мессенджер, ориентированный на анонимность и конфиденциальность, и безопасный криптовалютный кошелек в одном мощном инструменте для общения. Общайтесь с друзьями и развивающимися сообществами. Покупайте, отправляйте и обменивайте цифровые активы.
+Status объединяет анонимный мессенджер, ориентированный на конфиденциальность, и защищенный криптокошелек в один мощный инструмент для финансов и общения. Общайтесь с друзьями, находите новые сообщества, а также покупайте, храните и обменивайте цифровые активы.
 
 Status — это ваша операционная система для Ethereum.
 
-ПРИВАТНЫЙ МЕССЕНДЖЕР
-Отправляйте приватные сообщения 1:1 и участвуйте в групповых чатах, будучи уверенными в том, что никто не может перехватить или прочитать ваши сообщения. Status — это мессенджер, который устраняет необходимость в централизованных серверах для передачи сообщений, обеспечивая высшую степень конфиденциальности и безопасности. Все сообщения защищены сквозным шифрованием. Более того, ни одно сообщение не раскрывает, кто является автором или предполагаемым получателем, поэтому никто, включая Status, не знает, кто с кем общается и что было сказано.
+БЕЗОПАСНЫЙ КОШЕЛЕК ETHEREUM
+Крипто-кошелек Status позволяет вам безопасно отправлять, хранить и обменивать активы Ethereum, такие как ETH, SNT, стейблкоины, такие как DAI, а также невзаимозаменяемые токены. Контролируйте свою криптовалюту с помощью нашего криптокошелека для Ethereum, поддерживающего Ethereum, Arbitrum и Optimism. В настоящее время криптокошелек Status поддерживает такие активы ETH, ERC-20, ERC-721 и ERC-1155.
 
-БЕЗОПАСНЫЙ КРИПТОКОШЕЛЕК ДЛЯ ETHEREUM
-Кошелек Status позволяет вам безопасно отправлять, хранить и обменивать Ethereum-активы, такие как ETH, SNT, стейблкоины (например, DAI), а также цифровые коллекционные предметы. Контролируйте свои криптовалюты и цифровые активы с уверенностью с помощью нашего мультичейн Ethereum-кошелька, поддерживающего mainnet, Arbitrum и Optimism. Кошелек Status в настоящее время поддерживает активы ETH, ERC-20, ERC-721 и ERC-1155; поддержка Bitcoin отсутствует.
+ПРИВАТНИЙ МЕСЕНДЖЕР
+Отправляйте приватные сообщения друзьям или группам. Status — это приложение для обмена сообщениями, которое поддерживает децентрализованную систему для повышения конфиденциальности и безопасного обмена сообщениями. Все сообщения зашифрованы с помощью сквозного шифрования. Более того, ни одно сообщение не содержит информации об авторе или получателе, поэтому никто, даже Status, не знает, кто с кем общается или что было отправлено.
 
 ЗАРАБАТЫВАЙТЕ С DEFI
-Заставьте свои криптовалюты работать на вас с актуальными приложениями децентрализованных финансов и децентрализованными биржами (DEX), такими как Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber и другими.
+Используйте свою криптовалюту для работы с новейшими приложениями для децентрализованных финансов и децентрализованными криптобиржами (DEX), такими как Maker, Aave, Uniswap, Synthetix, PoolTogether, Kyber и другие.
 
-СВЯЗЬ С СООБЩЕСТВОМ
-Исследуйте, присоединяйтесь и общайтесь с любимыми сообществами и друзьями. Независимо от того, являетесь ли вы частью небольшой группы друзей, художественного коллектива, трейдеров криптовалют или крупной организации — отправляйте сообщения и общайтесь в сообществах Status.
+НАЙДИТЕ ВАШЕ СООБЩЕСТВО
+Находите, исследуйте и общайтесь с любимыми сообществами и друзьями. Независимо от того, является ли это небольшой группой друзей, коллективом художников, криптотрейдеров или следующим большим сообществом единомышленников — отправляйте текстовые сообщения и общайтесь с сообществами в Status.
 
-КОНФИДЕНЦИАЛЬНАЯ РЕГИСТРАЦИЯ
-Создайте анонимный профиль и оставайтесь конфиденциальными. При создании бесплатного профиля вам НИКОГДА не потребуется вводить номер телефона, адрес электронной почты или банковские данные. Ваши приватные ключи кошелька генерируются локально и хранятся безопасно, чтобы только вы имели доступ к своим средствам и финансовым операциям.
+СОЗДАНИЕ ПРИВАТНОГО АККАУНТА
+Оставайтесь конфиденциальными с помощью создания анонимного аккаунта. При создании аккаунта вам НИКОГДА не нужно будет вводить номер телефона, адрес электронной почты или банковский счет. Приватные ключи вашего криптокошелька генерируются локально на вашем устройстве и надежно хранятся, чтобы только вы имели доступ к своим средствам и финансовым транзакциям.

fastlane/metadata/android/ru-RU/short_description.txt

@@ -1 +1 @@
-Crypto Wallet & Private Chat
+Web3 финансы и приват чат

fastlane/metadata/android/ru-RU/title.txt

@@ -0,0 +1 @@
+Status: Криптокошелек

fastlane/metadata/android/tr-TR/full_description.txt

@@ -1,18 +1,18 @@
-Status, gizlilik odaklı takma adla kullanılan bir mesajlaşma uygulaması ile güvenli bir kripto cüzdanını birleştirerek güçlü bir iletişim aracı sunar. Arkadaşlarınız ve büyüyen topluluklarla sohbet edin. Dijital varlıklar satın alın, saklayın ve değiştirin.
+Status, takma adlı gizlilik odaklı mesajlaşmayı ve güvenli kripto cüzdanını tek bir güçlü iletişim aracında birleştiriyor. Arkadaşlarınızla ve büyüyen topluluklarla sohbet edin. Dijital varlıkları satın alın, saklayın ve değiştirin.
 
-Status, Ethereum için işletim sisteminizdir.
-
-ÖZEL MESAJLAŞMA UYGULAMASI
-Özel 1:1 ve grup sohbetlerini kimsenin iletişiminizi gözetlemesine izin vermeden gönderin. Status, merkezi mesaj iletimini ortadan kaldırarak daha fazla gizlilik ve güvenli mesajlaşma sağlayan bir mesajlaşma uygulamasıdır. Tüm mesajlar uçtan uca şifreleme ile korunur. Ayrıca, hiçbir mesaj yazarın veya hedeflenen alıcının kim olduğunu ortaya çıkarmaz, bu yüzden kimse, hatta Status bile, kimin kiminle konuştuğunu veya ne konuşulduğunu bilmez.
+Status, Ethereum işletim sisteminizdir.
 
 GÜVENLİ ETHEREUM CÜZDANI
-Status kripto cüzdanı, ETH, SNT, DAI gibi stabilcoinler ve koleksiyon gibi Ethereum varlıklarını güvenle göndermenize, saklamanıza ve değiştirmenize olanak tanır. Ana ağ, Arbitrum ve Optimism'i destekleyen çok zincirli Ethereum cüzdan uygulamamızla kripto paralarınız ve dijital varlıklarınız üzerinde güvenle kontrol sahibi olun. Status blok zinciri cüzdanı şu anda yalnızca ETH, ERC-20, ERC-721 ve ERC-1155 varlıklarını destekler; Bitcoin desteklenmemektedir.
+Status kripto cüzdanı, ETH, SNT, DAI gibi sabit paralar ve koleksiyonluk eşyalar gibi Ethereum varlıklarını güvenli bir şekilde göndermenize, saklamanıza ve değiştirmenize olanak tanır. Ana ağ, Arbitrum ve Optimism'i destekleyen çok zincirli Ethereum cüzdan uygulamamızla kripto paranızın ve dijital varlıklarınızın kontrolünü güvenle ele alın. Status blok zinciri cüzdanı şu anda yalnızca ETH, ERC-20, ERC-721 ve ERC-1155 varlıklarını destekliyor; Bitcoin'i desteklemiyor.
+
+ÖZEL MESAJLAŞMACI
+İletişimlerinizi kimse gözetlemeden özel 1:1 ve özel grup sohbetleri gönderin. Status, daha fazla gizlilik ve güvenli mesajlaşma için merkezi mesaj iletimlerini ortadan kaldıran bir mesajlaşma uygulamasıdır. Tüm mesajlar uçtan uca şifrelemeyle şifrelenir. Ayrıca, hiçbir mesaj yazarının veya hedeflenen alıcının kim olduğunu ifşa etmez, bu nedenle hiç kimse, Status bile kimin kiminle konuştuğunu veya ne söylendiğini bilmez.
 
 DEFI İLE KAZANIN
-Kripto paralarınızı Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber gibi en son merkeziyetsiz finans uygulamaları ve merkeziyetsiz borsalar (DEX) ile değerlendirin.
+Kripto paranızı Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber ve daha fazlası gibi en son merkezi olmayan finans uygulamaları ve merkezi olmayan borsalarla (DEX) çalıştırın.
 
 TOPLULUĞUNUZLA BAĞLANTI KURUN
-Favori topluluklarınız ve arkadaşlarınızla keşfedin, bağlantı kurun ve sohbet edin. İster küçük bir arkadaş grubu, bir sanatçı kolektifi, kripto para tacirleri veya bir sonraki büyük organizasyon olsun - Status topluluklarıyla mesajlaşın ve iletişim kurun.
+En sevdiğiniz toplulukları ve arkadaşlarınızla keşfedin, bağlantı kurun ve sohbet edin. İster küçük bir arkadaş grubu, ister bir sanatçı kolektifi, kripto tüccarları veya bir sonraki büyük organizasyon olsun - Status topluluklarıyla mesajlaşın ve iletişim kurun.
 
 ÖZEL HESAP OLUŞTURMA
-Takma adla hesap oluşturarak gizliliğinizi koruyun. Ücretsiz hesabınızı oluştururken asla telefon numarası, e-posta adresi veya banka hesabı girmenize gerek yoktur. Cüzdanınızın özel anahtarları yerel olarak oluşturulur ve yalnızca sizin fonlarınıza ve finansal işlemlerinize erişiminiz olmasını sağlamak için güvenli bir şekilde saklanır.
+Sahte anonim hesap oluşturma ile gizli kalın. Ücretsiz hesabınızı oluştururken ASLA bir telefon numarası, e-posta adresi veya banka hesabı girmeniz gerekmeyecek. Cüzdan özel anahtarlarınız yerel olarak oluşturulur ve yalnızca sizin fonlarınıza ve finansal işlemlerinize erişebilmenizi sağlamak için güvenli bir şekilde saklanır.

fastlane/metadata/android/tr-TR/short_description.txt

@@ -1 +1 @@
-Kripto Cüzdanı ve Özel Sohbet
+Özel Finans ve Web3'ü Bağlayın

fastlane/metadata/android/tr-TR/title.txt

@@ -0,0 +1 @@
+Status:  Sosyal Kripto Cüzdanı

fastlane/metadata/android/uk-UA/full_description.txt

@@ -0,0 +1,18 @@
+Status поєднує анонімний месенджер, орієнтований на конфіденційність та захищений криптогаманець в один потужний інструмент для фінансів та спілкування. Спілкуйтеся з друзями та спільнотами. Купуйте, зберігайте та обмінюйте крипто активи.
+
+Status — це ваша операційна система для Ethereum.
+
+БЕЗПЕЧНИЙ КРИПТОГАМАНЕЦЬ ДЛЯ ETHEREUM
+Криптогаманець Status дозволяє безпечно надсилати, зберігати та обмінювати крипто активи на Ethereum, такі як ETH, SNT, стейблкоїни та DAI, а також невзаємозамінні токени. Впевнено контролюйте свої крипто активи за допомогою нашого блокчейн гаманця для Ethereum, який підтримує Ethereum, Arbitrum і Optimism. Криптогаманець Status наразі підтримує такі кприпто активи як ETH, ERC-20, ERC-721 та ERC-1155.
+
+ПРИВАТНИЙ МЕСЕНДЖЕР
+Надсилайте приватні повідомлення друзям або групам. Status — це програма для обміну повідомленнями, яка підтримує децентралізовану систему повідомлень для більшої конфіденційності та безпечного обміну повідомленнями. Усі повідомлення зашифровано за допомогою наскрізного шифрування. Крім того, жодне повідомлення не містить інформації про автора чи одержувача, тому ніхто, навіть Status, не знає, хто з ким спілкувється або що було надіслано.
+
+ЗАРОБЛЯЙТЕ З DEFI
+Налаштуйте свою криптовалюту на роботу з найновішими програмами для децентралізованих фінансів і децентралізованими крипто біржами (DEX), такими як Maker, Aave, Uniswap, Synthetix, PoolTogether, Kyber тощо.
+
+ЗНАЙДІТЬ ВАШУ СПІЛЬНОТУ
+Знаходьте, досліджуйте та спілкуйтеся з улюбленими спільнотами та друзями. Незалежно від того, чи це невелика група друзів, колектив художників, криптотрейдерів чи наступна велика спільнота однодумців – надсилайте текстові повідомлення та спілкуйтеся зі спільнотами у Status.
+
+СТВОРЕННЯ ПРИВАТНОГО ОБЛІКОВОГО ЗАПИСУ
+Залишайтеся конфіденційними за допомогою створення анонімного облікового запису. Під час створення облікового запису вам НІКОЛИ не доведеться вводити номер телефону, адресу електронної пошти чи банківський рахунок. Приватні ключі вашого крипто гаманця генеруються локально на вашому пристрої та надійно зберігаються, щоб лише Ви мали доступ до своїх коштів і фінансових транзакцій.

fastlane/metadata/android/uk-UA/short_description.txt

@@ -0,0 +1 @@
+Web3 фінанси та приват чат

fastlane/metadata/android/uk-UA/title.txt

@@ -0,0 +1 @@
+Status: Криптогаманець

fastlane/metadata/android/uk/full_description.txt

@@ -1,18 +0,0 @@
-Status поєднує у собі месенджер, орієнтований на анонімність і конфіденційність, з безпечним криптовалютним гаманцем в одному потужному інструменті для спілкування. Спілкуйтеся з друзями та зростаючими спільнотами. Купуйте, надсилайте та обмінюйте цифрові активи.
-
-Status — це ваша операційна система для Ethereum.
-
-ПРИВАТНИЙ МЕСЕНДЖЕР
-Надсилайте приватні повідомлення та беріть участь у групових чатах, будучи впевненими, що ніхто не може перехопити або прочитати ваші листування. Status усуває необхідність у централізованих серверах для передачі повідомлень, забезпечуючи найвищий рівень конфіденційності та безпеки. Усі повідомлення захищені наскрізним шифруванням. Крім того, жодне повідомлення не розкриває, хто є його автором або передбачуваним отримувачем, тому ніхто, включаючи Status, не знає, хто з ким спілкується і що було сказано.
-
-БЕЗПЕЧНИЙ КРИПТОГАМАНЕЦЬ ДЛЯ ETHEREUM
-Гаманець Status дозволяє вам безпечно надсилати, зберігати та обмінювати активи Ethereum, такі як ETH, SNT, стейблкоїни (наприклад, DAI), а також цифрові колекційні предмети. Контролюйте свої криптовалюти та цифрові активи з упевненістю за допомогою нашого мультичейн Ethereum-гаманця, що підтримує Mainnet, Arbitrum та Optimism. Гаманець Status наразі підтримує активи ETH, ERC-20, ERC-721 і ERC-1155; підтримка Bitcoin відсутня.
-
-ЗАРОБЛЯЙТЕ ЗА ДОПОМОГОЮ DEFI
-Змусьте свої криптовалюти працювати на вас за допомогою актуальних додатків децентралізованих фінансів і децентралізованих бірж (DEX), таких як Maker, Aave, Uniswap, Synthetix, PoolTogether, Zerion, Kyber та інших.
-
-ЗВ’ЯЗОК ІЗ СПІЛЬНОТОЮ
-Відкривайте, знаходьте й спілкуйтесь зі своїми улюбленими спільнотами та друзями. Незалежно від того, чи є ви частиною невеликої групи друзів, творчого колективу, криптотрейдерів або великої організації — надсилайте повідомлення та спілкуйтесь у спільнотах Status.
-
-КОНФІДЕНЦІЙНА РЕЄСТРАЦІЯ
-Створіть анонімний профіль і залишайтеся конфіденційними. Під час створення безкоштовного профілю вам НІКОЛИ не потрібно буде вводити номер телефону, адресу електронної пошти або банківські дані. Ваші приватні ключі гаманця генеруються локально та зберігаються надійно, щоб лише ви мали доступ до своїх коштів і фінансових операцій.

fastlane/metadata/android/uk/short_description.txt

@@ -1 +0,0 @@
-Crypto Wallet & Private Chat

fastlane/metadata/android/zh-CN/full_description.txt

@@ -2,12 +2,12 @@ Status 将保护匿名私密的消息应用，与安全的加密货币钱包结
 
 Status 是你的以太坊操作系统。
 
+安全的以太坊钱包
+Status 加密货币钱包支持安全地发送、存储和交换以太坊资产（例如 ETH、SNT）、稳定币（例如 DAI）以及数字藏品。Status 多链以太坊钱包支持主网、Arbitrum 和 Optimism，让您安心掌控加密货币和数字资产。Status 区块链钱包目前仅支持 ETH、ERC-20、ERC-721 和 ERC-1155 资产；不支持 Bitcoin。
+
 私密通信
 一对一或同多人发送私密消息，没有人能窥探你的通信内容。Status 不使用中心化消息中继，提升消息的隐私和安全。所有消息都经过端到端加密。此外，消息不含发送或接收者的身份信息，包括 Status 在内的任何人都无法获知消息内容或交流者身份。
 
-安全的以太坊钱包
-Status 加密货币钱包支持安全地发送、存储和交换以太坊上的资产，如 ETH、SNT，DAI 等稳定币以及数字藏品。Status 多链以太坊钱包支持主网、Arbitrum 和 Optimism，让您安心掌控加密货币和数字资产。Status 区块链钱包目前仅支持 ETH、ERC-20、ERC-721 和 ERC-1155 资产；不支持 Bitcoin。
-
 赚取 DeFi 收益
 使用最新的去中心化金融应用和去中心化交易所 (DEX)，如 Maker、Aave、Uniswap、Synthetix、PoolTogether、Zerion、Kyber 等，充分发挥加密货币的作用。
 

fastlane/metadata/android/zh-CN/short_description.txt

@@ -1 +1 @@
-安全地聊天和交易
+连接个人金融和Web3

fastlane/metadata/android/zh-CN/title.txt

@@ -0,0 +1 @@
+Status: 可以社交的加密货币钱包

ios/Podfile.lock

@@ -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

ios/StatusIm.xcodeproj/project.pbxproj

@@ -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",

ios/StatusIm/AppDelegate.mm

@@ -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];

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

@@ -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 {

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

@@ -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")
         }
     }
 

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

@@ -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

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

@@ -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)

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

@@ -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
         )
     }
 }

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

@@ -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)
-        }
-    }
-} 

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

@@ -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>? {

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

@@ -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

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

@@ -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)
     }
 }

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

@@ -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

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

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

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

@@ -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

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

@@ -4,7 +4,6 @@
 #import "Statusgo.h"
 #import "Utils.h"
 #import "SSZipArchive.h"
-#import "StatusBackendClient.h"
 
 @implementation LogManager
 
@@ -21,7 +20,9 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
 #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];
@@ -87,36 +88,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

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

@@ -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

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

@@ -5,6 +5,5 @@
 #import "RCTLog.h"
 
 @interface Status : NSObject <RCTBridgeModule, StatusgoSignalHandler>
-+ (Status *)sharedInstance;
 - (void)handleSignal:(NSString *)signal;
 @end

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

@@ -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

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

@@ -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 

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

@@ -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 

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

@@ -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

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

@@ -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

nix/overlay.nix

@@ -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;

package.json

@@ -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",

shadow-cljs.edn

@@ -51,60 +51,56 @@
    ;; 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_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"}
    :chunks {:fleets legacy.status-im.fleet.default-fleet/default-fleets}
    :release
    {:closure-defines

src/status_im/config.cljs

@@ -134,14 +134,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 "")

src/status_im/contexts/onboarding/common/background/view.cljs

@@ -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))))
 

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

@@ -561,7 +561,7 @@
                        :error error-message}))
          {:fx [[:dispatch
                 (cond
-                  (and failure? swap?) [:wallet/swap-proposal-error error-message]
+                  (and failure? swap?) [:wallet/swap-proposal-error error]
                   failure?             [:wallet/suggested-routes-error error-message]
                   swap?                [:wallet/swap-proposal-success (fix-routes data)]
                   :else                [:wallet/suggested-routes-success (fix-routes data)

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

@@ -27,12 +27,14 @@
                                     :test-networks-enabled? test-networks-enabled?
                                     :token-symbol           (get-in data [:asset-to-pay :symbol])}))
          network'               (or network
-                                    (swap-utils/select-network asset-to-pay))]
+                                    (swap-utils/select-network asset-to-pay))
+         start-point            (if open-new-screen? :action-menu :swap-button)]
      {:db (-> db
               (assoc-in [:wallet :ui :swap :asset-to-pay] asset-to-pay)
               (assoc-in [:wallet :ui :swap :asset-to-receive] asset-to-receive)
               (assoc-in [:wallet :ui :swap :network] network')
-              (assoc-in [:wallet :ui :swap :launch-screen] view-id))
+              (assoc-in [:wallet :ui :swap :launch-screen] view-id)
+              (assoc-in [:wallet :ui :swap :start-point] start-point))
       :fx (if network'
             [[:dispatch [:wallet/switch-current-viewing-account (:address account)]]
              [:dispatch
@@ -40,6 +42,13 @@
                 [:open-modal :screen/wallet.setup-swap]
                 [:navigate-to-within-stack
                  [:screen/wallet.setup-swap :screen/wallet.swap-select-asset-to-pay]])]
+             [:dispatch
+              [:centralized-metrics/track :metric/swap-start
+               {:network       (:chain-id network)
+                :pay_token     (:symbol asset-to-pay)
+                :receive_token (:symbol asset-to-receive)
+                :start_point   start-point
+                :launch_screen view-id}]]
              [:dispatch [:wallet.swap/set-default-slippage]]]
             [[:dispatch
               [:show-bottom-sheet
@@ -57,22 +66,36 @@
 
 (rf/reg-event-fx :wallet.swap/select-asset-to-pay
  (fn [{:keys [db]} [{:keys [token]}]]
-   {:db (update-in db
-                   [:wallet :ui :swap]
-                   #(-> %
-                        (assoc :asset-to-pay token)
-                        (dissoc :amount
-                                :amount-hex
-                                :last-request-uuid
-                                :swap-proposal
-                                :error-response
-                                :loading-swap-proposal?
-                                :approval-transaction-id
-                                :approved-amount)))}))
+   (let [previous-token (get-in db [:wallet :ui :swap :asset-to-pay])
+         network        (get-in db [:wallet :ui :swap :network])]
+     {:db (update-in db
+                     [:wallet :ui :swap]
+                     #(-> %
+                          (assoc :asset-to-pay token)
+                          (dissoc :amount
+                                  :amount-hex
+                                  :last-request-uuid
+                                  :swap-proposal
+                                  :error-response
+                                  :loading-swap-proposal?
+                                  :approval-transaction-id
+                                  :approved-amount)))
+      :fx [[:dispatch
+            [:centralized-metrics/track :metric/swap-asset-to-pay-changed
+             {:network        (:chain-id network)
+              :previous_token (:symbol previous-token)
+              :new_token      (:symbol token)}]]]})))
 
 (rf/reg-event-fx :wallet.swap/select-asset-to-receive
  (fn [{:keys [db]} [{:keys [token]}]]
-   {:db (assoc-in db [:wallet :ui :swap :asset-to-receive] token)}))
+   (let [previous-token (get-in db [:wallet :ui :swap :asset-to-receive])
+         network        (get-in db [:wallet :ui :swap :network])]
+     {:db (assoc-in db [:wallet :ui :swap :asset-to-receive] token)
+      :fx [[:dispatch
+            [:centralized-metrics/track :metric/swap-asset-to-receive-changed
+             {:network        (:chain-id network)
+              :previous_token (:symbol previous-token)
+              :new_token      (:symbol token)}]]]})))
 
 (rf/reg-event-fx :wallet.swap/set-default-slippage
  (fn [{:keys [db]}]
@@ -132,9 +155,15 @@
                                       :last-request-uuid      request-uuid
                                       :amount                 amount
                                       :amount-hex             amount-in-hex
-                                      :loading-swap-proposal? true)
+                                      :loading-swap-proposal? true
+                                      :initial-response?      true)
                                      clean-approval-transaction?
                                      (dissoc :approval-transaction-id :approved-amount :swap-proposal)))
+        :fx            [[:dispatch
+                         [:centralized-metrics/track :metric/swap-proposal-start
+                          {:network       swap-chain-id
+                           :pay_token     pay-token-id
+                           :receive_token receive-token-id}]]]
         :json-rpc/call [{:method   "wallet_getSuggestedRoutesAsync"
                          :params   params
                          :on-error (fn [error]
@@ -148,6 +177,10 @@
  (fn [{:keys [db]} [swap-proposal]]
    (let [last-request-uuid (get-in db [:wallet :ui :swap :last-request-uuid])
          amount-hex        (get-in db [:wallet :ui :swap :amount-hex])
+         asset-to-pay      (get-in db [:wallet :ui :swap :asset-to-pay])
+         asset-to-receive  (get-in db [:wallet :ui :swap :asset-to-receive])
+         network           (get-in db [:wallet :ui :swap :network])
+         initial-response? (get-in db [:wallet :ui :swap :initial-response?])
          view-id           (:view-id db)
          request-uuid      (:uuid swap-proposal)
          best-routes       (:best swap-proposal)
@@ -163,22 +196,45 @@
                                :swap-proposal          (when-not (empty? best-routes)
                                                          (assoc (first best-routes) :uuid request-uuid))
                                :error-response         error-response
-                               :loading-swap-proposal? false)}
+                               :loading-swap-proposal? false
+                               :initial-response?      false)}
+         (and initial-response? (seq best-routes))
+         (assoc :fx
+                [[:dispatch
+                  [:centralized-metrics/track :metric/swap-proposal-received
+                   {:network       (:chain-id network)
+                    :pay_token     (:symbol asset-to-pay)
+                    :receive_token (:symbol asset-to-receive)}]]])
+         (and initial-response? (empty? best-routes))
+         (assoc :fx
+                [[:dispatch
+                  [:centralized-metrics/track :metric/swap-proposal-failed
+                   {:error (:code error-response)}]]])
          ;; Router is unstable and it can return a swap proposal and after auto-refetching it can
          ;; return an error. Ideally this shouldn't happen, but adding this behavior so if the
          ;; user is in swap confirmation screen or in token approval confirmation screen, we
          ;; navigate back to setup swap screen so proper error is displayed.
          (and (empty? best-routes) (= view-id :screen/wallet.swap-set-spending-cap))
-         (assoc :fx [[:dismiss-modal :screen/wallet.swap-set-spending-cap]])
+         (assoc :fx
+                [[:dispatch
+                  [:centralized-metrics/track :metric/swap-proposal-failed
+                   {:error (:code error-response)}]]
+                 [:dismiss-modal :screen/wallet.swap-set-spending-cap]])
          (and (empty? best-routes) (= view-id :screen/wallet.swap-confirmation))
-         (assoc :fx [[:navigate-back]]))))))
+         (assoc :fx
+                [[:dispatch
+                  [:centralized-metrics/track :metric/swap-proposal-failed
+                   {:error (:code error-response)}]]
+                 [:navigate-back]]))))))
 
 (rf/reg-event-fx :wallet/swap-proposal-error
- (fn [{:keys [db]} [error-message]]
+ (fn [{:keys [db]} [error-response]]
    {:db (-> db
             (update-in [:wallet :ui :swap] dissoc :route :swap-proposal)
             (assoc-in [:wallet :ui :swap :loading-swap-proposal?] false)
-            (assoc-in [:wallet :ui :swap :error-response] error-message))}))
+            (assoc-in [:wallet :ui :swap :error-response] error-response))
+    :fx [[:dispatch
+          [:centralized-metrics/track :metric/swap-proposal-failed {:error (:code error-response)}]]]}))
 
 (rf/reg-event-fx :wallet/stop-get-swap-proposal
  (fn []
@@ -279,16 +335,25 @@
                                                (-> amount-out
                                                    (number/hex->whole receive-token-decimals)
                                                    (money/to-fixed receive-token-decimals)))]
+                                         (rf/dispatch [:centralized-metrics/track
+                                                       (if approval-required?
+                                                         :metric/swap-approval-execution-start
+                                                         :metric/swap-transaction-execution-start)
+                                                       (cond-> {:network   swap-chain-id
+                                                                :pay_token token-id-from}
+                                                         (not approval-required?)
+                                                         (assoc :receive_token token-id-to))])
                                          (rf/dispatch [:wallet.swap/add-authorized-transaction
                                                        (cond-> {:transaction result
                                                                 :approval-transaction?
                                                                 approval-required?}
                                                          (not approval-required?)
                                                          (assoc :swap-data
-                                                                {:pay-token-symbol token-id-from
-                                                                 :pay-amount amount
+                                                                {:pay-token-symbol     token-id-from
+                                                                 :pay-amount           amount
                                                                  :receive-token-symbol token-id-to
-                                                                 :receive-amount receive-amount}))])
+                                                                 :receive-amount       receive-amount
+                                                                 :swap-chain-id        swap-chain-id}))])
                                          (rf/dispatch [:hide-bottom-sheet])
                                          (rf/dispatch [:dismiss-modal
                                                        (if approval-required?
@@ -308,6 +373,15 @@
                                                                  :receive-amount       receive-amount})}]
                                             500)))))
                        :on-error   (fn [error]
+                                     (rf/dispatch [:centralized-metrics/track
+                                                   (if approval-required?
+                                                     :metric/swap-approval-execution-failed
+                                                     :metric/swap-transaction-execution-failed)
+                                                   (cond-> {:network   swap-chain-id
+                                                            :error     error
+                                                            :pay_token token-id-from}
+                                                     (not approval-required?)
+                                                     (assoc :receive_token token-id-to))])
                                      (log/error "failed swap transaction"
                                                 {:event  :wallet/swap-transaction
                                                  :error  error
@@ -342,19 +416,26 @@
 
 (rf/reg-event-fx :wallet.swap/approve-transaction-update
  (fn [{:keys [db]} [{:keys [status]}]]
-   (let [{:keys [amount asset-to-pay swap-proposal]} (get-in db [:wallet :ui :swap])
-         provider-name                               (:bridge-name swap-proposal)
-         token-symbol                                (:symbol asset-to-pay)
-         current-viewing-account-address             (get-in db
-                                                             [:wallet :current-viewing-account-address])
-         account-name                                (get-in db
-                                                             [:wallet :accounts
-                                                              current-viewing-account-address :name])
-         transaction-confirmed-or-failed?            (#{:confirmed :failed} status)
-         transaction-confirmed?                      (= status :confirmed)]
+   (let [{:keys [amount asset-to-pay swap-proposal
+                 network]}                (get-in db [:wallet :ui :swap])
+         provider-name                    (:bridge-name swap-proposal)
+         token-symbol                     (:symbol asset-to-pay)
+         swap-chain-id                    (:chain-id network)
+         current-viewing-account-address  (get-in db
+                                                  [:wallet :current-viewing-account-address])
+         account-name                     (get-in db
+                                                  [:wallet :accounts
+                                                   current-viewing-account-address :name])
+         transaction-confirmed-or-failed? (#{:confirmed :failed} status)
+         transaction-confirmed?           (= status :confirmed)]
      (when transaction-confirmed-or-failed?
        (cond-> {:fx
                 [[:dispatch
+                  [:centralized-metrics/track :metric/swap-approval-execution-finished
+                   {:network   swap-chain-id
+                    :pay_token token-symbol
+                    :succeeded transaction-confirmed?}]]
+                 [:dispatch
                   [:toasts/upsert
                    {:id   :approve-transaction-update
                     :type (if transaction-confirmed? :positive :negative)
@@ -377,16 +458,23 @@
 (rf/reg-event-fx :wallet.swap/swap-transaction-update
  (fn [{:keys [db]} [{:keys [tx-hash status]}]]
    (let [{:keys [pay-amount pay-token-symbol
-                 receive-amount receive-token-symbol]} (get-in db
-                                                               [:wallet :transactions tx-hash
-                                                                :swap-data])
-         transaction-confirmed-or-failed?              (#{:confirmed :failed} status)
-         transaction-confirmed?                        (= status :confirmed)]
+                 receive-amount receive-token-symbol
+                 swap-chain-id]}          (get-in db
+                                                  [:wallet :transactions tx-hash
+                                                   :swap-data])
+         transaction-confirmed-or-failed? (#{:confirmed :failed} status)
+         transaction-confirmed?           (= status :confirmed)]
      (when transaction-confirmed-or-failed?
        {:db (-> db
                 (update-in [:wallet :swap-transaction-ids] disj tx-hash)
                 (update-in [:wallet :transactions] dissoc tx-hash))
         :fx [[:dispatch
+              [:centralized-metrics/track :metric/swap-transaction-execution-finished
+               {:network       swap-chain-id
+                :pay_token     pay-token-symbol
+                :receive_token receive-token-symbol
+                :succeeded     transaction-confirmed?}]]
+             [:dispatch
               [:toasts/upsert
                {:id   :swap-transaction-update
                 :type (if transaction-confirmed? :positive :negative)
@@ -401,13 +489,13 @@
 (rf/reg-event-fx :wallet.swap/flip-assets
  (fn [{:keys [db]}]
    (let [{:keys [asset-to-pay asset-to-receive
-                 swap-proposal amount]} (get-in db [:wallet :ui :swap])
-         receive-token-decimals         (:decimals asset-to-receive)
-         amount-out                     (when swap-proposal (:amount-out swap-proposal))
-         receive-amount                 (when amount-out
-                                          (-> amount-out
-                                              (number/hex->whole receive-token-decimals)
-                                              (money/to-fixed receive-token-decimals)))]
+                 swap-proposal amount network]} (get-in db [:wallet :ui :swap])
+         receive-token-decimals                 (:decimals asset-to-receive)
+         amount-out                             (when swap-proposal (:amount-out swap-proposal))
+         receive-amount                         (when amount-out
+                                                  (-> amount-out
+                                                      (number/hex->whole receive-token-decimals)
+                                                      (money/to-fixed receive-token-decimals)))]
      {:db (update-in db
                      [:wallet :ui :swap]
                      #(-> %
@@ -420,7 +508,17 @@
                                   :loading-swap-proposal?
                                   :last-request-uuid
                                   :approved-amount
-                                  :approval-transaction-id)))})))
+                                  :approval-transaction-id)))
+      :fx [[:dispatch
+            [:centralized-metrics/track :metric/swap-asset-to-pay-changed
+             {:network        (:chain-id network)
+              :previous_token (:symbol asset-to-pay)
+              :new_token      (:symbol asset-to-receive)}]]
+           [:dispatch
+            [:centralized-metrics/track :metric/swap-asset-to-receive-changed
+             {:network        (:chain-id network)
+              :previous_token (:symbol asset-to-receive)
+              :new_token      (:symbol asset-to-pay)}]]]})))
 
 (rf/reg-event-fx :wallet/end-swap-flow
  (fn [{:keys [db]}]

src/status_im/contexts/wallet/swap/select_asset_to_pay/view.cljs

@@ -40,6 +40,7 @@
   (let [[search-text set-search-text] (rn/use-state "")
         on-change-text                #(set-search-text %)
         on-close                      (fn []
+                                        (rf/dispatch [:centralized-metrics/track :metric/swap-closed])
                                         (rf/dispatch [:wallet/clean-swap])
                                         (rf/dispatch [:navigate-back]))]
     [rn/safe-area-view {:style style/container}

src/status_im/contexts/wallet/swap/setup_swap/view.cljs

@@ -29,7 +29,9 @@
 (def ^:private default-token-symbol "ETH")
 
 (defn- on-close
-  []
+  [start-point]
+  (when (= start-point :action-menu)
+    (rf/dispatch [:centralized-metrics/track :metric/swap-closed]))
   (rf/dispatch [:wallet/clean-swap-proposal {:clean-approval-transaction? true}])
   (events-helper/navigate-back))
 
@@ -263,16 +265,22 @@
                                         :text                 error-text}
                                  pay-input-error?
                                  (merge {:action?         true
-                                         :on-button-press #(rf/dispatch [:show-bottom-sheet
-                                                                         {:content buy-token/view}])
+                                         :on-button-press (fn []
+                                                            (rf/dispatch [:centralized-metrics/track
+                                                                          :metric/swap-buy-assets])
+                                                            (rf/dispatch [:show-bottom-sheet
+                                                                          {:content buy-token/view}]))
                                          :button-text     (i18n/label :t/add-assets)})
                                  (= error-response-code
                                     constants/router-error-code-not-enough-native-balance)
                                  (merge {:action?         true
-                                         :on-button-press #(rf/dispatch
-                                                            [:show-bottom-sheet
-                                                             {:content (fn []
-                                                                         [buy-token/view])}])
+                                         :on-button-press (fn []
+                                                            (rf/dispatch [:centralized-metrics/track
+                                                                          :metric/swap-buy-eth])
+                                                            (rf/dispatch
+                                                             [:show-bottom-sheet
+                                                              {:content (fn []
+                                                                          [buy-token/view])}]))
                                          :button-text     (i18n/label :t/add-eth)}))]
     (when (or pay-input-error? error-response)
       [quo/alert-banner props])))
@@ -337,6 +345,7 @@
         asset-to-pay                                (rf/sub [:wallet/swap-asset-to-pay])
         asset-to-receive                            (rf/sub [:wallet/swap-asset-to-receive])
         network                                     (rf/sub [:wallet/swap-network])
+        start-point                                 (rf/sub [:wallet/swap-start-point])
         pay-input-amount                            (controlled-input/input-value pay-input-state)
         pay-token-decimals                          (:decimals asset-to-pay)
         pay-token-balance-selected-chain            (number/convert-to-whole-number
@@ -463,7 +472,7 @@
      [asset-to-receive])
     [rn/view {:style style/container}
      [account-switcher/view
-      {:on-press      on-close
+      {:on-press      #(on-close start-point)
        :icon-name     :i/arrow-left
        :margin-top    (safe-area/get-top)
        :switcher-type :select-account

src/status_im/contexts/wallet/wallet_connect/events/session_proposals.cljs

@@ -142,6 +142,7 @@
 
 (rf/reg-event-fx :wallet-connect/approve-session-success
  (fn [{:keys [db]} [session]]
+   (log/info "Successfully approved WalletConnect session" session)
    (let [total-connected-dapps (data-store/get-total-connected-dapps db)]
      {:fx [[:dispatch [:wallet-connect/on-new-session session]]
            [:dispatch [:wallet-connect/reset-current-session-proposal]]

src/status_im/contexts/wallet/wallet_connect/utils/sessions.cljs

@@ -54,6 +54,7 @@
   (assoc session
          :accounts
          (-> sessionJson
+             transforms/json->clj
              :namespaces
              :eip155
              :accounts)))
@@ -93,10 +94,10 @@
 (defn sync-persisted-sessions
   [active-sessions persisted-sessions]
   (-> (promesa/all
-       (for [topic (find-inactive-sessions active-sessions
-                                           persisted-sessions)]
-         (do (log/info "Syncing disconnected session with persistance" topic)
-             (rpc/wallet-disconnect-persisted-session topic))))
+       (for [session (find-inactive-sessions active-sessions
+                                             persisted-sessions)]
+         (do (log/info "Syncing disconnected session with persistance" session)
+             (rpc/wallet-disconnect-persisted-session (:topic session)))))
       (promesa/catch (fn [err]
                        (throw (ex-info "Failed to synchronize persisted sessions"
                                        {:error err
@@ -107,7 +108,11 @@
   (promesa/let [persisted-sessions (get-persisted-sessions)]
     (if online?
       (promesa/let [active-sessions (get-active-sessions web3-wallet addresses)]
-        (sync-persisted-sessions active-sessions persisted-sessions)
+        (log/info "Got active Wallet Connect sessions" (map :topic active-sessions))
+        ;; NOTE: handling the error here, so that if persistance fails, it doesn't affect the active
+        ;; sessions
+        (-> (sync-persisted-sessions active-sessions persisted-sessions)
+            (promesa/catch #(log/error %)))
         active-sessions)
       persisted-sessions)))
 

src/status_im/core.cljs

@@ -30,8 +30,7 @@
     [status-im.setup.global-error :as global-error]
     [status-im.setup.interceptors :as interceptors]
     status-im.subs.root
-    [utils.i18n :as i18n]
-    [status-im.setup.status-backend-client :as status-backend-client]))
+    [utils.i18n :as i18n]))
 
 ;;;; re-frame RN setup
 (set! interop/next-tick js/setTimeout)
@@ -47,7 +46,6 @@
 
 (defn init
   []
-  (status-backend-client/init)
   (navigation/init)
   (native-module/init #(re-frame/dispatch [:signals/signal-received %]))
   (when platform/android?

src/status_im/setup/status_backend_client.cljs

@@ -1,22 +0,0 @@
-(ns status-im.setup.status-backend-client
-  (:require ["react-native" :as react-native]
-            [status-im.config :as config]))
-
-(def default-config
-  {:server-enabled?    (config/enabled? config/STATUS_BACKEND_SERVER_ENABLED)
-   :status-go-endpoint (str "http://" config/STATUS_BACKEND_SERVER_HOST "/statusgo/")
-   :signal-endpoint    (str "ws://" config/STATUS_BACKEND_SERVER_HOST "/signals")
-   :root-data-dir      config/STATUS_BACKEND_SERVER_ROOT_DATA_DIR})
-
-(defn set-config!
-  [{:keys [server-enabled? status-go-endpoint signal-endpoint root-data-dir]}]
-  (when-let [client (.-StatusBackendClient (.-NativeModules react-native))]
-    (.configStatusBackendServer client
-                                server-enabled?
-                                status-go-endpoint
-                                signal-endpoint
-                                root-data-dir)))
-
-(defn init
-  []
-  (set-config! default-config))

src/status_im/subs/wallet/swap.cljs

@@ -27,6 +27,11 @@
  :<- [:wallet/swap]
  :-> :network)
 
+(rf/reg-sub
+ :wallet/swap-start-point
+ :<- [:wallet/swap]
+ :-> :start-point)
+
 (rf/reg-sub
  :wallet/swap-error-response
  :<- [:wallet/swap]

src/utils/image_server.cljs

@@ -213,18 +213,16 @@
 (defn get-image-uri
   [{:keys [type options]}
    profile-picture-options]
-  (let [uri ((case type
-               :account  get-account-image-uri
-               :contact  get-contact-image-uri
-               :initials get-initials-avatar-uri
-               str)
-             (-> (merge options profile-picture-options)
-                 (assoc :ring?
-                        (if (nil? (:override-ring? options))
-                          (:ring? profile-picture-options)
-                          (:override-ring? options)))))]
-    (println "Image URI:" uri)
-    uri))
+  ((case type
+     :account  get-account-image-uri
+     :contact  get-contact-image-uri
+     :initials get-initials-avatar-uri
+     str)
+   (-> (merge options profile-picture-options)
+       (assoc :ring?
+              (if (nil? (:override-ring? options))
+                (:ring? profile-picture-options)
+                (:override-ring? options))))))
 
 (schema/=> get-image-uri
   [:=>

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "chore/create_v2_endpoint",
-    "commit-sha1": "e255fb8b1d588f1030fc3db4f123081c58814984",
-    "src-sha256": "05h1hg3944wg1wnz0wkslvxs27sz9h7aqb882m4ilbkagklfs0nz"
+    "version": "release/3.4.x",
+    "commit-sha1": "635f19e3c7bc76dfb2cbf780eb7975b9fed1a024",
+    "src-sha256": "1nn8gq9d91ix5mzndr306rq3n68rzj4drym3pfaxzaa73k4v9r07"
 }

yarn.lock

@@ -9469,10 +9469,10 @@ react-native-hole-view@^3.0.0-alpha4:
   resolved "https://registry.yarnpkg.com/react-native-hole-view/-/react-native-hole-view-3.0.0-alpha4.tgz#b5f54df380636c3b4dfacd5c297117f068fa4531"
   integrity sha512-pAIQCA13Dn42xLFsVziFXHRtTgRJ13SBrb1vwFG7cIFslMjmBhPdFlUrqYcN+wMTt2+OnZhRxgM4Yaf4+gARDg==
 
-react-native-image-crop-picker@0.41.2:
-  version "0.41.2"
-  resolved "https://registry.npmjs.org/react-native-image-crop-picker/-/react-native-image-crop-picker-0.41.2.tgz#824fa8fee8391fbb3e0b5ae2973221a2dff0cafb"
-  integrity sha512-GcDu/adXU/1y/MrxsbOfqcGRGWC2pTttt5VGy/jyRJ6GXfoC29fTQf8SG5kGtc5schSR6K+mKYO4uW6eJPljlQ==
+react-native-image-crop-picker@0.40.0:
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.40.0.tgz#cf378a4cbdb64b9b6ff94399b8515ff3bdccbf9c"
+  integrity sha512-FpqiCS4CiPQp8qIorlELWKbpi1d9lyhJki9spZr4LShv9hk65GWo6tYJupfTV19o5XcRwJn8d4MHIUoyWMJRTQ==
 
 react-native-image-resizer@^1.2.3:
   version "1.2.3"