Return data from cache if present

When we can't update the balance but we have an original balance, the backend should return the last available data. To test: 1) Login, make sure balances are present 2) Logout, go offline 3) Login again It should show the latest available balance instead of 0s https://github.com/status-im/status-go/compare/a93c8572...c5991352
wallet(account): disable send and bridge options for assets with a 0 balance (#21033 )
2024-08-13 10:05:52 +01:00 · 2024-08-12 17:26:40 +01:00 · 2024-08-09 21:39:07 +03:30 · 2024-08-09 16:42:49 +02:00 · 2024-08-09 17:20:43 +08:00 · 2024-08-09 00:20:50 +03:00
117 changed files with 1690 additions and 1868 deletions
@@ -35,3 +35,4 @@ FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=0
 ENABLE_ALERT_BANNER=0
+FLAG_WALLET_CONNECT_ENABLED=1
@@ -38,3 +38,5 @@ SHOW_NOT_IMPLEMENTED_FEATURES=1
 DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT=10000
 DELETE_MESSAGE_UNDO_TIME_LIMIT=10000
 ENABLE_ALERT_BANNER=0
+FLAG_WALLET_CONNECT_ENABLED=1
+MOBILE_DATA_SYNCING_TOGGLE_ENABLE=0
@@ -36,3 +36,4 @@ LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 ENABLE_ALERT_BANNER=1
+FLAG_WALLET_CONNECT_ENABLED=1
@@ -23,3 +23,4 @@ DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
 ENABLE_ALERT_BANNER=1
+FLAG_WALLET_CONNECT_ENABLED=1
@@ -19,3 +19,4 @@ MAX_IMAGES_BATCH=1
 DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
+FLAG_WALLET_CONNECT_ENABLED=1
@@ -436,10 +436,11 @@ android-clean: ##@prepare Clean Gradle state
 	rm -rf ~/.gradle


-android-ports: export FLOWSTORM_PORT := 7722
+android-ports: export FLOWSTORM_PORT ?= 7722
 android-ports: export TARGET := android-sdk
+android-ports: export RCT_METRO_PORT ?= 8081
 android-ports: ##@other Add proxies to Android Device/Simulator
-	adb reverse tcp:8081 tcp:8081 && \
+	adb reverse tcp:$(RCT_METRO_PORT) tcp:$(RCT_METRO_PORT) && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
 	adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.3'
+library 'status-jenkins-lib@v1.9.4'

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

 import groovy.json.JsonBuilder

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

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

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

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

 pipeline {

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

 pipeline {

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

 pipeline {

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

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

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

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

 pipeline {
  agent {
@@ -62,6 +62,11 @@ public class EncryptionUtils extends ReactContextBaseJavaModule {
        return Statusgo.encodeTransfer(to, value);
    }

+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String encodeFunctionCall(final String method, final String paramsJSON) {
+        return Statusgo.encodeFunctionCall(method, paramsJSON);
+    }
+
    @ReactMethod(isBlockingSynchronousMethod = true)
    public String decodeParameters(final String decodeParamJSON) {
        return Statusgo.decodeParameters(decodeParamJSON);
@@ -45,7 +45,6 @@ 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.2.0
 androidx.core:core:1.6.0
 androidx.core:core:1.9.0
 androidx.cursoradapter:cursoradapter:1.0.0
@@ -68,7 +67,6 @@ androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
 androidx.emoji2:emoji2-views-helper:1.2.0
 androidx.emoji2:emoji2:1.2.0
-androidx.exifinterface:exifinterface:1.0.0
 androidx.exifinterface:exifinterface:1.1.0-beta01
 androidx.exifinterface:exifinterface:1.1.0-rc01
 androidx.exifinterface:exifinterface:1.2.0
@@ -518,15 +516,7 @@ com.googlecode.javaewah:JavaEWAH:1.1.12
 com.googlecode.javaewah:JavaEWAH:1.1.13
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
-com.google.android.datatransport:transport-api:2.2.1
-com.google.android.datatransport:transport-backend-cct:2.3.3
-com.google.android.datatransport:transport-runtime:2.2.6
-com.google.android.gms:play-services-basement:18.0.0
-com.google.android.gms:play-services-base:18.0.1
-com.google.android.gms:play-services-mlkit-barcode-scanning:18.0.0
-com.google.android.gms:play-services-tasks:18.0.1
 com.google.android.material:material:1.2.0-alpha03
-com.google.android.odml:image:1.0.0-beta1
 com.google.android:annotations:4.1.1.4
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-common-protos:2.0.1
@@ -553,10 +543,6 @@ com.google.errorprone:error_prone_annotations:2.3.4
 com.google.errorprone:error_prone_annotations:2.4.0
 com.google.errorprone:error_prone_annotations:2.9.0
 com.google.errorprone:error_prone_annotations:2.11.0
-com.google.firebase:firebase-annotations:16.0.0
-com.google.firebase:firebase-components:16.1.0
-com.google.firebase:firebase-encoders-json:17.1.0
-com.google.firebase:firebase-encoders:16.1.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:17.0
@@ -572,11 +558,6 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jimfs:jimfs:1.1
-com.google.mlkit:barcode-scanning-common:17.0.0
-com.google.mlkit:barcode-scanning:17.0.2
-com.google.mlkit:common:18.0.0
-com.google.mlkit:vision-common:17.0.0
-com.google.mlkit:vision-interfaces:16.0.0
 com.google.prefab:cli:2.0.0
 com.google.protobuf:protobuf-java-util:3.4.0
 com.google.protobuf:protobuf-java-util:3.10.0
@@ -591,6 +572,7 @@ com.google.testing.platform:core-proto:0.0.8-alpha04
 com.google.testing.platform:core-proto:0.0.8-alpha07
 com.google.testing.platform:core-proto:0.0.8-alpha08
 com.google.test.platform:core-proto:0.0.2-dev
+com.google.zxing:core:3.4.1
 com.ibm.icu:icu4j:53.1
 com.intellij:annotations:12.0
 com.parse.bolts:bolts-tasks:1.4.0
@@ -87,7 +87,6 @@ https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0
 https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/emoji2/emoji2-views-helper/1.2.0/emoji2-views-helper-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/emoji2/emoji2/1.2.0/emoji2-1.2.0.pom
-https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.0.0/exifinterface-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-beta01/exifinterface-1.1.0-beta01.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-rc01/exifinterface-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.2.0/exifinterface-1.2.0.pom
@@ -481,26 +480,8 @@ https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.0.4/zipflinger-
 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/8.1.1/zipflinger-8.1.1.pom
-https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.1/transport-api-2.2.1.pom
-https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-backend-cct/2.3.3/transport-backend-cct-2.3.3.pom
-https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.5/transport-runtime-2.2.5.pom
-https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.6/transport-runtime-2.2.6.pom
-https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/18.0.0/play-services-basement-18.0.0.pom
-https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/18.0.1/play-services-base-18.0.1.pom
-https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-mlkit-barcode-scanning/18.0.0/play-services-mlkit-barcode-scanning-18.0.0.pom
-https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/18.0.1/play-services-tasks-18.0.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
-https://dl.google.com/dl/android/maven2/com/google/android/odml/image/1.0.0-beta1/image-1.0.0-beta1.pom
-https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-annotations/16.0.0/firebase-annotations-16.0.0.pom
-https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/16.1.0/firebase-components-16.1.0.pom
-https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders-json/17.1.0/firebase-encoders-json-17.1.0.pom
-https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders/16.1.0/firebase-encoders-16.1.0.pom
-https://dl.google.com/dl/android/maven2/com/google/mlkit/barcode-scanning-common/17.0.0/barcode-scanning-common-17.0.0.pom
-https://dl.google.com/dl/android/maven2/com/google/mlkit/barcode-scanning/17.0.2/barcode-scanning-17.0.2.pom
-https://dl.google.com/dl/android/maven2/com/google/mlkit/common/18.0.0/common-18.0.0.pom
-https://dl.google.com/dl/android/maven2/com/google/mlkit/vision-common/17.0.0/vision-common-17.0.0.pom
-https://dl.google.com/dl/android/maven2/com/google/mlkit/vision-interfaces/16.0.0/vision-interfaces-16.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/prefab/cli/2.0.0/cli-2.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha04/core-proto-0.0.8-alpha04.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha07/core-proto-0.0.8-alpha07.pom
@@ -523,12 +504,12 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-cod
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.pom
 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.0/commons-codec-1.17.0.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.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.2/commons-logging-1.3.2.pom
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.3/commons-logging-1.3.3.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
@@ -628,22 +609,22 @@ 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.17.1/jackson-annotations-2.17.1.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.17.1/jackson-core-2.17.1.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.17.1/jackson-databind-2.17.1.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.17.1/jackson-base-2.17.1.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.17.1/jackson-bom-2.17.1.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.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.17.1/jackson-modules-base-2.17.1.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.17.1/jackson-module-jaxb-annotations-2.17.1.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/58/oss-parent-58.pom
@@ -712,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.28.0/error_prone_annotations-2.28.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.29.2/error_prone_annotations-2.29.2.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
@@ -725,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.28.0/error_prone_parent-2.28.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.29.2/error_prone_parent-2.29.2.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
@@ -770,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.27.0/protobuf-bom-4.27.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.28.0-RC1/protobuf-bom-4.28.0-RC1.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
@@ -787,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.27.0/protobuf-java-4.27.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.28.0-RC1/protobuf-java-4.28.0-RC1.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
@@ -798,9 +779,11 @@ 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.27.0/protobuf-parent-4.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.2/truth-parent-1.4.2.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.28.0-RC1/protobuf-parent-4.28.0-RC1.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
+https://repo.maven.apache.org/maven2/com/google/zxing/zxing-parent/3.4.1/zxing-parent-3.4.1.pom
 https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
 https://repo.maven.apache.org/maven2/com/intellij/annotations/12.0/annotations-12.0.pom
 https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0.pom
@@ -971,9 +954,11 @@ https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.15/byte
 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.15/byte-buddy-parent-1.14.15.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.17/byte-buddy-parent-1.14.17.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.15/byte-buddy-1.14.15.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.17/byte-buddy-1.14.17.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
@@ -1018,6 +1003,7 @@ 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/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.pom
@@ -1037,6 +1023,7 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/common
 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/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
@@ -1091,7 +1078,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.44.0/checker-qual-3.44.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.45.0/checker-qual-3.45.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
@@ -1101,21 +1088,21 @@ https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotation
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.17/animal-sniffer-annotations-1.17.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.18/animal-sniffer-annotations-1.18.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.19/animal-sniffer-annotations-1.19.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.23/animal-sniffer-annotations-1.23.pom
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.24/animal-sniffer-annotations-1.24.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.14/animal-sniffer-parent-1.14.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.17/animal-sniffer-parent-1.17.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.18/animal-sniffer-parent-1.18.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.19/animal-sniffer-parent-1.19.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.23/animal-sniffer-parent-1.23.pom
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.24/animal-sniffer-parent-1.24.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/34/mojo-parent-34.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/40/mojo-parent-40.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/50/mojo-parent-50.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/74/mojo-parent-74.pom
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/84/mojo-parent-84.pom
 https://repo.maven.apache.org/maven2/org/codehaus/woodstox/stax2-api/4.2.1/stax2-api-4.2.1.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
-https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.2.0/easymock-parent-5.2.0.pom
-https://repo.maven.apache.org/maven2/org/easymock/easymock/5.2.0/easymock-5.2.0.pom
+https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.3.0/easymock-parent-5.3.0.pom
+https://repo.maven.apache.org/maven2/org/easymock/easymock/5.3.0/easymock-5.3.0.pom
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.2/angus-activation-project-2.0.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.2/angus-activation-2.0.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.2/project-1.0.2.pom
@@ -1146,9 +1133,10 @@ https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.po
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.5/txw2-4.0.5.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
-https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.pom
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/3.0-rc1/hamcrest-core-3.0-rc1.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/3.0-rc1/hamcrest-3.0-rc1.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.12/org.jacoco.build-0.8.12.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
@@ -1248,7 +1236,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/
 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.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.0.0/kotlin-reflect-2.0.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.20-Beta2/kotlin-reflect-2.0.20-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
@@ -1353,7 +1341,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20-R
 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.9.0/kotlin-stdlib-1.9.0.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.0/kotlin-stdlib-2.0.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.20-Beta2/kotlin-stdlib-2.0.20-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
@@ -1372,6 +1360,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trov
 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.0-M2/junit-bom-5.11.0-M2.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
@@ -1383,8 +1372,10 @@ https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.12.0/mockito-cor
 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
+https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.4/objenesis-parent-3.4.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.3/objenesis-3.3.pom
+https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.4/objenesis-3.4.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0/asm-analysis-6.0.pom
@@ -17,6 +17,7 @@
  hermesEnabled ? lib.getEnvWithDefault "ORG_GRADLE_PROJECT_hermesEnabled" "true",
  buildUrl ? lib.getEnvWithDefault "ORG_GRADLE_PROJECT_buildUrl" null,
  statusGoSrcOverride ? lib.getEnvWithDefault "STATUS_GO_SRC_OVERRIDE" null,
+  reactMetroPort ? lib.getEnvWithDefault "RCT_METRO_PORT" 8081,
  # If APKs should be split based on architectures
  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "true",
  # Android architectures to build for
@@ -158,6 +159,7 @@ in stdenv.mkDerivation rec {
      --no-build-cache \
      --parallel \
      -Dmaven.repo.local='${deps.gradle}' \
+      -PreactNativeDevServerPort=${toString reactMetroPort} \
      assemble${gradleBuildType}
    '';
  in
@@ -41,7 +41,7 @@
    "react-native-background-timer": "^2.1.1",
    "react-native-biometrics": "^3.0.1",
    "react-native-blob-util": "^0.13.18",
-    "react-native-camera-kit": "14.0.0-beta13",
+    "react-native-camera-kit": "git+https://github.com/status-im/react-native-camera-kit.git#refs/tags/v14.0.0-beta15-status-v1",
    "react-native-config": "^1.5.0",
    "react-native-dialogs": "1.1.2",
    "react-native-draggable-flatlist": "4.0.1",
@@ -6,7 +6,7 @@ if pgrep -f 'shadow-cljs watch mobile' > /dev/null; then
    exit 1
 fi

-if pgrep -f 'react-native start' > /dev/null; then
+if pgrep -f "react-native start --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
    echo "Error: make run-metro is already running in another terminal" >&2
    echo "Please close that terminal before running this command." >&2
    exit 1
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash

-if pgrep -f 'react-native start' > /dev/null; then
+if pgrep -f "react-native start --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
    echo "Info: metro is already running in another terminal"
 else
    echo "Info: starting a new metro terminal"
-    react-native start --reset-cache
+    react-native start --port=${RCT_METRO_PORT:-8081} --reset-cache
 fi
@@ -4,7 +4,7 @@ set -euo pipefail
 TIMEOUT=10 # Metro should not take this long to start.

 while [ "${TIMEOUT}" -gt 0 ]; do
-  if ! lsof -i:8081 &> /dev/null; then
+  if ! lsof -i:"${RCT_METRO_PORT:-8081}" &> /dev/null; then
    echo "."
    sleep 1
    ((TIMEOUT--))
@@ -67,6 +67,8 @@
         :closure-defines
         {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
          status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
+          status-im.config/STATUS_BUILD_PROXY_USER        #shadow/env "STATUS_BUILD_PROXY_USER"
+          status-im.config/STATUS_BUILD_PROXY_PASSWORD    #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
          status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
          status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
          status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
@@ -103,6 +105,8 @@
   {:closure-defines
    {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
     status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
+     status-im.config/STATUS_BUILD_PROXY_USER        #shadow/env "STATUS_BUILD_PROXY_USER"
+     status-im.config/STATUS_BUILD_PROXY_PASSWORD    #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
     status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
     status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
     status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
@@ -98,16 +98,16 @@
        (update :categories <-categories-rpc)
        (assoc :role-permissions?
               (->> community
-                    :tokenPermissions
+                    :token-permissions
                    vals
                    (some role-permission?)))
        (assoc :membership-permissions?
               (->> community
-                    :tokenPermissions
+                    :token-permissions
                    vals
                    (some membership-permission?)))
        (assoc :token-images
               (reduce (fn [acc {sym :symbol image :image}]
                         (assoc acc sym image))
                       {}
-                       (:communityTokensMetadata community))))))
+                       (:tokens-metadata community))))))
@@ -11,9 +11,6 @@
    legacy.status-im.fleet.core
    legacy.status-im.group-chats.core
    legacy.status-im.log-level.core
-    legacy.status-im.mailserver.constants
-    [legacy.status-im.mailserver.core :as mailserver]
-    legacy.status-im.mobile-sync-settings.core
    legacy.status-im.multiaccounts.login.core
    legacy.status-im.multiaccounts.logout.core
    [legacy.status-im.multiaccounts.model :as multiaccounts.model]
@@ -105,8 +102,7 @@
  (let [current-theme-type (get-in cofx [:db :profile/profile :appearance])]
    (when (and (multiaccounts.model/logged-in? db)
               (= current-theme-type status-im.constants/theme-type-system))
-      {:profile.settings/switch-theme-fx
-       [(get-in db [:profile/profile :appearance]) (:view-id db)]})))
+      {:dispatch [:theme/switch]})))

 (defn- on-biometric-auth-fail
  [{:keys [code]}]
@@ -134,7 +130,6 @@
    (rf/merge cofx
              {:db                                   (dissoc db :app-in-background-since)
               :effects.biometric/get-supported-type nil}
-              (mailserver/process-next-messages-request)
              (when-not new-account?
                (universal-links/process-stored-event))
              #(when-let [chat-id (:current-chat-id db)]
@@ -1,437 +0,0 @@
-(ns ^{:doc "Mailserver events and API"} legacy.status-im.mailserver.core
-  (:require
-    [clojure.string :as string]
-    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
-    [legacy.status-im.node.core :as node]
-    [legacy.status-im.utils.mobile-sync :as mobile-network-utils]
-    [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
-    [status-im.navigation.events :as navigation]
-    [taoensso.timbre :as log]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
-
-;; How do mailserver work ?
-;;
-;; - We send a request to the mailserver, we are only interested in the
-;; messages since `last-request` up to the last seven days
-;; and the last 24 hours for topics that were just joined
-;; - The mailserver doesn't directly respond to the request and
-;; instead we start receiving messages in the filters for the requested
-;; topics.
-;; - If the mailserver was not ready when we tried for instance to request
-;; the history of a topic after joining a chat, the request will be done
-;; as soon as the mailserver becomes available
-
-
-(defn connected?
-  [db id]
-  (= (:mailserver/current-id db) id))
-
-(defn fetch
-  [db id]
-  (get-in db [:mailserver/mailservers (node/current-fleet-key db) id]))
-
-(defn fetch-current
-  [db]
-  (fetch db (:mailserver/current-id db)))
-
-(defn preferred-mailserver-id
-  [db]
-  (get-in db [:profile/profile :pinned-mailservers (node/current-fleet-key db)]))
-
-(defn connection-error-dismissed
-  [db]
-  (get-in db [:mailserver/connection-error-dismissed]))
-
-(defn mailserver-address->id
-  [db address]
-  (let [current-fleet (node/current-fleet-key db)]
-    (:id (some #(when (= address (:address %))
-                  %)
-               (-> db
-                   :mailserver/mailservers
-                   current-fleet
-                   vals)))))
-
-(rf/defn disconnect-from-mailserver
-  {:events [::disconnect-from-mailserver]}
-  [{:keys [db] :as cofx}]
-  {:db (-> db
-           (assoc :mailserver/state nil)
-           (dissoc :mailserver/current-request :mailserver/fetching-gaps-in-progress))})
-
-(defn fetch-use-mailservers?
-  [db]
-  (get-in db [:profile/profile :use-mailservers?]))
-
-(defonce showing-connection-error-popup? (atom false))
-
-(defn cancel-connection-popup!
-  []
-  (reset! showing-connection-error-popup? false)
-  (re-frame/dispatch [:mailserver.ui/dismiss-connection-error true]))
-
-(re-frame/reg-fx
- ::cancel-connection-popup
- cancel-connection-popup!)
-
-(rf/defn show-connection-error!
-  [cofx current-fleet preferred-mailserver]
-  (reset! showing-connection-error-popup? true)
-  {:ui/show-confirmation
-   {:title               (i18n/label :t/mailserver-error-title)
-    :content             (i18n/label :t/mailserver-error-content)
-    :confirm-button-text (i18n/label :t/mailserver-pick-another)
-    :on-cancel           cancel-connection-popup!
-    :on-accept           #(do
-                            (reset! showing-connection-error-popup? false)
-                            (re-frame/dispatch [:mailserver.ui/dismiss-connection-error true])
-                            (re-frame/dispatch [:navigate-to :offline-messaging-settings]))
-    :extra-options       [{:text    (i18n/label :t/mailserver-retry)
-                           :onPress #(do
-                                       (reset! showing-connection-error-popup? false)
-                                       (re-frame/dispatch
-                                        [:mailserver.ui/connect-confirmed
-                                         current-fleet
-                                         preferred-mailserver]))
-                           :style   "default"}]}})
-
-(rf/defn handle-successful-request
-  {:events [::request-success]}
-  [{:keys [db] :as cofx} response-js]
-  {:db       (dissoc db :mailserver/current-request)
-   :dispatch [:sanitize-messages-and-process-response response-js]})
-
-(rf/defn handle-mailserver-not-working
-  [{:keys [db] :as cofx}]
-  (let [current-fleet     (node/current-fleet-key db)
-        error-dismissed?  (connection-error-dismissed db)
-        pinned-mailserver (get-in db [:profile/profile :pinned-mailservers current-fleet])]
-    (when (and pinned-mailserver
-               (not error-dismissed?)
-               (not @showing-connection-error-popup?))
-      (show-connection-error! cofx current-fleet pinned-mailserver))))
-
-(rf/defn handle-request-error
-  {:events [::request-error]}
-  [{:keys [db] :as cofx}]
-  {:db (dissoc db :mailserver/current-request)})
-
-(defn needs-to-fetch-historic-messages?
-  [db]
-  (and
-   (:messenger/started? db)
-   (mobile-network-utils/syncing-allowed? db)
-   (fetch-use-mailservers? db)
-   (not (:mailserver/current-request db))))
-
-(rf/defn process-next-messages-request
-  {:events [::request-messages]}
-  [{:keys [db]}]
-  (when (needs-to-fetch-historic-messages? db)
-    {:db                                       (assoc db :mailserver/current-request true)
-     :mailserver/request-all-historic-messages nil}))
-
-(re-frame/reg-fx :mailserver/request-all-historic-messages
- (fn []
-   (json-rpc/call {:method      "wakuext_requestAllHistoricMessagesWithRetries"
-                   :params      [false]
-                   :js-response true
-                   :on-success  #(do
-                                   (log/info "fetched historical messages")
-                                   (re-frame/dispatch [::request-success %]))
-                   :on-error    #(do
-                                   (log/error "failed retrieve historical messages" %)
-                                   (re-frame/dispatch [::request-error]))})))
-
-(rf/defn handle-mailserver-changed
-  [{:keys [db] :as cofx} ms]
-  (if (seq ms)
-    {:db (assoc db
-                :mailserver/state      :connecting
-                :mailserver/current-id (keyword ms))}
-    {:db (assoc db :mailserver/state nil)}))
-
-(rf/defn handle-mailserver-available
-  [{:keys [db] :as cofx} ms]
-  {::cancel-connection-popup []
-   :db                       (assoc db
-                                    :mailserver/state      :connected
-                                    :mailserver/current-id (keyword ms))})
-
-(rf/defn connected-to-mailserver
-  [{:keys [db] :as cofx}]
-  (let [{:keys [address]} (fetch-current db)]
-    (rf/merge
-     cofx
-     {:mailserver/update-mailservers [[address] #(re-frame/dispatch [::request-messages])]})))
-
-(rf/defn handle-request-success
-  {:events [:mailserver.callback/request-success]}
-  [{{:keys [chats] :as db} :db} {:keys [request-id topics]}]
-  (when (:mailserver/current-request db)
-    {:db (assoc-in db
-          [:mailserver/current-request :request-id]
-          request-id)}))
-
-(rf/defn toggle-use-mailservers
-  [cofx value]
-  {:json-rpc/call
-   [{:method     "wakuext_toggleUseMailservers"
-     :params     [value]
-     :on-success #(log/info "successfully toggled use-mailservers" value)
-     :on-failure #(log/error "failed to toggle use-mailserver" value %)}]})
-
-(rf/defn update-use-mailservers
-  {:events [:mailserver.ui/use-history-switch-pressed]}
-  [cofx use-mailservers?]
-  (rf/merge cofx
-            (multiaccounts.update/optimistic :use-mailservers? use-mailservers?)
-            (toggle-use-mailservers use-mailservers?)
-            (when use-mailservers?
-              (disconnect-from-mailserver))))
-
-(rf/defn retry-next-messages-request
-  {:events [:mailserver.ui/retry-request-pressed]}
-  [{:keys [db] :as cofx}]
-  (rf/merge cofx
-            {:db (dissoc db :mailserver/request-error)}
-            (process-next-messages-request)))
-
-(rf/defn show-request-error-popup
-  {:events [:mailserver.ui/request-error-pressed]}
-  [{:keys [db]}]
-  (let [mailserver-error (:mailserver/request-error db)]
-    {:effects.utils/show-confirmation
-     {:title               (i18n/label :t/mailserver-request-error-title)
-      :content             (i18n/label :t/mailserver-request-error-content
-                                       {:error mailserver-error})
-      :on-accept           #(re-frame/dispatch [:mailserver.ui/retry-request-pressed])
-      :confirm-button-text (i18n/label :t/mailserver-request-retry)}}))
-
-(def enode-url-regex
-  #"enode://[a-zA-Z0-9]+\@\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b:(\d{1,5})")
-
-(defn- extract-url-components
-  [address]
-  (rest (re-matches #"enode://(.*)@(.*)" address)))
-
-(defn valid-enode-url?
-  [address]
-  (re-matches enode-url-regex address))
-
-(defn build-url
-  [address]
-  (let [[initial host] (extract-url-components address)]
-    (str "enode://" initial "@" host)))
-
-(rf/defn set-input
-  {:events [:mailserver.ui/input-changed]}
-  [{:keys [db]} input-key value]
-  {:db (update
-        db
-        :mailserver.edit/mailserver
-        assoc
-        input-key
-        {:value value
-         :error (case input-key
-                  :id   false
-                  :name (string/blank? value)
-                  :url  (not (valid-enode-url? value)))})})
-
-(defn- address->mailserver
-  [address]
-  (let [[enode url :as response] (extract-url-components address)]
-    {:address (if (seq response)
-                (str "enode://" enode "@" url)
-                address)
-     :custom  true}))
-
-(defn- build
-  [id mailserver-name address]
-  (assoc (address->mailserver address)
-         :id   id
-         :name mailserver-name))
-
-(def default? (comp not :custom fetch))
-
-(rf/defn edit
-  {:events [:mailserver.ui/custom-mailserver-selected]}
-  [{:keys [db] :as cofx} id]
-  (let [{:keys [id address name]} (fetch db id)
-        url                       (when address (build-url address))]
-    (rf/merge cofx
-              (set-input :id id)
-              (set-input :url (str url))
-              (set-input :name (str name))
-              (navigation/navigate-to :edit-mailserver nil))))
-
-(defn mailserver->rpc
-  [mailserver current-fleet]
-  (-> mailserver
-      (assoc :fleet (name current-fleet))
-      (update :id name)))
-
-(rf/defn upsert
-  {:events       [:mailserver.ui/save-pressed]
-   :interceptors [(re-frame/inject-cofx :random-id-generator)]}
-  [{{:mailserver.edit/keys [mailserver] :profile/keys [profile] :as db} :db
-    random-id-generator                                                 :random-id-generator
-    :as                                                                 cofx}]
-
-  (let [{:keys [name url id]} mailserver
-        current-fleet         (node/current-fleet-key db)]
-    (when (and (not (string/blank? (:value name)))
-               (valid-enode-url? (:value url)))
-
-      (let [mailserver (build
-                        (or (:value id)
-                            (keyword (string/replace (random-id-generator) "-" "")))
-                        (:value name)
-                        (:value url))
-            current    (connected? db (:id mailserver))]
-        {:db (-> db
-                 (dissoc :mailserver.edit/mailserver)
-                 (assoc-in [:mailserver/mailservers current-fleet (:id mailserver)]
-                           mailserver))
-         :json-rpc/call
-         [{:method     "mailservers_addMailserver"
-           :params     [(mailserver->rpc mailserver current-fleet)]
-           :on-success (fn []
-                         ;; we naively logout if the user is connected to the edited mailserver
-                         (when current
-                           (re-frame/dispatch
-                            [:multiaccounts.logout.ui/logout-confirmed]))
-                         (log/debug "saved mailserver" id "successfuly"))
-           :on-failure #(log/error "failed to save mailserver" id %)}]
-         :dispatch [:navigate-back]}))))
-
-(defn can-delete?
-  [db id]
-  (not (or (default? db id)
-           (connected? db id))))
-
-(rf/defn delete
-  {:events [:mailserver.ui/delete-confirmed]}
-  [{:keys [db] :as cofx} id]
-  (if (can-delete? db id)
-    {:db (-> db
-             (update-in
-              [:mailserver/mailservers (node/current-fleet-key db)]
-              dissoc
-              id)
-             (dissoc :mailserver.edit/mailserver))
-     :json-rpc/call
-     [{:method     "mailservers_deleteMailserver"
-       :params     [(name id)]
-       :on-success #(log/debug "deleted mailserver" id)
-       :on-failure #(log/error "failed to delete mailserver" id %)}]
-     :dispatch [:navigate-back]}
-    {:dispatch [:navigate-back]}))
-
-(rf/defn show-connection-confirmation
-  {:events [:mailserver.ui/default-mailserver-selected :mailserver.ui/connect-pressed]}
-  [{:keys [db]} mailserver-id]
-  (let [current-fleet (node/current-fleet-key db)]
-    {:ui/show-confirmation
-     {:title (i18n/label :t/close-app-title)
-      :content
-      (i18n/label :t/connect-mailserver-content
-                  {:name (get-in db
-                                 [:mailserver/mailservers
-                                  current-fleet mailserver-id :name])})
-      :confirm-button-text (i18n/label :t/close-app-button)
-      :on-accept
-      #(re-frame/dispatch
-        [:mailserver.ui/connect-confirmed current-fleet mailserver-id])
-      :on-cancel nil}}))
-
-(rf/defn show-delete-confirmation
-  {:events [:mailserver.ui/delete-pressed]}
-  [{:keys [db]} mailserver-id]
-  {:ui/show-confirmation
-   {:title               (i18n/label :t/delete-mailserver-title)
-    :content             (i18n/label :t/delete-mailserver-are-you-sure)
-    :confirm-button-text (i18n/label :t/delete-mailserver)
-    :on-accept           #(re-frame/dispatch
-                           [:mailserver.ui/delete-confirmed mailserver-id])}})
-
-(rf/defn set-url-from-qr
-  {:events [:mailserver.callback/qr-code-scanned]}
-  [cofx url]
-  (assoc (set-input cofx :url url)
-         :dispatch
-         [:navigate-back]))
-
-(rf/defn dismiss-connection-error
-  {:events [:mailserver.ui/dismiss-connection-error]}
-  [{:keys [db]} new-state]
-  {:db (assoc db :mailserver/connection-error-dismissed new-state)})
-
-(rf/defn pin-mailserver
-  {:events [:mailserver.ui/connect-confirmed]}
-  [{:keys [db] :as cofx} current-fleet mailserver-id]
-  (let [pinned-mailservers (-> db
-                               (get-in [:profile/profile :pinned-mailservers])
-                               (assoc current-fleet mailserver-id))]
-    (rf/merge cofx
-              {:db            (assoc db :mailserver/current-id mailserver-id)
-               :json-rpc/call [{:method     "wakuext_setPinnedMailservers"
-                                :params     [pinned-mailservers]
-                                :on-success #(log/info "successfully pinned mailserver")
-                                :on-error   #(log/error "failed to pin mailserver" %)}]}
-              (multiaccounts.update/optimistic :pinned-mailservers pinned-mailservers))))
-
-(rf/defn unpin
-  {:events [:mailserver.ui/unpin-pressed]}
-  [{:keys [db] :as cofx}]
-  (let [current-fleet      (node/current-fleet-key db)
-        pinned-mailservers (-> db
-                               (get-in [:profile/profile :pinned-mailservers])
-                               (dissoc current-fleet))]
-    (rf/merge cofx
-              {:json-rpc/call [{:method     "wakuext_setPinnedMailservers"
-                                :params     [pinned-mailservers]
-                                :on-success #(log/info "successfully unpinned mailserver")
-                                :on-error   #(log/error "failed to unpin mailserver" %)}]}
-              (multiaccounts.update/optimistic
-               :pinned-mailservers
-               pinned-mailservers)
-              (dismiss-connection-error false))))
-
-(rf/defn pin
-  {:events [:mailserver.ui/pin-pressed]}
-  [{:keys [db] :as cofx}]
-  (let [current-fleet      (node/current-fleet-key db)
-        mailserver-id      (:mailserver/current-id db)
-        pinned-mailservers (get-in db [:profile/profile :pinned-mailservers])]
-    (rf/merge cofx
-              (multiaccounts.update/multiaccount-update
-               :pinned-mailservers
-               (assoc pinned-mailservers
-                      current-fleet
-                      mailserver-id)
-               {})
-              (dismiss-connection-error false))))
-
-(rf/defn mailserver-ui-add-pressed
-  {:events [:mailserver.ui/add-pressed]}
-  [{:keys [db] :as cofx}]
-  (rf/merge cofx
-            {:db (dissoc db :mailserver.edit/mailserver)}
-            (navigation/navigate-to :edit-mailserver nil)))
-
-(defn add-mailservers
-  [db mailservers]
-  (reduce (fn [db {:keys [fleet id name] :as mailserver}]
-            (let [updated-mailserver
-                  (-> mailserver
-                      (update :id keyword)
-                      (assoc :name (if (seq name) name id))
-                      (dissoc :fleet))]
-              (assoc-in db
-               [:mailserver/mailservers (keyword fleet) (keyword id)]
-               updated-mailserver)))
-          db
-          mailservers))
@@ -1,109 +0,0 @@
-(ns legacy.status-im.mobile-sync-settings.core
-  (:require
-    [legacy.status-im.mailserver.core :as mailserver]
-    [legacy.status-im.multiaccounts.model :as multiaccounts.model]
-    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
-    [legacy.status-im.utils.mobile-sync :as utils]
-    [re-frame.core :as re-frame]
-    [status-im.navigation.events :as navigation]
-    [taoensso.timbre :as log]
-    [utils.re-frame :as rf]))
-
-(rf/defn sheet-defaults
-  [{:keys [db]}]
-  (let [remember-choice? (get-in db [:profile/profile :remember-syncing-choice?])]
-    {:db (assoc db
-                :mobile-network/remember-choice?
-                (or (nil? remember-choice?)
-                    remember-choice?))}))
-
-(re-frame/reg-event-fx :mobile-network/on-network-status-change
- (fn [{:keys [db]}]
-   (let [previously-initialized?  (get db :network-status/initialized?)
-         logged-in?               (multiaccounts.model/logged-in? db)
-         fetch-historic-messages? (mailserver/needs-to-fetch-historic-messages? db)]
-     (if logged-in?
-       {:db (cond-> (-> db
-                        (assoc :network-status/initialized? true)
-                        (assoc :bottom-sheet/show? false))
-              fetch-historic-messages?
-              (assoc :mailserver/current-request true))
-        :fx [(when fetch-historic-messages?
-               [:mailserver/request-all-historic-messages])
-             [:dispatch [:hide-bottom-sheet]]
-             (when previously-initialized?
-               (let [new-identity-input (get-in db [:contacts/new-identity :input])]
-                 [:dispatch [:contacts/set-new-identity {:input new-identity-input}]]))]}
-       {:db (assoc db :network-status/initialized? true)}))))
-
-(defn apply-settings
-  ([sync?] (apply-settings sync? :default))
-  ([sync? remember?]
-   (fn [{:keys [db] :as cofx}]
-     (let [network (:network/type db)
-           remember-choice?
-           (if (not= :default remember?)
-             remember?
-             (:mobile-network/remember-choice? db))
-           cellular? (utils/cellular? network)]
-       (log/info "apply mobile network settings"
-                 "sunc?"     sync?
-                 "remember?" remember?
-                 "cellular?" cellular?)
-       (rf/merge
-        cofx
-        (multiaccounts.update/multiaccount-update
-         :syncing-on-mobile-network?
-         (boolean sync?)
-         {})
-        (multiaccounts.update/multiaccount-update
-         :remember-syncing-choice?
-         (boolean remember-choice?)
-         {})
-        (when (and cellular? sync?)
-          (mailserver/process-next-messages-request)))))))
-
-(rf/defn mobile-network-continue-syncing
-  {:events [:mobile-network/continue-syncing]}
-  [cofx]
-  ((apply-settings true) cofx))
-
-(rf/defn mobile-network-stop-syncing
-  {:events [:mobile-network/stop-syncing]}
-  [cofx]
-  ((apply-settings false) cofx))
-
-(rf/defn mobile-network-set-syncing
-  {:events [:mobile-network/set-syncing]}
-  [{:keys [db] :as cofx} syncing?]
-  (let [{:keys [remember-syncing-choice?]} (:profile/profile db)]
-    ((apply-settings syncing? remember-syncing-choice?) cofx)))
-
-(rf/defn mobile-network-ask-on-mobile-network?
-  {:events [:mobile-network/ask-on-mobile-network?]}
-  [{:keys [db] :as cofx} ask?]
-  (let [{:keys [syncing-on-mobile-network?]} (:profile/profile db)]
-    ((apply-settings syncing-on-mobile-network? (not ask?)) cofx)))
-
-(rf/defn mobile-network-restore-defaults
-  {:events [:mobile-network/restore-defaults]}
-  [cofx]
-  ((apply-settings false false) cofx))
-
-(rf/defn mobile-network-remember-choice?
-  {:events [:mobile-network/remember-choice?]}
-  [{:keys [db]} remember-choice?]
-  {:db (assoc db :mobile-network/remember-choice? remember-choice?)})
-
-(rf/defn mobile-network-navigate-to-settings
-  {:events [:mobile-network/navigate-to-settings]}
-  [cofx]
-  (rf/merge
-   cofx
-   (navigation/hide-bottom-sheet)
-   (navigation/navigate-to :mobile-network-settings nil)))
-
-(rf/defn mobile-network-show-offline-sheet
-  {:events [:mobile-network/show-offline-sheet]}
-  [cofx]
-  (navigation/hide-bottom-sheet cofx))
@@ -13,18 +13,17 @@
   (native-module/logout)))

 (rf/defn initialize-app-db
-  [{{:keys                [keycard initials-avatar-font-file biometrics]
-     :network/keys        [type status]
-     :wallet-connect/keys [web3-wallet]}
+  [{{:keys         [keycard initials-avatar-font-file biometrics]
+     :network/keys [type status expensive?]}
    :db}]
  {:db (assoc db/app-db
-              :network/type               type
-              :network/status             status
-              :initials-avatar-font-file  initials-avatar-font-file
-              :keycard                    (dissoc keycard :secrets :pin :application-info)
-              :biometrics                 biometrics
-              :syncing                    nil
-              :wallet-connect/web3-wallet web3-wallet)})
+              :network/type              type
+              :network/status            status
+              :network/expensive?        expensive?
+              :initials-avatar-font-file initials-avatar-font-file
+              :keycard                   (dissoc keycard :secrets :pin :application-info)
+              :biometrics                biometrics
+              :syncing                   nil)})

 (rf/defn logout-method
  {:events [::logout-method]}
@@ -1,51 +0,0 @@
-(ns legacy.status-im.ui.screens.mobile-network-settings.sheets
-  (:require-macros [legacy.status-im.utils.views :as views])
-  (:require [legacy.status-im.ui.components.list.item :as list.item]
-            [legacy.status-im.ui.components.react :as react]
-            [legacy.status-im.ui.screens.mobile-network-settings.sheets-styles :as styles]
-            [re-frame.core :as re-frame]
-            [utils.i18n :as i18n]))
-
-(defn title
-  [label]
-  [react/view {:style styles/title}
-   [react/text
-    {:style styles/title-text}
-    (i18n/label label)]])
-
-(defn details
-  [label]
-  [react/view
-   {:style styles/details}
-   [react/text
-    {:style styles/details-text}
-    (i18n/label label)]])
-
-(defn separator
-  []
-  [react/view {:style styles/separator}])
-
-(defn go-to-settings
-  []
-  [react/view
-   {:style styles/go-to-settings-container}
-   [react/text
-    {:style    styles/go-to-settings
-     :on-press #(re-frame/dispatch [:mobile-network/navigate-to-settings])}
-    (i18n/label :t/mobile-network-go-to-settings)]])
-
-(views/defview offline-sheet
-  []
-  [react/view {:flex 1}
-   [react/view {:align-items :center}
-    [title :t/mobile-network-sheet-offline]
-    [details :t/mobile-network-sheet-offline-details]]
-   [list.item/list-item
-    {:theme              :accent
-     :title              (i18n/label :t/mobile-network-start-syncing)
-     :subtitle           (i18n/label :t/mobile-network-continue-syncing-details)
-     :subtitle-max-lines 2
-     :icon               :main-icons/network
-     :on-press           #(re-frame/dispatch [:mobile-network/continue-syncing])}]
-   [separator]
-   [go-to-settings]])
@@ -1,73 +0,0 @@
-(ns legacy.status-im.ui.screens.mobile-network-settings.sheets-styles
-  (:require
-    [legacy.status-im.ui.components.colors :as colors]))
-
-(def title
-  {:height     21
-   :margin-top 8})
-
-(def title-text
-  {:typography :title-bold})
-
-(def details
-  {:width         311
-   :margin-left   32
-   :margin-right  32
-   :margin-top    6
-   :margin-bottom 10})
-
-(def details-text
-  {:color      colors/gray
-   :text-align :center})
-
-(def separator
-  {:background-color colors/gray-lighter
-   :margin-left      72
-   :align-self       :stretch
-   :height           1
-   :margin-top       8})
-
-(def checkbox-line-container
-  {:margin-left     71
-   :margin-top      13
-   :height          29
-   :flex-direction  :row
-   :justify-content :center})
-
-(def checkbox
-  {:padding         0
-   :justify-content :center
-   :align-items     :center
-   :width           18
-   :height          18
-   :border-radius   2
-   :margin-top      6})
-
-(def checkbox-icon
-  {:tint-color colors/white})
-
-(def checkbox-text-container
-  {:justify-content :center
-   :flex            1
-   :margin-left     13})
-
-(def settings-container
-  {:margin-left 69
-   :height      44
-   :margin-top  6
-   :align-items :flex-start})
-
-(def settings-text
-  {:color colors/gray})
-
-(def settings-link
-  {:color colors/blue})
-
-(def go-to-settings-container
-  {:height          52
-   :margin-left     72
-   :justify-content :center
-   :align-self      :stretch})
-
-(def go-to-settings
-  {:color colors/blue})
@@ -1,32 +0,0 @@
-(ns legacy.status-im.ui.screens.mobile-network-settings.style
-  (:require
-    [legacy.status-im.ui.components.colors :as colors]))
-
-(def container
-  {:flex 1})
-
-(def switch-container
-  {:height 52})
-
-(def details
-  {:margin-right  16
-   :margin-left   16
-   :margin-top    8
-   :margin-bottom 16})
-
-(def use-mobile-data-text
-  {:color colors/gray})
-
-(defn settings-separator
-  []
-  {:align-self       :stretch
-   :height           1
-   :background-color colors/gray-lighter})
-
-(def defaults-container
-  {:height          52
-   :justify-content :center
-   :padding-left    16})
-
-(def defaults
-  {:color colors/blue})
@@ -1,57 +0,0 @@
-(ns legacy.status-im.ui.screens.mobile-network-settings.view
-  (:require-macros [legacy.status-im.utils.views :as views])
-  (:require
-    legacy.status-im.mobile-sync-settings.core
-    [legacy.status-im.ui.components.react :as react]
-    [legacy.status-im.ui.screens.mobile-network-settings.sheets :as sheets]
-    [legacy.status-im.ui.screens.mobile-network-settings.style :as styles]
-    [legacy.status-im.ui.screens.profile.components.views :as profile.components]
-    [re-frame.core :as re-frame]
-    [utils.i18n :as i18n]))
-
-(defn hide-sheet-and-dispatch
-  [event]
-  (re-frame/dispatch [:bottom-sheet/hide-old])
-  (re-frame/dispatch event))
-
-(defn settings-separator
-  []
-  [react/view
-   {:style (styles/settings-separator)}])
-
-;; TODO(Ferossgp): To refactor, uses outdated components
-(views/defview mobile-network-settings
-  []
-  (views/letsubs
-    [{:keys [syncing-on-mobile-network?
-             remember-syncing-choice?]}
-     [:profile/profile]]
-    [:<>
-     [react/view
-      {:style               styles/switch-container
-       :accessibility-label "mobile-network-use-mobile"}
-      [profile.components/settings-switch-item
-       {:label-kw  :t/mobile-network-use-mobile
-        :value     syncing-on-mobile-network?
-        :action-fn #(hide-sheet-and-dispatch [:mobile-network/set-syncing %])}]]
-     [react/view {:style styles/details}
-      [react/text {:style styles/use-mobile-data-text}
-       (i18n/label :t/mobile-network-use-mobile-data)]]
-     [react/view
-      {:style               styles/switch-container
-       :accessibility-label "mobile-network-ask-me"}
-      [profile.components/settings-switch-item
-       {:label-kw  :t/mobile-network-ask-me
-        :value     (not remember-syncing-choice?)
-        :action-fn #(hide-sheet-and-dispatch [:mobile-network/ask-on-mobile-network? %])}]]
-     [settings-separator]
-     [react/view
-      {:style styles/defaults-container}
-      [react/text
-       {:style               styles/defaults
-        :accessibility-label "restore-defaults"
-        :on-press            #(hide-sheet-and-dispatch [:mobile-network/restore-defaults])}
-       (i18n/label :t/restore-defaults)]]]))
-
-(def offline-sheet
-  {:content sheets/offline-sheet})
@@ -13,7 +13,6 @@
    [legacy.status-im.ui.screens.glossary.view :as glossary]
    [legacy.status-im.ui.screens.help-center.views :as help-center]
    [legacy.status-im.ui.screens.log-level-settings.views :as log-level-settings]
-    [legacy.status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
    [legacy.status-im.ui.screens.notifications-settings.views :as notifications-settings]
    [legacy.status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver]
    [legacy.status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings]
@@ -145,10 +144,6 @@
    :options   {:topBar (topbar-options :t/fleet-settings)
                :insets {:top? true}}
    :component fleet-settings/fleet-settings}
-   {:name      :mobile-network-settings
-    :options   {:topBar (topbar-options :t/mobile-network-settings)
-                :insets {:top? true}}
-    :component mobile-network-settings/mobile-network-settings}
   {:name      :backup-settings
    :options   {:topBar (topbar-options :t/backup-settings)
                :insets {:top? true}}
@@ -13,8 +13,7 @@

 (views/defview sync-settings
  []
-  (views/letsubs [{:keys [syncing-on-mobile-network?
-                          backup-enabled?
+  (views/letsubs [{:keys [backup-enabled?
                          default-sync-period
                          use-mailservers?]}
                  [:profile/profile]
@@ -27,16 +26,6 @@
       :on-press   #(rf/dispatch [:navigate-back])}]
     [react/scroll-view
      [components/list-header (i18n/label :t/data-syncing)]
-      [list.item/list-item
-       {:size                :small
-        :title               (i18n/label :t/mobile-network-settings)
-        :accessibility-label :notifications-button
-        :on-press            #(re-frame/dispatch [:navigate-to :mobile-network-settings])
-        :chevron             true
-        :accessory           :text
-        :accessory-text      (if syncing-on-mobile-network?
-                               (i18n/label :t/mobile-network-use-mobile)
-                               (i18n/label :t/mobile-network-use-wifi))}]
      [list.item/list-item
       {:size                :small
        :title               (i18n/label :t/backup-settings)
@@ -333,7 +333,7 @@
  [flag]
  (log/debug "[native-module] set-blank-preview-flag")
  ;; Sometimes the app crashes during logout because `flag` is nil.
-  (when flag
+  (when-not (nil? flag)
    (.setBlankPreviewFlag ^js (encryption) flag)))

 (defn get-device-model-info
@@ -387,6 +387,11 @@
  (log/debug "[native-module] encode-transfer")
  (.encodeTransfer ^js (encryption) to-norm amount-hex))

+(defn encode-function-call
+  [method params]
+  (log/debug "[native-module] encode-function-call")
+  (.encodeFunctionCall ^js (encryption) method (types/clj->json params)))
+
 (defn decode-parameters
  [bytes-string types]
  (log/debug "[native-module] decode-parameters")
@@ -60,7 +60,7 @@

 (defn icon-color
  [{:keys [theme blur? type]}]
-  (let [theme-with-blur (if blur? :blue theme)
+  (let [theme-with-blur (if blur? :blur theme)
        matcher         [theme-with-blur type]]
    (case matcher
      ([:dark :main] [:light :main])     (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
@@ -11,5 +11,5 @@
     [:networks [:* [:map [:source :schema.common/image-source]]]]
     [:on-press {:optional true} [:maybe fn?]]
     [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-     [:state {:optional true} [:maybe [:enum :default :active :selected]]]]]
+     [:state {:optional true} [:maybe [:enum :default :active :selected :disabled]]]]]
   :any])
@@ -18,6 +18,7 @@
   :padding-vertical   8
   :border-radius      12
   :height             56
+   :opacity            (when (= state :disabled) 0.3)
   :background-color   (background-color state customization-color theme)})

 (defn check-color
@@ -62,6 +62,7 @@
      :on-press-in         on-press-in
      :on-press-out        on-press-out
      :on-press            on-press
+      :disabled            (= state :disabled)
      :accessibility-label :token-network}
     [info props]
     [values props]]))
@@ -0,0 +1,8 @@
+(ns react-native.net-info
+  (:require
+    ["@react-native-community/netinfo" :default net-info]))
+
+(defn add-net-info-listener
+  [callback]
+  (when net-info
+    (.addEventListener ^js net-info callback)))
@@ -0,0 +1,24 @@
+(ns status-im.common.data-confirmation-sheet.style
+  (:require [quo.foundations.colors :as colors]))
+
+(def heading
+  {:padding-left   20
+   :padding-bottom 8})
+
+(def message
+  {:padding-horizontal 20
+   :padding-top        4})
+
+(def warning
+  {:margin-horizontal 20
+   :margin-top        10})
+
+(def drawer-container
+  {:padding-horizontal 13
+   :padding-top        16})
+
+(def settings-subtext
+  {:color         colors/white-opa-70
+   :align-self    :center
+   :margin-bottom 12})
+
@@ -0,0 +1,73 @@
+(ns status-im.common.data-confirmation-sheet.view
+  (:require
+    [quo.core :as quo]
+    [react-native.core :as rn]
+    [status-im.common.data-confirmation-sheet.style :as style]
+    [utils.i18n :as i18n]
+    [utils.navigation :as navigation]
+    [utils.re-frame :as rf]))
+
+(defn on-choice-callback
+  [syncing-on-mobile-network?]
+  (rf/dispatch [:network/set-syncing-on-mobile-network syncing-on-mobile-network?])
+  (navigation/hide-bottom-sheet))
+
+(def on-wifi-only (partial on-choice-callback false))
+(def on-mobile-and-wifi (partial on-choice-callback true))
+
+(defn view
+  []
+  (let [settings-drawer?           (= (rf/sub [:view-id]) :screen/settings.syncing)
+        syncing-on-mobile-network? (rf/sub [:profile/syncing-on-mobile-network?])]
+    (rn/use-mount navigation/dismiss-keyboard)
+    [:<>
+     [quo/text
+      {:weight              :semi-bold
+       :size                :heading-2
+       :accessibility-label :data-confirmation-sheet-heading
+       :style               style/heading}
+      (i18n/label (if settings-drawer? :t/sync-and-backup :t/which-connection-to-use))]
+     [quo/text
+      {:weight              :regular
+       :size                :paragraph-1
+       :accessibility-label :data-confirmation-sheet-message
+       :style               style/message}
+      (i18n/label :t/syncing-connection-message)]
+     [quo/information-box
+      {:type  :default
+       :icon  :i/info
+       :blur? true
+       :style style/warning}
+      (i18n/label :t/syncing-wifi-connection-warning)]
+     (if settings-drawer?
+       [rn/view {:style style/drawer-container}
+        [quo/drawer-action
+         {:title               (i18n/label :t/mobile-data-and-wifi)
+          :state               (when syncing-on-mobile-network? :selected)
+          :blur?               true
+          :accessibility-label :mobile-data-and-wifi-action
+          :icon                :i/connection
+          :on-press            on-mobile-and-wifi}]
+        [quo/drawer-action
+         {:title               (i18n/label :t/wifi-only)
+          :state               (when-not syncing-on-mobile-network? :selected)
+          :blur?               true
+          :accessibility-label :wifi-only-action
+          :icon                :i/placeholder
+          :on-press            on-wifi-only}]]
+       [quo/bottom-actions
+        {:actions          :two-actions
+         :blur?            true
+         :container-style  {:margin-top 12}
+         :button-one-label (i18n/label :t/wifi-only)
+         :button-one-props {:type     :grey
+                            :on-press on-wifi-only}
+         :button-two-label (i18n/label :t/mobile-and-wifi)
+         :button-two-props {:on-press on-mobile-and-wifi}}])
+     (if settings-drawer?
+       [quo/divider-line {:container-style {:padding-vertical 8}}]
+       [quo/text
+        {:weight :regular
+         :size   :paragraph-2
+         :style  style/settings-subtext}
+        (i18n/label :t/you-can-change-later-in-settings)])]))
@@ -1,7 +1,6 @@
 (ns status-im.common.signals.events
  (:require
    [legacy.status-im.chat.models.message :as models.message]
-    [legacy.status-im.mailserver.core :as mailserver]
    [legacy.status-im.visibility-status-updates.core :as visibility-status-updates]
    [oops.core :as oops]
    [status-im.common.pairing.events :as pairing]
@@ -66,15 +65,6 @@
      "messages.new"
      (messages.transport/sanitize-messages-and-process-response cofx event-js true)

-      "mailserver.changed"
-      (mailserver/handle-mailserver-changed cofx (oops/oget event-js :id))
-
-      "mailserver.available"
-      (mailserver/handle-mailserver-available cofx (oops/oget event-js :id))
-
-      "mailserver.not.working"
-      (mailserver/handle-mailserver-not-working cofx)
-
      "discovery.summary"
      (summary cofx (transforms/js->clj event-js))

@@ -0,0 +1,8 @@
+(ns status-im.common.theme.effects
+  (:require
+    [status-im.common.theme.core :as theme]
+    [utils.re-frame :as rf]))
+
+(rf/reg-fx :theme/legacy-theme-fx
+ (fn [theme]
+   (theme/set-legacy-theme theme)))
@@ -1,7 +1,8 @@
 (ns status-im.common.theme.events
  (:require
    [re-frame.core :as re-frame]
-    [status-im.common.theme.core :as theme]))
+    [status-im.common.theme.core :as theme]
+    [status-im.common.theme.utils :as utils]))

 (re-frame/reg-fx
 :theme/init-theme
@@ -10,5 +11,16 @@

 (re-frame/reg-event-fx
 :theme/switch
- (fn [{db :db} [theme]]
-   {:db (assoc db :theme theme)}))
+ (fn [{db :db} [{:keys [theme view-id theme-type]}]]
+   "Switches the theme and triggers related effects.
+   Parameters:
+   - theme: Optional theme keyword to apply. If not provided, defaults to the theme determined by theme-type.
+   - theme-type: Optional theme type to determine the theme. If not provided, defaults to the theme type from the user's profile.
+   - view-id: Optional view ID for updating status color. If not provided, uses the current view ID from the database."
+   (let [theme-type (or theme-type (get-in db [:profile/profile :appearance]))
+         theme      (or theme (utils/theme-type->theme-value theme-type))]
+     {:db (assoc db :theme theme)
+      :fx [[:theme/legacy-theme-fx theme]
+           [:dispatch
+            [:reload-status-nav-color
+             (or view-id (:view-id db))]]]})))
@@ -0,0 +1,17 @@
+(ns status-im.common.theme.utils
+  (:require
+    [status-im.common.theme.core :as theme]
+    [status-im.constants :as constants]))
+
+(defn theme-type->theme-value
+  "Converts theme type identifier to a theme keyword.
+  Returns `:light` or `:dark` based on `theme-type`:
+  - `theme-type-light` (1): Light theme.
+  - `theme-type-dark` (2): Dark theme.
+  - `theme-type-system` (0): Uses system preference."
+  [theme-type]
+  (condp = theme-type
+    constants/theme-type-dark   :dark
+    constants/theme-type-light  :light
+    constants/theme-type-system (if (theme/device-theme-dark?) :dark :light)
+    :dark))
@@ -12,6 +12,8 @@

 (goog-define INFURA_TOKEN "")
 (goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9")
+(goog-define STATUS_BUILD_PROXY_USER "")
+(goog-define STATUS_BUILD_PROXY_PASSWORD "")
 (goog-define OPENSEA_API_KEY "")
 (goog-define RARIBLE_MAINNET_API_KEY "")
 (goog-define RARIBLE_TESTNET_API_KEY "")
@@ -45,6 +47,7 @@
 (def mixpanel-token MIXPANEL_TOKEN)

 (def opensea-api-key OPENSEA_API_KEY)
+(def status-proxy-enabled? true)
 (def bootnodes-settings-enabled? (enabled? (get-config :BOOTNODES_SETTINGS_ENABLED "1")))
 (def mailserver-confirmations-enabled? (enabled? (get-config :MAILSERVER_CONFIRMATIONS_ENABLED)))
 (def pairing-popup-disabled? (enabled? (get-config :PAIRING_POPUP_DISABLED "0")))
@@ -125,6 +128,9 @@
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))
 (def test-networks-enabled? (enabled? (get-config :TEST_NETWORKS_ENABLED "0")))

+(def mobile-data-syncing-toggle-enabled?
+  (enabled? (get-config :MOBILE_DATA_SYNCING_TOGGLE_ENABLE "1")))
+
 ;; Alert banners are disabled for debug builds because alert banners overlay
 ;; interfere with react-native debug tools, such as inspector and Perf monitor
 (def enable-alert-banner? (enabled? (get-config :ENABLE_ALERT_BANNER "0")))
@@ -554,11 +554,21 @@
 (def ^:const send-type-erc-721-transfer 6)
 (def ^:const send-type-erc-1155-transfer 7)

+(def ^:const multi-transaction-type-send 0)
+(def ^:const multi-transaction-type-approve 1)
+(def ^:const multi-transaction-type-bridge 2)
+(def ^:const multi-transaction-type-swap 3)
+(def ^:const multi-transaction-type-unknown 255)
+
+(def ^:const contract-function-signature-erc20-approve "approve(address,uint256)")
+
 (def ^:const bridge-name-transfer "Transfer")
 (def ^:const bridge-name-erc-721-transfer "ERC721Transfer")
 (def ^:const bridge-name-erc-1155-transfer "ERC1155Transfer")
 (def ^:const bridge-name-hop "Hop")

+(def ^:const bridge-assets #{"ETH" "USDT" "USDC" "DAI"})
+
 (def ^:const wallet-contract-type-uknown 0)
 (def ^:const wallet-contract-type-erc-20 1)
 (def ^:const wallet-contract-type-erc-721 2)
@@ -46,6 +46,10 @@
   (when (show-confirmation-modal? db)
     {:fx [[:dispatch
            [:show-bottom-sheet
-             {:content (fn [] [modal-view])
-              :shell?  true}]]]})))
-
+             {:content  (fn [] [modal-view])
+              ;; When in the profiles screen do biometric auth after the metrics sheet is dismissed
+              ;; https://github.com/status-im/status-mobile/issues/20932
+              :on-close (when (= (:view-id db) :screen/profile.profiles)
+                          #(rf/dispatch [:profile.login/login-with-biometric-if-available
+                                         (get-in db [:profile/login :key-uid])]))
+              :shell?   true}]]]})))
@@ -3,37 +3,61 @@
    [legacy.status-im.utils.build :as build]
    [react-native.platform :as platform]))

-(defn user-journey-event
-  [action]
+(defn key-value-event
+  [event-name val-key value]
  {:metric
-   {:eventName  "user-journey"
+   {:eventName  event-name
    :platform   platform/os
    :appVersion build/app-short-version
-    :eventValue {:action action}}})
+    :eventValue {val-key value}}})
+
+(defn user-journey-event
+  [action]
+  (key-value-event "user-journey" :action action))
+
+(defn navigation-event
+  [view-id]
+  (key-value-event "navigation" :viewId view-id))

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

 (defn track-view-id-event
  [view-id]
-  (case view-id
-    :communities-stack (user-journey-event communities-tab-clicked)
-    :chats-stack       (user-journey-event chats-tab-clicked)
-    :wallet-stack      (user-journey-event wallet-tab-clicked)
-    nil))
+  (when (contains? view-ids-to-track view-id)
+    (navigation-event (name view-id))))

 (defn tracked-event
  [[event-name second-parameter]]
  (case event-name
-    :onboarding/navigate-to-create-profile
-    (user-journey-event navigate-to-create-profile-event)
-
    :profile/get-profiles-overview-success
    (user-journey-event app-started-event)

+    :centralized-metrics/toggle-centralized-metrics
+    (key-value-event "events.metrics-enabled" :enabled second-parameter)
+
    :set-view-id
    (track-view-id-event second-parameter)

@@ -5,31 +5,75 @@
    [react-native.platform :as platform]
    [status-im.contexts.centralized-metrics.tracking :as tracking]))

+(def platform-os platform/os)
+(def app-version build/app-short-version)
+
+(deftest key-value-event-test
+  (testing "creates correct key-value event"
+    (let [event-name "test-event"
+          val-key    :test-key
+          value      "test-value"
+          expected   {:metric
+                      {:eventName  event-name
+                       :platform   platform-os
+                       :appVersion app-version
+                       :eventValue {val-key value}}}]
+      (is (= expected (tracking/key-value-event event-name val-key value))))))
+
 (deftest user-journey-event-test
-  (testing "creates correct metric event"
-    (let [action   "some-action"
-          expected {:metric {:eventName  "user-journey"
-                             :platform   platform/os
-                             :appVersion build/app-short-version
-                             :eventValue {:action action}}}]
+  (testing "creates correct user journey event"
+    (let [action   "test-action"
+          expected {:metric
+                    {:eventName  "user-journey"
+                     :platform   platform-os
+                     :appVersion app-version
+                     :eventValue {:action action}}}]
      (is (= expected (tracking/user-journey-event action))))))

+(deftest navigation-event-test
+  (testing "creates correct navigation event"
+    (let [view-id  :test-view-id
+          expected {:metric
+                    {:eventName  "navigation"
+                     :platform   platform-os
+                     :appVersion app-version
+                     :eventValue {:viewId view-id}}}]
+      (is (= expected (tracking/navigation-event view-id))))))
+
 (deftest track-view-id-event-test
-  (testing "returns correct event for view-id"
-    (is (= (tracking/user-journey-event tracking/communities-tab-clicked)
+  (testing "returns correct navigation event for view-id"
+    (is (= {:metric
+            {:eventName  "navigation"
+             :platform   platform-os
+             :appVersion app-version
+             :eventValue {:viewId "communities-stack"}}}
           (tracking/track-view-id-event :communities-stack)))
-    (is (= (tracking/user-journey-event tracking/chats-tab-clicked)
-           (tracking/track-view-id-event :chats-stack)))
-    (is (= (tracking/user-journey-event tracking/wallet-tab-clicked)
-           (tracking/track-view-id-event :wallet-stack)))
+    (is (= {:metric
+            {:eventName  "navigation"
+             :platform   platform-os
+             :appVersion app-version
+             :eventValue {:viewId "onboarding.create-profile"}}}
+           (tracking/track-view-id-event :screen/onboarding.create-profile)))
    (is (nil? (tracking/track-view-id-event :unknown-stack)))))

 (deftest tracked-event-test
  (testing "returns correct event for given inputs"
-    (is (= (tracking/user-journey-event tracking/navigate-to-create-profile-event)
-           (tracking/tracked-event [:onboarding/navigate-to-create-profile])))
-    (is (= (tracking/user-journey-event tracking/app-started-event)
+    (is (= {:metric
+            {:eventName  "user-journey"
+             :platform   platform-os
+             :appVersion app-version
+             :eventValue {:action tracking/app-started-event}}}
           (tracking/tracked-event [:profile/get-profiles-overview-success])))
-    (is (= (tracking/track-view-id-event :wallet-stack)
+    (is (= {:metric
+            {:eventName  "events.metrics-enabled"
+             :platform   platform-os
+             :appVersion app-version
+             :eventValue {:enabled true}}}
+           (tracking/tracked-event [:centralized-metrics/toggle-centralized-metrics true])))
+    (is (= {:metric
+            {:eventName  "navigation"
+             :platform   platform-os
+             :appVersion app-version
+             :eventValue {:viewId "wallet-stack"}}}
           (tracking/tracked-event [:set-view-id :wallet-stack])))
    (is (nil? (tracking/tracked-event [:unknown-event])))))
@@ -50,7 +50,7 @@
           item])))))

 (defn add-manage-members
-  [{:keys [on-scroll]}]
+  [{:keys [scroll-enabled? on-scroll]}]
  (let [theme                      (quo.theme/use-theme)
        selected-participants      (rf/sub [:group-chat/selected-participants])
        deselected-members         (rf/sub [:group-chat/deselected-members])
@@ -71,6 +71,7 @@
      (i18n/label (if admin? :t/manage-members :t/add-members))]
     [gesture/section-list
      {:key-fn                         :title
+       :scroll-enabled                 @scroll-enabled?
       :on-scroll                      on-scroll
       :sticky-section-headers-enabled false
       :sections                       (rf/sub [:contacts/grouped-by-first-letter])
@@ -2,7 +2,6 @@
  (:require
    [clojure.string :as string]
    [legacy.status-im.data-store.communities :as data-store.communities]
-    [legacy.status-im.mailserver.core :as mailserver]
    [schema.core :as schema]
    [status-im.constants :as constants]
    [status-im.contexts.chat.messenger.messages.link-preview.events :as link-preview.events]
@@ -288,8 +287,7 @@
  (when-let [community (first communities)]
    {:db (-> db
             (assoc-in [:communities (:id community) :spectated] true))
-     :fx [[:dispatch [:communities/handle-community community]]
-          [:dispatch [::mailserver/request-messages]]]}))
+     :fx [[:dispatch [:communities/handle-community community]]]}))

 (rf/reg-event-fx :chat.ui/spectate-community-success spectate-community-success)

@@ -1,6 +1,5 @@
 (ns status-im.contexts.communities.events-test
  (:require [cljs.test :refer [deftest is testing]]
-            [legacy.status-im.mailserver.core :as mailserver]
            matcher-combinators.test
            [status-im.contexts.chat.messenger.messages.link-preview.events :as link-preview.events]
            [status-im.contexts.communities.events :as events]))
@@ -112,7 +111,7 @@
    (testing "dispatch fxs for first community"
      (is (match?
           {:fx [[:dispatch [:communities/handle-community {:id community-id}]]
-                 [:dispatch [::mailserver/request-messages]]]}
+                ]}
           (events/spectate-community-success {} [{:communities [{:id community-id}]}])))))
  (testing "given empty community"
    (testing "do nothing"
@@ -0,0 +1,17 @@
+(ns status-im.contexts.network.effects
+  (:require
+    [native-module.core :as native-module]
+    [react-native.net-info :as net-info]
+    [utils.re-frame :as rf]))
+
+(rf/reg-fx
+ :effects.network/listen-to-network-info
+ (fn []
+   (net-info/add-net-info-listener
+    #(rf/dispatch [:network/on-state-change
+                   (js->clj % :keywordize-keys true)]))))
+
+(rf/reg-fx
+ :effects.network/notify-status-go
+ (fn [network-type expensive?]
+   (native-module/connection-change network-type expensive?)))
@@ -0,0 +1,76 @@
+(ns status-im.contexts.network.events
+  (:require
+    [status-im.common.data-confirmation-sheet.view :as data-confirmation-sheet]
+    [status-im.config :as config]
+    [status-im.feature-flags :as ff]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+(rf/reg-event-fx :network/set-syncing-on-mobile-network
+ (fn [{:keys [db]} [syncing-on-mobile-network?]]
+   (when config/mobile-data-syncing-toggle-enabled?
+     {:db (update db
+                  :profile/profile
+                  assoc
+                  :syncing-on-mobile-network?
+                  syncing-on-mobile-network?
+                  :remember-syncing-choice?
+                  true)
+      :fx [[:json-rpc/call
+            [{:method     "wakuext_setSyncingOnMobileNetwork"
+              :params     [{:enabled syncing-on-mobile-network?}]
+              :on-success #(log/debug "successfully set syncing-on-mobile-network"
+                                      syncing-on-mobile-network?)
+              :on-error   #(log/error "could not set syncing-on-mobile-network" %)}]]]})))
+
+(rf/reg-event-fx :network/check-expensive-connection
+ (fn [{:keys [db]}]
+   (when
+     (and (:network/expensive? db)
+          config/mobile-data-syncing-toggle-enabled?
+          (:profile/profile db)
+          (not (get-in db [:profile/profile :remember-syncing-choice?])))
+     ;; Note here we are only updating :remember-syncing-choice? temporarily to avoid opening
+     ;; multiple bottom sheets and the user might again see the sheet on the next login. Unless the
+     ;; user makes a syncing choice that will persist this key in the status-go
+     {:db (assoc-in db [:profile/profile :remember-syncing-choice?] true)
+      :fx [[:dispatch
+            [:show-bottom-sheet
+             {:content (fn [] [data-confirmation-sheet/view])
+              :shell?  true
+              :theme   :dark}]]]})))
+
+(rf/reg-event-fx
+ :network/on-state-change
+ (fn [{:keys [db]} [{:keys [isConnected type details]}]]
+   (let [old-network-status  (:network/status db)
+         old-network-type    (:network/type db)
+         connectivity-status (if isConnected :online :offline)
+         status-changed?     (not= connectivity-status old-network-status)
+         type-changed?       (not= type old-network-type)
+         expensive?          (:isConnectionExpensive details)]
+     (log/debug "[net-info]"
+                "old-network-status"  old-network-status
+                "old-network-type"    old-network-type
+                "connectivity-status" connectivity-status
+                "type"                type
+                "details"             details)
+     {:db (assoc db :network/expensive? expensive?)
+      :fx [[:dispatch [:network/check-expensive-connection]]
+           (when status-changed?
+             [:dispatch [:network/on-network-status-change connectivity-status]])
+           (when type-changed?
+             [:dispatch [:network/on-network-type-change type expensive?]])]})))
+
+(rf/reg-event-fx
+ :network/on-network-type-change
+ (fn [{:keys [db]} [network-type expensive?]]
+   {:db (assoc db :network/type network-type)
+    :fx [[:effects.network/notify-status-go network-type expensive?]]}))
+
+(rf/reg-event-fx
+ :network/on-network-status-change
+ (fn [{:keys [db]} [connectivity-status]]
+   {:db (assoc db :network/status connectivity-status)
+    :fx [(when (ff/enabled? ::ff/wallet.wallet-connect)
+           [:dispatch [:wallet-connect/reload-on-network-change (= :online connectivity-status)]])]}))
@@ -1,55 +0,0 @@
-(ns status-im.contexts.networks.events
-  (:require
-    ["@react-native-community/netinfo" :default net-info]
-    [native-module.core :as native-module]
-    [status-im.feature-flags :as ff]
-    [taoensso.timbre :as log]
-    [utils.re-frame :as rf]))
-
-(rf/reg-fx
- :effects.network/listen-to-network-info
- (fn []
-   (when net-info
-     (.addEventListener ^js net-info
-                        #(rf/dispatch [:network/on-state-change
-                                       (js->clj % :keywordize-keys true)])))))
-
-(rf/reg-event-fx
- :network/on-state-change
- (fn [{:keys [db]} [{:keys [isConnected type details]}]]
-   (let [old-network-status       (:network/status db)
-         old-network-type         (:network/type db)
-         connectivity-status      (if isConnected :online :offline)
-         status-changed?          (not= connectivity-status old-network-status)
-         type-changed?            (not= type old-network-type)
-         is-connection-expensive? (:is-connection-expensive details)]
-     (log/debug "[net-info]"
-                "old-network-status"  old-network-status
-                "old-network-type"    old-network-type
-                "connectivity-status" connectivity-status
-                "type"                type
-                "details"             details)
-     {:fx [(when status-changed?
-             [:dispatch [:network/on-network-status-change isConnected]])
-           (when type-changed?
-             [:dispatch [:network/on-network-type-change type is-connection-expensive?]])]})))
-
-(rf/reg-event-fx
- :network/on-network-type-change
- (fn [{:keys [db]} [network-type expensive?]]
-   {:db (assoc db :network/type network-type)
-    :fx [[:effects.network/notify-status-go network-type expensive?]
-         [:dispatch [:mobile-network/on-network-status-change]]]}))
-
-(rf/reg-event-fx
- :network/on-network-status-change
- (fn [{:keys [db]} [is-connected?]]
-   (let [network-status (if is-connected? :online :offline)]
-     {:db (assoc db :network/status network-status)
-      :fx [(when (ff/enabled? ::ff/wallet.wallet-connect)
-             [:dispatch [:wallet-connect/reload-on-network-change is-connected?]])]})))
-
-(rf/reg-fx
- :effects.network/notify-status-go
- (fn [network-type expensive?]
-   (native-module/connection-change network-type expensive?)))
@@ -19,10 +19,10 @@
      :icon-name  :i/close
      :right-side [{:icon-name (if light? :i/dark :i/light)
                    :on-press  #(if light?
-                                  (rf/dispatch [:theme/switch :dark])
-                                  (rf/dispatch [:theme/switch :light]))}]
+                                  (rf/dispatch [:theme/switch {:theme :dark}])
+                                  (rf/dispatch [:theme/switch {:theme :light}]))}]
      :on-press   #(if (or logged-in? (not= (rf/sub [:view-id]) :quo-preview))
                     (rf/dispatch [:navigate-back])
                     (do
-                       (rf/dispatch [:theme/switch :dark])
+                       (rf/dispatch [:theme/switch {:theme :dark}])
                       (rf/dispatch [:init-root root])))}]))
@@ -50,7 +50,7 @@
     (fn []
       (rn/use-effect (fn []
                        (when @blur?
-                          (rf/dispatch [:theme/switch :dark])))
+                          (rf/dispatch [:theme/switch {:theme :dark}])))
                      [@blur?])
       [preview/preview-container {:state state :descriptor descriptor}
        [rn/view
@@ -377,8 +377,8 @@
    (rn/use-effect (fn []
                     (when blur-dark-only?
                       (if blur?
-                         (rf/dispatch [:theme/switch :dark])
-                         (rf/dispatch [:theme/switch :light]))))
+                         (rf/dispatch [:theme/switch {:theme :dark}])
+                         (rf/dispatch [:theme/switch {:theme :light}]))))
                   [blur? blur-dark-only?])
    [rn/view
     {:style {:top  (safe-area/get-top)
@@ -9,21 +9,26 @@
 (defn login
  []
  {;; Temporary fix until https://github.com/status-im/status-go/issues/3024 is resolved
-   :wakuV2Nameserver            "8.8.8.8"
-   :openseaAPIKey               config/opensea-api-key
-   :poktToken                   config/POKT_TOKEN
-   :infuraToken                 config/INFURA_TOKEN
-   :raribleMainnetAPIKey        config/RARIBLE_MAINNET_API_KEY
-   :raribleTestnetAPIKey        config/RARIBLE_TESTNET_API_KEY
-   :alchemyEthereumMainnetToken config/ALCHEMY_ETHEREUM_MAINNET_TOKEN
-   :alchemyEthereumGoerliToken  config/ALCHEMY_ETHEREUM_GOERLI_TOKEN
-   :alchemyEthereumSepoliaToken config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN
-   :alchemyOptimismMainnetToken config/ALCHEMY_OPTIMISM_MAINNET_TOKEN
-   :alchemyOptimismGoerliToken  config/ALCHEMY_OPTIMISM_GOERLI_TOKEN
-   :alchemyOptimismSepoliaToken config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN
-   :alchemyArbitrumMainnetToken config/ALCHEMY_ARBITRUM_MAINNET_TOKEN
-   :alchemyArbitrumGoerliToken  config/ALCHEMY_ARBITRUM_GOERLI_TOKEN
-   :alchemyArbitrumSepoliaToken config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN})
+   :wakuV2Nameserver              "8.8.8.8"
+   :statusProxyEnabled            config/status-proxy-enabled?
+   :statusProxyMarketUser         config/STATUS_BUILD_PROXY_USER
+   :statusProxyMarketPassword     config/STATUS_BUILD_PROXY_PASSWORD
+   :statusProxyBlockchainUser     config/STATUS_BUILD_PROXY_USER
+   :statusProxyBlockchainPassword config/STATUS_BUILD_PROXY_PASSWORD
+   :openseaAPIKey                 config/opensea-api-key
+   :poktToken                     config/POKT_TOKEN
+   :infuraToken                   config/INFURA_TOKEN
+   :raribleMainnetAPIKey          config/RARIBLE_MAINNET_API_KEY
+   :raribleTestnetAPIKey          config/RARIBLE_TESTNET_API_KEY
+   :alchemyEthereumMainnetToken   config/ALCHEMY_ETHEREUM_MAINNET_TOKEN
+   :alchemyEthereumGoerliToken    config/ALCHEMY_ETHEREUM_GOERLI_TOKEN
+   :alchemyEthereumSepoliaToken   config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN
+   :alchemyOptimismMainnetToken   config/ALCHEMY_OPTIMISM_MAINNET_TOKEN
+   :alchemyOptimismGoerliToken    config/ALCHEMY_OPTIMISM_GOERLI_TOKEN
+   :alchemyOptimismSepoliaToken   config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN
+   :alchemyArbitrumMainnetToken   config/ALCHEMY_ARBITRUM_MAINNET_TOKEN
+   :alchemyArbitrumGoerliToken    config/ALCHEMY_ARBITRUM_GOERLI_TOKEN
+   :alchemyArbitrumSepoliaToken   config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN})

 (defn create
  []
@@ -54,7 +54,7 @@
                    (update :profile/login #(select-profile % key-uid)))
                db-with-settings)
          :fx [[:dispatch [:init-root :screen/profile.profiles]]
-               (when key-uid
+               (when (and key-uid userConfirmed)
                 [:effects.biometric/check-if-available
                  {:key-uid    key-uid
                   :on-success (fn [auth-method]
@@ -1,11 +1,9 @@
 (ns status-im.contexts.profile.login.events
  (:require
    [legacy.status-im.data-store.settings :as data-store.settings]
-    [legacy.status-im.mailserver.core :as mailserver]
    [native-module.core :as native-module]
    [status-im.common.keychain.events :as keychain]
    [status-im.config :as config]
-    [status-im.constants :as constants]
    status-im.contexts.profile.login.effects
    [status-im.contexts.profile.rpc :as profile.rpc]
    [status-im.feature-flags :as ff]
@@ -81,11 +79,7 @@
                  [[:dispatch [:onboarding/finalize-setup]]]

                  :else
-                  [[:profile.settings/switch-theme-fx
-                    [(or (:appearance settings)
-                         constants/theme-type-dark)
-                     :shell-stack]]
-                   [:dispatch [:init-root :shell-stack]]
+                  [[:dispatch [:init-root :shell-stack]]
                   [:dispatch [:profile/show-testnet-mode-banner-if-enabled]]]))})))

 ;; login phase 2: we want to load and show chats faster, so we split login into 2 phases
@@ -99,7 +93,7 @@
           ;; thread to process more important events first, but we can't delay
           ;; too much otherwise the UX may degrade due to stale data.
           [:dispatch-later [{:ms 1500 :dispatch [:profile.login/non-critical-initialization]}]]
-           [:dispatch [:mobile-network/on-network-status-change]]
+           [:dispatch [:network/check-expensive-connection]]
           [:profile.settings/get-profile-picture key-uid]
           (when (ff/enabled? ::ff/wallet.wallet-connect)
             [:dispatch [:wallet-connect/init]])
@@ -131,11 +125,9 @@
              :on-error   #(log/error "node-info: failed error" %)}]]]})))

 (rf/reg-event-fx :profile.login/messenger-started
- (fn [{:keys [db]} [{:keys [mailservers]}]]
+ (fn [{:keys [db]} [_]]
   (let [new-account? (get db :onboarding/new-account?)]
-     {:db (-> db
-              (assoc :messenger/started? true)
-              (mailserver/add-mailservers mailservers))
+     {:db (assoc db :messenger/started? true)
      :fx [[:fetch-chats-preview
            {:on-success (fn [result]
                           (rf/dispatch [:chats-list/load-success result])
@@ -1,10 +1,7 @@
 (ns status-im.contexts.profile.settings.effects
  (:require [native-module.core :as native-module]
            [re-frame.core :as re-frame]
-            [react-native.platform :as platform]
-            [status-im.common.theme.core :as theme]
-            [status-im.constants :as constants]
-            [utils.re-frame :as rf]))
+            [react-native.platform :as platform]))

 (re-frame/reg-fx
 :profile.settings/blank-preview-flag-changed
@@ -16,15 +13,3 @@
 (fn [value]
   (when platform/android?
     (native-module/toggle-webview-debug value))))
-
-(re-frame/reg-fx
- :profile.settings/switch-theme-fx
- (fn [[theme-type view-id]]
-   (let [theme (if (or (= theme-type constants/theme-type-dark)
-                       (and (= theme-type constants/theme-type-system)
-                            (theme/device-theme-dark?)))
-                 :dark
-                 :light)]
-     (theme/set-legacy-theme theme)
-     (rf/dispatch [:theme/switch theme])
-     (rf/dispatch [:reload-status-nav-color view-id]))))
@@ -95,14 +95,7 @@
 (rf/reg-event-fx :profile.settings/change-appearance
 (fn [_ [theme]]
   {:fx [[:dispatch [:profile.settings/profile-update :appearance theme]]
-         [:profile.settings/switch-theme-fx [theme :appearance]]]}))
-
-(rf/reg-event-fx :profile.settings/switch-theme
- (fn [{:keys [db]} [theme view-id]]
-   (let [theme (or theme
-                   (get-in db [:profile/profile :appearance])
-                   constants/theme-type-dark)]
-     {:fx [[:profile.settings/switch-theme-fx [theme view-id]]]})))
+         [:dispatch [:theme/switch {:theme-type theme}]]]}))

 (rf/reg-fx :profile.settings/get-profile-picture
 (fn [key-uid]
@@ -68,7 +68,7 @@
     :blur?       true
     :action      :arrow}
    {:title       (i18n/label :t/syncing)
-     :on-press    #(rf/dispatch [:open-modal :settings-syncing])
+     :on-press    #(rf/dispatch [:open-modal :screen/settings.syncing])
     :image-props :i/syncing
     :image       :icon
     :blur?       true
@@ -0,0 +1,52 @@
+(ns status-im.contexts.profile.settings.screens.syncing.view
+  (:require
+    [quo.core :as quo]
+    [status-im.common.data-confirmation-sheet.view :as data-confirmation-sheet]
+    [utils.i18n :as i18n]
+    [utils.navigation :as navigation]
+    [utils.re-frame :as rf]))
+
+(defn- open-paired-devices-list
+  []
+  (rf/dispatch [:open-modal :screen/paired-devices]))
+
+(defn- open-data-confirmation-sheet
+  []
+  (rf/dispatch
+   [:show-bottom-sheet
+    {:content (fn [] [data-confirmation-sheet/view])
+     :shell?  true
+     :theme   :dark}]))
+
+(defn view
+  []
+  (let [pairing-devices-count      (rf/sub [:pairing/paired-devices-count])
+        syncing-on-mobile-network? (rf/sub [:profile/syncing-on-mobile-network?])]
+    [quo/overlay {:type :shell :top-inset? true}
+     [quo/page-nav
+      {:background :blur
+       :icon-name  :i/arrow-left
+       :on-press   navigation/navigate-back}]
+     [quo/page-top {:title (i18n/label :t/syncing)}]
+     [quo/category
+      {:data      [{:title             (i18n/label :t/sync-and-backup)
+                    :description       :text
+                    :description-props {:text (if syncing-on-mobile-network?
+                                                (i18n/label :t/wifi-and-mobile-data)
+                                                (i18n/label :t/mobile-network-use-wifi))}
+                    :on-press          open-data-confirmation-sheet
+                    :blur?             true
+                    :image-props       :i/syncing
+                    :image             :icon
+                    :action            :arrow}
+                   {:title             (i18n/label :t/paired-devices)
+                    :description       :text
+                    :description-props {:text (i18n/label :t/devices-count
+                                                          {:number pairing-devices-count})}
+                    :on-press          open-paired-devices-list
+                    :image-props       :i/mobile
+                    :image             :icon
+                    :blur?             true
+                    :action            :arrow}]
+       :blur?     true
+       :list-type :settings}]]))
@@ -1,33 +1,47 @@
 (ns status-im.contexts.shell.qr-reader.sheets.scanned-wallet-address
  (:require
    [quo.core :as quo]
-    [status-im.contexts.wallet.common.utils :as utils]
-    [status-im.contexts.wallet.common.utils.networks :as network-utils]
+    [react-native.clipboard :as clipboard]
    [status-im.feature-flags :as ff]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

+(defn- copy-address
+  [address]
+  (clipboard/set-string address)
+  (rf/dispatch [:toasts/upsert
+                {:type :positive
+                 :text (i18n/label :t/address-copied)}]))
+
+#_(defn- send-to-address
+    [address]
+    (let [[_ split-address] (network-utils/split-network-full-address address)]
+      (rf/dispatch
+       [:wallet/select-send-address
+        {:address     address
+         :recipient   {:recipient-type :address
+                       :label          (utils/get-shortened-address split-address)}
+         :stack-id    :wallet-select-address
+         :start-flow? true}])))
+
 (defn view
  [address]
-  (let [[_ splitted-address] (network-utils/split-network-full-address address)]
-    [:<>
-     [quo/drawer-top
-      {:title address
-       :type  :address}]
-     [quo/action-drawer
-      [[{:icon                :i/send
+  [:<>
+   [quo/drawer-top {:title address :type :address}]
+   [quo/action-drawer
+    [[{:icon                :i/copy
+       :accessibility-label :send-asset
+       :label               (i18n/label :t/copy-address)
+       :on-press            #(copy-address address)}
+      ;; Originally, the flow went to the send flow, but it has been removed to avoid bugs,
+      ;; please check https://github.com/status-im/status-mobile/issues/20972 for more context
+      ;; The previous code has been commented out to be reintroduced in the future easily.
+      #_{:icon                :i/send
         :accessibility-label :send-asset
         :label               (i18n/label :t/send-to-this-address)
-         :on-press            (fn []
-                                (rf/dispatch [:wallet/select-send-address
-                                              {:address     address
-                                               :recipient   {:recipient-type :address
-                                                             :label          (utils/get-shortened-address
-                                                                              splitted-address)}
-                                               :stack-id    :wallet-select-address
-                                               :start-flow? true}]))}
-        (when (ff/enabled? :ff/wallet.saved-addresses)
-          {:icon                :i/save
-           :accessibility-label :save-address
-           :label               (i18n/label :t/save-address)
-           :on-press            #(js/alert "feature not implemented")})]]]]))
+         :on-press            #(send-to-address address)}
+      (when (ff/enabled? :ff/wallet.saved-addresses)
+        {:icon                :i/save
+         :accessibility-label :save-address
+         :label               (i18n/label :t/save-address)
+         :on-press            #(js/alert "feature not implemented")})]]]])
@@ -54,7 +54,7 @@
        {:size   :heading-1
         :weight :semi-bold
         :style  {:color colors/white}}
-        (i18n/label :t/syncing)]
+        (i18n/label :t/paired-devices)]
       [quo/button
        {:size                32
         :type                :primary
@@ -58,9 +58,7 @@
                                         {:content buy-token/view}])
         :bridge-action   (fn []
                            (rf/dispatch [:wallet/clean-send-data])
-                            (rf/dispatch [:wallet/wizard-navigate-forward
-                                          {:start-flow? true
-                                           :flow-id     :wallet-bridge-flow}]))
+                            (rf/dispatch [:wallet/start-bridge]))
         :swap-action     (when (ff/enabled? ::ff/wallet.swap)
                            #(rf/dispatch [:wallet.swap/start]))}])
     [quo/tabs
@@ -6,11 +6,12 @@

 (defn collectible-balance
  [collectible]
-  (-> collectible
-      :ownership
-      first
-      :balance
-      js/parseInt))
+  (let [balance (-> collectible
+                    :ownership
+                    first
+                    :balance
+                    js/parseInt)]
+    (if (js/Number.isNaN balance) 0 balance)))

 (def supported-collectible-types
  #{"image/jpeg"
@@ -9,6 +9,7 @@
  [{token-symbol  :symbol
    token-name    :name
    total-balance :total-balance
+    disabled?     :bridge-disabled?
    :as           token}
   _ _
   {:keys [currency currency-symbol on-token-press preselected-token-symbol]}]
@@ -25,7 +26,9 @@
      :fiat-value  fiat-formatted
      :networks    (seq (:networks token))
      :on-press    #(on-token-press token)
-      :state       (when (= preselected-token-symbol token-symbol)
+      :state       (cond
+                     disabled? :disabled
+                     (= preselected-token-symbol token-symbol)
                     :selected)}]))

 (defn view
@@ -1,9 +1,11 @@
 (ns status-im.contexts.wallet.common.token-value.view
  (:require [quo.core :as quo]
            [status-im.common.not-implemented :as not-implemented]
+            [status-im.contexts.wallet.send.utils :as send-utils]
            [status-im.contexts.wallet.sheets.buy-token.view :as buy-token]
            [status-im.feature-flags :as ff]
            [utils.i18n :as i18n]
+            [utils.money :as money]
            [utils.re-frame :as rf]))

 (defn- action-buy
@@ -20,6 +22,7 @@
  {:icon                :i/send
   :accessibility-label :send
   :label               (i18n/label :t/send)
+   :disabled?           (:disabled? send-params)
   :on-press            (fn []
                          (rf/dispatch [:hide-bottom-sheet])
                          (rf/dispatch [:wallet/clean-send-data])
@@ -39,6 +42,7 @@
  {:icon                :i/bridge
   :accessibility-label :bridge
   :label               (i18n/label :t/bridge)
+   :disabled?           (:bridge-disabled? bridge-params)
   :on-press            (fn []
                          (rf/dispatch [:hide-bottom-sheet])
                          (rf/dispatch [:wallet/bridge-select-token bridge-params]))})
@@ -67,20 +71,35 @@

 (defn token-value-drawer
  [token watch-only? entry-point]
-  (let [token-symbol          (:token token)
-        token-data            (first (rf/sub [:wallet/current-viewing-account-tokens-filtered
-                                              token-symbol]))
-        selected-account?     (rf/sub [:wallet/current-viewing-account-address])
-        token-owners          (rf/sub [:wallet/operable-addresses-with-token-symbol token-symbol])
-        send-or-bridge-params (if selected-account?
-                                {:token       token-data
-                                 :stack-id    :screen/wallet.accounts
-                                 :start-flow? true
-                                 :owners      token-owners}
-                                {:token-symbol token-symbol
-                                 :stack-id     :wallet-stack
-                                 :start-flow?  true
-                                 :owners       token-owners})]
+  (let [token-symbol           (:token token)
+        token-data             (first (rf/sub [:wallet/current-viewing-account-tokens-filtered
+                                               token-symbol]))
+        fiat-unformatted-value (get-in token [:values :fiat-unformatted-value])
+        has-balance?           (money/greater-than fiat-unformatted-value (money/bignumber "0"))
+        selected-account?      (rf/sub [:wallet/current-viewing-account-address])
+        token-owners           (rf/sub [:wallet/operable-addresses-with-token-symbol token-symbol])
+        send-params            (if selected-account?
+                                 {:token       token-data
+                                  :stack-id    :screen/wallet.accounts
+                                  :disabled?   (not has-balance?)
+                                  :start-flow? true
+                                  :owners      token-owners}
+                                 {:token-symbol token-symbol
+                                  :stack-id     :wallet-stack
+                                  :start-flow?  true
+                                  :owners       token-owners})
+        bridge-params          (if selected-account?
+                                 {:token            token-data
+                                  :bridge-disabled? (or (not has-balance?)
+                                                        (send-utils/bridge-disabled? token-symbol))
+                                  :stack-id         :screen/wallet.accounts
+                                  :start-flow?      true
+                                  :owners           token-owners}
+                                 {:token-symbol     token-symbol
+                                  :bridge-disabled? (send-utils/bridge-disabled? token-symbol)
+                                  :stack-id         :wallet-stack
+                                  :start-flow?      true
+                                  :owners           token-owners})]
    [quo/action-drawer
     [(cond->> [(when (ff/enabled? ::ff/wallet.assets-modal-manage-tokens)
                  (action-manage-tokens watch-only?))
@@ -88,11 +107,11 @@
                  (action-hide))]
        (not watch-only?) (concat [(action-buy)
                                   (when (seq token-owners)
-                                     (action-send send-or-bridge-params entry-point))
+                                     (action-send send-params entry-point))
                                   (action-receive selected-account?)
                                   (when (ff/enabled? ::ff/wallet.swap) (action-swap))
                                   (when (seq (seq token-owners))
-                                     (action-bridge send-or-bridge-params))]))]]))
+                                     (action-bridge bridge-params))]))]]))

 (defn view
  [item _ _ {:keys [watch-only? entry-point]}]
@@ -213,8 +213,7 @@
  [new-path]
  (let [bonder-fees (:tx-bonder-fees new-path)
        token-fees  (+ (money/wei->ether bonder-fees)
-                       (money/wei->ether
-                        (:tx-token-fees new-path)))]
+                       (money/wei->ether (:tx-token-fees new-path)))]
    {:from                      (:from-chain new-path)
     :amount-in-locked          (:amount-in-locked new-path)
     :amount-in                 (:amount-in new-path)
@@ -274,7 +274,7 @@
 (rf/reg-event-fx :wallet/get-keypairs get-keypairs)

 (rf/reg-event-fx :wallet/bridge-select-token
- (fn [{:keys [db]} [{:keys [token token-symbol stack-id]}]]
+ (fn [{:keys [db]} [{:keys [token token-symbol stack-id start-flow?]}]]
   (let [missing-recipient? (-> db :wallet :ui :send :to-address nil?)
         to-address         (-> db :wallet :current-viewing-account-address)]
     {:db (cond-> db
@@ -285,13 +285,17 @@
      :fx [[:dispatch
            [:wallet/wizard-navigate-forward
             {:current-screen stack-id
-              :start-flow?    true
+              :start-flow?    start-flow?
              :flow-id        :wallet-bridge-flow}]]]})))

 (rf/reg-event-fx :wallet/start-bridge
 (fn [{:keys [db]}]
   {:db (assoc-in db [:wallet :ui :send :tx-type] :tx/bridge)
-    :fx [[:dispatch [:open-modal :screen/wallet.bridge-select-asset]]]}))
+    :fx [[:dispatch
+          [:wallet/wizard-navigate-forward
+           {:start-flow? true
+            :flow-id     :wallet-bridge-flow}]]]}))
+

 (rf/reg-event-fx :wallet/select-bridge-network
 (fn [{:keys [db]} [{:keys [network-chain-id stack-id]}]]
@@ -21,12 +21,13 @@
      :label               (i18n/label :t/add-account)
      :sub-label           (i18n/label :t/add-account-description)
      :on-press            #(rf/dispatch [:navigate-to :screen/wallet.create-account])}
-     {:icon                :i/reveal
-      :accessibility-label :add-a-contact
-      :label               (i18n/label :t/add-address-to-watch)
-      :sub-label           (i18n/label :t/add-address-to-watch-description)
-      :on-press            #(rf/dispatch [:navigate-to :screen/wallet.add-address-to-watch])
-      :add-divider?        true}]]])
+     (when (ff/enabled? ::ff/wallet.add-watched-address)
+       {:icon                :i/reveal
+        :accessibility-label :add-a-contact
+        :label               (i18n/label :t/add-address-to-watch)
+        :sub-label           (i18n/label :t/add-address-to-watch-description)
+        :on-press            #(rf/dispatch [:navigate-to :screen/wallet.add-address-to-watch])
+        :add-divider?        true})]]])

 (defn- new-account-card-data
  []
@@ -10,6 +10,7 @@
    [status-im.contexts.wallet.send.utils :as send-utils]
    [taoensso.timbre :as log]
    [utils.address :as address]
+    [utils.hex :as utils.hex]
    [utils.money :as money]
    [utils.number]
    [utils.re-frame :as rf]))
@@ -76,11 +77,11 @@
                                           :token-networks-ids token-networks-ids
                                           :tx-type            tx-type
                                           :receiver?          true})
-                                         (->
+                                         (cond->
                                           (send-utils/reset-loading-network-amounts-to-zero
                                            receiver-network-values)
-                                           vec
-                                           (conj {:type :edit})))
+
+                                           (not= tx-type :tx/bridge) (conj {:type :edit})))
         network-links                 (when routes-available?
                                         (send-utils/network-links chosen-route
                                                                   sender-network-values
@@ -104,9 +105,7 @@
         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)
+              (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)
@@ -206,7 +205,7 @@
       {:db (cond-> db
              :always      (update-in [:wallet :ui :send]
                                      #(-> %
-                                           (dissoc :collectible)
+                                           (dissoc :collectible :tx-type)
                                           (assoc :token-not-supported-in-receiver-networks?
                                                  unsupported-token?)))
              token-symbol (assoc-in [:wallet :ui :send :token-symbol] token-symbol)
@@ -218,6 +217,11 @@
              entry-point  (assoc-in [:wallet :ui :send :entry-point] entry-point))
        :fx [[:dispatch [:wallet/clean-suggested-routes]]
             [:dispatch
+              ;; ^:flush-dom allows us to make sure the re-frame DB state is always synced
+              ;; before the navigation occurs, so the new screen is always rendered with
+              ;; the DB state set by this event.  By adding the metadata we are omitting
+              ;; a 1-frame blink when the screen is mounted.
+              ^:flush-dom
              [:wallet/wizard-navigate-forward
               {:current-screen stack-id
                :start-flow?    start-flow?
@@ -402,11 +406,11 @@
                                                      receiver-networks)))
                                         network-chain-ids))
         from-locked-amount (update-vals from-locked-amounts to-hex)
-         transaction-type (case tx-type
-                            :tx/collectible-erc-721  constants/send-type-erc-721-transfer
-                            :tx/collectible-erc-1155 constants/send-type-erc-1155-transfer
-                            :tx/bridge               constants/send-type-bridge
-                            constants/send-type-transfer)
+         send-type (case tx-type
+                     :tx/collectible-erc-721  constants/send-type-erc-721-transfer
+                     :tx/collectible-erc-1155 constants/send-type-erc-1155-transfer
+                     :tx/bridge               constants/send-type-bridge
+                     constants/send-type-transfer)
         balances-per-chain (when token (:balances-per-chain token))
         sender-token-available-networks-for-suggested-routes
         (when token
@@ -447,7 +451,7 @@
                                     :tx-type tx-type
                                     :receiver? true}))
         params [{:uuid                 (str (random-uuid))
-                  :sendType             transaction-type
+                  :sendType             send-type
                  :addrFrom             from-address
                  :addrTo               to-address
                  :amountIn             amount-in
@@ -490,24 +494,48 @@
                                            {:event :wallet/stop-get-suggested-routes
                                             :error error}))}]}))

-(rf/reg-event-fx :wallet/handle-suggested-routes
+(defn- bridge-amount-greater-than-bonder-fees?
+  [{{token-decimals :decimals} :from-token
+    bonder-fees                :tx-bonder-fees
+    amount-in                  :amount-in}]
+  (let [bonder-fees      (utils.money/token->unit bonder-fees token-decimals)
+        amount-to-bridge (utils.money/token->unit amount-in token-decimals)]
+    (> amount-to-bridge bonder-fees)))
+
+(defn- remove-multichain-routes
+  [routes]
+  (if (> (count routes) 1)
+    [] ;; if route is multichain, we remove it
+    routes))
+
+(defn- remove-invalid-bonder-fees-routes
+  [routes]
+  (filter bridge-amount-greater-than-bonder-fees? routes))
+
+(defn- ->old-route-paths
+  [routes]
+  (map data-store/new->old-route-path routes))
+
+(rf/reg-event-fx
+ :wallet/handle-suggested-routes
 (fn [_ data]
-   (if-let [error (some-> data
-                          first
-                          :ErrorResponse
-                          (#(if (= (:code %) "0") "An error occurred" (:details %))))]
-     (do
+   (if-let [{:keys [code details]} (-> data :ErrorResponse first)]
+     (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})
-       {:fx [[:dispatch [:wallet/suggested-routes-error error]]]})
-     (let [suggested-routes-new-data (data-store/rpc->suggested-routes data)
-           suggested-routes          (-> suggested-routes-new-data
-                                         first
-                                         (update :best #(map data-store/new->old-route-path %))
-                                         (update :candidates #(map data-store/new->old-route-path %)))]
-       {:fx [[:dispatch
-              [:wallet/suggested-routes-success suggested-routes]]]}))))
+                   :error error-message})
+       {:fx [[: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
+                               (first)
+                               (data-store/rpc->suggested-routes)
+                               (update :best best-routes-fix)
+                               (update :candidates candidates-fix))]
+       {:fx [[:dispatch [:wallet/suggested-routes-success routes]]]}))))

 (rf/reg-event-fx :wallet/add-authorized-transaction
 (fn [{:keys [db]} [transaction]]
@@ -581,6 +609,29 @@
                                       :gwei
                                       gas-price))))))

+(defn- approval-path
+  [{:keys [route from-address to-address token-address]}]
+  (let [{:keys [from]}                     route
+        from-chain-id                      (:chain-id from)
+        approval-amount-required           (:approval-amount-required route)
+        approval-amount-required-sanitized (-> approval-amount-required
+                                               (utils.hex/normalize-hex)
+                                               (native-module/hex-to-number))
+        approval-contract-address          (:approval-contract-address route)
+        data                               (native-module/encode-function-call
+                                            constants/contract-function-signature-erc20-approve
+                                            [approval-contract-address
+                                             approval-amount-required-sanitized])
+        tx-data                            (transaction-data {:from-address  from-address
+                                                              :to-address    to-address
+                                                              :token-address token-address
+                                                              :route         route
+                                                              :data          data
+                                                              :eth-transfer? false})]
+    {:BridgeName constants/bridge-name-transfer
+     :ChainID    from-chain-id
+     :TransferTx tx-data}))
+
 (defn- transaction-path
  [{:keys [from-address to-address token-id token-address route data eth-transfer?]}]
  (let [{:keys [bridge-name amount-in bonder-fees from
@@ -617,7 +668,8 @@
      (= bridge-name constants/bridge-name-hop)
      (assoc :HopTx
             (assoc tx-data
-                    :ChainID   to-chain-id
+                    :ChainID   from-chain-id
+                    :ChainIDTo to-chain-id
                    :Symbol    token-id
                    :Recipient to-address
                    :Amount    amount-in
@@ -634,14 +686,14 @@
                    :Amount    amount-in)))))

 (defn- multi-transaction-command
-  [{:keys [from-address to-address from-asset to-asset amount-out transfer-type]
-    :or   {transfer-type constants/send-type-transfer}}]
+  [{:keys [from-address to-address from-asset to-asset amount-out multi-transaction-type]
+    :or   {multi-transaction-type constants/multi-transaction-type-unknown}}]
  {:fromAddress from-address
   :toAddress   to-address
   :fromAsset   from-asset
   :toAsset     to-asset
   :fromAmount  amount-out
-   :type        transfer-type})
+   :type        multi-transaction-type})

 (rf/reg-event-fx :wallet/send-transaction
 (fn [{:keys [db]} [sha3-pwd]]
@@ -649,11 +701,9 @@
         first-route (first routes)
         from-address (get-in db [:wallet :current-viewing-account-address])
         transaction-type (get-in db [:wallet :ui :send :tx-type])
-         transaction-type-param (case transaction-type
-                                  :tx/collectible-erc-721  constants/send-type-erc-721-transfer
-                                  :tx/collectible-erc-1155 constants/send-type-erc-1155-transfer
-                                  :tx/bridge               constants/send-type-bridge
-                                  constants/send-type-transfer)
+         multi-transaction-type (if (= :tx/bridge transaction-type)
+                                  constants/multi-transaction-type-bridge
+                                  constants/multi-transaction-type-send)
         token (get-in db [:wallet :ui :send :token])
         collectible (get-in db [:wallet :ui :send :collectible])
         first-route-from-chain-id (get-in first-route [:from :chain-id])
@@ -668,30 +718,41 @@
                             erc20-transfer?
                             (get-in token [:balances-per-chain first-route-from-chain-id :address]))
         to-address (get-in db [:wallet :ui :send :to-address])
-         transaction-paths (mapv (fn [route]
-                                   (let [data (when erc20-transfer?
-                                                (native-module/encode-transfer
-                                                 (address/normalized-hex to-address)
-                                                 (:amount-in route)))]
-                                     (transaction-path {:to-address    to-address
-                                                        :from-address  from-address
-                                                        :route         route
-                                                        :token-address token-address
-                                                        :token-id      (if collectible
-                                                                         (money/to-hex (js/parseInt
-                                                                                        token-id))
-                                                                         token-id)
-                                                        :data          data
-                                                        :eth-transfer? eth-transfer?})))
+         transaction-paths (into []
+                                 (mapcat
+                                  (fn [route]
+                                    (let [approval-required? (:approval-required route)
+                                          data               (when erc20-transfer?
+                                                               (native-module/encode-transfer
+                                                                (address/normalized-hex to-address)
+                                                                (:amount-in route)))
+                                          base-path          (transaction-path
+                                                              {:to-address    to-address
+                                                               :from-address  from-address
+                                                               :route         route
+                                                               :token-address token-address
+                                                               :token-id      (if collectible
+                                                                                (money/to-hex
+                                                                                 (js/parseInt token-id))
+                                                                                token-id)
+                                                               :data          data
+                                                               :eth-transfer? eth-transfer?})]
+                                      (if approval-required?
+                                        [(approval-path {:route         route
+                                                         :token-address token-address
+                                                         :from-address  from-address
+                                                         :to-address    to-address})
+                                         base-path]
+                                        [base-path]))))
                                 routes)
         request-params
         [(multi-transaction-command
-           {:from-address  from-address
-            :to-address    to-address
-            :from-asset    token-id
-            :to-asset      token-id
-            :amount-out    (if eth-transfer? (:amount-out first-route) "0x0")
-            :transfer-type transaction-type-param})
+           {:from-address           from-address
+            :to-address             to-address
+            :from-asset             token-id
+            :to-asset               token-id
+            :amount-out             (if eth-transfer? (:amount-out first-route) "0x0")
+            :multi-transaction-type multi-transaction-type})
          transaction-paths
          sha3-pwd]]
     (log/info "multi transaction called")
@@ -1,6 +1,7 @@
 (ns status-im.contexts.wallet.send.events-test
  (:require
-    [cljs.test :refer-macros [is testing]]
+    [cljs.test :refer-macros [is testing run-tests]]
+    matcher-combinators.test
    [re-frame.db :as rf-db]
    [status-im.contexts.wallet.common.utils.networks :as network-utils]
    status-im.contexts.wallet.send.events
@@ -14,7 +15,10 @@
   :description
   "dogs are cute and this one is the cutestdogs are cute and this one is the cutest"
   :ownership [{:address "0x01"
-                :balance balance}]})
+                :balance balance}]
+   :id {:contract-id {:address  "0x11"
+                      :chain-id 1}
+        :token-id    "some-id"}})

 (h/deftest-event :wallet/update-receiver-networks
  [event-id dispatch]
@@ -170,13 +174,14 @@
                           :networks #{{:chain-id 421614}
                                       {:chain-id 11155420}
                                       {:chain-id 11155111}}}
-        receiver-networks [421614 11155420]]
+        receiver-networks [421614 11155420]
+        expected-db       {:wallet {:ui {:other-props :value}}}]
    (reset! rf-db/app-db
      {:wallet {:ui {:send        {:token-display-name token-symbol
                                   :token              token
                                   :receiver-networks  receiver-networks}
                     :other-props :value}}})
-    (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui]) :send)))))
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))

 (h/deftest-event :wallet/select-address-tab
  [event-id dispatch]
@@ -187,38 +192,37 @@

 (h/deftest-event :wallet/clean-send-address
  [event-id dispatch]
-  (reset! rf-db/app-db
-    {:wallet {:ui {:send {:to-address  "0x01"
-                          :recipient   {:recipient-type :saved-address
-                                        :label          "label"}
-                          :other-props :value}}}})
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :to-address)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :recipient)))
-  (is (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :other-props)))
+  (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:to-address  "0x01"
+                            :recipient   {:recipient-type :saved-address
+                                          :label          "label"}
+                            :other-props :value}}}})
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))

 (h/deftest-event :wallet/clean-send-amount
  [event-id dispatch]
-  (reset! rf-db/app-db
-    {:wallet {:ui {:send {:amount      10
-                          :other-props :value}}}})
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :amount)))
-  (is (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :other-props)))
+  (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:amount      10
+                            :other-props :value}}}})
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))

 (h/deftest-event :wallet/clean-disabled-from-networks
  [event-id dispatch]
-  (reset! rf-db/app-db
-    {:wallet {:ui {:send {:disabled-from-chain-ids [:optimism]
-                          :other-props             :value}}}})
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :disabled-from-chain-ids)))
-  (is (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :other-props)))
+  (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:disabled-from-chain-ids [:optimism]
+                            :other-props             :value}}}})
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))

 (h/deftest-event :wallet/clean-from-locked-amounts
  [event-id dispatch]
-  (reset! rf-db/app-db
-    {:wallet {:ui {:send {:from-locked-amounts "value"
-                          :other-props         :value}}}})
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :from-locked-amounts)))
-  (is (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :other-props)))
+  (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:from-locked-amounts "value"
+                            :other-props         :value}}}})
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))

 (h/deftest-event :wallet/disable-from-networks
  [event-id dispatch]
@@ -247,55 +251,42 @@

 (h/deftest-event :wallet/clean-selected-token
  [event-id dispatch]
-  (reset! rf-db/app-db
-    {:wallet {:ui {:send {:other-props        :value
-                          :token              "ETH"
-                          :token-display-name "ETH"
-                          :tx-type            :tx/collectible-erc-721}}}})
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :token)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :token-display-name)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :tx-type)))
-  (is (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :other-props)))
+  (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:other-props        :value
+                            :token              "ETH"
+                            :token-display-name "ETH"
+                            :tx-type            :tx/collectible-erc-721}}}})
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))

 (h/deftest-event :wallet/clean-selected-collectible
  [event-id dispatch]
-  (reset! rf-db/app-db
-    {:wallet {:ui {:send {:other-props        :value
-                          :collectible        "ETH"
-                          :token-display-name "ETH"
-                          :amount             10}}}})
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :collectible)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :token-display-name)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :amount)))
-  (is (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :other-props)))
+  (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:other-props        :value
+                            :collectible        "ETH"
+                            :token-display-name "ETH"
+                            :amount             10}}}})
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))

 (h/deftest-event :wallet/clean-suggested-routes
  [event-id dispatch]
-  (reset! rf-db/app-db
-    {:wallet {:ui {:send
-                   {:other-props               :value
-                    :suggested-routes          ["1" "2"]
-                    :route                     "1"
-                    :amount                    10
-                    :from-values-by-chain      [{:chain-id 1} {:chain-id 10} {:chain-id 42161}]
-                    :to-values-by-chain        [{:chain-id 1} {:chain-id 10} {:chain-id 42161}]
-                    :sender-network-values     [:eth :arb1]
-                    :receiver-network-values   [:eth :arb1]
-                    :network-links             [{:from-chain-id 1
-                                                 :to-chain-id   10
-                                                 :position-diff 1}]
-                    :loading-suggested-routes? false}}}})
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :suggested-routes)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :route)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :amount)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :from-values-by-chain)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :to-values-by-chain)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :sender-network-values)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :receiver-network-values)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :network-links)))
-  (is (not (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send])
-                      :loading-suggested-routes?)))
-  (is (contains? (get-in (dispatch [event-id]) [:db :wallet :ui :send]) :other-props)))
+  (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send
+                     {:other-props               :value
+                      :suggested-routes          ["1" "2"]
+                      :route                     "1"
+                      :amount                    10
+                      :from-values-by-chain      [{:chain-id 1} {:chain-id 10} {:chain-id 42161}]
+                      :to-values-by-chain        [{:chain-id 1} {:chain-id 10} {:chain-id 42161}]
+                      :sender-network-values     [:eth :arb1]
+                      :receiver-network-values   [:eth :arb1]
+                      :network-links             [{:from-chain-id 1
+                                                   :to-chain-id   10
+                                                   :position-diff 1}]
+                      :loading-suggested-routes? false}}}})
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))

 (h/deftest-event :wallet/suggested-routes-error
  [event-id dispatch]
@@ -453,3 +444,287 @@
                                :recipient   recipient
                                :stack-id    stack-id
                                :start-flow? start-flow?}])))))))
+
+(h/deftest-event :wallet/suggested-routes-success
+  [event-id dispatch]
+  (let [timestamp                     :timestamp
+        suggested-routes              {:Best
+                                       [{:From           {:isTest    false
+                                                          :chainName "Arbitrum"
+                                                          :chainId   42161}
+                                         :AmountInLocked false
+                                         :AmountIn       "0x5af3107a4000"
+                                         :MaxAmountIn    "0x4f7920c6831d6"
+                                         :GasFees        {:gasPrice       "0.01"
+                                                          :baseFee        "0.008750001"
+                                                          :eip1559Enabled true}
+                                         :BridgeName     "Transfer"
+                                         :AmountOut      "0x5af3107a4000"
+                                         :To             {:isTest    false
+                                                          :chainName "Arbitrum"
+                                                          :chainId   42161}
+                                         :Cost           "0.006539438247064285301"
+                                         :GasAmount      108197}]
+                                       :Candidates
+                                       [{:From           {:isTest    false
+                                                          :chainName "Arbitrum"
+                                                          :chainId   42161}
+                                         :AmountInLocked false
+                                         :AmountIn       "0x5af3107a4000"
+                                         :MaxAmountIn    "0x4f7920c6831d6"
+                                         :GasFees        {:gasPrice       "0.01"
+                                                          :baseFee        "0.008750001"
+                                                          :eip1559Enabled true}
+                                         :BridgeName     "Transfer"
+                                         :AmountOut      "0x5af3107a4000"
+                                         :To             {:isTest    false
+                                                          :chainName "Arbitrum"
+                                                          :chainId   42161}
+                                         :Cost           "0.006539438247064285301"
+                                         :GasAmount      108197}
+                                        {:From           {:isTest    false
+                                                          :chainName "Ethereum"
+                                                          :chainId   1}
+                                         :AmountInLocked false
+                                         :AmountIn       "0x0"
+                                         :MaxAmountIn    "0x245aa392272e6"
+                                         :GasFees        {:gasPrice       "1.01"
+                                                          :baseFee        "1.008750001"
+                                                          :eip1559Enabled true}
+                                         :BridgeName     "Transfer"
+                                         :AmountOut      "0x0"
+                                         :To             {:isTest    false
+                                                          :chainName "Arbitrum"
+                                                          :chainId   42161}
+                                         :Cost           "1.906539438247064285301"
+                                         :GasAmount      23487}]
+                                       :NativeChainTokenPrice 123
+                                       :TokenPrice 123}
+        suggested-routes-data         suggested-routes
+        chosen-route                  (:best suggested-routes-data)
+        token-symbol                  "ETH"
+        token                         {:symbol   "ETH"
+                                       :name     "Ether"
+                                       :networks #{{:chain-id 421614}
+                                                   {:chain-id 11155420}
+                                                   {:chain-id 11155111}}}
+        token-networks                (:networks token)
+        routes-available?             (pos? (count chosen-route))
+        sender-network-values         [1 10]
+        receiver-network-values       [1 10]
+        receiver-networks             [1 10 421614]
+        token-decimals                (if (collectible-with-balance 1) 0 (:decimals token))
+        native-token?                 (and token (= token-symbol "ETH"))
+        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})
+        to-network-values-for-ui      (send-utils/network-values-for-ui to-network-amounts-by-chain)
+        tx-type                       :tx/collectible-erc-1155
+        from-network-values-for-ui    (send-utils/network-values-for-ui from-network-amounts-by-chain)
+        disabled-from-chain-ids       [:421614]
+        token-networks-ids            (when token-networks (mapv #(:chain-id %) token-networks))
+        sender-possible-chain-ids     (mapv :chain-id sender-network-values)
+        receiver-network-values       (if routes-available?
+                                        (send-utils/network-amounts
+                                         {:network-values     to-network-values-for-ui
+                                          :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)
+
+                                          (not= tx-type :tx/bridge) (conj {:type :edit})))
+        sender-network-values         (if routes-available?
+                                        (send-utils/network-amounts
+                                         {:network-values
+                                          (if (= tx-type :tx/bridge)
+                                            from-network-values-for-ui
+                                            (send-utils/add-zero-values-to-network-values
+                                             from-network-values-for-ui
+                                             sender-possible-chain-ids))
+                                          :disabled-chain-ids disabled-from-chain-ids
+                                          :receiver-networks receiver-networks
+                                          :token-networks-ids token-networks-ids
+                                          :from-locked-amounts {}
+                                          :tx-type tx-type
+                                          :receiver? false})
+                                        (send-utils/reset-loading-network-amounts-to-zero
+                                         sender-network-values))
+        expected-db                   {:wallet {:ui {:send
+                                                     {:other-props :value
+                                                      :suggested-routes suggested-routes-data
+                                                      :route chosen-route
+                                                      :token token
+                                                      :disabled-from-chain-ids disabled-from-chain-ids
+                                                      :suggested-routes-call-timestamp timestamp
+                                                      :collectible (collectible-with-balance 1)
+                                                      :token-display-name token-symbol
+                                                      :receiver-networks receiver-networks
+                                                      :tx-type tx-type
+                                                      :from-values-by-chain from-network-values-for-ui
+                                                      :to-values-by-chain to-network-values-for-ui
+                                                      :sender-network-values sender-network-values
+                                                      :receiver-network-values receiver-network-values
+                                                      :network-links (when routes-available?
+                                                                       (send-utils/network-links
+                                                                        chosen-route
+                                                                        sender-network-values
+                                                                        receiver-network-values))
+                                                      :loading-suggested-routes? false
+                                                      :from-locked-amounts {}}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:other-props                     :value
+                            :suggested-routes-call-timestamp timestamp
+                            :token                           token
+                            :collectible                     (collectible-with-balance 1)
+                            :token-display-name              token-symbol
+                            :receiver-networks               receiver-networks
+                            :receiver-network-values         [1 10]
+                            :sender-network-values           [1 10]
+                            :tx-type                         tx-type
+                            :disabled-from-chain-ids         disabled-from-chain-ids
+                            :from-locked-amounts             {}}}}})
+    (is (match? expected-db (:db (dispatch [event-id suggested-routes timestamp]))))))
+
+(h/deftest-event :wallet/add-authorized-transaction
+  [event-id dispatch]
+  (let [hashes          {:chain-1 ["tx-1" "tx-2" "tx-3"]
+                         :chain-2 ["tx-4" "tx-5"]
+                         :chain-3 ["tx-6" "tx-7" "tx-8" "tx-9"]}
+        transaction-id  "txid-1"
+        expected-result {:db {:wallet {:ui           {:send {:transaction-ids ["tx-1" "tx-2" "tx-3"
+                                                                               "tx-4" "tx-5" "tx-6"
+                                                                               "tx-7" "tx-8" "tx-9"]}}
+                                       :transactions (send-utils/map-multitransaction-by-ids
+                                                      transaction-id
+                                                      hashes)}}
+                         :fx [[:dispatch [:wallet/end-transaction-flow]]
+                              [:dispatch-later
+                               [{:ms       2000
+                                 :dispatch [:wallet/clean-just-completed-transaction]}]]]}]
+    (is (match? expected-result
+                (dispatch [event-id
+                           {:id     transaction-id
+                            :hashes hashes}])))))
+
+(h/deftest-event :wallet/select-from-account
+  [event-id dispatch]
+  (let [stack-id    :screen/stack
+        start-flow? false
+        address     "0x01"]
+    (testing "when tx-type is :tx/bridge and token-symbol is nil"
+      (let [flow-id         :wallet-bridge-flow
+            tx-type         :tx/bridge
+            expected-result {:db {:wallet {:ui {:send {:to-address address
+                                                       :tx-type    tx-type}}}}
+                             :fx [[:dispatch [:wallet/switch-current-viewing-account address]]
+                                  [:dispatch
+                                   [:wallet/wizard-navigate-forward
+                                    {:current-screen stack-id
+                                     :start-flow?    start-flow?
+                                     :flow-id        flow-id}]]]}]
+        (reset! rf-db/app-db {:wallet {:ui {:send {:tx-type tx-type}}}})
+        (is (match? expected-result
+                    (dispatch [event-id
+                               {:address     address
+                                :stack-id    stack-id
+                                :start-flow? start-flow?}])))))
+    (testing "when tx-type is not :tx/bridge and token-symbol is nil"
+      (let [flow-id         :wallet-send-flow
+            tx-type         :tx/collectible-erc-721
+            expected-result {:db {:wallet {:ui {:send {:tx-type tx-type}}}}
+                             :fx [[:dispatch [:wallet/switch-current-viewing-account address]]
+                                  [:dispatch
+                                   [:wallet/wizard-navigate-forward
+                                    {:current-screen stack-id
+                                     :start-flow?    start-flow?
+                                     :flow-id        flow-id}]]]}]
+        (reset! rf-db/app-db {:wallet {:ui {:send {:tx-type tx-type}}}})
+        (is (match? expected-result
+                    (dispatch [event-id
+                               {:address     address
+                                :stack-id    stack-id
+                                :start-flow? start-flow?}])))))
+    (testing "when tx-type is :tx/bridge and token-symbol is not nil"
+      (let [flow-id         :wallet-bridge-flow
+            tx-type         :tx/bridge
+            tokens          [{:symbol             "ETH"
+                              :chain-id           1
+                              :balances-per-chain {1     {:raw-balance (money/bignumber 100)}
+                                                   10    {:raw-balance (money/bignumber 200)}
+                                                   42161 {:raw-balance (money/bignumber 300)}}
+                              :decimals           2}]
+            network-details #{{:chain-id 1}
+                              {:chain-id 10}
+                              {:chain-id 42161}}
+            expected-result {:db {:wallet {:ui       {:send {:to-address   address
+                                                             :tx-type      tx-type
+                                                             :token-symbol "ETH"
+                                                             :token        (assoc (first tokens)
+                                                                                  :networks #{nil}
+                                                                                  :total-balance
+                                                                                  (money/bignumber 6))}}
+                                           :accounts {address {:tokens tokens}}}}
+                             :fx [[:dispatch [:wallet/switch-current-viewing-account address]]
+                                  [:dispatch
+                                   [:wallet/wizard-navigate-forward
+                                    {:current-screen stack-id
+                                     :start-flow?    start-flow?
+                                     :flow-id        flow-id}]]]}]
+        (reset! rf-db/app-db {:wallet {:ui       {:send {:tx-type      tx-type
+                                                         :token-symbol "ETH"}}
+                                       :accounts {address {:tokens tokens}}}})
+        (is (match? expected-result
+                    (dispatch [event-id
+                               {:address        address
+                                :stack-id       stack-id
+                                :start-flow?    start-flow?
+                                :netork-details network-details}])))))
+    (testing "when tx-type is not :tx/bridge and token-symbol is not nil"
+      (let [flow-id         :wallet-send-flow
+            tx-type         :tx/collectible-erc-721
+            tokens          [{:symbol             "ETH"
+                              :chain-id           1
+                              :balances-per-chain {1     {:raw-balance (money/bignumber 100)}
+                                                   10    {:raw-balance (money/bignumber 200)}
+                                                   42161 {:raw-balance (money/bignumber 300)}}
+                              :decimals           2}]
+            network-details #{{:chain-id 1}
+                              {:chain-id 10}
+                              {:chain-id 42161}}
+            expected-result {:db {:wallet {:ui       {:send {:tx-type      tx-type
+                                                             :token-symbol "ETH"
+                                                             :token        (assoc (first tokens)
+                                                                                  :networks #{nil}
+                                                                                  :total-balance
+                                                                                  (money/bignumber 6))}}
+                                           :accounts {address {:tokens tokens}}}}
+                             :fx [[:dispatch [:wallet/switch-current-viewing-account address]]
+                                  [:dispatch
+                                   [:wallet/wizard-navigate-forward
+                                    {:current-screen stack-id
+                                     :start-flow?    start-flow?
+                                     :flow-id        flow-id}]]]}]
+        (reset! rf-db/app-db {:wallet {:ui       {:send {:tx-type      tx-type
+                                                         :token-symbol "ETH"}}
+                                       :accounts {address {:tokens tokens}}}})
+        (is (match? expected-result
+                    (dispatch [event-id
+                               {:address        address
+                                :stack-id       stack-id
+                                :start-flow?    start-flow?
+                                :netork-details network-details}])))))))
+
+(run-tests)
@@ -100,7 +100,8 @@
   :wallet/wallet-send-enabled-from-chain-ids      [1]
   :wallet/wallet-send-amount                      nil
   :wallet/wallet-send-tx-type                     :tx/send
-   :wallet/wallet-send-fee-fiat-formatted          "$5,00"})
+   :wallet/wallet-send-fee-fiat-formatted          "$5,00"
+   :wallet/total-amount                            (money/bignumber "250")})

 (h/describe "Send > input amount screen"
  (h/setup-restorable-re-frame)
@@ -221,9 +221,9 @@
                                                      (number/remove-trailing-zeroes
                                                       (.toFixed (/ input-amount conversion-rate)
                                                                 crypto-decimals)))
-        send-amount                                 (rf/sub [:wallet/wallet-send-amount])
+        total-amount-receiver                       (rf/sub [:wallet/total-amount true])
        amount-text                                 (str (number/remove-trailing-zeroes
-                                                          (.toFixed (js/parseFloat send-amount)
+                                                          (.toFixed total-amount-receiver
                                                                    (min token-decimals 6)))
                                                         " "
                                                         token-symbol)
@@ -124,7 +124,7 @@
          :customization-color (:color account)}]])]))

 (defn- user-summary
-  [{:keys [account-props theme label accessibility-label summary-type recipient account-to?]}]
+  [{:keys [account-props theme label accessibility-label summary-type recipient bridge-tx? account-to?]}]
  (let [network-values    (rf/sub [:wallet/network-values account-to?])
        summary-info-type (case (:recipient-type recipient)
                            :saved-address :saved-account
@@ -144,7 +144,7 @@
       :networks?     true
       :values        network-values
       :account-props (cond-> account-props
-                        account-to?
+                        (and account-to? (not bridge-tx?))
                        (assoc
                         :size                32
                         :name                (:label recipient)
@@ -225,6 +225,7 @@
                                                 bridge-to-chain-id]))
            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)
@@ -249,8 +250,8 @@
                                      [transaction-details
                                       {:estimated-time-min estimated-time-min
                                        :max-fees           fee-formatted
-                                        :token-display-name token-display-name
-                                        :amount             amount
+                                        :token-display-name token-symbol
+                                        :amount             total-amount-receiver
                                        :to-network         bridge-to-network
                                        :theme              theme
                                        :route              route
@@ -298,5 +299,6 @@
                                    from-account-props
                                    user-props)
             :recipient           recipient
+             :bridge-tx?          (= transaction-type :tx/bridge)
             :account-to?         true
             :theme               theme}]]]]))))
@@ -1,6 +1,7 @@
 (ns status-im.contexts.wallet.send.utils
  (:require
    [native-module.core :as native-module]
+    [status-im.constants :as constants]
    [status-im.contexts.wallet.common.utils.networks :as network-utils]
    [utils.hex :as utils.hex]
    [utils.money :as money]))
@@ -46,7 +47,7 @@
  [{:keys [route token-decimals native-token? receiver?]}]
  (reduce
   (fn [acc path]
-     (let [amount-hex   (if receiver? (:amount-in path) (:amount-out path))
+     (let [amount-hex   (if receiver? (:amount-out path) (:amount-in path))
           amount-units (native-module/hex-to-number
                         (utils.hex/normalize-hex amount-hex))
           amount       (money/with-precision
@@ -249,3 +250,7 @@
      money/wei->gwei
      (money/with-precision precision)
      (str)))
+
+(defn bridge-disabled?
+  [token-symbol]
+  (not (constants/bridge-assets token-symbol)))
@@ -32,10 +32,10 @@

 (deftest network-amounts-by-chain-test
  (testing "Correctly calculates network amounts for transaction with native token"
-    (let [route          [{:amount-in "0xde0b6b3a7640000"
-                           :to        {:chain-id 1}}
-                          {:amount-in "0xde0b6b3a7640000"
-                           :to        {:chain-id 10}}]
+    (let [route          [{:amount-out "0xde0b6b3a7640000"
+                           :to         {:chain-id 1}}
+                          {:amount-out "0xde0b6b3a7640000"
+                           :to         {:chain-id 10}}]
          token-decimals 18
          native-token?  true
          receiver?      true
@@ -50,10 +50,10 @@

  (testing
    "Correctly calculates network amounts for transaction with native token and multiple routes to same chain-id"
-    (let [route          [{:amount-in "0xde0b6b3a7640000"
-                           :to        {:chain-id 1}}
-                          {:amount-in "0xde0b6b3a7640000"
-                           :to        {:chain-id 1}}]
+    (let [route          [{:amount-out "0xde0b6b3a7640000"
+                           :to         {:chain-id 1}}
+                          {:amount-out "0xde0b6b3a7640000"
+                           :to         {:chain-id 1}}]
          token-decimals 18
          native-token?  true
          receiver?      true
@@ -66,10 +66,10 @@
        (is (money/equal-to (get result chain-id) exp-value)))))

  (testing "Correctly calculates network amounts for transaction with non-native token"
-    (let [route          [{:amount-out "0x1e8480"
-                           :from       {:chain-id 1}}
-                          {:amount-out "0x1e8480"
-                           :from       {:chain-id 10}}]
+    (let [route          [{:amount-in "0x1e8480"
+                           :from      {:chain-id 1}}
+                          {:amount-in "0x1e8480"
+                           :from      {:chain-id 10}}]
          token-decimals 6
          native-token?  false
          receiver?      false
@@ -1,5 +1,6 @@
 (ns status-im.contexts.wallet.wallet-connect.core
  (:require [clojure.edn :as edn]
+            [clojure.set :as set]
            [clojure.string :as string]
            [native-module.core :as native-module]
            [status-im.constants :as constants]
@@ -119,10 +120,24 @@
      (networks/get-network-details)
      (add-full-testnet-name)))

+(defn session-networks-allowed?
+  [testnet-mode? {:keys [chains]}]
+  (let [chain-ids (set (map (fn [chain]
+                              (-> chain
+                                  (string/split ":")
+                                  second
+                                  js/parseInt))
+                            chains))]
+    (if testnet-mode?
+      (set/subset? chain-ids (set/union constants/sepolia-chain-ids constants/goerli-chain-ids))
+      (set/subset? chain-ids constants/mainnet-chain-ids))))
+
 (defn event-should-be-handled?
  [db {:keys [topic]}]
-  (some #(= topic %)
-        (map :topic (:wallet-connect/sessions db))))
+  (let [testnet-mode? (get-in db [:profile/profile :test-networks-enabled?])]
+    (some #(and (= (:topic %) topic)
+                (session-networks-allowed? testnet-mode? %))
+          (:wallet-connect/sessions db))))

 (defn sdk-session->db-session
  [{:keys [topic expiry pairingTopic] :as session}]
@@ -67,7 +67,7 @@
 (rf/reg-event-fx
 :wallet-connect/on-session-proposal
 (fn [{:keys [db]} [proposal]]
-   (log/info "Received Wallet Connect session proposal: " {:id (:id proposal)})
+   (log/info "Received Wallet Connect session proposal: " proposal)
   (let [accounts                     (get-in db [:wallet :accounts])
         current-viewing-address      (get-in db [:wallet :current-viewing-account-address])
         available-accounts           (wallet-connect-core/filter-operable-accounts (vals accounts))
@@ -117,7 +117,7 @@
 :wallet-connect/on-session-delete
 (fn [{:keys [db]} [{:keys [topic] :as event}]]
   (when (wallet-connect-core/event-should-be-handled? db event)
-     (log/info "Received Wallet Connect session delete: " event)
+     (log/info "Received Wallet Connect session delete from the SDK: " event)
     {:fx [[:dispatch [:wallet-connect/disconnect-session topic]]]})))

 (rf/reg-event-fx
@@ -140,6 +140,7 @@
 (fn [{:keys [db]} [{:keys [topic on-success on-fail]}]]
   (let [web3-wallet    (get db :wallet-connect/web3-wallet)
         network-status (:network/status db)]
+     (log/info "Disconnecting dApp session" topic)
     (if (= network-status :online)
       {:fx [[:effects.wallet-connect/disconnect
              {:web3-wallet web3-wallet
@@ -262,6 +263,9 @@
                               (or (< expiry (/ now 1000))
                                   (not (contains? session-topics topic))))
                             persisted-sessions)]
+     (when (seq expired-sessions)
+       (log/info "Updating WalletConnect persisted sessions due to expired/inactive sessions"
+                 {:expired expired-sessions}))
     {:fx (mapv (fn [{:keys [topic]}]
                  [:dispatch [:wallet-connect/disconnect-session topic]])
                expired-sessions)
@@ -324,6 +328,7 @@
 (rf/reg-event-fx
 :wallet-connect/disconnect-session
 (fn [{:keys [db]} [topic]]
+   (log/info "Removing session from persistance and state" topic)
   {:db (update db
                :wallet-connect/sessions
                (fn [sessions]
@@ -27,6 +27,7 @@
 (fn [{:keys [db]} [event]]
   (let [method         (wallet-connect-core/get-request-method event)
         existing-event (get-in db [:wallet-connect/current-request :event])]
+     (log/info "Processing Wallet Connect session request" method)
     ;; NOTE: make sure we don't show two requests at the same time
     (when-not existing-event
       {:db (-> db
@@ -125,38 +126,37 @@
 (rf/reg-event-fx
 :wallet-connect/process-sign-typed
 (fn [{:keys [db]}]
-   (let [[address raw-data] (wallet-connect-core/get-db-current-request-params db)
-         parsed-raw-data    (transforms/js-parse raw-data)
-         session-chain-id   (-> (wallet-connect-core/get-db-current-request-event db)
-                                (get-in [:params :chainId])
-                                wallet-connect-core/eip155->chain-id)
-         data-chain-id      (-> parsed-raw-data
-                                transforms/js->clj
-                                signing/typed-data-chain-id)
-         parsed-data        (try (-> parsed-raw-data
-                                     (transforms/js-dissoc :types :primaryType)
-                                     (transforms/js-stringify 2))
-                                 (catch js/Error _ nil))]
-     (cond
-       (nil? parsed-data)
+   (try
+     (let [[address raw-data] (wallet-connect-core/get-db-current-request-params db)
+           parsed-raw-data    (transforms/js-parse raw-data)
+           session-chain-id   (-> (wallet-connect-core/get-db-current-request-event db)
+                                  (get-in [:params :chainId])
+                                  wallet-connect-core/eip155->chain-id)
+           data-chain-id      (-> parsed-raw-data
+                                  transforms/js->clj
+                                  signing/typed-data-chain-id)
+           parsed-data        (-> parsed-raw-data
+                                  (transforms/js-dissoc :types :primaryType)
+                                  (transforms/js-stringify 2))]
+       (if (and data-chain-id
+                (not= session-chain-id data-chain-id))
+         {:fx [[:dispatch
+                [:wallet-connect/wrong-typed-data-chain-id
+                 {:expected-chain-id session-chain-id
+                  :wrong-chain-id    data-chain-id}]]]}
+         {:db (update-in db
+                         [:wallet-connect/current-request]
+                         assoc
+                         :address      (string/lower-case address)
+                         :display-data (or parsed-data raw-data)
+                         :raw-data     raw-data)
+          :fx [[:dispatch [:wallet-connect/show-request-modal]]]}))
+     (catch js/Error err
       {:fx [[:dispatch
              [:wallet-connect/on-processing-error
-               (ex-info "Failed to parse JSON typed data" {:data raw-data})]]]}
-
-       (not= session-chain-id data-chain-id)
-       {:fx [[:dispatch
-              [:wallet-connect/wrong-typed-data-chain-id
-               {:expected-chain-id session-chain-id
-                :wrong-chain-id    data-chain-id}]]]}
-
-       :else
-       {:db (update-in db
-                       [:wallet-connect/current-request]
-                       assoc
-                       :address      (string/lower-case address)
-                       :display-data (or parsed-data raw-data)
-                       :raw-data     raw-data)
-        :fx [[:dispatch [:wallet-connect/show-request-modal]]]}))))
+               (ex-info "Failed to parse JSON typed data"
+                        {:error err
+                         :data  (wallet-connect-core/get-db-current-request-params db)})]]]}))))

 (rf/reg-event-fx
 :wallet-connect/wrong-typed-data-chain-id
@@ -168,20 +168,20 @@
                                   wallet-connect-core/chain-id->network-details
                                   :full-name)
         toast-message         (i18n/label :t/wallet-connect-typed-data-wrong-chain-id-warning
-                                           {:wrong-chain    wrong-network-name
+                                           {:wrong-chain    (or wrong-network-name
+                                                                (wallet-connect-core/chain-id->eip155
+                                                                 wrong-chain-id))
                                            :expected-chain expected-network-name})]
     {:fx [[:dispatch
            [:toasts/upsert
-             {:type  :negative
-              :theme :dark
-              :text  toast-message}]]
+             {:type :negative
+              :text toast-message}]]
           [:dispatch
            [:wallet-connect/on-processing-error
             (ex-info "Can't proceed signing typed data due to wrong chain-id included in the data"
                      {:expected-chain-id expected-chain-id
                       :wrong-chain-id    wrong-chain-id})]]]})))

-;; TODO: we should reject a request if processing fails
 (rf/reg-event-fx
 :wallet-connect/on-processing-error
 (fn [{:keys [db]} [error]]
@@ -193,4 +193,5 @@
                 :method               method
                 :wallet-connect-event event
                 :event                :wallet-connect/on-processing-error})
-     {:fx [[:dispatch [:wallet-connect/dismiss-request-modal]]]})))
+     ;; FIXME(@clauxx/@alwx): rename this event eventually
+     {:fx [[:dispatch [:wallet-connect/on-request-modal-dismissed]]]})))
@@ -106,7 +106,11 @@
                 :method               method
                 :wallet-connect-event event
                 :event                :wallet-connect/on-sign-error})
-     {:fx [[:dispatch [:wallet-connect/dismiss-request-modal]]]})))
+     {:fx [[:dispatch [:wallet-connect/dismiss-request-modal]]
+           [:dispatch
+            [:toasts/upsert
+             {:type :negative
+              :text (i18n/label :t/something-went-wrong)}]]]})))

 (rf/reg-event-fx
 :wallet-connect/send-response
@@ -4,6 +4,7 @@
            [status-im.contexts.wallet.wallet-connect.core :as core]
            [status-im.contexts.wallet.wallet-connect.rpc :as rpc]
            [utils.hex :as hex]
+            [utils.number :as number]
            [utils.transforms :as transforms]))

 (defn typed-data-chain-id
@@ -16,7 +17,8 @@
                            (some #(= "chainId" (:name %))))
        data-chain-id  (-> typed-data
                           :domain
-                           :chainId)]
+                           :chainId
+                           number/parse-int)]
    (when chain-id-type?
      data-chain-id)))

@@ -12,6 +12,7 @@
    status-im.common.peer-stats.events
    status-im.common.shared-urls.events
    status-im.common.signals.events
+    status-im.common.theme.effects
    status-im.common.theme.events
    [status-im.common.toasts.events]
    status-im.common.universal-links
@@ -27,7 +28,8 @@
    status-im.contexts.contact.blocking.events
    status-im.contexts.keycard.effects
    status-im.contexts.keycard.events
-    status-im.contexts.networks.events
+    status-im.contexts.network.effects
+    status-im.contexts.network.events
    status-im.contexts.onboarding.common.overlay.events
    status-im.contexts.onboarding.events
    status-im.contexts.profile.events
@@ -22,6 +22,7 @@
                                         :FLAG_WALLET_SETTINGS_IMPORT_ALL_KEYPAIRS)
   ::shell.jump-to                      (enabled-in-env? :ENABLE_JUMP_TO)

+   ::wallet.add-watched-address         (enabled-in-env? :FLAG_ADD_WATCHED_ADDRESS)
   ::wallet.advanced-sending            (enabled-in-env? :FLAG_ADVANCED_SENDING)
   ::wallet.assets-modal-hide           (enabled-in-env? :FLAG_ASSETS_MODAL_HIDE)
   ::wallet.assets-modal-manage-tokens  (enabled-in-env? :FLAG_ASSETS_MODAL_MANAGE_TOKENS)
@@ -74,9 +74,7 @@
   (let [[status-bar-theme] (get-status-nav-color root-id theme)
         root               (get (roots/roots status-bar-theme) root-id)]
     (dismiss-all-modals)
-     (rf/dispatch [:profile.settings/switch-theme
-                   (get roots/themes root-id)
-                   root-id])
+     (rf/dispatch [:theme/switch {:view-id root-id}])
     (reset! state/root-id (or (get-in root [:root :stack :id]) root-id))
     (navigation/set-root root)
     (state/navigation-state-reset [{:id   root-id
@@ -1,19 +1,8 @@
 (ns status-im.navigation.roots
  (:require
    [quo.foundations.colors :as colors]
-    [status-im.constants :as constants]
    [status-im.navigation.options :as options]))

-;; Theme Order for navigation roots
-;; 1. Themes hardcoded in below map
-;; 2. If nil or no entry in map, then theme stored in
-;;    [:db :profile/profile :appearance] will be used (for mulitaccounts)
-;; 3). Fallback theme - Dark
-(def themes
-  {:screen/onboarding.intro constants/theme-type-dark
-   :screen/profile.profiles constants/theme-type-dark
-   :shell-stack             nil})
-
 (defn roots-internal
  [status-bar-theme]
  {:screen/onboarding.intro
@@ -56,6 +56,7 @@
     change-password-loading]
    [status-im.contexts.profile.settings.screens.password.change-password.view :as change-password]
    [status-im.contexts.profile.settings.screens.password.view :as settings-password]
+    [status-im.contexts.profile.settings.screens.syncing.view :as settings.syncing]
    [status-im.contexts.profile.settings.view :as settings]
    [status-im.contexts.settings.privacy-and-security.view :as settings.privacy-and-security]
    [status-im.contexts.settings.wallet.keypairs-and-accounts.missing-keypairs.encrypted-qr.view
@@ -84,7 +85,7 @@
    [status-im.contexts.syncing.how-to-pair.view :as how-to-pair]
    [status-im.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page]
    [status-im.contexts.syncing.setup-syncing.view :as settings-setup-syncing]
-    [status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing]
+    [status-im.contexts.syncing.syncing-devices-list.view :as syncing-devices-list]
    [status-im.contexts.wallet.account.edit-account.view :as wallet-edit-account]
    [status-im.contexts.wallet.account.share-address.view :as wallet-share-address]
    [status-im.contexts.wallet.account.view :as wallet-accounts]
@@ -241,9 +242,9 @@
     :options   options/transparent-screen-options
     :component settings/view}

-    {:name      :settings-syncing
+    {:name      :screen/paired-devices
     :options   options/transparent-modal-screen-options
-     :component settings-syncing/view}
+     :component syncing-devices-list/view}

    {:name      :settings-setup-syncing
     :options   options/transparent-screen-options
@@ -625,6 +626,10 @@
     :options   options/transparent-modal-screen-options
     :component settings.messages/view}

+    {:name      :screen/settings.syncing
+     :options   options/transparent-modal-screen-options
+     :component settings.syncing/view}
+
    {:name      :screen/settings-blocked-users
     :options   options/transparent-modal-screen-options
     :component settings.blocked-users/view}
@@ -12,6 +12,12 @@
        vals
        (pairing/sort-installations installation-id))))

+(re-frame/reg-sub
+ :pairing/paired-devices-count
+ :<- [:pairing/installations]
+ (fn [installations]
+   (count (filter :enabled? (rest installations)))))
+
 (re-frame/reg-sub
 :pairing/enabled-installations
 :<- [:pairing/installations]
@@ -20,9 +20,15 @@

 (re-frame/reg-sub
 :profile/currency
+ (fn []
+   ;; returns "usd" by default as the support for other currencies are in progress on Mobile
+   constants/profile-default-currency))
+
+(re-frame/reg-sub
+ :profile/syncing-on-mobile-network?
 :<- [:profile/profile]
- (fn [{:keys [currency]}]
-   (or currency constants/profile-default-currency)))
+ (fn [{:keys [syncing-on-mobile-network?]}]
+   (boolean syncing-on-mobile-network?)))

 (re-frame/reg-sub
 :profile/currency-symbol
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrea Maria Piana	1249371a1e	Return data from cache if present When we can't update the balance but we have an original balance, the backend should return the last available data. To test: 1) Login, make sure balances are present 2) Logout, go offline 3) Login again It should show the latest available balance instead of 0s https://github.com/status-im/status-go/compare/a93c8572...c5991352	2024-08-13 10:05:52 +01:00
Jamie Caprani	9a52339ea7	wallet(account): disable send and bridge options for assets with a 0 balance (#21033 )	2024-08-12 17:26:40 +01:00
Mohsen	d53bef385a	[#20971 ] fix: app crash when collectible max limit is nan (#20992 )	2024-08-09 21:39:07 +03:30
Parvesh Monu	35e71289dc	Improve theme switch (#20984 )	2024-08-09 16:42:49 +02:00
frank	0dfc8384e6	chore_: ignore sensitive fields of WalletConfig when logging (#20986 )	2024-08-09 17:20:43 +08:00
Yevheniia Berdnyk	605e3a727d	e2e: fixes for welcome button and more	2024-08-09 00:20:50 +03:00
Ulises Manuel	41e18993be	fix(wallet): Remove redirection to send flow when the user scans an address QR code (#20979 )	2024-08-08 08:19:41 -06:00
flexsurfer	ce3f2b5895	Token-gated permissions are not displayed on community's homepage #20965 (#20976 )	2024-08-08 12:16:38 +02:00
frank	3b4cbfa4bc	fix_: enable light client and disable store confirmation for mobile v1 by default (#20953 ) https://github.com/status-im/status-go/compare/cba3ac57...6581f75c	2024-08-07 21:48:10 +08:00
Yevheniia Berdnyk	9a3cdc4f8b	e2e: fixes for community link and welcome button error	2024-08-06 18:58:31 +03:00
frankandSiddarth Kumar	1d84c30de3	chore:enable status proxy (#20931 ) * feat_: enable status proxy * chore: update jenkins lib * chore: add missing env reference --------- Co-authored-by: Siddarth Kumar <siddarthkay@gmail.com>	2024-08-06 07:19:36 -07:00
Jamie CapraniandYevheniia Berdnyk	8133c4c5f0	chore(wallet): feature flag adding watch only accounts (#20955 ) * chore(wallet): feature flag adding watch only accounts * e2e: disabled test for watch-only accounts --------- Co-authored-by: Yevheniia Berdnyk <ie.berdnyk@gmail.com>	2024-08-05 10:08:05 -07:00
Yevheniia Berdnyk	e21ece0f8d	e2e: update for deep links tests	2024-08-05 17:57:35 +03:00
Sean Hagstrom	89828ba7fd	chore: allow for overriding metro server port (#20202 ) This change will now allow for customizing the port number when running the metro server. The environment variable `RCT_METRO_PORT` can now be set when executing commands like `make run-ios`, `make run ios-device`, and `make run-android`. Though, it should be noted that `make clean` may need to be ran before attempting to set or change `RCT_METRO_PORT` since the react-native app will have statically built code that references the value of RCT_METRO_PORT from compile time and not runtime.	2024-08-05 12:48:35 +01:00
Shivek Khurana	8215498ddb	📈 Capture onboarding funnel (#20926 ) * 📈 Capture onboarding funnel * ⏩ Faster lookup * ✅ Capture how many people enabled metrics - It technically captures disabled too - But we'll never know if someone disabled - Because that info won't be transmitted * ✏️ Fix tests * 🧯 Fix lint	2024-08-02 22:19:58 +05:30
Ulises Manuel	ae6205c874	fix(wallet): Fix input amount step skipped while sending a token (#20852 ) * fix(wallet): Fix input amount step skipped while sending a token * Add comment about ^:flush-dom metadata	2024-08-02 09:30:00 -06:00
Lungu Cristian	328f9686c9	Fix typed-data chainid check (#20943 ) * fix: typed-data chainid check & toast on sign fail * fix: parsing the chain-id and error-handling	2024-08-02 14:55:46 +03:00
Sean Hagstrom	9f412577d7	fix: remove mobile-data sync setting inside legacy settings (#20942 )	2024-08-02 11:59:09 +01:00
Parvesh Monu	11bd340a94	fix 'Usage data' bottom sheet reappears after reopening the app if you swipe it down on onboarding (#20945 )	2024-08-02 15:17:18 +05:30
Parvesh Monu	3c102b9797	fix Mobile app doesn't allow taking screenshots when the 'Block Screenshots' toggle is turned off (#20941 )	2024-08-01 17:06:14 +05:30
Ulises Manuel	bd4b7fc49d	fix(wallet): Error while bridging tokens due to bonderFees (#20929 )	2024-07-31 15:40:24 -06:00
Brian Sztamfater	29252336cc	chore: bump react-native-camera-link version to Status fork to remove usage of ML Kit (#20891 )	2024-07-31 17:54:21 -03:00
Brian Sztamfater	4b5b4f9099	fix(wallet): inverted values of receiver and sender when displaying bridging routes (#20893 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-07-31 17:02:03 -03:00
Yevheniia Berdnyk	28da6f8bfc	e2e: fixes for wallet, community urls and more	2024-07-31 19:27:28 +03:00
Mohamed Javid	e0fe0d2dbd	fix(android): send and bridge ERC-20 tokens (#20924 ) This commit adds the missing "encodeFunctionCall" method in Android Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-07-31 18:33:46 +05:30
frank	07cf34ad60	feat_: add fallback pairing support (#20921 ) Creating this PR for regression testing the comparability of feature sync between different versions(mainly current PR build vs v2.29) after adding backend fallback pairing support. Because frontend haven't added the invocations relate to fallback pairing API yet, so fallback pairing won't support with current build. relate status-go PR https://github.com/status-im/status-go/pull/5614 Testing notes expected: sync should work as before between different versions like following: v2.29 <-> PR build PR build <-> recent desktop build NOTE: It breaks with v1 of pairing, but that's ancient (last year I believe), so safe to break.	2024-07-30 16:08:20 -03:00
Mohamed Javid	7c4c9a9fc0	fix_: use usd as default currency (#20916 ) This commit uses "usd" currency as default for the fiat price calculation for the tokens. Every currency has a different format - decimal which we need to rely on a separate RPC to fetch currency format and do the calculation. So, this PR will change to use usd as the default for v2.30. Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-07-30 21:03:26 +05:30
Brian Sztamfater	59ceddbaad	fix(wallet): fix bridge transactions (#20902 ) * fix(wallet): fix bridge transactions Signed-off-by: Brian Sztamfater <brian@status.im> * add support for approve transactions Signed-off-by: Brian Sztamfater <brian@status.im> --------- Signed-off-by: Brian Sztamfater <brian@status.im>	2024-07-30 11:02:11 -03:00
mmilad75	99ccbc3383	Cover wallet send events with tests Part 2 #20411 #20533 (#20721 )	2024-07-30 14:14:36 +02:00
Lungu Cristian	8c2d5398b0	Enabling WalletConnect feature flag (#20906 ) * feat: removed wallet connect feature flag * fix: show pending requests when logging out and in * fix: don't show requests across (test/main)nets * format: added env newlines * fix: network state reset on network type change * fix: reject typed-data if wrong chain-id * chore: added logs for future debugging	2024-07-29 19:55:54 +03:00
mmilad75andJamie Caprani	67c83b13e3	fix(wallet): remove edit routes button in bridging (#20874 ) Co-authored-by: Jamie Caprani <jamiecaprani@gmail.com>	2024-07-29 18:10:32 +02:00
Brian Sztamfater	11a84ba145	feat(wallet): disable complex routing (#20901 )	2024-07-29 16:47:35 +01:00
Jamie Caprani	1f5bb579c9	chore(wallet): disable bridging on unsupported tokens (#20846 )	2024-07-29 03:02:10 -07:00
Parvesh MonuandAndrea Maria Piana	4586f8007c	Add toggle in advanced settings for mobile data https://github.com/status-im/status-go/compare/4a43b2b2...9755b3de Co-authored-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>	2024-07-29 14:27:28 +05:30