test: use debug level by default

2024-01-31 15:59:51 -04:00
130 changed files with 1039 additions and 1795 deletions
@@ -160,12 +160,10 @@ 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! /' \
-		> $(FLEETS_FILE)
-	echo >> $(FLEETS_FILE)
+		> resources/config/fleets.json

 $(KEYSTORE_PATH): export TARGET := keytool
 $(KEYSTORE_PATH):
@@ -275,9 +273,6 @@ 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,24 +267,25 @@ 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")
-    // 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)
+    implementation "androidx.core:core-splashscreen:1.0.0"
+
+    if (hermesEnabled.toBoolean()) {
+        implementation("com.facebook.react:hermes-android")
+      } else {
+      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,6 +57,4 @@ newArchEnabled=false

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

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

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

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

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

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

 pipeline {

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

 pipeline {

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

 pipeline {

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

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

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

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

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

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

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

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

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

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

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

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

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

  {
-    "path": "org/mockito/mockito-core/5.10.0",
+    "path": "org/mockito/mockito-core/5.9.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "mockito-core-5.10.0.pom": {
-        "sha1": "25e309d012d326eef980de463edeb2a592cf9cdb",
-        "sha256": "sha256-D4gyKTuHHyO2/0QkET7mXBdfq9G2uswY7Dg8s5akOq8="
+      "mockito-core-5.9.0.pom": {
+        "sha1": "2054dcc15b9ede899cb9ec6e8e960e36c68b4574",
+        "sha256": "sha256-BJDEL+Yu7WRzQdpAojcHGW2BO0TbKj3KMB2IFz56yPc="
      },
-      "mockito-core-5.10.0.jar": {
-        "sha1": "b3812fa2ee069f1d0b41c1c0155da79d0e1dcde0",
-        "sha256": "sha256-AyP1kbBNOg18qevuu56fNKB8DskWm3RE7jlRtx1MrVY="
+      "mockito-core-5.9.0.jar": {
+        "sha1": "faa88b96db3aeb96a93e83dec7491345bfbfc414",
+        "sha256": "sha256-u62Rhe1zSWX6x+Nn8OUVlvaVMeUdiyy87BBI3W+0Hyw="
      }
    }
  },
@@ -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.26.0-RC1/protobuf-bom-4.26.0-RC1.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-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.26.0-RC1/protobuf-java-4.26.0-RC1.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-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.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/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/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-Beta3/kotlin-reflect-2.0.0-Beta3.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-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-Beta3/kotlin-stdlib-2.0.0-Beta3.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-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.2/junit-bom-5.10.2.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/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.10.0/mockito-core-5.10.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-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,9 +79,6 @@ 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": "2024-02-02T14:48:22.521541",
+        "timestamp": "2023-01-05T10:03:38.657813",
        "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:-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"
+                "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"
            },
            "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:-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"
+                "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"
            },
            "wss/p2p/waku": {
                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
@@ -116,23 +116,6 @@
                "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",
@@ -143,12 +126,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:-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"
+                "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"
            },
            "wss/p2p/waku": {
                "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
@@ -166,9 +149,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:-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"
+                "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"
            },
            "wss/p2p/waku": {
                "node-01.do-ams3.status.test": "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
@@ -176,52 +159,38 @@
                "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi"
            }
        },
-        "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"
+        "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"
            },
-            "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"
+            "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"
            },
-            "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"
+            "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"
            }
        },
-        "notify.prod": {
+        "go-waku.test": {
            "tcp/p2p/waku": {
-                "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"
+                "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"
            }
        }
    }
@@ -33,17 +33,10 @@ 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,17 +63,10 @@
         {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_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-          status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
          status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
-          status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+          status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
+          status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
         :compiler-options {:output-feature-set :es5
                            ;; We disable `:fn-deprecated` warnings because we
                            ;; are managing deprecation via clj-kondo and we
@@ -97,17 +90,10 @@
    {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_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
+     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
    :compiler-options {:output-feature-set :es6
                       ;;disable for android build as there
                       ;;is an intermittent warning with deftype
@@ -137,17 +123,10 @@
    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_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-    status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
-    status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+    status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
+    status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
   :compiler-options
   {;; needed because we override require and it
    ;; messes with source-map which reports callstack
@@ -44,37 +44,22 @@
  [categ]
  (reduce-kv #(assoc %1 (name %2) %3) {} categ))

-(defn role-permission?
-  [token-permission]
-  (contains? constants/community-role-permissions (:type token-permission)))
-
-(defn membership-permission?
-  [token-permission]
-  (= (:type token-permission) constants/community-token-permission-become-member))
-
 (defn <-rpc
  [c]
  (-> c
-      (set/rename-keys
-       {:canRequestAccess            :can-request-access?
-        :canManageUsers              :can-manage-users?
-        :canDeleteMessageForEveryone :can-delete-message-for-everyone?
-        ;; This flag is misleading based on its name alone
-        ;; because it should not be used to decide if the user
-        ;; is *allowed* to join. Allowance is based on token
-        ;; permissions. Still, the flag can be used to know
-        ;; whether or not the user will have to wait until an
-        ;; admin approves a join request.
-        :canJoin                     :can-join?
-        :requestedToJoinAt           :requested-to-join-at
-        :isMember                    :is-member?
-        :adminSettings               :admin-settings
-        :tokenPermissions            :token-permissions
-        :communityTokensMetadata     :tokens-metadata
-        :introMessage                :intro-message
-        :muteTill                    :muted-till
-        :lastOpenedAt                :last-opened-at
-        :joinedAt                    :joined-at})
+      (set/rename-keys {:canRequestAccess            :can-request-access?
+                        :canManageUsers              :can-manage-users?
+                        :canDeleteMessageForEveryone :can-delete-message-for-everyone?
+                        :canJoin                     :can-join?
+                        :requestedToJoinAt           :requested-to-join-at
+                        :isMember                    :is-member?
+                        :adminSettings               :admin-settings
+                        :tokenPermissions            :token-permissions
+                        :communityTokensMetadata     :tokens-metadata
+                        :introMessage                :intro-message
+                        :muteTill                    :muted-till
+                        :lastOpenedAt                :last-opened-at
+                        :joinedAt                    :joined-at})
      (update :admin-settings
              set/rename-keys
              {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
@@ -82,16 +67,9 @@
      (update :chats <-chats-rpc)
      (update :token-permissions seq)
      (update :categories <-categories-rpc)
-      (assoc :role-permissions?
-             (->> c
-                  :tokenPermissions
-                  vals
-                  (some role-permission?)))
      (assoc :membership-permissions?
-             (->> c
-                  :tokenPermissions
-                  vals
-                  (some membership-permission?)))
+             (some #(= (:type %) constants/community-token-permission-become-member)
+                   (vals (:tokenPermissions c))))
      (assoc :token-images
             (reduce (fn [acc {sym :symbol image :image}]
                       (assoc acc sym image))
@@ -0,0 +1,93 @@
+(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,6 +8,7 @@
    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,8 +19,7 @@
           transactions-management-enabled?
           current-fleet
           webview-debug
-           test-networks-enabled?
-           is-sepolia-enabled?]}]
+           test-networks-enabled?]}]
  (keep
   identity
   [{:size :small
@@ -111,14 +110,6 @@
     #(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
@@ -139,7 +130,6 @@
 (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]
@@ -155,7 +145,6 @@
                   :current-fleet                    current-fleet
                   :dev-mode?                        false
                   :webview-debug                    webview-debug
-                   :test-networks-enabled?           test-networks-enabled?
-                   :is-sepolia-enabled?              is-sepolia-enabled?})
+                   :test-networks-enabled?           test-networks-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/throttle-and-dispatch [::network/connect-network-pressed target-network-id]
-                                                    1000)}
+         :on-press #(debounce/dispatch-and-chill [::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/throttle-and-dispatch
+             :on-press            #(debounce/dispatch-and-chill
                                    [(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/throttle-and-dispatch [::ens/input-submitted] 3000)}
+     {:on-press #(debounce/dispatch-and-chill [::ens/input-submitted] 3000)}
     [icon-wrapper colors/blue
      [icons/icon :main-icons/arrow-right {:color colors/white-persist}]]]

@@ -365,9 +365,8 @@
           :right        [react/view {:padding-horizontal 8}
                          [quo/button
                           {:disabled (or (not @checked?) (not sufficient-funds?))
-                            :on-press #(debounce/throttle-and-dispatch [::ens/register-name-pressed
-                                                                        address]
-                                                                       2000)}
+                            :on-press #(debounce/dispatch-and-chill [::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/throttle-and-dispatch [:group-chats.ui/create-pressed
-                                                                   group-name]
-                                                                  300)}
+            :on-press            #(debounce/dispatch-and-chill [: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 [throttle-and-dispatch]]
+    [utils.debounce :refer [dispatch-and-chill]]
    [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 #(throttle-and-dispatch [::network/connect-network-pressed id] 1000)}
+           {:on-press #(dispatch-and-chill [::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/throttle-and-dispatch event 2000))
+  (debounce/dispatch-and-chill 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 allow-multiple-presses?]
+               pressed? on-press-in on-press-out]
        :or   {type                :primary
               size                40
               customization-color (cond (= type :primary)  :blue
@@ -52,17 +52,16 @@
                                           :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
-          :allow-multiple-presses? allow-multiple-presses?
-          :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
+          :on-long-press       on-long-press}
         [rn/view
          {:style (merge
                   (style/shape-style-container size border-radius)
@@ -15,12 +15,11 @@
    [rn/view
     {:style style/container}
     [button/button
-      {:icon                    true
-       :type                    :outline
-       :accessibility-label     :previous-month-button
-       :allow-multiple-presses? true
-       :size                    24
-       :on-press                #(on-change (utils/previous-month year month))}
+      {:icon                true
+       :type                :outline
+       :accessibility-label :previous-month-button
+       :size                24
+       :on-press            #(on-change (utils/previous-month year month))}
      :i/chevron-left]
     [text/text
      {:weight :semi-bold
@@ -28,12 +27,11 @@
       :style  (style/text theme)}
      (utils/format-month-year year month)]
     [button/button
-      {:icon                    true
-       :accessibility-label     :next-month-button
-       :allow-multiple-presses? true
-       :size                    24
-       :type                    :outline
-       :on-press                #(on-change (utils/next-month year month))}
+      {:icon                true
+       :accessibility-label :next-month-button
+       :size                24
+       :type                :outline
+       :on-press            #(on-change (utils/next-month year month))}
      :i/chevron-right]]))

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

    [rn/pressable
-     {:style                   (style/color-button hex-color selected? idx window-width)
-      :accessibility-label     :color-picker-item
-      :allow-multiple-presses? true
-      :on-press                #(on-press color)}
+     {:style               (style/color-button hex-color selected? idx window-width)
+      :accessibility-label :color-picker-item
+      :on-press            #(on-press color)}
     (if (and (= :feng-shui color) (not selected?))
       [feng-shui
        (assoc props
@@ -1,34 +0,0 @@
-(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))))
@@ -1,57 +0,0 @@
-(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)})
@@ -1,39 +0,0 @@
-(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,11 +3,9 @@
    [quo.foundations.colors :as colors]))

 (defn divider
-  [theme blur?]
+  [theme]
  {:border-top-width 1
-   :border-top-color (if blur?
-                       colors/white-opa-5
-                       (colors/theme-colors colors/neutral-10 colors/neutral-90 theme))
+   :border-top-color (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 blur?]
+  [theme]
  [rn/view
-   {:style               (style/divider theme blur?)
+   {:style               (style/divider theme)
    :accessible          true
    :accessibility-label :divider}])

@@ -45,7 +45,7 @@
           blur?]}]
  [:<>
   (when add-divider?
-     [divider theme blur?])
+     [divider theme])
   [maybe-pressable disabled?
    {:accessibility-label accessibility-label
     :style               (style/container {:sub-label           sub-label
@@ -182,7 +182,7 @@

 (defn- view-internal
  [{:keys [title title-icon type theme description blur? community-name community-logo button-icon
-           account-name emoji context-tag-type
+           account-name emoji
           on-button-press
           on-button-long-press
           button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar
@@ -214,7 +214,6 @@
      :description         description
      :community-name      community-name
      :community-logo      community-logo
-      :context-tag-type    context-tag-type
      :customization-color customization-color
      :account-name        account-name
      :emoji               emoji}]]
@@ -6,21 +6,14 @@
    [react-native.linear-gradient :as linear-gradient]))

 (defn- view-internal
-  [{: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)}])))
+  [{: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)}]))

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

 (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
-           allow-multiple-presses?]}]
+           untrustworthy? on-press on-long-press accessory customization-color theme]}]
  [rn/touchable-highlight
-   {: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)}
+   {: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)}
   [:<>
    [user-avatar/user-avatar
     {:full-name       primary-name
@@ -47,13 +47,12 @@
                                    :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
-      :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}
+     {: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}
     [reanimated/view {:style background-animated-style}
      ;; In android animations are not working for the animated components which are nested by
      ;; hole-view,
@@ -19,16 +19,15 @@
      (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)))
-          :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)}
+         {: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)}
         (case type
           :key             [icons/icon
                             label
@@ -3,6 +3,7 @@
    [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
@@ -24,12 +25,7 @@
        {:style {:border-radius (:border-radius image-style)
                 :overflow      :hidden}}
        [svg/svg-uri (assoc image-style :uri (:uri resource))]]
-       ;; 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
+       [fast-image/fast-image
        {:style  image-style
         :source (if (string? resource)
                   {:uri      resource
@@ -12,13 +12,12 @@
                 accessibility-label]
          :or   {accessibility-label :reaction}}]
      [rn/pressable
-       {: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)))}
+       {:accessibility-label accessibility-label
+        :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,8 +30,7 @@
                                                 :theme               theme})]
        [rn/pressable
         (when-not disabled?
-           {:on-press                #(handle-press on-change internal-checked? actual-checked?)
-            :allow-multiple-presses? true})
+           {:on-press #(handle-press on-change internal-checked? actual-checked?)})
         [rn/view
          {:style                             outer-styles
           :needs-offscreen-alpha-compositing true
@@ -3,7 +3,6 @@
            [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]
@@ -134,19 +133,10 @@
     {:style style/share-qr-container}
     [rn/view
      {:style style/share-qr-inner-container}
-      (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}])
+      [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} [:maybe [:or keyword? string?]]]
+     [:token {:optional true} [: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,7 +1,6 @@
 (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]
@@ -73,25 +72,18 @@
   [token-name-text theme text]])

 (defn input-section
-  [{: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]
+  [{: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?]
          :or   {show-keyboard? true}}]
      [rn/pressable
       {:on-press focus-input
@@ -110,9 +102,7 @@
                  :max-length               12
                  :on-change-text           handle-on-change-text
                  :selection-color          customization-color
-                  :show-soft-input-on-focus show-keyboard?
-                  :on-selection-change      handle-selection-change
-                  :selection                (clj->js selection)}
+                  :show-soft-input-on-focus show-keyboard?}
           controlled-input?       (assoc :value value)
           (not controlled-input?) (assoc :default-value @value-atom))]]
       [token-label
@@ -121,32 +111,33 @@
         :value (if controlled-input? value @value-atom)}]])))

 (defn- view-internal
-  []
-  (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))]]))))
+  [{: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))]])))

 (def view (quo.theme/with-theme view-internal))
@@ -36,7 +36,6 @@
    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
@@ -230,7 +229,6 @@
 (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,7 +17,6 @@
    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
@@ -3,69 +3,62 @@
  (:require
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
-    [react-native.platform :as platform]
-    [utils.number]))
-
-;; Set radius coefficient based on Android Version.
-;; A good way to know is to check if shadow color is supported i.e API level 28 (Android 9) above
-(def ^:private shadow-radius-coefficient (if platform/is-shadow-color-supported? 0.8 0.1))
-
-(defn- get-shadow-color
-  "Calculates the shadow color based on a given color and opacity, with an optional coefficient.
-  - Arity [color opacity]: Uses a default coefficient value of 5 (empirically determined) to compute the shadow color.
-  - Arity [color opacity coefficient]: Uses the specified coefficient to compute the shadow color.
-  On Android platforms, the shadow color's alpha is adjusted based on the product of opacity and
-  coefficient, constrained between 0 and 1. Returns a map with :shadow-color and :shadow-opacity keys."
-  ([color opacity]
-   (get-shadow-color color opacity 5))
-  ([color opacity coefficient]
-   {:shadow-color   (if platform/android?
-                      (colors/alpha color (utils.number/value-in-range (* opacity coefficient) 0 1))
-                      color)
-    :shadow-opacity opacity}))
-
-(defn- get-shadow-radius
-  "Computes shadow radius and elevation properties based on a given radius, with an optional coefficient.
-  - Arity [radius]: Uses a default coefficient of 0.8 for API level 28 and above and 0.1 otherwise (empirically determined) to compute the elevation.
-  - Arity [radius coefficient]: Uses the specified coefficient to compute the elevation.
-  Returns a map with :elevation, computed as the product of radius and coefficient, and :shadow-radius keys."
-  ([radius]
-   (get-shadow-radius radius shadow-radius-coefficient))
-  ([radius coefficient]
-   {:elevation     (* radius coefficient)
-    :shadow-radius radius}))
+    [react-native.platform :as platform]))

 (def ^:private shadows
-  (let [dark-normal           {1 (merge {:shadow-offset {:width 0 :height 4}}
-                                        (get-shadow-color colors/neutral-100 0.5)
-                                        (get-shadow-radius 20))
-                               2 (merge {:shadow-offset {:width 0 :height 4}}
-                                        (get-shadow-color colors/neutral-100 0.64)
-                                        (get-shadow-radius 20))
-                               3 (merge {:shadow-offset {:width 0 :height 12}}
-                                        (get-shadow-color colors/neutral-100 0.64)
-                                        (get-shadow-radius 20))
-                               4 (merge {:shadow-offset {:width 0 :height 16}}
-                                        (get-shadow-color colors/neutral-100 0.72)
-                                        (get-shadow-radius 20))}
+  (let [dark-normal           {1 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.5))
+                                  :shadow-offset  {:width 0 :height 4}
+                                  :elevation      3
+                                  :shadow-opacity 1
+                                  :shadow-radius  20}
+                               2 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.64))
+                                  :shadow-offset  {:width 0 :height 4}
+                                  :elevation      4
+                                  :shadow-opacity 1
+                                  :shadow-radius  20}
+                               3 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.64))
+                                  :shadow-offset  {:width 0 :height 12}
+                                  :elevation      8
+                                  :shadow-opacity 1
+                                  :shadow-radius  20}
+                               4 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.72))
+                                  :shadow-offset  {:width 0 :height 16}
+                                  :shadow-opacity 1
+                                  :shadow-radius  20
+                                  :elevation      15}}
        dark-normal-inverted  (-> dark-normal
                                  (update-in [:soft :shadow-offset :height] -)
                                  (update-in [:medium :shadow-offset :height] -)
                                  (update-in [:intense :shadow-offset :height] -)
                                  (update-in [:strong :shadow-offset :height] -))
-        light-normal          {1 (merge {:shadow-offset {:width 0 :height 4}}
-                                        (get-shadow-color colors/neutral-100 0.04)
-                                        (get-shadow-radius 16))
-
-                               2 (merge {:shadow-offset {:width 0 :height 4}}
-                                        (get-shadow-color colors/neutral-100 0.08)
-                                        (get-shadow-radius 16))
-                               3 (merge {:shadow-offset {:width 0 :height 12}}
-                                        (get-shadow-color colors/neutral-100 0.12)
-                                        (get-shadow-radius 16))
-                               4 (merge {:shadow-offset {:width 0 :height 16}}
-                                        (get-shadow-color colors/neutral-100 0.16)
-                                        (get-shadow-radius 16))}
+        light-normal          {1 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.04))
+                                  :shadow-offset  {:width 0 :height 4}
+                                  :elevation      1
+                                  :shadow-opacity 1
+                                  :shadow-radius  16}
+                               2 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.08))
+                                  :shadow-offset  {:width 0 :height 4}
+                                  :elevation      6
+                                  :shadow-opacity 1
+                                  :shadow-radius  16}
+                               3 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.12))
+                                  :shadow-offset  {:width 0 :height 12}
+                                  :elevation      8
+                                  :shadow-opacity 1
+                                  :shadow-radius  16}
+                               4 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.16))
+                                  :shadow-offset  {:width 0 :height 16}
+                                  :shadow-opacity 1
+                                  :shadow-radius  16
+                                  :elevation      13}}
        light-normal-inverted (-> light-normal
                                  (update-in [:soft :shadow-offset :height] -)
                                  (update-in [:medium :shadow-offset :height] -)
@@ -7,7 +7,6 @@
    [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))
@@ -34,28 +33,12 @@
 (def text (reagent/adapt-react-class (.-Text ^js react-native)))
 (def text-input (reagent/adapt-react-class (.-TextInput ^js react-native)))

-(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
+(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
  (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)
@@ -14,5 +14,3 @@
 (def low-device? (and android? (< version 29)))

 (def is-below-android-13? (and android? (< version 33)))
-
-(def is-shadow-color-supported? (and android? (> version 27)))
@@ -1,32 +0,0 @@
-(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,23 +5,22 @@
    [utils.re-frame :as rf]))

 (defn contact-list-item
-  [{:keys [on-press on-long-press accessory allow-multiple-presses?]}
+  [{:keys [on-press on-long-press accessory]}
   {: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
-      :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}]))
+     {: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}]))
@@ -4,6 +4,7 @@
    [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
@@ -35,7 +36,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         #(rf/dispatch [:open-modal :share-shell])
+      :qr-code-on-press         #(dispatch-and-chill [:open-modal :share-shell] 1000)
      :container-style          (merge style/top-nav-container container-style)
      :blur?                    blur?
      :jump-to?                 jump-to?
@@ -9,6 +9,7 @@
    [status-im.common.lightbox.animations :as anim]
    [status-im.common.lightbox.constants :as constants]
    [status-im.common.lightbox.style :as style]
+    [utils.i18n :as i18n]
    [utils.re-frame :as rf]
    [utils.url :as url]))

@@ -39,6 +40,25 @@
        (anim/animate top-view-width screen-width)
        (anim/animate top-view-bg colors/neutral-100-opa-0)))))

+(defn drawer
+  [images index]
+  (let [{:keys [image]} (nth images index)
+        uri             (url/replace-port image (rf/sub [:mediaserver/port]))]
+    [quo/action-drawer
+     [[{:icon                :i/save
+        :accessibility-label :save-image
+        :label               (i18n/label :t/save-image-library)
+        :on-press            (fn []
+                               (rf/dispatch [:hide-bottom-sheet])
+                               (rf/dispatch
+                                [:lightbox/save-image-to-gallery
+                                 uri
+                                 #(rf/dispatch [:toasts/upsert
+                                                {:id              :random-id
+                                                 :type            :positive
+                                                 :container-style {:bottom (when platform/android? 20)}
+                                                 :text            (i18n/label :t/photo-saved)}])]))}]]]))
+
 (defn share-image
  [images index]
  (let [{:keys [image]} (nth images index)
@@ -46,7 +66,7 @@
    (rf/dispatch [:lightbox/share-image uri])))

 (defn top-view
-  [images insets index animations derived landscape? screen-width on-options-press]
+  [images insets index animations derived landscape? screen-width]
  (let [{:keys [description header]} (nth images @index)
        bg-color                     (if landscape?
                                       colors/neutral-100-opa-70
@@ -93,6 +113,7 @@
      [rn/touchable-opacity
       {:active-opacity      1
        :accessibility-label :image-options
-        :on-press            #(on-options-press images @index)
+        :on-press            #(rf/dispatch [:show-bottom-sheet
+                                            {:content (fn [] [drawer images @index])}])
        :style               style/close-container}
       [quo/icon :options {:size 20 :color colors/white}]]]]))
@@ -44,8 +44,7 @@
   [rn/view {:style {:width constants/separator-width}}]])

 (defn lightbox-content
-  [{:keys [props state animations derived images index handle-items-changed bottom-text-component
-           on-options-press]}]
+  [{:keys [props state animations derived images index handle-items-changed bottom-text-component]}]
  (let [{:keys [data transparent? scroll-index
                set-full-height?]} state
        insets                     (safe-area/get-insets)
@@ -70,7 +69,7 @@
                                                   {:height screen-height})}
     (when-not @transparent?
       [:f> top-view/top-view images insets scroll-index animations derived landscape?
-        screen-width on-options-press])
+        screen-width])
     [gesture/gesture-detector
      {:gesture (utils/drag-gesture animations (and landscape? platform/ios?) set-full-height?)}
      [reanimated/view
@@ -137,8 +136,7 @@

 (defn- f-lightbox
  []
-  (let [{:keys [images index bottom-text-component on-options-press]}
-        (rf/sub [:get-screen-params])
+  (let [{:keys [images index bottom-text-component]} (rf/sub [:get-screen-params])
        props
        (utils/init-props)
        state
@@ -162,8 +160,7 @@
          :images                images
          :index                 index
          :handle-items-changed  handle-items-changed
-          :bottom-text-component bottom-text-component
-          :on-options-press      on-options-press}]))))
+          :bottom-text-component bottom-text-component}]))))

 (defn lightbox
  []
@@ -26,8 +26,7 @@
   :discover                      (js/require "../resources/images/ui2/discover.png")
   :invite-friends                (js/require "../resources/images/ui2/invite-friends.png")
   :transaction-progress          (js/require "../resources/images/ui2/transaction-progress.png")
-   :welcome-illustration          (js/require "../resources/images/ui2/welcome_illustration.png")
-   :notifications                 (js/require "../resources/images/ui2/notifications.png")})
+   :welcome-illustration          (js/require "../resources/images/ui2/welcome_illustration.png")})

 (def ui-themed
  {:angry-man
@@ -85,10 +84,7 @@
    :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")}
-   :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")}})
+    :dark  (js/require "../resources/images/ui2/sweating-man-dark.png")}})

 (def mock-images
  {:bored-ape             (js/require "../resources/images/mock2/bored-ape.png")
@@ -1,6 +1,7 @@
 (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]
@@ -69,7 +70,10 @@
      "messages.new"               (messages.transport/sanitize-messages-and-process-response cofx
                                                                                              event-js
                                                                                              true)
-      "wallet"                     (rf/dispatch [:wallet/signal-received event-js])
+      "wallet"                     (ethereum.subscriptions/new-wallet-event cofx
+                                                                            (js->clj event-js
+                                                                                     :keywordize-keys
+                                                                                     true))
      "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,18 +11,11 @@

 (goog-define INFURA_TOKEN "")
 (goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9")
-(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 "")
+(goog-define ALCHEMY_OPTIMISM_MAINNET_TOKEN "")
+(goog-define ALCHEMY_ARBITRUM_MAINNET_TOKEN "")
+(goog-define OPENSEA_API_KEY "")

 (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))
@@ -167,10 +160,9 @@

 (def default-kdf-iterations 3200)

-(def community-accounts-selection-enabled? (enabled? (get-config :ACCOUNT_SELECTION_ENABLED "0")))
+(def community-accounts-selection-enabled? false)
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))

 (def wallet-feature-flags
  {:edit-default-keypair false
-   :bridge-token         false
-   :remove-account       false})
+   :bridge-token         false})
@@ -153,11 +153,6 @@
 (def ^:const community-token-permission-can-view-and-post-channel 4)
 (def ^:const community-token-permission-become-token-master 5)
 (def ^:const community-token-permission-become-token-owner 6)
-(def ^:const community-role-permissions
-  #{community-token-permission-become-admin
-    community-token-permission-become-member
-    community-token-permission-become-token-master
-    community-token-permission-become-token-owner})

 ;; Community rules for joining
 (def ^:const community-rule-ens-only "ens-only")
@@ -410,15 +405,12 @@
 (def ^:const ens-action-type-set-pub-key 2)

 ;; wallet
-(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 mainnet-chain-id 1)
 (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 optimism-test-chain-id 420)
+(def ^:const arbitrum-chain-id 42161)
+(def ^:const arbitrum-test-chain-id 421613)
+(def ^:const goerli-chain-id 5)

 (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/throttle-and-dispatch
+                             (debounce/dispatch-and-chill
                              [: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/throttle-and-dispatch
+      :on-press            #(debounce/dispatch-and-chill
                             [:open-modal :new-contact]
                             1000)}]]])
@@ -79,11 +79,10 @@
      (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
-            :allow-multiple-presses? true
-            :accessory               {:type     :checkbox
-                                      :checked? @checked?
-                                      :on-check on-toggle}})
+           {:on-press  on-toggle
+            :accessory {:type     :checkbox
+                        :checked? @checked?
+                        :on-check on-toggle}})
         item]))))

 (defn add-manage-members
@@ -136,11 +135,10 @@
                                                              extra-data])}])]
    [contact-list-item/contact-list-item
     (when (not= public-key current-pk)
-       {: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}})
+       {:on-press      #(rf/dispatch [:chat.ui/show-profile public-key])
+        :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/throttle-and-dispatch [:chat/navigate-to-chat chat-id] 500)))
+    (debounce/dispatch-and-chill [:chat/navigate-to-chat chat-id] 500)))

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

 (defn- view-internal
@@ -2,11 +2,9 @@
  (: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]
@@ -26,18 +24,26 @@
  [message/message message context (atom false)])

 (defn empty-pinned-messages-state
-  [{:keys [theme community?]}]
+  [{:keys [community?]}]
  [rn/view {:style style/no-pinned-messages-container}
-   [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))}]])
+   [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))]]])

-(defn f-pinned-messages
-  [{:keys [theme chat-id]}]
+(defn pinned-messages
+  [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])
@@ -77,11 +83,4 @@
         :key-fn      list-key-fn
         :separator   [quo/separator {:style {:margin-vertical 8}}]}]
       [empty-pinned-messages-state
-        {:community? (boolean community)
-         :theme      theme}])]))
-
-(defn- internal-pinned-messages
-  [params]
-  [:f> f-pinned-messages params])
-
-(def view (quo.theme/with-theme internal-pinned-messages))
+        {:community? (boolean community)}])]))
@@ -66,12 +66,7 @@
                                                  album-messages))
                                   :bottom-text-component
                                   [lightbox/bottom-text-for-lightbox
-                                    first-image]
-                                   :on-options-press (fn [images index]
-                                                       (rf/dispatch [:show-bottom-sheet
-                                                                     {:content (fn [] [lightbox/drawer
-                                                                                       images
-                                                                                       index])}]))}])}
+                                    first-image]}])}
              [fast-image/fast-image
               {:style     (style/image dimensions index portrait? images-count)
                :source    {:uri (url/replace-port (:image (:content item)) media-server-port)}
@@ -190,17 +190,16 @@
       {:accessibility-label :audio-message-container
        :style               (style/container)}
       [rn/touchable-opacity
-        {: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)}
+        {: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)}
        [quo/icon
         (cond
           (= @player-state :preparing)
@@ -57,13 +57,7 @@
                                       :index 0
                                       :insets insets
                                       :bottom-text-component
-                                       [lightbox/bottom-text-for-lightbox message]
-                                       :on-options-press (fn [images index]
-                                                           (rf/dispatch [:show-bottom-sheet
-                                                                         {:content (fn []
-                                                                                     [lightbox/drawer
-                                                                                      images
-                                                                                      index])}]))}])}
+                                       [lightbox/bottom-text-for-lightbox message]}])}
      [fast-image/fast-image
       {:source              {:uri image-local-url}
        :style               (merge dimensions {:border-radius 12})
@@ -1,15 +1,10 @@
 (ns status-im.contexts.chat.messenger.messages.content.lightbox.view
  (:require
    [oops.core :as oops]
-    [quo.core :as quo]
-    [react-native.platform :as platform]
    [reagent.core :as reagent]
    [status-im.common.lightbox.constants :as constants]
    [status-im.contexts.chat.messenger.messages.content.lightbox.style :as style]
-    [status-im.contexts.chat.messenger.messages.content.text.view :as message-view]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
-    [utils.url :as url]))
+    [status-im.contexts.chat.messenger.messages.content.text.view :as message-view]))

 (defn bottom-text-for-lightbox
  [_]
@@ -21,22 +16,3 @@
          :chat-id        chat-id
          :style-override (style/bottom-text expandable-text?)
          :on-layout      #(reset! text-height (oops/oget % "nativeEvent.layout.height"))}]))))
-
-(defn drawer
-  [images index]
-  (let [{:keys [image]} (nth images index)
-        uri             (url/replace-port image (rf/sub [:mediaserver/port]))]
-    [quo/action-drawer
-     [[{:icon                :i/save
-        :accessibility-label :save-image
-        :label               (i18n/label :t/save-image-library)
-        :on-press            (fn []
-                               (rf/dispatch [:hide-bottom-sheet])
-                               (rf/dispatch
-                                [:lightbox/save-image-to-gallery
-                                 uri
-                                 #(rf/dispatch [:toasts/upsert
-                                                {:id              :random-id
-                                                 :type            :positive
-                                                 :container-style {:bottom (when platform/android? 20)}
-                                                 :text            (i18n/label :t/photo-saved)}])]))}]]]))
@@ -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/view {:chat-id chat-id}])}))
+  (navigation/show-bottom-sheet cofx {:content (fn [] [pinned-messages-menu/pinned-messages chat-id])}))
@@ -35,7 +35,6 @@
     [quo/drawer-top
      {:type                :context-tag
       :title               (i18n/label :t/addresses-for-permissions)
-       :context-tag-type    :community
       :community-name      name
       :button-icon         :i/info
       :on-button-press     not-implemented/alert
@@ -26,7 +26,6 @@
    [:<>
     [quo/drawer-top
      {:type                :context-tag
-       :context-tag-type    :community
       :title               (i18n/label :t/airdrop-addresses)
       :community-name      name
       :button-icon         :i/info
@@ -23,8 +23,10 @@
 (defn- view-internal
  [{:keys [theme]}]
  (fn []
-    (let [{:keys [id]}                (rf/sub [:get-screen-params])
-          {:keys [color name images]} (rf/sub [:communities/community id])]
+    (let [{:keys [name
+                  id
+                  images]} (rf/sub [:get-screen-params])
+          {:keys [color]}  (rf/sub [:communities/community id])]
      [rn/safe-area-view {:flex 1}
       [gesture/scroll-view {:style style/container}
        [rn/view style/page-container
@@ -26,9 +26,8 @@
    [quo/communities-membership-list-item
     {:customization-color customization-color
      :style               {:padding-horizontal 20}
-      :on-press            #(debounce/throttle-and-dispatch [:communities/navigate-to-community-overview
-                                                             id]
-                                                            500)
+      :on-press            #(debounce/dispatch-and-chill [:communities/navigate-to-community-overview id]
+                                                         500)
      :on-long-press       #(rf/dispatch
                             [:show-bottom-sheet
                              {:content       (fn []
@@ -7,6 +7,7 @@
    [react-native.core :as rn]
    [reagent.core :as reagent]
    [status-im.common.home.actions.view :as actions]
+    [status-im.common.password-authentication.view :as password-authentication]
    [status-im.common.scroll-page.style :as scroll-page.style]
    [status-im.common.scroll-page.view :as scroll-page]
    [status-im.config :as config]
@@ -14,20 +15,38 @@
    [status-im.contexts.communities.actions.chat.view :as chat-actions]
    [status-im.contexts.communities.actions.community-options.view :as options]
    [status-im.contexts.communities.overview.style :as style]
+    [status-im.contexts.communities.overview.utils :as utils]
    [status-im.contexts.communities.utils :as communities.utils]
    [utils.debounce :as debounce]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

-(defn- add-category-height
-  [categories-heights category height]
-  (swap! categories-heights assoc category height))
+(defn preview-user-list
+  [user-list]
+  (when (seq user-list)
+    [rn/view style/preview-user
+     [quo/preview-list
+      {:type   :user
+       :number (count user-list)
+       :size   :size-24}
+      user-list]
+     [quo/text
+      {:accessibility-label :communities-screen-title
+       :style               {:margin-left 8}
+       :size                :label}
+      (utils/join-existing-users-string user-list)]]))

-(defn- collapse-category
+(defn add-category-height
+  [categories-heights category height]
+  (swap! categories-heights
+    (fn [heights]
+      (assoc heights category height))))
+
+(defn collapse-category
  [community-id category-id collapsed?]
  (rf/dispatch [:communities/toggle-collapsed-category community-id category-id (not collapsed?)]))

-(defn- layout-y
+(defn layout-y
  [event]
  (oops/oget event "nativeEvent.layout.y"))

@@ -58,7 +77,7 @@
             {:on-press      on-press
              :on-long-press #(rf/dispatch [:show-bottom-sheet channel-sheet-data])})]]))

-(defn- channel-list-component
+(defn channel-list-component
  [{:keys [on-category-layout community-id community-color on-first-channel-height-changed]}
   channels-list]
  [rn/view
@@ -85,7 +104,7 @@
           ^{:key (:id chat)}
           [channel-chat-item community-id community-color chat])])])])

-(defn- get-access-type
+(defn get-access-type
  [access]
  (condp = access
    constants/community-no-membership-access   :open
@@ -93,9 +112,17 @@
    constants/community-on-request-access      :request-access
    :unknown-access))

-(defn- info-button
+(defn join-gated-community
+  [id]
+  (rf/dispatch [:password-authentication/show
+                {:content (fn [] [password-authentication/view])}
+                {:label    (i18n/label :t/join-open-community)
+                 :on-press #(rf/dispatch [:communities/request-to-join
+                                          {:community-id id :password %}])}]))
+
+(defn info-button
  []
-  [rn/pressable
+  [rn/touchable-without-feedback
   {:on-press
    #(rf/dispatch
      [:show-bottom-sheet
@@ -110,116 +137,119 @@
   [rn/view
    [quo/icon :i/info {:no-color true}]]])

-(defn- token-requirements
-  [{:keys [id color]}]
-  (let [{:keys [can-request-access?
-                number-of-hold-tokens tokens
-                highest-permission-role]} (rf/sub [:community/token-gated-overview id])
-        highest-role-text
-        (i18n/label
-         (communities.utils/role->translation-key highest-permission-role :t/member))]
-    [rn/view {:style (style/token-gated-container)}
-     [rn/view
-      {:style {:padding-horizontal 12
-               :flex-direction     :row
-               :align-items        :center
-               :justify-content    :space-between
-               :flex               1}}
-      [quo/text {:weight :medium}
-       (if can-request-access?
-         (i18n/label :t/you-eligible-to-join-as {:role highest-role-text})
-         (i18n/label :t/you-not-eligible-to-join))]
-      [info-button]]
-     (when (pos? number-of-hold-tokens)
-       [quo/text {:style {:padding-horizontal 12 :padding-bottom 18} :size :paragraph-2}
-        (if can-request-access?
-          (i18n/label :t/you-hold-number-of-hold-tokens-of-these
-                      {:number-of-hold-tokens number-of-hold-tokens})
-          (i18n/label :t/you-must-hold))])
-     [quo/token-requirement-list
-      {:tokens   tokens
-       :padding? true}]
-     [quo/button
-      {:on-press            (if config/community-accounts-selection-enabled?
-                              #(rf/dispatch [:open-modal :community-account-selection
-                                             {:community-id id}])
-                              #(rf/dispatch [:open-modal :community-requests-to-join {:id id}]))
-       :accessibility-label :join-community-button
-       :customization-color color
-       :container-style     {:margin-horizontal 12 :margin-top 12 :margin-bottom 12}
-       :disabled?           (not can-request-access?)
-       :icon-left           (if can-request-access? :i/unlocked :i/locked)}
-      (i18n/label :t/join-open-community)]]))
+(defn token-gates
+  []
+  (fn [{:keys [id color]}]
+    (let [{:keys [can-request-access?
+                  number-of-hold-tokens tokens
+                  highest-permission-role]} (rf/sub [:community/token-gated-overview id])
+          highest-role-text
+          (i18n/label
+           (communities.utils/role->translation-key highest-permission-role :t/member))]
+      [rn/view {:style (style/token-gated-container)}
+       [rn/view
+        {:style {:padding-horizontal 12
+                 :flex-direction     :row
+                 :align-items        :center
+                 :justify-content    :space-between
+                 :flex               1}}
+        [quo/text {:weight :medium}
+         (if can-request-access?
+           (i18n/label :t/you-eligible-to-join-as {:role highest-role-text})
+           (i18n/label :t/you-not-eligible-to-join))]
+        [info-button]]
+       (when (pos? number-of-hold-tokens)
+         [quo/text {:style {:padding-horizontal 12 :padding-bottom 18} :size :paragraph-2}
+          (if can-request-access?
+            (i18n/label :t/you-hold-number-of-hold-tokens-of-these
+                        {:number-of-hold-tokens number-of-hold-tokens})
+            (i18n/label :t/you-must-hold))])
+       [quo/token-requirement-list
+        {:tokens   tokens
+         :padding? true}]
+       [quo/button
+        {:on-press
+         (if config/community-accounts-selection-enabled?
+           #(rf/dispatch [:open-modal :community-account-selection {:community-id id}])
+           #(join-gated-community id))
+         :accessibility-label :join-community-button
+         :customization-color color
+         :container-style {:margin-horizontal 12 :margin-top 12 :margin-bottom 12}
+         :disabled? (not can-request-access?)
+         :icon-left (if can-request-access? :i/unlocked :i/locked)}
+        (i18n/label :t/join-open-community)]])))

-(defn- join-community
-  [{:keys [id color joined permissions role-permissions? can-join?] :as community}]
-  (let [pending?        (rf/sub [:communities/my-pending-request-to-join id])
-        access-type     (get-access-type (:access permissions))
+(defn join-community
+  [{:keys [joined color permissions token-permissions membership-permissions? id] :as community}
+   pending?]
+  (let [access-type     (get-access-type (:access permissions))
        unknown-access? (= access-type :unknown-access)
        invite-only?    (= access-type :invite-only)]
    [:<>
     (when-not (or joined pending? invite-only? unknown-access?)
-       (if role-permissions?
-         [token-requirements community]
+       (if membership-permissions?
+         [token-gates community]
         [quo/button
-          {:on-press            (if config/community-accounts-selection-enabled?
-                                  #(rf/dispatch [:open-modal :community-account-selection
-                                                 {:community-id id}])
-                                  #(rf/dispatch [:open-modal :community-requests-to-join {:id id}]))
+          {:on-press
+           (if config/community-accounts-selection-enabled?
+             #(rf/dispatch [:open-modal :community-account-selection {:community-id id}])
+             #(rf/dispatch [:open-modal :community-requests-to-join community]))
+
           :accessibility-label :show-request-to-join-screen-button
           :customization-color color
-           :icon-left           :i/communities}
+           :icon-left :i/communities}
          (i18n/label :t/request-to-join)]))
-     (when (not (or pending? role-permissions? can-join?))
+
+     (when (not (or joined pending? token-permissions))
       [quo/text
        {:size   :paragraph-2
         :weight :regular
         :style  style/review-notice}
        (i18n/label :t/community-admins-will-review-your-request)])]))

-(defn- status-tag
-  [community-id joined]
-  (let [pending? (rf/sub [:communities/my-pending-request-to-join community-id])]
-    (when (or pending? joined)
-      [rn/view {:style {:position :absolute :top 12 :right 12}}
-       [quo/status-tag
-        {:status {:type (if joined :positive :pending)}
-         :label  (if joined
-                   (i18n/label :t/joined)
-                   (i18n/label :t/pending))}]])))
+(defn status-tag
+  [pending? joined]
+  (when (or pending? joined)
+    [rn/view {:style {:position :absolute :top 12 :right 12}}
+     [quo/status-tag
+      {:status {:type (if joined :positive :pending)}
+       :label  (if joined
+                 (i18n/label :t/joined)
+                 (i18n/label :t/pending))}]]))

-(defn- add-handlers
+(defn add-handlers
  [community-id
   joined-or-spectated
   {:keys [id locked?]
    :or   {locked? false}
    :as   chat}]
-  (cond-> chat
-    (and (not locked?) id)
-    (assoc :on-press      (when joined-or-spectated
-                            (fn []
-                              (rf/dispatch [:dismiss-keyboard])
-                              (debounce/throttle-and-dispatch
-                               [:communities/navigate-to-community-chat (str community-id id)]
-                               1000)))
-           :on-long-press #(rf/dispatch
-                            [:show-bottom-sheet
-                             {:content (fn []
-                                         [chat-actions/actions chat false])}])
-           :community-id  community-id)))
+  (merge
+   chat
+   (when (and (not locked?) id)
+     {:on-press      (when joined-or-spectated
+                       (fn []
+                         (rf/dispatch [:dismiss-keyboard])
+                         (debounce/dispatch-and-chill
+                          [:communities/navigate-to-community-chat (str community-id id)]
+                          1000)))
+      :on-long-press #(rf/dispatch
+                       [:show-bottom-sheet
+                        {:content (fn []
+                                    [chat-actions/actions chat false])}])
+      :community-id  community-id})))

-(defn- add-handlers-to-chats
+(defn add-handlers-to-chats
  [community-id joined-or-spectated chats]
  (mapv (partial add-handlers community-id joined-or-spectated) chats))

-(defn- add-handlers-to-categorized-chats
+(defn add-handlers-to-categorized-chats
  [community-id categorized-chats joined-or-spectated]
  (let [add-on-press (partial add-handlers-to-chats community-id joined-or-spectated)]
    (map (fn [[category v]]
           [category (update v :chats add-on-press)])
         categorized-chats)))

-(defn- community-header
+(defn community-header
  [title logo description]
  [quo/text-combinations
   {:container-style
@@ -236,11 +266,11 @@
    :title-accessibility-label :community-title
    :description-accessibility-label :community-description}])

-(defn- community-content
-  [{:keys [id]}]
-  (rf/dispatch [:communities/check-all-community-channels-permissions id])
-  (fn [{:keys [name description joined spectated images tags color id membership-permissions?]
-        :as   community}
+(defn community-content
+  [community]
+  (rf/dispatch [:communities/check-all-community-channels-permissions (:id community)])
+  (fn [{:keys [name description joined spectated images tags color id token-permissions] :as community}
+       pending?
       {:keys [on-category-layout
               collapsed?
               on-first-channel-height-changed]}]
@@ -249,7 +279,7 @@
      [:<>
       [rn/view {:style style/community-content-container}
        (when-not collapsed?
-          [status-tag id joined])
+          [status-tag pending? joined])
        [community-header name (when collapsed? (get-in images [:thumbnail :uri]))
         (when-not collapsed? description)]
        (when (and (seq tags) (not collapsed?))
@@ -257,8 +287,9 @@
           {:tags            tags
            :last-item-style style/last-community-tag
            :container-style style/community-tag-container}])
-        [join-community community]]
-       (when (or joined (not membership-permissions?))
+        [join-community community pending?]]
+       (when (or (and (seq token-permissions) joined)
+                 (empty? token-permissions))
         [channel-list-component
          {:on-category-layout              on-category-layout
           :community-id                    id
@@ -266,7 +297,7 @@
           :on-first-channel-height-changed on-first-channel-height-changed}
          (add-handlers-to-categorized-chats id chats-by-category joined-or-spectated)])])))

-(defn- sticky-category-header
+(defn sticky-category-header
  [_]
  (fn [{:keys [enabled label]}]
    (when enabled
@@ -279,7 +310,7 @@
        {:chevron :left}
        label]])))

-(defn- page-nav-right-section-buttons
+(defn page-nav-right-section-buttons
  [id]
  [{:icon-name           :i/options
    :accessibility-label :community-options-for-community
@@ -287,7 +318,7 @@
                           [:show-bottom-sheet
                            {:content (fn [] [options/community-options-bottom-sheet id])}])}])

-(defn- pick-first-category-by-height
+(defn pick-first-category-by-height
  [scroll-height first-channel-height categories-heights]
  (->> categories-heights
       (sort-by (comp - second))
@@ -295,7 +326,7 @@
               (and (>= scroll-height (+ height first-channel-height))
                    category)))))

-(defn- community-scroll-page
+(defn community-scroll-page
  [{:keys [joined]}]
  (let [scroll-height        (reagent/atom 0)
        categories-heights   (reagent/atom {})
@@ -305,7 +336,7 @@
        ;; from not collapsed to collapsed if the
        ;; user is on this page
        initial-joined?      joined]
-    (fn [{:keys [id name images] :as community}]
+    (fn [{:keys [id name images] :as community} pending?]
      (let [cover          {:uri (get-in images [:banner :uri])}
            logo           {:uri (get-in images [:thumbnail :uri])}
            collapsed?     (and initial-joined? (:joined community))
@@ -332,6 +363,7 @@
                                        @categories-heights)}]}
         [community-content
          community
+          pending?
          {:on-category-layout              (partial add-category-height categories-heights)
           :collapsed?                      collapsed?
           :on-first-channel-height-changed
@@ -341,16 +373,17 @@
             (swap! categories-heights select-keys categories)
             (reset! first-channel-height height))}]]))))

-(defn- community-card-page-view
+(defn community-card-page-view
  [id]
  (let [{:keys [id joined]
-         :as   community} (rf/sub [:communities/community id])]
+         :as   community} (rf/sub [:communities/community id])
+        pending?          (rf/sub [:communities/my-pending-request-to-join id])]
    (when community
      (when joined
        (rf/dispatch [:activity-center.notifications/dismiss-community-overview id]))
-      [community-scroll-page community])))
+      [community-scroll-page community pending?])))

-(defn view
+(defn overview
  [id]
  (let [id                  (or id (rf/sub [:get-screen-params :community-overview]))
        customization-color (rf/sub [:profile/customization-color])]
@@ -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,9 +144,7 @@
                                     (rf/dispatch
                                      [:show-bottom-sheet
                                       {:content (fn []
-                                                   [profile-picture-picker/view
-                                                    {:update-profile-pic-callback on-change-profile-pic
-                                                     :has-picture?                false}])
+                                                   [method-menu/view on-change-profile-pic])
                                        :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/throttle-and-dispatch [:open-modal
-                                                                                  :sign-in-intro]
-                                                                                 2000)
+     :top-card            {:on-press            #(debounce/dispatch-and-chill [: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/throttle-and-dispatch
+                                                  (debounce/dispatch-and-chill
                                                   [: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/throttle-and-dispatch [:open-modal :privacy-policy] 1000)
+      {:on-press #(debounce/dispatch-and-chill [: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/throttle-and-dispatch
+       :on-press     #(debounce/dispatch-and-chill
                       [:onboarding/navigate-to-create-profile]
                       1000)}]
     [rn/view {:style style/subtitle-container}
@@ -1,4 +1,4 @@
-(ns status-im.common.profile-picture-picker.view
+(ns status-im.contexts.onboarding.select-photo.method-menu.view
  (:require
    ["react-native-image-crop-picker" :default image-picker]
    [quo.core :as quo]
@@ -59,7 +59,7 @@
   crop-opts))

 (defn view
-  [{:keys [update-profile-pic-callback has-picture?]}]
+  [update-profile-pic-callback]
  [quo/action-drawer
   [[{:icon                :i/camera
      :accessibility-label :take-photo-button
@@ -86,15 +86,5 @@
                               :on-allowed  (fn [] (pick-pic update-profile-pic-callback))
                               :on-denied   (fn []
                                              (log/info
-                                               "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))})]]])
+                                               "user has denied permissions to select picture"))}))}]]])

@@ -35,8 +35,8 @@
                             in-onboarding? (rf/dispatch [:navigate-back-to :sign-in-intro])
                             :else          (do
                                              (rf/dispatch [:navigate-back])
-                                              (debounce/throttle-and-dispatch [:open-modal :sign-in]
-                                                                              1000))))
+                                              (debounce/dispatch-and-chill [:open-modal :sign-in]
+                                                                           1000))))
    :accessibility-label :try-again-later-button
    :customization-color profile-color
    :container-style     style/try-again-button}
@@ -1,30 +0,0 @@
-(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,7 +43,6 @@
    [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]
@@ -261,9 +260,7 @@
                       {:name      :channel-actions
                        :options   {:insets {:bottom? true}}
                        :component channel-actions/view}]
-   :counter           [{:name      :collectible-counter
-                        :component collectible-counter/view}
-                       {:name      :counter
+   :counter           [{:name      :counter
                        :component counter/view}
                       {:name      :step
                        :component step/view}]
@@ -13,17 +13,10 @@
   :openseaAPIKey               config/opensea-api-key
   :poktToken                   config/POKT_TOKEN
   :infuraToken                 config/INFURA_TOKEN
-   :raribleMainnetAPIKey        config/RARIBLE_MAINNET_API_KEY
-   :raribleTestnetAPIKey        config/RARIBLE_TESTNET_API_KEY
-   :alchemyEthereumMainnetToken config/ALCHEMY_ETHEREUM_MAINNET_TOKEN
-   :alchemyEthereumGoerliToken  config/ALCHEMY_ETHEREUM_GOERLI_TOKEN
-   :alchemyEthereumSepoliaToken config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN
   :alchemyOptimismMainnetToken config/ALCHEMY_OPTIMISM_MAINNET_TOKEN
   :alchemyOptimismGoerliToken  config/ALCHEMY_OPTIMISM_GOERLI_TOKEN
-   :alchemyOptimismSepoliaToken config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN
   :alchemyArbitrumMainnetToken config/ALCHEMY_ARBITRUM_MAINNET_TOKEN
-   :alchemyArbitrumGoerliToken  config/ALCHEMY_ARBITRUM_GOERLI_TOKEN
-   :alchemyArbitrumSepoliaToken config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN})
+   :alchemyArbitrumGoerliToken  config/ALCHEMY_ARBITRUM_GOERLI_TOKEN})

 (defn create
  []
@@ -1,52 +0,0 @@
-(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)
@@ -1,27 +0,0 @@
-(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.profile-picture-picker.view :as profile-picture-picker]
+            [status-im.common.not-implemented :as not-implemented]
            [status-im.contexts.profile.edit.style :as style]
            [status-im.contexts.profile.utils :as profile.utils]
            [utils.i18n :as i18n]
@@ -9,37 +9,22 @@

 (defn view
  []
-  (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])))]
+  (let [profile         (rf/sub [:profile/profile-with-image])
+        full-name       (profile.utils/displayed-name profile)
+        profile-picture (profile.utils/photo profile)]
    [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
-        :customization-color customization-color
-        :status-indicator?   false
-        :ring?               true
-        :size                :big}]
+       {:full-name         full-name
+        :profile-picture   profile-picture
+        :status-indicator? false
+        :ring?             true
+        :size              :big}]
      [quo/button
-       {: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}]))
+       {:on-press        not-implemented/alert
        :container-style style/camera-button
        :icon-only?      true
        :type            :grey
@@ -2,21 +2,17 @@
  (: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 [:profile/edit-profile-name-success]}]]]})
+           :on-success (fn []
+                         (rf/dispatch [:navigate-back])
+                         (rf/dispatch [:toasts/upsert
+                                       {:type  :positive
+                                        :theme :dark
+                                        :text  (i18n/label :t/name-updated)}]))}]]]})

 (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 [:profile/edit-profile-name-success]}]]]}]
+                          :on-success fn?}]]]}]
    (is (match? expected
                (sut/edit-profile-name cofx [new-name])))))
@@ -3,7 +3,6 @@
    [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/throttle-and-dispatch
+                             (debounce/dispatch-and-chill
                              [: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/throttle-and-dispatch
+      :on-press            #(debounce/dispatch-and-chill
                             [:open-modal :sign-in]
                             1000)
      :accessibility-label :multi-profile}]]])
@@ -70,15 +70,6 @@
                                       {: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?]
@@ -89,6 +80,7 @@
             (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/throttle-and-dispatch [:open-modal :share-shell] 1000)}
+                      :on-press  #(debounce/dispatch-and-chill [: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/throttle-and-dispatch [:shell/navigate-to-jump-to] 500))
+                               (debounce/dispatch-and-chill [:shell/navigate-to-jump-to] 500))
        :customization-color customization-color
        :label               (i18n/label :t/jump-to)}}
      {:position :absolute
--- a/Show More
+++ b/Show More