Add deletion of saved addresses

.env.jenkins

@@ -36,4 +36,5 @@ STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
+SHOW_NOT_IMPLEMENTED_FEATURES=1
 ENABLE_ALERT_BANNER=1

Makefile

@@ -139,7 +139,7 @@ _install-hooks: ##@prepare Create prepare-commit-msg git hook symlink
 
 # Remove directories and ignored files
 clean: SHELL := /bin/sh
-clean: _fix-node-perms _tmpdir-rm ios-clean android-clean ##@prepare Remove all output folders
+clean: _fix-node-perms _tmpdir-rm ##@prepare Remove all output folders
 	git clean -dXf
 
 # Remove directories, ignored and non-ignored files
@@ -196,10 +196,6 @@ xcode-clean: XCODE_HOME := $(HOME)/Library/Developer/Xcode
 xcode-clean: ##@prepare Clean XCode derived data and archives
 	rm -fr $(XCODE_HOME)/DerivedData/StatusIm-* $(XCODE_HOME)/Archives/*/StatusIm*
 
-ios-simulator-cache-clean: SHELL := /bin/sh
-ios-simulator-cache-clean: ##@prepare Clean iOS Simulator Caches
-	rm -rf ~/Library/Developer/CoreSimulator/Cache
-
 #----------------
 # Release builds
 #----------------
@@ -353,11 +349,13 @@ test: export SHADOW_NS_REGEXP := .*-test$$
 test: ##@test Run all Clojure tests
 test: _test-clojure
 
-test-watch-for-repl: export TARGET := default
 test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
 test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
+test-watch-for-repl: status-go-library
 test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connections
-	yarn install && shadow-cljs compile mocks && \
+	yarn node-pre-gyp rebuild
+	rm -f target/test/test.js
+	yarn shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
 		'yarn shadow-cljs watch test --verbose' \
 		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"
@@ -411,17 +409,13 @@ geth-connect: ##@other Connect to Geth on the device
 	build/bin/geth attach http://localhost:8545
 
 ios-clean: SHELL := /bin/sh
-ios-clean: ios-simulator-cache-clean
 ios-clean: ##@prepare Clean iOS build artifacts
 	git clean -dxf -f target/ios
 
-android-clean: SHELL := /bin/sh
+android-clean: export TARGET := gradle
 android-clean: ##@prepare Clean Gradle state
 	git clean -dxf -f ./android/app/build; \
-	rm -rf android/.gradle \
-	rm -rf android/build \
-	rm -rf ~/.gradle
-
+	[[ -d android/.gradle ]] && cd android && ./gradlew clean
 
 android-ports: export TARGET := android-sdk
 android-ports: ##@other Add proxies to Android Device/Simulator

android/app/build.gradle

@@ -59,7 +59,7 @@ react {
 /**
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
-def enableProguardInReleaseBuilds = true
+def enableProguardInReleaseBuilds = false
 
 /**
  * The preferred build flavor of JavaScriptCore (JSC)
@@ -83,6 +83,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = hermesEnabled.toBoolean();
 
+
 def getCommitHash = { ->
     if (project.hasProperty("commitHash")) {
         return project.commitHash
@@ -232,7 +233,6 @@ android {
         }
         release {
             minifyEnabled enableProguardInReleaseBuilds
-            shrinkResources enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             signingConfig null
         }
@@ -240,10 +240,10 @@ android {
             initWith release
             applicationIdSuffix ".pr"
             versionNameSuffix   ".pr"
-            debuggable false
+            debuggable          false
             matchingFallbacks = ["release"]
-            // necessary to make react-native-config's code generation work
-            resValue "string", "build_config_package", "im.status.ethereum"
+             // necessary to make react-native-config's code generation work
+             resValue "string", "build_config_package", "im.status.ethereum"
         }
     }
 
@@ -277,14 +277,11 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
     implementation("androidx.core:core-splashscreen:1.0.0")
-
-    if (enableHermes) {
-        implementation("com.facebook.react:hermes-android")
-    } else {
-        // https://github.com/status-im/status-mobile/issues/18493
-        // we don't use hermes for debug builds because it crashes too often
-        implementation(jscFlavor)
-    }
+    // we don't use hermes for debug but we need its pom file for release builds
+    // https://github.com/status-im/status-mobile/pull/18675
+    implementation("com.facebook.react:hermes-android")
+    // FIXME: implementing both hermes & JSC increases bundle size by ~ 2MB
+    implementation(jscFlavor)
 
     // react-native-screens
     implementation("androidx.appcompat:appcompat:1.1.0-rc01")
@@ -296,7 +293,7 @@ dependencies {
     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.11.0")
+    implementation("com.squareup.okhttp3:okhttp-tls:4.9.2")
     implementation("com.google.prefab:cli:2.0.0")
     implementation("com.android.tools.build:aapt2:8.1.1-10154469")
 }

android/app/proguard-rules.pro

@@ -58,9 +58,6 @@
 -keep interface okhttp3.** { *; }
 -dontwarn okhttp3.**
 
-# to fix : java.security.KeyStoreException: BKS not found
--keep class org.bouncycastle.** { *; }
-
 # okio
 
 -keep class sun.misc.Unsafe { *; }
@@ -78,13 +75,4 @@
 -keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
   **[] $VALUES;
   public *;
-}
-
-# react-native-config
-# https://github.com/lugg/react-native-config?tab=readme-ov-file#problems-with-proguard
--keep class im.status.ethereum.BuildConfig {*;}
-
-# react-native-navigation
-# to fix : java.lang.ClassCastException: java.lang.Class cannot be cast to java.lang.reflect.ParameterizedType
-# at com.reactnativenavigation.views.element.animators.PropertyAnimatorCreator.getChildClass(Unknown Source:13)
--keep class com.reactnativenavigation.** {*;}
+}

android/app/src/debug/AndroidManifest.xml

@@ -3,7 +3,7 @@
           xmlns:tools="http://schemas.android.com/tools">
 
     <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission tools:node="remove" android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
     <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
 

ios/Podfile.lock

@@ -946,6 +946,8 @@ PODS:
   - react-native-status-keycard (2.5.39):
     - Keycard
     - React
+  - react-native-transparent-video (0.1.0):
+    - React-Core
   - react-native-webview (13.6.3):
     - React-Core
   - React-nativeconfig (0.73.5)
@@ -1119,14 +1121,14 @@ PODS:
     - React
   - ReactNativeCameraKit (14.0.0-beta13):
     - React-Core
-  - ReactNativeNavigation (7.39.0):
+  - ReactNativeNavigation (7.38.3):
     - HMSegmentedControl
     - React-Core
     - React-CoreModules
     - React-RCTImage
     - React-RCTText
-    - ReactNativeNavigation/Core (= 7.39.0)
-  - ReactNativeNavigation/Core (7.39.0):
+    - ReactNativeNavigation/Core (= 7.38.3)
+  - ReactNativeNavigation/Core (7.38.3):
     - HMSegmentedControl
     - React-Core
     - React-CoreModules
@@ -1236,6 +1238,7 @@ DEPENDENCIES:
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-status (from `../modules/react-native-status`)
   - react-native-status-keycard (from `../node_modules/react-native-status-keycard`)
+  - react-native-transparent-video (from `../node_modules/react-native-transparent-video`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
@@ -1385,6 +1388,8 @@ EXTERNAL SOURCES:
     :path: "../modules/react-native-status"
   react-native-status-keycard:
     :path: "../node_modules/react-native-status-keycard"
+  react-native-transparent-video:
+    :path: "../node_modules/react-native-transparent-video"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
   React-nativeconfig:
@@ -1484,7 +1489,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
   FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
+  glog: 530710e7949eb12c82670bd09e946becf50a3c2a
   hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
@@ -1528,6 +1533,7 @@ SPEC CHECKSUMS:
   react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
   react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
   react-native-status-keycard: f1c1227b2d5984c10fb44db68e4bfd2937f31e98
+  react-native-transparent-video: e484ad11ace8e5f62516e2c5e15efd3cb4df24b0
   react-native-webview: 88293a0f23eca8465c0433c023ec632930e644d0
   React-nativeconfig: 1166714a4f7ea57a0df5c2cb44fbc70f98d580f9
   React-NativeModulesApple: 726664e9829eb5eed8170241000e46ead269a05f
@@ -1551,7 +1557,7 @@ SPEC CHECKSUMS:
   ReactCommon: 2947b0bffd82ea0e58ca7928881152d4c6dae9af
   ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
   ReactNativeCameraKit: d95d3e19c514526a234d9f93c6db7e7f10eef9ea
-  ReactNativeNavigation: 679d8c8bf3b8ae98d285bce810964d10da85dbdb
+  ReactNativeNavigation: 46305e1026fa4cdcf0cfb3822932fc58d090668d
   RNCAsyncStorage: c913ede1fa163a71cea118ed4670bbaaa4b511bb
   RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
   RNCMaskedView: 71fc32d971f03b7f03d6ab6b86b730c4ee64f5b6

modules/react-native-status/android/src/main/java/im/status/ethereum/module/NetworkManager.kt

@@ -75,17 +75,4 @@ class NetworkManager(private val reactContext: ReactApplicationContext) : ReactC
         utils.executeRunnableStatusGoMethod({ Statusgo.recover(rpcParams) }, callback)
     }
 
-    @ReactMethod
-    fun getConnectionStringForExportingKeypairsKeystores(configJSON: String, callback: Callback) {
-        val jsonConfig = JSONObject(configJSON)
-        val senderConfig = jsonConfig.getJSONObject("senderConfig")
-        val keyUID = senderConfig.getString("loggedInKeyUid")
-        val keyStorePath = utils.getKeyStorePath(keyUID)
-        senderConfig.put("keystorePath", keyStorePath)
-
-        utils.executeRunnableStatusGoMethod(
-                { Statusgo.getConnectionStringForExportingKeypairsKeystores(jsonConfig.toString()) },
-                callback)
-    }
-
 }

modules/react-native-status/ios/RCTStatus/NetworkManager.m

@@ -106,22 +106,4 @@ RCT_EXPORT_METHOD(recover:(NSString *)message
     callback(@[result]);
 }
 
-RCT_EXPORT_METHOD(getConnectionStringForExportingKeypairsKeystores:(NSString *)configJSON
-        callback:(RCTResponseSenderBlock)callback) {
-
-    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
-    NSError *error;
-    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
-    NSMutableDictionary *senderConfig = configDict[@"senderConfig"];
-    NSString *keyUID = senderConfig[@"loggedInKeyUid"];
-    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
-    NSString *keystoreDir = multiaccountKeystoreDir.path;
-
-    [senderConfig setValue:keystoreDir forKey:@"keystorePath"];
-    NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];
-
-    NSString *result = StatusgoGetConnectionStringForExportingKeypairsKeystores(modifiedConfigJSON);
-    callback(@[result]);
-}
-
 @end

nix/deps/clojure/deps.json

@@ -837,11 +837,11 @@
   },
 
   {
-    "path": "org/clojure/tools.logging/1.2.4/tools.logging-1.2.4",
+    "path": "org/clojure/tools.logging/1.1.0/tools.logging-1.1.0",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "3a85764aa30c434a5b0375a2ee72924aa040fa66",
-      "sha256": "0a8riw23pfkiiyz98ccmljpbw1z13mxl73pdgyz80j93s0y0mzj6"
+      "sha1": "84cb5d00caa9df2ee504d46f6107f4708271f619",
+      "sha256": "0x2zzivn38z179lxkw9wbi9n9qwsf466lrd9y27khdz7wbxhscb5"
     }
   },
 
@@ -1008,11 +1008,11 @@
   },
 
   {
-    "path": "re-frame/re-frame/1.4.3/re-frame-1.4.3",
+    "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "74e132cc593ed2d72a5d4874954c58677a905f0e",
-      "sha256": "1xdmbjb0gv6dby98y1nx3brz9sdkfzxz9cjk8ajcr1f4zabcaapb"
+      "sha1": "b7135a76432b8141027ba1f4eb6bb15a36acfb7c",
+      "sha256": "16wi01z0j4wn04kldwzxvj0pd9dianjyb000nv5611ikhxk1qrps"
     }
   },
 

nix/deps/clojure/deps.list

@@ -91,7 +91,7 @@ org/clojure/test.check/1.1.1/test.check-1.1.1.jar
 org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0.jar
 org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.jar
 org/clojure/tools.cli/1.0.206/tools.cli-1.0.206.jar
-org/clojure/tools.logging/1.2.4/tools.logging-1.2.4.jar
+org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
 org/clojure/tools.reader/1.3.7/tools.reader-1.3.7.jar
 org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar
@@ -110,7 +110,7 @@ prismatic/schema/1.1.7/schema-1.1.7.jar
 reagent/reagent/1.2.0/reagent-1.2.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
 refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1.jar
-re-frame/re-frame/1.4.3/re-frame-1.4.3.jar
+re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar

nix/deps/gradle/deps.json

@@ -8454,16 +8454,20 @@
   },
 
   {
-    "path": "commons-logging/commons-logging/1.3.2",
+    "path": "commons-logging/commons-logging/1.3.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "commons-logging-1.3.2.pom": {
-        "sha1": "fcfa9f6e411771b8be9bee29e9d318867d3e1bc3",
-        "sha256": "sha256-ZMFGqsSRjMPiHhMij1/kF4VZM7GBN0zML4me8eFWsm0="
+      "commons-logging-1.3.1.pom": {
+        "sha1": "4bfde82c8e291f8e31227a91e0c5e428ee113e2d",
+        "sha256": "sha256-jeGLudCI4RAGLLIgVKx4DfW8A0njFzUbjtFuIH//s7g="
       },
-      "commons-logging-1.3.2.jar": {
-        "sha1": "3dc966156ef19d23c839715165435e582fafa753",
-        "sha256": "sha256-a4WEJPUYAV8yv80Rg6Nz9Kgn1y0Ca2Ax2gyRzw6PNIk="
+      "commons-logging-1.3.1-api.jar": {
+        "sha1": "c8395db010f14b2643d838c66703ad7c9325ff3c",
+        "sha256": "sha256-F+1DKWd0Dhql/EJKJGrawLoAamu/2pjKvGkoNRqOuFQ="
+      },
+      "commons-logging-1.3.1.jar": {
+        "sha1": "8cff7dc1e492911f3dd7640ebfb60d6206a1dd40",
+        "sha256": "sha256-lUB7tDN7rWuPsuZHpH+VIZmxUg7ztreTF9H+D8eQuPw="
       }
     }
   },
@@ -10302,20 +10306,20 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/core/jackson-annotations/2.17.1",
+    "path": "com/fasterxml/jackson/core/jackson-annotations/2.17.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-annotations-2.17.1.pom": {
-        "sha1": "186c3704ed2d09c8870722223a44e7b221da9a5a",
-        "sha256": "sha256-c1XzdEX12vUPUMdfLrzXG6LE+86ktiVBSAWexjVkTnc="
+      "jackson-annotations-2.17.0.pom": {
+        "sha1": "912bf318b1a41adbc921505aef325182cbf71869",
+        "sha256": "sha256-yHz4sMhDRDpM7E5pp4kTM10OR7FqGdI8IcI4JuCS+Mk="
       },
-      "jackson-annotations-2.17.1.jar": {
-        "sha1": "fca7ef6192c9ad05d07bc50da991bf937a84af3a",
-        "sha256": "sha256-/MrYLhMXLA5DhNtxV3IZybhjHAgg9LGNqqVwFvtmHHY="
+      "jackson-annotations-2.17.0.jar": {
+        "sha1": "880a742337010da4c851f843d8cac150e22dff9f",
+        "sha256": "sha256-hWJWmgAdRuhOojgCJX4zyPaLJOtHweDv0TOgNyxRKVk="
       },
-      "jackson-annotations-2.17.1.module": {
-        "sha1": "3822431bbca9acce12e554dff0d82de1c802a13e",
-        "sha256": "sha256-VNTVHaATppa+CeH0gDH39At3cYB4qpNuZMAjpP2blZM="
+      "jackson-annotations-2.17.0.module": {
+        "sha1": "c3f7565e70f082a678c6c0bedd479df9a771cfe6",
+        "sha256": "sha256-RkPjPFKL6kG0/F7A4vivbBzVlQAr4voTzE+pF2JXf7w="
       }
     }
   },
@@ -10336,20 +10340,20 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/core/jackson-core/2.17.1",
+    "path": "com/fasterxml/jackson/core/jackson-core/2.17.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-core-2.17.1.pom": {
-        "sha1": "22a579663e24a696b98a352eb423ca393dc1a4bd",
-        "sha256": "sha256-2UiDEgmgTAE5G5Oq7nrTShyelIY/nnaFwvW2FJoqs50="
+      "jackson-core-2.17.0.pom": {
+        "sha1": "ff0f34af82de11f065364a11d993ab2769b7ec07",
+        "sha256": "sha256-lR2zV/nEmlyId8CJYMSoroa9jJqohwYmZL0E96/+6pU="
       },
-      "jackson-core-2.17.1.jar": {
-        "sha1": "5e52a11644cd59a28ef79f02bddc2cc3bab45edb",
-        "sha256": "sha256-3bJsih8ahFNeghPEizWyUzcENOMoezzxV3eFb8TljOY="
+      "jackson-core-2.17.0.jar": {
+        "sha1": "a6e5058ef9720623c517252d17162f845306ff3a",
+        "sha256": "sha256-Vb4TD2poA4CIomGFbE44POeZV6D8GinsshOp79bvQ4k="
       },
-      "jackson-core-2.17.1.module": {
-        "sha1": "ff7615f1ccc2a9c1c8a5a404ab29e53f5abe29a7",
-        "sha256": "sha256-iowJZP38Js7bso2CXfRiGBf7jNIrnnpZ2cdKOl8b3R0="
+      "jackson-core-2.17.0.module": {
+        "sha1": "4a7ed6d155ffc200c55da5827a1ea9db10dcbdc6",
+        "sha256": "sha256-PSDo4ew+imyoB/J3vL2UM//DSs27X9PcJIWs8lKXlIc="
       }
     }
   },
@@ -10370,20 +10374,20 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/core/jackson-databind/2.17.1",
+    "path": "com/fasterxml/jackson/core/jackson-databind/2.17.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-databind-2.17.1.pom": {
-        "sha1": "6948da5a23ce75d431982d8228b67299b57be315",
-        "sha256": "sha256-YKCKmGrDE60+MmiKTjJ6YSg6ioAa1vphV5+MS+bcj2w="
+      "jackson-databind-2.17.0.pom": {
+        "sha1": "16301a5fdcdd9b6e453dff2307808730b82dda97",
+        "sha256": "sha256-itZM7RCQyt5O90sVYbmWOkUeM/Sc8/oCp4y7LaCvzxc="
       },
-      "jackson-databind-2.17.1.jar": {
-        "sha1": "0524dcbcccdde7d45a679dfc333e4763feb09079",
-        "sha256": "sha256-tsovfVsaskXOxUlewzl3PS2QVUxIWSWQZz+xj0QAqUg="
+      "jackson-databind-2.17.0.jar": {
+        "sha1": "7173e9e1d4bc6d7ca03bc4eeedcd548b8b580b34",
+        "sha256": "sha256-0O1bVMsbC7sIKOJM51KkOgBtwYizTjpK4yOKzHtjdBg="
       },
-      "jackson-databind-2.17.1.module": {
-        "sha1": "9dff3c7bfd8d46e05335d0b5dea8f12d5a4f5a20",
-        "sha256": "sha256-C6vGRqBi8NnTWEQCpQJxiE7cPhekGULB4x4OENcdvuY="
+      "jackson-databind-2.17.0.module": {
+        "sha1": "8e40a003945d3481158e7396b5926d09488b83d3",
+        "sha256": "sha256-fHs6Ikpqvls4uhoi/kVMCyVh80uyfnI8FwkluK0Akhs="
       }
     }
   },
@@ -10415,12 +10419,12 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/jackson-base/2.17.1",
+    "path": "com/fasterxml/jackson/jackson-base/2.17.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-base-2.17.1.pom": {
-        "sha1": "f5b8cfce0e5562b14ac36020b46ec3bcd8f2d990",
-        "sha256": "sha256-4K78YdOPzd2VX/7sAbt1EE8bv/+jpuy1jb50r7cV4yI="
+      "jackson-base-2.17.0.pom": {
+        "sha1": "fb0c3dd80f76b467d6afa2569bbfc10afe5df73f",
+        "sha256": "sha256-w9lEq1Kiy2/0VJ3O6wTUIajeYyo8yl3UVPq8f1KsMeI="
       }
     }
   },
@@ -10437,12 +10441,12 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/jackson-bom/2.17.1",
+    "path": "com/fasterxml/jackson/jackson-bom/2.17.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-bom-2.17.1.pom": {
-        "sha1": "3bd0a8fe4faa6434ff0109e330349fd8cff0967f",
-        "sha256": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU="
+      "jackson-bom-2.17.0.pom": {
+        "sha1": "b07eaa72b4c5113b038c749723ead41ba2fc9b5e",
+        "sha256": "sha256-SWSsYtWw5Ne/Vuz4sscC+pkUGCpfwtLnZvTPdoZP0qU="
       }
     }
   },
@@ -10481,12 +10485,12 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/module/jackson-modules-base/2.17.1",
+    "path": "com/fasterxml/jackson/module/jackson-modules-base/2.17.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-modules-base-2.17.1.pom": {
-        "sha1": "a19b31429808678e13cc068c37384e316bc9dd75",
-        "sha256": "sha256-fzPKJF1DhO+gTVBoQIYumA1QMYwGkg+aOt8F1I8LeUM="
+      "jackson-modules-base-2.17.0.pom": {
+        "sha1": "b2d172695b8e6137df2fe53e8e90e3d6ee511268",
+        "sha256": "sha256-tv/miBI+l3tsL99BKBcdSBSBd449w6QT6N4k88k/QAU="
       }
     }
   },
@@ -10507,20 +10511,20 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.1",
+    "path": "com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-module-jaxb-annotations-2.17.1.pom": {
-        "sha1": "7e73e3750a612c5d176f24245cc6aedc49f41c0a",
-        "sha256": "sha256-HdSa8i8aVUOzkvwAuXjJywz6bijcHLASxuhYlQs4F+E="
+      "jackson-module-jaxb-annotations-2.17.0.pom": {
+        "sha1": "f1bd4e7f9af710bf265ba21394185a5b37051ef2",
+        "sha256": "sha256-VrsjZo/bGjZsQTOWBPuStlf75ARtSMMvlZ0h4EbEXO8="
       },
-      "jackson-module-jaxb-annotations-2.17.1.jar": {
-        "sha1": "f77e7bf0e64dfcf53bfdcf2764ad7ab92b78a4da",
-        "sha256": "sha256-lD9YVAwZtRcnRl7PTQehHQiLMDOXhIJCmdV+Wv6e7p0="
+      "jackson-module-jaxb-annotations-2.17.0.jar": {
+        "sha1": "e07032ce170277213ac4835169ca79fa0340c7b5",
+        "sha256": "sha256-mTJZetw8/maj37eCxGgJ1B1mtvjo6Y2GSjGKB38XEig="
       },
-      "jackson-module-jaxb-annotations-2.17.1.module": {
-        "sha1": "feb6451e95bb55db0dc98d26ed4e7968f9ce0267",
-        "sha256": "sha256-EQtHVfGAVgQ9XtnpeQDOQiU/0lbz7EdaPwUMsAhNze4="
+      "jackson-module-jaxb-annotations-2.17.0.module": {
+        "sha1": "d7b4ed7f26b3f096d301ee076120d8a9c89ad387",
+        "sha256": "sha256-2FGXX3oXYyDBfUOnjM4UjGmVLSykOwhdgKwIluHyBBA="
       }
     }
   },
@@ -11842,27 +11846,27 @@
   },
 
   {
-    "path": "com/google/guava/guava-parent/33.2.0-jre",
+    "path": "com/google/guava/guava-parent/33.1.0-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-parent-33.2.0-jre.pom": {
-        "sha1": "f5bfac48964350d7ad36aa378acff0ed379f816b",
-        "sha256": "sha256-Ng5j7DRbu9j6pK3YluMlAt//9U6DQJhFyzPB+tN7WYU="
+      "guava-parent-33.1.0-jre.pom": {
+        "sha1": "07ac341ceab9c132ddc00771ca187bac04681eeb",
+        "sha256": "sha256-D73wcsyo4Fa6MVQrt18MFJCRRABYbUukIuz8fR38ecY="
       }
     }
   },
 
   {
-    "path": "com/google/guava/guava-testlib/33.2.0-jre",
+    "path": "com/google/guava/guava-testlib/33.1.0-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-testlib-33.2.0-jre.pom": {
-        "sha1": "1d0c542e891776dcb545a86de861afb18bc79540",
-        "sha256": "sha256-HQFL2lY+v0p64DOKef0JPulhIctiQz0g61uejCvIroo="
+      "guava-testlib-33.1.0-jre.pom": {
+        "sha1": "f25d7efd40db1ad39cc7222a89bee9150b1835ad",
+        "sha256": "sha256-5spqGrW/Ajzn7xgo3vmKiQP/aXt4kVlBK//JCceU1Gs="
       },
-      "guava-testlib-33.2.0-jre.jar": {
-        "sha1": "4678a8fd0e7fba71a4283154fd4979f51ba294d5",
-        "sha256": "sha256-HK2mwu+stz+eoRk7sMeKr/qT2DjtAGrIBtDXoeYMQlo="
+      "guava-testlib-33.1.0-jre.jar": {
+        "sha1": "55c1c7a9df8d7293bd67d0209320d678f04c5fee",
+        "sha256": "sha256-xttkB1YEm8dLDaYhaH2k6XfUeiCuN4FGaMW/jGpQogM="
       }
     }
   },
@@ -12048,20 +12052,20 @@
   },
 
   {
-    "path": "com/google/guava/guava/33.2.0-jre",
+    "path": "com/google/guava/guava/33.1.0-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-33.2.0-jre.pom": {
-        "sha1": "e78e6bc096ac140596ce47c2cd6e90f12a417779",
-        "sha256": "sha256-7YMRSBtY5QTb/BtfR3C/B13BL2yshV3X1/NqUNTEGRA="
+      "guava-33.1.0-jre.pom": {
+        "sha1": "ff9e5899929c5ff0de96f6d9a49359ecc088f756",
+        "sha256": "sha256-VXQa0W+Yzubm3Ard3UOAacxeP/KaJuMXXU/qKHaSVLc="
       },
-      "guava-33.2.0-jre.jar": {
-        "sha1": "e264781dadc4967e5292f3c4d05f1d153631f7b4",
-        "sha256": "sha256-mfSR6GJizjjROzWB1A93rNtGlqlQVEfDFUR0wxkpCN0="
+      "guava-33.1.0-jre.jar": {
+        "sha1": "9b7ed39143d59e8eabcc6f91ffe4d23db2efe558",
+        "sha256": "sha256-NGrsDrjImHNgyKJk5w/xDC+6dgRG6yfoqwfnjnh6df4="
       },
-      "guava-33.2.0-jre.module": {
-        "sha1": "5ee9e7ff047a61986890f7ea80a2695c7239169c",
-        "sha256": "sha256-eSlFEwC6UJb1M6LiPOqpManfGBIy21emmK1+PB4TD/g="
+      "guava-33.1.0-jre.module": {
+        "sha1": "603d87c0a1f8da8a608eb1c48ee6200ccba29c13",
+        "sha256": "sha256-6qUNmCgORsANUYq/FUgp3pm1lm0bb+KLffHVvZB+dKg="
       }
     }
   },
@@ -12234,12 +12238,12 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-bom/4.27.0-RC3",
+    "path": "com/google/protobuf/protobuf-bom/4.27.0-RC1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-bom-4.27.0-RC3.pom": {
-        "sha1": "bd9f15b87d06e839222b2dadcd90272013557048",
-        "sha256": "sha256-S1fPaw/YOC7Ntmsg4yYX+nDJh3kcIsYiOw9GMFhCogI="
+      "protobuf-bom-4.27.0-RC1.pom": {
+        "sha1": "27a037f37e7e95b5e28ec5cd410ed99d34eb0a29",
+        "sha256": "sha256-ilnU8jEpEPRz7kIC0n8QQBt1nSyGY6xr/dQP299Bfy4="
       }
     }
   },
@@ -12485,16 +12489,16 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-java/4.27.0-RC3",
+    "path": "com/google/protobuf/protobuf-java/4.27.0-RC1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-java-4.27.0-RC3.pom": {
-        "sha1": "eb6c9cf9ce563effc186f0a8bbc35aa53bbcf74e",
-        "sha256": "sha256-tYj2q0siUF4fcX4dwZ/NhbsHbICJkDDlOE0fX0+lb1s="
+      "protobuf-java-4.27.0-RC1.pom": {
+        "sha1": "8c2f747548d2fafc3e9b057cee34c343dc47e78e",
+        "sha256": "sha256-n9A6OYpEYg/F4Um5bKFXFb/1zQkxiNk7nGaSmmj087w="
       },
-      "protobuf-java-4.27.0-RC3.jar": {
-        "sha1": "b8abf4eca2730bf6de63f187eb1c15dd512cbe83",
-        "sha256": "sha256-BTKtECTWI2FWGsrtuXTX0WiJ52cLNuI+kyHda50zTvk="
+      "protobuf-java-4.27.0-RC1.jar": {
+        "sha1": "f37d7fb8ab06eee5ae3dd11c121f63a8b209e74f",
+        "sha256": "sha256-MW6bDi8Ee6d42j4PgT+0lqqzysiu/qRTRiIAi2bAcyk="
       }
     }
   },
@@ -12614,12 +12618,12 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-parent/4.27.0-RC3",
+    "path": "com/google/protobuf/protobuf-parent/4.27.0-RC1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-parent-4.27.0-RC3.pom": {
-        "sha1": "896b7ebb6bf6d26d64bf7b92e41d5e4f6c097a8b",
-        "sha256": "sha256-i7Fdb53i0Q8PlqmPKfkl+9T/oA/VEOyse5X3QjIYhvc="
+      "protobuf-parent-4.27.0-RC1.pom": {
+        "sha1": "59b00c8642d1166a189ebdcc529d3de170c8c56c",
+        "sha256": "sha256-mdkAVgkc3DOMTzc5ghqX3ICl1+ajWVFVWdw//1f73+E="
       }
     }
   },
@@ -12760,20 +12764,20 @@
   },
 
   {
-    "path": "com/squareup/okhttp3/okhttp-tls/4.11.0",
+    "path": "com/squareup/okhttp3/okhttp-tls/4.9.2",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "okhttp-tls-4.11.0.pom": {
-        "sha1": "93518ebb24213d6dcbde8e0c21913e40672f80c3",
-        "sha256": "sha256-0SYiMcXxtb/bVe/7+SXas1/dWlNFEvhsSd3HIGY/IEg="
+      "okhttp-tls-4.9.2.pom": {
+        "sha1": "dec05ee1b4de176f92a12361b1cc82eb7b45857d",
+        "sha256": "sha256-pzMpEUHs6TYBsocbxdsl3laPLAqVohrGEBOkQdQbDBI="
       },
-      "okhttp-tls-4.11.0.jar": {
-        "sha1": "5ac74e5e234dc2d5cd434ac87df377858a2dcf40",
-        "sha256": "sha256-SuTHCSwBeBhSRQabkSdGX9V8dkSF81ev7USlxIoFNf0="
+      "okhttp-tls-4.9.2.jar": {
+        "sha1": "2337dfb8b20de9cecd4ea36d54d15a3d85a3f385",
+        "sha256": "sha256-W8xRWQAJ2M/xShfi7i3cQ6J1HOQZmdhiQaNG8JwiB34="
       },
-      "okhttp-tls-4.11.0.module": {
-        "sha1": "e790e6e5d0e88f9fc0c70df981e86daf29f411fa",
-        "sha256": "sha256-2m5O5qfdybnUZusr5ScBAmsXms2wClyso08uXTdeSMI="
+      "okhttp-tls-4.9.2.module": {
+        "sha1": "d5ab02f5e49911694f95a23a0a93dd3de27f8dd1",
+        "sha256": "sha256-s001IZvRHujsteSz3Qf0W+iym6Bep5z57dqRYcwlj9E="
       }
     }
   },
@@ -12846,25 +12850,6 @@
     }
   },
 
-  {
-    "path": "com/squareup/okhttp3/okhttp/4.11.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "okhttp-4.11.0.pom": {
-        "sha1": "723ab52cf1ac14363cb36ab084b0af810c095bef",
-        "sha256": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94="
-      },
-      "okhttp-4.11.0.jar": {
-        "sha1": "436932d695b2c43f2c86b8111c596179cd133d56",
-        "sha256": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0="
-      },
-      "okhttp-4.11.0.module": {
-        "sha1": "db24464b688785ba9c5765df8b5508a9b8994b40",
-        "sha256": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g="
-      }
-    }
-  },
-
   {
     "path": "com/squareup/okhttp3/parent/3.9.1",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -12887,25 +12872,6 @@
     }
   },
 
-  {
-    "path": "com/squareup/okio/okio-jvm/3.2.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "okio-jvm-3.2.0.pom": {
-        "sha1": "749720d97fe3dc16e0d84a05628f4c818b375a85",
-        "sha256": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0="
-      },
-      "okio-jvm-3.2.0.jar": {
-        "sha1": "332d1c5dc82b0241cb1d35bb0901d28470cc89ca",
-        "sha256": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ="
-      },
-      "okio-jvm-3.2.0.module": {
-        "sha1": "09f966bc7d27d5151fa3367e637e098cf7cf4179",
-        "sha256": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ="
-      }
-    }
-  },
-
   {
     "path": "com/squareup/okio/okio-jvm/3.9.0",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -12925,6 +12891,25 @@
     }
   },
 
+  {
+    "path": "com/squareup/okio/okio-metadata/2.8.0",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "okio-metadata-2.8.0.pom": {
+        "sha1": "dc508270653b48fd92c98866c5f1ed6e3e033cad",
+        "sha256": "sha256-v8xCxsWC2Zl4UgnmAs30RRoyZJrsbg7CaLdIhOA0QAg="
+      },
+      "okio-metadata-2.8.0.jar": {
+        "sha1": "2a068c26cd04cbd7214ae6a4146c5f5424bdb393",
+        "sha256": "sha256-99w4g86uLh/jQl4bVMXfKLiFfF/QA4G1If2mB5DylSw="
+      },
+      "okio-metadata-2.8.0.module": {
+        "sha1": "a5b10ac12aa5f879996e516be24aaeb9b4459873",
+        "sha256": "sha256-pO72Qb5eVGPSeJw8c2AfmpnzbhN3ygB+MPD+5ToFTNw="
+      }
+    }
+  },
+
   {
     "path": "com/squareup/okio/okio-parent/1.13.0",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -13041,29 +13026,6 @@
     }
   },
 
-  {
-    "path": "com/squareup/okio/okio/3.2.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "okio-3.2.0.pom": {
-        "sha1": "85284557b21661be1c4983910fef4e35532e1e34",
-        "sha256": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE="
-      },
-      "okio-3.2.0-all.jar": {
-        "sha1": "22e2a4f865203033fc0f35fd5892a213d21a4710",
-        "sha256": "sha256-Uf+6hylix9O+0SjfKbDeqz7qMfwjfAoMgVjcmQqEh44="
-      },
-      "okio-3.2.0.jar": {
-        "sha1": "afd4b7185a6976c2ac6bfb7b126c257ee9b3e765",
-        "sha256": "sha256-3KkyyyAptsniZ3D4fbCLFNSB/+gTGlnzaaI4XBG+Ti0="
-      },
-      "okio-3.2.0.module": {
-        "sha1": "32c2edb224d6eeaee24f8086e3ac41b92138fadb",
-        "sha256": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ="
-      }
-    }
-  },
-
   {
     "path": "com/squareup/okio/okio/3.9.0",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -15037,16 +14999,16 @@
   },
 
   {
-    "path": "net/bytebuddy/byte-buddy-agent/1.14.15",
+    "path": "net/bytebuddy/byte-buddy-agent/1.14.12",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "byte-buddy-agent-1.14.15.pom": {
-        "sha1": "38dc80ceffcc2eb5a333a91178e2b604d79acc4c",
-        "sha256": "sha256-bSndpffrUMo7o7ChKu9RjMVtgjSjNEKl+pgrS0SAJl4="
+      "byte-buddy-agent-1.14.12.pom": {
+        "sha1": "2e7579d9fc7635fac3b777222bfe7ed0c6180370",
+        "sha256": "sha256-ZpifcNNV1gD9TZJtiDXke30b7/Z47r7FnRljY7XNTCw="
       },
-      "byte-buddy-agent-1.14.15.jar": {
-        "sha1": "0b4cc9d88d5de562bf75b3a54ab436ad01b3f72d",
-        "sha256": "sha256-PvbscXWAE2EXAGfMaQKWn5ZtN8cr+TU9nNKCJjsYQGQ="
+      "byte-buddy-agent-1.14.12.jar": {
+        "sha1": "be4984cb6fd1ef1d11f218a648889dfda44b8a15",
+        "sha256": "sha256-KzCakwAJLgtpb3xHH9UdmWkAHfeEyKufB5l0N9dXrW0="
       }
     }
   },
@@ -15074,12 +15036,23 @@
   },
 
   {
-    "path": "net/bytebuddy/byte-buddy-parent/1.14.15",
+    "path": "net/bytebuddy/byte-buddy-parent/1.14.9",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "byte-buddy-parent-1.14.15.pom": {
-        "sha1": "41a33be695a3bbf89c995e2d53433f4cbaa3ac81",
-        "sha256": "sha256-JurvCGUf+li6KQCSzjKBeC4pwGKKG3n6WjeE+Qi0GKw="
+      "byte-buddy-parent-1.14.9.pom": {
+        "sha1": "da031e5ce56cd47e73b9793bf85525d5bf016071",
+        "sha256": "sha256-Zrg0IlHTXyBj5pMW9juvywVjQv516SHA9GXC2WWTU14="
+      }
+    }
+  },
+
+  {
+    "path": "net/bytebuddy/byte-buddy-parent/1.14.12",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "byte-buddy-parent-1.14.12.pom": {
+        "sha1": "b9c86a9d0a445f6a6374f092377a570cfc363426",
+        "sha256": "sha256-m3/SvyklMayw6XTZVeSjbKQTMt0Nr+icJNj+Q5uuV7A="
       }
     }
   },
@@ -15115,16 +15088,31 @@
   },
 
   {
-    "path": "net/bytebuddy/byte-buddy/1.14.15",
+    "path": "net/bytebuddy/byte-buddy/1.14.9",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "byte-buddy-1.14.15.pom": {
-        "sha1": "95fc2fd8a131fad0706f51d6b573ece01763572c",
-        "sha256": "sha256-1WOfj+J86tM+akx4n62OZfMo9iu3na0r3XrmzJO5RUw="
+      "byte-buddy-1.14.9.pom": {
+        "sha1": "fb912d2860bd618655759750893db27c3f12db66",
+        "sha256": "sha256-LWdykQ0WFpvUySKeijZc9U4ZK8Ygy8+n+EJx9dEV6BU="
       },
-      "byte-buddy-1.14.15.jar": {
-        "sha1": "11c9440bc7f9468761e5a82778a05205169d49a9",
-        "sha256": "sha256-dHLjlhmSwSqf1PbWfCHeQoCr4Y8pJwTdSdczgon4rPU="
+      "byte-buddy-1.14.9.jar": {
+        "sha1": "b69e7fff6c473d3ed2b489cdfd673a091fd94226",
+        "sha256": "sha256-N3NS4lMoK/hvcxrJDtiDSOj0CmPOAzwAqFmC3n55Dm8="
+      }
+    }
+  },
+
+  {
+    "path": "net/bytebuddy/byte-buddy/1.14.12",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "byte-buddy-1.14.12.pom": {
+        "sha1": "95857e045a1878f95b696844f78d03b94ec25964",
+        "sha256": "sha256-XamVxw3nt/SoSKhUN8fd7oA9GrfKwtfY33GUw9XicU0="
+      },
+      "byte-buddy-1.14.12.jar": {
+        "sha1": "6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1",
+        "sha256": "sha256-lwY2E01hwYOxn49Y+mMeMNLyq8o0SzeEijk8rHhj3XA="
       }
     }
   },
@@ -15935,6 +15923,17 @@
     }
   },
 
+  {
+    "path": "org/apache/commons/commons-parent/67",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "commons-parent-67.pom": {
+        "sha1": "761d110d7313f09bfc20ec1fb1f420da3314958e",
+        "sha256": "sha256-UHrZeCzW5L8io0Eyk2TG2vqqAqsmswy8Z4XPsFlQZ1Y="
+      }
+    }
+  },
+
   {
     "path": "org/apache/commons/commons-parent/69",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -19228,16 +19227,16 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC3",
+    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC2",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-reflect-2.0.0-RC3.pom": {
-        "sha1": "a7730291ea955a34868c94a9409c048c15107d94",
-        "sha256": "sha256-9aeMqntbuaejEkPzeT4Nj+3/q1d6KNW7pXlyMFkU5nU="
+      "kotlin-reflect-2.0.0-RC2.pom": {
+        "sha1": "f59f0775b6c4874de09c44d692037fd8f3132bfd",
+        "sha256": "sha256-1aOhZnjByMuCwt0x6SO2i+pd0ka/rEv8T+nO3nUo6gM="
       },
-      "kotlin-reflect-2.0.0-RC3.jar": {
-        "sha1": "2de9acd396986f0130a7015ca18caa593915b077",
-        "sha256": "sha256-bFXdlUw7yRgPPDvM+D9PAf+ifqvMVlWdLKw2Z6FbjMo="
+      "kotlin-reflect-2.0.0-RC2.jar": {
+        "sha1": "a416a6e9f3c00ba5f0c58091bbe20128117720ff",
+        "sha256": "sha256-VSmq3nuZWEmDRvXHvnD+3VIrYmg0FlJmaIJ9j3mNbaE="
       }
     }
   },
@@ -20052,21 +20051,6 @@
     }
   },
 
-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-jdk7-1.6.10.pom": {
-        "sha1": "5da7f12df7646d63f35e8a894157143c93efceb4",
-        "sha256": "sha256-YSIR/5MPW1LHJP92NBfVqigd1+AyXDs1yNGBIKao300="
-      },
-      "kotlin-stdlib-jdk7-1.6.10.jar": {
-        "sha1": "e1c380673654a089c4f0c9f83d0ddfdc1efdb498",
-        "sha256": "sha256-Ku3NxrabM731zCNbzqiOfPZgEUa7a83/2zErus174mE="
-      }
-    }
-  },
-
   {
     "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -20277,36 +20261,6 @@
     }
   },
 
-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-jdk8-1.6.10.pom": {
-        "sha1": "9ad76ce2a9e0473c5d5d4ec01add1b061beb521d",
-        "sha256": "sha256-Q6ZJ+nN7+zX6SvTm3jPi8IpdGRBNdYLqQNvNK2N5Csw="
-      },
-      "kotlin-stdlib-jdk8-1.6.10.jar": {
-        "sha1": "e80fe6ac3c3573a80305f5ec43f86b829e8ab53d",
-        "sha256": "sha256-FFbYLQOeow2EhbAykB9Su/B+fNvoux+HCK0yqFdMQc4="
-      }
-    }
-  },
-
-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-jdk8-1.6.20.pom": {
-        "sha1": "6207ba2d7a89316eafea7f135ef1fc17e41c424b",
-        "sha256": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk="
-      },
-      "kotlin-stdlib-jdk8-1.6.20.jar": {
-        "sha1": "dab8089bca6ac0e394c37281ea8cff2f99acd421",
-        "sha256": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU="
-      }
-    }
-  },
-
   {
     "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -20815,28 +20769,28 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC3",
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC2",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-stdlib-2.0.0-RC3.pom": {
-        "sha1": "7fb5dbef4bdc345da221fecbd12ddbcf6bbe3160",
-        "sha256": "sha256-zUpUNgRDkBPpPf5Czq/zFbV0Fy6PWdc4u7Ast9mrP38="
+      "kotlin-stdlib-2.0.0-RC2.pom": {
+        "sha1": "a0173de9669d2b669a0a9331abc10eed854c7578",
+        "sha256": "sha256-P5+BoFtN2UXxa5nt5GUj/36Ts2zN2qRIKsbvj519M2g="
       },
-      "kotlin-stdlib-2.0.0-RC3-all.jar": {
+      "kotlin-stdlib-2.0.0-RC2-all.jar": {
         "sha1": "e6142a28b5fa6722cd811dd86278ad056784fa40",
         "sha256": "sha256-MOBSIrwGf/+4lqMna18ePylFC/HZRh0noZzg78eTtc0="
       },
-      "kotlin-stdlib-2.0.0-RC3-common.jar": {
+      "kotlin-stdlib-2.0.0-RC2-common.jar": {
         "sha1": "281e03983850e590dcc0d2474758f2fa8dd0e96a",
         "sha256": "sha256-EsHDu0lApPmVlUD/tc8uLl6brNtoywDEvSidFjm9HSc="
       },
-      "kotlin-stdlib-2.0.0-RC3.jar": {
-        "sha1": "37bea4f33a0d1823317f1210048928030077ec38",
-        "sha256": "sha256-B2a3hUy+BDpaysUyZ3CUvh9ua0iT54/a2SXC64Mks3Y="
+      "kotlin-stdlib-2.0.0-RC2.jar": {
+        "sha1": "504eb64ad16be7612c962dd198a511a809800d80",
+        "sha256": "sha256-nFMX9JplxBB9EJM5WG+LfW95ehOyI0zMR5CGQZDpQVo="
       },
-      "kotlin-stdlib-2.0.0-RC3.module": {
-        "sha1": "83a7913d9fd48986a323feb3fccc2b1049182fab",
-        "sha256": "sha256-vpppwKPQSAwqZ2ff0DPELmM87yPovzFuqKy8Osz9piE="
+      "kotlin-stdlib-2.0.0-RC2.module": {
+        "sha1": "ec60b751c2b289581aed1cf553d477048a890cc4",
+        "sha256": "sha256-18U/l65G+3O8wy1oZbKJ+MSv8fv3yvfaXIllxukU+wg="
       }
     }
   },
@@ -21221,16 +21175,16 @@
   },
 
   {
-    "path": "org/mockito/mockito-core/5.12.0",
+    "path": "org/mockito/mockito-core/5.11.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "mockito-core-5.12.0.pom": {
-        "sha1": "63bde3dc82d8ee626ecf765f61a1ce7b8c68cb96",
-        "sha256": "sha256-bccvwKe1NHdVVfgzB0hiqcUwE6ZzOD4hMStYHKI7dhI="
+      "mockito-core-5.11.0.pom": {
+        "sha1": "456cc29c4ed1d6e11efe7a92bdaae1ea5999a49d",
+        "sha256": "sha256-ugsbXXA1CUlPmo5EWCIjh54zSKTElmfwx35odG5IHHg="
       },
-      "mockito-core-5.12.0.jar": {
-        "sha1": "22f8bbaf478e6789164787fa411a3b5ed986e110",
-        "sha256": "sha256-Si6ykjcFDadJ6QpG+Ui85+JuwitnHkH1mxrG9LZAgik="
+      "mockito-core-5.11.0.jar": {
+        "sha1": "e4069fa4f4ff2c94322cfec5f2e45341c6c70aff",
+        "sha256": "sha256-8HbJax9JuNm8QuRrCWmq9WhMQMi1tnnUAOXYgAc6DgA="
       }
     }
   },

nix/deps/gradle/deps.list

@@ -597,13 +597,12 @@ com.google.test.platform:core-proto:0.0.2-dev
 com.ibm.icu:icu4j:53.1
 com.intellij:annotations:12.0
 com.parse.bolts:bolts-tasks:1.4.0
-com.squareup.okhttp3:okhttp-tls:4.11.0
+com.squareup.okhttp3:okhttp-tls:4.9.2
 com.squareup.okhttp3:okhttp-urlconnection:4.9.2
 com.squareup.okhttp3:okhttp:4.9.2
-com.squareup.okhttp3:okhttp:4.11.0
-com.squareup.okio:okio-jvm:3.2.0
+com.squareup.okio:okio-metadata:2.8.0
+com.squareup.okio:okio:2.8.0
 com.squareup.okio:okio:2.9.0
-com.squareup.okio:okio:3.2.0
 com.squareup:javapoet:1.8.0
 com.squareup:javapoet:1.10.0
 com.squareup:javapoet:1.13.0
@@ -775,6 +774,7 @@ org.jetbrains.kotlinx:atomicfu:0.16.3
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1

nix/deps/gradle/deps.urls

@@ -528,7 +528,7 @@ https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.po
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
-https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.2/commons-logging-1.3.2.pom
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
@@ -628,22 +628,22 @@ https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloa
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.5/soloader-0.10.5.pom
 https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.1/jackson-annotations-2.17.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.0/jackson-annotations-2.17.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.1/jackson-core-2.17.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.0/jackson-core-2.17.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.1/jackson-databind-2.17.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.0/jackson-databind-2.17.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.1/jackson-dataformat-xml-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.11.1/jackson-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.17.1/jackson-base-2.17.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.17.0/jackson-base-2.17.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.11.1/jackson-bom-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.17.1/jackson-bom-2.17.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.17.0/jackson-bom-2.17.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.11/jackson-parent-2.11.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.17/jackson-parent-2.17.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.11.1/jackson-modules-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.17.1/jackson-modules-base-2.17.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.17.0/jackson-modules-base-2.17.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.1/jackson-module-jaxb-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.1/jackson-module-jaxb-annotations-2.17.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.0/jackson-module-jaxb-annotations-2.17.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/58/oss-parent-58.pom
@@ -740,8 +740,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.2.0-jre/guava-parent-33.2.0-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.2.0-jre/guava-testlib-33.2.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.1.0-jre/guava-parent-33.1.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.1.0-jre/guava-testlib-33.1.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -754,7 +754,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.2.0-jre/guava-33.2.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.1.0-jre/guava-33.1.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -768,7 +768,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.13.0/pro
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.17.2/protobuf-bom-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.2/protobuf-bom-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.3/protobuf-bom-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.27.0-RC3/protobuf-bom-4.27.0-RC3.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.27.0-RC1/protobuf-bom-4.27.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
@@ -785,7 +785,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.13.0/pr
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.17.2/protobuf-java-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.27.0-RC3/protobuf-java-4.27.0-RC3.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.27.0-RC1/protobuf-java-4.27.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -796,7 +796,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.2/protobuf-parent-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.3/protobuf-parent-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.27.0-RC3/protobuf-parent-4.27.0-RC3.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.27.0-RC1/protobuf-parent-4.27.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.2/truth-parent-1.4.2.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.pom
 https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
@@ -806,16 +806,15 @@ https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.
 https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.10.0/javapoet-1.10.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.13.0/javapoet-1.13.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-tls/4.11.0/okhttp-tls-4.11.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-tls/4.9.2/okhttp-tls-4.9.2.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/4.9.2/okhttp-urlconnection-4.9.2.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.9.1/okhttp-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.9.2/okhttp-4.9.2.pom
-https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.11.0/okhttp-4.11.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.9.0/okio-jvm-3.9.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-metadata/2.8.0/okio-metadata-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.13.0/okio-parent-1.13.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.4/okio-parent-1.17.4.pom
@@ -824,7 +823,6 @@ https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.p
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.4/okio-1.17.4.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.2.0/okio-3.2.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.9.0/okio-3.9.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.1/all-1.2.1.pom
@@ -965,13 +963,15 @@ https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.13/byte-buddy-agent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.19/byte-buddy-agent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.15/byte-buddy-agent-1.14.15.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.12/byte-buddy-agent-1.14.12.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.19/byte-buddy-parent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.15/byte-buddy-parent-1.14.15.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.9/byte-buddy-parent-1.14.9.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.12/byte-buddy-parent-1.14.12.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.19/byte-buddy-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.15/byte-buddy-1.14.15.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.9/byte-buddy-1.14.9.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -1034,6 +1034,7 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/67/commons-parent-67.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
@@ -1246,7 +1247,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.8.20-RC2/kotlin-reflect-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC3/kotlin-reflect-2.0.0-RC3.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC2/kotlin-reflect-2.0.0-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
@@ -1301,7 +1302,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.30/kotlin-stdlib-jdk7-1.5.30.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.31/kotlin-stdlib-jdk7-1.5.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.0/kotlin-stdlib-jdk7-1.6.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.20-RC2/kotlin-stdlib-jdk7-1.8.20-RC2.pom
@@ -1316,8 +1316,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.30/kotlin-stdlib-jdk8-1.5.30.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.31/kotlin-stdlib-jdk8-1.5.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.0/kotlin-stdlib-jdk8-1.6.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20/kotlin-stdlib-jdk8-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.20-RC2/kotlin-stdlib-jdk8-1.8.20-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21.pom
@@ -1351,7 +1349,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20-R
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC3/kotlin-stdlib-2.0.0-RC3.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC2/kotlin-stdlib-2.0.0-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
@@ -1377,7 +1375,7 @@ https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.po
 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.12.0/mockito-core-5.12.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.11.0/mockito-core-5.11.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

nix/deps/gradle/generate.sh

@@ -55,8 +55,7 @@ com.android.tools.build:gradle:8.1.1
 com.google.errorprone:error_prone_annotations:2.7.1
 com.android.tools.lint:lint-gradle:31.1.1
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
-com.android.tools.build:gradle:3.5.4
-com.facebook.react:hermes-android:0.73.5' \
+com.android.tools.build:gradle:3.5.4' \
         >> "${DEPS_LIST}"
 }
 

nix/deps/gradle/proj.list

@@ -34,5 +34,6 @@ react-native-static-safe-area-insets
 react-native-status
 react-native-status-keycard
 react-native-svg
+react-native-transparent-video
 react-native-webview
 walletconnect_react-native-compat

nix/overlay.nix

@@ -57,7 +57,7 @@ in {
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
   openjdk = super.openjdk11_headless;
   xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
-    versions = ["15.1" "15.2" "15.3"];
+    versions = ["15.1"];
   };
   go = super.go_1_20;
   clang = super.clang_15;

package.json

@@ -55,7 +55,7 @@
     "react-native-keychain": "8.1.2",
     "react-native-linear-gradient": "^2.8.0",
     "react-native-lottie-splash-screen": "^1.0.1",
-    "react-native-navigation": "7.39.0",
+    "react-native-navigation": "7.38.3",
     "react-native-orientation-locker": "^1.5.0",
     "react-native-permissions": "4.1.5",
     "react-native-reanimated": "3.6.1",
@@ -66,6 +66,7 @@
     "react-native-static-safe-area-insets": "^2.2.0",
     "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39",
     "react-native-svg": "13.10.0",
+    "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1",
     "react-native-webview": "13.6.3",
     "react-syntax-highlighter": "^15.5.0"
   },

patches/react-native-navigation-button-presenter.patch

@@ -0,0 +1,22 @@
+# https://github.com/wix/react-native-navigation/issues/7819
+
+--- ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt
++++ ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter-patched.kt
+@@ -194,8 +194,8 @@
+
+                 class WixAccessibilityDelegateCompat: AccessibilityDelegateCompat(){
+                     override fun onInitializeAccessibilityNodeInfo(
+-                        host: View?,
+-                        info: AccessibilityNodeInfoCompat?
++                        host: View,
++                        info: AccessibilityNodeInfoCompat
+                     ) {
+                         super.onInitializeAccessibilityNodeInfo(host, info)
+
+@@ -216,4 +216,4 @@
+     }
+
+
+-}
+\ No newline at end of file
++}

patches/react-native-navigation.patch

@@ -0,0 +1,19 @@
+# https://github.com/wix/react-native-navigation/issues/7819
+
+--- ./node_modules/react-native-navigation/lib/android/app/build.gradle
++++ ./node_modules/react-native-navigation/lib/android/app/build-patched.gradle
+@@ -62,11 +62,11 @@
+         }
+     }
+     compileOptions {
+-        sourceCompatibility JavaVersion.VERSION_1_8
+-        targetCompatibility JavaVersion.VERSION_1_8
++        sourceCompatibility JavaVersion.VERSION_17
++        targetCompatibility JavaVersion.VERSION_17
+     }
+     kotlinOptions {
+-        jvmTarget = JavaVersion.VERSION_1_8
++        jvmTarget = JavaVersion.VERSION_17
+     }
+
+     flavorDimensions "RNN.reactNativeVersion"

resources/config/fleets.json

@@ -1,7 +1,7 @@
 {
     "meta": {
         "hostname": "node-01.do-ams3.sites.misc",
-        "timestamp": "2024-03-15T00:00:36.865154",
+        "timestamp": "2024-02-02T14:48:22.521541",
         "warning": "DO NOT EDIT! Auto generated from Consul. Should only be used at build time."
     },
     "fleets": {
@@ -82,21 +82,38 @@
                 "boot-01.ac-cn-hongkong-c.eth.staging": "/ip4/47.91.229.44/tcp/30703/ethv4/16Uiu2HAmRnt2Eyoknh3auxh4fJwkRgqkH1gqrWGes8Pk1k3MV4xu"
             }
         },
-        "waku.sandbox": {
+        "wakuv2.prod": {
             "tcp/p2p/waku": {
-                "node-01.do-ams3.waku.sandbox": "/dns4/node-01.do-ams3.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmQSMNExfUYUqfuXWkD5DaNZnMYnigRxFKbk3tcEFQeQeE",
-                "node-01.gc-us-central1-a.waku.sandbox": "/dns4/node-01.gc-us-central1-a.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAm6fyqE1jB5MonzvoMdU8v76bWV8ZeNpncDamY1MQXfjdB",
-                "node-01.ac-cn-hongkong-c.waku.sandbox": "/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmSJvSJphxRdbnigUV5bjRRZFBhTtWFTSyiKaQByCjwmpV"
+                "node-01.do-ams3.wakuv2.prod": "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+                "node-01.gc-us-central1-a.wakuv2.prod": "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA",
+                "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.waku.sandbox": "enr:-QESuEB4Dchgjn7gfAvwB00CxTA-nGiyk-aALI-H4dYSZD3rUk7bZHmP8d2U6xDiQ2vZffpo45Jp7zKNdnwDUx6g4o6XAYJpZIJ2NIJpcIRA4VDAim11bHRpYWRkcnO4XAArNiZub2RlLTAxLmRvLWFtczMud2FrdS5zYW5kYm94LnN0YXR1cy5pbQZ2XwAtNiZub2RlLTAxLmRvLWFtczMud2FrdS5zYW5kYm94LnN0YXR1cy5pbQYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQOvD3S3jUNICsrOILlmhENiWAMmMVlAl6-Q8wRB7hidY4N0Y3CCdl-DdWRwgiMohXdha3UyDw",
-                "node-01.gc-us-central1-a.waku.sandbox": "enr:-QEkuEBIkb8q8_mrorHndoXH9t5N6ZfD-jehQCrYeoJDPHqT0l0wyaONa2-piRQsi3oVKAzDShDVeoQhy0uwN1xbZfPZAYJpZIJ2NIJpcIQiQlleim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS5zYW5kYm94LnN0YXR1cy5pbQZ2XwA2Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS5zYW5kYm94LnN0YXR1cy5pbQYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQKnGt-GSgqPSf3IAPM7bFgTlpczpMZZLF3geeoNNsxzSoN0Y3CCdl-DdWRwgiMohXdha3UyDw",
-                "node-01.ac-cn-hongkong-c.waku.sandbox": "enr:-QEkuEB3WHNS-xA3RDpfu9A2Qycr3bN3u7VoArMEiDIFZJ66F1EB3d4wxZN1hcdcOX-RfuXB-MQauhJGQbpz3qUofOtLAYJpZIJ2NIJpcIQI2SVcim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS5zYW5kYm94LnN0YXR1cy5pbQZ2XwA2Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS5zYW5kYm94LnN0YXR1cy5pbQYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQPK35Nnz0cWUtSAhBp7zvHEhyU_AqeQUlqzLiLxfP2L4oN0Y3CCdl-DdWRwgiMohXdha3UyDw"
+                "node-01.do-ams3.wakuv2.prod": "enr:-P-4QJI8tS1WTdIQxq_yIrD05oIIW1Xg-tm_qfP0CHfJGnp9dfr6ttQJmHwTNxGEl4Le8Q7YHcmi-kXTtphxFysS11oBgmlkgnY0gmlwhLymh5GKbXVsdGlhZGRyc7hgAC02KG5vZGUtMDEuZG8tYW1zMy53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGdl8ALzYobm9kZS0wMS5kby1hbXMzLndha3V2Mi5wcm9kLnN0YXR1c2ltLm5ldAYfQN4DiXNlY3AyNTZrMaEDbl1X_zJIw3EAJGtmHMVn4Z2xhpSoUaP5ElsHKCv7hlWDdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
+                "node-01.gc-us-central1-a.wakuv2.prod": "enr:-QERuEC0EGWTjg_gYdnuPypJ9LAbB3lml6M8GiRajGegL2iWEj1MJzUMV9X6jXw7mMAQQLozLCTLFT-zv-ELQLPwWdACAYJpZIJ2NIJpcIQieWRsim11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdXYyLnByb2Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhA_30kHgQqfXZRioa4J_u5asgXTJ5iw_8w3lEICH4TFu_g3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.ac-cn-hongkong-c.wakuv2.prod": "enr:-QERuEDABor1lVmSa5ek8of5eBc8jZoxxdleJVLLdMl8UeZHNwhsVp64SFiCT4BRIIfcs7uxTPUCjmWxK_OA1s-FfIW7AYJpZIJ2NIJpcIQI0t7nim11bHRpYWRkcnO4cgA2NjFub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdXYyLnByb2Quc3RhdHVzaW0ubmV0BnZfADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhAo0C-VvfgHiXrxZi3umDiooXMGY9FvYj5_d1Q4EeS7eyg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
             },
             "wss/p2p/waku": {
-                "node-01.do-ams3.waku.sandbox": "/dns4/node-01.do-ams3.waku.sandbox.status.im/tcp/8000/wss/p2p/16Uiu2HAmQSMNExfUYUqfuXWkD5DaNZnMYnigRxFKbk3tcEFQeQeE",
-                "node-01.gc-us-central1-a.waku.sandbox": "/dns4/node-01.gc-us-central1-a.waku.sandbox.status.im/tcp/8000/wss/p2p/16Uiu2HAm6fyqE1jB5MonzvoMdU8v76bWV8ZeNpncDamY1MQXfjdB",
-                "node-01.ac-cn-hongkong-c.waku.sandbox": "/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/8000/wss/p2p/16Uiu2HAmSJvSJphxRdbnigUV5bjRRZFBhTtWFTSyiKaQByCjwmpV"
+                "node-01.do-ams3.wakuv2.prod": "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+                "node-01.gc-us-central1-a.wakuv2.prod": "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA",
+                "node-01.ac-cn-hongkong-c.wakuv2.prod": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD"
+            }
+        },
+        "wakuv2.test": {
+            "tcp/p2p/waku": {
+                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+                "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS",
+                "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"
+            },
+            "wss/p2p/waku": {
+                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+                "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS",
+                "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": {
@@ -166,9 +183,9 @@
                 "boot-01.ac-cn-hongkong-c.shards.test": "/dns4/boot-01.ac-cn-hongkong-c.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmGwcE8v7gmJNEWFtZtojYpPMTHy2jBLL6xRk33qgDxFWX"
             },
             "enr/p2p/waku/boot": {
-                "boot-01.do-ams3.shards.test": "enr:-QEQuEAdkU8UWa5vvRr-uoULGoyWflIOozVUWj-9iUXw7nEo_yWKmDKrYJ_t4rSwbRLobDy8M0mO8HQyDFVfdQxDZQRVAYJpZIJ2NIJpcISnYxMvim11bHRpYWRkcnO4YAAtNihib290LTAxLmRvLWFtczMuc2hhcmRzLnRlc3Quc3RhdHVzaW0ubmV0BnZfAC82KGJvb3QtMDEuZG8tYW1zMy5zaGFyZHMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEC3rRtFQSgc24uWewzXaxTY8hDAHB8sgnxr9k8Rjb5GeSDdGNwgnZfg3VkcIIjKIV3YWt1Mg0",
-                "boot-01.gc-us-central1-a.shards.test": "enr:-QEiuECIDOWRVQAUq2xpm3EUhuLRH1e_WCiLa6-5zmLoyVB-QSkSealvjt5Zb7cEqhU0pIeRaqnX6b8s98BahmG2XaSIAYJpZIJ2NIJpcIQihw1Xim11bHRpYWRkcnO4cgA2NjFib290LTAxLmdjLXVzLWNlbnRyYWwxLWEuc2hhcmRzLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MWJvb3QtMDEuZ2MtdXMtY2VudHJhbDEtYS5zaGFyZHMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaECxjqgDQ0WyRSOilYU32DA5k_XNlDis3m1VdXkK9xM6kODdGNwgnZfg3VkcIIjKIV3YWt1Mg0",
-                "boot-01.ac-cn-hongkong-c.shards.test": "enr:-QEiuEDvfBDIqKRhdBHfGkRLvbYdD8Cja_m8tqWqUG40zXDUSTWejzvi2TL7z4H9gMhy2asTJ0vBTMjpQPj6Te-e2uAFAYJpZIJ2NIJpcIQI2hdMim11bHRpYWRkcnO4cgA2NjFib290LTAxLmFjLWNuLWhvbmdrb25nLWMuc2hhcmRzLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MWJvb3QtMDEuYWMtY24taG9uZ2tvbmctYy5zaGFyZHMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEDP7CbRk-YKJwOFFM4Z9ney0GPc7WPJaCwGkpNRyla7mCDdGNwgnZfg3VkcIIjKIV3YWt1Mg0"
+                "boot-01.do-ams3.shards.test": "enr:-QEOuEAuAK49evunDoidpHqcmeVqZz73wt4jwHnHJlmCVBFj6EdIbZ9uH5BnCYKOEPJTns2QJKUR2XLtWyzIspPAfJF9AYJpZIJ2NIJpcISnYxMvim11bHRpYWRkcnO4YAAtNihib290LTAxLmRvLWFtczMuc2hhcmRzLnRlc3Quc3RhdHVzaW0ubmV0BnZfAC82KGJvb3QtMDEuZG8tYW1zMy5zaGFyZHMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4Jyc4sAEAQAIABAAIABAIlzZWNwMjU2azGhAt60bRUEoHNuLlnsM12sU2PIQwBwfLIJ8a_ZPEY2-Rnkg3RjcIJ2X4N1ZHCCIyiFd2FrdTIN",
+                "boot-01.gc-us-central1-a.shards.test": "enr:-QEguEC3wjzOk7U5rIqiX32CCD-0_J1cYYGK_YwKSah5di2NTxJUaKQ9B7NMiEQ_-YGm-Eus4SzHtxN_fXEuVaNHql9aAYJpZIJ2NIJpcIQihw1Xim11bHRpYWRkcnO4cgA2NjFib290LTAxLmdjLXVzLWNlbnRyYWwxLWEuc2hhcmRzLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MWJvb3QtMDEuZ2MtdXMtY2VudHJhbDEtYS5zaGFyZHMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4Jyc4sAEAQAIABAAIABAIlzZWNwMjU2azGhAsY6oA0NFskUjopWFN9gwOZP1zZQ4rN5tVXV5CvcTOpDg3RjcIJ2X4N1ZHCCIyiFd2FrdTIN",
+                "boot-01.ac-cn-hongkong-c.shards.test": "enr:-QEguEBb4rlxsdYCIZ8NcAlcjnb2zp4C9JbDsz-01Ix2sKNdWzI79KRFnhlakX-4F8gRYcviDvQL5eEZDOxHTupUW7VXAYJpZIJ2NIJpcIQI2hdMim11bHRpYWRkcnO4cgA2NjFib290LTAxLmFjLWNuLWhvbmdrb25nLWMuc2hhcmRzLnRlc3Quc3RhdHVzaW0ubmV0BnZfADg2MWJvb3QtMDEuYWMtY24taG9uZ2tvbmctYy5zaGFyZHMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4Jyc4sAEAQAIABAAIABAIlzZWNwMjU2azGhAz-wm0ZPmCicDhRTOGfZ3stBj3O1jyWgsBpKTUcpWu5gg3RjcIJ2X4N1ZHCCIyiFd2FrdTIN"
             },
             "wss/p2p/waku/boot": {
                 "boot-01.do-ams3.shards.test": "/dns4/boot-01.do-ams3.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmAR24Mbb6VuzoyUiGx42UenDkshENVDj4qnmmbabLvo31",
@@ -184,12 +201,12 @@
                 "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:-QESuEBxlk35-NNVnppRQaNSB3fR4M7J7xK3NUYer3z-L9j0uTpg9MatcSEHLUFkf4lt5qxacyBxD6G1w5elhdSgeKo4AYJpZIJ2NIJpcISf3_Jeim11bHRpYWRkcnO4YgAuNilzdG9yZS0wMS5kby1hbXMzLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAwNilzdG9yZS0wMS5kby1hbXMzLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJzjQAQBQABACAAQACAAQCJc2VjcDI1NmsxoQLfoaQH3oSYW59yxEBfeAZbltmUnC4BzYkHqer2VQMTyoN0Y3CCdl-DdWRwgiMohXdha3UyAw",
-                "store-02.do-ams3.shards.test": "enr:-QESuEC_CCKHt-bfmNcpFhY4_RyzEPfb9qXDzc7-2mo0oTanx2pMNLVkGYQuAWzgS14nGqecJ4qNGnJf0iW6xmk7bvgSAYJpZIJ2NIJpcISf3_Kaim11bHRpYWRkcnO4YgAuNilzdG9yZS0wMi5kby1hbXMzLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAwNilzdG9yZS0wMi5kby1hbXMzLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJzjQAQBQABACAAQACAAQCJc2VjcDI1NmsxoQLSM62HmqGpZ382YM4CyI-MCIlkxMP7ZbOwqwRPvk9wsIN0Y3CCdl-DdWRwgiMohXdha3UyAw",
-                "store-01.gc-us-central1-a.shards.test": "enr:-QEkuEDdeEvvLl4imez1cjafogCr4Y9TC739Io6U7J78VG6ong2UtkKNADtupsHKArUcc13jCZI_O4z6XnLz6zYLpDn-AYJpZIJ2NIJpcIQiqsAnim11bHRpYWRkcnO4dAA3NjJzdG9yZS0wMS5nYy11cy1jZW50cmFsMS1hLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA5NjJzdG9yZS0wMS5nYy11cy1jZW50cmFsMS1hLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJzjQAQBQABACAAQACAAQCJc2VjcDI1NmsxoQN_aBxNsOBrceDLyC75vBFRuzv_tWfaHG50Jc9DQztwkIN0Y3CCdl-DdWRwgiMohXdha3UyAw",
-                "store-02.gc-us-central1-a.shards.test": "enr:-QEkuEA98rxs-uF2s5E1qVW-yg7p7y6JZ5sFCDmeQOvaeQekLwbEO_O68XfOFCmuJsWwmA00HtnnbkAfFaYy0ZhsHWbKAYJpZIJ2NIJpcIQiqpoCim11bHRpYWRkcnO4dAA3NjJzdG9yZS0wMi5nYy11cy1jZW50cmFsMS1hLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA5NjJzdG9yZS0wMi5nYy11cy1jZW50cmFsMS1hLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJzjQAQBQABACAAQACAAQCJc2VjcDI1NmsxoQNbEg1bkMJCBiD5Tje3Z_11R-kd9munZF0v4iiYZa1jgoN0Y3CCdl-DdWRwgiMohXdha3UyAw",
-                "store-01.ac-cn-hongkong-c.shards.test": "enr:-QEkuEAIYrY2284THz1f4FkFEr7PIHw5GrBLEd_4UZWMh1aCGUzePYMf-YIaw_-bEqfqRK_1p7RJVgLupl8EaENIUXG3AYJpZIJ2NIJpcIQI2kpJim11bHRpYWRkcnO4dAA3NjJzdG9yZS0wMS5hYy1jbi1ob25na29uZy1jLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA5NjJzdG9yZS0wMS5hYy1jbi1ob25na29uZy1jLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJzjQAQBQABACAAQACAAQCJc2VjcDI1NmsxoQJm10jdarzx9hcdhRKGfsAyS0Hc5pWj3yhyTvT5FIwKGIN0Y3CCdl-DdWRwgiMohXdha3UyAw",
-                "store-02.ac-cn-hongkong-c.shards.test": "enr:-QEkuECDx1C82BBcVM4UAFnTNTRe8zwX6vIy3iYU3qOyJJZGuDhceqbwVwW_Nc5j6tAUgnotg_jiZiNXoj_tJrFildM4AYJpZIJ2NIJpcIQI2nnoim11bHRpYWRkcnO4dAA3NjJzdG9yZS0wMi5hYy1jbi1ob25na29uZy1jLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA5NjJzdG9yZS0wMi5hYy1jbi1ob25na29uZy1jLnNoYXJkcy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DgnJzjQAQBQABACAAQACAAQCJc2VjcDI1NmsxoQLMncuu6pJ3DQRzYUqkB1PbaRxZXIGJi8waKbbBFbOSNIN0Y3CCdl-DdWRwgiMohXdha3UyAw"
+                "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",

shadow-cljs.edn

@@ -2,7 +2,7 @@
 {:source-paths ["src" "test/cljs"]
 
  :dependencies [[reagent "1.2.0"]
-                [re-frame "1.4.3"]
+                [re-frame "1.3.0"]
                 [binaryage/oops "0.7.2"]
                 [com.andrewmcveigh/cljs-time "0.5.2"]
                 [com.taoensso/timbre "6.3.1"]

src/js/worklets/header_animations.js

@@ -1,25 +0,0 @@
-import {
-  useDerivedValue,
-  interpolate,
-  interpolateColor,
-  Extrapolation,
-  useAnimatedStyle,
-} from 'react-native-reanimated';
-
-const CLAMP_MIN = 0;
-const CLAMP_MAX = 60;
-const BLUR_MIN = 1;
-const BLUR_MAX = 15;
-
-export const useBlurAmount = (sharedValue) =>
-  useDerivedValue(() =>
-    parseInt(interpolate(sharedValue.value, [CLAMP_MIN, CLAMP_MAX], [BLUR_MIN, BLUR_MAX], Extrapolation.CLAMP)),
-  );
-
-export function useLayerOpacity(sharedValue, from, to) {
-  return useAnimatedStyle(() => ({
-    flex: 1,
-    justifyContent: 'flex-end',
-    backgroundColor: interpolateColor(sharedValue.value, [0, 60], [from, to], 'RGB'),
-  }));
-}

src/js/worklets/parallax.js

@@ -0,0 +1,46 @@
+import { useAnimatedStyle, useAnimatedSensor, withTiming, interpolate, SensorType } from 'react-native-reanimated';
+import { Platform } from 'react-native';
+
+const PI = Math.PI;
+
+/*
+sensorAnimatedImage uses the pitch and roll of a device to move the content on screen in the respective direction. 
+
+This approach mostly follows the example here:
+https://github.com/notJust-dev/iOSLockScreen/blob/main/src/components/SensorAnimatedImage.js
+
+which is explained in better detail in this video 
+https://www.youtube.com/watch?v=iEBoZDHCN5Y&t=2205s
+there is a bug with the pitch and roll calculations provided directly from the sensor data so the calculation had to
+be done using the quaternions directly.
+This link is useful to understand this: https://engineering.stackexchange.com/questions/3348/calculating-pitch-yaw-and-roll-from-mag-acc-and-gyro-data
+*/
+export function sensorAnimatedImage(zIndex, offset, stretch) {
+  'worklet';
+  const rotationSensor = useAnimatedSensor(SensorType.ROTATION, { interval: 30 });
+  return useAnimatedStyle(function () {
+    const { qx, qz, qw, qy, pitch } = rotationSensor.sensor.value;
+
+    const roll = Math.asin(-2.0 * (qx * qz - qw * qy));
+
+    const translateY = withTiming(
+      interpolate(pitch, Platform.OS === 'ios' ? [-PI, PI] : [PI, -PI], [
+        (-offset * 3) / zIndex - offset + (offset - stretch),
+        (offset * 3) / zIndex - offset + (offset - stretch),
+      ]),
+      { duration: 10 },
+    );
+    const translateX = withTiming(
+      interpolate(
+        roll,
+        [1, -1],
+        [(-offset * 2) / zIndex - offset + (offset - stretch), (offset * 2) / zIndex - offset + (offset - stretch)],
+      ),
+      { duration: 10 },
+    );
+
+    return {
+      transform: [{ translateX }, { translateY }],
+    };
+  });
+}

src/legacy/status_im/browser/core.cljs

@@ -11,11 +11,9 @@
     [legacy.status-im.utils.random :as random]
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
-    [react-native.core :as react]
     [react-native.platform :as platform]
     [status-im.common.json-rpc.events :as json-rpc]
     [status-im.common.universal-links :as links]
-    [status-im.config :as config]
     [status-im.constants :as constants]
     [status-im.contexts.chat.events :as chat.events]
     [status-im.navigation.events :as navigation]
@@ -304,18 +302,16 @@
                         :history       [normalized-url]}]
     (if (links/universal-link? normalized-url)
       {:dispatch [:universal-links/handle-url normalized-url]}
-      (if config/show-not-implemented-features?
-        (rf/merge cofx
-                  {:db (assoc db
-                              :browser/options
-                              {:browser-id (:browser-id browser)}
-                              :browser/screen-id :browser)}
-                  (navigation/pop-to-root :shell-stack)
-                  (chat.events/close-chat)
-                  (navigation/change-tab :browser-stack)
-                  (update-browser browser)
-                  (resolve-url nil))
-        (.openURL ^js react/linking (url/normalize-url url))))))
+      (rf/merge cofx
+                {:db (assoc db
+                            :browser/options
+                            {:browser-id (:browser-id browser)}
+                            :browser/screen-id :browser)}
+                (navigation/pop-to-root :shell-stack)
+                (chat.events/close-chat)
+                (navigation/change-tab :browser-stack)
+                (update-browser browser)
+                (resolve-url nil)))))
 
 (rf/defn open-existing-browser
   "Opens an existing browser with it's history"

src/legacy/status_im/browser/core_test.cljs

@@ -1,5 +1,8 @@
 (ns legacy.status-im.browser.core-test
   (:require
+    [cljs.test :refer-macros [deftest is testing]]
+    [legacy.status-im.browser.core :as browser]
+    [utils.i18n :as i18n]
     [utils.url :as url]))
 
 (defn has-wrong-properties?
@@ -18,103 +21,101 @@
   (some #(when (= (url/normalize-and-decode-url dapp-url) (first (:history %))) (:browser-id %))
         (vals (get-in result [:db :browser/browsers]))))
 
-#_(deftest browser-test
-    (let [dapp1-url "cryptokitties.co"
-          dapp2-url "http://test2.com"]
+(deftest browser-test
+  (let [dapp1-url "cryptokitties.co"
+        dapp2-url "http://test2.com"]
 
-      (testing "user opens a dapp"
-        (let [result-open (browser/open-url {:db {} :now 1} dapp1-url)
-              dapp1-id    (get-dapp-id result-open dapp1-url)]
-          (is (= dapp1-id (get-in result-open [:db :browser/options :browser-id]))
-              "browser-id should be dapp1-url")
-          (is (not (has-wrong-properties? result-open
-                                          dapp1-id
-                                          {:browser-id    dapp1-id
-                                           :history-index 0
-                                           :history       ["https://cryptokitties.co"]
-                                           :dapp?         false
-                                           :name          (i18n/label :t/browser)}))
-              "some properties of the browser are not correct")
+    (testing "user opens a dapp"
+      (let [result-open (browser/open-url {:db {} :now 1} dapp1-url)
+            dapp1-id    (get-dapp-id result-open dapp1-url)]
+        (is (= dapp1-id (get-in result-open [:db :browser/options :browser-id]))
+            "browser-id should be dapp1-url")
+        (is (not (has-wrong-properties? result-open
+                                        dapp1-id
+                                        {:browser-id    dapp1-id
+                                         :history-index 0
+                                         :history       ["https://cryptokitties.co"]
+                                         :dapp?         false
+                                         :name          (i18n/label :t/browser)}))
+            "some properties of the browser are not correct")
 
-          (testing "then a second dapp"
-            (let [result-open-2 (browser/open-url {:db  (:db result-open)
-                                                   :now 2}
-                                                  dapp2-url)
-                  dapp2-id      (get-dapp-id result-open-2 dapp2-url)]
-              (is (= dapp2-id (get-in result-open-2 [:db :browser/options :browser-id]))
-                  "browser-id should be dapp2 host")
-              (is (not (has-wrong-properties? result-open-2
-                                              dapp2-id
-                                              {:browser-id    dapp2-id
-                                               :history-index 0
-                                               :history       ["http://test2.com"]
-                                               :dapp?         false}))
-                  "some properties of the browser are not correct")
+        (testing "then a second dapp"
+          (let [result-open-2 (browser/open-url {:db  (:db result-open)
+                                                 :now 2}
+                                                dapp2-url)
+                dapp2-id      (get-dapp-id result-open-2 dapp2-url)]
+            (is (= dapp2-id (get-in result-open-2 [:db :browser/options :browser-id]))
+                "browser-id should be dapp2 host")
+            (is (not (has-wrong-properties? result-open-2
+                                            dapp2-id
+                                            {:browser-id    dapp2-id
+                                             :history-index 0
+                                             :history       ["http://test2.com"]
+                                             :dapp?         false}))
+                "some properties of the browser are not correct")
 
-              (testing "then removes the second dapp"
-                (let [result-remove-2 (browser/remove-browser {:db (:db result-open-2)} dapp2-id)]
-                  (is (= #{dapp1-id}
-                         (set (keys (get-in result-remove-2 [:db :browser/browsers]))))
-                      "the second dapp shouldn't be in the browser list anymore")))))
+            (testing "then removes the second dapp"
+              (let [result-remove-2 (browser/remove-browser {:db (:db result-open-2)} dapp2-id)]
+                (is (= #{dapp1-id}
+                       (set (keys (get-in result-remove-2 [:db :browser/browsers]))))
+                    "the second dapp shouldn't be in the browser list anymore")))))
 
-          (testing "then opens the dapp again"
-            (let [result-open-existing (browser/open-existing-browser {:db  (:db result-open)
-                                                                       :now 2}
-                                                                      dapp1-id)
-                  dapp1-url2           (str "https://" dapp1-url "/nav2")]
-              (is (not (has-wrong-properties? result-open-existing
-                                              dapp1-id
-                                              {:browser-id    dapp1-id
-                                               :history-index 0
-                                               :history       ["https://cryptokitties.co"]
-                                               :dapp?         false
-                                               :name          (i18n/label :t/browser)}))
-                  "some properties of the browser are not correct")
-              (is (nil? (browser/navigate-to-next-page result-open-existing))
-                  "nothing should happen if user tries to navigate to next page")
-              (is (nil? (browser/navigate-to-previous-page result-open-existing))
-                  "nothing should happen if user tries to navigate to previous page")
+        (testing "then opens the dapp again"
+          (let [result-open-existing (browser/open-existing-browser {:db  (:db result-open)
+                                                                     :now 2}
+                                                                    dapp1-id)
+                dapp1-url2           (str "https://" dapp1-url "/nav2")]
+            (is (not (has-wrong-properties? result-open-existing
+                                            dapp1-id
+                                            {:browser-id    dapp1-id
+                                             :history-index 0
+                                             :history       ["https://cryptokitties.co"]
+                                             :dapp?         false
+                                             :name          (i18n/label :t/browser)}))
+                "some properties of the browser are not correct")
+            (is (nil? (browser/navigate-to-next-page result-open-existing))
+                "nothing should happen if user tries to navigate to next page")
+            (is (nil? (browser/navigate-to-previous-page result-open-existing))
+                "nothing should happen if user tries to navigate to previous page")
 
-              (testing "then navigates to a new url in the dapp"
-                (let [result-navigate (browser/navigation-state-changed
-                                       {:db  (:db result-open-existing)
-                                        :now 4}
-                                       (clj->js {"url"     dapp1-url2
-                                                 "loading" false})
-                                       false)]
-                  (is (not (has-wrong-properties? result-navigate
+            (testing "then navigates to a new url in the dapp"
+              (let [result-navigate (browser/navigation-state-changed
+                                     {:db  (:db result-open-existing)
+                                      :now 4}
+                                     (clj->js {"url"     dapp1-url2
+                                               "loading" false})
+                                     false)]
+                (is (not (has-wrong-properties? result-navigate
+                                                dapp1-id
+                                                {:browser-id    dapp1-id
+                                                 :history-index 1
+                                                 :history       ["https://cryptokitties.co" dapp1-url2]
+                                                 :dapp?         false
+                                                 :name          (i18n/label :t/browser)}))
+                    "some properties of the browser are not correct")
+
+                (testing "then navigates to previous page"
+                  (let [result-previous (browser/navigate-to-previous-page {:db  (:db result-navigate)
+                                                                            :now 5})]
+                    (is
+                     (not (has-wrong-properties? result-previous
+                                                 dapp1-id
+                                                 {:browser-id    dapp1-id
+                                                  :history-index 0
+                                                  :history       ["https://cryptokitties.co" dapp1-url2]
+                                                  :dapp?         false
+                                                  :name          (i18n/label :t/browser)}))
+                     "some properties of the browser are not correct")
+
+                    (testing "then navigates to next page")
+                    (let [result-next (browser/navigate-to-next-page {:db  (:db result-previous)
+                                                                      :now 6})]
+                      (is (not
+                           (has-wrong-properties? result-next
                                                   dapp1-id
                                                   {:browser-id    dapp1-id
                                                    :history-index 1
                                                    :history       ["https://cryptokitties.co" dapp1-url2]
                                                    :dapp?         false
                                                    :name          (i18n/label :t/browser)}))
-                      "some properties of the browser are not correct")
-
-                  (testing "then navigates to previous page"
-                    (let [result-previous (browser/navigate-to-previous-page {:db  (:db result-navigate)
-                                                                              :now 5})]
-                      (is
-                       (not (has-wrong-properties? result-previous
-                                                   dapp1-id
-                                                   {:browser-id    dapp1-id
-                                                    :history-index 0
-                                                    :history       ["https://cryptokitties.co"
-                                                                    dapp1-url2]
-                                                    :dapp?         false
-                                                    :name          (i18n/label :t/browser)}))
-                       "some properties of the browser are not correct")
-
-                      (testing "then navigates to next page")
-                      (let [result-next (browser/navigate-to-next-page {:db  (:db result-previous)
-                                                                        :now 6})]
-                        (is (not
-                             (has-wrong-properties? result-next
-                                                    dapp1-id
-                                                    {:browser-id    dapp1-id
-                                                     :history-index 1
-                                                     :history       ["https://cryptokitties.co"
-                                                                     dapp1-url2]
-                                                     :dapp?         false
-                                                     :name          (i18n/label :t/browser)}))
-                            "some properties of the browser are not correct"))))))))))))
+                          "some properties of the browser are not correct"))))))))))))

src/legacy/status_im/browser/permissions_test.cljs

@@ -1,90 +1,96 @@
-(ns legacy.status-im.browser.permissions-test)
+(ns legacy.status-im.browser.permissions-test
+  (:require
+    [cljs.test :refer-macros [deftest is testing]]
+    [legacy.status-im.browser.core :as browser]
+    [legacy.status-im.browser.core-test :as core.tests]
+    [legacy.status-im.browser.permissions :as permissions]
+    [legacy.status-im.utils.deprecated-types :as types]))
 
-#_(deftest permissions-test
-    (let [dapp-name  "test.com"
-          dapp-name2 "test2.org"
-          cofx       {:db (assoc-in (:db (browser/open-url {:db {}} dapp-name))
-                           [:profile/profile :public-key]
-                           "public-key")}
-          dapp-id    (core.tests/get-dapp-id cofx dapp-name)]
-      (testing "dapps permissions are initialized"
-        (is (zero? (count (get-in cofx [:db :dapps/permissions]))))
-        (is (= dapp-id (get-in cofx [:db :browser/options :browser-id]))))
+(deftest permissions-test
+  (let [dapp-name  "test.com"
+        dapp-name2 "test2.org"
+        cofx       {:db (assoc-in (:db (browser/open-url {:db {}} dapp-name))
+                         [:profile/profile :public-key]
+                         "public-key")}
+        dapp-id    (core.tests/get-dapp-id cofx dapp-name)]
+    (testing "dapps permissions are initialized"
+      (is (zero? (count (get-in cofx [:db :dapps/permissions]))))
+      (is (= dapp-id (get-in cofx [:db :browser/options :browser-id]))))
 
-      (testing "receiving an unsupported permission"
-        (let [result-ask (browser/process-bridge-message cofx
-                                                         (types/clj->json
-                                                          {:type       "api-request"
-                                                           :host       dapp-name
-                                                           :messageId  0
-                                                           :permission "FAKE_PERMISSION"}))]
-          (is (not (get-in result-ask [:browser/send-to-bridge :isAllowed])))))
+    (testing "receiving an unsupported permission"
+      (let [result-ask (browser/process-bridge-message cofx
+                                                       (types/clj->json
+                                                        {:type       "api-request"
+                                                         :host       dapp-name
+                                                         :messageId  0
+                                                         :permission "FAKE_PERMISSION"}))]
+        (is (not (get-in result-ask [:browser/send-to-bridge :isAllowed])))))
 
-      (testing "receiving a supported permission"
-        (let [result-ask (browser/process-bridge-message cofx
-                                                         (types/clj->json {:type       "api-request"
-                                                                           :host       dapp-name
-                                                                           :messageId  1
-                                                                           :permission "contact-code"}))]
-          (is (= (get-in result-ask [:db :browser/options :show-permission])
-                 {:requested-permission "contact-code"
-                  :dapp-name            "test.com"
-                  :message-id           1
-                  :yield-control?       nil}))
-          (is (zero? (count (get-in result-ask [:db :dapps/permissions]))))
-
-          (testing "then user accepts the supported permission"
-            (let [accept-result (permissions/allow-permission {:db (:db result-ask)})]
-              (is (= (get accept-result :browser/send-to-bridge)
-                     {:type       "api-response"
-                      :messageId  1
-                      :isAllowed  true
-                      :data       "public-key"
-                      :permission "contact-code"})
-                  "the data should have been sent to the bridge")
-              (is (= (get-in accept-result [:db :dapps/permissions])
-                     {"test.com" {:dapp "test.com" :permissions ["contact-code"]}})
-                  "the dapp should now have CONTACT_CODE permission")
-
-              (testing "then dapp asks for permission again"
-                (let [result-ask-again (browser/process-bridge-message {:db (:db accept-result)}
-                                                                       (types/clj->json
-                                                                        {:type       "api-request"
+    (testing "receiving a supported permission"
+      (let [result-ask (browser/process-bridge-message cofx
+                                                       (types/clj->json {:type       "api-request"
                                                                          :host       dapp-name
-                                                                         :messageId  2
+                                                                         :messageId  1
                                                                          :permission "contact-code"}))]
-                  (is (= (get result-ask-again :browser/send-to-bridge)
-                         {:type       "api-response"
-                          :isAllowed  true
-                          :messageId  2
-                          :data       "public-key"
-                          :permission "contact-code"})
-                      "the response should be immediatly sent to the bridge")))
+        (is (= (get-in result-ask [:db :browser/options :show-permission])
+               {:requested-permission "contact-code"
+                :dapp-name            "test.com"
+                :message-id           1
+                :yield-control?       nil}))
+        (is (zero? (count (get-in result-ask [:db :dapps/permissions]))))
 
-              (testing "then user switch to another dapp that asks for permissions"
-                (let [new-dapp    (browser/open-url {:db (:db accept-result)} dapp-name2)
-                      result-ask2 (browser/process-bridge-message {:db (:db new-dapp)}
-                                                                  (types/clj->json
-                                                                   {:type       "api-request"
-                                                                    :host       dapp-name2
-                                                                    :messageId  3
-                                                                    :permission "contact-code"}))]
-                  (is (= (get-in result-ask2 [:db :dapps/permissions])
-                         {"test.com" {:dapp "test.com" :permissions ["contact-code"]}})
-                      "there should only be permissions for dapp-name at that point")
-                  (is (nil? (get result-ask2 :browser/send-to-bridge))
-                      "no message should be sent to the bridge")
+        (testing "then user accepts the supported permission"
+          (let [accept-result (permissions/allow-permission {:db (:db result-ask)})]
+            (is (= (get accept-result :browser/send-to-bridge)
+                   {:type       "api-response"
+                    :messageId  1
+                    :isAllowed  true
+                    :data       "public-key"
+                    :permission "contact-code"})
+                "the data should have been sent to the bridge")
+            (is (= (get-in accept-result [:db :dapps/permissions])
+                   {"test.com" {:dapp "test.com" :permissions ["contact-code"]}})
+                "the dapp should now have CONTACT_CODE permission")
 
-                  (testing "then user accepts permission for dapp-name2"
-                    (let [accept-result2 (permissions/allow-permission {:db (:db result-ask2)})]
-                      (is (= (get-in accept-result2 [:db :dapps/permissions])
-                             {"test.com"  {:dapp "test.com" :permissions ["contact-code"]}
-                              "test2.org" {:dapp "test2.org" :permissions ["contact-code"]}})
-                          "there should be permissions for both dapps now")
-                      (is (= (get accept-result2 :browser/send-to-bridge)
-                             {:type       "api-response"
-                              :isAllowed  true
-                              :messageId  3
-                              :data       "public-key"
-                              :permission "contact-code"})
-                          "the response should be sent to the bridge")))))))))))
+            (testing "then dapp asks for permission again"
+              (let [result-ask-again (browser/process-bridge-message {:db (:db accept-result)}
+                                                                     (types/clj->json
+                                                                      {:type       "api-request"
+                                                                       :host       dapp-name
+                                                                       :messageId  2
+                                                                       :permission "contact-code"}))]
+                (is (= (get result-ask-again :browser/send-to-bridge)
+                       {:type       "api-response"
+                        :isAllowed  true
+                        :messageId  2
+                        :data       "public-key"
+                        :permission "contact-code"})
+                    "the response should be immediatly sent to the bridge")))
+
+            (testing "then user switch to another dapp that asks for permissions"
+              (let [new-dapp    (browser/open-url {:db (:db accept-result)} dapp-name2)
+                    result-ask2 (browser/process-bridge-message {:db (:db new-dapp)}
+                                                                (types/clj->json
+                                                                 {:type       "api-request"
+                                                                  :host       dapp-name2
+                                                                  :messageId  3
+                                                                  :permission "contact-code"}))]
+                (is (= (get-in result-ask2 [:db :dapps/permissions])
+                       {"test.com" {:dapp "test.com" :permissions ["contact-code"]}})
+                    "there should only be permissions for dapp-name at that point")
+                (is (nil? (get result-ask2 :browser/send-to-bridge))
+                    "no message should be sent to the bridge")
+
+                (testing "then user accepts permission for dapp-name2"
+                  (let [accept-result2 (permissions/allow-permission {:db (:db result-ask2)})]
+                    (is (= (get-in accept-result2 [:db :dapps/permissions])
+                           {"test.com"  {:dapp "test.com" :permissions ["contact-code"]}
+                            "test2.org" {:dapp "test2.org" :permissions ["contact-code"]}})
+                        "there should be permissions for both dapps now")
+                    (is (= (get accept-result2 :browser/send-to-bridge)
+                           {:type       "api-response"
+                            :isAllowed  true
+                            :messageId  3
+                            :data       "public-key"
+                            :permission "contact-code"})
+                        "the response should be sent to the bridge")))))))))))

src/legacy/status_im/fleet/core_test.cljs

@@ -9,7 +9,8 @@
       (testing "it returns the default fleets"
         (is (=
              #{:eth.prod
-               :eth.staging}
+               :eth.staging
+               :eth.test}
              (into #{}
                    (keys (node/fleets {})))))))
     (testing "passing a custom fleet"

src/legacy/status_im/ui/components/list_selection.cljs

@@ -5,7 +5,6 @@
     [legacy.status-im.ui.components.react :as react]
     [re-frame.core :as re-frame]
     [react-native.platform :as platform]
-    [status-im.config :as config]
     [utils.i18n :as i18n]
     [utils.url :as url]))
 
@@ -28,13 +27,10 @@
 (defn browse
   [link]
   (show {:title       (i18n/label :t/browsing-title)
-         :options     (if config/show-not-implemented-features?
-                        [{:label  (i18n/label :t/browsing-open-in-status)
-                          :action #(re-frame/dispatch [:browser.ui/open-url link])}
-                         {:label  (i18n/label (platform-web-browser))
-                          :action #(.openURL ^js react/linking (url/normalize-url link))}]
-                        [{:label  (i18n/label (platform-web-browser))
-                          :action #(.openURL ^js react/linking (url/normalize-url link))}])
+         :options     [{:label  (i18n/label :t/browsing-open-in-status)
+                        :action #(re-frame/dispatch [:browser.ui/open-url link])}
+                       {:label  (i18n/label (platform-web-browser))
+                        :action #(.openURL ^js react/linking (url/normalize-url link))}]
          :cancel-text (i18n/label :t/browsing-cancel)}))
 
 (defn browse-in-web-browser

src/mocks/js_dependencies.cljs

@@ -418,7 +418,6 @@
     "react-native-transparent-video"                   react-native-transparent-video
     "react-native-orientation-locker"                  react-native-orientation-locker
     "react-native-gifted-charts"                       react-native-gifted-charts
-    "@walletconnect/react-native-compat"               #js {}
     "../resources/data/emojis/en.json"                 (js/JSON.parse
                                                         (slurp
                                                          "./resources/data/emojis/en.json"))
@@ -438,7 +437,6 @@
     "../src/js/worklets/parallax.js"                   #js {}
     "../src/js/worklets/profile_header.js"             #js {}
     "../src/js/worklets/identifiers_highlighting.js"   #js {}
-    "../src/js/worklets/header_animations.js"          #js {}
     "./fleets.js"                                      default-fleets
     "../translations/ar.json"                          (js/JSON.parse (slurp "./translations/ar.json"))
     "../translations/de.json"                          (js/JSON.parse (slurp "./translations/de.json"))

src/native_module/core.cljs

@@ -601,11 +601,3 @@
   (.createAccountFromMnemonicAndDeriveAccountsForPaths ^js (account-manager)
                                                        (types/clj->json mnemonic)
                                                        #(callback (types/json->clj %))))
-
-(defn get-connection-string-for-exporting-keypairs-keystores
-  "Generates connection string form status-go for the purpose of exporting keypairs and keystores on sender side"
-  [config-json callback]
-  (log/info "[native-module] Fetching Export Keypairs Connection String"
-            {:fn          :get-connection-string-for-exporting-keypairs-keystores
-             :config-json config-json})
-  (.getConnectionStringForExportingKeypairsKeystores ^js (network) config-json callback))

src/quo/components/avatars/channel_avatar/style.cljs

@@ -7,7 +7,6 @@
 (defn outer-container
   [{:keys [size customization-color theme]}]
   (let [container-size (case size
-                         :size-80 80
                          :size-64 64
                          :size-32 32
                          24)]
@@ -22,7 +21,6 @@
   [size]
   {:text-align :center
    :font-size  (case size
-                 :size-80 36
                  :size-64 24
                  :size-32 15
                  11)})

src/quo/components/avatars/channel_avatar/view.cljs

@@ -11,15 +11,15 @@
 
 (defn- initials
   [{:keys [full-name size customization-color theme]}]
-  (let [amount-initials (if (#{:size-32 :size-64 :size-80} size) 2 1)
+  (let [amount-initials (if (#{:size-32 :size-64} size) 2 1)
         channel-name    (utils.string/safe-replace full-name "#" "")]
     [text/text
      (cond-> {:accessibility-label :initials
               :style               {:color (colors/resolve-color customization-color theme)}
               :size                :paragraph-2
               :weight              :semi-bold}
-       (#{:size-64 :size-80} size) (assoc :size   :heading-1
-                                          :weight :medium))
+       (= size :size-64) (assoc :size   :heading-1
+                                :weight :medium))
      (utils.string/get-initials channel-name amount-initials)]))
 
 (defn- lock

src/quo/components/avatars/collection_avatar/style.cljs

@@ -9,17 +9,10 @@
     :size-20 20
     nil))
 
-(defn collection-avatar-container
-  [theme size]
-  {:width           (get-dimensions size)
-   :height          (get-dimensions size)
-   :border-width    1
-   :border-color    (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme)
-   :border-radius   6
-   :justify-content :center
-   :align-items     :center})
-
 (defn collection-avatar
-  [size]
-  {:width  (get-dimensions size)
-   :height (get-dimensions size)})
+  [theme size]
+  {:width         (get-dimensions size)
+   :height        (get-dimensions size)
+   :border-width  1
+   :border-color  (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme)
+   :border-radius 6})

src/quo/components/avatars/collection_avatar/view.cljs

@@ -2,21 +2,18 @@
   (:require
     [quo.components.avatars.collection-avatar.style :as style]
     [quo.theme :as quo.theme]
-    [react-native.core :as rn]
     [react-native.fast-image :as fast-image]))
 
 (defn view
   "Opts:
-
+   
     :image - collection image
     :theme - keyword -> :light/:dark"
-  [{:keys [image size on-load-start on-load-end on-error] :or {size :size-24}}]
+  [{:keys [image size on-load-end on-error] :or {size :size-24}}]
   (let [theme (quo.theme/use-theme)]
-    [rn/view {:style (style/collection-avatar-container theme size)}
-     [fast-image/fast-image
-      {:accessibility-label :collection-avatar
-       :source              image
-       :on-load-start       on-load-start
-       :on-load-end         on-load-end
-       :on-error            on-error
-       :style               (style/collection-avatar size)}]]))
+    [fast-image/fast-image
+     {:accessibility-label :collection-avatar
+      :source              image
+      :on-load-end         on-load-end
+      :on-error            on-error
+      :style               (style/collection-avatar theme size)}]))

src/quo/components/avatars/community_avatar/component_spec.cljs

@@ -1,9 +0,0 @@
-(ns quo.components.avatars.community-avatar.component-spec
-  (:require [quo.components.avatars.community-avatar.view :as community-avatar]
-            [test-helpers.component :as h]))
-
-(h/describe "Avatars: Community Avatar"
-  (h/test "should render correctly"
-    (h/render-with-theme-provider
-     [community-avatar/view {:image "mock-image"}])
-    (h/is-truthy (h/get-by-label-text :community-avatar))))

src/quo/components/avatars/community_avatar/style.cljs

@@ -1,12 +0,0 @@
-(ns quo.components.avatars.community-avatar.style)
-
-(def ^:private sizes
-  {:size-32 32
-   :size-24 24})
-
-(defn image
-  [size]
-  (let [size-val (sizes size)]
-    {:border-radius (/ size-val 2)
-     :width         size-val
-     :height        size-val}))

src/quo/components/avatars/community_avatar/view.cljs

@@ -1,23 +0,0 @@
-(ns quo.components.avatars.community-avatar.view
-  (:require [quo.components.avatars.community-avatar.style :as style]
-            [react-native.core :as rn]
-            [schema.core :as schema]))
-
-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:size {:optional true} [:maybe [:enum :size-32 :size-24]]]
-      [:image :schema.common/image-source]
-      [:container-style {:optional true} [:maybe :map]]]]]
-   :any])
-
-(defn- view-internal
-  [{:keys [size image container-style]}]
-  [rn/image
-   {:source              image
-    :accessibility-label :community-avatar
-    :style               (merge (style/image size) container-style)}])
-
-(def view (schema/instrument #'view-internal ?schema))

src/quo/components/avatars/dapp_avatar/component_spec.cljs

@@ -1,14 +0,0 @@
-(ns quo.components.avatars.dapp-avatar.component-spec
-  (:require [quo.components.avatars.dapp-avatar.view :as dapp-avatar]
-            [test-helpers.component :as h]))
-
-(h/describe "Avatars: dApp Avatar"
-  (h/test "should render correctly without context"
-    (h/render-with-theme-provider
-     [dapp-avatar/view {:image "mock-image"}])
-    (h/is-truthy (h/get-by-label-text :dapp-avatar)))
-
-  (h/test "should render correctly with context"
-    (h/render-with-theme-provider
-     [dapp-avatar/view {:image "mock-image" :network-image "mock-image" :context? true}])
-    (h/is-truthy (h/get-by-label-text :dapp-avatar))))

src/quo/components/avatars/dapp_avatar/style.cljs

@@ -1,23 +0,0 @@
-(ns quo.components.avatars.dapp-avatar.style)
-
-(def ^:const size 32)
-
-(def container
-  {:height size
-   :width  size})
-
-(def hole-view
-  {:width  size
-   :height size})
-
-(def context
-  {:width         16
-   :height        16
-   :border-radius 8
-   :position      :absolute
-   :right         -4
-   :bottom        -4})
-
-(def image
-  {:width  size
-   :height size})

src/quo/components/avatars/dapp_avatar/view.cljs

@@ -1,42 +0,0 @@
-(ns quo.components.avatars.dapp-avatar.view
-  (:require [quo.components.avatars.dapp-avatar.style :as style]
-            [react-native.core :as rn]
-            [react-native.hole-view :as hole-view]
-            [react-native.platform :as platform]
-            [schema.core :as schema]))
-
-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:context? {:optional true} [:maybe :boolean]]
-      [:image :schema.common/image-source]
-      [:network-image {:optional true} [:maybe :schema.common/image-source]]
-      [:container-style {:optional true} [:maybe :map]]]]]
-   :any])
-
-(defn- view-internal
-  [{:keys [context? image network-image container-style]}]
-  [rn/view
-   {:style               (merge style/container container-style)
-    :accessibility-label :dapp-avatar}
-   [hole-view/hole-view
-    (cond-> {:holes (if context?
-                      [{:x            19
-                        :y            19
-                        :width        18
-                        :height       18
-                        :borderRadius 9}]
-                      [])
-             :style style/hole-view}
-      platform/android? (assoc :key context?))
-    [rn/image
-     {:source image
-      :style  style/image}]]
-   (when context?
-     [rn/image
-      {:source network-image
-       :style  style/context}])])
-
-(def view (schema/instrument #'view-internal ?schema))

src/quo/components/avatars/group_avatar/view.cljs

@@ -1,5 +1,6 @@
 (ns quo.components.avatars.group-avatar.view
   (:require
+    [clojure.string :as string]
     [quo.components.avatars.group-avatar.style :as style]
     [quo.components.icon :as icon]
     [quo.components.markdown.text :as text]
@@ -21,7 +22,7 @@
              :container 80}})
 
 (defn view
-  [{:keys [size customization-color picture icon-name emoji]
+  [{:keys [size customization-color picture icon-name emoji chat-name]
     :or   {size                :size-20
            customization-color :blue
            picture             nil
@@ -49,6 +50,14 @@
             {:size  :paragraph-1
              :style (dissoc (style/avatar-identifier theme) :font-size)}
             emoji])
+         chat-name
+         (if (= size :size-80)
+           [rn/text
+            {:style (style/avatar-identifier theme)}
+            ((comp first string/upper-case) chat-name)]
+           [text/text
+            {:size :paragraph-1}
+            ((comp first string/upper-case) chat-name)])
          :else
          [icon/icon icon-name
           {:size  icon-size

src/quo/components/avatars/token_avatar/component_spec.cljs

@@ -1,14 +0,0 @@
-(ns quo.components.avatars.token-avatar.component-spec
-  (:require [quo.components.avatars.token-avatar.view :as token-avatar]
-            [test-helpers.component :as h]))
-
-(h/describe "Avatars: Token Avatar"
-  (h/test "should render correctly without context"
-    (h/render-with-theme-provider
-     [token-avatar/view {:image "mock-image"}])
-    (h/is-truthy (h/get-by-label-text :token-avatar)))
-
-  (h/test "should render correctly with context"
-    (h/render-with-theme-provider
-     [token-avatar/view {:image "mock-image" :network-image "mock-image" :context? true}])
-    (h/is-truthy (h/get-by-label-text :token-avatar))))

src/quo/components/avatars/token_avatar/style.cljs

@@ -1,25 +0,0 @@
-(ns quo.components.avatars.token-avatar.style)
-
-(def ^:const size 32)
-
-(def container
-  {:height size
-   :width  size})
-
-(def hole-view
-  {:width  size
-   :height size})
-
-(def context
-  {:width         16
-   :height        16
-   :border-radius 8
-   :position      :absolute
-   :right         -4
-   :bottom        -4})
-
-(defn image
-  [type]
-  {:width         size
-   :border-radius (if (= type :collectible) 8 0)
-   :height        size})

src/quo/components/avatars/token_avatar/view.cljs

@@ -1,43 +0,0 @@
-(ns quo.components.avatars.token-avatar.view
-  (:require [quo.components.avatars.token-avatar.style :as style]
-            [react-native.core :as rn]
-            [react-native.hole-view :as hole-view]
-            [react-native.platform :as platform]
-            [schema.core :as schema]))
-
-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:type {:optional true} [:enum :asset :collectible]]
-      [:context? {:optional true} [:maybe :boolean]]
-      [:image :schema.common/image-source]
-      [:network-image {:optional true} [:maybe :schema.common/image-source]]
-      [:container-style {:optional true} [:maybe :map]]]]]
-   :any])
-
-(defn- view-internal
-  [{:keys [type context? image network-image container-style]}]
-  [rn/view
-   {:style               (merge style/container container-style)
-    :accessibility-label :token-avatar}
-   [hole-view/hole-view
-    (cond-> {:holes (if context?
-                      [{:x            19
-                        :y            19
-                        :width        18
-                        :height       18
-                        :borderRadius 9}]
-                      [])
-             :style style/hole-view}
-      platform/android? (assoc :key context?))
-    [rn/image
-     {:source image
-      :style  (style/image type)}]]
-   (when context?
-     [rn/image
-      {:source network-image
-       :style  style/context}])])
-
-(def view (schema/instrument #'view-internal ?schema))

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

@@ -117,7 +117,8 @@
            {:size            (when (#{56 24} size) :paragraph-2)
             :weight          :medium
             :number-of-lines 1
-            :style           {:color label-color}}
+            :style           {:color   label-color
+                              :opacity (when disabled? 0.3)}}
            children]
 
           (vector? children)

src/quo/components/buttons/swap_order_button/component_spec.cljs

@@ -1,23 +0,0 @@
-(ns quo.components.buttons.swap-order-button.component-spec
-  (:require [quo.components.buttons.swap-order-button.view :as swap-order-button]
-            [test-helpers.component :as h]))
-
-(h/describe "Buttons: Swap Order Button"
-  (h/test "should render correctly"
-    (h/render-with-theme-provider
-     [swap-order-button/view {:on-press identity}])
-    (h/is-truthy (h/get-by-label-text :swap-order-button)))
-
-  (h/test "should call on-press handler when pressed"
-    (let [on-press (h/mock-fn)]
-      (h/render-with-theme-provider
-       [swap-order-button/view {:on-press on-press}])
-      (h/fire-event :press (h/get-by-label-text :swap-order-button))
-      (h/was-called on-press)))
-
-  (h/test "should not call on-press handler when button is disabled"
-    (let [on-press (h/mock-fn)]
-      (h/render-with-theme-provider
-       [swap-order-button/view {:on-press on-press :disabled? true}])
-      (h/fire-event :press (h/get-by-label-text :swap-order-button))
-      (h/was-not-called on-press))))

src/quo/components/buttons/swap_order_button/schema.cljs

@@ -1,11 +0,0 @@
-(ns quo.components.buttons.swap-order-button.schema)
-
-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:disabled? {:optional true} [:maybe :boolean]]
-      [:on-press fn?]
-      [:container-style {:optional true} [:maybe :map]]]]]
-   :any])

src/quo/components/buttons/swap_order_button/style.cljs

@@ -1,18 +0,0 @@
-(ns quo.components.buttons.swap-order-button.style
-  (:require [quo.foundations.colors :as colors]))
-
-(defn container
-  [pressed? disabled? theme]
-  {:width            32
-   :height           32
-   :border-radius    10
-   :border-width     1
-   :opacity          (if disabled? 0.3 1)
-   :align-items      :center
-   :justify-content  :center
-   :border-color     (if pressed?
-                       (colors/theme-colors colors/neutral-20 colors/neutral-60 theme)
-                       (colors/theme-colors colors/neutral-10 colors/neutral-80 theme))
-   :background-color (if pressed?
-                       (colors/theme-colors colors/neutral-5 colors/neutral-80 theme)
-                       (colors/theme-colors colors/neutral-2_5 colors/neutral-90 theme))})

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

@@ -1,28 +0,0 @@
-(ns quo.components.buttons.swap-order-button.view
-  (:require [quo.components.buttons.swap-order-button.schema :as swap-order-button.schema]
-            [quo.components.buttons.swap-order-button.style :as style]
-            [quo.components.icon :as icon]
-            [quo.foundations.colors :as colors]
-            quo.theme
-            [react-native.core :as rn]
-            [schema.core :as schema]))
-
-(defn- view-internal
-  [{:keys [disabled? on-press container-style]}]
-  (let [theme                  (quo.theme/use-theme)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true) [])
-        on-press-out           (rn/use-callback #(set-pressed false) [])]
-    [rn/pressable
-     {:style               (merge (style/container pressed? disabled? theme)
-                                  container-style)
-      :accessibility-label :swap-order-button
-      :disabled            disabled?
-      :on-press            on-press
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out}
-     [icon/icon :i/arrow-down
-      {:size  20
-       :color (colors/theme-colors colors/neutral-100 colors/white theme)}]]))
-
-(def view (schema/instrument #'view-internal swap-order-button.schema/?schema))

src/quo/components/community/community_token_gating/component_spec.cljs

@@ -1,61 +0,0 @@
-(ns quo.components.community.community-token-gating.component-spec
-  (:require
-    [quo.core :as quo]
-    [test-helpers.component :as h]))
-
-(h/describe "Community Detail Token Gating Component"
-  (h/test "render with satisfied permissions"
-    (let [mock-on-press-fn      (h/mock-fn)
-          mock-on-press-info-fn (h/mock-fn)]
-      (h/render
-       [quo/community-token-gating
-        {:tokens          [[{:symbol       "ETH"
-                             :sufficient?  true
-                             :collectible? false
-                             :amount       "0.8"
-                             :img-src      nil}]
-                           [{:symbol       "ETH"
-                             :sufficient?  false
-                             :collectible? false
-                             :amount       "1"
-                             :img-src      nil}
-                            {:symbol       "STT"
-                             :sufficient?  false
-                             :collectible? false
-                             :amount       "10"
-                             :img-src      nil}]]
-         :community-color "#FF0000"
-         :role            "Member"
-         :satisfied?      true
-         :on-press        mock-on-press-fn
-         :on-press-info   mock-on-press-info-fn}])
-      (h/is-truthy (h/get-by-translation-text :t/you-eligible-to-join-as {:role "Member"}))
-      (h/is-truthy (h/get-by-text "0.8 ETH"))
-      (h/is-truthy (h/get-by-text "1 ETH"))
-      (h/is-truthy (h/get-by-text "10 STT"))
-      (h/fire-event :press (h/get-by-translation-text :t/request-to-join))
-      (h/was-called mock-on-press-fn)
-      (h/fire-event :press (h/get-by-label-text :community-token-gating-info))
-      (h/was-called mock-on-press-info-fn)))
-
-  (h/test "render with unsatisfied permissions"
-    (let [mock-on-press-fn      (h/mock-fn)
-          mock-on-press-info-fn (h/mock-fn)]
-      (h/render
-       [quo/community-token-gating
-        {:tokens          [[{:symbol       "ETH"
-                             :sufficient?  false
-                             :collectible? false
-                             :amount       "0.8"
-                             :img-src      nil}]]
-         :community-color "#FF0000"
-         :role            "Member"
-         :satisfied?      false
-         :on-press        mock-on-press-fn
-         :on-press-info   mock-on-press-info-fn}])
-      (h/is-truthy (h/get-by-translation-text :t/you-not-eligible-to-join))
-      (h/is-truthy (h/get-by-text "0.8 ETH"))
-      (h/fire-event :press (h/get-by-translation-text :t/request-to-join))
-      (h/was-not-called mock-on-press-fn)
-      (h/fire-event :press (h/get-by-label-text :community-token-gating-info))
-      (h/was-called mock-on-press-info-fn))))

src/quo/components/community/community_token_gating/schema.cljs

@@ -1,22 +0,0 @@
-(ns quo.components.community.community-token-gating.schema)
-
-(def ^:private ?token-schema
-  [:map
-   [:symbol :string]
-   [:sufficient? :boolean]
-   [:collectible? :boolean]
-   [:amount {:optional true} [:maybe :string]]
-   [:img-src {:optional true} [:maybe :schema.common/image-source]]])
-
-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map
-      [:tokens [:sequential [:sequential ?token-schema]]]
-      [:community-color [:or :string :schema.common/customization-color]]
-      [:role {:optional true} [:maybe :string]]
-      [:satisfied? :boolean]
-      [:on-press fn?]
-      [:on-press-info fn?]]]]
-   :any])

src/quo/components/community/community_token_gating/style.cljs

@@ -1,47 +0,0 @@
-(ns quo.components.community.community-token-gating.style
-  (:require [quo.foundations.colors :as colors]))
-
-(defn container
-  [theme]
-  {:padding-bottom  12
-   :padding-top     10
-   :border-width    1
-   :border-color    (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
-   :border-radius   16
-   :margin-vertical -4})
-
-(def eligibility-row
-  {:flex-direction     :row
-   :padding-horizontal 12
-   :align-items        :center})
-
-(def divider
-  {:height       27
-   :padding-left 12
-   :padding-top  0
-   :align-items  :flex-start})
-
-(def eligibility-label
-  {:flex 1})
-
-(def you-hodl
-  {:padding-horizontal 12
-   :margin-bottom      15})
-
-(def join-button
-  {:padding-horizontal 12
-   :margin-top         8})
-
-(def token-row
-  {:flex-direction     :row
-   :padding-horizontal 12
-   :row-gap            10
-   :column-gap         8
-   :flex-wrap          :wrap
-   :margin-bottom      11})
-
-;; This wrapper prevents layout shifts caused by border effects on
-;; the view's height when the token has a border.
-(def token-wrapper
-  {:height          26
-   :justify-content :center})

src/quo/components/community/community_token_gating/view.cljs

@@ -1,89 +0,0 @@
-(ns quo.components.community.community-token-gating.view
-  (:require [clojure.string :as string]
-            [quo.components.buttons.button.view :as button]
-            [quo.components.community.community-token-gating.schema :as component-schema]
-            [quo.components.community.community-token-gating.style :as style]
-            [quo.components.dividers.divider-label.view :as divider-label]
-            [quo.components.icon :as icon]
-            [quo.components.markdown.text :as text]
-            [quo.components.tags.collectible-tag.view :as collectible-tag]
-            [quo.components.tags.token-tag.view :as token-tag]
-            [quo.foundations.colors :as colors]
-            [quo.theme :as theme]
-            [react-native.core :as rn]
-            [schema.core :as schema]
-            [utils.i18n :as i18n]))
-
-(defn- token-view
-  [{:keys [collectible? img-src amount sufficient?] :as token}]
-  (let [token-symbol (:symbol token)]
-    [rn/view {:style style/token-wrapper}
-     (if collectible?
-       [collectible-tag/view
-        {:collectible-name    token-symbol
-         :size                :size-24
-         :collectible-img-src img-src
-         :options             (when sufficient?
-                                :hold)}]
-       [token-tag/view
-        {:token-symbol  token-symbol
-         :size          :size-24
-         :token-value   amount
-         :token-img-src img-src
-         :options       (when sufficient? :hold)}])]))
-
-(defn- tokens-row
-  [{:keys [theme tokens divider?]}]
-  [:<>
-   [rn/view
-    {:style style/token-row}
-    (map-indexed (fn [token-index token]
-                   ^{:key (str "token-" token-index)}
-                   [token-view token])
-                 tokens)]
-   (when-not divider?
-     [divider-label/view
-      {:container-style style/divider}
-      [text/text
-       {:size  :label
-        :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
-       (string/lower-case (i18n/label :t/or))]])])
-
-(defn- view-internal
-  [{:keys [tokens community-color role satisfied? on-press on-press-info]}]
-  (let [theme            (theme/use-theme)
-        last-token-index (dec (count tokens))]
-    [rn/view {:style (style/container theme)}
-     [rn/view {:style style/eligibility-row}
-      [text/text
-       {:size   :paragraph-1
-        :weight :medium
-        :style  style/eligibility-label}
-       (if satisfied?
-         (i18n/label :t/you-eligible-to-join-as {:role role})
-         (i18n/label :t/you-not-eligible-to-join))]
-      [rn/pressable {:on-press on-press-info}
-       [icon/icon :i/info
-        {:color               (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
-         :accessibility-label :community-token-gating-info}]]]
-     [text/text
-      {:size  :paragraph-2
-       :style style/you-hodl}
-      (i18n/label (if satisfied? :t/you-hodl :t/you-must-hold))]
-     (map-indexed (fn [index tokens-item]
-                    ^{:key (str role "-tokens-" index)}
-                    [tokens-row
-                     {:tokens   tokens-item
-                      :theme    theme
-                      :divider? (= index last-token-index)}])
-                  tokens)
-     [button/button
-      {:on-press            on-press
-       :container-style     style/join-button
-       :accessibility-label :join-community-button
-       :customization-color community-color
-       :disabled?           (not satisfied?)
-       :icon-left           (if satisfied? :i/unlocked :i/locked)}
-      (i18n/label :t/request-to-join)]]))
-
-(def view (schema/instrument #'view-internal component-schema/?schema))

src/quo/components/community/style.cljs

@@ -101,6 +101,39 @@
    :top      8
    :right    8})
 
+(def token-tag-spacing
+  {:padding-top  10
+   :margin-right 8})
+
+(defn token-row
+  [padding?]
+  (merge
+   {:flex-direction :row
+    :flex-wrap      :wrap
+    :align-items    :center}
+   (when padding?
+     {:padding-horizontal 12})))
+
+(defn token-row-or-text
+  [padding? theme]
+  (merge
+   {:padding-top   4
+    :margin-bottom -2
+    :color         (colors/theme-colors
+                    colors/neutral-50
+                    colors/neutral-40
+                    theme)}
+   (when padding?
+     {:padding-left 12})))
+
+(defn token-row-or-border
+  [theme]
+  {:height           1
+   :background-color (colors/theme-colors
+                      colors/neutral-20
+                      colors/neutral-80
+                      theme)})
+
 (defn loading-card
   [width theme]
   (merge

src/quo/components/community/token_gating.cljs

@@ -0,0 +1,44 @@
+(ns quo.components.community.token-gating
+  (:require
+    [clojure.string :as string]
+    [quo.components.community.style :as style]
+    [quo.components.markdown.text :as text]
+    [quo.components.tags.token-tag.view :as token-tag]
+    [quo.theme :as quo.theme]
+    [react-native.core :as rn]
+    [utils.i18n :as i18n]))
+
+(defn token-requirement-list-row
+  [tokens padding?]
+  [rn/view {:style (style/token-row padding?)}
+   (map-indexed (fn [token-index {:keys [img-src amount sufficient? purchasable?] :as token}]
+                  ^{:key token-index}
+                  [rn/view {:style style/token-tag-spacing}
+                   [token-tag/view
+                    {:token-symbol  (:symbol token)
+                     :token-img-src img-src
+                     :token-value   amount
+                     :size          :size-24
+                     :options       (cond
+                                      sufficient?  :hold
+                                      purchasable? :add)}]])
+                tokens)])
+
+(defn token-requirement-list
+  [{:keys [tokens padding?]}]
+  (let [theme (quo.theme/use-theme)]
+    [:<>
+     (if (> (count tokens) 1)
+       (map-indexed
+        (fn [token-requirement-index tokens]
+          ^{:key token-requirement-index}
+          [rn/view {:margin-bottom 12}
+           (when-not (= token-requirement-index 0)
+             [rn/view {:style (style/token-row-or-border theme)}])
+           (when-not (= token-requirement-index 0)
+             [text/text
+              {:style (style/token-row-or-text padding? theme)
+               :size  :label} (string/lower-case (i18n/label :t/or))])
+           [token-requirement-list-row tokens padding?]])
+        tokens)
+       [token-requirement-list-row (first tokens) padding?])]))

src/quo/components/drawers/drawer_action/component_spec.cljs

@@ -6,26 +6,24 @@
 
 (h/describe "Drawers: drawer-action"
   (h/test "default render"
-    (h/render-with-theme-provider [drawer-action/view {:accessibility-label :container}])
+    (h/render-with-theme-provider [drawer-action/view {}])
     (h/is-truthy (h/query-by-label-text :container)))
 
   (h/test "on-press-in changes internal state to :pressed"
-    (h/render-with-theme-provider [drawer-action/view {:accessibility-label :container}])
+    (h/render-with-theme-provider [drawer-action/view {}])
     (h/fire-event :on-press-in (h/get-by-label-text :container))
     (h/wait-for #(h/has-style (h/query-by-label-text :container)
                               {:backgroundColor (colors/resolve-color :blue :light 5)})))
 
   (h/test "render default action with state :selected"
-    (h/render-with-theme-provider [drawer-action/view
-                                   {:state :selected :accessibility-label :container}])
+    (h/render-with-theme-provider [drawer-action/view {:state :selected}])
     (h/has-style (h/query-by-label-text :container)
                  {:backgroundColor (colors/resolve-color :blue :light 5)})
     (h/is-truthy (h/query-by-label-text :check-icon)))
 
   (h/test "call on-press"
     (let [on-press (h/mock-fn)]
-      (h/render-with-theme-provider [drawer-action/view
-                                     {:on-press on-press :accessibility-label :container}])
+      (h/render-with-theme-provider [drawer-action/view {:on-press on-press}])
       (h/fire-event :on-press (h/get-by-label-text :container))
       (h/was-called on-press)))
 
@@ -40,9 +38,8 @@
 
   (h/test "render :toggle action with state :selected"
     (h/render-with-theme-provider [drawer-action/view
-                                   {:accessibility-label :container
-                                    :action              :toggle
-                                    :state               :selected}])
+                                   {:action :toggle
+                                    :state  :selected}])
     (h/is-truthy (h/query-by-label-text "toggle-on"))
     (h/has-style (h/query-by-label-text :container)
                  {:backgroundColor :transparent}))
@@ -54,5 +51,4 @@
                                     :description "Just a small desc"}])
     (h/is-truthy (h/query-by-label-text :left-icon))
     (h/is-truthy (h/query-by-text "Check contact"))
-    (h/has-style (h/query-by-text "Check contact") {:color colors/neutral-100})
     (h/is-truthy (h/query-by-text "Just a small desc"))))

src/quo/components/drawers/drawer_action/schema.cljs

@@ -4,8 +4,6 @@
   [:=>
    [:cat
     [:map {:closed true}
-     [:accessibility-label {:optional true} [:maybe :keyword]]
-     [:type {:optional true} [:maybe [:enum :main :danger]]]
      [:action {:optional true} [:maybe [:enum :arrow :toggle]]]
      [:icon {:optional true} [:maybe :keyword]]
      [:description {:optional true} [:maybe :string]]

src/quo/components/drawers/drawer_action/style.cljs

@@ -28,23 +28,6 @@
   {:flex         1
    :margin-right 12})
 
-(defn text
-  [{:keys [theme blur? type]}]
-  (let [base {:weight :medium}
-        theme-with-blur (if blur? :blue theme)
-        matcher [theme-with-blur type]
-        color
-        (case matcher
-          ([:dark :main] [:light :main])     (colors/theme-colors colors/neutral-100
-                                                                  colors/white
-                                                                  theme)
-          [:blur :main]                      colors/white-70-blur
-          ([:dark :danger] [:light :danger]) (colors/theme-colors colors/danger-50
-                                                                  colors/danger-60
-                                                                  theme)
-          [:blur :danger]                    colors/danger-60)]
-    (assoc-in base [:style :color] color)))
-
 (defn- neutral-color
   [theme blur?]
   (if blur?
@@ -58,14 +41,8 @@
    :margin-top   1})
 
 (defn icon-color
-  [{:keys [theme blur? type]}]
-  (let [theme-with-blur (if blur? :blue theme)
-        matcher         [theme-with-blur type]]
-    (case matcher
-      ([:dark :main] [:light :main])     (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
-      [:blur :main]                      colors/white-70-blur
-      ([:dark :danger] [:light :danger]) (colors/theme-colors colors/danger-50 colors/danger-60 theme)
-      [:blur :danger]                    colors/danger-60)))
+  [{:keys [theme blur?]}]
+  (neutral-color theme blur?))
 
 (defn desc
   [{:keys [theme blur?]}]

src/quo/components/drawers/drawer_action/view.cljs

@@ -10,13 +10,11 @@
     [schema.core :as schema]))
 
 (defn view-internal
-  [{:keys       [action icon description state title on-press customization-color
-                 blur? accessibility-label]
-    action-type :type
-    :or         {customization-color :blue
-                 blur?               false}}]
+  [{:keys [action icon description state title on-press
+           customization-color blur?]
+    :or   {customization-color :blue
+           blur?               false}}]
   (let [theme                  (quo.theme/use-theme)
-        action-type            (or action-type :main)
         [pressed? set-pressed] (rn/use-state false)
         on-press-in            (rn/use-callback #(set-pressed true))
         on-press-out           (rn/use-callback #(set-pressed false))]
@@ -31,21 +29,16 @@
                                              :pressed?            pressed?
                                              :description?        (not-empty description)
                                              :blur?               blur?})
-      :accessibility-label accessibility-label}
+      :accessibility-label :container}
      (when icon
        [icon/icon icon
         {:accessibility-label :left-icon
          :container-style     (style/left-icon)
          :color               (style/icon-color {:theme theme
-                                                 :type  action-type
                                                  :blur? blur?})}])
 
-     [rn/view
-      {:style (style/text-container)}
-      [text/text
-       (style/text {:theme theme
-                    :type  action-type
-                    :blur? blur?})
+     [rn/view {:style (style/text-container)}
+      [text/text {:weight :medium}
        title]
 
       (when (seq description)
@@ -68,7 +61,6 @@
        [icon/icon :i/chevron-right
         {:accessibility-label :arrow-icon
          :color               (style/icon-color {:theme theme
-                                                 :type  action-type
                                                  :blur? blur?})}]
 
        (= state :selected)

src/quo/components/drawers/drawer_top/component_spec.cljs

@@ -80,10 +80,10 @@
     (h/is-truthy (h/get-by-text "0x62b...0a5"))
     (h/is-truthy (h/get-by-label-text :account-avatar)))
 
-  (h/test "component renders keypair type with default label"
+  (h/test "component renders in keypair type when keycard? is false"
     (h/render-with-theme-provider [quo/drawer-top
                                    {:title       "Title"
-                                    :stored      nil
+                                    :keycard?    false
                                     :icon-avatar :i/placeholder
                                     :type        :keypair}]
                                   theme)
@@ -91,21 +91,10 @@
     (-> (h/expect (h/get-by-translation-text :t/on-device))
         (.toBeTruthy)))
 
-  (h/test "component renders keypair type when stored on device"
+  (h/test "component renders in keypair type when keycard? is true"
     (h/render-with-theme-provider [quo/drawer-top
                                    {:title       "Title"
-                                    :stored      :on-device
-                                    :icon-avatar :i/placeholder
-                                    :type        :keypair}]
-                                  theme)
-    (h/is-truthy (h/get-by-text "Title"))
-    (-> (h/expect (h/get-by-translation-text :t/on-device))
-        (.toBeTruthy)))
-
-  (h/test "component renders keypair type when stored on keycard"
-    (h/render-with-theme-provider [quo/drawer-top
-                                   {:title       "Title"
-                                    :stored      :on-keycard
+                                    :keycard?    true
                                     :icon-avatar :i/placeholder
                                     :type        :keypair}]
                                   theme)
@@ -113,17 +102,6 @@
     (-> (h/expect (h/get-by-translation-text :t/on-keycard))
         (.toBeTruthy)))
 
-  (h/test "component renders keypair type when considered missing"
-    (h/render-with-theme-provider [quo/drawer-top
-                                   {:title       "Title"
-                                    :stored      :missing
-                                    :icon-avatar :i/placeholder
-                                    :type        :keypair}]
-                                  theme)
-    (h/is-truthy (h/get-by-text "Title"))
-    (-> (h/expect (h/get-by-translation-text :t/import-to-use-derived-accounts))
-        (.toBeTruthy)))
-
   (h/test "component renders in default-keypair type"
     (h/render-with-theme-provider [quo/drawer-top
                                    {:title       "Title"

src/quo/components/drawers/drawer_top/view.cljs

@@ -37,18 +37,16 @@
     nil))
 
 (defn- keypair-subtitle
-  [{:keys [theme blur? stored]}]
+  [{:keys [theme blur? keycard?]}]
   [rn/view {:style style/row}
    [text/text
     {:size   :paragraph-2
      :weight :regular
      :style  (style/description theme blur?)}
-    (case stored
-      :on-device  (i18n/label :t/on-device)
-      :on-keycard (i18n/label :t/on-keycard)
-      :missing    (i18n/label :t/import-to-use-derived-accounts)
+    (if keycard?
+      (i18n/label :t/on-keycard)
       (i18n/label :t/on-device))]
-   (when (= stored :on-keycard)
+   (when keycard?
      [icons/icon
       :i/keycard-card
       {:color           (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
@@ -105,14 +103,14 @@
    description])
 
 (defn- subtitle
-  [{:keys [type theme blur? stored networks description community-name community-logo
+  [{:keys [type theme blur? keycard? networks description community-name community-logo
            context-tag-type account-name emoji customization-color full-name profile-picture]}]
   (cond
     (= :keypair type)
     [keypair-subtitle
-     {:theme  theme
-      :blur?  blur?
-      :stored stored}]
+     {:theme    theme
+      :blur?    blur?
+      :keycard? keycard?}]
 
     (= :account type)
     [account-subtitle
@@ -197,7 +195,7 @@
 (defn view
   [{:keys [title title-icon type description blur? community-name community-logo button-icon
            account-name emoji context-tag-type button-type container-style
-           on-button-press on-button-long-press profile-picture stored networks label full-name
+           on-button-press on-button-long-press profile-picture keycard? networks label full-name
            button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar]}]
   (let [theme (quo.theme/use-theme)]
     [rn/view {:style (merge style/container container-style)}
@@ -222,7 +220,7 @@
        {:type                type
         :theme               theme
         :blur?               blur?
-        :stored              stored
+        :keycard?            keycard?
         :networks            networks
         :description         description
         :community-name      community-name

src/quo/components/inputs/address_input/style.cljs

@@ -9,18 +9,20 @@
   (merge {:padding-horizontal 20
           :padding-top        8
           :padding-bottom     16
+          :height             48
           :flex-direction     :row
           :align-items        :flex-start}
          container-style))
 
 (def buttons-container
   {:flex-direction :row
-   :align-items    :flex-start})
+   :align-items    :center
+   :padding-top    (when platform/android? 2)})
 
 (def clear-icon-container
-  {:justify-content :flex-start
+  {:justify-content :center
    :align-items     :center
-   :padding-top     (when platform/ios? 4)
+   :padding-top     (if platform/ios? 6 2)
    :height          24
    :width           20})
 
@@ -31,10 +33,9 @@
                           nil)
          :flex         1
          :color        (colors/theme-colors colors/neutral-100 colors/white theme)
-         :margin-top   -4
+         :margin-top   (if platform/ios? 0 -4)
          :margin-right 8
-         :max-height   50
-         :padding      0))
+         :height       (if platform/ios? 24 40)))
 
 (defn accessory-button
   [blur? theme]

src/quo/components/inputs/address_input/view.cljs

@@ -128,12 +128,12 @@
        :auto-capitalize        :none
        :auto-correct           false
        :spell-check            false
-       :multiline              true
        :keyboard-appearance    theme
        :on-focus               on-focus
        :on-blur                on-blur
        :on-change-text         on-change}]
-     (when (empty? value)
+     (when (or (= status :default)
+               (= status :active))
        [rn/view
         {:style               style/buttons-container
          :accessibility-label :paste-scan-buttons-container}
@@ -154,9 +154,7 @@
             :inner-style         (style/accessory-button blur? theme)
             :on-press            on-scan}
            :main-icons/scan])])
-     (when (or (= status :typing)
-               (and (= status :active)
-                    (not-empty value)))
+     (when (= status :typing)
        [rn/view
         {:style               style/buttons-container
          :accessibility-label :clear-button-container}
@@ -169,10 +167,7 @@
         {:style               style/buttons-container
          :accessibility-label :loading-button-container}
         [loading-icon blur? theme]])
-     (when (and (or (= status :loading)
-                    (= status :default))
-                valid-ens-or-address?
-                (not-empty value))
+     (when (and (= status :loading) valid-ens-or-address?)
        [rn/view
         {:style               style/buttons-container
          :accessibility-label :positive-button-container}

src/quo/components/list_items/missing_keypair/component_spec.cljs

@@ -1,30 +0,0 @@
-(ns quo.components.list-items.missing-keypair.component-spec
-  (:require
-    [quo.components.list-items.missing-keypair.view :as missing-keypair]
-    [test-helpers.component :as h]))
-
-(def keypair-data
-  {:accounts []
-   :name     "Key Pair Name"})
-
-(def props
-  {:keypair          keypair-data
-   :blur?            true
-   :on-options-press (fn [])})
-
-(h/describe "List items: missing keypair item"
-  (h/test "Test item container renders"
-    (h/render-with-theme-provider [missing-keypair/view props])
-    (h/is-truthy (h/get-by-label-text :missing-keypair-item)))
-  (h/test "Test keypair icon renders"
-    (h/render-with-theme-provider [missing-keypair/view props])
-    (h/is-truthy (h/get-by-label-text :icon)))
-  (h/test "Test name renders"
-    (h/render-with-theme-provider [missing-keypair/view props])
-    (h/is-truthy (h/get-by-label-text :name)))
-  (h/test "Test preview-list renders"
-    (h/render-with-theme-provider [missing-keypair/view props])
-    (h/is-truthy (h/get-by-label-text :preview-list)))
-  (h/test "Test options button renders"
-    (h/render-with-theme-provider [missing-keypair/view props])
-    (h/is-truthy (h/get-by-label-text :options-button))))

src/quo/components/list_items/missing_keypair/schema.cljs

@@ -1,25 +0,0 @@
-(ns quo.components.list-items.missing-keypair.schema)
-
-(def ^:private ?base
-  [:map
-   [:blur? {:optional true} [:maybe :boolean]]
-   [:keypair
-    [:map
-     [:key-uid :string]
-     [:name :string]
-     [:accounts
-      [:sequential
-       [:map {:closed true}
-        [:type [:enum :default]]
-        [:emoji :string]
-        [:customization-color {:optional true} [:maybe :schema.common/customization-color]]]]]]]])
-
-(def ^:private ?on-option-press
-  [:map
-   [:on-options-press {:optional true} [:maybe fn?]]])
-
-(def ?schema
-  [:=>
-   [:cat
-    [:merge ?base ?on-option-press]]
-   :any])

src/quo/components/list_items/missing_keypair/style.cljs

@@ -1,46 +0,0 @@
-(ns quo.components.list-items.missing-keypair.style
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(defn container
-  [{:keys [blur? theme]}]
-  {:flex-direction   :row
-   :align-items      :center
-   :flex             1
-   :padding-right    12
-   :padding-left     8
-   :padding-vertical 8
-   :border-radius    12
-   :border-width     (if blur? 0 1)
-   :border-color     (colors/theme-colors colors/neutral-10
-                                          colors/neutral-80
-                                          theme)
-   :background-color (if blur?
-                       colors/white-opa-5
-                       (colors/theme-colors colors/neutral-2_5
-                                            colors/neutral-80-opa-40
-                                            theme))})
-
-(defn icon-container
-  [{:keys [blur? theme]}]
-  {:border-radius 32
-   :border-width  1
-   :border-color  (if blur?
-                    colors/white-opa-5
-                    (colors/theme-colors colors/neutral-20
-                                         colors/neutral-80
-                                         theme))})
-
-(def name-container
-  {:flex          1
-   :padding-right 16
-   :padding-left  8})
-
-(def preview-list-container
-  {:padding-right 16})
-
-(defn options-icon-color
-  [{:keys [theme blur?]}]
-  (if blur?
-    colors/white-opa-70
-    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))

src/quo/components/list_items/missing_keypair/view.cljs

@@ -1,56 +0,0 @@
-(ns quo.components.list-items.missing-keypair.view
-  (:require
-    [quo.components.avatars.icon-avatar :as icon-avatar]
-    [quo.components.icon :as icon]
-    [quo.components.list-items.missing-keypair.schema :as component-schema]
-    [quo.components.list-items.missing-keypair.style :as style]
-    [quo.components.list-items.preview-list.view :as preview-list]
-    [quo.components.markdown.text :as text]
-    [quo.theme]
-    [react-native.core :as rn]
-    [schema.core :as schema]))
-
-(defn- internal-view
-  [{{:keys [accounts name]} :keypair
-    :keys                   [keypair blur? on-options-press]}]
-  (let [theme                    (quo.theme/use-theme)
-        on-keypair-options-press (rn/use-callback
-                                  (fn [event]
-                                    (on-options-press event keypair))
-                                  [keypair on-options-press])]
-    [rn/view
-     {:style               (style/container {:theme theme
-                                             :blur? blur?})
-      :accessibility-label :missing-keypair-item}
-     [rn/view
-      {:style               (style/icon-container {:theme theme
-                                                   :blur? blur?})
-       :accessibility-label :icon}
-      [icon-avatar/icon-avatar
-       {:size    :size-32
-        :icon    :i/seed
-        :color   :neutral
-        :border? false}]]
-     [rn/view
-      {:style               style/name-container
-       :accessibility-label :name}
-      [text/text
-       {:weight :semi-bold}
-       name]]
-     [rn/view
-      {:accessibility-label :preview-list}
-      [preview-list/view
-       {:blur?           blur?
-        :type            :accounts
-        :size            :size-24
-        :number          (count accounts)
-        :container-style style/preview-list-container}
-       accounts]]
-     [rn/pressable {:on-press on-keypair-options-press}
-      [icon/icon :i/options
-       {:color               (style/options-icon-color
-                              {:theme theme
-                               :blur? blur?})
-        :accessibility-label :options-button}]]]))
-
-(def view (schema/instrument #'internal-view component-schema/?schema))

src/quo/components/list_items/network_list/component_spec.cljs

@@ -8,7 +8,8 @@
   (h/render-with-theme-provider component :light))
 
 (def props
-  {:state               :default
+  {:theme               :light
+   :state               :default
    :label               "Mainnet"
    :network-image       873
    :customization-color :blue

src/quo/components/list_items/network_list/view.cljs

@@ -40,6 +40,7 @@
    [:catn
     [:props
      [:map {:closed true}
+      [:theme :schema.common/theme]
       [:network-image :int]
       [:label :string]
       [:fiat-value :string]

src/quo/components/list_items/saved_address/view.cljs

@@ -1,5 +1,6 @@
 (ns quo.components.list-items.saved-address.view
   (:require
+    [clojure.string :as string]
     [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
     [quo.components.icon :as icon]
     [quo.components.list-items.saved-address.style :as style]
@@ -9,32 +10,51 @@
     [react-native.core :as rn]
     [utils.address :as address]))
 
+(def ^:private chains-map
+  {:eth :ethereum
+   :arb :arbitrum
+   :opt :optimism})
+
 (defn- left-container
-  [{:keys [blur? name ens address customization-color]}]
+  [{:keys [blur? ens address customization-color chain-color-map] address-name :name}]
   (let [theme (quo.theme/use-theme)]
     [rn/view {:style style/left-container}
      [wallet-user-avatar/wallet-user-avatar
       {:size                :size-32
-       :full-name           name
+       :full-name           address-name
        :customization-color customization-color}]
      [rn/view {:style style/account-container}
       [text/text
        {:weight :semi-bold
         :size   :paragraph-1
         :style  style/name-text}
-       name]
+       address-name]
       [text/text {:size :paragraph-2}
        [text/text
         {:size   :paragraph-2
          :weight :monospace
          :style  (style/account-address blur? theme)}
+        (map (fn [[chain color]]
+               ^{:key chain}
+               [text/text
+                {:size   :paragraph-2
+                 :weight :monospace
+                 :style  {:color color}} (str (name chain) ":")])
+             chain-color-map)
         (or ens (address/get-shortened-key address))]]]]))
 
 (defn view
-  [{:keys [blur? user-props active-state? customization-color on-press on-options-press]
+  [{:keys [blur? user-props active-state? customization-color on-press on-options-press chains]
     :or   {customization-color :blue
            blur?               false}}]
   (let [theme             (quo.theme/use-theme)
+        chains-vector     (map keyword (string/split chains #":"))
+        chain-color-map   (->> chains-vector
+                               (map (fn [chain-short-keyword]
+                                      (let [chain-full-name (get chains-map chain-short-keyword)]
+                                        {chain-short-keyword (colors/resolve-color chain-full-name
+                                                                                   theme)})))
+                               (into {}))
         [state set-state] (rn/use-state :default)
         active?           (rn/use-ref-atom false)
         timer             (rn/use-ref-atom nil)
@@ -64,7 +84,8 @@
        :name                (:name user-props)
        :ens                 (:ens user-props)
        :address             (:address user-props)
-       :customization-color (or (:customization-color user-props) :blue)}]
+       :customization-color (or (:customization-color user-props) :blue)
+       :chain-color-map     (when chains chain-color-map)}]
      (when on-options-press
        [rn/pressable
         {:accessibility-label :options-button

src/quo/components/messages/author/style.cljs

@@ -3,14 +3,39 @@
     [quo.foundations.colors :as colors]
     [react-native.platform :as platform]))
 
+(defn- primary-name-top-offset
+  [size]
+  (when (= size 15)
+    (cond platform/ios?     1
+          platform/android? -0.5
+          :else             0)))
+
+(defn- primary-name-margin-bottom-offset
+  [size]
+  (when (and (= size 15)
+             (or platform/ios? platform/android?))
+    -0.25))
+
+(defn- primary-name-layout-offsets
+  [size]
+  ;; NOTE(seanstrom): We need to sometimes offset the primary-name to align the baseline of the text
+  ;; while avoiding shifting elements downward.
+  {:top           (primary-name-top-offset size)
+   :margin-bottom (primary-name-margin-bottom-offset size)})
+
 (defn container
   [size]
-  (cond->
-    {:flex-shrink    1
-     :flex-wrap      :nowrap
-     :flex-direction :row
-     :align-items    :center
-     :height         (if (= size 15) 22 18)}))
+  {:flex-shrink    1
+   :flex-wrap      :nowrap
+   :flex-direction :row
+   :align-items    :baseline
+   ;; NOTE(seanstrom): Because we're offseting the primary-name we need to inverse the offset on the
+   ;; container to avoid shifting elements downward
+   :top            (* -1 (primary-name-top-offset size))})
+
+(def details-container
+  {:flex-direction :row
+   :margin-left    8})
 
 (defn middle-dot
   [theme]
@@ -23,15 +48,11 @@
 
 (defn primary-name
   [muted? theme size]
-  {:color           (if muted?
-                      colors/neutral-50
-                      (colors/theme-colors colors/neutral-100 colors/white theme))
-   ;; iOS: primary-name height is 22.3 / 18.7
-   ;; Android: primary-name height is 21.8 / 18.5
-   :margin-vertical (if (= size 15)
-                      (if platform/ios? -0.15 0)
-                      (if platform/ios? -0.35 -0.25))
-   :flex-shrink     1})
+  (merge (primary-name-layout-offsets size)
+         {:color       (if muted?
+                         colors/neutral-50
+                         (colors/theme-colors colors/neutral-100 colors/white theme))
+          :flex-shrink 1}))
 
 (defn secondary-name
   [theme]
@@ -39,9 +60,13 @@
    :color       (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})
 
 (defn icon-container
-  [is-first? size]
+  [is-first?]
   {:margin-left (if is-first? 4 2)
-   :padding-top (if (= size 15) 6 4)})
+   ;; NOTE(seanstrom): Because we're using flex baseline to align elements
+   ;; we need to offset the icon container to match the designs.
+   :top         (cond platform/ios?     1
+                      platform/android? 2
+                      :else             0)})
 
 (defn time-text
   [theme]

src/quo/components/messages/author/view.cljs

@@ -13,35 +13,7 @@
   [{:keys [primary-name secondary-name style short-chat-key time-str contact? verified? untrustworthy?
            muted? size]
     :or   {size 13}}]
-  (let [theme (quo.theme/use-theme)
-
-        short-chat-key-component
-        (when (and (not verified?) short-chat-key)
-          [text/text
-           {:weight          :monospace
-            :size            :label
-            :number-of-lines 1
-            :style           (style/chat-key-text theme)}
-           short-chat-key])
-
-        time-str-component
-        (when time-str
-          [text/text
-           {:monospace           true
-            :size                :label
-            :accessibility-label :message-timestamp
-            :number-of-lines     1
-            :style               (style/time-text theme)}
-           time-str])
-
-        middle-dot-seperator-component
-        (when (and short-chat-key-component time-str-component)
-          [text/text
-           {:monospace       true
-            :size            :label
-            :number-of-lines 1
-            :style           (style/middle-dot theme)}
-           middle-dot])]
+  (let [theme (quo.theme/use-theme)]
     [rn/view
      {:style (merge (style/container size) style)}
      [text/text
@@ -51,7 +23,7 @@
        :accessibility-label :author-primary-name
        :style               (style/primary-name muted? theme size)}
       primary-name]
-     (when-not (string/blank? secondary-name)
+     (when (not (string/blank? secondary-name))
        [:<>
         [text/text
          {:size            :label
@@ -69,22 +41,38 @@
        [icons/icon :main-icons2/contact
         {:size            12
          :no-color        true
-         :container-style (style/icon-container true size)}])
+         :container-style (style/icon-container true)}])
      (cond
        verified?
        [icons/icon :main-icons2/verified
         {:size            12
          :no-color        true
-         :container-style (style/icon-container contact? size)}]
+         :container-style (style/icon-container contact?)}]
        untrustworthy?
        [icons/icon :main-icons2/untrustworthy
         {:size            12
          :no-color        true
-         :container-style (style/icon-container contact? size)}])
-
-     (when (or short-chat-key-component time-str-component)
-       [rn/view {:style {:width 8}}])
-
-     short-chat-key-component
-     middle-dot-seperator-component
-     time-str-component]))
+         :container-style (style/icon-container contact?)}])
+     [rn/view {:style style/details-container}
+      (when (and (not verified?) short-chat-key)
+        [text/text
+         {:weight          :monospace
+          :size            :label
+          :number-of-lines 1
+          :style           (style/chat-key-text theme)}
+         short-chat-key])
+      (when (and (not verified?) time-str short-chat-key)
+        [text/text
+         {:monospace       true
+          :size            :label
+          :number-of-lines 1
+          :style           (style/middle-dot theme)}
+         middle-dot])
+      (when time-str
+        [text/text
+         {:monospace           true
+          :size                :label
+          :accessibility-label :message-timestamp
+          :number-of-lines     1
+          :style               (style/time-text theme)}
+         time-str])]]))

src/quo/components/navigation/page_nav/style.cljs

@@ -13,12 +13,13 @@
    :align-items        :center})
 
 (defn center-content-container
-  [centered?]
+  [centered? center-opacity]
   {:flex              1
    :margin-horizontal 12
    :flex-direction    :row
    :align-items       :center
-   :justify-content   (if centered? :center :flex-start)})
+   :justify-content   (if centered? :center :flex-start)
+   :opacity           center-opacity})
 
 (def right-actions-container
   {:flex-direction :row})

src/quo/components/navigation/page_nav/view.cljs

@@ -44,68 +44,62 @@
 
 (defn- right-section-spacing [] [rn/view {:style style/right-actions-spacing}])
 
-(defmulti add-button
-  (fn [{:keys [button-props]}]
-    (:content-type button-props)))
-
-(defmethod add-button :account-switcher
-  [{:keys [support-account-switcher? button-props]}]
-  (when support-account-switcher?
-    (let [{:keys [customization-color on-press emoji type]} button-props]
-      [rn/pressable {:on-press on-press}
-       [account-avatar/view
-        {:emoji               emoji
-         :size                32
-         :type                (or type :default)
-         :customization-color customization-color}]])))
-
-(defmethod add-button :default
-  [{:keys [background behind-overlay? button-props]}]
-  (let [{:keys [label icon-name]} button-props]
-    [button/button
-     (assoc button-props
-            :type       (button-type background)
-            :icon-only? (boolean icon-name)
-            :size       32
-            :accessible true
-            :background (if behind-overlay?
-                          :blur
-                          (when (button-properties/backgrounds background) background)))
-     (or label icon-name)]))
-
 (defn- add-right-buttons-xf
-  [max-actions background behind-overlay? support-account-switcher?]
+  [max-actions background behind-overlay?]
   (comp (filter map?)
         (take max-actions)
-        (map (fn [button-props]
-               (add-button {:background                background
-                            :behind-overlay?           behind-overlay?
-                            :support-account-switcher? support-account-switcher?
-                            :button-props              button-props})))
+        (map (fn [{:keys [icon-name label] :as button-props}]
+               [button/button
+                (assoc button-props
+                       :type       (button-type background)
+                       :icon-only? icon-name
+                       :size       32
+                       :accessible true
+                       :background (if behind-overlay?
+                                     :blur
+                                     (when (button-properties/backgrounds background) background)))
+                (or label icon-name)]))
         (interpose [right-section-spacing])))
 
+(defn- account-switcher-content
+  [{:keys [customization-color on-press emoji type]}]
+  [rn/pressable {:on-press on-press}
+   [account-avatar/view
+    {:emoji               emoji
+     :size                32
+     :type                (or type :default)
+     :customization-color customization-color}]])
+
 (defn- right-content
-  [{:keys [background content max-actions min-size? support-account-switcher?
+  [{:keys [background content max-actions min-size? support-account-switcher? account-switcher
            behind-overlay?]
     :or   {support-account-switcher? true}}]
   [rn/view (when min-size? {:style style/right-content-min-size})
-   (when (coll? content)
+   (cond
+     (and support-account-switcher? (= content :account-switcher))
+     [account-switcher-content account-switcher]
+
+     (coll? content)
      (into [rn/view {:style style/right-actions-container}]
-           (add-right-buttons-xf max-actions background behind-overlay? support-account-switcher?)
-           content))])
+           (add-right-buttons-xf max-actions background behind-overlay?)
+           content)
+
+     :else
+     nil)])
 
 (def header-height 155)
 (def page-nav-height 25)
 (def threshold (- header-height page-nav-height))
 
 (defn- title-center
-  [{:keys [title scroll-y center-content-container-style]}]
+  [{:keys [centered? title center-opacity scroll-y]}]
   (let [animated-style (when scroll-y
                          (header-worklet/profile-header-animation scroll-y
                                                                   threshold
                                                                   page-nav-height))]
     [reanimated/view
-     {:style [center-content-container-style animated-style]}
+     {:style [(style/center-content-container centered? center-opacity)
+              animated-style]}
      [text/text
       {:weight          :medium
        :size            :paragraph-1
@@ -113,15 +107,14 @@
       title]]))
 
 (defn- dropdown-center
-  [{:keys [background dropdown-on-press dropdown-selected? dropdown-text
-           center-content-container-style]}]
+  [{:keys [background dropdown-on-press dropdown-selected? dropdown-text center-opacity]}]
   (let [theme          (quo.theme/use-theme)
         dropdown-type  (cond
                          (= background :photo)                      :grey
                          (and (= theme :dark) (= background :blur)) :grey
                          :else                                      :ghost)
         dropdown-state (if dropdown-selected? :active :default)]
-    [reanimated/view {:style center-content-container-style}
+    [reanimated/view {:style (style/center-content-container true center-opacity)}
      [dropdown/view
       {:type       dropdown-type
        :state      dropdown-state
@@ -131,9 +124,9 @@
       dropdown-text]]))
 
 (defn- token-center
-  [{:keys [background token-logo token-name token-abbreviation center-content-container-style]}]
+  [{:keys [background token-logo token-name token-abbreviation center-opacity]}]
   (let [theme (quo.theme/use-theme)]
-    [reanimated/view {:style center-content-container-style}
+    [reanimated/view {:style (style/center-content-container false center-opacity)}
      [rn/image {:style style/token-logo :source token-logo}]
      [text/text
       {:style           style/token-name
@@ -149,9 +142,9 @@
       token-abbreviation]]))
 
 (defn- channel-center
-  [{:keys [background channel-emoji channel-name channel-icon center-content-container-style]}]
+  [{:keys [background channel-emoji channel-name channel-icon center-opacity]}]
   (let [theme (quo.theme/use-theme)]
-    [reanimated/view {:style center-content-container-style}
+    [reanimated/view {:style (style/center-content-container false center-opacity)}
      [rn/text {:style style/channel-emoji}
       channel-emoji]
      [text/text
@@ -163,9 +156,9 @@
      [icons/icon channel-icon {:size 16 :color (style/channel-icon-color theme background)}]]))
 
 (defn- title-description-center
-  [{:keys [background picture title description center-content-container-style]}]
+  [{:keys [background picture title description center-opacity]}]
   (let [theme (quo.theme/use-theme)]
-    [reanimated/view {:style center-content-container-style}
+    [reanimated/view {:style (style/center-content-container false center-opacity)}
      (when picture
        [rn/view {:style style/group-avatar-picture}
         [group-avatar/view {:picture picture :size :size-28}]])
@@ -184,11 +177,11 @@
        description]]]))
 
 (defn- community-network-center
-  [{:keys [type community-logo network-logo community-name network-name center-content-container-style]}]
+  [{:keys [type community-logo network-logo community-name network-name center-opacity]}]
   (let [community? (= type :community)
         shown-logo (if community? community-logo network-logo)
         shown-name (if community? community-name network-name)]
-    [reanimated/view {:style center-content-container-style}
+    [reanimated/view {:style (style/center-content-container false center-opacity)}
      [rn/image
       {:style  style/community-network-logo
        :source shown-logo}]
@@ -199,8 +192,8 @@
       shown-name]]))
 
 (defn- wallet-networks-center
-  [{:keys [networks networks-on-press background center-content-container-style]}]
-  [reanimated/view {:style center-content-container-style}
+  [{:keys [networks networks-on-press background center-opacity]}]
+  [reanimated/view {:style (style/center-content-container true center-opacity)}
    [network-dropdown/view
     {:state    :default
      :on-press networks-on-press
@@ -215,11 +208,19 @@
   - on-press: callback for left button
   - icon-name: icon for left button
   - right-side (optional):
+      - The `:account-switcher` keyword
       - vector of maps to render buttons, e.g.:
         {:icon-name           :i/my-icon
          :on-press            (fn callback [] nil)
          :accessibility-label \"an optional label\"}
 
+  - account-switcher (optional)
+      - props to render dropdown component (emoji only) e.g.:
+       {:customization-color :purple
+        :on-press            (fn [] nil)
+        :state               :default (inherit dropdown states)
+        :emoji               \"🍑\"}
+
   Depending on the `type` selected, different properties are accepted:
   `:title`
     - title
@@ -250,94 +251,86 @@
   `:network`
     - network-name
     - network-logo a valid rn/image `:source` value"
-  [{:keys [type right-side background text-align behind-overlay? center-opacity]
+  [{:keys [type right-side background text-align account-switcher behind-overlay?]
     :or   {type       :no-title
            text-align :center
            right-side :none
            background :white}
     :as   props}]
-  (let [center-content-container-style (reanimated/apply-animations-to-style
-                                        (if center-opacity
-                                          {:opacity center-opacity}
-                                          nil)
-                                        (style/center-content-container
-                                         (case type
-                                           :title                       (= text-align :center)
-                                           (:dropdown :wallet-networks) true
-                                           false)))
-        props-with-style               (assoc props
-                                              :center-content-container-style
-                                              center-content-container-style)]
-    (case type
-      :no-title
+  (case type
+    :no-title
+    [page-nav-base props
+     [right-content
+      {:background       background
+       :content          right-side
+       :max-actions      3
+       :behind-overlay?  behind-overlay?
+       :account-switcher account-switcher}]]
+
+    :title
+    (let [centered? (= text-align :center)]
       [page-nav-base props
+       [title-center (assoc props :centered? centered?)]
        [right-content
-        {:background      background
-         :content         right-side
-         :max-actions     3
-         :behind-overlay? behind-overlay?}]]
+        {:background       background
+         :content          right-side
+         :max-actions      (if centered? 1 3)
+         :min-size?        centered?
+         :account-switcher account-switcher}]])
 
-      :title
-      (let [centered? (= text-align :center)]
-        [page-nav-base props
-         [title-center props-with-style]
-         [right-content
-          {:background  background
-           :content     right-side
-           :max-actions (if centered? 1 3)
-           :min-size?   centered?}]])
+    :dropdown
+    [page-nav-base props
+     [dropdown-center props]
+     [right-content
+      {:background                background
+       :content                   right-side
+       :max-actions               1
+       :support-account-switcher? false}]]
 
-      :dropdown
-      [page-nav-base props
-       [dropdown-center props-with-style]
-       [right-content
-        {:background                background
-         :content                   right-side
-         :max-actions               1
-         :support-account-switcher? false}]]
+    :token
+    [page-nav-base props
+     [token-center props]
+     [right-content
+      {:background       background
+       :content          right-side
+       :max-actions      3
+       :account-switcher account-switcher}]]
 
-      :token
-      [page-nav-base props
-       [token-center props-with-style]
-       [right-content
-        {:background  background
-         :content     right-side
-         :max-actions 3}]]
+    :channel
+    [page-nav-base props
+     [channel-center props]
+     [right-content
+      {:background                background
+       :content                   right-side
+       :max-actions               3
+       :support-account-switcher? false}]]
 
-      :channel
-      [page-nav-base props
-       [channel-center props-with-style]
-       [right-content
-        {:background                background
-         :content                   right-side
-         :max-actions               3
-         :support-account-switcher? false}]]
+    :title-description
+    [page-nav-base props
+     [title-description-center props]
+     [right-content
+      {:background                background
+       :content                   right-side
+       :max-actions               2
+       :support-account-switcher? false}]]
 
-      :title-description
-      [page-nav-base props
-       [title-description-center props-with-style]
-       [right-content
-        {:background                background
-         :content                   right-side
-         :max-actions               2
-         :support-account-switcher? false}]]
+    :wallet-networks
+    [page-nav-base props
+     [wallet-networks-center props]
+     [right-content
+      {:background       background
+       :content          right-side
+       :max-actions      1
+       :min-size?        true
+       :account-switcher account-switcher}]]
 
-      :wallet-networks
-      [page-nav-base props
-       [wallet-networks-center props-with-style]
-       [right-content
-        {:background  background
-         :content     right-side
-         :max-actions 3
-         :min-size?   true}]]
+    (:community :network)
+    [page-nav-base props
+     [community-network-center props]
+     [right-content
+      {:background                background
+       :content                   right-side
+       :max-actions               3
+       :support-account-switcher? false}]]
 
-      (:community :network)
-      [page-nav-base props
-       [community-network-center props-with-style]
-       [right-content
-        {:background                background
-         :content                   right-side
-         :max-actions               3
-         :support-account-switcher? false}]]
-
-      nil)))
+    nil))

src/quo/components/notifications/toast/view.cljs

@@ -67,26 +67,27 @@
 
 (defn toast
   "Options:
-
+   
    :type => :neutral/:negative/:positive
    "
-  [{:keys [type icon title text action undo-duration undo-on-press container-style user]
+  [{:keys [type icon title text action undo-duration undo-on-press container-style theme user]
     :or   {type :neutral icon :i/placeholder}}]
-  (let [theme     (quo.theme/use-theme)
-        icon-name (case type
-                    :positive (if (= theme :light)
-                                :i/correct
-                                :i/correct-dark)
-                    :negative (if (= theme :light)
-                                :i/incorrect
-                                :i/incorrect-dark)
-                    :neutral  icon)]
-    [quo.theme/provider theme
+  (let [context-theme (quo.theme/use-theme)
+        context-theme (or theme context-theme)
+        icon-name     (case type
+                        :positive (if (= theme :light)
+                                    :i/correct
+                                    :i/correct-dark)
+                        :negative (if (= theme :light)
+                                    :i/incorrect
+                                    :i/incorrect-dark)
+                        :neutral  icon)]
+    [quo.theme/provider context-theme
      [toast-container
       {:left            (cond user
                               [user-avatar/user-avatar user]
                               icon-name
-                              [icon/icon icon-name (style/icon type theme)])
+                              [icon/icon icon-name (style/icon type context-theme)])
        :title           title
        :text            text
        :right           (if undo-duration
@@ -95,4 +96,3 @@
                             :undo-on-press undo-on-press}]
                           action)
        :container-style container-style}]]))
-

src/quo/components/profile/collectible_list_item/style.cljs

@@ -5,22 +5,18 @@
 (def container-border-radius 12)
 (def card-image-padding-vertical 3)
 (def card-image-padding-horizontal 3)
-(def default-opacity-for-loader 1)
-(def default-opacity-for-image 0)
 
 (defn fallback
-  [{:keys [theme opacity]}]
-  [{:opacity opacity}
-   {:opacity          default-opacity-for-image
-    :background-color (colors/theme-colors colors/neutral-2_5 colors/neutral-90 theme)
-    :border-style     :dashed
-    :border-color     (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
-    :border-width     1
-    :border-radius    container-border-radius
-    :width            "100%"
-    :aspect-ratio     1
-    :align-items      :center
-    :justify-content  :center}])
+  [{:keys [theme]}]
+  {:background-color (colors/theme-colors colors/neutral-2_5 colors/neutral-90 theme)
+   :border-style     :dashed
+   :border-color     (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
+   :border-width     1
+   :border-radius    container-border-radius
+   :width            "100%"
+   :aspect-ratio     1
+   :align-items      :center
+   :justify-content  :center})
 
 (def collectible-counter
   {:position :absolute
@@ -63,15 +59,6 @@
 (def card-detail-text
   {:flex 1})
 
-(defn card-loader
-  [opacity]
-  [{:opacity opacity}
-   {:position       :absolute
-    :opacity        default-opacity-for-loader
-    :left           8
-    :align-items    :center
-    :flex-direction :row}])
-
 (def image-view-container
   {:aspect-ratio  1
    :border-radius container-border-radius})
@@ -96,7 +83,6 @@
 (defn loading-image
   [theme]
   {:position         :absolute
-   :opacity          default-opacity-for-loader
    :top              0
    :bottom           0
    :left             0
@@ -105,20 +91,8 @@
    :background-color (colors/theme-colors colors/white-70-blur colors/neutral-95-opa-70-blur theme)
    :z-index          2})
 
-(defn loading-image-with-opacity
-  [theme opacity]
-  [{:opacity opacity}
-   (loading-image theme)])
-
 (defn avatar-container
-  [opacity]
-  [{:opacity opacity}
-   {:flex           1
-    :flex-direction :row
-    :opacity        default-opacity-for-image}])
-
-(defn supported-file
-  [opacity]
-  [{:opacity opacity}
-   {:aspect-ratio 1
-    :opacity      default-opacity-for-image}])
+  [loaded?]
+  {:flex           1
+   :flex-direction :row
+   :opacity        (when-not loaded? 0)})

src/quo/components/profile/collectible_list_item/view.cljs

@@ -10,54 +10,13 @@
     [quo.foundations.gradients :as gradients]
     [quo.theme]
     [react-native.core :as rn]
-    [react-native.reanimated :as reanimated]
     [schema.core :as schema]
-    [utils.datetime :as datetime]
     [utils.i18n :as i18n]))
 
-(def timing-options-out 650)
-(def timing-options-in 1000)
-(def first-load-time 500)
-(def cached-load-time 200)
-(def error-wait-time 800)
-
-(defn on-load-end
-  [{:keys [load-time set-state loader-opacity image-opacity]}]
-  (reanimated/animate loader-opacity 0 timing-options-out)
-  (reanimated/animate image-opacity 1 timing-options-in)
-  (if (> load-time cached-load-time)
-    (js/setTimeout
-     (fn []
-       (set-state (fn [prev-state]
-                    (assoc prev-state :image-loaded? true))))
-     first-load-time)
-    (set-state (fn [prev-state]
-                 (assoc prev-state :image-loaded? true)))))
-
-(defn on-load-error
-  [set-state]
-  (js/setTimeout (fn []
-                   (set-state (fn [prev-state] (assoc prev-state :image-error? true))))
-                 error-wait-time))
-
-(defn on-load-avatar
-  [{:keys [load-time set-state loader-opacity avatar-opacity]}]
-  (reanimated/animate loader-opacity 0 timing-options-out)
-  (reanimated/animate avatar-opacity 1 timing-options-in)
-  (if (> load-time cached-load-time)
-    (js/setTimeout
-     (fn []
-       (set-state (fn [prev-state]
-                    (assoc prev-state :avatar-loaded? true))))
-     first-load-time)
-    (set-state (fn [prev-state]
-                 (assoc prev-state :avatar-loaded? true)))))
-
 (defn- fallback-view
-  [{:keys [label theme image-opacity]}]
-  [reanimated/view
-   {:style (style/fallback {:opacity image-opacity
-                            :theme   theme})}
+  [{:keys [label theme]}]
+  [rn/view
+   {:style (style/fallback {:theme theme})}
    [rn/view
     [icon/icon :i/sad {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)}]]
    [rn/view {:style {:height 4}}]
@@ -75,85 +34,77 @@
   [rn/view {:style (style/loading-message theme)}])
 
 (defn- loading-image
-  [{:keys [theme gradient-color-index loader-opacity]}]
-  [reanimated/view
-   {:style (style/loading-image-with-opacity theme loader-opacity)}
-   [gradients/view
-    {:theme           theme
-     :container-style (style/loading-image theme)
-     :color-index     gradient-color-index}]])
+  [{:keys [theme gradient-color-index]}]
+  [gradients/view
+   {:theme           theme
+    :container-style (style/loading-image theme)
+    :color-index     gradient-color-index}])
 
 (defn- card-details
   [{:keys [community? avatar-image-src collectible-name theme state set-state]}]
-  (let [loader-opacity            (reanimated/use-shared-value 1)
-        avatar-opacity            (reanimated/use-shared-value 0)
-        [load-time set-load-time] (rn/use-state (datetime/now))]
-    [rn/view {:style style/card-details-container}
-     [reanimated/view {:style (style/avatar-container avatar-opacity)}
-      (if community?
-        [preview-list/view
-         {:type :communities
-          :size :size-20}
-         [avatar-image-src]]
-        [collection-avatar/view
-         {:size        :size-20
-          :on-start    #(set-load-time (fn [start-time] (- (datetime/now) start-time)))
-          :on-load-end #(on-load-avatar {:set-state      set-state
-                                         :load-time      load-time
-                                         :loader-opacity loader-opacity
-                                         :avatar-opacity avatar-opacity})
-          :image       avatar-image-src}])
-      [rn/view {:style {:width 8}}]
-      [text/text
-       {:size            :paragraph-1
-        :weight          :semi-bold
-        :ellipsize-mode  :tail
-        :number-of-lines 1
-        :style           style/card-detail-text}
-       collectible-name]]
-     (when (not (:avatar-loaded? state))
-       [reanimated/view {:style (style/card-loader loader-opacity)}
-        [loading-square theme]
-        [loading-message theme]])]))
+  [rn/view {:style style/card-details-container}
+   (cond (not (:avatar-loaded? state))
+         [rn/view {:style {:flex-direction :row}}
+          [loading-square theme]
+          [loading-message theme]]
+
+         community?
+         [:<>
+          [preview-list/view
+           {:type :communities
+            :size :size-20}
+           [avatar-image-src]]
+          [rn/view {:style {:width 8}}]
+          [text/text
+           {:size   :paragraph-1
+            :weight :semi-bold
+            :style  style/card-detail-text}
+           collectible-name]])
+
+   [rn/view
+    {:style (style/avatar-container (:avatar-loaded? state))}
+    [:<>
+     [collection-avatar/view
+      {:size        :size-20
+       :on-load-end #(set-state (fn [prev-state] (assoc prev-state :avatar-loaded? true)))
+       :image       avatar-image-src}]
+     [rn/view {:style {:width 8}}]]
+    [text/text
+     {:size            :paragraph-1
+      :weight          :semi-bold
+      :ellipsize-mode  :tail
+      :number-of-lines 1
+      :style           style/card-detail-text}
+     collectible-name]]])
 
 (defn- card-view
   [{:keys [avatar-image-src collectible-name community? counter state set-state
            gradient-color-index image-src supported-file?]}]
-  (let [theme                     (quo.theme/use-theme)
-        loader-opacity            (reanimated/use-shared-value (if supported-file? 1 0))
-        image-opacity             (reanimated/use-shared-value (if supported-file? 0 1))
-        [load-time set-load-time] (rn/use-state (datetime/now))]
+  (let [theme (quo.theme/use-theme)]
     [rn/view {:style (style/card-view-container theme)}
      [rn/view {:style {:aspect-ratio 1}}
       (cond
         (:image-error? state)
         [fallback-view
-         {:image-opacity image-opacity
-          :theme         theme
-          :label         (i18n/label :t/cant-fetch-info)}]
+         {:theme theme
+          :label (i18n/label :t/cant-fetch-info)}]
 
         (not supported-file?)
         [fallback-view
-         {:image-opacity image-opacity
-          :theme         theme
-          :label         (i18n/label :t/unsupported-file)}]
+         {:theme theme
+          :label (i18n/label :t/unsupported-file)}]
 
         (not (:image-loaded? state))
         [loading-image
-         {:loader-opacity       loader-opacity
-          :theme                theme
+         {:theme                theme
           :gradient-color-index gradient-color-index}])
       (when supported-file?
-        [reanimated/view {:style (style/supported-file image-opacity)}
+        [rn/view {:style {:aspect-ratio 1}}
          [rn/image
-          {:style         style/image
-           :on-load-start #(set-load-time (fn [start-time] (- (datetime/now) start-time)))
-           :on-load-end   #(on-load-end {:load-time      load-time
-                                         :set-state      set-state
-                                         :loader-opacity loader-opacity
-                                         :image-opacity  image-opacity})
-           :on-error      #(on-load-error set-state)
-           :source        image-src}]])]
+          {:style       style/image
+           :on-load-end #(set-state (fn [prev-state] (assoc prev-state :image-loaded? true)))
+           :on-error    #(set-state (fn [prev-state] (assoc prev-state :image-error? true)))
+           :source      image-src}]])]
      (when (and (:image-loaded? state) (not (:image-error? state)) counter)
        [collectible-counter/view
         {:container-style style/collectible-counter
@@ -170,40 +121,30 @@
 (defn- image-view
   [{:keys [avatar-image-src community? counter state set-state
            gradient-color-index image-src supported-file?]}]
-  (let [theme                     (quo.theme/use-theme)
-        loader-opacity            (reanimated/use-shared-value (if supported-file? 1 0))
-        image-opacity             (reanimated/use-shared-value (if supported-file? 0 1))
-        [load-time set-load-time] (rn/use-state (datetime/now))]
+  (let [theme (quo.theme/use-theme)]
     [rn/view {:style style/image-view-container}
      (cond
        (:image-error? state)
        [fallback-view
-        {:image-opacity image-opacity
-         :theme         theme
-         :label         (i18n/label :t/cant-fetch-info)}]
+        {:theme theme
+         :label (i18n/label :t/cant-fetch-info)}]
 
        (not supported-file?)
        [fallback-view
-        {:image-opacity image-opacity
-         :theme         theme
-         :label         (i18n/label :t/unsupported-file)}]
+        {:theme theme
+         :label (i18n/label :t/unsupported-file)}]
 
        (not (:image-loaded? state))
        [loading-image
-        {:loader-opacity       loader-opacity
-         :theme                theme
+        {:theme                theme
          :gradient-color-index gradient-color-index}])
      (when supported-file?
-       [reanimated/view {:style (style/supported-file image-opacity)}
+       [rn/view {:style {:aspect-ratio 1}}
         [rn/image
-         {:style         style/image
-          :on-load-start #(set-load-time (fn [start-time] (- (datetime/now) start-time)))
-          :on-load-end   #(on-load-end {:load-time      load-time
-                                        :set-state      set-state
-                                        :loader-opacity loader-opacity
-                                        :image-opacity  image-opacity})
-          :on-error      #(on-load-error set-state)
-          :source        image-src}]])
+         {:style       style/image
+          :on-load-end #(set-state (fn [prev-state] (assoc prev-state :image-loaded? true)))
+          :on-error    #(set-state (fn [prev-state] (assoc prev-state :image-error? true)))
+          :source      image-src}]])
      (when (and (:image-loaded? state) (not (:image-error? state)) counter)
        [collectible-counter/view
         {:container-style style/collectible-counter

src/quo/components/profile/expanded_collectible/style.cljs

@@ -1,10 +1,13 @@
 (ns quo.components.profile.expanded-collectible.style
-  (:require [quo.foundations.colors :as colors]))
+  (:require [quo.foundations.colors :as colors]
+            [quo.foundations.shadows :as shadows]))
 
-(def container
-  {:align-items     :center
-   :justify-content :center
-   :border-radius   16})
+(defn container
+  [theme]
+  (merge (shadows/get 2 theme)
+         {:align-items     :center
+          :justify-content :center
+          :border-radius   16}))
 
 (defn image
   [square? aspect-ratio]

src/quo/components/profile/expanded_collectible/view.cljs

@@ -34,8 +34,7 @@
     label]])
 
 (defn view-internal
-  [{:keys [container-style square? on-press counter image-src native-ID supported-file?
-           on-collectible-load]}]
+  [{:keys [container-style square? on-press counter image-src native-ID supported-file?]}]
   (let [theme                          (quo.theme/use-theme)
         [image-size set-image-size]    (rn/use-state {})
         [image-error? set-image-error] (rn/use-state false)]
@@ -49,7 +48,7 @@
     [rn/pressable
      {:on-press            (when (and (not image-error?) supported-file?) on-press)
       :accessibility-label :expanded-collectible
-      :style               (merge container-style style/container)}
+      :style               (merge container-style (style/container theme))}
      (cond
        (not supported-file?)
        [fallback-view
@@ -69,8 +68,7 @@
          {:style     (style/image square? (:aspect-ratio image-size))
           :source    image-src
           :native-ID native-ID
-          :on-error  #(set-image-error true)
-          :on-load   on-collectible-load}]
+          :on-error  #(set-image-error true)}]
         [counter-view counter]])]))
 
 (def ?schema
@@ -84,8 +82,7 @@
       [:native-ID {:optional true} [:maybe [:or string? keyword?]]]
       [:square? {:optional true} [:maybe boolean?]]
       [:counter {:optional true} [:maybe string?]]
-      [:on-press {:optional true} [:maybe fn?]]
-      [:on-collectible-load {:optional true} [:maybe fn?]]]]]
+      [:on-press {:optional true} [:maybe fn?]]]]]
    :any])
 
 (def view (schema/instrument #'view-internal ?schema))

src/quo/components/selectors/react/view.cljs

@@ -5,8 +5,7 @@
     [react-native.core :as rn]))
 
 (defn view
-  [{:keys [reactions on-press on-long-press hide-new-reaction-button? on-press-add use-case
-           container-style]}]
+  [{:keys [reactions on-press on-long-press add-reaction? on-press-add use-case container-style]}]
   [rn/view {:style (merge style/container container-style)}
    (for [emoji-reaction reactions
          :let           [{:keys [emoji emoji-id emoji-reaction-id quantity own]} emoji-reaction]]
@@ -20,7 +19,7 @@
        :on-press            #(on-press emoji-reaction)
        :on-long-press       #(on-long-press emoji-reaction)
        :accessibility-label (str "emoji-reaction-" emoji-id)}])
-   (when-not hide-new-reaction-button?
+   (when add-reaction?
      [react-selector/view
       {:on-press            on-press-add
        :state               :add-reaction

src/quo/components/selectors/reactions_selector/style.cljs

@@ -1,31 +1,12 @@
 (ns quo.components.selectors.reactions-selector.style
   (:require
-    [quo.foundations.colors :as colors]
-    [react-native.platform :as platform]))
+    [quo.foundations.colors :as colors]))
 
 (defn container
   [pressed? theme]
-  (merge
-   {:border-radius    12
-    :border-width     1
-    :border-color     (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
-    :background-color (when pressed?
-                        (colors/theme-colors colors/neutral-10 colors/neutral-80-opa-40 theme))}
-   (if platform/ios?
-     {:padding            9.5
-      :padding-horizontal 8}
-     {:padding 8})))
-
-(def emoji-text-style
-  (merge
-   {:line-height 20
-    :text-align  :center}
-   (if platform/ios?
-     {:line-height 20
-      :font-size   17
-      :text-align  :center}
-     {:font-size           18
-      :height              24
-      :width               24
-      :text-align          :center
-      :text-align-vertical :center})))
+  {:padding          10
+   :border-radius    12
+   :border-width     1
+   :border-color     (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
+   :background-color (when pressed?
+                       (colors/theme-colors colors/neutral-10 colors/neutral-80-opa-40 theme))})