lint

Optimize opening of Settings screens
2024-05-08 17:18:29 +04:00 · 2024-05-08 09:59:52 -03:00
250 changed files with 3159 additions and 6030 deletions
@@ -1,5 +1,4 @@
 {:config-paths ["status-im"]
- :output       {:exclude-files ["src/user.cljs" "src/dev/user.cljs"]}
 :lint-as      {legacy.status-im.utils.views/defview clojure.core/defn
                legacy.status-im.utils.views/letsubs clojure.core/let
                reagent.core/with-let                clojure.core/let
@@ -16,8 +15,6 @@
                :case-symbol-test              {:level :error}
                :clj-kondo-config              {:level :error}
                :cond-else                     {:level :error}
-                :condition-always-true         {:level :error}
-                :conflicting-alias             {:level :error}
                :consistent-alias              {:level   :error
                                                :aliases {clojure.set             set
                                                          clojure.string          string
@@ -45,13 +42,11 @@
                :missing-body-in-when          {:level :error}
                :missing-clause-in-try         {:level :error}
                :missing-else-branch           {:level :error}
-                :multiple-async-in-deftest     {:level :error}
                :not-empty?                    {:level :error}
                :plus-one                      {:level :error}
                :redundant-do                  {:level :error}
                :redundant-let                 {:level :error}
                :refer-all                     {:level :error}
-                :shadowed-fn-param             {:level :error}
                :shadowed-var                  {:level   :error
                                                ;; We temporarily use :include to define an
                                                ;; allowlist of core Clojure vars. In the
@@ -59,11 +54,9 @@
                                                ;; vars, we should be able to delete this
                                                ;; option and lint all vars.
                                                :exclude [type name]}
-                :self-requiring-namespace      {:level :error}
                :single-operand-comparison     {:level :error}
                :syntax                        {:level :error}
                :unbound-destructuring-default {:level :error}
-                :underscore-in-namespace       {:level :error}
                :uninitialized-var             {:level :error}
                :unknown-require-option        {:level :error}
                :unreachable-code              {:level :error}
@@ -127,8 +127,6 @@ fastlane/README.md
 # Clj

 .cpcache/
-src/user.cljs
-src/dev/user.cljs

 # emacs
 .dir-locals.el
@@ -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
@@ -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)
@@ -233,7 +233,6 @@ android {
        }
        release {
            minifyEnabled enableProguardInReleaseBuilds
-            shrinkResources enableProguardInReleaseBuilds
            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
            signingConfig null
        }
@@ -241,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"
        }
    }

@@ -294,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")
 }
@@ -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.** {*;}
+}
@@ -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"/>

@@ -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
@@ -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)
-    }
-
 }
@@ -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
@@ -1,9 +1,5 @@
-// This code has pieces that were autogenerated but is now managed manually
-// Here lies the node bindings used for integration tests
-// These are basically C calls to exported status-go functions
-// Along 1 additional Poll function to get signals to work
-// function names registered here in init() are used in various places
-// ref -> status-mobile/src/tests/test_utils.cljs
+// DO NOT EDIT: code is autogenerated by go2nodebinding from Go code.
+// https://github.com/divan/go2nodebinding

 #include <node.h>
 #include <string>
@@ -1151,13 +1147,10 @@ void _PollSignal(const FunctionCallbackInfo<Value>& args) {
        v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(args[0]);
        if (!q.empty()) {
          const unsigned argc = 1;
-          v8::Local<v8::Value> argv[argc] = {v8::String::NewFromUtf8(isolate, q.front().c_str()).ToLocalChecked()};
-          v8::MaybeLocal<v8::Value> result = func->Call(isolate->GetCurrentContext(), v8::Null(isolate), argc, argv);
-          if (result.IsEmpty()) {
-            isolate->ThrowException(Exception::Error(
-                String::NewFromUtf8Literal(isolate, "Error calling the callback function")));
-            return;
-          }
+          v8::Local<v8::Value> argv[argc] =
+          { v8::String::NewFromUtf8(isolate,q.front().c_str()).ToLocalChecked()};
+
+          func->Call(isolate->GetCurrentContext(), v8::Null(isolate), argc, argv);
          q.pop();
        }
 }
@@ -90,20 +90,11 @@
  },

  {
-    "path": "cider/cider-nrepl/0.44.0/cider-nrepl-0.44.0",
+    "path": "cider/cider-nrepl/0.31.0/cider-nrepl-0.31.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "c3d3a729beaa728d0ee6a3678a48c880b6bc95f1",
-      "sha256": "0klcppvydxlx9ji376mvz40yv3s7awq6p9yd57wigpfy4m2yv0w6"
-    }
-  },
-
-  {
-    "path": "cider/orchard/0.21.0/orchard-0.21.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "073617f16a132c7f20608d971244753d4e704129",
-      "sha256": "1n2afbyhw9x9kvfna4m4x6n6pwjiqsqcayql644bw2932i1isrkj"
+      "sha1": "1f28a4a834a7a46cf24def971b1a705a6795c73a",
+      "sha256": "0h4pyzy8rzzh567khvimw2cs8jr640kqxgaxvbfx1s5yfp56fka2"
    }
  },

@@ -117,11 +108,11 @@
  },

  {
-    "path": "clj-kondo/clj-kondo/2024.03.13/clj-kondo-2024.03.13",
+    "path": "clj-kondo/clj-kondo/2023.09.07/clj-kondo-2023.09.07",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "adec398a95322f3a27baf0a92b658493335464d1",
-      "sha256": "0r97hsj7m3qc12xwyxx6m1a71gqp5aiy99imcf8r0nz2dnjmj0kz"
+      "sha1": "9bf516b973a0b77d7dc5a3c6c84a884e3470e7b7",
+      "sha256": "1qkw5ryqdzy4wl3xbr0r72ikrch75z5vh1dny569y3jlc888gkv8"
    }
  },

@@ -260,15 +251,6 @@
    }
  },

-  {
-    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
-      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
-    }
-  },
-
  {
    "path": "com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0",
    "host": "https://repo1.maven.org/maven2",
@@ -342,38 +324,11 @@
  },

  {
-    "path": "commons-codec/commons-codec/1.15/commons-codec-1.15",
+    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d",
-      "sha256": "0qzd8v96j4x7jjcfpvvdh9ar1xhwxpxi2rh51nzhj0br7bbgdsdk"
-    }
-  },
-
-  {
-    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
-      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
-    }
-  },
-
-  {
-    "path": "commons-io/commons-io/2.11.0/commons-io-2.11.0",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "a2503f302b11ebde7ebc3df41daebe0e4eea3689",
-      "sha256": "020946yakki3qzc652arfndzi594drxanidz9bawbb6vhxnjy6wn"
-    }
-  },
-
-  {
-    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
-      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
+      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
+      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
    }
  },

@@ -413,6 +368,42 @@
    }
  },

+  {
+    "path": "commons-codec/commons-codec/1.15/commons-codec-1.15",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d",
+      "sha256": "0qzd8v96j4x7jjcfpvvdh9ar1xhwxpxi2rh51nzhj0br7bbgdsdk"
+    }
+  },
+
+  {
+    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
+      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
+    }
+  },
+
+  {
+    "path": "commons-io/commons-io/2.11.0/commons-io-2.11.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "a2503f302b11ebde7ebc3df41daebe0e4eea3689",
+      "sha256": "020946yakki3qzc652arfndzi594drxanidz9bawbb6vhxnjy6wn"
+    }
+  },
+
+  {
+    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
+      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
+    }
+  },
+
  {
    "path": "crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1",
    "host": "https://repo.clojars.org",
@@ -584,15 +575,6 @@
    }
  },

-  {
-    "path": "mx/cider/logjam/0.1.1/logjam-0.1.1",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "0e9a1c08d4e80e46be8ed8b8cb894bef5e56f39d",
-      "sha256": "1p6hnacyfjn365r0li639lf9fnqpgx1cs7jz7066cn566wjw46az"
-    }
-  },
-
  {
    "path": "net/cgrand/macrovich/0.2.1/macrovich-0.2.1",
    "host": "https://repo.clojars.org",
@@ -621,11 +603,11 @@
  },

  {
-    "path": "nrepl/nrepl/1.1.0/nrepl-1.1.0",
+    "path": "nrepl/nrepl/0.9.0/nrepl-0.9.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "69f138d4a778c199e5d72446ca25998222ba0862",
-      "sha256": "0n29xczgwpqv98vz36sdic98mf07dmzhjawlxd63p2s2zafkp1ss"
+      "sha1": "49beada131959f08f9a20899affbd1b10c03a668",
+      "sha256": "1phak0479s27ffw9wzz7pi8cqqs6ipsm15dhgw9szxxcfhx529qa"
    }
  },

@@ -638,15 +620,6 @@
    }
  },

-  {
-    "path": "org/apache/ant/ant/1.10.11/ant-1.10.11",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "b875cd48a0bc955ae9c5c477ad991e1f26fb24d2",
-      "sha256": "0m07pifkdpwghpp8wvqh14sbxazmjbkkpsfakw6ixq5apfdvih48"
-    }
-  },
-
  {
    "path": "org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11",
    "host": "https://repo1.maven.org/maven2",
@@ -657,11 +630,11 @@
  },

  {
-    "path": "org/babashka/sci/0.8.41/sci-0.8.41",
-    "host": "https://repo.clojars.org",
+    "path": "org/apache/ant/ant/1.10.11/ant-1.10.11",
+    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "e8d59dc588a1e1f0c62c21fb47c093eeed043f04",
-      "sha256": "1lhv283fs0bnqbj1jhfgyy2rv6hspnhdgsiklqy3rqxrqbnrww6w"
+      "sha1": "b875cd48a0bc955ae9c5c477ad991e1f26fb24d2",
+      "sha256": "0m07pifkdpwghpp8wvqh14sbxazmjbkkpsfakw6ixq5apfdvih48"
    }
  },

@@ -674,6 +647,15 @@
    }
  },

+  {
+    "path": "org/babashka/sci/0.7.38/sci-0.7.38",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "ef2d8c74065b9a7d685a11bff017676db308a923",
+      "sha256": "04pkxwcgkd1p4f4rszsr6pp18fl0vni1az47a390llrhyyrjcckn"
+    }
+  },
+
  {
    "path": "org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0",
    "host": "https://repo1.maven.org/maven2",
@@ -764,15 +746,6 @@
    }
  },

-  {
-    "path": "org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "533ce2bdbb7925db781449abb6527af1e6c5e782",
-      "sha256": "0js19lw8bp9gym3pn47h867vhf65j18qc6x1pfn883vkwyasm18l"
-    }
-  },
-
  {
    "path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541",
    "host": "https://repo1.maven.org/maven2",
@@ -782,6 +755,15 @@
    }
  },

+  {
+    "path": "org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "533ce2bdbb7925db781449abb6527af1e6c5e782",
+      "sha256": "0js19lw8bp9gym3pn47h867vhf65j18qc6x1pfn883vkwyasm18l"
+    }
+  },
+
  {
    "path": "org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0",
    "host": "https://repo1.maven.org/maven2",
@@ -809,15 +791,6 @@
    }
  },

-  {
-    "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "692882a35d7b50947d6e4852fba8a51d8d5e3646",
-      "sha256": "08fzw3srrppgq1d11sh1ghnyvi24ixa10kbqsncc7xyx7fybcs0k"
-    }
-  },
-
  {
    "path": "org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2",
    "host": "https://repo1.maven.org/maven2",
@@ -827,6 +800,15 @@
    }
  },

+  {
+    "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "692882a35d7b50947d6e4852fba8a51d8d5e3646",
+      "sha256": "08fzw3srrppgq1d11sh1ghnyvi24ixa10kbqsncc7xyx7fybcs0k"
+    }
+  },
+
  {
    "path": "org/clojure/tools.cli/1.0.206/tools.cli-1.0.206",
    "host": "https://repo1.maven.org/maven2",
@@ -837,11 +819,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"
    }
  },

@@ -980,15 +962,6 @@
    }
  },

-  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
-    }
-  },
-
  {
    "path": "re-com/re-com/2.8.0/re-com-2.8.0",
    "host": "https://repo.clojars.org",
@@ -999,20 +972,11 @@
  },

  {
-    "path": "refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1",
+    "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "f949af92dd1d6fef59d7447bd0cb62118e34eca1",
-      "sha256": "0dml9yvjmji6xk2sk3cdmkvvnh13rw29szxxl363hap8yg28xcs1"
-    }
-  },
-
-  {
-    "path": "re-frame/re-frame/1.4.3/re-frame-1.4.3",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "74e132cc593ed2d72a5d4874954c58677a905f0e",
-      "sha256": "1xdmbjb0gv6dby98y1nx3brz9sdkfzxz9cjk8ajcr1f4zabcaapb"
+      "sha1": "b7135a76432b8141027ba1f4eb6bb15a36acfb7c",
+      "sha256": "16wi01z0j4wn04kldwzxvj0pd9dianjyb000nv5611ikhxk1qrps"
    }
  },

@@ -1034,6 +998,24 @@
    }
  },

+  {
+    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
+      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+    }
+  },
+
+  {
+    "path": "refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "f949af92dd1d6fef59d7447bd0cb62118e34eca1",
+      "sha256": "0dml9yvjmji6xk2sk3cdmkvvnh13rw29szxxl363hap8yg28xcs1"
+    }
+  },
+
  {
    "path": "ring-cors/ring-cors/0.1.8/ring-cors-0.1.8",
    "host": "https://repo.clojars.org",
@@ -8,10 +8,9 @@ borkdude/edamame/1.3.23/edamame-1.3.23.jar
 borkdude/sci.impl.reflector/0.0.1/sci.impl.reflector-0.0.1.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
 cheshire/cheshire/5.11.0/cheshire-5.11.0.jar
-cider/cider-nrepl/0.44.0/cider-nrepl-0.44.0.jar
-cider/orchard/0.21.0/orchard-0.21.0.jar
+cider/cider-nrepl/0.31.0/cider-nrepl-0.31.0.jar
 cider/piggieback/0.5.2/piggieback-0.5.2.jar
-clj-kondo/clj-kondo/2024.03.13/clj-kondo-2024.03.13.jar
+clj-kondo/clj-kondo/2023.09.07/clj-kondo-2023.09.07.jar
 cljs-bean/cljs-bean/1.9.0/cljs-bean-1.9.0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
 com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar
@@ -27,7 +26,6 @@ com/github/javaparser/javaparser-core/3.25.3/javaparser-core-3.25.3.jar
 com/google/auto/value/auto-value-annotations/1.6/auto-value-annotations-1.6.jar
 com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 com/google/code/gson/gson/2.9.1/gson-2.9.1.jar
-com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
 com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar
 com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
 com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar
@@ -36,14 +34,15 @@ com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
 com/google/javascript/closure-compiler-unshaded/v20230802/closure-compiler-unshaded-v20230802.jar
 com/google/protobuf/protobuf-java/3.21.12/protobuf-java-3.21.12.jar
 com/google/re2j/re2j/1.3/re2j-1.3.jar
-commons-codec/commons-codec/1.15/commons-codec-1.15.jar
-commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
-commons-io/commons-io/2.11.0/commons-io-2.11.0.jar
-compojure/compojure/1.5.2/compojure-1.5.2.jar
+com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
 com/taoensso/encore/3.68.0/encore-3.68.0.jar
 com/taoensso/timbre/6.3.1/timbre-6.3.1.jar
 com/taoensso/truss/1.11.0/truss-1.11.0.jar
 com/taoensso/tufte/2.6.3/tufte-2.6.3.jar
+commons-codec/commons-codec/1.15/commons-codec-1.15.jar
+commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
+commons-io/commons-io/2.11.0/commons-io-2.11.0.jar
+compojure/compojure/1.5.2/compojure-1.5.2.jar
 crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1.jar
 crypto-random/crypto-random/1.2.1/crypto-random-1.2.1.jar
 day8/re-frame/test/0.1.5/test-0.1.5.jar
@@ -63,16 +62,15 @@ javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar
 medley/medley/0.8.2/medley-0.8.2.jar
 metosin/malli/0.13.0/malli-0.13.0.jar
 mvxcvi/arrangement/2.1.0/arrangement-2.1.0.jar
-mx/cider/logjam/0.1.1/logjam-0.1.1.jar
 net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
 net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
 nrepl/bencode/1.1.0/bencode-1.1.0.jar
-nrepl/nrepl/1.1.0/nrepl-1.1.0.jar
+nrepl/nrepl/0.9.0/nrepl-0.9.0.jar
 nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.jar
-org/apache/ant/ant/1.10.11/ant-1.10.11.jar
 org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
-org/babashka/sci/0.8.41/sci-0.8.41.jar
+org/apache/ant/ant/1.10.11/ant-1.10.11.jar
 org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2.jar
+org/babashka/sci/0.7.38/sci-0.7.38.jar
 org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
 org/clojure/clojure/1.11.1/clojure-1.11.1.jar
 org/clojure/clojurescript/1.11.60/clojurescript-1.11.60.jar
@@ -83,15 +81,15 @@ org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2.jar
 org/clojure/core.specs.alpha/0.2.62/core.specs.alpha-0.2.62.jar
 org/clojure/data.json/2.4.0/data.json-2.4.0.jar
 org/clojure/data.priority-map/1.1.0/data.priority-map-1.1.0.jar
-org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
 org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
+org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
 org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0.jar
 org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.jar
 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.analyzer/1.1.0/tools.analyzer-1.1.0.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
@@ -107,12 +105,12 @@ org/slf4j/slf4j-nop/2.0.9/slf4j-nop-2.0.9.jar
 org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar
 org/wildfly/common/wildfly-common/1.5.4.Final/wildfly-common-1.5.4.Final.jar
 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
+reagent/reagent/1.2.0/reagent-1.2.0.jar
+refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.2.0/ring-codec-1.2.0.jar
 ring/ring-core/1.9.6/ring-core-1.9.6.jar
@@ -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="
      }
    }
  },
@@ -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
@@ -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
@@ -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
@@ -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"];
+    versions = ["15.1"];
  };
  go = super.go_1_20;
  clang = super.clang_15;
@@ -1,9 +1,8 @@
-{ stdenv, meta, source, buildGo119Package, buildGo120Package }:
-let
-  # https://github.com/status-im/status-mobile/issues/19802
-  # only for Darwin to fix Integration Tests failing with missing symbols on go 1.20
-  buildGoPackageIntegrationTest = if stdenv.isDarwin then buildGo119Package else buildGo120Package;
-in buildGoPackageIntegrationTest {
+{ buildGoPackage
+# object with source attributes
+, meta, source}:
+
+buildGoPackage {
  pname = source.repo;
  version = "${source.cleanVersion}-${source.shortRev}";

@@ -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"
  },
@@ -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
+}
@@ -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"
@@ -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"]
@@ -21,7 +21,7 @@
                [nubank/matcher-combinators "3.8.8"]

                ;; Use the same version specified in the Nix dependency.
-                [clj-kondo/clj-kondo "2024.03.13"]
+                [clj-kondo/clj-kondo "2023.09.07"]

                ;; Routing
                [bidi "2.1.6"]
@@ -1,23 +0,0 @@
-# The `dev/` directory
-
-The `src/dev/` directory is a place where developers can commit non-production
-and non-test code which can facilitate development in general. The code should,
-ideally, be useful to more than one team member.
-
-**Note**: As of today (2024-05-07), we don't have further guidelines or examples
-about how mobile teams should use and maintain these dev-only namespaces. Before
-opening a PR introducing new dev-only namespaces, consider sharing and
-discussing with as many team members as you can.
-
-### The `user` namespace
-
-You may optionally create a `src/dev/user.cljs` and/or `src/user.cljs` file.
-These files are git-ignored and are meant to be your own playground. Clojure
-developers usually use such namespaces to create temporary utilities and
-experiments that aren't necessarily useful to others. They are particularly
-valuable for developers adept at the REPL-Driven Development workflow.
-
-Be careful with `make clean` because it will delete all non-tracked git files.
-If you rely on this file, you may prefer to create a symbolic link and store the
-original `user.cljs` file outside the `status-mobile` repository. Then, after
-`make clean`, you will need to recreate the symlink.
@@ -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'),
-  }));
-}
@@ -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 }],
+    };
+  });
+}
@@ -12,8 +12,7 @@
    [re-frame.core :as re-frame.core]
    [react-native.core :as rn]
    [status-im.contexts.profile.utils :as profile.utils]
-    [utils.ens.core :as utils.ens]
-    [utils.image-server :as image-server]))
+    [utils.ens.core :as utils.ens]))

 ;;TODO REWORK THIS NAMESPACE

@@ -157,11 +156,9 @@
                                                     (styles/default-chat-icon-text size)
                                                     (styles/emoji-chat-icon-text size))}
                          override-styles)
-        img-config (:config photo-path)
-        photo-path (if img-config
+        photo-path (if (:fn photo-path)
                     ;; temp support new media server avatar for old component
-                     {:uri (image-server/get-image-uri
-                            img-config
+                     {:uri ((:fn photo-path)
                            {:size             size
                             :full-name        name
                             :font-size        (get-in styles [:default-chat-icon-text :font-size])
@@ -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"))
@@ -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))
@@ -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)})
@@ -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
@@ -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})
@@ -2,20 +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-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-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)}]))
@@ -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
@@ -8,7 +8,6 @@
    [react-native.core :as rn]
    [react-native.fast-image :as fast-image]
    [schema.core :as schema]
-    [utils.image-server :as image-server]
    utils.string))

 (defn initials-avatar
@@ -39,23 +38,23 @@
           online?           true
           ring?             true}
    :as   props}]
-  (let [theme           (quo.theme/use-theme)
-        picture-config  (:config profile-picture)
-        full-name       (or full-name "Your Name")
+  (let [theme              (quo.theme/use-theme)
+        full-name          (or full-name "Your Name")
        ;; image generated with `profile-picture-fn` is round cropped
        ;; no need to add border-radius for them
-        outer-styles    (style/outer size (not picture-config))
+        outer-styles       (style/outer size (not (:fn profile-picture)))
        ;; Once image is loaded, fast image re-renders view with the help of reagent atom,
        ;; But dynamic updates don't work when user-avatar is used inside hole-view
        ;; https://github.com/status-im/status-mobile/issues/15553
-        image-view      (if static? no-flicker-image/image fast-image/fast-image)
-        font-size       (get-in style/sizes [size :font-size])
-        amount-initials (if (#{:xs :xxs :xxxs} size) 1 2)
-        sizes           (get style/sizes size)
-        indicator-color (get (style/indicator-color theme) (if online? :online :offline))]
+        image-view         (if static? no-flicker-image/image fast-image/fast-image)
+        font-size          (get-in style/sizes [size :font-size])
+        amount-initials    (if (#{:xs :xxs :xxxs} size) 1 2)
+        sizes              (get style/sizes size)
+        indicator-color    (get (style/indicator-color theme) (if online? :online :offline))
+        profile-picture-fn (:fn profile-picture)]

    [rn/view {:style outer-styles :accessibility-label :user-avatar}
-     (if (and full-name (not (or picture-config profile-picture)))
+     (if (and full-name (not (or profile-picture-fn profile-picture)))
       ;; this is for things that's not user-avatar but are currently using user-avatar to render
       ;; the initials e.g. community avatar
       [initials-avatar props]
@@ -63,9 +62,8 @@
        {:accessibility-label :profile-picture
         :style outer-styles
         :source
-         (cond picture-config
-               {:uri (image-server/get-image-uri
-                      picture-config
+         (cond profile-picture-fn
+               {:uri (profile-picture-fn
                      {:length                   amount-initials
                       :full-name                full-name
                       :font-size                (:font-size (text/text-style {:size
@@ -78,7 +76,7 @@
                       :indicator-center-to-edge (when status-indicator?
                                                   (:status-indicator-center-to-edge sizes))
                       :indicator-color          indicator-color
-                       :theme                    theme
+                       :override-theme           theme
                       :color                    (:color style/initials-avatar-text)
                       :size                     (:width outer-styles)
                       :ring?                    ring?
@@ -35,7 +35,6 @@
           size                40
           customization-color (if (= type :primary) :blue nil)}}
   children]
-  (when (string? children) (js/console.log "button - " children))
  (let [[pressed-state? set-pressed-state] (rn/use-state false)
        theme (quo.theme/use-theme)
        {:keys [icon-color background-color label-color border-color blur-type
@@ -8,10 +8,9 @@
  [rn/view {:style (assoc container-style :flex-direction :row)}
   (map-indexed
    (fn [index action]
-      (when action
-        ^{:key index}
-        [:<>
-         [channel-action/view action]
-         (when (not= action (last actions))
-           [rn/view {:style {:width 16}}])]))
+      ^{:key index}
+      [:<>
+       [channel-action/view action]
+       (when (not= action (last actions))
+         [rn/view {:width 16}])])
    actions)])
@@ -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))))
@@ -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])
@@ -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})
@@ -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))
@@ -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
@@ -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?])]))
@@ -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"))))
@@ -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]]
@@ -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?]}]
@@ -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)
@@ -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]
@@ -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}
@@ -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]
@@ -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])]]))
@@ -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})
@@ -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))
@@ -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}]]))
-
@@ -12,8 +12,8 @@
     [:lower-case? :boolean]
     [:upper-case? :boolean]
     [:numbers? :boolean]
-     [:symbols? :boolean]]]
-   :any])
+     [:symbols? :boolean]]
+    [:any]]])

 (defn- view-internal
  [{:keys [lower-case? upper-case? numbers? symbols?]}]
@@ -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]
@@ -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))
@@ -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
@@ -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))})
@@ -20,6 +20,4 @@
      :style                   (merge (style/container pressed? theme)
                                      container-style)
      :on-press                on-press}
-     [rn/text
-      {:style style/emoji-text-style}
-      (reactions.resource/system-emojis emoji)]]))
+     [rn/text (reactions.resource/system-emojis emoji)]]))
@@ -3,7 +3,7 @@
    [quo.foundations.colors :as colors]))

 (defn container
-  [{:keys [size card? blur? actionable? theme]}]
+  [size card? blur? theme]
  {:flex-direction     :row
   :justify-content    :space-between
   :padding-vertical   (when (= size :default) 8)
@@ -11,11 +11,8 @@
   :border-radius      16
   :border-width       (when (and card? (not= size :small)) 1)
   :background-color   (if blur?
-                         (if actionable? :transparent colors/white-opa-5)
-                         (colors/theme-colors
-                          (if actionable? colors/white colors/neutral-2_5)
-                          (if actionable? colors/neutral-95 colors/neutral-90)
-                          theme))
+                         colors/white-opa-5
+                         (colors/theme-colors colors/white colors/neutral-95 theme))
   :border-color       (if blur?
                         colors/white-opa-10
                         (colors/theme-colors colors/neutral-10
@@ -125,12 +125,7 @@
       {:accessibility-label :data-item
        :disabled            (not icon-right?)
        :on-press            on-press
-        :style               (merge (style/container {:size        size
-                                                      :card?       card?
-                                                      :blur?       blur?
-                                                      :actionable? on-press
-                                                      :theme       theme})
-                                    container-style)}
+        :style               (merge (style/container size card? blur? theme) container-style)}
       [left-side props]
       (when (and (= :default status) (not= :small size))
         [right-side
@@ -3,7 +3,6 @@

 (def container
  {:flex-direction  :row
-   :flex            1
   :justify-content :space-between})

 (def right-counter
@@ -6,8 +6,7 @@
    [:props
     [:map {:closed true}
      [:status {:optional true} [:maybe [:enum :default :error]]]
-      [:on-inc-press {:optional true} [:maybe fn?]]
-      [:on-dec-press {:optional true} [:maybe fn?]]
+      [:on-change-text {:optional true} [:maybe fn?]]
      [:container-style {:optional true} [:maybe :map]]
      [:min-value {:optional true} [:maybe :int]]
      [:max-value {:optional true} [:maybe :int]]
@@ -13,7 +13,7 @@
                    :name                "Trip to Vegas"
                    :address             "0x0ah...71a"}
    :networks      [{:network-name :ethereum :short-name "eth"}
-                    {:network-name :optimism :short-name "oeth"}]
+                    {:network-name :optimism :short-name "opt"}]
    :action        :none}])

 (def default-details
@@ -48,7 +48,7 @@
     (when show-optimism?
       [network-amount
        {:network  :optimism
-         :amount   (str (:amount optimism) " " (or (:token-symbol optimism) "OETH"))
+         :amount   (str (:amount optimism) " " (or (:token-symbol optimism) "OPT"))
         :divider? show-arbitrum?
         :theme    theme}])
     (when show-arbitrum?
@@ -6,16 +6,14 @@
 (h/describe "Wallet: Token Input"
  (h/test "Token label renders"
    (h/render-with-theme-provider [token-input/view
-                                   {:token           :snt
-                                    :currency        :eur
-                                    :currency-symbol "€"
-                                    :conversion      1}])
+                                   {:token      :snt
+                                    :currency   :eur
+                                    :conversion 1}])
    (h/is-truthy (h/get-by-text "SNT")))

  (h/test "Amount renders"
    (h/render-with-theme-provider [token-input/view
-                                   {:token           :snt
-                                    :currency        :eur
-                                    :currency-symbol "€"
-                                    :conversion      1}])
+                                   {:token      :snt
+                                    :currency   :eur
+                                    :conversion 1}])
    (h/is-truthy (h/get-by-text "€0.00"))))
@@ -12,22 +12,30 @@
  {:padding-horizontal 20
   :padding-bottom     4
   :height             36
-   :flex-direction     :row})
+   :flex-direction     :row
+   :justify-content    :space-between})

 (defn token-name
  [theme]
  {:color          (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
-   :padding-bottom 3})
+   :margin-right   8
+   :padding-bottom 2})

-(def text-input-container
-  {:flex-direction :row
+(def token-label-container
+  {:position       :absolute
+   :left           40 ; token image size + margin
+   :right          0
+   :bottom         0
+   :top            0
+   :flex-direction :row
   :align-items    :flex-end})

-(defn input-container
-  [window-width]
-  {:width        (- window-width 120)
-   :margin-left  8
-   :margin-right 8})
+(def text-input-container
+  {:position :absolute
+   :top      0
+   :bottom   0
+   :left     40 ; token image size + margin
+   :right    0})

 (def text-input-dimensions
  (-> typography/heading-1
@@ -46,8 +54,7 @@
         :color
         (if error?
           (colors/resolve-color :danger theme)
-           (colors/theme-colors colors/neutral-100 colors/white theme))
-         :flex-shrink 1))
+           (colors/theme-colors colors/neutral-100 colors/white theme))))

 (defn placeholder-text
  [theme]
@@ -9,34 +9,32 @@
    [quo.components.utilities.token.view :as token]
    [quo.components.wallet.token-input.schema :as component-schema]
    [quo.components.wallet.token-input.style :as style]
+    [quo.foundations.common :as common]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [schema.core :as schema]
-    [utils.number :as number]))
+    [schema.core :as schema]))

 (defn fiat-format
-  [currency-symbol num-value conversion]
-  (str currency-symbol (.toFixed (* num-value conversion) 2)))
+  [currency num-value conversion]
+  (str (get common/currency-label currency) (.toFixed (* num-value conversion) 2)))

 (defn crypto-format
  [num-value conversion crypto-decimals token]
-  (str (number/remove-trailing-zeroes
-        (.toFixed (/ num-value conversion) (or crypto-decimals 2)))
+  (str (.toFixed (/ num-value conversion) (or crypto-decimals 2))
       " "
       (string/upper-case (or (clj->js token) ""))))

 (defn calc-value
-  [{:keys [crypto? currency-symbol token value conversion crypto-decimals]}]
+  [{:keys [crypto? currency token value conversion crypto-decimals]}]
  (let [num-value (if (string? value)
                    (or (parse-double value) 0)
                    value)]
    (if crypto?
-      (fiat-format currency-symbol num-value conversion)
+      (fiat-format currency num-value conversion)
      (crypto-format num-value conversion crypto-decimals token))))

 (defn- data-info
-  [{:keys [theme token crypto-decimals conversion networks title crypto? currency-symbol amount
-           error?]}]
+  [{:keys [theme token crypto-decimals conversion networks title crypto? currency amount error?]}]
  [rn/view {:style style/data-container}
   [network-tag/view
    {:networks networks
@@ -47,7 +45,7 @@
     :weight :medium
     :style  (style/fiat-amount theme)}
    (calc-value {:crypto?         crypto?
-                 :currency-symbol currency-symbol
+                 :currency        currency
                 :token           token
                 :value           amount
                 :conversion      conversion
@@ -61,6 +59,20 @@
    :weight :semi-bold}
   (string/upper-case (or (clj->js text) ""))])

+(defn- token-label
+  [{:keys [theme value text]}]
+  [rn/view
+   {:style          style/token-label-container
+    :pointer-events :none}
+   [rn/text-input
+    {:max-length  12
+     :style       style/text-input-dimensions
+     :editable    false
+     :placeholder "0"
+     :opacity     0
+     :value       value}]
+   [token-name-text theme text]])
+
 (defn input-section
  [{:keys [on-change-text value value-internal set-value-internal on-selection-change
           on-token-press]}]
@@ -80,45 +92,36 @@
                                        (oops/oget "nativeEvent.selection")
                                        (js->clj :keywordize-keys true)
                                        (on-selection-change))))]
-    (fn [{:keys [token customization-color show-keyboard? crypto? currency value error? selection
-                 handle-on-swap]
+    (fn [{:keys [token customization-color show-keyboard? crypto? currency value error? selection]
          :or   {show-keyboard? true}}]
-      (let [theme        (quo.theme/use-theme)
-            window-width (:width (rn/get-window))]
-        [rn/pressable
-         {:style    {:width          "100%"
-                     :flex-direction :row}
-          :on-press on-token-press}
-         [token/view
-          {:token token
-           :size  :size-32}]
-         [rn/view {:style (style/input-container window-width)}
-          [rn/pressable
-           {:style    style/text-input-container
-            :on-press focus-input}
-           [rn/text-input
-            (cond-> {:style                    (style/text-input theme error?)
-                     :placeholder-text-color   (style/placeholder-text theme)
-                     :auto-focus               true
-                     :ref                      set-ref
-                     :placeholder              "0"
-                     :keyboard-type            :numeric
-                     :on-change-text           handle-on-change-text
-                     :selection-color          customization-color
-                     :show-soft-input-on-focus show-keyboard?
-                     :on-selection-change      handle-selection-change
-                     :selection                (clj->js selection)}
-              controlled-input?       (assoc :value value)
-              (not controlled-input?) (assoc :default-value value-internal))]
-           [token-name-text theme (if crypto? token currency)]]]
-         [button/button
-          {:icon                true
-           :icon-only?          true
-           :size                32
-           :on-press            handle-on-swap
-           :type                :outline
-           :accessibility-label :reorder}
-          :i/reorder]]))))
+      (let [theme (quo.theme/use-theme)]
+        [rn/view {:style {:flex 1}}
+         [rn/pressable {:on-press on-token-press}
+          [token/view
+           {:token token
+            :size  :size-32}]]
+         [rn/pressable
+          {:style    style/text-input-container
+           :on-press focus-input}
+          [rn/text-input
+           (cond-> {:style                    (style/text-input theme error?)
+                    :placeholder-text-color   (style/placeholder-text theme)
+                    :auto-focus               true
+                    :ref                      set-ref
+                    :placeholder              "0"
+                    :keyboard-type            :numeric
+                    :max-length               12
+                    :on-change-text           handle-on-change-text
+                    :selection-color          customization-color
+                    :show-soft-input-on-focus show-keyboard?
+                    :on-selection-change      handle-selection-change
+                    :selection                (clj->js selection)}
+             controlled-input?       (assoc :value value)
+             (not controlled-input?) (assoc :default-value value-internal))]]
+         [token-label
+          {:theme theme
+           :text  (if crypto? token currency)
+           :value (if controlled-input? value value-internal)}]]))))

 (defn- view-internal
  [{:keys [container-style value on-swap] :as props}]
@@ -138,8 +141,15 @@
              :value-internal     value-internal
              :theme              theme
              :set-value-internal set-value-internal
-              :handle-on-swap     handle-on-swap
-              :crypto?            crypto?)]]
+              :crypto?            crypto?)]
+      [button/button
+       {:icon                true
+        :icon-only?          true
+        :size                32
+        :on-press            handle-on-swap
+        :type                :outline
+        :accessibility-label :reorder}
+       :i/reorder]]
     [divider-line/view {:container-style (style/divider theme)}]
     [data-info
      (assoc props
@@ -35,9 +35,9 @@
    quo.components.community.community-detail-token-gating.view
    quo.components.community.community-list-view
    quo.components.community.community-stat.view
-    quo.components.community.community-token-gating.view
    quo.components.community.community-view
    quo.components.community.icon
+    quo.components.community.token-gating
    quo.components.counter.collectible-counter.view
    quo.components.counter.counter.view
    quo.components.counter.step.view
@@ -227,7 +227,6 @@
 ;;;; Community
 (def community-card-view-item quo.components.community.community-card-view/view)
 (def community-detail-token-gating quo.components.community.community-detail-token-gating.view/view)
-(def community-token-gating quo.components.community.community-token-gating.view/view)
 (def communities-membership-list-item
  quo.components.community.community-list-view/communities-membership-list-item)
 (def community-stats-column quo.components.community.community-view/community-stats-column)
@@ -237,6 +236,7 @@
 (def permission-tag-container quo.components.community.community-view/permission-tag-container)
 (def discover-card quo.components.community.banner.view/view)
 (def community-icon quo.components.community.icon/community-icon)
+(def token-requirement-list quo.components.community.token-gating/token-requirement-list)
 (def channel-action quo.components.community.channel-action.view/view)
 (def channel-actions quo.components.community.channel-actions.view/view)

@@ -18,7 +18,6 @@
    quo.components.colors.color-picker.component-spec
    quo.components.community.community-detail-token-gating.component-spec
    quo.components.community.community-stat.component-spec
-    quo.components.community.community-token-gating.component-spec
    quo.components.counter.collectible-counter.component-spec
    quo.components.counter.counter.component-spec
    quo.components.counter.step.component-spec
@@ -257,7 +257,7 @@

 (def ^:private get-network-full-name
  {:eth  :ethereum
-   :oeth :optimism
+   :opt  :optimism
   :arb1 :arbitrum})

 (def ^:private networks-short-name
@@ -0,0 +1,5 @@
+(ns quo.foundations.common)
+
+(def currency-label
+  {:eur "€"
+   :usd "$"})
@@ -181,14 +181,6 @@
    #(let [ret (handler)] (if (fn? ret) ret js/undefined))
    (get-js-deps deps))))

-(defn use-layout-effect
-  ([handler]
-   (use-layout-effect handler nil))
-  ([handler deps]
-   (react/useLayoutEffect
-    #(let [ret (handler)] (if (fn? ret) ret js/undefined))
-    (get-js-deps deps))))
-
 (defn use-mount
  [handler]
  (use-effect handler []))
@@ -203,35 +195,6 @@
  ([handler deps]
   (react/useCallback handler (get-js-deps deps))))

-(defn use-fn-factory-factory
-  "A dirty code translation from the form-2 solution `make-fn-factory`."
-  [f]
-  (let [*args1  (use-ref-atom nil)
-        cached  (use-ref-atom
-                 (fn [& args2]
-                   (apply f (concat @*args1 args2))))
-        factory (use-ref-atom
-                 (fn factory
-                   [& args1]
-                   (reset! *args1 args1)
-                   @cached))]
-    @factory))
-
-(defn use-fn-factory
-  [f & args]
-  (let [factory (use-fn-factory-factory f)]
-    (apply factory args)))
-
-(defn make-fn-factory
-  "Should be used in a form-2 component."
-  [f]
-  (let [*args1 (atom nil)
-        cached (fn [& args2]
-                 (apply f (concat @*args1 args2)))]
-    (fn [& args1]
-      (reset! *args1 args1)
-      cached)))
-
 (defn use-memo
  [handler deps]
  (react/useMemo handler (get-js-deps deps)))
@@ -241,7 +204,7 @@
  (let [[render? set-render] (use-state false)]
    (use-mount
     (fn []
-       (js/setTimeout #(set-render true) 0)))
+       (reagent/next-tick #(set-render true))))
    (when render?
      content)))

@@ -15,7 +15,7 @@
  [_]
  (let [loaded? (reagent/atom false)
        error?  (reagent/atom false)]
-    (fn [{:keys [source fallback-content] :as props}]
+    (fn [{:keys [source] :as props}]
      [fast-image-class
       (merge
        props
@@ -35,6 +35,6 @@
       (when (or @error? (not @loaded?))
         [placeholder (:style props)
          (if @error?
-            (or fallback-content [rn/text "X"])
+            [rn/text "X"]
            (when-not @loaded?
              [rn/activity-indicator {:animating true}]))])])))
@@ -0,0 +1,6 @@
+(ns react-native.transparent-video
+  (:require
+    ["react-native-transparent-video" :default TV]
+    [reagent.core :as reagent]))
+
+(def view (reagent/adapt-react-class TV))
@@ -14,11 +14,11 @@
  [{:keys [on-press allow-multiple-presses? throttle-duration]} throttle-id]
  (if allow-multiple-presses?
    on-press
-    (fn [event]
+    (fn []
      (let [id @throttle-id]
        (when (and id (not (get @throttle id)))
          (swap! throttle assoc id true)
-          (on-press event)
+          (on-press)
          (js/setTimeout
           #(swap! throttle dissoc id)
           (or throttle-duration 500)))))))
@@ -1,22 +0,0 @@
-(ns react-native.wallet-connect
-  (:require
-    ["@walletconnect/core" :refer [Core]]
-    ["@walletconnect/utils" :refer [buildApprovedNamespaces]]
-    ["@walletconnect/web3wallet" :refer [Web3Wallet]]))
-
-(defn- wallet-connect-core
-  [project-id]
-  (Core. #js {:projectId project-id}))
-
-(defn init
-  [project-id metadata]
-  (let [core (wallet-connect-core project-id)]
-    (Web3Wallet.init
-     (clj->js {:core     core
-               :metadata metadata}))))
-
-(defn build-approved-namespaces
-  [proposal supported-namespaces]
-  (buildApprovedNamespaces
-   (clj->js {:proposal            proposal
-             :supportedNamespaces supported-namespaces})))
@@ -19,5 +19,5 @@
       (catch js/Error e#
         (taoensso.timbre/error "Failed to instrument function"
                                {:symbol ~sym :error e#})
-         (throw e#)))
+         ~sym))
     ~sym))
@@ -91,5 +91,5 @@
                    {:schema-id schema-id
                     :error     e
                     :function  f})
-         (throw e)))
+         f))
     f)))
@@ -3,9 +3,7 @@
    [quo.foundations.colors :as colors]
    [schema.registry :as registry]))

-(def ^:private ?customization-color (into [:enum :primary] colors/account-colors))
-
-(def ^:private ?profile-picture-options
+(def ^:private ?profile-picture-fn-params
  [:map
   [:length :int]
   [:full-name :string]
@@ -13,67 +11,22 @@
   [:indicator-size {:optional true} [:maybe :int]]
   [:indicator-color {:optional true} [:maybe :string]]
   [:indicator-center-to-edge {:optional true} [:maybe :int]]
-   [:theme :schema.common/theme]
+   [:override-theme :schema.common/theme]
+   [:background-color :string]
   [:color :string]
   [:size :int]
   [:ring? :boolean]
   [:ring-width :int]])

-(def ^:private ?account-image-uri-options
-  [:map
-   [:port :int]
-   [:ratio :double]
-   [:key-uid :string]
-   [:image-name :string]
-   [:theme :schema.common/theme]
-   [:override-ring? [:maybe :boolean]]])
-
-(def ^:private ?initials-image-uri-options
-  [:map
-   [:port :int]
-   [:ratio :double]
-   [:uppercase-ratio :double]
-   [:font-file :string]
-   [:theme :schema.common/theme]
-   [:customization-color ?customization-color]
-   [:key-uid {:optional true} [:maybe :string]]
-   [:public-key {:optional true} [:maybe :string]]
-   [:override-ring? {:optional true} [:maybe :boolean]]])
-
-(def ^:private ?contact-image-uri-options
-  [:map
-   [:port :int]
-   [:clock :int]
-   [:ratio :double]
-   [:image-name :string]
-   [:public-key :string]
-   [:theme :schema.common/theme]
-   [:override-ring? [:maybe :boolean]]])
-
-(def ^:private ?image-uri-config
-  [:multi {:dispatch :type}
-   [:account
-    [:map
-     [:type [:= :account]]
-     [:options ?account-image-uri-options]]]
-   [:contact
-    [:map
-     [:type [:= :contact]]
-     [:options ?contact-image-uri-options]]]
-   [:initials
-    [:map
-     [:type [:= :initials]]
-     [:options ?initials-image-uri-options]]]])
-
 (def ^:private ?profile-picture-source
  [:or
   :schema.common/image-source
   [:map
-    [:config ?image-uri-config]]])
+    [:fn [:=> [:cat ?profile-picture-fn-params] :string]]]])
+
+(def ^:private ?customization-color (into [:enum] colors/account-colors))

 (defn register-schemas
  []
-  (registry/register ::customization-color ?customization-color)
-  (registry/register ::image-uri-config ?image-uri-config)
  (registry/register ::profile-picture-source ?profile-picture-source)
-  (registry/register ::profile-picture-options ?profile-picture-options))
+  (registry/register ::customization-color ?customization-color))
@@ -8,6 +8,7 @@
 (defn sheet
  [{:keys [max-height]}]
  {:position                :absolute
+   :overflow                :hidden
   :bottom                  0
   :left                    0
   :right                   0
@@ -37,7 +37,7 @@
  [state]
  (set-input-error state (upper-limit-exceeded? state)))

-(defn set-input-value
+(defn- set-input-value
  [state value]
  (-> state
      (assoc :value value)
@@ -78,10 +78,9 @@

 (defn add-character
  [state character]
-  (if (can-add-character? state character)
+  (when (can-add-character? state character)
    (set-input-value state
-                     (normalize-value-as-numeric (input-value state) character))
-    state))
+                     (normalize-value-as-numeric (input-value state) character))))

 (defn delete-last
  [state]
@@ -58,7 +58,7 @@

 (defn view
  [{:keys [header footer customization-color footer-container-padding header-container-style
-           gradient-cover? keyboard-should-persist-taps]
+           gradient-cover?]
    :or   {footer-container-padding (safe-area/get-top)}}
   & children]
  (reagent/with-let [scroll-view-ref              (atom nil)
@@ -108,8 +108,7 @@
                                            :padding-bottom (when @keyboard-did-show?
                                                              @footer-container-height)}
          :always-bounce-vertical          @keyboard-did-show?
-          :shows-vertical-scroll-indicator false
-          :keyboard-should-persist-taps    keyboard-should-persist-taps}
+          :shows-vertical-scroll-indicator false}
         (into [rn/view {:on-layout set-content-container-height}]
               children)]
        [rn/keyboard-avoiding-view
@@ -365,21 +365,23 @@
          :sub-label           nil
          :chevron?            false}))

+;; TODO(OmarBasem): to be implemented.
 (defn add-members-entry
-  [chat-id]
+  []
  (entry {:icon                :i/add-user
          :label               (i18n/label :t/add-members)
-          :on-press            #(rf/dispatch [:open-modal :group-add-manage-members chat-id])
+          :on-press            #(js/alert "TODO: to be implemented")
          :danger?             false
          :accessibility-label :add-members
          :sub-label           nil
          :chevron?            false}))

+;; TODO(OmarBasem): to be implemented.
 (defn manage-members-entry
-  [chat-id]
+  []
  (entry {:icon                :i/add-user
          :label               (i18n/label :t/manage-members)
-          :on-press            #(rf/dispatch [:open-modal :group-add-manage-members chat-id])
+          :on-press            #(js/alert "TODO: to be implemented")
          :danger?             false
          :accessibility-label :manage-members
          :sub-label           nil
@@ -433,8 +435,11 @@
        admin?          (get admins current-pub-key)]
    [(group-details-entry chat-id)
     (when inside-chat?
-       (when admin?
-         (manage-members-entry chat-id)))
+       (if admin?
+         (when config/show-not-implemented-features?
+           (manage-members-entry))
+         (when config/show-not-implemented-features?
+           (add-members-entry))))
     (when (and admin? inside-chat?)
       (when config/show-not-implemented-features?
         (edit-group-entry)))
@@ -16,4 +16,4 @@

 (def ^:const default-dimension 1000)

-(def ^:const margin 16)
+(def ^:const margin 8)
@@ -0,0 +1,18 @@
+(ns status-im.common.parallax.blacklist
+  (:require
+    [native-module.core :as native-module]))
+
+(def ^:private device-id (:device-id (native-module/get-device-model-info)))
+
+(defn- get-model-code
+  [model]
+  (if-let [[_ code] (and model (re-find #"iPhone(\d+)" model))]
+    (js/parseInt code 10)
+    0))
+
+(def ^:private minimum-device-code 11)
+
+(def blacklisted?
+  (-> device-id
+      get-model-code
+      (< minimum-device-code)))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Omar Basem	3537522796	lint	2024-05-08 17:18:29 +04:00
Icaro Motta	a6574856d8	Optimize opening of Settings screens	2024-05-08 09:59:52 -03:00