testing native token not found error fix

Makefile

@@ -97,8 +97,6 @@ nix-purge: ##@nix Completely remove Nix setup, including /nix directory
 	nix/scripts/purge.sh
 
 nix-update-gradle: export TARGET := gradle
-nix-update-gradle: export ORG_GRADLE_PROJECT_hermesEnabled := false
-nix-update-gradle: export ORG_GRADLE_PROJECT_universalApk := false
 nix-update-gradle: ##@nix Update maven nix expressions based on current gradle setup
 	nix/deps/gradle/generate.sh
 

ci/Jenkinsfile.android

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

ci/Jenkinsfile.combined

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

ci/Jenkinsfile.e2e-nightly

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

ci/Jenkinsfile.ios

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

ci/Jenkinsfile.tests

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

ci/tests/Jenkinsfile.e2e-nightly

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

ci/tests/Jenkinsfile.e2e-prs

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

ci/tests/Jenkinsfile.e2e-upgrade

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

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.nix-cache

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

ci/tools/Jenkinsfile.playstore-meta

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

ci/tools/Jenkinsfile.xcode-clean

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

fastlane/Gemfile.lock

@@ -219,7 +219,6 @@ PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
   x86_64-darwin-22
-  x86_64-darwin-23
 
 DEPENDENCIES
   activesupport (>= 6.1.7.3, < 7.1.0)

ios/Podfile.lock

@@ -935,8 +935,6 @@ PODS:
     - React
   - react-native-orientation-locker (1.5.0):
     - React-Core
-  - react-native-pdf (6.7.5):
-    - React-Core
   - react-native-shake (3.4.0):
     - React
   - react-native-slider (3.0.0):
@@ -1235,7 +1233,6 @@ DEPENDENCIES:
   - react-native-lottie-splash-screen (from `../node_modules/react-native-lottie-splash-screen`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
-  - react-native-pdf (from `../node_modules/react-native-pdf`)
   - react-native-shake (from `../node_modules/react-native-shake`)
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-status (from `../modules/react-native-status`)
@@ -1380,8 +1377,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/netinfo"
   react-native-orientation-locker:
     :path: "../node_modules/react-native-orientation-locker"
-  react-native-pdf:
-    :path: "../node_modules/react-native-pdf"
   react-native-shake:
     :path: "../node_modules/react-native-shake"
   react-native-slider:
@@ -1490,7 +1485,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
   FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 36c15c01d70ed395c6e4f3619f98a23ee415b07a
+  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
@@ -1530,7 +1525,6 @@ SPEC CHECKSUMS:
   react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b
   react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
   react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
-  react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c
   react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
   react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
   react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466

nix/deps/gradle/deps.list

@@ -4,12 +4,10 @@ androidx.activity:activity:1.2.4
 androidx.activity:activity:1.6.0
 androidx.annotation:annotation-experimental:1.1.0
 androidx.annotation:annotation-experimental:1.3.0
-androidx.annotation:annotation-jvm:1.6.0
 androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
-androidx.annotation:annotation:1.6.0
 androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
@@ -43,14 +41,12 @@ androidx.coordinatorlayout:coordinatorlayout:1.1.0
 androidx.core:core-ktx:1.2.0
 androidx.core:core-ktx:1.6.0
 androidx.core:core-ktx:1.9.0
-androidx.core:core-ktx:1.12.0
 androidx.core:core-splashscreen:1.0.0
 androidx.core:core:1.0.0
 androidx.core:core:1.1.0
 androidx.core:core:1.1.0-rc01
 androidx.core:core:1.6.0
 androidx.core:core:1.9.0
-androidx.core:core:1.12.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
@@ -59,7 +55,6 @@ androidx.databinding:databinding-common:4.1.0
 androidx.databinding:databinding-common:7.0.4
 androidx.databinding:databinding-common:7.2.1
 androidx.databinding:databinding-common:7.3.1
-androidx.databinding:databinding-common:7.4.2
 androidx.databinding:databinding-common:8.1.1
 androidx.databinding:databinding-compiler-common:3.2.1
 androidx.databinding:databinding-compiler-common:3.5.3
@@ -67,7 +62,6 @@ androidx.databinding:databinding-compiler-common:4.1.0
 androidx.databinding:databinding-compiler-common:7.0.4
 androidx.databinding:databinding-compiler-common:7.2.1
 androidx.databinding:databinding-compiler-common:7.3.1
-androidx.databinding:databinding-compiler-common:7.4.2
 androidx.databinding:databinding-compiler-common:8.1.1
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
@@ -171,7 +165,6 @@ com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:baseLibrary:7.0.4
 com.android.databinding:baseLibrary:7.2.1
 com.android.databinding:baseLibrary:7.3.1
-com.android.databinding:baseLibrary:7.4.2
 com.android.databinding:baseLibrary:8.1.1
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.1
@@ -181,7 +174,6 @@ com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
 com.android.tools.analytics-library:crash:30.3.1
-com.android.tools.analytics-library:crash:30.4.2
 com.android.tools.analytics-library:crash:31.1.1
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
@@ -190,7 +182,6 @@ com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
 com.android.tools.analytics-library:protos:30.3.1
-com.android.tools.analytics-library:protos:30.4.2
 com.android.tools.analytics-library:protos:31.1.1
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
@@ -199,7 +190,6 @@ com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
 com.android.tools.analytics-library:shared:30.3.1
-com.android.tools.analytics-library:shared:30.4.2
 com.android.tools.analytics-library:shared:31.1.1
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
@@ -208,7 +198,6 @@ com.android.tools.analytics-library:tracker:27.1.0
 com.android.tools.analytics-library:tracker:30.0.4
 com.android.tools.analytics-library:tracker:30.2.1
 com.android.tools.analytics-library:tracker:30.3.1
-com.android.tools.analytics-library:tracker:30.4.2
 com.android.tools.analytics-library:tracker:31.1.1
 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
@@ -224,14 +213,12 @@ com.android.tools.build:aapt2-proto:4.1.0-6503028
 com.android.tools.build:aapt2-proto:7.0.4-7396180
 com.android.tools.build:aapt2-proto:7.2.1-7984345
 com.android.tools.build:aapt2-proto:7.3.1-8691043
-com.android.tools.build:aapt2-proto:7.4.2-8841542
 com.android.tools.build:aapt2-proto:8.1.1-10154469
 com.android.tools.build:aapt2:8.1.1-10154469
 com.android.tools.build:aaptcompiler:4.1.0
 com.android.tools.build:aaptcompiler:7.0.4
 com.android.tools.build:aaptcompiler:7.2.1
 com.android.tools.build:aaptcompiler:7.3.1
-com.android.tools.build:aaptcompiler:7.4.2
 com.android.tools.build:aaptcompiler:8.1.1
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
@@ -240,7 +227,6 @@ com.android.tools.build:apksig:4.1.0
 com.android.tools.build:apksig:7.0.4
 com.android.tools.build:apksig:7.2.1
 com.android.tools.build:apksig:7.3.1
-com.android.tools.build:apksig:7.4.2
 com.android.tools.build:apksig:8.1.1
 com.android.tools.build:apkzlib:3.2.1
 com.android.tools.build:apkzlib:3.5.3
@@ -248,7 +234,6 @@ com.android.tools.build:apkzlib:4.1.0
 com.android.tools.build:apkzlib:7.0.4
 com.android.tools.build:apkzlib:7.2.1
 com.android.tools.build:apkzlib:7.3.1
-com.android.tools.build:apkzlib:7.4.2
 com.android.tools.build:apkzlib:8.1.1
 com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
@@ -259,7 +244,6 @@ com.android.tools.build:builder-model:4.1.0
 com.android.tools.build:builder-model:7.0.4
 com.android.tools.build:builder-model:7.2.1
 com.android.tools.build:builder-model:7.3.1
-com.android.tools.build:builder-model:7.4.2
 com.android.tools.build:builder-model:8.1.1
 com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
@@ -270,7 +254,6 @@ com.android.tools.build:builder-test-api:4.1.0
 com.android.tools.build:builder-test-api:7.0.4
 com.android.tools.build:builder-test-api:7.2.1
 com.android.tools.build:builder-test-api:7.3.1
-com.android.tools.build:builder-test-api:7.4.2
 com.android.tools.build:builder-test-api:8.1.1
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
@@ -281,7 +264,6 @@ com.android.tools.build:builder:4.1.0
 com.android.tools.build:builder:7.0.4
 com.android.tools.build:builder:7.2.1
 com.android.tools.build:builder:7.3.1
-com.android.tools.build:builder:7.4.2
 com.android.tools.build:builder:8.1.1
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.9.0
@@ -289,7 +271,6 @@ com.android.tools.build:bundletool:0.14.0
 com.android.tools.build:bundletool:1.6.0
 com.android.tools.build:bundletool:1.8.2
 com.android.tools.build:bundletool:1.9.0
-com.android.tools.build:bundletool:1.11.4
 com.android.tools.build:bundletool:1.14.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
@@ -298,12 +279,10 @@ com.android.tools.build:gradle-api:4.1.0
 com.android.tools.build:gradle-api:7.0.4
 com.android.tools.build:gradle-api:7.2.1
 com.android.tools.build:gradle-api:7.3.1
-com.android.tools.build:gradle-api:7.4.2
 com.android.tools.build:gradle-api:8.1.1
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
 com.android.tools.build:gradle-core:3.0.1
-com.android.tools.build:gradle-settings-api:7.4.2
 com.android.tools.build:gradle-settings-api:8.1.1
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
@@ -314,7 +293,6 @@ com.android.tools.build:gradle:4.1.0
 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:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.1
@@ -324,7 +302,6 @@ com.android.tools.build:manifest-merger:27.1.0
 com.android.tools.build:manifest-merger:30.0.4
 com.android.tools.build:manifest-merger:30.2.1
 com.android.tools.build:manifest-merger:30.3.1
-com.android.tools.build:manifest-merger:30.4.2
 com.android.tools.build:manifest-merger:31.1.1
 com.android.tools.build:transform-api:1.5.0
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
@@ -337,7 +314,6 @@ com.android.tools.ddms:ddmlib:27.1.0
 com.android.tools.ddms:ddmlib:30.0.4
 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.external.com-intellij:intellij-core:26.0.1
 com.android.tools.external.lombok:lombok-ast:0.2.3
@@ -353,7 +329,6 @@ com.android.tools.layoutlib:layoutlib-api:27.1.0
 com.android.tools.layoutlib:layoutlib-api:30.0.4
 com.android.tools.layoutlib:layoutlib-api:30.2.1
 com.android.tools.layoutlib:layoutlib-api:30.3.1
-com.android.tools.layoutlib:layoutlib-api:30.4.2
 com.android.tools.layoutlib:layoutlib-api:31.1.1
 com.android.tools.lint:lint-api:24.3.1
 com.android.tools.lint:lint-api:24.5.0
@@ -368,44 +343,36 @@ com.android.tools.lint:lint-model:27.1.0
 com.android.tools.lint:lint-model:30.0.4
 com.android.tools.lint:lint-model:30.2.1
 com.android.tools.lint:lint-model:30.3.1
-com.android.tools.lint:lint-model:30.4.2
 com.android.tools.lint:lint-model:31.1.1
 com.android.tools.lint:lint-typedef-remover:30.2.1
 com.android.tools.lint:lint-typedef-remover:30.3.1
-com.android.tools.lint:lint-typedef-remover:30.4.2
 com.android.tools.lint:lint-typedef-remover:31.1.1
 com.android.tools.lint:lint:24.3.1
 com.android.tools.lint:lint:24.5.0
 com.android.tools.lint:lint:26.0.1
 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-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-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-apk-installer-proto: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-emulator-control-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-logcat-proto: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-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:annotations:24.3.1
 com.android.tools:annotations:24.5.0
@@ -416,7 +383,6 @@ com.android.tools:annotations:27.1.0
 com.android.tools:annotations:30.0.4
 com.android.tools:annotations:30.2.1
 com.android.tools:annotations:30.3.1
-com.android.tools:annotations:30.4.2
 com.android.tools:annotations:31.1.1
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
@@ -427,7 +393,6 @@ com.android.tools:common:27.1.0
 com.android.tools:common:30.0.4
 com.android.tools:common:30.2.1
 com.android.tools:common:30.3.1
-com.android.tools:common:30.4.2
 com.android.tools:common:31.1.1
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
@@ -438,7 +403,6 @@ com.android.tools:dvlib:27.1.0
 com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
 com.android.tools:dvlib:30.3.1
-com.android.tools:dvlib:30.4.2
 com.android.tools:dvlib:31.1.1
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
@@ -447,7 +411,6 @@ com.android.tools:repository:27.1.0
 com.android.tools:repository:30.0.4
 com.android.tools:repository:30.2.1
 com.android.tools:repository:30.3.1
-com.android.tools:repository:30.4.2
 com.android.tools:repository:31.1.1
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
@@ -458,7 +421,6 @@ com.android.tools:sdklib:27.1.0
 com.android.tools:sdklib:30.0.4
 com.android.tools:sdklib:30.2.1
 com.android.tools:sdklib:30.3.1
-com.android.tools:sdklib:30.4.2
 com.android.tools:sdklib:31.1.1
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
@@ -469,19 +431,16 @@ com.android.tools:sdk-common:27.1.0
 com.android.tools:sdk-common:30.0.4
 com.android.tools:sdk-common:30.2.1
 com.android.tools:sdk-common:30.3.1
-com.android.tools:sdk-common:30.4.2
 com.android.tools:sdk-common:31.1.1
 com.android:signflinger:4.1.0
 com.android:signflinger:7.0.4
 com.android:signflinger:7.2.1
 com.android:signflinger:7.3.1
-com.android:signflinger:7.4.2
 com.android:signflinger:8.1.1
 com.android:zipflinger:4.1.0
 com.android:zipflinger:7.0.4
 com.android:zipflinger:7.2.1
 com.android:zipflinger:7.3.1
-com.android:zipflinger:7.4.2
 com.android:zipflinger:8.1.1
 com.diffplug.durian:durian-collect:1.2.0
 com.diffplug.durian:durian-core:1.2.0
@@ -552,7 +511,6 @@ com.github.status-im:function:0.0.1
 com.github.wix-playground:ahbottomnavigation:3.3.0
 com.github.wix-playground:reflow-animator:1.0.6
 com.github.yalantis:ucrop:2.2.6-native
-com.github.zacharee:AndroidPdfViewer:4.0.1
 com.googlecode.concurrent-trees:concurrent-trees:2.6.1
 com.googlecode.javaewah:JavaEWAH:1.1.12
 com.googlecode.javaewah:JavaEWAH:1.1.13
@@ -662,7 +620,6 @@ io.grpc:grpc-protobuf:1.45.1
 io.grpc:grpc-stub:1.21.1
 io.grpc:grpc-stub:1.39.0
 io.grpc:grpc-stub:1.45.1
-io.legere:pdfiumandroid:1.0.19
 io.netty:netty-buffer:4.1.34.Final
 io.netty:netty-buffer:4.1.52.Final
 io.netty:netty-buffer:4.1.72.Final
@@ -796,16 +753,12 @@ org.jetbrains.intellij.deps:trove4j:1.0.20200330
 org.jetbrains.kotlinx:atomicfu:0.16.3
 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.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.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.7.3
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
 org.jetbrains.kotlin:kotlin-android-extensions:1.9.0
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
@@ -845,7 +798,6 @@ org.jetbrains.kotlin:kotlin-reflect:1.3.72
 org.jetbrains.kotlin:kotlin-reflect:1.4.32
 org.jetbrains.kotlin:kotlin-reflect:1.5.31
 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.9.0
@@ -862,18 +814,15 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72
 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.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72
 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.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
@@ -882,7 +831,6 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 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.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
@@ -893,11 +841,9 @@ org.jetbrains.kotlin:kotlin-stdlib:1.3.72
 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.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.9.0
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
 org.jetbrains.kotlin:kotlin-util-io:1.6.20
@@ -906,7 +852,6 @@ org.jetbrains.kotlin:kotlin-util-klib:1.6.20
 org.jetbrains.kotlin:kotlin-util-klib:1.9.0
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
-org.jetbrains:annotations:23.0.0
 org.jetbrains:markdown-jvm:0.2.1
 org.jetbrains:markdown:0.2.1
 org.json:json:20180813

nix/deps/gradle/deps.urls

@@ -52,7 +52,6 @@ https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.2.0/core-ktx-1.
 https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.6.0/core-ktx-1.6.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.8.0/core-ktx-1.8.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.9.0/core-ktx-1.9.0.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.12.0/core-ktx-1.12.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core-splashscreen/1.0.0/core-splashscreen-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.1/core-1.0.1.pom
@@ -66,7 +65,6 @@ https://dl.google.com/dl/android/maven2/androidx/core/core/1.5.0/core-1.5.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.6.0/core-1.6.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.8.0/core-1.8.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.9.0/core-1.9.0.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core/1.12.0/core-1.12.0.pom
 https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1.pom
@@ -76,7 +74,6 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.0.4/databinding-common-7.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.2.1/databinding-common-7.2.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.3.1/databinding-common-7.3.1.pom
-https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.4.2/databinding-common-7.4.2.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/8.1.1/databinding-common-8.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.3/databinding-compiler-common-3.5.3.pom
@@ -85,7 +82,6 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compile
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.0.4/databinding-compiler-common-7.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.2.1/databinding-compiler-common-7.2.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.3.1/databinding-compiler-common-7.3.1.pom
-https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.4.2/databinding-compiler-common-7.4.2.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/8.1.1/databinding-compiler-common-8.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0/documentfile-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0.pom
@@ -192,14 +188,12 @@ https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.4/baseLibrary-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.2.1/baseLibrary-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.3.1/baseLibrary-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.4.2/baseLibrary-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/8.1.1/baseLibrary-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/4.1.0/signflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/7.0.4/signflinger-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/7.2.1/signflinger-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/7.3.1/signflinger-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/signflinger/7.4.2/signflinger-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/8.1.1/signflinger-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/26.0.2/animated-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/27.0.1/animated-vector-drawable-27.0.1.pom
@@ -228,7 +222,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.0.4/crash-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.2.1/crash-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.3.1/crash-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.4.2/crash-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/31.1.1/crash-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
@@ -238,7 +231,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/prot
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.0.4/protos-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.2.1/protos-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.3.1/protos-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.4.2/protos-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/31.1.1/protos-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
@@ -248,7 +240,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shar
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.0.4/shared-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.2.1/shared-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.3.1/shared-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.4.2/shared-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/31.1.1/shared-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
@@ -258,7 +249,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/trac
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.0.4/tracker-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.2.1/tracker-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.3.1/tracker-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.4.2/tracker-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/31.1.1/tracker-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
@@ -268,7 +258,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/ann
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.0.4/annotations-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.2.1/annotations-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.3.1/annotations-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.4.2/annotations-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/31.1.1/annotations-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.4.0/aapt2-proto-0.4.0.pom
@@ -279,14 +268,12 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.0.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.2.1-7984345/aapt2-proto-7.2.1-7984345.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.3.0-alpha07-8248216/aapt2-proto-7.3.0-alpha07-8248216.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.3.1-8691043/aapt2-proto-7.3.1-8691043.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.4.2-8841542/aapt2-proto-7.4.2-8841542.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/8.1.1-10154469/aapt2-proto-8.1.1-10154469.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/8.1.1-10154469/aapt2-8.1.1-10154469.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/4.1.0/aaptcompiler-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.0.4/aaptcompiler-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.2.1/aaptcompiler-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.3.1/aaptcompiler-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.4.2/aaptcompiler-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/8.1.1/aaptcompiler-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
@@ -296,7 +283,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apk
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.0.4/apksig-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.1/apksig-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.3.1/apksig-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.4.2/apksig-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/8.1.1/apksig-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.3/apkzlib-3.5.3.pom
@@ -305,7 +291,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/apkzlib-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.2.1/apkzlib-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.3.1/apkzlib-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.4.2/apkzlib-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/8.1.1/apkzlib-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
@@ -315,7 +300,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.0.4/builder-model-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.2.1/builder-model-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.3.1/builder-model-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.4.2/builder-model-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/8.1.1/builder-model-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
@@ -325,7 +309,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.0.4/builder-test-api-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.2.1/builder-test-api-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.3.1/builder-test-api-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.4.2/builder-test-api-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/8.1.1/builder-test-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
@@ -335,7 +318,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/bu
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.0.4/builder-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.2.1/builder-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.3.1/builder-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.4.2/builder-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/8.1.1/builder-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.5.0/bundletool-0.5.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.9.0/bundletool-0.9.0.pom
@@ -343,7 +325,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.14.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.6.0/bundletool-1.6.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.8.2/bundletool-1.8.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.9.0/bundletool-1.9.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.11.4/bundletool-1.11.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.14.0/bundletool-1.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
@@ -353,10 +334,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4/gradle-api-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.2.1/gradle-api-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.3.1/gradle-api-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.4.2/gradle-api-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/8.1.1/gradle-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-api/7.4.2/gradle-settings-api-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-api/8.1.1/gradle-settings-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
@@ -366,7 +345,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gra
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.0.4/gradle-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.2.1/gradle-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.3.1/gradle-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.4.2/gradle-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/8.1.1/gradle-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-alpha10/jetifier-core-1.0.0-alpha10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta04/jetifier-core-1.0.0-beta04.pom
@@ -384,7 +362,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.0.4/manifest-merger-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.2.1/manifest-merger-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.3.1/manifest-merger-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.4.2/manifest-merger-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/31.1.1/manifest-merger-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
@@ -394,7 +371,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-2
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.2.1/common-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.3.1/common-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/common/30.4.2/common-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/31.1.1/common-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
@@ -404,7 +380,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddm
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddmlib-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.2.1/ddmlib-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.3.1/ddmlib-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.4.2/ddmlib-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/31.1.1/ddmlib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
@@ -414,7 +389,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.2.1/dvlib-30.2.1.pom
 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/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
@@ -429,7 +403,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-ap
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.4/layoutlib-api-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.2.1/layoutlib-api-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.3.1/layoutlib-api-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.4.2/layoutlib-api-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/31.1.1/layoutlib-api-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/31.1.1/lint-api-31.1.1.pom
@@ -444,11 +417,9 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/27.1.0
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.0.4/lint-model-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.2.1/lint-model-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.3.1/lint-model-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.4.2/lint-model-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/31.1.1/lint-model-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.2.1/lint-typedef-remover-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.3.1/lint-typedef-remover-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.4.2/lint-typedef-remover-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/31.1.1/lint-typedef-remover-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/31.1.1/lint-31.1.1.pom
@@ -461,7 +432,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repo
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repository-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.2.1/repository-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.3.1/repository-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.4.2/repository-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/31.1.1/repository-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
@@ -471,7 +441,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-2
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.2.1/sdklib-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.3.1/sdklib-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.4.2/sdklib-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/31.1.1/sdklib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
@@ -481,43 +450,35 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.4/sdk-common-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.2.1/sdk-common-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.3.1/sdk-common-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.4.2/sdk-common-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/31.1.1/sdk-common-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.2.1/android-device-provider-ddmlib-proto-30.2.1.pom
 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-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-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-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-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-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-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-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-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/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
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.3.1/zipflinger-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.4.2/zipflinger-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/8.1.1/zipflinger-8.1.1.pom
 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
@@ -533,7 +494,6 @@ https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.1.1/lib-3.1.1.
 https://jitpack.io/com/github/wix-playground/ahbottomnavigation/3.3.0/ahbottomnavigation-3.3.0.pom
 https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animator-1.0.6.pom
 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/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
@@ -546,7 +506,7 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.10/commons-co
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.1/commons-codec-1.17.1.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
-https://repo.maven.apache.org/maven2/commons-io/commons-io/2.17.0/commons-io-2.17.0.pom
+https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.4/commons-logging-1.3.4.pom
@@ -649,25 +609,25 @@ https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloa
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.5/soloader-0.10.5.pom
 https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.18.0/jackson-annotations-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.2/jackson-annotations-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.18.0/jackson-core-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.2/jackson-core-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.18.0/jackson-databind-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.2/jackson-databind-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.1/jackson-dataformat-xml-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.11.1/jackson-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.18.0/jackson-base-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.17.2/jackson-base-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.11.1/jackson-bom-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.18.0/jackson-bom-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.17.2/jackson-bom-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.11/jackson-parent-2.11.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.18/jackson-parent-2.18.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.17/jackson-parent-2.17.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.11.1/jackson-modules-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.18.0/jackson-modules-base-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.17.2/jackson-modules-base-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.1/jackson-module-jaxb-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.18.0/jackson-module-jaxb-annotations-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.2/jackson-module-jaxb-annotations-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/61/oss-parent-61.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/58/oss-parent-58.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/woodstox/woodstox-core/6.2.1/woodstox-core-6.2.1.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.pom
@@ -733,7 +693,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.31.0/error_prone_annotations-2.31.0.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 +706,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.31.0/error_prone_parent-2.31.0.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
@@ -763,8 +723,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.1-jre/guava-parent-33.3.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.3.1-jre/guava-testlib-33.3.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.0-jre/guava-parent-33.3.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.3.0-jre/guava-testlib-33.3.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -777,7 +737,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.3.1-jre/guava-33.3.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.3.0-jre/guava-33.3.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -791,7 +751,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.28.0/protobuf-bom-4.28.0.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 +768,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.28.0/protobuf-java-4.28.0.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 +779,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.28.0/protobuf-parent-4.28.0.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
@@ -840,7 +800,7 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.11.0/okhttp-4
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 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-jvm/3.9.0/okio-jvm-3.9.0.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
@@ -850,7 +810,7 @@ https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.4/okio-1.17.4.p
 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
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.2.0/okio-3.2.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.9.1/okio-3.9.1.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.9.0/okio-3.9.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.1/all-1.2.1.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.2/all-1.2.2.pom
@@ -917,7 +877,6 @@ https://repo.maven.apache.org/maven2/io/grpc/grpc-protobuf/1.45.1/grpc-protobuf-
 https://repo.maven.apache.org/maven2/io/grpc/grpc-stub/1.21.1/grpc-stub-1.21.1.pom
 https://repo.maven.apache.org/maven2/io/grpc/grpc-stub/1.39.0/grpc-stub-1.39.0.pom
 https://repo.maven.apache.org/maven2/io/grpc/grpc-stub/1.45.1/grpc-stub-1.45.1.pom
-https://repo.maven.apache.org/maven2/io/legere/pdfiumandroid/1.0.19/pdfiumandroid-1.0.19.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-buffer/4.1.34.Final/netty-buffer-4.1.34.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-buffer/4.1.52.Final/netty-buffer-4.1.52.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.pom
@@ -983,7 +942,6 @@ https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.3.1/jaxb-api-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.4.0-b180830.0359/jaxb-api-parent-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jaxb-api-2.2.12-b140109.1041.pom
-https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12/jaxb-api-2.2.12.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.4.0-b180830.0359/jaxb-api-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.pom
@@ -992,15 +950,15 @@ https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.13/byte-buddy-agent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.19/byte-buddy-agent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.15.4/byte-buddy-agent-1.15.4.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.15.0/byte-buddy-agent-1.15.0.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.19/byte-buddy-parent-1.11.19.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.18/byte-buddy-parent-1.14.18.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.4/byte-buddy-parent-1.15.4.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.0/byte-buddy-parent-1.15.0.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.19/byte-buddy-1.11.19.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.18/byte-buddy-1.14.18.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.4/byte-buddy-1.15.4.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.0/byte-buddy-1.15.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -1044,6 +1002,7 @@ https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/33/apache-33.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
@@ -1064,9 +1023,9 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/71/commons-parent-71.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/72/commons-parent-72.pom
-https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/74/commons-parent-74.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -1121,7 +1080,7 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.48.1/checker-qual-3.48.1.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.46.0/checker-qual-3.46.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.10/groovy-xml-3.0.10.pom
@@ -1187,7 +1146,6 @@ https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.12/org.jacoc
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/annotations/23.0.0/annotations-23.0.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/dokka/dokka-core/1.4.32/dokka-core-1.4.32.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330.pom
@@ -1195,18 +1153,14 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu-jvm/0.16.3/a
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu/0.16.3/atomicfu-0.16.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.5.2/kotlinx-coroutines-android-1.5.2.pom
 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.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.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.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
@@ -1282,10 +1236,9 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.32/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.5.31/kotlin-reflect-1.5.31.pom
 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-reflect/2.0.20/kotlin-reflect-2.0.20.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
@@ -1329,11 +1282,8 @@ 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.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
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0/kotlin-stdlib-common-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.22/kotlin-stdlib-common-1.9.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50/kotlin-stdlib-jdk7-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.pom
@@ -1345,10 +1295,8 @@ 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.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
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.20/kotlin-stdlib-jdk7-1.8.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.21/kotlin-stdlib-jdk7-1.8.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0/kotlin-stdlib-jdk7-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
@@ -1362,10 +1310,8 @@ 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.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
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.20/kotlin-stdlib-jdk8-1.8.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.0/kotlin-stdlib-jdk8-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
@@ -1394,13 +1340,10 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/k
 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
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
-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-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.20/kotlin-stdlib-2.0.20.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
@@ -1420,14 +1363,14 @@ 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.0/junit-bom-5.11.0.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
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.12.4/mockito-core-3.12.4.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.14.2/mockito-core-5.14.2.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.13.0/mockito-core-5.13.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-inline/4.0.0/mockito-inline-4.0.0.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom
@@ -1442,14 +1385,14 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/7.0/asm-analysis-7
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/8.0.1/asm-analysis-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.7.1/asm-bom-9.7.1.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.7/asm-bom-9.7.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/8.0.1/asm-commons-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.1/asm-commons-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.7.1/asm-commons-9.7.1.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.7/asm-commons-9.7.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/6.0_BETA/asm-debug-all-6.0_BETA.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1.pom
@@ -1464,7 +1407,7 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/8.0.1/asm-tree-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.7.1/asm-tree-9.7.1.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.7/asm-tree-9.7.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/6.0/asm-util-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/7.0/asm-util-7.0.pom
@@ -1478,7 +1421,6 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.0/asm-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/8.0.1/asm-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.1/asm-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7.1/asm-9.7.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom

nix/deps/gradle/proj.list

@@ -26,7 +26,6 @@ react-native-lottie-splash-screen
 react-native-navigation
 react-native-nfc-manager
 react-native-orientation-locker
-react-native-pdf
 react-native-permissions
 react-native-reanimated
 react-native-shake

package.json

@@ -58,7 +58,6 @@
     "react-native-lottie-splash-screen": "^1.0.1",
     "react-native-navigation": "7.39.0",
     "react-native-orientation-locker": "^1.5.0",
-    "react-native-pdf": "^6.7.5",
     "react-native-permissions": "4.1.5",
     "react-native-reanimated": "3.6.1",
     "react-native-redash": "18.1.0",

resources/config/fleets.json

@@ -180,17 +180,17 @@
         },
         "shards.staging": {
             "tcp/p2p/waku/boot": {
-                "boot-01.do-ams3.shards.staging": "/dns4/boot-01.do-ams3.shards.staging.status.im/tcp/30303/p2p/16Uiu2HAmQE7FXQc6iZHdBzYfw3qCSDa9dLc1wsBJKoP4aZvztq2d",
+                "boot-01.do-ams3.shards.staging": "/dns4/boot-01.do-ams3.shards.staging.status.im/tcp/30303/p2p/16Uiu2HAmEqqio4UR1SWqAc7KY19t6qyDvtmyjreZpzUBJvb4u65R",
                 "boot-01.gc-us-central1-a.shards.staging": "/dns4/boot-01.gc-us-central1-a.shards.staging.status.im/tcp/30303/p2p/16Uiu2HAmGAA54bBTE78MYidSy3P7Q9yAWFNTAEReJYD69VRvtL5r",
                 "boot-01.ac-cn-hongkong-c.shards.staging": "/dns4/boot-01.ac-cn-hongkong-c.shards.staging.status.im/tcp/30303/p2p/16Uiu2HAmNTpGnyZ8W1BK2sXEmgSCNWiyDKgRU3NBR2DXST2HzxRU"
             },
             "enr/p2p/waku/boot": {
-                "boot-01.do-ams3.shards.staging": "enr:-QEQuEBuiQgFlJNcv255042zwyl4pOBOivakX8N30Dr9vaaEU2q8-7N4GVY4Hk87iEKELjlIXTpE9Wj6EQq1lrBuc7ayAYJpZIJ2NIJpcISPxvrpim11bHRpYWRkcnO4YAAtNihib290LTAxLmRvLWFtczMuc3RhdHVzLnN0YWdpbmcuc3RhdHVzLmltBnZfAC82KGJvb3QtMDEuZG8tYW1zMy5zdGF0dXMuc3RhZ2luZy5zdGF0dXMuaW0GAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEDq-yGgpuoUG6NKkbIDRmrMiT-bEVzFlpWLEK_rF3yKUaDdGNwgnZfg3VkcIIjKIV3YWt1Mg0",
+                "boot-01.do-ams3.shards.staging": "enr:-QEQuEDsh6FgAb_36cReaX7W4gWx_7_GNpsUki7bXMoMrrrWij5pDEyV3guR-urDW_6GJTAzpQiJV61F-CfNn_NxPbY-AYJpZIJ2NIJpcISPxvrpim11bHRpYWRkcnO4YAAtNihib290LTAxLmRvLWFtczMuc2hhcmRzLnN0YWdpbmcuc3RhdHVzLmltBnZfAC82KGJvb3QtMDEuZG8tYW1zMy5zaGFyZHMuc3RhZ2luZy5zdGF0dXMuaW0GAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEDIH8BcuEzgnmwPQTu7BPYyg4u4om7K9qekKA2gT_H2wSDdGNwgnZfg3VkcIIjKIV3YWt1Mg0",
                 "boot-01.gc-us-central1-a.shards.staging": "enr:-QEiuECWCuk1CoefbPYUV_cff27t-471k_QhJ_MvgOUQmRE4vgI6h9fD4LgXy7TZNSFXeBBP9haWJB7lx8Wujx-LPmhrAYJpZIJ2NIJpcIRoxQVgim11bHRpYWRkcnO4cgA2NjFib290LTAxLmdjLXVzLWNlbnRyYWwxLWEuc2hhcmRzLnN0YWdpbmcuc3RhdHVzLmltBnZfADg2MWJvb3QtMDEuZ2MtdXMtY2VudHJhbDEtYS5zaGFyZHMuc3RhZ2luZy5zdGF0dXMuaW0GAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEDNAvlGjekD1YV4WpmjwArGAH2g9kHFJnMRfgUhcIkoA2DdGNwgnZfg3VkcIIjKIV3YWt1Mg0",
                 "boot-01.ac-cn-hongkong-c.shards.staging": "enr:-QEiuEAcHWW7aNBtJhigTCAnKu9-H1b98SWpBJkGm3PAxth5QjJA0kdiabOfou4HgCD6RuyZEnFE5L8ymahouw3kWRiWAYJpZIJ2NIJpcIQvTKi6im11bHRpYWRkcnO4cgA2NjFib290LTAxLmFjLWNuLWhvbmdrb25nLWMuc2hhcmRzLnN0YWdpbmcuc3RhdHVzLmltBnZfADg2MWJvb3QtMDEuYWMtY24taG9uZ2tvbmctYy5zaGFyZHMuc3RhZ2luZy5zdGF0dXMuaW0GAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEDkbgV7oqPNmFtX5FzSPi9WH8kkmrPB1R3n9xRXge91M-DdGNwgnZfg3VkcIIjKIV3YWt1Mg0"
             },
             "wss/p2p/waku/boot": {
-                "boot-01.do-ams3.shards.staging": "/dns4/boot-01.do-ams3.shards.staging.status.im/tcp/443/wss/p2p/16Uiu2HAmQE7FXQc6iZHdBzYfw3qCSDa9dLc1wsBJKoP4aZvztq2d",
+                "boot-01.do-ams3.shards.staging": "/dns4/boot-01.do-ams3.shards.staging.status.im/tcp/443/wss/p2p/16Uiu2HAmEqqio4UR1SWqAc7KY19t6qyDvtmyjreZpzUBJvb4u65R",
                 "boot-01.gc-us-central1-a.shards.staging": "/dns4/boot-01.gc-us-central1-a.shards.staging.status.im/tcp/443/wss/p2p/16Uiu2HAmGAA54bBTE78MYidSy3P7Q9yAWFNTAEReJYD69VRvtL5r",
                 "boot-01.ac-cn-hongkong-c.shards.staging": "/dns4/boot-01.ac-cn-hongkong-c.shards.staging.status.im/tcp/443/wss/p2p/16Uiu2HAmNTpGnyZ8W1BK2sXEmgSCNWiyDKgRU3NBR2DXST2HzxRU"
             },

src/mocks/js_dependencies.cljs

@@ -371,8 +371,6 @@
     :LineChart        #js {}
     :LineChartBicolor #js {}})
 
-(def react-native-pdf #js {:default {}})
-
 (def worklet-factory
   #js {:applyAnimationsToStyle (fn [])})
 
@@ -423,7 +421,6 @@
     "react-native-transparent-video"                   react-native-transparent-video
     "react-native-orientation-locker"                  react-native-orientation-locker
     "react-native-gifted-charts"                       react-native-gifted-charts
-    "react-native-pdf"                                 react-native-pdf
     "@walletconnect/react-native-compat"               #js {}
     "../resources/data/emojis/en.json"                 (js/JSON.parse
                                                         (slurp

src/quo/components/buttons/wallet_ctas/view.cljs

@@ -48,7 +48,7 @@
         :accessibility-label :receive}]
       (when swap-action
         [action-button
-         {:icon                :i/transaction
+         {:icon                :i/swap
           :text                (i18n/label :t/swap)
           :on-press            swap-action
           :theme               theme

src/quo/components/wallet/approval_label/component_spec.cljs

@@ -10,8 +10,7 @@
        :customization-color :blue
        :token-value         "100"
        :token-symbol        "SNT"}])
-    (h/is-truthy (h/get-by-translation-text :t/approve-amount-symbol
-                                            {:token-amount "100" :token-symbol "SNT"})))
+    (h/is-truthy (h/get-by-translation-text :t/approve-amount-symbol {:amount "100" :symbol "SNT"})))
 
   (h/test "with :approving status"
     (h/render-with-theme-provider
@@ -20,8 +19,7 @@
        :customization-color :blue
        :token-value         "50"
        :token-symbol        "DAI"}])
-    (h/is-truthy (h/get-by-translation-text :t/approving-amount-symbol
-                                            {:token-amount "50" :token-symbol "DAI"})))
+    (h/is-truthy (h/get-by-translation-text :t/approving-amount-symbol {:amount "50" :symbol "DAI"})))
 
   (h/test "with :approved status"
     (h/render-with-theme-provider
@@ -30,8 +28,7 @@
        :customization-color :blue
        :token-value         "5"
        :token-symbol        "ETH"}])
-    (h/is-truthy (h/get-by-translation-text :t/approved-amount-symbol
-                                            {:token-amount "5" :token-symbol "ETH"})))
+    (h/is-truthy (h/get-by-translation-text :t/approved-amount-symbol {:amount "5" :symbol "ETH"})))
 
   (h/test "on-press event is called when button is pressed"
     (let [mock-fn (h/mock-fn)]

src/quo/components/wallet/approval_label/view.cljs

@@ -54,8 +54,8 @@
         {:size  :paragraph-2
          :style (style/message theme)}
         (i18n/label (status-message status)
-                    {:token-amount token-value
-                     :token-symbol token-symbol})]]
+                    {:amount token-value
+                     :symbol token-symbol})]]
       (when (and button-props
                  (or (= status :approve)
                      (and (not= status :approve) show-view-button?)))

src/quo/components/wallet/summary_info/view.cljs

@@ -60,8 +60,7 @@
 
 (defn- view-internal
   [{:keys [type account-props token-props networks? values]}]
-  (let [theme   (quo.theme/use-theme)
-        address (or (:address account-props) (:address token-props))]
+  (let [theme (quo.theme/use-theme)]
     [rn/view
      {:style (style/container networks? theme)}
      [rn/view
@@ -90,13 +89,12 @@
             (get-in account-props [:status-account :name])]
            [rn/view
             {:style (style/dot-divider theme)}]])
-        (when address
-          [text/text
-           {:size   (when (not= type :account) :paragraph-2)
-            :weight (when (= type :account) :semi-bold)
-            :style  {:color (when (not= type :account)
-                              (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}}
-           address])]]]
+        [text/text
+         {:size   (when (not= type :account) :paragraph-2)
+          :weight (when (= type :account) :semi-bold)
+          :style  {:color (when (not= type :account)
+                            (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}}
+         (or (:address account-props) (:address token-props))]]]]
      (when networks?
        [:<>
         [rn/view

src/quo/components/wallet/transaction_summary/view.cljs

@@ -17,7 +17,7 @@
 
 (def transaction-icon
   {:send   :i/send
-   :swap   :i/transaction
+   :swap   :i/swap
    :bridge :i/bridge})
 
 (defn transaction-header

src/quo/components/wallet/wallet_activity/view.cljs

@@ -23,7 +23,7 @@
 (def transaction-icon
   {:receive :i/receive
    :send    :i/send
-   :swap    :i/transaction
+   :swap    :i/swap
    :bridge  :i/bridge
    :buy     :i/buy
    :destroy :i/destroy

src/react_native/pdf_viewer.cljs

@@ -1,6 +0,0 @@
-(ns react-native.pdf-viewer
-  (:require
-    ["react-native-pdf" :default rn-pdf]
-    [reagent.core :as reagent]))
-
-(def view (reagent/adapt-react-class rn-pdf))

src/status_im/common/enter_seed_phrase/view.cljs

@@ -96,7 +96,7 @@
        (take 7)))
 
 (defn recovery-phrase-screen
-  [{:keys [banner-offset initial-insets keypair title on-success render-controls]}]
+  [{:keys [banner-offset initial-insets keypair title recovering-keypair? render-controls]}]
   (reagent/with-let [keyboard-shown?           (reagent/atom false)
                      keyboard-show-listener    (.addListener rn/keyboard
                                                              "keyboardDidShow"
@@ -120,20 +120,14 @@
                                                  (reset! seed-phrase new-phrase))
                      on-submit                 (fn []
                                                  (swap! seed-phrase clean-seed-phrase)
-                                                 (rf/dispatch
-                                                  [:profile.recover/validate-recovery-phrase
-                                                   (security/mask-data @seed-phrase)
-                                                   {:on-success (fn [mnemonic key-uid]
-                                                                  (if on-success
-                                                                    (on-success
-                                                                     {:key-uid key-uid
-                                                                      :phrase mnemonic
-                                                                      :on-error
-                                                                      set-invalid-seed-phrase})
-                                                                    (rf/dispatch
-                                                                     [:onboarding/seed-phrase-validated
-                                                                      mnemonic key-uid])))
-                                                    :on-error   set-invalid-seed-phrase}]))]
+                                                 (if recovering-keypair?
+                                                   (rf/dispatch [:wallet/seed-phrase-entered
+                                                                 (security/mask-data
+                                                                  @seed-phrase)
+                                                                 set-invalid-seed-phrase])
+                                                   (rf/dispatch [:onboarding/seed-phrase-entered
+                                                                 (security/mask-data @seed-phrase)
+                                                                 set-invalid-seed-phrase])))]
     (let [words-coll               (mnemonic/passphrase->words @seed-phrase)
           last-word                (peek words-coll)
           pick-suggested-word      (fn [pressed-word]
@@ -197,7 +191,7 @@
          [rn/view {:style style/keyboard-container}
           [quo/predictive-keyboard
            {:type     suggestions-state
-            :blur?    (not on-success)
+            :blur?    (not recovering-keypair?)
             :text     suggestions-text
             :words    (keyboard-suggestions last-word)
             :on-press pick-suggested-word}]])])
@@ -206,7 +200,7 @@
      (.remove keyboard-hide-listener))))
 
 (defn screen
-  [{:keys [title keypair navigation-icon on-success render-controls]}]
+  [{:keys [title keypair navigation-icon recovering-keypair? render-controls]}]
   (let [[insets _]    (rn/use-state (safe-area/get-insets))
         banner-offset (rf/sub [:alert-banners/top-margin])]
     [rn/view {:style style/full-layout}
@@ -215,22 +209,21 @@
        {:margin-top (:top insets)
         :background :blur
         :icon-name  (or navigation-icon
-                        (if on-success :i/close :i/arrow-left))
+                        (if recovering-keypair? :i/close :i/arrow-left))
         :on-press   #(rf/dispatch [:navigate-back])}]
       [recovery-phrase-screen
-       {:title           title
-        :keypair         keypair
-        :render-controls render-controls
-        :banner-offset   banner-offset
-        :initial-insets  insets
-        :on-success      on-success}]]]))
+       {:title               title
+        :keypair             keypair
+        :render-controls     render-controls
+        :banner-offset       banner-offset
+        :initial-insets      insets
+        :recovering-keypair? recovering-keypair?}]]]))
 
 (defn view
   []
-  (let [{:keys [on-success]} (rf/sub [:get-screen-params])]
+  (let [{:keys [recovering-keypair?]} (rf/sub [:get-screen-params])]
     (rn/use-unmount
-     (when-not on-success
-       #(rf/dispatch [:onboarding/clear-navigated-to-enter-seed-phrase-from-screen])))
+     #(rf/dispatch [:onboarding/clear-navigated-to-enter-seed-phrase-from-screen]))
     [screen
-     {:title      (i18n/label :t/use-recovery-phrase)
-      :on-success on-success}]))
+     {:title               (i18n/label :t/use-recovery-phrase)
+      :recovering-keypair? recovering-keypair?}]))

src/status_im/common/pdf_viewer/view.cljs

@@ -1,20 +0,0 @@
-(ns status-im.common.pdf-viewer.view
-  (:require
-    [quo.core :as quo]
-    [react-native.core :as rn]
-    [react-native.pdf-viewer :as pdf-viewer]
-    [status-im.common.events-helper :as events-helper]
-    [utils.re-frame :as rf]))
-
-(defn view
-  []
-  (let [{:keys [uri pdf-viewer-props]} (rf/sub [:get-screen-params])]
-    [rn/view {:style {:flex 1}}
-     [quo/page-nav
-      {:icon-name           :i/close
-       :on-press            events-helper/navigate-back
-       :accessibility-label :pdf-viewer-nav}]
-     [pdf-viewer/view
-      (merge {:source {:uri uri}
-              :style  {:flex 1}}
-             pdf-viewer-props)]]))

src/status_im/contexts/centralized_metrics/events.cljs

@@ -45,15 +45,3 @@
                           #(rf/dispatch [:profile.login/login-with-biometric-if-available
                                          (get-in db [:profile/login :key-uid])]))
               :shell?   true}]]]})))
-
-(rf/reg-fx :effects.centralized-metrics/track
- (fn [event]
-   (native-module/add-centralized-metric event)))
-
-(rf/reg-event-fx
- :centralized-metrics/track
- (fn [{:keys [db]} [event-name data]]
-   (let [event-id (name event-name)]
-     (when (push-event? db)
-       {:fx [[:effects.centralized-metrics/track
-              (tracking/key-value-event event-id data)]]}))))

src/status_im/contexts/centralized_metrics/tracking.cljs

@@ -4,20 +4,20 @@
     [react-native.platform :as platform]))
 
 (defn key-value-event
-  [event-name event-value]
+  [event-name val-key value]
   {:metric
    {:eventName  event-name
     :platform   platform/os
     :appVersion build/app-short-version
-    :eventValue event-value}})
+    :eventValue {val-key value}}})
 
 (defn user-journey-event
   [action]
-  (key-value-event "user-journey" {:action action}))
+  (key-value-event "user-journey" :action action))
 
 (defn navigation-event
   [view-id]
-  (key-value-event "navigation" {:viewId view-id}))
+  (key-value-event "navigation" :viewId view-id))
 
 (def ^:const app-started-event "app-started")
 
@@ -57,7 +57,7 @@
     (user-journey-event app-started-event)
 
     :centralized-metrics/toggle-centralized-metrics
-    (key-value-event "events.metrics-enabled" {:enabled second-parameter})
+    (key-value-event "events.metrics-enabled" :enabled second-parameter)
 
     :set-view-id
     (track-view-id-event second-parameter)

src/status_im/contexts/centralized_metrics/tracking_test.cljs

@@ -18,7 +18,7 @@
                        :platform   platform-os
                        :appVersion app-version
                        :eventValue {val-key value}}}]
-      (is (= expected (tracking/key-value-event event-name {val-key value}))))))
+      (is (= expected (tracking/key-value-event event-name val-key value))))))
 
 (deftest user-journey-event-test
   (testing "creates correct user journey event"

src/status_im/contexts/keycard/authorise/view.cljs

@@ -1,35 +0,0 @@
-(ns status-im.contexts.keycard.authorise.view
-  (:require [quo.core :as quo]
-            [react-native.core :as rn]
-            [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]))
-
-(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
-      {:key        :header
-       :background :blur
-       :icon-name  :i/close
-       :on-press   events-helper/navigate-back}]
-     [quo/page-top
-      {:title       (i18n/label :t/authorise-with-password)
-       :description :context-tag
-       :context-tag {:full-name           profile-name
-                     :profile-picture     profile-picture
-                     :customization-color customization-color}}]
-     [rn/view {:style {:flex 1 :padding-horizontal 20 :justify-content :space-between}}
-      [quo/text (i18n/label :t/migrate-key-pair-authorise)]
-      [standard-auth/slide-button
-       {:size                :size-48
-        :container-style     {}
-        :customization-color customization-color
-        :track-text          (i18n/label :t/slide-to-authorise)
-        :on-auth-success     #(println "TBD" (security/safe-unmask-data %))
-        :auth-button-label   (i18n/label :t/confirm)}]]]))

src/status_im/contexts/keycard/events.cljs

@@ -72,21 +72,22 @@
 
 (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)
-        :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})))
+   (let [error (keycard.utils/validate-application-info key-uid application-info)]
+     (if error
+       (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)
+          :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}))))
 
 (rf/reg-event-fx :keycard/get-application-info
  (fn [_ [{:keys [on-success on-failure]}]]

src/status_im/contexts/keycard/pin/create/view.cljs

@@ -1,55 +0,0 @@
-(ns status-im.contexts.keycard.pin.create.view
-  (:require [clojure.string :as string]
-            [quo.core :as quo]
-            [react-native.core :as rn]
-            [status-im.constants :as constants]
-            [utils.i18n :as i18n]))
-
-(defn view
-  [{:keys [on-complete]}]
-  (let [[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)
-        pin-empty?                (string/blank? pin)
-        on-delete                 (rn/use-callback
-                                   (fn []
-                                     (set-error false)
-                                     (if (= (count pin) 1)
-                                       (do
-                                         (set-pin "")
-                                         (set-stage :create))
-                                       (when (and pin (pos? (count pin)))
-                                         (set-pin (.slice pin 0 -1)))))
-                                   [pin])
-        on-press                  (rn/use-callback
-                                   (fn [new-symbol]
-                                     (let [new-pin (str pin new-symbol)]
-                                       (when (<= (count new-pin) constants/pincode-length)
-                                         (set-pin new-pin)
-                                         (when (= constants/pincode-length (count new-pin))
-                                           (if (= :repeat stage)
-                                             (if (= first-pin new-pin)
-                                               (on-complete new-pin)
-                                               (set-error true))
-                                             (do
-                                               (set-pin "")
-                                               (set-first-pin new-pin)
-                                               (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))}]
-     [rn/view {:style {:flex 1 :justify-content :center :align-items :center :padding-vertical 34}}
-      [quo/pin-input
-       {:blur?                 false
-        :number-of-pins        constants/pincode-length
-        :number-of-filled-pins (count pin)
-        :error?                error?
-        :info                  (when error? (i18n/label :t/pin-not-match))}]]
-     [quo/numbered-keyboard
-      {:delete-key? (not pin-empty?)
-       :on-delete   on-delete
-       :on-press    on-press}]]))

src/status_im/contexts/keycard/sheets/migrate/view.cljs

@@ -6,10 +6,9 @@
 
 (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?])]
+  (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 #()}
        :button-two-label (i18n/label :t/cancel)
        :button-two-props {:type     :grey
                           :on-press #(rf/dispatch [:hide-bottom-sheet])}}]]))

src/status_im/contexts/onboarding/events.cljs

@@ -131,6 +131,15 @@
                  [:open-modal :screen/onboarding.enable-biometrics]
                  [:open-modal :screen/onboarding.enable-notifications])}))
 
+(rf/defn seed-phrase-entered
+  {:events [:onboarding/seed-phrase-entered]}
+  [_ seed-phrase on-error]
+  {:multiaccount/validate-mnemonic [seed-phrase
+                                    (fn [mnemonic key-uid]
+                                      (re-frame/dispatch [:onboarding/seed-phrase-validated
+                                                          mnemonic key-uid]))
+                                    on-error]})
+
 (rf/defn seed-phrase-validated
   {:events [:onboarding/seed-phrase-validated]}
   [{:keys [db]} seed-phrase key-uid]

src/status_im/contexts/preview/status_im/common/floating_button_page/view.cljs

@@ -25,7 +25,7 @@
                                 :title       "floating button page"
                                 :description "press right icon to swap button type"
                                 :text-align  :left
-                                :right-side  [{:icon-name :i/transaction
+                                :right-side  [{:icon-name :i/swap
                                                :on-press  #(swap! slide? not)}]
                                 :background  :blur
                                 :icon-name   :i/close

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

@@ -1,31 +1,9 @@
 (ns status-im.contexts.profile.recover.effects
   (:require
     [native-module.core :as native-module]
-    [promesa.core :as promesa]
-    [utils.re-frame :as rf]
-    [utils.security.core :as security]
-    [utils.transforms :as transforms]))
+    [utils.re-frame :as rf]))
 
 (rf/reg-fx :effects.profile/restore-and-login
  (fn [request]
    ;;"node.login" signal will be triggered as a callback
    (native-module/restore-account-and-login request)))
-
-(defn validate-mnemonic
-  [mnemonic]
-  (-> mnemonic
-      (security/safe-unmask-data)
-      (native-module/validate-mnemonic)
-      (promesa/then (fn [result]
-                      (let [{:keys [keyUID]} (transforms/json->clj result)]
-                        {:key-uid keyUID})))))
-
-(rf/reg-fx :effects.profile/validate-recovery-phrase
- (fn [[mnemonic on-success on-error]]
-   (-> (validate-mnemonic mnemonic)
-       (promesa/then (fn [{:keys [key-uid]}]
-                       (when (fn? on-success)
-                         (on-success mnemonic key-uid))))
-       (promesa/catch (fn [error]
-                        (when (and error (fn? on-error))
-                          (on-error error)))))))

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

@@ -24,7 +24,3 @@
             :imagePath          (profile.config/strip-file-prefix image-path)
             :customizationColor (or color constants/profile-default-color)
             :fetchBackup        true)}))
-
-(rf/reg-event-fx :profile.recover/validate-recovery-phrase
- (fn [_ [phrase {:keys [on-success on-error]}]]
-   {:effects.profile/validate-recovery-phrase [phrase on-success on-error]}))

src/status_im/contexts/profile/settings/view.cljs

@@ -49,14 +49,13 @@
 
 (defn view
   []
-  (let [theme                      (quo.theme/use-theme)
-        insets                     (safe-area/get-insets)
-        customization-color        (rf/sub [:profile/customization-color])
-        scroll-y                   (reanimated/use-shared-value 0)
-        profile                    (rf/sub [:profile/profile])
-        recovery-phrase-backed-up? (rf/sub [:profile/recovery-phrase-backed-up?])
-        full-name                  (profile.utils/displayed-name profile)
-        on-scroll                  (rn/use-callback #(scroll-handler % scroll-y))]
+  (let [theme               (quo.theme/use-theme)
+        insets              (safe-area/get-insets)
+        customization-color (rf/sub [:profile/customization-color])
+        scroll-y            (reanimated/use-shared-value 0)
+        profile             (rf/sub [:profile/profile])
+        full-name           (profile.utils/displayed-name profile)
+        on-scroll           (rn/use-callback #(scroll-handler % scroll-y))]
     [quo/overlay {:type :shell}
      [rn/view
       {:style (style/navigation-wrapper {:customization-color customization-color
@@ -80,7 +79,7 @@
                                                                      profile)}}])}]}]]
      [rn/flat-list
       {:header                          [settings.header/view {:scroll-y scroll-y}]
-       :data                            (settings.items/items (not recovery-phrase-backed-up?))
+       :data                            (settings.items/items (boolean (seq (:mnemonic profile))))
        :shows-vertical-scroll-indicator false
        :render-fn                       settings-category-view
        :get-item-layout                 get-item-layout

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

@@ -160,7 +160,7 @@
 
 (defn wallet-validate-seed-phrase
   [_ [seed-phrase on-success on-error]]
-  {:fx [[:effects.profile/validate-recovery-phrase [seed-phrase on-success on-error]]]})
+  {:fx [[:multiaccount/validate-mnemonic [seed-phrase on-success on-error]]]})
 
 (rf/reg-event-fx :wallet/validate-seed-phrase wallet-validate-seed-phrase)
 

src/status_im/contexts/settings/wallet/events_test.cljs

@@ -101,7 +101,7 @@
         seed-phrase-masked (security/mask-data "seed phrase")
         on-success         #(prn "success")
         on-error           #(prn "error")
-        expected           {:fx [[:effects.profile/validate-recovery-phrase
+        expected           {:fx [[:multiaccount/validate-mnemonic
                                   [seed-phrase-masked on-success on-error]]]}]
     (is (= expected
            (sut/wallet-validate-seed-phrase

src/status_im/contexts/settings/wallet/saved_addresses/sheets/address_options/view.cljs

@@ -6,21 +6,24 @@
     [react-native.platform :as platform]
     [status-im.constants :as constants]
     [status-im.contexts.settings.wallet.saved-addresses.sheets.remove-address.view :as remove-address]
+    [status-im.contexts.wallet.common.utils :as utils]
+    [status-im.contexts.wallet.common.utils.networks :as network-utils]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
 (defn view
-  [{:keys [name full-address chain-short-names address customization-color] :as opts}]
-  (let [open-send-flow                 (rn/use-callback
+  [{:keys [name full-address chain-short-names address] :as opts}]
+  (let [[_ splitted-address]           (network-utils/split-network-full-address address)
+        open-send-flow                 (rn/use-callback
                                         (fn []
                                           (rf/dispatch [:hide-bottom-sheet])
                                           (rf/dispatch [:pop-to-root :shell-stack])
                                           (js/setTimeout #(rf/dispatch [:wallet/select-send-address
                                                                         {:address full-address
                                                                          :recipient
-                                                                         {:label name
-                                                                          :customization-color
-                                                                          customization-color
+                                                                         {:label
+                                                                          (utils/get-shortened-address
+                                                                           splitted-address)
                                                                           :recipient-type :saved-address}
                                                                          :stack-id :wallet-select-address
                                                                          :start-flow? true}])

src/status_im/contexts/wallet/add_account/create_account/events.cljs

@@ -61,6 +61,16 @@
 
 (rf/reg-event-fx :wallet/seed-phrase-validated seed-phrase-validated)
 
+(defn seed-phrase-entered
+  [_ [seed-phrase on-error]]
+  {:fx [[:multiaccount/validate-mnemonic
+         [seed-phrase
+          (fn [mnemonic key-uid]
+            (rf/dispatch [:wallet/seed-phrase-validated mnemonic key-uid on-error]))
+          on-error]]]})
+
+(rf/reg-event-fx :wallet/seed-phrase-entered seed-phrase-entered)
+
 (defn store-account-generated-with-mnemonic
   [{:keys [db]} [{:keys [new-account-data keypair-name]}]]
   (let [new-account (update new-account-data :mnemonic security/mask-data)]

src/status_im/contexts/wallet/add_account/create_account/new_keypair/backup_recovery_phrase/style.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.profile.backup-recovery-phrase.style
+(ns status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.platform :as platform]))

src/status_im/contexts/wallet/add_account/create_account/new_keypair/backup_recovery_phrase/view.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.profile.backup-recovery-phrase.view
+(ns status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.view
   (:require
     [clojure.string :as string]
     [native-module.core :as native-module]
@@ -6,7 +6,8 @@
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [reagent.core :as reagent]
-    [status-im.contexts.profile.backup-recovery-phrase.style :as style]
+    [status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.style :as
+     style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
     [utils.security.core :as security]))
@@ -44,20 +45,20 @@
 
 (defn view
   []
-  (let [step-labels          [:t/backup-step-1 :t/backup-step-2 :t/backup-step-3
-                              :t/backup-step-4]
-        checked?             (reagent/atom
-                              {:0 false
-                               :1 false
-                               :2 false
-                               :3 false})
-        revealed?            (reagent/atom false)
-        customization-color  (rf/sub [:profile/customization-color])
-        {:keys [on-success]} (rf/sub [:get-screen-params])
-        seed-phrase          (reagent/atom [])
-        random-phrase        (reagent/atom [])]
+  (let [step-labels         [:t/backup-step-1 :t/backup-step-2 :t/backup-step-3
+                             :t/backup-step-4]
+        checked?            (reagent/atom
+                             {:0 false
+                              :1 false
+                              :2 false
+                              :3 false})
+        revealed?           (reagent/atom false)
+        customization-color (rf/sub [:profile/customization-color])
+        seed-phrase         (reagent/atom [])
+        random-phrase       (reagent/atom [])]
     (fn []
       (let [theme (quo.theme/use-theme)]
+
         (rn/use-mount
          (fn []
            (native-module/get-random-mnemonic #(reset! seed-phrase (string/split % #"\s")))
@@ -106,10 +107,10 @@
               :button-one-label (i18n/label :t/i-have-written)
               :button-one-props {:disabled?           (some false? (vals @checked?))
                                  :customization-color customization-color
-                                 :on-press            #(on-success {:masked-seed-phrase
-                                                                    (security/mask-data
-                                                                     @seed-phrase)
-                                                                    :random-phrase @random-phrase})}}]
+                                 :on-press            #(rf/dispatch [:wallet/store-new-seed-phrase
+                                                                     {:seed-phrase   (security/mask-data
+                                                                                      @seed-phrase)
+                                                                      :random-phrase @random-phrase}])}}]
             [quo/text
              {:size  :paragraph-2
               :style (style/description-text theme)}

src/status_im/contexts/wallet/add_account/create_account/select_keypair/view.cljs

@@ -16,21 +16,13 @@
    [[{:icon                :i/add
       :accessibility-label :generate-new-keypair
       :label               (i18n/label :t/generate-new-keypair)
-      :on-press            #(rf/dispatch [:navigate-to :screen/backup-recovery-phrase
-                                          {:on-success (fn [{:keys [masked-seed-phrase random-phrase]}]
-                                                         (rf/dispatch [:wallet/store-new-seed-phrase
-                                                                       {:seed-phrase masked-seed-phrase
-                                                                        :random-phrase
-                                                                        random-phrase}]))}])}
+      :on-press            #(rf/dispatch [:navigate-to :screen/wallet.backup-recovery-phrase])}
      {:icon                :i/seed
       :accessibility-label :import-using-phrase
       :label               (i18n/label :t/import-using-phrase)
       :add-divider?        true
-      :on-press            (fn []
-                             (rf/dispatch [:navigate-to :screen/use-recovery-phrase
-                                           {:on-success (fn [{:keys [key-uid phrase on-error]}]
-                                                          (rf/dispatch [:wallet/seed-phrase-validated
-                                                                        phrase key-uid on-error]))}]))}
+      :on-press            #(rf/dispatch [:navigate-to :screen/wallet.enter-seed-phrase
+                                          {:recovering-keypair? true}])}
      (when (ff/enabled? ::ff/wallet.import-private-key)
        {:icon                :i/key
         :accessibility-label :import-private-key

src/status_im/contexts/wallet/bridge/input_amount/view.cljs

@@ -10,14 +10,17 @@
   []
   [rn/view {:style style/bridge-send-wrapper}
    [input-amount/view
-    {:current-screen-id :screen/wallet.bridge-input-amount
-     :button-one-label  (i18n/label :t/review-bridge)
-     :button-one-props  {:icon-left :i/bridge}
-     :on-confirm        (fn [amount]
-                          (rf/dispatch [:wallet/set-token-amount-to-bridge
-                                        {:amount   amount
-                                         :stack-id :screen/wallet.bridge-input-amount}]))
-     :on-navigate-back  (fn []
-                          (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
-                          (rf/dispatch [:wallet/clean-disabled-from-networks])
-                          (rf/dispatch [:wallet/clean-send-amount]))}]])
+    {:current-screen-id      :screen/wallet.bridge-input-amount
+     :button-one-label       (i18n/label :t/review-bridge)
+     :button-one-props       {:icon-left :i/bridge}
+     :enabled-from-chain-ids (rf/sub
+                              [:wallet/bridge-from-chain-ids])
+     :from-enabled-networks  (rf/sub [:wallet/bridge-from-networks])
+     :on-confirm             (fn [amount]
+                               (rf/dispatch [:wallet/set-token-amount-to-bridge
+                                             {:amount   amount
+                                              :stack-id :screen/wallet.bridge-input-amount}]))
+     :on-navigate-back       (fn []
+                               (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
+                               (rf/dispatch [:wallet/clean-disabled-from-networks])
+                               (rf/dispatch [:wallet/clean-send-amount]))}]])

src/status_im/contexts/wallet/common/token_value/view.cljs

@@ -48,7 +48,7 @@
 
 (defn- action-swap
   [{:keys [token asset-to-receive token-symbol testnet-mode?]}]
-  {:icon                :i/transaction
+  {:icon                :i/swap
    :accessibility-label :swap
    :label               (i18n/label :t/swap)
    :disabled?           testnet-mode?

src/status_im/contexts/wallet/common/utils.cljs

@@ -27,18 +27,12 @@
   [balance]
   (cut-fiat-balance balance 2))
 
-(defn prepend-curency-symbol-to-fiat-balance
-  [fiat-balance currency-symbol]
+(defn prettify-balance
+  [currency-symbol balance]
   (let [formatted-symbol (if (> (count currency-symbol) 1)
                            (str currency-symbol " ")
                            currency-symbol)]
-    (str formatted-symbol fiat-balance)))
-
-(defn prettify-balance
-  [currency-symbol fiat-balance]
-  (-> fiat-balance
-      cut-fiat-balance-to-two-decimals
-      (prepend-curency-symbol-to-fiat-balance currency-symbol)))
+    (str formatted-symbol (cut-fiat-balance-to-two-decimals balance))))
 
 (defn get-derivation-path
   [number-of-accounts]
@@ -110,15 +104,11 @@
       :else                          (number/remove-trailing-zeroes
                                       (.toFixed token-units standardized-decimals-count)))))
 
-(defn add-token-symbol-to-crypto-balance
-  [crypto-balance token-symbol]
-  (str crypto-balance " " (string/upper-case token-symbol)))
-
 (defn prettify-crypto-balance
   [token-symbol crypto-balance conversion-rate]
-  (-> crypto-balance
-      (cut-crypto-decimals-to-fit-usd-cents conversion-rate)
-      (add-token-symbol-to-crypto-balance token-symbol)))
+  (str (cut-crypto-decimals-to-fit-usd-cents crypto-balance conversion-rate)
+       " "
+       (string/upper-case token-symbol)))
 
 (defn get-standard-crypto-format
   "For full details: https://github.com/status-im/status-mobile/issues/18225"
@@ -175,33 +165,6 @@
   (let [price (get-market-value currency token)]
     (money/crypto->fiat balance price)))
 
-(defn formatted-token-fiat-value
-  "Converts a token balance into its equivalent fiat value, formatted with a currency symbol.
-  If the fiat value is below $0.01, it returns a <$0.01 string"
-  [{:keys [currency currency-symbol balance token]}]
-  (let [price             (or (get-market-value currency token) 0)
-        price-zero?       (zero? price)
-        balance           (or balance 0)
-        balance-positive? (pos? balance)
-        fiat-value        (money/crypto->fiat balance price)
-        fiat-value-zero?  (money/equal-to fiat-value (money/bignumber 0))]
-    (if (and fiat-value-zero? (not price-zero?) balance-positive?)
-      (number/small-number-threshold 2 currency-symbol)
-      (str currency-symbol fiat-value))))
-
-(defn sanitized-token-amount-to-display
-  "Formats a token amount to a specified number of decimals.
-  Returns a threshold value if the formatted amount is less than the minimum value represented by the decimals."
-  [amount display-decimals]
-  (let [number                (or (money/bignumber amount)
-                                  (money/bignumber 0))
-        amount-fixed-decimals (number/to-fixed number display-decimals)]
-    (if (and (= amount-fixed-decimals "0")
-             (money/greater-than amount
-                                 (money/bignumber 0)))
-      (number/small-number-threshold display-decimals)
-      (str amount-fixed-decimals))))
-
 (defn calculate-balance-from-tokens
   [{:keys [currency tokens chain-ids]}]
   (->> tokens

src/status_im/contexts/wallet/common/utils_test.cljs

@@ -168,30 +168,3 @@
           expected-order ["DAI" "ETH" "SNT"]]
       (is (= expected-order sorted-tokens)))))
 
-(deftest formatted-token-fiat-value-test
-  (testing "formatted-token-fiat-value function"
-    (let [default-params {:currency        "USD"
-                          :currency-symbol "$"
-                          :balance         0.5
-                          :token           {:market-values-per-currency {:usd {:price 2000}}}}]
-      (is (= (utils/formatted-token-fiat-value default-params) "$1000"))
-      (is (= (utils/formatted-token-fiat-value (assoc default-params :balance 0)) "$0"))
-      (is (= (utils/formatted-token-fiat-value (assoc default-params :balance 0.000001)) "<$0.01"))
-      (is (= (utils/formatted-token-fiat-value (assoc default-params :balance nil)) "$0"))
-      (is (= (utils/formatted-token-fiat-value
-              (assoc default-params :balance 1 :token {:market-values-per-currency {:usd {:price nil}}}))
-             "$0"))
-      (is (= (utils/formatted-token-fiat-value
-              (assoc default-params :balance 1 :token {:market-values-per-currency {:usd {:price 0}}}))
-             "$0")))))
-
-(deftest sanitized-token-amount-to-display-test
-  (testing "sanitized-token-amount-to-display function"
-    (is (= (utils/sanitized-token-amount-to-display 1.2345 2) "1.23"))
-    (is (= (utils/sanitized-token-amount-to-display 0.0001 3) "<0.001"))
-    (is (= (utils/sanitized-token-amount-to-display 0.00001 3) "<0.001"))
-    (is (= (utils/sanitized-token-amount-to-display 0 2) "0"))
-    (is (= (utils/sanitized-token-amount-to-display 123.456789 4) "123.4568"))
-    (is (= (utils/sanitized-token-amount-to-display 0.00000123 6) "0.000001"))
-    (is (= (utils/sanitized-token-amount-to-display nil 2) "0"))
-    (is (= (utils/sanitized-token-amount-to-display "invalid" 2) "0"))))

src/status_im/contexts/wallet/effects.cljs

@@ -4,7 +4,6 @@
     [native-module.core :as native-module]
     [promesa.core :as promesa]
     [status-im.common.json-rpc.events :as json-rpc]
-    [status-im.contexts.profile.recover.effects :as profile.recover.effects]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]
     [utils.security.core :as security]
@@ -27,6 +26,26 @@
        :paths          paths}
       on-success))))
 
+(defn validate-mnemonic
+  [mnemonic]
+  (-> mnemonic
+      (security/safe-unmask-data)
+      (native-module/validate-mnemonic)
+      (promesa/then (fn [result]
+                      (let [{:keys [keyUID]} (transforms/json->clj result)]
+                        {:key-uid keyUID})))))
+
+(rf/reg-fx
+ :multiaccount/validate-mnemonic
+ (fn [[mnemonic on-success on-error]]
+   (-> (validate-mnemonic mnemonic)
+       (promesa/then (fn [{:keys [key-uid]}]
+                       (when (fn? on-success)
+                         (on-success mnemonic key-uid))))
+       (promesa/catch (fn [error]
+                        (when (and error (fn? on-error))
+                          (on-error error)))))))
+
 (defn create-account-from-private-key
   [private-key]
   (-> private-key
@@ -62,7 +81,7 @@
 
 (defn import-missing-keypair-by-seed-phrase
   [keypair-key-uid seed-phrase password]
-  (-> (profile.recover.effects/validate-mnemonic seed-phrase)
+  (-> (validate-mnemonic seed-phrase)
       (promesa/then
        (fn [{:keys [key-uid]}]
          (if (not= keypair-key-uid key-uid)

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

@@ -28,108 +28,95 @@
    {:fx [[:dispatch [:wallet/stop-get-suggested-routes]]
          [:dispatch [:wallet/clean-suggested-routes]]]}))
 
-(defn- add-not-enough-assets-data
-  [send-data chosen-route]
-  (-> send-data
-      (assoc :route                     chosen-route
-             :loading-suggested-routes? false
-             :suggested-routes          {:best []}
-             :enough-assets?            false)
-      (update :sender-network-values send-utils/reset-loading-network-amounts-to-zero)
-      (update :receiver-network-values send-utils/reset-loading-network-amounts-to-zero)))
-
-(rf/reg-event-fx
- :wallet/suggested-routes-success
- (fn [{:keys [db]} [suggested-routes-data enough-assets?]]
-   (if-not enough-assets?
-     {:db (update-in db [:wallet :ui :send] add-not-enough-assets-data (:best suggested-routes-data))}
-     (let [chosen-route                  (:best suggested-routes-data)
-           {:keys [token collectible token-display-name
-                   receiver-networks
-                   receiver-network-values
-                   sender-network-values tx-type
-                   disabled-from-chain-ids
-                   from-locked-amounts]} (get-in db [:wallet :ui :send])
-           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-ids            (when token-networks
-                                           (map #(:chain-id %) token-networks))
-           from-network-amounts-by-chain (send-utils/network-amounts-by-chain
-                                          {:route          chosen-route
-                                           :token-decimals token-decimals
-                                           :native-token?  native-token?
-                                           :receiver?      false})
-           to-network-amounts-by-chain   (send-utils/network-amounts-by-chain
-                                          {:route          chosen-route
-                                           :token-decimals token-decimals
-                                           :native-token?  native-token?
-                                           :receiver?      true})
-           sender-possible-chain-ids     (map :chain-id sender-network-values)
-           sender-network-values         (if routes-available?
-                                           (send-utils/network-amounts
-                                            {:network-values
-                                             (if (= tx-type :tx/bridge)
-                                               from-network-amounts-by-chain
-                                               (send-utils/add-zero-values-to-network-values
-                                                from-network-amounts-by-chain
-                                                sender-possible-chain-ids))
-                                             :disabled-chain-ids disabled-from-chain-ids
-                                             :receiver-networks receiver-networks
-                                             :token-networks-ids token-networks-ids
-                                             :from-locked-amounts from-locked-amounts
-                                             :tx-type tx-type
-                                             :receiver? false})
+(rf/reg-event-fx :wallet/suggested-routes-success
+ (fn [{:keys [db]} [suggested-routes-data]]
+   (let [chosen-route                  (:best suggested-routes-data)
+         {:keys [token collectible token-display-name
+                 receiver-networks
+                 receiver-network-values
+                 sender-network-values tx-type
+                 disabled-from-chain-ids
+                 from-locked-amounts]} (get-in db [:wallet :ui :send])
+         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-ids            (when token-networks
+                                         (map #(:chain-id %) token-networks))
+         from-network-amounts-by-chain (send-utils/network-amounts-by-chain
+                                        {:route          chosen-route
+                                         :token-decimals token-decimals
+                                         :native-token?  native-token?
+                                         :receiver?      false})
+         to-network-amounts-by-chain   (send-utils/network-amounts-by-chain
+                                        {:route          chosen-route
+                                         :token-decimals token-decimals
+                                         :native-token?  native-token?
+                                         :receiver?      true})
+         sender-possible-chain-ids     (map :chain-id sender-network-values)
+         sender-network-values         (if routes-available?
+                                         (send-utils/network-amounts
+                                          {:network-values
+                                           (if (= tx-type :tx/bridge)
+                                             from-network-amounts-by-chain
+                                             (send-utils/add-zero-values-to-network-values
+                                              from-network-amounts-by-chain
+                                              sender-possible-chain-ids))
+                                           :disabled-chain-ids disabled-from-chain-ids
+                                           :receiver-networks receiver-networks
+                                           :token-networks-ids token-networks-ids
+                                           :from-locked-amounts from-locked-amounts
+                                           :tx-type tx-type
+                                           :receiver? false})
+                                         (send-utils/reset-loading-network-amounts-to-zero
+                                          sender-network-values))
+         receiver-network-values       (if routes-available?
+                                         (send-utils/network-amounts
+                                          {:network-values     to-network-amounts-by-chain
+                                           :disabled-chain-ids disabled-from-chain-ids
+                                           :receiver-networks  receiver-networks
+                                           :token-networks-ids token-networks-ids
+                                           :tx-type            tx-type
+                                           :receiver?          true})
+                                         (cond->
                                            (send-utils/reset-loading-network-amounts-to-zero
-                                            sender-network-values))
-           receiver-network-values       (if routes-available?
-                                           (send-utils/network-amounts
-                                            {:network-values     to-network-amounts-by-chain
-                                             :disabled-chain-ids disabled-from-chain-ids
-                                             :receiver-networks  receiver-networks
-                                             :token-networks-ids token-networks-ids
-                                             :tx-type            tx-type
-                                             :receiver?          true})
-                                           (cond->
-                                             (send-utils/reset-loading-network-amounts-to-zero
-                                              receiver-network-values)
+                                            receiver-network-values)
 
-                                             (not= tx-type :tx/bridge)
-                                             send-utils/safe-add-type-edit))
-           network-links                 (when routes-available?
-                                           (send-utils/network-links chosen-route
-                                                                     sender-network-values
-                                                                     receiver-network-values))]
-       {:db (update-in db
-                       [:wallet :ui :send]
-                       assoc
-                       :suggested-routes          suggested-routes-data
-                       :route                     chosen-route
-                       :from-values-by-chain      from-network-amounts-by-chain
-                       :to-values-by-chain        to-network-amounts-by-chain
-                       :sender-network-values     sender-network-values
-                       :receiver-network-values   receiver-network-values
-                       :network-links             network-links
-                       :loading-suggested-routes? false
-                       :enough-assets?            true)}))))
+                                           (not= tx-type :tx/bridge)
+                                           send-utils/safe-add-type-edit))
+         network-links                 (when routes-available?
+                                         (send-utils/network-links chosen-route
+                                                                   sender-network-values
+                                                                   receiver-network-values))]
+     {:db (update-in db
+                     [:wallet :ui :send]
+                     assoc
+                     :suggested-routes          suggested-routes-data
+                     :route                     chosen-route
+                     :from-values-by-chain      from-network-amounts-by-chain
+                     :to-values-by-chain        to-network-amounts-by-chain
+                     :sender-network-values     sender-network-values
+                     :receiver-network-values   receiver-network-values
+                     :network-links             network-links
+                     :loading-suggested-routes? false)})))
 
-(rf/reg-event-fx
- :wallet/suggested-routes-error
+(rf/reg-event-fx :wallet/suggested-routes-error
  (fn [{:keys [db]} [error-message]]
-   {:db (-> db
-            (update-in [:wallet :ui :send] dissoc :route)
-            (update-in [:wallet :ui :send :sender-network-values]
-                       send-utils/reset-loading-network-amounts-to-zero)
-            (update-in [:wallet :ui :send :receiver-network-values]
-                       send-utils/reset-loading-network-amounts-to-zero)
-            (assoc-in [:wallet :ui :send :loading-suggested-routes?] false)
-            (assoc-in [:wallet :ui :send :suggested-routes] {:best []}))
-    :fx [[:dispatch
-          [:toasts/upsert
-           {:id   :send-transaction-error
-            :type :negative
-            :text error-message}]]]}))
+   (let [cleaned-sender-network-values   (-> (get-in db [:wallet :ui :send :sender-network-values])
+                                             (send-utils/reset-loading-network-amounts-to-zero))
+         cleaned-receiver-network-values (-> (get-in db [:wallet :ui :send :receiver-network-values])
+                                             (send-utils/reset-loading-network-amounts-to-zero))]
+     {:db (-> db
+              (update-in [:wallet :ui :send] dissoc :route)
+              (assoc-in [:wallet :ui :send :sender-network-values] cleaned-sender-network-values)
+              (assoc-in [:wallet :ui :send :receiver-network-values] cleaned-receiver-network-values)
+              (assoc-in [:wallet :ui :send :loading-suggested-routes?] false)
+              (assoc-in [:wallet :ui :send :suggested-routes] {:best []}))
+      :fx [[:dispatch
+            [:toasts/upsert
+             {:id   :send-transaction-error
+              :type :negative
+              :text error-message}]]]})))
 
 (rf/reg-event-fx :wallet/clean-send-address
  (fn [{:keys [db]}]
@@ -391,7 +378,8 @@
                  from-locked-amounts bridge-to-chain-id]
           :or   {token updated-token}} (get-in db [:wallet :ui :send])
          test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])
-         networks (get-in db [:wallet :networks (if test-networks-enabled? :test :prod)])
+         networks ((if test-networks-enabled? :test :prod)
+                   (get-in db [:wallet :networks]))
          network-chain-ids (map :chain-id networks)
          token-decimal (when token (:decimals token))
          token-id (utils/format-token-id token collectible)
@@ -521,43 +509,40 @@
   [routes]
   (map data-store/new->old-route-path routes))
 
-(def ^:private best-routes-fix
-  (comp ->old-route-paths
-        remove-invalid-bonder-fees-routes
-        remove-multichain-routes))
-
-(def ^:private candidates-fix
-  (comp ->old-route-paths remove-invalid-bonder-fees-routes))
-
-(defn- fix-routes
-  [data]
-  (-> data
-      (data-store/rpc->suggested-routes)
-      (update :best best-routes-fix)
-      (update :candidates candidates-fix)))
-
 (rf/reg-event-fx
  :wallet/handle-suggested-routes
  (fn [{:keys [db]} [data]]
-   (let [{send :send swap? :swap} (-> db :wallet :ui)
-         skip-processing-routes?  (:skip-processing-suggested-routes? send)]
-     (when (or swap? (not skip-processing-routes?))
-       (let [{error-code :code
-              :as        error} (:ErrorResponse data)
-             enough-assets?     (not (and (:Best data) (= error-code "WR-002")))
-             failure?           (and error enough-assets? (not swap?))
-             error-message      (if (zero? error-code) "An error occurred" (:details error))]
-         (when failure?
-           (log/error "failed to get suggested routes (async)"
-                      {:event :wallet/handle-suggested-routes
-                       :error error-message}))
-         {:fx [[:dispatch
-                (cond
-                  (and failure? swap?) [:wallet/swap-proposal-error error-message]
-                  failure?             [:wallet/suggested-routes-error error-message]
-                  swap?                [:wallet/swap-proposal-success (fix-routes data)]
-                  :else                [:wallet/suggested-routes-success (fix-routes data)
-                                        enough-assets?])]]})))))
+   (let [swap?                                     (get-in db [:wallet :ui :swap])
+         {:keys [code details] :as error-response} (-> data :ErrorResponse)
+         skip-processing-suggested-routes?         (get-in db
+                                                           [:wallet :ui :send
+                                                            :skip-processing-suggested-routes?])
+         process-response?                         (and (not swap?)
+                                                        (not skip-processing-suggested-routes?))]
+     (if (and (not swap?) error-response)
+       (let [error-message (if (= code "0") "An error occurred" details)]
+         (log/error "failed to get suggested routes (async)"
+                    {:event :wallet/handle-suggested-routes
+                     :error error-message})
+         {:fx [(cond
+                 swap?
+                 [:dispatch [:wallet/swap-proposal-error error-message]]
+                 process-response?
+                 [:dispatch [:wallet/suggested-routes-error error-message]])]})
+       (let [best-routes-fix (comp ->old-route-paths
+                                   remove-invalid-bonder-fees-routes
+                                   remove-multichain-routes)
+             candidates-fix  (comp ->old-route-paths
+                                   remove-invalid-bonder-fees-routes)
+             routes          (-> data
+                                 (data-store/rpc->suggested-routes)
+                                 (update :best best-routes-fix)
+                                 (update :candidates candidates-fix))]
+         {:fx [(cond
+                 swap?
+                 [:dispatch [:wallet/swap-proposal-success routes]]
+                 process-response?
+                 [:dispatch [:wallet/suggested-routes-success routes]])]})))))
 
 (rf/reg-event-fx :wallet/add-authorized-transaction
  (fn [{:keys [db]} [transaction]]

src/status_im/contexts/wallet/send/input_amount/component_spec.cljs

@@ -41,8 +41,6 @@
                                                     :mixedcase-address "0x7bcDfc75c431"
                                                     :public-key "0x04371e2d9d66b82f056bc128064"
                                                     :removed false}
-   :wallet/current-viewing-account-color           :purple
-   :wallet/wallet-send-enough-assets?              true
    :wallet/wallet-send-token                       {:symbol                     :eth
                                                     :networks                   [{:source 879
                                                                                   :short-name "eth"
@@ -104,7 +102,7 @@
    :wallet/wallet-send-tx-type                     :tx/send
    :wallet/wallet-send-fee-fiat-formatted          "$5,00"
    :wallet/sending-collectible?                    false
-   :wallet/total-amount-in-to-chains               (money/bignumber "250")})
+   :wallet/total-amount                            (money/bignumber "250")})
 
 (h/describe "Send > input amount screen"
   (h/setup-restorable-re-frame)

src/status_im/contexts/wallet/send/input_amount/controlled_input_logic.cljs

@@ -1,74 +0,0 @@
-(ns status-im.contexts.wallet.send.input-amount.controlled-input-logic
-  (:require
-    [clojure.string :as string]
-    [status-im.contexts.wallet.common.utils :as wallet-utils]
-    [utils.money :as money]))
-
-(def ^:private default-max-limit 12)
-
-(def ^:private not-digits-or-dot-pattern
-  #"[^0-9+\.]")
-
-(def ^:private dot ".")
-
-(defn- can-add-character?
-  [input-value character max-length]
-  (let [length-overflow?    (>= (count input-value) max-length)
-        extra-dot?          (and (= character dot) (string/includes? input-value dot))
-        extra-leading-zero? (and (= input-value "0") (= "0" (str character)))
-        non-numeric?        (re-find not-digits-or-dot-pattern (str character))]
-    (not (or non-numeric? extra-dot? extra-leading-zero? length-overflow?))))
-
-(defn- normalize-value-as-numeric
-  [value character]
-  (cond
-    (and (string/blank? value) (= character dot))
-    (str "0" character)
-
-    (and (= value "0") (not= character dot))
-    (str character)
-
-    :else
-    (str value character)))
-
-(defn add-character
-  ([input-value character]
-   (add-character input-value character default-max-limit))
-  ([input-value character max-length]
-   (if (can-add-character? input-value character max-length)
-     (normalize-value-as-numeric input-value character)
-     input-value)))
-
-(defn delete-last
-  ([input-value]
-   (delete-last input-value ""))
-  ([input-value default-value]
-   (let [new-value (subs input-value 0 (dec (count input-value)))]
-     (if (string/blank? new-value)
-       default-value
-       new-value))))
-
-(defn upper-limit-exceeded?
-  [input-value upper-limit]
-  (and upper-limit
-       (when (money/bignumber? (money/bignumber input-value))
-         (money/greater-than (money/bignumber input-value) (money/bignumber upper-limit)))))
-
-(defn lower-limit-exceeded?
-  [input-value lower-limit]
-  (and lower-limit
-       (when (money/bignumber? (money/bignumber input-value))
-         (money/less-than (money/bignumber input-value) (money/bignumber lower-limit)))))
-
-(defn value-out-of-limits?
-  [input-value upper-limit lower-limit]
-  (or (upper-limit-exceeded? input-value upper-limit)
-      (lower-limit-exceeded? input-value lower-limit)))
-
-(defn value-numeric
-  [input-value]
-  (or (parse-double input-value) 0))
-
-(defn empty-value?
-  [input-value]
-  (or (string/blank? input-value) (<= (value-numeric input-value) 0)))

src/status_im/contexts/wallet/send/input_amount/controller.cljs

@@ -1,497 +0,0 @@
-(ns status-im.contexts.wallet.send.input-amount.controller
-  (:require
-    [clojure.string :as string]
-    [status-im.constants :as constants]
-    [status-im.contexts.wallet.common.utils :as utils]
-    [status-im.contexts.wallet.send.input-amount.controlled-input-logic :as controlled-input-logic]
-    [utils.money :as money]
-    [utils.number :as number]
-    [utils.re-frame :as rf]))
-
-;; notes
-;; token-by-symbol and token looks very similar but they have difference in market values data
-;; inside token structure :total-balance and :available-balance are same, not sure if they have
-;; different
-;; meaning
-
-;; subs
-
-(rf/reg-sub :layers/ui
- :<- [:layers]
- :-> :ui)
-
-(rf/reg-sub :ui/send
- :<- [:layers/ui]
- :-> :send)
-
-(rf/reg-sub :ui/send-input-amount-screen
- :<- [:ui/send]
- :-> :input-amount-screen)
-
-(rf/reg-sub :send-input-amount-screen/controller
- :<- [:ui/send-input-amount-screen]
- :-> :controller)
-
-(rf/reg-sub :send-input-amount-screen/currency-information
- :<- [:wallet/wallet-send-token]
- :<- [:profile/currency]
- :<- [:profile/currency-symbol]
- :<- [:profile/profile]
- (fn [[{token-symbol :symbol
-        :as
-        token}
-       currency
-       currency-symbol
-       {fiat-currency :currency}]]
-   {:usd-conversion-rate (utils/token-usd-price token)
-    :currency            currency
-    :fiat-currency       fiat-currency
-    :currency-symbol     currency-symbol
-    :token-symbol        token-symbol
-    :conversion-rate     (-> token
-                             :market-values-per-currency
-                             currency
-                             :price)
-    :token-decimals      (-> token
-                             utils/token-usd-price
-                             utils/one-cent-value
-                             utils/calc-max-crypto-decimals)
-    :token               token}))
-
-(rf/reg-sub :send-input-amount-screen/max-decimals
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/currency-information]
- :<- [:wallet/wallet-send-receiver-preferred-networks]
- (fn [[{:keys [crypto-currency?]}
-       {:keys [token-decimals]}]]
-   (if crypto-currency? token-decimals 2)))
-
-(rf/reg-sub :send-input-amount-screen/enabled-from-chain-ids
- :<- [:wallet/wallet-send-tx-type]
- :<- [:wallet/wallet-send-enabled-from-chain-ids]
- :<- [:wallet/bridge-from-chain-ids]
- (fn [[tx-type send-chain-ids bridge-chain-ids]]
-   (if (= tx-type :tx/bridge)
-     bridge-chain-ids
-     send-chain-ids)))
-
-(rf/reg-sub :send-input-amount-screen/from-enabled-networks
- :<- [:wallet/wallet-send-tx-type]
- :<- [:wallet/wallet-send-enabled-networks]
- :<- [:wallet/bridge-from-networks]
- (fn [[tx-type send-enabled-networks bridge-enabled-networks]]
-   (if (= tx-type :tx/bridge)
-     bridge-enabled-networks
-     send-enabled-networks)))
-
-(defn- every-network-value-is-zero?
-  [sender-network-values]
-  (every? (fn [{:keys [total-amount]}]
-            (and
-             total-amount
-             (money/bignumber? total-amount)
-             (money/equal-to total-amount
-                             (money/bignumber "0"))))
-          sender-network-values))
-
-(rf/reg-sub :send-input-amount-screen/routes-information
- :<- [:wallet/wallet-send-route]
- :<- [:wallet/wallet-send-sender-network-values]
- :<- [:wallet/wallet-send-receiver-network-values]
- :<- [:wallet/wallet-send-suggested-routes]
- :<- [:wallet/wallet-send-loading-suggested-routes?]
- :<- [:wallet/wallet-send-tx-type]
- (fn [[route
-       sender-network-values
-       receiver-network-values
-       suggested-routes
-       loading-routes?
-       tx-type]]
-   (let [token-not-supported-in-receiver-networks? (and (not= tx-type :tx/bridge)
-                                                        (->> receiver-network-values
-                                                             (remove #(= (:type %) :add))
-                                                             (every? #(= (:type %) :not-available))))
-         routes                                    (when suggested-routes
-                                                     (or (:best suggested-routes) []))]
-     {:route                                     route
-      :sender-network-values                     sender-network-values
-      :receiver-network-values                   receiver-network-values
-      :suggested-routes                          suggested-routes
-      :loading-routes?                           loading-routes?
-      :routes                                    routes
-      :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
-      :no-routes-found?                          (and
-                                                  (every-network-value-is-zero?
-                                                   sender-network-values)
-                                                  (not (nil? routes))
-                                                  (not loading-routes?)
-                                                  (not token-not-supported-in-receiver-networks?))})))
-
-(rf/reg-sub :send-input-amount-screen/networks-information
- :<- [:wallet/wallet-send-token]
- :<- [:wallet/wallet-send-receiver-networks]
- :<- [:wallet/wallet-send-receiver-preferred-networks]
- (fn [[{token-networks :networks}
-       receiver-networks
-       receiver-preferred-networks]]
-   {:token-networks                   token-networks
-    :receiver-networks                receiver-networks
-    :sending-to-unpreferred-networks? (not (every? (fn [receiver-selected-network]
-                                                     (contains?
-                                                      (set receiver-preferred-networks)
-                                                      receiver-selected-network))
-                                                   receiver-networks))}))
-
-(rf/reg-sub :send-input-amount-screen/token-by-symbol
- :<- [:send-input-amount-screen/enabled-from-chain-ids]
- :<- [:send-input-amount-screen/currency-information]
- (fn [[enabled-from-chain-ids {:keys [token-symbol]}]]
-   (rf/sub [:wallet/token-by-symbol
-            (str token-symbol)
-            enabled-from-chain-ids])))
-
-(rf/reg-sub :send-input-amount-screen/total-balance
- :<- [:send-input-amount-screen/token-by-symbol]
- (fn [{:keys [total-balance]}]
-   total-balance))
-
-(rf/reg-sub :send-input-amount-screen/upper-limit
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/currency-information]
- :<- [:send-input-amount-screen/total-balance]
- (fn [[{:keys [crypto-currency?]}
-       {:keys [usd-conversion-rate conversion-rate]}
-       total-balance]]
-   (if crypto-currency?
-     (utils/cut-crypto-decimals-to-fit-usd-cents
-      total-balance
-      usd-conversion-rate)
-     (-> (money/crypto->fiat
-          total-balance
-          conversion-rate)
-         utils/cut-fiat-balance-to-two-decimals))))
-
-(rf/reg-sub
- :send-input-amount-screen/amount-in-crypto
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/currency-information]
- (fn [[{:keys [crypto-currency? token-input-value]}
-       {:keys [conversion-rate token-decimals]}]]
-   (if crypto-currency?
-     token-input-value
-     (number/remove-trailing-zeroes
-      (.toFixed (/ token-input-value conversion-rate)
-                token-decimals)))))
-
-(defn- fiat->crypto
-  [value conversion-rate]
-  (-> value
-      (money/fiat->crypto conversion-rate)
-      (utils/cut-crypto-decimals-to-fit-usd-cents conversion-rate)))
-
-(defn- crypto->fiat
-  [value conversion-rate]
-  (-> value
-      (money/crypto->fiat conversion-rate)
-      (utils/cut-fiat-balance-to-two-decimals)))
-
-(rf/reg-sub :send-input-amount-screen/token-input-converted-value
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/currency-information]
- (fn [[{:keys [crypto-currency? token-input-value]}
-       {:keys [conversion-rate]}]]
-   (if crypto-currency?
-     (crypto->fiat token-input-value conversion-rate)
-     (fiat->crypto token-input-value conversion-rate))))
-
-(rf/reg-sub :send-input-amount-screen/token-input-converted-value-prettified
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/token-input-converted-value]
- :<- [:send-input-amount-screen/currency-information]
- (fn [[{:keys [crypto-currency?]}
-       token-input-converted-value
-       {:keys [currency-symbol token-symbol]}]]
-   (if crypto-currency?
-     (utils/prepend-curency-symbol-to-fiat-balance token-input-converted-value currency-symbol)
-     (utils/add-token-symbol-to-crypto-balance token-input-converted-value
-                                               (or (clj->js token-symbol) "")))))
-
-(rf/reg-sub :send-input-amount-screen/upper-limit-prettified
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/currency-information]
- :<- [:send-input-amount-screen/upper-limit]
- (fn [[{:keys [crypto-currency?]}
-       {:keys [currency-symbol token-symbol conversion-rate]}
-       upper-limit]]
-   (if crypto-currency?
-     (utils/prettify-crypto-balance
-      (or (clj->js token-symbol) "")
-      (money/bignumber upper-limit)
-      conversion-rate)
-     (utils/prettify-balance currency-symbol
-                             (money/bignumber upper-limit)))
- ))
-
-(rf/reg-sub :send-input-amount-screen/value-out-of-limits?
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/upper-limit]
- (fn [[{:keys [token-input-value]}
-       upper-limit]]
-   (controlled-input-logic/value-out-of-limits? token-input-value upper-limit 0)))
-
-(rf/reg-sub :send-input-amount-screen/recipient-gets-amount
- :<- [:send-input-amount-screen/currency-information]
- :<- [:wallet/total-amount-in-to-chains]
- (fn [[{:keys [conversion-rate token-symbol]}
-       total-amount-receiver]]
-   (utils/prettify-crypto-balance
-    token-symbol
-    total-amount-receiver
-    conversion-rate)))
-
-(rf/reg-sub :send-input-amount-screen/owned-eth-balance-is-zero?
- :<- [:send-input-amount-screen/enabled-from-chain-ids]
- (fn [enabled-from-chain-ids]
-   (let [owned-eth-token (rf/sub [:wallet/token-by-symbol
-                                  (string/upper-case
-                                   constants/mainnet-short-name)
-                                  enabled-from-chain-ids])]
-     (money/equal-to (:total-balance owned-eth-token) 0))))
-
-(rf/reg-sub :send-input-amount-screen/fee-formatted
- :<- [:send-input-amount-screen/routes-information]
- (fn [{:keys [route]}]
-   (let [native-currency-symbol (when-not (or (nil? route) (empty? route))
-                                  (get-in (first route)
-                                          [:from :native-currency-symbol]))]
-     (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol]))))
-
-(rf/reg-sub :send-input-amount-screen/upper-limit-exceeded?
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/upper-limit]
- (fn [[{:keys [token-input-value]}
-       upper-limit]]
-   (controlled-input-logic/upper-limit-exceeded?
-    token-input-value
-    upper-limit)))
-
-(rf/reg-sub :send-input-amount-screen/upper-limit-equals-input-value?
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/upper-limit]
- (fn [[{:keys [token-input-value]}
-       upper-limit]]
-   (money/equal-to
-    (money/bignumber token-input-value)
-    (money/bignumber upper-limit))))
-
-(rf/reg-sub :send-input-amount-screen/should-try-again?
- :<- [:send-input-amount-screen/upper-limit-exceeded?]
- :<- [:send-input-amount-screen/routes-information]
- (fn [[upper-limit-exceeded?
-       {:keys [no-routes-found?]}]]
-   (and (not upper-limit-exceeded?) no-routes-found?)))
-
-(rf/reg-sub :send-input-amount-screen/not-enough-asset?
- :<- [:send-input-amount-screen/upper-limit-exceeded?]
- :<- [:send-input-amount-screen/upper-limit-equals-input-value?]
- :<- [:send-input-amount-screen/routes-information]
- :<- [:send-input-amount-screen/currency-information]
- :<- [:send-input-amount-screen/owned-eth-balance-is-zero?]
- (fn [[upper-limit-exceeded?
-       upper-limit-equals-input-value?
-       {:keys [sender-network-values no-routes-found?]}
-       {:keys [token-symbol]}
-       owned-eth-balance-is-zero?]]
-   (and
-    (or no-routes-found? upper-limit-exceeded?)
-    (not-empty sender-network-values)
-    (if (= token-symbol
-           (string/upper-case
-            constants/mainnet-short-name))
-      upper-limit-equals-input-value?
-      owned-eth-balance-is-zero?))))
-
-(rf/reg-sub :send-input-amount-screen/show-no-routes?
- :<- [:send-input-amount-screen/upper-limit-exceeded?]
- :<- [:send-input-amount-screen/routes-information]
- :<- [:send-input-amount-screen/not-enough-asset?]
- (fn [[upper-limit-exceeded?
-       {:keys [sender-network-values no-routes-found?]}
-       not-enough-asset?]]
-   (and
-    (or no-routes-found? upper-limit-exceeded?)
-    (not-empty sender-network-values)
-    (not not-enough-asset?))))
-
-(comment
-  (rf/sub [:send-input-amount-screen/not-enough-asset?])
-  (rf/sub [:send-input-amount-screen/upper-limit-equals-input-value?])
-  (:no-routes-found? (rf/sub [:send-input-amount-screen/routes-information]))
-  (:sender-network-values (rf/sub [:send-input-amount-screen/currency-information]))
-  (rf/sub [:send-input-amount-screen/not-enough-asset?]))
-
-
-(rf/reg-sub :send-input-amount-screen/view-subs
- :<- [:send-input-amount-screen/currency-information]
- :<- [:send-input-amount-screen/value-out-of-limits?]
- :<- [:send-input-amount-screen/routes-information]
- :<- [:send-input-amount-screen/networks-information]
- :<- [:send-input-amount-screen/recipient-gets-amount]
- :<- [:send-input-amount-screen/max-decimals]
- :<- [:send-input-amount-screen/fee-formatted]
- :<- [:wallet/current-viewing-account-address]
- :<- [:send-input-amount-screen/not-enough-asset?]
- :<- [:send-input-amount-screen/show-no-routes?]
- (fn
-   [[{:keys [token-symbol] :as currency-information}
-     value-out-of-limits?
-     {:keys [route
-             sender-network-values
-             loading-routes?
-             token-not-supported-in-receiver-networks?
-             no-routes-found?]
-      :as   routes-information}
-     {:keys [token-networks
-             receiver-networks]}
-     recipient-gets-amount
-     max-decimals
-     fee-formatted
-     current-address
-     not-enough-asset?
-     show-no-routes?]]
-   {:token-symbol                              token-symbol
-    :value-out-of-limits?                      value-out-of-limits?
-    :route                                     route
-    :sender-network-values                     sender-network-values
-    :loading-routes?                           loading-routes?
-    :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
-    :token-networks                            token-networks
-    :receiver-networks                         receiver-networks
-    :recipient-gets-amount                     recipient-gets-amount
-    :max-decimals                              max-decimals
-    :fee-formatted                             fee-formatted
-    :no-routes-found?                          no-routes-found?
-    :current-address                           current-address
-    :not-enough-asset?                         not-enough-asset?
-    :show-no-routes?                           show-no-routes?}))
-
-(rf/reg-sub :send-input-amount-screen/token-input-subs
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/currency-information]
- :<- [:send-input-amount-screen/token-input-converted-value]
- :<- [:send-input-amount-screen/token-input-converted-value-prettified]
- :<- [:send-input-amount-screen/value-out-of-limits?]
- :<- [:send-input-amount-screen/upper-limit-prettified]
- :<- [:send-input-amount-screen/from-enabled-networks]
- (fn
-   [[{:keys [crypto-currency? token-input-value] :as controller}
-     {:keys [fiat-currency token-symbol] :as currency-information}
-     token-input-converted-value
-     token-input-converted-value-prettified
-     value-out-of-limits?
-     upper-limit-prettified
-     from-enabled-networks]]
-   {:crypto-currency?                       crypto-currency?
-    :fiat-currency                          fiat-currency
-    :token-symbol                           token-symbol
-    :upper-limit-prettified                 upper-limit-prettified
-    :input-value                            token-input-value
-    :value-out-of-limits?                   value-out-of-limits?
-    :token-input-converted-value            token-input-converted-value
-    :token-input-converted-value-prettified token-input-converted-value-prettified
-    :from-enabled-networks                  from-enabled-networks}))
-
-(rf/reg-sub :send-input-amount-screen/routes-subs
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/currency-information]
- :<- [:send-input-amount-screen/amount-in-crypto]
- :<- [:send-input-amount-screen/value-out-of-limits?]
- :<- [:send-input-amount-screen/routes-information]
- :<- [:send-input-amount-screen/token-by-symbol]
- :<- [:send-input-amount-screen/upper-limit-exceeded?]
-
- (fn
-   [[{:keys [token-input-value] :as controller}
-     {:keys [token] :as currency-information}
-     amount-in-crypto
-     value-out-of-limits?
-     {:keys [routes
-             token-not-supported-in-receiver-networks?]
-      :as   routes-information}
-     token-by-symbol
-     upper-limit-exceeded?]]
-   {:token                                     token
-    :valid-input?                              (not (or (controlled-input-logic/empty-value?
-                                                         token-input-value)
-                                                        value-out-of-limits?))
-    :upper-limit-exceeded?                     upper-limit-exceeded?
-    :amount-in-crypto                          amount-in-crypto
-    :routes                                    routes
-    :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
-    :token-by-symbol                           token-by-symbol}))
-
-(rf/reg-sub :send-input-amount-screen/bottom-actions-subs
- :<- [:send-input-amount-screen/controller]
- :<- [:send-input-amount-screen/amount-in-crypto]
- :<- [:send-input-amount-screen/value-out-of-limits?]
- :<- [:send-input-amount-screen/routes-information]
- :<- [:send-input-amount-screen/networks-information]
- :<- [:send-input-amount-screen/token-by-symbol]
- :<- [:send-input-amount-screen/should-try-again?]
- (fn
-   [[{:keys [token-input-value] :as controller}
-     amount-in-crypto
-     value-out-of-limits?
-     {:keys [route loading-routes?]
-      :as   routes-information}
-     {:keys [sending-to-unpreferred-networks?]}
-     token-by-symbol
-     should-try-again?]]
-   {:valid-input?                     (not (or (controlled-input-logic/empty-value?
-                                                token-input-value)
-                                               value-out-of-limits?))
-    :amount-in-crypto                 amount-in-crypto
-    :route                            route
-    :loading-routes?                  loading-routes?
-    :token-by-symbol                  token-by-symbol
-    :sending-to-unpreferred-networks? sending-to-unpreferred-networks?
-    :should-try-again?                should-try-again?}))
-
-
-;; events
-(def token-input-value-path [:layers :ui :send :input-amount-screen :controller :token-input-value])
-
-(rf/reg-event-fx :send-input-amount-screen/set-input-state
- (fn [{:keys [db]} [f]]
-   {:db (update-in db [:layers :ui :send :input-amount-screen :controller :input-state] f)}))
-
-(rf/reg-event-fx :send-input-amount-screen/set-token-input-value
- (fn [{:keys [db]} [v]]
-   {:db (assoc-in db token-input-value-path v)}))
-
-
-(rf/reg-event-fx :send-input-amount-screen/swap-between-fiat-and-crypto
- (fn [{:keys [db]} [token-input-converted-value]]
-   {:db (update-in db [:layers :ui :send :input-amount-screen :controller :crypto-currency?] not)
-    :fx [[:dispatch
-          [:send-input-amount-screen/set-token-input-value token-input-converted-value]]]}))
-
-
-(rf/reg-event-fx :send-input-amount-screen/token-input-add-character
- (fn [{:keys [db]} [c max-decimals]]
-   (let [input-value   (get-in db token-input-value-path)
-         new-text      (str input-value c)
-         regex-pattern (str "^\\d*\\.?\\d{0," max-decimals "}$")
-         regex         (re-pattern regex-pattern)]
-     (when (re-matches regex new-text)
-       {:db (update-in db token-input-value-path #(controlled-input-logic/add-character % c))}))))
-
-(rf/reg-event-fx :send-input-amount-screen/token-input-delete-last
- (fn [{:keys [db]}]
-   {:db (update-in db token-input-value-path controlled-input-logic/delete-last)}))
-
-(rf/reg-event-fx :send-input-amount-screen/token-input-delete-all
- (fn [{:keys [db]}]
-   {:db (assoc-in db token-input-value-path "")}))
-
-

src/status_im/contexts/wallet/send/input_amount/view.cljs

@@ -1,13 +1,16 @@
 (ns status-im.contexts.wallet.send.input-amount.view
   (:require
+    [clojure.string :as string]
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [quo.theme]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
+    [status-im.common.controlled-input.utils :as controlled-input]
+    [status-im.constants :as constants]
     [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
     [status-im.contexts.wallet.common.asset-list.view :as asset-list]
-    [status-im.contexts.wallet.send.input-amount.controller]
+    [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.send.input-amount.style :as style]
     [status-im.contexts.wallet.send.routes.view :as routes]
     [status-im.contexts.wallet.sheets.buy-token.view :as buy-token]
@@ -16,10 +19,12 @@
     [status-im.setup.hot-reload :as hot-reload]
     [utils.debounce :as debounce]
     [utils.i18n :as i18n]
+    [utils.money :as money]
+    [utils.number :as number]
     [utils.re-frame :as rf]))
 
 (defn- estimated-fees
-  [{:keys [loading-routes? fees recipient-gets-amount]}]
+  [{:keys [loading-routes? fees amount]}]
   [rn/view {:style style/estimated-fees-container}
    (when (ff/enabled? ::ff/wallet.advanced-sending)
      [rn/view {:style style/estimated-fees-content-container}
@@ -43,12 +48,20 @@
      :status          (if loading-routes? :loading :default)
      :size            :small
      :title           (i18n/label :t/recipient-gets)
-     :subtitle        recipient-gets-amount}]])
-
+     :subtitle        amount}]])
 
+(defn- every-network-value-is-zero?
+  [sender-network-values]
+  (every? (fn [{:keys [total-amount]}]
+            (and
+             total-amount
+             (money/bignumber? total-amount)
+             (money/equal-to total-amount
+                             (money/bignumber "0"))))
+          sender-network-values))
 
 (defn select-asset-bottom-sheet
-  []
+  [clear-input!]
   (let [{preselected-token-symbol :symbol} (rf/sub [:wallet/wallet-send-token])]
     [:<> ;; Need to be a `:<>` to keep `asset-list` scrollable.
      [quo/drawer-top
@@ -60,8 +73,7 @@
        :preselected-token-symbol preselected-token-symbol
        :on-token-press           (fn [token]
                                    (rf/dispatch [:wallet/edit-token-to-send token])
-                                   #(rf/dispatch
-                                     [:send-input-amount-screen/token-input-delete-all]))}]]))
+                                   (clear-input!))}]]))
 
 (defn- token-not-available
   [token-symbol receiver-networks token-networks]
@@ -109,7 +121,7 @@
   [quo/alert-banner
    {:action?         true
     :text            (i18n/label :t/not-enough-assets-to-pay-gas-fees)
-    :button-text     (i18n/label :t/add-eth)
+    :button-text     (i18n/label :t/buy-eth)
     :on-button-press #(rf/dispatch [:show-bottom-sheet
                                     {:content buy-token/view}])}])
 
@@ -128,122 +140,157 @@
 
     :else (rf/dispatch [:wallet/stop-and-clean-suggested-routes])))
 
-(defn token-input
-  []
-  (let [{:keys [crypto-currency?
-                upper-limit-prettified
-                input-value
-                value-out-of-limits?
-                token-input-converted-value
-                token-input-converted-value-prettified
-                fiat-currency
-                token-symbol
-                from-enabled-networks]} (rf/sub [:send-input-amount-screen/token-input-subs])
-        show-select-asset-sheet         #(rf/dispatch
-                                          [:show-bottom-sheet
-                                           {:content (fn [] [select-asset-bottom-sheet])}])]
-    [quo/token-input
-     {:container-style style/input-container
-      :token-symbol    token-symbol
-      :value           input-value
-      :on-swap         #(rf/dispatch [:send-input-amount-screen/swap-between-fiat-and-crypto
-                                      token-input-converted-value])
-      :on-token-press  show-select-asset-sheet
-      :error?          value-out-of-limits?
-      :currency-symbol (if crypto-currency? token-symbol fiat-currency)
-      :converted-value token-input-converted-value-prettified
-      :hint-component  [quo/network-tags
-                        {:networks (seq from-enabled-networks)
-                         :title    (i18n/label
-                                    :t/send-limit
-                                    {:limit upper-limit-prettified})
-                         :status   (when value-out-of-limits? :error)}]}]))
-(defn routes-view
-  [current-screen-id]
-  (let [{:keys [valid-input?
-                upper-limit-exceeded?
-                amount-in-crypto
-                routes
-                token-not-supported-in-receiver-networks?
-                token
-                token-by-symbol]} (rf/sub [:send-input-amount-screen/routes-subs])
-        request-fetch-routes      (fn [bounce-duration-ms]
-                                    (fetch-routes
-                                     {:amount                 amount-in-crypto
-                                      :valid-input?           valid-input?
-                                      :bounce-duration-ms     bounce-duration-ms
-                                      :token                  token
-                                      :reset-amounts-to-zero? (and upper-limit-exceeded?
-                                                                   (some? routes))}))]
-    [routes/view
-     {:token                                     token-by-symbol
-      :send-amount-in-crypto                     amount-in-crypto
-      :valid-input?                              valid-input?
-      :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
-      :current-screen-id                         current-screen-id
-      :request-fetch-routes                      request-fetch-routes}]))
-
-(defn bottom-actions
-  [on-confirm button-one-label button-one-props]
-  (let [{:keys [valid-input?
-                amount-in-crypto
-                route
-                loading-routes?
-                token-by-symbol
-                sending-to-unpreferred-networks?
-                should-try-again?]} (rf/sub [:send-input-amount-screen/bottom-actions-subs])]
-    [quo/bottom-actions
-     {:actions          :one-action
-      :button-one-label (if should-try-again?
-                          (i18n/label :t/try-again)
-                          button-one-label)
-      :button-one-props (merge (when-not should-try-again? button-one-props)
-                               {:disabled? (or loading-routes?
-                                               (and (not should-try-again?)
-                                                    (or (nil? route)
-                                                        (empty? route)
-                                                        (not valid-input?))))
-                                :on-press  (cond
-                                             should-try-again?
-                                             #(rf/dispatch [:wallet/start-get-suggested-routes
-                                                            {:amount        amount-in-crypto
-                                                             :updated-token token-by-symbol}])
-                                             sending-to-unpreferred-networks?
-                                             #(show-unpreferred-networks-alert on-confirm)
-                                             :else
-                                             #(on-confirm amount-in-crypto))}
-                               (when should-try-again?
-                                 {:type :grey}))}])
-)
-
 (defn view
   ;; crypto-decimals, limit-crypto and initial-crypto-currency? args are needed
   ;; for component tests only
-  [{on-confirm        :on-confirm
-    on-navigate-back  :on-navigate-back
-    button-one-label  :button-one-label
-    button-one-props  :button-one-props
-    current-screen-id :current-screen-id}]
-  (let [{:keys [value-out-of-limits?
-                route
-                sender-network-values
-                loading-routes?
-                token-not-supported-in-receiver-networks?
-                token-networks
-                receiver-networks
-                token-symbol
-                recipient-gets-amount
-                max-decimals
-                fee-formatted
-                no-routes-found?
-                current-address
-                not-enough-asset?
-                show-no-routes?]
-         :as   state}    (rf/sub [:send-input-amount-screen/view-subs])
-        view-id          (rf/sub [:view-id])
-        active-screen?   (= view-id current-screen-id)
-        bottom           (safe-area/get-bottom)
-        on-navigate-back on-navigate-back]
+  [{default-on-confirm       :on-confirm
+    default-limit-crypto     :limit-crypto
+    default-crypto-decimals  :crypto-decimals
+    on-navigate-back         :on-navigate-back
+    button-one-label         :button-one-label
+    button-one-props         :button-one-props
+    current-screen-id        :current-screen-id
+    initial-crypto-currency? :initial-crypto-currency?
+    enabled-from-chain-ids   :enabled-from-chain-ids
+    from-enabled-networks    :from-enabled-networks
+    :or                      {initial-crypto-currency? true}}]
+  (let [view-id                                   (rf/sub [:view-id])
+        active-screen?                            (= view-id current-screen-id)
+        bottom                                    (safe-area/get-bottom)
+        [crypto-currency? set-crypto-currency]    (rn/use-state initial-crypto-currency?)
+        handle-on-confirm                         (fn [amount]
+                                                    (rf/dispatch [:wallet/set-token-amount-to-send
+                                                                  {:amount   amount
+                                                                   :stack-id current-screen-id}]))
+        {fiat-currency :currency}                 (rf/sub [:profile/profile])
+        {token-symbol   :symbol
+         token-networks :networks
+         :as            token}                    (rf/sub [:wallet/wallet-send-token])
+        send-from-locked-amounts                  (rf/sub [:wallet/wallet-send-from-locked-amounts])
+        {:keys [total-balance]
+         :as   token-by-symbol}                   (rf/sub [:wallet/token-by-symbol
+                                                           (str token-symbol)
+                                                           enabled-from-chain-ids])
+        token-balance                             (or default-limit-crypto total-balance)
+        usd-conversion-rate                       (utils/token-usd-price token)
+        currency                                  (rf/sub [:profile/currency])
+        conversion-rate                           (-> token
+                                                      :market-values-per-currency
+                                                      currency
+                                                      :price)
+        token-decimals                            (-> token
+                                                      utils/token-usd-price
+                                                      utils/one-cent-value
+                                                      utils/calc-max-crypto-decimals)
+        [input-state set-input-state]             (rn/use-state controlled-input/init-state)
+        clear-input!                              #(set-input-state controlled-input/delete-all)
+        currency-symbol                           (rf/sub [:profile/currency-symbol])
+        loading-routes?                           (rf/sub
+                                                   [:wallet/wallet-send-loading-suggested-routes?])
+        route                                     (rf/sub [:wallet/wallet-send-route])
+        on-confirm                                (or default-on-confirm handle-on-confirm)
+        crypto-decimals                           (or token-decimals default-crypto-decimals)
+        max-limit                                 (if crypto-currency?
+                                                    (utils/cut-crypto-decimals-to-fit-usd-cents
+                                                     token-balance
+                                                     usd-conversion-rate)
+                                                    (utils/cut-fiat-balance-to-two-decimals
+                                                     (money/crypto->fiat token-balance conversion-rate)))
+        input-value                               (controlled-input/input-value input-state)
+        valid-input?                              (not (or (controlled-input/empty-value? input-state)
+                                                           (controlled-input/input-error input-state)))
+        confirm-disabled?                         (or (nil? route)
+                                                      (empty? route)
+                                                      (not valid-input?))
+        amount-in-crypto                          (if crypto-currency?
+                                                    input-value
+                                                    (number/remove-trailing-zeroes
+                                                     (.toFixed (/ input-value conversion-rate)
+                                                               crypto-decimals)))
+        total-amount-receiver                     (rf/sub [:wallet/total-amount true])
+        amount-text                               (str (number/remove-trailing-zeroes
+                                                        (.toFixed total-amount-receiver
+                                                                  (min token-decimals 6)))
+                                                       " "
+                                                       token-symbol)
+        first-route                               (first route)
+        native-currency-symbol                    (when-not confirm-disabled?
+                                                    (get-in first-route
+                                                            [:from :native-currency-symbol]))
+        fee-formatted                             (when native-currency-symbol
+                                                    (rf/sub [:wallet/wallet-send-fee-fiat-formatted
+                                                             native-currency-symbol]))
+        show-select-asset-sheet                   #(rf/dispatch
+                                                    [:show-bottom-sheet
+                                                     {:content (fn []
+                                                                 [select-asset-bottom-sheet
+                                                                  clear-input!])}])
+        sender-network-values                     (rf/sub
+                                                   [:wallet/wallet-send-sender-network-values])
+        receiver-network-values                   (rf/sub
+                                                   [:wallet/wallet-send-receiver-network-values])
+        tx-type                                   (rf/sub [:wallet/wallet-send-tx-type])
+        token-not-supported-in-receiver-networks? (and (not= tx-type :tx/bridge)
+                                                       (->> receiver-network-values
+                                                            (remove #(= (:type %) :add))
+                                                            (every? #(= (:type %) :not-available))))
+        suggested-routes                          (rf/sub [:wallet/wallet-send-suggested-routes])
+        routes                                    (when suggested-routes
+                                                    (or (:best suggested-routes) []))
+        no-routes-found?                          (and
+                                                   (every-network-value-is-zero?
+                                                    sender-network-values)
+                                                   (not (nil? routes))
+                                                   (not loading-routes?)
+                                                   (not token-not-supported-in-receiver-networks?))
+        receiver-networks                         (rf/sub [:wallet/wallet-send-receiver-networks])
+        receiver-preferred-networks               (rf/sub
+                                                   [:wallet/wallet-send-receiver-preferred-networks])
+        receiver-preferred-networks-set           (set receiver-preferred-networks)
+        sending-to-unpreferred-networks?          (not (every? (fn [receiver-selected-network]
+                                                                 (contains?
+                                                                  receiver-preferred-networks-set
+                                                                  receiver-selected-network))
+                                                               receiver-networks))
+        input-error                               (controlled-input/input-error input-state)
+        limit-exceeded?                           (controlled-input/upper-limit-exceeded? input-state)
+        should-try-again?                         (and (not limit-exceeded?) no-routes-found?)
+        current-address                           (rf/sub [:wallet/current-viewing-account-address])
+        owned-eth-token                           (rf/sub [:wallet/token-by-symbol
+                                                           (string/upper-case
+                                                            constants/mainnet-short-name)
+                                                           enabled-from-chain-ids])
+        not-enough-asset?                         (and
+                                                   (or no-routes-found? limit-exceeded?)
+                                                   (not-empty sender-network-values)
+                                                   (if (= token-symbol
+                                                          (string/upper-case
+                                                           constants/mainnet-short-name))
+                                                     (money/equal-to
+                                                      (controlled-input/value-bn input-state)
+                                                      (controlled-input/upper-limit-bn input-state))
+                                                     (money/equal-to (:total-balance
+                                                                      owned-eth-token)
+                                                                     0)))
+        show-no-routes?                           (and
+                                                   (or no-routes-found? limit-exceeded?)
+                                                   (not-empty sender-network-values)
+                                                   (not not-enough-asset?))
+        request-fetch-routes                      (fn [bounce-duration-ms]
+                                                    (fetch-routes
+                                                     {:amount                 amount-in-crypto
+                                                      :valid-input?           valid-input?
+                                                      :bounce-duration-ms     bounce-duration-ms
+                                                      :token                  token
+                                                      :reset-amounts-to-zero? (and limit-exceeded?
+                                                                                   (some? routes))}))
+        swap-between-fiat-and-crypto              (fn []
+                                                    (if crypto-currency?
+                                                      (set-input-state
+                                                       #(controlled-input/->fiat % conversion-rate))
+                                                      (set-input-state
+                                                       #(controlled-input/->crypto % conversion-rate)))
+                                                    (set-crypto-currency (not crypto-currency?)))]
     (rn/use-effect
      (fn []
        (when active-screen?
@@ -257,52 +304,120 @@
     (hot-reload/use-safe-unmount on-navigate-back)
     (rn/use-effect
      (fn []
-       (when value-out-of-limits?
-         (rf/dispatch [:wallet/stop-get-suggested-routes])
-         (debounce/clear-all)))
-     [value-out-of-limits?])
+       (set-input-state #(controlled-input/set-upper-limit % max-limit)))
+     [max-limit])
     (rn/use-effect
      (fn []
-       (rf/dispatch [:send-input-amount-screen/token-input-delete-all])
+       (when input-error
+         (rf/dispatch [:wallet/stop-get-suggested-routes])
+         (debounce/clear-all)))
+     [input-error])
+    (rn/use-effect
+     (fn []
+       (clear-input!)
        (rf/dispatch [:wallet/stop-and-clean-suggested-routes])
        (rf/dispatch [:wallet/clean-disabled-from-networks]))
      [current-address])
+    (rn/use-effect
+     (fn []
+       (request-fetch-routes 0))
+     [send-from-locked-amounts])
     [rn/view
      {:style               style/screen
       :accessibility-label (str "container"
-                                (when value-out-of-limits? "-error"))}
+                                (when (controlled-input/input-error input-state) "-error"))}
      [account-switcher/view
       {:icon-name     :i/arrow-left
        :on-press      #(rf/dispatch [:navigate-back])
        :switcher-type :select-account}]
-     [token-input]
-     [routes-view current-screen-id]
+     [quo/token-input
+      {:container-style style/input-container
+       :token-symbol    token-symbol
+       :value           input-value
+       :on-swap         swap-between-fiat-and-crypto
+       :on-token-press  show-select-asset-sheet
+       :error?          (controlled-input/input-error input-state)
+       :currency-symbol (if crypto-currency? token-symbol fiat-currency)
+       :converted-value (if crypto-currency?
+                          (utils/prettify-balance
+                           currency-symbol
+                           (money/crypto->fiat input-value
+                                               conversion-rate))
+                          (utils/prettify-crypto-balance
+                           (or (clj->js token-symbol) "")
+                           (money/fiat->crypto input-value
+                                               conversion-rate)
+                           conversion-rate))
+       :hint-component  [quo/network-tags
+                         {:networks (seq from-enabled-networks)
+                          :title    (i18n/label
+                                     :t/send-limit
+                                     {:limit (if crypto-currency?
+                                               (utils/prettify-crypto-balance
+                                                (or (clj->js token-symbol) "")
+                                                (controlled-input/upper-limit-bn input-state)
+                                                conversion-rate)
+                                               (utils/prettify-balance currency-symbol
+                                                                       (controlled-input/upper-limit-bn
+                                                                        input-state)))})
+                          :status   (when (controlled-input/input-error input-state) :error)}]}]
+     [routes/view
+      {:token                                     token-by-symbol
+       :send-amount-in-crypto                     amount-in-crypto
+       :valid-input?                              valid-input?
+       :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
+       :current-screen-id                         current-screen-id
+       :request-fetch-routes                      request-fetch-routes}]
      (when (and (not loading-routes?)
                 sender-network-values
                 token-not-supported-in-receiver-networks?)
        [token-not-available token-symbol receiver-networks token-networks])
      (when (and (not no-routes-found?) (or loading-routes? route))
        [estimated-fees
-        {:loading-routes?       loading-routes?
-         :fees                  fee-formatted
-         :recipient-gets-amount recipient-gets-amount}])
+        {:loading-routes? loading-routes?
+         :fees            fee-formatted
+         :amount          amount-text}])
      (cond
        show-no-routes?   [no-routes-found]
        not-enough-asset? [not-enough-asset])
-     [bottom-actions on-confirm button-one-label button-one-props]
+     [quo/bottom-actions
+      {:actions          :one-action
+       :button-one-label (if should-try-again?
+                           (i18n/label :t/try-again)
+                           button-one-label)
+       :button-one-props (merge (when-not should-try-again?
+                                  button-one-props)
+                                {:disabled? (or loading-routes?
+                                                (and (not should-try-again?) confirm-disabled?))
+                                 :on-press  (cond
+                                              should-try-again?
+                                              #(rf/dispatch [:wallet/start-get-suggested-routes
+                                                             {:amount        amount-in-crypto
+                                                              :updated-token token-by-symbol}])
+                                              sending-to-unpreferred-networks?
+                                              #(show-unpreferred-networks-alert on-confirm)
+                                              :else
+                                              #(on-confirm amount-in-crypto))}
+                                (when should-try-again?
+                                  {:type :grey}))}]
      [quo/numbered-keyboard
       {:container-style      (style/keyboard-container bottom)
        :left-action          :dot
        :delete-key?          true
        :on-press             (fn [c]
-                               (rf/dispatch [:send-input-amount-screen/token-input-add-character c
-                                             max-decimals]))
+                               (let [new-text      (str input-value c)
+                                     max-decimals  (if crypto-currency? crypto-decimals 2)
+                                     regex-pattern (str "^\\d*\\.?\\d{0," max-decimals "}$")
+                                     regex         (re-pattern regex-pattern)]
+                                 (when (re-matches regex new-text)
+                                   (debounce/clear-all)
+                                   (set-input-state #(controlled-input/add-character % c)))))
        :on-delete            (fn []
                                (debounce/clear-all)
-                               (rf/dispatch [:send-input-amount-screen/token-input-delete-last])
+                               (set-input-state controlled-input/delete-last)
                                (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes]))
        :on-long-press-delete (fn []
                                (debounce/clear-all)
-                               (rf/dispatch [:send-input-amount-screen/token-input-delete-all])
+                               (set-input-state controlled-input/delete-all)
                                (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes]))}]]))
 

src/status_im/contexts/wallet/send/routes/view.cljs

@@ -340,11 +340,15 @@
   (let [token-symbol (:symbol token)
         nav-current-screen-id (rf/sub [:view-id])
         active-screen? (= nav-current-screen-id current-screen-id)
-        loading-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
-        sender-network-values (rf/sub [:wallet/wallet-send-sender-network-values])
-        receiver-network-values (rf/sub [:wallet/wallet-send-receiver-network-values])
+        loading-routes? (rf/sub
+                         [:wallet/wallet-send-loading-suggested-routes?])
+        sender-network-values (rf/sub
+                               [:wallet/wallet-send-sender-network-values])
+        receiver-network-values (rf/sub
+                                 [:wallet/wallet-send-receiver-network-values])
         network-links (rf/sub [:wallet/wallet-send-network-links])
-        disabled-from-chain-ids (rf/sub [:wallet/wallet-send-disabled-from-chain-ids])
+        disabled-from-chain-ids (rf/sub
+                                 [:wallet/wallet-send-disabled-from-chain-ids])
         {token-balances-per-chain :balances-per-chain} (rf/sub [:wallet/wallet-send-token])
         token-available-networks-for-suggested-routes
         (send-utils/token-available-networks-for-suggested-routes

src/status_im/contexts/wallet/send/send_amount/view.cljs

@@ -8,14 +8,12 @@
 (defn view
   []
   [input-amount/view
-   {:current-screen-id :screen/wallet.send-input-amount
-    :button-one-label  (i18n/label :t/review-send)
-    :on-confirm        (fn [amount]
-                         (rf/dispatch [:wallet/set-token-amount-to-send
-                                       {:amount   amount
-                                        :stack-id :screen/wallet.send-input-amount}]))
-    :on-navigate-back  (fn []
-                         (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
-                         (rf/dispatch [:wallet/clean-disabled-from-networks])
-                         (rf/dispatch [:wallet/clean-from-locked-amounts])
-                         (rf/dispatch [:wallet/clean-send-amount]))}])
+   {:current-screen-id      :screen/wallet.send-input-amount
+    :button-one-label       (i18n/label :t/review-send)
+    :enabled-from-chain-ids (rf/sub [:wallet/wallet-send-enabled-from-chain-ids])
+    :from-enabled-networks  (rf/sub [:wallet/wallet-send-enabled-networks])
+    :on-navigate-back       (fn []
+                              (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
+                              (rf/dispatch [:wallet/clean-disabled-from-networks])
+                              (rf/dispatch [:wallet/clean-from-locked-amounts])
+                              (rf/dispatch [:wallet/clean-send-amount]))}])

src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs

@@ -221,8 +221,9 @@
             bridge-to-network         (when bridge-to-chain-id
                                         (rf/sub [:wallet/network-details-by-chain-id
                                                  bridge-to-chain-id]))
-            loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
-            total-amount-receiver     (rf/sub [:wallet/total-amount-in-to-chains])
+            loading-suggested-routes? (rf/sub
+                                       [:wallet/wallet-send-loading-suggested-routes?])
+            total-amount-receiver     (rf/sub [:wallet/total-amount true])
             from-account-props        {:customization-color account-color
                                        :size                32
                                        :emoji               (:emoji account)

src/status_im/contexts/wallet/sheets/buy_token/view.cljs

@@ -55,7 +55,7 @@
                                          #(set-min-height
                                            (oops/oget % :nativeEvent :layout :height)))]
     [:<>
-     [quo/drawer-top {:title (or title (i18n/label :t/ways-to-buy-assets))}]
+     [quo/drawer-top {:title (or title (i18n/label :t/buy-assets))}]
      [quo/segmented-control
       {:size            32
        :container-style style/tabs

src/status_im/contexts/wallet/sheets/slippage_settings/view.cljs

@@ -4,7 +4,6 @@
             [react-native.core :as rn]
             [react-native.platform :as platform]
             [status-im.constants :as constants]
-            [status-im.contexts.wallet.common.utils :as utils]
             [status-im.contexts.wallet.sheets.slippage-settings.style :as style]
             [utils.i18n :as i18n]
             [utils.money :as money]
@@ -44,18 +43,15 @@
   (let [receive-token-decimals    (:decimals asset-to-receive)
         amount-out-whole-number   (number/hex->whole amount-out receive-token-decimals)
         amount-out-num            (number/to-fixed amount-out-whole-number
-                                                   receive-token-decimals)
+                                                   (min constants/min-token-decimals-to-display
+                                                        receive-token-decimals))
         slippage-num              (-> (money/bignumber amount-out-num)
                                       (money/mul (money/bignumber max-slippage))
                                       (money/div (money/bignumber 100)))
         amount-out-minus-slippage (money/sub (money/bignumber amount-out-num) slippage-num)
-        display-decimals          (min receive-token-decimals
-                                       constants/min-token-decimals-to-display)
         receive-amount            (if (money/greater-than amount-out-minus-slippage
                                                           (money/bignumber 0))
-                                    (str (utils/sanitized-token-amount-to-display
-                                          amount-out-minus-slippage
-                                          display-decimals))
+                                    (str amount-out-minus-slippage)
                                     0)]
     receive-amount))
 

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

@@ -204,12 +204,6 @@
  (fn [{:keys [db]}]
    {:db (update-in db [:wallet :ui] dissoc :swap)}))
 
-(rf/reg-event-fx
- :wallet/on-swap-done
- (fn [_]
-   {:fx [[:dispatch [:wallet/select-account-tab :activity]]
-         [:dispatch [:wallet/clean-swap]]]}))
-
 (rf/reg-event-fx :wallet/swap-transaction
  (fn [{:keys [db]} [sha3-pwd]]
    (let [wallet-address         (get-in db
@@ -278,11 +272,16 @@
                                      (when result
                                        (let [receive-token-decimals (:decimals asset-to-receive)
                                              amount-out (:amount-out swap-proposal)
-                                             receive-amount
-                                             (when amount-out
-                                               (-> amount-out
-                                                   (number/hex->whole receive-token-decimals)
-                                                   (money/to-fixed receive-token-decimals)))]
+                                             decimals-to-display
+                                             (min
+                                              receive-token-decimals
+                                              constants/min-token-decimals-to-display)
+                                             receive-amount (when amount-out
+                                                              (number/remove-trailing-zeroes
+                                                               (.toFixed (number/hex->whole
+                                                                          amount-out
+                                                                          receive-token-decimals)
+                                                                         decimals-to-display)))]
                                          (rf/dispatch [:wallet.swap/add-authorized-transaction
                                                        (cond-> {:transaction result
                                                                 :approval-transaction?
@@ -299,6 +298,8 @@
                                                          :screen/wallet.swap-set-spending-cap
                                                          :screen/wallet.swap-confirmation)])
                                          (when-not approval-required?
+                                           (rf/dispatch [:wallet/select-account-tab :activity])
+                                           (rf/dispatch [:wallet/clean-swap])
                                            (debounce/debounce-and-dispatch
                                             [:toasts/upsert
                                              {:id   :swap-transaction-pending
@@ -363,12 +364,12 @@
                     :type (if transaction-confirmed? :positive :negative)
                     :text (if transaction-confirmed?
                             (i18n/label :t/spending-cap-set
-                                        {:token-amount  amount
+                                        {:amount        amount
                                          :token-symbol  token-symbol
                                          :provider-name provider-name
                                          :account-name  account-name})
                             (i18n/label :t/spending-cap-failed
-                                        {:token-amount  amount
+                                        {:amount        amount
                                          :token-symbol  token-symbol
                                          :provider-name provider-name
                                          :account-name  account-name}))}]]]}

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

@@ -64,7 +64,7 @@
   []
   (let [theme            (quo.theme/use-theme)
         asset-to-pay     (rf/sub [:wallet/swap-asset-to-pay])
-        pay-amount       (rf/sub [:wallet/swap-pay-amount-raw])
+        pay-amount       (rf/sub [:wallet/swap-pay-amount])
         pay-token-symbol (:symbol asset-to-pay)]
     [rn/view {:style style/summary-section-container}
      [quo/text

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

@@ -26,7 +26,6 @@
     [utils.string :as utils.string]))
 
 (def ^:private default-text-for-unfocused-input "0.00")
-(def ^:private default-token-symbol "ETH")
 
 (defn- on-close
   []
@@ -99,8 +98,7 @@
         approval-transaction-id          (rf/sub [:wallet/swap-approval-transaction-id])
         approved-amount                  (rf/sub [:wallet/swap-approved-amount])
         error-response                   (rf/sub [:wallet/swap-error-response])
-        asset-to-pay                     (rf/sub [:wallet/token-by-symbol
-                                                  (or pay-token-symbol default-token-symbol)])
+        asset-to-pay                     (rf/sub [:wallet/token-by-symbol pay-token-symbol])
         overlay-shown?                   (boolean (:sheets (rf/sub [:bottom-sheet])))
         input-ref                        (rn/use-ref-atom nil)
         set-input-ref                    (rn/use-callback (fn [ref] (reset! input-ref ref)))
@@ -113,11 +111,11 @@
                                                    (:chain-id network) :raw-balance]
                                                   0)
                                           pay-token-decimals)
-        pay-token-fiat-value             (utils/formatted-token-fiat-value
-                                          {:currency        currency
-                                           :currency-symbol currency-symbol
-                                           :balance         (or pay-input-num-value 0)
-                                           :token           asset-to-pay})
+        pay-token-fiat-value             (str
+                                          (utils/calculate-token-fiat-value
+                                           {:currency currency
+                                            :balance  (or pay-input-num-value 0)
+                                            :token    asset-to-pay}))
         available-crypto-limit           (money/bignumber
                                           pay-token-balance-selected-chain)
         display-decimals                 (min pay-token-decimals
@@ -130,14 +128,8 @@
                                            (number/small-number-threshold display-decimals)
                                            available-crypto-limit-display)
         approval-amount-required-num     (when approval-amount-required
-                                           (number/to-fixed (number/hex->whole
-                                                             approval-amount-required
-                                                             pay-token-decimals)
-                                                            pay-token-decimals))
-        approval-label-token-value       (when (or approval-amount-required-num approved-amount)
-                                           (utils/sanitized-token-amount-to-display
-                                            (or approval-amount-required-num approved-amount)
-                                            display-decimals))
+                                           (str (number/hex->whole approval-amount-required
+                                                                   pay-token-decimals)))
         pay-input-error?                 (or (and (not (string/blank? pay-input-amount))
                                                   (money/greater-than
                                                    (money/bignumber pay-input-amount)
@@ -156,7 +148,6 @@
                                               :valid-input?                valid-pay-input?
                                               :clean-approval-transaction? true}))
                                           [pay-input-amount])]
-    (rn/use-unmount #(rf/dispatch [:wallet/on-swap-done]))
     (rn/use-effect
      (fn []
        (request-fetch-swap-proposal))
@@ -181,6 +172,7 @@
                               (and loading-swap-proposal? (not input-focused?)) :loading
                               input-focused?                                    :typing
                               :else                                             :disabled)
+      :currency-symbol      currency-symbol
       :on-token-press       on-token-press
       :on-max-press         #(on-max-press (str pay-token-balance-selected-chain))
       :on-input-focus       on-input-focus
@@ -195,7 +187,7 @@
                                                     :confirmed :approved
                                                     :finalised :approved
                                                     :approve)
-                             :token-value         approval-label-token-value
+                             :token-value         (or approval-amount-required-num approved-amount)
                              :button-props        (merge {:on-press on-approve-press}
                                                          (when error-response
                                                            {:disabled? true}))
@@ -225,11 +217,10 @@
         amount-out-num           (if amount-out-whole-number
                                    (number/to-fixed amount-out-whole-number receive-token-decimals)
                                    default-text-for-unfocused-input)
-        receive-token-fiat-value (utils/formatted-token-fiat-value
-                                  {:currency        currency
-                                   :currency-symbol currency-symbol
-                                   :balance         (or amount-out-whole-number 0)
-                                   :token           asset-to-receive})]
+        receive-token-fiat-value (str (utils/calculate-token-fiat-value
+                                       {:currency currency
+                                        :balance  (or amount-out-whole-number 0)
+                                        :token    asset-to-receive}))]
     [quo/swap-input
      {:type                 :receive
       :error?               false
@@ -243,6 +234,7 @@
                               (and loading-swap-proposal? (not input-focused?)) :loading
                               input-focused?                                    :typing
                               :else                                             :disabled)
+      :currency-symbol      currency-symbol
       :on-token-press       on-token-press
       :on-input-focus       on-input-focus
       :value                amount-out-num
@@ -265,15 +257,17 @@
                                  (merge {:action?         true
                                          :on-button-press #(rf/dispatch [:show-bottom-sheet
                                                                          {:content buy-token/view}])
-                                         :button-text     (i18n/label :t/add-assets)})
+                                         :button-text     (i18n/label :t/buy-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])}])
-                                         :button-text     (i18n/label :t/add-eth)}))]
+                                                                         [buy-token/view
+                                                                          {:title (i18n/label
+                                                                                   :t/buy-ethereum)}])}])
+                                         :button-text     (i18n/label :t/buy-eth)}))]
     (when (or pay-input-error? error-response)
       [quo/alert-banner props])))
 

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

@@ -80,8 +80,7 @@
        :values      (send-utils/network-values-for-ui network-values)
        :token-props {:token   token-symbol
                      :label   (str amount " " token-symbol)
-                     :address (when token-address
-                                (address-utils/get-shortened-compressed-key token-address))
+                     :address (address-utils/get-shortened-compressed-key token-address)
                      :size    32}}]]))
 
 (defn- pay-section
@@ -89,7 +88,7 @@
   (let [theme             (quo.theme/use-theme)
         asset-to-pay      (rf/sub [:wallet/swap-asset-to-pay])
         network           (rf/sub [:wallet/swap-network])
-        pay-amount        (rf/sub [:wallet/swap-pay-amount-raw])
+        pay-amount        (rf/sub [:wallet/swap-pay-amount])
         network-chain-id  (:chain-id network)
         network-name      (:network-name network)
         pay-token-symbol  (:symbol asset-to-pay)
@@ -99,8 +98,7 @@
       :label                     (i18n/label :t/pay)
       :token-symbol              pay-token-symbol
       :amount                    pay-amount
-      :token-address             (when-not (address-utils/zero-address? pay-token-address)
-                                   pay-token-address)
+      :token-address             pay-token-address
       :network                   network-name
       :theme                     theme}]))
 
@@ -109,7 +107,7 @@
   (let [theme                 (quo.theme/use-theme)
         asset-to-receive      (rf/sub [:wallet/swap-asset-to-receive])
         network               (rf/sub [:wallet/swap-network])
-        receive-amount        (rf/sub [:wallet/swap-receive-amount-raw])
+        receive-amount        (rf/sub [:wallet/swap-receive-amount])
         network-chain-id      (:chain-id network)
         network-name          (:network-name network)
         receive-token-symbol  (:symbol asset-to-receive)
@@ -119,8 +117,7 @@
       :label                     (i18n/label :t/receive)
       :token-symbol              receive-token-symbol
       :amount                    receive-amount
-      :token-address             (when-not (address-utils/zero-address? receive-token-address)
-                                   receive-token-address)
+      :token-address             receive-token-address
       :network                   network-name
       :theme                     theme}]))
 
@@ -182,8 +179,7 @@
   (let [provider (rf/sub [:wallet/swap-proposal-provider])
         theme    (quo.theme/use-theme)
         on-press (rn/use-callback #(when provider
-                                     (rf/dispatch [:open-modal :screen/pdf-viewer
-                                                   {:uri (:terms-and-conditions-url provider)}]))
+                                     (rf/dispatch [:open-url (:terms-and-conditions-url provider)]))
                                   [provider])]
     [:<>
      [transaction-details]

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

@@ -1,6 +1,7 @@
 (ns status-im.contexts.wallet.wallet-connect.events.effects
   (:require
     [promesa.core :as promesa]
+    [re-frame.core :as rf]
     [react-native.wallet-connect :as wallet-connect]
     [status-im.config :as config]
     [status-im.constants :as constants]
@@ -9,7 +10,6 @@
     [status-im.contexts.wallet.wallet-connect.utils.transactions :as transactions]
     [status-im.contexts.wallet.wallet-connect.utils.typed-data :as typed-data]
     [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
     [utils.security.core :as security]))
 
 (rf/reg-fx
@@ -56,8 +56,8 @@
          :proposal-request proposal-request
          :address          address
          :session-networks session-networks})
-       (promesa/then (partial rf/call-continuation on-success))
-       (promesa/catch (partial rf/call-continuation on-fail)))))
+       (promesa/then on-success)
+       (promesa/catch on-fail))))
 
 (rf/reg-fx
  :effects.wallet-connect/sign-message
@@ -72,8 +72,8 @@
            (signing/eth-sign password address data)
 
            (signing/personal-sign password address data))
-         (promesa/then (partial rf/call-continuation on-success))
-         (promesa/catch (partial rf/call-continuation on-error))))))
+         (promesa/then on-success)
+         (promesa/catch on-error)))))
 
 (rf/reg-fx
  :effects.wallet-connect/prepare-transaction
@@ -92,8 +92,8 @@
                                       tx-hash
                                       tx-args
                                       chain-id)
-       (promesa/then (partial rf/call-continuation on-success))
-       (promesa/catch (partial rf/call-continuation on-error)))))
+       (promesa/then on-success)
+       (promesa/catch on-error))))
 
 (rf/reg-fx
  :effects.wallet-connect/send-transaction
@@ -103,8 +103,8 @@
                                       tx-hash
                                       tx-args
                                       chain-id)
-       (promesa/then (partial rf/call-continuation on-success))
-       (promesa/catch (partial rf/call-continuation on-error)))))
+       (promesa/then on-success)
+       (promesa/catch on-error))))
 
 (rf/reg-fx
  :effects.wallet-connect/sign-typed-data
@@ -114,8 +114,8 @@
                         data
                         chain-id
                         version)
-       (promesa/then (partial rf/call-continuation on-success))
-       (promesa/catch (partial rf/call-continuation on-error)))))
+       (promesa/then on-success)
+       (promesa/catch on-error))))
 
 (rf/reg-fx
  :effects.wallet-connect/respond-session-request

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

@@ -135,21 +135,17 @@
                  :proposal-request current-proposal
                  :session-networks session-networks
                  :address          current-address
-                 :on-success       [:wallet-connect/approve-session-success]
-                 :on-fail          [:wallet-connect/approve-session-error]}])
+                 :on-success       #(rf/dispatch [:wallet-connect/approve-session-success %])
+                 :on-fail          #(rf/dispatch [:wallet-connect/approve-session-error %])}])
              [:dispatch [:dismiss-modal :screen/wallet.wallet-connect-session-proposal]]]}
        {:fx [[:dispatch [:wallet-connect/no-internet-toast]]]}))))
 
 (rf/reg-event-fx :wallet-connect/approve-session-success
- (fn [{:keys [db]} [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]]
-           [:dispatch [:wallet-connect/redirect-to-dapp (data-store/get-dapp-redirect-url session)]]
-           [:dispatch
-            [:centralized-metrics/track :metric/dapp-session-proposal
-             {:action                :approved
-              :total_connected_dapps total-connected-dapps}]]]})))
+ (fn [_ [session]]
+   (log/info "Wallet Connect session approved")
+   {:fx [[:dispatch [:wallet-connect/on-new-session session]]
+         [:dispatch [:wallet-connect/reset-current-session-proposal]]
+         [:dispatch [:wallet-connect/redirect-to-dapp (data-store/get-dapp-redirect-url session)]]]}))
 
 (rf/reg-event-fx :wallet-connect/approve-session-error
  (fn [_ [error]]
@@ -162,18 +158,11 @@
  :wallet-connect/reject-session-proposal
  (fn [{:keys [db]} [proposal]]
    (let [web3-wallet                      (get db :wallet-connect/web3-wallet)
-         {:keys [request response-sent?]} (:wallet-connect/current-proposal db)
-         networks                         (networks/get-proposal-networks (or proposal request))
-         rejected?                        (nil? proposal)]
-     {:fx (concat
-           (when-not response-sent?
-             [[:effects.wallet-connect/reject-session-proposal
-               {:web3-wallet web3-wallet
-                :proposal    (or proposal request)
-                :on-success  #(log/info "Wallet Connect session proposal rejected")
-                :on-error    #(log/error "Wallet Connect unable to reject session proposal")}]
-              [:dispatch
-               [:centralized-metrics/track :metric/dapp-session-proposal
-                {:action   (if rejected? :rejected :not_supported)
-                 :networks networks}]]])
-           [[:dispatch [:wallet-connect/reset-current-session-proposal]]])})))
+         {:keys [request response-sent?]} (:wallet-connect/current-proposal db)]
+     {:fx [(when-not response-sent?
+             [:effects.wallet-connect/reject-session-proposal
+              {:web3-wallet web3-wallet
+               :proposal    (or proposal request)
+               :on-success  #(log/info "Wallet Connect session proposal rejected")
+               :on-error    #(log/error "Wallet Connect unable to reject session proposal")}])
+           [:dispatch [:wallet-connect/reset-current-session-proposal]]]})))

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

@@ -51,8 +51,8 @@
              :address    address
              :data       raw-data
              :rpc-method rpc-method
-             :on-error   [:wallet-connect/on-sign-error]
-             :on-success [:wallet-connect/finish-session-request]}]]})))
+             :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
+             :on-success #(rf/dispatch [:wallet-connect/finish-session-request %])}]]})))
 
 (rf/reg-event-fx
  :wallet-connect/respond-sign-typed-data
@@ -65,8 +65,8 @@
              :data       raw-data
              :chain-id   chain-id
              :version    typed-data-version
-             :on-error   [:wallet-connect/on-sign-error]
-             :on-success [:wallet-connect/finish-session-request]}]]})))
+             :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
+             :on-success #(rf/dispatch [:wallet-connect/finish-session-request %])}]]})))
 
 (rf/reg-event-fx
  :wallet-connect/respond-send-transaction-data
@@ -79,8 +79,8 @@
              :chain-id   chain-id
              :tx-hash    tx-hash
              :tx-args    tx-args
-             :on-error   [:wallet-connect/on-sign-error]
-             :on-success [:wallet-connect/finish-session-request]}]]})))
+             :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
+             :on-success #(rf/dispatch [:wallet-connect/finish-session-request %])}]]})))
 
 (rf/reg-event-fx
  :wallet-connect/respond-sign-transaction-data
@@ -93,8 +93,8 @@
              :chain-id   chain-id
              :tx-hash    tx-hash
              :tx-params  tx-args
-             :on-error   [:wallet-connect/on-sign-error]
-             :on-success [:wallet-connect/finish-session-request]}]]})))
+             :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
+             :on-success #(rf/dispatch [:wallet-connect/finish-session-request %])}]]})))
 
 (rf/reg-event-fx
  :wallet-connect/on-sign-error
@@ -161,15 +161,9 @@
 
 (rf/reg-event-fx
  :wallet-connect/finish-session-request
- (fn [{:keys [db]} [result]]
-   (let [event  (get-in db [:wallet-connect/current-request :event])
-         method (data-store/get-request-method event)]
-     {:fx [[:dispatch
-            [:centralized-metrics/track :metric/dapp-session-response
-             {:method   method
-              :approved true}]]
-           [:dispatch [:wallet-connect/send-response {:result result}]]
-           [:dispatch [:wallet-connect/dismiss-request-modal]]]})))
+ (fn [_ [result]]
+   {:fx [[:dispatch [:wallet-connect/send-response {:result result}]]
+         [:dispatch [:wallet-connect/dismiss-request-modal]]]}))
 
 ;; NOTE: Currently we only reject a session if the user dismissed a modal
 ;; without accepting the session first.
@@ -182,17 +176,9 @@
 (rf/reg-event-fx
  :wallet-connect/on-request-modal-dismissed
  (fn [{:keys [db]}]
-   (let [{:keys [response-sent? event]} (get db :wallet-connect/current-request)
-         method                         (data-store/get-request-method event)]
-     {:fx (concat
-           (when-not response-sent?
-             [[:dispatch
-               [:centralized-metrics/track :metric/dapp-session-response
-                {:method   method
-                 :approved false}]]
-              [:dispatch
-               [:wallet-connect/send-response
-                {:request event
-                 :error   (wallet-connect/get-sdk-error
-                           constants/wallet-connect-user-rejected-error-key)}]]])
-           [[:dispatch [:wallet-connect/reset-current-request]]])})))
+   {:fx [(when-not (get-in db [:wallet-connect/current-request :response-sent?])
+           [:dispatch
+            [:wallet-connect/send-response
+             {:error (wallet-connect/get-sdk-error
+                      constants/wallet-connect-user-rejected-error-key)}]])
+         [:dispatch [:wallet-connect/reset-current-request]]]}))

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

@@ -14,10 +14,7 @@
             [{:method     "wallet_disconnectWalletConnectSession"
               :params     [topic]
               :on-success [:wallet-connect/delete-session topic]
-              :on-error   #(log/info "Wallet Connect session persistence failed" %)}]]
-           [:dispatch
-            [:centralized-metrics/track
-             :metric/dapp-session-disconnected]]]})))
+              :on-error   #(log/info "Wallet Connect session persistence failed" %)}]]]})))
 
 (rf/reg-event-fx
  :wallet-connect/disconnect-dapp
@@ -29,14 +26,10 @@
        {:fx [[:effects.wallet-connect/disconnect
               {:web3-wallet web3-wallet
                :topic       topic
-               :on-fail     (fn []
-                              (when on-fail
-                                (on-fail)))
+               :on-fail     on-fail
                :on-success  (fn []
                               (log/info "Successfully disconnected dApp session" topic)
                               (rf/dispatch [:wallet-connect/delete-session topic])
-                              (rf/dispatch [:centralized-metrics/track
-                                            :metric/dapp-session-disconnected])
                               (when on-success
                                 (on-success)))}]]}
        {:fx [[:dispatch [:wallet-connect/no-internet-toast]]]}))))

src/status_im/contexts/wallet/wallet_connect/modals/common/footer/view.cljs

@@ -31,12 +31,9 @@
 
                                           :not-enough-assets
                                           :t/not-enough-assets-for-transaction)))
-         :button-text     (i18n/label :t/add-eth)
-         :on-button-press (rn/use-callback (fn []
-                                             (rf/dispatch [:centralized-metrics/track
-                                                           :metric/dapp-buy-eth])
-                                             (rf/dispatch [:show-bottom-sheet
-                                                           {:content buy-token/view}])))}])
+         :button-text     (i18n/label :t/buy-eth)
+         :on-button-press #(rf/dispatch [:show-bottom-sheet
+                                         {:content buy-token/view}])}])
      [rn/view {:style style/content-container}
       (into [rn/view
              {:style style/data-items-container}]

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

@@ -73,10 +73,3 @@
   (-> db
       get-db-current-request-event
       get-request-params))
-
-(defn get-total-connected-dapps
-  [db]
-  (-> db
-      :wallet-connect/sessions
-      count
-      inc))

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

@@ -25,17 +25,3 @@
   (testing "returns nil if no redirect URL is found"
     (let [session {:peer {:metadata {}}}]
       (is (nil? (sut/get-dapp-redirect-url session))))))
-
-(deftest get-total-connected-dapps-test
-  (testing "returns the total number of connected dApps plus 1"
-    (let [db {:wallet-connect/sessions [{:url "https://dapp1.com"}
-                                        {:url "https://dapp2.com"}]}]
-      (is (= 3 (sut/get-total-connected-dapps db)))))
-
-  (testing "returns 1 when there are no connected dApps"
-    (let [db {:wallet-connect/sessions []}]
-      (is (= 1 (sut/get-total-connected-dapps db)))))
-
-  (testing "handles nil sessions correctly"
-    (let [db {:wallet-connect/sessions nil}]
-      (is (= 1 (sut/get-total-connected-dapps db))))))

src/status_im/db.cljs

@@ -2,7 +2,6 @@
   (:require
     [legacy.status-im.fleet.core :as fleet]
     [react-native.core :as rn]
-    [status-im.common.controlled-input.utils :as controlled-input]
     [status-im.contexts.shell.activity-center.events :as activity-center]
     [status-im.contexts.wallet.db :as wallet]))
 
@@ -44,10 +43,4 @@
    :stickers/packs-pending             #{}
    :settings/change-password           {}
    :keycard                            {}
-   :theme                              :light
-   :layers                             {:ui
-                                        {:send
-                                         {:input-amount-screen
-                                          {:controller
-                                           {:crypto-currency?  true
-                                            :token-input-value ""}}}}}})
+   :theme                              :light})

src/status_im/navigation/screens.cljs

@@ -5,7 +5,6 @@
     [status-im.common.emoji-picker.view :as emoji-picker]
     [status-im.common.enter-seed-phrase.view :as enter-seed-phrase]
     [status-im.common.lightbox.view :as lightbox]
-    [status-im.common.pdf-viewer.view :as pdf-viewer]
     [status-im.config :as config]
     [status-im.contexts.chat.group-create.view :as group-create]
     [status-im.contexts.chat.group-details.view :as group-details]
@@ -27,7 +26,6 @@
     [status-im.contexts.communities.actions.share-community.view :as share-community]
     [status-im.contexts.communities.discover.view :as communities.discover]
     [status-im.contexts.communities.overview.view :as communities.overview]
-    [status-im.contexts.keycard.authorise.view :as keycard.authorise]
     [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]
@@ -48,7 +46,6 @@
     [status-im.contexts.preview.quo.component-preview.view :as component-preview]
     [status-im.contexts.preview.quo.main :as quo.preview]
     [status-im.contexts.preview.status-im.main :as status-im-preview]
-    [status-im.contexts.profile.backup-recovery-phrase.view :as backup-recovery-phrase]
     [status-im.contexts.profile.contact.share.view :as share-contact]
     [status-im.contexts.profile.contact.view :as contact-profile]
     [status-im.contexts.profile.edit.accent-colour.view :as edit-accent-colour]
@@ -109,6 +106,8 @@
      wallet-import-private-key]
     [status-im.contexts.wallet.add-account.create-account.key-pair-name.view :as
      wallet-key-pair-name]
+    [status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.view :as
+     wallet-backup-recovery-phrase]
     [status-im.contexts.wallet.add-account.create-account.new-keypair.confirm-backup.view :as
      wallet-confirm-backup]
     [status-im.contexts.wallet.add-account.create-account.select-keypair.view :as wallet-select-keypair]
@@ -476,9 +475,9 @@
      :options   {:insets {:top? true}}
      :component wallet-create-account/view}
 
-    {:name      :screen/backup-recovery-phrase
+    {:name      :screen/wallet.backup-recovery-phrase
      :options   {:insets {:top? true :bottom? true}}
-     :component backup-recovery-phrase/view}
+     :component wallet-backup-recovery-phrase/view}
 
     {:name      :screen/wallet.confirm-backup
      :options   {:insets {:top? true :bottom? true}}
@@ -488,7 +487,7 @@
      :options   {:insets {:top? true}}
      :component wallet-key-pair-name/view}
 
-    {:name      :screen/use-recovery-phrase
+    {:name      :screen/wallet.enter-seed-phrase
      :component enter-seed-phrase/view}
 
     {:name      :screen/wallet.share-address
@@ -683,11 +682,6 @@
                                       :popStackOnPress     false})
      :component change-password-loading/view}
 
-    {:name      :screen/pdf-viewer
-     :options   {:insets                 {:top? true}
-                 :modalPresentationStyle :overCurrentContext}
-     :component pdf-viewer/view}
-
     ;; Keycard
     {:name      :screen/keycard.check
      :options   options/keycard-modal-screen-options
@@ -703,11 +697,7 @@
 
     {:name      :screen/keycard.not-keycard
      :options   options/keycard-modal-screen-options
-     :component keycard.not-keycard/view}
-
-    {:name      :screen/keycard.authorise
-     :options   options/keycard-modal-screen-options
-     :component keycard.authorise/view}]
+     :component keycard.not-keycard/view}]
 
    [{:name    :shell
      :options {:theme :dark}}]

src/status_im/subs/profile.cljs

@@ -345,12 +345,6 @@
  (fn [{:keys [processing]}]
    processing))
 
-(re-frame/reg-sub
- :profile/recovery-phrase-backed-up?
- :<- [:profile/profile]
- (fn [profile]
-   (not (boolean (seq (:mnemonic profile))))))
-
 ;; LINK PREVIEW
 ;; ========================================================================================================
 

src/status_im/subs/root.cljs

@@ -196,5 +196,3 @@
 
 ;;keycard
 (reg-root-key-sub :keycard :keycard)
-
-(reg-root-key-sub :layers :layers)

src/status_im/subs/wallet/networks.cljs

@@ -75,13 +75,15 @@
       {}
       network-values))))
 
-(re-frame/reg-sub :wallet/total-amount-in-to-chains
+(re-frame/reg-sub
+ :wallet/total-amount
  :<- [:wallet/wallet-send]
- (fn [{:keys [to-values-by-chain]}]
-   (reduce
-    (fn [acc amount]
-      (if (money/bignumber? amount)
-        (money/add acc amount)
-        acc))
-    (money/bignumber 0)
-    (vals to-values-by-chain))))
+ (fn [{:keys [from-values-by-chain to-values-by-chain]} [_ to-values?]]
+   (let [network-values (if to-values? to-values-by-chain from-values-by-chain)]
+     (reduce
+      (fn [acc amount]
+        (if (money/bignumber? amount)
+          (money/add acc amount)
+          acc))
+      (money/bignumber 0)
+      (vals network-values)))))

src/status_im/subs/wallet/swap.cljs

@@ -143,62 +143,30 @@
  :<- [:wallet/swap-asset-to-receive]
  (fn [[amount-out asset-to-receive]]
    (let [receive-token-decimals (:decimals asset-to-receive)
-         amount-out-whole       (when amount-out
+         receive-amount         (when amount-out
                                   (number/hex->whole amount-out receive-token-decimals))
-         amount-out-num         (when amount-out-whole
-                                  (number/to-fixed amount-out-whole
-                                                   receive-token-decimals))
-         display-decimals       (min receive-token-decimals
-                                     constants/min-token-decimals-to-display)
-         receive-amount         (when amount-out-num
-                                  (utils/sanitized-token-amount-to-display amount-out-num
-                                                                           display-decimals))]
+         receive-amount         (when amount-out
+                                  (number/remove-trailing-zeroes
+                                   (.toFixed receive-amount
+                                             (min receive-token-decimals
+                                                  constants/min-token-decimals-to-display))))]
      (or receive-amount 0))))
 
-(rf/reg-sub
- :wallet/swap-receive-amount-raw
- :<- [:wallet/swap-proposal-amount-out]
- :<- [:wallet/swap-asset-to-receive]
- (fn [[amount-out asset-to-receive]]
-   (let [receive-token-decimals (:decimals asset-to-receive)
-         amount-out-whole       (when amount-out
-                                  (number/hex->whole amount-out receive-token-decimals))
-         amount-out-num         (when amount-out-whole
-                                  (number/to-fixed amount-out-whole
-                                                   receive-token-decimals))]
-     (or amount-out-num 0))))
-
 (rf/reg-sub
  :wallet/swap-pay-amount
  :<- [:wallet/swap-proposal-amount-in]
  :<- [:wallet/swap-asset-to-pay]
  (fn [[amount-in asset-to-pay]]
    (let [pay-token-decimals (:decimals asset-to-pay)
-         amount-in-whole    (when amount-in
+         pay-amount         (when amount-in
                               (number/hex->whole amount-in pay-token-decimals))
-         amount-in-num      (when amount-in-whole
-                              (number/to-fixed amount-in-whole
-                                               pay-token-decimals))
-         display-decimals   (min pay-token-decimals
-                                 constants/min-token-decimals-to-display)
-         pay-amount         (when amount-in-num
-                              (utils/sanitized-token-amount-to-display amount-in-num
-                                                                       display-decimals))]
+         pay-amount         (when amount-in
+                              (number/remove-trailing-zeroes
+                               (.toFixed pay-amount
+                                         (min pay-token-decimals
+                                              constants/min-token-decimals-to-display))))]
      (or pay-amount 0))))
 
-(rf/reg-sub
- :wallet/swap-pay-amount-raw
- :<- [:wallet/swap-proposal-amount-in]
- :<- [:wallet/swap-asset-to-pay]
- (fn [[amount-in asset-to-pay]]
-   (let [pay-token-decimals (:decimals asset-to-pay)
-         amount-in-whole    (when amount-in
-                              (number/hex->whole amount-in pay-token-decimals))
-         amount-in-num      (when amount-in-whole
-                              (number/to-fixed amount-in-whole
-                                               pay-token-decimals))]
-     (or amount-in-num 0))))
-
 (rf/reg-sub
  :wallet/swap-proposal-provider
  :<- [:wallet/swap-proposal]

src/status_im/subs/wallet/wallet.cljs

@@ -126,23 +126,18 @@
  :<- [:wallet/wallet-send]
  :-> :route)
 
-(rf/reg-sub
- :wallet/wallet-send-enough-assets?
- :<- [:wallet/wallet-send]
- :-> :enough-assets?)
-
 (rf/reg-sub
  :wallet/wallet-send-token
  :<- [:wallet/wallet-send]
  :<- [:wallet/network-details]
  :<- [:wallet/wallet-send-disabled-from-chain-ids]
  (fn [[wallet-send networks disabled-from-chain-ids]]
-   (let [token                    (:token wallet-send)
-         disabled-from-chain-ids? (set disabled-from-chain-ids)
-         enabled-from-chain-ids   (->> networks
-                                       (map :chain-id)
-                                       (remove disabled-from-chain-ids?)
-                                       set)]
+   (let [token                  (:token wallet-send)
+         enabled-from-chain-ids (->> networks
+                                     (filter #(not (contains? (set disabled-from-chain-ids)
+                                                              (:chain-id %))))
+                                     (map :chain-id)
+                                     set)]
      (some-> token
              (assoc :networks          (network-utils/network-list token networks)
                     :available-balance (utils/calculate-total-token-balance token)

src/utils/address.cljs

@@ -10,7 +10,6 @@
 (def regx-eip-3770-address #"^(?:(?:eth:|arb1:|oeth:)(?=:|))*0x[0-9a-fA-F]{40}$")
 (def regx-metamask-address #"^ethereum:(0x[0-9a-fA-F]{40})(?:@(0x1|0xa|0xa4b1))?$")
 (def regx-address-contains #"(?i)0x[a-fA-F0-9]{40}")
-(def zero-address "0x0000000000000000000000000000000000000000")
 
 (defn normalized-hex
   [hex]
@@ -138,6 +137,3 @@
     (metamask-address? address)
     (metamask-address->eth-address address)))
 
-(defn zero-address?
-  [address]
-  (= address zero-address))

src/utils/money.cljs

@@ -47,10 +47,11 @@
   (if (bignumber? n) n (bignumber n)))
 
 (defn ->bignumbers
-  [& numbers]
-  (let [transformed-numbers (map ->bignumber numbers)]
-    (when (every? bignumber? transformed-numbers)
-      transformed-numbers)))
+  [n1 n2]
+  (when-let [bn1 (->bignumber n1)]
+    (when-let [bn2 (->bignumber n2)]
+      (when (and (bignumber? bn1) (bignumber? bn2))
+        [bn1 bn2]))))
 
 (defn greater-than-or-equals
   [^js n1 ^js n2]

src/utils/number.cljs

@@ -86,12 +86,10 @@
 (defn small-number-threshold
   "Receives a decimal count and returns a string like '<0.001' if the decimal count is 3,
    '<0.000001' if the decimal count is 6, etc."
-  ([decimal-count]
-   (small-number-threshold decimal-count ""))
-  ([decimal-count currency-symbol]
-   (if (> decimal-count 0)
-     (str "<" currency-symbol "0." (apply str (repeat (dec decimal-count) "0")) "1")
-     (str currency-symbol "0"))))
+  [decimal-count]
+  (if (> decimal-count 0)
+    (str "<0." (apply str (repeat (dec decimal-count) "0")) "1")
+    "0"))
 
 (defn valid-decimal-count?
   "Returns false if the number has more decimals than the decimal count, otherwise true."

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v3.3.0",
-    "commit-sha1": "43659f0c7e1a64102e7f8e38bd532b72714c5819",
-    "src-sha256": "01fpviw1g22f4ni3li2wnhyz0l517jfipvnyfysckds6yi94l0hf"
+    "version": "router-improvements",
+    "commit-sha1": "a5e7465e27c7043b4e3e755d786355b2c47557d8",
+    "src-sha256": "0msir6b4gr9kf15krxn9ys3ssx3h2mza4ccw5a62rmlqd4rdh2ya"
 }

test/appium/tests/critical/test_wallet.py

@@ -4,6 +4,7 @@ import time
 import pytest
 from _pytest.outcomes import Failed
 from selenium.common import TimeoutException, NoSuchElementException
+
 from base_test_case import MultipleSharedDeviceTestCase, create_shared_drivers
 from support.api.network_api import NetworkApi
 from tests import marks, run_in_parallel
@@ -191,7 +192,6 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
 
 @pytest.mark.xdist_group(name="new_one_2")
 @marks.nightly
-@marks.secured
 @marks.smoke
 class TestWalletOneDevice(MultipleSharedDeviceTestCase):
 
@@ -199,55 +199,10 @@ class TestWalletOneDevice(MultipleSharedDeviceTestCase):
         self.network_api = NetworkApi()
         self.drivers, self.loop = create_shared_drivers(1)
         self.sign_in_view = SignInView(self.drivers[0])
-        self.sender, self.receiver = transaction_senders['ETH_1'], transaction_senders['ETH_2']
-        self.total_balance = {'Ether': 0.0052, 'USDCoin': 5.0, 'Status': 10.0, 'Uniswap': 0.627, 'Dai Stablecoin': 0.0}
-        self.mainnet_balance = {'Ether': 0.005, 'USDCoin': 0.0, 'Status': 10.0, 'Uniswap': 0.127, 'Dai Stablecoin': 0.0}
-        self.optimizm_balance = {'Ether': 0.0001, 'USDCoin': 5.0, 'Status': 0, 'Uniswap': 0, 'Dai Stablecoin': 0.0}
-        self.arb_balance = {'Ether': 0.0001, 'USDCoin': 0.0, 'Status': 0.0, 'Uniswap': 0.5, 'Dai Stablecoin': 0.0}
-        self.sender['wallet_address'] = '0x' + self.sender['address']
-        self.receiver['wallet_address'] = '0x' + self.receiver['address']
-        self.sender_username, self.receiver_username = 'sender', 'receiver'
-        self.sign_in_view.recover_access(passphrase=self.sender['passphrase'], username=self.sender_username)
-
+        self.sign_in_view.create_user()
         self.home_view = self.sign_in_view.get_home_view()
         self.wallet_view = self.home_view.wallet_tab.click()
 
-    @marks.testrail_id(740490)
-    def test_wallet_balance_mainnet(self):
-        self.profile_view = self.home_view.profile_button.click()
-        self.profile_view.switch_network()
-        self.sign_in_view.sign_in()
-        self.sign_in_view.wallet_tab.click()
-
-        self.wallet_view.just_fyi("Checking total balance")
-        real_balance = {}
-        for asset in self.total_balance:
-            real_balance[asset] = self.wallet_view.get_asset(asset).get_amount()
-
-        for asset in self.total_balance:
-            if real_balance[asset] != self.total_balance[asset]:
-                self.errors.append("For the %s the wrong value %s is shown, expected %s in total" %
-                                   (asset, real_balance[asset], self.total_balance[asset]))
-        expected_balances = {
-            'Mainnet': self.mainnet_balance,
-            'Arbitrum': self.arb_balance,
-            'Optimism': self.optimizm_balance
-        }
-
-        for network in expected_balances:
-            self.wallet_view.just_fyi("Checking total balance on %s network" % network)
-            self.wallet_view.select_network(network)
-            real_balance = {}
-            for asset in expected_balances[network]:
-                real_balance[asset] = self.wallet_view.get_asset(asset).get_amount()
-            for asset in expected_balances[network]:
-                if real_balance[asset] != expected_balances[network][asset]:
-                    self.errors.append("For the %s the wrong value %s is shown, expected %s on %s" %
-                                       (asset, real_balance[asset], expected_balances[network][asset], network))
-            self.wallet_view.select_network(network)
-
-        self.errors.verify_no_errors()
-
     @marks.testrail_id(727231)
     def test_wallet_add_remove_regular_account(self):
         self.wallet_view.just_fyi("Adding new regular account")

test/appium/views/profile_view.py

@@ -305,7 +305,6 @@ class ProfileView(BaseView):
                                           suffix="/following-sibling::*[1]/android.widget.EditText")
         self.specify_network_id_input = EditBox(self.driver, translation_id="specify-network-id")
         self.connect_button = Button(self.driver, accessibility_id="network-connect-button")
-
         ## Toggles
         self.transaction_management_enabled_toggle = Button(self.driver,
                                                             accessibility_id="transactions-management-enabled")
@@ -361,7 +360,6 @@ class ProfileView(BaseView):
         self.confirm_testnet_mode_change_button = Button(self.driver, accessibility_id="confirm-testnet-mode-change")
 
     def switch_network(self):
-        self.driver.info("Toggling test mode")
         self.profile_wallet_button.click()
         self.network_settings_button.click()
         self.testnet_mode_toggle.click()

test/appium/views/wallet_view.py

@@ -19,7 +19,7 @@ class AssetElement(Button):
 
     def get_amount(self):
         element = Text(self.driver, xpath=self.locator + "/../android.widget.TextView[3]")
-        element.scroll_to_element()
+        element.scroll_to_element(down_start_y=0.89, down_end_y=0.8)
         try:
             amount = element.text.split()[0]
             if '<' in amount:

translations/en.json

@@ -51,11 +51,9 @@
   "add-address-to-watch": "Add address to watch",
   "add-address-to-watch-description": "Watch a public address or ENS name",
   "add-an-account": "Add an account",
-  "add-assets": "Add assets",
   "add-bootnode": "Add bootnode",
   "add-contact": "Add contact",
   "add-custom-token": "Add custom token",
-  "add-eth": "Add ETH",
   "add-favourite": "Add favourite",
   "add-mailserver": "Add Status node",
   "add-me-to-your-contacts": "Please add me to your contacts",
@@ -139,12 +137,12 @@
   "apply": "Apply",
   "apply-changes": "Apply changes",
   "approve": "Approve",
-  "approve-amount-symbol": "Approve {{token-amount}} {{token-symbol}}",
+  "approve-amount-symbol": "Approve {{amount}} {{symbol}}",
   "approve-limit": "Approve limit",
   "approve-token": "Approve token",
   "approve-token-contract-desc": "Approving a token with a contract allows it to spend your token balance. If you feel that a project is untrustworthy, don’t approve the token with them, or approve only the amount you will use with them.",
-  "approved-amount-symbol": "Approved {{token-amount}} {{token-symbol}}",
-  "approving-amount-symbol": "Approving {{token-amount}} {{token-symbol}}...",
+  "approved-amount-symbol": "Approved {{amount}} {{symbol}}",
+  "approving-amount-symbol": "Approving {{amount}} {{symbol}}...",
   "apr": "Apr",
   "arbiscan": "Arbiscan",
   "arbitrum": "Arbitrum",
@@ -165,7 +163,6 @@
   "audio-recorder-max-ms-reached": "Maximum recording time reached",
   "audio-recorder-permissions-error": "You have to give permission to send audio messages",
   "aug": "Aug",
-  "authorise-with-password": "Authorise with password",
   "authorize": "Authorize",
   "available": "Available",
   "available-participants": {
@@ -269,11 +266,13 @@
   "bug-report-too-short-description": "Description is too short",
   "build-yourself": "To use the app without these Terms of Use, you can build your own version",
   "buy": "Buy",
+  "buy-assets": "Buy assets",
   "buy-crypto": "Buy crypto",
   "buy-crypto-choose-a-service": "Choose a service you'd like to use to buy crypto",
   "buy-crypto-description": "Find a dapp to buy crypto now",
   "buy-crypto-leaving": "You are leaving Status and entering a third party website to complete your purchase",
   "buy-crypto-title": "Looks like your wallet is empty",
+  "buy-eth": "Buy ETH",
   "buy-ethereum": "Buy Ethereum",
   "buy-keycard": "Buy Keycard",
   "by-continuing-you-accept": "By continuing you accept our ",
@@ -540,7 +539,6 @@
   "create-channel-title": "New channel",
   "create-community": "Create a community",
   "create-group-chat": "Create group chat",
-  "create-keycard-pin": "Create Keycard PIN",
   "create-multiaccount": "Generate keys",
   "create-new-key": "Get new keys",
   "create-new-profile": "Create new profile",
@@ -1570,7 +1568,6 @@
   "messages-from-contacts-only-subtitle": "Only people you added as contacts can start a new chat with you or invite you to a group",
   "messages-gap-warning": "Some messages might be missing",
   "might-break": "Might break some ÐApps",
-  "migrate-key-pair-authorise": "To migrate profile key pair to Keycard you need to authorise with profile password.",
   "migrate-key-pair-keycard": "Migrate profile key pair to Keycard",
   "migrate-key-pair-keycard-default-key": "{{name}} is your default Status key pair. Migrating this key pair to Keycard will require you to use your Keycard to login to Status and to transact with the key pair’s derived accounts on all synced devices.\n\nKey pair will be removed from device and stored on Keycard.",
   "migrate-key-pair-keycard-info": "Re-encrypting your data with your new Keycard login method may take some time, during which you won’t be able to use the app.",
@@ -1932,7 +1929,6 @@
   "pin-code": "6-digit passcode",
   "pin-limit-reached": "Pin limit reached. Unpin a previous message first.",
   "pin-mismatch": "Wrong passcode",
-  "pin-not-match": "PIN do not match",
   "pin-one-attempt": " one attempt ",
   "pin-one-attempt-blocked-after": "before your Keycard gets blocked",
   "pin-one-attempt-blocked-before": "Be careful, you have only",
@@ -2096,7 +2092,6 @@
   "removed-from-contacts": "Removed from contacts",
   "rename": "Rename",
   "rename-key-pair": "Rename key pair",
-  "repeat-keycard-pin": "Repeat Keycard PIN",
   "repeat-pin": "Repeat new 6-digit passcode",
   "repeat-puk": "Repeat new 12-digit PUK",
   "replied": "Replied",
@@ -2345,7 +2340,6 @@
   "signing-phrase": "Signing phrase",
   "simple": "Simple",
   "skip": "Skip",
-  "slide-to-authorise": "Slide to authorise",
   "slide-to-bridge": "Slide to bridge",
   "slide-to-create-account": "Slide to create account",
   "slide-to-import": "Slide to import",
@@ -2376,8 +2370,8 @@
   "specify-symbol": "Specify a symbol",
   "spender-contract": "Spender contract",
   "spending-cap": "Spending cap",
-  "spending-cap-failed": "Spending cap failed: {{token-amount}} {{token-symbol}} for {{provider-name}} in {{account-name}}",
-  "spending-cap-set": "Spending cap set: {{token-amount}} {{token-symbol}} for {{provider-name}} in {{account-name}}",
+  "spending-cap-failed": "Spending cap failed: {{amount}} {{token-symbol}} for {{provider-name}} in {{account-name}}",
+  "spending-cap-set": "Spending cap set: {{amount}} {{token-symbol}} for {{provider-name}} in {{account-name}}",
   "start-chat": "Start chat",
   "start-conversation": "Start conversation",
   "start-group-chat": "Start group chat",
@@ -2777,7 +2771,6 @@
   "watch-only": "Watch-only",
   "watched-account-removed": "Watched address has been removed",
   "watched-address": "Watched address",
-  "ways-to-buy-assets": "Ways to buy assets",
   "wc-brand-guide": "Guidance on using branding such as trademarks and logos",
   "wc-disclaimer": "Disclaimers (including third party providers), warranties, and legal releases",
   "wc-dispute": "Dispute resolution provisions",

yarn.lock

@@ -3391,11 +3391,6 @@
     metro-config "^0.80.3"
     metro-runtime "^0.80.3"
 
-"@react-native/normalize-color@*":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@react-native/normalize-color/-/normalize-color-2.1.0.tgz#939b87a9849e81687d3640c5efa2a486ac266f91"
-  integrity sha512-Z1jQI2NpdFJCVgpY+8Dq/Bt3d+YUi1928Q+/CZm/oh66fzM0RUl54vvuXlPJKybH4pdCZey1eDTPaLHkMPNgWA==
-
 "@react-native/normalize-colors@0.73.2", "@react-native/normalize-colors@^0.73.0":
   version "0.73.2"
   resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.73.2.tgz#cc8e48fbae2bbfff53e12f209369e8d2e4cf34ec"
@@ -5339,11 +5334,6 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-js@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
-  integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
-
 crypto-random-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
@@ -5510,15 +5500,6 @@ depd@2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-deprecated-react-native-prop-types@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/deprecated-react-native-prop-types/-/deprecated-react-native-prop-types-2.3.0.tgz#c10c6ee75ff2b6de94bb127f142b814e6e08d9ab"
-  integrity sha512-pWD0voFtNYxrVqvBMYf5gq3NA2GCpfodS1yNynTPc93AYA/KEMGeWDqqeUB6R2Z9ZofVhks2aeJXiuQqKNpesA==
-  dependencies:
-    "@react-native/normalize-color" "*"
-    invariant "*"
-    prop-types "*"
-
 deprecated-react-native-prop-types@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/deprecated-react-native-prop-types/-/deprecated-react-native-prop-types-5.0.0.tgz#02a12f090da7bd9e8c3ac53c31cf786a1315d302"
@@ -6680,7 +6661,7 @@ ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-invariant@*, invariant@2.2.4, invariant@^2.2.2, invariant@^2.2.4, invariant@^2.2.x:
+invariant@2.2.4, invariant@^2.2.2, invariant@^2.2.4, invariant@^2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -9183,15 +9164,6 @@ prompts@^2.4.2:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@*, prop-types@^15.8.1:
-  version "15.8.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.13.1"
-
 prop-types@15.x.x, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -9201,6 +9173,15 @@ prop-types@15.x.x, prop-types@^15.7.2:
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
+prop-types@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.13.1"
+
 property-information@^5.0.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69"
@@ -9513,14 +9494,6 @@ react-native-orientation-locker@^1.5.0:
   resolved "https://registry.yarnpkg.com/react-native-orientation-locker/-/react-native-orientation-locker-1.5.0.tgz#324853937eed4835ecd1c8613ab2206135d908ac"
   integrity sha512-4XOCGmNN4BXg5JUFjUuXpsfhPJmbA3LkQilJO1ed+6vL97teTdG2w5IEevKiqL9/hPjeWE8YYtX/YW+yp53hkg==
 
-react-native-pdf@^6.7.5:
-  version "6.7.5"
-  resolved "https://registry.yarnpkg.com/react-native-pdf/-/react-native-pdf-6.7.5.tgz#1bc5479f2161189f938912b4080ea9eef8a9d84d"
-  integrity sha512-d1S76p2Vwax2iG+kTnjINiUMvpjtJJvtMiYwHRbgGczT8GJjtXH49YCWOd+HfnUAU29cB+knzsKGYoZBMQM8Ow==
-  dependencies:
-    crypto-js "4.2.0"
-    deprecated-react-native-prop-types "^2.3.0"
-
 react-native-permissions@4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/react-native-permissions/-/react-native-permissions-4.1.5.tgz#db4d1ddbf076570043f4fd4168f54bb6020aec92"