Bump go

* Small refactor & add customization color to `info-count` component
* Fix notification mark in group chats for no mentions, also notification alignment styles in the component
* Code style: `change > 0` for `pos?`

.clj-kondo/config.edn

@@ -14,6 +14,21 @@
                                               clojure.set     set
                                               clojure.walk    walk
                                               taoensso.timbre log}}
+                :shadowed-var      {:level   :error
+                                    ;; We temporarily use :include to define an
+                                    ;; allowlist of core Clojure vars. In the
+                                    ;; future, as we progressively fix shadowed
+                                    ;; vars, we should be able to delete this
+                                    ;; option and lint all vars.
+                                    :include [comparator
+                                              count
+                                              identity
+                                              iter
+                                              key
+                                              str
+                                              symbol
+                                              time
+                                              val]}
                 :invalid-arity     {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
                 ;; TODO remove number when this is fixed
                 ;; https://github.com/borkdude/clj-kondo/issues/867

.env

@@ -22,7 +22,6 @@ KEYCARD_TEST_MENU=0
 QR_READ_TEST_MENU=1
 ENABLE_ROOT_ALERT=1
 ENABLE_QUO_PREVIEW=1
-MAX_IMAGES_BATCH=5
 APN_TOPIC=im.status.ethereum.pr
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1

.env.e2e

@@ -21,7 +21,6 @@ COMMANDS_ENABLED=1
 KEYCARD_TEST_MENU=1
 QR_READ_TEST_MENU=1
 ENABLE_ROOT_ALERT=0
-MAX_IMAGES_BATCH=5
 APN_TOPIC=im.status.ethereum.pr
 VERIFY_TRANSACTION_CHAIN_ID=5
 VERIFY_ENS_CHAIN_ID=5

.env.jenkins

@@ -26,7 +26,6 @@ VERIFY_TRANSACTION_CHAIN_ID=5
 VERIFY_ENS_CHAIN_ID=5
 TEST_STATEOFUS=1
 BLANK_PREVIEW=0
-MAX_IMAGES_BATCH=5
 DATABASE_MANAGEMENT_ENABLED=1
 COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1

.env.nightly

@@ -17,7 +17,6 @@ RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
 ENABLE_ROOT_ALERT=1
-MAX_IMAGES_BATCH=5
 BLANK_PREVIEW=0
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,8 +1,8 @@
 ---
-name: Bug Report
-about: Bug Report
+name: MVPBug Report
+about: MVPBug Report
 title: ''
-labels: bug
+labels: 'E:Mobile Bugfixes MVP'
 assignees: ''
 
 ---
@@ -22,8 +22,7 @@ assignees: ''
 
 ### Reproduction
 
-1) Open Status
-2) 
+1. 
 
 ### Additional Information
 

.github/ISSUE_TEMPLATE/wont-fix-bug.md

@@ -0,0 +1,30 @@
+---
+name: Wont fix Report 
+about: to facilitate future handling, identify and address non-urgent issues that won't be prioritized in the near future
+title: ''
+labels: likely_wont_fix
+assignees: ''
+
+---
+
+## Problem
+
+
+#### Expected behavior
+
+
+#### Actual behavior
+
+
+### Reproduction
+
+1. 
+
+### Additional Information
+
+- Status version: release 
+- Operating System: Android, iOS
+
+
+[comment]: # (Please, add logs/notes if necessary)
+

README.md

@@ -2,7 +2,9 @@
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="80"/>](https://play.google.com/store/apps/details?id=im.status.ethereum)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80"/>](https://f-droid.org/packages/im.status.ethereum/)
-[<img src="doc/github_badge.png" alt="Get it on Github" height="80"/>](https://github.com/status-im/status-mobile/releases)
+
+
+[Get it on Github](https://github.com/status-im/status-mobile/releases)
 
 Join us in creating a browser, messenger, and gateway to a decentralized world. Status is a free (libre) open source mobile client targeting Android & iOS built entirely on [Ethereum](https://ethereum.org/) technologies. That's right, no middle men and `go-ethereum` running directly on your device.
 
@@ -20,31 +22,31 @@ If this interests you, **help us make Status a reality** - anyone can contribute
 
 ## How to Contribute?
 
-Go straight to the [docs](https://status.im/docs) or [join our chat](https://join.status.im/chat/public/status) and choose what interests you:
+Go straight to the [docs](doc/) and choose what interests you:
 
 - **Developer** Developers are the heart of software and to keep Status beating
 we need all the help we can get! If you're looking to code in ClojureScript or
 Golang then Status is the project for you! We use React Native and there is even
 some Java/Objective-C too! Want to learn more about it? Start by reading our
-[Developer Introduction](https://status.im/developer_tools/) which guides you
+[Developer Introduction](doc/starting-guide.md) which guides you
 through the technology stack and start browsing [beginner
 issues](https://github.com/status-im/status-mobile/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20).
 Then you can read how to [Build
-Status](https://status.im/technical/build_status/), which talks about managing
-project dependencies, coding guidelines and testing procedures. The [doc/](doc/)
-directory also has valuable information for contributors.
+Status](doc/starting-guide.md), which talks about managing
+project dependencies, coding guidelines and testing procedures.
+Check out our [coding guidelines](doc/new-guidelines.md).
 
 - **Community Management**
 Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and long lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.im/about)
 
 - **Specification / Documentation**
-John Dewey once said "Education is not preparation for life; education is life *itself* ". Developers & Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, head over to our [docs](https://status.im/docs) and see how you can improve what we have.
+John Dewey once said "Education is not preparation for life; education is life *itself* ". Developers & Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, check out our [docs](doc/) and see how you can improve what we have.
 
 - **Blog Writing**
-Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page. [Jump into our chat](https://join.status.im/chat/public/status) and discuss with the team how you can contribute!
+Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page.
 
 - **Testers**
-It's bug hunting season! Status is currently under active development and there is sure to be a bunch of learning, [build status from scratch](https://status.im/technical/build_status/) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-mobile/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!
+It's bug hunting season! Status is currently under active development and there is sure to be a bunch of learning, [build status from scratch](doc/starting-guide.md) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-mobile/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!
 
 - **Security**
 Status is a visual interface to make permanent changes on the Blockchain, it handles crypto-tokens that have real value and allows 3rd party code execution. Security is paramount to its success. You are given permission to break Status as hard as you can, as long as you share your findings with the community!
@@ -52,9 +54,6 @@ Status is a visual interface to make permanent changes on the Blockchain, it han
 - **Evangelism**
 Help us spread the word! Tell a friend *right now*, in fact tell **everyone** - yell from a mountain if you have to, every person counts! If you've got a great story to tell or have some interesting way you've spread the word about Status let us know about it in our [chat](https://join.status.im/chat/public/status)
 
-## Status API
-View our [API Docs](https://status.im/developer_tools/status_web_api.html) and learn how to integrate your DApp into Status. You can read more about how to add your DApp to Status [here](https://status.im/developer_tools/add_your_dapp.html).
-
 ## Give me Binaries!
 
 You can get our Beta builds for both Android and iOS on our [website](https://status.im), through our [nightly builds](https://status.im/nightly/) or by [building it yourself](https://status.im/technical/build_status/).
@@ -68,12 +67,8 @@ Without the dedication of these outstanding individuals, Status would not exist.
 
 ## Contact us
 
-Feel free to email us at [support@status.im](mailto:support@status.im) or better yet, [join our chat](https://join.status.im/chat/public/status).
+Feel free to email us at [support@status.im](mailto:support@status.im).
 
 ## License
 
 Licensed under the [Mozilla Public License v2.0](https://github.com/status-im/status-mobile/blob/develop/LICENSE.md)
-
-## Testing Supported by
-
-[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)](https://www.browserstack.com/automate/public-build/SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)

ci/tests/Jenkinsfile.e2e-nightly

@@ -74,7 +74,7 @@ pipeline {
             sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
               python3 -m pytest \
-                --numprocesses 4 \
+                --numprocesses 6 \
                 --rerun_count=2 \
                 --testrail_report=True \
                 -m testrail_id \

ci/tests/Jenkinsfile.e2e-prs

@@ -123,7 +123,7 @@ pipeline {
             sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
               python3 -m pytest \
-                --numprocesses 4 \
+                --numprocesses 6 \
                 --rerun_count=2 \
                 --testrail_report=True \
                 -k \"${params.KEYWORD_EXPRESSION}\" \

doc/README.md

@@ -24,6 +24,7 @@
 
 [Patching](patching.md)
 
+[Creating a pixel perfect UI](pixel-perfection.md)
 
 ## Testing
 

doc/new-guidelines.md

@@ -80,6 +80,52 @@ This mistake mostly happens with functional components
 
 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 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.
+
+#### Avoid unnecessarily grouping categories to reduce the number of props
+For example in Figma if there is a component and it has the following variants:
+
+|theme: "light" blur: "False"|theme: "dark" blur: "False"|theme: "light" blur: "True"|theme: "dark"  blur: "True"|
+|----------------------------|---------------------------|---------------------------|---------------------------|
+| type :neutral label "ABC"  | type :neutral label "ABC" |                           |                           |
+| type :active  label "ABC"  | type :active  label "ABC" |                           |                           |
+| type :danger  label "ABC"  | type :danger  label "ABC" | type :danger label "ABC"  | type :danger label "ABC"  |
+
+```clojure
+;; bad
+"theme - :light or :dark
+type - can be :neutral :active :danger :danger-blur"
+(defn my-component [{:keys [theme type]} label])
+
+;; good
+"theme - :light or :dark
+ type - can be :neutral :active :danger
+ blur? - boolean
+"
+(defn my-component [{:keys [theme blur? type]} label])
+```
+
+Please note this is only for the external API of the component and there should be no restriction of how the component manages its internal API as that will not affect the developer using the component with the issues described above.
+
+In some cases this is not always possible or does not make sense. However the thought process should be how easy will it be for another developer to use this component with the correct configuration given the screen designs for Figma.
+
+#### Avoid unnecessarily renaming props 
+In general it can be helpful to avoid renaming props from their counterpart in Figma.
+
+For example if Figma has sizes `:small`, `:medium` and `:large`
+
+```clojure
+;; bad
+":size - :little, :default or :big"
+(defn my-component [{:keys [size]}])
+
+;; good
+":size - :small, :medium or :large"
+(defn my-component [{:keys [size]}])
+```
+
 ### Component styles
 
 Prefer to define styles in a separate file named `style.cljs`, colocated with
@@ -736,9 +782,9 @@ Clojure (JVM) codebases which mirror the sources in a top-level test directory.
 └── models_test.cljs
 ```
 
-Component tests should be created in a separate directory `__tests__`, colocated
-with the source. When the entire component implementation is isolated under a
-single directory, create a test file named `component_spec.cljs` instead.
+Component tests should be created in the same directory as the source component,
+and named as `component_spec.cljs`.
+
 
 ```
 └── filter

doc/pixel-perfection.md

@@ -0,0 +1,17 @@
+# 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 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" 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)
+
+- Lower the opacity so you can see it sitting on top of the Figma mock ups. 

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

@@ -626,10 +626,10 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     }
 
     @ReactMethod
-    public void loginWithKeycard(final String accountData, final String password, final String chatKey) {
+    public void loginWithKeycard(final String accountData, final String password, final String chatKey, final String nodeConfigJSON) {
         Log.d(TAG, "loginWithKeycard");
         this.migrateKeyStoreDir(accountData, password);
-        String result = Statusgo.loginWithKeycard(accountData, password, chatKey);
+        String result = Statusgo.loginWithKeycard(accountData, password, chatKey, nodeConfigJSON);
         if (result.startsWith("{\"error\":\"\"")) {
             Log.d(TAG, "LoginWithKeycard result: " + result);
         } else {
@@ -823,6 +823,11 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         executeRunnableStatusGoMethod(() -> Statusgo.hashMessage(message), callback);
     }
 
+    @ReactMethod
+    public void startSearchForLocalPairingPeers(final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.startSearchForLocalPairingPeers(), callback);
+    }
+
     @ReactMethod
     public void getConnectionStringForBootstrappingAnotherDevice(final String configJSON, final Callback callback) throws JSONException {
          final JSONObject jsonConfig = new JSONObject(configJSON);
@@ -1172,19 +1177,19 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         executeRunnableStatusGoMethod(() -> Statusgo.deleteImportedKey(address, password, keyStoreDir), callback);
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true) 
+    @ReactMethod(isBlockingSynchronousMethod = true)
     public String keystoreDir() {
         final String absRootDirPath = this.getNoBackupDirectory();
         return pathCombine(absRootDirPath, "keystore");
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true) 
+    @ReactMethod(isBlockingSynchronousMethod = true)
     public String backupDisabledDataDir() {
         return this.getNoBackupDirectory();
     }
 
 
-    @ReactMethod(isBlockingSynchronousMethod = true) 
+    @ReactMethod(isBlockingSynchronousMethod = true)
     public String logFileDirectory() {
         return getPublicStorageDirectory().getAbsolutePath();
     }

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

@@ -312,6 +312,11 @@ RCT_EXPORT_METHOD(localPairingPreflightOutboundCheck:(RCTResponseSenderBlock)cal
     callback(@[result]);
 }
 
+RCT_EXPORT_METHOD(startSearchForLocalPairingPeers:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoStartSearchForLocalPairingPeers();
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)configJSON
                   callback:(RCTResponseSenderBlock)callback) {
 
@@ -633,14 +638,15 @@ RCT_EXPORT_METHOD(loginAccount:(NSString *)request) {
 
 RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
                   password:(NSString *)password
-                  chatKey:(NSString *)chatKey) {
+                  chatKey:(NSString *)chatKey
+                  nodeConfigJSON:(NSString *)nodeConfigJSON) {
 #if DEBUG
     NSLog(@"LoginWithKeycard() method called");
 #endif
     [self getExportDbFilePath];
     [self migrateKeystore:accountData password:password];
 
-    NSString *result = StatusgoLoginWithKeycard(accountData, password, chatKey);
+    NSString *result = StatusgoLoginWithKeycard(accountData, password, chatKey, nodeConfigJSON);
 
     NSLog(@"%@", result);
 }

modules/react-native-status/nodejs/status.cpp

@@ -833,6 +833,37 @@ void _SaveAccountAndLogin(const FunctionCallbackInfo<Value>& args) {
 
 }
 
+void _CreateAccountAndLogin(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 SaveAccountAndLogin")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'settingsJSON'")));
+		return;
+	}
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = CreateAccountAndLogin(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
 void _GenerateAlias(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -1010,7 +1041,7 @@ void _LoginWithKeycard(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
 
-	if (args.Length() != 3) {
+	if (args.Length() != 4) {
 		// Throw an Error that is passed back to JavaScript
 		isolate->ThrowException(Exception::TypeError(
 			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for LoginWithKeycard")));
@@ -1034,6 +1065,11 @@ void _LoginWithKeycard(const FunctionCallbackInfo<Value>& args) {
 			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'keyHex'")));
 		return;
 	}
+	if (!args[3]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'nodeConfigJSON'")));
+		return;
+	}
 
 
 	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
@@ -1042,9 +1078,11 @@ void _LoginWithKeycard(const FunctionCallbackInfo<Value>& args) {
 	char *arg1 = *arg1Obj;
 	String::Utf8Value arg2Obj(isolate, args[2]->ToString(context).ToLocalChecked());
 	char *arg2 = *arg2Obj;
+	String::Utf8Value arg3Obj(isolate, args[3]->ToString(context).ToLocalChecked());
+    char *arg3 = *arg3Obj;
 
 	// Call exported Go function, which returns a C string
-	char *c = LoginWithKeycard(arg0, arg1, arg2);
+	char *c = LoginWithKeycard(arg0, arg1, arg2, arg3);
 
 	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
 	args.GetReturnValue().Set(ret);
@@ -1929,6 +1967,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "hashMessage", _HashMessage);
 	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);

nix/deps/clojure/deps.json

@@ -1,17 +1,4 @@
 [
-  {
-    "path": "args4j/args4j/2.0.26/args4j-2.0.26",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "f0aada195340b361a1a45aa9c3d417c7cbb0a6b5",
-      "sha256": "0151vnbmbjnr5089ik8np91r3a4g2ylcahih22zr49a3ilri6f80"
-    },
-    "jar": {
-      "sha1": "01ebb18ebb3b379a74207d5af4ea7c8338ebd78b",
-      "sha256": "193i0xgn295bdz5gk4zrk4ncfa29x8vl97bfd01kl1za44ixm6wq"
-    }
-  },
-
   {
     "path": "bidi/bidi/2.1.6/bidi-2.1.6",
     "host": "https://repo.clojars.org",
@@ -39,15 +26,15 @@
   },
 
   {
-    "path": "binaryage/oops/0.7.0/oops-0.7.0",
+    "path": "binaryage/oops/0.7.2/oops-0.7.2",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "de223223c4272ce9ee75c81f8764e894029630b4",
-      "sha256": "0sz21344v8lxd6mjlrb8r8yyz934h4lnkwqlpg3csgsi11mppya3"
+      "sha1": "bdce8b7dc9f2b569f5c42a4d6108325899970eb9",
+      "sha256": "1rc4slg4836pnxds447sam9hsiwd4x2al1ykazp6iglc10ix9igd"
     },
     "jar": {
-      "sha1": "9729401b4c6551f6becf44cf0818d04255410099",
-      "sha256": "0jkdybj37q3a4vvay3asj47ms7l3qjpidhkk30293w0zc7jk18k8"
+      "sha1": "2f47298f9aa41ef6f2c4f2c49f472eb113e94ae7",
+      "sha256": "0c9f7wylwl0lxcn4vqncprlzmdddqhxzb3vdaawdm0da0xh010hb"
     }
   },
 
@@ -65,28 +52,28 @@
   },
 
   {
-    "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",
     "pom": {
-      "sha1": "3a39a7a1690b4ee6b48a4f0c65d089eacf47e8a5",
-      "sha256": "1qhz6q1afg22j5d8zyxzqsbbinix3zh4lyy2acij8hrp02f274wj"
+      "sha1": "d2dd4e969cf44bfffd8609d0d4945a4a561b5a58",
+      "sha256": "0f4yxk0wx1i13inkq9zjd1450bbly5lf62216a88clmn4l5x8knn"
     },
     "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",
     "pom": {
-      "sha1": "c432ffbdd51b67bf82e4a63f1f4f102ba55f4ddf",
-      "sha256": "191wpjlq78s08d509hq2yrxsdzm3qfkqf2zdiwxxlmmh14dg65rx"
+      "sha1": "7e88493d18a4aaf13aff9d0319dcd82178d95f1d",
+      "sha256": "08w5y48bpvnlyqbdjs0h7nz9dp35rc7b46hsvh1a0vpdszisxh0p"
     },
     "jar": {
-      "sha1": "0a02a3e2ecd7a126ab60d8a44793342f20ced79b",
-      "sha256": "142vl5np33akcrnn6pksi0rjfsmmi528villxsj6cwcndvybiw4m"
+      "sha1": "ecfd5c286a85db3f059e75c37fca5722d9e26f79",
+      "sha256": "1ps9yf3cxmlm447hqkidjb5xry90n0wl3jk0jn28fagq31lzylkl"
     }
   },
 
@@ -207,162 +194,6 @@
     }
   },
 
-  {
-    "path": "com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "d04690f71f3393e23f30998d9534365274fa5f9f",
-      "sha256": "1khlag991h7326xsjnpx6hnyip5cwawsmxz6m20kkzavvihsfw21"
-    },
-    "jar": {
-      "sha1": "f7be08ec23c21485b9b5a1cf1654c2ec8c58168d",
-      "sha256": "1k9zl76xi2nykixaynss2gk4h861zipdb9xl6q1br0ln4hscx1f8"
-    }
-  },
-
-  {
-    "path": "com/google/code/gson/gson/2.7/gson-2.7",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "09f9e39f9b791aeb73ba428ad30872f1a703edb3",
-      "sha256": "1phf2qksjf75ykwgp39189jdbqsn5zrmi07g8h522yxq0zn3cfbj"
-    },
-    "jar": {
-      "sha1": "751f548c85fa49f330cecbb1875893f971b33c4e",
-      "sha256": "0clda1xrjfja969xsbrhc61ip588xvsi9k054kpd4cz1m5gfnhrd"
-    }
-  },
-
-  {
-    "path": "com/google/elemental2/elemental2-core/1.0.0-RC1/elemental2-core-1.0.0-RC1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "2ccdbc92bc4dfbc9159bf43cf794c240ec37621f",
-      "sha256": "04gmnxv7fpsn66wvmsip4s9hqcc1wphsy3bg13vx262kg9w35j19"
-    },
-    "jar": {
-      "sha1": "7e6e9ec8574d2ff6503f3f774c43695d0276f8f4",
-      "sha256": "1l6g27a361nyl90ln9k2xamjds9xm3kjrfb9xcqz1gqhjgmnml7i"
-    }
-  },
-
-  {
-    "path": "com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "19c878e6870c8382864dcc459de1c6bfe7f36e54",
-      "sha256": "16l1kbc7wbisjmjvkfac854ddyql0b5smdxr2vz8wdms26vydp1y"
-    },
-    "jar": {
-      "sha1": "a6a2b2df72fd13ec466216049b303f206bd66c5d",
-      "sha256": "0831h49f21znl7z8lkr2ikywwajdachgxva7zpj8sp7rl2d9998h"
-    }
-  },
-
-  {
-    "path": "com/google/guava/guava/25.1-jre/guava-25.1-jre",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "5dd13f6c0d56f05059c5eba88a20a8699ece583d",
-      "sha256": "1pya5f4vbh8z9zvprnl64i9qqp0rghjfsflx64q9md28w5pb9y35"
-    },
-    "jar": {
-      "sha1": "6c57e4b22b44e89e548b5c9f70f0c45fe10fb0b4",
-      "sha256": "1gqaqxdnxhr1gk9haldrifvda8ingj1s4bin5sf455y38jic7c3d"
-    }
-  },
-
-  {
-    "path": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "b964a9414771661bdf35a3f10692a2fb0dd2c866",
-      "sha256": "1gnn7b80krv19qjd9hhacahffqq9iwqgmw4ds56wp9wk3rbqrjgh"
-    },
-    "jar": {
-      "sha1": "ed28ded51a8b1c6b112568def5f4b455e6809019",
-      "sha256": "1xpcvmnw2y3fa56hhk8dmknrq8afr6r3kdmzsg9hnwgjg3msg519"
-    }
-  },
-
-  {
-    "path": "com/google/javascript/closure-compiler-externs/v20200830/closure-compiler-externs-v20200830",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "703aed7fd9e61298194db257c105b934c5e0cc12",
-      "sha256": "06wpqr4rpj9qz067dn6j54k37lpaqpljrqzamdfb1lrkpygksb29"
-    },
-    "jar": {
-      "sha1": "d5182c2e1bd226e39835c3b97875e27b54ee7401",
-      "sha256": "0f3zgq7k9n1cwm787k2kkyxc9r033h54wlmb60d4nfhd39dbsza3"
-    }
-  },
-
-  {
-    "path": "com/google/javascript/closure-compiler-unshaded/v20200830/closure-compiler-unshaded-v20200830",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "f1ac30ac5c39c2b6a8b9672373bebb1b5521cffa",
-      "sha256": "0nhxzkdyri03mccxf65lxjxn1fafvhdkqvphf8vkxzkjbgiqwjdm"
-    },
-    "jar": {
-      "sha1": "a017550b64e2690e3a4a5340d1eb699809b9f775",
-      "sha256": "1kpihfzp4x8vxykgd6lcf4nb1r4f5zp3hpivs2793ny019w73rbn"
-    }
-  },
-
-  {
-    "path": "com/google/jsinterop/base/1.0.0/base-1.0.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "9d68520e28ac9b035f86a520692196ea31aaf4f0",
-      "sha256": "0byl8ksnlpvs0nm3a2midrbp6zrgxl7jzqgcz7z1hb1iy3jzfdk1"
-    },
-    "jar": {
-      "sha1": "5d2a5cda3092004832cb67cfe7a100a2ef8411f8",
-      "sha256": "04j4r89vimffmfim0ipmgbd54bxx111c0ygs34dn0krqdb13adk0"
-    }
-  },
-
-  {
-    "path": "com/google/jsinterop/jsinterop-annotations/1.0.2/jsinterop-annotations-1.0.2",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "718fc66ea5e7ee1597960c5874d4603542814166",
-      "sha256": "0bslwg7rqjanczf3sz11pgdans4hcl4nbp1f5xyy7dzfnkhyhbhx"
-    },
-    "jar": {
-      "sha1": "abd7319f53d018e11108a88f599bd16492448dd2",
-      "sha256": "057hgcrix9ss4cfgkl7pqqlcc7g1xnlx39i8lipn0sjv3xrl9bzw"
-    }
-  },
-
-  {
-    "path": "com/google/protobuf/protobuf-java/3.11.1/protobuf-java-3.11.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "599529d980b7ca0b4145ae48d4323f3e85e5b1c5",
-      "sha256": "0a0w96psyxpss3y3va5b8hcqzfxxy2kisng9hc6b4im9f83gj56x"
-    },
-    "jar": {
-      "sha1": "1752390841a56e112b01990c9b523e6978abb24f",
-      "sha256": "1wbwasjsqb19xpjk66wyih67492di8sg64qh2n2az7mpfy1dn0aa"
-    }
-  },
-
-  {
-    "path": "com/google/re2j/re2j/1.3/re2j-1.3",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "565024724e6527255f0ae38e507c7f90c55b21ce",
-      "sha256": "0bzj30pnw9bm7jfcwl5ypaqrgvvp3yndf9vdw0qjfyzr9xx39z2d"
-    },
-    "jar": {
-      "sha1": "dc7de2b32fa8cc569ab44fb849abadbbc6983b91",
-      "sha256": "06fypacl4jsbiddgby40fxxz6bpck7jvc5ch344f472cqnhhy16q"
-    }
-  },
-
   {
     "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
     "host": "https://repo1.maven.org/maven2",
@@ -376,6 +207,19 @@
     }
   },
 
+  {
+    "path": "com/google/javascript/closure-compiler-unshaded/v20210302/closure-compiler-unshaded-v20210302",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "1f790dd30fd0c2279cf73d79c4eba6a9f7516532",
+      "sha256": "17vb4r6bn97s4jjwja7xmpwfdnfzknhyigz2vdiqpqyh4a31hb3c"
+    },
+    "jar": {
+      "sha1": "14a87750b6bbe6e29932446b6db1f015851fd4e8",
+      "sha256": "11ydn317q2aqh1bkm7gry48r2bakw5ifpx1yrrq192vq5kg7zwhq"
+    }
+  },
+
   {
     "path": "com/ibm/icu/icu4j/66.1/icu4j-66.1",
     "host": "https://repo1.maven.org/maven2",
@@ -389,6 +233,58 @@
     }
   },
 
+  {
+    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "44b9477418d2942d45550f7e7c66c16262062d0e",
+      "sha256": "1yscxabk7i59vgfjg7c1y3prj39h1d8prnwgxbisc4ni29qdpf5x"
+    },
+    "jar": {
+      "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
+      "sha256": "0scm6321zz76dc3bs8sy2qyami755lz4lq5455gl67bi9slxyha2"
+    }
+  },
+
+  {
+    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "65112009d674333c1acfafb4e198ff250d710764",
+      "sha256": "007nyd66fqp3fbrmnsbfp1fpkhmr2lk33qmkp3salqld3xd7qlc8"
+    },
+    "jar": {
+      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
+      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
+    }
+  },
+
+  {
+    "path": "commons-io/commons-io/2.6/commons-io-2.6",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "5060835593e5b6ed18c82fc2e782f0a3c30a00b1",
+      "sha256": "0q4a6fp6xkyd86ikymkyv2plhf9vj8aqvggxg9d1yad2jcw8c8qc"
+    },
+    "jar": {
+      "sha1": "815893df5f31da2ece4040fe0a12fd44b577afaf",
+      "sha256": "04v5fg53jl9gbn6pyz3l7kbpxv0xjzyasnw6yd1a3hhacq2d6xzq"
+    }
+  },
+
+  {
+    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "9e8da477b6682094d56802cb155291a2acb829bd",
+      "sha256": "036z64iprypccz03iq7lqxvw99xjh4xlsfmfwbs37pmhfnfmbdnx"
+    },
+    "jar": {
+      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
+      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
+    }
+  },
+
   {
     "path": "com/taoensso/encore/2.105.0/encore-2.105.0",
     "host": "https://repo.clojars.org",
@@ -467,58 +363,6 @@
     }
   },
 
-  {
-    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "44b9477418d2942d45550f7e7c66c16262062d0e",
-      "sha256": "1yscxabk7i59vgfjg7c1y3prj39h1d8prnwgxbisc4ni29qdpf5x"
-    },
-    "jar": {
-      "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
-      "sha256": "0scm6321zz76dc3bs8sy2qyami755lz4lq5455gl67bi9slxyha2"
-    }
-  },
-
-  {
-    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "65112009d674333c1acfafb4e198ff250d710764",
-      "sha256": "007nyd66fqp3fbrmnsbfp1fpkhmr2lk33qmkp3salqld3xd7qlc8"
-    },
-    "jar": {
-      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
-      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
-    }
-  },
-
-  {
-    "path": "commons-io/commons-io/2.6/commons-io-2.6",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "5060835593e5b6ed18c82fc2e782f0a3c30a00b1",
-      "sha256": "0q4a6fp6xkyd86ikymkyv2plhf9vj8aqvggxg9d1yad2jcw8c8qc"
-    },
-    "jar": {
-      "sha1": "815893df5f31da2ece4040fe0a12fd44b577afaf",
-      "sha256": "04v5fg53jl9gbn6pyz3l7kbpxv0xjzyasnw6yd1a3hhacq2d6xzq"
-    }
-  },
-
-  {
-    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "9e8da477b6682094d56802cb155291a2acb829bd",
-      "sha256": "036z64iprypccz03iq7lqxvw99xjh4xlsfmfwbs37pmhfnfmbdnx"
-    },
-    "jar": {
-      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
-      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
-    }
-  },
-
   {
     "path": "crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0",
     "host": "https://repo.clojars.org",
@@ -663,15 +507,15 @@
   },
 
   {
-    "path": "io/undertow/undertow-core/2.1.3.Final/undertow-core-2.1.3.Final",
+    "path": "io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "28ef70062f9f9442f346d345fb7403d1181c2603",
-      "sha256": "0khc267iljd5b3wlb9rks3zr9blqiz55dky2y0lgx5slxvr5ww95"
+      "sha1": "0c0f3b7a6b2c2b4e73d719362b4595e77fbe98cd",
+      "sha256": "14z0577jgx3r510zgjrzd2vcz9md3d5qpb81ir14zis9vdn5pwxf"
     },
     "jar": {
-      "sha1": "ea86fcf86ad8d283c5b14a6820061a6bd203839e",
-      "sha256": "00z8d052wp0ba0f64ki08867d7hsx3w1zrhngpbm45qcqs2hphai"
+      "sha1": "78650b4029dd9280c4769d9425b5559f12cb83bf",
+      "sha256": "1brpkd2l98byf76jga6hj5drv5sj2d93lxlq2xz0rxpqyqas1xm4"
     }
   },
 
@@ -741,28 +585,15 @@
   },
 
   {
-    "path": "nrepl/nrepl/0.7.0/nrepl-0.7.0",
+    "path": "nrepl/nrepl/1.0.0/nrepl-1.0.0",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "913a846875363d8255bcede71d1186082f0f05d5",
-      "sha256": "1f1ii5k975fmlcqj6dydc28mzbpiyyq9hqzv9lnzm9n15fgggafa"
+      "sha1": "79b3e7030f2da9c4b8a20e4e5b44b401fbaccefc",
+      "sha256": "0wnsyd2vwikqljl8si3040s5b89fm8j9zfa4a1c8g3lzj4npjwvl"
     },
     "jar": {
-      "sha1": "55dabf4f271d30e7a8f0e198055c000398991e14",
-      "sha256": "1h9zin2z4ll3jfr0cqp7zfvy6d2axrjjnyv8qbir0krjsss13ikw"
-    }
-  },
-
-  {
-    "path": "org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "17ab37f0fb0338647a70ab40f15c2c685e4185e3",
-      "sha256": "0s0062lnqk8vq23dil7qma7rl5x1h16h2x4bah7fw6rbvm9h7cfy"
-    },
-    "jar": {
-      "sha1": "518929596ee3249127502a8573b2e008e2d51ed3",
-      "sha256": "15br88i0dk5l0hdh6ikgg6kvdbdir38jdw69j9s579az5xil317w"
+      "sha1": "f47774c43493efdc879d36b95ebd67ea0d9c890a",
+      "sha256": "1fx5ssmixgqmklliw0ng8fjz41kkhys56x8dbwv9yqrfzws9f2x3"
     }
   },
 
@@ -780,15 +611,15 @@
   },
 
   {
-    "path": "org/clojure/clojurescript/1.10.773/clojurescript-1.10.773",
+    "path": "org/clojure/clojurescript/1.10.844/clojurescript-1.10.844",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "ae4301ccf5a38dad594760b1c08774fc471fd59c",
-      "sha256": "15vfzdq8vx9slppvkyvgvzndnrgqrc5m2vl0969lnprwizmrv570"
+      "sha1": "f4004d2de394c5f41317a38ae32f79e78826b45f",
+      "sha256": "0nq8mz45gl86aigrmjnkq2fd612caayxfzkyk03dmp5v4sr5zxf6"
     },
     "jar": {
-      "sha1": "9f9729dbbf9b814c83dc189977b447d2ae92b6cd",
-      "sha256": "1r0b6241ci1jwh6dk2yqb2ylh4aj4f2df5xxzwx3qp33xlday11z"
+      "sha1": "86bedf67c795c72bde3feb0415b41be8b95f2cbb",
+      "sha256": "03rs4dpwssa5ym9idip6vkxq27np3dwx7mzxms2s0yv4lipla58v"
     }
   },
 
@@ -884,28 +715,28 @@
   },
 
   {
-    "path": "org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f",
+    "path": "org/clojure/google-closure-library/0.0-20201211-3e6c510d/google-closure-library-0.0-20201211-3e6c510d",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "1aa0b32fd70e6644dcb06b88b55630d6bbb6f188",
-      "sha256": "1wq6gvhlvy3mdhj1cb0w62kclqd7x42dqd0275l40rlla5q5h1z1"
+      "sha1": "9fbaa40e54d12d1d35afee260600b8e7325034cc",
+      "sha256": "046qdcbqclxz0p4lnahglqkazraw47gymx3cin5jrw2wd7dpmr0l"
     },
     "jar": {
-      "sha1": "4fc15daa4fd1b150e8c6d32755796634446dd86a",
-      "sha256": "1ykw162gng0lcbxn2f387vv1l4d7hfwyayhxgzqqgi9jx211fzw5"
+      "sha1": "b8c673dd84d8ed85c6d857e28afee5524a0ef82c",
+      "sha256": "0q84zw1nl0sg69cx9i7g2bkw7996ig2j3m9pw4yfysjsn5aycm1q"
     }
   },
 
   {
-    "path": "org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f",
+    "path": "org/clojure/google-closure-library-third-party/0.0-20201211-3e6c510d/google-closure-library-third-party-0.0-20201211-3e6c510d",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "dea94d117aa88d75e281f877914454f79df06bf2",
-      "sha256": "1nysls9ywj3b3zvlfwy68kayx47r4bacidmq1vx8w4h043l9kxrr"
+      "sha1": "93650c3e00cf1dc0811d2e347068828cf6700fca",
+      "sha256": "1y6a10n8w98gr02ys8zxkddq2qrz7l5y3462d4hg8jpaq3r2pdm8"
     },
     "jar": {
-      "sha1": "6025affb7181cd40418600864f58eed1ea80055d",
-      "sha256": "0w6waii2qps7vp3nzbj5nai809xdq26ss0cabl4wz1s8fc6js6qw"
+      "sha1": "edcb415db3c88ada448cfbf65b021f12c7b131e9",
+      "sha256": "1f5hjr2r323il0g9maamwdbgqxrvm3hg87jsgc13wa7naw4pm9pi"
     }
   },
 
@@ -935,19 +766,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "3f21bdbd549557232eb0bf0965b2beea34004d52",
-      "sha256": "0cyyhf82pn4mjw4whr4sx3cnxrgsk862dq92gn79yawxr6842i51"
-    },
-    "jar": {
-      "sha1": "027d2ebe594eb5f46d6bcea62593e184937b3011",
-      "sha256": "0kcfcn12dmyrm7sk1jkrlcb7ws8kazfqziv62mfid62xc095gayz"
-    }
-  },
-
   {
     "path": "org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0",
     "host": "https://repo1.maven.org/maven2",
@@ -961,6 +779,19 @@
     }
   },
 
+  {
+    "path": "org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "3f21bdbd549557232eb0bf0965b2beea34004d52",
+      "sha256": "0cyyhf82pn4mjw4whr4sx3cnxrgsk862dq92gn79yawxr6842i51"
+    },
+    "jar": {
+      "sha1": "027d2ebe594eb5f46d6bcea62593e184937b3011",
+      "sha256": "0kcfcn12dmyrm7sk1jkrlcb7ws8kazfqziv62mfid62xc095gayz"
+    }
+  },
+
   {
     "path": "org/clojure/tools.cli/1.0.194/tools.cli-1.0.194",
     "host": "https://repo1.maven.org/maven2",
@@ -1014,15 +845,15 @@
   },
 
   {
-    "path": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14",
+    "path": "org/graalvm/js/js/20.1.0/js-20.1.0",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "99a56e3312f8ece1d457c8ca0a3c4b69d173d000",
-      "sha256": "09ianw2880ch3x6xq5d2cz2b15ik6f4ndf8hb7ckw7lr0ndg2y8q"
+      "sha1": "95452a7fdac1d358f1dd66b33e49f4440e986922",
+      "sha256": "0gkazzg8771g3pc90fb99wmlk99rjimcryrmzz6zab742m4dbina"
     },
     "jar": {
-      "sha1": "775b7e22fb10026eed3f86e8dc556dfafe35f2d5",
-      "sha256": "0pchd4360mim0f0a6vwr33szigihgvv4ic1scz1l9mxssq5k4s10"
+      "sha1": "0abe5e8068014ccb34cf075637a00b7ce37e4a8c",
+      "sha256": "0v5pxjl9p7wwfrrzkkqh6qbvnn0p8n342smxzcqk3qxl4ah3aqnk"
     }
   },
 
@@ -1039,19 +870,6 @@
     }
   },
 
-  {
-    "path": "org/graalvm/js/js/20.1.0/js-20.1.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "95452a7fdac1d358f1dd66b33e49f4440e986922",
-      "sha256": "0gkazzg8771g3pc90fb99wmlk99rjimcryrmzz6zab742m4dbina"
-    },
-    "jar": {
-      "sha1": "0abe5e8068014ccb34cf075637a00b7ce37e4a8c",
-      "sha256": "0v5pxjl9p7wwfrrzkkqh6qbvnn0p8n342smxzcqk3qxl4ah3aqnk"
-    }
-  },
-
   {
     "path": "org/graalvm/regex/regex/20.1.0/regex-20.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -1182,6 +1000,19 @@
     }
   },
 
+  {
+    "path": "org/ow2/asm/asm/7.1/asm-7.1",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "7e40eb6619fd20bd7d98bf775bfdd810aec87ac7",
+      "sha256": "101i3pyrq082kjyz413hfqwkjjsyfnk9kx3rqr38ln56mlp78a8g"
+    },
+    "jar": {
+      "sha1": "fa29aa438674ff19d5e1386d2c3527a0267f291e",
+      "sha256": "1pnlb1ick32bihpzc599xl9ppd07qhls6pm0xaqwrj9cdlmzmcja"
+    }
+  },
+
   {
     "path": "org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1",
     "host": "https://repo1.maven.org/maven2",
@@ -1234,19 +1065,6 @@
     }
   },
 
-  {
-    "path": "org/ow2/asm/asm/7.1/asm-7.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "7e40eb6619fd20bd7d98bf775bfdd810aec87ac7",
-      "sha256": "101i3pyrq082kjyz413hfqwkjjsyfnk9kx3rqr38ln56mlp78a8g"
-    },
-    "jar": {
-      "sha1": "fa29aa438674ff19d5e1386d2c3527a0267f291e",
-      "sha256": "1pnlb1ick32bihpzc599xl9ppd07qhls6pm0xaqwrj9cdlmzmcja"
-    }
-  },
-
   {
     "path": "org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final",
     "host": "https://repo1.maven.org/maven2",
@@ -1299,6 +1117,19 @@
     }
   },
 
+  {
+    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "d2279922777793edfc0ae9e01d68a832eb5ce52d",
+      "sha256": "1h1gk4cykidm1jx75dq426lrgf8r7900fcir5jz59zp1ka2a0ywb"
+    },
+    "jar": {
+      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
+      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+    }
+  },
+
   {
     "path": "re-com/re-com/2.8.0/re-com-2.8.0",
     "host": "https://repo.clojars.org",
@@ -1312,6 +1143,19 @@
     }
   },
 
+  {
+    "path": "refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "699468e940eace1064d6fa7a7553bf87d4ed4026",
+      "sha256": "12djd3mxi22b23c9vrv6amq1r9x9iq9b00s3ywl301rjmq5lqh4l"
+    },
+    "jar": {
+      "sha1": "2b3bb82da53b5db9c2b2aa298417816b81d0ed97",
+      "sha256": "1ysqabmlnghki6x0636zngxza2d83c85276wp9ma9wk183mkv52a"
+    }
+  },
+
   {
     "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
     "host": "https://repo.clojars.org",
@@ -1351,32 +1195,6 @@
     }
   },
 
-  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "d2279922777793edfc0ae9e01d68a832eb5ce52d",
-      "sha256": "1h1gk4cykidm1jx75dq426lrgf8r7900fcir5jz59zp1ka2a0ywb"
-    },
-    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
-    }
-  },
-
-  {
-    "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "0bce30b420249ba7e4b90cbb3e046b4bb5416389",
-      "sha256": "0zmg5qc8d55pry7832isiwd2q237znfjqjpxchd2hvlpalh5qnva"
-    },
-    "jar": {
-      "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207",
-      "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i"
-    }
-  },
-
   {
     "path": "ring-cors/ring-cors/0.1.8/ring-cors-0.1.8",
     "host": "https://repo.clojars.org",
@@ -1456,15 +1274,15 @@
   },
 
   {
-    "path": "thheller/shadow-cljs/2.11.16/shadow-cljs-2.11.16-aot",
+    "path": "thheller/shadow-cljs/2.12.0/shadow-cljs-2.12.0-aot",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "c06750fa2103c3ade8e9580034401d7379558768",
-      "sha256": "09m0yl56b2ld1a9031x6x3wlzys608hfzdf87hrnmpihg8khq5ph"
+      "sha1": "e89cabf1b6c7d268ee38343c839bc17c62160eaf",
+      "sha256": "0l9yv2c6acp3n2x5z1g9nqwqx58hl619srls5flnlf2x41f5gn7f"
     },
     "jar": {
-      "sha1": "6da05fd411b96fa939fa4df19aa28c0a37b0a87d",
-      "sha256": "1w6xm7bfg216cygmc4skns2laip3b7vp8nvgqmylpgna1k21mps2"
+      "sha1": "4748679d4953be302acf7e791b284a8dc49523d7",
+      "sha256": "1gcbna7wam7fnhrxxfb4v3agq0655la2fmwd7r9a6ip9xxc86z3a"
     }
   },
 
@@ -1481,6 +1299,19 @@
     }
   },
 
+  {
+    "path": "thheller/shadow-undertow/0.1.0/shadow-undertow-0.1.0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "456dc9b20bccd14b6012540547d1a8e7c47f7c66",
+      "sha256": "0gwxvbpkfvy84h01gjasd0fnfgqmsaybiilbz0461vaazvcd3v8b"
+    },
+    "jar": {
+      "sha1": "e072ad66285641c59df19f5352872a51da106156",
+      "sha256": "1ywcyfsrr3g42kxwchj6jvb2x43md3sdpnnk87h9m5g786ilay3r"
+    }
+  },
+
   {
     "path": "thheller/shadow-util/0.7.0/shadow-util-0.7.0",
     "host": "https://repo.clojars.org",

nix/deps/clojure/deps.list

@@ -1,10 +1,9 @@
-args4j/args4j/2.0.26/args4j-2.0.26.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.0/oops-0.7.0.jar
+binaryage/oops/0.7.2/oops-0.7.2.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.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
 cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
 com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar
@@ -14,30 +13,19 @@ com/cognitect/transit-cljs/0.8.248/transit-cljs-0.8.248.jar
 com/cognitect/transit-java/1.0.343/transit-java-1.0.343.jar
 com/cognitect/transit-js/0.8.846/transit-js-0.8.846.jar
 com/fasterxml/jackson/core/jackson-core/2.8.7/jackson-core-2.8.7.jar
-com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar
-com/google/code/gson/gson/2.7/gson-2.7.jar
-com/google/elemental2/elemental2-core/1.0.0-RC1/elemental2-core-1.0.0-RC1.jar
-com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1.jar
-com/google/guava/guava/25.1-jre/guava-25.1-jre.jar
-com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar
-com/google/javascript/closure-compiler-externs/v20200830/closure-compiler-externs-v20200830.jar
-com/google/javascript/closure-compiler-unshaded/v20200830/closure-compiler-unshaded-v20200830.jar
-com/google/jsinterop/base/1.0.0/base-1.0.0.jar
-com/google/jsinterop/jsinterop-annotations/1.0.2/jsinterop-annotations-1.0.2.jar
-com/google/protobuf/protobuf-java/3.11.1/protobuf-java-3.11.1.jar
-com/google/re2j/re2j/1.3/re2j-1.3.jar
 com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
+com/google/javascript/closure-compiler-unshaded/v20210302/closure-compiler-unshaded-v20210302.jar
 com/ibm/icu/icu4j/66.1/icu4j-66.1.jar
+commons-codec/commons-codec/1.10/commons-codec-1.10.jar
+commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
+commons-io/commons-io/2.6/commons-io-2.6.jar
+compojure/compojure/1.5.2/compojure-1.5.2.jar
 com/taoensso/encore/2.105.0/encore-2.105.0.jar
 com/taoensso/timbre/4.10.0/timbre-4.10.0.jar
 com/taoensso/truss/1.5.0/truss-1.5.0.jar
 com/taoensso/tufte/2.1.0/tufte-2.1.0.jar
 com/wsscode/pathom/2.2.31/pathom-2.2.31.jar
 com/wsscode/spec-inspec/1.0.0-alpha2/spec-inspec-1.0.0-alpha2.jar
-commons-codec/commons-codec/1.10/commons-codec-1.10.jar
-commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
-commons-io/commons-io/2.6/commons-io-2.6.jar
-compojure/compojure/1.5.2/compojure-1.5.2.jar
 crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0.jar
 crypto-random/crypto-random/1.2.0/crypto-random-1.2.0.jar
 day8/re-frame/test/0.1.5/test-0.1.5.jar
@@ -49,16 +37,15 @@ hickory/hickory/0.7.1/hickory-0.7.1.jar
 http-kit/http-kit/2.2.0/http-kit-2.2.0.jar
 instaparse/instaparse/1.4.0/instaparse-1.4.0.jar
 io/aviso/pretty/0.1.33/pretty-0.1.33.jar
-io/undertow/undertow-core/2.1.3.Final/undertow-core-2.1.3.Final.jar
+io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final.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
 mvxcvi/alphabase/1.0.0/alphabase-1.0.0.jar
 net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
-nrepl/nrepl/0.7.0/nrepl-0.7.0.jar
-org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0.jar
+nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
 org/clojure/clojure/1.10.1/clojure-1.10.1.jar
-org/clojure/clojurescript/1.10.773/clojurescript-1.10.773.jar
+org/clojure/clojurescript/1.10.844/clojurescript-1.10.844.jar
 org/clojure/core.async/1.3.610/core.async-1.3.610.jar
 org/clojure/core.cache/1.0.207/core.cache-1.0.207.jar
 org/clojure/core.memoize/1.0.236/core.memoize-1.0.236.jar
@@ -66,19 +53,18 @@ org/clojure/core.rrb-vector/0.1.1/core.rrb-vector-0.1.1.jar
 org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44.jar
 org/clojure/data.json/1.0.0/data.json-1.0.0.jar
 org/clojure/data.priority-map/1.0.0/data.priority-map-1.0.0.jar
-org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f.jar
-org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f.jar
+org/clojure/google-closure-library/0.0-20201211-3e6c510d/google-closure-library-0.0-20201211-3e6c510d.jar
+org/clojure/google-closure-library-third-party/0.0-20201211-3e6c510d/google-closure-library-third-party-0.0-20201211-3e6c510d.jar
 org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176.jar
 org/clojure/test.check/1.1.0/test.check-1.1.0.jar
-org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0.jar
 org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0.jar
+org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0.jar
 org/clojure/tools.cli/1.0.194/tools.cli-1.0.194.jar
 org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
 org/clojure/tools.reader/1.3.3/tools.reader-1.3.3.jar
-org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
-org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0.jar
 org/graalvm/js/js/20.1.0/js-20.1.0.jar
+org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0.jar
 org/graalvm/regex/regex/20.1.0/regex-20.1.0.jar
 org/graalvm/sdk/graal-sdk/20.1.0/graal-sdk-20.1.0.jar
 org/graalvm/truffle/truffle-api/20.1.0/truffle-api-20.1.0.jar
@@ -89,28 +75,29 @@ org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final.jar
 org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final.jar
 org/jsoup/jsoup/1.9.2/jsoup-1.9.2.jar
 org/msgpack/msgpack/0.6.12/msgpack-0.6.12.jar
+org/ow2/asm/asm/7.1/asm-7.1.jar
 org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar
 org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar
 org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar
 org/ow2/asm/asm-util/7.1/asm-util-7.1.jar
-org/ow2/asm/asm/7.1/asm-7.1.jar
 org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar
 org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
 quoin/quoin/0.1.2/quoin-0.1.2.jar
+reagent/reagent/1.2.0/reagent-1.2.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
+refactor-nrepl/refactor-nrepl/3.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
-reagent/reagent/1.2.0/reagent-1.2.0.jar
-refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.1.2/ring-codec-1.1.2.jar
 ring/ring-core/1.8.1/ring-core-1.8.1.jar
 spec-coerce/spec-coerce/1.0.0-alpha6/spec-coerce-1.0.0-alpha6.jar
 status-im/timbre/4.10.0-2-status/timbre-4.10.0-2-status.jar
 thheller/shadow-client/1.3.3/shadow-client-1.3.3.jar
-thheller/shadow-cljs/2.11.16/shadow-cljs-2.11.16-aot.jar
+thheller/shadow-cljs/2.12.0/shadow-cljs-2.12.0-aot.jar
 thheller/shadow-cljsjs/0.0.21/shadow-cljsjs-0.0.21.jar
+thheller/shadow-undertow/0.1.0/shadow-undertow-0.1.0.jar
 thheller/shadow-util/0.7.0/shadow-util-0.7.0.jar
 viebel/codox-klipse-theme/0.0.1/codox-klipse-theme-0.0.1.jar

package.json

@@ -44,7 +44,7 @@
     "react-native-camera-kit": "^13.0.0",
     "react-native-config": "^1.5.0",
     "react-native-dialogs": "^1.0.4",
-    "react-native-draggable-flatlist": "^3.0.3",
+    "react-native-draggable-flatlist": "^4.0.1",
     "react-native-fast-image": "^8.5.11",
     "react-native-fetch-polyfill": "^1.1.2",
     "react-native-fs": "^2.14.1",
@@ -99,7 +99,7 @@
     "process": "0.11.10",
     "react-test-renderer": "18.0.0",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
-    "shadow-cljs": "2.11.16"
+    "shadow-cljs": "2.25.0"
   },
   "binary": {
     "module_name": "status_nodejs_addon",

shadow-cljs.edn

@@ -3,23 +3,27 @@
 
  :dependencies [[reagent "1.2.0"]
                 [re-frame "1.3.0"]
-                [binaryage/oops "0.7.0"]
+                [binaryage/oops "0.7.2"]
                 [com.andrewmcveigh/cljs-time "0.5.2"]
                 [status-im/timbre "4.10.0-2-status"]
-                [com.taoensso/encore "2.105.0"]
                 [hickory "0.7.1"]
                 [cljs-bean "1.3.0"]
                 [com.cognitect/transit-cljs "0.8.248"]
                 [mvxcvi/alphabase "1.0.0"]
                 [camel-snake-kebab "0.4.3"]
-                ;; dev dependencies
+                ;; Dev dependencies
                 [refactor-nrepl "2.5.0"]
                 [cider/cider-nrepl "0.25.3"]
                 [cider/piggieback "0.4.1"]
                 [re-frisk-remote "1.6.0"]
-                ;; routing
+                ;; We don't use the encore library, but re-frisk requires re-frisk/sente (fork of
+                ;; com.taoensso/sente), which in turn requires encore. We need to bump encore to
+                ;; 3.21.0+ to remove a warning displayed while shadow-cljs starts (commit
+                ;; https://github.com/ptaoussanis/encore/commit/f7a21567b9611a63999609ca183c7fb175034bd6).
+                [com.taoensso/encore "3.21.0"]
+                ;; Routing
                 [bidi "2.1.6"]
-                ;; test dependencies
+                ;; Test dependencies
                 [day8.re-frame/test "0.1.5"]
                 [com.taoensso/tufte "2.1.0"]]
 
@@ -48,10 +52,9 @@
                     :after-load-async  status-im2.setup.hot-reload/reload
                     :build-notify      status-im2.setup.hot-reload/build-notify
                     :preloads          [re-frisk-remote.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
+                                        ;; 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
                                         ;; @testing-library/react-native.
                                         test-helpers.component]}
          :closure-defines
@@ -99,8 +102,8 @@
    :output-dir "target/test"
    :optimizations :simple
    :target :node-test
-   ;; When running tests without a REPL you can uncomment below line to `make test-watch` a specific file
-   ;; :ns-regexp        "status-im2.subs.chat.messages-test$"
+   ;; Uncomment line below to `make test-watch` a specific file
+   ;; :ns-regexp "status-im2.subs.chat.messages-test$"
    :main
    status-im.test-runner/main
    ;; set :ui-driven to true to let shadow-cljs inject node-repl

src/js/worklets/lightbox.js

@@ -6,3 +6,10 @@ export function infoLayout(input, isTop) {
     return isTop ? input.value : -input.value;
   });
 }
+
+export function textSheet(input, isHeight) {
+  return useDerivedValue(function () {
+    'worklet';
+    return isHeight ? input.value : -input.value;
+  });
+}

src/js/worklets/shell/constants.js

@@ -1,18 +1,18 @@
 import { Easing } from 'react-native-reanimated';
 
 // Home Stack States
-export const CLOSE_WITH_ANIMATION = 0;
-export const OPEN_WITH_ANIMATION = 1;
-export const CLOSE_WITHOUT_ANIMATION = 2;
-export const OPEN_WITHOUT_ANIMATION = 3;
+export const CLOSE_WITHOUT_ANIMATION = 0;
+export const OPEN_WITHOUT_ANIMATION = 1;
+export const CLOSE_WITH_ANIMATION = 2;
+export const OPEN_WITH_ANIMATION = 3;
 
 // Floating Screen States
-export const CLOSE_SCREEN_WITH_SLIDE_ANIMATION = 0;
-export const OPEN_SCREEN_WITH_SLIDE_ANIMATION = 1;
-export const CLOSE_SCREEN_WITH_SHELL_ANIMATION = 2;
-export const OPEN_SCREEN_WITH_SHELL_ANIMATION = 3;
-export const CLOSE_SCREEN_WITHOUT_ANIMATION = 4;
-export const OPEN_SCREEN_WITHOUT_ANIMATION = 5;
+export const CLOSE_SCREEN_WITHOUT_ANIMATION = 0;
+export const OPEN_SCREEN_WITHOUT_ANIMATION = 1;
+export const CLOSE_SCREEN_WITH_SLIDE_ANIMATION = 2;
+export const OPEN_SCREEN_WITH_SLIDE_ANIMATION = 3;
+export const CLOSE_SCREEN_WITH_SHELL_ANIMATION = 4;
+export const OPEN_SCREEN_WITH_SHELL_ANIMATION = 5;
 
 export const SHELL_ANIMATION_TIME = 200;
 

src/native_module/core.cljs

@@ -225,12 +225,12 @@
   (.verifyDatabasePassword ^js (status) key-uid hashed-password callback))
 
 (defn login-with-keycard
-  [{:keys [key-uid multiaccount-data password chat-key]}]
+  [{:keys [key-uid multiaccount-data password chat-key node-config]}]
   (log/debug "[native-module] login-with-keycard")
   (clear-web-data)
   (init-keystore
    key-uid
-   #(.loginWithKeycard ^js (status) multiaccount-data password chat-key)))
+   #(.loginWithKeycard ^js (status) multiaccount-data password chat-key (types/clj->json node-config))))
 
 (defn set-soft-input-mode
   [mode]
@@ -258,6 +258,13 @@
   (log/debug "[native-module] hash-message")
   (.hashMessage ^js (status) message callback))
 
+(defn start-searching-for-local-pairing-peers
+  "starts a UDP multicast beacon that both listens for and broadcasts to LAN peers"
+  [callback]
+  (log/info "[native-module] Start Searching for Local Pairing Peers"
+            {:fn :start-searching-for-local-pairing-peers})
+  (.startSearchForLocalPairingPeers ^js (status) callback))
+
 (defn local-pairing-preflight-outbound-check
   "Checks whether the device has allows connecting to the local server"
   [callback]
@@ -287,11 +294,11 @@
   and then compressed. Example input/output :
   input key  = zQ3shTAten2v9CwyQD1Kc7VXAqNPDcHZAMsfbLHCZEx6nFqk9 and
   output key = 0x025596a7ff87da36860a84b0908191ce60a504afc94aac93c1abd774f182967ce6"
-  [key callback]
+  [input-key callback]
   (log/info "[native-module] Deserializing and then compressing public key"
             {:fn  :deserialize-and-compress-key
-             :key key})
-  (.deserializeAndCompressKey ^js (status) key callback))
+             :key input-key})
+  (.deserializeAndCompressKey ^js (status) input-key callback))
 
 (defn compressed-key->public-key
   "Provides compressed key to status-go and gets back the uncompressed public key via deserialization"
@@ -461,19 +468,19 @@
   (.numberToHex ^js (status) (str num)))
 
 (defn sha3
-  [str]
+  [s]
   (log/debug "[native-module] sha3")
-  (.sha3 ^js (status) str))
+  (.sha3 ^js (status) s))
 
 (defn utf8-to-hex
-  [str]
+  [s]
   (log/debug "[native-module] utf8-to-hex")
-  (.utf8ToHex ^js (status) str))
+  (.utf8ToHex ^js (status) s))
 
 (defn hex-to-utf8
-  [str]
+  [s]
   (log/debug "[native-module] hex-to-utf8")
-  (.hexToUtf8 ^js (status) str))
+  (.hexToUtf8 ^js (status) s))
 
 (defn check-address-checksum
   [address]

src/quo/animated.cljs

@@ -82,8 +82,8 @@
           :restDisplacementThreshold 0.001}})
 
 (defn set-value
-  [anim val]
-  (ocall anim "setValue" val))
+  [anim v]
+  (ocall anim "setValue" v))
 
 (def Value (oget animated "Value"))
 
@@ -178,20 +178,20 @@
   (.withOffset ^js redash (clj->js config)))
 
 (defn with-spring-transition
-  [val config]
-  (.withSpringTransition ^js redash val (clj->js config)))
+  [v config]
+  (.withSpringTransition ^js redash v (clj->js config)))
 
 (defn with-timing-transition
-  [val config]
-  (.withTimingTransition ^js redash val (clj->js config)))
+  [v config]
+  (.withTimingTransition ^js redash v (clj->js config)))
 
 (defn use-spring-transition
-  [val config]
-  (.useSpringTransition ^js redash val (clj->js config)))
+  [v config]
+  (.useSpringTransition ^js redash v (clj->js config)))
 
 (defn use-timing-transition
-  [val config]
-  (.useTimingTransition ^js redash val (clj->js config)))
+  [v config]
+  (.useTimingTransition ^js redash v (clj->js config)))
 
 (defn re-timing
   [config]
@@ -232,36 +232,11 @@
      :onGestureEvent       (.-onGestureEvent ^js gesture)}))
 
 (defn snap-point
-  [value velocity snap-points]
-  (.snapPoint ^js redash value velocity (to-array snap-points)))
-
-(defn cancelable-loop
-  [{:keys [clock duration finished on-reach]}]
-  (let [time       (value 0)
-        frame-time (value 0)
-        position   (value 0)
-        to-value   (value 1)
-        state      {:time      time
-                    :frameTime frame-time
-                    :finished  finished
-                    :position  position}
-        config     {:toValue  to-value
-                    :duration duration
-                    :easing   (:linear easings)}]
-    (block
-     [(timing clock state config)
-      (cond* (and* finished
-                   (eq position to-value))
-             (call* [] on-reach))
-      (cond* finished
-             [(set finished 0)
-              (set time 0)
-              (set frame-time 0)
-              (set position 0)])
-      position])))
+  [v velocity snap-points]
+  (.snapPoint ^js redash v velocity (to-array snap-points)))
 
 (defn with-easing
-  [{val   :value
+  [{v     :value
     :keys [snap-points velocity offset state easing duration
            animation-over]
     :or   {duration       250
@@ -282,7 +257,7 @@
              (set position offset))
       (cond* (neq state (:end gh/states))
              [(set animation-over 0)
-              (set position (add offset val))])
+              (set position (add offset v))])
       (cond* (and* (eq state (:end gh/states))
                    (not* animation-over))
              [(set position

src/quo/previews/preview.clj

@@ -1,12 +1,5 @@
 (ns quo.previews.preview)
 
-(defn descriptor->values
-  [{:keys [key options type]}]
-  {key (case type
-         :boolean [false true]
-         :text    [nil "Just simple text"] ; NOTE(Ferossgp): add example with long text?
-         :select  (mapv :key options))})
-
 (defmacro list-comp
   [[binding seq-expr & bindings] body-expr]
   (cond (not binding)

src/quo/previews/preview.cljs

@@ -68,8 +68,8 @@
    :background-color   (:ui-background @colors/theme)})
 
 (defn customizer-boolean
-  [{:keys [label key state]}]
-  (let [state* (reagent/cursor state [key])]
+  [{:keys [label state] :as args}]
+  (let [state* (reagent/cursor state [(:key args)])]
     [rn/view {:style container}
      [label-view state label]
      [rn/view
@@ -95,8 +95,8 @@
         "False"]]]]))
 
 (defn customizer-text
-  [{:keys [label key state]}]
-  (let [state* (reagent/cursor state [key])]
+  [{:keys [label state] :as args}]
+  (let [state* (reagent/cursor state [(:key args)])]
     [rn/view {:style container}
      [label-view state label]
      [rn/view {:style {:flex 0.6}}
@@ -117,8 +117,8 @@
 (defn customizer-select
   []
   (let [open (reagent/atom nil)]
-    (fn [{:keys [label key state options]}]
-      (let [state*   (reagent/cursor state [key])
+    (fn [{:keys [label state options] :as args}]
+      (let [state*   (reagent/cursor state [(:key args)])
             selected (value-for-key @state* options)]
         [rn/view {:style container}
          [label-view state label]
@@ -133,15 +133,15 @@
             [rn/view {:style (modal-view)}
              [rn/scroll-view
               (doall
-               (for [{:keys [key value]} options]
-                 ^{:key key}
+               (for [{k :key v :value} options]
+                 ^{:key k}
                  [rn/touchable-opacity
-                  {:style    (select-option-style (= @state* key))
+                  {:style    (select-option-style (= @state* k))
                    :on-press #(do
                                 (reset! open false)
-                                (reset! state* key))}
-                  [quo/text {:color (if (= @state* key) :link :secondary)}
-                   value]]))
+                                (reset! state* k))}
+                  [quo/text {:color (if (= @state* k) :link :secondary)}
+                   v]]))
               [rn/view {:flex-direction :row}
                [rn/touchable-opacity
                 {:style    (select-option-style false)
@@ -175,17 +175,15 @@
    {:style              {:flex 1}
     :padding-horizontal 16}
    (doall
-    (for [{:keys [key type]
-           :as   desc}
-          descriptors
-          :let [descriptor (merge desc
-                                  {:state state})]]
-      ^{:key key}
+    (for [desc descriptors
+          :let [descriptor (merge desc {:state state})]]
+      ^{:key (:key desc)}
       [:<>
-       (case type
+       (case (:type desc)
          :boolean [customizer-boolean descriptor]
          :text    [customizer-text descriptor]
-         :select  [customizer-select descriptor])]))])
+         :select  [customizer-select descriptor]
+         nil)]))])
 
 (comment
   [{:label "Show error:"

src/quo/react.cljs

@@ -12,9 +12,9 @@
 
 ;; Inspired from UIX, Rum and Rumext
 (defn set-ref-val!
-  [ref val]
-  (oset! ref "current" val)
-  val)
+  [ref v]
+  (oset! ref "current" v)
+  v)
 
 (defn set-native-props
   [^js ref ^js props]
@@ -54,8 +54,8 @@
                    #js [value set-value])))
 
 (defn use-ref
-  [val]
-  (let [ref (react/useRef val)]
+  [v]
+  (let [ref (react/useRef v)]
     (reify
      cljs.core/IHash
        (-hash [_] (goog/getUid ref))

src/quo2/components/avatars/channel_avatar.cljs

@@ -1,50 +0,0 @@
-(ns quo2.components.avatars.channel-avatar
-  (:require [quo2.components.icon :as icons]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [quo2.theme :as theme]
-            [react-native.core :as rn]))
-
-(defn channel-avatar
-  [{:keys [big? locked? emoji-background-color emoji]}]
-  (let [lock-exists? locked?
-        dark?        (theme/dark?)]
-    [rn/view
-     {:style {:width            (if big? 32 24)
-              :height           (if big? 32 24)
-              :border-radius    (if big? 32 24)
-              :justify-content  :center
-              :align-items      :center
-              :background-color emoji-background-color}}
-     [rn/view
-      {:style {:display         :flex
-               :justify-content :center
-               :align-items     :center}}
-      [text/text
-       {:size (if big?
-                :paragraph-1
-                :label)} emoji]
-      (when lock-exists?
-        [rn/view
-         {:style {:position         :absolute
-                  :left             (if big?
-                                      14
-                                      8)
-                  :top              (if big?
-                                      15
-                                      8)
-                  :background-color (if dark?
-                                      colors/neutral-90
-                                      colors/white)
-                  :border-radius    15
-                  :padding          2}}
-         [icons/icon
-          (if locked?
-            :main-icons/locked
-            :main-icons/unlocked)
-          {:color           (if dark?
-                              colors/neutral-40
-                              colors/neutral-50)
-           :container-style {:width  12
-                             :height 12}
-           :size            12}]])]]))

src/quo2/components/avatars/channel_avatar/component_spec.cljs

@@ -0,0 +1,35 @@
+(ns quo2.components.avatars.channel-avatar.component-spec
+  (:require [quo2.components.avatars.channel-avatar.view :as component]
+            [test-helpers.component :as h]))
+
+(h/describe "Channel Avatar"
+  (h/test "default render"
+    (h/render [component/view])
+    (h/is-truthy (h/query-by-label-text :initials))
+    (h/is-null (h/query-by-label-text :emoji))
+    (h/is-null (h/query-by-label-text :lock)))
+
+  (h/test "with emoji, no lock set, large size"
+    (let [emoji "🍓"]
+      (h/render [component/view {:emoji emoji :size :size/l}])
+      (h/is-null (h/query-by-label-text :initials))
+      (h/is-truthy (h/query-by-text emoji))
+      (h/is-null (h/query-by-label-text :lock))))
+
+  (h/test "locked"
+    (h/render [component/view {:locked? true}])
+    (h/is-truthy (h/query-by-label-text :lock)))
+
+  (h/test "unlocked"
+    (h/render [component/view {:locked? false}])
+    (h/is-truthy (h/query-by-label-text :lock)))
+
+  (h/test "no emoji, smaller size"
+    (h/render [component/view {:full-name "Status Mobile"}])
+    (h/is-truthy (h/query-by-text "S")))
+
+  (h/test "no emoji, large size"
+    (h/render [component/view
+               {:full-name "Status Mobile"
+                :size      :size/l}])
+    (h/is-truthy (h/query-by-text "SM"))))

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

@@ -0,0 +1,28 @@
+(ns quo2.components.avatars.channel-avatar.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(def lock-icon-size 12)
+
+(defn outer-container
+  [{:keys [size color]}]
+  (let [size (if (= size :size/l) 32 24)]
+    {:width            size
+     :height           size
+     :border-radius    size
+     :justify-content  :center
+     :align-items      :center
+     :background-color (colors/theme-alpha color 0.1 0.1)}))
+
+(defn lock-container
+  [size]
+  (let [distance (if (= size :size/l) 20 12)]
+    {:position         :absolute
+     :left             distance
+     :top              distance
+     :background-color (colors/theme-colors colors/white colors/neutral-95)
+     :border-radius    (* 2 lock-icon-size)
+     :padding          2}))
+
+(def lock-icon
+  {:width  lock-icon-size
+   :height lock-icon-size})

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

@@ -0,0 +1,60 @@
+(ns quo2.components.avatars.channel-avatar.view
+  (:require [clojure.string :as string]
+            [quo2.components.avatars.channel-avatar.style :as style]
+            [quo2.components.icon :as icons]
+            [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]
+            [react-native.core :as rn]
+            utils.string))
+
+(defn- initials
+  [full-name size color]
+  (let [amount-initials (if (= size :size/l) 2 1)]
+    [text/text
+     {:accessibility-label :initials
+      :size                :paragraph-2
+      :weight              :semi-bold
+      :style               {:color color}}
+     (utils.string/get-initials full-name amount-initials)]))
+
+(defn- lock
+  [locked? size]
+  ;; When `locked?` is nil, we must not display the unlocked icon.
+  (when (boolean? locked?)
+    [rn/view
+     {:accessibility-label :lock
+      :style               (style/lock-container size)}
+     [icons/icon (if locked? :i/locked :i/unlocked)
+      {:color           (colors/theme-colors colors/neutral-50 colors/neutral-40)
+       :container-style style/lock-icon
+       :size            12}]]))
+
+(defn view
+  "Options:
+
+  :size - keyword (default nil) - Container size, for the moment,
+  only :size/l (meaning large) is supported.
+
+  :emoji - string (default nil)
+
+  :customization-color - color (default nil) If the component is used for a
+  community channel, then the default color should be the community custom
+  color.
+
+  :locked? - nil/bool (default nil) - When true/false display a locked/unlocked
+  icon respectively. When nil does not show icon.
+
+  :full-name - string (default nil) - When :emoji is blank, this value will be
+  used to extract the initials.
+  "
+  [{:keys [size emoji customization-color locked? full-name]}]
+  [rn/view
+   {:accessibility-label :channel-avatar
+    :style               (style/outer-container {:size size :color customization-color})}
+   (if (string/blank? emoji)
+     [initials full-name size customization-color]
+     [text/text
+      {:accessibility-label :emoji
+       :size                (if (= size :size/l) :paragraph-1 :label)}
+      (string/trim emoji)])
+   [lock locked? size]])

src/quo2/components/avatars/user_avatar/style.cljs

@@ -41,7 +41,7 @@
      :border-radius dimensions}))
 
 (defn initials-avatar
-  [size draw-ring? customization-color]
+  [size draw-ring? customization-color theme]
   (let [outer-dimensions (get-in sizes [size :outer])
         inner-dimensions (get-in sizes [size (if draw-ring? :inner :outer)])]
     {:position         :absolute
@@ -52,7 +52,7 @@
      :border-radius    inner-dimensions
      :justify-content  :center
      :align-items      :center
-     :background-color (colors/custom-color-by-theme customization-color 50 60)}))
+     :background-color (colors/custom-color-by-theme customization-color 50 60 nil nil theme)}))
 
 (def initials-avatar-text
   {:color colors/white-opa-70})
@@ -67,7 +67,7 @@
      :background-color background}))
 
 (defn dot
-  [size ring?]
+  [size ring? theme]
   (let [dimensions   (get-in sizes [size :status-indicator])
         border-width (get-in sizes [size :status-indicator-border])
         right        (case size
@@ -89,5 +89,5 @@
      :height           dimensions
      :border-width     border-width
      :border-radius    dimensions
-     :background-color (colors/theme-colors colors/white colors/neutral-100)
-     :border-color     (colors/theme-colors colors/white colors/neutral-100)}))
+     :background-color (colors/theme-colors colors/white colors/neutral-100 theme)
+     :border-color     (colors/theme-colors colors/white colors/neutral-100 theme)}))

src/quo2/components/avatars/user_avatar/view.cljs

@@ -1,44 +1,32 @@
 (ns quo2.components.avatars.user-avatar.view
-  (:require [clojure.string :as string]
-            [quo2.components.avatars.user-avatar.style :as style]
+  (:require [quo2.components.avatars.user-avatar.style :as style]
             [quo2.components.markdown.text :as text]
+            [quo2.theme :as quo.theme]
             [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]))
-
-(defn trim-whitespace [s] (string/join " " (string/split (string/trim s) #"\s+")))
-
-(defn- extract-initials
-  [full-name amount-initials]
-  (let [upper-case-first-letter (comp string/upper-case first)
-        names-list              (string/split (trim-whitespace full-name) " ")]
-    (if (= (first names-list) "")
-      ""
-      (->> names-list
-           (map upper-case-first-letter)
-           (take amount-initials)
-           (string/join)))))
+            [react-native.fast-image :as fast-image]
+            utils.string))
 
 (defn initials-avatar
-  [{:keys [full-name size draw-ring? customization-color]}]
+  [{:keys [full-name size draw-ring? customization-color theme]}]
   (let [font-size       (get-in style/sizes [size :font-size])
         amount-initials (if (#{:xs :xxs :xxxs} size) 1 2)]
     [rn/view
      {:accessibility-label :initials-avatar
-      :style               (style/initials-avatar size draw-ring? customization-color)}
+      :style               (style/initials-avatar size draw-ring? customization-color theme)}
      [text/text
       {:style  style/initials-avatar-text
        :size   font-size
        :weight :semi-bold}
-      (extract-initials full-name amount-initials)]]))
+      (utils.string/get-initials full-name amount-initials)]]))
 
 (def valid-ring-sizes #{:big :medium :small})
 
-(defn user-avatar
+(defn- user-avatar-internal
   "If no `profile-picture` is given, draws the initials based on the `full-name` and
   uses `ring-background` to display the ring behind the initials when given. Otherwise,
   shows the `profile-picture` which already comes with the ring drawn."
   [{:keys [full-name status-indicator? online? size profile-picture ring-background
-           customization-color static? muted?]
+           customization-color static? muted? theme]
     :or   {status-indicator?   true
            online?             true
            size                :big
@@ -62,11 +50,14 @@
         {:full-name           full-name
          :size                size
          :draw-ring?          draw-ring?
-         :customization-color customization-color}])
+         :customization-color customization-color
+         :theme               theme}])
      (when status-indicator?
        [rn/view
         {:accessibility-label :status-indicator
-         :style               (style/dot size draw-ring?)}
+         :style               (style/dot size draw-ring? theme)}
         [rn/view
          {:accessibility-label :inner-status-indicator-dot
           :style               (style/inner-dot size online?)}]])]))
+
+(def user-avatar (quo.theme/with-theme user-avatar-internal))

src/quo2/components/browser/browser_input/component_spec.cljs

@@ -0,0 +1,58 @@
+(ns quo2.components.browser.browser-input.component-spec
+  (:require [quo2.components.browser.browser-input.view :as browser-input]
+            [test-helpers.component :as h]))
+
+(h/describe "Browser input"
+  (h/test "Renders empty in default state"
+    (h/render [browser-input/browser-input
+               {:on-change-text (h/mock-fn)
+                :value          ""}])
+    (h/is-truthy (h/get-by-label-text :browser-input)))
+
+  (h/test "On change text is fired"
+    (let [on-change-text (h/mock-fn)]
+      (h/render [browser-input/browser-input
+                 {:on-change-text on-change-text
+                  :value          "mock text"}])
+      (h/fire-event :change-text (h/get-by-label-text :browser-input) "mock-text-new")
+      (h/was-called on-change-text)))
+
+  (h/describe "Input Label"
+    (h/test "Doesn't render label text when input is focused"
+      (h/render [browser-input/browser-input
+                 {:auto-focus true}])
+      (h/is-null (h/query-by-label-text :browser-input-label)))
+
+    (h/test "Renders label text when input has a value and input is not focused"
+      (h/render [browser-input/browser-input
+                 {:default-value "mock default"}])
+      (h/is-truthy (h/query-by-label-text :browser-input-label)))
+
+    (h/test "Renders site favicon when specified"
+      (h/render [browser-input/browser-input
+                 {:default-value "mock default" :favicon :i/verified}])
+      (h/is-truthy (h/query-by-label-text :browser-input-favicon)))
+
+    (h/test "Renders lock icon when lock is enabled"
+      (h/render [browser-input/browser-input
+                 {:default-value "mock default" :locked? true}])
+      (h/is-truthy (h/query-by-label-text :browser-input-locked-icon))))
+
+  (h/describe "Clear button"
+    (h/test "Doesn't render in default state"
+      (h/render [browser-input/browser-input])
+      (h/is-null (h/query-by-label-text :browser-input-clear-button)))
+
+    (h/test "Renders when there is a value"
+      (h/render [browser-input/browser-input
+                 {:default-value "mock text"}])
+      (h/is-truthy (h/query-by-label-text :browser-input-clear-button)))
+
+    (h/test "Is pressable"
+      (let [on-clear (h/mock-fn)]
+        (h/render [browser-input/browser-input
+                   {:default-value "mock text"
+                    :on-clear      on-clear}])
+        (h/is-truthy (h/query-by-label-text :browser-input-clear-button))
+        (h/fire-event :press (h/query-by-label-text :browser-input-clear-button))
+        (h/was-called on-clear)))))

src/quo2/components/browser/browser_input/style.cljs

@@ -0,0 +1,56 @@
+(ns quo2.components.browser.browser-input.style
+  (:require [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]))
+
+(def clear-icon-container
+  {:align-items     :center
+   :height          20
+   :justify-content :center
+   :margin-left     8
+   :top             4
+   :width           20})
+
+(def favicon-icon-container
+  {:margin-right 2})
+
+(defn input
+  [disabled?]
+  (assoc (text/text-style {:size   :paragraph-1
+                           :weight :regular})
+         :flex       1
+         :min-height 36
+         :min-width  120
+         :opacity    (if disabled? 0.3 1)))
+
+(def lock-icon-container
+  {:margin-left 2})
+
+(defn active-container
+  [display?]
+  {:align-items     :center
+   :flex-direction  :row
+   :justify-content :center
+   :opacity         (if display? 1 0)})
+
+(def default-container
+  {:align-items        :center
+   :bottom             0
+   :flex-direction     :row
+   :left               0
+   :padding-horizontal 20
+   :position           :absolute
+   :right              0
+   :top                0
+   :z-index            10})
+
+(defn text
+  []
+  (assoc (text/text-style {:size   :paragraph-1
+                           :weight :medium})
+         :color
+         (colors/theme-colors colors/neutral-100 colors/white)))
+
+(def root-container
+  {:height             60
+   :padding-horizontal 20
+   :padding-vertical   8})

src/quo2/components/browser/browser_input/view.cljs

@@ -0,0 +1,144 @@
+(ns quo2.components.browser.browser-input.view
+  (:require [quo2.components.icon :as icon]
+            [quo2.components.browser.browser-input.style :as style]
+            [react-native.core :as rn]
+            [reagent.core :as reagent]
+            [quo2.foundations.colors :as colors]
+            [quo2.theme :as quo2.theme]
+            [clojure.string :as string]
+            [react-native.platform :as platform]))
+
+(defn remove-http-https-www
+  [value]
+  (string/replace value #"(https?://(www\.)?|http://)" ""))
+
+(defn clear-icon-color
+  [blur? theme]
+  (if blur?
+    (colors/theme-colors colors/neutral-80-opa-30 colors/white-opa-10 theme)
+    (colors/theme-colors colors/neutral-40 colors/neutral-60 theme)))
+
+(defn lock-icon-color
+  [blur? theme]
+  (if blur?
+    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
+    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
+
+(defn- clear-button
+  [{:keys [on-press blur? theme]}]
+  [rn/touchable-opacity
+   {:accessibility-label :browser-input-clear-button
+    :on-press            on-press
+    :style               style/clear-icon-container}
+   [icon/icon :i/clear
+    {:color (clear-icon-color blur? theme)}]])
+
+(defn lock-icon
+  [{:keys [blur? theme]}]
+  [rn/view
+   [icon/icon :i/locked
+    {:accessibility-label :browser-input-locked-icon
+     :color               (lock-icon-color blur? theme)
+     :container-style     style/lock-icon-container
+     :size                16}]])
+
+(defn cursor-color
+  [customization-color theme]
+  (colors/theme-colors (colors/custom-color customization-color 50)
+                       (colors/custom-color customization-color 60)
+                       theme))
+
+(defn placeholder-color
+  [state blur? theme]
+  (cond
+    (and blur? (= state :active))
+    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 theme)
+
+    blur?
+    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 theme)
+
+    (= state :active)
+    (colors/theme-colors colors/neutral-30 colors/neutral-60 theme)
+
+    :else
+    (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)))
+
+(def ^:private props-to-remove
+  [:cursor-color :placeholder-text-color :editable :on-change-text :on-focus
+   :on-blur :on-clear :value :disabled? :blur? :customization-color :theme])
+
+(defn browser-input-internal
+  [{:keys [default-value]
+    :or   {default-value ""}}]
+  (let [state       (reagent/atom :default)
+        value       (reagent/atom default-value)
+        set-active  #(reset! state :active)
+        set-default #(reset! state :default)
+        set-value   #(reset! value %)
+        ref         (atom nil)
+        clear-input (fn []
+                      (.clear ^js @ref)
+                      (reset! value ""))
+        focus-input (fn []
+                      (set-active)
+                      (.focus ^js @ref))]
+    (fn [{:keys [disabled? blur? on-change-text customization-color
+                 on-clear on-focus on-blur theme get-ref locked?
+                 favicon favicon-color favicon-size]
+          :as   props}]
+      (let [clean-props (apply dissoc props props-to-remove)]
+        [rn/view {:style style/root-container}
+         (when (and (seq @value) (= @state :default))
+           [rn/touchable-opacity
+            {:style    style/default-container
+             :on-press focus-input}
+            (when favicon
+              [icon/icon favicon
+               {:accessibility-label :browser-input-favicon
+                :color               favicon-color
+                :container-style     style/favicon-icon-container
+                :size                favicon-size}])
+            [rn/text
+             {:accessibility-label :browser-input-label
+              :style               (style/text)} (remove-http-https-www @value)]
+            (when locked?
+              [lock-icon
+               {:blur? blur?
+                :theme theme}])])
+         [rn/view {:style (style/active-container (or (empty? @value) (= @state :active)))}
+          [rn/text-input
+           (merge
+            clean-props
+            {:accessibility-label    :browser-input
+             :auto-capitalize        :none
+             :auto-correct           false
+             :cursor-color           (cursor-color customization-color theme)
+             :editable               (not disabled?)
+             :keyboard-appearance    (colors/theme-colors :light :dark theme)
+             :keyboard-type          :web-search
+             :on-blur                (fn []
+                                       (set-default)
+                                       (when on-blur (on-blur)))
+             :on-change-text         (fn [new-text]
+                                       (set-value new-text)
+                                       (when on-change-text (on-change-text new-text)))
+             :on-focus               (fn []
+                                       (set-active)
+                                       (when on-focus (on-focus)))
+             :placeholder-text-color (placeholder-color @state blur? theme)
+             :ref                    (fn [r]
+                                       (reset! ref r)
+                                       (when get-ref (get-ref r)))
+             :selection-color        (when platform/ios?
+                                       (cursor-color customization-color theme))
+             :select-text-on-focus   true
+             :style                  (style/input disabled?)})]
+          (when (seq @value)
+            [clear-button
+             {:blur?    blur?
+              :on-press (fn []
+                          (clear-input)
+                          (when on-clear (on-clear)))
+              :theme    theme}])]]))))
+
+(def browser-input (quo2.theme/with-theme browser-input-internal))

src/quo2/components/buttons/__tests__/buttons_component_spec.cljs

@@ -1,28 +0,0 @@
-(ns quo2.components.buttons.--tests--.buttons-component-spec
-  (:require ["@testing-library/react-native" :as rtl]
-            [quo2.components.buttons.button :as button]
-            [reagent.core :as reagent]))
-
-(defn render-button
-  ([options label]
-   (rtl/render (reagent/as-element [button/button options label]))))
-
-(js/global.test "default render of button component"
-  (fn []
-    (render-button {:accessibility-label "test-button"} "")
-    (-> (js/expect (rtl/screen.getByLabelText "test-button"))
-        (.toBeTruthy))))
-
-(js/global.test "button renders with a label"
-  (fn []
-    (render-button {} "test-label")
-    (-> (js/expect (rtl/screen.getByText "test-label"))
-        (.toBeTruthy))))
-
-(js/global.test "button on-press works"
-  (let [event (js/jest.fn)]
-    (fn []
-      (render-button {:on-press event} "test-label")
-      (rtl/fireEvent.press (rtl/screen.getByText "test-label"))
-      (-> (js/expect event)
-          (.toHaveBeenCalledTimes 1)))))

src/quo2/components/buttons/button/component_spec.cljs

@@ -0,0 +1,18 @@
+(ns quo2.components.buttons.button.component-spec
+  (:require [quo2.components.buttons.button.view :as button]
+            [test-helpers.component :as h]))
+
+(h/describe "button tests"
+  (h/test "default render of button component"
+    (h/render [button/button {:accessibility-label "test-button"} ""])
+    (h/is-truthy (h/get-by-label-text "test-button")))
+
+  (h/test "button renders with a label"
+    (h/render [button/button {} "test-label"])
+    (h/is-truthy (h/get-by-text "test-label")))
+
+  (h/test "button on-press works"
+    (let [event (h/mock-fn)]
+      (h/render [button/button {:on-press event} "test-label"])
+      (h/fire-event :press (h/get-by-text "test-label"))
+      (h/was-called event))))

src/quo2/components/buttons/button/properties.cljs

@@ -0,0 +1,103 @@
+(ns quo2.components.buttons.button.properties
+  (:require [quo2.foundations.colors :as colors]))
+
+(defn custom-color-type
+  [customization-color icon-only?]
+  {:icon-color           colors/white
+   :icon-secondary-color colors/white-opa-70
+   :label-color          colors/white
+   :background-color     (colors/custom-color customization-color 50)
+   :border-radius        (when icon-only? 24)})
+
+(defn grey-photo
+  [theme pressed?]
+  {:icon-color            (colors/theme-colors colors/neutral-100 colors/white theme)
+   :icon-secondary-color  (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-70 theme)
+   :label-color           (colors/theme-colors colors/neutral-100 colors/white theme)
+   :icon-background-color (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme)
+   :blur-overlay-color    (if pressed?
+                            (colors/theme-colors colors/white-opa-50
+                                                 colors/neutral-80-opa-50
+                                                 theme)
+                            (colors/theme-colors colors/white-opa-40
+                                                 colors/neutral-80-opa-40
+                                                 theme))
+   :blur-type             (if (= theme :light) :light :dark)})
+
+(defn grey-blur
+  [theme pressed?]
+  {:icon-color           (colors/theme-colors colors/neutral-100 colors/white theme)
+   :icon-secondary-color (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-70 theme)
+   :label-color          (colors/theme-colors colors/neutral-100 colors/white theme)
+   :background-color     (if pressed?
+                           (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme)
+                           (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5 theme))})
+
+(defn outline-blur
+  [theme pressed?]
+  {:icon-color           (colors/theme-colors colors/neutral-100 colors/white theme)
+   :icon-secondary-color (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
+   :label-color          (colors/theme-colors colors/neutral-100 colors/white theme)
+   :border-color         (if pressed?
+                           (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 theme)
+                           (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme))})
+
+(defn grey
+  [theme pressed?]
+  {:icon-color           (colors/theme-colors colors/neutral-100 colors/white theme)
+   :icon-secondary-color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+   :label-color          (colors/theme-colors colors/neutral-100 colors/white theme)
+   :background-color     (if pressed?
+                           (colors/theme-colors colors/neutral-20 colors/neutral-60 theme)
+                           (colors/theme-colors colors/neutral-10 colors/neutral-80 theme))})
+
+(defn dark-grey
+  [theme pressed?]
+  {:icon-color           (colors/theme-colors colors/neutral-100 colors/white theme)
+   :icon-secondary-color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+   :label-color          (colors/theme-colors colors/neutral-100 colors/white theme)
+   :background-color     (if pressed?
+                           (colors/theme-colors colors/neutral-30 colors/neutral-60 theme)
+                           (colors/theme-colors colors/neutral-20 colors/neutral-90 theme))})
+
+(defn outline
+  [theme pressed?]
+  {:icon-color           (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+   :icon-secondary-color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+   :label-color          (colors/theme-colors colors/neutral-100 colors/white theme)
+   :border-color         (if pressed?
+                           (colors/theme-colors colors/neutral-40 colors/neutral-60 theme)
+                           (colors/theme-colors colors/neutral-30 colors/neutral-70 theme))})
+
+(defn ghost
+  [theme pressed?]
+  {:icon-color           (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+   :icon-secondary-color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+   :label-color          (colors/theme-colors colors/neutral-100 colors/white theme)
+   :background-color     (when pressed?
+                           (colors/theme-colors colors/neutral-10 colors/neutral-80 theme))})
+
+(defn black
+  [pressed?]
+  {:icon-color       colors/white
+   :label-color      colors/white
+   :background-color (if pressed? colors/neutral-80 colors/neutral-95)})
+
+(defn get-values
+  [{:keys [customization-color theme type background pressed? icon-only?]}]
+  (cond
+    (= type :primary)                              (custom-color-type customization-color icon-only?)
+    (= type :positive)                             (custom-color-type customization-color icon-only?)
+    (= type :danger)                               (custom-color-type customization-color icon-only?)
+    ;; TODO Remove type blurred - https://github.com/status-im/status-mobile/issues/16535
+    (and (= :photo background) (= type :grey))     (grey-photo theme pressed?)
+    ;; TODO Remove type blur-bg - https://github.com/status-im/status-mobile/issues/16535
+    (or (= type :blur-bg)
+        (and (= :blur background) (= type :grey))) (grey-blur theme pressed?)
+    (and (= :blur background) (= type :outline))   (outline-blur theme pressed?)
+    (= type :grey)                                 (grey theme pressed?)
+    (= type :dark-grey)                            (dark-grey theme pressed?)
+    (= type :outline)                              (outline theme pressed?)
+    (= type :ghost)                                (ghost theme pressed?)
+    ;; TODO: remove type shell - https://github.com/status-im/status-mobile/issues/16535
+    (or (= type :shell) (= type :black))           (black pressed?)))

src/quo2/components/buttons/button/style.cljs

@@ -0,0 +1,106 @@
+(ns quo2.components.buttons.button.style)
+
+(def blur-view
+  {:position :absolute
+   :top      0
+   :left     0
+   :right    0
+   :bottom   0})
+
+(defn icon-style
+  [{:keys [icon-container-size icon-background-color icon-container-rounded?
+           icon-size margin-left margin-right]}]
+  (cond-> (merge {:margin-left     margin-left
+                  :margin-right    margin-right
+                  :align-items     :center
+                  :justify-content :center})
+    icon-container-size
+    (assoc :width icon-container-size :height icon-container-size)
+    icon-background-color
+    (assoc :background-color icon-background-color)
+    icon-container-rounded?
+    (assoc :border-radius (/ (or icon-container-size icon-size) 2))))
+
+(defn icon-left-icon-style
+  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
+           icon-size]}]
+  (icon-style
+   {:margin-left             (or (get override-margins :left)
+                                 (if (= size 40) 12 8))
+    :margin-right            (or (get override-margins :right) 4)
+    :icon-container-size     icon-container-size
+    :icon-background-color   icon-background-color
+    :icon-container-rounded? icon-container-rounded?
+    :icon-size               icon-size}))
+
+(defn icon-right-icon-style
+  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
+           icon-size]}]
+  (icon-style {:margin-left             (or (get override-margins :left) 4)
+               :margin-right            (or (get override-margins :right)
+                                            (if (= size 40) 12 8))
+               :icon-container-size     icon-container-size
+               :icon-background-color   icon-background-color
+               :icon-container-rounded? icon-container-rounded?
+               :icon-size               icon-size}))
+
+(defn shape-style-container
+  [size border-radius]
+  {:height        size
+   :border-radius (if border-radius
+                    border-radius
+                    (case size
+                      56 12
+                      40 12
+                      32 10
+                      8))})
+
+(defn style-container
+  [{:keys [size disabled border-radius background-color border-color icon-only? icon-above width
+           icon-left icon-right]}]
+  (merge {:height             size
+          :align-items        :center
+          :justify-content    :center
+          :flex-direction     (if icon-above :column :row)
+          :padding-horizontal (when-not (or icon-only? icon-left icon-right)
+                                (case size
+                                  56 16
+                                  40 16
+                                  32 12
+                                  8))
+          :padding-left       (when-not (or icon-only? icon-left)
+                                (case size
+                                  56 16
+                                  40 16
+                                  32 12
+                                  8))
+          :padding-right      (when-not (or icon-only? icon-right)
+                                (case size
+                                  56 16
+                                  40 16
+                                  32 12
+                                  8))
+          :padding-top        (when-not (or icon-only? icon-left icon-right)
+                                (case size
+                                  56 0
+                                  40 9
+                                  32 5
+                                  3))
+          :padding-bottom     (when-not (or icon-only? icon-left icon-right)
+                                (case size
+                                  56 0
+                                  40 9
+                                  32 5
+                                  4))
+          :overflow           :hidden
+          :background-color   background-color}
+         (shape-style-container size border-radius)
+         (when width
+           {:width width})
+         (when icon-only?
+           {:width size})
+         (when border-color
+           {:border-color border-color
+            :border-width 1})
+         (when disabled
+           {:opacity 0.3})))

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

@@ -0,0 +1,139 @@
+(ns quo2.components.buttons.button.view
+  (:require [quo2.components.icon :as quo2.icons]
+            [quo2.components.markdown.text :as text]
+            [quo2.theme :as theme]
+            [react-native.core :as rn]
+            [react-native.blur :as blur]
+            [reagent.core :as reagent]
+            [quo2.components.buttons.button.style :as style]
+            [quo2.components.buttons.button.properties :as button-properties]
+            [quo2.foundations.customization-colors :as customization-colors]))
+
+(defn- button-internal
+  "with label
+   [button opts \"label\"]
+   opts
+   {on-press callback
+    on-long-press callback
+    disabled boolean
+    :type   :primary/:positive:grey/:dark-grey/:outline/:ghost/
+            :danger/:black  (TODO remove :photo-bg/:blur-bg/:blur-bg-outline/:shell/:community)
+    background :photo/:blur or nil
+    :size   40 [default] /32/24/56
+    :icon   true/false
+    :above  :icon-keyword
+    :before :icon-keyword
+    :after  :icon-keyword}
+    :customization-color keyword or hexstring 
+    :theme :light/:dark
+   only icon
+   [button {:icon true} :i/close-circle]"
+  [_ _]
+  (let [pressed? (reagent/atom false)]
+    (fn
+      [{:keys [on-press on-long-press disabled type background size before after above
+               width customization-color theme override-background-color
+               accessibility-label icon style inner-style]
+        :or   {type                :primary
+               size                40
+               customization-color (cond (= type :primary)  :blue
+                                         (= type :positive) :success
+                                         (= type :danger)   :danger
+                                         :else              nil)}}
+       children]
+      (let [icon-only? icon ;; TODO Update external api to icon-only? -
+                            ;; https://github.com/status-im/status-mobile/issues/16535
+            container-style style ;; TODO Update external api to container-style and remove prop width
+            icon-left before ;; TODO Update external api to icon-left
+            icon-right after ;; TODO Update external api to icon-right
+            icon-above above ;; TODO Update external api to icon-above
+            {:keys [icon-color icon-secondary-color background-color label-color border-color blur-type
+                    blur-overlay-color icon-background-color border-radius]}
+            (button-properties/get-values {:customization-color customization-color
+                                           :background          background
+                                           :type                type
+                                           :theme               theme
+                                           :pressed?            @pressed?
+                                           :icon-only?          icon-only?})
+            icon-size (when (= 24 size) 12)
+            icon-secondary-color (or icon-secondary-color icon-color)]
+        [rn/touchable-without-feedback
+         {:disabled            disabled
+          :accessibility-label accessibility-label
+          :on-press-in         #(reset! pressed? true)
+          :on-press-out        #(reset! pressed? nil)
+          :on-press            on-press
+          :on-long-press       on-long-press}
+         [rn/view
+          {:style (merge
+                   (style/shape-style-container size border-radius)
+                   {:width width}
+                   container-style)}
+          [rn/view
+           {:style (merge
+                    (style/style-container {:size size
+                                            :disabled disabled
+                                            :border-radius border-radius
+                                            :background-color
+                                            (or override-background-color background-color)
+                                            :border-color border-color
+                                            :icon-only? icon-only?
+                                            :icon-above icon-above
+                                            :width width
+                                            :icon-left icon-left
+                                            :icon-right icon-right})
+                    inner-style)}
+           (when customization-color
+             [customization-colors/overlay
+              {:customization-color customization-color
+               :theme               theme
+               :pressed?            @pressed?}])
+           (when (= background :photo)
+             [blur/view
+              {:blur-radius   20
+               :blur-type     blur-type
+               :overlay-color blur-overlay-color
+               :style         style/blur-view}])
+           (when icon-above
+             [rn/view
+              [quo2.icons/icon icon-above
+               {:container-style {:margin-bottom 2}
+                :color           icon-secondary-color
+                :size            icon-size}]])
+           (when icon-left
+             [rn/view
+              {:style (style/icon-left-icon-style
+                       {:size                  size
+                        :icon-background-color icon-background-color
+                        :icon-size             icon-size})}
+              [quo2.icons/icon icon-left
+               {:color icon-secondary-color
+                :size  icon-size}]])
+           [rn/view
+            (cond
+              icon-only?
+              [quo2.icons/icon children
+               {:color icon-color
+                :size  icon-size}]
+
+              (string? children)
+              [text/text
+               {:size            (when (#{56 24} size) :paragraph-2)
+                :weight          :medium
+                :number-of-lines 1
+                :style           {:color label-color}}
+               children]
+
+              (vector? children)
+              children)]
+           (when icon-right
+             [rn/view
+              {:style (style/icon-right-icon-style
+                       {:size                  size
+                        :icon-background-color icon-background-color
+                        :icon-size             icon-size})}
+              [quo2.icons/icon icon-right
+               {:color icon-secondary-color
+                :size  icon-size}]])]]]))))
+
+(def button (theme/with-theme button-internal))

src/quo2/components/buttons/dynamic_button.cljs

@@ -62,7 +62,7 @@
     :customization-color customize jump-to and mention button color}"
   [_]
   (let [pressed? (reagent/atom false)]
-    (fn [{:keys [type label on-press count customization-color style]}]
+    (fn [{:keys [type label on-press customization-color style] :as args}]
       [rn/touchable-opacity
        {:on-press-in         #(reset! pressed? true)
         :on-press-out        #(reset! pressed? false)
@@ -102,6 +102,6 @@
            (case type
              :jump-to                                       label
              :search-with-label                             label
-             (:mention :notification-down :notification-up) (str count))])
+             (:mention :notification-down :notification-up) (str (:count args)))])
         (when (#{:jump-to :notification-down :notification-up} type)
           [icon-view type])]])))

src/quo2/components/buttons/predictive_keyboard/view.cljs

@@ -5,7 +5,7 @@
             [quo2.theme :as theme]
             [react-native.linear-gradient :as linear-gradient]
             [quo2.foundations.colors :as colors]
-            [quo2.components.buttons.button :as button]))
+            [quo2.components.buttons.button.view :as button]))
 
 (def ^:private gradients
   {:light [(colors/alpha colors/neutral-40 0.05) (colors/alpha colors/neutral-40 0)]

src/quo2/components/buttons/style.cljs

@@ -1,42 +0,0 @@
-(ns quo2.components.buttons.style)
-
-(def blur-view
-  {:position :absolute
-   :top      0
-   :left     0
-   :right    0
-   :bottom   0})
-
-(defn before-icon-style
-  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
-           icon-size]}]
-  (merge
-   {:margin-left     (or (get override-margins :left)
-                         (if (= size 40) 12 8))
-    :margin-right    (or (get override-margins :right) 4)
-    :align-items     :center
-    :justify-content :center}
-   (when icon-container-size
-     {:width  icon-container-size
-      :height icon-container-size})
-   (when icon-background-color
-     {:background-color icon-background-color})
-   (when icon-container-rounded?
-     {:border-radius (/ (or icon-container-size icon-size) 2)})))
-
-(defn after-icon-style
-  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
-           icon-size]}]
-  (merge
-   {:margin-left     (or (get override-margins :left) 4)
-    :margin-right    (or (get override-margins :right)
-                         (if (= size 40) 12 8))
-    :align-items     :center
-    :justify-content :center}
-   (when icon-container-size
-     {:width  icon-container-size
-      :height icon-container-size})
-   (when icon-background-color
-     {:background-color icon-background-color})
-   (when icon-container-rounded?
-     {:border-radius (/ (or icon-container-size icon-size) 2)})))

src/quo2/components/calendar/calendar/component_spec.cljs

@@ -0,0 +1,64 @@
+(ns quo2.components.calendar.calendar.component-spec
+  (:require [quo2.components.calendar.calendar.view :as calendar]
+            [test-helpers.component :as h]
+            [cljs-time.core :as time]))
+
+(def start-date (time/date-time (time/year (time/now)) (time/month (time/now)) 5))
+(def end-date (time/date-time (time/plus start-date (time/days 2))))
+
+(h/describe "calendar component"
+  (h/test "default render of calendar component"
+    (h/render
+     [calendar/view
+      {:start-date start-date
+       :end-date   end-date}])
+    (-> (h/expect (h/query-by-translation-text "Mo"))
+        (h/is-truthy)))
+
+  (h/test "should call on-change with selected date on first click"
+    (let [on-change (h/mock-fn)]
+      (h/render
+       [calendar/view
+        {:start-date nil
+         :end-date   nil
+         :on-change  on-change}])
+      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
+      (h/was-called-with on-change {:start-date start-date :end-date nil})))
+
+  (h/test "should call on-change with start and end date on second click"
+    (let [on-change (h/mock-fn)]
+      (h/render
+       [calendar/view
+        {:start-date start-date :end-date nil :on-change on-change}])
+      (h/fire-event :press (h/query-by-text (str (time/day end-date))))
+      (h/was-called-with on-change {:start-date start-date :end-date end-date})))
+
+  (h/test "should reset the dates on third click"
+    (let [on-change (h/mock-fn)]
+      (h/render
+       [calendar/view
+        {:start-date start-date
+         :end-date   end-date
+         :on-change  on-change}])
+      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
+      (h/was-called-with on-change {:start-date start-date :end-date nil})))
+
+  (h/test "should reset dates when start date is clicked again"
+    (let [on-change (h/mock-fn)]
+      (h/render
+       [calendar/view
+        {:start-date start-date
+         :end-date   nil
+         :on-change  on-change}])
+      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
+      (h/was-called-with on-change {:start-date nil :end-date nil})))
+
+  (h/test "should assign start and end date correctly when upper range selected first"
+    (let [on-change (h/mock-fn)]
+      (h/render
+       [calendar/view
+        {:start-date end-date
+         :end-date   nil
+         :on-change  on-change}])
+      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
+      (h/was-called-with on-change {:start-date start-date :end-date end-date}))))

src/quo2/components/calendar/calendar/days_grid/style.cljs

@@ -0,0 +1,7 @@
+(ns quo2.components.calendar.calendar.days-grid.style)
+
+(def container-days
+  {:flex-grow         1
+   :margin-top        4
+   :margin-horizontal 8
+   :overflow          :hidden})

src/quo2/components/calendar/calendar/days_grid/utils.cljs

@@ -0,0 +1,65 @@
+(ns quo2.components.calendar.calendar.days-grid.utils
+  (:require
+    [utils.number :as utils.number]
+    [cljs-time.core :as time]))
+
+(defn- day-of-week
+  [date]
+  (let [day (time/day-of-week date)]
+    (mod day 7)))
+
+(defn- add-days
+  [date days]
+  (time/plus date (time/days days)))
+
+(defn day-grid
+  [year month]
+  (let [year      (utils.number/parse-int year)
+        month     (utils.number/parse-int month)
+        first-day (time/date-time year month 1)
+        start-day (add-days first-day (- 0 (day-of-week first-day)))
+        end-day   (add-days start-day 34)]
+    (loop [days        []
+           current-day start-day]
+      (if (time/after? current-day end-day)
+        days
+        (recur (conj days current-day) (add-days current-day 1))))))
+
+(defn get-day-state
+  [day today year month start-date end-date]
+  (cond
+    (and start-date (time/equal? day start-date))             :selected
+    (and end-date (time/equal? day end-date))                 :selected
+    (and (= (time/year day) (time/year today))
+         (= (time/month day) (time/month today))
+         (= (time/day day) (time/day today)))                 :today
+    (and (= (time/year day) year) (= (time/month day) month)) :default
+    :else                                                     :disabled))
+
+(defn update-range
+  [day start-date end-date]
+  (let [new-state (cond
+                    (and start-date end-date)                     {:start-date day :end-date nil}
+                    (and start-date (time/equal? day start-date)) {:start-date nil :end-date nil}
+                    (and end-date (time/equal? day end-date))     {:start-date nil :end-date nil}
+                    (nil? start-date)                             {:start-date day :end-date nil}
+                    (nil? end-date)                               {:start-date start-date :end-date day}
+                    :else                                         {:start-date start-date
+                                                                   :end-date   end-date})]
+    (if (and (:start-date new-state)
+             (:end-date new-state)
+             (time/after? (:start-date new-state) (:end-date new-state)))
+      {:start-date (:end-date new-state) :end-date (:start-date new-state)}
+      new-state)))
+
+(defn in-range?
+  [day start-date end-date]
+  (and start-date end-date (time/after? day start-date) (time/before? day end-date)))
+
+(defn get-in-range-pos
+  [day start-date end-date]
+  (cond
+    (or (nil? start-date) (nil? end-date))        nil
+    (and start-date (time/equal? day start-date)) :start
+    (and end-date (time/equal? day end-date))     :end
+    (in-range? day start-date end-date)           :middle))

src/quo2/components/calendar/calendar/days_grid/utils_test.cljs

@@ -0,0 +1,51 @@
+(ns quo2.components.calendar.calendar.days-grid.utils-test
+  (:require [cljs.test :refer-macros [deftest is testing]]
+            [quo2.components.calendar.calendar.days-grid.utils :as utils]
+            [cljs-time.core :as time]))
+
+(deftest day-grid-test
+  (let [day-grid-result (utils/day-grid "2023" "7")]
+    (testing "it returns correct days grid"
+      (is (= 35 (count day-grid-result)))
+      (is (time/equal? (time/date-time 2023 6 25) (first day-grid-result)))
+      (is (time/equal? (time/date-time 2023 7 29) (last day-grid-result))))))
+
+(deftest get-day-state-test
+  (let [today      (time/date-time 2023 7 27)
+        year       2023
+        month      7
+        start-date (time/date-time 2023 7 20)
+        end-date   (time/date-time 2023 7 30)]
+    (testing "it returns :today when day equals today"
+      (is (= :today (utils/get-day-state today today year month start-date end-date))))
+    (testing "it returns :selected when day equals start-date and not today"
+      (is
+       (= :selected (utils/get-day-state start-date today year month start-date end-date))))
+    (testing "it returns :selected when day equals end-date and not today"
+      (is
+       (= :selected (utils/get-day-state end-date today year month start-date end-date))))))
+
+(deftest update-range-test
+  (let [start-date (time/date-time 2023 7 20)
+        end-date   (time/date-time 2023 7 30)
+        day        (time/date-time 2023 7 27)]
+    (testing "it returns updated range"
+      (is
+       (= {:start-date day :end-date nil} (utils/update-range day start-date end-date))))))
+
+(deftest in-range-test
+  (let [start-date (time/date-time 2023 7 20)
+        end-date   (time/date-time 2023 7 30)
+        day        (time/date-time 2023 7 27)]
+    (testing "it returns true when day is within range"
+      (is (utils/in-range? day start-date end-date))
+      (is (not (utils/in-range? (time/date-time 2023 7 19) start-date end-date))))))
+
+(deftest get-in-range-pos-test
+  (let [start-date (time/date-time 2023 7 20)
+        end-date   (time/date-time 2023 7 30)
+        day        (time/date-time 2023 7 27)]
+    (testing "it returns correct position within range"
+      (is (= :start (utils/get-in-range-pos start-date start-date end-date)))
+      (is (= :end (utils/get-in-range-pos end-date start-date end-date)))
+      (is (= :middle (utils/get-in-range-pos day start-date end-date))))))

src/quo2/components/calendar/calendar/days_grid/view.cljs

@@ -0,0 +1,41 @@
+(ns quo2.components.calendar.calendar.days-grid.view
+  (:require [react-native.core :as rn]
+            [cljs-time.core :as time]
+            [quo2.components.calendar.calendar.days-grid.utils :as utils]
+            [quo2.components.calendar.calendar-day.view :as calendar-day]
+            [quo2.components.calendar.calendar.days-grid.style :as style]))
+
+(defn- day-view
+  [day _ _ {:keys [year month selection-range on-press customization-color]}]
+  (let [today      (time/now)
+        start-date (:start-date selection-range)
+        end-date   (:end-date selection-range)
+        state      (utils/get-day-state day today year month start-date end-date)
+        in-range   (utils/get-in-range-pos day start-date end-date)
+        on-press   #(on-press (time/date-time day))]
+    [calendar-day/view
+     {:customization-color customization-color
+      :state               state
+      :in-range            in-range
+      :on-press            on-press}
+     (str (time/day day))]))
+
+(defn view
+  [{:keys [year month on-change start-date end-date customization-color]}]
+  (let [on-day-press (fn [day]
+                       (let [new-selection (utils/update-range day start-date end-date)]
+                         (on-change new-selection)))]
+    [rn/view
+     {:style style/container-days}
+     [rn/flat-list
+      {:data                    (utils/day-grid year month)
+       :key-fn                  str
+       :num-columns             7
+       :content-container-style {:margin-horizontal -2}
+       :render-fn               day-view
+       :render-data             {:customization-color customization-color
+                                 :year                year
+                                 :month               month
+                                 :on-press            on-day-press
+                                 :selection-range     {:start-date start-date
+                                                       :end-date   end-date}}}]]))

src/quo2/components/calendar/calendar/month_picker/component_spec.cljs

@@ -0,0 +1,25 @@
+(ns quo2.components.calendar.calendar.month-picker.component-spec
+  (:require [quo2.components.calendar.calendar.month-picker.view :as month-picker]
+            [test-helpers.component :as h]))
+
+(h/describe "month-picker component"
+  (h/test "default render of month-picker component"
+    (h/render
+     [month-picker/view
+      {:year "2023" :month "7"}])
+    (-> (h/expect (h/query-by-translation-text "July 2023"))
+        (h/is-truthy)))
+
+  (h/test "should call on-change with next month when right button pressed"
+    (let [on-change (h/mock-fn)]
+      (h/render
+       [month-picker/view {:year "2023" :month "7" :on-change on-change}])
+      (h/fire-event :press (h/query-by-label-text :next-month-button))
+      (h/was-called on-change)))
+
+  (h/test "should call on-change with previous month when left button pressed"
+    (let [on-change (h/mock-fn)]
+      (h/render
+       [month-picker/view {:year "2023" :month "1" :on-change on-change}])
+      (h/fire-event :press (h/query-by-label-text :previous-month-button))
+      (h/was-called on-change))))

src/quo2/components/calendar/calendar/month_picker/style.cljs

@@ -0,0 +1,14 @@
+(ns quo2.components.calendar.calendar.month-picker.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(def container
+  {:align-items        :center
+   :flex-direction     :row
+   :flex-grow          1
+   :padding-horizontal 12
+   :padding-vertical   9
+   :justify-content    :space-between})
+
+(defn text
+  [theme]
+  {:color (colors/theme-colors colors/neutral-100 colors/white theme)})

src/quo2/components/calendar/calendar/month_picker/utils.cljs

@@ -0,0 +1,22 @@
+(ns quo2.components.calendar.calendar.month-picker.utils
+  (:require [utils.datetime :as datetime]))
+
+(defn format-month-year
+  [year month]
+  (let [month (cond
+                (or (nil? month) (zero? month)) 1
+                (> month 12)                    12
+                :else                           month)]
+    (str (datetime/format-long-month month) " " year)))
+
+(defn next-month
+  [year month]
+  (let [new-month (if (= month 12) 1 (inc month))
+        new-year  (if (= month 12) (inc year) year)]
+    {:year (str new-year) :month (str new-month)}))
+
+(defn previous-month
+  [year month]
+  (let [new-month (if (= month 1) 12 (dec month))
+        new-year  (if (= month 1) (dec year) year)]
+    {:year (str new-year) :month (str new-month)}))

src/quo2/components/calendar/calendar/month_picker/utils_test.cljs

@@ -0,0 +1,20 @@
+(ns quo2.components.calendar.calendar.month-picker.utils-test
+  (:require [cljs.test :refer-macros [deftest is testing]]
+            [quo2.components.calendar.calendar.month-picker.utils :as utils]))
+
+(deftest format-month-year-test
+  (testing "returns correct format for given year and month"
+    (is (= (utils/format-month-year 2023 1) "January 2023"))
+    (is (= (utils/format-month-year 2023 12) "December 2023"))
+    (is (= (utils/format-month-year 2023 0) "January 2023"))
+    (is (= (utils/format-month-year 2023 13) "December 2023"))))
+
+(deftest next-month-test
+  (testing "returns the next month and year"
+    (is (= (utils/next-month 2023 1) {:year "2023" :month "2"}))
+    (is (= (utils/next-month 2023 12) {:year "2024" :month "1"}))))
+
+(deftest previous-month-test
+  (testing "returns the previous month and year"
+    (is (= (utils/previous-month 2023 1) {:year "2022" :month "12"}))
+    (is (= (utils/previous-month 2023 12) {:year "2023" :month "11"}))))

src/quo2/components/calendar/calendar/month_picker/view.cljs

@@ -0,0 +1,36 @@
+(ns quo2.components.calendar.calendar.month-picker.view
+  (:require [react-native.core :as rn]
+            [utils.number :as utils.number]
+            [quo2.theme :as theme]
+            [quo2.components.buttons.button.view :as button]
+            [quo2.components.markdown.text :as text]
+            [quo2.components.calendar.calendar.month-picker.style :as style]
+            [quo2.components.calendar.calendar.month-picker.utils :as utils]))
+
+(defn- view-internal
+  [{:keys [year month on-change theme]}]
+  (let [year  (utils.number/parse-int year)
+        month (utils.number/parse-int month)]
+    [rn/view
+     {:style style/container}
+     [button/button
+      {:icon                true
+       :type                :outline
+       :accessibility-label :previous-month-button
+       :size                24
+       :on-press            #(on-change (utils/previous-month year month))}
+      :i/chevron-left]
+     [text/text
+      {:weight :semi-bold
+       :size   :paragraph-1
+       :style  (style/text theme)}
+      (utils/format-month-year year month)]
+     [button/button
+      {:icon                true
+       :accessibility-label :next-month-button
+       :size                24
+       :type                :outline
+       :on-press            #(on-change (utils/next-month year month))}
+      :i/chevron-right]]))
+
+(def view (theme/with-theme view-internal))

src/quo2/components/calendar/calendar/style.cljs

@@ -0,0 +1,14 @@
+(ns quo2.components.calendar.calendar.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(defn container
+  [theme]
+  {:flex-direction   :row
+   :height           270
+   :border-color     (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
+   :border-radius    12
+   :border-width     1
+   :background-color (colors/theme-colors colors/white colors/neutral-80-opa-40 theme)})
+
+(def container-main
+  {:flex-grow 1})

src/quo2/components/calendar/calendar/utils.cljs

@@ -0,0 +1,25 @@
+(ns quo2.components.calendar.calendar.utils
+  (:require [utils.datetime :as datetime]
+            [utils.number :as utils.number]
+            [clojure.string :as string]))
+
+(defn generate-years
+  [current-year]
+  (let [current-year current-year]
+    (reverse (vec (range (- current-year 100) (+ current-year 1))))))
+
+(defn current-year
+  []
+  (-> (datetime/now)
+      datetime/timestamp->year-month-day-date
+      (string/split #"-")
+      first
+      utils.number/parse-int))
+
+(defn current-month
+  []
+  (-> (datetime/now)
+      datetime/timestamp->year-month-day-date
+      (string/split #"-")
+      second
+      utils.number/parse-int))

src/quo2/components/calendar/calendar/utils_test.cljs

@@ -0,0 +1,30 @@
+(ns quo2.components.calendar.calendar.utils-test
+  (:require [cljs.test :refer-macros [deftest is testing]]
+            [quo2.components.calendar.calendar.utils :as utils]
+            [utils.datetime :as datetime]
+            [clojure.string :as string]
+            [utils.number :as utils.number]))
+
+(deftest generate-years-test
+  (testing "returns correct years range"
+    (let [current-year (utils/current-year)]
+      (is (= (last (utils/generate-years current-year)) (- current-year 100)))
+      (is (= (first (utils/generate-years current-year)) current-year)))))
+
+(deftest current-year-test
+  (testing "returns the current year"
+    (let [current-year (-> (datetime/now)
+                           datetime/timestamp->year-month-day-date
+                           (string/split #"-")
+                           first
+                           utils.number/parse-int)]
+      (is (= (utils/current-year) current-year)))))
+
+(deftest current-month-test
+  (testing "returns the current month"
+    (let [current-month (-> (datetime/now)
+                            datetime/timestamp->year-month-day-date
+                            (string/split #"-")
+                            second
+                            utils.number/parse-int)]
+      (is (= (utils/current-month) current-month)))))

src/quo2/components/calendar/calendar/view.cljs

@@ -0,0 +1,42 @@
+(ns quo2.components.calendar.calendar.view
+  (:require [react-native.core :as rn]
+            [quo2.theme :as theme]
+            [reagent.core :as reagent]
+            [utils.number :as utils.number]
+            [quo2.components.calendar.calendar.utils :as utils]
+            [quo2.components.calendar.calendar.style :as style]
+            [quo2.components.calendar.calendar.years-list.view :as years-list]
+            [quo2.components.calendar.calendar.days-grid.view :as days-grid]
+            [quo2.components.calendar.calendar.weekdays-header.view :as weekdays-header]
+            [quo2.components.calendar.calendar.month-picker.view :as month-picker]))
+
+(defn- view-internal
+  []
+  (let [selected-year   (reagent/atom (utils/current-year))
+        selected-month  (reagent/atom (utils/current-month))
+        on-change-year  #(reset! selected-year %)
+        on-change-month (fn [new-date]
+                          (reset! selected-year (utils.number/parse-int (:year new-date)))
+                          (reset! selected-month (utils.number/parse-int (:month new-date))))]
+    (fn [{:keys [on-change start-date end-date theme]}]
+      [rn/view
+       {:style (style/container theme)}
+       [years-list/view
+        {:on-change-year on-change-year
+         :year           @selected-year}]
+       [rn/view
+        {:style style/container-main}
+        [month-picker/view
+         {:year      @selected-year
+          :month     @selected-month
+          :on-change on-change-month}]
+        [weekdays-header/view]
+        [days-grid/view
+         {:year                @selected-year
+          :month               @selected-month
+          :start-date          start-date
+          :end-date            end-date
+          :on-change           on-change
+          :customization-color :blue}]]])))
+
+(def view (theme/with-theme view-internal))

src/quo2/components/calendar/calendar/weekdays_header/style.cljs

@@ -0,0 +1,18 @@
+(ns quo2.components.calendar.calendar.weekdays-header.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(def container-weekday-row
+  {:flex-direction     :row
+   :justify-content    :space-between
+   :padding-horizontal 8})
+
+(def container-weekday
+  {:width           32
+   :height          30
+   :padding-top     2
+   :justify-content :center
+   :align-items     :center})
+
+(defn text-weekdays
+  [theme]
+  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})

src/quo2/components/calendar/calendar/weekdays_header/view.cljs

@@ -0,0 +1,23 @@
+(ns quo2.components.calendar.calendar.weekdays-header.view
+  (:require [react-native.core :as rn]
+            [quo2.theme :as theme]
+            [utils.datetime :as datetime]
+            [utils.i18n :as i18n]
+            [quo2.components.markdown.text :as text]
+            [quo2.components.calendar.calendar.weekdays-header.style :as style]))
+
+(defn- view-internal
+  [theme]
+  [rn/view
+   {:style style/container-weekday-row}
+   (for [weekday datetime/weekday-names]
+     [rn/view
+      {:style style/container-weekday
+       :key   weekday}
+      [text/text
+       {:weight :medium
+        :size   :paragraph-2
+        :style  (style/text-weekdays theme)}
+       (str (i18n/label weekday))]])])
+
+(def view (theme/with-theme view-internal))

src/quo2/components/calendar/calendar/years_list/style.cljs

@@ -0,0 +1,33 @@
+(ns quo2.components.calendar.calendar.years-list.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(defn gradient-start-color
+  [theme]
+  (colors/theme-colors colors/white colors/neutral-90 theme))
+
+(defn gradient-end-color
+  [theme]
+  (colors/theme-colors colors/white-opa-0 colors/neutral-100-opa-0 theme))
+
+(def gradient-view
+  {:position               :absolute
+   :height                 50
+   :border-top-left-radius 12
+   :top                    0
+   :left                   0
+   :right                  0})
+
+(defn container-years
+  [theme]
+  {:border-width              1
+   :overflow                  :hidden
+   :padding-left              8
+   :padding-right             7
+   :padding-vertical          8
+   :margin-left               -1
+   :margin-top                -1
+   :margin-bottom             -1
+   :border-style              :dashed
+   :border-top-left-radius    12
+   :border-bottom-left-radius 12
+   :border-color              (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)})

src/quo2/components/calendar/calendar/years_list/view.cljs

@@ -0,0 +1,49 @@
+(ns quo2.components.calendar.calendar.years-list.view
+  (:require [react-native.core :as rn]
+            [quo2.theme :as theme]
+            [react-native.linear-gradient :as linear-gradient]
+            [quo2.components.calendar.calendar.utils :as utils]
+            [quo2.components.calendar.calendar-year.view :as calendar-year]
+            [quo2.components.calendar.calendar.years-list.style :as style]))
+
+(defn- year-view
+  [year _ _ {:keys [selected-year on-press]}]
+  [calendar-year/view
+   {:selected? (= year selected-year)
+    :on-press  #(on-press year)}
+   (str year)])
+
+(defn- separator
+  []
+  [rn/view {:style {:height 4}}])
+
+(defn- footer
+  []
+  [rn/view {:style {:height 32}}])
+
+(defn- gradiant-overview
+  [theme]
+  [linear-gradient/linear-gradient
+   {:colors [(style/gradient-start-color theme) (style/gradient-end-color theme)]
+    :style  style/gradient-view
+    :start  {:x 0 :y 0}
+    :end    {:x 0 :y 1}}])
+
+(defn view-internal
+  [{:keys [on-change-year year theme]}]
+  [rn/view
+   {:style (style/container-years theme)}
+   [rn/flat-list
+    {:data                            (utils/generate-years (utils/current-year))
+     :key-fn                          str
+     :list-key                        :years-list
+     :inverted                        true
+     :shows-vertical-scroll-indicator false
+     :footer                          [footer]
+     :separator                       [separator]
+     :render-fn                       year-view
+     :render-data                     {:selected-year year
+                                       :on-press      #(on-change-year %)}}]
+   [gradiant-overview theme]])
+
+(def view (theme/with-theme view-internal))

src/quo2/components/calendar/calendar_day/component_spec.cljs

@@ -0,0 +1,14 @@
+(ns quo2.components.calendar.calendar-day.component-spec
+  (:require [quo2.components.calendar.calendar-day.view :as calendar-day]
+            [test-helpers.component :as h]))
+
+(h/describe "calendar-day component"
+  (h/test "default render of calendar-day component"
+    (h/render [calendar-day/view {} "25"])
+    (h/is-truthy (h/query-by-text "25")))
+
+  (h/test "should not call on-press when state is :disabled"
+    (let [on-press (h/mock-fn)]
+      (h/render [calendar-day/view {:on-press on-press :state :disabled} "25"])
+      (h/fire-event :press (h/query-by-text "25"))
+      (h/was-not-called on-press))))

src/quo2/components/calendar/calendar_day/style.cljs

@@ -0,0 +1,69 @@
+(ns quo2.components.calendar.calendar-day.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(def wrapper
+  {:flex            1
+   :margin-vertical 2
+   :justify-content :center
+   :align-items     :center})
+
+(def container-base
+  {:align-items     :center
+   :justify-content :center
+   :border-radius   10
+   :height          32
+   :width           32})
+
+(defn text-base
+  [theme]
+  {:color      (colors/theme-colors colors/neutral-100 colors/white theme)
+   :text-align :center})
+
+(defn in-range-background
+  [{:keys [in-range theme]}]
+  (cond-> {:position :absolute
+           :top      0
+           :right    0
+           :left     0
+           :bottom   0}
+    (= in-range :start)
+    (assoc :background-color
+           (colors/theme-colors colors/neutral-5 colors/neutral-80 theme)
+           :left 20)
+
+    (= in-range :middle)
+    (assoc :background-color
+           (colors/theme-colors colors/neutral-5 colors/neutral-80 theme))
+
+    (= in-range :end)
+    (assoc :background-color
+           (colors/theme-colors colors/neutral-5 colors/neutral-80 theme)
+           :right 20)))
+
+(defn container
+  [{:keys [state theme customization-color]}]
+  (cond-> container-base
+    (= state :default)
+    (assoc :background-color colors/neutral-100-opa-0)
+
+    (= state :disabled)
+    (assoc :opacity 0.3)
+
+    (= state :selected)
+    (assoc :background-color (colors/custom-color-by-theme customization-color 50 60 nil nil theme))))
+
+(defn text
+  [{:keys [state theme]}]
+  (cond-> (text-base theme)
+    (= state :selected) (assoc :color colors/white)))
+
+(defn indicator
+  [{:keys [state theme customization-color]}]
+  {:width            4
+   :position         :absolute
+   :bottom           3
+   :height           2
+   :border-radius    8
+   :background-color (if (= state :today)
+                       (colors/custom-color-by-theme customization-color 50 60 nil nil theme)
+                       colors/neutral-100-opa-0)})

src/quo2/components/calendar/calendar_day/view.cljs

@@ -0,0 +1,31 @@
+(ns quo2.components.calendar.calendar-day.view
+  (:require [react-native.core :as rn]
+            [quo2.theme :as theme]
+            [quo2.components.markdown.text :as text]
+            [quo2.components.calendar.calendar-day.style :as style]))
+
+(defn- view-internal
+  [{:keys [state in-range on-press customization-color theme]
+    :or   {state :default}}
+   day]
+  [rn/view {:style style/wrapper}
+   [rn/view {:style (style/in-range-background {:in-range in-range :theme theme})}]
+   [rn/touchable-opacity
+    {:on-press on-press
+     :style    (style/container
+                {:state               state
+                 :theme               theme
+                 :customization-color customization-color})
+     :disabled (= state :disabled)}
+    [text/text
+     {:weight :medium
+      :size   :paragraph-2
+      :style  (style/text {:state state :theme theme})}
+     day]
+    [rn/view
+     {:style (style/indicator
+              {:state               state
+               :theme               theme
+               :customization-color customization-color})}]]])
+
+(def view (theme/with-theme view-internal))

src/quo2/components/calendar/calendar_year/component_spec.cljs

@@ -0,0 +1,14 @@
+(ns quo2.components.calendar.calendar-year.component-spec
+  (:require [quo2.components.calendar.calendar-year.view :as calendar-year]
+            [test-helpers.component :as h]))
+
+(h/describe "calendar-year component"
+  (h/test "default render of calendar-year component"
+    (h/render [calendar-year/view {} "2023"])
+    (h/is-truthy (h/query-by-text "2023")))
+
+  (h/test "should not call on-press when disabled"
+    (let [on-press (h/mock-fn)]
+      (h/render [calendar-year/view {:on-press on-press :disabled? true} "2023"])
+      (h/fire-event :press (h/query-by-text "2023"))
+      (h/was-not-called on-press))))

src/quo2/components/calendar/calendar_year/style.cljs

@@ -0,0 +1,25 @@
+(ns quo2.components.calendar.calendar-year.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(def container-base
+  {:align-items     :center
+   :justify-content :center
+   :border-radius   10
+   :height          32
+   :width           48})
+
+(defn text-base
+  [theme]
+  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})
+
+(defn container
+  [{:keys [selected? disabled? theme]}]
+  (cond-> container-base
+    disabled? (assoc :opacity 0.3)
+    selected? (assoc :background-color
+                     (colors/theme-colors colors/neutral-10 colors/neutral-70 theme))))
+
+(defn text
+  [{:keys [selected? theme]}]
+  (cond-> (text-base theme)
+    selected? (assoc :color (colors/theme-colors colors/neutral-100 colors/white theme))))

src/quo2/components/calendar/calendar_year/view.cljs

@@ -0,0 +1,24 @@
+(ns quo2.components.calendar.calendar-year.view
+  (:require [react-native.core :as rn]
+            [quo2.theme :as theme]
+            [quo2.components.markdown.text :as text]
+            [quo2.components.calendar.calendar-year.style :as style]))
+
+(defn- view-internal
+  [{:keys [selected? disabled? on-press theme]} year]
+  [rn/touchable-opacity
+   {:on-press on-press
+    :style    (style/container
+               {:selected? selected?
+                :disabled? disabled?
+                :theme     theme})
+    :disabled disabled?}
+   [text/text
+    {:weight :medium
+     :size   :paragraph-2
+     :style  (style/text
+              {:selected? selected?
+               :theme     theme})}
+    year]])
+
+(def view (theme/with-theme view-internal))

src/quo2/components/code/snippet.cljs

@@ -1,7 +1,7 @@
 (ns quo2.components.code.snippet
   (:require [cljs-bean.core :as bean]
             [clojure.string :as string]
-            [quo2.components.buttons.button :as button]
+            [quo2.components.buttons.button.view :as button]
             [quo2.components.code.code.style :as style]
             [quo2.components.markdown.text :as text]
             [react-native.core :as rn]

src/quo2/components/common/separator/view.cljs

@@ -1,4 +1,4 @@
-(ns quo2.components.separator
+(ns quo2.components.common.separator.view
   (:require [quo2.foundations.colors :as quo2.colors]
             [react-native.core :as rn]))
 

src/quo2/components/community/banner/style.cljs

@@ -2,18 +2,21 @@
   (:require [quo2.foundations.colors :as colors]))
 
 (defn community-card
-  [radius]
-  {:shadow-offset    {:width  0
-                      :height 2}
-   :shadow-radius    radius
-   :shadow-opacity   1
-   :shadow-color     colors/shadow
-   :elevation        1
-   :border-radius    radius
-   :justify-content  :space-between
-   :background-color (colors/theme-colors
-                      colors/white
-                      colors/neutral-90)})
+  [theme]
+  {:shadow-offset     {:width 0 :height 2}
+   :shadow-radius     16
+   :shadow-opacity    1
+   :shadow-color      colors/shadow
+   :elevation         1
+   :border-radius     16
+   :justify-content   :space-between
+   :background-color  (colors/theme-colors colors/white colors/neutral-90 theme)
+   :flex-direction    :row
+   :margin-horizontal 20
+   :margin-top        8
+   :margin-bottom     8
+   :height            56
+   :padding-right     12})
 
 (def banner-content
   {:flex           1
@@ -25,13 +28,6 @@
   {:flex               1
    :padding-horizontal 12})
 
-(def banner-card
-  {:flex-direction    :row
-   :margin-horizontal 20
-   :margin-vertical   8
-   :height            56
-   :padding-right     12})
-
 (def discover-illustration
   {:position :absolute
    :top      -4

src/quo2/components/community/banner/view.cljs

@@ -2,14 +2,13 @@
   (:require [quo2.components.community.banner.style :as style]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
+            [quo2.theme :as theme]
             [react-native.core :as rn]))
 
 (defn- card-title-and-description
-  [title description]
-  [rn/view
-   {:style style/banner-content}
-   [rn/view
-    {:style style/banner-title}
+  [title description theme]
+  [rn/view {:style style/banner-content}
+   [rn/view {:style style/banner-title}
     [text/text
      {:accessibility-label :community-name-text
       :ellipsize-mode      :tail
@@ -21,26 +20,21 @@
      {:accessibility-label :community-name-text
       :ellipsize-mode      :tail
       :number-of-lines     1
-      :color               (colors/theme-colors
-                            colors/neutral-50
-                            colors/neutral-40)
+      :color               (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
       :weight              :regular
       :size                :paragraph-2}
      description]]])
 
-(defn view
-  [{:keys [title description on-press accessibility-label banner]}]
+(defn view-internal
+  [{:keys [title description on-press accessibility-label banner style theme]}]
   [rn/touchable-without-feedback
    {:on-press            on-press
     :accessibility-label accessibility-label}
-   [rn/view
-    (merge (style/community-card 16)
-           {:background-color (colors/theme-colors
-                               colors/white
-                               colors/neutral-90)}
-           style/banner-card)
-    [card-title-and-description title description]
+   [rn/view {:style (merge (style/community-card theme) style)}
+    [card-title-and-description title description theme]
     [rn/image
      {:style               style/discover-illustration
       :source              banner
       :accessibility-label :discover-communities-illustration}]]])
+
+(def view (theme/with-theme view-internal))

src/quo2/components/community/community_list_view.cljs

@@ -3,6 +3,7 @@
             [quo2.components.community.style :as style]
             [quo2.components.counter.counter :as counter]
             [quo2.components.icon :as icons]
+            [quo2.theme :as theme]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
             [quo2.components.community.icon :as community-icon]
@@ -21,8 +22,8 @@
       :resize-mode     :center
       :size            20
       :color           (colors/theme-colors
-                        colors/neutral-40
-                        colors/neutral-50)}]
+                        colors/neutral-50
+                        colors/neutral-40)}]
     (pos? unread-mentions-count)
     [counter/counter {:type :default} unread-mentions-count]
 
@@ -34,7 +35,7 @@
    {:keys [name
            locked?
            status
-           muted?
+           muted
            unread-messages?
            unread-mentions-count
            community-icon
@@ -59,7 +60,7 @@
          :accessibility-label :community-name-text
          :number-of-lines     1
          :ellipsize-mode      :tail
-         :style               {:color (when muted?
+         :style               {:color (when muted
                                         (colors/theme-colors
                                          colors/neutral-40
                                          colors/neutral-60))}}
@@ -71,14 +72,15 @@
          {:locked? locked?
           :tokens  tokens}]
         [notification-view
-         {:muted?                muted?
+         {:muted?                muted
           :unread-mentions-count unread-mentions-count
           :unread-messages?      unread-messages?}])]]]])
 
 (defn communities-membership-list-item
   [props
+   bottom-sheet?
    {:keys [name
-           muted?
+           muted
            unviewed-messages-count
            unviewed-mentions-count
            status
@@ -105,17 +107,22 @@
        :number-of-lines     1
        :ellipsize-mode      :tail
        :weight              :semi-bold
-       :size                :paragraph-1}
+       :size                :paragraph-1
+       :style               (when muted
+                              {:color (if (theme/dark?)
+                                        colors/neutral-60
+                                        colors/neutral-40)})}
       name]]
 
     [rn/view
      {:justify-content :center
-      :margin-right    16}
+      :margin-right    (when bottom-sheet?
+                         16)}
      (if (= status :gated)
        [community-view/permission-tag-container
         {:locked? locked?
          :tokens  tokens}]
        [notification-view
-        {:muted?                muted?
+        {:muted?                muted
          :unread-mentions-count unviewed-mentions-count
          :unread-messages?      (pos? unviewed-messages-count)}])]]])

src/quo2/components/community/community_view.cljs

@@ -5,13 +5,17 @@
             [quo2.components.tags.permission-tag :as permission]
             [quo2.components.tags.tag :as tag]
             [quo2.foundations.colors :as colors]
-            [quo.gesture-handler :as gesture-handler] ;;TODO move to quo2
-            [react-native.core :as rn]))
+            [quo2.theme :as theme]
+            [react-native.core :as rn]
+            [react-native.gesture :as gesture]
+            utils.money))
 
 (defn community-stats
-  [{:keys [icon members-count icon-color]}]
-  [rn/view (style/stats-count-container)
-   [rn/view {:margin-right 4}
+  [{: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}
@@ -20,29 +24,32 @@
       :color           icon-color}]]
    [text/text
     {:weight :regular
-     :size   :paragraph-1}
+     :size   :paragraph-2}
     members-count]])
 
 (defn community-stats-column
-  [{:keys [type]}]
-  (let [icon-color (colors/theme-colors colors/neutral-50 colors/neutral-40)]
+  [{: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
-      {:icon          :i/group
-       :members-count "629.2K" ;;TODO here should be formatted value, use money/format-members from
-                               ;;outside this component
-       :icon-color    icon-color}]
+      {:accessibility-label :stats-members-count
+       :icon                :i/group
+       :members-count       (utils.money/format-amount members-count)
+       :icon-color          icon-color}]
      [community-stats
-      {:icon          :i/lightning
-       :members-count "112.1K"
-       :icon-color    icon-color}]]))
+      {: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]}]
-  [gesture-handler/scroll-view
+  [gesture/scroll-view
    {:shows-horizontal-scroll-indicator false
     :horizontal                        true
     :style                             container-style}
@@ -84,13 +91,16 @@
        :style               {:margin-top (if (= size :large) 8 2)}}
       description])])
 
-(defn permission-tag-container
-  [{:keys [locked? tokens on-press]}]
+(defn- permission-tag-container-internal
+  [{:keys [locked? blur? tokens on-press theme]}]
   [permission/tag
-   {:background-color (colors/theme-colors
-                       colors/neutral-10
-                       colors/neutral-80)
-    :locked?          locked?
-    :tokens           tokens
-    :size             24
-    :on-press         on-press}])
+   {:accessibility-label :permission-tag
+    :background-color    (if (and (= :dark theme) blur?)
+                           colors/white-opa-10
+                           (colors/theme-colors colors/neutral-10 colors/neutral-80 theme))
+    :locked?             locked?
+    :tokens              tokens
+    :size                24
+    :on-press            on-press}])
+
+(def permission-tag-container (theme/with-theme permission-tag-container-internal))

src/quo2/components/community/token_gating.cljs

@@ -12,11 +12,11 @@
    {:style (style/token-row padding?)}
    (doall
     (map-indexed (fn [token-index token]
-                   (let [{:keys [img-src symbol amount sufficient? purchasable? loading?]} token]
+                   (let [{:keys [img-src amount sufficient? purchasable? loading?]} token]
                      ^{:key token-index}
                      [rn/view {:style style/token-tag-spacing}
                       [token-tag/token-tag
-                       {:symbol      symbol
+                       {:symbol      (:symbol token)
                         :value       amount
                         :size        24
                         :sufficient? sufficient?

src/quo2/components/counter/component_spec.cljs

@@ -1,4 +1,4 @@
-(ns quo2.components.counter.--tests--.counter-component-spec
+(ns quo2.components.counter.component-spec
   (:require [quo2.components.counter.counter :as counter]
             [test-helpers.component :as h]))
 

src/quo2/components/counter/counter.cljs

@@ -17,8 +17,8 @@
            :outline   colors/neutral-70}})
 
 (defn get-color
-  [key]
-  (get-in themes [(theme/get-theme) key]))
+  [k]
+  (get-in themes [(theme/get-theme) k]))
 
 (defn counter
   [{:keys [type override-text-color override-bg-color style accessibility-label max-value]

src/quo2/components/dividers/date.cljs

@@ -1,6 +1,6 @@
 (ns quo2.components.dividers.date
   (:require [quo2.components.markdown.text :as text]
-            [quo2.components.separator :as separator]
+            [quo2.components.common.separator.view :as separator]
             [quo2.foundations.colors :as colors]
             [react-native.core :as rn]))
 

src/quo2/components/dividers/divider_label_component_spec.cljs

@@ -1,4 +1,4 @@
-(ns quo2.components.dividers.--tests--.divider-label-component-spec
+(ns quo2.components.dividers.divider-label-component-spec
   (:require ["@testing-library/react-native" :as rtl]
             [quo2.components.dividers.divider-label :as divider-label]
             [reagent.core :as reagent]))

src/quo2/components/drawers/action_drawers/style.cljs

@@ -2,9 +2,9 @@
   (:require [quo2.foundations.colors :as colors]))
 
 (defn divider
-  []
+  [theme]
   {:border-top-width 1
-   :border-top-color (colors/theme-colors colors/neutral-10 colors/neutral-90)
+   :border-top-color (colors/theme-colors colors/neutral-10 colors/neutral-90 theme)
    :margin-top       8
    :margin-bottom    7
    :align-items      :center
@@ -45,6 +45,6 @@
    :width         20})
 
 (defn right-text
-  [override-theme]
-  {:color        (colors/theme-colors colors/neutral-50 colors/neutral-40 override-theme)
+  [theme]
+  {:color        (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
    :margin-right 12})

src/quo2/components/drawers/action_drawers/view.cljs

@@ -1,20 +1,21 @@
 (ns quo2.components.drawers.action-drawers.view
-  (:require [quo2.components.icon :as icon]
+  (:require [react-native.core :as rn]
+            [quo2.components.drawers.action-drawers.style :as style]
+            [quo2.components.icon :as icon]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            [quo2.components.drawers.action-drawers.style :as style]))
+            [quo2.theme :as quo.theme]))
 
 (defn- get-icon-color
-  [danger? override-theme]
+  [danger? theme]
   (if danger?
-    colors/danger-60
-    (colors/theme-colors colors/neutral-50 colors/neutral-40 override-theme)))
+    (colors/theme-colors colors/danger-50 colors/danger-60 theme)
+    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
 
 (defn- divider
-  []
+  [theme]
   [rn/view
-   {:style               (style/divider)
+   {:style               (style/divider theme)
     :accessible          true
     :accessibility-label :divider}])
 
@@ -24,7 +25,7 @@
     [rn/view (dissoc props :on-press) child]
     [rn/touchable-highlight props child]))
 
-(defn- action
+(defn- action-internal
   [{:keys [icon
            label
            sub-label
@@ -34,65 +35,66 @@
            disabled?
            on-press
            add-divider?
-           override-theme
+           theme
            accessibility-label
-           icon-color]
-    :as   action-props}]
-  (when action-props
-    [:<> {:key label}
-     (when add-divider?
-       [divider])
-     [maybe-pressable disabled?
-      {:accessibility-label accessibility-label
-       :style               (style/container sub-label disabled?)
-       :underlay-color      (colors/theme-colors colors/neutral-5 colors/neutral-90 override-theme)
-       :on-press            on-press}
-      [rn/view
-       {:style (style/row-container sub-label)}
-       [rn/view
-        {:accessibility-label :left-icon-for-action
-         :accessible          true
-         :style               style/left-icon}
-        [icon/icon icon
-         {:color (or icon-color (get-icon-color danger? override-theme))
-          :size  20}]]
-       [rn/view
-        {:style style/text-container}
+           icon-color]}]
+  [:<>
+   (when add-divider?
+     [divider theme])
+   [maybe-pressable disabled?
+    {:accessibility-label accessibility-label
+     :style               (style/container sub-label disabled?)
+     :underlay-color      (colors/theme-colors colors/neutral-5 colors/neutral-90 theme)
+     :on-press            on-press}
+    [rn/view
+     {:style (style/row-container sub-label)}
+     [rn/view
+      {:accessibility-label :left-icon-for-action
+       :accessible          true
+       :style               style/left-icon}
+      [icon/icon icon
+       {:color (or icon-color (get-icon-color danger? theme))
+        :size  20}]]
+     [rn/view
+      {:style style/text-container}
+      [text/text
+       {:size   :paragraph-1
+        :weight :medium
+        :style  {:color
+                 (cond
+                   danger? (colors/theme-colors colors/danger-50 colors/danger-60 theme)
+                   :else   (colors/theme-colors colors/neutral-100 colors/white theme))}}
+       label]
+      (when sub-label
         [text/text
-         {:size   :paragraph-1
-          :weight :medium
-          :style  {:color
-                   (cond
-                     danger? (colors/theme-colors colors/danger-50 colors/danger-60 override-theme)
-                     :else   (colors/theme-colors colors/neutral-100 colors/white override-theme))}}
-         label]
-        (when sub-label
+         {:size  :paragraph-2
+          :style {:color
+                  (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
+         sub-label])]
+     (when (or right-text right-icon)
+       [rn/view {:style style/right-side-container}
+        (when right-text
           [text/text
-           {:size  :paragraph-2
-            :style {:color
-                    (colors/theme-colors colors/neutral-50 colors/neutral-40 override-theme)}}
-           sub-label])]
-       (when (or right-text right-icon)
-         [rn/view {:style style/right-side-container}
-          (when right-text
-            [text/text
-             {:accessibility-label :right-text-for-action
-              :size                :paragraph-1
-              :style               (style/right-text override-theme)}
-             right-text])
-          (when right-icon
-            [rn/view
-             {:style               style/right-icon
-              :accessible          true
-              :accessibility-label :right-icon-for-action}
-             [icon/icon right-icon
-              {:color (get-icon-color danger? override-theme)
-               :size  20}]])])]]]))
+           {:accessibility-label :right-text-for-action
+            :size                :paragraph-1
+            :style               (style/right-text theme)}
+           right-text])
+        (when right-icon
+          [rn/view
+           {:style               style/right-icon
+            :accessible          true
+            :accessibility-label :right-icon-for-action}
+           [icon/icon right-icon
+            {:color (get-icon-color danger? theme)
+             :size  20}]])])]]])
+
+(def ^:private action (quo.theme/with-theme action-internal))
 
 (defn action-drawer
   [sections]
   [:<>
    (doall
     (for [actions sections]
-      (doall
-       (map action actions))))])
+      (let [filtered-actions (filter some? actions)]
+        (doall
+         (map #(with-meta [action %] {:key (:label %)}) filtered-actions)))))])

src/quo2/components/drawers/documentation_drawers/style.cljs

@@ -15,7 +15,7 @@
    :margin-bottom (+ (safe-area/get-bottom) 8)})
 
 (defn title
-  [shell?]
+  [theme]
   {:color (colors/theme-colors colors/neutral-100
                                colors/white
-                               (when shell? :dark))})
+                               theme)})

src/quo2/components/drawers/documentation_drawers/view.cljs

@@ -1,11 +1,12 @@
 (ns quo2.components.drawers.documentation-drawers.view
-  (:require [quo2.components.buttons.button :as button]
+  (:require [quo2.components.buttons.button.view :as button]
             [quo2.components.drawers.documentation-drawers.style :as style]
             [quo2.components.markdown.text :as text]
             [react-native.core :as rn]
-            [react-native.gesture :as gesture]))
+            [react-native.gesture :as gesture]
+            [quo2.theme :as quo.theme]))
 
-(defn view
+(defn- view-internal
   "Options
    - `title` Title text
    - `show-button?` Show button
@@ -15,7 +16,7 @@
    - `shell?` use shell theme
    `content` Content of the drawer
    "
-  [{:keys [title show-button? on-press-button button-label button-icon shell?]} content]
+  [{:keys [title show-button? on-press-button button-label button-icon theme shell?]} content]
   [gesture/scroll-view
    {:style                             style/outer-container
     :always-bounce-vertical            false
@@ -24,18 +25,18 @@
     [text/text
      {:size                :heading-2
       :accessibility-label :documentation-drawer-title
-      :style               (style/title shell?)
+      :style               (style/title theme)
       :weight              :semi-bold}
      title]
     [rn/view {:style style/content :accessibility-label :documentation-drawer-content}
      content]
     (when show-button?
       [button/button
-       (cond-> {:size                24
-                :type                (if shell? :blur-bg-outline :outline)
-                :on-press            on-press-button
-                :accessibility-label :documentation-drawer-button
-                :after               button-icon}
-         shell? (assoc :override-theme :dark))
+       {:size                24
+        :type                (if shell? :blur-bg-outline :outline)
+        :on-press            on-press-button
+        :accessibility-label :documentation-drawer-button
+        :after               button-icon}
        button-label])]])
 
+(def view (quo.theme/with-theme view-internal))

src/quo2/components/dropdowns/dropdown.cljs

@@ -1,10 +1,12 @@
 (ns quo2.components.dropdowns.dropdown
-  (:require [quo2.components.buttons.button :as button]))
+  (:require [quo2.components.dropdowns.old-button-view :as old-button]))
 
 (defn dropdown
   [_ _]
   (fn [{:keys [on-change selected] :as opts} children]
-    [button/button
+    ;TODO: Dropdown needs to be implemented/refactored to be its own component -
+    ;https://github.com/status-im/status-mobile/issues/16456
+    [old-button/button
      (merge
       opts
       {:after                   (if selected :i/chevron-top :i/chevron-down)

src/quo2/components/dropdowns/old_button_style.cljs

@@ -1,12 +1,46 @@
-(ns quo2.components.buttons.button
-  (:require [quo2.components.icon :as quo2.icons]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [quo2.theme :as theme]
-            [react-native.core :as rn]
-            [react-native.blur :as blur]
-            [reagent.core :as reagent]
-            [quo2.components.buttons.style :as style]))
+(ns quo2.components.dropdowns.old-button-style
+  (:require [quo2.foundations.colors :as colors]))
+
+(def blur-view
+  {:position :absolute
+   :top      0
+   :left     0
+   :right    0
+   :bottom   0})
+
+(defn before-icon-style
+  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
+           icon-size]}]
+  (merge
+   {:margin-left     (or (get override-margins :left)
+                         (if (= size 40) 12 8))
+    :margin-right    (or (get override-margins :right) 4)
+    :align-items     :center
+    :justify-content :center}
+   (when icon-container-size
+     {:width  icon-container-size
+      :height icon-container-size})
+   (when icon-background-color
+     {:background-color icon-background-color})
+   (when icon-container-rounded?
+     {:border-radius (/ (or icon-container-size icon-size) 2)})))
+
+(defn after-icon-style
+  [{:keys [override-margins size icon-container-size icon-background-color icon-container-rounded?
+           icon-size]}]
+  (merge
+   {:margin-left     (or (get override-margins :left) 4)
+    :margin-right    (or (get override-margins :right)
+                         (if (= size 40) 12 8))
+    :align-items     :center
+    :justify-content :center}
+   (when icon-container-size
+     {:width  icon-container-size
+      :height icon-container-size})
+   (when icon-background-color
+     {:background-color icon-background-color})
+   (when icon-container-rounded?
+     {:border-radius (/ (or icon-container-size icon-size) 2)})))
 
 (defn themes
   [customization-color]
@@ -179,7 +213,7 @@
                       24 8))})
 
 (defn style-container
-  [type size disabled background-color border-color icon above width before after blur-active?]
+  [{:keys [type size disabled background-color border-color icon above width before after blur-active?]}]
   (merge {:height             size
           :align-items        :center
           :justify-content    :center
@@ -228,132 +262,3 @@
             :border-width 1})
          (when disabled
            {:opacity 0.3})))
-
-(defn- button-internal
-  "with label
-   [button opts \"label\"]
-   opts
-   {:type   :primary/:secondary/:grey/:dark-grey/:outline/:ghost/
-            :danger/:photo-bg/:blur-bg/:blur-bg-outline/:shell/:community
-    :size   40 [default] /32/24
-    :icon   true/false
-    :community-color '#FFFFFF'
-    :community-text-color '#000000'
-    :before :icon-keyword
-    :after  :icon-keyword}
-
-   only icon
-   [button {:icon true} :i/close-circle]"
-  [_ _]
-  (let [pressed-in (reagent/atom false)]
-    (fn
-      [{:keys [on-press disabled type size before after above icon-secondary-no-color
-               width customization-color theme override-background-color pressed
-               on-long-press accessibility-label icon icon-no-color style inner-style test-ID
-               blur-active? override-before-margins override-after-margins icon-size icon-container-size
-               icon-container-rounded?]
-        :or   {type                :primary
-               size                40
-               customization-color :primary
-               blur-active?        true}}
-       children]
-      (let [{:keys [icon-color icon-secondary-color background-color label-color border-color blur-type
-                    blur-overlay-color icon-background-color]}
-            (get-in (themes customization-color)
-                    [theme type])
-            state (cond disabled                 :disabled
-                        (or @pressed-in pressed) :pressed
-                        :else                    :default)
-            blur-state (if blur-active? :blurred :default)
-            icon-size (or icon-size (when (= 24 size) 12))
-            icon-secondary-color (or icon-secondary-color icon-color)]
-        [rn/touchable-without-feedback
-         (merge {:test-ID             test-ID
-                 :disabled            disabled
-                 :accessibility-label accessibility-label
-                 :on-press-in         #(reset! pressed-in true)
-                 :on-press-out        #(reset! pressed-in nil)}
-                (when on-press
-                  {:on-press on-press})
-                (when on-long-press
-                  {:on-long-press on-long-press}))
-         [rn/view
-          {:style (merge
-                   (shape-style-container type icon size)
-                   {:width width}
-                   style)}
-          [rn/view
-           {:style (merge
-                    (style-container
-                     type
-                     size
-                     disabled
-                     (or override-background-color (get background-color state))
-                     (get border-color state)
-                     icon
-                     above
-                     width
-                     before
-                     after
-                     blur-active?)
-                    (when (= state :pressed) {:opacity 0.9})
-                    inner-style)}
-           (when (and (= type :blurred)
-                      blur-active?)
-             [blur/view
-              {:blur-radius   20
-               :blur-type     blur-type
-               :overlay-color blur-overlay-color
-               :style         style/blur-view}])
-           (when above
-             [rn/view
-              [quo2.icons/icon above
-               {:container-style {:margin-bottom 2}
-                :color           icon-secondary-color
-                :size            icon-size}]])
-           (when before
-             [rn/view
-              {:style (style/before-icon-style
-                       {:override-margins        override-before-margins
-                        :size                    size
-                        :icon-container-size     icon-container-size
-                        :icon-background-color   (get icon-background-color blur-state)
-                        :icon-container-rounded? icon-container-rounded?
-                        :icon-size               icon-size})}
-              [quo2.icons/icon before
-               {:color icon-secondary-color
-                :size  icon-size}]])
-           [rn/view
-            (cond
-              (or icon icon-no-color)
-              [quo2.icons/icon children
-               {:color    icon-color
-                :no-color icon-no-color
-                :size     icon-size}]
-
-              (string? children)
-              [text/text
-               {:size            (when (#{56 24} size) :paragraph-2)
-                :weight          :medium
-                :number-of-lines 1
-                :style           {:color label-color}}
-
-               children]
-
-              (vector? children)
-              children)]
-           (when after
-             [rn/view
-              {:style (style/after-icon-style
-                       {:override-margins        override-after-margins
-                        :size                    size
-                        :icon-container-size     icon-container-size
-                        :icon-background-color   (get icon-background-color blur-state)
-                        :icon-container-rounded? icon-container-rounded?
-                        :icon-size               icon-size})}
-              [quo2.icons/icon after
-               {:no-color icon-secondary-no-color
-                :color    icon-secondary-color
-                :size     icon-size}]])]]]))))
-
-(def button (theme/with-theme button-internal))