fix: show user avater on share screen

fleets.json: remove go-waku fleets and update some other ENRs
chore: remove hermes enable condition (#18723 )
2024-02-06 16:13:49 +01:00 · 2024-02-06 12:34:56 +01:00 · 2024-02-06 16:57:05 +05:30 · 2024-02-06 13:15:23 +02:00 · 2024-02-05 16:08:18 +02:00 · 2024-02-05 04:29:25 -08:00
113 changed files with 1472 additions and 777 deletions
@@ -160,10 +160,12 @@ pod-install: export TARGET := ios
 pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile.lock
 	cd ios && pod install; cd --

+FLEETS_FILE := ./resources/config/fleets.json
 update-fleets: ##@prepare Download up-to-date JSON file with current fleets state
 	curl -s https://fleets.status.im/ \
 		| sed 's/"warning": "/"warning": "DO NOT EDIT! /' \
-		> resources/config/fleets.json
+		> $(FLEETS_FILE)
+	echo >> $(FLEETS_FILE)

 $(KEYSTORE_PATH): export TARGET := keytool
 $(KEYSTORE_PATH):
@@ -273,6 +275,9 @@ run-re-frisk: ##@run Start re-frisk server

 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
+# Disabled for debug builds to avoid 'maximum call stack exceeded' errors.
+# https://github.com/status-im/status-mobile/issues/18493
+run-android: export ORG_GRADLE_PROJECT_hermesEnabled := false
 # INFO: If it's empty (no devices attached, parsing issues, script error) - for Nix it's the same as not set.
 run-android: export ANDROID_ABI_INCLUDE ?= $(shell ./scripts/adb_devices_abis.sh)
 run-android: ##@run Build Android APK and start it on the device
@@ -267,25 +267,24 @@ android {
 dependencies {
    // The version of react-native is set by the React Native Gradle Plugin
    implementation("com.facebook.react:react-android")
-    implementation "androidx.core:core-splashscreen:1.0.0"
-
-    if (hermesEnabled.toBoolean()) {
-        implementation("com.facebook.react:hermes-android")
-      } else {
-      implementation jscFlavor
-    }
+    implementation("androidx.core:core-splashscreen:1.0.0")
+    // we don't use hermes for debug but we need its pom file for release builds
+    // https://github.com/status-im/status-mobile/pull/18675
+    implementation("com.facebook.react:hermes-android")
+    // FIXME: implementing both hermes & JSC increases bundle size by ~ 2MB
+    implementation(jscFlavor)

    // react-native-screens
-    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
-    implementation 'androidx.multidex:multidex:2.0.1' // required by status-mobile/android/app/src/main/java/im/status/ethereum/MainApplication.java
+    implementation("androidx.appcompat:appcompat:1.1.0-rc01")
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02")
+    implementation("androidx.multidex:multidex:2.0.1") // required by status-mobile/android/app/src/main/java/im/status/ethereum/MainApplication.java
    implementation project(':react-native-blur')
    implementation project(':react-native-status')
    implementation project(':react-native-status-keycard')
-    implementation 'com.github.status-im:function:0.0.1'
-    implementation 'com.facebook.fresco:fresco:2.5.0'
-    implementation 'com.facebook.fresco:animated-gif:2.5.0'
-    implementation "com.squareup.okhttp3:okhttp-tls:4.9.2"
+    implementation("com.github.status-im:function:0.0.1")
+    implementation("com.facebook.fresco:fresco:2.5.0")
+    implementation("com.facebook.fresco:animated-gif:2.5.0")
+    implementation("com.squareup.okhttp3:okhttp-tls:4.9.2")
    implementation("com.google.prefab:cli:2.0.0")
 }

@@ -57,4 +57,6 @@ newArchEnabled=false

 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
-hermesEnabled=true
+# Disabled for debug builds to avoid 'maximum call stack exceeded' errors.
+# https://github.com/status-im/status-mobile/issues/18493
+hermesEnabled=false
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.4'
+library 'status-jenkins-lib@v1.8.5'

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

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

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

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

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

 pipeline {

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

 pipeline {

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

 pipeline {

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

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

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

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

 pipeline {
  agent {
@@ -11344,12 +11344,12 @@
  },

  {
-    "path": "com/google/protobuf/protobuf-bom/4.0.0-rc-2",
+    "path": "com/google/protobuf/protobuf-bom/4.26.0-RC1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "protobuf-bom-4.0.0-rc-2.pom": {
-        "sha1": "1cf14b7774313bc34805dd58fffa3cbc35601184",
-        "sha256": "sha256-45/pSYKw70HwkoTPbtPkj0Bsu/ZtioKD0MYmk04KYTI="
+      "protobuf-bom-4.26.0-RC1.pom": {
+        "sha1": "95b890ee6f318b67514a9d3573c78aebfd8cf4c1",
+        "sha256": "sha256-rGscgQUEAvrvFw6SnyMSbIw7N0J6SEgo4bo8nmAbO04="
      }
    }
  },
@@ -11520,16 +11520,16 @@
  },

  {
-    "path": "com/google/protobuf/protobuf-java/4.0.0-rc-2",
+    "path": "com/google/protobuf/protobuf-java/4.26.0-RC1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "protobuf-java-4.0.0-rc-2.pom": {
-        "sha1": "8fab0fe0746b1d370663a3db7dd483c2c4d34a6f",
-        "sha256": "sha256-q//aKX5NdsCktWMRsnjG/L3jNI9g/ucIGLN119ZzT50="
+      "protobuf-java-4.26.0-RC1.pom": {
+        "sha1": "9b053265705abd2eb8dd06831b4728ed19e8f79a",
+        "sha256": "sha256-cexXywR1/FPS885SUYezfvvww1TAjy6gAtAmxJVxn0Y="
      },
-      "protobuf-java-4.0.0-rc-2.jar": {
-        "sha1": "ae590f34383d2d6fde2b3b8e2ffb668e64579099",
-        "sha256": "sha256-PMJSvvZfetM8UwzuxxZkzR2gsmUhrWZzpl2fpJMegio="
+      "protobuf-java-4.26.0-RC1.jar": {
+        "sha1": "a4718e6e4943736bb27aa3c7f8ef3c0a851c35b1",
+        "sha256": "sha256-cgTa51zMiegEQa2I9pyGy9psCQ5tPJU9MfMoC8DyDDg="
      }
    }
  },
@@ -11627,38 +11627,38 @@
  },

  {
-    "path": "com/google/protobuf/protobuf-parent/4.0.0-rc-2",
+    "path": "com/google/protobuf/protobuf-parent/4.26.0-RC1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "protobuf-parent-4.0.0-rc-2.pom": {
-        "sha1": "c5391c7917ca1197cbbda4efc6454a87e7e7107e",
-        "sha256": "sha256-4NJwgSugXAqrlx4wtRyl0VcmYBkGxiGsIM3LLkq2fi8="
+      "protobuf-parent-4.26.0-RC1.pom": {
+        "sha1": "80963cafb79bc1b0f5dd2c1c82c67016c2362ad4",
+        "sha256": "sha256-n+4hEMufYvUwFQts4WiDUYKyGGnivQQhyc2bS7fODMs="
      }
    }
  },

  {
-    "path": "com/google/truth/truth-parent/1.2.0",
+    "path": "com/google/truth/truth-parent/1.4.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "truth-parent-1.2.0.pom": {
-        "sha1": "d24447b2a11846a354e503575ed95e393ba5158d",
-        "sha256": "sha256-Q8/2l2yxZ5ETlTWluYDpwTW8Fgxk7hGc/6qNHv9aquI="
+      "truth-parent-1.4.0.pom": {
+        "sha1": "08b3f870d82e4e34caa1aa94ca03c29d9b40d3d2",
+        "sha256": "sha256-K+3ssiZ3EYKh/sxgh3NFLyTPuMEjreDzymb4pmmU3Gs="
      }
    }
  },

  {
-    "path": "com/google/truth/truth/1.2.0",
+    "path": "com/google/truth/truth/1.4.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "truth-1.2.0.pom": {
-        "sha1": "44853be2a0532449235377b3eea680b679cefa7e",
-        "sha256": "sha256-4snQPEXLKYR49KPOM37mXXsk+nVA/PSEy/OkvuQCuVo="
+      "truth-1.4.0.pom": {
+        "sha1": "6ff4bdfe8a3758a755b52ad894b7d983c88e4850",
+        "sha256": "sha256-v4+lYqfRXWNEU9f/LidC/eACm2VNhwtK0uejf89mTnY="
      },
-      "truth-1.2.0.jar": {
-        "sha1": "0135db6c1dfab1b3ca326c8ce51c09381d332d43",
-        "sha256": "sha256-tGEIQNXjffFOZqqwuEDA7j+l6Vl9o6KQIGQYcXHCM5o="
+      "truth-1.4.0.jar": {
+        "sha1": "2a9475ed8cf2081b859fda8f9c860d5c449cd9ed",
+        "sha256": "sha256-I1wo6W7mcBqwHMhS+ylMsPNHVvY2qBVLmu8I+xIVu8Q="
      }
    }
  },
@@ -17512,16 +17512,16 @@
  },

  {
-    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta2",
+    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta3",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "kotlin-reflect-2.0.0-Beta2.pom": {
-        "sha1": "71908b10dd3fefa0509880918948931ad0b8d7c8",
-        "sha256": "sha256-TmkaczZz+Eqbux6yz2SyE9WhflLrknrULgk8j/2sfUs="
+      "kotlin-reflect-2.0.0-Beta3.pom": {
+        "sha1": "dc97aad46542eaa0cb64120911ac1013483969ac",
+        "sha256": "sha256-NnPskjZQvqH3zdWL94mDT/EMvy51senYGEbKjz+ya64="
      },
-      "kotlin-reflect-2.0.0-Beta2.jar": {
-        "sha1": "0cf9ed5d13e31c4e4ab74be627b7cedc0ecc7715",
-        "sha256": "sha256-PAz62O51jigTUVGhAJHGrWdbLoVdCFwwhhI883u50bw="
+      "kotlin-reflect-2.0.0-Beta3.jar": {
+        "sha1": "6915153788502bdccc98753f41dcbd5bf7c7e128",
+        "sha256": "sha256-k4zOXYaKP8MBwjWAOLuEt0ahsLlSHtdnldJma/o0e2Y="
      }
    }
  },
@@ -18769,28 +18769,28 @@
  },

  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta2",
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta3",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "kotlin-stdlib-2.0.0-Beta2.pom": {
-        "sha1": "a1310fbc42c0cbc786766d2e35dcbfdaf3f8a8b1",
-        "sha256": "sha256-8upeJFveFokz2f2rBOXj2KZ9+OzyWxWtqZ9/2qcJGnI="
+      "kotlin-stdlib-2.0.0-Beta3.pom": {
+        "sha1": "1005b3f259dffb93f972e5227eb18fc579b71811",
+        "sha256": "sha256-2qxjaqrwUBME9CbB4lpEKGV4qi2VGn8USteyCSZ8lq4="
      },
-      "kotlin-stdlib-2.0.0-Beta2-all.jar": {
-        "sha1": "c844df2813fa56f8baa346530a5172ccf03277d0",
-        "sha256": "sha256-o8TV9hZ9IGumB5g+8nq6R6YU+VxlRV0PJ3IsSsMRsSM="
+      "kotlin-stdlib-2.0.0-Beta3-all.jar": {
+        "sha1": "845c7a75152307a41522e800bb9706a58e02b228",
+        "sha256": "sha256-YwNHMM8zT64dAULHPNt+zLXQ5xTeAvtP/HKybthMDWI="
      },
-      "kotlin-stdlib-2.0.0-Beta2-common.jar": {
+      "kotlin-stdlib-2.0.0-Beta3-common.jar": {
        "sha1": "e0224f6b9468655e1feffe789ab7ebd4965a9431",
        "sha256": "sha256-ikItp8AZFxM/bokvCF68e2Q+oNGbbJxTILtPDnj7uMI="
      },
-      "kotlin-stdlib-2.0.0-Beta2.jar": {
-        "sha1": "61be8a13ad24f43c915ba6962440cd30af4700ec",
-        "sha256": "sha256-yDOkRXCSzieZ5nejro0ku4suO6qDwWlDBdnb5ZHgquA="
+      "kotlin-stdlib-2.0.0-Beta3.jar": {
+        "sha1": "9982637ebb69602015ed823cceca7054d2ab8bbe",
+        "sha256": "sha256-1+6KuGuMgmiuPLpxx+cJSZ3/pnVOMmLdtzmk3mwB0ro="
      },
-      "kotlin-stdlib-2.0.0-Beta2.module": {
-        "sha1": "22702775430e8d3a9f8d824167e00484e07d5932",
-        "sha256": "sha256-J6vVZxhfZbGpw8tTtV4RQTPJrkFqMwetPevDDG/iO/U="
+      "kotlin-stdlib-2.0.0-Beta3.module": {
+        "sha1": "5026675037ebf81e108eb3cc581a24570ec7ceb2",
+        "sha256": "sha256-rlVFQM89Ga0h57LsViIgT8iSdE18G0rd/TN7/u9UKrU="
      }
    }
  },
@@ -19055,16 +19055,16 @@
  },

  {
-    "path": "org/junit/junit-bom/5.10.1",
+    "path": "org/junit/junit-bom/5.10.2",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "junit-bom-5.10.1.pom": {
-        "sha1": "41a86ea51227739a5b7ca3430ae88ce44a64a42a",
-        "sha256": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
+      "junit-bom-5.10.2.pom": {
+        "sha1": "b25ed98a5bd08cdda60e569cf22822a760e76019",
+        "sha256": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
      },
-      "junit-bom-5.10.1.module": {
-        "sha1": "1b577334c47deb59a29dc31e5211499d0eb3c17b",
-        "sha256": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c="
+      "junit-bom-5.10.2.module": {
+        "sha1": "ce536748a853ae6ac09e7815fce0678a96cff778",
+        "sha256": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo="
      }
    }
  },
@@ -19160,16 +19160,16 @@
  },

  {
-    "path": "org/mockito/mockito-core/5.9.0",
+    "path": "org/mockito/mockito-core/5.10.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "mockito-core-5.9.0.pom": {
-        "sha1": "2054dcc15b9ede899cb9ec6e8e960e36c68b4574",
-        "sha256": "sha256-BJDEL+Yu7WRzQdpAojcHGW2BO0TbKj3KMB2IFz56yPc="
+      "mockito-core-5.10.0.pom": {
+        "sha1": "25e309d012d326eef980de463edeb2a592cf9cdb",
+        "sha256": "sha256-D4gyKTuHHyO2/0QkET7mXBdfq9G2uswY7Dg8s5akOq8="
      },
-      "mockito-core-5.9.0.jar": {
-        "sha1": "faa88b96db3aeb96a93e83dec7491345bfbfc414",
-        "sha256": "sha256-u62Rhe1zSWX6x+Nn8OUVlvaVMeUdiyy87BBI3W+0Hyw="
+      "mockito-core-5.10.0.jar": {
+        "sha1": "b3812fa2ee069f1d0b41c1c0155da79d0e1dcde0",
+        "sha256": "sha256-AyP1kbBNOg18qevuu56fNKB8DskWm3RE7jlRtx1MrVY="
      }
    }
  },
@@ -718,7 +718,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.7.1/prot
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.10.0/protobuf-bom-3.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.13.0/protobuf-bom-3.13.0.pom
 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/4.0.0-rc-2/protobuf-bom-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.26.0-RC1/protobuf-bom-4.26.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.10.0/protobuf-java-util-3.10.0.pom
@@ -730,7 +730,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.7.1/pro
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.10.0/protobuf-java-3.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.pom
 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/4.0.0-rc-2/protobuf-java-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.26.0-RC1/protobuf-java-4.26.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -739,9 +739,9 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.7.1/p
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.10.0/protobuf-parent-3.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/protobuf-parent-3.13.0.pom
 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/4.0.0-rc-2/protobuf-parent-4.0.0-rc-2.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.2.0/truth-parent-1.2.0.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth/1.2.0/truth-1.2.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.26.0-RC1/protobuf-parent-4.26.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom
+https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.0/truth-1.4.0.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
@@ -1146,7 +1146,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.10/kotlin-reflect-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta2/kotlin-reflect-2.0.0-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta3/kotlin-reflect-2.0.0-Beta3.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.9.0/kotlin-scripting-common-1.9.0.pom
@@ -1229,7 +1229,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.22/kotlin-stdlib-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta2/kotlin-stdlib-2.0.0-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta3/kotlin-stdlib-2.0.0-Beta3.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.9.0/kotlin-tooling-core-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20/kotlin-tooling-metadata-1.6.20.pom
@@ -1247,14 +1247,14 @@ https://repo.maven.apache.org/maven2/org/json/json/20231013/json-20231013.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/junit/junit-bom/5.9.2/junit-bom-5.9.2.pom
 https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.3/junit-bom-5.9.3.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.1/junit-bom-5.10.1.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.2/junit-bom-5.10.2.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.12.4/mockito-core-3.12.4.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.9.0/mockito-core-5.9.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.10.0/mockito-core-5.10.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-inline/4.0.0/mockito-inline-4.0.0.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom
@@ -79,6 +79,9 @@ in stdenv.mkDerivation rec {
  STATUS_GO_SRC_OVERRIDE = statusGoSrcOverride;
  ANDROID_ABI_SPLIT = androidAbiSplit;
  ANDROID_ABI_INCLUDE = androidAbiInclude;
+  # Disabled for debug builds to avoid 'maximum call stack exceeded' errors.
+  # https://github.com/status-im/status-mobile/issues/18493
+  ORG_GRADLE_PROJECT_hermesEnabled = true;

  # Fix for ERR_OSSL_EVP_UNSUPPORTED error.
  NODE_OPTIONS = "--openssl-legacy-provider";
@@ -1,7 +1,7 @@
 {
    "meta": {
        "hostname": "node-01.do-ams3.sites.misc",
-        "timestamp": "2023-01-05T10:03:38.657813",
+        "timestamp": "2024-02-02T14:48:22.521541",
        "warning": "DO NOT EDIT! Auto generated from Consul. Should only be used at build time."
    },
    "fleets": {
@@ -89,9 +89,9 @@
                "node-01.ac-cn-hongkong-c.wakuv2.prod": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD"
            },
            "enr/p2p/waku": {
-                "node-01.do-ams3.wakuv2.prod": "enr:-M-4QLdAB-KyzT3QEsDoNa4LXT6RGH9BIylvTlDFLQhigWmxKEesulgc8AoKmVEUKj_4St6ThBKwyBc69tBfCe2hVTABgmlkgnY0gmlwhLymh5GKbXVsdGlhZGRyc7EALzYobm9kZS0wMS5kby1hbXMzLndha3V2Mi5wcm9kLnN0YXR1c2ltLm5ldAYfQN4DiXNlY3AyNTZrMaEDbl1X_zJIw3EAJGtmHMVn4Z2xhpSoUaP5ElsHKCv7hlWDdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
-                "node-01.gc-us-central1-a.wakuv2.prod": "enr:-Nm4QNgc2L6L-4nk6jgllNDE1QDcn6kv2922rTRYs1wM3My_OmSsTimkMCIMh8fat6enFdYfuJ23KjWdF5whBz3zXgUBgmlkgnY0gmlwhCJ5ZGyKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhA_30kHgQqfXZRioa4J_u5asgXTJ5iw_8w3lEICH4TFu_g3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
-                "node-01.ac-cn-hongkong-c.wakuv2.prod": "enr:-Nm4QOdTOKZJKTUUZ4O_W932CXIET-M9NamewDnL78P5u9DOGnZlK0JFZ4k0inkfe6iY-0JAaJVovZXc575VV3njeiABgmlkgnY0gmlwhAjS3ueKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhAo0C-VvfgHiXrxZi3umDiooXMGY9FvYj5_d1Q4EeS7eyg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
+                "node-01.do-ams3.wakuv2.prod": "enr:-P-4QJI8tS1WTdIQxq_yIrD05oIIW1Xg-tm_qfP0CHfJGnp9dfr6ttQJmHwTNxGEl4Le8Q7YHcmi-kXTtphxFysS11oBgmlkgnY0gmlwhLymh5GKbXVsdGlhZGRyc7hgAC02KG5vZGUtMDEuZG8tYW1zMy53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGdl8ALzYobm9kZS0wMS5kby1hbXMzLndha3V2Mi5wcm9kLnN0YXR1c2ltLm5ldAYfQN4DiXNlY3AyNTZrMaEDbl1X_zJIw3EAJGtmHMVn4Z2xhpSoUaP5ElsHKCv7hlWDdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
+                "node-01.gc-us-central1-a.wakuv2.prod": "enr:-QERuEC0EGWTjg_gYdnuPypJ9LAbB3lml6M8GiRajGegL2iWEj1MJzUMV9X6jXw7mMAQQLozLCTLFT-zv-ELQLPwWdACAYJpZIJ2NIJpcIQieWRsim11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdXYyLnByb2Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhA_30kHgQqfXZRioa4J_u5asgXTJ5iw_8w3lEICH4TFu_g3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.ac-cn-hongkong-c.wakuv2.prod": "enr:-QERuEDABor1lVmSa5ek8of5eBc8jZoxxdleJVLLdMl8UeZHNwhsVp64SFiCT4BRIIfcs7uxTPUCjmWxK_OA1s-FfIW7AYJpZIJ2NIJpcIQI0t7nim11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdXYyLnByb2Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhAo0C-VvfgHiXrxZi3umDiooXMGY9FvYj5_d1Q4EeS7eyg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
            },
            "wss/p2p/waku": {
                "node-01.do-ams3.wakuv2.prod": "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
@@ -106,9 +106,9 @@
                "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm"
            },
            "enr/p2p/waku": {
-                "node-01.do-ams3.wakuv2.test": "enr:-M-4QCtJKX2WDloRYDT4yjeMGKUCRRcMlsNiZP3cnPO0HZn6IdJ035RPCqsQ5NvTyjqHzKnTM6pc2LoKliV4CeV0WrgBgmlkgnY0gmlwhIbRi9KKbXVsdGlhZGRyc7EALzYobm9kZS0wMS5kby1hbXMzLndha3V2Mi50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DiXNlY3AyNTZrMaEDnr03Tuo77930a7sYLikftxnuG3BbC3gCFhA4632ooDaDdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
-                "node-01.gc-us-central1-a.wakuv2.test": "enr:-Nm4QLHYoJ5WYQoVzyqPR-pwIeQvi3ONWs-EPwk3uUiBiDseN9Dd7fYbCvkMdeXcuZ-8U9IYdGm38VxSDf_Oq3zZ0cEBgmlkgnY0gmlwhGia74CKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS53YWt1djIudGVzdC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhA1giYsmWV9r2yJZYAiMGHJfjLlLeqAuTAokUGPN__pkxg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
-                "node-01.ac-cn-hongkong-c.wakuv2.test": "enr:-Nm4QC0_ClHzbsutYzgT3jJm7ZY1D4shylAdd6Ac-L4uwAUha1oHM0zwoEkTORVt94W5Cpa0IiyrTcXAYLgpRXpVNUsBgmlkgnY0gmlwhC_y0kmKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy53YWt1djIudGVzdC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhAhAm-P4q6mWONKcGnbLPU8WXZJ4Qs3AxIbrycvc7PVKsg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
+                "node-01.do-ams3.wakuv2.test": "enr:-P-4QPLMQ1zIYRAs4-F0mYmMxMihSySRtEIuGHJ_Qd_GL8XqUE78hpVUE97rgwlXnxPkzMJHkWyiNq7DT1fdZSy3QcgBgmlkgnY0gmlwhIbRi9KKbXVsdGlhZGRyc7hgAC02KG5vZGUtMDEuZG8tYW1zMy53YWt1djIudGVzdC5zdGF0dXNpbS5uZXQGdl8ALzYobm9kZS0wMS5kby1hbXMzLndha3V2Mi50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DiXNlY3AyNTZrMaEDnr03Tuo77930a7sYLikftxnuG3BbC3gCFhA4632ooDaDdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
+                "node-01.gc-us-central1-a.wakuv2.test": "enr:-QERuEDZcXS5tjppj4TIlOm-TLanjmqx3-uk2kGFvvAQR1NVrklUhiN1JCb5dWucEQ_oDADOb6nG_1mJ5goF5CHneZ-VAYJpZIJ2NIJpcIRomu-Aim11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdXYyLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS53YWt1djIudGVzdC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhA1giYsmWV9r2yJZYAiMGHJfjLlLeqAuTAokUGPN__pkxg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.ac-cn-hongkong-c.wakuv2.test": "enr:-QERuEC2LyiXKURIKxNHa7Mj7frsM-lZiAGJ-2mopR3w8LMn2UhKmahZ9RHKV5ehBN1fXbRYqAeiXuOxD9t2igF4PIizAYJpZIJ2NIJpcIQv8tJJim11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdXYyLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy53YWt1djIudGVzdC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhAhAm-P4q6mWONKcGnbLPU8WXZJ4Qs3AxIbrycvc7PVKsg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
            },
            "wss/p2p/waku": {
                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
@@ -116,6 +116,23 @@
                "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm"
            }
        },
+        "waku.test": {
+            "tcp/p2p/waku": {
+                "node-01.do-ams3.waku.test": "/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W",
+                "node-01.gc-us-central1-a.waku.test": "/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG",
+                "node-01.ac-cn-hongkong-c.waku.test": "/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp"
+            },
+            "enr/p2p/waku": {
+                "node-01.do-ams3.waku.test": "enr:-QESuEC1p_s3xJzAC_XlOuuNrhVUETmfhbm1wxRGis0f7DlqGSw2FM-p2Ugl_r25UHQJ3f1rIRrpzxJXSMaJe4yk1XFSAYJpZIJ2NIJpcISygI2rim11bHRpYWRkcnO4XAArNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAtNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJATXRSRSUyTw_QLB6H_U3oziVQgNRgrXpK7wp2AMyNxYN0Y3CCdl-DdWRwgiMohXdha3UyDw",
+                "node-01.gc-us-central1-a.waku.test": "enr:-QEkuECnZ3IbVAgkOzv-QLnKC4dRKAPRY80m1-R7G8jZ7yfT3ipEfBrhKN7ARcQgQ-vg-h40AQzyvAkPYlHPaFKk6u9uAYJpZIJ2NIJpcIQiEAFDim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQMIJwesBVgUiBCi8yiXGx7RWylBQkYm1U9dvEy-neLG2YN0Y3CCdl-DdWRwgiMohXdha3UyDw",
+                "node-01.ac-cn-hongkong-c.waku.test": "enr:-QEkuEDzQyIAhs-CgBHIrJqtBv3EY1uP1Psrc-y8yJKsmxW7dh3DNcq2ergMUWSFVcJNlfcgBeVsFPkgd_QopRIiCV2pAYJpZIJ2NIJpcIQI2ttrim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJIN4qwz3v4r2Q8Bv8zZD0eqBcKw6bdLvdkV7-JLjqIj4N0Y3CCdl-DdWRwgiMohXdha3UyDw"
+            },
+            "wss/p2p/waku": {
+                "node-01.do-ams3.waku.test": "/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W",
+                "node-01.gc-us-central1-a.waku.test": "/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG",
+                "node-01.ac-cn-hongkong-c.waku.test": "/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp"
+            }
+        },
        "status.prod": {
            "tcp/p2p/waku": {
                "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
@@ -126,12 +143,12 @@
                "node-02.ac-cn-hongkong-c.status.prod": "/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8"
            },
            "enr/p2p/waku": {
-                "node-01.do-ams3.status.prod": "enr:-M-4QLOTEs_ZFxCb09FgIezZd5KeTru5CWWyEtMWMN-yUABrerWxckU-pMIh3yO8VjxHpgZ4jU2WSXuK3goW4uYb6c4BgmlkgnY0gmlwhI_G-a6KbXVsdGlhZGRyc7EALzYobm9kZS0wMS5kby1hbXMzLnN0YXR1cy5wcm9kLnN0YXR1c2ltLm5ldAYBu94DiXNlY3AyNTZrMaECoVyonsTGEQvVioM562Q1fjzTb_vKD152PPIdsV7sM6SDdGNwgnZfg3VkcIIjKIV3YWt1MgM",
-                "node-02.do-ams3.status.prod": "enr:-M-4QIhQjPgSnoKXLsJAxbRzF8cZYYjOfdt1ysBkibcriCvXb9lWHDiRghIv11JQltK5KYFs2zrCKoQ-_ZoRXEs5FasBgmlkgnY0gmlwhKEj9HmKbXVsdGlhZGRyc7EALzYobm9kZS0wMi5kby1hbXMzLnN0YXR1cy5wcm9kLnN0YXR1c2ltLm5ldAYBu94DiXNlY3AyNTZrMaED1AYI2Ox27DnSqf2qoih5M2fNpHFq-OzJ3thREEApdiiDdGNwgnZfg3VkcIIjKIV3YWt1MgM",
-                "node-01.gc-us-central1-a.status.prod": "enr:-Nm4QPRAGqCjHCuu3DjbDVoLPqpE35Lfc3mjdCsmGTqdWmxjOF2NAbdYezEnukrz38TkTNXzEdslw_n_H5uUQ3hi-2EBgmlkgnY0gmlwhCPKN5mKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAhoqdPkAZNvNRuzEecDGwnt5UbF98qwM16PZG3JmW6kUg3RjcIJ2X4N1ZHCCIyiFd2FrdTID",
-                "node-02.gc-us-central1-a.status.prod": "enr:-Nm4QEdveBFdGPTVPCmYBikMKtGFlvLnzvXfYLOWDLPtTejBLcV_9e5Ry7dqx5K027rn5zedG-HnNiHP_GBcdCpGnq0BgmlkgnY0gmlwhCKE1emKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDIuZ2MtdXMtY2VudHJhbDEtYS5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAwtASPpiz5Gq3zuFuWF4MTviQVipi3HaQGytF-4wfbdvg3RjcIJ2X4N1ZHCCIyiFd2FrdTID",
-                "node-01.ac-cn-hongkong-c.status.prod": "enr:-Nm4QOxEmmi5LQo3EwmHCagXOzVXzsLDGDwPDTL6ECmUCoXPYV0ldWvzMVqPOEPzXMCtECdk7xpleiNN85oKQxFiGnYBgmlkgnY0gmlwhC_yyjuKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAgwDLi50TMXqxWTCnR_rjQP3Eeznjs645ZNBoRh5B3jhg3RjcIJ2X4N1ZHCCIyiFd2FrdTID",
-                "node-02.ac-cn-hongkong-c.status.prod": "enr:-Nm4QOqKQ4bi7sYE1ZXAqnryEGeJOnQxIzo9UK5xHY_GeP4healoFVspoG2FaUCSyIg8pa4X2P99BbC15iSh98NIgPYBgmlkgnY0gmlwhC_zgIaKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDIuYWMtY24taG9uZ2tvbmctYy5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAzE4YIBrPK5oT_9MvYEeggmaDd205iU4Nn1MAhU5xqY5g3RjcIJ2X4N1ZHCCIyiFd2FrdTID"
+                "node-01.do-ams3.status.prod": "enr:-P-4QGVNANzbhCI49du6Moyw98AjuMhKoOpE_Jges9JlCq-ICAVadktjfcNpuhQgT0g1cu86_S3nbM7eYkCsqDAQG7UBgmlkgnY0gmlwhI_G-a6KbXVsdGlhZGRyc7hgAC02KG5vZGUtMDEuZG8tYW1zMy5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGdl8ALzYobm9kZS0wMS5kby1hbXMzLnN0YXR1cy5wcm9kLnN0YXR1c2ltLm5ldAYBu94DiXNlY3AyNTZrMaECoVyonsTGEQvVioM562Q1fjzTb_vKD152PPIdsV7sM6SDdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
+                "node-02.do-ams3.status.prod": "enr:-P-4QMXNung2KVE9xLMzctM754vz4kbavb4Stai3RBPfN-5XMfuf2i0x8J5l8fkxkiZ3Vpd0IkN9Gg0PbbDh2BUyIF8BgmlkgnY0gmlwhKEj9HmKbXVsdGlhZGRyc7hgAC02KG5vZGUtMDIuZG8tYW1zMy5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGdl8ALzYobm9kZS0wMi5kby1hbXMzLnN0YXR1cy5wcm9kLnN0YXR1c2ltLm5ldAYBu94DiXNlY3AyNTZrMaED1AYI2Ox27DnSqf2qoih5M2fNpHFq-OzJ3thREEApdiiDdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
+                "node-01.gc-us-central1-a.status.prod": "enr:-QERuEAFZ-rlajEo617uz0NDycgW4cPqqBumBvTOWywyFzIg4UOmbctTjYi6sfMArMgJEIDpphaXpLkCt5r12_gmtDQlAYJpZIJ2NIJpcIQjyjeZim11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEuc3RhdHVzLnByb2Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAhoqdPkAZNvNRuzEecDGwnt5UbF98qwM16PZG3JmW6kUg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-02.gc-us-central1-a.status.prod": "enr:-QERuEA_42Fh7Kq3drLxfIuRkqMfoJpfKpjwRcUXLv1PUQdUt1AAhIOUpun_kHKAMBmrREU9y2VoTKykl0dPBw02Fbh-AYJpZIJ2NIJpcIQihNXpim11bHRpYWRkcnO4cgA2NjFub2RlLTAyLmdjLXVzLWNlbnRyYWwxLWEuc3RhdHVzLnByb2Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDIuZ2MtdXMtY2VudHJhbDEtYS5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAwtASPpiz5Gq3zuFuWF4MTviQVipi3HaQGytF-4wfbdvg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.ac-cn-hongkong-c.status.prod": "enr:-QERuEAVmLHSKOsMq2Atya-0mhdvu718BAcynh40JAPBprvhpgcsTqkXV5kRrxaZbtzKa5-b0I4aO9U_O7-zHe24UDMAAYJpZIJ2NIJpcIQv8so7im11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMuc3RhdHVzLnByb2Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAgwDLi50TMXqxWTCnR_rjQP3Eeznjs645ZNBoRh5B3jhg3RjcIJ2X4N1ZHCCIyiFd2FrdTIL",
+                "node-02.ac-cn-hongkong-c.status.prod": "enr:-QERuECscpffU15jE9GD77vwwKCeAWn8jBl7IXS9fMj8FcY6YzBPNNr17pXuOHPqhLbieZxM3zc0AMWDa5tWqpfbtzMKAYJpZIJ2NIJpcIQv84CGim11bHRpYWRkcnO4cgA2NjFub2RlLTAyLmFjLWNuLWhvbmdrb25nLWMuc3RhdHVzLnByb2Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDIuYWMtY24taG9uZ2tvbmctYy5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAzE4YIBrPK5oT_9MvYEeggmaDd205iU4Nn1MAhU5xqY5g3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
            },
            "wss/p2p/waku": {
                "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
@@ -149,9 +166,9 @@
                "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi"
            },
            "enr/p2p/waku": {
-                "node-01.do-ams3.status.test": "enr:-M-4QI1qCnM3DMuZR2Y86FygFXPtm9fIRc4rFdUaDj0NbEA3Jl4In8mXAjUWgoei7W9Grc7oqtgibmIo-HIHHg7wrhMBgmlkgnY0gmlwhEDhUe2KbXVsdGlhZGRyc7EALzYobm9kZS0wMS5kby1hbXMzLnN0YXR1cy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DiXNlY3AyNTZrMaECBNx5Erw5Jdsw-uI9pBjB_V2R6brvuVWE-MJwYCQKVv6DdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
-                "node-01.gc-us-central1-a.status.test": "enr:-Nm4QFxGf89g3MGnCLYBxBgpXejyB44mvXvJSpNzjlRwNXO6BIn7hl66OJpESPWdH7ipHNemmz0e04wtJHe_wVV5woABgmlkgnY0gmlwhCJ6_HaKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5zdGF0dXMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAzToWxPoQnnubNH_CIu7YHPV0RHadQVIKlpfMJxxC2eFg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
-                "node-01.ac-cn-hongkong-c.status.test": "enr:-Nm4QCF2zwCuAZzxTtjjjbo5hn6vx0ICcEJBGRBMdDCfpoX5BGiApbfhEljEjpI4ePhYra_k0o5uI8eTTGYHkr6208gBgmlkgnY0gmlwhC_y6SSKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5zdGF0dXMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAmRvsjqPlfX7OOJ4x4F3GAOpBa4y4NQSoNHjX2XIo1lvg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
+                "node-01.do-ams3.status.test": "enr:-P-4QOg_CbInUakb3TEQBeCICyC-QDPeWK-CGtV9-nWp1W5DOKE2va63re3nPw-_hgvJfJkvshTaV0VmditigxKxT_kBgmlkgnY0gmlwhEDhUe2KbXVsdGlhZGRyc7hgAC02KG5vZGUtMDEuZG8tYW1zMy5zdGF0dXMudGVzdC5zdGF0dXNpbS5uZXQGdl8ALzYobm9kZS0wMS5kby1hbXMzLnN0YXR1cy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DiXNlY3AyNTZrMaECBNx5Erw5Jdsw-uI9pBjB_V2R6brvuVWE-MJwYCQKVv6DdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
+                "node-01.gc-us-central1-a.status.test": "enr:-QERuED3i2Oj7jWVR6QyPE_R0WO4Kec4CuUf8Pf6YrEXB6mvFwW_Y2wyHExqajqKR-ke-129TwAwovz2QjErTUga6rM8AYJpZIJ2NIJpcIQievx2im11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEuc3RhdHVzLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5zdGF0dXMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAzToWxPoQnnubNH_CIu7YHPV0RHadQVIKlpfMJxxC2eFg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.ac-cn-hongkong-c.status.test": "enr:-QERuEDoxPEax-hctqp6vg2cmvd2UNPjgdf6iWmgvShX2-hL_Wj2JHpjVua9buZTYLsLD-Or5e71hwlgZlFaceEfopnzAYJpZIJ2NIJpcIQv8ukkim11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMuc3RhdHVzLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5zdGF0dXMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAmRvsjqPlfX7OOJ4x4F3GAOpBa4y4NQSoNHjX2XIo1lvg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
            },
            "wss/p2p/waku": {
                "node-01.do-ams3.status.test": "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
@@ -159,38 +176,52 @@
                "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi"
            }
        },
-        "go-waku.prod": {
-            "tcp/p2p/waku": {
-                "node-01.do-ams3.go-waku.prod": "/dns4/node-01.do-ams3.go-waku.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkyScd7DiwgMwzfw8CFFhznH3wRzciqEUfjDzn7vyimR8c",
-                "node-01.gc-us-central1-a.go-waku.prod": "/dns4/node-01.gc-us-central1-a.go-waku.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmKTYnoPKebjWy63e1zPKiYRCQvm25W5mNSnCFE8EmzLga",
-                "node-01.ac-cn-hongkong-c.go-waku.prod": "/dns4/node-01.ac-cn-hongkong-c.go-waku.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkwUKwy66nhcSFeW7y5qijNqXC4ZD3TaMMqnoEbh3wK2xU"
+        "shards.test": {
+            "tcp/p2p/waku/boot": {
+                "boot-01.do-ams3.shards.test": "/dns4/boot-01.do-ams3.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmAR24Mbb6VuzoyUiGx42UenDkshENVDj4qnmmbabLvo31",
+                "boot-01.gc-us-central1-a.shards.test": "/dns4/boot-01.gc-us-central1-a.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm8mUZ18tBWPXDQsaF7PbCKYA35z7WB2xNZH2EVq1qS8LJ",
+                "boot-01.ac-cn-hongkong-c.shards.test": "/dns4/boot-01.ac-cn-hongkong-c.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmGwcE8v7gmJNEWFtZtojYpPMTHy2jBLL6xRk33qgDxFWX"
            },
-            "enr/p2p/waku": {
-                "node-01.do-ams3.go-waku.prod": "enr:-NC4QGRYrus1rbuI183CZmxjb1wL4_wdNMcJDKaxaTaRs-RUTXP6KQ0VxL8zGaPNNxLT45ItXS8dmQvcyBWUlTwqXfYBgmlkgnY0gmlwhIbRh8OKbXVsdGlhZGRyc7IAMDYpbm9kZS0wMS5kby1hbXMzLmdvLXdha3UucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAjusiHwKZa-rftTSq-KnDnirfCBW-q5ClJf4YEw9N8_Jg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
-                "node-01.gc-us-central1-a.go-waku.prod": "enr:-Nq4QJuKC3qwV704_zzThJiIaV2Jb1YLLjRzSalpgrgAUV7vU0_fMYTQUshz6hcqds0lR3lHFzhCDEdrT6TmP1rBF1IBgmlkgnY0gmlwhCJ6XvOKbXVsdGlhZGRyc7g7ADk2Mm5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5nby13YWt1LnByb2Quc3RhdHVzaW0ubmV0BgG73gOJc2VjcDI1NmsxoQNlE4TEM5FmqnyDaMQ4viBkHpx2FZb9SPVl_XsVCrn5q4N0Y3CCdl-DdWRwgiMohXdha3UyDw",
-                "node-01.ac-cn-hongkong-c.go-waku.prod": "enr:-Nq4QFd-E6Ej3RuGF_-zZWYLfIb4vpfhKNi6RiLWrt30O90oNuJnbhUo8rMvuX_sO95X6QoyHa9RaUYx9N7cywA4WWkBgmlkgnY0gmlwhAjSBH6KbXVsdGlhZGRyc7g7ADk2Mm5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5nby13YWt1LnByb2Quc3RhdHVzaW0ubmV0BgG73gOJc2VjcDI1NmsxoQIeZXd0MFV5YU9q0pWt05cUEc0RnptCtJarNlnxV7OpJYN0Y3CCdl-DdWRwgiMohXdha3UyDw"
+            "enr/p2p/waku/boot": {
+                "boot-01.do-ams3.shards.test": "enr:-QEOuEAuAK49evunDoidpHqcmeVqZz73wt4jwHnHJlmCVBFj6EdIbZ9uH5BnCYKOEPJTns2QJKUR2XLtWyzIspPAfJF9AYJpZIJ2NIJpcISnYxMvim11bHRpYWRkcnO4YAAtNihib290LTAxLmRvLWFtczMuc2hhcmRzLnRlc3Quc3RhdHVzaW0ubmV0BnZfAC82KGJvb3QtMDEuZG8tYW1zMy5zaGFyZHMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4Jyc4sAEAQAIABAAIABAIlzZWNwMjU2azGhAt60bRUEoHNuLlnsM12sU2PIQwBwfLIJ8a_ZPEY2-Rnkg3RjcIJ2X4N1ZHCCIyiFd2FrdTIN",
+                "boot-01.gc-us-central1-a.shards.test": "enr:-QEguEC3wjzOk7U5rIqiX32CCD-0_J1cYYGK_YwKSah5di2NTxJUaKQ9B7NMiEQ_-YGm-Eus4SzHtxN_fXEuVaNHql9aAYJpZIJ2NIJpcIQihw1Xim11bHRpYWRkcnO4cgA2NjFib290LTAxLmdjLXVzLWNlbnRyYWwxLWEuc2hhcmRzLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MWJvb3QtMDEuZ2MtdXMtY2VudHJhbDEtYS5zaGFyZHMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4Jyc4sAEAQAIABAAIABAIlzZWNwMjU2azGhAsY6oA0NFskUjopWFN9gwOZP1zZQ4rN5tVXV5CvcTOpDg3RjcIJ2X4N1ZHCCIyiFd2FrdTIN",
+                "boot-01.ac-cn-hongkong-c.shards.test": "enr:-QEguEBb4rlxsdYCIZ8NcAlcjnb2zp4C9JbDsz-01Ix2sKNdWzI79KRFnhlakX-4F8gRYcviDvQL5eEZDOxHTupUW7VXAYJpZIJ2NIJpcIQI2hdMim11bHRpYWRkcnO4cgA2NjFib290LTAxLmFjLWNuLWhvbmdrb25nLWMuc2hhcmRzLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MWJvb3QtMDEuYWMtY24taG9uZ2tvbmctYy5zaGFyZHMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4Jyc4sAEAQAIABAAIABAIlzZWNwMjU2azGhAz-wm0ZPmCicDhRTOGfZ3stBj3O1jyWgsBpKTUcpWu5gg3RjcIJ2X4N1ZHCCIyiFd2FrdTIN"
            },
-            "wss/p2p/waku": {
-                "node-01.do-ams3.go-waku.prod": "/dns4/node-01.do-ams3.go-waku.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkyScd7DiwgMwzfw8CFFhznH3wRzciqEUfjDzn7vyimR8c",
-                "node-01.gc-us-central1-a.go-waku.prod": "/dns4/node-01.gc-us-central1-a.go-waku.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmKTYnoPKebjWy63e1zPKiYRCQvm25W5mNSnCFE8EmzLga",
-                "node-01.ac-cn-hongkong-c.go-waku.prod": "/dns4/node-01.ac-cn-hongkong-c.go-waku.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkwUKwy66nhcSFeW7y5qijNqXC4ZD3TaMMqnoEbh3wK2xU"
+            "wss/p2p/waku/boot": {
+                "boot-01.do-ams3.shards.test": "/dns4/boot-01.do-ams3.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmAR24Mbb6VuzoyUiGx42UenDkshENVDj4qnmmbabLvo31",
+                "boot-01.gc-us-central1-a.shards.test": "/dns4/boot-01.gc-us-central1-a.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm8mUZ18tBWPXDQsaF7PbCKYA35z7WB2xNZH2EVq1qS8LJ",
+                "boot-01.ac-cn-hongkong-c.shards.test": "/dns4/boot-01.ac-cn-hongkong-c.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmGwcE8v7gmJNEWFtZtojYpPMTHy2jBLL6xRk33qgDxFWX"
+            },
+            "tcp/p2p/waku/store": {
+                "store-01.do-ams3.shards.test": "/dns4/store-01.do-ams3.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmAUdrQ3uwzuE4Gy4D56hX6uLKEeerJAnhKEHZ3DxF1EfT",
+                "store-02.do-ams3.shards.test": "/dns4/store-02.do-ams3.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm9aDJPkhGxc2SFcEACTFdZ91Q5TJjp76qZEhq9iF59x7R",
+                "store-01.gc-us-central1-a.shards.test": "/dns4/store-01.gc-us-central1-a.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmMELCo218hncCtTvC2Dwbej3rbyHQcR8erXNnKGei7WPZ",
+                "store-02.gc-us-central1-a.shards.test": "/dns4/store-02.gc-us-central1-a.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJnVR7ZzFaYvciPVafUXuYGLHPzSUigqAmeNw9nJUVGeM",
+                "store-01.ac-cn-hongkong-c.shards.test": "/dns4/store-01.ac-cn-hongkong-c.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2M7xs7cLPc3jamawkEqbr7cUJX11uvY7LxQ6WFUdUKUT",
+                "store-02.ac-cn-hongkong-c.shards.test": "/dns4/store-02.ac-cn-hongkong-c.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm9CQhsuwPR54q27kNj9iaQVfyRzTGKrhFmr94oD8ujU6P"
+            },
+            "enr/p2p/waku/store": {
+                "store-01.do-ams3.shards.test": "enr:-QEQuEDom7vBcLEP3ZCvRGPyBVTUJUO5YIyXvxcibag_iq6s5Ux6Zd1_nnqEXqynppYMNOTaTzSetRhmV9IH83j72umYAYJpZIJ2NIJpcISf3_Jeim11bHRpYWRkcnO4YgAuNilzdG9yZS0wMS5kby1hbXMzLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAwNilzdG9yZS0wMS5kby1hbXMzLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJziwAQBAAgAEAAgAEAiXNlY3AyNTZrMaEC36GkB96EmFufcsRAX3gGW5bZlJwuAc2JB6nq9lUDE8qDdGNwgnZfg3VkcIIjKIV3YWt1MgM",
+                "store-02.do-ams3.shards.test": "enr:-QEQuEAmPituRLmZuwA6z0AT_Vl-KWbb7kpyX7qcWwbjygv_Oxrdu_0kmpShNtauWxhRmaOMOYddv9IwiIS8HujxHvpbAYJpZIJ2NIJpcISf3_Kaim11bHRpYWRkcnO4YgAuNilzdG9yZS0wMi5kby1hbXMzLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAwNilzdG9yZS0wMi5kby1hbXMzLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJziwAQBAAgAEAAgAEAiXNlY3AyNTZrMaEC0jOth5qhqWd_NmDOAsiPjAiJZMTD-2WzsKsET75PcLCDdGNwgnZfg3VkcIIjKIV3YWt1MgM",
+                "store-01.gc-us-central1-a.shards.test": "enr:-QEiuEBW0x-NQAwfFIgwrwtMRbPpWYRbWzsQ6nMDQK5K8vT8uAph5mlAw-TaeIxw9K2Vc0QuEYzf8-MnOESVyQ-C6ywcAYJpZIJ2NIJpcIQiqsAnim11bHRpYWRkcnO4dAA3NjJzdG9yZS0wMS5nYy11cy1jZW50cmFsMS1hLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA5NjJzdG9yZS0wMS5nYy11cy1jZW50cmFsMS1hLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJziwAQBAAgAEAAgAEAiXNlY3AyNTZrMaEDf2gcTbDga3Hgy8gu-bwRUbs7_7Vn2hxudCXPQ0M7cJCDdGNwgnZfg3VkcIIjKIV3YWt1MgM",
+                "store-02.gc-us-central1-a.shards.test": "enr:-QEiuEDjbS1EbRmNA7Gl1F3z_NsTHloyfZp4h0tm5cQmTvo5SlFGIBPPpmB6oycGnVGCHFPmqV_XbJJRO5pObWa5dOHgAYJpZIJ2NIJpcIQiqpoCim11bHRpYWRkcnO4dAA3NjJzdG9yZS0wMi5nYy11cy1jZW50cmFsMS1hLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA5NjJzdG9yZS0wMi5nYy11cy1jZW50cmFsMS1hLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJziwAQBAAgAEAAgAEAiXNlY3AyNTZrMaEDWxINW5DCQgYg-U43t2f9dUfpHfZrp2RdL-IomGWtY4KDdGNwgnZfg3VkcIIjKIV3YWt1MgM",
+                "store-01.ac-cn-hongkong-c.shards.test": "enr:-QEiuEDkMIJT5pVMmtzHD5RATLyU0kAG0tKcC3AE3BQe0O6S9R6OsA7PEVaaUg52fA4_I2pwjoW2GroE6uR9a-7Vdfy-AYJpZIJ2NIJpcIQI2kpJim11bHRpYWRkcnO4dAA3NjJzdG9yZS0wMS5hYy1jbi1ob25na29uZy1jLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA5NjJzdG9yZS0wMS5hYy1jbi1ob25na29uZy1jLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJziwAQBAAgAEAAgAEAiXNlY3AyNTZrMaECZtdI3Wq88fYXHYUShn7AMktB3OaVo98ock70-RSMChiDdGNwgnZfg3VkcIIjKIV3YWt1MgM",
+                "store-02.ac-cn-hongkong-c.shards.test": "enr:-QEiuEBzOdkswwOBobEe-nUvdtALMP8sjV9b_v9rQS4E0QOv2TVdrXRKKrBzOgk8TIXFtdry3RrowN5pTH7vBWl8TPKUAYJpZIJ2NIJpcIQI2nnoim11bHRpYWRkcnO4dAA3NjJzdG9yZS0wMi5hYy1jbi1ob25na29uZy1jLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA5NjJzdG9yZS0wMi5hYy1jbi1ob25na29uZy1jLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJziwAQBAAgAEAAgAEAiXNlY3AyNTZrMaECzJ3LruqSdw0Ec2FKpAdT22kcWVyBiYvMGim2wRWzkjSDdGNwgnZfg3VkcIIjKIV3YWt1MgM"
+            },
+            "wss/p2p/waku/store": {
+                "store-01.do-ams3.shards.test": "/dns4/store-01.do-ams3.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmAUdrQ3uwzuE4Gy4D56hX6uLKEeerJAnhKEHZ3DxF1EfT",
+                "store-02.do-ams3.shards.test": "/dns4/store-02.do-ams3.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm9aDJPkhGxc2SFcEACTFdZ91Q5TJjp76qZEhq9iF59x7R",
+                "store-01.gc-us-central1-a.shards.test": "/dns4/store-01.gc-us-central1-a.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmMELCo218hncCtTvC2Dwbej3rbyHQcR8erXNnKGei7WPZ",
+                "store-02.gc-us-central1-a.shards.test": "/dns4/store-02.gc-us-central1-a.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmJnVR7ZzFaYvciPVafUXuYGLHPzSUigqAmeNw9nJUVGeM",
+                "store-01.ac-cn-hongkong-c.shards.test": "/dns4/store-01.ac-cn-hongkong-c.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm2M7xs7cLPc3jamawkEqbr7cUJX11uvY7LxQ6WFUdUKUT",
+                "store-02.ac-cn-hongkong-c.shards.test": "/dns4/store-02.ac-cn-hongkong-c.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm9CQhsuwPR54q27kNj9iaQVfyRzTGKrhFmr94oD8ujU6P"
            }
        },
-        "go-waku.test": {
+        "notify.prod": {
            "tcp/p2p/waku": {
-                "node-01.do-ams3.go-waku.test": "/dns4/node-01.do-ams3.go-waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAm9vnvCQgCDrynDK1h7GJoEZVGvnuzq84RyDQ3DEdXmcX7",
-                "node-01.gc-us-central1-a.go-waku.test": "/dns4/node-01.gc-us-central1-a.go-waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmPz63Xc6AuVkDeujz7YeZta18rcdau3Y1BzaxKAfDrBqz",
-                "node-01.ac-cn-hongkong-c.go-waku.test": "/dns4/node-01.ac-cn-hongkong-c.go-waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmBDbMWFiG9ki8sDw6fYtraSxo4oHU9HbuN43S2HVyq1FD"
-            },
-            "enr/p2p/waku": {
-                "node-01.do-ams3.go-waku.test": "enr:-NC4QKYOHGKa69sKLLKbRlcR890mmPRIboV0MUSMQtvjiwd7SISpBYqVibOpmTuS0kRlU6KmBQs_MXA9LPOBgMbRB7UBgmlkgnY0gmlwhIbRhj-KbXVsdGlhZGRyc7IAMDYpbm9kZS0wMS5kby1hbXMzLmdvLXdha3UudGVzdC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAtd5TiUZInW1nFF7nZtkXrw0iuqOLyV31_f7EhuM_Fs-g3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
-                "node-01.gc-us-central1-a.go-waku.test": "enr:-Nq4QEb3btlua6_4EdC1SAF0wTl0JqI8Du34Bm7raZoYOAbHPmRzVt4rq-0ItCM3L4MkOpCFn_X26aTq-Q2YEK8DuGEBgmlkgnY0gmlwhCPft1uKbXVsdGlhZGRyc7g7ADk2Mm5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5nby13YWt1LnRlc3Quc3RhdHVzaW0ubmV0BgG73gOJc2VjcDI1NmsxoQOoVQePH5eRqlcCf-0XwZsoJPeZp1Mq59un_jYM9hUc6YN0Y3CCdl-DdWRwgiMohXdha3UyDw",
-                "node-01.ac-cn-hongkong-c.go-waku.test": "enr:-Nq4QCWN6qBpeK_1GiqE_F45k3MmBDxaOJ7X9fAOKO0qu_6xCPAkjOVz6Th_vn8n-CLdEizO5oJ6YOivuAiRHDdJ3q4BgmlkgnY0gmlwhAjaAm6KbXVsdGlhZGRyc7g7ADk2Mm5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5nby13YWt1LnRlc3Quc3RhdHVzaW0ubmV0BgG73gOJc2VjcDI1NmsxoQLqosp15CMf5c4k-z9MGM7_aiR0DGdmSrpjQ_xWnmsTOIN0Y3CCdl-DdWRwgiMohXdha3UyDw"
-            },
-            "wss/p2p/waku": {
-                "node-01.do-ams3.go-waku.test": "/dns4/node-01.do-ams3.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm9vnvCQgCDrynDK1h7GJoEZVGvnuzq84RyDQ3DEdXmcX7",
-                "node-01.gc-us-central1-a.go-waku.test": "/dns4/node-01.gc-us-central1-a.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmPz63Xc6AuVkDeujz7YeZta18rcdau3Y1BzaxKAfDrBqz",
-                "node-01.ac-cn-hongkong-c.go-waku.test": "/dns4/node-01.ac-cn-hongkong-c.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmBDbMWFiG9ki8sDw6fYtraSxo4oHU9HbuN43S2HVyq1FD"
+                "node-01.do-ams3.notify.prod": "enode://401ba5eda402678dc78a0a40fd0795f4ea8b1e34972c4d15cf33ac01292341c89f0cbc637fa9f7a3ffe0b9dfe90e9cdae7a14925500ab01b6a91c67bae42a97a@178.128.139.80:1443",
+                "node-01.gc-us-central1-a.notify.prod": "enode://181141b1d111908aaf05f4788e6778ec07073a1d4e1ce43c73815c40ee4e7345a1cbf5a90a45f601bf3763f12be63b01624ba1f36eeb9572455e7034b8f9f2c4@34.71.141.140:1443",
+                "node-01.ac-cn-hongkong-c.notify.prod": "enode://5ffc34d5ffda180d94cd3974d9ed2bb082ede68f342babdbe801ceffb7da902087d43f9aa961c7b85029358874c08ef04ecad9f1d95a1f0e448cbdd5d04350c7@47.242.88.117:1443"
            }
        }
    }
@@ -33,10 +33,17 @@ trap "rm -vf ${SECRETS_FILE_PATH}" EXIT ERR INT QUIT

 # Names of variables containing secrets to save in env file.
 SECRETS_ENV_VARS=(
+    'ALCHEMY_ETHEREUM_MAINNET_TOKEN'
+    'ALCHEMY_ETHEREUM_GOERLI_TOKEN'
+    'ALCHEMY_ETHEREUM_SEPOLIA_TOKEN'
    'ALCHEMY_ARBITRUM_GOERLI_TOKEN'
    'ALCHEMY_ARBITRUM_MAINNET_TOKEN'
+    'ALCHEMY_ARBITRUM_SEPOLIA_TOKEN'
    'ALCHEMY_OPTIMISM_GOERLI_TOKEN'
    'ALCHEMY_OPTIMISM_MAINNET_TOKEN'
+    'ALCHEMY_OPTIMISM_SEPOLIA_TOKEN'
+    'RARIBLE_MAINNET_API_KEY'
+    'RARIBLE_TESTNET_API_KEY'
    'INFURA_TOKEN'
    'INFURA_TOKEN_SECRET'
    'OPENSEA_API_KEY'
@@ -63,10 +63,17 @@
         {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
          status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
          status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
+          status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
+          status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
+          status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
+          status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
+          status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
+          status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
          status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
-          status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
+          status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
          status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-          status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
+          status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
+          status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
         :compiler-options {:output-feature-set :es5
                            ;; We disable `:fn-deprecated` warnings because we
                            ;; are managing deprecation via clj-kondo and we
@@ -90,10 +97,17 @@
    {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
     status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
     status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
+     status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
+     status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
+     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
+     status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
+     status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
+     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
     status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
+     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
+     status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
+     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
    :compiler-options {:output-feature-set :es6
                       ;;disable for android build as there
                       ;;is an intermittent warning with deftype
@@ -123,10 +137,17 @@
    status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
    status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
    status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
+    status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
+    status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
+    status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
+    status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
+    status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
+    status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
    status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
-    status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
+    status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
+    status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
+    status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
   :compiler-options
   {;; needed because we override require and it
    ;; messes with source-map which reports callstack
@@ -1,93 +0,0 @@
-(ns legacy.status-im.ethereum.subscriptions
-  (:require
-    [legacy.status-im.ethereum.transactions.core :as transactions]
-    [legacy.status-im.wallet.core :as wallet.core]
-    [legacy.status-im.wallet.db :as wallet]
-    [taoensso.timbre :as log]
-    [utils.ethereum.eip.eip55 :as eip55]
-    [utils.re-frame :as rf]))
-
-(rf/defn new-transfers
-  [cofx block-number accounts]
-  (log/debug "[wallet-subs] new-transfers"
-             "accounts" accounts
-             "block"    block-number)
-  (transactions/check-watched-transactions cofx))
-
-(rf/defn recent-history-fetching-started
-  [{:keys [db]} accounts]
-  (log/debug "[wallet-subs] recent-history-fetching-started"
-             "accounts"
-             accounts)
-  (let [event (get db :wallet-legacy/on-recent-history-fetching)]
-    (cond-> {:db (-> db
-                     (transactions/update-fetching-status accounts :recent? true)
-                     (assoc :wallet-legacy/recent-history-fetching-started? true)
-                     (dissoc :wallet-legacy/on-recent-history-fetching))}
-      event
-      (assoc :dispatch event))))
-
-(rf/defn recent-history-fetching-ended
-  [{:keys [db]} {:keys [accounts blockNumber]}]
-  (log/debug "[wallet-subs] recent-history-fetching-ended"
-             "accounts" accounts
-             "block"    blockNumber)
-  {:db (-> db
-           (assoc :ethereum/current-block blockNumber)
-           (update-in [:wallet-legacy :accounts]
-                      wallet/remove-transactions-since-block
-                      blockNumber)
-           (transactions/update-fetching-status accounts :recent? false)
-           (dissoc :wallet-legacy/waiting-for-recent-history?
-                   :wallet-legacy/refreshing-history?
-                   :wallet-legacy/fetching-error
-                   :wallet-legacy/recent-history-fetching-started?))
-   :transactions/get-transfers
-   {:chain-tokens (:wallet-legacy/all-tokens db)
-    :addresses    (reduce
-                   (fn [v address]
-                     (let [normalized-address
-                           (eip55/address->checksum address)]
-                       (if (contains? v normalized-address)
-                         v
-                         (conj v address))))
-                   []
-                   accounts)
-    :before-block blockNumber
-    :limit        20}})
-
-(rf/defn fetching-error
-  [{:keys [db] :as cofx} {:keys [message]}]
-  (rf/merge
-   cofx
-   {:db (assoc db :wallet-legacy/fetching-error message)}
-   (wallet.core/after-checking-history)))
-
-(rf/defn non-archival-node-detected
-  [{:keys [db]} _]
-  {:db (assoc db :wallet-legacy/non-archival-node true)})
-
-(rf/defn new-wallet-event
-  [cofx {:keys [type blockNumber accounts] :as event}]
-  (log/debug "[wallet-subs] new-wallet-event"
-             "event-type"  type
-             "blockNumber" blockNumber
-             "accounts"    accounts)
-  (case type
-    "new-transfers"                            (new-transfers cofx blockNumber accounts)
-    "recent-history-fetching"                  (recent-history-fetching-started cofx accounts)
-    "recent-history-ready"                     (recent-history-fetching-ended cofx event)
-    "fetching-history-error"                   (fetching-error cofx event)
-    "non-archival-node-detected"               (non-archival-node-detected cofx event)
-    "pending-transaction-status-changed"       {:fx
-                                                [[:dispatch
-                                                  [:wallet/pending-transaction-status-changed-received
-                                                   event]]]}
-    "wallet-owned-collectibles-filtering-done" {:fx [[:dispatch
-                                                      [:wallet/owned-collectibles-filtering-done
-                                                       event]]]}
-    "wallet-get-collectibles-details-done"     {:fx [[:dispatch
-                                                      [:wallet/get-collectible-details-done
-                                                       event]]]}
-    "wallet-tick-reload"                       {:fx [[:dispatch [:wallet/reload]]]}
-    (log/debug ::unknown-wallet-event :type type :event event)))
@@ -8,7 +8,6 @@
    legacy.status-im.chat.models.loading
    legacy.status-im.contact.block
    legacy.status-im.currency.core
-    legacy.status-im.ethereum.subscriptions
    legacy.status-im.fleet.core
    [legacy.status-im.keycard.core :as keycard]
    legacy.status-im.log-level.core
@@ -19,7 +19,8 @@
           transactions-management-enabled?
           current-fleet
           webview-debug
-           test-networks-enabled?]}]
+           test-networks-enabled?
+           is-sepolia-enabled?]}]
  (keep
   identity
   [{:size :small
@@ -110,6 +111,14 @@
     #(re-frame/dispatch [:profile.settings/toggle-test-networks])
     :accessory :switch
     :active test-networks-enabled?}
+    {:size :small
+     :title "Enable Sepolia as test network"
+     :accessibility-label :enable-sepolia-as-test-network
+     :container-margin-bottom 8
+     :on-press
+     #(re-frame/dispatch [:profile.settings/toggle-sepolia-test-network])
+     :accessory :switch
+     :active is-sepolia-enabled?}
    {:size                :small
     :title               (i18n/label :t/set-currency)
     :accessibility-label :wallet-change-currency
@@ -130,6 +139,7 @@
 (views/defview advanced-settings
  []
  (views/letsubs [test-networks-enabled?           [:profile/test-networks-enabled?]
+                  is-sepolia-enabled?              [:profile/is-sepolia-enabled?]
                  light-client-enabled?            [:profile/light-client-enabled?]
                  webview-debug                    [:profile/webview-debug]
                  network-name                     [:network-name]
@@ -145,6 +155,7 @@
                   :current-fleet                    current-fleet
                   :dev-mode?                        false
                   :webview-debug                    webview-debug
-                   :test-networks-enabled?           test-networks-enabled?})
+                   :test-networks-enabled?           test-networks-enabled?
+                   :is-sepolia-enabled?              is-sepolia-enabled?})
      :key-fn    (fn [_ i] (str i))
      :render-fn render-item}]))
@@ -63,6 +63,6 @@
       [quo/button
        {:theme    :positive
         :style    {:margin-horizontal 8}
-         :on-press #(debounce/dispatch-and-chill [::network/connect-network-pressed target-network-id]
-                                                 1000)}
+         :on-press #(debounce/throttle-and-dispatch [::network/connect-network-pressed target-network-id]
+                                                    1000)}
        (i18n/label :t/allow)]]]]))
@@ -84,7 +84,7 @@
                                       (zero? (count selected)))
             :accessibility-label :share-community-link
             :type                :secondary
-             :on-press            #(debounce/dispatch-and-chill
+             :on-press            #(debounce/throttle-and-dispatch
                                    [(if can-invite?
                                       ::communities/invite-people-confirmation-pressed
                                       ::communities/share-community-confirmation-pressed) @user-pk
@@ -111,7 +111,7 @@

    (:available :connected :connected-with-different-key :owned)
    [react/touchable-highlight
-     {:on-press #(debounce/dispatch-and-chill [::ens/input-submitted] 3000)}
+     {:on-press #(debounce/throttle-and-dispatch [::ens/input-submitted] 3000)}
     [icon-wrapper colors/blue
      [icons/icon :main-icons/arrow-right {:color colors/white-persist}]]]

@@ -365,8 +365,9 @@
           :right        [react/view {:padding-horizontal 8}
                          [quo/button
                           {:disabled (or (not @checked?) (not sufficient-funds?))
-                            :on-press #(debounce/dispatch-and-chill [::ens/register-name-pressed address]
-                                                                    2000)}
+                            :on-press #(debounce/throttle-and-dispatch [::ens/register-name-pressed
+                                                                        address]
+                                                                       2000)}
                           (if sufficient-funds?
                             (i18n/label :t/ens-register)
                             (i18n/label :t/not-enough-snt))]]}]]))))
@@ -139,9 +139,9 @@
           {:type                :secondary
            :accessibility-label :create-group-chat-button
            :disabled            group-name-empty?
-            :on-press            #(debounce/dispatch-and-chill [:group-chats.ui/create-pressed
-                                                                group-name]
-                                                               300)}
+            :on-press            #(debounce/throttle-and-dispatch [:group-chats.ui/create-pressed
+                                                                   group-name]
+                                                                  300)}
           (i18n/label :t/create-group-chat)]}]]])))

 (defn searchable-contact-list
@@ -6,7 +6,7 @@
    [legacy.status-im.ui.screens.network.styles :as st]
    [legacy.status-im.ui.screens.network.views :as network-settings]
    [re-frame.core :as re-frame]
-    [utils.debounce :refer [dispatch-and-chill]]
+    [utils.debounce :refer [throttle-and-dispatch]]
    [utils.i18n :as i18n])
  (:require-macros [legacy.status-im.utils.views :as views]))

@@ -25,7 +25,7 @@
          :connected? connected?}]
        (when-not connected?
          [react/touchable-highlight
-           {:on-press #(dispatch-and-chill [::network/connect-network-pressed id] 1000)}
+           {:on-press #(throttle-and-dispatch [::network/connect-network-pressed id] 1000)}
           [react/view st/connect-button-container
            [react/view
             {:style               st/connect-button
@@ -109,7 +109,7 @@
 (defn hide-sheet-and-dispatch-old
  [event]
  (re-frame/dispatch [:bottom-sheet/hide-old])
-  (debounce/dispatch-and-chill event 2000))
+  (debounce/throttle-and-dispatch event 2000))

 (defn invitation-sheet
  [{:keys [id]} contact]
@@ -34,7 +34,7 @@
    (fn
      [{:keys [on-press on-long-press disabled? type background size icon-left icon-right icon-top
               customization-color theme accessibility-label icon-only? container-style inner-style
-               pressed? on-press-in on-press-out]
+               pressed? on-press-in on-press-out allow-multiple-presses?]
        :or   {type                :primary
               size                40
               customization-color (cond (= type :primary)  :blue
@@ -52,16 +52,17 @@
                                           :icon-only?          icon-only?})
            icon-size (when (= 24 size) 12)]
        [rn/touchable-without-feedback
-         {:disabled            disabled?
-          :accessibility-label accessibility-label
-          :on-press-in         (fn []
-                                 (reset! pressed-state? true)
-                                 (when on-press-in (on-press-in)))
-          :on-press-out        (fn []
-                                 (reset! pressed-state? nil)
-                                 (when on-press-out (on-press-out)))
-          :on-press            on-press
-          :on-long-press       on-long-press}
+         {:disabled                disabled?
+          :accessibility-label     accessibility-label
+          :on-press-in             (fn []
+                                     (reset! pressed-state? true)
+                                     (when on-press-in (on-press-in)))
+          :on-press-out            (fn []
+                                     (reset! pressed-state? nil)
+                                     (when on-press-out (on-press-out)))
+          :on-press                on-press
+          :allow-multiple-presses? allow-multiple-presses?
+          :on-long-press           on-long-press}
         [rn/view
          {:style (merge
                   (style/shape-style-container size border-radius)
@@ -15,11 +15,12 @@
    [rn/view
     {:style style/container}
     [button/button
-      {:icon                true
-       :type                :outline
-       :accessibility-label :previous-month-button
-       :size                24
-       :on-press            #(on-change (utils/previous-month year month))}
+      {:icon                    true
+       :type                    :outline
+       :accessibility-label     :previous-month-button
+       :allow-multiple-presses? true
+       :size                    24
+       :on-press                #(on-change (utils/previous-month year month))}
      :i/chevron-left]
     [text/text
      {:weight :semi-bold
@@ -27,11 +28,12 @@
       :style  (style/text theme)}
      (utils/format-month-year year month)]
     [button/button
-      {:icon                true
-       :accessibility-label :next-month-button
-       :size                24
-       :type                :outline
-       :on-press            #(on-change (utils/next-month year month))}
+      {:icon                    true
+       :accessibility-label     :next-month-button
+       :allow-multiple-presses? true
+       :size                    24
+       :type                    :outline
+       :on-press                #(on-change (utils/next-month year month))}
      :i/chevron-right]]))

 (def view (theme/with-theme view-internal))
@@ -31,9 +31,10 @@
                                         theme))]

    [rn/pressable
-     {:style               (style/color-button hex-color selected? idx window-width)
-      :accessibility-label :color-picker-item
-      :on-press            #(on-press color)}
+     {:style                   (style/color-button hex-color selected? idx window-width)
+      :accessibility-label     :color-picker-item
+      :allow-multiple-presses? true
+      :on-press                #(on-press color)}
     (if (and (= :feng-shui color) (not selected?))
       [feng-shui
        (assoc props
@@ -0,0 +1,34 @@
+(ns quo.components.counter.collectible-counter.component-spec
+  (:require
+    [quo.components.counter.collectible-counter.view :as collectible-counter]
+    [test-helpers.component :as h]))
+
+(defn render
+  [component]
+  (h/render-with-theme-provider component :dark))
+
+(h/describe "collectible counter component"
+  (h/test "default render of component"
+    (render [collectible-counter/view {}])
+    (-> (h/expect (h/get-by-label-text :collectible-counter))
+        (h/is-truthy)))
+
+  (h/test "render with a string value"
+    (render [collectible-counter/view {:value "x500"}])
+    (-> (h/expect (h/get-by-text "x500"))
+        (h/is-truthy)))
+
+  (h/test "render with an integer value and default status"
+    (render [collectible-counter/view
+             {:value  100
+              :status :default}])
+    (-> (h/expect (h/get-by-text "100"))
+        (h/is-truthy)))
+
+  (h/test "render with all availiable props"
+    (render [collectible-counter/view
+             {:value  "x100"
+              :status :error
+              :size   :size-24}])
+    (-> (h/expect (h/get-by-text "x100"))
+        (h/is-truthy))))
@@ -0,0 +1,57 @@
+(ns quo.components.counter.collectible-counter.style
+  (:require
+    [quo.foundations.colors :as colors]))
+
+(defn- get-background-color
+  [{:keys [status theme]}]
+  (case status
+    :default (colors/theme-colors colors/white-opa-70 colors/neutral-95-opa-70 theme)
+    :error   (colors/resolve-color :danger theme 10)
+    (colors/theme-colors colors/white-opa-70 colors/neutral-95-opa-70 theme)))
+
+(defn- get-container-border-styles
+  [{:keys [status theme]}]
+  (when (= status :error)
+    {:border-color (colors/resolve-color :danger theme 20)
+     :border-width 1}))
+
+(defn- get-container-styles-by-size
+  [{:keys [size]}]
+  (let [style-size-24 {:height             24
+                       :padding-vertical   3
+                       :padding-horizontal 8}
+        style-size-32 {:height             32
+                       :padding-vertical   5
+                       :padding-horizontal 12}]
+    (case size
+      :size-32 style-size-32
+      :size-24 style-size-24
+      style-size-32)))
+
+(defn container
+  [props]
+  (merge {:align-self       :flex-start
+          :flex-direcrion   :row
+          :justify-content  :center
+          :border-radius    999
+          :background-color (get-background-color props)}
+         (get-container-border-styles props)
+         (get-container-styles-by-size props)))
+
+(defn- get-text-color
+  [{:keys [status theme]}]
+  (case status
+    :default (colors/theme-colors colors/neutral-100 colors/white theme)
+    :error   (colors/resolve-color :danger theme)
+    (colors/theme-colors colors/neutral-100 colors/white theme)))
+
+(defn get-text-size
+  [{:keys [size]}]
+  (case size
+    :size-32 :paragraph-1
+    :size-24 :paragraph-2
+    :paragraph-1))
+
+(defn text
+  [props]
+  {:color (get-text-color props)})
@@ -0,0 +1,39 @@
+(ns quo.components.counter.collectible-counter.view
+  (:require
+    [quo.components.counter.collectible-counter.style :as style]
+    [quo.components.markdown.text :as text]
+    [quo.theme]
+    [react-native.core :as rn]
+    [schema.core :as schema]))
+
+(def ?schema
+  [:=>
+   [:catn
+    [:props
+     [:map {:closed true}
+      [:value {:optional true} [:maybe [:or :string :int]]]
+      [:status {:optional true} [:maybe :keyword]]
+      [:size {:optional true} [:maybe [:enum :size-32 :size-24]]]
+      [:accessibility-label {:optional true} [:maybe :keyword]]
+      [:theme :schema.common/theme]]]]
+   :any])
+
+(defn- view-internal
+  [{:keys [value accessibility-label]
+    :as   props}]
+  (let [default-props {:status :default
+                       :size   :size-32}
+        props         (merge default-props props)]
+    [rn/view
+     {:accessible          true
+      :accessibility-label (or accessibility-label :collectible-counter)
+      :style               (style/container props)}
+     [text/text
+      {:weight :medium
+       :size   (style/get-text-size props)
+       :style  (style/text props)}
+      value]]))
+
+(def view
+  (quo.theme/with-theme
+   (schema/instrument #'view-internal ?schema)))
@@ -3,9 +3,11 @@
    [quo.foundations.colors :as colors]))

 (defn divider
-  [theme]
+  [theme blur?]
  {:border-top-width 1
-   :border-top-color (colors/theme-colors colors/neutral-10 colors/neutral-90 theme)
+   :border-top-color (if blur?
+                       colors/white-opa-5
+                       (colors/theme-colors colors/neutral-10 colors/neutral-90 theme))
   :margin-top       8
   :margin-bottom    7
   :align-items      :center
@@ -14,9 +14,9 @@
    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))

 (defn- divider
-  [theme]
+  [theme blur?]
  [rn/view
-   {:style               (style/divider theme)
+   {:style               (style/divider theme blur?)
    :accessible          true
    :accessibility-label :divider}])

@@ -45,7 +45,7 @@
           blur?]}]
  [:<>
   (when add-divider?
-     [divider theme])
+     [divider theme blur?])
   [maybe-pressable disabled?
    {:accessibility-label accessibility-label
     :style               (style/container {:sub-label           sub-label
@@ -6,14 +6,21 @@
    [react-native.linear-gradient :as linear-gradient]))

 (defn- view-internal
-  [{:keys [customization-color opacity container-style height] :or {customization-color :blue}}]
-  (let [color-top    (colors/custom-color customization-color 50 20)
-        color-bottom (colors/custom-color customization-color 50 0)]
-    [linear-gradient/linear-gradient
-     {:accessibility-label :gradient-cover
-      :colors              [color-top color-bottom]
-      :start               {:x 0 :y 0}
-      :end                 {:x 0 :y 1}
-      :style               (merge (style/root-container opacity height) container-style)}]))
+  [{:keys [customization-color opacity container-style height]
+    :or   {customization-color :blue}}]
+  ;; `when` added for safety, `linear-gradient` will break if `nil` is passed,
+  ;; the `:or` destructuring won't work because it's only applied when the
+  ;; `:customization-color` key is non-existent. While deleting an account the key exists
+  ;; and has a `nil` value.
+  (when customization-color
+    (let [color-top    (colors/resolve-color customization-color 50 20)
+          color-bottom (colors/resolve-color customization-color 50 0)]
+      [linear-gradient/linear-gradient
+       {:accessibility-label :gradient-cover
+        :colors              [color-top color-bottom]
+        :start               {:x 0 :y 0}
+        :end                 {:x 0 :y 1}
+        :style               (merge (style/root-container opacity height)
+                                    container-style)}])))

 (def view (quo.theme/with-theme view-internal))
@@ -39,13 +39,15 @@

 (defn user
  [{:keys [short-chat-key primary-name secondary-name photo-path online? contact? verified?
-           untrustworthy? on-press on-long-press accessory customization-color theme]}]
+           untrustworthy? on-press on-long-press accessory customization-color theme
+           allow-multiple-presses?]}]
  [rn/touchable-highlight
-   {:style               container-style
-    :underlay-color      (colors/resolve-color customization-color theme 5)
-    :accessibility-label :user-list
-    :on-press            (when on-press on-press)
-    :on-long-press       (when on-long-press on-long-press)}
+   {:style                   container-style
+    :underlay-color          (colors/resolve-color customization-color theme 5)
+    :allow-multiple-presses? allow-multiple-presses?
+    :accessibility-label     :user-list
+    :on-press                (when on-press on-press)
+    :on-long-press           (when on-long-press on-long-press)}
   [:<>
    [user-avatar/user-avatar
     {:full-name       primary-name
@@ -47,12 +47,13 @@
                                    :height        40
                                    :border-radius 10})]
    [rn/touchable-without-feedback
-     {:test-ID             test-ID
-      :on-long-press       on-long-press ;;NOTE - this is temporary while supporting old wallet
-      :on-press            on-press
-      :on-press-in         #(toggle-background-color background-color false pass-through?)
-      :on-press-out        #(toggle-background-color background-color true pass-through?)
-      :accessibility-label accessibility-label}
+     {:test-ID                 test-ID
+      :on-long-press           on-long-press ;;NOTE - this is temporary while supporting old wallet
+      :allow-multiple-presses? true
+      :on-press                on-press
+      :on-press-in             #(toggle-background-color background-color false pass-through?)
+      :on-press-out            #(toggle-background-color background-color true pass-through?)
+      :accessibility-label     accessibility-label}
     [reanimated/view {:style background-animated-style}
      ;; In android animations are not working for the animated components which are nested by
      ;; hole-view,
@@ -19,15 +19,16 @@
      (let [label-color      (style/get-label-color disabled? theme blur?)
            background-color (style/toggle-background-color @pressed? blur? theme)]
        [rn/pressable
-         {:accessibility-label (label->accessibility-label label)
-          :disabled            (or disabled? (not label))
-          :on-press            (fn []
-                                 (when on-press
-                                   (on-press label)))
-          :on-press-in         #(reset! pressed? true)
-          :on-press-out        #(reset! pressed? false)
-          :hit-slop            {:top 8 :bottom 8 :left 25 :right 25}
-          :style               (style/container background-color)}
+         {:accessibility-label     (label->accessibility-label label)
+          :disabled                (or disabled? (not label))
+          :on-press                (fn []
+                                     (when on-press
+                                       (on-press label)))
+          :allow-multiple-presses? true
+          :on-press-in             #(reset! pressed? true)
+          :on-press-out            #(reset! pressed? false)
+          :hit-slop                {:top 8 :bottom 8 :left 25 :right 25}
+          :style                   (style/container background-color)}
         (case type
           :key             [icons/icon
                             label
@@ -3,7 +3,6 @@
    [quo.components.markdown.text :as text]
    [quo.components.profile.collectible.style :as style]
    [react-native.core :as rn]
-    [react-native.fast-image :as fast-image]
    [react-native.svg :as svg]))

 (defn remaining-tiles
@@ -25,7 +24,12 @@
        {:style {:border-radius (:border-radius image-style)
                 :overflow      :hidden}}
        [svg/svg-uri (assoc image-style :uri (:uri resource))]]
-       [fast-image/fast-image
+       ;; NOTE: using react-native-fast-image here causes a crash on devices when used inside a
+       ;; large flatlist. The library seems to have issues with memory consumption when used with
+       ;; large images/GIFs.
+       ;;
+       ;; https://github.com/DylanVann/react-native-fast-image/issues/195
+       [rn/image
        {:style  image-style
         :source (if (string? resource)
                   {:uri      resource
@@ -12,12 +12,13 @@
                 accessibility-label]
          :or   {accessibility-label :reaction}}]
      [rn/pressable
-       {:accessibility-label accessibility-label
-        :style               (merge (style/container @pressed?)
-                                    container-style)
-        :on-press            (fn [e]
-                               (swap! pressed? not)
-                               (when on-press
-                                 (on-press e)))}
+       {:accessibility-label     accessibility-label
+        :allow-multiple-presses? true
+        :style                   (merge (style/container @pressed?)
+                                        container-style)
+        :on-press                (fn [e]
+                                   (swap! pressed? not)
+                                   (when on-press
+                                     (on-press e)))}
       [rn/text
        (reactions.resource/system-emojis emoji)]])))
@@ -30,7 +30,8 @@
                                                 :theme               theme})]
        [rn/pressable
         (when-not disabled?
-           {:on-press #(handle-press on-change internal-checked? actual-checked?)})
+           {:on-press                #(handle-press on-change internal-checked? actual-checked?)
+            :allow-multiple-presses? true})
         [rn/view
          {:style                             outer-styles
           :needs-offscreen-alpha-compositing true
@@ -3,6 +3,7 @@
            [clojure.string :as string]
            [oops.core :as oops]
            [quo.components.avatars.account-avatar.view :as account-avatar]
+            [quo.components.avatars.user-avatar.view :as user-avatar]
            [quo.components.buttons.button.view :as button]
            [quo.components.gradient.gradient-cover.view :as gradient-cover]
            [quo.components.markdown.text :as text]
@@ -133,10 +134,19 @@
     {:style style/share-qr-container}
     [rn/view
      {:style style/share-qr-inner-container}
-      [account-avatar/view
-       {:customization-color customization-color
-        :emoji               emoji
-        :size                32}]
+      (if (= :profile share-qr-type)
+        [user-avatar/user-avatar
+         {:profile-picture      profile-picture
+          :customization-color customization-color
+          :full-name           full-name
+          :size                :small
+          :status-indicator?   false
+          :online?             false
+          :ring?               true}]
+        [account-avatar/view
+         {:customization-color customization-color
+          :emoji               emoji
+          :size                32}])
      [text/text
       {:size   :heading-2
        :weight :semi-bold
@@ -12,7 +12,7 @@
   [:cat
    [:map {:closed true}
     [:size {:optional true :default 32} [:or keyword? pos-int?]]
-     [:token {:optional true} [:or keyword? string?]]
+     [:token {:optional true} [:maybe [:or keyword? string?]]]
     [:style {:optional true} map?]
     ;; Ignores `token` and uses this as parameter to `rn/image`'s source.
     [:image-source {:optional true} [:maybe [:or :schema.common/image-source :string]]]]]
@@ -1,6 +1,7 @@
 (ns quo.components.wallet.token-input.view
  (:require
    [clojure.string :as string]
+    [oops.core :as oops]
    [quo.components.buttons.button.view :as button]
    [quo.components.dividers.divider-line.view :as divider-line]
    [quo.components.markdown.text :as text]
@@ -72,18 +73,25 @@
   [token-name-text theme text]])

 (defn input-section
-  [{:keys [on-change-text value value-atom]}]
-  (let [input-ref             (atom nil)
-        set-ref               #(reset! input-ref %)
-        focus-input           #(when-let [ref ^js @input-ref]
-                                 (.focus ref))
-        controlled-input?     (some? value)
-        handle-on-change-text (fn [v]
-                                (when-not controlled-input?
-                                  (reset! value-atom v))
-                                (when on-change-text
-                                  (on-change-text v)))]
-    (fn [{:keys [theme token customization-color show-keyboard? crypto? currency value error?]
+  [{:keys [on-change-text value value-atom on-selection-change]}]
+  (let [input-ref               (atom nil)
+        set-ref                 #(reset! input-ref %)
+        focus-input             #(when-let [ref ^js @input-ref]
+                                   (.focus ref))
+        controlled-input?       (some? value)
+        handle-on-change-text   (fn [v]
+                                  (when-not controlled-input?
+                                    (reset! value-atom v))
+                                  (when on-change-text
+                                    (on-change-text v)))
+        handle-selection-change (fn [^js e]
+                                  (when on-selection-change
+                                    (-> e
+                                        (oops/oget "nativeEvent.selection")
+                                        (js->clj :keywordize-keys true)
+                                        (on-selection-change))))]
+    (fn [{:keys [theme token customization-color show-keyboard? crypto? currency value error?
+                 selection]
          :or   {show-keyboard? true}}]
      [rn/pressable
       {:on-press focus-input
@@ -102,7 +110,9 @@
                  :max-length               12
                  :on-change-text           handle-on-change-text
                  :selection-color          customization-color
-                  :show-soft-input-on-focus show-keyboard?}
+                  :show-soft-input-on-focus show-keyboard?
+                  :on-selection-change      handle-selection-change
+                  :selection                (clj->js selection)}
           controlled-input?       (assoc :value value)
           (not controlled-input?) (assoc :default-value @value-atom))]]
       [token-label
@@ -111,33 +121,32 @@
         :value (if controlled-input? value @value-atom)}]])))

 (defn- view-internal
-  [{:keys [on-swap]}]
-  (let [width          (:width (rn/get-window))
-        value-atom     (reagent/atom nil)
-        crypto?        (reagent/atom true)
-        handle-on-swap (fn []
-                         (swap! crypto? not)
-                         (when on-swap
-                           (on-swap @crypto?)))]
-    (fn [{:keys [theme container-style value] :as props}]
-      [rn/view {:style (merge (style/main-container width) container-style)}
-       [rn/view {:style style/amount-container}
-        [input-section
-         (assoc props
-                :value-atom value-atom
-                :crypto?    @crypto?)]
-        [button/button
-         {:icon                true
-          :icon-only?          true
-          :size                32
-          :on-press            handle-on-swap
-          :type                :outline
-          :accessibility-label :reorder}
-         :i/reorder]]
-       [divider-line/view {:container-style (style/divider theme)}]
-       [data-info
-        (assoc props
-               :crypto? @crypto?
-               :amount  (or value @value-atom))]])))
+  []
+  (let [width      (:width (rn/get-window))
+        value-atom (reagent/atom nil)
+        crypto?    (reagent/atom true)]
+    (fn [{:keys [theme container-style value on-swap] :as props}]
+      (let [handle-on-swap (fn []
+                             (swap! crypto? not)
+                             (when on-swap (on-swap @crypto?)))]
+        [rn/view {:style (merge (style/main-container width) container-style)}
+         [rn/view {:style style/amount-container}
+          [input-section
+           (assoc props
+                  :value-atom value-atom
+                  :crypto?    @crypto?)]
+          [button/button
+           {:icon                true
+            :icon-only?          true
+            :size                32
+            :on-press            handle-on-swap
+            :type                :outline
+            :accessibility-label :reorder}
+           :i/reorder]]
+         [divider-line/view {:container-style (style/divider theme)}]
+         [data-info
+          (assoc props
+                 :crypto? @crypto?
+                 :amount  (or value @value-atom))]]))))

 (def view (quo.theme/with-theme view-internal))
@@ -36,6 +36,7 @@
    quo.components.community.community-view
    quo.components.community.icon
    quo.components.community.token-gating
+    quo.components.counter.collectible-counter.view
    quo.components.counter.counter.view
    quo.components.counter.step.view
    quo.components.dividers.date
@@ -229,6 +230,7 @@
 (def channel-actions quo.components.community.channel-actions/channel-actions)

 ;;;; Counter
+(def collectible-counter quo.components.counter.collectible-counter.view/view)
 (def counter quo.components.counter.counter.view/view)
 (def step #'quo.components.counter.step.view/view)

@@ -17,6 +17,7 @@
    quo.components.calendar.calendar.month-picker.component-spec
    quo.components.colors.color-picker.component-spec
    quo.components.community.community-stat.component-spec
+    quo.components.counter.collectible-counter.component-spec
    quo.components.counter.counter.component-spec
    quo.components.counter.step.component-spec
    quo.components.dividers.divider-label.component-spec
@@ -7,6 +7,7 @@
    [react-native.flat-list :as flat-list]
    [react-native.platform :as platform]
    [react-native.section-list :as section-list]
+    [react-native.utils :as utils]
    [reagent.core :as reagent]))

 (def app-state ^js (.-AppState ^js react-native))
@@ -33,12 +34,28 @@
 (def text (reagent/adapt-react-class (.-Text ^js react-native)))
 (def text-input (reagent/adapt-react-class (.-TextInput ^js react-native)))

-(def pressable (reagent/adapt-react-class (.-Pressable ^js react-native)))
-(def touchable-opacity (reagent/adapt-react-class (.-TouchableOpacity ^js react-native)))
-(def touchable-highlight (reagent/adapt-react-class (.-TouchableHighlight ^js react-native)))
-(def touchable-without-feedback
+(def pressable-class (reagent/adapt-react-class (.-Pressable ^js react-native)))
+(def touchable-opacity-class (reagent/adapt-react-class (.-TouchableOpacity ^js react-native)))
+(def touchable-highlight-class (reagent/adapt-react-class (.-TouchableHighlight ^js react-native)))
+(def touchable-without-feedback-class
  (reagent/adapt-react-class (.-TouchableWithoutFeedback ^js react-native)))

+(defn pressable
+  [props & children]
+  (into [pressable-class (utils/custom-pressable-props props)] children))
+
+(defn touchable-opacity
+  [props & children]
+  (into [touchable-opacity-class (utils/custom-pressable-props props)] children))
+
+(defn touchable-highlight
+  [props & children]
+  (into [touchable-highlight-class (utils/custom-pressable-props props)] children))
+
+(defn touchable-without-feedback
+  [props & children]
+  (into [touchable-without-feedback-class (utils/custom-pressable-props props)] children))
+
 (def flat-list flat-list/flat-list)

 (def section-list section-list/section-list)
@@ -0,0 +1,32 @@
+(ns react-native.utils)
+
+(defonce ^:private throttle (atom {}))
+
+(defn- wrapped-ref
+  [{:keys [ref]} throttle-id]
+  (fn [ref-value]
+    (when ref-value
+      (when ref
+        (ref ref-value))
+      (reset! throttle-id ref-value))))
+
+(defn- throttled-on-press
+  [{:keys [on-press allow-multiple-presses? throttle-duration]} throttle-id]
+  (if allow-multiple-presses?
+    on-press
+    (fn []
+      (let [id @throttle-id]
+        (when (and id (not (get @throttle id)))
+          (swap! throttle assoc id true)
+          (on-press)
+          (js/setTimeout
+           #(swap! throttle dissoc id)
+           (or throttle-duration 500)))))))
+
+(defn custom-pressable-props
+  [{:keys [on-press] :as props}]
+  (let [throttle-id (atom nil)]
+    (cond-> props
+      on-press
+      (assoc :on-press (throttled-on-press props throttle-id)
+             :ref      (wrapped-ref props throttle-id)))))
@@ -5,22 +5,23 @@
    [utils.re-frame :as rf]))

 (defn contact-list-item
-  [{:keys [on-press on-long-press accessory]}
+  [{:keys [on-press on-long-press accessory allow-multiple-presses?]}
   {:keys [primary-name secondary-name public-key compressed-key ens-verified added?]}
   theme]
  (let [photo-path          (rf/sub [:chats/photo-path public-key])
        online?             (rf/sub [:visibility-status-updates/online? public-key])
        customization-color (rf/sub [:profile/customization-color])]
    [quo/user
-     {:customization-color customization-color
-      :theme               theme
-      :short-chat-key      (address/get-shortened-compressed-key (or compressed-key public-key))
-      :primary-name        primary-name
-      :secondary-name      secondary-name
-      :photo-path          photo-path
-      :online?             online?
-      :verified?           ens-verified
-      :contact?            added?
-      :on-press            on-press
-      :on-long-press       on-long-press
-      :accessory           accessory}]))
+     {:customization-color     customization-color
+      :allow-multiple-presses? allow-multiple-presses?
+      :theme                   theme
+      :short-chat-key          (address/get-shortened-compressed-key (or compressed-key public-key))
+      :primary-name            primary-name
+      :secondary-name          secondary-name
+      :photo-path              photo-path
+      :online?                 online?
+      :verified?               ens-verified
+      :contact?                added?
+      :on-press                on-press
+      :on-long-press           on-long-press
+      :accessory               accessory}]))
@@ -4,7 +4,6 @@
    [status-im.common.home.top-nav.style :as style]
    [status-im.constants :as constants]
    [status-im.contexts.profile.utils :as profile.utils]
-    [utils.debounce :refer [dispatch-and-chill]]
    [utils.re-frame :as rf]))

 (defn view
@@ -36,7 +35,7 @@
     {:avatar-on-press          #(rf/dispatch [:open-modal :settings])
      :scan-on-press            #(js/alert "to be implemented")
      :activity-center-on-press #(rf/dispatch [:activity-center/open])
-      :qr-code-on-press         #(dispatch-and-chill [:open-modal :share-shell] 1000)
+      :qr-code-on-press         #(rf/dispatch [:open-modal :share-shell])
      :container-style          (merge style/top-nav-container container-style)
      :blur?                    blur?
      :jump-to?                 jump-to?
@@ -1,4 +1,4 @@
-(ns status-im.contexts.onboarding.select-photo.method-menu.view
+(ns status-im.common.profile-picture-picker.view
  (:require
    ["react-native-image-crop-picker" :default image-picker]
    [quo.core :as quo]
@@ -59,7 +59,7 @@
   crop-opts))

 (defn view
-  [update-profile-pic-callback]
+  [{:keys [update-profile-pic-callback has-picture?]}]
  [quo/action-drawer
   [[{:icon                :i/camera
      :accessibility-label :take-photo-button
@@ -86,5 +86,15 @@
                               :on-allowed  (fn [] (pick-pic update-profile-pic-callback))
                               :on-denied   (fn []
                                              (log/info
-                                               "user has denied permissions to select picture"))}))}]]])
+                                               "user has denied permissions to select picture"))}))}
+     (when has-picture?
+       {:accessibility-label :remove-profile-picture
+        :add-divider?        true
+        :danger?             true
+        :blur?               true
+        :icon                :i/delete
+        :label               (i18n/label :t/profile-pic-remove)
+        :on-press            (fn []
+                               (rf/dispatch [:hide-bottom-sheet])
+                               (update-profile-pic-callback nil))})]]])

@@ -85,7 +85,10 @@
    :dark  (js/require "../resources/images/ui2/no-permissions-dark.png")}
   :sweating-man
   {:light (js/require "../resources/images/ui2/sweating-man-light.png")
-    :dark  (js/require "../resources/images/ui2/sweating-man-dark.png")}})
+    :dark  (js/require "../resources/images/ui2/sweating-man-dark.png")}
+   :no-pinned-messages
+   {:light (js/require "../resources/images/ui2/no-pinned-messages-light.png")
+    :dark  (js/require "../resources/images/ui2/no-pinned-messages-dark.png")}})

 (def mock-images
  {:bored-ape             (js/require "../resources/images/mock2/bored-ape.png")
@@ -1,7 +1,6 @@
 (ns status-im.common.signals.events
  (:require
    [legacy.status-im.chat.models.message :as models.message]
-    [legacy.status-im.ethereum.subscriptions :as ethereum.subscriptions]
    [legacy.status-im.mailserver.core :as mailserver]
    [legacy.status-im.visibility-status-updates.core :as visibility-status-updates]
    [status-im.common.pairing.events :as pairing]
@@ -70,10 +69,7 @@
      "messages.new"               (messages.transport/sanitize-messages-and-process-response cofx
                                                                                              event-js
                                                                                              true)
-      "wallet"                     (ethereum.subscriptions/new-wallet-event cofx
-                                                                            (js->clj event-js
-                                                                                     :keywordize-keys
-                                                                                     true))
+      "wallet"                     (rf/dispatch [:wallet/signal-received event-js])
      "local-notifications"        (local-notifications/process cofx
                                                                (js->clj event-js :keywordize-keys true))
      "community.found"            (link-preview/cache-community-preview-data (js->clj event-js
@@ -11,11 +11,18 @@

 (goog-define INFURA_TOKEN "")
 (goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9")
-(goog-define ALCHEMY_ARBITRUM_GOERLI_TOKEN "")
-(goog-define ALCHEMY_OPTIMISM_GOERLI_TOKEN "")
-(goog-define ALCHEMY_OPTIMISM_MAINNET_TOKEN "")
-(goog-define ALCHEMY_ARBITRUM_MAINNET_TOKEN "")
 (goog-define OPENSEA_API_KEY "")
+(goog-define RARIBLE_MAINNET_API_KEY "")
+(goog-define RARIBLE_TESTNET_API_KEY "")
+(goog-define ALCHEMY_ETHEREUM_MAINNET_TOKEN "")
+(goog-define ALCHEMY_ETHEREUM_GOERLI_TOKEN "")
+(goog-define ALCHEMY_ETHEREUM_SEPOLIA_TOKEN "")
+(goog-define ALCHEMY_ARBITRUM_MAINNET_TOKEN "")
+(goog-define ALCHEMY_ARBITRUM_GOERLI_TOKEN "")
+(goog-define ALCHEMY_ARBITRUM_SEPOLIA_TOKEN "")
+(goog-define ALCHEMY_OPTIMISM_MAINNET_TOKEN "")
+(goog-define ALCHEMY_OPTIMISM_GOERLI_TOKEN "")
+(goog-define ALCHEMY_OPTIMISM_SEPOLIA_TOKEN "")

 (def mainnet-rpc-url (str "https://eth-archival.gateway.pokt.network/v1/lb/" POKT_TOKEN))
 (def goerli-rpc-url (str "https://goerli-archival.gateway.pokt.network/v1/lb/" POKT_TOKEN))
@@ -165,4 +172,5 @@

 (def wallet-feature-flags
  {:edit-default-keypair false
-   :bridge-token         false})
+   :bridge-token         false
+   :remove-account       false})
@@ -410,12 +410,15 @@
 (def ^:const ens-action-type-set-pub-key 2)

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

 (def ^:const mainnet-short-name "eth")
 (def ^:const optimism-short-name "opt")
@@ -23,7 +23,7 @@
      :label               (i18n/label :t/new-chat)
      :on-press            (fn []
                             (rf/dispatch [:group-chat/clear-contacts])
-                             (debounce/dispatch-and-chill
+                             (debounce/throttle-and-dispatch
                              [:open-modal :start-a-new-chat]
                              1000))}
     {:icon                :i/add-user
@@ -31,6 +31,6 @@
      :label               (i18n/label :t/add-a-contact)
      :sub-label           (i18n/label :t/enter-chat-key)
      :add-divider?        true
-      :on-press            #(debounce/dispatch-and-chill
+      :on-press            #(debounce/throttle-and-dispatch
                             [:open-modal :new-contact]
                             1000)}]]])
@@ -79,10 +79,11 @@
      (let [on-toggle #(group-chat-member-toggle member? (swap! checked? not) public-key)]
        [contact-list-item/contact-list-item
         (when (not= current-pk public-key)
-           {:on-press  on-toggle
-            :accessory {:type     :checkbox
-                        :checked? @checked?
-                        :on-check on-toggle}})
+           {:on-press                on-toggle
+            :allow-multiple-presses? true
+            :accessory               {:type     :checkbox
+                                      :checked? @checked?
+                                      :on-check on-toggle}})
         item]))))

 (defn add-manage-members
@@ -135,10 +136,11 @@
                                                              extra-data])}])]
    [contact-list-item/contact-list-item
     (when (not= public-key current-pk)
-       {:on-press      #(rf/dispatch [:chat.ui/show-profile public-key])
-        :on-long-press show-profile-actions
-        :accessory     {:type     :options
-                        :on-press show-profile-actions}})
+       {:on-press                #(rf/dispatch [:chat.ui/show-profile public-key])
+        :allow-multiple-presses? true
+        :on-long-press           show-profile-actions
+        :accessory               {:type     :options
+                                  :on-press show-profile-actions}})
     item]))

 (defn group-details
@@ -18,7 +18,7 @@
  [chat-id]
  (fn []
    (rf/dispatch [:dismiss-keyboard])
-    (debounce/dispatch-and-chill [:chat/navigate-to-chat chat-id] 500)))
+    (debounce/throttle-and-dispatch [:chat/navigate-to-chat chat-id] 500)))

 (defn parsed-text-to-one-line
  [parsed-text]
@@ -57,10 +57,11 @@
                            (re-frame/dispatch [:deselect-contact public-key])
                            (re-frame/dispatch [:select-contact public-key]))]
      [contact-list-item/contact-list-item
-       {:on-press  on-toggle
-        :accessory {:type     :checkbox
-                    :checked? user-selected?
-                    :on-check on-toggle}}
+       {:on-press                on-toggle
+        :allow-multiple-presses? true
+        :accessory               {:type     :checkbox
+                                  :checked? user-selected?
+                                  :on-check on-toggle}}
       item])))

 (defn- view-internal
@@ -2,9 +2,11 @@
  (:require
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
+    [quo.theme]
    [react-native.core :as rn]
    [react-native.fast-image :as fast-image]
    [react-native.gesture :as gesture]
+    [status-im.common.resources :as resources]
    [status-im.contexts.chat.messenger.menus.pinned-messages.style :as style]
    [status-im.contexts.chat.messenger.messages.content.view :as message]
    [utils.i18n :as i18n]
@@ -24,26 +26,18 @@
  [message/message message context (atom false)])

 (defn empty-pinned-messages-state
-  [{:keys [community?]}]
+  [{:keys [theme community?]}]
  [rn/view {:style style/no-pinned-messages-container}
-   [rn/view {:style style/no-pinned-messages-icon}
-    [quo/icon :i/placeholder]]
-   [rn/view {:style style/no-pinned-messages-content}
-    [quo/text
-     {:size   :paragraph-1
-      :weight :semi-bold
-      :style  style/no-pinned-messages-title}
-     (i18n/label :t/no-pinned-messages)]
-    [quo/text
-     {:size  :paragraph-2
-      :style style/no-pinned-messages-text}
-     (i18n/label
-      (if community?
-        :t/no-pinned-messages-community-desc
-        :t/no-pinned-messages-desc))]]])
+   [quo/empty-state
+    {:blur?       false
+     :image       (resources/get-themed-image :no-pinned-messages theme)
+     :title       (i18n/label :t/no-pinned-messages)
+     :description (i18n/label (if community?
+                                :t/no-pinned-messages-community-desc
+                                :t/no-pinned-messages-desc))}]])

-(defn pinned-messages
-  [chat-id]
+(defn f-pinned-messages
+  [{:keys [theme chat-id]}]
  (let [pinned                 (rf/sub [:chats/pinned-sorted-list chat-id])
        render-data            (rf/sub [:chats/current-chat-message-list-view-context :in-pinned-view])
        current-chat           (rf/sub [:chats/chat-by-id chat-id])
@@ -83,4 +77,11 @@
         :key-fn      list-key-fn
         :separator   [quo/separator {:style {:margin-vertical 8}}]}]
       [empty-pinned-messages-state
-        {:community? (boolean community)}])]))
+        {:community? (boolean community)
+         :theme      theme}])]))
+
+(defn- internal-pinned-messages
+  [params]
+  [:f> f-pinned-messages params])
+
+(def view (quo.theme/with-theme internal-pinned-messages))
@@ -190,16 +190,17 @@
       {:accessibility-label :audio-message-container
        :style               (style/container)}
       [rn/touchable-opacity
-        {:accessibility-label :play-pause-audio-message-button
-         :on-press            #(play-pause-player {:player-key        player-key
-                                                   :player-state      player-state
-                                                   :progress          progress
-                                                   :message-id        message-id
-                                                   :audio-duration-ms duration
-                                                   :seeking-audio?    seeking-audio?
-                                                   :user-interaction? true
-                                                   :mediaserver-port  mediaserver-port})
-         :style               (style/play-pause-container)}
+        {:accessibility-label     :play-pause-audio-message-button
+         :allow-multiple-presses? true
+         :on-press                #(play-pause-player {:player-key        player-key
+                                                       :player-state      player-state
+                                                       :progress          progress
+                                                       :message-id        message-id
+                                                       :audio-duration-ms duration
+                                                       :seeking-audio?    seeking-audio?
+                                                       :user-interaction? true
+                                                       :mediaserver-port  mediaserver-port})
+         :style                   (style/play-pause-container)}
        [quo/icon
         (cond
           (= @player-state :preparing)
@@ -128,4 +128,4 @@
 (rf/defn show-pins-bottom-sheet
  {:events [:pin-message/show-pins-bottom-sheet]}
  [cofx chat-id]
-  (navigation/show-bottom-sheet cofx {:content (fn [] [pinned-messages-menu/pinned-messages chat-id])}))
+  (navigation/show-bottom-sheet cofx {:content (fn [] [pinned-messages-menu/view {:chat-id chat-id}])}))
@@ -26,8 +26,9 @@
    [quo/communities-membership-list-item
     {:customization-color customization-color
      :style               {:padding-horizontal 20}
-      :on-press            #(debounce/dispatch-and-chill [:communities/navigate-to-community-overview id]
-                                                         500)
+      :on-press            #(debounce/throttle-and-dispatch [:communities/navigate-to-community-overview
+                                                             id]
+                                                            500)
      :on-long-press       #(rf/dispatch
                             [:show-bottom-sheet
                              {:content       (fn []
@@ -199,7 +199,7 @@
    (assoc :on-press      (when joined-or-spectated
                            (fn []
                              (rf/dispatch [:dismiss-keyboard])
-                              (debounce/dispatch-and-chill
+                              (debounce/throttle-and-dispatch
                               [:communities/navigate-to-community-chat (str community-id id)]
                               1000)))
           :on-long-press #(rf/dispatch
@@ -10,10 +10,10 @@
    [react-native.platform :as platform]
    [react-native.safe-area :as safe-area]
    [reagent.core :as reagent]
+    [status-im.common.profile-picture-picker.view :as profile-picture-picker]
    [status-im.common.validation.profile :as profile-validator]
    [status-im.constants :as c]
    [status-im.contexts.onboarding.create-profile.style :as style]
-    [status-im.contexts.onboarding.select-photo.method-menu.view :as method-menu]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]
    [utils.responsiveness :as responsiveness]))
@@ -144,7 +144,9 @@
                                     (rf/dispatch
                                      [:show-bottom-sheet
                                       {:content (fn []
-                                                   [method-menu/view on-change-profile-pic])
+                                                   [profile-picture-picker/view
+                                                    {:update-profile-pic-callback on-change-profile-pic
+                                                     :has-picture?                false}])
                                        :shell?  true}]))
              :image-picker-props  {:profile-picture     @profile-pic
                                    :full-name           (if (seq @full-name)
@@ -19,16 +19,16 @@
                            (reset! scan-sync-code/dismiss-animations reset-top-animation-fn))
     :animations-duration constants/onboarding-modal-animation-duration
     :animations-delay    constants/onboarding-modal-animation-delay
-     :top-card            {:on-press            #(debounce/dispatch-and-chill [:open-modal
-                                                                               :sign-in-intro]
-                                                                              2000)
+     :top-card            {:on-press            #(debounce/throttle-and-dispatch [:open-modal
+                                                                                  :sign-in-intro]
+                                                                                 2000)
                           :heading             (i18n/label :t/sign-in)
                           :animated-heading    (i18n/label :t/sign-in-by-syncing)
                           :accessibility-label :already-use-status-button}
     :bottom-card         {:on-press            (fn []
                                                  (when-let [blur-show-fn @overlay/blur-show-fn-atom]
                                                    (blur-show-fn))
-                                                  (debounce/dispatch-and-chill
+                                                  (debounce/throttle-and-dispatch
                                                   [:open-modal :new-to-status]
                                                   1000))
                           :heading             (i18n/label :t/new-to-status)
@@ -45,7 +45,7 @@
       :style  style/plain-text}
      (i18n/label :t/by-continuing-you-accept)]
     [quo/text
-      {:on-press #(debounce/dispatch-and-chill [:open-modal :privacy-policy] 1000)
+      {:on-press #(debounce/throttle-and-dispatch [:open-modal :privacy-policy] 1000)
       :size     :paragraph-2
       :weight   :regular
       :style    style/highlighted-text}
@@ -31,7 +31,7 @@
                        (* 2 56) ;; two other list items
                        (* 2 16) ;; spacing between items
                        220)     ;; extra spacing (top bar)
-       :on-press     #(debounce/dispatch-and-chill
+       :on-press     #(debounce/throttle-and-dispatch
                       [:onboarding/navigate-to-create-profile]
                       1000)}]
     [rn/view {:style style/subtitle-container}
@@ -35,8 +35,8 @@
                             in-onboarding? (rf/dispatch [:navigate-back-to :sign-in-intro])
                             :else          (do
                                              (rf/dispatch [:navigate-back])
-                                              (debounce/dispatch-and-chill [:open-modal :sign-in]
-                                                                           1000))))
+                                              (debounce/throttle-and-dispatch [:open-modal :sign-in]
+                                                                              1000))))
    :accessibility-label :try-again-later-button
    :customization-color profile-color
    :container-style     style/try-again-button}
@@ -0,0 +1,30 @@
+(ns status-im.contexts.preview.quo.counter.collectible-counter
+  (:require
+    [quo.core :as quo]
+    [reagent.core :as reagent]
+    [status-im.contexts.preview.quo.preview :as preview]))
+
+(def descriptor
+  [{:key     :status
+    :type    :select
+    :options [{:key :default}
+              {:key :error}]}
+   {:key     :size
+    :type    :select
+    :options [{:key :size-32}
+              {:key :size-24}]}
+   {:key  :value
+    :type :text}])
+
+(defn view
+  []
+  (let [state (reagent/atom {:value  "x500"
+                             :status :default
+                             :size   :size-32})]
+    (fn []
+      [preview/preview-container
+       {:state                 state
+        :descriptor            descriptor
+        :show-blur-background? true
+        :blur?                 true}
+       [quo/collectible-counter @state]])))
@@ -43,6 +43,7 @@
    [status-im.contexts.preview.quo.community.discover-card :as discover-card]
    [status-im.contexts.preview.quo.community.list-item :as community-list-item]
    [status-im.contexts.preview.quo.community.token-gating :as token-gating]
+    [status-im.contexts.preview.quo.counter.collectible-counter :as collectible-counter]
    [status-im.contexts.preview.quo.counter.counter :as counter]
    [status-im.contexts.preview.quo.counter.step :as step]
    [status-im.contexts.preview.quo.dividers.date :as divider-date]
@@ -260,7 +261,9 @@
                       {:name      :channel-actions
                        :options   {:insets {:bottom? true}}
                        :component channel-actions/view}]
-   :counter           [{:name      :counter
+   :counter           [{:name      :collectible-counter
+                        :component collectible-counter/view}
+                       {:name      :counter
                        :component counter/view}
                       {:name      :step
                        :component step/view}]
@@ -13,10 +13,17 @@
   :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})
+   :alchemyArbitrumGoerliToken  config/ALCHEMY_ARBITRUM_GOERLI_TOKEN
+   :alchemyArbitrumSepoliaToken config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN})

 (defn create
  []
@@ -0,0 +1,52 @@
+(ns status-im.contexts.profile.edit.header.events
+  (:require [clojure.string :as string]
+            [status-im.common.profile-picture-picker.view :as profile-picture-picker]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(rf/reg-event-fx :profile/update-local-picture
+ (fn [{:keys [db]} [images]]
+   {:db (if images
+          (assoc-in db [:profile/profile :images] images)
+          (update db :profile/profile dissoc :images))}))
+
+(rf/reg-event-fx :profile/edit-profile-picture-success
+ (fn [_ [images]]
+   {:fx [[:dispatch [:profile/update-local-picture (reverse images)]]
+         [:dispatch
+          [:toasts/upsert
+           {:type  :positive
+            :theme :dark
+            :text  (i18n/label :t/profile-picture-added)}]]]}))
+
+(defn edit-profile-picture
+  [{:keys [db]} [picture crop-width crop-height]]
+  (let [key-uid     (get-in db [:profile/profile :key-uid])
+        crop-width  (or crop-width profile-picture-picker/crop-size)
+        crop-height (or crop-height profile-picture-picker/crop-size)
+        path        (string/replace-first picture #"file://" "")]
+    {:fx [[:json-rpc/call
+           [{:method     "multiaccounts_storeIdentityImage"
+             :params     [key-uid path 0 0 crop-width crop-height]
+             :on-success [:profile/edit-profile-picture-success]}]]]}))
+
+(rf/reg-event-fx :profile/edit-picture edit-profile-picture)
+
+(rf/reg-event-fx :profile/delete-profile-picture-success
+ (fn [_]
+   {:fx [[:dispatch [:profile/update-local-picture nil]]
+         [:dispatch
+          [:toasts/upsert
+           {:type  :positive
+            :theme :dark
+            :text  (i18n/label :t/profile-picture-removed)}]]]}))
+
+(defn delete-profile-picture
+  [{:keys [db]}]
+  (let [key-uid (get-in db [:profile/profile :key-uid])]
+    {:fx [[:json-rpc/call
+           [{:method     "multiaccounts_deleteIdentityImage"
+             :params     [key-uid]
+             :on-success [:profile/delete-profile-picture-success]}]]]}))
+
+(rf/reg-event-fx :profile/delete-picture delete-profile-picture)
@@ -0,0 +1,27 @@
+(ns status-im.contexts.profile.edit.header.events-test
+  (:require [cljs.test :refer [deftest is]]
+            matcher-combinators.test
+            [status-im.common.profile-picture-picker.view :as profile-picture-picker]
+            [status-im.contexts.profile.edit.header.events :as sut]))
+
+(deftest edit-picture-test
+  (let [picture  "new-picture"
+        key-uid  "key-uid"
+        cofx     {:db {:profile/profile {:key-uid key-uid}}}
+        expected {:fx [[:json-rpc/call
+                        [{:method     "multiaccounts_storeIdentityImage"
+                          :params     [key-uid picture 0 0 profile-picture-picker/crop-size
+                                       profile-picture-picker/crop-size]
+                          :on-success [:profile/edit-profile-picture-success]}]]]}]
+    (is (match? expected
+                (sut/edit-profile-picture cofx [picture])))))
+
+(deftest delete-picture-test
+  (let [key-uid  "key-uid"
+        cofx     {:db {:profile/profile {:key-uid key-uid}}}
+        expected {:fx [[:json-rpc/call
+                        [{:method     "multiaccounts_deleteIdentityImage"
+                          :params     [key-uid]
+                          :on-success [:profile/delete-profile-picture-success]}]]]}]
+    (is (match? expected
+                (sut/delete-profile-picture cofx)))))
@@ -1,7 +1,7 @@
 (ns status-im.contexts.profile.edit.header.view
  (:require [quo.core :as quo]
            [react-native.core :as rn]
-            [status-im.common.not-implemented :as not-implemented]
+            [status-im.common.profile-picture-picker.view :as profile-picture-picker]
            [status-im.contexts.profile.edit.style :as style]
            [status-im.contexts.profile.utils :as profile.utils]
            [utils.i18n :as i18n]
@@ -9,22 +9,37 @@

 (defn view
  []
-  (let [profile         (rf/sub [:profile/profile-with-image])
-        full-name       (profile.utils/displayed-name profile)
-        profile-picture (profile.utils/photo profile)]
+  (let [profile               (rf/sub [:profile/profile-with-image])
+        customization-color   (rf/sub [:profile/customization-color])
+        full-name             (profile.utils/displayed-name profile)
+        profile-picture       (profile.utils/photo profile)
+        has-picture?          (rf/sub [:profile/has-picture])
+        on-change-profile-pic (fn [picture]
+                                (if picture
+                                  (rf/dispatch [:profile/edit-picture picture])
+                                  (rf/dispatch [:profile/delete-picture])))]
    [rn/view
     {:key   :edit-profile
      :style style/screen-container}
     [quo/text-combinations {:title (i18n/label :t/edit-profile)}]
     [rn/view style/avatar-wrapper
      [quo/user-avatar
-       {:full-name         full-name
-        :profile-picture   profile-picture
-        :status-indicator? false
-        :ring?             true
-        :size              :big}]
+       {:full-name           full-name
+        :profile-picture     profile-picture
+        :customization-color customization-color
+        :status-indicator?   false
+        :ring?               true
+        :size                :big}]
      [quo/button
-       {:on-press        not-implemented/alert
+       {:on-press        (fn []
+                           (rf/dispatch
+                            [:show-bottom-sheet
+                             {:content (fn []
+                                         [profile-picture-picker/view
+                                          {:update-profile-pic-callback on-change-profile-pic
+                                           :has-picture?                has-picture?}])
+                              :theme   :dark
+                              :shell?  true}]))
        :container-style style/camera-button
        :icon-only?      true
        :type            :grey
@@ -2,17 +2,21 @@
  (:require [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

+(rf/reg-event-fx :profile/edit-profile-name-success
+ (fn [_]
+   {:fx [[:dispatch [:navigate-back]]
+         [:dispatch
+          [:toasts/upsert
+           {:type  :positive
+            :theme :dark
+            :text  (i18n/label :t/name-updated)}]]]}))
+
 (defn edit-profile-name
  [{:keys [db]} [name]]
  {:db (assoc-in db [:profile/profile :display-name] name)
   :fx [[:json-rpc/call
         [{:method     "wakuext_setDisplayName"
           :params     [name]
-           :on-success (fn []
-                         (rf/dispatch [:navigate-back])
-                         (rf/dispatch [:toasts/upsert
-                                       {:type  :positive
-                                        :theme :dark
-                                        :text  (i18n/label :t/name-updated)}]))}]]]})
+           :on-success [:profile/edit-profile-name-success]}]]]})

 (rf/reg-event-fx :profile/edit-name edit-profile-name)
@@ -10,6 +10,6 @@
                  :fx [[:json-rpc/call
                        [{:method     "wakuext_setDisplayName"
                          :params     [name]
-                          :on-success fn?}]]]}]
+                          :on-success [:profile/edit-profile-name-success]}]]]}]
    (is (match? expected
                (sut/edit-profile-name cofx [new-name])))))
@@ -3,6 +3,7 @@
    [legacy.status-im.data-store.settings :as data-store.settings]
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
+    [status-im.contexts.profile.edit.header.events]
    [status-im.contexts.profile.edit.name.events]
    [status-im.contexts.profile.login.events :as profile.login]
    [status-im.contexts.profile.rpc :as profile.rpc]
@@ -50,13 +50,13 @@
      :on-press            (fn []
                             (when @push-animation-fn-atom
                               (@push-animation-fn-atom))
-                             (debounce/dispatch-and-chill
+                             (debounce/throttle-and-dispatch
                              [:open-modal :new-to-status]
                              1000))
      :accessibility-label :create-new-profile}
     {:icon                :i/multi-profile
      :label               (i18n/label :t/add-existing-status-profile)
-      :on-press            #(debounce/dispatch-and-chill
+      :on-press            #(debounce/throttle-and-dispatch
                             [:open-modal :sign-in]
                             1000)
      :accessibility-label :multi-profile}]]])
@@ -70,6 +70,15 @@
                                       {:on-success on-success}])
             :on-cancel nil}]]})))

+(rf/reg-event-fx :profile.settings/toggle-sepolia-test-network
+ (fn [{:keys [db]}]
+   (let [value      (get-in db [:profile/profile :is-sepolia-enabled?])
+         on-success #(rf/dispatch [:wallet/initialize])]
+     {:fx [[:dispatch
+            [:profile.settings/profile-update :is-sepolia-enabled?
+             (not value)
+             {:on-success on-success}]]]})))
+
 (rf/defn change-preview-privacy-flag
  {:events [:profile.settings/change-preview-privacy]}
  [{:keys [db] :as cofx} private?]
@@ -80,7 +89,6 @@
             (boolean private?)
             {})))

-
 (rf/defn change-profile-pictures-show-to
  {:events [:profile.settings/change-profile-pictures-show-to]}
  [cofx id]
@@ -56,7 +56,7 @@
        :on-press   #(rf/dispatch [:navigate-back])
        :right-side [{:icon-name :i/multi-profile :on-press #(rf/dispatch [:open-modal :sign-in])}
                     {:icon-name :i/qr-code
-                      :on-press  #(debounce/dispatch-and-chill [:open-modal :share-shell] 1000)}
+                      :on-press  #(debounce/throttle-and-dispatch [:open-modal :share-shell] 1000)}
                     {:icon-name :i/share :on-press not-implemented/alert}]}]]
     [rn/flat-list
      {:key                             :list
@@ -74,7 +74,7 @@
       :jump-to
       {:on-press            (fn []
                               (rf/dispatch [:navigate-back])
-                               (debounce/dispatch-and-chill [:shell/navigate-to-jump-to] 500))
+                               (debounce/throttle-and-dispatch [:shell/navigate-to-jump-to] 500))
        :customization-color customization-color
        :label               (i18n/label :t/jump-to)}}
      {:position :absolute
@@ -59,7 +59,7 @@
       :button              (when empty-input?
                              {:on-press paste-on-input
                               :text     (i18n/label :t/paste)})
-       :value               @input-value}]
+       :value               (or scanned-address @input-value)}]
     [quo/button
      {:type            :outline
       :on-press        (fn []
@@ -9,6 +9,7 @@
            [react-native.gesture :as gesture]
            [react-native.platform :as platform]
            [reagent.core :as reagent]
+            [status-im.config :as config]
            [status-im.contexts.wallet.common.sheets.account-options.style :as style]
            [status-im.contexts.wallet.common.sheets.remove-account.view :as remove-account]
            [status-im.contexts.wallet.common.utils :as utils]
@@ -32,12 +33,13 @@

 (defn- options
  [{:keys [theme show-account-selector? options-height]}]
-  (let [{:keys [name color emoji address watch-only?]} (rf/sub [:wallet/current-viewing-account])
-        network-preference-details                     (rf/sub [:wallet/network-preference-details])
-        multichain-address                             (utils/get-multichain-address
-                                                        network-preference-details
-                                                        address)
-        share-title                                    (str name " " (i18n/label :t/address))]
+  (let [{:keys [name color emoji address watch-only?
+                default-account?]} (rf/sub [:wallet/current-viewing-account])
+        network-preference-details (rf/sub [:wallet/network-preference-details])
+        multichain-address         (utils/get-multichain-address
+                                    network-preference-details
+                                    address)
+        share-title                (i18n/label :t/share-address-title {:address name})]
    [rn/view
     {:on-layout #(reset! options-height (oops/oget % "nativeEvent.layout.height"))
      :style     (when show-account-selector? style/options-container)}
@@ -92,15 +94,19 @@
                                 #(rf/dispatch [:wallet/share-account
                                                {:title share-title :content multichain-address}])
                                 600))}
-        {:add-divider?        (not show-account-selector?)
-         :icon                :i/delete
-         :accessibility-label :remove-account
-         :label               (i18n/label :t/remove-account)
-         :danger?             true
-         :on-press            #(rf/dispatch [:show-bottom-sheet
-                                             {:content
-                                              (fn []
-                                                [remove-account/view])}])}]]]
+        (when-not default-account?
+          {:add-divider?        (not show-account-selector?)
+           :icon                :i/delete
+           :accessibility-label :remove-account
+           :label               (i18n/label :t/remove-account)
+           :danger?             true
+           :on-press            (fn []
+                                  (if (:remove-account config/wallet-feature-flags)
+                                    (rf/dispatch [:show-bottom-sheet
+                                                  {:content
+                                                   (fn []
+                                                     [remove-account/view])}])
+                                    (js/alert "Feature disabled in config file")))})]]]
     (when show-account-selector?
       [:<>
        [quo/divider-line {:container-style style/divider-label}]
@@ -11,13 +11,17 @@
    [utils.re-frame :as rf]))

 (defn- footer
-  [{:keys [submit-disabled?]}]
+  [{:keys [address submit-disabled? toast-message]}]
  [quo/bottom-actions
   {:actions             :2-actions
    :customization-color :danger
    :button-one-label    (i18n/label :t/remove)
-    :button-one-props    {:on-press  #(js/alert "Will be implemented")
-                          :type      :danger
+    :button-one-props    {:on-press
+                          (fn []
+                            (rf/dispatch [:wallet/remove-account
+                                          {:address       address
+                                           :toast-message toast-message}]))
+                          :type :danger
                          :disabled? submit-disabled?}
    :button-two-label    (i18n/label :t/cancel)
    :button-two-props    {:on-press #(rf/dispatch [:hide-bottom-sheet])
@@ -26,7 +30,7 @@
 (defn- recovery-phase-flow
  []
  (let [confirmed? (reagent/atom false)]
-    (fn [{:keys [name emoji path color] :as _account}]
+    (fn [{:keys [address name emoji path color] :as _account}]
      (let [formatted-path (utils/format-derivation-path path)]
        [:<>
         [quo/drawer-top
@@ -64,10 +68,13 @@
            :checked?            @confirmed?
            :on-change           #(swap! confirmed? not)}]
          [quo/text (i18n/label :t/remove-account-confirmation)]]
-         [footer {:submit-disabled? (not @confirmed?)}]]))))
+         [footer
+          {:submit-disabled? (not @confirmed?)
+           :address          address
+           :toast-message    (i18n/label :t/account-removed)}]]))))

 (defn- watched-address-flow
-  [{:keys [name emoji color] :as _account}]
+  [{:keys [address name emoji color] :as _account}]
  [:<>
   [quo/drawer-top
    {:title               (i18n/label :t/remove-watched-address-title)
@@ -79,13 +86,17 @@
   [rn/view {:style style/desc-container}
    [quo/text {:weight :medium}
     (i18n/label :t/remove-watched-address-desc)]]
-   [footer {:submit-disabled? false}]])
+   [footer
+    {:submit-disabled? false
+     :address          address
+     :toast-message    (i18n/label :t/watched-account-removed)}]])

 (defn- view-internal
  []
  (let [{:keys [type] :as account} (rf/sub [:wallet/current-viewing-account])]
    (case type
      :generated [recovery-phase-flow account]
-      :watch     [watched-address-flow account])))
+      :watch     [watched-address-flow account]
+      nil)))

 (def view (quo.theme/with-theme view-internal))
@@ -74,11 +74,13 @@
 (defn get-standard-crypto-format
  "For full details: https://github.com/status-im/status-mobile/issues/18225"
  [{:keys [market-values-per-currency]} token-units]
-  (let [price          (get-in market-values-per-currency [:usd :price])
-        one-cent-value (if (pos? price) (/ 0.01 price) 0)
-        decimals-count (calc-max-crypto-decimals one-cent-value)]
-    (if (money/equal-to token-units 0)
-      "0"
+  (if (or (nil? token-units)
+          (nil? market-values-per-currency)
+          (money/equal-to token-units 0))
+    "0"
+    (let [price          (-> market-values-per-currency :usd :price)
+          one-cent-value (if (pos? price) (/ 0.01 price) 0)
+          decimals-count (calc-max-crypto-decimals one-cent-value)]
      (if (< token-units one-cent-value)
        (str "<" (remove-trailing-zeroes (.toFixed one-cent-value decimals-count)))
        (remove-trailing-zeroes (.toFixed token-units decimals-count))))))
@@ -188,17 +190,30 @@
    address))

 (def id->network
-  {constants/mainnet-chain-id       :ethereum
-   constants/goerli-chain-id        :ethereum
-   constants/optimism-chain-id      :optimism
-   constants/optimism-test-chain-id :optimism
-   constants/arbitrum-chain-id      :arbitrum
-   constants/arbitrum-test-chain-id :arbitrum})
+  {constants/ethereum-chain-id         :ethereum
+   constants/goerli-chain-id           :ethereum
+   constants/ethereum-sepolia-chain-id :ethereum
+   constants/optimism-chain-id         :optimism
+   constants/optimism-testnet-chain-id :optimism
+   constants/optimism-sepolia-chain-id :optimism
+   constants/arbitrum-chain-id         :arbitrum
+   constants/arbitrum-testnet-chain-id :arbitrum
+   constants/arbitrum-sepolia-chain-id :arbitrum})

-(def short-name->id
-  {:eth  constants/mainnet-chain-id
-   :opt  constants/optimism-chain-id
-   :arb1 constants/arbitrum-chain-id})
+(defn- get-chain-id
+  [test-net?]
+  (if test-net?
+    {:eth  constants/goerli-chain-id
+     :opt  constants/optimism-testnet-chain-id
+     :arb1 constants/arbitrum-testnet-chain-id}
+    {:eth  constants/ethereum-chain-id
+     :opt  constants/optimism-chain-id
+     :arb1 constants/arbitrum-chain-id}))
+
+(defn short-name->id
+  [short-name test-net?]
+  (let [chain-id-map (get-chain-id test-net?)]
+    (get chain-id-map short-name)))

 (defn get-standard-fiat-format
  [crypto-value currency-symbol fiat-value]
@@ -33,6 +33,7 @@
      (update :test-preferred-chain-ids chain-ids-string->set)
      (update :type keyword)
      (update :color #(if (seq %) (keyword %) constants/account-default-customization-color))
+      (assoc :default-account? (:wallet account))
      add-keys-to-account))

 (defn rpc->accounts
@@ -49,7 +50,8 @@
                        :color                    :colorId})
      (update :prodPreferredChainIds chain-ids-set->string)
      (update :testPreferredChainIds chain-ids-set->string)
-      (dissoc :watch-only?)))
+      (dissoc :watch-only?)
+      (dissoc :default-account?)))

 (defn- rpc->balances-per-chain
  [token]
@@ -2,6 +2,7 @@
  (:require [quo.core :as quo]
            [react-native.core :as rn]
            [reagent.core :as reagent]
+            [status-im.config :as config]
            [status-im.contexts.wallet.common.screen-base.create-or-edit-account.view
             :as create-or-edit-account]
            [status-im.contexts.wallet.common.sheets.network-preferences.view
@@ -51,7 +52,7 @@
                                              :updated-key :name
                                              :new-value   @edited-account-name}))]
    (fn []
-      (let [{:keys [name emoji address color watch-only?]
+      (let [{:keys [name emoji address color watch-only? default-account?]
             :as   account}         (rf/sub [:wallet/current-viewing-account])
            network-details         (rf/sub [:wallet/network-preference-details])
            test-networks-enabled?  (rf/sub [:profile/test-networks-enabled?])
@@ -62,13 +63,16 @@
            button-disabled?        (or (nil? @edited-account-name)
                                        (= name @edited-account-name))]
        [create-or-edit-account/view
-         {:page-nav-right-side [{:icon-name :i/delete
-                                 :on-press
-                                 (fn []
-                                   (rf/dispatch [:show-bottom-sheet
-                                                 {:content
-                                                  (fn []
-                                                    [remove-account/view])}]))}]
+         {:page-nav-right-side [(when-not default-account?
+                                  {:icon-name :i/delete
+                                   :on-press
+                                   (fn []
+                                     (if (:remove-account config/wallet-feature-flags)
+                                       (rf/dispatch [:show-bottom-sheet
+                                                     {:content
+                                                      (fn []
+                                                        [remove-account/view])}])
+                                       (js/alert "Feature disabled in config file")))})]
          :account-name        account-name
          :account-emoji       emoji
          :account-color       color
@@ -7,6 +7,7 @@
    [status-im.contexts.wallet.events.collectibles]
    [status-im.contexts.wallet.item-types :as item-types]
    [taoensso.timbre :as log]
+    [utils.collection]
    [utils.ethereum.chain :as chain]
    [utils.ethereum.eip.eip55 :as eip55]
    [utils.i18n :as i18n]
@@ -51,10 +52,9 @@
         wallet-db           (get db :wallet)
         new-account?        (:new-account? wallet-db)
         navigate-to-account (:navigate-to-account wallet-db)]
-     {:db (reduce (fn [db {:keys [address] :as account}]
-                    (assoc-in db [:wallet :accounts address] account))
-                  db
-                  (data-store/rpc->accounts wallet-accounts))
+     {:db (assoc-in db
+           [:wallet :accounts]
+           (utils.collection/index-by :address (data-store/rpc->accounts wallet-accounts)))
      :fx [[:dispatch [:wallet/get-wallet-token]]
           [:dispatch [:wallet/request-collectibles {:start-at-index 0 :new-request? true}]]
           (when new-account?
@@ -84,6 +84,30 @@
                                   {:error %
                                    :event :wallet/save-account})}]]]}))

+(rf/reg-event-fx
+ :wallet/show-account-deleted-toast
+ (fn [_ [toast-message]]
+   {:fx [[:dispatch [:toasts/upsert {:type :positive :text toast-message}]]]}))
+
+(rf/reg-event-fx
+ :wallet/remove-account-success
+ (fn [_ [toast-message _]]
+   {:fx [[:dispatch [:hide-bottom-sheet]]
+         [:dispatch [:pop-to-root :shell-stack]]
+         [:dispatch [:wallet/get-accounts]]
+         [:dispatch [:wallet/show-account-deleted-toast toast-message]]]}))
+
+(rf/reg-event-fx
+ :wallet/remove-account
+ (fn [_ [{:keys [address toast-message]}]]
+   {:fx [[:json-rpc/call
+          [{:method     "accounts_deleteAccount"
+            :params     [address]
+            :on-success [:wallet/remove-account-success toast-message]
+            :on-error   #(log/info "failed to remove account "
+                                   {:error %
+                                    :event :wallet/remove-account})}]]]}))
+
 (rf/reg-event-fx
 :wallet/get-wallet-token
 (fn [{:keys [db]}]
@@ -133,10 +157,10 @@

 (rf/reg-event-fx :wallet/create-derived-addresses
 (fn [{:keys [db]} [{:keys [sha3-pwd path]} on-success]]
-   (let [{:keys [wallet-root-address]} (:profile/profile db)]
+   (let [{:keys [address]} (:profile/profile db)]
     {:fx [[:json-rpc/call
            [{:method     "wallet_getDerivedAddresses"
-              :params     [sha3-pwd wallet-root-address [path]]
+              :params     [sha3-pwd address [path]]
              :on-success on-success
              :on-error   #(log/info "failed to derive address " %)}]]]})))

@@ -3,10 +3,12 @@
    [camel-snake-kebab.core :as csk]
    [camel-snake-kebab.extras :as cske]
    [clojure.string :as string]
+    [native-module.core :as native-module]
    [status-im.constants :as constants]
    [status-im.contexts.wallet.common.utils :as utils]
    [status-im.contexts.wallet.send.utils :as send-utils]
    [taoensso.timbre :as log]
+    [utils.address :as address]
    [utils.money :as money]
    [utils.number]
    [utils.re-frame :as rf]))
@@ -56,13 +58,15 @@
 (fn [{:keys [db]}]
   {:db (update-in db [:wallet :ui :send] dissoc :recipient :to-address)}))

-(rf/reg-event-fx :wallet/select-send-address
+(rf/reg-event-fx
+ :wallet/select-send-address
 (fn [{:keys [db]} [{:keys [address token recipient stack-id]}]]
   (let [[prefix to-address] (utils/split-prefix-and-address address)
+         test-net?           (get-in db [:profile/profile :test-networks-enabled?])
         prefix-seq          (string/split prefix #":")
         selected-networks   (->> prefix-seq
                                  (remove string/blank?)
-                                  (mapv #(utils/short-name->id (keyword %))))]
+                                  (mapv #(utils/short-name->id (keyword %) test-net?)))]
     {:db (-> db
              (assoc-in [:wallet :ui :send :recipient] (or recipient address))
              (assoc-in [:wallet :ui :send :to-address] to-address)
@@ -73,18 +77,20 @@
              [:wallet-send-input-amount stack-id]
              [:wallet-select-asset stack-id])]]})))

-(rf/reg-event-fx :wallet/update-receiver-networks
+(rf/reg-event-fx
+ :wallet/update-receiver-networks
 (fn [{:keys [db]} [selected-networks]]
   {:db (assoc-in db [:wallet :ui :send :selected-networks] selected-networks)}))

 (rf/reg-event-fx :wallet/send-select-token
 (fn [{:keys [db]} [{:keys [token stack-id]}]]
-   {:db (assoc-in db [:wallet :ui :send :token] token)
-    :fx [[:dispatch-later
-          {:ms       1
-           :dispatch [:navigate-to-within-stack [:wallet-send-input-amount stack-id]]}]]}))
+   {:db (-> db
+            (update-in [:wallet :ui :send] dissoc :collectible)
+            (assoc-in [:wallet :ui :send :token] token))
+    :fx [[:navigate-to-within-stack [:wallet-send-input-amount stack-id]]]}))

-(rf/reg-event-fx :wallet/send-select-token-drawer
+(rf/reg-event-fx
+ :wallet/send-select-token-drawer
 (fn [{:keys [db]} [{:keys [token]}]]
   {:db (assoc-in db [:wallet :ui :send :token] token)}))

@@ -92,6 +98,15 @@
 (fn [{:keys [db]}]
   {:db (assoc-in db [:wallet :ui :send :token] nil)}))

+(rf/reg-event-fx :wallet/send-select-collectible
+ (fn [{:keys [db]} [{:keys [collectible stack-id]}]]
+   {:db (-> db
+            (update-in [:wallet :ui :send] dissoc :token)
+            (assoc-in [:wallet :ui :send :collectible] collectible)
+            (assoc-in [:wallet :ui :send :amount] 1))
+    :fx [[:dispatch [:wallet/get-suggested-routes 1]]
+         [:navigate-to-within-stack [:wallet-transaction-confirmation stack-id]]]}))
+
 (rf/reg-event-fx :wallet/send-select-amount
 (fn [{:keys [db]} [{:keys [amount stack-id]}]]
   {:db (assoc-in db [:wallet :ui :send :amount] amount)
@@ -101,19 +116,25 @@
 (fn [{:keys [db now]} [amount]]
   (let [wallet-address          (get-in db [:wallet :current-viewing-account-address])
         token                   (get-in db [:wallet :ui :send :token])
-         account-address         (get-in db [:wallet :ui :send :send-account-address])
-         selected-networks       (get-in db [:wallet :ui :send :selected-networks])
-         to-address              (or account-address (get-in db [:wallet :ui :send :to-address]))
-         token-decimal           (:decimals token)
-         token-id                (:symbol token)
-         network-preferences     selected-networks
+         collectible             (get-in db [:wallet :ui :send :collectible])
+         to-address              (get-in db [:wallet :ui :send :to-address])
+         token-decimal           (when token (:decimals token))
+         token-id                (if token
+                                   (:symbol token)
+                                   (str (get-in collectible [:id :contract-id :address])
+                                        ":"
+                                        (get-in collectible [:id :token-id])))
+         network-preferences     (if token [] [(get-in collectible [:id :contract-id :chain-id])])
         gas-rates               constants/gas-rate-medium
-         amount-in               (send-utils/amount-in-hex amount token-decimal)
+         amount-in               (send-utils/amount-in-hex amount (if token token-decimal 0))
         from-address            wallet-address
         disabled-from-chain-ids []
         disabled-to-chain-ids   []
         from-locked-amount      {}
-         request-params          [constants/send-type-transfer
+         transaction-type        (if token
+                                   constants/send-type-transfer
+                                   constants/send-type-erc-721-transfer)
+         request-params          [transaction-type
                                  from-address
                                  to-address
                                  amount-in
@@ -157,21 +178,46 @@
   {:fx [[:dispatch [:dismiss-modal :wallet-transaction-progress]]]}))

 (defn- transaction-bridge
-  [{:keys [from-address to-address route]}]
-  (let [{:keys [from bridge-name amount-out gas-amount gas-fees]}           route
-        {:keys [gas-price max-fee-per-gas-medium max-priority-fee-per-gas]} gas-fees]
-    [{:BridgeName bridge-name
-      :ChainID    (:chain-id from)
-      :TransferTx {:From                 from-address
-                   :To                   to-address
-                   :Gas                  (money/to-hex gas-amount)
-                   :GasPrice             (money/to-hex (money/->wei :gwei gas-price))
-                   :Value                amount-out
-                   :Nonce                nil
-                   :MaxFeePerGas         (money/to-hex (money/->wei :gwei max-fee-per-gas-medium))
-                   :MaxPriorityFeePerGas (money/to-hex (money/->wei :gwei max-priority-fee-per-gas))
-                   :Input                ""
-                   :Data                 "0x"}}]))
+  [{:keys [from-address from-chain-id to-address token-id token-address route data eth-transfer?]}]
+  (let [{:keys [bridge-name amount-out gas-amount
+                gas-fees]}                 route
+        eip-1559-enabled?                  (:eip-1559-enabled gas-fees)
+        {:keys [gas-price max-fee-per-gas-medium
+                max-priority-fee-per-gas]} gas-fees
+        transfer-tx                        (cond-> {:From  from-address
+                                                    :To    (or token-address to-address)
+                                                    :Gas   (money/to-hex gas-amount)
+                                                    :Value (when eth-transfer? amount-out)
+                                                    :Nonce nil
+                                                    :Input ""
+                                                    :Data  (or data "0x")}
+                                             eip-1559-enabled?       (assoc :TxType "0x02"
+                                                                            :MaxFeePerGas
+                                                                            (money/to-hex
+                                                                             (money/->wei
+                                                                              :gwei
+                                                                              max-fee-per-gas-medium))
+                                                                            :MaxPriorityFeePerGas
+                                                                            (money/to-hex
+                                                                             (money/->wei
+                                                                              :gwei
+                                                                              max-priority-fee-per-gas)))
+                                             (not eip-1559-enabled?) (assoc :TxType   "0x00"
+                                                                            :GasPrice (money/to-hex
+                                                                                       (money/->wei
+                                                                                        :gwei
+                                                                                        gas-price))))]
+    [(cond-> {:BridgeName bridge-name
+              :ChainID    from-chain-id}
+
+       (= bridge-name constants/bridge-name-erc-721-transfer)
+       (assoc :ERC721TransferTx
+              (assoc transfer-tx
+                     :Recipient to-address
+                     :TokenID   token-id))
+
+       (= bridge-name constants/bridge-name-transfer)
+       (assoc :TransferTx transfer-tx))]))

 (defn- multi-transaction-command
  [{:keys [from-address to-address from-asset to-asset amount-out transfer-type]
@@ -185,25 +231,50 @@

 (rf/reg-event-fx :wallet/send-transaction
 (fn [{:keys [db]} [sha3-pwd]]
-   (let [route          (get-in db [:wallet :ui :send :route])
-         from-address   (get-in db [:wallet :current-viewing-account-address])
-         to-address     (get-in db [:wallet :ui :send :to-address])
-         token          (get-in db [:wallet :ui :send :token])
-         token-id       (:symbol token)
-         request-params [(multi-transaction-command {:from-address from-address
-                                                     :to-address   to-address
-                                                     :from-asset   token-id
-                                                     :to-asset     token-id
-                                                     :amount-out   (:amount-out route)})
-                         (transaction-bridge {:to-address   to-address
-                                              :from-address from-address
-                                              :route        route})
-                         sha3-pwd]]
+   (let [route           (get-in db [:wallet :ui :send :route])
+         from-address    (get-in db [:wallet :current-viewing-account-address])
+         token           (get-in db [:wallet :ui :send :token])
+         collectible     (get-in db [:wallet :ui :send :collectible])
+         from-chain-id   (get-in route [:from :chain-id])
+         token-id        (if token
+                           (:symbol token)
+                           (get-in collectible [:id :token-id]))
+         erc20-transfer? (and token (not= token-id "ETH"))
+         eth-transfer?   (and token (not erc20-transfer?))
+         token-address   (cond collectible
+                               (get-in collectible
+                                       [:id :contract-id :address])
+                               erc20-transfer?
+                               (get-in token [:balances-per-chain from-chain-id :address]))
+         to-address      (get-in db [:wallet :ui :send :to-address])
+         data            (when erc20-transfer?
+                           (native-module/encode-transfer (address/normalized-hex to-address)
+                                                          (:amount-out route)))
+         request-params  [(multi-transaction-command
+                           {:from-address from-address
+                            :to-address   to-address
+                            :from-asset   token-id
+                            :to-asset     token-id
+                            :amount-out   (if eth-transfer? (:amount-out route) "0x0")})
+                          (transaction-bridge {:to-address    to-address
+                                               :from-address  from-address
+                                               :route         route
+                                               :from-chain-id from-chain-id
+                                               :token-address token-address
+                                               :token-id      (when collectible
+                                                                (money/to-hex (js/parseInt token-id)))
+                                               :data          data
+                                               :eth-transfer? eth-transfer?})
+                          sha3-pwd]]
     {:json-rpc/call [{:method     "wallet_createMultiTransaction"
                       :params     request-params
                       :on-success (fn [result]
                                     (rf/dispatch [:hide-bottom-sheet])
-                                     (rf/dispatch [:wallet/add-authorized-transaction result]))
+                                     (rf/dispatch [:wallet/add-authorized-transaction result])
+                                     (rf/dispatch [:wallet/clean-scanned-address])
+                                     (rf/dispatch [:wallet/clean-local-suggestions])
+                                     (rf/dispatch [:wallet/clean-send-address])
+                                     (rf/dispatch [:wallet/select-address-tab nil]))
                       :on-error   (fn [error]
                                     (log/error "failed to send transaction"
                                                {:event  :wallet/send-transaction
@@ -53,8 +53,9 @@
  (h/test "Default render"
    (h/setup-subs sub-mocks)
    (h/render [input-amount/view
-               {:crypto-decimals 2
-                :limit-crypto    250}])
+               {:crypto-decimals          2
+                :limit-crypto             250
+                :initial-crypto-currency? false}])
    (h/is-truthy (h/get-by-text "0"))
    (h/is-truthy (h/get-by-text "ETH"))
    (h/is-truthy (h/get-by-text "$0.00"))
@@ -65,9 +66,10 @@
    (h/setup-subs sub-mocks)
    (let [on-confirm (h/mock-fn)]
      (h/render [input-amount/view
-                 {:on-confirm      on-confirm
-                  :crypto-decimals 10
-                  :limit-crypto    1000}])
+                 {:on-confirm               on-confirm
+                  :crypto-decimals          10
+                  :limit-crypto             1000
+                  :initial-crypto-currency? false}])

      (h/fire-event :press (h/query-by-label-text :keyboard-key-1))
      (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
@@ -88,9 +90,10 @@

    (let [on-confirm (h/mock-fn)]
      (h/render [input-amount/view
-                 {:crypto-decimals 10
-                  :limit-crypto    1000
-                  :on-confirm      on-confirm}])
+                 {:crypto-decimals          10
+                  :limit-crypto             1000
+                  :on-confirm               on-confirm
+                  :initial-crypto-currency? false}])

      (h/fire-event :press (h/query-by-label-text :keyboard-key-1))
      (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
@@ -30,28 +30,54 @@
 (defn valid-input?
  [current v]
  (let [max-length          12
-        length-owerflow?    (>= (count current) max-length)
+        length-overflow?    (>= (count current) max-length)
        extra-dot?          (and (= v dot) (string/includes? current dot))
        extra-leading-zero? (and (= current "0") (= "0" (str v)))
        non-numeric?        (re-find not-digits-or-dot-pattern (str v))]
-    (not (or non-numeric? extra-dot? extra-leading-zero? length-owerflow?))))
+    (not (or non-numeric? extra-dot? extra-leading-zero? length-overflow?))))
+
+(defn- add-char-to-string
+  [s c idx]
+  (let [size (count s)]
+    (if (= size idx)
+      (str s c)
+      (str (subs s 0 idx)
+           c
+           (subs s idx size)))))
+
+(defn- move-input-cursor
+  ([input-selection-atom new-idx]
+   (move-input-cursor input-selection-atom new-idx new-idx))
+  ([input-selection-atom new-start-idx new-end-idx]
+   (let [start-idx (if (< new-start-idx 0) 0 new-start-idx)
+         end-idx   (if (< new-end-idx 0) 0 new-start-idx)]
+     (swap! input-selection-atom assoc :start start-idx :end end-idx))))

 (defn- normalize-input
-  [current v]
-  (cond
-    (and (string/blank? current) (= v dot))
-    (str "0" v)
+  [current v input-selection-atom]
+  (let [{:keys [start end]} @input-selection-atom]
+    (if (= start end)
+      (cond
+        (and (string/blank? current) (= v dot))
+        (do
+          (move-input-cursor input-selection-atom 2)
+          (str "0" v))

-    (and (= current "0") (not= v dot))
-    (str v)
+        (and (= current "0") (not= v dot))
+        (do
+          (move-input-cursor input-selection-atom 1)
+          (str v))

-    :else
-    (str current v)))
+        :else
+        (do
+          (move-input-cursor input-selection-atom (inc start))
+          (add-char-to-string current v start)))
+      current)))

 (defn- make-new-input
-  [current v]
+  [current v input-selection-atom]
  (if (valid-input? current v)
-    (normalize-input current v)
+    (normalize-input current v input-selection-atom)
    current))

 (defn- reset-input-error
@@ -59,124 +85,154 @@
  (reset! input-error
    (> new-value prev-value)))

+(defn delete-from-string
+  [s idx]
+  (let [size (count s)]
+    (str (subs s 0 (dec idx)) (subs s idx size))))
+
 (defn- f-view-internal
-  ;; crypto-decimals and limit-crypto args are needed for component tests only
-  [{:keys [crypto-decimals limit-crypto]}]
-  (let [bottom                    (safe-area/get-bottom)
-        {:keys [currency]}        (rf/sub [:profile/profile])
-        token                     (rf/sub [:wallet/wallet-send-token])
-        loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
-        token-symbol              (:symbol token)
-        limit-crypto              (or limit-crypto
-                                      (utils/get-standard-crypto-format token (:total-balance token)))
-        conversion-rate           (get-in token [:market-values-per-currency :usd :price])
-        limit-fiat                (.toFixed (* (:total-balance token) conversion-rate) 2)
-        crypto-decimals           (or crypto-decimals (utils/get-crypto-decimals-count token))
-        input-value               (reagent/atom "")
-        input-error               (reagent/atom false)
-        current-limit             (reagent/atom {:amount   limit-crypto
-                                                 :currency token-symbol})
-        handle-swap               (fn [crypto?]
-                                    (let [num-value (parse-double @input-value)]
-                                      (reset! current-limit (if crypto?
-                                                              {:amount   limit-crypto
-                                                               :currency token-symbol}
-                                                              {:amount   limit-fiat
-                                                               :currency currency}))
-                                      (reset-input-error num-value
-                                                         (:amount @current-limit)
-                                                         input-error)))
-        handle-keyboard-press     (fn [v]
-                                    (let [current-value        @input-value
-                                          new-value            (make-new-input current-value v)
-                                          num-value            (or (parse-double new-value) 0)
-                                          current-limit-amount (:amount @current-limit)]
-                                      (when (not loading-suggested-routes?)
-                                        (reset! input-value new-value)
-                                        (reset-input-error num-value current-limit-amount input-error)
-                                        (reagent/flush))))
-        handle-delete             (fn [_]
-                                    (when-not loading-suggested-routes?
-                                      (let [current-limit-amount (:amount @current-limit)]
-                                        (swap! input-value #(subs % 0 (dec (count %))))
-                                        (reset-input-error @input-value current-limit-amount input-error)
-                                        (reagent/flush))))
-        handle-on-change          (fn [v]
-                                    (when (valid-input? @input-value v)
-                                      (let [num-value            (or (parse-double v) 0)
-                                            current-limit-amount (:amount @current-limit)]
-                                        (reset! input-value v)
-                                        (reset-input-error num-value current-limit-amount input-error)
-                                        (reagent/flush))))]
-    (fn [{:keys [on-confirm]
-          :or   {on-confirm #(rf/dispatch [:wallet/send-select-amount
-                                           {:amount   @input-value
-                                            :stack-id :wallet-send-input-amount}])}}]
-      (let [limit-label       (make-limit-label @current-limit)
-            input-num-value   (parse-double @input-value)
-            suggested-routes  (rf/sub [:wallet/wallet-send-suggested-routes])
-            route             (rf/sub [:wallet/wallet-send-route])
-            confirm-disabled? (or
-                               (nil? route)
-                               (empty? @input-value)
-                               (<= input-num-value 0)
-                               (> input-num-value (:amount @current-limit)))
-            amount            (str @input-value " " token-symbol)
-            {:keys [color]}   (rf/sub [:wallet/current-viewing-account])
-            fetch-routes      (fn []
+  ;; crypto-decimals, limit-crypto and initial-crypto-currency? args are needed
+  ;; for component tests only
+  [{default-on-confirm       :on-confirm
+    default-limit-crypto     :limit-crypto
+    default-crypto-decimals  :crypto-decimals
+    initial-crypto-currency? :initial-crypto-currency?
+    :or                      {initial-crypto-currency? true}}]
+  (let [_ (rn/dismiss-keyboard!)
+        bottom                (safe-area/get-bottom)
+        input-value           (reagent/atom "")
+        input-error           (reagent/atom false)
+        crypto-currency?      (reagent/atom initial-crypto-currency?)
+        input-selection       (reagent/atom {:start 0 :end 0})
+        handle-swap           (fn [{:keys [crypto? limit-fiat limit-crypto]}]
+                                (let [num-value     (parse-double @input-value)
+                                      current-limit (if crypto? limit-crypto limit-fiat)]
+                                  (reset! crypto-currency? crypto?)
+                                  (reset-input-error num-value current-limit input-error)))
+        handle-keyboard-press (fn [v loading-routes? current-limit-amount]
+                                (when-not loading-routes?
+                                  (let [current-value @input-value
+                                        new-value     (make-new-input current-value v input-selection)
+                                        num-value     (or (parse-double new-value) 0)]
+                                    (reset! input-value new-value)
+                                    (reset-input-error num-value current-limit-amount input-error)
+                                    (reagent/flush))))
+        handle-delete         (fn [loading-routes? current-limit-amount]
+                                (when-not loading-routes?
+                                  (let [{:keys [start end]} @input-selection]
+                                    (reset-input-error @input-value current-limit-amount input-error)
+                                    (when (= start end)
+                                      (swap! input-value delete-from-string start)
+                                      (move-input-cursor input-selection (dec start)))
+                                    (reagent/flush))))
+        handle-on-change      (fn [v current-limit-amount]
+                                (when (valid-input? @input-value v)
+                                  (let [num-value (or (parse-double v) 0)]
+                                    (reset! input-value v)
+                                    (reset-input-error num-value current-limit-amount input-error)
+                                    (reagent/flush))))
+        on-navigate-back      (fn []
+                                (rf/dispatch [:wallet/clean-selected-token])
+                                (rf/dispatch [:navigate-back-within-stack :wallet-send-input-amount]))
+        fetch-routes          (fn [input-num-value current-limit-amount]
                                (rf/dispatch [:wallet/clean-suggested-routes])
-                                (when-not (or
-                                           (empty? @input-value)
-                                           (<= input-num-value 0)
-                                           (> input-num-value (:amount @current-limit)))
-                                  (debounce/debounce-and-dispatch [:wallet/get-suggested-routes
-                                                                   @input-value]
-                                                                  100)))]
+                                (when-not (or (empty? @input-value)
+                                              (<= input-num-value 0)
+                                              (> input-num-value current-limit-amount))
+                                  (debounce/debounce-and-dispatch
+                                   [:wallet/get-suggested-routes @input-value]
+                                   100)))
+        handle-on-confirm     (fn []
+                                (rf/dispatch [:wallet/send-select-amount
+                                              {:amount   @input-value
+                                               :stack-id :wallet-send-input-amount}]))
+        selection-change      (fn [selection]
+                                ;; `reagent/flush` is needed to properly propagate the
+                                ;; input cursor state. Since this is a controlled
+                                ;; component the cursor will become static if
+                                ;; `reagent/flush` is removed.
+                                (reset! input-selection selection)
+                                (reagent/flush))]
+    (fn []
+      (let [{fiat-currency :currency} (rf/sub [:profile/profile])
+            {:keys [color]}           (rf/sub [:wallet/current-viewing-account])
+            {token-balance  :total-balance
+             token-symbol   :symbol
+             token-networks :networks
+             :as            token}    (rf/sub [:wallet/wallet-send-token])
+            conversion-rate           (-> token :market-values-per-currency :usd :price)
+            loading-routes?           (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
+            suggested-routes          (rf/sub [:wallet/wallet-send-suggested-routes])
+            route                     (rf/sub [:wallet/wallet-send-route])
+            on-confirm                (or default-on-confirm handle-on-confirm)
+            crypto-decimals           (or default-crypto-decimals
+                                          (utils/get-crypto-decimals-count token))
+            crypto-limit              (or default-limit-crypto
+                                          (utils/get-standard-crypto-format token token-balance))
+            fiat-limit                (.toFixed (* token-balance conversion-rate) 2)
+            current-limit             (if @crypto-currency? crypto-limit fiat-limit)
+            current-currency          (if @crypto-currency? token-symbol fiat-currency)
+            limit-label               (make-limit-label {:amount   current-limit
+                                                         :currency current-currency})
+            input-num-value           (parse-double @input-value)
+            confirm-disabled?         (or (nil? route)
+                                          (empty? @input-value)
+                                          (<= input-num-value 0)
+                                          (> input-num-value current-limit))
+            amount-text               (str @input-value " " token-symbol)]
        (rn/use-effect
         (fn []
           (let [dismiss-keyboard-fn   #(when (= % "active") (rn/dismiss-keyboard!))
                 app-keyboard-listener (.addEventListener rn/app-state "change" dismiss-keyboard-fn)]
             #(.remove app-keyboard-listener))))
-        (rn/use-effect #(fetch-routes) [@input-value])
+        (rn/use-effect
+         #(fetch-routes input-num-value current-limit)
+         [@input-value])
        [rn/view
         {:style               style/screen
          :accessibility-label (str "container" (when @input-error "-error"))}
         [account-switcher/view
          {:icon-name     :i/arrow-left
-           :on-press      #(rf/dispatch [:navigate-back-within-stack :wallet-send-input-amount])
+           :on-press      on-navigate-back
           :switcher-type :select-account}]
         [quo/token-input
-          {:container-style style/input-container
-           :token           token-symbol
-           :currency        currency
-           :crypto-decimals crypto-decimals
-           :error?          @input-error
-           :networks        (:networks token)
-           :title           (i18n/label :t/send-limit {:limit limit-label})
-           :conversion      conversion-rate
-           :show-keyboard?  false
-           :value           @input-value
-           :on-swap         handle-swap
-           :on-change-text  (fn [text]
-                              (handle-on-change text))}]
+          {:container-style     style/input-container
+           :token               token-symbol
+           :currency            current-currency
+           :crypto-decimals     crypto-decimals
+           :error?              @input-error
+           :networks            token-networks
+           :title               (i18n/label :t/send-limit {:limit limit-label})
+           :conversion          conversion-rate
+           :show-keyboard?      false
+           :value               @input-value
+           :selection           @input-selection
+           :on-change-text      #(handle-on-change % current-limit)
+           :on-selection-change selection-change
+           :on-swap             #(handle-swap
+                                  {:crypto?      %
+                                   :currency     current-currency
+                                   :token-symbol token-symbol
+                                   :limit-fiat   fiat-limit
+                                   :limit-crypto crypto-limit})}]
         [routes/view
-          {:amount       amount
+          {:amount       amount-text
           :routes       suggested-routes
           :token        token
           :input-value  @input-value
-           :fetch-routes fetch-routes}]
+           :fetch-routes #(fetch-routes % current-limit)}]
         [quo/bottom-actions
          {:actions             :1-action
+           :customization-color color
           :button-one-label    (i18n/label :t/confirm)
           :button-one-props    {:disabled? confirm-disabled?
-                                 :on-press  on-confirm}
-           :customization-color color}]
+                                 :on-press  on-confirm}}]
         [quo/numbered-keyboard
          {:container-style (style/keyboard-container bottom)
           :left-action     :dot
           :delete-key?     true
-           :on-press        handle-keyboard-press
-           :on-delete       handle-delete}]]))))
+           :on-press        #(handle-keyboard-press % loading-routes? current-limit)
+           :on-delete       #(handle-delete loading-routes? current-limit)}]]))))

 (defn- view-internal
  [props]
@@ -17,22 +17,21 @@
   {:id :tab/collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}])

 (defn- asset-component
-  []
-  (fn [token _ _ {:keys [currency currency-symbol]}]
-    (let [on-press         #(rf/dispatch [:wallet/send-select-token
-                                          {:token    token
-                                           :stack-id :wallet-select-asset}])
-          token-units      (utils/total-token-units-in-all-chains token)
-          crypto-formatted (utils/get-standard-crypto-format token token-units)
-          fiat-value       (utils/total-token-fiat-value currency token)
-          fiat-formatted   (utils/get-standard-fiat-format crypto-formatted currency-symbol fiat-value)]
-      [quo/token-network
-       {:token       (:symbol token)
-        :label       (:name token)
-        :token-value (str crypto-formatted " " (:symbol token))
-        :fiat-value  fiat-formatted
-        :networks    (:networks token)
-        :on-press    on-press}])))
+  [token _ _ {:keys [currency currency-symbol]}]
+  (let [on-press         #(rf/dispatch [:wallet/send-select-token
+                                        {:token    token
+                                         :stack-id :wallet-select-asset}])
+        token-units      (utils/total-token-units-in-all-chains token)
+        crypto-formatted (utils/get-standard-crypto-format token token-units)
+        fiat-value       (utils/total-token-fiat-value currency token)
+        fiat-formatted   (utils/get-standard-fiat-format crypto-formatted currency-symbol fiat-value)]
+    [quo/token-network
+     {:token       (:symbol token)
+      :label       (:name token)
+      :token-value (str crypto-formatted " " (:symbol token))
+      :fiat-value  fiat-formatted
+      :networks    (:networks token)
+      :on-press    on-press}]))

 (defn- asset-list
  [search-text]
@@ -14,16 +14,18 @@
  {:margin-right 4})

 (defn details-container
-  [route? theme]
+  [{:keys [loading-suggested-routes? route-loaded? theme]}]
  {:flex-direction     :row
-   :justify-content    (if route? :space-between :center)
-   :height             52
+   :justify-content    (if route-loaded? :space-between :center)
+   :height             (when (or loading-suggested-routes? route-loaded?) 52)
   :padding-horizontal 12
   :padding-top        7
   :padding-bottom     8
   :border-radius      16
   :border-width       1
-   :border-color       (colors/theme-colors colors/neutral-10 colors/neutral-90 theme)})
+   :border-color       (if (or loading-suggested-routes? route-loaded?)
+                         (colors/theme-colors colors/neutral-10 colors/neutral-90 theme)
+                         :transparent)})

 (def details-title-container
  {:padding-horizontal 20
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jo-mut	500a170e7f	fix: show user avater on share screen	2024-02-06 16:13:49 +01:00
Anton Iakimov	07feff60ec	fleets.json: remove go-waku fleets and update some other ENRs	2024-02-06 12:34:56 +01:00
Siddarth Kumar	59c07050b2	chore: remove hermes enable condition (#18723 ) We recently disabled `hermes` for debug builds here -> https://github.com/status-im/status-mobile/pull/18675 A side effect of that is when we run `make nix-update-gradle` the `hermes` pom gets removed from `deps.list` This pom is necessary for release builds. Currently that pom exists in `deps.list` but someone may accidentally remove it when running `make nix-update-gradle` In this commit we remove the conditional implementation of `hermes` or `jsc` in `build.gradle` This ensures that the `hermes` pom we need during release builds is not removed from `deps.list`. I also ran `make nix-update-gradle` just to be sure. I compared the apk in this commit to other PRs and the size increased by 2MB. A small price to pay so that the team can run Malli locally without crashing their debug app frequently. I've added a FIXME comment in the code for when we want to cut back on bundle size later.	2024-02-06 16:57:05 +05:30
Lungu Cristian	431b6c36ca	fix: collectibles scroll crash (#18658 )	2024-02-06 13:15:23 +02:00
Yevheniia Berdnyk	2e7a9c82ff	e2e: fix for deep/universal links test	2024-02-05 16:08:18 +02:00
Nikolay	32442945ee	chore(wallet): connect remove account rpc request (#18601 )	2024-02-05 04:29:25 -08:00
Nikolay	19ac0eea08	Collectible counter component #18632 (#18653 )	2024-02-05 04:17:49 -08:00
Jamie Caprani	0964424a36	chore: remove old wallet signals and move signals to status-im ns (#18285 )	2024-02-05 03:40:58 -08:00
Parvesh Monu	b6ce60eccf	Disable multiple button presses (#18478 )	2024-02-05 15:26:14 +05:30
Omar Basem	a6565b52ce	fix: test networks short-name->id (#18692 ) * fix: test networks short-name->id	2024-02-05 09:15:30 +04:00
John Ngei	154fbb156d	added empty state illustrations image for pinned messages	2024-02-02 23:24:34 +01:00
John Ngei	9c884d1173	fixed: input field does not adjust its size to the scanned data from a QR code	2024-02-02 23:14:49 +01:00
Mohamed Javid	4dded72878	Wallet - Add support for Sepolia testnet and Rarible collectible provider (#18519 ) This commit adds support for the Sepolia test network and Rarible collectible/collection provider. --------- Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-02-02 19:44:00 +05:30
Ulises Manuel	c7bf9f00b5	[#18459 ] - Add cursor-based input to `token-input` (#18594 )	2024-02-01 20:02:00 -06:00
Ulises Manuel	b6ddd8b5ff	[#18495 ] Fix token not ready for next screen (#18532 ) * Fix exception thrown re-frame don't have the subs' value ready * Make Token malli schema more lenient * Make `get-standard-crypto-format` able to work with `nil` values * Refactor token screen to move subscriptions inside render function * Make token input reactive to on-swap * Remove `crypto-currency?` atom to properly react to state changes * Fix component tests	2024-02-01 17:51:12 -06:00
Yevheniia Berdnyk	3f9cd3a688	e2e: fixes 01.02	2024-02-01 20:36:51 +02:00
Mohsen	675897c9ab	[#18313 ] feat: implement change profile picture (#18440 )	2024-02-01 19:45:58 +03:30
Siddarth Kumar	df76881c90	chore: disable hermes via gradle project env var (#18675 ) fixes #18493 We enabled `hermes` for android in the `react-native` upgrade to `0.72.5` Although things seemed fine but developers were seeing frequent crashes in their local environment. After some investigation the crashes were traced to max native call stack depth in `hermes` engine. Disabling `hermes` for local debug builds helps fix that issue. This commit disables `hermes` by default with the help of a exporting an environment variable in the `make run-android` command. It is annoying that this also modifies `android/gradle.properties` so we keep `hermesEnabled` as `false` there as well. We also enable `hermes` when generating release builds so that we can take advantage of `hermes` engine in release builds. We also add a log to print whether `hermes` is enabled or not. I think its helpful to have this so that we know whether `hermes` is enabled or not.	2024-02-01 20:56:18 +05:30
Brian Sztamfater	e54932057d	fix: reintroduce changes for sending erc20 token and collectibles (#18679 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-02-01 12:03:04 -03:00