chore: pick go-waku updates

chore: take filter ping related changes from status-go
2024-07-26 16:33:46 +05:30 · 2024-07-26 16:33:46 +05:30
156 changed files with 2346 additions and 2578 deletions
@@ -35,4 +35,3 @@ FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=0
 ENABLE_ALERT_BANNER=0
-FLAG_WALLET_CONNECT_ENABLED=1
@@ -38,5 +38,3 @@ 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,4 +36,3 @@ LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 ENABLE_ALERT_BANNER=1
-FLAG_WALLET_CONNECT_ENABLED=1
@@ -23,4 +23,3 @@ DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
 ENABLE_ALERT_BANNER=1
-FLAG_WALLET_CONNECT_ENABLED=1
@@ -19,4 +19,3 @@ MAX_IMAGES_BATCH=1
 DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
-FLAG_WALLET_CONNECT_ENABLED=1
@@ -215,13 +215,15 @@ build-fdroid: ##@build Build release for F-Droid
 build-android: export BUILD_ENV ?= prod
 build-android: export BUILD_TYPE ?= nightly
 build-android: export ORG_GRADLE_PROJECT_versionCode ?= $(TMP_BUILD_NUMBER)
+build-android: export ANDROID_ABI_SPLIT ?= false
+build-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
 build-android: ##@build Build unsigned Android APK
 	@scripts/build-android.sh

 release-android: export TARGET := keytool
 release-android: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
 release-android: keystore build-android ##@build Build signed Android APK
-	@scripts/sign-android.sh result/app-arm64-v8a-release-unsigned.apk
+	@scripts/sign-android.sh result/app-release-unsigned.apk

 release-ios: export TARGET := ios
 release-ios: export IOS_STATUS_GO_TARGETS := ios/arm64
@@ -436,11 +438,10 @@ 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:$(RCT_METRO_PORT) tcp:$(RCT_METRO_PORT) && \
+	adb reverse tcp:8081 tcp:8081 && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
 	adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \
@@ -211,7 +211,7 @@ android {
            reset()
            enable getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()
            include getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
-            universalApk false
+            universalApk true
        }
    }
    signingConfigs {
@@ -38,10 +38,10 @@ KEYSTORE_PASSWORD=password
 KEYSTORE_ALIAS=status
 KEYSTORE_KEY_PASSWORD=password

-# Splitting by CPU Architecture produces smaller APKs.
-ANDROID_ABI_SPLIT=true
-# By default its better to only build apk for most recent devices.
-ANDROID_ABI_INCLUDE=arm64-v8a
+# By default we build a mostly universal APK
+ANDROID_ABI_SPLIT=false
+# Some platforms are excluded though
+ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86;x86_64

 org.gradle.jvmargs=-Xmx8704M -XX:+UseParallelGC

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

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -72,7 +72,11 @@ pipeline {
        stage('Upload') {
          steps { script {
            def urls = apks.collect { s5cmd.upload(it) }
-            env.PKG_URL = urls.first()
+            if (urls.size() > 1) { /* Return only the universal APK. */
+              env.PKG_URL = urls.find { it.contains('universal') }
+            } else { /* If no universal is available pick first. */
+              env.PKG_URL = urls.first()
+            }
            jenkins.setBuildDesc(APK: env.PKG_URL)
          } }
        }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.9.1'

 import groovy.json.JsonBuilder

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

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

 /* 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.4'
+library 'status-jenkins-lib@v1.9.1'

 /* 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.4'
+library 'status-jenkins-lib@v1.9.1'

 pipeline {

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

 pipeline {

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

 pipeline {

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

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

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

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

 pipeline {
  agent {
@@ -62,11 +62,6 @@ 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,6 +45,7 @@ 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
@@ -67,6 +68,7 @@ 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
@@ -516,7 +518,15 @@ 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
@@ -543,6 +553,10 @@ 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
@@ -558,6 +572,11 @@ 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
@@ -572,7 +591,6 @@ 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,6 +87,7 @@ 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
@@ -480,8 +481,26 @@ 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
@@ -504,12 +523,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.1/commons-codec-1.17.1.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-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.3/commons-logging-1.3.3.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/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
@@ -609,22 +628,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.2/jackson-annotations-2.17.2.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-core/2.11.1/jackson-core-2.11.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-core/2.17.1/jackson-core-2.17.1.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.2/jackson-databind-2.17.2.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/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.2/jackson-base-2.17.2.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-bom/2.11.1/jackson-bom-2.11.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-bom/2.17.1/jackson-bom-2.17.1.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.2/jackson-modules-base-2.17.2.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-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.2/jackson-module-jaxb-annotations-2.17.2.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-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
@@ -693,7 +712,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.29.2/error_prone_annotations-2.29.2.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_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
@@ -706,7 +725,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.29.2/error_prone_parent-2.29.2.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/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
@@ -751,7 +770,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.28.0-RC1/protobuf-bom-4.28.0-RC1.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-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
@@ -768,7 +787,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.28.0-RC1/protobuf-java-4.28.0-RC1.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-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
@@ -779,11 +798,9 @@ 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.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/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/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
@@ -954,11 +971,9 @@ 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
@@ -1003,7 +1018,6 @@ 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
@@ -1023,7 +1037,6 @@ 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
@@ -1078,7 +1091,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.45.0/checker-qual-3.45.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/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
@@ -1088,21 +1101,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.24/animal-sniffer-annotations-1.24.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-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.24/animal-sniffer-parent-1.24.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/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/84/mojo-parent-84.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/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.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/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/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
@@ -1133,10 +1146,9 @@ 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/3.0-rc1/hamcrest-core-3.0-rc1.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-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
@@ -1236,7 +1248,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.20-Beta2/kotlin-reflect-2.0.20-Beta2.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-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
@@ -1341,7 +1353,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.20-Beta2/kotlin-stdlib-2.0.20-Beta2.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-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
@@ -1360,7 +1372,6 @@ 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
@@ -1372,10 +1383,8 @@ 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,12 +17,11 @@
  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",
+  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "false",
  # Android architectures to build for
  # Used to detect end-to-end builds
-  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "arm64-v8a",
+  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "armeabi-v7a;arm64-v8a;x86",
 }:

 let
@@ -159,7 +158,6 @@ 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": "git+https://github.com/status-im/react-native-camera-kit.git#refs/tags/v14.0.0-beta15-status-v1",
+    "react-native-camera-kit": "14.0.0-beta13",
    "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 --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
+if pgrep -f 'react-native start' > /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
@@ -13,7 +13,7 @@ export BUILD_TYPE=debug

 # Install the APK on running emulator or android device.
 installAndLaunchApp() {
-  adb install -r ./result/app-arm64-v8a-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
+  adb install -r ./result/app-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
  "${GIT_ROOT}/scripts/wait-for-metro-port.sh" 2>&1
  # connected android devices need this port to be exposed for metro
  adb reverse "tcp:${RCT_METRO_PORT}" "tcp:${RCT_METRO_PORT}"
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash

-if pgrep -f "react-native start --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
+if pgrep -f 'react-native start' > /dev/null; then
    echo "Info: metro is already running in another terminal"
 else
    echo "Info: starting a new metro terminal"
-    react-native start --port=${RCT_METRO_PORT:-8081} --reset-cache
+    react-native start --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:"${RCT_METRO_PORT:-8081}" &> /dev/null; then
+  if ! lsof -i:8081 &> /dev/null; then
    echo "."
    sleep 1
    ((TIMEOUT--))
@@ -67,8 +67,6 @@
         :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"
@@ -105,8 +103,6 @@
   {: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
-                    :token-permissions
+                    :tokenPermissions
                    vals
                    (some role-permission?)))
        (assoc :membership-permissions?
               (->> community
-                    :token-permissions
+                    :tokenPermissions
                    vals
                    (some membership-permission?)))
        (assoc :token-images
               (reduce (fn [acc {sym :symbol image :image}]
                         (assoc acc sym image))
                       {}
-                       (:tokens-metadata community))))))
+                       (:communityTokensMetadata community))))))
@@ -11,6 +11,9 @@
    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]
@@ -102,7 +105,8 @@
  (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))
-      {:dispatch [:theme/switch]})))
+      {:profile.settings/switch-theme-fx
+       [(get-in db [:profile/profile :appearance]) (:view-id db)]})))

 (defn- on-biometric-auth-fail
  [{:keys [code]}]
@@ -130,6 +134,7 @@
    (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)]
@@ -0,0 +1,437 @@
+(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))
@@ -0,0 +1,109 @@
+(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,17 +13,18 @@
   (native-module/logout)))

 (rf/defn initialize-app-db
-  [{{:keys         [keycard initials-avatar-font-file biometrics]
-     :network/keys [type status expensive?]}
+  [{{:keys                [keycard initials-avatar-font-file biometrics]
+     :network/keys        [type status]
+     :wallet-connect/keys [web3-wallet]}
    :db}]
  {:db (assoc db/app-db
-              :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)})
+              :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)})

 (rf/defn logout-method
  {:events [::logout-method]}
@@ -1,4 +1,4 @@
-(ns utils.network.core
+(ns legacy.status-im.network.core
  (:require
    [clojure.string :as string]))

@@ -1,7 +1,7 @@
-(ns utils.network.core-test
+(ns legacy.status-im.network.core-test
  (:require
    [cljs.test :refer-macros [deftest is testing]]
-    [utils.network.core :as network.core]))
+    [legacy.status-im.network.core :as network.core]))

 (deftest valid-rpc-url-test
  (testing "nil?"
@@ -5,7 +5,6 @@
    [legacy.status-im.ui.components.list.views :as list]
    [quo.core :as quo]
    [re-frame.core :as re-frame]
-    [status-im.feature-flags :as ff]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf])
  (:require-macros [legacy.status-im.utils.views :as views]))
@@ -60,14 +59,14 @@
     :on-press
     #(re-frame/dispatch [:open-modal :peers-stats])
     :chevron true}
-    (when (ff/enabled? ::ff/settings.telemetry)
-      {:size                    :small
-       :title                   "Telemetry"
-       :accessibility-label     :telemetry-enabled
-       :container-margin-bottom 8
-       :on-press                #(re-frame/dispatch [:profile.settings/toggle-telemetry])
-       :accessory               :switch
-       :active                  telemetry-enabled?})
+    {:size :small
+     :title "Telemetry"
+     :accessibility-label :telemetry-enabled
+     :container-margin-bottom 8
+     :on-press
+     #(re-frame/dispatch [:profile.settings/toggle-telemetry])
+     :accessory :switch
+     :active telemetry-enabled?}
    {:size :small
     :title (i18n/label :t/light-client-enabled)
     :accessibility-label :light-client-enabled
@@ -0,0 +1,51 @@
+(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]])
@@ -0,0 +1,73 @@
+(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})
@@ -0,0 +1,32 @@
+(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})
@@ -0,0 +1,57 @@
+(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,6 +13,7 @@
    [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]
@@ -144,6 +145,10 @@
    :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,7 +13,8 @@

 (views/defview sync-settings
  []
-  (views/letsubs [{:keys [backup-enabled?
+  (views/letsubs [{:keys [syncing-on-mobile-network?
+                          backup-enabled?
                          default-sync-period
                          use-mailservers?]}
                  [:profile/profile]
@@ -26,6 +27,16 @@
       :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-not (nil? flag)
+  (when flag
    (.setBlankPreviewFlag ^js (encryption) flag)))

 (defn get-device-model-info
@@ -387,11 +387,6 @@
  (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? :blur theme)
+  (let [theme-with-blur (if blur? :blue 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 :disabled]]]]]
+     [:state {:optional true} [:maybe [:enum :default :active :selected]]]]]
   :any])
@@ -18,7 +18,6 @@
   :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,7 +62,6 @@
      :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]]))
@@ -32,7 +32,8 @@

 (def system-message-base-wrapper
  {:flex-direction :row
-   :flex           1})
+   :flex           1
+   :align-items    :center})

 (def system-message-base-content-wrapper
  {:align-self     :center
@@ -127,14 +127,6 @@
      (when incoming? [split-text "sent you a contact request" theme true])
      [sm-timestamp timestamp theme]]]))

-(defn system-message-group
-  [{:keys [customization-color child]}]
-  [system-message-base
-   {:icon {:icon    :i/add-user
-           :color   (or customization-color :primary)
-           :opacity 5}}
-   [rn/view child]])
-
 (defn system-message-pinned
  [{:keys [pinned-by child customization-color timestamp]}]
  (let [theme (quo.theme/use-theme)]
@@ -191,7 +183,6 @@
       :contact-request [system-message-contact-request data]
       :added           [system-message-added data]
       :removed         [system-message-removed data]
-       :group           [system-message-group data]
       nil)]))

 (defn system-message
@@ -4,37 +4,11 @@
    [oops.core :as oops]
    [react-native.core :as rn]))

-(defn- add-keyboard-listener
-  [listener callback]
-  (oops/ocall rn/keyboard "addListener" listener callback))
-
 (defn use-keyboard
  []
-  (let [[keyboard-height set-keyboard-height] (rn/use-state 0)
-        [did-show? set-did-show]              (rn/use-state false)
-        [will-show? set-will-show]            (rn/use-state false)]
-    (rn/use-mount
-     (fn []
-       (let [will-show-listener (add-keyboard-listener "keyboardWillShow" #(set-will-show true))
-             did-show-listener  (add-keyboard-listener "keyboardDidShow"
-                                                       (fn [e]
-                                                         (set-did-show true)
-                                                         (set-keyboard-height
-                                                          (oops/oget e "endCoordinates.height"))))
-             will-hide-listener (add-keyboard-listener "keyboardWillHide" #(set-will-show false))
-             did-hide-listener  (add-keyboard-listener "keyboardDidHide"
-                                                       (fn [e]
-                                                         (set-did-show false)
-                                                         (when e
-                                                           (oops/oget e "endCoordinates.height"))))]
-         (fn []
-           (oops/ocall will-show-listener "remove")
-           (oops/ocall did-show-listener "remove")
-           (oops/ocall will-hide-listener "remove")
-           (oops/ocall did-hide-listener "remove")))))
-    {:keyboard-shown      did-show?
-     :keyboard-will-show? will-show?
-     :keyboard-height     keyboard-height}))
+  (let [kb (.useKeyboard hooks)]
+    {:keyboard-shown  (.-keyboardShown ^js kb)
+     :keyboard-height (.-keyboardHeight ^js kb)}))

 (defn use-back-handler
  [handler]
@@ -1,8 +0,0 @@
-(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)))
@@ -1,24 +0,0 @@
-(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})
-
@@ -1,73 +0,0 @@
-(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)])]))
@@ -3,23 +3,21 @@
            [react-native.safe-area :as safe-area]))

 (defn content-container
-  [blur? keyboard-shown? {:keys [padding-vertical padding-horizontal]}]
+  [blur? keyboard-shown?]
  (let [margin-bottom (if keyboard-shown? 0 (safe-area/get-bottom))]
    (cond-> {:margin-top         :auto
             :overflow           :hidden
             :margin-bottom      margin-bottom
-             :padding-vertical   (or padding-vertical 12)
-             :padding-horizontal (or padding-horizontal 20)}
+             :padding-vertical   12
+             :padding-horizontal 20}
      blur? (dissoc :padding-vertical :padding-horizontal))))

 (defn blur-inner-container
-  [{:keys [theme shell-overlay? padding-vertical padding-horizontal background-color]}]
-  {:background-color   (or background-color
-                           (colors/theme-colors
-                            colors/white-70-blur
-                            (if shell-overlay?
-                              colors/neutral-80-opa-80-blur
-                              colors/neutral-95-opa-70-blur)
-                            theme))
-   :padding-vertical   (or padding-vertical 12)
-   :padding-horizontal (or padding-horizontal 20)})
+  [theme shell-overlay?]
+  {:background-color   (colors/theme-colors colors/white-70-blur
+                                            (if shell-overlay?
+                                              colors/neutral-80-opa-80-blur
+                                              colors/neutral-95-opa-70-blur)
+                                            theme)
+   :padding-vertical   12
+   :padding-horizontal 20})
@@ -6,25 +6,20 @@
    [status-im.common.floating-button-page.floating-container.style :as style]))

 (defn- blur-container
-  [shell-overlay? blur-options child]
+  [child shell-overlay?]
  (let [theme (quo.theme/use-theme)]
    [quo/blur
-     (or blur-options
-         {:blur-amount   20
-          :blur-type     :transparent
-          :overlay-color :transparent})
-     [rn/view
-      {:style (style/blur-inner-container (assoc
-                                           blur-options
-                                           :theme          theme
-                                           :shell-overlay? shell-overlay?))}
+     {:blur-amount   20
+      :blur-type     :transparent
+      :overlay-color :transparent}
+     [rn/view {:style (style/blur-inner-container theme shell-overlay?)}
      child]]))

 (defn view
-  [{:keys [on-layout keyboard-shown? blur? shell-overlay? blur-options]} child]
+  [{:keys [on-layout keyboard-shown? blur? shell-overlay?]} child]
  [rn/view
-   {:style     (style/content-container blur? keyboard-shown? blur-options)
+   {:style     (style/content-container blur? keyboard-shown?)
    :on-layout on-layout}
   (if blur?
-     [blur-container shell-overlay? blur-options child]
+     [blur-container child shell-overlay?]
     child)])
@@ -13,13 +13,3 @@
   :bottom   0
   :left     0
   :right    0})
-
-(defn content-keyboard-avoiding-view
-  [{:keys [top bottom]}]
-  {:position :absolute
-   :top      top
-   :left     0
-   :right    0
-   :bottom   bottom})
-
-(def scroll-view-container {:flex 1})
@@ -30,15 +30,13 @@
      (reset! ratom height))))

 (defn- init-keyboard-listeners
-  [{:keys [on-did-show on-will-show scroll-view-ref]}]
+  [{:keys [on-did-show scroll-view-ref]}]
  (let [keyboard-will-show? (reagent/atom false)
        keyboard-did-show?  (reagent/atom false)
        add-listener        (fn [listener callback]
                              (oops/ocall rn/keyboard "addListener" listener callback))
        will-show-listener  (add-listener "keyboardWillShow"
-                                          (fn [e]
-                                            (reset! keyboard-will-show? true)
-                                            (when on-will-show (on-will-show e))))
+                                          #(reset! keyboard-will-show? true))
        did-show-listener   (add-listener "keyboardDidShow"
                                          (fn [e]
                                            (reset! keyboard-did-show? true)
@@ -60,8 +58,7 @@

 (defn view
  [{:keys [header footer customization-color footer-container-padding header-container-style
-           content-container-style gradient-cover? keyboard-should-persist-taps shell-overlay?
-           blur-options content-avoid-keyboard?]
+           content-container-style gradient-cover? keyboard-should-persist-taps shell-overlay?]
    :or   {footer-container-padding (safe-area/get-top)}}
   & children]
  (reagent/with-let [scroll-view-ref              (atom nil)
@@ -72,34 +69,29 @@
                     content-container-height     (reagent/atom 0)
                     content-scroll-y             (reagent/atom 0)
                     keyboard-height              (reagent/atom 0)
-                     reset-keyboard-height        #(reset! keyboard-height (oops/oget
-                                                                            %
-                                                                            "endCoordinates.height"))
                     {:keys [keyboard-will-show?
                             keyboard-did-show?
                             remove-listeners]}   (init-keyboard-listeners
-                                                   (cond-> {:scroll-view-ref scroll-view-ref}
-                                                     platform/ios?
-                                                     (assoc :on-will-show reset-keyboard-height)
-                                                     (not platform/ios?)
-                                                     (assoc :on-did-show reset-keyboard-height)))
+                                                   {:scroll-view-ref scroll-view-ref
+                                                    :on-did-show
+                                                    (fn [e]
+                                                      (reset! keyboard-height
+                                                        (oops/oget e "endCoordinates.height")))})
                     set-header-height            (set-height-on-layout header-height)
                     set-content-container-height (set-height-on-layout content-container-height)
                     set-footer-container-height  (set-height-on-layout footer-container-height)
                     set-content-y-scroll         (fn [event]
                                                    (reset! content-scroll-y
-                                                      (oops/oget event "nativeEvent.contentOffset.y")))
-                     bottom-safe-area             (safe-area/get-bottom)]
+                                                      (oops/oget event "nativeEvent.contentOffset.y")))]
    (let [keyboard-shown?          (if platform/ios? @keyboard-will-show? @keyboard-did-show?)
          footer-container-padding (+ footer-container-padding (rf/sub [:alert-banners/top-margin]))
-          show-background?         (show-background
-                                    {:window-height            window-height
-                                     :footer-container-height  @footer-container-height
-                                     :keyboard-height          @keyboard-height
-                                     :content-scroll-y         @content-scroll-y
-                                     :content-container-height @content-container-height
-                                     :header-height            @header-height
-                                     :keyboard-shown?          keyboard-shown?})]
+          show-background?         (show-background {:window-height            window-height
+                                                     :footer-container-height  @footer-container-height
+                                                     :keyboard-height          @keyboard-height
+                                                     :content-scroll-y         @content-scroll-y
+                                                     :content-container-height @content-container-height
+                                                     :header-height            @header-height
+                                                     :keyboard-shown?          keyboard-shown?})]
      [:<>
       (when gradient-cover?
         [quo/gradient-cover {:customization-color customization-color}])
@@ -108,28 +100,20 @@
         {:on-layout set-header-height
          :style     header-container-style}
         header]
-        [(if content-avoid-keyboard? rn/keyboard-avoiding-view rn/view)
-         {:style
-          (if content-avoid-keyboard?
-            (style/content-keyboard-avoiding-view
-             {:top    @header-height
-              :bottom (if keyboard-shown?
-                        @footer-container-height
-                        (+ bottom-safe-area @footer-container-height))})
-            style/scroll-view-container)}
-         [gesture/scroll-view
-          {:ref                                  set-scroll-ref
-           :on-scroll                            set-content-y-scroll
-           :scroll-event-throttle                64
-           :content-container-style              {:flex-grow 1}
-           :always-bounce-vertical               @keyboard-did-show?
-           :automatically-adjust-keyboard-insets true
-           :shows-vertical-scroll-indicator      false
-           :keyboard-should-persist-taps         keyboard-should-persist-taps}
-          (into [rn/view
-                 {:style     content-container-style
-                  :on-layout set-content-container-height}]
-                children)]]
+        [gesture/scroll-view
+         {:ref                             set-scroll-ref
+          :on-scroll                       set-content-y-scroll
+          :scroll-event-throttle           64
+          :content-container-style         {:flex-grow      1
+                                            :padding-bottom (when @keyboard-did-show?
+                                                              @footer-container-height)}
+          :always-bounce-vertical          @keyboard-did-show?
+          :shows-vertical-scroll-indicator false
+          :keyboard-should-persist-taps    keyboard-should-persist-taps}
+         (into [rn/view
+                {:style     content-container-style
+                 :on-layout set-content-container-height}]
+               children)]
        [rn/keyboard-avoiding-view
         {:style                    style/keyboard-avoiding-view
          :keyboard-vertical-offset (if platform/ios? footer-container-padding 0)
@@ -137,9 +121,8 @@
         [floating-container/view
          {:on-layout       set-footer-container-height
           :keyboard-shown? keyboard-shown?
-           :blur-options    blur-options
-           :shell-overlay?  shell-overlay?
-           :blur?           show-background?}
+           :blur?           show-background?
+           :shell-overlay?  shell-overlay?}
          footer]]]])
    (finally
     (remove-listeners))))
@@ -55,7 +55,7 @@
             {:dispatch (if user-in-sign-in-intro-screen?
                          [:navigate-to-within-stack
                           [:screen/onboarding.syncing-progress-intro :screen/onboarding.sign-in-intro]]
-                          [:open-modal :screen/onboarding.syncing-progress])}
+                          [:navigate-to :screen/onboarding.syncing-progress])}

             (and completed-pairing? sender?)
             {:dispatch [:syncing/clear-states]}
@@ -27,9 +27,7 @@
   :welcome-illustration          (js/require "../resources/images/ui2/welcome_illustration.png")
   :notifications                 (js/require "../resources/images/ui2/notifications.png")
   :nfc-prompt                    (js/require "../resources/images/ui2/nfc-prompt.png")
-   :nfc-success                   (js/require "../resources/images/ui2/nfc-success.png")
-   :syncing-devices               (js/require "../resources/images/ui2/syncing_devices.png")
-   :syncing-wrong                 (js/require "../resources/images/ui2/syncing_wrong.png")})
+   :nfc-success                   (js/require "../resources/images/ui2/nfc-success.png")})

 (def ui-themed
  {:angry-man
@@ -1,6 +1,7 @@
 (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]
@@ -37,15 +38,6 @@
      "wallet"
      {:fx [[:dispatch [:wallet/signal-received event-js]]]}

-      "wallet.sign.transactions"
-      {:fx [[:dispatch
-             [:standard-auth/authorize-with-keycard
-              {:on-complete #(rf/dispatch [:keycard/sign-hash %
-                                           (first (transforms/js->clj event-js))])}]]]}
-
-      "wallet.suggested.routes"
-      {:fx [[:dispatch [:wallet/handle-suggested-routes (transforms/js->clj event-js)]]]}
-
      "envelope.sent"
      (messages.transport/update-envelopes-status
       cofx
@@ -65,6 +57,15 @@
      "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))

@@ -3,35 +3,21 @@
    [schema.core :as schema]
    [status-im.common.standard-authentication.enter-password.view :as enter-password]
    [status-im.common.standard-authentication.events-schema :as events-schema]
-    [status-im.contexts.keycard.pin.view :as keycard.pin]
    [taoensso.timbre :as log]
-    [utils.address]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]
    [utils.security.core :as security]))

-(rf/reg-fx :effects.keycard/call-on-auth-success
- (fn [on-auth-success]
-   (when on-auth-success (on-auth-success ""))))
-
 (defn authorize
-  [{:keys [db]} [{:keys [on-auth-success keycard-supported?] :as args}]]
+  [{:keys [db]} [args]]
  (let [key-uid  (get-in db [:profile/profile :key-uid])
        keycard? (get-in db [:profile/profile :keycard-pairing])]
-    {:fx
-     [(if keycard?
-        (if keycard-supported?
-          [:effects.keycard/call-on-auth-success on-auth-success]
-          [:effects.utils/show-popup
-           {:title "This feature is not supported yet "
-            :content
-            "Keycard support is limited to logging in
-            and signing the sending transaction.
-            Use Status Desktop to access all functions."}])
-        [:effects.biometric/check-if-available
-         {:key-uid    key-uid
-          :on-success #(rf/dispatch [:standard-auth/authorize-with-biometric args])
-          :on-fail    #(rf/dispatch [:standard-auth/authorize-with-password args])}])]}))
+    {:fx [[:effects.biometric/check-if-available
+           {:key-uid    key-uid
+            :on-success #(rf/dispatch [:standard-auth/authorize-with-biometric args])
+            :on-fail    (if keycard?
+                          #(rf/dispatch [:standard-auth/authorize-with-keycard args])
+                          #(rf/dispatch [:standard-auth/authorize-with-password args]))}]]}))

 (schema/=> authorize events-schema/?authorize)
 (rf/reg-event-fx :standard-auth/authorize authorize)
@@ -108,16 +94,6 @@
        :button-icon-left    auth-button-icon-left
        :button-label        auth-button-label}])))

-(defn authorize-with-keycard
-  [_ [{:keys [on-complete]}]]
-  {:fx [[:dispatch
-         [:show-bottom-sheet
-          {:hide-on-background-press? false
-           :on-close                  #(rf/dispatch [:standard-auth/reset-login-password])
-           :content                   (fn []
-                                        [keycard.pin/auth {:on-complete on-complete}])}]]]})
-(rf/reg-event-fx :standard-auth/authorize-with-keycard authorize-with-keycard)
-
 (defn authorize-with-password
  [_ [{:keys [on-close theme blur?] :as args}]]
  {:fx [[:dispatch [:standard-auth/reset-login-password]]
@@ -134,9 +110,7 @@
 (rf/reg-event-fx
 :standard-auth/reset-login-password
 (fn [{:keys [db]}]
-   {:db (-> db
-            (update :profile/login dissoc :password :error)
-            (update :keycard dissoc :pin))}))
+   {:db (update db :profile/login dissoc :password :error)}))

 (rf/reg-fx
 :standard-auth/on-close
@@ -8,7 +8,7 @@

 (defn view
  [{:keys [track-text customization-color auth-button-label on-auth-success on-auth-fail
-           auth-button-icon-left size blur? container-style disabled? dependencies keycard-supported?]
+           auth-button-icon-left size blur? container-style disabled? dependencies]
    :or   {container-style {:flex 1}}}]
  (let [theme           (quo.theme/use-theme)
        auth-method     (rf/sub [:auth-method])
@@ -21,7 +21,6 @@
                                          :auth-button-icon-left auth-button-icon-left
                                          :theme                 theme
                                          :blur?                 blur?
-                                          :keycard-supported?    keycard-supported?
                                          :biometric-auth?       biometric-auth?
                                          :on-auth-success       on-auth-success
                                          :on-auth-fail          on-auth-fail
@@ -1,8 +0,0 @@
-(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,8 +1,7 @@
 (ns status-im.common.theme.events
  (:require
    [re-frame.core :as re-frame]
-    [status-im.common.theme.core :as theme]
-    [status-im.common.theme.utils :as utils]))
+    [status-im.common.theme.core :as theme]))

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

 (re-frame/reg-event-fx
 :theme/switch
- (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))]]]})))
+ (fn [{db :db} [theme]]
+   {:db (assoc db :theme theme)}))
@@ -1,17 +0,0 @@
-(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,8 +12,6 @@

 (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 "")
@@ -47,7 +45,6 @@
 (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")))
@@ -128,9 +125,6 @@
 (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")))
@@ -291,7 +291,6 @@
 (def ^:const wallet-connect-session-delete-event "session_delete")
 (def ^:const wallet-connect-user-rejected-error-key "USER_REJECTED")
 (def ^:const wallet-connect-user-disconnected-reason-key "USER_DISCONNECTED")
-(def ^:const wallet-connect-user-rejected-chains-error-key "USER_REJECTED_CHAINS")

 (def ^:const transaction-pending-type-wallet-connect-transfer "WalletConnectTransfer")

@@ -554,21 +553,11 @@
 (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,10 +46,6 @@
   (when (show-confirmation-modal? db)
     {:fx [[:dispatch
            [:show-bottom-sheet
-             {: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}]]]})))
+             {:content (fn [] [modal-view])
+              :shell?  true}]]]})))
+
@@ -3,61 +3,37 @@
    [legacy.status-im.utils.build :as build]
    [react-native.platform :as platform]))

-(defn key-value-event
-  [event-name val-key value]
-  {:metric
-   {:eventName  event-name
-    :platform   platform/os
-    :appVersion build/app-short-version
-    :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))
+  {:metric
+   {:eventName  "user-journey"
+    :platform   platform/os
+    :appVersion build/app-short-version
+    :eventValue {:action action}}})

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

 (defn track-view-id-event
  [view-id]
-  (when (contains? view-ids-to-track view-id)
-    (navigation-event (name 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))

 (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,75 +5,31 @@
    [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 user journey event"
-    (let [action   "test-action"
-          expected {:metric
-                    {:eventName  "user-journey"
-                     :platform   platform-os
-                     :appVersion app-version
-                     :eventValue {:action action}}}]
+  (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}}}]
      (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 navigation event for view-id"
-    (is (= {:metric
-            {:eventName  "navigation"
-             :platform   platform-os
-             :appVersion app-version
-             :eventValue {:viewId "communities-stack"}}}
+  (testing "returns correct event for view-id"
+    (is (= (tracking/user-journey-event tracking/communities-tab-clicked)
           (tracking/track-view-id-event :communities-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 (= (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 (nil? (tracking/track-view-id-event :unknown-stack)))))

 (deftest tracked-event-test
  (testing "returns correct event for given inputs"
-    (is (= {:metric
-            {:eventName  "user-journey"
-             :platform   platform-os
-             :appVersion app-version
-             :eventValue {:action tracking/app-started-event}}}
+    (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)
           (tracking/tracked-event [:profile/get-profiles-overview-success])))
-    (is (= {:metric
-            {:eventName  "events.metrics-enabled"
-             :platform   platform-os
-             :appVersion app-version
-             :eventValue {:enabled true}}}
-           (tracking/tracked-event [:centralized-metrics/toggle-centralized-metrics true])))
-    (is (= {:metric
-            {:eventName  "navigation"
-             :platform   platform-os
-             :appVersion app-version
-             :eventValue {:viewId "wallet-stack"}}}
+    (is (= (tracking/track-view-id-event :wallet-stack)
           (tracking/tracked-event [:set-view-id :wallet-stack])))
    (is (nil? (tracking/tracked-event [:unknown-event])))))
@@ -33,7 +33,3 @@
 (def drawer-message-container
  {:padding-top    4
   :padding-bottom 4})
-
-(def group-member-mention
-  {:flex-direction :row
-   :align-items    :center})
@@ -126,60 +126,14 @@
      :photo-path          photo-path
      :incoming?           (not= public-key from)}]))

-(defn group-member
-  [literal]
-  (let [[primary-name _] (rf/sub [:contacts/contact-two-names-by-identity literal])
-        photo-path       (rf/sub [:chats/photo-path literal])]
-    [rn/view {:style style/group-member-mention}
-     [quo/user-avatar
-      {:full-name         primary-name
-       :profile-picture   photo-path
-       :status-indicator? false
-       :size              :xxxs
-       :ring?             false}]
-     [quo/text
-      {:weight :semi-bold
-       :style  {:margin-left 4}}
-      primary-name]]))
-
-
-(defn resolve-group-system-message
-  [{:keys [children]}]
-  (reduce (fn [acc {:keys [type literal]}]
-            (if (= type "mention")
-              (conj acc [group-member literal])
-              (conj acc
-                    [rn/view
-                     [quo/text literal]])))
-          [:<>]
-          children))
-
-
-(defn render-parsed-text
-  [content]
-  (reduce (fn [acc e]
-            (conj acc (resolve-group-system-message e)))
-          [quo/text]
-          (:parsed-text content)))
-
-(defn group-system-message
-  [{:keys [chat-id timestamp-str content]} type]
-  (let [{:keys [customization-color]} (rf/sub [:contacts/contact-by-address chat-id])]
-    [quo/system-message
-     {:type                type
-      :timestamp           timestamp-str
-      :customization-color customization-color
-      :child               (render-parsed-text content)}]))
-
 (defn system-message-content
  [{:keys [content-type quoted-message] :as message-data}]
-
  (if quoted-message
    [pin/pinned-message message-data]
    (condp = content-type

      constants/content-type-system-text
-      [group-system-message message-data :group]
+      [system.text/text-content message-data]

      constants/content-type-system-pinned-message
      [system.text/text-content message-data]
@@ -2,6 +2,7 @@
  (: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]
@@ -287,7 +288,8 @@
  (when-let [community (first communities)]
    {:db (-> db
             (assoc-in [:communities (:id community) :spectated] true))
-     :fx [[:dispatch [:communities/handle-community community]]]}))
+     :fx [[:dispatch [:communities/handle-community community]]
+          [:dispatch [::mailserver/request-messages]]]}))

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

@@ -1,5 +1,6 @@
 (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]))
@@ -111,7 +112,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"
@@ -109,22 +109,3 @@
  [pairings]
  (keycard/set-pairings pairings))
 (rf/reg-fx :effects.keycard/set-pairing-to-keycard set-pairing-to-keycard)
-
-(defn sign
-  [{:keys [on-success on-failure] :as args}]
-  (log/debug "[keycard] sign")
-  (keycard/sign
-   (assoc
-    args
-    :on-success
-    (fn [response]
-      (log/debug "[keycard response succ] sign")
-      (when on-success
-        (on-success (transforms/js->clj response))))
-    :on-failure
-    (fn [response]
-      (log/warn "[keycard response fail] sign"
-                (error-object->map response))
-      (when on-failure
-        (on-failure (error-object->map response)))))))
-(rf/reg-fx :effects.keycard/sign sign)
@@ -3,8 +3,6 @@
            status-im.contexts.keycard.login.events
            status-im.contexts.keycard.pin.events
            status-im.contexts.keycard.sheet.events
-            status-im.contexts.keycard.sign.events
-            [status-im.contexts.keycard.utils :as keycard.utils]
            [taoensso.timbre :as log]))

 (rf/reg-event-fx :keycard/on-check-nfc-enabled-success
@@ -57,19 +55,3 @@
 (fn [{:keys [db]} [{:keys [on-cancel-event-vector]}]]
   (log/debug "[keycard] nfc started success")
   {:db (assoc-in db [:keycard :on-nfc-cancelled-event-vector] on-cancel-event-vector)}))
-
-(rf/reg-event-fx :keycard/on-action-with-pin-error
- (fn [{:keys [db]} [error]]
-   (log/debug "[keycard] get keys error: " error)
-   (let [tag-was-lost?     (keycard.utils/tag-lost? (:error error))
-         pin-retries-count (keycard.utils/pin-retries (:error error))]
-     (if tag-was-lost?
-       {:db (assoc-in db [:keycard :pin :status] nil)}
-       (if (nil? pin-retries-count)
-         {:effects.utils/show-popup {:title "wrong-keycard"}}
-         {:db (-> db
-                  (assoc-in [:keycard :application-info :pin-retry-counter] pin-retries-count)
-                  (update-in [:keycard :pin] assoc :status :error))
-          :fx [[:dispatch [:keycard/hide-connection-sheet]]
-               (when (zero? pin-retries-count)
-                 [:effects.utils/show-popup {:title "frozen-keycard"}])]})))))
@@ -3,6 +3,22 @@
            [taoensso.timbre :as log]
            [utils.re-frame :as rf]))

+(rf/reg-event-fx :keycard.login/on-get-keys-error
+ (fn [{:keys [db]} [error]]
+   (log/debug "[keycard] get keys error: " error)
+   (let [tag-was-lost?     (keycard.utils/tag-lost? (:error error))
+         pin-retries-count (keycard.utils/pin-retries (:error error))]
+     (if tag-was-lost?
+       {:db (assoc-in db [:keycard :pin :status] nil)}
+       (if (nil? pin-retries-count)
+         {:effects.utils/show-popup {:title "wrong-keycard"}}
+         {:db (-> db
+                  (assoc-in [:keycard :application-info :pin-retry-counter] pin-retries-count)
+                  (update-in [:keycard :pin] assoc :status :error))
+          :fx [[:dispatch [:keycard/hide-connection-sheet]]
+               (when (zero? pin-retries-count)
+                 [:effects.utils/show-popup {:title "frozen-keycard"}])]})))))
+
 (rf/reg-event-fx :keycard.login/on-get-keys-success
 (fn [{:keys [db]} [data]]
   (let [{:keys [key-uid encryption-public-key
@@ -40,25 +56,28 @@
               :key-uid             key-uid}]]}))))

 (rf/reg-event-fx :keycard.login/on-get-application-info-success
- (fn [{:keys [db]} [application-info {:keys [key-uid on-read-fx]}]]
-   (let [error (keycard.utils/validate-application-info key-uid application-info)]
+ (fn [{:keys [db]} [application-info]]
+   (let [profile (get-in db [:profile/profiles-overview (get-in db [:profile/login :key-uid])])
+         pin     (get-in db [:keycard :pin :text])
+         error   (keycard.utils/validate-application-info profile application-info)]
     (if error
       {:effects.utils/show-popup {:title (str error)}}
-       {:db (-> db
-                (assoc-in [:keycard :application-info] application-info)
-                (assoc-in [:keycard :pin :status] :verifying))
-        :fx on-read-fx}))))
+       {:db                       (-> db
+                                      (assoc-in [:keycard :application-info] application-info)
+                                      (assoc-in [:keycard :pin :status] :verifying))
+        :effects.keycard/get-keys {:pin        pin
+                                   :on-success #(rf/dispatch [:keycard.login/on-get-keys-success %])
+                                   :on-failure #(rf/dispatch [:keycard.login/on-get-keys-error %])}}))))

 (rf/reg-event-fx :keycard.login/cancel-reading-card
 (fn [{:keys [db]}]
   {:db (assoc-in db [:keycard :on-card-connected-event-vector] nil)}))

-(rf/reg-event-fx :keycard/read-card
- (fn [{:keys [db]} [args]]
+(rf/reg-event-fx :keycard/read-card-and-login
+ (fn [{:keys [db]}]
   (let [connected?   (get-in db [:keycard :card-connected?])
         event-vector [:keycard/get-application-info
-                       {:on-success #(rf/dispatch [:keycard.login/on-get-application-info-success %
-                                                   args])}]]
+                       {:on-success #(rf/dispatch [:keycard.login/on-get-application-info-success %])}]]
     (log/debug "[keycard] proceed-to-login")
     {:db (assoc-in db [:keycard :on-card-connected-event-vector] event-vector)
      :fx [[:dispatch
@@ -9,17 +9,13 @@
                (assoc-in [:keycard :pin :text] (.slice pin 0 -1))
                (assoc-in [:keycard :pin :status] nil))}))))

-(rf/reg-fx :effects.keycard.pin/dispatch-on-complete
- (fn [[on-complete new-pin]]
-   (on-complete new-pin)))
-
 (rf/reg-event-fx :keycard.pin/number-pressed
- (fn [{:keys [db]} [number max-numbers on-complete]]
+ (fn [{:keys [db]} [number max-numbers on-complete-event]]
   (let [pin     (get-in db [:keycard :pin :text])
         new-pin (str pin number)]
     (when (<= (count new-pin) max-numbers)
       {:db (-> db
                (assoc-in [:keycard :pin :text] new-pin)
                (assoc-in [:keycard :pin :status] nil))
-        :fx [(when (and on-complete (= (dec max-numbers) (count pin)))
-               [:effects.keycard.pin/dispatch-on-complete [on-complete new-pin]])]}))))
+        :fx [(when (= (dec max-numbers) (count pin))
+               [:dispatch [on-complete-event]])]}))))
@@ -6,7 +6,7 @@
            [utils.re-frame :as rf]))

 (defn auth
-  [{:keys [on-complete]}]
+  [callback-event-key]
  (let [{:keys [text status]} (rf/sub [:keycard/pin])
        pin-retry-counter     (rf/sub [:keycard/pin-retry-counter])
        error?                (= status :error)]
@@ -23,4 +23,4 @@
      {:delete-key? true
       :on-delete   #(rf/dispatch [:keycard.pin/delete-pressed])
       :on-press    #(rf/dispatch [:keycard.pin/number-pressed % constants/pincode-length
-                                   on-complete])}]]))
+                                   callback-event-key])}]]))
@@ -1,29 +0,0 @@
-(ns status-im.contexts.keycard.sign.events
-  (:require [utils.address]
-            [utils.re-frame :as rf]))
-
-(defn get-signature-map
-  [tx-hash signature]
-  {tx-hash {:r (subs signature 0 64)
-            :s (subs signature 64 128)
-            :v (str (js/parseInt (subs signature 128 130) 16))}})
-
-(rf/reg-event-fx :keycard/sign-hash
- (fn [{:keys [db]} [pin-text tx-hash]]
-   (let [current-address (get-in db [:wallet :current-viewing-account-address])
-         path            (get-in db [:wallet :accounts current-address :path])
-         key-uid         (get-in db [:profile/profile :key-uid])]
-     {:fx [[:dispatch
-            [:keycard/read-card
-             {:key-uid    key-uid
-              :on-read-fx [[:effects.keycard/sign
-                            {:pin pin-text
-                             :path path
-                             :hash (utils.address/naked-address tx-hash)
-                             :on-success
-                             #(do
-                                (rf/dispatch [:keycard/hide-connection-sheet])
-                                (rf/dispatch
-                                 [:wallet/proceed-with-transactions-signatures
-                                  (get-signature-map tx-hash %)]))
-                             :on-failure #(rf/dispatch [:keycard/on-action-with-pin-error %])}]]}]]]})))
@@ -16,8 +16,8 @@
   (re-matches #".*NFCError:100.*" error)))

 (defn validate-application-info
-  [profile-key-uid {:keys [key-uid paired? pin-retry-counter puk-retry-counter] :as application-info}]
-  (let [profile-mismatch? (or (nil? profile-key-uid) (not= profile-key-uid key-uid))]
+  [profile {:keys [key-uid paired? pin-retry-counter puk-retry-counter] :as application-info}]
+  (let [profile-mismatch? (or (nil? profile) (not= (:key-uid profile) key-uid))]
    (log/debug "[keycard] login-with-keycard"
               "empty application info" (empty? application-info)
               "no key-uid"             (empty? key-uid)
@@ -1,17 +0,0 @@
-(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?)))
@@ -1,76 +0,0 @@
-(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)]])]}))
@@ -0,0 +1,55 @@
+(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?)))
@@ -2,6 +2,8 @@
  (:require
    [quo.foundations.colors :as colors]))

+(def flex-fill {:flex 1})
+
 (def heading {:margin-bottom 20})
 (def heading-subtitle {:color colors/white})
 (def heading-title (assoc heading-subtitle :margin-bottom 8))
@@ -12,15 +14,23 @@
 (def space-between-inputs {:height 16})

 (def password-tips
-  {:flex-direction     :row
-   :justify-content    :space-between
-   :padding-horizontal 20})
+  {:flex-direction    :row
+   :justify-content   :space-between
+   :margin-horizontal 20})

-(def form-container
-  {:justify-content    :space-between
-   :padding-top        12
-   :padding-horizontal 20})
+(def top-part
+  {:margin-horizontal 20
+   :margin-top        12})

-(def disclaimer-container {:padding-horizontal 20})
-(def footer-container {:padding-bottom 12})
-(def footer-button-container {:margin-top 20 :padding-horizontal 20})
+(def bottom-part
+  {:flex            1
+   :margin-top      12
+   :justify-content :flex-end})
+
+(def disclaimer-container
+  {:margin-horizontal 20
+   :margin-vertical   4})
+
+(def button-container
+  {:margin-horizontal 20
+   :margin-vertical   12})
@@ -1,11 +1,11 @@
 (ns status-im.contexts.onboarding.create-password.view
  (:require
+    [oops.core :refer [ocall]]
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
    [react-native.core :as rn]
-    [react-native.platform :as platform]
    [react-native.safe-area :as safe-area]
-    [status-im.common.floating-button-page.view :as floating-button]
+    [reagent.core :as reagent]
    [status-im.constants :as constants]
    [status-im.contexts.onboarding.create-password.style :as style]
    [utils.i18n :as i18n]
@@ -94,7 +94,7 @@
    [quo/tips {:completed? symbols?}
     (i18n/label :t/password-creation-tips-4)]]])

-(defn validate-password
+(defn password-validations
  [password]
  (let [validations (juxt utils.string/has-lower-case?
                          utils.string/has-upper-case?
@@ -111,25 +111,68 @@
       (filter true?)
       count))

-(defn- use-password-checks
-  [password]
-  (rn/use-memo
-   (fn []
-     (let [{:keys [long-enough?]
-            :as   validations} (validate-password password)]
-       {:password-long-enough? long-enough?
-        :password-validations  validations
-        :password-strength     (calc-password-strength validations)
-        :empty-password?       (empty? password)}))
-   [password]))
+(defn password-form
+  []
+  (let [password                  (reagent/atom "")
+        repeat-password           (reagent/atom "")
+        accepts-disclaimer?       (reagent/atom false)
+        focused-input             (reagent/atom nil)
+        show-password-validation? (reagent/atom false)
+        same-password-length?     #(and (seq @password)
+                                        (= (count @password) (count @repeat-password)))]
+    (fn []
+      (let [{user-color :color} (rf/sub [:onboarding/profile])
+            {:keys [long-enough?]
+             :as   validations} (password-validations @password)
+            password-strength   (calc-password-strength validations)
+            empty-password?     (empty? @password)
+            same-passwords?     (and (not empty-password?) (= @password @repeat-password))
+            meet-requirements?  (and (not empty-password?)
+                                     (utils.string/at-least-n-chars? @password 10)
+                                     same-passwords?
+                                     @accepts-disclaimer?)]
+        [:<>
+         [rn/view {:style style/top-part}
+          [header]
+          [password-inputs
+           {:password-long-enough?     long-enough?
+            :passwords-match?          same-passwords?
+            :empty-password?           empty-password?
+            :show-password-validation? @show-password-validation?
+            :on-input-focus            #(reset! focused-input :password)
+            :on-change-password        (fn [new-value]
+                                         (reset! password new-value)
+                                         (when (same-password-length?)
+                                           (reset! show-password-validation? true)))
+            :on-change-repeat-password (fn [new-value]
+                                         (reset! repeat-password new-value)
+                                         (when (same-password-length?)
+                                           (reset! show-password-validation? true)))
+            :on-blur-repeat-password   #(if empty-password?
+                                          (reset! show-password-validation? false)
+                                          (reset! show-password-validation? true))}]]

-(defn- use-repeat-password-checks
-  [password repeat-password]
-  (rn/use-memo
-   (fn []
-     {:same-password-length? (and (seq password) (= (count password) (count repeat-password)))
-      :same-passwords?       (and (seq password) (= password repeat-password))})
-   [password repeat-password]))
+         [rn/view {:style style/bottom-part}
+          (when same-passwords?
+            [rn/view {:style style/disclaimer-container}
+             [quo/disclaimer
+              {:blur?     true
+               :on-change #(swap! accepts-disclaimer? not)
+               :checked?  @accepts-disclaimer?}
+              (i18n/label :t/password-creation-disclaimer)]])
+          (when (and (= @focused-input :password) (not same-passwords?))
+            [help
+             {:validations       validations
+              :password-strength password-strength}])
+
+          [rn/view {:style style/button-container}
+           [quo/button
+            {:disabled?           (not meet-requirements?)
+             :customization-color user-color
+             :on-press            #(rf/dispatch
+                                    [:onboarding/password-set
+                                     (security/mask-data @password)])}
+            (i18n/label :t/password-creation-confirm)]]]]))))

 (defn create-password-doc
  []
@@ -140,108 +183,38 @@
    [quo/text {:size :paragraph-2}
     (i18n/label :t/create-profile-password-info-box-description)]]])

-(defn- on-press-info
-  []
-  (rn/dismiss-keyboard!)
-  (rf/dispatch [:show-bottom-sheet
-                {:content create-password-doc
-                 :shell?  true}]))
-
-(defn- navigate-back
-  []
-  (rf/dispatch [:navigate-back]))
-
-(defn- page-nav
-  []
-  (let [{:keys [top]} (safe-area/get-insets)]
-    [quo/page-nav
-     {:margin-top top
-      :background :blur
-      :icon-name  :i/arrow-left
-      :on-press   navigate-back
-      :right-side [{:icon-name :i/info
-                    :on-press  on-press-info}]}]))
-
 (defn create-password
  []
-  (let [[password set-password]                         (rn/use-state "")
-        [repeat-password set-repeat-password]           (rn/use-state "")
-        [accepts-disclaimer? set-accepts-disclaimer?]   (rn/use-state false)
-        [focused-input set-focused-input]               (rn/use-state nil)
-        [show-password-validation?
-         set-show-password-validation?]                 (rn/use-state false)
-        {user-color :color}                             (rf/sub [:onboarding/profile])
-
-
-        {:keys [password-long-enough?
-                password-validations password-strength
-                empty-password?]}                       (use-password-checks password)
-
-        {:keys [same-password-length? same-passwords?]} (use-repeat-password-checks password
-                                                                                    repeat-password)
-
-        meet-requirements?                              (rn/use-memo
-                                                         #(and (not empty-password?)
-                                                               (utils.string/at-least-n-chars? password
-                                                                                               10)
-                                                               same-passwords?
-                                                               accepts-disclaimer?)
-                                                         [password repeat-password
-                                                          accepts-disclaimer?])]
-
-    [floating-button/view
-     {:header [page-nav]
-      :keyboard-should-persist-taps :handled
-      :content-avoid-keyboard? true
-      :blur-options
-      {:blur-amount        34
-       :blur-radius        20
-       :blur-type          :transparent
-       :overlay-color      :transparent
-       :background-color   (if platform/android? colors/neutral-100 colors/neutral-80-opa-1-blur)
-       :padding-vertical   0
-       :padding-horizontal 0}
-      :footer-container-padding 0
-      :footer
-      [rn/view
-       {:style style/footer-container}
-       (when same-passwords?
-         [rn/view {:style style/disclaimer-container}
-          [quo/disclaimer
-           {:blur?     true
-            :on-change (partial set-accepts-disclaimer? not)
-            :checked?  accepts-disclaimer?}
-           (i18n/label :t/password-creation-disclaimer)]])
-       (when (and (= focused-input :password) (not same-passwords?))
-         [help
-          {:validations       password-validations
-           :password-strength password-strength}])
-       [quo/button
-        {:container-style     style/footer-button-container
-         :disabled?           (not meet-requirements?)
-         :customization-color user-color
-         :on-press            #(rf/dispatch
-                                [:onboarding/password-set
-                                 (security/mask-data password)])}
-        (i18n/label :t/password-creation-confirm)]]}
-
-     [rn/view {:style style/form-container}
-      [header]
-      [password-inputs
-       {:password-long-enough?     password-long-enough?
-        :passwords-match?          same-passwords?
-        :empty-password?           empty-password?
-        :show-password-validation? show-password-validation?
-        :on-input-focus            #(set-focused-input :password)
-        :on-change-password        (fn [new-value]
-                                     (set-password new-value)
-                                     (when same-password-length?
-                                       (set-show-password-validation? true)))
-
-        :on-change-repeat-password (fn [new-value]
-                                     (set-repeat-password new-value)
-                                     (when same-password-length?
-                                       (set-show-password-validation? true)))
-        :on-blur-repeat-password   #(if empty-password?
-                                      (set-show-password-validation? false)
-                                      (set-show-password-validation? true))}]]]))
+  (reagent/with-let [keyboard-shown?      (reagent/atom false)
+                     {:keys [top bottom]} (safe-area/get-insets)
+                     will-show-listener   (ocall rn/keyboard
+                                                 "addListener"
+                                                 "keyboardWillShow"
+                                                 #(reset! keyboard-shown? true))
+                     will-hide-listener   (ocall rn/keyboard
+                                                 "addListener"
+                                                 "keyboardWillHide"
+                                                 #(reset! keyboard-shown? false))
+                     on-press-info        (fn []
+                                            (rn/dismiss-keyboard!)
+                                            (rf/dispatch [:show-bottom-sheet
+                                                          {:content create-password-doc
+                                                           :shell?  true}]))]
+    [:<>
+     [rn/touchable-without-feedback
+      {:on-press   rn/dismiss-keyboard!
+       :accessible false}
+      [rn/view {:style style/flex-fill}
+       [rn/keyboard-avoiding-view {:style style/flex-fill}
+        [quo/page-nav
+         {:margin-top top
+          :background :blur
+          :icon-name  :i/arrow-left
+          :on-press   #(rf/dispatch [:navigate-back])
+          :right-side [{:icon-name :i/info
+                        :on-press  on-press-info}]}]
+        [password-form]
+        [rn/view {:style {:height (if-not @keyboard-shown? bottom 0)}}]]]]]
+    (finally
+     (ocall will-show-listener "remove")
+     (ocall will-hide-listener "remove"))))
@@ -20,13 +20,14 @@
   :padding-bottom   20
   :background-color (when-not in-onboarding? colors/neutral-80-opa-80-blur)})

-(defn page-illustration
-  [width]
-  {:flex            1
-   :width           width
-   :align-items     :center
-   :align-self      :center
-   :justify-content :center})
+(def page-illustration
+  {:flex              1
+   :background-color  colors/danger-50
+   :align-items       :center
+   :margin-horizontal 20
+   :border-radius     20
+   :margin-top        20
+   :justify-content   :center})

 (def try-again-button
  {:margin-top         20
@@ -2,9 +2,10 @@
  (:require
    [quo.core :as quo]
    [react-native.core :as rn]
-    [status-im.common.resources :as resources]
+    [status-im.config :as config]
    [status-im.contexts.onboarding.common.background.view :as background]
    [status-im.contexts.onboarding.syncing.progress.style :as style]
+    [utils.debounce :as debounce]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

@@ -26,39 +27,45 @@
    :description-accessibility-label :progress-screen-sub-title}])

 (defn try-again-button
-  [profile-color]
+  [profile-color in-onboarding? logged-in?]
  [quo/button
   {:on-press            (fn []
                           (rf/dispatch [:syncing/clear-states])
-                           (rf/dispatch [:navigate-back]))
+                           (cond
+                             logged-in?     (rf/dispatch [:navigate-back])
+                             in-onboarding? (rf/dispatch [:navigate-back-to
+                                                          :screen/onboarding.sign-in-intro])
+                             :else          (do
+                                              (rf/dispatch [:navigate-back])
+                                              (debounce/throttle-and-dispatch
+                                               [:open-modal
+                                                :screen/onboarding.sign-in]
+                                               1000))))
    :accessibility-label :try-again-later-button
    :customization-color profile-color
-    :size                40
    :container-style     style/try-again-button}
   (i18n/label :t/try-again)])

-(defn- illustration
-  [pairing-progress?]
-  [rn/image
-   {:resize-mode :contain
-    :style       (style/page-illustration (:width (rn/get-window)))
-    :source      (resources/get-image (if pairing-progress? :syncing-devices :syncing-wrong))}])
-
 (defn view
  [in-onboarding?]
-  (let [pairing-status    (rf/sub [:pairing/pairing-status])
-        pairing-progress? (pairing-progress pairing-status)
-        profile-color     (or (:color (rf/sub [:onboarding/profile]))
-                              (rf/sub [:profile/customization-color]))]
+  (let [pairing-status (rf/sub [:pairing/pairing-status])
+        profile-color  (:color (rf/sub [:onboarding/profile]))
+        logged-in?     (rf/sub [:multiaccount/logged-in?])]
    [rn/view {:style (style/page-container in-onboarding?)}
     (when-not in-onboarding?
       [rn/view {:style style/absolute-fill}
        [background/view true]])
     [quo/page-nav {:type :no-title :background :blur}]
-     [page-title pairing-progress?]
-     [illustration pairing-progress?]
+     [page-title (pairing-progress pairing-status)]
+     (if config/show-not-implemented-features?
+       (if (pairing-progress pairing-status)
+         [rn/view {:style style/page-illustration}
+          [quo/text "[Success here]"]]
+         [rn/view {:style style/page-illustration}
+          [quo/text "[Error here]"]])
+       [rn/view {:flex 1}])
     (when-not (pairing-progress pairing-status)
-       [try-again-button profile-color])]))
+       [try-again-button profile-color in-onboarding? logged-in?])]))

 (defn view-onboarding
  []
@@ -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 {:theme :dark}])
-                                  (rf/dispatch [:theme/switch {:theme :light}]))}]
+                                  (rf/dispatch [:theme/switch :dark])
+                                  (rf/dispatch [:theme/switch :light]))}]
      :on-press   #(if (or logged-in? (not= (rf/sub [:view-id]) :quo-preview))
                     (rf/dispatch [:navigate-back])
                     (do
-                       (rf/dispatch [:theme/switch {:theme :dark}])
+                       (rf/dispatch [:theme/switch :dark])
                       (rf/dispatch [:init-root root])))}]))
@@ -50,7 +50,7 @@
     (fn []
       (rn/use-effect (fn []
                        (when @blur?
-                          (rf/dispatch [:theme/switch {:theme :dark}])))
+                          (rf/dispatch [:theme/switch :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 {:theme :dark}])
-                         (rf/dispatch [:theme/switch {:theme :light}]))))
+                         (rf/dispatch [:theme/switch :dark])
+                         (rf/dispatch [:theme/switch :light]))))
                   [blur? blur-dark-only?])
    [rn/view
     {:style {:top  (safe-area/get-top)
@@ -9,26 +9,21 @@
 (defn login
  []
  {;; Temporary fix until https://github.com/status-im/status-go/issues/3024 is resolved
-   :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})
+   :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})

 (defn create
  []
@@ -54,7 +54,7 @@
                    (update :profile/login #(select-profile % key-uid)))
                db-with-settings)
          :fx [[:dispatch [:init-root :screen/profile.profiles]]
-               (when (and key-uid userConfirmed)
+               (when key-uid
                 [:effects.biometric/check-if-available
                  {:key-uid    key-uid
                   :on-success (fn [auth-method]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Prem Chaitanya Prathi	387d3818c5	chore: pick go-waku updates	2024-07-26 16:33:46 +05:30
Prem Chaitanya Prathi	849330dfc1	chore: take filter ping related changes from status-go	2024-07-26 16:33:46 +05:30