fix: tx confirmation title network color

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

 ---
@@ -0,0 +1,9 @@
+initscript {
+    repositories {
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath "org.gradle:github-dependency-graph-gradle-plugin:+"
+    }
+}
+apply plugin: org.gradle.dependencygraph.simple.SimpleDependencyGraphPlugin
@@ -1,12 +1,12 @@
 pluginManagement {
-include ':react-native-share'
-project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
+includeBuild('../node_modules/@react-native/gradle-plugin')
  repositories {
      mavenLocal() // Let's prioritize local Maven repos so that Nix can provide them offline
      gradlePluginPortal()
  }
 }
-
+include ':react-native-share'
+project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
 rootProject.name = 'StatusIm'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':react-native-nfc-manager'
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 import groovy.json.JsonBuilder

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 pipeline {
  agent { label 'linux' }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 pipeline {

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 pipeline {

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 pipeline {

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 pipeline {
  agent { label 'macos' }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

 pipeline {
  agent { label 'linux' }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.12'
+library 'status-jenkins-lib@v1.9.13'

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

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

 ## Brief flow for test to be automated
@@ -219,7 +219,6 @@ PLATFORMS
  arm64-darwin-22
  arm64-darwin-23
  x86_64-darwin-22
-  x86_64-darwin-23

 DEPENDENCIES
  activesupport (>= 6.1.7.3, < 7.1.0)
@@ -1490,7 +1490,7 @@ SPEC CHECKSUMS:
  FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
  FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 36c15c01d70ed395c6e4f3619f98a23ee415b07a
+  glog: c0eca6ffed0a6fde1965ef26dcc7bf528f052af4
  hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
@@ -253,6 +253,11 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
        utils.executeRunnableStatusGoMethod({ Statusgo.initializeApplication(request) }, callback)
    }

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

    @ReactMethod
    fun logout() {
@@ -204,6 +204,14 @@ RCT_EXPORT_METHOD(initializeApplication:(NSString *)request
    callback(@[result]);
 }

+RCT_EXPORT_METHOD(acceptTerms:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"acceptTerms() method called");
+#endif
+    NSString *result = StatusgoAcceptTerms();
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
 #if DEBUG
    NSLog(@"OpenAccounts() method called");
@@ -14,9 +14,8 @@ RCT_EXPORT_MODULE();
 RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
                  jsLogs:(NSString *)jsLogs
                  callback:(RCTResponseSenderBlock)callback) {
-    // TODO: Implement SendLogs for iOS
 #if DEBUG
-    NSLog(@"SendLogs() method called, not implemented");
+    NSLog(@"SendLogs() method called");
 #endif
    NSFileManager *fileManager = [NSFileManager defaultManager];
    NSError *error = nil;
@@ -34,25 +33,6 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson

    NSURL *dbFile = [logsFolderName URLByAppendingPathComponent:@"db.json"];
    NSURL *jsLogsFile = [logsFolderName URLByAppendingPathComponent:@"Status.log"];
-#if DEBUG
-    NSString *networkDirPath = @"ethereum/mainnet_rpc_dev";
-#else
-    NSString *networkDirPath = @"ethereum/mainnet_rpc";
-#endif
-
-#if DEBUG
-    NSString *goerliNetworkDirPath = @"ethereum/goerli_rpc_dev";
-#else
-    NSString *goerliNetworkDirPath = @"ethereum/goerli_rpc";
-#endif
-
-    NSURL *networkDir = [rootUrl URLByAppendingPathComponent:networkDirPath];
-    NSURL *originalGethLogsFile = [networkDir URLByAppendingPathComponent:@"geth.log"];
-    NSURL *gethLogsFile = [logsFolderName URLByAppendingPathComponent:@"mainnet_geth.log"];
-
-    NSURL *goerliNetworkDir = [rootUrl URLByAppendingPathComponent:goerliNetworkDirPath];
-    NSURL *goerliGethLogsFile = [goerliNetworkDir URLByAppendingPathComponent:@"geth.log"];
-    NSURL *goerliLogsFile = [logsFolderName URLByAppendingPathComponent:@"goerli_geth.log"];

    NSURL *mainGethLogsFile = [rootUrl URLByAppendingPathComponent:@"geth.log"];
    NSURL *mainLogsFile = [logsFolderName URLByAppendingPathComponent:@"geth.log"];
@@ -62,10 +42,6 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
    [dbJson writeToFile:dbFile.path atomically:YES encoding:NSUTF8StringEncoding error:nil];
    [jsLogs writeToFile:jsLogsFile.path atomically:YES encoding:NSUTF8StringEncoding error:nil];

-    //NSString* gethLogs = StatusgoExportNodeLogs();
-    //[gethLogs writeToFile:gethLogsFile.path atomically:YES encoding:NSUTF8StringEncoding error:nil];
-    [fileManager copyItemAtPath:originalGethLogsFile.path toPath:gethLogsFile.path error:nil];
-    [fileManager copyItemAtPath:goerliGethLogsFile.path toPath:goerliLogsFile.path error:nil];
    [fileManager copyItemAtPath:mainGethLogsFile.path toPath:mainLogsFile.path error:nil];
    
    if ([fileManager fileExistsAtPath:requestsLogFile.path]) {
@@ -761,6 +761,26 @@ void _Logout(const FunctionCallbackInfo<Value>& args) {

 }

+void _AcceptTerms(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+
+	if (args.Length() != 0) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for AcceptTerms")));
+		return;
+	}
+
+	// Check the argument types
+
+	// Call exported Go function, which returns a C string
+	char *c = AcceptTerms();
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+}
+
 void _HashMessage(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -1998,6 +2018,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
 	NODE_SET_METHOD(exports, "initializeApplication", _InitializeApplication);
+	NODE_SET_METHOD(exports, "acceptTerms", _AcceptTerms);
 	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
@@ -315,6 +315,7 @@ com.android.tools.build:gradle:7.0.4
 com.android.tools.build:gradle:7.2.1
 com.android.tools.build:gradle:7.3.1
 com.android.tools.build:gradle:7.4.2
+com.android.tools.build:gradle:8.1.1
 com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.1
@@ -339,6 +340,7 @@ com.android.tools.ddms:ddmlib:30.2.1
 com.android.tools.ddms:ddmlib:30.3.1
 com.android.tools.ddms:ddmlib:30.4.2
 com.android.tools.ddms:ddmlib:31.1.1
+com.android.tools.emulator:proto:31.1.1
 com.android.tools.external.com-intellij:intellij-core:26.0.1
 com.android.tools.external.lombok:lombok-ast:0.2.3
 com.android.tools.external.org-jetbrains:uast:26.0.1
@@ -381,32 +383,43 @@ com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2
 com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.1
+com.android.tools.utp:android-device-provider-ddmlib:31.1.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.0.4
 com.android.tools.utp:android-device-provider-gradle-proto:30.2.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.3.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.4.2
 com.android.tools.utp:android-device-provider-gradle-proto:31.1.1
+com.android.tools.utp:android-device-provider-gradle:31.1.1
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.1
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-additional-test-output:31.1.1
 com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-apk-installer:31.1.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2
 com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-coverage:31.1.1
+com.android.tools.utp:android-test-plugin-host-device-info-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-device-info:31.1.1
 com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-emulator-control:31.1.1
 com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-logcat:31.1.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.4
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2
 com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-retention:31.1.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.4
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.1
+com.android.tools.utp:android-test-plugin-result-listener-gradle:31.1.1
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.1
@@ -574,6 +587,7 @@ com.google.code.gson:gson:2.8.0
 com.google.code.gson:gson:2.8.5
 com.google.code.gson:gson:2.8.6
 com.google.code.gson:gson:2.8.9
+com.google.code.gson:gson:2.9.1
 com.google.crypto.tink:tink:1.3.0-rc2
 com.google.crypto.tink:tink:1.7.0
 com.google.dagger:dagger:2.28.3
@@ -583,6 +597,7 @@ com.google.errorprone:error_prone_annotations:2.3.1
 com.google.errorprone:error_prone_annotations:2.3.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.errorprone:error_prone_annotations:2.4.0
+com.google.errorprone:error_prone_annotations:2.7.1
 com.google.errorprone:error_prone_annotations:2.9.0
 com.google.errorprone:error_prone_annotations:2.11.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
@@ -594,6 +609,7 @@ com.google.guava:guava:27.0.1-jre
 com.google.guava:guava:28.1-jre
 com.google.guava:guava:29.0-jre
 com.google.guava:guava:30.1-jre
+com.google.guava:guava:31.0.1-jre
 com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:1.0
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
@@ -610,9 +626,14 @@ com.google.protobuf:protobuf-java:3.4.0
 com.google.protobuf:protobuf-java:3.10.0
 com.google.protobuf:protobuf-java:3.17.2
 com.google.protobuf:protobuf-java:3.19.3
+com.google.testing.platform:android-device-provider-local:0.0.8-alpha08
+com.google.testing.platform:android-driver-instrumentation:0.0.8-alpha08
+com.google.testing.platform:android-test-plugin:0.0.8-alpha08
 com.google.testing.platform:core-proto:0.0.8-alpha04
 com.google.testing.platform:core-proto:0.0.8-alpha07
 com.google.testing.platform:core-proto:0.0.8-alpha08
+com.google.testing.platform:core:0.0.8-alpha08
+com.google.testing.platform:launcher:0.0.8-alpha08
 com.google.test.platform:core-proto:0.0.2-dev
 com.google.zxing:core:3.4.1
 com.ibm.icu:icu4j:53.1
@@ -785,6 +806,8 @@ org.glassfish.jaxb:jaxb-runtime:2.3.2
 org.glassfish.jaxb:txw2:2.2.11
 org.glassfish.jaxb:txw2:2.3.1
 org.glassfish.jaxb:txw2:2.3.2
+org.gradle.toolchains:foojay-resolver:0.5.0
+org.gradle:github-dependency-graph-gradle-plugin:1.3.1
 org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.2
 org.jacoco:org.jacoco.core:0.7.4.201502262128
@@ -798,45 +821,64 @@ org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
+org.jetbrains.kotlin:kotlin-android-extensions:1.8.0
 org.jetbrains.kotlin:kotlin-android-extensions:1.9.0
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.20
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.0
 org.jetbrains.kotlin:kotlin-build-common:1.6.20
+org.jetbrains.kotlin:kotlin-build-common:1.8.0
 org.jetbrains.kotlin:kotlin-build-tools-api:1.9.0
 org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.0
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.0
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0
 org.jetbrains.kotlin:kotlin-compiler-runner:1.6.20
+org.jetbrains.kotlin:kotlin-compiler-runner:1.8.0
 org.jetbrains.kotlin:kotlin-compiler-runner:1.9.0
 org.jetbrains.kotlin:kotlin-daemon-client:1.6.20
+org.jetbrains.kotlin:kotlin-daemon-client:1.8.0
 org.jetbrains.kotlin:kotlin-daemon-client:1.9.0
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.0
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0
 org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.0
 org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.0
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.20
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.0
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.0
 org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.0
 org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.0
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.20
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.0
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.0
 org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0
 org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.20
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.0
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.0
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.0
 org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.9.0
 org.jetbrains.kotlin:kotlin-native-utils:1.6.20
+org.jetbrains.kotlin:kotlin-native-utils:1.8.0
 org.jetbrains.kotlin:kotlin-native-utils:1.9.0
 org.jetbrains.kotlin:kotlin-project-model:1.6.20
+org.jetbrains.kotlin:kotlin-project-model:1.8.0
 org.jetbrains.kotlin:kotlin-project-model:1.9.0
 org.jetbrains.kotlin:kotlin-reflect:1.1.3-2
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
@@ -848,13 +890,18 @@ org.jetbrains.kotlin:kotlin-reflect:1.6.10
 org.jetbrains.kotlin:kotlin-reflect:1.7.10
 org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
+org.jetbrains.kotlin:kotlin-scripting-common:1.8.0
 org.jetbrains.kotlin:kotlin-scripting-common:1.9.0
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.0
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.0
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.0
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0
+org.jetbrains.kotlin:kotlin-script-runtime:1.8.0
 org.jetbrains.kotlin:kotlin-script-runtime:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
@@ -863,6 +910,7 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
@@ -874,6 +922,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
@@ -883,6 +932,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
@@ -894,15 +944,19 @@ org.jetbrains.kotlin:kotlin-stdlib:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib:1.7.10
+org.jetbrains.kotlin:kotlin-stdlib:1.8.0
 org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib:1.9.22
+org.jetbrains.kotlin:kotlin-tooling-core:1.8.0
 org.jetbrains.kotlin:kotlin-tooling-core:1.9.0
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
 org.jetbrains.kotlin:kotlin-util-io:1.6.20
+org.jetbrains.kotlin:kotlin-util-io:1.8.0
 org.jetbrains.kotlin:kotlin-util-io:1.9.0
 org.jetbrains.kotlin:kotlin-util-klib:1.6.20
+org.jetbrains.kotlin:kotlin-util-klib:1.8.0
 org.jetbrains.kotlin:kotlin-util-klib:1.9.0
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
@@ -964,20 +1018,8 @@ org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
 xerces:xercesImpl:2.12.0
 xml-apis:xml-apis:1.4.01
-com.android.tools.build:gradle:1.3.1
-com.squareup.okio:okio:1.13.0
-com.squareup.okio:okio:1.15.0
-com.squareup.okhttp3:okhttp:3.12.1
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
 org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
-com.android.tools.build:gradle:8.1.1
-com.google.errorprone:error_prone_annotations:2.7.1
-com.android.tools.lint:lint-gradle:31.1.1
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
 com.android.tools.build:gradle:3.5.4
-androidx.annotation:annotation:1.6.0
-androidx.annotation:annotation-jvm:1.6.0
+com.android.tools.lint:lint-gradle:31.1.1
 com.facebook.react:hermes-android:0.73.5
@@ -416,6 +416,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.2.1/dvlib-30.
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.3.1/dvlib-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.4.2/dvlib-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/31.1.1/dvlib-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/emulator/proto/31.1.1/proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/31.1.1/intellij-core-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/31.1.1/kotlin-compiler-31.1.1.pom
@@ -487,32 +488,43 @@ https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-pro
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.3.1/android-device-provider-ddmlib-proto-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.4.2/android-device-provider-ddmlib-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/31.1.1/android-device-provider-ddmlib-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib/31.1.1/android-device-provider-ddmlib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.0.4/android-device-provider-gradle-proto-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.2.1/android-device-provider-gradle-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.3.1/android-device-provider-gradle-proto-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.4.2/android-device-provider-gradle-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/31.1.1/android-device-provider-gradle-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle/31.1.1/android-device-provider-gradle-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.2.1/android-test-plugin-host-additional-test-output-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.3.1/android-test-plugin-host-additional-test-output-proto-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.4.2/android-test-plugin-host-additional-test-output-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/31.1.1/android-test-plugin-host-additional-test-output-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output/31.1.1/android-test-plugin-host-additional-test-output-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-apk-installer-proto/31.1.1/android-test-plugin-host-apk-installer-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-apk-installer/31.1.1/android-test-plugin-host-apk-installer-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.2.1/android-test-plugin-host-coverage-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.3.1/android-test-plugin-host-coverage-proto-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.4.2/android-test-plugin-host-coverage-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/31.1.1/android-test-plugin-host-coverage-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage/31.1.1/android-test-plugin-host-coverage-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-device-info-proto/31.1.1/android-test-plugin-host-device-info-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-device-info/31.1.1/android-test-plugin-host-device-info-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-emulator-control-proto/31.1.1/android-test-plugin-host-emulator-control-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-emulator-control/31.1.1/android-test-plugin-host-emulator-control-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-logcat-proto/31.1.1/android-test-plugin-host-logcat-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-logcat/31.1.1/android-test-plugin-host-logcat-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.0.4/android-test-plugin-host-retention-proto-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.2.1/android-test-plugin-host-retention-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.3.1/android-test-plugin-host-retention-proto-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.4.2/android-test-plugin-host-retention-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/31.1.1/android-test-plugin-host-retention-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention/31.1.1/android-test-plugin-host-retention-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.0.4/android-test-plugin-result-listener-gradle-proto-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.2.1/android-test-plugin-result-listener-gradle-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.3.1/android-test-plugin-result-listener-gradle-proto-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.4.2/android-test-plugin-result-listener-gradle-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/31.1.1/android-test-plugin-result-listener-gradle-proto-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle/31.1.1/android-test-plugin-result-listener-gradle-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/4.1.0/zipflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.0.4/zipflinger-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.1/zipflinger-7.2.1.pom
@@ -522,9 +534,14 @@ https://dl.google.com/dl/android/maven2/com/android/zipflinger/8.1.1/zipflinger-
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom
 https://dl.google.com/dl/android/maven2/com/google/prefab/cli/2.0.0/cli-2.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/testing/platform/android-device-provider-local/0.0.8-alpha08/android-device-provider-local-0.0.8-alpha08.pom
+https://dl.google.com/dl/android/maven2/com/google/testing/platform/android-driver-instrumentation/0.0.8-alpha08/android-driver-instrumentation-0.0.8-alpha08.pom
+https://dl.google.com/dl/android/maven2/com/google/testing/platform/android-test-plugin/0.0.8-alpha08/android-test-plugin-0.0.8-alpha08.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha04/core-proto-0.0.8-alpha04.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha07/core-proto-0.0.8-alpha07.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha08/core-proto-0.0.8-alpha08.pom
+https://dl.google.com/dl/android/maven2/com/google/testing/platform/core/0.0.8-alpha08/core-0.0.8-alpha08.pom
+https://dl.google.com/dl/android/maven2/com/google/testing/platform/launcher/0.0.8-alpha08/launcher-0.0.8-alpha08.pom
 https://dl.google.com/dl/android/maven2/com/google/test/platform/core-proto/0.0.2-dev/core-proto-0.0.2-dev.pom
 https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom
 https://jitpack.io/com/github/status-im/function/0.0.1/function-0.0.1.pom
@@ -535,6 +552,7 @@ https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animat
 https://jitpack.io/com/github/yalantis/ucrop/2.2.6-native/ucrop-2.2.6-native.pom
 https://jitpack.io/com/github/zacharee/AndroidPdfViewer/4.0.1/AndroidPdfViewer-4.0.1.pom
 https://plugins.gradle.org/m2/com/adarshr/gradle-test-logger-plugin/2.0.0/gradle-test-logger-plugin-2.0.0.pom
+https://plugins.gradle.org/m2/org/gradle/github-dependency-graph-gradle-plugin/1.3.1/github-dependency-graph-gradle-plugin-1.3.1.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver-convention/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.5.0/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-0.5.0.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver/0.5.0/foojay-resolver-0.5.0.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.1/antlr-2.7.1.pom
@@ -733,7 +751,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.0/error_prone_annotations-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.33.0/error_prone_annotations-2.33.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.35.1/error_prone_annotations-2.35.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -746,7 +764,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.0/error_prone_parent-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.33.0/error_prone_parent-2.33.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.35.1/error_prone_parent-2.35.1.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -791,7 +809,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.13.0/pro
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.17.2/protobuf-bom-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.2/protobuf-bom-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.3/protobuf-bom-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.29.0-RC1/protobuf-bom-4.29.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.29.0-RC2/protobuf-bom-4.29.0-RC2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
@@ -808,7 +826,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.13.0/pr
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.17.2/protobuf-java-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.29.0-RC1/protobuf-java-4.29.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.29.0-RC2/protobuf-java-4.29.0-RC2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -819,7 +837,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.2/protobuf-parent-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.3/protobuf-parent-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.29.0-RC1/protobuf-parent-4.29.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.29.0-RC2/protobuf-parent-4.29.0-RC2.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.4/truth-parent-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.4/truth-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/zxing/core/3.4.1/core-3.4.1.pom
@@ -841,11 +859,7 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.13.0/okio-parent-1.13.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.4/okio-parent-1.17.4.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.13.0/okio-1.13.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.4/okio-1.17.4.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom
@@ -1197,81 +1211,68 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-an
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.1/kotlinx-coroutines-android-1.6.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.7.3/kotlinx-coroutines-android-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-bom/1.6.1/kotlinx-coroutines-bom-1.6.1.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-bom/1.6.3/kotlinx-coroutines-bom-1.6.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-bom/1.7.3/kotlinx-coroutines-bom-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.4.1/kotlinx-coroutines-core-jvm-1.4.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.0/kotlinx-coroutines-core-jvm-1.5.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.2/kotlinx-coroutines-core-jvm-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.1/kotlinx-coroutines-core-jvm-1.6.1.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.3/kotlinx-coroutines-core-jvm-1.6.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.7.3/kotlinx-coroutines-core-jvm-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.4.1/kotlinx-coroutines-core-1.4.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.5.2/kotlinx-coroutines-core-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.6.1/kotlinx-coroutines-core-1.6.1.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.6.3/kotlinx-coroutines-core-1.6.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.7.3/kotlinx-coroutines-core-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.1.0/kotlinx-metadata-jvm-0.1.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.7.22/org.jetbrains.kotlin.jvm.gradle.plugin-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.8.0/org.jetbrains.kotlin.jvm.gradle.plugin-1.8.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.9.0/org.jetbrains.kotlin.jvm.gradle.plugin-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.6.20/kotlin-android-extensions-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.7.22/kotlin-android-extensions-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.8.0/kotlin-android-extensions-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.9.0/kotlin-android-extensions-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotations-jvm/1.3.72/kotlin-annotations-jvm-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.6.20/kotlin-annotation-processing-gradle-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.7.22/kotlin-annotation-processing-gradle-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.8.0/kotlin-annotation-processing-gradle-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.6.20/kotlin-build-common-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.7.22/kotlin-build-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.8.0/kotlin-build-common-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.9.0/kotlin-build-common-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools-api/1.9.0/kotlin-build-tools-api-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools-impl/1.9.0/kotlin-build-tools-impl-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.6.20/kotlin-compiler-embeddable-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.22/kotlin-compiler-embeddable-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.8.0/kotlin-compiler-embeddable-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.9.0/kotlin-compiler-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.6.20/kotlin-compiler-runner-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.7.22/kotlin-compiler-runner-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.8.0/kotlin-compiler-runner-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.9.0/kotlin-compiler-runner-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.6.20/kotlin-daemon-client-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.7.22/kotlin-daemon-client-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.8.0/kotlin-daemon-client-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.9.0/kotlin-daemon-client-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.6.20/kotlin-daemon-embeddable-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.22/kotlin-daemon-embeddable-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.8.0/kotlin-daemon-embeddable-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.9.0/kotlin-daemon-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugins-bom/1.9.0/kotlin-gradle-plugins-bom-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-annotations/1.9.0/kotlin-gradle-plugin-annotations-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.20/kotlin-gradle-plugin-api-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.7.22/kotlin-gradle-plugin-api-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.8.0/kotlin-gradle-plugin-api-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.9.0/kotlin-gradle-plugin-api-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.7.22/kotlin-gradle-plugin-idea-proto-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.8.0/kotlin-gradle-plugin-idea-proto-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.9.0/kotlin-gradle-plugin-idea-proto-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.7.22/kotlin-gradle-plugin-idea-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.8.0/kotlin-gradle-plugin-idea-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.9.0/kotlin-gradle-plugin-idea-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.6.20/kotlin-gradle-plugin-model-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.7.22/kotlin-gradle-plugin-model-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.8.0/kotlin-gradle-plugin-model-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.9.0/kotlin-gradle-plugin-model-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.20/kotlin-gradle-plugin-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.7.22/kotlin-gradle-plugin-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.8.0/kotlin-gradle-plugin-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.9.0/kotlin-gradle-plugin-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.6.20/kotlin-klib-commonizer-api-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.7.22/kotlin-klib-commonizer-api-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.8.0/kotlin-klib-commonizer-api-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.9.0/kotlin-klib-commonizer-api-1.9.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.8.0/kotlin-klib-commonizer-embeddable-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.9.0/kotlin-klib-commonizer-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.6.20/kotlin-native-utils-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.7.22/kotlin-native-utils-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.8.0/kotlin-native-utils-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.9.0/kotlin-native-utils-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.6.20/kotlin-project-model-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.7.22/kotlin-project-model-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.8.0/kotlin-project-model-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.9.0/kotlin-project-model-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.pom
@@ -1283,27 +1284,21 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.5.31/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.8.20-RC2/kotlin-reflect-1.8.20-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.1.0-Beta2/kotlin-reflect-2.1.0-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.9.0/kotlin-scripting-common-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.6.20/kotlin-scripting-compiler-embeddable-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.22/kotlin-scripting-compiler-embeddable-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.8.0/kotlin-scripting-compiler-embeddable-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.9.0/kotlin-scripting-compiler-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.6.20/kotlin-scripting-compiler-impl-embeddable-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.22/kotlin-scripting-compiler-impl-embeddable-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.8.0/kotlin-scripting-compiler-impl-embeddable-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.9.0/kotlin-scripting-compiler-impl-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.20/kotlin-scripting-jvm-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.22/kotlin-scripting-jvm-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.8.0/kotlin-scripting-jvm-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.0/kotlin-scripting-jvm-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.6.20/kotlin-script-runtime-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.7.22/kotlin-script-runtime-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.8.0/kotlin-script-runtime-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.9.0/kotlin-script-runtime-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.2.71/kotlin-stdlib-common-1.2.71.pom
@@ -1326,7 +1321,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.20/kotlin-stdlib-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.22/kotlin-stdlib-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.20-RC2/kotlin-stdlib-common-1.8.20-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.20/kotlin-stdlib-common-1.8.20.pom
@@ -1345,6 +1339,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.0/kotlin-stdlib-jdk7-1.6.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.21/kotlin-stdlib-jdk7-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.10/kotlin-stdlib-jdk7-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.20-RC2/kotlin-stdlib-jdk7-1.8.20-RC2.pom
@@ -1362,6 +1357,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.0/kotlin-stdlib-jdk8-1.6.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20/kotlin-stdlib-jdk8-1.6.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.21/kotlin-stdlib-jdk8-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.10/kotlin-stdlib-jdk8-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.20-RC2/kotlin-stdlib-jdk8-1.8.20-RC2.pom
@@ -1391,7 +1387,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.10/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.20/kotlin-stdlib-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.22/kotlin-stdlib-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20-RC2/kotlin-stdlib-1.8.20-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20/kotlin-stdlib-1.8.20.pom
@@ -1401,16 +1396,13 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/ko
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.22/kotlin-stdlib-1.9.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.25/kotlin-stdlib-1.9.25.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.1.0-Beta2/kotlin-stdlib-2.1.0-Beta2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20/kotlin-tooling-metadata-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.6.20/kotlin-util-io-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.7.22/kotlin-util-io-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.8.0/kotlin-util-io-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.9.0/kotlin-util-io-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.6.20/kotlin-util-klib-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.7.22/kotlin-util-klib-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.8.0/kotlin-util-klib-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.9.0/kotlin-util-klib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown-jvm/0.2.1/markdown-jvm-0.2.1.pom
@@ -1420,7 +1412,7 @@ https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20240303/json-20240303.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
 https://repo.maven.apache.org/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.2/junit-bom-5.11.2.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.3/junit-bom-5.11.3.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
@@ -42,22 +42,10 @@ function gen_deps_list() {
 # https://github.com/status-im/status-mobile/issues/15447
 function add_deps_hack() {
    echo -n \
-'com.android.tools.build:gradle:1.3.1
-com.squareup.okio:okio:1.13.0
-com.squareup.okio:okio:1.15.0
-com.squareup.okhttp3:okhttp:3.12.1
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
-org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
+'org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
-com.android.tools.build:gradle:8.1.1
-com.google.errorprone:error_prone_annotations:2.7.1
-com.android.tools.lint:lint-gradle:31.1.1
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
 com.android.tools.build:gradle:3.5.4
-androidx.annotation:annotation:1.6.0
-androidx.annotation:annotation-jvm:1.6.0
+com.android.tools.lint:lint-gradle:31.1.1
 com.facebook.react:hermes-android:0.73.5' \
        >> "${DEPS_LIST}"
 }
@@ -7,6 +7,7 @@
 set -Eeuo pipefail

 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
+GRADLE_REPORTS_DIR="${GIT_ROOT}/android/build/reports/dependency-graph-snapshots"
 # Gradle needs to be run in 'android' subfolder.
 cd "${GIT_ROOT}/android"

@@ -15,23 +16,11 @@ GRADLE_LOG_FILE='/tmp/gradle.log'
 function show_gradle_log() { cat "${GRADLE_LOG_FILE}" >&2; }
 trap show_gradle_log ERR

-# Run the gradle command for a project:
-# - ':buildEnvironment' to get build tools
-# - ':dependencies' to get direct deps limited those by
-#   implementation config to avoid test dependencies
-DEPS=("${@}")
-declare -a BUILD_DEPS
-declare -a NORMAL_DEPS
-for i in "${!DEPS[@]}"; do
-    BUILD_DEPS[${i}]="${DEPS[${i}]}:buildEnvironment"
-    NORMAL_DEPS[${i}]="${DEPS[${i}]}:dependencies"
-done
+./gradlew -I init.gradle \
+  --dependency-verification=off \
+  --no-configuration-cache --no-configure-on-demand \
+ :ForceDependencyResolutionPlugin_resolveAllDependencies > "${GRADLE_LOG_FILE}" 2>&1

-# And clean up the output using AWK script.
-AWK_SCRIPT="${GIT_ROOT}/nix/deps/gradle/gradle_parser.awk"
-
-./gradlew --no-daemon --console plain \
-    "${BUILD_DEPS[@]}" \
-    "${NORMAL_DEPS[@]}" \
-    | tee "${GRADLE_LOG_FILE}" \
-    | awk -f "${AWK_SCRIPT}"
+# skip org.webkit:android-jsc, its provided by react-native
+# remove when new architecture is enabled
+jq -r '.[].dependency | select(startswith("org.webkit:android-jsc") | not)' "${GRADLE_REPORTS_DIR}/dependency-resolution.json"
@@ -1,55 +0,0 @@
-# This script parses the AWFUL Gradle output of :dependencies calls
-# and outputs just the names of the packages in the Maven format:
-# <groupId>:<artifactId>:<version>
-
-function findPackage(line, regex) {
-    rval = match(line, regex, matches)
-    if (rval != 0) {
-        dep = sprintf("%s:%s:%s", matches[1], matches[2], matches[3])
-        if (deps[dep] == nil) {
-            deps[dep] = 1
-        }
-        return 1
-    }
-    return 0
-}
-
-# Gradle outputs dependencies in groups defined by configurations.
-# Those configurations are words followed by a dash and a description.
-# There's also a special 'classpath' configuration we want.
-/^(classpath|[a-zA-Z0-9]+)( - .*)?$/ {
-    # Ignore configurations starting with 'test'
-    if (tolower($1) ~ /^test/) {
-        next
-    }
-
-    # Lines after configuration name list packages
-    for (getline line; line != ""; getline line) {
-
-        # JavaScript Core (JSC) is provided by node_modules
-        if (line ~ "org.webkit:android-jsc") { continue }
-
-        # Example: +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50
-        if (findPackage(line, "--- ([^ :]+):([^ :]+):([^ :]+)$")) {
-            continue
-        }
-
-        # Example: +--- androidx.lifecycle:lifecycle-common:{strictly 2.0.0} -> 2.0.0 (c)
-        if (findPackage(line, "--- ([^ :]+):([^ :]+):[^:]+ -> ([^ :]+) ?(\\([*c]\\))?$")) {
-            continue
-        }
-
-        # Example: +--- com.android.support:appcompat-v7:28.0.0 -> androidx.appcompat:appcompat:1.0.2
-        if (findPackage(line, "--- [^ :]+:[^ :]+:[^ ]+ -> ([^ :]+):([^ :]+):([^ :]+)$")) {
-            continue
-        }
-    }
-}
-
-END{
-    # It's nicer to sort it
-    asorti(deps, sorted)
-    for (i in sorted) {
-        print sorted[i]
-    }
-}
@@ -32,12 +32,9 @@ trap "rm -vf ${SECRETS_FILE_PATH}" EXIT ERR INT QUIT
 # Names of variables containing secrets to save in env file.
 SECRETS_ENV_VARS=(
    'ALCHEMY_ETHEREUM_MAINNET_TOKEN'
-    'ALCHEMY_ETHEREUM_GOERLI_TOKEN'
    'ALCHEMY_ETHEREUM_SEPOLIA_TOKEN'
-    'ALCHEMY_ARBITRUM_GOERLI_TOKEN'
    'ALCHEMY_ARBITRUM_MAINNET_TOKEN'
    'ALCHEMY_ARBITRUM_SEPOLIA_TOKEN'
-    'ALCHEMY_OPTIMISM_GOERLI_TOKEN'
    'ALCHEMY_OPTIMISM_MAINNET_TOKEN'
    'ALCHEMY_OPTIMISM_SEPOLIA_TOKEN'
    'RARIBLE_MAINNET_API_KEY'
@@ -75,13 +75,10 @@
          status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
          status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
          status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-          status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
          status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
          status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-          status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
          status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
          status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-          status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
          status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
         :compiler-options {:output-feature-set :es5
                            ;; We disable `:fn-deprecated` warnings because we
@@ -95,7 +92,8 @@
                            ;; otherwise sometimes you'll get weird errors when
                            ;; instrumenting functions.
                            :static-fns         false
-                            :infer-externs      true}
+                            :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
@@ -113,13 +111,10 @@
     status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
     status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
     status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
    :compiler-options {:output-feature-set :es6
                       ;;disable for android build as there
@@ -129,7 +124,8 @@
                       :static-fns         true
                       :fn-invoke-direct   true
                       :optimizations      :advanced
-                       :js-options         {:js-provider :closure}}}}
+                       :js-options         {:js-provider :closure}
+                       :reader-features    #{:mobile}}}}
  ;; the tests are ran with node, react-native dependencies are mocked
  ;; by using node --require override.js, which uses the node-library
  ;; produced by the target :mocks below and redefines node require
@@ -156,25 +152,23 @@
    status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
    status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
    status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
    status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
    status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
    status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
    status-im.config/WALLET_CONNECT_PROJECT_ID      #shadow/env "WALLET_CONNECT_PROJECT_ID"}
   :compiler-options
   {;; needed because we override require and it
    ;; messes with source-map which reports callstack
    ;; exceeded exceptions instead of real issues
-    :source-map    false
+    :source-map      false
    ;; needed because we use deref in tests
-    :static-fns    false
-    :optimizations :simple
-    :warnings      {:fn-deprecated false}
-    :infer-externs true}}
+    :static-fns      false
+    :optimizations   :simple
+    :warnings        {:fn-deprecated false}
+    :infer-externs   true
+    :reader-features #{:mobile}}}

  ;; mock.js-dependencies is mocking the react-native libraries
  ;; we build it as a node library so that it can be required by
@@ -3,8 +3,7 @@
    ["react-native" :as rn]
    ["react-native-status-keycard" :default status-keycard]
    [react-native.platform :as platform]
-    [taoensso.timbre :as log]
-    [utils.address :as address]))
+    [taoensso.timbre :as log]))

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

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

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

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

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

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

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

 (defn get-transaction-details-url
  [chain-id tx-hash]
@@ -79,6 +79,12 @@
                          (types/clj->json request)
                          #(callback (types/json->clj %))))

+(defn accept-terms
+  ([]
+   (native-utils/promisify-native-module-call accept-terms))
+  ([callback]
+   (.acceptTerms ^js (account-manager) callback)))
+
 (defn prepare-dir-and-update-config
  [key-uid config callback]
  (log/debug "[native-module] prepare-dir-and-update-config")
@@ -502,17 +508,16 @@
                              new-password-hashed
                              callback))))

-(defn convert-to-keycard-account
-  [{:keys [key-uid] :as multiaccount-data} settings current-password# new-password callback]
-  (log/debug "[native-module] convert-to-keycard-account")
+(defn convert-to-keycard-profile
+  [{:keys [key-uid] :as profile} settings password new-password callback]
  (.convertToKeycardAccount ^js (encryption)
                            key-uid
-                            (types/clj->json multiaccount-data)
+                            (types/clj->json profile)
                            (types/clj->json settings)
-                            ""
-                            current-password#
+                            (:keycard-instance-uid settings)
+                            password
                            new-password
-                            callback))
+                            #(when callback (callback (types/json->clj %)))))

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

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

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

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

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

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

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

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

 (def header-title
  {:flex           1
@@ -59,7 +59,6 @@
  [rn/view {:style (merge style/container container-style)}
   [text/text
    {:size                :heading-1
-     :number-of-lines     1
     :weight              :semi-bold
     :style               style/text
     :accessibility-label accessibility-label}
@@ -5,6 +5,7 @@
    [react-native.core :as rn]
    [reagent.core :as reagent]
    [status-im.common.confirmation-drawer.style :as style]
+    [status-im.constants :as constants]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

@@ -35,11 +36,12 @@
           close-button-text]}]
  (let [extra-action-selected? (reagent/atom false)]
    (fn []
-      (let [{:keys [group-chat chat-id public-key color
+      (let [{:keys [group-chat chat-id public-key color chat-type
                    profile-picture name]} context
            id                             (or chat-id public-key)
            theme                          (quo.theme/use-theme)
-            [primary-name _]               (when-not group-chat
+            [primary-name _]               (when-not (or group-chat
+                                                         (= chat-type constants/public-chat-type))
                                             (rf/sub [:contacts/contact-two-names-by-identity id]))
            display-name                   (cond
                                             (= primary-name "Unknown")
@@ -232,12 +232,11 @@
      :sub-label           nil
      :chevron?            false})))

-;; TODO(OmarBasem): Requires design input.
 (defn edit-name-image-entry
-  []
+  [chat-id]
  (entry {:icon                :i/edit
          :label               (i18n/label :t/edit-name-and-image)
-          :on-press            #(js/alert "TODO: to be implemented, requires design input")
+          :on-press            #(rf/dispatch [:open-modal :screen/group-update chat-id])
          :danger?             false
          :accessibility-label :edit-name-and-image
          :sub-label           nil
@@ -359,7 +358,7 @@
                                 (rf/dispatch [:chats-list/load-chat chat-id])
                                 (rf/dispatch [:pin-message/load-pin-messages chat-id])
                                 (rf/dispatch [:hide-bottom-sheet])
-                                 (rf/dispatch [:navigate-to :group-details chat-id]))
+                                 (rf/dispatch [:navigate-to :screen/group-details chat-id]))
          :danger?             false
          :accessibility-label :group-details
          :sub-label           nil
@@ -369,18 +368,17 @@
  [chat-id admin?]
  (entry {:icon                :i/add-user
          :label               (i18n/label (if admin? :t/manage-members :t/add-members))
-          :on-press            #(rf/dispatch [:open-modal :group-add-manage-members chat-id])
+          :on-press            #(rf/dispatch [:open-modal :screen/group-add-manage-members chat-id])
          :danger?             false
          :accessibility-label :manage-members
          :sub-label           nil
          :chevron?            false}))

-;; TODO(OmarBasem): to be implemented.
 (defn edit-group-entry
-  []
+  [chat-id]
  (entry {:icon                :i/edit
          :label               (i18n/label :t/edit-name-and-image)
-          :on-press            #(js/alert "TODO: to be implemented")
+          :on-press            #(rf/dispatch [:open-modal :screen/group-update chat-id])
          :danger?             false
          :accessibility-label :edit-group
          :sub-label           nil
@@ -398,10 +396,11 @@
          :chevron?            false}))

 (defn destructive-actions
-  [{:keys [group-chat] :as item} inside-chat?]
+  [{:keys [group-chat chat-type] :as item} inside-chat?]
  [(when (not group-chat)
-     (close-chat-entry item inside-chat? (not group-chat)))
-   (clear-history-entry item group-chat)
+     (close-chat-entry item inside-chat? (not= chat-type constants/public-chat-type)))
+   (when-not (= chat-type constants/public-chat-type)
+     (clear-history-entry item group-chat))
   (when group-chat
     (leave-group-entry item nil))])

@@ -425,8 +424,7 @@
     (when inside-chat?
       (add-manage-members-entry chat-id admin?))
     (when (and admin? inside-chat?)
-       (when config/show-not-implemented-features?
-         (edit-group-entry)))
+       (edit-group-entry chat-id))
     (when (and admin? inside-chat?)
       (when config/show-not-implemented-features?
         (group-privacy-entry)))]))
@@ -438,6 +436,11 @@
    (notification-actions item inside-chat? true)
    (destructive-actions item inside-chat?)]])

+(defn public-chat-actions
+  [item inside-chat?]
+  [quo/action-drawer
+   [(destructive-actions item inside-chat?)]])
+
 (defn private-group-chat-actions
  [item inside-chat?]
  [quo/action-drawer
@@ -473,6 +476,8 @@
     [one-to-one-actions chat inside-chat?]
     constants/private-group-chat-type
     [private-group-chat-actions chat inside-chat?]
+     constants/public-chat-type
+     [public-chat-actions chat inside-chat?]
     constants/community-chat-type
     [communities-chat-actions/actions chat inside-chat? hide-show-members?]
     nil))
@@ -480,13 +485,12 @@
   (chat-actions chat inside-chat? nil)))

 (defn group-details-actions
-  [{:keys [admins] :as group}]
+  [{:keys [chat-id admins] :as group}]
  (let [current-pub-key (rf/sub [:multiaccount/public-key])
        admin?          (get admins current-pub-key)]
    [quo/action-drawer
     [(when admin?
-        [(when config/show-not-implemented-features?
-           (edit-name-image-entry))])
+        [(edit-name-image-entry chat-id)])
      [(when config/show-not-implemented-features?
         (notifications-entry admin?))]
      (destructive-actions group false)]]))
@@ -7,8 +7,7 @@
   :margin-bottom     8})

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

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

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

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

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

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

 (def verify-ens-chain-id (js/parseInt (get-config :VERIFY_ENS_CHAIN_ID "1")))
 (def verify-ens-url
  (if (= :mainnet (chain/chain-id->chain-keyword verify-ens-chain-id))
    mainnet-rpc-url
-    goerli-rpc-url))
+    sepolia-rpc-url))
 (def verify-ens-contract-address
  (get-config :VERIFY_ENS_CONTRACT_ADDRESS
              ((chain/chain-id->chain-keyword verify-ens-chain-id) utils.ens/ens-registries)))
@@ -295,6 +295,8 @@

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

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

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

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

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

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

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

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

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

 (def ^:const mainnet-network-name :mainnet)
 (def ^:const ethereum-network-name :ethereum)
@@ -566,6 +559,7 @@
 (def ^:const bridge-name-erc-1155-transfer "ERC1155Transfer")
 (def ^:const bridge-name-hop "Hop")
 (def ^:const bridge-name-paraswap "Paraswap")
+(def ^:const bridge-name-celer "CBridge")

 (def ^:const bridge-assets #{"ETH" "USDT" "USDC" "DAI"})

@@ -579,13 +573,14 @@
 (def ^:const sheet-screen-handle-height 20)

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

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

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

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

 (def ^:const slippages [0.1 0.5 1])
@@ -14,10 +14,13 @@

 (defn centralized-metrics-interceptor
  [context]
-  (when-let [event (tracking/tracked-event (interceptor/get-coeffect context :event))]
-    (log/debug "tracking event" event)
-    (when (push-event? (interceptor/get-coeffect context :db))
-      (native-module/add-centralized-metric event)))
+  (when (push-event? (interceptor/get-coeffect context :db))
+    (when-let [event (tracking/metrics-event (interceptor/get-coeffect context :event))]
+      (log/debug "tracking event" event)
+      (if (or (seq? event) (vector? event))
+        (doseq [e event]
+          (native-module/add-centralized-metric e))
+        (native-module/add-centralized-metric event))))
  context)

 (def interceptor
@@ -15,7 +15,7 @@

 (deftest centralized-metrics-interceptor-test
  (testing "processes context correctly"
-    (with-redefs [tracking/tracked-event (fn [_] {:metric "mocked-event"})
+    (with-redefs [tracking/metrics-event (fn [_] {:metric "mocked-event"})
                  events/push-event?     (fn [_] true)]
      (let [context {:coeffects {:event [:some-event]
                                 :db    {:centralized-metrics/enabled? true}}}]
@@ -1,7 +1,9 @@
 (ns status-im.contexts.centralized-metrics.tracking
  (:require
+    [clojure.string]
    [legacy.status-im.utils.build :as build]
-    [react-native.platform :as platform]))
+    [react-native.platform :as platform]
+    [status-im.navigation.screens :as screens]))

 (defn key-value-event
  [event-name event-value]
@@ -19,47 +21,54 @@
  [view-id]
  (key-value-event "navigation" {:viewId view-id}))

+(defn screen-event
+  [screen event-data]
+  (let [screen-id (:name screen)
+        view-id   (get-in screen [:metrics :alias-id] screen-id)]
+    {:metric
+     {:eventName  "navigation"
+      :platform   platform/os
+      :appVersion build/app-short-version
+      :eventValue (assoc event-data :viewId (name view-id))}}))
+
 (def ^:const app-started-event "app-started")

 (def ^:const view-ids-to-track
  #{;; Tabs
    :communities-stack
    :chats-stack
-    :wallet-stack
-
-    ;; Onboarding
-    :screen/onboarding.intro
-    :screen/onboarding.new-to-status
-    :screen/onboarding.sync-or-recover-profile
-    :screen/onboarding.enter-seed-phrase
-    :screen/onboarding.create-profile
-    :screen/onboarding.create-profile-password
-    :screen/onboarding.enable-biometrics
-    :screen/onboarding.generating-keys
-    :screen/onboarding.enable-notifications
-    :screen/onboarding.preparing-status
-    :screen/onboarding.sign-in-intro
-    :screen/onboarding.sign-in
-    :screen/onboarding.syncing-progress
-    :screen/onboarding.syncing-progress-intro
-    :screen/onboarding.syncing-results
-    :screen/onboarding.welcome})
+    :wallet-stack})

 (defn track-view-id-event
  [view-id]
-  (when (contains? view-ids-to-track view-id)
-    (navigation-event (name view-id))))
+  (if-let [screen (get screens/screens-by-name view-id)]
+    (when (get-in screen [:metrics :track?])
+      (screen-event screen {}))
+    (when (contains? view-ids-to-track view-id)
+      (navigation-event (name view-id)))))

-(defn tracked-event
-  [[event-name second-parameter]]
-  (case event-name
+(defn navigated-to-collectibles-tab-event
+  [location]
+  (key-value-event "navigated-to-collectibles-tab" {:location location}))
+
+(defn metrics-event
+  [[rf-event-name rf-event-parameter]]
+  (case rf-event-name
    :profile/get-profiles-overview-success
    (user-journey-event app-started-event)

    :centralized-metrics/toggle-centralized-metrics
-    (key-value-event "events.metrics-enabled" {:enabled second-parameter})
+    (key-value-event "events.metrics-enabled" {:enabled rf-event-parameter})

    :set-view-id
-    (track-view-id-event second-parameter)
+    (track-view-id-event rf-event-parameter)
+
+    :wallet/select-account-tab
+    (when (= rf-event-parameter :collectibles)
+      (navigated-to-collectibles-tab-event :account))
+
+    :wallet/select-home-tab
+    (when (= rf-event-parameter :collectibles)
+      (navigated-to-collectibles-tab-event :home))

    nil))
@@ -52,7 +52,7 @@
            {:eventName  "navigation"
             :platform   platform-os
             :appVersion app-version
-             :eventValue {:viewId "onboarding.create-profile"}}}
+             :eventValue {:viewId "onboarding.create-profile-info"}}}
           (tracking/track-view-id-event :screen/onboarding.create-profile)))
    (is (nil? (tracking/track-view-id-event :unknown-stack)))))

@@ -63,17 +63,23 @@
             :platform   platform-os
             :appVersion app-version
             :eventValue {:action tracking/app-started-event}}}
-           (tracking/tracked-event [:profile/get-profiles-overview-success])))
+           (tracking/metrics-event [:profile/get-profiles-overview-success])))
    (is (= {:metric
            {:eventName  "events.metrics-enabled"
             :platform   platform-os
             :appVersion app-version
             :eventValue {:enabled true}}}
-           (tracking/tracked-event [:centralized-metrics/toggle-centralized-metrics true])))
+           (tracking/metrics-event [:centralized-metrics/toggle-centralized-metrics true])))
    (is (= {:metric
            {:eventName  "navigation"
             :platform   platform-os
             :appVersion app-version
             :eventValue {:viewId "wallet-stack"}}}
-           (tracking/tracked-event [:set-view-id :wallet-stack])))
-    (is (nil? (tracking/tracked-event [:unknown-event])))))
+           (tracking/metrics-event [:set-view-id :wallet-stack])))
+    (is (nil? (tracking/metrics-event [:unknown-event])))
+    (is (= {:metric
+            {:eventName  "navigation"
+             :platform   platform-os
+             :appVersion app-version
+             :eventValue {:viewId "onboarding.intro"}}}
+           (tracking/metrics-event [:set-view-id :screen/onboarding.intro])))))
@@ -9,7 +9,7 @@
    [status-im.constants :as constants]
    [status-im.contexts.chat.contacts.events :as contacts-store]
    status-im.contexts.chat.effects
-    status-im.contexts.chat.group-create.events
+    status-im.contexts.chat.group.events
    [status-im.contexts.chat.messenger.composer.link-preview.events :as link-preview]
    status-im.contexts.chat.messenger.messages.content.reactions.events
    [status-im.contexts.chat.messenger.messages.delete-message-for-me.events :as delete-for-me]
@@ -33,8 +33,8 @@
   (multi-user-chat? (get-chat cofx chat-id))))

 (defn public-chat?
-  ([chat]
-   (:public? chat))
+  ([{:keys [chat-type]}]
+   (= chat-type constants/public-chat-type))
  ([cofx chat-id]
   (public-chat? (get-chat cofx chat-id))))

@@ -52,7 +52,7 @@
 (defn group-chat?
  ([chat]
   (and (multi-user-chat? chat)
-        (not (public-chat? chat))))
+        (not (:public? chat))))
  ([cofx chat-id]
   (group-chat? (get-chat cofx chat-id))))

@@ -1,13 +1,11 @@
-(ns status-im.contexts.chat.group-create.view
-  (:require [clojure.string :as string]
-            [quo.core :as quo]
-            [quo.foundations.colors :as colors]
+(ns status-im.contexts.chat.group.common.group-edit
+  (:require [quo.core :as quo]
            [quo.theme]
            [react-native.core :as rn]
            [status-im.common.avatar-picture-picker.view :as avatar-picture-picker]
            [status-im.common.floating-button-page.view :as floating-button-page]
            [status-im.constants :as constants]
-            [status-im.contexts.chat.group-create.style :as style]
+            [status-im.contexts.chat.group.common.style :as style]
            [status-im.contexts.profile.utils :as profile.utils]
            [utils.debounce :as debounce]
            utils.emojilib
@@ -41,35 +39,28 @@
      :i/camera]]))

 (defn view
-  []
+  [{:keys [default-group-name default-group-color default-group-image contacts
+           submit-button-label submit-event back-button-icon chat-id close on-success editing-group?]}]
  (let [theme                         (quo.theme/use-theme)
        {window-width :width}         (rn/get-window)
-        profile                       (rf/sub [:profile/profile-with-image])
-        contacts                      (rf/sub [:selected-group-contacts])
        contacts-count                (count contacts)
-        default-value                 (rn/use-memo
-                                       (fn []
-                                         (let [contact-string (string/join ", "
-                                                                           (map
-                                                                            profile.utils/displayed-name
-                                                                            contacts))]
-                                           (subs contact-string
-                                                 0
-                                                 (min (count contact-string)
-                                                      constants/max-group-chat-name-length))))
-                                       [])
-        [group-name set-group-name]   (rn/use-state default-value)
+        [group-name set-group-name]   (rn/use-state default-group-name)
        [error-message
         set-error-message]           (rn/use-state nil)
        group-name-empty?             (not (and (string? group-name) (not-empty group-name)))
-        [group-color set-group-color] (rn/use-state (rand-nth colors/account-colors))
-        [group-image set-group-image] (rn/use-state nil)
-        create-group-on-press         (rn/use-callback #(debounce/throttle-and-dispatch
-                                                         [:group-chat/create group-name group-color
-                                                          group-image]
+        [group-color set-group-color] (rn/use-state default-group-color)
+        [group-image set-group-image] (rn/use-state default-group-image)
+        on-submit                     (rn/use-callback #(debounce/throttle-and-dispatch
+                                                         [submit-event
+                                                          {:group-name  group-name
+                                                           :group-color group-color
+                                                           :group-image (when (not= group-image
+                                                                                    default-group-image)
+                                                                          group-image)
+                                                           :chat-id     chat-id
+                                                           :on-success  on-success}]
                                                         300)
                                                       [group-name group-color group-image])
-        back-on-press                 (rn/use-callback #(rf/dispatch [:navigate-back]))
        on-change-text                (rn/use-callback
                                       (fn [text]
                                         (if (boolean (re-find utils.emojilib/emoji-regex text))
@@ -77,7 +68,13 @@
                                                                          {:check (i18n/label
                                                                                   :t/emojis)}))
                                           (set-error-message nil))
-                                         (set-group-name text)))]
+                                         (set-group-name text)))
+        disabled?                     (or group-name-empty?
+                                          error-message
+                                          (and editing-group?
+                                               (= group-name default-group-name)
+                                               (= group-color default-group-color)
+                                               (= group-image default-group-image)))]
    [floating-button-page/view
     {:customization-color    group-color
      :gradient-cover?        true
@@ -85,13 +82,13 @@
      :header                 [quo/page-nav
                               {:background :photo
                                :type       :no-title
-                                :icon-name  :i/arrow-left
-                                :on-press   back-on-press}]
+                                :icon-name  back-button-icon
+                                :on-press   close}]
      :footer                 [quo/button
                               {:customization-color group-color
-                                :disabled?           (boolean (or group-name-empty? error-message))
-                                :on-press            create-group-on-press}
-                               (i18n/label :t/create-group-chat)]}
+                                :disabled?           disabled?
+                                :on-press            on-submit}
+                               submit-button-label]}
     [:<>
      [avatar
       {:customization-color group-color
@@ -99,7 +96,7 @@
        :set-group-image     set-group-image}]
      [quo/title-input
       {:on-change-text  on-change-text
-        :default-value   default-value
+        :default-value   default-group-name
        :container-style {:padding-horizontal 20 :padding-top 12 :padding-bottom (if error-message 0 16)}
        :placeholder     (i18n/label :t/name-your-group)
        :max-length      constants/max-group-chat-name-length}]
@@ -126,9 +123,9 @@
                            :padding-left   (responsiveness/iphone-11-Pro-20-pixel-from-width
                                             window-width)}}]]
      [quo/divider-label
-       (i18n/label :t/n-m-people {:n (inc contacts-count) :m constants/max-group-chat-participants})]
+       (i18n/label :t/n-m-people {:n contacts-count :m constants/max-group-chat-participants})]
      [rn/view {:style style/tags}
-       (for [contact (conj contacts profile)]
+       (for [contact contacts]
         ^{:key contact}
         [quo/context-tag
          {:container-style style/tag
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.group-create.style
+(ns status-im.contexts.chat.group.common.style
  (:require [quo.foundations.colors :as colors]))

 (def avatar {:width 88 :margin-top 12 :margin-left 20})
@@ -0,0 +1,27 @@
+(ns status-im.contexts.chat.group.create.view
+  (:require
+    [clojure.string :as string]
+    [quo.foundations.colors :as colors]
+    [status-im.constants :as constants]
+    [status-im.contexts.chat.group.common.group-edit :as group-edit]
+    [status-im.contexts.profile.utils :as profile.utils]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]))
+
+(defn view
+  [{:keys [close]}]
+  (let [contacts           (rf/sub [:selected-group-contacts])
+        contact-string     (string/join ", " (map profile.utils/displayed-name contacts))
+        default-group-name (subs contact-string
+                                 0
+                                 (min (count contact-string) constants/max-group-chat-name-length))
+        profile            (rf/sub [:profile/profile-with-image])
+        contacts           (conj contacts profile)]
+    [group-edit/view
+     {:default-group-name  default-group-name
+      :default-group-color (rand-nth colors/account-colors)
+      :contacts            contacts
+      :submit-button-label (i18n/label :t/create-group-chat)
+      :submit-event        :group-chat/create
+      :back-button-icon    :i/arrow-left
+      :close               close}]))
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.group-details.style
+(ns status-im.contexts.chat.group.details.style
  (:require
    [quo.foundations.colors :as colors]))

@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.group-details.view
+(ns status-im.contexts.chat.group.details.view
  (:require
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
@@ -11,7 +11,7 @@
    [status-im.common.contact-list.view :as contact-list]
    [status-im.common.home.actions.view :as actions]
    [status-im.constants :as constants]
-    [status-im.contexts.chat.group-details.style :as style]
+    [status-im.contexts.chat.group.details.style :as style]
    [status-im.feature-flags :as ff]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -54,7 +54,7 @@
  (let [theme                      (quo.theme/use-theme)
        selected-participants      (rf/sub [:group-chat/selected-participants])
        deselected-members         (rf/sub [:group-chat/deselected-members])
-        chat-id                    (rf/sub [:get-screen-params :group-add-manage-members])
+        chat-id                    (rf/sub [:get-screen-params :screen/group-add-manage-members])
        {:keys [admins] :as group} (rf/sub [:chats/chat-by-id chat-id])
        current-pk                 (rf/sub [:multiaccount/public-key])
        admin?                     (get admins current-pk)]
@@ -123,9 +123,9 @@
  [_]
  [rn/view {:style {:height 8}}])

-(defn group-details
+(defn view
  []
-  (let [chat-id         (rf/sub [:get-screen-params :group-details])
+  (let [chat-id         (rf/sub [:get-screen-params :screen/group-details])
        {:keys [admins chat-id chat-name color muted contacts image]
         :as   group}   (rf/sub [:chats/chat-by-id chat-id])
        members         (rf/sub [:contacts/group-members-sections chat-id])
@@ -176,7 +176,8 @@
                          :icon                :i/add-user
                          :label               (i18n/label (if admin? :t/manage-members :t/add-members))
                          :counter-value       (count contacts)
-                          :on-press            #(rf/dispatch [:open-modal :group-add-manage-members
+                          :on-press            #(rf/dispatch [:open-modal
+                                                              :screen/group-add-manage-members
                                                              chat-id])}]}]
     [rn/section-list
      {:key-fn                         :title
@@ -1,12 +1,12 @@
-(ns status-im.contexts.chat.group-create.events
+(ns status-im.contexts.chat.group.events
  (:require [clojure.string :as string]
-            [legacy.status-im.data-store.chats :as data-store.chats]
            [oops.core :as oops]
            [re-frame.core :as rf]
-            [status-im.common.avatar-picture-picker.view :as avatar-picture-picker]))
+            [status-im.common.avatar-picture-picker.view :as avatar-picture-picker]
+            [taoensso.timbre :as log]))

 (rf/reg-event-fx :group-chat/create
- (fn [{:keys [db]} [group-name color image]]
+ (fn [{:keys [db]} [{:keys [group-name group-color group-image]}]]
   (let [selected-contacts (:group/selected-contacts db)]
     {:json-rpc/call [{:method      "wakuext_createGroupChatWithMembers"
                       :params      [nil group-name (into [] selected-contacts)]
@@ -17,25 +17,23 @@
                                                        (oops/oget :id))]
                                        (rf/dispatch [:chat-updated response])
                                        (rf/dispatch [:group-chat/edit
-                                                      {:chat-id    chat-id
-                                                       :group-name group-name
-                                                       :color      color
-                                                       :image      image}])))}]})))
-
-(rf/reg-event-fx :group-chat/edit-success
- (fn [{:keys [db]} [{:keys [chat-id name color image]}]]
-   (let [new-chat {:name name :color color :image image}]
-     {:db (update-in db [:chats chat-id] #(merge % new-chat))})))
+                                                      {:chat-id     chat-id
+                                                       :group-name  group-name
+                                                       :group-color group-color
+                                                       :group-image group-image}])))}]})))

 (rf/reg-event-fx :group-chat/edit
- (fn [_ [{:keys [chat-id group-name color image]}]]
+ (fn [_ [{:keys [chat-id group-name group-color group-image on-success]}]]
   {:json-rpc/call [{:method      "chat_editChat"
-                     :params      ["" chat-id group-name (name color)
-                                   {:imagePath (when image (string/replace-first image #"file://" ""))
+                     :params      ["" chat-id group-name (name group-color)
+                                   {:imagePath (when group-image
+                                                 (string/replace-first group-image #"file://" ""))
                                    :x         0
                                    :y         0
                                    :width     avatar-picture-picker/crop-size
                                    :height    avatar-picture-picker/crop-size}]
                     :js-response true
-                     :on-success  #(rf/dispatch [:group-chat/edit-success
-                                                 (data-store.chats/<-rpc-js %)])}]}))
+                     :on-error    #(log/error "failed to edit group" {:error %})
+                     :on-success  (fn [response]
+                                    (rf/dispatch [:chat-updated response true])
+                                    (when on-success (on-success)))}]}))
@@ -0,0 +1,23 @@
+(ns status-im.contexts.chat.group.update.view
+  (:require
+    [status-im.contexts.chat.group.common.group-edit :as group-edit]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]))
+
+(defn view
+  [{:keys [close]}]
+  (let [chat-id                         (rf/sub [:get-screen-params :screen/group-update])
+        {:keys [chat-name color image]} (rf/sub [:chats/chat-by-id chat-id])
+        contacts                        (rf/sub [:contacts/contacts-by-chat chat-id])]
+    [group-edit/view
+     {:default-group-name  chat-name
+      :default-group-color color
+      :default-group-image image
+      :contacts            contacts
+      :submit-button-label (i18n/label :t/update-group-chat)
+      :submit-event        :group-chat/edit
+      :back-button-icon    :i/close
+      :chat-id             chat-id
+      :close               close
+      :on-success          close
+      :editing-group?      true}]))
@@ -237,11 +237,17 @@

 (defn chat-item
  [{:keys [chat-id group-chat color name last-message timestamp muted image
-           unviewed-messages-count]
+           chat-type unviewed-messages-count]
    :as   item}]
  (let [[primary-name secondary-name]
-        (if group-chat
+        (cond
+          group-chat
          [name ""]
+
+          (= chat-type constants/public-chat-type)
+          [(str "#" name) ""]
+
+          :else
          (rf/sub [:contacts/contact-two-names-by-identity chat-id]))
        {:keys [ens-verified added?] :as contact} (when-not group-chat
                                                    (rf/sub [:contacts/contact-by-address chat-id]))
@@ -149,7 +149,7 @@
          :on-press            (fn []
                                 (if one-contact-selected?
                                   (rf/dispatch [:chat.ui/start-chat public-key])
-                                   (rf/dispatch [:open-modal :group-create])))}
+                                   (rf/dispatch [:open-modal :screen/group-create])))}
         (if one-contact-selected?
           (i18n/label :t/chat-with {:selected-user primary-name})
           (i18n/label :t/setup-group-chat))]])]))
@@ -12,10 +12,13 @@
 (defn view
  [{:keys [contact-id]}]
  (let [customization-color       (rf/sub [:profile/customization-color])
-        [primary-name _]          (rf/sub [:contacts/contact-two-names-by-identity contact-id])
        {:keys [contact-request-state
-                community-id]}    (rf/sub [:chats/current-chat-chat-view])
+                community-id
+                chat-name]}       (rf/sub [:chats/current-chat-chat-view])
        chat-type                 (rf/sub [:chats/chat-type])
+        [primary-name _]          (if (= chat-type :public-chat)
+                                    [(str "#" chat-name) ""]
+                                    (rf/sub [:contacts/contact-two-names-by-identity contact-id]))
        community-chat?           (= chat-type :community-chat)
        joined                    (when community-chat?
                                    (rf/sub [:communities/community-joined community-id]))
@@ -4,20 +4,18 @@
            [status-im.common.events-helper :as events-helper]
            [status-im.common.standard-authentication.core :as standard-auth]
            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]
-            [utils.security.core :as security]))
+            [utils.re-frame :as rf]))

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 (defn auth
-  [{:keys [on-complete]}]
-  (let [{:keys [text status]} (rf/sub [:keycard/pin])
-        pin-retry-counter     (rf/sub [:keycard/pin-retry-counter])
-        error?                (= status :error)]
+  [{:keys [on-complete error]}]
+  (let [{:keys [error? error-message]} error
+        {:keys [text status]}          (rf/sub [:keycard/pin])
+        pin-retry-counter              (rf/sub [:keycard/pin-retry-counter])
+        error?                         (or error? (= status :error))]
+    (rn/use-unmount #(rf/dispatch [:keycard.pin/clear]))
    [rn/view {:padding-bottom 12 :flex 1}
     [rn/view {:flex 1 :justify-content :center :align-items :center :padding 34}
      [quo/pin-input
@@ -18,7 +20,9 @@
        :number-of-filled-pins (count text)
        :error?                error?
        :info                  (when error?
-                                 (i18n/label :t/pin-retries-left {:number pin-retry-counter}))}]]
+                                 (if error-message
+                                   error-message
+                                   (i18n/label :t/pin-retries-left {:number pin-retry-counter})))}]]
     [quo/numbered-keyboard
      {:delete-key? true
       :on-delete   #(rf/dispatch [:keycard.pin/delete-pressed])
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Cristian Lungu	f3fd33d63a	fix: tx confirmation title network color	2024-11-05 14:06:13 +02:00
Cristian Lungu	08fea7fe5f	fix: input amount fee rebase leftover	2024-11-05 13:46:43 +02:00
Cristian Lungu	792caf5259	fix: tx confirmation summary-info address initials	2024-11-05 13:34:37 +02:00
Cristian Lungu	c02d97d380	fix: hide "Amount received" on collectible confirmation	2024-11-05 13:33:46 +02:00
Cristian Lungu	3001fa91e9	ref: extracted transaction title component	2024-11-05 13:33:20 +02:00
Cristian Lungu	2714c7b9e5	fix: network-values reagent warning	2024-11-05 11:52:45 +02:00
Cristian Lungu	307155a4ca	ref: split tx confirmation subs into components	2024-11-04 20:23:41 +02:00
Cristian Lungu	a5ef314d6a	ref: account summary from tx confirmation	2024-11-04 20:21:07 +02:00
Cristian Lungu	2ba16e6762	fix: refactored send confirmation title	2024-11-04 20:21:07 +02:00
Cristian Lungu	6acda08ebb	fix: network-values amount should be fixed	2024-11-04 20:16:12 +02:00
Cristian Lungu	90166ad45a	fix: sending BonderFee as string	2024-11-04 20:16:11 +02:00
Cristian Lungu	ef8490961a	fix: addressed review comments	2024-11-04 20:16:11 +02:00
Cristian Lungu	e4ae78bb25	test: added subscription tests	2024-11-04 20:16:11 +02:00
Cristian Lungu	ea07780e9c	fix: lint	2024-11-04 20:16:11 +02:00
Cristian Lungu	ff569f328a	fix: wallet input component tests	2024-11-04 20:16:11 +02:00
Cristian Lungu	e4b42fc0ca	fix: tests for estimated-received	2024-11-04 20:16:10 +02:00
Cristian Lungu	9397dd46e8	feat: added bridge bonder-fee info sheet	2024-11-04 20:16:10 +02:00
Cristian Lungu	34d6b3c1d5	feat: moved send estimated-fees in separate ns	2024-11-04 20:16:10 +02:00
Cristian Lungu	3c7d299ef7	feat: title-icon prop for quo/data-item	2024-11-04 20:16:10 +02:00
Cristian Lungu	43a8be9d52	fix: route out value not using token decimals	2024-11-04 20:16:10 +02:00
Cristian Lungu	adff7a5120	ref: moved estimated received from event to sub	2024-11-04 20:16:09 +02:00
Cristian Lungu	4db4b5c84b	test: added test cases for out amount and received	2024-11-04 20:16:09 +02:00
Cristian Lungu	23d84a54fc	fix: show correct bridge values for to/received/fees	2024-11-04 20:16:09 +02:00
Cristian Lungu	5d51ae55b5	test: estimated-received-by-chain-test tests	2024-11-04 20:16:09 +02:00
Cristian Lungu	d51d88fc0b	ref: added token precision constant	2024-11-04 20:16:09 +02:00
Cristian Lungu	bf8fa45e52	fix: using estimated received value for transactions	2024-11-04 20:16:08 +02:00
Lungu Cristian	077b885617	Fix wallet action buttons alignment (#21514 ) * fix: wallet-ctas dynamic spacing * fix: updated bridge icon according to designs	2024-11-04 20:01:54 +02:00
Tetiana Churikova	2e42da5996	gh: added Type (#21472 )	2024-11-04 16:53:18 +01:00
Tetiana Churikova	f6dc9d1ad3	e2e: skipping waku tests and fixes (#21471 )	2024-11-04 16:33:03 +01:00
Mohamed Javid	9f1eb60e21	chore_: Remove Goerli code (#21508 ) This commit removes the goerli-related code from the mobile repo. Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-11-04 18:10:36 +05:30
Mohamed Javid	8e7d5233df	fix(wallet)_: Bridging tx improvements (#21523 ) This commit fixes two issues faced in L1 to L2 tx: - fail with 'L1_ETH_BRG: Value does not match amount' error - reverted tx due to out of gas error Status go changes: https://github.com/status-im/status-go/pull/6012 Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-11-04 15:04:36 +05:30
Mohamed Javid	4f40fda6a3	fix(wallet)_: Chain prefix for ENS resolved address (#21504 ) This commit removes chain prefixes being added to ENS resolved address in send flow Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-11-01 21:09:59 +05:30
flexsurfer	f0079961f4	[#21316 ] Keycard - Allow user to migrate existing Profile to the new … (#21467 )	2024-11-01 12:48:07 +01:00
Lungu Cristian	9862abb7eb	Fix "Failed to get dApps" error when a session expired (#21531 ) * fix: pass the topic instead of entire session * chore: added logs for future debugging	2024-10-30 15:51:26 +02:00
Brian Sztamfater	6d7697870d	feat(swap): add metrics for swaps (#21485 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-10-29 12:01:47 -03:00
Parvesh Monu	4f53a2b11e	fix No tabs are available in the app on Graphene OS (#21520 )	2024-10-29 20:14:26 +05:30
Siddarth Kumar	fd9e8273e1	chore(deps)_: use gradle plugin to get deps (#21502 ) related issue : https://github.com/status-im/status-mobile/issues/15447 This commit makes use of https://github.com/gradle/github-dependency-graph-gradle-plugin to generate deps so that we may get rid of the AWK script that parses `gradle` output to figure out `gradle` dependencies. credits to Vedran for doing initial research on this dependency generator plugin. We still miss a few dependencies and are not completely able to get rid of the hack list step just yet. I also moved `react-native-share` out of `pluginManagement ` block in `android/settings.gradle` because it does not belong there.	2024-10-29 11:39:50 +05:30
Parvesh Monu	6afaba23b5	fix Error when creating an account on e2e build (#21496 )	2024-10-29 00:54:07 +05:30
Mohamed Javid	4aef76281c	fix(wallet-settings)_: Icon color in missing keypair section (#21498 ) This commit fixes the icon color in the missing keypair section Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-10-28 15:53:25 +05:30
Mohamed Javid	c62d7d501e	fix(wallet)_: token supported networks (#21451 ) This commit - fixes the networks/chains supported by the token based on the token list fetched from status-go instead of relying on the balance-per-chain map as status-go returns balance for chains only if there is a positive balance - adds supported-networks key to token data map for network details Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-10-24 16:00:18 +05:30
Sean Hagstrom	65cdb0dfe7	chore: refactor screens definitions and add more navigation events for screens (#21328 ) This change refactors the navigation-screens namespace to organise each screen definition into a group based on the app features. It also adds some metrics tracking to all the of the screens defined in the navigation-screens namespace. Additionally, in this change we've introduced a new build configuration for shadow-cljs which allows us to conditionally include code for certain shadow-cljs builds. In this case, we've decided to only exclude the metrics re-frame interceptor from being required when running the component-tests build. This is due to a complication with the metrics interceptor depending on the navigation-screens namespace, which would eventually require many other third-party dependencies that do not have mocks defined for the component tests. To avoid defining more mocks, we've avoided requiring the metrics interceptor for now.	2024-10-23 08:28:41 -07:00
Mohsen	ea18966f33	[#21439 ] fix: close swap flow after confirmation (#21466 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-10-23 11:41:36 -03:00
Icaro Motta	e1abe5c6e2	feat(onboarding): Present Terms to users upgrading from v1 or those who need to accept updated Terms (#21487 ) Cherry-pick https://github.com/status-im/status-mobile/commit/d45eb5ec20ae7757cd99554920e466eabac0bfb1. Fixes https://github.com/status-im/status-mobile/issues/21113 Related status-go PR: https://github.com/status-im/status-go/pull/5977	2024-10-23 11:26:29 -03:00
Siddarth Kumar	cac96b589f	chore(ci)_: bump universal apk size limit to 125MB (#21486 )	2024-10-23 12:45:59 +05:30
Volodymyr Kozieiev	f8d4f56d2d	collectible metrics (#21280 )	2024-10-22 16:10:14 +01:00
Mohamed Javid	0957fb6e0a	fix(wallet)_: Activity tab is selected on navigating back from the swap flow (#21474 ) This commit fixes activity tab is selected when navigating back from the swap flow Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-10-22 18:55:19 +05:30
Lungu Cristian	5118a5095d	Fix networks on select asset screen (#21403 ) * fix: filter tokens by balance on select asset * feat: added network-list-with-positive-balance * fix: swaps error when using networks with balance * fix: hide send/bridge/swap when no token balance	2024-10-22 15:55:37 +03:00
Andrey Bocharnikov	01c5cf2498	fix: client should pass a list with "Symbol" and without "ChainID-" prefix to wallet_fetchMarketValues, wallet_fetchPrices (#21453 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-10-22 09:15:47 -03:00
Parvesh Monu	fae4b34863	fix Group Admin has no option to Edit a Group Chat (#21457 )	2024-10-21 22:01:31 +05:30
Parvesh Monu	020d5cc1c1	fix public chat deletion and name display issues post-migration (#21469 )	2024-10-21 16:51:41 +05:30