Lint fix

feat: Add general infrastructure for status-backend integration
[#21316 ] Keycard - Allow user to migrate existing Profile to the new … (#21467 )
2024-11-01 08:49:55 -06:00 · 2024-11-01 08:49:55 -06:00 · 2024-11-01 12:48:07 +01:00 · 2024-10-30 15:51:26 +02:00 · 2024-10-29 12:01:47 -03:00 · 2024-10-29 20:14:26 +05:30
83 changed files with 2004 additions and 1476 deletions
@@ -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'
@@ -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]
-    }
-}
@@ -82,7 +82,12 @@
          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/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
+          status-im.config/STATUS_BACKEND_ENABLED         #shadow/env "STATUS_BACKEND_ENABLED"
+          ;; The dir <STATUS_BACKEND_STORAGE_DIR>/data musts exist before running the app.
+          status-im.config/STATUS_BACKEND_STORAGE_DIR     #shadow/env "STATUS_BACKEND_STORAGE_DIR"
+          status-im.config/STATUS_BACKEND_PORT            #shadow/env "STATUS_BACKEND_PORT"
+          status-im.config/STATUS_BACKEND_ADDRESS         #shadow/env "STATUS_BACKEND_ADDRESS"}
         :compiler-options {:output-feature-set :es5
                            ;; We disable `:fn-deprecated` warnings because we
                            ;; are managing deprecation via clj-kondo and we
@@ -121,7 +126,8 @@
     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/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
+     status-im.config/STATUS_BACKEND_ENABLED         false}
    :compiler-options {:output-feature-set :es6
                       ;;disable for android build as there
                       ;;is an intermittent warning with deftype
@@ -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)
@@ -3,54 +3,31 @@
    ["react-native" :as react-native]
    [clojure.string :as string]
    [native-module.utils :as native-utils]
+    [oops.core :as oops]
    [react-native.platform :as platform]
+    [status-backend.config :as status-backend.config]
+    [status-backend.core :as status-backend]
+    [status-im.config]
    [taoensso.timbre :as log]
    [utils.transforms :as types]))

-(defn status
-  []
-  (when (exists? (.-NativeModules react-native))
-    (.-Status ^js (.-NativeModules react-native))))
+(defn- extract-from-native-modules
+  [module]
+  (if status-im.config/STATUS_BACKEND_ENABLED
+    status-backend/fetch-js-obj
+    (some-> react-native
+            (oops/gobj-get "NativeModules")
+            (oops/gobj-get module))))

-(defn account-manager
-  []
-  (when (exists? (.-NativeModules react-native))
-    (.-AccountManager ^js (.-NativeModules react-native))))
-
-(defn encryption
-  []
-  (when (exists? (.-NativeModules react-native))
-    (.-EncryptionUtils ^js (.-NativeModules react-native))))
-
-(defn database
-  []
-  (when (exists? (.-NativeModules react-native))
-    (.-DatabaseManager ^js (.-NativeModules react-native))))
-
-(defn ui-helper
-  []
-  (when (exists? (.-NativeModules react-native))
-    (.-UIHelper ^js (.-NativeModules react-native))))
-
-(defn log-manager
-  []
-  (when (exists? (.-NativeModules react-native))
-    (.-LogManager ^js (.-NativeModules react-native))))
-
-(defn utils
-  []
-  (when (exists? (.-NativeModules react-native))
-    (.-Utils ^js (.-NativeModules react-native))))
-
-(defn network
-  []
-  (when (exists? (.-NativeModules react-native))
-    (.-NetworkManager ^js (.-NativeModules react-native))))
-
-(defn mail-manager
-  []
-  (when (exists? (.-NativeModules react-native))
-    (.-MailManager ^js (.-NativeModules react-native))))
+(defn status [] (extract-from-native-modules "Status"))
+(defn account-manager [] (extract-from-native-modules "AccountManager"))
+(defn encryption [] (extract-from-native-modules "EncryptionUtils"))
+(defn database [] (extract-from-native-modules "DatabaseManager"))
+(defn ui-helper [] (extract-from-native-modules "UIHelper"))
+(defn log-manager [] (extract-from-native-modules "LogManager"))
+(defn utils [] (extract-from-native-modules "Utils"))
+(defn network [] (extract-from-native-modules "NetworkManager"))
+(defn mail-manager [] (extract-from-native-modules "MailManager"))

 (defn mail
  [opts callback]
@@ -58,7 +35,11 @@

 (defn init
  [handler]
-  (.addListener ^js (.-DeviceEventEmitter ^js react-native) "gethEvent" #(handler (.-jsonEvent ^js %))))
+  (if status-im.config/STATUS_BACKEND_ENABLED
+    (status-backend/init-web-socket handler)
+    (.addListener ^js (.-DeviceEventEmitter ^js react-native)
+                  "gethEvent"
+                  #(handler (.-jsonEvent ^js %)))))

 (defn clear-web-data
  []
@@ -508,21 +489,22 @@
                              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
  []
-  (.backupDisabledDataDir ^js (utils)))
+  (if status-im.config/STATUS_BACKEND_ENABLED
+    status-backend.config/data-dir-path
+    (.backupDisabledDataDir ^js (utils))))

 (defn fleets
  []
@@ -530,15 +512,27 @@

 (defn keystore-dir
  []
-  (.keystoreDir ^js (utils)))
+  (if status-im.config/STATUS_BACKEND_ENABLED
+    status-backend.config/keystore-dir-path
+    (.keystoreDir ^js (utils))))

 (defn log-file-directory
  []
-  (.logFileDirectory ^js (log-manager)))
+  (if status-im.config/STATUS_BACKEND_ENABLED
+    status-backend.config/log-dir-path
+    (.logFileDirectory ^js (log-manager))))

 (defn init-status-go-logging
  [{:keys [enable? mobile-system? log-level log-request-go? callback]}]
-  (.initLogging ^js (log-manager) enable? mobile-system? log-level log-request-go? callback))
+  (if status-im.config/STATUS_BACKEND_ENABLED
+    (.initLogging ^js (log-manager)
+                  {:Enabled        enable?
+                   :MobileSystem   mobile-system?
+                   :Level          log-level
+                   :LogRequestGo   log-request-go?
+                   :LogRequestFile status-backend.config/log-request-file-path}
+                  callback)
+    (.initLogging ^js (log-manager) enable? mobile-system? log-level log-request-go? callback)))

 (defn get-random-mnemonic
  [callback]
@@ -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
@@ -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}
@@ -0,0 +1,20 @@
+(ns status-backend.config
+  (:require [status-im.config]))
+
+(def ^:private url
+  (str "http://"
+       status-im.config/STATUS_BACKEND_ADDRESS
+       ":"
+       status-im.config/STATUS_BACKEND_PORT))
+
+(def data-dir-path
+  (str status-im.config/STATUS_BACKEND_STORAGE_DIR "/data"))
+
+(def ^:private public-storage-dir
+  (str status-im.config/STATUS_BACKEND_STORAGE_DIR "/public"))
+
+(def status-go-url (str url "/statusgo/"))
+(def signals-url (str url "/signals"))
+(def keystore-dir-path (str data-dir-path "/keystore"))
+(def log-dir-path (str data-dir-path "/log"))
+(def log-request-file-path (str public-storage-dir "/requests.log"))
@@ -0,0 +1,46 @@
+(ns status-backend.core
+  (:require
+    [clojure.string :as string]
+    [oops.core :as oops]
+    [status-backend.config :as config]
+    [taoensso.timbre :as log]
+    [utils.network.core :as network]))
+
+(def ^:private default-fetch-params
+  {:method  :POST
+   :headers {"Accept"       "application/json"
+             "Content-Type" "application/json"}})
+
+(defn fetch
+  ([endpoint]
+   (fetch endpoint nil (fn [])))
+  ([endpoint body-params]
+   (fetch endpoint body-params (fn [])))
+  ([endpoint body-params callback]
+   (let [url    (str config/status-go-url endpoint)
+         params (assoc default-fetch-params :body body-params)]
+     (network/fetch url params callback))))
+
+(defn- method-name->endpoint
+  [s]
+  (let [first-letter-capitalized (string/capitalize (first s))]
+    (str first-letter-capitalized (subs s 1))))
+
+(def fetch-js-obj
+  "Performs a request to the status-backend (by using `status-backend.core/fetch`) using
+  the method invoked as endpoint name. E.g
+  This call: (.myMethod fetch-js-obj params)
+  Is the same as: (fetch \"MyMethod\" params)
+  "
+  (js/Proxy. #js {}
+             #js {:get (fn [_target native-module-method-name]
+                         (let [endpoint (method-name->endpoint native-module-method-name)]
+                           (partial fetch endpoint)))}))
+
+(defn init-web-socket
+  [on-message]
+  (let [web-socket (js/WebSocket. config/signals-url)]
+    (oops/oset! web-socket "onopen" #(log/debug "[backend] Web Socket connected"))
+    (oops/oset! web-socket "onmessage" #(-> % (oops/oget "data") on-message))
+    (oops/oset! web-socket "onerror" #(log/error "[backend] Web Socket error" %))
+    (oops/oset! web-socket "onclose" #(log/debug "[backend] Web Socket closed" %))))
@@ -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
@@ -29,6 +29,12 @@
 (goog-define WALLET_CONNECT_PROJECT_ID "87815d72a81d739d2a7ce15c2cfdefb3")
 (goog-define MIXPANEL_APP_ID "3350627")
 (goog-define MIXPANEL_TOKEN "5c73bda2d36a9f688a5ee45641fb6775")
+(goog-define STATUS_BACKEND_ENABLED false)
+;; Warn: <STATUS_BACKEND_STORAGE_DIR>/data musts exist before running the app if
+;; `STATUS_BACKEND_ENABLED` is true.
+(goog-define STATUS_BACKEND_STORAGE_DIR "")
+(goog-define STATUS_BACKEND_PORT 9050)
+(goog-define STATUS_BACKEND_ADDRESS "localhost")

 (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))
@@ -580,13 +580,14 @@
 (def ^:const sheet-screen-handle-height 20)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -67,6 +67,28 @@
 (fn [_ [error]]
   {:dispatch [:biometric/show-message (ex-cause error)]}))

+;; Navigate to next screen once onboarding animation and account creation both are complete
+;; Note: If account creation fails, user will get stuck on loading screen
+;; TODO: Show error screen in case account creation/restoration fails
+(rf/reg-event-fx :onboarding/account-creation-complete
+ (fn [{:keys [db]} [opts]]
+   (let [loading-animation-complete? (or (:loading-animation-complete? opts)
+                                         (:onboarding/loading-animation-complete? db))
+         loading-screen              (or (:loading-screen opts) (:onboarding/loading-screen db))
+         login-signal-received?      (or (:login-signal-received? opts)
+                                         (:onboarding/login-signal-received? db))]
+     (if (and loading-animation-complete? login-signal-received?)
+       {:db (-> db
+                (dissoc :onboarding/loading-screen)
+                (dissoc :onboarding/loading-animation-complete?)
+                (dissoc :onboarding/login-signal-received?))
+        :fx [[:dispatch
+              [:navigate-to-within-stack [:screen/onboarding.enable-notifications loading-screen]]]]}
+       {:db (-> db
+                (assoc :onboarding/loading-screen loading-screen)
+                (assoc :onboarding/loading-animation-complete? loading-animation-complete?)
+                (assoc :onboarding/login-signal-received? login-signal-received?))}))))
+
 (rf/defn create-account-and-login
  {:events [:onboarding/create-account-and-login]}
  [{:keys [db] :as cofx}]
@@ -88,9 +110,9 @@
                                (when-not syncing-account-recovered?
                                  [:dispatch [:syncing/clear-syncing-installation-id]])]
               :dispatch-later [{:ms       constants/onboarding-generating-keys-animation-duration-ms
-                                 :dispatch [:navigate-to-within-stack
-                                            [:screen/onboarding.enable-notifications
-                                             loading-screen]]}]
+                                 :dispatch [:onboarding/account-creation-complete
+                                            {:loading-animation-complete? true
+                                             :loading-screen              loading-screen}]}]
               :db             (-> db
                                   (dissoc :profile/login)
                                   (dissoc :auth-method)
@@ -13,3 +13,7 @@
 (rf/reg-fx :effects.profile/enable-local-notifications
 (fn []
   (native-module/start-local-notifications)))
+
+(rf/reg-fx :effects.profile/convert-to-keycard-profile
+ (fn [{:keys [profile settings password new-password callback]}]
+   (native-module/convert-to-keycard-profile profile settings password new-password callback)))
@@ -83,7 +83,8 @@
                  [[:dispatch [:update-theme-and-init-root :screen/onboarding.syncing-results]]]

                  (get db :onboarding/new-account?)
-                  [[:dispatch [:onboarding/finalize-setup]]]
+                  [[:dispatch [:onboarding/finalize-setup]]
+                   [:dispatch [:onboarding/account-creation-complete {:login-signal-received? true}]]]

                  :else
                  [[:dispatch [:update-theme-and-init-root :shell-stack]]
@@ -1,5 +1,6 @@
 (ns status-im.contexts.profile.profiles.view
  (:require
+    [clojure.string :as string]
    [native-module.core :as native-module]
    [quo.core :as quo]
    [react-native.core :as rn]
@@ -182,7 +183,7 @@
       :render-fn               profile-card}]]))

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

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

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

@@ -4,6 +4,7 @@
            [react-native.core :as rn]
            [status-im.common.events-helper :as events-helper]
            [status-im.common.resources :as resources]
+            [status-im.constants :as constants]
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

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

 (defn- on-privacy-policy-press
  []
@@ -15,7 +15,7 @@

 (defn- bridge-token-component
  []
-  (fn [{:keys [chain-id network-name]} {:keys [networks] :as token}]
+  (fn [{:keys [chain-id network-name]} {:keys [supported-networks] :as token}]
    (let [network                     (rf/sub [:wallet/network-details-by-chain-id chain-id])
          currency                    (rf/sub [:profile/currency])
          currency-symbol             (rf/sub [:profile/currency-symbol])
@@ -28,7 +28,8 @@
          fiat-formatted              (utils/get-standard-fiat-format crypto-value
                                                                      currency-symbol
                                                                      fiat-value)
-          token-available-on-network? (network-utils/token-available-on-network? networks chain-id)]
+          token-available-on-network? (network-utils/token-available-on-network? supported-networks
+                                                                                 chain-id)]
      [quo/network-list
       {:label         (name network-name)
        :network-image (quo.resources/get-network (:network-name network))
@@ -49,7 +50,10 @@
        mainnet          (first network-details)
        layer-2-networks (rest network-details)
        account-token    (some #(when (= token-symbol (:symbol %)) %) tokens)
-        account-token    (when account-token (assoc account-token :networks (:networks token)))
+        account-token    (when account-token
+                           (assoc account-token
+                                  :networks           (:networks token)
+                                  :supported-networks (:supported-networks token)))
        bridge-to-title  (i18n/label :t/bridge-to
                                     {:name (string/upper-case (str token-symbol))})]

@@ -522,9 +522,10 @@
  [tokens networks chain-ids]
  (map (fn [token]
         (assoc token
-                :networks          (network-utils/network-list token networks)
-                :available-balance (calculate-total-token-balance token)
-                :total-balance     (calculate-total-token-balance token chain-ids)))
+                :networks           (network-utils/network-list-with-positive-balance token networks)
+                :supported-networks (network-utils/network-list token networks)
+                :available-balance  (calculate-total-token-balance token)
+                :total-balance      (calculate-total-token-balance token chain-ids)))
       tokens))

 (defn estimated-time-format
@@ -72,11 +72,32 @@
      (update :testPreferredChainIds chain-ids-set->string)
      (dissoc :watch-only? :default-account? :operable? :tokens :collectibles)))

+(defn add-missing-balance-per-chain-values
+  "Adds any missing chain balance (0) to the balance-per-chain map based on token supported chains as
+   status-go returns balance for that chain only if the balance is positive."
+  [balances-per-chain supported-chains]
+  (let [zero-balance-per-chain (fn [chain-id]
+                                 {:chain-id    chain-id
+                                  :raw-balance (money/->bignumber 0)
+                                  :balance     "0"})]
+    (reduce
+     (fn [result chain-id]
+       (if (contains? result chain-id)
+         result
+         (assoc result chain-id (zero-balance-per-chain chain-id))))
+     balances-per-chain
+     supported-chains)))
+
 (defn- rpc->balances-per-chain
-  [token]
+  [token supported-chains]
  (-> token
      (update :balances-per-chain update-vals #(update % :raw-balance money/bignumber))
-      (update :balances-per-chain update-keys (comp utils.number/parse-int name))))
+      (update :balances-per-chain update-keys (comp utils.number/parse-int name))
+      (update :balances-per-chain #(add-missing-balance-per-chain-values % supported-chains))))
+
+(defn- update-balances-per-chain
+  [tokens supported-chains-by-token-symbol]
+  (mapv #(rpc->balances-per-chain % (get supported-chains-by-token-symbol (:symbol %))) tokens))

 (defn- remove-tokens-with-empty-values
  [tokens]
@@ -85,12 +106,12 @@
   tokens))

 (defn rpc->tokens
-  [tokens]
+  [tokens supported-chains-by-token-symbol]
  (-> tokens
      (update-keys name)
      (update-vals #(cske/transform-keys transforms/->kebab-case-keyword %))
      (update-vals remove-tokens-with-empty-values)
-      (update-vals #(mapv rpc->balances-per-chain %))))
+      (update-vals #(update-balances-per-chain % supported-chains-by-token-symbol))))

 (defn rpc->network
  [network]
@@ -229,14 +229,17 @@
 (rf/reg-event-fx
 :wallet/store-wallet-token
 (fn [{:keys [db]} [address raw-tokens-data]]
-   (let [tokens     (data-store/rpc->tokens raw-tokens-data)
-         add-tokens (fn [stored-accounts tokens-per-account]
-                      (reduce-kv (fn [accounts address tokens-data]
-                                   (if (contains? accounts address)
-                                     (update accounts address assoc :tokens tokens-data)
-                                     accounts))
-                                 stored-accounts
-                                 tokens-per-account))]
+   (let [supported-chains-by-token-symbol (get-in db [:wallet :tokens :supported-chains-by-symbol])
+         tokens                           (data-store/rpc->tokens raw-tokens-data
+                                                                  supported-chains-by-token-symbol)
+         add-tokens                       (fn [stored-accounts tokens-per-account]
+                                            (reduce-kv
+                                             (fn [accounts address tokens-data]
+                                               (if (contains? accounts address)
+                                                 (update accounts address assoc :tokens tokens-data)
+                                                 accounts))
+                                             stored-accounts
+                                             tokens-per-account))]
     {:db (-> db
              (update-in [:wallet :accounts] add-tokens tokens)
              (assoc-in [:wallet :ui :tokens-loading address] false))})))
@@ -53,7 +53,7 @@
           token-decimals                (if collectible 0 (:decimals token))
           native-token?                 (and token (= token-display-name "ETH"))
           routes-available?             (pos? (count chosen-route))
-           token-networks                (:networks token)
+           token-networks                (:supported-networks token)
           token-networks-ids            (when token-networks
                                           (map #(:chain-id %) token-networks))
           from-network-amounts-by-chain (send-utils/network-amounts-by-chain
@@ -190,17 +190,21 @@
   ;; `token` is a map extracted from the sender, but in the wallet home page we don't know the
   ;; sender yet, so we only provide the `token-symbol`, later in
   ;; `:wallet/select-from-account` the `token` key will be set.
-   (let [{:keys [networks]}  token
-         receiver-networks   (get-in db [:wallet :ui :send :receiver-networks])
-         token-networks-ids  (map :chain-id networks)
-         unsupported-token?  (not-any? (set receiver-networks) token-networks-ids)
-         unique-owner        (when (= (count owners) 1)
-                               (first owners))
-         unique-owner-tokens (get-in db [:wallet :accounts unique-owner :tokens])
-         token-data          (or token
-                                 (when (and token-symbol unique-owner)
-                                   (some #(when (= (:symbol %) token-symbol) %)
-                                         unique-owner-tokens)))]
+   (let [{:keys [networks]}     token
+         receiver-networks      (get-in db [:wallet :ui :send :receiver-networks])
+         token-networks-ids     (map :chain-id networks)
+         unsupported-token?     (not-any? (set receiver-networks) token-networks-ids)
+         unique-owner           (when (= (count owners) 1)
+                                  (first owners))
+         unique-owner-tokens    (get-in db [:wallet :accounts unique-owner :tokens])
+         token-data             (or token
+                                    (when (and token-symbol unique-owner)
+                                      (some #(when (= (:symbol %) token-symbol) %)
+                                            unique-owner-tokens)))
+         test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])
+         network-details        (-> (get-in db
+                                            [:wallet :networks (if test-networks-enabled? :test :prod)])
+                                    (network-utils/sorted-networks-with-details))]
     (when (or token-data token-symbol)
       {:db (cond-> db
              :always      (update-in [:wallet :ui :send]
@@ -211,7 +215,11 @@
              token-symbol (assoc-in [:wallet :ui :send :token-symbol] token-symbol)
              token-data   (update-in [:wallet :ui :send]
                                      #(assoc %
-                                              :token              token-data
+                                              :token              (assoc token-data
+                                                                         :supported-networks
+                                                                         (network-utils/network-list
+                                                                          token-data
+                                                                          network-details))
                                              :token-display-name (:symbol token-data)))
              unique-owner (assoc-in [:wallet :current-viewing-account-address] unique-owner)
              entry-point  (assoc-in [:wallet :ui :send :entry-point] entry-point))
@@ -230,7 +238,7 @@
 (rf/reg-event-fx
 :wallet/edit-token-to-send
 (fn [{:keys [db]} [token]]
-   (let [{token-networks :networks
+   (let [{token-networks :supported-networks
          token-symbol   :symbol}                  token
         receiver-networks                         (get-in db [:wallet :ui :send :receiver-networks])
         token-networks-ids                        (map :chain-id token-networks)
@@ -426,7 +434,7 @@
            {:balances-per-chain balances-per-chain
             :disabled-chain-ids disabled-from-chain-ids
             :only-with-balance? false}))
-         token-networks-ids (when token (map #(:chain-id %) (:networks token)))
+         token-networks-ids (when token (map #(:chain-id %) (:supported-networks token)))
         sender-network-values (when sender-token-available-networks-for-suggested-routes
                                 (send-utils/loading-network-amounts
                                  {:valid-networks
@@ -553,7 +561,7 @@
                       :error error-message}))
         {:fx [[:dispatch
                (cond
-                  (and failure? swap?) [:wallet/swap-proposal-error error-message]
+                  (and failure? swap?) [:wallet/swap-proposal-error error]
                  failure?             [:wallet/suggested-routes-error error-message]
                  swap?                [:wallet/swap-proposal-success (fix-routes data)]
                  :else                [:wallet/suggested-routes-success (fix-routes data)
@@ -708,7 +716,11 @@
                             ;; account, so we extract the token data from the picked account.
                             (let [token (utils/get-token-from-account db token-symbol address)]
                               (assoc token
-                                      :networks      (network-utils/network-list token network-details)
+                                      :networks (network-utils/network-list-with-positive-balance
+                                                 token
+                                                 network-details)
+                                      :supported-networks (network-utils/network-list token
+                                                                                      network-details)
                                      :total-balance (utils/calculate-total-token-balance token))))
         bridge-tx?        (= tx-type :tx/bridge)
         flow-id           (if bridge-tx?
@@ -79,11 +79,14 @@
 (h/deftest-event :wallet/edit-token-to-send
  [event-id dispatch]
  (let [token-symbol      "ETH"
-        token             {:symbol   "ETH"
-                           :name     "Ether"
-                           :networks #{{:chain-id 421614}
-                                       {:chain-id 11155420}
-                                       {:chain-id 11155111}}}
+        token             {:symbol             "ETH"
+                           :name               "Ether"
+                           :networks           #{{:chain-id 421614}
+                                                 {:chain-id 11155420}
+                                                 {:chain-id 11155111}}
+                           :supported-networks #{{:chain-id 421614}
+                                                 {:chain-id 11155420}
+                                                 {:chain-id 11155111}}}
        receiver-networks [421614 11155420]]
    (testing "can be called with :token"
      (let [initial-db  {:wallet {:ui {:send {:receiver-networks receiver-networks
@@ -27,7 +27,7 @@
             receiver-preferred-networks              (rf/sub
                                                       [:wallet/wallet-send-receiver-preferred-networks])
             {token-symbol   :symbol
-              token-networks :networks}               (rf/sub [:wallet/wallet-send-token])
+              token-networks :supported-networks}     (rf/sub [:wallet/wallet-send-token])
             token-chain-ids-set                      (set (mapv #(:chain-id %) token-networks))
             [selected-receiver-networks
              set-selected-receiver-networks]         (rn/use-state receiver-networks)
@@ -27,12 +27,14 @@
                                    :test-networks-enabled? test-networks-enabled?
                                    :token-symbol           (get-in data [:asset-to-pay :symbol])}))
         network'               (or network
-                                    (swap-utils/select-network asset-to-pay))]
+                                    (swap-utils/select-network asset-to-pay))
+         start-point            (if open-new-screen? :action-menu :swap-button)]
     {:db (-> db
              (assoc-in [:wallet :ui :swap :asset-to-pay] asset-to-pay)
              (assoc-in [:wallet :ui :swap :asset-to-receive] asset-to-receive)
              (assoc-in [:wallet :ui :swap :network] network')
-              (assoc-in [:wallet :ui :swap :launch-screen] view-id))
+              (assoc-in [:wallet :ui :swap :launch-screen] view-id)
+              (assoc-in [:wallet :ui :swap :start-point] start-point))
      :fx (if network'
            [[:dispatch [:wallet/switch-current-viewing-account (:address account)]]
             [:dispatch
@@ -40,6 +42,13 @@
                [:open-modal :screen/wallet.setup-swap]
                [:navigate-to-within-stack
                 [:screen/wallet.setup-swap :screen/wallet.swap-select-asset-to-pay]])]
+             [:dispatch
+              [:centralized-metrics/track :metric/swap-start
+               {:network       (:chain-id network)
+                :pay_token     (:symbol asset-to-pay)
+                :receive_token (:symbol asset-to-receive)
+                :start_point   start-point
+                :launch_screen view-id}]]
             [:dispatch [:wallet.swap/set-default-slippage]]]
            [[:dispatch
              [:show-bottom-sheet
@@ -57,22 +66,36 @@

 (rf/reg-event-fx :wallet.swap/select-asset-to-pay
 (fn [{:keys [db]} [{:keys [token]}]]
-   {:db (update-in db
-                   [:wallet :ui :swap]
-                   #(-> %
-                        (assoc :asset-to-pay token)
-                        (dissoc :amount
-                                :amount-hex
-                                :last-request-uuid
-                                :swap-proposal
-                                :error-response
-                                :loading-swap-proposal?
-                                :approval-transaction-id
-                                :approved-amount)))}))
+   (let [previous-token (get-in db [:wallet :ui :swap :asset-to-pay])
+         network        (get-in db [:wallet :ui :swap :network])]
+     {:db (update-in db
+                     [:wallet :ui :swap]
+                     #(-> %
+                          (assoc :asset-to-pay token)
+                          (dissoc :amount
+                                  :amount-hex
+                                  :last-request-uuid
+                                  :swap-proposal
+                                  :error-response
+                                  :loading-swap-proposal?
+                                  :approval-transaction-id
+                                  :approved-amount)))
+      :fx [[:dispatch
+            [:centralized-metrics/track :metric/swap-asset-to-pay-changed
+             {:network        (:chain-id network)
+              :previous_token (:symbol previous-token)
+              :new_token      (:symbol token)}]]]})))

 (rf/reg-event-fx :wallet.swap/select-asset-to-receive
 (fn [{:keys [db]} [{:keys [token]}]]
-   {:db (assoc-in db [:wallet :ui :swap :asset-to-receive] token)}))
+   (let [previous-token (get-in db [:wallet :ui :swap :asset-to-receive])
+         network        (get-in db [:wallet :ui :swap :network])]
+     {:db (assoc-in db [:wallet :ui :swap :asset-to-receive] token)
+      :fx [[:dispatch
+            [:centralized-metrics/track :metric/swap-asset-to-receive-changed
+             {:network        (:chain-id network)
+              :previous_token (:symbol previous-token)
+              :new_token      (:symbol token)}]]]})))

 (rf/reg-event-fx :wallet.swap/set-default-slippage
 (fn [{:keys [db]}]
@@ -132,9 +155,15 @@
                                      :last-request-uuid      request-uuid
                                      :amount                 amount
                                      :amount-hex             amount-in-hex
-                                      :loading-swap-proposal? true)
+                                      :loading-swap-proposal? true
+                                      :initial-response?      true)
                                     clean-approval-transaction?
                                     (dissoc :approval-transaction-id :approved-amount :swap-proposal)))
+        :fx            [[:dispatch
+                         [:centralized-metrics/track :metric/swap-proposal-start
+                          {:network       swap-chain-id
+                           :pay_token     pay-token-id
+                           :receive_token receive-token-id}]]]
        :json-rpc/call [{:method   "wallet_getSuggestedRoutesAsync"
                         :params   params
                         :on-error (fn [error]
@@ -148,6 +177,10 @@
 (fn [{:keys [db]} [swap-proposal]]
   (let [last-request-uuid (get-in db [:wallet :ui :swap :last-request-uuid])
         amount-hex        (get-in db [:wallet :ui :swap :amount-hex])
+         asset-to-pay      (get-in db [:wallet :ui :swap :asset-to-pay])
+         asset-to-receive  (get-in db [:wallet :ui :swap :asset-to-receive])
+         network           (get-in db [:wallet :ui :swap :network])
+         initial-response? (get-in db [:wallet :ui :swap :initial-response?])
         view-id           (:view-id db)
         request-uuid      (:uuid swap-proposal)
         best-routes       (:best swap-proposal)
@@ -163,22 +196,45 @@
                               :swap-proposal          (when-not (empty? best-routes)
                                                         (assoc (first best-routes) :uuid request-uuid))
                               :error-response         error-response
-                               :loading-swap-proposal? false)}
+                               :loading-swap-proposal? false
+                               :initial-response?      false)}
+         (and initial-response? (seq best-routes))
+         (assoc :fx
+                [[:dispatch
+                  [:centralized-metrics/track :metric/swap-proposal-received
+                   {:network       (:chain-id network)
+                    :pay_token     (:symbol asset-to-pay)
+                    :receive_token (:symbol asset-to-receive)}]]])
+         (and initial-response? (empty? best-routes))
+         (assoc :fx
+                [[:dispatch
+                  [:centralized-metrics/track :metric/swap-proposal-failed
+                   {:error (:code error-response)}]]])
         ;; Router is unstable and it can return a swap proposal and after auto-refetching it can
         ;; return an error. Ideally this shouldn't happen, but adding this behavior so if the
         ;; user is in swap confirmation screen or in token approval confirmation screen, we
         ;; navigate back to setup swap screen so proper error is displayed.
         (and (empty? best-routes) (= view-id :screen/wallet.swap-set-spending-cap))
-         (assoc :fx [[:dismiss-modal :screen/wallet.swap-set-spending-cap]])
+         (assoc :fx
+                [[:dispatch
+                  [:centralized-metrics/track :metric/swap-proposal-failed
+                   {:error (:code error-response)}]]
+                 [:dismiss-modal :screen/wallet.swap-set-spending-cap]])
         (and (empty? best-routes) (= view-id :screen/wallet.swap-confirmation))
-         (assoc :fx [[:navigate-back]]))))))
+         (assoc :fx
+                [[:dispatch
+                  [:centralized-metrics/track :metric/swap-proposal-failed
+                   {:error (:code error-response)}]]
+                 [:navigate-back]]))))))

 (rf/reg-event-fx :wallet/swap-proposal-error
- (fn [{:keys [db]} [error-message]]
+ (fn [{:keys [db]} [error-response]]
   {:db (-> db
            (update-in [:wallet :ui :swap] dissoc :route :swap-proposal)
            (assoc-in [:wallet :ui :swap :loading-swap-proposal?] false)
-            (assoc-in [:wallet :ui :swap :error-response] error-message))}))
+            (assoc-in [:wallet :ui :swap :error-response] error-response))
+    :fx [[:dispatch
+          [:centralized-metrics/track :metric/swap-proposal-failed {:error (:code error-response)}]]]}))

 (rf/reg-event-fx :wallet/stop-get-swap-proposal
 (fn []
@@ -279,16 +335,25 @@
                                               (-> amount-out
                                                   (number/hex->whole receive-token-decimals)
                                                   (money/to-fixed receive-token-decimals)))]
+                                         (rf/dispatch [:centralized-metrics/track
+                                                       (if approval-required?
+                                                         :metric/swap-approval-execution-start
+                                                         :metric/swap-transaction-execution-start)
+                                                       (cond-> {:network   swap-chain-id
+                                                                :pay_token token-id-from}
+                                                         (not approval-required?)
+                                                         (assoc :receive_token token-id-to))])
                                         (rf/dispatch [:wallet.swap/add-authorized-transaction
                                                       (cond-> {:transaction result
                                                                :approval-transaction?
                                                                approval-required?}
                                                         (not approval-required?)
                                                         (assoc :swap-data
-                                                                {:pay-token-symbol token-id-from
-                                                                 :pay-amount amount
+                                                                {:pay-token-symbol     token-id-from
+                                                                 :pay-amount           amount
                                                                 :receive-token-symbol token-id-to
-                                                                 :receive-amount receive-amount}))])
+                                                                 :receive-amount       receive-amount
+                                                                 :swap-chain-id        swap-chain-id}))])
                                         (rf/dispatch [:hide-bottom-sheet])
                                         (rf/dispatch [:dismiss-modal
                                                       (if approval-required?
@@ -308,6 +373,15 @@
                                                                 :receive-amount       receive-amount})}]
                                            500)))))
                       :on-error   (fn [error]
+                                     (rf/dispatch [:centralized-metrics/track
+                                                   (if approval-required?
+                                                     :metric/swap-approval-execution-failed
+                                                     :metric/swap-transaction-execution-failed)
+                                                   (cond-> {:network   swap-chain-id
+                                                            :error     error
+                                                            :pay_token token-id-from}
+                                                     (not approval-required?)
+                                                     (assoc :receive_token token-id-to))])
                                     (log/error "failed swap transaction"
                                                {:event  :wallet/swap-transaction
                                                 :error  error
@@ -342,19 +416,26 @@

 (rf/reg-event-fx :wallet.swap/approve-transaction-update
 (fn [{:keys [db]} [{:keys [status]}]]
-   (let [{:keys [amount asset-to-pay swap-proposal]} (get-in db [:wallet :ui :swap])
-         provider-name                               (:bridge-name swap-proposal)
-         token-symbol                                (:symbol asset-to-pay)
-         current-viewing-account-address             (get-in db
-                                                             [:wallet :current-viewing-account-address])
-         account-name                                (get-in db
-                                                             [:wallet :accounts
-                                                              current-viewing-account-address :name])
-         transaction-confirmed-or-failed?            (#{:confirmed :failed} status)
-         transaction-confirmed?                      (= status :confirmed)]
+   (let [{:keys [amount asset-to-pay swap-proposal
+                 network]}                (get-in db [:wallet :ui :swap])
+         provider-name                    (:bridge-name swap-proposal)
+         token-symbol                     (:symbol asset-to-pay)
+         swap-chain-id                    (:chain-id network)
+         current-viewing-account-address  (get-in db
+                                                  [:wallet :current-viewing-account-address])
+         account-name                     (get-in db
+                                                  [:wallet :accounts
+                                                   current-viewing-account-address :name])
+         transaction-confirmed-or-failed? (#{:confirmed :failed} status)
+         transaction-confirmed?           (= status :confirmed)]
     (when transaction-confirmed-or-failed?
       (cond-> {:fx
                [[:dispatch
+                  [:centralized-metrics/track :metric/swap-approval-execution-finished
+                   {:network   swap-chain-id
+                    :pay_token token-symbol
+                    :succeeded transaction-confirmed?}]]
+                 [:dispatch
                  [:toasts/upsert
                   {:id   :approve-transaction-update
                    :type (if transaction-confirmed? :positive :negative)
@@ -377,16 +458,23 @@
 (rf/reg-event-fx :wallet.swap/swap-transaction-update
 (fn [{:keys [db]} [{:keys [tx-hash status]}]]
   (let [{:keys [pay-amount pay-token-symbol
-                 receive-amount receive-token-symbol]} (get-in db
-                                                               [:wallet :transactions tx-hash
-                                                                :swap-data])
-         transaction-confirmed-or-failed?              (#{:confirmed :failed} status)
-         transaction-confirmed?                        (= status :confirmed)]
+                 receive-amount receive-token-symbol
+                 swap-chain-id]}          (get-in db
+                                                  [:wallet :transactions tx-hash
+                                                   :swap-data])
+         transaction-confirmed-or-failed? (#{:confirmed :failed} status)
+         transaction-confirmed?           (= status :confirmed)]
     (when transaction-confirmed-or-failed?
       {:db (-> db
                (update-in [:wallet :swap-transaction-ids] disj tx-hash)
                (update-in [:wallet :transactions] dissoc tx-hash))
        :fx [[:dispatch
+              [:centralized-metrics/track :metric/swap-transaction-execution-finished
+               {:network       swap-chain-id
+                :pay_token     pay-token-symbol
+                :receive_token receive-token-symbol
+                :succeeded     transaction-confirmed?}]]
+             [:dispatch
              [:toasts/upsert
               {:id   :swap-transaction-update
                :type (if transaction-confirmed? :positive :negative)
@@ -401,13 +489,13 @@
 (rf/reg-event-fx :wallet.swap/flip-assets
 (fn [{:keys [db]}]
   (let [{:keys [asset-to-pay asset-to-receive
-                 swap-proposal amount]} (get-in db [:wallet :ui :swap])
-         receive-token-decimals         (:decimals asset-to-receive)
-         amount-out                     (when swap-proposal (:amount-out swap-proposal))
-         receive-amount                 (when amount-out
-                                          (-> amount-out
-                                              (number/hex->whole receive-token-decimals)
-                                              (money/to-fixed receive-token-decimals)))]
+                 swap-proposal amount network]} (get-in db [:wallet :ui :swap])
+         receive-token-decimals                 (:decimals asset-to-receive)
+         amount-out                             (when swap-proposal (:amount-out swap-proposal))
+         receive-amount                         (when amount-out
+                                                  (-> amount-out
+                                                      (number/hex->whole receive-token-decimals)
+                                                      (money/to-fixed receive-token-decimals)))]
     {:db (update-in db
                     [:wallet :ui :swap]
                     #(-> %
@@ -420,7 +508,17 @@
                                  :loading-swap-proposal?
                                  :last-request-uuid
                                  :approved-amount
-                                  :approval-transaction-id)))})))
+                                  :approval-transaction-id)))
+      :fx [[:dispatch
+            [:centralized-metrics/track :metric/swap-asset-to-pay-changed
+             {:network        (:chain-id network)
+              :previous_token (:symbol asset-to-pay)
+              :new_token      (:symbol asset-to-receive)}]]
+           [:dispatch
+            [:centralized-metrics/track :metric/swap-asset-to-receive-changed
+             {:network        (:chain-id network)
+              :previous_token (:symbol asset-to-receive)
+              :new_token      (:symbol asset-to-pay)}]]]})))

 (rf/reg-event-fx :wallet/end-swap-flow
 (fn [{:keys [db]}]
@@ -40,6 +40,7 @@
  (let [[search-text set-search-text] (rn/use-state "")
        on-change-text                #(set-search-text %)
        on-close                      (fn []
+                                        (rf/dispatch [:centralized-metrics/track :metric/swap-closed])
                                        (rf/dispatch [:wallet/clean-swap])
                                        (rf/dispatch [:navigate-back]))]
    [rn/safe-area-view {:style style/container}
@@ -29,7 +29,9 @@
 (def ^:private default-token-symbol "ETH")

 (defn- on-close
-  []
+  [start-point]
+  (when (= start-point :action-menu)
+    (rf/dispatch [:centralized-metrics/track :metric/swap-closed]))
  (rf/dispatch [:wallet/clean-swap-proposal {:clean-approval-transaction? true}])
  (events-helper/navigate-back))

@@ -263,16 +265,22 @@
                                        :text                 error-text}
                                 pay-input-error?
                                 (merge {:action?         true
-                                         :on-button-press #(rf/dispatch [:show-bottom-sheet
-                                                                         {:content buy-token/view}])
+                                         :on-button-press (fn []
+                                                            (rf/dispatch [:centralized-metrics/track
+                                                                          :metric/swap-buy-assets])
+                                                            (rf/dispatch [:show-bottom-sheet
+                                                                          {:content buy-token/view}]))
                                         :button-text     (i18n/label :t/add-assets)})
                                 (= error-response-code
                                    constants/router-error-code-not-enough-native-balance)
                                 (merge {:action?         true
-                                         :on-button-press #(rf/dispatch
-                                                            [:show-bottom-sheet
-                                                             {:content (fn []
-                                                                         [buy-token/view])}])
+                                         :on-button-press (fn []
+                                                            (rf/dispatch [:centralized-metrics/track
+                                                                          :metric/swap-buy-eth])
+                                                            (rf/dispatch
+                                                             [:show-bottom-sheet
+                                                              {:content (fn []
+                                                                          [buy-token/view])}]))
                                         :button-text     (i18n/label :t/add-eth)}))]
    (when (or pay-input-error? error-response)
      [quo/alert-banner props])))
@@ -337,6 +345,7 @@
        asset-to-pay                                (rf/sub [:wallet/swap-asset-to-pay])
        asset-to-receive                            (rf/sub [:wallet/swap-asset-to-receive])
        network                                     (rf/sub [:wallet/swap-network])
+        start-point                                 (rf/sub [:wallet/swap-start-point])
        pay-input-amount                            (controlled-input/input-value pay-input-state)
        pay-token-decimals                          (:decimals asset-to-pay)
        pay-token-balance-selected-chain            (number/convert-to-whole-number
@@ -463,7 +472,7 @@
     [asset-to-receive])
    [rn/view {:style style/container}
     [account-switcher/view
-      {:on-press      on-close
+      {:on-press      #(on-close start-point)
       :icon-name     :i/arrow-left
       :margin-top    (safe-area/get-top)
       :switcher-type :select-account
@@ -65,7 +65,11 @@
                      :tokens
                      (filter #(= token-symbol (:symbol %)))
                      first)]
-    (assoc token :networks (network-utils/network-list token networks))))
+    (assoc token
+           :networks
+           (network-utils/network-list-with-positive-balance
+            token
+            networks))))

 (defn select-default-asset-to-receive
  "Selects an asset to receive if it was not provided explicitly.
@@ -20,40 +20,50 @@

 (defn store-token-list
  [{:keys [db]} [{:keys [data]}]]
-  (let [chain-ids (chain/chain-ids db)
-        tokens    (reduce (fn [{:keys [by-address by-symbol] :as data}
-                               {:keys [name source version tokens]}]
-                            (-> data
-                                (update :sources
-                                        conj
-                                        {:name         name
-                                         :source       source
-                                         :version      version
-                                         :tokens-count (count tokens)})
-                                (update :by-address
-                                        merge
-                                        (tokens-data/tokens-by-address
-                                         {:added-tokens by-address
-                                          :source-name  name
-                                          :tokens       tokens
-                                          :chain-ids    chain-ids}))
-                                (update :by-symbol
-                                        merge
-                                        (tokens-data/tokens-by-symbol
-                                         {:added-tokens by-symbol
-                                          :source-name  name
-                                          :tokens       tokens
-                                          :chain-ids    chain-ids}))))
-                          {:sources    []
-                           :by-address {}
-                           :by-symbol  {}}
-                          data)
-        symbols   (->> tokens
-                       :by-symbol
-                       vals
-                       (map :symbol)
-                       set
-                       vec)]
+  (let [chain-ids                  (chain/chain-ids db)
+        tokens                     (reduce (fn [{:keys [by-address by-symbol] :as data}
+                                                {:keys [name source version tokens]}]
+                                             (-> data
+                                                 (update :sources
+                                                         conj
+                                                         {:name         name
+                                                          :source       source
+                                                          :version      version
+                                                          :tokens-count (count tokens)})
+                                                 (update :by-address
+                                                         merge
+                                                         (tokens-data/tokens-by-address
+                                                          {:added-tokens by-address
+                                                           :source-name  name
+                                                           :tokens       tokens
+                                                           :chain-ids    chain-ids}))
+                                                 (update :by-symbol
+                                                         merge
+                                                         (tokens-data/tokens-by-symbol
+                                                          {:added-tokens by-symbol
+                                                           :source-name  name
+                                                           :tokens       tokens
+                                                           :chain-ids    chain-ids}))))
+                                           {:sources    []
+                                            :by-address {}
+                                            :by-symbol  {}}
+                                           data)
+        symbols                    (->> tokens
+                                        :by-symbol
+                                        vals
+                                        (map :symbol)
+                                        set
+                                        vec)
+        by-symbol-vals             (-> tokens :by-symbol vals)
+        supported-chains-by-symbol (reduce
+                                    (fn [result
+                                         {token-symbol :symbol
+                                          :keys        [chain-id]}]
+                                      (if (contains? result token-symbol)
+                                        (update result token-symbol conj chain-id)
+                                        (assoc result token-symbol #{chain-id})))
+                                    {}
+                                    by-symbol-vals)]
    {:fx [[:effects.wallet.tokens/fetch-market-values
           {:symbols    symbols
            :currency   constants/profile-default-currency
@@ -70,9 +80,10 @@
            :on-error   [:wallet.tokens/fetch-prices-failed]}]]
     :db (-> db
             (assoc-in [:wallet :tokens]
-                       {:sources    (:sources tokens)
-                        :by-address (-> tokens :by-address vals)
-                        :by-symbol  (-> tokens :by-symbol vals)})
+                       {:sources                    (:sources tokens)
+                        :supported-chains-by-symbol supported-chains-by-symbol
+                        :by-address                 (-> tokens :by-address vals)
+                        :by-symbol                  by-symbol-vals})
             (assoc-in [:wallet :ui :loading]
                       {:token-list    false
                        :market-values true
@@ -47,10 +47,10 @@
       (match?
        (:db (tokens.events/store-token-list cofx [{:data data}]))
        {:wallet {:networks {:prod [{:chain-id 1}]}
-                  :tokens   {:sources    [{:name         "native"
-                                           :source       "native"
-                                           :version      "1.0.0"
-                                           :tokens-count 2}]
+                  :tokens   {:sources [{:name         "native"
+                                        :source       "native"
+                                        :version      "1.0.0"
+                                        :tokens-count 2}]
                             :by-address '({:address      "0x0000000000000000000000000000000000000000"
                                            :decimals     18
                                            :key          "1-0x0000000000000000000000000000000000000000"
@@ -73,28 +73,29 @@
                                            :verified?    true
                                            :chain-id     1
                                            :image        nil})
-                             :by-symbol  '({:address      "0x0000000000000000000000000000000000000000"
-                                            :decimals     18
-                                            :key          "1-ETH"
-                                            :community-id nil
-                                            :symbol       "ETH"
-                                            :sources      ["native"]
-                                            :name         "Ether"
-                                            :type         :erc20
-                                            :verified?    true
-                                            :chain-id     1
-                                            :image        nil}
-                                           {:address      "0x0000000000000000000000000000000000000001"
-                                            :decimals     18
-                                            :key          "1-SNT"
-                                            :community-id nil
-                                            :symbol       "SNT"
-                                            :sources      ["native"]
-                                            :name         "Status Network Token"
-                                            :type         :erc20
-                                            :verified?    true
-                                            :chain-id     1
-                                            :image        nil})}
+                             :by-symbol '({:address      "0x0000000000000000000000000000000000000000"
+                                           :decimals     18
+                                           :key          "1-ETH"
+                                           :community-id nil
+                                           :symbol       "ETH"
+                                           :sources      ["native"]
+                                           :name         "Ether"
+                                           :type         :erc20
+                                           :verified?    true
+                                           :chain-id     1
+                                           :image        nil}
+                                          {:address      "0x0000000000000000000000000000000000000001"
+                                           :decimals     18
+                                           :key          "1-SNT"
+                                           :community-id nil
+                                           :symbol       "SNT"
+                                           :sources      ["native"]
+                                           :name         "Status Network Token"
+                                           :type         :erc20
+                                           :verified?    true
+                                           :chain-id     1
+                                           :image        nil})
+                             :supported-chains-by-symbol {"ETH" #{1} "SNT" #{1}}}
                  :ui       {:loading {:token-list    false
                                       :market-values true
                                       :details       true
@@ -109,12 +110,13 @@
                      :db
                      :wallet
                      :tokens)
-                  {:sources    [{:name         "native"
-                                 :source       "native"
-                                 :version      "1.0.0"
-                                 :tokens-count 2}]
-                   :by-address nil
-                   :by-symbol  nil}))))
+                  {:sources                    [{:name         "native"
+                                                 :source       "native"
+                                                 :version      "1.0.0"
+                                                 :tokens-count 2}]
+                   :by-address                 nil
+                   :by-symbol                  nil
+                   :supported-chains-by-symbol {}}))))
  (testing "response contains two lists"
    (let [cofx {:db {:wallet {:networks {:prod [{:chain-id 1}]}}}}
          data [{:name    "native"
@@ -131,80 +133,81 @@
            :db
            :wallet
            :tokens)
-        {:sources    [{:name         "native"
-                       :source       "native"
-                       :version      "1.0.0"
-                       :tokens-count 2}
-                      {:name         "second"
-                       :source       "second"
-                       :version      "1.0.0"
-                       :tokens-count 2}]
-         :by-address '({:address      "0x0000000000000000000000000000000000000000"
-                        :decimals     18
-                        :key          "1-0x0000000000000000000000000000000000000000"
-                        :community-id nil
-                        :symbol       "ETH"
-                        :sources      ["native"]
-                        :name         "Ether"
-                        :type         :erc20
-                        :verified?    true
-                        :chain-id     1
-                        :image        nil}
-                       {:address      "0x0000000000000000000000000000000000000001"
-                        :decimals     18
-                        :key          "1-0x0000000000000000000000000000000000000001"
-                        :community-id nil
-                        :symbol       "SNT"
-                        :sources      ["native" "second"]
-                        :name         "Status Network Token"
-                        :type         :erc20
-                        :verified?    true
-                        :chain-id     1
-                        :image        nil}
-                       {:address      "0x0000000000000000000000000000000000000002"
-                        :decimals     18
-                        :key          "1-0x0000000000000000000000000000000000000002"
-                        :community-id nil
-                        :symbol       "ANOTHER1"
-                        :sources      ["second"]
-                        :name         "Another Token 1"
-                        :type         :erc20
-                        :verified?    false
-                        :chain-id     1
-                        :image        nil})
-         :by-symbol  '({:address      "0x0000000000000000000000000000000000000000"
-                        :decimals     18
-                        :key          "1-ETH"
-                        :community-id nil
-                        :symbol       "ETH"
-                        :sources      ["native"]
-                        :name         "Ether"
-                        :type         :erc20
-                        :verified?    true
-                        :chain-id     1
-                        :image        nil}
-                       {:address      "0x0000000000000000000000000000000000000001"
-                        :decimals     18
-                        :key          "1-SNT"
-                        :community-id nil
-                        :symbol       "SNT"
-                        :sources      ["native" "second"]
-                        :name         "Status Network Token"
-                        :type         :erc20
-                        :verified?    true
-                        :chain-id     1
-                        :image        nil}
-                       {:address      "0x0000000000000000000000000000000000000002"
-                        :decimals     18
-                        :key          "1-ANOTHER1"
-                        :community-id nil
-                        :symbol       "ANOTHER1"
-                        :sources      ["second"]
-                        :name         "Another Token 1"
-                        :type         :erc20
-                        :verified?    false
-                        :chain-id     1
-                        :image        nil})}))))
+        {:sources                    [{:name         "native"
+                                       :source       "native"
+                                       :version      "1.0.0"
+                                       :tokens-count 2}
+                                      {:name         "second"
+                                       :source       "second"
+                                       :version      "1.0.0"
+                                       :tokens-count 2}]
+         :by-address                 '({:address      "0x0000000000000000000000000000000000000000"
+                                        :decimals     18
+                                        :key          "1-0x0000000000000000000000000000000000000000"
+                                        :community-id nil
+                                        :symbol       "ETH"
+                                        :sources      ["native"]
+                                        :name         "Ether"
+                                        :type         :erc20
+                                        :verified?    true
+                                        :chain-id     1
+                                        :image        nil}
+                                       {:address      "0x0000000000000000000000000000000000000001"
+                                        :decimals     18
+                                        :key          "1-0x0000000000000000000000000000000000000001"
+                                        :community-id nil
+                                        :symbol       "SNT"
+                                        :sources      ["native" "second"]
+                                        :name         "Status Network Token"
+                                        :type         :erc20
+                                        :verified?    true
+                                        :chain-id     1
+                                        :image        nil}
+                                       {:address      "0x0000000000000000000000000000000000000002"
+                                        :decimals     18
+                                        :key          "1-0x0000000000000000000000000000000000000002"
+                                        :community-id nil
+                                        :symbol       "ANOTHER1"
+                                        :sources      ["second"]
+                                        :name         "Another Token 1"
+                                        :type         :erc20
+                                        :verified?    false
+                                        :chain-id     1
+                                        :image        nil})
+         :by-symbol                  '({:address      "0x0000000000000000000000000000000000000000"
+                                        :decimals     18
+                                        :key          "1-ETH"
+                                        :community-id nil
+                                        :symbol       "ETH"
+                                        :sources      ["native"]
+                                        :name         "Ether"
+                                        :type         :erc20
+                                        :verified?    true
+                                        :chain-id     1
+                                        :image        nil}
+                                       {:address      "0x0000000000000000000000000000000000000001"
+                                        :decimals     18
+                                        :key          "1-SNT"
+                                        :community-id nil
+                                        :symbol       "SNT"
+                                        :sources      ["native" "second"]
+                                        :name         "Status Network Token"
+                                        :type         :erc20
+                                        :verified?    true
+                                        :chain-id     1
+                                        :image        nil}
+                                       {:address      "0x0000000000000000000000000000000000000002"
+                                        :decimals     18
+                                        :key          "1-ANOTHER1"
+                                        :community-id nil
+                                        :symbol       "ANOTHER1"
+                                        :sources      ["second"]
+                                        :name         "Another Token 1"
+                                        :type         :erc20
+                                        :verified?    false
+                                        :chain-id     1
+                                        :image        nil})
+         :supported-chains-by-symbol {"ETH" #{1} "SNT" #{1} "ANOTHER1" #{1}}}))))
  (testing "second list contains a token that replaces the one that was added before"
    (let [cofx {:db {:wallet {:networks {:prod [{:chain-id 1}]}}}}
          data [{:name    "native"
@@ -221,55 +224,56 @@
            :db
            :wallet
            :tokens)
-        {:sources    [{:name         "native"
-                       :source       "native"
-                       :version      "1.0.0"
-                       :tokens-count 2}
-                      {:name         "second"
-                       :source       "second"
-                       :version      "1.0.0"
-                       :tokens-count 1}]
-         :by-address '({:address      "0x0000000000000000000000000000000000000000"
-                        :decimals     18
-                        :key          "1-0x0000000000000000000000000000000000000000"
-                        :community-id nil
-                        :symbol       "ANOTHER1"
-                        :sources      ["native" "second"]
-                        :name         "Another Token 2"
-                        :type         :erc20
-                        :verified?    false
-                        :chain-id     1
-                        :image        nil}
-                       {:address      "0x0000000000000000000000000000000000000002"
-                        :decimals     18
-                        :key          "1-0x0000000000000000000000000000000000000002"
-                        :community-id nil
-                        :symbol       "ANOTHER1"
-                        :sources      ["native"]
-                        :name         "Another Token 1"
-                        :type         :erc20
-                        :verified?    false
-                        :chain-id     1
-                        :image        nil})
-         :by-symbol  '({:address      "0x0000000000000000000000000000000000000000"
-                        :decimals     18
-                        :key          "1-ETH"
-                        :community-id nil
-                        :symbol       "ETH"
-                        :sources      ["native"]
-                        :name         "Ether"
-                        :type         :erc20
-                        :verified?    true
-                        :chain-id     1
-                        :image        nil}
-                       {:address      "0x0000000000000000000000000000000000000000"
-                        :decimals     18
-                        :key          "1-ANOTHER1"
-                        :community-id nil
-                        :symbol       "ANOTHER1"
-                        :sources      ["native" "second"]
-                        :name         "Another Token 2"
-                        :type         :erc20
-                        :verified?    false
-                        :chain-id     1
-                        :image        nil})})))))
+        {:sources                    [{:name         "native"
+                                       :source       "native"
+                                       :version      "1.0.0"
+                                       :tokens-count 2}
+                                      {:name         "second"
+                                       :source       "second"
+                                       :version      "1.0.0"
+                                       :tokens-count 1}]
+         :by-address                 '({:address      "0x0000000000000000000000000000000000000000"
+                                        :decimals     18
+                                        :key          "1-0x0000000000000000000000000000000000000000"
+                                        :community-id nil
+                                        :symbol       "ANOTHER1"
+                                        :sources      ["native" "second"]
+                                        :name         "Another Token 2"
+                                        :type         :erc20
+                                        :verified?    false
+                                        :chain-id     1
+                                        :image        nil}
+                                       {:address      "0x0000000000000000000000000000000000000002"
+                                        :decimals     18
+                                        :key          "1-0x0000000000000000000000000000000000000002"
+                                        :community-id nil
+                                        :symbol       "ANOTHER1"
+                                        :sources      ["native"]
+                                        :name         "Another Token 1"
+                                        :type         :erc20
+                                        :verified?    false
+                                        :chain-id     1
+                                        :image        nil})
+         :by-symbol                  '({:address      "0x0000000000000000000000000000000000000000"
+                                        :decimals     18
+                                        :key          "1-ETH"
+                                        :community-id nil
+                                        :symbol       "ETH"
+                                        :sources      ["native"]
+                                        :name         "Ether"
+                                        :type         :erc20
+                                        :verified?    true
+                                        :chain-id     1
+                                        :image        nil}
+                                       {:address      "0x0000000000000000000000000000000000000000"
+                                        :decimals     18
+                                        :key          "1-ANOTHER1"
+                                        :community-id nil
+                                        :symbol       "ANOTHER1"
+                                        :sources      ["native" "second"]
+                                        :name         "Another Token 2"
+                                        :type         :erc20
+                                        :verified?    false
+                                        :chain-id     1
+                                        :image        nil})
+         :supported-chains-by-symbol {"ETH" #{1} "ANOTHER1" #{1}}})))))
@@ -142,6 +142,7 @@

 (rf/reg-event-fx :wallet-connect/approve-session-success
 (fn [{:keys [db]} [session]]
+   (log/info "Successfully approved WalletConnect session" session)
   (let [total-connected-dapps (data-store/get-total-connected-dapps db)]
     {:fx [[:dispatch [:wallet-connect/on-new-session session]]
           [:dispatch [:wallet-connect/reset-current-session-proposal]]
@@ -54,6 +54,7 @@
  (assoc session
         :accounts
         (-> sessionJson
+             transforms/json->clj
             :namespaces
             :eip155
             :accounts)))
@@ -93,10 +94,10 @@
 (defn sync-persisted-sessions
  [active-sessions persisted-sessions]
  (-> (promesa/all
-       (for [topic (find-inactive-sessions active-sessions
-                                           persisted-sessions)]
-         (do (log/info "Syncing disconnected session with persistance" topic)
-             (rpc/wallet-disconnect-persisted-session topic))))
+       (for [session (find-inactive-sessions active-sessions
+                                             persisted-sessions)]
+         (do (log/info "Syncing disconnected session with persistance" session)
+             (rpc/wallet-disconnect-persisted-session (:topic session)))))
      (promesa/catch (fn [err]
                       (throw (ex-info "Failed to synchronize persisted sessions"
                                       {:error err
@@ -107,7 +108,11 @@
  (promesa/let [persisted-sessions (get-persisted-sessions)]
    (if online?
      (promesa/let [active-sessions (get-active-sessions web3-wallet addresses)]
-        (sync-persisted-sessions active-sessions persisted-sessions)
+        (log/info "Got active Wallet Connect sessions" (map :topic active-sessions))
+        ;; NOTE: handling the error here, so that if persistance fails, it doesn't affect the active
+        ;; sessions
+        (-> (sync-persisted-sessions active-sessions persisted-sessions)
+            (promesa/catch #(log/error %)))
        active-sessions)
      persisted-sessions)))

@@ -69,12 +69,6 @@
                 transitions/new-to-status-modal-animations
                 transitions/push-animations-for-transparent-background)}))

-(def keycard-modal-screen-options
-  (assoc transparent-modal-screen-options
-         :layout nil
-         :theme  :dark
-         :insets {:top? true :bottom? true}))
-
 (def sheet-options
  {:layout                 {:componentBackgroundColor :transparent
                            :orientation              ["portrait"]
@@ -32,7 +32,12 @@
    [status-im.contexts.keycard.check.view :as keycard.check]
    [status-im.contexts.keycard.empty.view :as keycard.empty]
    [status-im.contexts.keycard.error.view :as keycard.error]
+    [status-im.contexts.keycard.migrate.fail.view :as keycard.migrate.fail]
+    [status-im.contexts.keycard.migrate.re-encrypting.view :as keycard.re-encrypting]
+    [status-im.contexts.keycard.migrate.success.view :as keycard.migrate.success]
+    [status-im.contexts.keycard.migrate.view :as keycard.migrate]
    [status-im.contexts.keycard.not-keycard.view :as keycard.not-keycard]
+    [status-im.contexts.keycard.pin.create.view :as pin.create]
    [status-im.contexts.onboarding.create-or-sync-profile.view :as create-or-sync-profile]
    [status-im.contexts.onboarding.create-password.view :as create-password]
    [status-im.contexts.onboarding.create-profile.view :as create-profile]
@@ -310,8 +315,9 @@
    :component settings/view}

   {:name      :screen/settings.keycard
-    :metrics   {:track? :true}
-    :options   options/keycard-modal-screen-options
+    :metrics   {:track?   :true
+                :alias-id :settings.keycard}
+    :options   {:insets {:top? true :bottom? true}}
    :component settings.keycard/view}

   {:name      :edit-profile
@@ -877,29 +883,73 @@

 (def keycard-screens
  [{:name      :screen/keycard.check
-    :metrics   {:track? true}
-    :options   options/keycard-modal-screen-options
+    :metrics   {:track?   :true
+                :alias-id :keycard.check}
+    :options   {:insets {:top? true :bottom? true}}
    :component keycard.check/view}

   {:name      :screen/keycard.empty
-    :metrics   {:track? true}
-    :options   options/keycard-modal-screen-options
+    :metrics   {:track?   :true
+                :alias-id :keycard.empty}
+    :options   {:insets {:top? true :bottom? true}}
    :component keycard.empty/view}

   {:name      :screen/keycard.error
-    :metrics   {:track? true}
-    :options   options/keycard-modal-screen-options
+    :metrics   {:track?   :true
+                :alias-id :keycard.error}
+    :options   {:insets {:top? true :bottom? true}}
    :component keycard.error/view}

   {:name      :screen/keycard.not-keycard
-    :metrics   {:track? true}
-    :options   options/keycard-modal-screen-options
+    :metrics   {:track?   :true
+                :alias-id :keycard.not-keycard}
+    :options   {:insets {:top? true :bottom? true}}
    :component keycard.not-keycard/view}

   {:name      :screen/keycard.authorise
-    :metrics   {:track? true}
-    :options   options/keycard-modal-screen-options
-    :component keycard.authorise/view}])
+    :metrics   {:track?   :true
+                :alias-id :keycard.authorise}
+    :options   {:insets {:top? true :bottom? true}}
+    :component keycard.authorise/view}
+
+   {:name      :screen/keycard.migrate
+    :metrics   {:track?   :true
+                :alias-id :keycard.migrate}
+    :options   {:insets {:top? true :bottom? true}}
+    :component keycard.migrate/view}
+
+   {:name      :screen/keycard.re-encrypting
+    :metrics   {:track?   :true
+                :alias-id :keycard.re-encrypting}
+    :options   {:insets             {:top? true :bottom? true}
+                :popGesture         false
+                :hardwareBackButton {:dismissModalOnPress false
+                                     :popStackOnPress     false}}
+    :component keycard.re-encrypting/view}
+
+   {:name      :screen/keycard.migrate.success
+    :metrics   {:track?   :true
+                :alias-id :keycard.migrate.success}
+    :options   {:insets             {:top? true :bottom? true}
+                :popGesture         false
+                :hardwareBackButton {:dismissModalOnPress false
+                                     :popStackOnPress     false}}
+    :component keycard.migrate.success/view}
+
+   {:name      :screen/keycard.migrate.fail
+    :metrics   {:track?   :true
+                :alias-id :keycard.migrate.fail}
+    :options   {:insets             {:top? true :bottom? true}
+                :popGesture         false
+                :hardwareBackButton {:dismissModalOnPress false
+                                     :popStackOnPress     false}}
+    :component keycard.migrate.fail/view}
+
+   {:name      :screen/keycard.pin.create
+    :metrics   {:track?   :true
+                :alias-id :keycard.pin.create}
+    :options   {:insets {:top? true :bottom? true}}
+    :component pin.create/view}])

 (defn screens
  []
@@ -11,7 +11,7 @@
    [status-im.common.bottom-sheet-screen.view :as bottom-sheet-screen]
    [status-im.common.bottom-sheet.view :as bottom-sheet]
    [status-im.common.toasts.view :as toasts]
-    [status-im.contexts.keycard.nfc-sheet.view :as keycard.sheet]
+    [status-im.contexts.keycard.nfc.sheets.view :as keycard.sheet]
    [status-im.navigation.screens :as screens]
    [status-im.setup.hot-reload :as reloader]
    [utils.re-frame :as rf]))
@@ -27,6 +27,11 @@
 :<- [:wallet/swap]
 :-> :network)

+(rf/reg-sub
+ :wallet/swap-start-point
+ :<- [:wallet/swap]
+ :-> :start-point)
+
 (rf/reg-sub
 :wallet/swap-error-response
 :<- [:wallet/swap]
@@ -144,11 +144,12 @@
                                       (remove disabled-from-chain-ids?)
                                       set)]
     (some-> token
-             (assoc :networks          (network-utils/network-list token networks)
-                    :available-balance (utils/calculate-total-token-balance token)
-                    :total-balance     (utils/calculate-total-token-balance
-                                        token
-                                        enabled-from-chain-ids))))))
+             (assoc :networks           (network-utils/network-list-with-positive-balance token networks)
+                    :supported-networks (network-utils/network-list token networks)
+                    :available-balance  (utils/calculate-total-token-balance token)
+                    :total-balance      (utils/calculate-total-token-balance
+                                         token
+                                         enabled-from-chain-ids))))))

 (rf/reg-sub
 :wallet/wallet-send-token-symbol
@@ -459,6 +460,7 @@
                                                   networks)
                                                  chain-ids
                                                  (filter #(some #{(:chain-id %)} chain-ids)))
+                                      :supported-networks (network-utils/network-list token networks)
                                      :available-balance (utils/calculate-total-token-balance token)
                                      :total-balance (utils/calculate-total-token-balance
                                                      token
@@ -1,6 +1,7 @@
 (ns utils.network.core
  (:require
-    [clojure.string :as string]))
+    [clojure.string :as string]
+    [taoensso.timbre :as log]))

 (def url-regex
  #"https?://(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)")
@@ -41,7 +42,13 @@
       (map :error)
       (not-any? identity)))

-(defn chain-id-available?
-  [current-networks network]
-  (let [chain-id (get-in network [:config :NetworkId])]
-    (every? #(not= chain-id (get-in % [1 :config :NetworkId])) current-networks)))
+(defn fetch
+  [url {:keys [body] :as params} callback]
+  (let [js-params (cond-> params
+                    (map? body) (update :body (comp js/JSON.stringify clj->js))
+                    :always     clj->js)]
+    (-> (js/fetch url js-params)
+        (.then (fn [response]
+                 (.text response)))
+        (.then callback)
+        (.catch #(log/error (str "Error while fetching: " url) %)))))
@@ -293,6 +293,8 @@
  "cant-fetch-info": "Can't fetch info",
  "cant-open-public-chat": "Can't open public chat",
  "cant-report-bug": "Can't report a bug",
+  "cant-store-new-keys": "You can’t use it to store new keys right now",
+  "cant-use-right-now": "You can’t use it right now",
  "card-is-blank": "This card is blank",
  "card-reseted": "Card has been reseted",
  "card-unpaired": "Card has been unpaired from current device",
@@ -782,6 +784,8 @@
  "display-collectibles": "Display collectibles",
  "do-not-cheat": "Don't try to cheat",
  "do-not-cheat-description": "These 12 words give access to all of your funds so it is important that you write them in the correct order, take it seriously.",
+  "do-not-quit": "Do not quit the application or turn off your device. Doing so will lead to data corruption, loss of your Status profile and the inability to use Status.",
+
  "do-not-share": "Do not share",
  "done": "Done",
  "dont-ask": "Don't ask me again",
@@ -1010,6 +1014,7 @@
  "failed": "Failed",
  "failed-on": "Failed on",
  "failed-to-fetch-community": "Failed to fetch community",
+  "failed-to-migrate-key-pair": "Failed to migrate key pair",
  "faq": "Frequently asked questions",
  "fast": "Fast",
  "favorite-communities": "Your favourite communities",
@@ -1317,6 +1322,7 @@
  "key-name-error-too-short": "Key pair name must be at least {{count}} characters",
  "key-on-device": "Private key is saved on this device",
  "key-pair-imported-successfully": "{{name}} key pair imported successfully",
+  "key-pair-migrated-successfully": "Profile key pair successfully migrated",
  "key-pair-name-updated": "Key pair name updated",
  "key-pair-removed": "Key pair and derived accounts has been removed",
  "key-pairs-successfully-imported": "{{count}} key pairs successfully imported",
@@ -1344,6 +1350,7 @@
  "keycard-factory-reset-text": "Performing this will delete any mnemonic phrase stored on the card. Make sure you have a backup of the mnemonic phrase you've been using with this Keycard.",
  "keycard-factory-reset-title": "Are you sure you want to perform a factory reset?",
  "keycard-free-pairing-slots": "Keycard has {{n}} free pairing slots",
+  "keycard-full": "Keycard is full",
  "keycard-has-multiaccount-on-it": "This card is full. Each card can hold one main key pair",
  "keycard-init-description": "Put the card to the back of your phone to continue",
  "keycard-init-title": "Looking for cards...",
@@ -1354,6 +1361,8 @@
  "keycard-is-frozen-factory-reset": "Reset with mnemonic",
  "keycard-is-frozen-reset": "Reset with PUK",
  "keycard-is-frozen-title": "Keycard is frozen",
+  "keycard-locked": "Keycard is locked",
+  "keycard-not-empty": "Keycard is not empty",
  "keycard-onboarding-finishing-header": "Finishing up",
  "keycard-onboarding-intro-header": "Store your keys on Keycard",
  "keycard-onboarding-intro-text": "Get ready, this might take a few minutes, but it's important to secure your account",
@@ -1450,6 +1459,8 @@
  "log-in": "Log in",
  "log-level": "Log level",
  "log-level-settings": "Log level settings",
+  "log-out-remove": "Log out & Remove profile",
+  "log-out-remove-profile": "Log out and remove profile from this device",
  "logged-in": "Logged in",
  "logging": "Logging",
  "logging-enabled": "Logging enabled?",
@@ -1718,6 +1729,7 @@
  "no-fees": "No fees",
  "no-group-chats": "No group chats",
  "no-group-chats-description": "Much fun. Have friends. Wow!",
+  "no-key-pair-keycard": "There is no key pair on this Keycard",
  "no-keycard-applet-on-card": "No Keycard applet on card",
  "no-messages": "No messages",
  "no-messages-description": "Here’s a cat in a box instead",
@@ -1876,6 +1888,7 @@
  "pairing-new-installation-detected-title": "New device detected",
  "pairing-no-info": "No info",
  "pairing-please-set-a-name": "Please set a name for your device.",
+  "pairing-slots-occupied": "All pairing slots are occupied",
  "paraswap-error": "Paraswap error: {{paraswap-error}}",
  "participate-in-the-metaverse": "Participate in the truly free metaverse",
  "passphrase": "Passphrase",
@@ -2024,9 +2037,11 @@
  "re-encrypt": "Re-encrypt",
  "re-encrypt-data": "Re-encrypt your data",
  "re-encrypt-key": "Re-encrypt your keys",
+  "re-encrypting-data": "Re-encrypting data",
  "read": "Read",
  "read-more": "Read more",
  "ready-keycard": "Get your Keycard ready",
+  "ready-to-migrate-key-pair": "Ready to migrate profile key pair to the Keycard",
  "ready-to-scan": "Ready to Scan",
  "rearrange-categories": "Rearrange Categories",
  "receive": "Receive",
@@ -2045,6 +2060,7 @@
  "recover": "Recover",
  "recover-key": "Access existing keys",
  "recover-keycard-multiaccount-not-supported": "Keys for this account already exist and can't be added again. If you've lost your password, passcode or Keycard, uninstall the app, reinstall and access your keys by entering your seed phrase",
+  "recover-status-profile": "Recover your Status profile with recovery phrase",
  "recover-with-keycard": "Recover with Keycard",
  "recover-with-seed-phrase": "Recover with seed phrase",
  "recovering-key": "Accessing keys...",
@@ -2170,6 +2186,7 @@
  "scan-an-account-qr-code": "Scan an account QR code",
  "scan-an-address-qr-code": "Scan an address QR code",
  "scan-key-pairs-qr-code": "Scan key pairs QR code",
+  "scan-keycard": "Scan Keycard",
  "scan-or-enter-a-sync-code": "Scan or enter a sync code",
  "scan-or-enter-sync-code": "Scan or enter sync code",
  "scan-or-enter-sync-code-seen-on-this-device": "Scan or enter sync code seen on this device",
@@ -2622,6 +2639,7 @@
  "unknown-status-go-error": "Unknown status-go error",
  "unlimited": "Unlimited",
  "unlock": "Unlock",
+  "unlock-reset-instructions": "To unlock or factory reset the Keycard, please use the Status desktop app. If you'd like this feature on mobile, feel free to upvote them and discuss in the Status community.",
  "unmute": "Unmute",
  "unmute-channel": "Unmute channel",
  "unmute-chat": "Unmute chat",
@@ -2660,6 +2678,7 @@
  "use-as-profile-picture": "Use as profile picture",
  "use-biometrics": "Use biometrics to fill in your password",
  "use-keycard": "Use Keycard",
+  "use-keycard-for-status": "From now on, use this Keycard to login to Status and transact with derived accounts on all synced devices. To start using it, logout and log back in with this Keycard.",
  "use-keycard-login-sign": "Use this Keycard to login and sign transactions",
  "use-keycard-subtitle": "Keys will be stored on your Keycard",
  "use-photo": "Use Photo",
@@ -2809,6 +2828,7 @@
  "what-to-do": "What you would like to do?",
  "what-we-will-receive": "What we will receive:",
  "what-we-wont-receive": "What we won't receive:",
+  "what-you-can-do": "What you can do:",
  "whats-on-your-mind": "What’s on your mind…",
  "which-connection-to-use": "Which connection to use for syncing?",
  "who-are-you-looking-for": "Who are you looking for ?",
Author	SHA1	Message	Date
Ulises M	276eea2a5c	Lint fix	2024-11-01 08:49:55 -06:00
Ulises M	8e38393f04	feat: Add general infrastructure for status-backend integration	2024-11-01 08:49:55 -06:00
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