Init

2023-11-02 17:29:22 +01:00
376 changed files with 4487 additions and 6265 deletions
@@ -16,18 +16,10 @@
                :clj-kondo-config              {:level :error}
                :cond-else                     {:level :error}
                :consistent-alias              {:level   :error
-                                                :aliases {clojure.set      set
-                                                          clojure.string   string
-                                                          clojure.walk     walk
-                                                          malli.core       malli
-                                                          malli.dev.pretty malli.pretty
-                                                          malli.dev.virhe  malli.virhe
-                                                          malli.error      malli.error
-                                                          malli.generator  malli.generator
-                                                          malli.transform  malli.transform
-                                                          malli.util       malli.util
-                                                          schema.core      schema
-                                                          taoensso.timbre  log}}
+                                                :aliases {clojure.string  string
+                                                          clojure.set     set
+                                                          clojure.walk    walk
+                                                          taoensso.timbre log}}
                :deprecated-namespace          {:level :warning}
                :docstring-blank               {:level :error}
                :equals-true                   {:level :error}
@@ -1,2 +0,0 @@
-{:lint-as {malli.experimental/defn schema.core/defn}
- :linters {:unresolved-symbol {:exclude [(malli.core/=>)]}}}
@@ -1,2 +1,2 @@
-{:hooks   {:analyze-call {utils.i18n/label utils.i18n/label}}
+{:hooks   {:analyze-call {utils.i18n/label hooks.core/i18n-label}}
 :linters {:status-im.linter/invalid-translation-keyword {:level :error}}}
@@ -0,0 +1,19 @@
+(ns hooks.core
+  (:require [clj-kondo.hooks-api :as api]))
+
+(defn i18n-label
+  "Verify call to `i18n/label` pass the translation keyword qualified with `t`."
+  [{:keys [node]}]
+  (let [[_ translation-key-node & _] (:children node)]
+    (when (and (api/keyword-node? translation-key-node)
+               (not= "t" (-> translation-key-node api/sexpr namespace)))
+      (api/reg-finding! (assoc (meta translation-key-node)
+                               :message "Translation keyword should be qualified with \"t\""
+                               :type    :status-im.linter/invalid-translation-keyword)))))
+
+(comment
+  ;; Valid
+  (i18n-label {:node (api/parse-string "(i18n/label :t/foo)")})
+
+  ;; Invalid
+  (i18n-label {:node (api/parse-string "(i18n/label :foo)")}))
@@ -1,26 +0,0 @@
-(ns utils.i18n
-  (:require [clj-kondo.hooks-api :as hooks]))
-
-(defn label
-  "Verify call to `utils.i18n/label` pass the translation keyword qualified with `t`."
-  [{:keys [node]}]
-  (let [[_ translation-key-node & _] (:children node)]
-    (when (and (hooks/keyword-node? translation-key-node)
-               (not= "t" (-> translation-key-node hooks/sexpr namespace)))
-      (hooks/reg-finding! (assoc (meta translation-key-node)
-                                 :message "Translation keyword should be qualified with \"t\""
-                                 :type    :status-im.linter/invalid-translation-keyword)))))
-
-(comment
-  ;; Valid
-  (label {:node     (hooks/parse-string "(i18n/label :t/foo {:var \"hello\"})")
-          :cljc     false
-          :lang     :cljs
-          :filename ""
-          :config   {}
-          :ns       ""
-          :context  nil})
-
-  ;; Invalid
-  (label {:node (hooks/parse-string "(i18n/label :foo)")})
-)
@@ -190,7 +190,3 @@ test/appium/tests/users.py

 ## git hooks
 lefthook.yml
-
-## clj-kondo
-/.clj-kondo/taoensso/*
-/.clj-kondo/babashka/*
@@ -7,4 +7,3 @@ modules
 result
 target
 component-spec
-/app
@@ -36,7 +36,6 @@
  "deftest-sub"     :arg1-body
  "wait-for"        :arg1-body
  "with-deps-check" :arg1-body
-  "schema/=>"       :arg1-body
  "->"              [:noarg1-body
                     {:list               {:constant-pair? false :force-nl? false}
                      :next-inner-restore [[:list :constant-pair?]]}]
@@ -274,11 +274,11 @@ run-re-frisk: ##@run Start re-frisk server
 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
 # INFO: If it's empty (no devices attached, parsing issues, script error) - for Nix it's the same as not set.
-run-android: export ANDROID_ABI_INCLUDE ?= $(shell ./scripts/adb_devices_abis.sh)
+run-android: export ANDROID_ABI_INCLUDE ?= $(shell ./scripts/adb_devices_arch.sh)
 run-android: ##@run Build Android APK and start it on the device
 	npx react-native run-android --appIdSuffix debug

-SIMULATOR=iPhone 13
+SIMULATOR=iPhone 11 Pro
 run-ios: export TARGET := ios
 run-ios: export IOS_STATUS_GO_TARGETS := iossimulator/amd64
 run-ios: ##@run Build iOS app and start it in a simulator/device
@@ -311,14 +311,11 @@ endef
 lint: export TARGET := clojure
 lint: export CLJ_LINTER_PRINT_WARNINGS ?= false
 lint: ##@test Run code style checks
-	@sh scripts/lint/re-frame-in-quo-components.sh && \
-	sh scripts/lint/direct-require-component-outside-quo.sh && \
-	sh scripts/lint/require-i18n-resource-first.sh && \
+	@sh scripts/lint-re-frame-in-quo-components.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --fail-level error --lint src $(if $(filter $(CLJ_LINTER_PRINT_WARNINGS),true),,| grep -v ': warning: ') && \
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
-	scripts/lint/translations.clj && \
 	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
-	sh scripts/lint/trailing-newline.sh && \
+	sh scripts/lint-trailing-newline.sh && \
 	node_modules/.bin/prettier --write .

 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
@@ -328,7 +325,7 @@ lint-fix: ##@test Run code style checks and fix issues
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	clojure-lsp --ns-exclude-regex ".*/src/status_im2/core\.cljs$$" clean-ns && \
-	sh scripts/lint/trailing-newline.sh --fix && \
+	sh scripts/lint-trailing-newline.sh --fix && \
 	node_modules/.bin/prettier --write .

 shadow-server: export TARGET := clojure
@@ -26,8 +26,6 @@

 [Creating a pixel perfect UI](pixel-perfection.md)

-[Contributing to status-go](status-go-changes.md)
-
 ## Testing

 [How to run local tests](testing.md)
@@ -23,7 +23,7 @@ setups and runs the test suite once.
 setups and runs the test suite and watches for code changes will then retrigger the test suite.

 ## Writing Tests
-New test files will need their namespace added to either the file "src/quo/core_spec.cljs" or "src/status_im2/core_spec.cljs. These locations may update overtime but it is dependent on the entrypoint in shadow-cljs config discussed below.
+New test files will need their namespace added to either the file "src/quo2/core_spec.cljs" or "src/status_im2/core_spec.cljs. These locations may update overtime but it is dependent on the entrypoint in shadow-cljs config discussed below.


 ### Best practices
@@ -4,7 +4,7 @@

 ![](images/export-icons/export-icons.gif)

-1. Export from figma 2 pngs 2x and 3x put them in `./resources/images/icons2`
+1. Export from figma 2 pngs 2x and 3x put them in `./resources/images/icons`
 2. if necessary, rename file so that filename contains only lower case chars, e.g. `"Icon-Name@2x.png"` should be renamed to `"icon_name@2x.png"`.
 3. In the app `icon_name.png` still can be accessed as `icon-name`, so in order to use can add the next code:
    ```clojure
@@ -76,7 +76,7 @@ It's important to name functional components with `f-` prefix.

 ### Component props and API scheme to match Figma as closely as possible

-Ideally, the prop names for components (particularly in quo Design System)
+Ideally, the prop names for components (particularly in quo2 Design System)
 should match the Figma properties as best as possible. This makes it easier for
 the developer using that component to configure it correctly for the screen it
 is being used on and avoids unnecessary overwrites and adjustments being made.
@@ -134,7 +134,7 @@ For example if Figma has sizes `:small`, `:medium` and `:large`

 Prefer to define styles in a separate file named `style.cljs`, colocated with
 the source file. For a real example, see
-[src/quo/components/record_audio/record_audio/style.cljs](../src/quo/components/record_audio/record_audio/style.cljs).
+[src/quo2/components/record_audio/record_audio/style.cljs](../src/quo2/components/record_audio/record_audio/style.cljs).

 ```clojure
 ;; bad
@@ -467,9 +467,9 @@ Prefer the pure version of `:json-rpc/call` (no callbacks).

 ### Registering event handlers

-Register events with `utils.re-frame/reg-event-fx` and follow [re-frame's best
+Register events with `re-frame.core/reg-event-fx` and follow [re-frame's best
 practice](https://github.com/day8/re-frame/blob/39adca93673f334dc751ee2d99d340b51a9cc6db/docs/FAQs/BestPractice.md#use-the-fx-effect)
-so use only `:db` and `:fx` effects. `utils.re-frame/merge` and `utils.re-frame/defn` are deprecated and should not be
+so use only `:db` and `:fx` effects. `rf/merge` is deprecated and should not be
 used in the new code in `src/status_im2/`. Don't use
 `re-frame.core/reg-event-db`.

@@ -528,27 +528,27 @@ due to performance constraints.
   (:preferred-name multiaccount)))
 ```

-### Requiring quo components
+### Requiring quo2 components

-Consume `quo` components from `quo.core`, unless the namespace is also inside
-the `quo/` directory.
+Consume `quo2` components from `quo2.core`, unless the namespace is also inside
+the `quo2/` directory.

 ```clojure
 ;; bad
 (ns my-namespace
-  (:require [quo.components.icon :as icon]))
+  (:require [quo2.components.icon :as icon]))

 (icon/icon :i/verified)

 ;; good
 (ns my-namespace
-  (:require [quo.core :as quo]))
+  (:require [quo2.core :as quo]))

 (quo/icon :i/verified)

-;; also good because both namespaces are inside quo/
-(ns quo.components.tabs.account-selector
-  (:require [quo.components.markdown.text :as text]))
+;; also good because both namespaces are inside quo2/
+(ns quo2.components.tabs.account-selector
+  (:require [quo2.components.markdown.text :as text]))
 ```

 ### Require/import
@@ -615,12 +615,12 @@ Use the appropriate keyword qualification/namespace.

 ```clojure
 ;; bad
-(require '[quo.components.icon :as icons])
+(require '[quo2.components.icon :as icons])
 (icons/icon :main-icons2/verified)

 ;; good
-(require '[quo.core :as quo])
-(quo/icon :i/verified)
+(require '[quo2.core :as quo2])
+(quo2/icon :i/verified)
 ```

 ### Translations
@@ -695,7 +695,7 @@ First, the bird's-eye view with some example ClojureScript files:
 src
 ├── js/
 ├── mocks/
-├── quo
+├── quo2
 │   ├── components/
 │   ├── foundations/
 │   └── theme.cljs
@@ -716,7 +716,7 @@ src

 - `src/js`: Raw Javascript files, e.g. React Native Reanimated worklets.
 - `src/mocks`: Plumbing configuration to be able to run tests.
- `src/quo/`: The component library for Status Mobile.
+- `src/quo2/`: The component library for Status Mobile.
 - `src/react_native/`: Contains only low-level constructs to help React Native
  work in tandem with Clojure(Script).
 - `src/status_im2/`: Directory where we try to be as strict as possible about
@@ -728,7 +728,7 @@ src
  of the directory tree. Just like directories named `utils`, their directory
  nesting level communicates their applicable limits.
 - `src/status_im2/common/components/`: Contains reusable components that are not
-  part of the design system (quo).
+  part of the design system (quo2).
 - `src/status_im2/contexts/`: Contains [bounded contexts](#glossary), like
  `browser/`, `messaging/`, etc. As much as possible, _bounded contexts_ should
  not directly require each other's namespaces.
@@ -743,9 +743,9 @@ directory nesting level precisely indicates its boundaries. For example, a
 `contexts/user_settings/utils/datetime.cljs` file communicates that it should
 only be used in the `user_settings` context.

-### src/quo
+### src/quo2

-The `src/quo/` directory holds all components for the new design system. As
+The `src/quo2/` directory holds all components for the new design system. As
 much as possible, its sub-directories and component names should reflect the
 same language used by designers.

@@ -753,14 +753,14 @@ Even though the directory lives alongside the rest of the codebase, we should
 think of it as an external entity that abstracts away particular Status domain
 knowledge.

-Components inside `src/quo/` should not rely on re-frame, i.e. they should not
+Components inside `src/quo2/` should not rely on re-frame, i.e. they should not
 dispatch events or use subscriptions.

 Example structure:

 ```
 src
-└── quo
+└── quo2
    ├── components
    │   └── dropdown
    │       ├── style.cljs
@@ -1,22 +1,16 @@
 # Pixel Perfection
 The Status Mobile team aims to align the design implementation perfectly according to a given screens respective Figma design spec.

-Currently, the Figma Designs match up with both "iPhone 11 Pro" and "iPhone 13" screen size.
-
-The Dimension reference for iPhone 11 Pro is 375 x 812 (width x height) and for iPhone 13 is 390 x 844.
+Currently the Figma Designs match up with an "iPhone 11 Pro" screen size. 

 To test your implementation is correct you can take the following steps

 - Open a new Figma file so that you have write privileges. 
-
 - Copy in the component or screen from the Figma file.

- Using the "iPhone 11 Pro" or the "iPhone 13" simulator (it is the default now) you take a screenshot of your component and paste it into your Figma file.
-
- To get the right size, set your screenshot to width according to your simulator: 
-  - for iPhone 13 set 390
-  - for iPhone 11 Pro set 375
+- Using the "iPhone 11 Pro" simulator (it is the default now) you take a screenshot of your component and paste it into your Figma file.

+- To get the right size, set your screenshot to width 375px

 ![](images/pixel-perfection/layer-width.png)

@@ -30,23 +30,23 @@ You need to have an emulator like [AVD](https://developer.android.com/studio/run

 #### Running on a simulator

-We highly recommend using either the `iPhone 11 Pro` or `iPhone 13` simulator as its screen dimensions match with our design.
+We highly recommend using the `iPhone 11 Pro` simulator as its screen dimensions match with our design.

-If you have Xcode `v12.x` (and above) installed in your system, you need to follow the below steps to add `iPhone 13` simulator:
+If you have Xcode `v12.x` (and above) installed in your system, you need to follow the below steps to add `iPhone 11 Pro` simulator:

 1. Open Xcode
 2. Menu `>` Window `>` Devices and Simulators
 3. Tap `+` button on bottom left
-4. Select **Device Type** as `iPhone 13`
+4. Select **Device Type** as `iPhone 11 Pro`
 5. Leave the **Simulator Name** empty and tap on **Create**

 ##### NOTE ⚠️

-Running `make run-ios` will target `iPhone 13` by default.
+Running `make run-ios` will target `iPhone 11 Pro` by default.

 If you need to run on any other simulator, you can specify the simulator type by adding the `SIMULATOR` flag:
 ```sh
-make run-ios SIMULATOR="iPhone 13"
+make run-ios SIMULATOR="iPhone 11 Pro"
 ```

 #### Running on a physical device
@@ -1,31 +0,0 @@
-# How to make changes to status-go
-
-
-## Overview
-
-To make changes to status-go, the best approach is to first identify the issue/feature and the changes to be made directly in status-go.
-For any bugs we want to most likely write a failing test in status-go, and make sure that it passes, before we test on mobile.
-
-Once you are quite confident that the status-go code is ready to be tested on mobile, you can test it locally by running the following command:
-
-```
-env STATUS_GO_SRC_OVERRIDE={your-status-go-directory} make run-{android/ios}
-```
-
-This will recompile status-go and run status-mobile on your device with that updated status-go version.
-
-Once you have tested the status-go changes locally and you think it's ready for a PR:
-
-1) Create a PR in status-go
-
-2) Point your local status-mobile branch to that PR by running the script:
-
-```
-scripts/update-status-go.sh {status-go-branch-name}
-```
-
-This will update `status-go-version.json`
-
-Commit updated status-go-version.json and create a status-mobile PR
-
-Once both PRs have been approved and are good to merge, you can follow the [merge guidelines](./merging-pr-process.md)
@@ -765,7 +765,7 @@ SPEC CHECKSUMS:
  RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
  RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
  RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
-  RNReanimated: 42f56dc5c032a11177b9ea12cdb57285318b432e
+  RNReanimated: 62e43ee6baafb9ba3d3af1857d7fd23a1d41bff0
  RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c
  RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
  RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
@@ -1194,6 +1194,21 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
        return getPublicStorageDirectory().getAbsolutePath();
    }

+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String generateAlias(final String seed) {
+        return Statusgo.generateAlias(seed);
+    }
+
+    @ReactMethod
+    public void generateAliasAsync(final String seed, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.generateAlias(seed), callback);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String identicon(final String seed) {
+        return Statusgo.identicon(seed);
+    }
+
    @ReactMethod(isBlockingSynchronousMethod = true)
    public String encodeTransfer(final String to, final String value) {
        return Statusgo.encodeTransfer(to, value);
@@ -1254,6 +1269,31 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
        executeRunnableStatusGoMethod(() -> Statusgo.identicon(seed), callback);
    }

+    @ReactMethod
+    public void generateAliasAndIdenticonAsync(final String seed, final Callback callback) {
+
+         Log.d(TAG, "generateAliasAndIdenticonAsync");
+                if (!checkAvailability()) {
+                    callback.invoke(false);
+                    return;
+                }
+
+                Runnable r = new Runnable() {
+                    @Override
+                    public void run() {
+                        String resIdenticon = Statusgo.identicon(seed);
+                        String resAlias = Statusgo.generateAlias(seed);
+
+                        Log.d(TAG, resIdenticon);
+                        Log.d(TAG, resAlias);
+                        callback.invoke(resAlias, resIdenticon);
+                    }
+                };
+
+                StatusThreadPoolExecutor.getInstance().execute(r);
+
+    }
+
    @Override
    public @Nullable
    Map<String, Object> getConstants() {
@@ -880,6 +880,10 @@ RCT_EXPORT_METHOD(callRPC:(NSString *)payload
    });
 }

+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(generateAlias:(NSString *)publicKey) {
+  return StatusgoGenerateAlias(publicKey);
+}
+
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(keystoreDir) {
    NSFileManager *fileManager = [NSFileManager defaultManager];
    NSURL *rootUrl =[[fileManager
@@ -939,6 +943,19 @@ RCT_EXPORT_METHOD(initLogging:(BOOL)enabled
    callback(@[initResult]);
 }

+RCT_EXPORT_METHOD(generateAliasAsync:(NSString *)publicKey
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"generateAliasAsync() method called");
+#endif
+    NSString *result = StatusgoGenerateAlias(publicKey);
+    callback(@[result]);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(identicon:(NSString *)publicKey) {
+  return StatusgoIdenticon(publicKey);
+}
+
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeTransfer:(NSString *)to
                                       value:(NSString *)value) {
  return StatusgoEncodeTransfer(to,value);
@@ -994,6 +1011,15 @@ RCT_EXPORT_METHOD(validateMnemonic:(NSString *)seed
    callback(@[result]);
 }

+RCT_EXPORT_METHOD(identiconAsync:(NSString *)publicKey
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"identiconAsync() method called");
+#endif
+    NSString *result = StatusgoIdenticon(publicKey);
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(createAccountAndLogin:(NSString *)request) {
 #if DEBUG
    NSLog(@"createAccountAndLogin() method called");
@@ -1008,6 +1034,16 @@ RCT_EXPORT_METHOD(restoreAccountAndLogin:(NSString *)request) {
    StatusgoRestoreAccountAndLogin(request);
 }

+RCT_EXPORT_METHOD(generateAliasAndIdenticonAsync:(NSString *)publicKey
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"generateAliasAndIdenticonAsync() method called");
+#endif
+    NSString *identiconResult = StatusgoIdenticon(publicKey);
+    NSString *aliasResult = StatusgoGenerateAlias(publicKey);
+    callback(@[aliasResult, identiconResult]);
+}
+
 RCT_EXPORT_METHOD(callPrivateRPC:(NSString *)payload
                  callback:(RCTResponseSenderBlock)callback) {
    dispatch_async( dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@@ -354,6 +354,38 @@ void _StopCPUProfiling(const FunctionCallbackInfo<Value>& args) {

 }

+void _Identicon(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 1) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for Identicon")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'pk'")));
+		return;
+	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = Identicon(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
 void _EncodeTransfer(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -832,6 +864,38 @@ void _CreateAccountAndLogin(const FunctionCallbackInfo<Value>& args) {

 }

+void _GenerateAlias(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 1) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for GenerateAlias")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'pk'")));
+		return;
+	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = GenerateAlias(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
 void _ValidateMnemonic(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -1889,6 +1953,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
+	NODE_SET_METHOD(exports, "identicon", _Identicon);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
 	NODE_SET_METHOD(exports, "encodeFunctionCall", _EncodeFunctionCall);
 	NODE_SET_METHOD(exports, "decodeParameters", _DecodeParameters);
@@ -1903,6 +1968,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "resetChainData", _ResetChainData);
 	NODE_SET_METHOD(exports, "saveAccountAndLogin", _SaveAccountAndLogin);
 	NODE_SET_METHOD(exports, "createAccountAndLogin", _CreateAccountAndLogin);
+	NODE_SET_METHOD(exports, "generateAlias", _GenerateAlias);
 	NODE_SET_METHOD(exports, "validateMnemonic", _ValidateMnemonic);
 	NODE_SET_METHOD(exports, "multiformatSerializePublicKey", _MultiformatSerializePublicKey);
 	NODE_SET_METHOD(exports, "saveAccountAndLoginWithKeycard", _SaveAccountAndLoginWithKeycard);
@@ -45,20 +45,11 @@
  },

  {
-    "path": "borkdude/dynaload/0.3.5/dynaload-0.3.5",
+    "path": "borkdude/edamame/1.1.17/edamame-1.1.17",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "accd696ba364b850b4d92e38f5a34d0e828a0ad1",
-      "sha256": "0k62m1f29xfh3cp67w7kcvkp5aj35simi8kf95ycvkmgp76w11q8"
-    }
-  },
-
-  {
-    "path": "borkdude/edamame/1.3.23/edamame-1.3.23",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "254d023e97ed438f0f44532b5a06d928d031ede4",
-      "sha256": "0l7mxza2nimslhg0qh6jp7gmb8sd6l89fk5d1zvzq2xskscq2vly"
+      "sha1": "9087f7abf0104e0354d7db7fc4576608eac558f4",
+      "sha256": "1n1872i240lakn4pzsag4grf7bv7lcsipmqllxd9m4k1zp3dgla1"
    }
  },

@@ -90,20 +81,20 @@
  },

  {
-    "path": "cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3",
+    "path": "cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "5ae0efd9377a5e60c084bdaf4a2ce094f759ce23",
-      "sha256": "0drxf9nm23i1pcgrkwbcr09msq37csilzww38709add0hz8spjhq"
+      "sha1": "45f6034b26a14138e74145b7a4059628c0fedcd1",
+      "sha256": "1dy1l6y8cb8xiqq97a4lf8giyiicq4wfl4s2lxn5fb6614cjxqx2"
    }
  },

  {
-    "path": "cider/piggieback/0.4.1/piggieback-0.4.1",
+    "path": "cider/piggieback/0.5.2/piggieback-0.5.2",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "0a02a3e2ecd7a126ab60d8a44793342f20ced79b",
-      "sha256": "142vl5np33akcrnn6pksi0rjfsmmi528villxsj6cwcndvybiw4m"
+      "sha1": "ecfd5c286a85db3f059e75c37fca5722d9e26f79",
+      "sha256": "1ps9yf3cxmlm447hqkidjb5xry90n0wl3jk0jn28fagq31lzylkl"
    }
  },

@@ -548,24 +539,6 @@
    }
  },

-  {
-    "path": "metosin/malli/0.13.0/malli-0.13.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "286c52d26a3a9d613b5f692971bd19c581cdc4b0",
-      "sha256": "0vaq9d6cln5j4ww302fwlgg7m647cf2j16gs2i1p1d4klbn4jddz"
-    }
-  },
-
-  {
-    "path": "mvxcvi/arrangement/2.1.0/arrangement-2.1.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "1bc8f3bba7a28de85f319b7d464aa8d955f44918",
-      "sha256": "1j1rkwrs4wm8zk9v7ilgpnyav5sipdd2bmb83sazh392blw52wpk"
-    }
-  },
-
  {
    "path": "net/cgrand/macrovich/0.2.1/macrovich-0.2.1",
    "host": "https://repo.clojars.org",
@@ -755,15 +728,6 @@
    }
  },

-  {
-    "path": "org/clojure/test.check/1.1.1/test.check-1.1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "f33d988fd57bc9c11af1952db81c10f319c91416",
-      "sha256": "0y2hpkj7zl4yrpsl35ifpdaja5c72b8fpjcnmdgmld9c7cb1hlcl"
-    }
-  },
-
  {
    "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
    "host": "https://repo1.maven.org/maven2",
@@ -945,11 +909,11 @@
  },

  {
-    "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0",
+    "path": "refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207",
-      "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i"
+      "sha1": "2b3bb82da53b5db9c2b2aa298417816b81d0ed97",
+      "sha256": "1ysqabmlnghki6x0636zngxza2d83c85276wp9ma9wk183mkv52a"
    }
  },

@@ -3,13 +3,12 @@ babashka/fs/0.2.16/fs-0.2.16.jar
 bidi/bidi/2.1.6/bidi-2.1.6.jar
 binaryage/env-config/0.2.2/env-config-0.2.2.jar
 binaryage/oops/0.7.2/oops-0.7.2.jar
-borkdude/dynaload/0.3.5/dynaload-0.3.5.jar
-borkdude/edamame/1.3.23/edamame-1.3.23.jar
+borkdude/edamame/1.1.17/edamame-1.1.17.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.25.3/cider-nrepl-0.25.3.jar
-cider/piggieback/0.4.1/piggieback-0.4.1.jar
+cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0.jar
+cider/piggieback/0.5.2/piggieback-0.5.2.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
@@ -59,8 +58,6 @@ javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar
 javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
 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
 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
@@ -82,7 +79,6 @@ 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/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.cli/1.0.206/tools.cli-1.0.206.jar
@@ -103,7 +99,7 @@ org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.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/2.5.0/refactor-nrepl-2.5.0.jar
+refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0.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
@@ -67,12 +67,9 @@ stdenv.mkDerivation {
  '';
  buildPhase = ''
    # Assemble CLASSPATH from available clojure dependencies.
-    # We prepend 'src' so it can find the local sources and prioritize
-    # our own namespaces over dependencies, given that indirect dependencies
-    # can also cause naming conflicts (e.g. prismatic/schema already uses
-    # namespace schema.core).
-    export CLASS_PATH="src:$(find ${deps.clojure} \
-      -iname '*.jar' | tr '\n' ':')"
+    # We append 'src' so it can find the local sources.
+    export CLASS_PATH="$(find ${deps.clojure} \
+      -iname '*.jar' | tr '\n' ':')src"

    # target must be one of the builds defined in shadow-cljs.edn
    java -cp "$CLASS_PATH" clojure.main \
@@ -21,7 +21,7 @@ let
      buildInputs = with pkgs; [
        clojure flock maven openjdk
        # lint specific utilities
-        babashka clj-kondo clojure-lsp ripgrep zprint
+        clj-kondo zprint clojure-lsp
      ];
      # CLASSPATH from clojure deps with 'src' appended to find local sources.
      shellHook = with pkgs; ''
@@ -12,7 +12,7 @@
    "@react-native-async-storage/async-storage": "^1.17.9",
    "@react-native-camera-roll/camera-roll": "git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1",
    "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
-    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur.git#refs/tags/v4.3.3-status",
+    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur#refs/tags/v4.3.3-status",
    "@react-native-community/clipboard": "^1.2.2",
    "@react-native-community/hooks": "^3.0.0",
    "@react-native-community/masked-view": "^0.1.6",
@@ -47,7 +47,6 @@
    "react-native-image-crop-picker": "git+https://github.com/status-im/react-native-image-crop-picker.git#refs/tags/v0.36.2-status.0",
    "react-native-image-resizer": "^1.2.3",
    "react-native-image-viewing": "git+https://github.com/status-im/react-native-image-viewing.git#refs/tags/v0.2.1.status",
-    "react-native-intersection-observer": "^0.2.0",
    "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#refs/tags/v.3.0.0-5-status",
    "react-native-languages": "^3.0.2",
    "react-native-linear-gradient": "^2.8.0",
@@ -1,14 +0,0 @@
-#!/usr/bin/env sh
-
-# quo components namespace ends with style|utils|types|reaction-resource
-# are not the component view, they are usually utils fns or styles
-
-if rg --pcre2 --glob '!src/quo/**/*' 'quo\.components(\.[\w-]+)*\.[\w-]*(?<!style|utils|types|reaction-resource)(\s|\]|\n)' src; then
-  echo "Found above direct require of quo component outside src/quo/"
-  echo "For more info, check the style guide https://github.com/status-im/status-mobile/blob/develop/doc/new-guidelines.md#requiring-quo-components"
-  exit 1
-elif [ $? -eq 1 ]; then
-  exit 0
-else
-  exit $?
-fi
@@ -1,10 +0,0 @@
-#!/usr/bin/env sh
-
-if rg --quiet --multiline '^\(ns.*\n^\s*\(:require\n(^\s*(;|#_).*\n)*(^\s*\[status-im2\.setup\.i18n-resources\W)' src/status_im2/core.cljs; then
-  exit 0
-elif [ $? -eq 1 ]; then
-  echo "status-im2.setup.i18n-resources must be loaded first (be the first one in ns :require form) in status-im2.core"
-  echo "For more info, check the comment here https://github.com/status-im/status-mobile/pull/17618#discussion_r1361275489"
-else
-  exit $?
-fi
@@ -1,98 +0,0 @@
-#!/usr/bin/env bb
-
-(ns lint-translations
-  (:require [babashka.pods :as pods]))
-
-(pods/load-pod 'clj-kondo/clj-kondo "2023.09.07")
-(require '[pod.borkdude.clj-kondo :as kondo])
-(require '[cheshire.core :as json])
-(require '[clojure.set :as set])
-
-(def src-paths ["src"])
-
-(def translation-file "translations/en.json")
-
-;; set the following to true when solving https://github.com/status-im/status-mobile/issues/17811
-(def flag-show-non-namespaced-translation-keys false)
-(def flag-show-non-namespaced-translation-keys-occurrences false) ;; this makes the output super verbose!
-
-;; set the following to true when solving https://github.com/status-im/status-mobile/issues/17813
-;; and keep it permanently on after #17811 and #17813 have both been solved
-(def flag-show-unused-translation-keys false)
-
-(def flag-show-missing-translation-keys true)
-
-(defn- safe-name
-  [x]
-  (when x (name x)))
-
-(defn- ->keyword
-  [analysis-keyword]
-  (keyword (safe-name (:ns analysis-keyword)) (:name analysis-keyword)))
-
-(defn- report-issues
-  [incorrect-usages]
-  (doseq [incorrect-usage incorrect-usages]
-    (->> incorrect-usage
-         ((juxt :filename :row :reason ->keyword))
-         (apply format "%s:%s %s %s")
-         println)))
-
-(defn- extract-translation-keys
-  [file]
-  (-> file slurp json/parse-string keys))
-
-(def ^:private probably-unused-warning
-  (format "Probably unused translation key in %s:" translation-file))
-
-(defn -main
-  [& _args]
-  (println "Linting translations...")
-  (let [result                           (kondo/run!
-                                          {:lint   src-paths
-                                           :config {:output {:analysis {:keywords true}}}})
-        all-keywords                     (get-in result [:analysis :keywords])
-        used-translations                (filter (comp (partial = 't) :ns) all-keywords)
-        file-translation-keys            (apply sorted-set (extract-translation-keys translation-file))
-        missing-translations             (remove (comp file-translation-keys :name) used-translations)
-        used-translation-keys            (set (map :name used-translations))
-        possibly-unused-translation-keys (set/difference file-translation-keys used-translation-keys)
-        non-namespaced-translations      (filter
-                                          (fn [kw]
-                                            (and (not (:ns kw))
-                                                 (possibly-unused-translation-keys (:name kw))))
-                                          all-keywords)
-        unused-translation-keys          (set/difference possibly-unused-translation-keys
-                                                         (set (map :name non-namespaced-translations)))]
-
-    ;; TODO (2023-11-06 akatov): delete the following once #17811 and #17813 have both been solved
-    (doseq [k (apply sorted-set (map :name non-namespaced-translations))]
-      (when flag-show-non-namespaced-translation-keys
-        (println "Probably non-namespaced key" k))
-      (when flag-show-non-namespaced-translation-keys-occurrences
-        (->> non-namespaced-translations
-             (filter #(= k (:name %)))
-             (map #(assoc % :reason "Possibly non-namespaced translation key"))
-             report-issues)))
-
-    (when flag-show-unused-translation-keys
-      (run! #(println probably-unused-warning %) unused-translation-keys))
-
-    (when flag-show-missing-translation-keys
-      (report-issues (map #(assoc % :reason "Undefined Translation Key") missing-translations)))
-
-    (if (and
-         (or (not flag-show-missing-translation-keys)
-             (empty? missing-translations))
-         (or (not flag-show-unused-translation-keys)
-             (empty? possibly-unused-translation-keys))
-         (or (not flag-show-non-namespaced-translation-keys)
-             (not flag-show-non-namespaced-translation-keys-occurrences)
-             (empty? unused-translation-keys)))
-      0
-      1)))
-
-(when (= *file* (System/getProperty "babashka.file"))
-  (->> *command-line-args*
-       (apply -main)
-       System/exit))
@@ -9,7 +9,6 @@
                [cljs-bean "1.9.0"]
                [com.cognitect/transit-cljs "0.8.280"]
                [camel-snake-kebab "0.4.3"]
-                [metosin/malli "0.13.0"]

                ;; Dev dependencies
                [refactor-nrepl "2.5.0"]
@@ -51,7 +50,6 @@
                    :after-load-async  status-im2.setup.hot-reload/reload
                    :build-notify      status-im2.setup.hot-reload/build-notify
                    :preloads          [re-frisk-remote.preload
-                                        status-im2.setup.schema-preload
                                        ;; In order to use component test helpers in the REPL we
                                        ;; need to preload namespaces that are not normally required
                                        ;; by production code, such as
@@ -73,10 +71,6 @@
                            :warnings           {:fn-deprecated false}
                            :closure-defines    {re-frame.trace/trace-enabled? true}
                            :source-map         false
-                            ;; This seems to be necessary while using the REPL,
-                            ;; otherwise sometimes you'll get weird errors when
-                            ;; instrumenting functions.
-                            :static-fns         false
                            :infer-externs      true}
         ;; if you want to use a real device, set your local ip
         ;; in the SHADOW_HOST env variable to make sure that
@@ -110,15 +104,13 @@
   :output-dir "target/test"
   :optimizations :simple
   :target :node-test
-   :dev {:devtools {:preloads [status-im2.setup.schema-preload]}}
   ;; Uncomment line below to `make test-watch` a specific file
   ;; :ns-regexp "status-im2.subs.messages-test$"
   :main status-im.test-runner/main
   ;; set :ui-driven to true to let shadow-cljs inject node-repl
   :ui-driven true
   :closure-defines
-   {schema.core/throw-on-error?                      true
-    status-im2.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
+   {status-im2.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
    status-im2.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
    status-im2.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
    status-im2.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
@@ -147,17 +139,9 @@
   :compiler-options {:optimizations :simple
                      :source-map    false}}
  :component-test {:target           :npm-module
-                   :entries          [;; We need to tell shadow-cljs to compile
-                                      ;; the preloads namespace because it will
-                                      ;; be used directly by Jest in the option
-                                      ;; setupFilesAfterEnv.
-                                      status-im2.setup.schema-preload
-
-                                      quo.core-spec
-                                      status-im2.core-spec]
+                   :entries          [quo.core-spec status-im2.core-spec]
                   :ns-regexp        "component-spec$"
                   :output-dir       "component-spec"
-                   :closure-defines  {schema.core/throw-on-error? true}
                   :compiler-options {:warnings-as-errors false
                                      :static-fns         false
                                      :infer-externs      true}}}}
@@ -300,11 +300,6 @@
   {:clamp     nil
    :withPause (fn [])})

-(def react-native-intersection-observer
-  #js
-   {:InView     #js {}
-    :IOFlatList #js {}})
-
 (def react-native-languages
  (clj->js {:default {:language            "en"
                      :addEventListener    (fn [])
@@ -431,7 +426,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
-    "react-native-intersection-observer"             react-native-intersection-observer
    "../resources/data/emojis/en.json"               (js/JSON.parse (slurp
                                                                     "./resources/data/emojis/en.json"))
    "../src/js/worklets/core.js"                     worklet-factory
@@ -4,7 +4,8 @@
    [clojure.string :as string]
    [react-native.platform :as platform]
    [taoensso.timbre :as log]
-    [utils.transforms :as types]))
+    [utils.transforms :as types]
+    [utils.validators :as validators]))

 (defn status
  []
@@ -430,6 +431,19 @@
    ;; in unknown scenarios we also consider the device rooted to avoid degrading security
    :else (callback true)))

+(defn generate-gfycat
+  "Generate a 3 words random name based on the user public-key, synchronously"
+  [public-key]
+  (log/debug "[native-module] generate-gfycat")
+  (when (validators/valid-public-key? public-key)
+    (.generateAlias ^js (status) public-key)))
+
+(defn identicon
+  "Generate a icon based on a string, synchronously"
+  [seed]
+  (log/debug "[native-module] identicon")
+  (.identicon ^js (status) seed))
+
 (defn encode-transfer
  [to-norm amount-hex]
  (log/debug "[native-module] encode-transfer")
@@ -487,6 +501,12 @@
  (log/debug "[native-module] to-checksum-address")
  (.toChecksumAddress ^js (status) address))

+(defn gfycat-identicon-async
+  "Generate an icon based on a string and 3 words random name asynchronously"
+  [seed callback]
+  (log/debug "[native-module] gfycat-identicon-async")
+  (.generateAliasAndIdenticonAsync ^js (status) seed callback))
+
 (defn validate-mnemonic
  "Validate that a mnemonic conforms to BIP39 dictionary/checksum standards"
  [mnemonic callback]
@@ -2,7 +2,7 @@
  (:require
    [oops.core :as oops]
    [quo.components.animated-header-flatlist.style :as style]
-    [quo.components.icon :as icon]
+    [quo.core :as quo]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
@@ -73,11 +73,11 @@
      {:active-opacity 1
       :on-press       back-button-on-press
       :style          (style/button-container {:left 20 :theme theme})}
-      [icon/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
+      [quo/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
     [rn/touchable-opacity
      {:active-opacity 1
       :style          (style/button-container {:right 20 :theme theme})}
-      [icon/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
+      [quo/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
     [reanimated/blur-view
      {:blurAmount   32
       :blurType     :light
@@ -0,0 +1,68 @@
+(ns quo.components.avatars.wallet-user-avatar
+  (:require
+    [clojure.string :as string]
+    [quo.components.markdown.text :as text]
+    [quo.foundations.colors :as colors]
+    [quo.theme :as quo.theme]
+    [react-native.core :as rn]))
+
+(def circle-sizes
+  {:small   20
+   :medium  32
+   :large   48
+   :size-64 64
+   :x-large 80})
+
+(def font-sizes
+  {:small   :label
+   :medium  :paragraph-2
+   :large   :paragraph-1
+   :size-64 :heading-1
+   :x-large :heading-1})
+
+(def font-weights
+  {:small   :medium
+   :medium  :semi-bold
+   :large   :semi-bold
+   :size-64 :medium
+   :x-large :medium})
+
+(defn- view-internal
+  "params, first name, last name, customization-color, size
+   and if it's dark or not!"
+  [{:keys [f-name l-name customization-color size theme monospace? uppercase?]
+    :or   {f-name     "John"
+           l-name     "Doe"
+           size       :x-large
+           uppercase? true}}]
+  (let [circle-size    (size circle-sizes)
+        small?         (= size :small)
+        f-name-initial (-> f-name
+                           (#(if uppercase? (string/upper-case %) %))
+                           (subs 0 1))
+        l-name-initial (-> l-name
+                           (#(if uppercase? (string/upper-case %) %))
+                           (subs 0 1))
+        circle-color   (if customization-color
+                         (colors/resolve-color customization-color theme 20)
+                         (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5 theme))
+        text-color     (if customization-color
+                         (colors/resolve-color customization-color theme)
+                         (colors/theme-colors colors/neutral-80-opa-70 colors/white-opa-70 theme))]
+    [rn/view
+     {:style {:width            circle-size
+              :height           circle-size
+              :border-radius    circle-size
+              :text-align       :center
+              :justify-content  :center
+              :align-items      :center
+              :background-color circle-color}}
+     [text/text
+      {:size   (size font-sizes)
+       :weight (if monospace? :monospace (size font-weights))
+       :style  {:color text-color}}
+      (if small?
+        (str f-name-initial)
+        (str f-name-initial l-name-initial))]]))
+
+(def wallet-user-avatar (quo.theme/with-theme view-internal))
@@ -1,16 +0,0 @@
-(ns quo.components.avatars.wallet-user-avatar.component-spec
-  (:require [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
-            [test-helpers.component :as h]))
-
-(h/describe "wallet user avatar"
-  (h/describe "View internal"
-    (h/test "Renders by default even with no input parameters"
-      (h/render
-       [wallet-user-avatar/wallet-user-avatar {}])
-      (h/is-truthy (h/query-by-label-text :wallet-user-avatar)))
-
-    (h/test "Renders user’s initials when full name is provided"
-      (h/render
-       [wallet-user-avatar/wallet-user-avatar {:full-name "Jane Smith"}])
-      (h/is-truthy (h/get-by-text "JS")))))
-
@@ -1,27 +0,0 @@
-(ns quo.components.avatars.wallet-user-avatar.style
-  (:require [quo.foundations.colors :as colors]))
-
-(defn- circle-color
-  [customization-color]
-  (colors/custom-color customization-color 50 20))
-
-(defn- text-color
-  [customization-color theme]
-  (colors/theme-colors
-   (colors/custom-color customization-color 50)
-   (colors/custom-color customization-color 60)
-   theme))
-
-(defn container
-  [circle-size customization-color]
-  {:width            circle-size
-   :height           circle-size
-   :border-radius    circle-size
-   :text-align       :center
-   :justify-content  :center
-   :align-items      :center
-   :background-color (circle-color customization-color)})
-
-(defn text
-  [customization-color theme]
-  {:color (text-color customization-color theme)})
@@ -1,57 +0,0 @@
-(ns quo.components.avatars.wallet-user-avatar.view
-  (:require [quo.components.avatars.wallet-user-avatar.style :as style]
-            [quo.components.markdown.text :as text]
-            [quo.theme :as quo.theme]
-            [react-native.core :as rn]
-            utils.string))
-
-(def properties
-  {:size-20 {:size        20
-             :font-size   :label
-             :font-weight :medium}
-   :size-24 {:size        24
-             :font-size   :label
-             :font-weight :semi-bold}
-   :size-32 {:size        32
-             :font-size   :paragraph-2
-             :font-weight :semi-bold}
-   :size-48 {:size        48
-             :font-size   :paragraph-1
-             :font-weight :semi-bold}
-   :size-64 {:size        64
-             :font-size   :paragraph-1
-             :font-weight :medium}
-   :size-80 {:size        80
-             :font-size   :heading-1
-             :font-weight :medium}})
-
-(def smallest-possible (first (keys properties)))
-(def second-smallest-possible (second (keys properties)))
-(defn check-if-size-small
-  [size]
-  (or (= size smallest-possible)
-      (= size second-smallest-possible)))
-(def biggest-possible (last (keys properties)))
-
-(defn- view-internal
-  "Options:
-
-  :full-name - string (default: nil) - used to generate initials
-  :customization-color  - keyword (default: nil) - color of the avatar
-  :size   - keyword (default: last element of properties object) - size of the
-  avatar
-  :monospace? - boolean (default: false) - use monospace font"
-  [{:keys [full-name customization-color size theme monospace?]
-    :or   {size biggest-possible}}]
-  (let [circle-size (:size (size properties))
-        small?      (check-if-size-small size)]
-    [rn/view
-     {:style (style/container circle-size customization-color)}
-     [text/text
-      {:accessibility-label :wallet-user-avatar
-       :size                (:font-size (size properties))
-       :weight              (if monospace? :monospace (:font-weight (size properties)))
-       :style               (style/text customization-color theme)}
-      (utils.string/get-initials full-name (if small? 1 2))]]))
-
-(def wallet-user-avatar (quo.theme/with-theme view-internal))
@@ -1,3 +1,3 @@
 (ns quo.components.colors.color.constants)

-(def ^:const color-size 48)
+(def ^:const IPHONE_11_PRO_VIEWPORT_WIDTH 375)
@@ -1,13 +1,12 @@
 (ns quo.components.colors.color.style
  (:require
-    [quo.components.colors.color.constants :as constants]
    [quo.foundations.colors :as colors]
    [utils.responsiveness :as responsiveness]))

 (defn color-button-common
  [window-width]
-  {:width         constants/color-size
-   :height        constants/color-size
+  {:width         48
+   :height        48
   :border-width  4
   :border-radius 24
   :margin-right  (-> window-width
@@ -5,6 +5,10 @@
    [test-helpers.component :as h]))

 (h/describe "color-picker"
+  (h/test "color picker rendered"
+    (h/render [color-picker/view])
+    (-> (h/expect (h/get-all-by-label-text :color-picker-item))
+        (.toHaveLength 11)))
  (h/test "clicks on a color item"
    (let [event (h/mock-fn)]
      (h/render [color-picker/view {:on-change #(event)}])
@@ -16,6 +20,11 @@
      (h/render [color-picker/view {:on-change #(reset! selected %)}])
      (h/fire-event :press (get (h/get-all-by-label-text :color-picker-item) 0))
      (-> (h/expect @selected)
-          (.toStrictEqual :blue)))))
+          (.toStrictEqual :blue))))
+  (h/test "all of the values of colors-list are rendered"
+    (h/render [color-picker/view])
+    (js/Promise.all (map (fn [color]
+                           (h/is-truthy (h/get-all-by-label-text color)))
+                         color-picker/color-list))))


@@ -1,67 +1,39 @@
 (ns quo.components.colors.color-picker.view
  (:require
-    [quo.components.colors.color.constants :as constants]
    [quo.components.colors.color.view :as color]
-    [quo.foundations.colors :as colors]
    [react-native.core :as rn]
    [reagent.core :as reagent]))

+(def color-list
+  [:blue :yellow :purple :turquoise :magenta :sky :orange :army :flamingo :camel :copper])
+
 (defn- on-change-handler
  [selected color-name on-change]
  (reset! selected color-name)
  (when on-change (on-change color-name)))

-(defn get-item-layout
-  [_ index]
-  #js
-   {:length constants/color-size
-    :offset (* (+ constants/color-size 8) index)
-    :index  index})
-
-(defn- view-internal
+(defn view
  "Options
   - `default-selected` Default selected color name.
   - `on-change` Callback called when a color is selected `(fn [color-name])`.
   - `blur?` Boolean to enable blur background support.}"
-  [{:keys [default-selected blur? on-change feng-shui? container-style]}]
+  [{:keys [default-selected]}]
  (let [selected              (reagent/atom default-selected)
-        {window-width :width} (rn/get-window)
-        ref                   (atom nil)]
-    (rn/use-effect #(js/setTimeout (fn []
-                                     (.scrollToIndex ^js @ref
-                                                     #js
-                                                      {:animated     true
-                                                       :index        (.indexOf colors/account-colors
-                                                                               default-selected)
-                                                       :viewPosition 0.5}))
-                                   50))
-    [rn/flat-list
-     {:ref                               #(reset! ref %)
-      ;; TODO: using :feng-shui? temporarily while b & w is being developed.
-      ;; https://github.com/status-im/status-mobile/discussions/16676
-      :data                              (if feng-shui?
-                                           (conj colors/account-colors :feng-shui)
-                                           colors/account-colors)
-      :render-fn                         (fn [color idx]
-                                           [color/view
-                                            {:selected?    (= color @selected)
-                                             :on-press     (fn [e]
-                                                             (.scrollToIndex ^js @ref
-                                                                             #js
-                                                                              {:animated     true
-                                                                               :index        idx
-                                                                               :viewPosition 0.5})
-                                                             (on-change-handler selected e on-change))
-                                             :blur?        blur?
-                                             :key          color
-                                             :color        color
-                                             :idx          idx
-                                             :window-width window-width}])
-      :get-item-layout                   get-item-layout
-      :horizontal                        true
-      :shows-horizontal-scroll-indicator false
-      :content-container-style           container-style}]))
-
-(defn view
-  [props]
-  [:f> view-internal props])
+        {window-width :width} (rn/get-window)]
+    (fn [{:keys [blur? on-change feng-shui? container-style]}]
+      [rn/scroll-view
+       {:horizontal                        true
+        :shows-horizontal-scroll-indicator false
+        :content-container-style           container-style}
+       (doall (map-indexed (fn [idx color]
+                             [color/view
+                              {:selected?    (= color @selected)
+                               :on-press     #(on-change-handler selected % on-change)
+                               :blur?        blur?
+                               :key          color
+                               :color        color
+                               :idx          idx
+                               :window-width window-width}])
+                           ;; TODO: using :feng-shui? temporarily while b & w is being developed.
+                           ;; https://github.com/status-im/status-mobile/discussions/16676
+                           (if feng-shui? (conj color-list :feng-shui) color-list)))])))
@@ -1,18 +0,0 @@
-(ns quo.components.community.community-stat.component-spec
-  (:require
-    [quo.core :as quo]
-    [test-helpers.component :as h]
-    utils.money))
-
-(h/describe "Community Stat Component"
-  (h/test "default render"
-    (h/render [quo/community-stat
-               {:value               "5000"
-                :icon                :i/active-members
-                :accessibility-label :community-active-members}])
-    (h/is-truthy (h/query-by-label-text :community-active-members)))
-  (h/test "renders community stat with a value"
-    (h/render [quo/community-stat
-               {:value "5000"
-                :icon  :i/members}])
-    (h/is-truthy (h/query-by-text (utils.money/format-amount "5000")))))
@@ -1,12 +0,0 @@
-(ns quo.components.community.community-stat.style
-  (:require [quo.foundations.colors :as colors]))
-
-(def container
-  {:flex-direction :row
-   :align-items    :center
-   :height         22})
-
-(defn text
-  [theme]
-  {:color       (colors/theme-colors colors/black colors/white theme)
-   :margin-left 2})
@@ -1,26 +0,0 @@
-(ns quo.components.community.community-stat.view
-  (:require [quo.components.community.community-stat.style :as style]
-            [quo.components.icon :as quo.icons]
-            [quo.components.markdown.text :as quo.text]
-            [quo.foundations.colors :as colors]
-            [quo.theme :as quo.theme]
-            [react-native.core :as rn]
-            utils.money))
-
-(defn view-internal
-  [{:keys [value icon theme style accessibility-label]}]
-  [rn/view
-   {:style               (merge style/container style)
-    :accessibility-label accessibility-label}
-   [quo.icons/icon icon
-    {:size            16
-     :container-style {:align-items     :center
-                       :justify-content :center}
-     :resize-mode     :center
-     :color           (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
-   [quo.text/text
-    {:size   :paragraph-1
-     :weight :regular
-     :style  (style/text theme)} (utils.money/format-amount value)]])
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,30 +1,52 @@
 (ns quo.components.community.community-view
  (:require
-    [quo.components.community.community-stat.view :as community-stat]
    [quo.components.community.style :as style]
+    [quo.components.icon :as icons]
    [quo.components.markdown.text :as text]
    [quo.components.tags.permission-tag :as permission]
    [quo.components.tags.tag :as tag]
    [quo.foundations.colors :as colors]
    [quo.theme :as theme]
    [react-native.core :as rn]
-    [react-native.gesture :as gesture]))
+    [react-native.gesture :as gesture]
+    utils.money))
+
+(defn community-stats
+  [{:keys [icon members-count icon-color accessibility-label]}]
+  [rn/view
+   {:accessibility-label accessibility-label
+    :style               (style/stats-count-container)}
+   [rn/view {:margin-right 2}
+    [icons/icon icon
+     {:container-style {:align-items     :center
+                        :justify-content :center}
+      :resize-mode     :center
+      :size            16
+      :color           icon-color}]]
+   [text/text
+    {:weight :regular
+     :size   :paragraph-2}
+    members-count]])

 (defn community-stats-column
-  [{:keys [type members-count active-count]}]
-  [rn/view
-   (if (= type :card-view)
-     (style/card-stats-container)
-     (style/list-stats-container))
-   [community-stat/view
-    {:accessibility-label :stats-members-count
-     :icon                :i/group
-     :value               members-count
-     :style               {:margin-right 12}}]
-   [community-stat/view
-    {:accessibility-label :stats-active-count
-     :icon                :i/active-members
-     :value               active-count}]])
+  [{:keys [type theme blur? members-count active-count]}]
+  (let [icon-color (if (and (= :dark theme) blur?)
+                     colors/white-opa-40
+                     (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))]
+    [rn/view
+     (if (= type :card-view)
+       (style/card-stats-container)
+       (style/list-stats-container))
+     [community-stats
+      {:accessibility-label :stats-members-count
+       :icon                :i/group
+       :members-count       (utils.money/format-amount members-count)
+       :icon-color          icon-color}]
+     [community-stats
+      {:accessibility-label :stats-active-count
+       :icon                :i/active-members
+       :members-count       (utils.money/format-amount active-count)
+       :icon-color          icon-color}]]))

 (defn community-tags
  [{:keys [tags container-style last-item-style]}]
@@ -17,6 +17,12 @@
 (def detail-container
  {:flex 1})

+(defn stats-count-container
+  []
+  {:flex-direction :row
+   :align-items    :center
+   :margin-right   16})
+
 (defn card-stats-container
  []
  {:flex-direction :row})
@@ -3,22 +3,18 @@
    [quo.components.counter.step.view :as step]
    [test-helpers.component :as h]))

-(defn render
-  [component]
-  (h/render-with-theme-provider component :dark))
-
 (h/describe "step component"
  (h/test "default render of step component"
-    (render [step/view {} nil])
+    (h/render [step/view {} nil])
    (-> (h/expect (h/query-by-label-text :step-counter))
        (h/is-truthy)))

  (h/test "renders step with a string value"
-    (render [step/view {} "1"])
+    (h/render [step/view {} "1"])
    (-> (h/expect (h/get-by-text "1"))
        (h/is-truthy)))

  (h/test "renders step with an integer value"
-    (render [step/view {} 1])
+    (h/render [step/view {} 1])
    (-> (h/expect (h/get-by-text "1"))
        (h/is-truthy))))
@@ -2,24 +2,10 @@
  (:require
    [quo.components.counter.step.style :as style]
    [quo.components.markdown.text :as text]
-    quo.theme
+    [quo.theme :as theme]
    [react-native.core :as rn]
-    [schema.core :as schema]
    [utils.number]))

-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:accessibility-label {:optional true} [:maybe :keyword]]
-      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-      [:in-blur-view? {:optional true} [:maybe :boolean]]
-      [:theme :schema.common/theme]
-      [:type {:optional true} [:enum :active :complete :neutral]]]]
-    [:value [:maybe [:or :string :int]]]]
-   :any])
-
 (defn- view-internal
  [{:keys [type accessibility-label theme in-blur-view? customization-color]} value]
  (let [type  (or type :neutral)
@@ -37,9 +23,6 @@
     [text/text
      {:weight :medium
       :size   :label
-       :style  {:color (style/text-color type theme)}}
-      label]]))
+       :style  {:color (style/text-color type theme)}} label]]))

-(def view
-  (quo.theme/with-theme
-   (schema/instrument #'view-internal ?schema)))
+(def view (theme/with-theme view-internal))
@@ -7,9 +7,8 @@
    [react-native.core :as rn]))

 (def default-props
-  {:button-one-type     :primary
-   :button-two-type     :grey
-   :customization-color :blue})
+  {:button-one-type :primary
+   :button-two-type :grey})

 (defn- view-internal
  "Options:
@@ -24,9 +23,9 @@
  :scroll? - bool (default false) - Whether the iOS Home Indicator should be rendered"
  [props]
  (let [{:keys [actions description button-one-label button-two-label
-                button-one-props button-two-props theme scroll? customization-color container-style]}
+                button-one-props button-two-props theme scroll?]}
        (merge default-props props)]
-    [rn/view {:style container-style}
+    [:<>
     [rn/view {:style style/buttons-container}
      (when (= actions :2-actions)
        [button/button
@@ -44,8 +43,7 @@
         :container-style     style/button-container
         :background          (when scroll? :blur)
         :theme               theme
-         :accessibility-label :button-one
-         :customization-color customization-color}
+         :accessibility-label :button-one}
        button-one-props)
       button-one-label]]
     (when description
@@ -0,0 +1,20 @@
+(ns quo.components.dropdowns.dropdown-input.view
+  (:require
+    [quo.components.dropdowns.dropdown.properties :as properties]
+    [quo.components.dropdowns.dropdown.style :as style]
+    [quo.components.icon :as icon]
+    [quo.components.markdown.text :as text]
+    [quo.foundations.customization-colors :as customization-colors]
+    [quo.theme :as theme]
+    [react-native.blur :as blur]
+    [react-native.core :as rn]))
+
+(defn view-internal
+  []
+  [rn/pressable
+   {:on-press nil}])
+
+(def view
+  "Props:
+    - :on-press - function to call when pressed"
+  (theme/with-theme view-internal))
@@ -19,7 +19,3 @@
   :background-color colors/danger-50
   :align-items      :center
   :justify-content  :center})
-
-(def empty-state
-  {:width  375
-   :height 116})
@@ -2,12 +2,11 @@
  (:require
    [quo.components.graph.utils :as utils]
    [quo.components.graph.wallet-graph.style :as style]
+    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
-    [quo.foundations.resources :as resources]
    [quo.theme :as quo.theme]
    [react-native.charts :as charts]
    [react-native.core :as rn]
-    [react-native.fast-image :as fast-image]
    [react-native.linear-gradient :as linear-gradient]))

 (defn- time-frame->max-data-points
@@ -43,10 +42,11 @@
        gradient-colors [(colors/alpha line-color 0.1) (colors/alpha line-color 0)]
        fill-color      (colors/theme-colors colors/white colors/neutral-95)]
    (if (= time-frame :empty)
-      [fast-image/fast-image
-       {:style               style/empty-state
-        :source              (resources/get-themed-image :no-funds theme)
-        :accessibility-label :illustration}]
+      [rn/view
+       {:accessibility-label :illustration
+        :style               style/illustration}
+       [text/text {:style {:color colors/white}}
+        "Illustration here"]]
      [rn/view
       [linear-gradient/linear-gradient
        {:colors gradient-colors
@@ -3,17 +3,22 @@
    [quo.components.icon :as quo.icons]
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
-    [quo.theme :as quo.theme]
+    [quo.theme :as theme]
    [react-native.core :as rn]))

-(defn get-color
-  [k theme]
-  (case k
-    :success (colors/resolve-color :success theme)
-    :error   (colors/resolve-color :danger theme)
-    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
+(def themes
+  {:light {:default colors/neutral-50
+           :success colors/success-50
+           :error   colors/danger-50}
+   :dark  {:default colors/neutral-40
+           :success colors/success-60
+           :error   colors/danger-60}})

-(defn view-internal
+(defn get-color
+  [k]
+  (get-in themes [(theme/get-theme) k]))
+
+(defn info-message
  "[info-message opts \"message\"]
  opts
  {:type           :default/:success/:error
@@ -22,11 +27,11 @@
   :text-color     colors/white  ;; text color override
   :icon-color     colors/white  ;; icon color override
   :no-icon-color? false         ;; disable tint color for icon"
-  [{:keys [type size theme icon text-color icon-color no-icon-color? style accessibility-label]} message]
+  [{:keys [type size icon text-color icon-color no-icon-color? style]} message]
  (let [weight     (if (= size :default) :regular :medium)
        icon-size  (if (= size :default) 16 12)
        size       (if (= size :default) :paragraph-2 :label)
-        text-color (or text-color (get-color type theme))
+        text-color (or text-color (get-color type))
        icon-color (or icon-color text-color)]
    [rn/view
     {:style (merge {:flex-direction :row
@@ -37,10 +42,7 @@
       :no-color no-icon-color?
       :size     icon-size}]
     [text/text
-      {:accessibility-label accessibility-label
-       :size                size
-       :weight              weight
-       :style               {:color             text-color
-                             :margin-horizontal 4}} message]]))
-
-(def info-message (quo.theme/with-theme view-internal))
+      {:size   size
+       :weight weight
+       :style  {:color             text-color
+                :margin-horizontal 4}} message]]))
@@ -65,23 +65,22 @@
                 ens-regex address-regex
                 valid-ens-or-address?]}]
      (let [on-change              (fn [text]
-                                     (when (not= @value text)
-                                       (let [ens?     (when ens-regex
-                                                        (boolean (re-matches ens-regex text)))
-                                             address? (when address-regex
-                                                        (boolean (re-matches address-regex text)))]
-                                         (if (> (count text) 0)
-                                           (reset! status :typing)
-                                           (reset! status :active))
-                                         (reset! value text)
-                                         (when on-change-text
-                                           (on-change-text text))
-                                         (when (and ens? on-detect-ens)
-                                           (reset! status :loading)
-                                           (on-detect-ens text))
-                                         (when (and address? on-detect-address)
-                                           (reset! status :loading)
-                                           (on-detect-address text)))))
+                                     (let [ens?     (when ens-regex
+                                                      (boolean (re-matches ens-regex text)))
+                                           address? (when address-regex
+                                                      (boolean (re-matches address-regex text)))]
+                                       (if (> (count text) 0)
+                                         (reset! status :typing)
+                                         (reset! status :active))
+                                       (reset! value text)
+                                       (when on-change-text
+                                         (on-change-text text))
+                                       (when (and ens? on-detect-ens)
+                                         (reset! status :loading)
+                                         (on-detect-ens text))
+                                       (when (and address? on-detect-address)
+                                         (reset! status :loading)
+                                         (on-detect-address text))))
            on-paste               (fn []
                                     (clipboard/get-string
                                      (fn [clipboard]
@@ -91,8 +90,6 @@
            on-clear               (fn []
                                     (reset! value "")
                                     (reset! status (if @focused? :active :default))
-                                     (when on-change-text
-                                       (on-change-text ""))
                                     (when on-clear
                                       (on-clear)))
            on-scan                #(when on-scan
@@ -122,7 +119,6 @@
           :auto-complete          (when platform/ios? :none)
           :auto-capitalize        :none
           :auto-correct           false
-           :spell-check            false
           :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
           :on-focus               on-focus
           :on-blur                on-blur
@@ -23,8 +23,6 @@
           return-key-type
           size
           theme
-           on-focus
-           on-blur
           container-style]
    :or   {max-length    0
           auto-focus    false
@@ -50,14 +48,8 @@
          :accessibility-label :profile-title-input
          :keyboard-appearance (quo.theme/theme-value :light :dark theme)
          :return-key-type return-key-type
-          :on-focus (fn []
-                      (when (fn? on-focus)
-                        (on-focus))
-                      (reset! focused? true))
-          :on-blur (fn []
-                     (when (fn? on-blur)
-                       (on-blur))
-                     (reset! focused? false))
+          :on-focus #(swap! focused? (constantly true))
+          :on-blur #(swap! focused? (constantly false))
          :auto-focus auto-focus
          :input-mode :text
          :on-change-text on-change
@@ -31,5 +31,4 @@
   :align-items    :center})

 (def account-container
-  {:margin-left   8
-   :padding-right 56})
+  {:margin-left 8})
@@ -1,13 +1,13 @@
 (ns quo.components.list-items.address.view
  (:require
-    [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
+    [clojure.string :as string]
+    [quo.components.avatars.wallet-user-avatar :as wallet-user-avatar]
    [quo.components.list-items.address.style :as style]
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [reagent.core :as reagent]
-    [utils.address :as address]))
+    [reagent.core :as reagent]))

 (defn- left-container
  [{:keys [theme address networks blur?]}]
@@ -25,8 +25,7 @@
            [text/text
             {:size   :paragraph-1
              :weight :semi-bold
-              :style  {:color (colors/resolve-color network theme)}}
-             (str (subs (name network) 0 3) ":")])
+              :style  {:color (colors/resolve-color network)}} (str (subs (name network) 0 3) ":")])
          networks)
     [text/text
      {:size   :paragraph-1
@@ -34,7 +33,7 @@
       :style  {:color (if blur?
                         colors/white
                         (colors/theme-colors colors/neutral-100 colors/white theme))}}
-      (address/get-shortened-key address)]]]])
+      (string/replace address "x" "×")]]]])

 (defn- internal-view
  []
@@ -61,7 +60,6 @@
         [left-container
          {:theme    theme
           :networks networks
-           :address  address
-           :blur?    blur?}]]))))
+           :address  address}]]))))

 (def view (quo.theme/with-theme internal-view))
@@ -148,6 +148,8 @@
        (when (and members (= type :discover))
          [community-view/community-stats-column
           {:type          :list-view
+            :theme         theme
+            :blur?         blur?
            :members-count (:members-count members)
            :active-count  (:active-count members)}])]
       [info-component
@@ -13,7 +13,7 @@
    (h/render [saved-address/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)})))
+                              {:backgroundColor (colors/custom-color :blue 50 5)})))

  (h/test "on-press-in changes state to :pressed with blur? enabled"
    (h/render [saved-address/view {:blur? true}])
@@ -22,25 +22,24 @@
                              {:backgroundColor colors/white-opa-5})))

  (h/test "on-press-out changes state to :active"
-    (h/render [saved-address/view {:active-state? true}])
+    (h/render [saved-address/view])
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/fire-event :on-press-out (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
-                              {:backgroundColor (colors/resolve-color :blue :light 10)})))
+                              {:backgroundColor (colors/custom-color :blue 50 10)})))

  (h/test "on-press-out changes state to :active with blur? enabled"
-    (h/render [saved-address/view
-               {:blur?         true
-                :active-state? true}])
+    (h/render [saved-address/view {:blur? true}])
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/fire-event :on-press-out (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
                              {:backgroundColor colors/white-opa-10})))

-  (h/test "on-press container calls on-press"
+  (h/test "on-press-out calls on-press"
    (let [on-press (h/mock-fn)]
      (h/render [saved-address/view {:on-press on-press}])
-      (h/fire-event :on-press (h/get-by-label-text :container))
+      (h/fire-event :on-press-in (h/get-by-label-text :container))
+      (h/fire-event :on-press-out (h/get-by-label-text :container))
      (h/was-called on-press)))

  (h/test "renders options button if type :action"
@@ -1,27 +1,26 @@
 (ns quo.components.list-items.saved-address.view
  (:require
    [clojure.string :as string]
-    [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
+    [quo.components.avatars.wallet-user-avatar :as wallet-user-avatar]
    [quo.components.icon :as icon]
    [quo.components.list-items.saved-address.style :as style]
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [reagent.core :as reagent]
-    [utils.address :as address]))
+    [reagent.core :as reagent]))

 (defn- left-container
-  [{:keys [blur? theme name ens address customization-color]}]
+  [{:keys [blur? theme name address customization-color]}]
  (let [names      (remove string/blank? (string/split name " "))
        first-name (if (> (count names) 0) (first names) "")
        last-name  (if (> (count names) 1) (last names) "")]
    [rn/view {:style style/left-container}
     [wallet-user-avatar/wallet-user-avatar
-      {:size                :medium
-       :f-name              first-name
-       :l-name              last-name
-       :customization-color customization-color}]
+      {:size   :medium
+       :f-name first-name
+       :l-name last-name
+       :color  customization-color}]
     [rn/view {:style style/account-container}
      [text/text
       {:weight :semi-bold
@@ -33,7 +32,7 @@
        {:size   :paragraph-2
         :weight :monospace
         :style  (style/account-address blur? theme)}
-        (or ens (address/get-shortened-key address))]]]]))
+        address]]]]))

 (defn- internal-view
  []
@@ -43,39 +42,39 @@
        on-press-in (fn []
                      (when-not (= @state :selected)
                        (reset! timer (js/setTimeout #(reset! state :pressed) 100))))]
-    (fn [{:keys [blur? user-props active-state? customization-color
+    (fn [{:keys [blur? user-props customization-color
                 on-press
                 on-options-press
                 theme]
          :or   {customization-color :blue
                 blur?               false}}]
      (let [on-press-out (fn []
-                           (let [new-state (if (or (not active-state?) @active?) :default :active)]
+                           (let [new-state (if @active? :default :active)]
                             (when @timer (js/clearTimeout @timer))
                             (reset! timer nil)
                             (reset! active? (= new-state :active))
-                             (reset! state new-state)))]
+                             (reset! state new-state)
+                             (when on-press
+                               (on-press))))]
        [rn/pressable
         {:style               (style/container
                                {:state @state :blur? blur? :customization-color customization-color})
          :on-press-in         on-press-in
          :on-press-out        on-press-out
-          :on-press            on-press
          :accessibility-label :container}
         [left-container
          {:blur?               blur?
           :theme               theme
           :name                (:name user-props)
-           :ens                 (:ens user-props)
           :address             (:address user-props)
-           :customization-color (or (:customization-color user-props) :blue)}]
-         (when on-options-press
-           [rn/pressable
-            {:accessibility-label :options-button
-             :on-press            on-options-press}
-            [icon/icon :i/options
-             {:color (if blur?
-                       colors/white-opa-70
-                       (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}]])]))))
+           :customization-color (:customization-color user-props)}]
+         [rn/pressable
+          {:accessibility-label :options-button
+           :on-press            #(when on-options-press
+                                   (on-options-press))}
+          [icon/icon :i/options
+           {:color (if blur?
+                     colors/white-opa-70
+                     (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}]]]))))

 (def view (quo.theme/with-theme internal-view))
@@ -9,7 +9,6 @@
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [reagent.core :as reagent]
-    [utils.address :as address]
    [utils.i18n :as i18n]))

 (defn- account
@@ -31,7 +30,7 @@
    {:size   :paragraph-2
     :weight :monospace
     :style  (style/account-address theme)}
-    (address/get-shortened-key address)]])
+    address]])

 (defn- internal-view
  []
@@ -27,9 +27,8 @@
      {:size  20
       :color (colors/theme-colors colors/neutral-50 colors/neutral-40)}]
     :checkbox
-     [selectors/view
-      {:type                :checkbox
-       :checked?            checked?
+     [selectors/checkbox
+      {:checked?            checked?
       :accessibility-label :user-list-toggle-check
       :disabled?           disabled?
       :on-change           (when on-check on-check)}]
@@ -22,10 +22,9 @@
    (h/is-truthy (h/get-by-text "test description")))

  (h/test "renders step component when step-number is valid and type is step"
-    (h/render-with-theme-provider [list/view
-                                   {:type        :step
-                                    :step-number 1}]
-                                  :dark)
+    (h/render [list/view
+               {:type        :step
+                :step-number 1}])
    (h/is-truthy (h/get-by-label-text :step-counter)))

  (h/test "renders decription with a context tag component and description after the tag"
@@ -5,22 +5,23 @@
 (def container
  {:flex-wrap      :nowrap
   :flex-direction :row
-   :align-items    :flex-end})
+   :align-items    :center})

-(def name-container
-  {:margin-right   8
-   :flex-direction :row
-   :align-items    :flex-end
-  })
-
-(defn middle-dot
+(defn middle-dot-nickname
  [theme]
  {:color             (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)
-   :margin-horizontal 2})
+   :margin-horizontal 4})

 (defn chat-key-text
  [theme]
-  {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)})
+  {:color       (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)
+   :margin-left 8
+   :padding-top 1})
+
+(defn middle-dot-chat-key
+  [theme]
+  {:color       (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)
+   :margin-left 4})

 (defn primary-name
  [muted? theme]
@@ -33,13 +34,14 @@
  [theme]
  {:padding-top 1
   :flex-shrink 999999
+   :min-width   40
   :color       (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})

-(defn icon-container
-  [is-first?]
-  {:margin-left   (if is-first? 4 2)
-   :margin-bottom 2})
+(def icon-container
+  {:margin-left 4})

 (defn time-text
  [theme]
-  {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)})
+  {:color       (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)
+   :padding-top 1
+   :margin-left 8})
@@ -14,48 +14,46 @@
           muted? size theme]
    :or   {size 13}}]
  [rn/view {:style (merge style/container style {:height (if (= size 15) 21.75 18.2)})}
-   [rn/view {:style style/name-container}
-    [text/text
-     {:weight              :semi-bold
-      :size                (if (= size 15) :paragraph-1 :paragraph-2)
-      :number-of-lines     1
-      :accessibility-label :author-primary-name
-      :style               (style/primary-name muted? theme)}
-     primary-name]
-    (when (not (string/blank? secondary-name))
-      [:<>
-       [text/text
-        {:size            :label
-         :number-of-lines 1
-         :style           (style/middle-dot theme)}
-        middle-dot]
-       [text/text
-        {:weight              :medium
-         :size                :label
-         :number-of-lines     1
-         :accessibility-label :author-secondary-name
-         :style               (style/secondary-name theme)}
-        secondary-name]])
-    (when contact?
-      [icons/icon :main-icons2/contact
-       {:size            12
-        :no-color        true
-        :container-style (style/icon-container true)}])
-    (cond
-      verified?
-      [icons/icon :main-icons2/verified
-       {:size            12
-        :no-color        true
-        :container-style (style/icon-container contact?)}]
-      untrustworthy?
-      [icons/icon :main-icons2/untrustworthy
-       {:size            12
-        :no-color        true
-        :container-style (style/icon-container contact?)}])
-   ]
+   [text/text
+    {:weight              :semi-bold
+     :size                (if (= size 15) :paragraph-1 :paragraph-2)
+     :number-of-lines     1
+     :accessibility-label :author-primary-name
+     :style               (style/primary-name muted? theme)}
+    primary-name]
+   (when (not (string/blank? secondary-name))
+     [:<>
+      [text/text
+       {:size            :label
+        :number-of-lines 1
+        :style           (style/middle-dot-nickname theme)}
+       middle-dot]
+      [text/text
+       {:weight              :medium
+        :size                :label
+        :number-of-lines     1
+        :accessibility-label :author-secondary-name
+        :style               (style/secondary-name theme)}
+       secondary-name]])
+   (when contact?
+     [icons/icon :main-icons2/contact
+      {:size            12
+       :no-color        true
+       :container-style style/icon-container}])
+   (cond
+     verified?
+     [icons/icon :main-icons2/verified
+      {:size            12
+       :no-color        true
+       :container-style style/icon-container}]
+     untrustworthy?
+     [icons/icon :main-icons2/untrustworthy
+      {:size            12
+       :no-color        true
+       :container-style style/icon-container}])
   (when (and (not verified?) short-chat-key)
     [text/text
-      {:weight          :monospace
+      {:monospace       true
       :size            :label
       :number-of-lines 1
       :style           (style/chat-key-text theme)}
@@ -65,7 +63,7 @@
      {:monospace       true
       :size            :label
       :number-of-lines 1
-       :style           (style/middle-dot theme)}
+       :style           (style/middle-dot-chat-key theme)}
      middle-dot])
   (when time-str
     [text/text
@@ -7,11 +7,6 @@
    [react-native.core :as rn]
    [reagent.core :as reagent]))

-(defn- label->accessibility-label
-  [label]
-  (let [label-name (if (keyword? label) (name label) label)]
-    (keyword (str "keyboard-key-" label-name))))
-
 (defn- view-internal
  []
  (let [pressed? (reagent/atom false)]
@@ -19,11 +14,9 @@
      (let [label-color      (style/get-label-color disabled? theme blur?)
            background-color (style/toggle-background-color @pressed? blur? theme)]
        [rn/pressable
-         {:accessibility-label (label->accessibility-label label)
+         {:accessibility-label :keyboard-key
          :disabled            (or disabled? (not label))
-          :on-press            (fn []
-                                 (when on-press
-                                   (on-press label)))
+          :on-press            (fn [] (on-press label))
          :on-press-in         #(reset! pressed? true)
          :on-press-out        #(reset! pressed? false)
          :style               (style/container background-color)}
@@ -17,15 +17,13 @@

 (defn- view-internal
  []
-  (fn [{:keys [disabled? theme blur? left-action delete-key? on-press on-delete]
-        :or   {left-action :none}}]
+  (fn [{:keys [disabled? theme blur? left-action delete-key? on-press]}]
    [rn/view
     {:style style/container}
     (for [row-index (range 1 4)]
       ^{:key row-index}
       [rn/view {:style style/row-container}
        (for [column-index (range 1 4)]
-          ^{:key (str row-index column-index)}
          [keyboard-item
           {:item      (+ (* (dec row-index) 3) column-index)
            :type      :digit
@@ -63,7 +61,7 @@
         {:item      :i/delete
          :type      :key
          :disabled? disabled?
-          :on-press  on-delete
+          :on-press  on-press
          :blur?     blur?
          :theme     theme}]
        [keyboard-item])]]))
@@ -2,6 +2,11 @@
  (:require
    [quo.foundations.colors :as colors]))

+(def height 56)
+
+(def root-container
+  {:height height})
+
 (defn container
  [state theme]
  {:padding-top      12
@@ -25,7 +25,7 @@
 (defn- view-internal
  [{:keys [theme container-style default-active state data on-press active-id]}]
  [rn/view
-   {:style               container-style
+   {:style               (merge style/root-container container-style)
    :accessibility-label :showcase-nav}
   [rn/flat-list
    {:data                              data
@@ -11,9 +11,8 @@
   {:on-press            on-change
    :accessibility-label :disclaimer-touchable-opacity}
   [rn/view {:style (merge container-style (style/container blur?))}
-    [selectors/view
-     {:type                :checkbox
-      :accessibility-label accessibility-label
+    [selectors/checkbox
+     {:accessibility-label accessibility-label
      :blur?               blur?
      :checked?            checked?
      :on-change           on-change}]
@@ -6,27 +6,27 @@

 (defn render-toggle
  ([]
-   (render-toggle {:type :toggle}))
+   (render-toggle {}))
  ([opts]
-   (h/render (reagent/as-element [selectors/view (assoc opts :type :toggle)]))))
+   (h/render (reagent/as-element [selectors/toggle opts]))))

 (defn render-checkbox
  ([]
-   (render-checkbox {:type :checkbox}))
+   (render-checkbox {}))
  ([opts]
-   (h/render (reagent/as-element [selectors/view (assoc opts :type :checkbox)]))))
+   (h/render (reagent/as-element [selectors/checkbox opts]))))

-(defn render-filled-checkbox
+(defn render-checkbox-prefill
  ([]
-   (render-filled-checkbox {:type :filled-checkbox}))
+   (render-checkbox-prefill {}))
  ([opts]
-   (h/render (reagent/as-element [selectors/view (assoc opts :type :filled-checkbox)]))))
+   (h/render (reagent/as-element [selectors/checkbox-prefill opts]))))

 (defn render-radio
  ([]
-   (render-radio {:type :radio}))
+   (render-radio {}))
  ([opts]
-   (h/render (reagent/as-element [selectors/view (assoc opts :type :radio)]))))
+   (h/render (reagent/as-element [selectors/radio opts]))))

 (h/test "default render of toggle component"
  (render-toggle)
@@ -58,12 +58,12 @@
    (h/fire-event :press (h/get-by-test-id "checkbox-component"))
    (h/was-called mock-fn)))

-(h/test "default render of filled-checkbox component"
-  (render-filled-checkbox)
-  (h/is-truthy (h/get-by-test-id "filled-checkbox-component")))
+(h/test "default render of checkbox-prefill component"
+  (render-checkbox-prefill)
+  (h/is-truthy (h/get-by-test-id "checkbox-prefill-component")))

-(h/test "filled-checkbox component on change is working"
+(h/test "checkbox-prefill component on change is working"
  (let [mock-fn (h/mock-fn)]
-    (render-filled-checkbox {:on-change mock-fn})
-    (h/fire-event :press (h/get-by-test-id "filled-checkbox-component"))
+    (render-checkbox-prefill {:on-change mock-fn})
+    (h/fire-event :press (h/get-by-test-id "checkbox-prefill-component"))
    (h/was-called mock-fn)))
@@ -6,7 +6,7 @@
  [customization-color theme]
  {:normal {:checked   (colors/resolve-color customization-color theme)
            :unchecked (colors/theme-colors colors/neutral-30 colors/neutral-80 theme)}
-   :blur   {:checked   (colors/theme-colors (colors/resolve-color customization-color theme)
+   :blur   {:checked   (colors/theme-colors (colors/custom-color customization-color 50)
                                            colors/white-opa-70
                                            theme)
            :unchecked (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-10 theme)}})
@@ -15,7 +15,7 @@
  [customization-color theme]
  {:normal {:checked   (colors/resolve-color customization-color theme)
            :unchecked (colors/theme-colors colors/neutral-30 colors/neutral-70 theme)}
-   :blur   {:checked   (colors/theme-colors (colors/resolve-color customization-color theme)
+   :blur   {:checked   (colors/theme-colors (colors/custom-color customization-color 50)
                                            colors/white
                                            theme)
            :unchecked (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-40 theme)}})
@@ -29,7 +29,7 @@
  [customization-color theme]
  {:normal {:checked   (colors/resolve-color customization-color theme)
            :unchecked (colors/theme-colors colors/white-opa-40 colors/neutral-80-opa-40 theme)}
-   :blur   {:checked   (colors/theme-colors (colors/resolve-color customization-color theme)
+   :blur   {:checked   (colors/theme-colors (colors/custom-color customization-color 50)
                                            colors/white)
            :unchecked colors/white-opa-5}})

@@ -38,7 +38,7 @@
  {:normal (colors/theme-colors colors/neutral-30 colors/neutral-70 theme)
   :blur   (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-40 theme)})

-(defn- filled-checkbox-background-color
+(defn- checkbox-prefill-background-color
  [theme]
  {:normal (colors/theme-colors colors/neutral-30 colors/neutral-80 theme)
   :blur   (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme)})
@@ -119,16 +119,16 @@
            (colors/theme-colors colors/white colors/neutral-100 theme)
            colors/white)})

-(defn filled-checkbox
+(defn checkbox-prefill
  [{:keys [disabled? blur? container-style theme]}]
  (assoc container-style
         :height           21
         :width            21
         :border-radius    6
         :opacity          (if disabled? 0.3 1)
-         :background-color (get-color (filled-checkbox-background-color theme) blur?)))
+         :background-color (get-color (checkbox-prefill-background-color theme) blur?)))

-(defn filled-checkbox-check
+(defn checkbox-prefill-check
  [checked? _blur? theme]
  {:size  20
   :color (when checked? (colors/theme-colors colors/neutral-100 colors/white theme))})
@@ -11,7 +11,7 @@
  (when checked-atom (swap! checked-atom not))
  (when on-change (on-change (not checked?))))

-(defn- base-selector
+(defn- selector-internal
  [{:keys [default-checked? checked?]}]
  (let [controlled-component? (some? checked?)
        internal-checked?     (when-not controlled-component?
@@ -28,13 +28,14 @@
                                                 :container-style     container-style
                                                 :customization-color customization-color
                                                 :theme               theme})]
-        [rn/pressable
+        [rn/touchable-without-feedback
         (when-not disabled?
           {:on-press #(handle-press on-change internal-checked? actual-checked?)})
         [rn/view
          {:style                             outer-styles
           :needs-offscreen-alpha-compositing true
           :accessibility-label               accessibility-label
+           :accessibility-role                :checkbox
           :testID                            test-id}
          [rn/view
           {:style (inner-style-fn {:theme               theme
@@ -44,49 +45,39 @@
           (when (and icon-style-fn actual-checked?)
             [icons/icon :i/check-small (icon-style-fn actual-checked? blur? theme)])]]]))))

-(defn- toggle
+(def ^:private selector (quo.theme/with-theme selector-internal))
+
+(defn toggle
  [props]
-  [base-selector
+  [selector
   (assoc props
          :label-prefix   "toggle"
          :outer-style-fn style/toggle
          :inner-style-fn style/toggle-inner)])

-(defn- radio
+(defn radio
  [props]
-  [base-selector
+  [selector
   (assoc props
          :label-prefix   "radio"
          :outer-style-fn style/radio
          :inner-style-fn style/radio-inner)])

-(defn- checkbox
+(defn checkbox
  [props]
-  [base-selector
+  [selector
   (assoc props
          :label-prefix   "checkbox"
          :outer-style-fn style/checkbox
          :inner-style-fn style/common-checkbox-inner
          :icon-style-fn  style/checkbox-check)])

-(defn- filled-checkbox
+(defn checkbox-prefill
  [props]
-  [base-selector
+  [selector
   (assoc props
-          :label-prefix   "filled-checkbox"
-          :outer-style-fn style/filled-checkbox
+          :label-prefix   "checkbox-prefill"
+          :outer-style-fn style/checkbox-prefill
          :inner-style-fn style/common-checkbox-inner
-          :icon-style-fn  style/filled-checkbox-check)])
+          :icon-style-fn  style/checkbox-prefill-check)])

-(defn view-internal
-  [{:keys [type]
-    :or   {type :toggle}
-    :as   props}]
-  (case type
-    :toggle          [toggle props]
-    :radio           [radio props]
-    :checkbox        [checkbox props]
-    :filled-checkbox [filled-checkbox props]
-    nil))
-
-(def view (quo.theme/with-theme view-internal))
@@ -29,9 +29,8 @@
    [rn/view {:style style/card-footer-label-container}
     [text/text {:size :paragraph-2} label]]
    [rn/view {:style style/card-footer-toggle-container}
-     [selectors/view
-      {:type      :toggle
-       :disabled? (not active?)
+     [selectors/toggle
+      {:disabled? (not active?)
       :on-change on-toggle}]]]])

 (defn- selection-indicator
@@ -97,7 +97,9 @@
                       {:type :outline
                        :size 24})
                (:button-text action-props)]
-     :selector [selectors/view action-props]
+     :selector (if (= (:type action-props) :checkbox)
+                 [selectors/checkbox action-props]
+                 [selectors/toggle action-props])
     nil)])

 (defn- internal-view
@@ -3,7 +3,7 @@
    [quo.components.avatars.account-avatar.view :as account-avatar]
    [quo.components.avatars.channel-avatar.view :as channel-avatar]
    [quo.components.avatars.user-avatar.view :as user-avatar]
-    [quo.components.avatars.wallet-user-avatar.view :as wallet-avatar]
+    [quo.components.avatars.wallet-user-avatar :as wallet-avatar]
    [quo.components.share.qr-code.style :as style]
    [react-native.core :as rn]
    [react-native.fast-image :as fast-image]))
--- a/Show More
+++ b/Show More