Add case for transparent

Signed-off-by: ibrkhalil <vampirekid017@gmail.com>

.babelrc

@@ -0,0 +1,8 @@
+{
+  "presets": [
+    "module:metro-react-native-babel-preset"
+  ],
+  "plugins": [
+    "react-native-reanimated/plugin"
+  ]
+}

.carve_ignore

@@ -200,7 +200,7 @@ status-im.utils.platform/isMacOs?
 status-im.utils.platform/isNix?
 status-im.utils.platform/isWin?
 status-im.utils.platform/android-version>=
-utils.debounce/clear-all
+status-im.utils.debounce/clear-all
 status-im.transport.db/create-chat
 status-im.utils.priority-map/priority-map
 status-im.utils.priority-map/priority-map-by

.clj-kondo/config.edn

@@ -1,20 +1,14 @@
-{:lint-as      {status-im.utils.views/defview      clojure.core/defn
-                status-im.utils.views/letsubs      clojure.core/let
-                reagent.core/with-let              clojure.core/let
-                utils.re-frame/defn                clj-kondo.lint-as/def-catch-all
-                quo.react/with-deps-check          clojure.core/fn
-                quo.previews.preview/list-comp     clojure.core/for
-                status-im.utils.styles/def         clojure.core/def
-                status-im.utils.styles/defn        clojure.core/defn
-                status-im.test-helpers/deftest-sub clojure.core/defn
-                taoensso.tufte/defnp               clojure.core/defn}
- :linters      {:consistent-alias  {:level   :error
-                                    :aliases {clojure.string  string
-                                              taoensso.timbre log}}
-                :invalid-arity     {:skip-args [utils.re-frame/defn]}
-                ;; TODO remove number when this is fixed
-                ;; https://github.com/borkdude/clj-kondo/issues/867
-                :unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY
-                                              number
-                                              status-im.test-helpers/restore-app-db]}}
- :config-in-ns {mocks.js-dependencies {:linters {:clojure-lsp/unused-public-var {:level :off}}}}}
+{:lint-as {status-im.utils.views/defview  clojure.core/defn
+           status-im.utils.views/letsubs  clojure.core/let
+           reagent.core/with-let          clojure.core/let
+           status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all
+           utils.re-frame/defn            clj-kondo.lint-as/def-catch-all
+           quo.react/with-deps-check      clojure.core/fn
+           quo.previews.preview/list-comp clojure.core/for
+           status-im.utils.styles/def     clojure.core/def
+           status-im.utils.styles/defn    clojure.core/defn
+           taoensso.tufte/defnp           clojure.core/defn}
+ :linters {: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
+           :unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY number]}}}

.env

@@ -4,7 +4,7 @@ DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -32,4 +32,3 @@ COMMANDS_ENABLED=1
 TWO_MINUTES_SYNCING=1
 SWAP_ENABLED=1
 STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1

.env.e2e

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.staging
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
@@ -32,4 +32,3 @@ COMMUNITIES_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
 STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1

.env.jenkins

@@ -3,7 +3,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -34,4 +34,3 @@ DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
 ENABLE_QUO_PREVIEW=1
 STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1

.env.nightly

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1

.env.release

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1

.gitignore

@@ -7,7 +7,6 @@
 
 # Xcode
 #
-/component-spec
 result/
 build/
 *.pbxuser
@@ -178,9 +177,4 @@ test/appium/tests/users.py
 /lib/
 
 ## visual tests
-/artifacts
-
-/.calva/
-
-## component-tests
-*.log
+/artifacts

.zprintrc

@@ -1,47 +0,0 @@
-;; -*- mode: clojure -*-
-;; vi: ft=clojure
-{:width     105
- :style     [;; community style
-             ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#community
-             :community
-
-             ;; no comma in map
-             :no-comma
-
-             :custom-justify
-
-             ;; respect all newlines
-             ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-nl
-             :respect-nl
-
-             ;; respect blank line
-             ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-bl
-             :respect-bl]
- :fn-map
- {"reg-sub"         :arg1-pair
-  "list-comp"       :binding
-  "defview"         :arg1-body
-  "letsubs"         :binding
-  "testing"         :arg1-body
-  "deftest-sub"     :arg1-body
-  "with-deps-check" :arg1-body
-  "ns"              [:arg1-body
-                     {:list   {:respect-nl? false}
-                      :vector {:respect-nl? false}}]
-  "->"              [:noarg1-body
-                     {:list               {:constant-pair? false :force-nl? false}
-                      :next-inner-restore [[:list :constant-pair?]]}]
-  "set!"            "reset!"
-  "assoc-when"      "assoc"
-  "assoc-some"      "assoc"
-  "conj-when"       "conj"
-  "conj-some"       "conj"}
- :remove    {:fn-force-nl #{:noarg1-body}}
- :style-map
- {:no-comma       {:map {:comma? false}}
-  :rj-var         {:pair {:justify {:max-variance 1000}}}
-  :custom-justify
-  {:doc     "Justify everything using pre-1.1.2 approach"
-   :binding {:justify? true :justify {:max-variance 1000}}
-   :map     {:justify? true :justify {:max-variance 1000}}
-   :pair    {:justify? true :justify {:max-variance 1000}}}}}

Makefile

@@ -285,20 +285,16 @@ endif
 # Tests
 #--------------
 
-lint: export TARGET := default
+lint: export TARGET := clojure
 lint: ##@test Run code style checks
 	sh scripts/lint-re-frame-in-quo-components.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
-	TARGETS=$$(git diff --diff-filter=d --cached --name-only | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn$$ || echo shadow-cljs.edn) && \
-	zprint '{:search-config? true}' -fc $$TARGETS
+	TARGETS=$$(git diff --diff-filter=d --cached --name-only src && echo src) && \
+	clojure -Scp "$$CLASS_PATH" -m cljfmt.main check --indents indentation.edn $$TARGETS
 
-lint-fix: export TARGET := default
+lint-fix: export TARGET := clojure
 lint-fix: ##@test Run code style checks and fix issues
-	TARGETS=$$(git diff --diff-filter=d --cached --name-only | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn$$ || echo shadow-cljs.edn) && \
-	clojure-lsp clean-ns --filenames $$(echo $$TARGETS | xargs | sed -e 's/ /,/g') && \
-	zprint '{:search-config? true}' -fw $$TARGETS && \
-	zprint '{:search-config? true}' -fw $$TARGETS
-
+	clojure -Scp "$$CLASS_PATH" -m cljfmt.main fix src --indents indentation.edn
 
 shadow-server: export TARGET := clojure
 shadow-server:##@ Start shadow-cljs in server mode for watching
@@ -309,17 +305,9 @@ test-watch: ##@ Watch tests and re-run no changes to cljs files
 	yarn install
 	nodemon --exec 'yarn shadow-cljs compile mocks && yarn shadow-cljs compile test && node --require ./test-resources/override.js target/test/test.js' -e cljs
 
-test-watch-for-repl: export TARGET := clojure
-test-watch-for-repl: ##@ Watch tests and support REPL connections
-	yarn install
-	rm -f target/test/test.js
-	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
-		'yarn shadow-cljs compile mocks && yarn shadow-cljs watch test --verbose' \
-		'until [ -f ./target/test/test.js ] ; do sleep 1 ; done ; node --require ./test-resources/override.js ./target/test/test.js --repl'
-
 test: export TARGET := clojure
 test: ##@test Run tests once in NodeJS
-	# Here we create the gyp bindings for nodejs
+	# Here we creates the gyp bindings for nodejs
 	yarn install
 	yarn shadow-cljs compile mocks && \
 	yarn shadow-cljs compile test && \
@@ -328,27 +316,14 @@ test: ##@test Run tests once in NodeJS
 
 run-visual-test-ios: export TARGET := clojure
 run-visual-test-ios: XCODE_DERIVED_DATA := $(HOME)/Library/Developer/Xcode/DerivedData
-run-visual-test-ios: APPLICATION_NAME := StatusIm-brfnruzfrkkycpbndmdoeyrigthc
+run-visual-test-ios: APPLICATION_NAME := $(shell ls $(XCODE_DERIVED_DATA) | grep -E '\bStatusIm-')
 run-visual-test-ios: export TEST_BINARY_PATH := $(XCODE_DERIVED_DATA)/$(APPLICATION_NAME)/Build/Products/Debug-iphonesimulator/StatusIm.app
 run-visual-test-ios: ##@test Run tests once in NodeJS
-	detox test --configuration ios.sim.debug
-
-component-test-watch: export TARGET := clojure
-component-test-watch: export COMPONENT_TEST := true
-component-test-watch: export BABEL_ENV := test
-component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 	yarn install
-	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js' -e cljs
-
-component-test: export TARGET := clojure
-component-test: export COMPONENT_TEST := true
-component-test: export BABEL_ENV := test
-component-test: ##@test Run tests once in NodeJS
-	# Here we create the gyp bindings for nodejs
-	yarn install
-	yarn shadow-cljs compile component-test && \
-	jest --config=test/jest/jest.config.js
+	detox build --configuration ios.sim.debug && \
+	detox test --configuration ios.sim.debug 
 
+#--------------
 # Other
 #--------------
 

babel.config.js

@@ -1,24 +0,0 @@
-module.exports = {
-
-    "presets": [
-        "module:metro-react-native-babel-preset"
-    ],
-    "plugins": [
-        "react-native-reanimated/plugin"
-    ],
-    "env": {
-        "test": {
-            "presets": [
-                '@babel/preset-react',
-                [
-                    '@babel/preset-env',
-                    {
-                        targets: {
-                            node: '14',
-                        },
-                    },
-                ],
-            ],
-        }
-    }
-}

ci/Jenkinsfile.android

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -36,7 +36,7 @@ pipeline {
     LANG     = "en_US.UTF-8"
     LC_ALL   = "en_US.UTF-8"
     LANGUAGE = "en_US.UTF-8"
-    TARGET   = "android${utils.isE2EBuild() ? "-e2e" : ""}"
+    TARGET   = 'android'
     BUILD_ENV = 'prod'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1

ci/Jenkinsfile.combined

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.nix-cache

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'
 
 pipeline {
   agent { label params.AGENT_LABEL }

ci/Jenkinsfile.tests

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/tests/Jenkinsfile.e2e-prs

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'
 
 pipeline {
   agent { label 'macos' }

ci/tools/Jenkinsfile.playstore-meta

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'
 
 pipeline {
   agent { label 'linux' }

doc/STARTING_GUIDE.md

@@ -93,6 +93,6 @@ To use a physical iPhone your device UDID must be added to provisioning profiles
   - Invite your Apple account to be Developer in Status team.
 3. Run a build in XCode using the project from `status-mobile/ios` directory.
   - You might see error: `Select a development team in the Signing & Capabilities editor`
-  - Select `Status Research & Development GmbH` as the development team and rebuild again.
+  - Select `STATUS HOLDINGS PTE. LTD.` as the development team and rebuild again.
 
 Once build finishes Status should start on your iPhone with its logs in terminal running `make run-metro`.

doc/decisions/0007-masking-sensitive-data.md

@@ -20,8 +20,6 @@ printed out by mistake in a log entry (see https://github.com/status-im/status-m
 To minimize the risk of leaking passwords through logs, we should not pass
 passwords as strings in our codebase. We introduced a new type `MaskedData` in
 `status-im.utils.security`.
-update (16-Dec-2022) `status-im.utils.security` is now moved over to `utils.security.core` 
-
 We use `(security/mask-data <data to hide>` to wrap sensitive data into this
 type and then use `(security/unmask <masked-data>)` to get the plaintext back.
 

doc/new-guidelines.md

@@ -62,31 +62,6 @@ with the source file using it. For a real example, see
     (do-something)]])
 ```
 
-#### Styles def vs defn
-
-Always use `def` over `defn`, unless the style relies on dynamic values, such as
-deref'ed atoms.
-
-```clojure
-;; bad
-(defn title-column []
-  {:height 56})
-
-;; good
-(def title-column
-  {:height 56})
-```
-
-```clojure
-;; bad
-(def community-card
-  {:background-color (colors/theme-colors colors/white colors/neutral-90)})
-
-;; good
-(defn community-card []
-  {:background-color (colors/theme-colors colors/white colors/neutral-90)})
-```
-
 ### Using TODOs comments
 
 _TODO_ comments are used extensively in the codebase, but prefer to use them
@@ -274,22 +249,6 @@ test macros `deftest` and `is`, which are ubiquitous in the Clojure community.
   (:require [cljs-time.coerce :as time.coerce]))
 ```
 
-### Javascript interop
-
-Use [binaryage/oops](https://github.com/binaryage/cljs-oops) macros instead of
-core interop macros.
-
-```clojure
-;; bad
-(fn [^js event]
-  (.-width (.-nativeEvent event)))
-
-;; good
-(require '[oops.core :as  oops])
-(fn [event]
-  (oops/oget event "nativeEvent.width"))
-```
-
 ### Accessibility labels
 
 Use keywords instead of strings. As a bonus, remember keywords are cached in
@@ -337,53 +296,6 @@ keywords and concatenating them into a single string.
 (i18n/label :t/biometric-auth-error {:code error-code})
 ```
 
-### Tests
-#### Subscription tests
-
-Test [layer-3 subscriptions](https://day8.github.io/re-frame/subscriptions/) by
-actually subscribing to them, so reframe's signal graph gets validated too.
-
-```clojure
-;; bad
-(defn user-recipes
-  [[current-user all-recipes location]]
-  ...)
-
-(re-frame/reg-sub
- :user/recipes
- :<- [:current-user]
- :<- [:all-recipes]
- :<- [:location]
- user-recipes)
-
-(deftest user-recipes-test
-  (testing "builds list of recipes"
-    (let [current-user {...}
-          all-recipes  {...}
-          location     [...]]
-      (is (= expected (recipes [current-user all-recipes location]))))))
-
-;; good
-(require '[status-im.test-helpers :as h])
-
-(re-frame/reg-sub
- :user/recipes
- :<- [:current-user]
- :<- [:all-recipes]
- :<- [:location]
- (fn [[current-user all-recipes location]]
-   ...))
-
-(h/deftest-sub :user/recipes
-  [sub-name]
-  (testing "builds list of recipes"
-    (swap! rf-db/app-db assoc
-           :current-user {...}
-           :all-recipes {...}
-           :location [...])
-    (is (= expected (rf/sub [sub-name])))))
-```
-
 ## Project Structure
 
 First, the bird's-eye view with some example ClojureScript files:

indentation.edn

@@ -0,0 +1 @@
+{letsubs [[:inner 0]]}

ios/StatusIm.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -319,6 +319,7 @@
 				FBF6AB84EBC2085D28C3CDEF /* Pods-Status-StatusImPR.debug.xcconfig */,
 				BF23313BEFBC84C6BB7E7677 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
+			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -400,12 +401,12 @@
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
-						DevelopmentTeam = 8B5X2M6H2Y;
+						DevelopmentTeam = DTX7Z4U3YA;
 						ProvisioningStyle = Manual;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
-						DevelopmentTeam = 8B5X2M6H2Y;
+						DevelopmentTeam = DTX7Z4U3YA;
 						LastSwiftMigration = 1140;
 						ProvisioningStyle = Manual;
 						SystemCapabilities = {
@@ -424,7 +425,7 @@
 						};
 					};
 					3AAD2AB924A3A60E0075D594 = {
-						DevelopmentTeam = 8B5X2M6H2Y;
+						DevelopmentTeam = DTX7Z4U3YA;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -756,7 +757,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -767,11 +768,7 @@
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -794,18 +791,14 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -825,12 +818,12 @@
 				BUNDLE_ID_SUFFIX = .debug;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -864,11 +857,7 @@
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					/usr/lib/swift,
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -899,12 +888,12 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
@@ -930,11 +919,7 @@
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					/usr/lib/swift,
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -968,7 +953,7 @@
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -999,11 +984,7 @@
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					/usr/lib/swift,
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -1015,7 +996,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr;
 				PRODUCT_NAME = "Status PR";
-				PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum.pr";
+				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum.pr";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -1032,12 +1013,12 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -1062,11 +1043,7 @@
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					/usr/lib/swift,
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -1119,7 +1096,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1202,7 +1179,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

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

@@ -1,78 +0,0 @@
-package im.status.ethereum.module;
-
-import android.view.ActionMode;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.UIBlock;
-import com.facebook.react.uimanager.UIManagerModule;
-import com.facebook.react.views.textinput.ReactEditText;
-import javax.annotation.Nonnull;
-
-class RNSelectableTextInputModule extends ReactContextBaseJavaModule {
-
-    private ActionMode lastActionMode;
-
-    public RNSelectableTextInputModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @Nonnull
-    @Override
-    public String getName() {
-        return "RNSelectableTextInputManager";
-    }
-
-    @ReactMethod
-    public void setupMenuItems(final Integer selectableTextViewReactTag, final Integer textInputReactTag) {
-        ReactApplicationContext reactContext = this.getReactApplicationContext();
-        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-        uiManager.addUIBlock(new UIBlock() {
-            public void execute (NativeViewHierarchyManager nvhm) {
-                RNSelectableTextInputViewManager rnSelectableTextManager = (RNSelectableTextInputViewManager) nvhm.resolveViewManager(selectableTextViewReactTag);
-                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
-                rnSelectableTextManager.registerSelectionListener(reactTextView);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void startActionMode(final Integer textInputReactTag) {
-        ReactApplicationContext reactContext = this.getReactApplicationContext();
-        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-        uiManager.addUIBlock(new UIBlock() {
-            public void execute (NativeViewHierarchyManager nvhm) {
-                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
-                lastActionMode = reactTextView.startActionMode(reactTextView.getCustomSelectionActionModeCallback(), ActionMode.TYPE_FLOATING);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void hideLastActionMode(){
-        ReactApplicationContext reactContext = this.getReactApplicationContext();
-        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-        uiManager.addUIBlock(new UIBlock() {
-            public void execute (NativeViewHierarchyManager nvhm) {
-                if(lastActionMode!=null){
-                    lastActionMode.finish();
-                    lastActionMode = null;
-                }
-            }
-        });
-    }
-
-    @ReactMethod
-    public void setSelection(final Integer textInputReactTag, final Integer start, final Integer end){
-        ReactApplicationContext reactContext = this.getReactApplicationContext();
-        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-        uiManager.addUIBlock(new UIBlock() {
-            public void execute (NativeViewHierarchyManager nvhm) {
-                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
-                reactTextView.setSelection(start, end);
-            }
-        });
-    }
- 
-}

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

@@ -1,102 +0,0 @@
-package im.status.ethereum.module;
-
-import android.view.ActionMode;
-import android.view.ActionMode.Callback;
-import android.view.Menu;
-import android.view.MenuItem;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.facebook.react.views.textinput.ReactEditText;
-import com.facebook.react.views.view.ReactViewGroup;
-import com.facebook.react.views.view.ReactViewManager;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class RNSelectableTextInputViewManager extends ReactViewManager {
-    public static final String REACT_CLASS = "RNSelectableTextInput";
-    private String[] _menuItems = new String[0];
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    public ReactViewGroup createViewInstance(ThemedReactContext context) {
-        return new ReactViewGroup(context);
-    }
-
-    @ReactProp(name = "menuItems")
-    public void setMenuItems(ReactViewGroup reactViewGroup, ReadableArray items) {
-        if(items != null) {
-            List<String> result = new ArrayList<String>(items.size());
-            for (int i = 0; i < items.size(); i++) {
-                result.add(items.getString(i));
-            }
-            this._menuItems = result.toArray(new String[items.size()]);
-        }
-    }
-
-    public void registerSelectionListener(final ReactEditText view) {
-        view.setCustomSelectionActionModeCallback(new Callback() {
-            @Override
-            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                menu.clear();
-                for (int i = 0; i < _menuItems.length; i++) {
-                    menu.add(0, i, 0, _menuItems[i]);
-                }
-                return true;
-            }
-
-            @Override
-            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                return true;
-            }
-
-            @Override
-            public void onDestroyActionMode(ActionMode mode) {
-            }
-
-            @Override
-            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                int selectionStart = view.getSelectionStart();
-                int selectionEnd = view.getSelectionEnd();
-                String selectedText = view.getText().toString().substring(selectionStart, selectionEnd);
-
-                // Dispatch event
-                onSelectNativeEvent(view, item.getItemId(), selectedText, selectionStart, selectionEnd);
-
-                mode.finish();
-
-                return true;
-            }
-
-        });
-    }
-
-    public void onSelectNativeEvent(ReactEditText view, int eventType, String content, int selectionStart, int selectionEnd) {
-        WritableMap event = Arguments.createMap();
-        event.putInt("eventType", eventType);
-        event.putString("content", content);
-        event.putInt("selectionStart", selectionStart);
-        event.putInt("selectionEnd", selectionEnd);
-
-        // Dispatch
-        ReactContext reactContext = (ReactContext) view.getContext();
-        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(view.getId(), "topSelection", event);
-    }
-
-    @Override
-    public Map getExportedCustomDirectEventTypeConstants() {
-        return MapBuilder.builder()
-                         .put("topSelection", MapBuilder.of("registrationName","onSelection"))
-                         .build();
-    }
-}

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

@@ -940,52 +940,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         StatusThreadPoolExecutor.getInstance().execute(r);
     }
 
-    @ReactMethod
-    public void getConnectionStringForBootstrappingAnotherDevice(final String configJSON, final Callback callback) throws JSONException {
-         final JSONObject jsonConfig = new JSONObject(configJSON);
-         final String keyUID = jsonConfig.getString("keyUID");
-         final String keyStorePath = this.getKeyStorePath(keyUID);
-         jsonConfig.put("keystorePath", keyStorePath);
-
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable runnableTask = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.getConnectionStringForBootstrappingAnotherDevice(jsonConfig.toString());
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
-    }
-
-    @ReactMethod
-    public void inputConnectionStringForBootstrapping(final String connectionString, final String configJSON, final Callback callback) throws JSONException {
-         final JSONObject jsonConfig = new JSONObject(configJSON);
-         final String keyStorePath = pathCombine(this.getNoBackupDirectory(), "/keystore");
-         jsonConfig.put("keystorePath", keyStorePath);
-
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable runnableTask = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.inputConnectionStringForBootstrapping(connectionString,jsonConfig.toString());
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
-    }
-
-
     @ReactMethod
     public void hashTypedData(final String data, final Callback callback) {
         Log.d(TAG, "hashTypedData");

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

@@ -7,7 +7,6 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -30,15 +29,12 @@ public class StatusPackage implements ReactPackage {
         List<NativeModule> modules = new ArrayList<>();
 
         modules.add(new StatusModule(reactContext, this.rootedDevice));
-        modules.add(new RNSelectableTextInputModule(reactContext));
 
         return modules;
     }
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Arrays.<ViewManager>asList(
-                new RNSelectableTextInputViewManager()
-        );
+        return Collections.emptyList();
     }
 }

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

@@ -90,25 +90,26 @@ static RCTBridge *bridge;
 
 RCT_EXPORT_MODULE();
 
+////////////////////////////////////////////////////////////////////
 #pragma mark - shouldMoveToInternalStorage
-
+//////////////////////////////////////////////////////////////////// shouldMoveToInternalStorage
 RCT_EXPORT_METHOD(shouldMoveToInternalStorage:(RCTResponseSenderBlock)onResultCallback) {
     // Android only
     onResultCallback(@[[NSNull null]]);
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - moveToInternalStorage
-
+//////////////////////////////////////////////////////////////////// moveToInternalStorage
 RCT_EXPORT_METHOD(moveToInternalStorage:(RCTResponseSenderBlock)onResultCallback) {
     // Android only
     onResultCallback(@[[NSNull null]]);
 }
 
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - InitKeystore method
-
+//////////////////////////////////////////////////////////////////// StopNode
 RCT_EXPORT_METHOD(initKeystore:(NSString *)keyUID
                       callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -131,9 +132,9 @@ RCT_EXPORT_METHOD(initKeystore:(NSString *)keyUID
                    });
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - SendLogs method
-
+//////////////////////////////////////////////////////////////////// sendLogs
 RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
                   jsLogs:(NSString *)jsLogs
                   callback:(RCTResponseSenderBlock)callback) {
@@ -195,6 +196,7 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
     callback(@[zipFile.absoluteString]);
 }
 
+//////////////////////////////////////////////////////////////////// addPeer
 RCT_EXPORT_METHOD(exportLogs:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"exportLogs() method called");
@@ -203,6 +205,7 @@ RCT_EXPORT_METHOD(exportLogs:(RCTResponseSenderBlock)callback) {
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// addPeer
 RCT_EXPORT_METHOD(addPeer:(NSString *)enode
                   callback:(RCTResponseSenderBlock)callback) {
   NSString *result = StatusgoAddPeer(enode);
@@ -212,6 +215,7 @@ RCT_EXPORT_METHOD(addPeer:(NSString *)enode
 #endif
 }
 
+//////////////////////////////////////////////////////////////////// multiAccountImportPrivateKey
 RCT_EXPORT_METHOD(deleteMultiaccount:(NSString *)keyUID
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -222,6 +226,7 @@ RCT_EXPORT_METHOD(deleteMultiaccount:(NSString *)keyUID
     callback(@[result]);
 }
 
+////////////////////////////////////verify//////////////////////////////// multiAccountImportPrivateKey
 RCT_EXPORT_METHOD(deleteImportedKey:(NSString *)keyUID
                   address:(NSString *)address
                   password:(NSString *)password
@@ -234,6 +239,7 @@ RCT_EXPORT_METHOD(deleteImportedKey:(NSString *)keyUID
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// multiAccountGenerateAndDeriveAddresses
 RCT_EXPORT_METHOD(multiAccountGenerateAndDeriveAddresses:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -243,6 +249,7 @@ RCT_EXPORT_METHOD(multiAccountGenerateAndDeriveAddresses:(NSString *)json
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// MultiAccountStoreAccount
 RCT_EXPORT_METHOD(multiAccountStoreAccount:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -252,6 +259,7 @@ RCT_EXPORT_METHOD(multiAccountStoreAccount:(NSString *)json
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// MultiAccountLoadAccount
 RCT_EXPORT_METHOD(multiAccountLoadAccount:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -261,6 +269,7 @@ RCT_EXPORT_METHOD(multiAccountLoadAccount:(NSString *)json
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// MultiAccountReset
 RCT_EXPORT_METHOD(multiAccountReset:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"MultiAccountReset() method called");
@@ -269,6 +278,7 @@ RCT_EXPORT_METHOD(multiAccountReset:(RCTResponseSenderBlock)callback) {
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// multiAccountStoreDerived
 RCT_EXPORT_METHOD(multiAccountStoreDerived:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -278,6 +288,7 @@ RCT_EXPORT_METHOD(multiAccountStoreDerived:(NSString *)json
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// multiAccountImportPrivateKey
 RCT_EXPORT_METHOD(multiAccountImportPrivateKey:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -287,6 +298,7 @@ RCT_EXPORT_METHOD(multiAccountImportPrivateKey:(NSString *)json
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// hashTransaction
 RCT_EXPORT_METHOD(hashTransaction:(NSString *)txArgsJSON
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -296,6 +308,7 @@ RCT_EXPORT_METHOD(hashTransaction:(NSString *)txArgsJSON
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// hashMessage
 RCT_EXPORT_METHOD(hashMessage:(NSString *)message
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -305,40 +318,7 @@ RCT_EXPORT_METHOD(hashMessage:(NSString *)message
     callback(@[result]);
 }
 
-RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)configJSON
-                  callback:(RCTResponseSenderBlock)callback) {
-
-    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
-    NSDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil];
-    NSString *keyUID = [configDict objectForKey:@"keyUID"];
-    NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID];
-    NSString *keystoreDir = multiaccountKeystoreDir.path;
-
-    [configDict setValue:keystoreDir forKey:@"keystorePath"];
-    NSString *modifiedConfigJSON = [configDict bv_jsonStringWithPrettyPrint:NO];
-
-    NSString *result = StatusgoGetConnectionStringForBootstrappingAnotherDevice(modifiedConfigJSON);
-    callback(@[result]);
-}
-
-RCT_EXPORT_METHOD(inputConnectionStringForBootstrapping:(NSString *)cs
-                  configJSON:(NSString *)configJSON
-                  callback:(RCTResponseSenderBlock)callback) {
-
-    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
-    NSDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil];
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
-    NSURL *multiaccountKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
-    NSString *keystoreDir = multiaccountKeystoreDir.path;
-
-    [configDict setValue:keystoreDir forKey:@"keystorePath"];
-    NSString *modifiedConfigJSON = [configDict bv_jsonStringWithPrettyPrint:NO];
-
-    NSString *result = StatusgoInputConnectionStringForBootstrapping(cs,modifiedConfigJSON);
-    callback(@[result]);
-}
-
+//////////////////////////////////////////////////////////////////// hashTypedData
 RCT_EXPORT_METHOD(hashTypedData:(NSString *)data
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -348,6 +328,7 @@ RCT_EXPORT_METHOD(hashTypedData:(NSString *)data
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// hashTypedDataV4
 RCT_EXPORT_METHOD(hashTypedDataV4:(NSString *)data
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -357,6 +338,7 @@ RCT_EXPORT_METHOD(hashTypedDataV4:(NSString *)data
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// sendTransactionWithSignature
 RCT_EXPORT_METHOD(sendTransactionWithSignature:(NSString *)txArgsJSON
                   signature:(NSString *)signature
                   callback:(RCTResponseSenderBlock)callback) {
@@ -367,6 +349,7 @@ RCT_EXPORT_METHOD(sendTransactionWithSignature:(NSString *)txArgsJSON
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// multiAccountImportMnemonic
 RCT_EXPORT_METHOD(multiAccountImportMnemonic:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -376,6 +359,7 @@ RCT_EXPORT_METHOD(multiAccountImportMnemonic:(NSString *)json
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// multiAccountDeriveAddresses
 RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -395,6 +379,7 @@ RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
     return [json valueForKey:@"key-uid"];
 }
 
+//////////////////////////////////////////////////////////////////// prepareDirAndUpdateConfig
 -(NSString *) prepareDirAndUpdateConfig:(NSString *)config
                              withKeyUID:(NSString *)keyUID {
     NSFileManager *fileManager = [NSFileManager defaultManager];
@@ -467,6 +452,7 @@ RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
 }
 
 
+//////////////////////////////////////////////////////////////////// prepareDirAndUpdateConfig
 RCT_EXPORT_METHOD(prepareDirAndUpdateConfig:(NSString *)keyUID
                                      config:(NSString *)config
                                    callback:(RCTResponseSenderBlock)callback) {
@@ -478,6 +464,7 @@ RCT_EXPORT_METHOD(prepareDirAndUpdateConfig:(NSString *)keyUID
     callback(@[updatedConfig]);
 }
 
+//////////////////////////////////////////////////////////////////// saveAccountAndLogin
 RCT_EXPORT_METHOD(saveAccountAndLogin:(NSString *)multiaccountData
                   password:(NSString *)password
                   settings:(NSString *)settings
@@ -494,6 +481,7 @@ RCT_EXPORT_METHOD(saveAccountAndLogin:(NSString *)multiaccountData
     NSLog(@"%@", result);
 }
 
+//////////////////////////////////////////////////////////////////// saveAccountAndLoginWithKeycard
 RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
                   password:(NSString *)password
                   settings:(NSString *)settings
@@ -514,11 +502,11 @@ RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
 - (NSString *) getExportDbFilePath {
     NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"export.db"];
     NSFileManager *fileManager = [NSFileManager defaultManager];
-
+    
     if ([fileManager fileExistsAtPath:filePath]) {
         [fileManager removeItemAtPath:filePath error:nil];
     }
-
+    
     return filePath;
 }
 
@@ -555,6 +543,7 @@ RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
     }
 }
 
+//////////////////////////////////////////////////////////////////// login
 RCT_EXPORT_METHOD(login:(NSString *)accountData
                   password:(NSString *)password) {
 #if DEBUG
@@ -566,6 +555,7 @@ RCT_EXPORT_METHOD(login:(NSString *)accountData
     NSLog(@"%@", result);
 }
 
+//////////////////////////////////////////////////////////////////// loginWithConfig
 RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData
                   password:(NSString *)password
                   configJSON:(NSString *)configJSON) {
@@ -578,6 +568,7 @@ RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData
     NSLog(@"%@", result);
 }
 
+//////////////////////////////////////////////////////////////////// loginWithKeycard
 RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
                   password:(NSString *)password
                   chatKey:(NSString *)chatKey) {
@@ -592,6 +583,7 @@ RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
     NSLog(@"%@", result);
 }
 
+//////////////////////////////////////////////////////////////////// logout
 RCT_EXPORT_METHOD(logout) {
 #if DEBUG
     NSLog(@"Logout() method called");
@@ -601,6 +593,7 @@ RCT_EXPORT_METHOD(logout) {
     NSLog(@"%@", result);
 }
 
+//////////////////////////////////////////////////////////////////// openAccounts
 RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"OpenAccounts() method called");
@@ -614,6 +607,7 @@ RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// verityAccountPassword
 RCT_EXPORT_METHOD(verify:(NSString *)address
                   password:(NSString *)password
                   callback:(RCTResponseSenderBlock)callback) {
@@ -630,6 +624,7 @@ RCT_EXPORT_METHOD(verify:(NSString *)address
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// verifyDatabasePassword
 RCT_EXPORT_METHOD(verifyDatabasePassword:(NSString *)keyUID
                   password:(NSString *)password
                   callback:(RCTResponseSenderBlock)callback) {
@@ -640,6 +635,7 @@ RCT_EXPORT_METHOD(verifyDatabasePassword:(NSString *)keyUID
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// changeDatabasePassword
 RCT_EXPORT_METHOD(reEncryptDbAndKeystore:(NSString *)keyUID
                   currentPassword:(NSString *)currentPassword
                   newPassword:(NSString *)newPassword
@@ -652,6 +648,7 @@ RCT_EXPORT_METHOD(reEncryptDbAndKeystore:(NSString *)keyUID
     callback(@[result]);
 }
 
+//////////////////////////////////////////////////////////////////// convertToKeycardAccount
 RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
                   accountData:(NSString *)accountData
                   settings:(NSString *)settings
@@ -666,9 +663,9 @@ RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
     callback(@[result]);
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - SendTransaction
-
+//////////////////////////////////////////////////////////////////// sendTransaction
 RCT_EXPORT_METHOD(sendTransaction:(NSString *)txArgsJSON
                   password:(NSString *)password
                   callback:(RCTResponseSenderBlock)callback) {
@@ -679,9 +676,9 @@ RCT_EXPORT_METHOD(sendTransaction:(NSString *)txArgsJSON
     callback(@[result]);
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - SignMessage
-
+//////////////////////////////////////////////////////////////////// signMessage
 RCT_EXPORT_METHOD(signMessage:(NSString *)message
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -691,9 +688,9 @@ RCT_EXPORT_METHOD(signMessage:(NSString *)message
     callback(@[result]);
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - Recover
-
+//////////////////////////////////////////////////////////////////// recover
 RCT_EXPORT_METHOD(recover:(NSString *)message
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -703,9 +700,9 @@ RCT_EXPORT_METHOD(recover:(NSString *)message
     callback(@[result]);
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - SignTypedData
-
+//////////////////////////////////////////////////////////////////// signTypedData
 RCT_EXPORT_METHOD(signTypedData:(NSString *)data
                   account:(NSString *)account
                   password:(NSString *)password
@@ -717,9 +714,9 @@ RCT_EXPORT_METHOD(signTypedData:(NSString *)data
     callback(@[result]);
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - SignTypedDataV4
-
+//////////////////////////////////////////////////////////////////// signTypedDataV4
 RCT_EXPORT_METHOD(signTypedDataV4:(NSString *)data
                   account:(NSString *)account
                   password:(NSString *)password
@@ -731,9 +728,9 @@ RCT_EXPORT_METHOD(signTypedDataV4:(NSString *)data
     callback(@[result]);
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - SignGroupMembership
-
+//////////////////////////////////////////////////////////////////// signGroupMembership
 RCT_EXPORT_METHOD(signGroupMembership:(NSString *)content
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -743,9 +740,9 @@ RCT_EXPORT_METHOD(signGroupMembership:(NSString *)content
     callback(@[result]);
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - ExtractGroupMembershipSignatures
-
+//////////////////////////////////////////////////////////////////// extractGroupMembershipSignatures
 RCT_EXPORT_METHOD(extractGroupMembershipSignatures:(NSString *)content
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -755,9 +752,9 @@ RCT_EXPORT_METHOD(extractGroupMembershipSignatures:(NSString *)content
     callback(@[result]);
 }
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - GetNodeConfig
-
+//////////////////////////////////////////////////////////////////// getNodeConfig
 RCT_EXPORT_METHOD(getNodeConfig:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"GetNodeConfig() method called");
@@ -767,9 +764,9 @@ RCT_EXPORT_METHOD(getNodeConfig:(RCTResponseSenderBlock)callback) {
 }
 
 
-
+////////////////////////////////////////////////////////////////////
 #pragma mark - only android methods
-
+////////////////////////////////////////////////////////////////////
 RCT_EXPORT_METHOD(setAdjustResize) {
 #if DEBUG
     NSLog(@"setAdjustResize() works only on Android");
@@ -960,10 +957,10 @@ RCT_EXPORT_METHOD(exportUnencryptedDatabase:(NSString *)accountData
 #if DEBUG
     NSLog(@"exportUnencryptedDatabase() method called");
 #endif
-
+    
     NSString *filePath = [self getExportDbFilePath];
     StatusgoExportUnencryptedDatabase(accountData, password, filePath);
-
+    
     callback(@[filePath]);
 }
 
@@ -998,7 +995,7 @@ RCT_EXPORT_METHOD(deactivateKeepAwake)
     });
 }
 
-#pragma mark - deviceinfo
+//// deviceinfo
 
 - (bool) is24Hour
 {

nix/deps/clojure/deps.json

@@ -51,45 +51,6 @@
     }
   },
 
-  {
-    "path": "borkdude/edamame/0.0.11-alpha.28/edamame-0.0.11-alpha.28",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "488f403591739aab5a68ce6e7f82c0e855c23fd6",
-      "sha256": "1cw712kzza733g55s02ql35q630zd8j8nmnpivcczjkg240jans4"
-    },
-    "jar": {
-      "sha1": "371f3e232e7fdb04b7b2044825eb9822280e8f93",
-      "sha256": "1iyxq6jypjd875cgdyllknh27mx5fnkyjz80mr927d5i94r0ywj4"
-    }
-  },
-
-  {
-    "path": "borkdude/sci.impl.reflector/0.0.1/sci.impl.reflector-0.0.1",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "eb3aff6c7db85d91f7e05b98e06d1354a4fce36c",
-      "sha256": "1bvr7cvpbvqi7swypzpbfrig16zipwvmg4m47y2x5chs5czwxv15"
-    },
-    "jar": {
-      "sha1": "33dfc86102e0ea400498cbca47572459c1c43b00",
-      "sha256": "0a5gxmj8kzc01y9bn7l4x7c1v5q9wcbvw5hdr525d3ylsyl6xfkw"
-    }
-  },
-
-  {
-    "path": "borkdude/sci/0.2.1-alpha.1/sci-0.2.1-alpha.1",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "516cb8e3a8e430d59d9c3e7a51f9f859e3b249e0",
-      "sha256": "1nrww29m90q1avaahw7i5418c18crc3cidhbg3ml7h7vjjplsl9y"
-    },
-    "jar": {
-      "sha1": "96e39dcbc3fb3a41c6bf2e628303cf0f534b28a3",
-      "sha256": "1cjvz85ls982rmx90igv4mcfaa53fj5z29df9mf4jplyig3l9dxb"
-    }
-  },
-
   {
     "path": "cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3",
     "host": "https://repo.clojars.org",
@@ -117,15 +78,15 @@
   },
 
   {
-    "path": "clj-stacktrace/clj-stacktrace/0.2.8/clj-stacktrace-0.2.8",
+    "path": "cljfmt/cljfmt/0.6.7/cljfmt-0.6.7",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "c5a47e6858344c9fd42eecafc7920a7a18d6126d",
-      "sha256": "1az0fs9k5xvzl8bz564apd77kqc83nl8sxsrvmswmbmkamvy4hd3"
+      "sha1": "3d7ac9112908c9c9349adc056d1d06ae2cd33c21",
+      "sha256": "1q46q43mykn61f032y5734j84gcjca41pwd3iik9xghnzmphy2mn"
     },
     "jar": {
-      "sha1": "b0654b98763199ee57182526465d823492d1cc3f",
-      "sha256": "1029wd82qyxv6ji9pd38m32nqia56h6845lqv4ym4dsz5i201g9a"
+      "sha1": "91e8afa2c19db72acdef7f881aad905871ba6e69",
+      "sha256": "0ara83gaqnafjgr2aqz5zqmywdsmhsz483xkkxpiwbn9lfqvidmh"
     }
   },
 
@@ -143,15 +104,15 @@
   },
 
   {
-    "path": "cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0",
+    "path": "cljsjs/react/17.0.1-0/react-17.0.1-0",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "ff154f318e1f63061b5bd42d9a38fc8547360cb4",
-      "sha256": "166ynlrph7rx3nql0c85c37vcbcsnwbjamk71hw74rz451pgnncr"
+      "sha1": "d5d3681281585d981375fe7bb29362bfcd0d4449",
+      "sha256": "0rskh6mfq5h0l0wybs68w9v585a6zlnnfgrvsf5k3h51fk2p28da"
     },
     "jar": {
-      "sha1": "d5c53eca9f3884402c76268b82e3828223dcbf90",
-      "sha256": "1530hwqpxzxfjm6dy77whqwjzzx79jpnd9xvnkxy1lnk7l7lj494"
+      "sha1": "726da8a9305a865df90d81e9a8d58f87ff0ee8bd",
+      "sha256": "0bfmvw8gk98vdf9azll6041r1jaz1pmb0dyb35cfc8dr3mmr4ag7"
     }
   },
 
@@ -169,15 +130,15 @@
   },
 
   {
-    "path": "cljsjs/react/17.0.1-0/react-17.0.1-0",
+    "path": "cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "d5d3681281585d981375fe7bb29362bfcd0d4449",
-      "sha256": "0rskh6mfq5h0l0wybs68w9v585a6zlnnfgrvsf5k3h51fk2p28da"
+      "sha1": "ff154f318e1f63061b5bd42d9a38fc8547360cb4",
+      "sha256": "166ynlrph7rx3nql0c85c37vcbcsnwbjamk71hw74rz451pgnncr"
     },
     "jar": {
-      "sha1": "726da8a9305a865df90d81e9a8d58f87ff0ee8bd",
-      "sha256": "0bfmvw8gk98vdf9azll6041r1jaz1pmb0dyb35cfc8dr3mmr4ag7"
+      "sha1": "d5c53eca9f3884402c76268b82e3828223dcbf90",
+      "sha256": "1530hwqpxzxfjm6dy77whqwjzzx79jpnd9xvnkxy1lnk7l7lj494"
     }
   },
 
@@ -311,6 +272,32 @@
     }
   },
 
+  {
+    "path": "com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "7d5e372ff32c90095800f96d8308c41af0285a41",
+      "sha256": "1dj7p0m0kwnjvy1y3kq63zb6bw0azjf79i5xbccmy3wv63b1vqrg"
+    },
+    "jar": {
+      "sha1": "7e060dd5b19431e6d198e91ff670644372f60fbd",
+      "sha256": "1hn5plp7iyl626h8mrra56sysfm2qannj1dapr1m5afwkb24vfk1"
+    }
+  },
+
+  {
+    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "5e902aae26ac5c36f6420f689f43333129dd69e2",
+      "sha256": "10vzlnl8vbjv2jqf818wdb7kgy9c6qjka7fjmmi3vdpg1mcn6pv6"
+    },
+    "jar": {
+      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
+      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
+    }
+  },
+
   {
     "path": "com/google/elemental2/elemental2-core/1.0.0-RC1/elemental2-core-1.0.0-RC1",
     "host": "https://repo1.maven.org/maven2",
@@ -441,19 +428,6 @@
     }
   },
 
-  {
-    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "5e902aae26ac5c36f6420f689f43333129dd69e2",
-      "sha256": "10vzlnl8vbjv2jqf818wdb7kgy9c6qjka7fjmmi3vdpg1mcn6pv6"
-    },
-    "jar": {
-      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
-      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
-    }
-  },
-
   {
     "path": "com/ibm/icu/icu4j/66.1/icu4j-66.1",
     "host": "https://repo1.maven.org/maven2",
@@ -467,6 +441,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",
@@ -545,58 +571,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",
@@ -675,19 +649,6 @@
     }
   },
 
-  {
-    "path": "hashp/hashp/0.2.1/hashp-0.2.1",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "32530b9106a64fd5442d2aa27c6da4175d1f1440",
-      "sha256": "1z94k8c52r87rq3nhc0mqazcxff6d4phi8gy1bgndhiz4nq1mia7"
-    },
-    "jar": {
-      "sha1": "fb501db2eb4a028c1875382d58c17c381aec47b8",
-      "sha256": "1lwirzb60zvksvkb3arpwi4fk1xnp0x5ljmrca5vf7dq25lmwmsd"
-    }
-  },
-
   {
     "path": "hiccup/hiccup/1.0.5/hiccup-1.0.5",
     "host": "https://repo.clojars.org",
@@ -818,32 +779,6 @@
     }
   },
 
-  {
-    "path": "mvxcvi/arrangement/1.2.0/arrangement-1.2.0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "4f19bd291595870162eadd35456a0b2e76444a64",
-      "sha256": "1qqnl05nwcjnzhlgplcsbckrp8pqvf8n6bf8kr8rz7lz2q4px3vb"
-    },
-    "jar": {
-      "sha1": "036e640bb9e14c2aa95589a45a018eb8358ce3f6",
-      "sha256": "1m3v1rkpdmv7aym5vq2swh0mf9mg7xppdr3vrl4g6qm3s42c24b7"
-    }
-  },
-
-  {
-    "path": "mvxcvi/puget/1.3.1/puget-1.3.1",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "07104dc20a13c7e255fffee4f16de9a6873c187f",
-      "sha256": "1129rb3qksg7n85j03k6d3sr6868g724097vxids1r4wqj2phxkf"
-    },
-    "jar": {
-      "sha1": "a4f7dcf71ccd8d69d4ecd2b19f3d671dfc169308",
-      "sha256": "029znh7p8f1h91gri4jhzwqsa0rnn3i34yr3kav55npym2sw5sfp"
-    }
-  },
-
   {
     "path": "net/cgrand/macrovich/0.2.1/macrovich-0.2.1",
     "host": "https://repo.clojars.org",
@@ -949,15 +884,15 @@
   },
 
   {
-    "path": "org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2",
+    "path": "org/clojure/core.rrb-vector/0.1.1/core.rrb-vector-0.1.1",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "e9336ac820c5a7e07fe0aa431df981cbab6db3e3",
-      "sha256": "07q9qmxc7ggaxh27imgs34svn4j269rhslbnrs63ahrqzk5bmqlf"
+      "sha1": "3231642aa1dcf628c864a5f208cd293fbd6a385a",
+      "sha256": "18kk5sds5lg8r2kidhz9qpgyrvggkj8j4sgfdsmyyl93w3f16lnp"
     },
     "jar": {
-      "sha1": "0404feea925608b921b56acd11d3b187a0d33fe4",
-      "sha256": "13hkx1285f2imqlj6wbgyxki2yg8rmfr49iq1zijxm1cgfx8xyai"
+      "sha1": "aafb7677ec1e9f344fc834bbbdb91e8ba02af474",
+      "sha256": "0cqyy1vqrhilgwrdxsibd7360ch3hhwjnbbnzsak38v6i6mg66xl"
     }
   },
 
@@ -1000,19 +935,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "1aa0b32fd70e6644dcb06b88b55630d6bbb6f188",
-      "sha256": "1wq6gvhlvy3mdhj1cb0w62kclqd7x42dqd0275l40rlla5q5h1z1"
-    },
-    "jar": {
-      "sha1": "4fc15daa4fd1b150e8c6d32755796634446dd86a",
-      "sha256": "1ykw162gng0lcbxn2f387vv1l4d7hfwyayhxgzqqgi9jx211fzw5"
-    }
-  },
-
   {
     "path": "org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f",
     "host": "https://repo1.maven.org/maven2",
@@ -1026,6 +948,19 @@
     }
   },
 
+  {
+    "path": "org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "1aa0b32fd70e6644dcb06b88b55630d6bbb6f188",
+      "sha256": "1wq6gvhlvy3mdhj1cb0w62kclqd7x42dqd0275l40rlla5q5h1z1"
+    },
+    "jar": {
+      "sha1": "4fc15daa4fd1b150e8c6d32755796634446dd86a",
+      "sha256": "1ykw162gng0lcbxn2f387vv1l4d7hfwyayhxgzqqgi9jx211fzw5"
+    }
+  },
+
   {
     "path": "org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176",
     "host": "https://repo1.maven.org/maven2",
@@ -1052,19 +987,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",
@@ -1078,6 +1000,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",
@@ -1143,19 +1078,6 @@
     }
   },
 
-  {
-    "path": "org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "020bac4e8232f0b051e3e6b8033f67653cf9c685",
-      "sha256": "1avd7kmwh0i6nkcirwl358a6lkpqwara0f5a7qiw1fjivc81qmzq"
-    },
-    "jar": {
-      "sha1": "a4accb1ced82da8d61bd2928f435de8af548dc2b",
-      "sha256": "03001wa3xs08lw2rz27w5s0fyspyhkiiarqsrq9yf8gfysmnik2s"
-    }
-  },
-
   {
     "path": "org/graalvm/js/js/20.1.0/js-20.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -1169,6 +1091,19 @@
     }
   },
 
+  {
+    "path": "org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "020bac4e8232f0b051e3e6b8033f67653cf9c685",
+      "sha256": "1avd7kmwh0i6nkcirwl358a6lkpqwara0f5a7qiw1fjivc81qmzq"
+    },
+    "jar": {
+      "sha1": "a4accb1ced82da8d61bd2928f435de8af548dc2b",
+      "sha256": "03001wa3xs08lw2rz27w5s0fyspyhkiiarqsrq9yf8gfysmnik2s"
+    }
+  },
+
   {
     "path": "org/graalvm/regex/regex/20.1.0/regex-20.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -1299,6 +1234,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",
@@ -1351,19 +1299,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",
@@ -1416,6 +1351,19 @@
     }
   },
 
+  {
+    "path": "reagent/reagent/1.0.0/reagent-1.0.0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "93ad5ccb0101108fb0843a3f2c50da28f8fd8336",
+      "sha256": "1l4xzgc4wbd8b29mhj5j336cf8w1zccaia0w413zf3bnj6jf5m38"
+    },
+    "jar": {
+      "sha1": "a1dd4d40425bb2e1afad0fe72780b43ff394ccfa",
+      "sha256": "1g607s1ymns85923bvhwrsj0y5czyqqq1jmxx0a58fnsm1b318fa"
+    }
+  },
+
   {
     "path": "re-com/re-com/2.8.0/re-com-2.8.0",
     "host": "https://repo.clojars.org",
@@ -1429,6 +1377,19 @@
     }
   },
 
+  {
+    "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": "re-frame/re-frame/0.12.0/re-frame-0.12.0",
     "host": "https://repo.clojars.org",
@@ -1468,32 +1429,6 @@
     }
   },
 
-  {
-    "path": "reagent/reagent/1.0.0/reagent-1.0.0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "93ad5ccb0101108fb0843a3f2c50da28f8fd8336",
-      "sha256": "1l4xzgc4wbd8b29mhj5j336cf8w1zccaia0w413zf3bnj6jf5m38"
-    },
-    "jar": {
-      "sha1": "a1dd4d40425bb2e1afad0fe72780b43ff394ccfa",
-      "sha256": "1g607s1ymns85923bvhwrsj0y5czyqqq1jmxx0a58fnsm1b318fa"
-    }
-  },
-
-  {
-    "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": "rewrite-clj/rewrite-clj/0.6.1/rewrite-clj-0.6.1",
     "host": "https://repo.clojars.org",
@@ -1508,15 +1443,15 @@
   },
 
   {
-    "path": "rewrite-cljs/rewrite-cljs/0.4.5/rewrite-cljs-0.4.5",
+    "path": "rewrite-cljs/rewrite-cljs/0.4.4/rewrite-cljs-0.4.4",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "378cd53218027b9a93640dcf64c040665f6c9c6b",
-      "sha256": "1qrhrgzhqdyqizh0ngnr4zgj9xkfzq0qhsws4pxxra3qc9ikl9cq"
+      "sha1": "4e7a2542517a5b0231631305461603605bea1592",
+      "sha256": "050imgkzw5q7200klwrkd4v32xxy1f4aghs8g4ma5dbg4rl4pgcd"
     },
     "jar": {
-      "sha1": "c35be115c39dadc71a4de3f584aa8ca295e11257",
-      "sha256": "1dnw0jhr1hhqz80w3z5d8qdbaqdvgzg4fyhv6lffa51c9ca1dsr1"
+      "sha1": "dd14a371d0d09eedccb39f01e3edabefb2d1e64f",
+      "sha256": "0hb07wg71i2bjn8wzs8q6w1nb3jb2s36nhr9kv9mc0gyrr6im244"
     }
   },
 
@@ -1648,18 +1583,5 @@
       "sha1": "09af0b348e6253dcf9fd567d0d22ffebdea46176",
       "sha256": "1qg2iyblykfkzmplc2c46916b9m0h5ad6lxmvrk5qn3pdxqr8vw0"
     }
-  },
-
-  {
-    "path": "zprint/zprint/1.1.1/zprint-1.1.1",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "d7225bdc4978d3a8eac8613187cddd2efb9e39d2",
-      "sha256": "0yyy31h88zww238c2v4zi9va3pjp7ii76zjggglakd3wm1fdbnck"
-    },
-    "jar": {
-      "sha1": "3bd9bbedb188a66ccf72c1e22819e8e423a6757a",
-      "sha256": "1bvrarxw0dqvxlhj6gdwrv6mklzh4p79537g293fqlm07f2knfph"
-    }
   }
 ]

nix/deps/clojure/deps.list

@@ -2,16 +2,13 @@ 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
-borkdude/edamame/0.0.11-alpha.28/edamame-0.0.11-alpha.28.jar
-borkdude/sci.impl.reflector/0.0.1/sci.impl.reflector-0.0.1.jar
-borkdude/sci/0.2.1-alpha.1/sci-0.2.1-alpha.1.jar
 cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
 cider/piggieback/0.4.1/piggieback-0.4.1.jar
-clj-stacktrace/clj-stacktrace/0.2.8/clj-stacktrace-0.2.8.jar
+cljfmt/cljfmt/0.6.7/cljfmt-0.6.7.jar
 cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.0.jar
-cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0.jar
-cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0.jar
 cljsjs/react/17.0.1-0/react-17.0.1-0.jar
+cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0.jar
+cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-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
 com/bhauman/cljs-test-display/0.1.1/cljs-test-display-0.1.1.jar
@@ -22,6 +19,8 @@ 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/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar
+com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.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
@@ -32,25 +31,23 @@ 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/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
 edn-query-language/eql/0.0.9/eql-0.0.9.jar
 expound/expound/0.8.5/expound-0.8.5.jar
 fipp/fipp/0.6.23/fipp-0.6.23.jar
-hashp/hashp/0.2.1/hashp-0.2.1.jar
 hiccup/hiccup/1.0.5/hiccup-1.0.5.jar
 hickory/hickory/0.7.1/hickory-0.7.1.jar
 http-kit/http-kit/2.2.0/http-kit-2.2.0.jar
@@ -61,8 +58,6 @@ 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
-mvxcvi/arrangement/1.2.0/arrangement-1.2.0.jar
-mvxcvi/puget/1.3.1/puget-1.3.1.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
@@ -71,23 +66,23 @@ org/clojure/clojurescript/1.10.773/clojurescript-1.10.773.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
-org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2.jar
+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-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f.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/0.4.1/tools.logging-0.4.1.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
@@ -98,23 +93,23 @@ 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.0.0/reagent-1.0.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
+refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
 re-frame/re-frame/0.12.0/re-frame-0.12.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.0.0/reagent-1.0.0.jar
-refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
 rewrite-clj/rewrite-clj/0.6.1/rewrite-clj-0.6.1.jar
-rewrite-cljs/rewrite-cljs/0.4.5/rewrite-cljs-0.4.5.jar
+rewrite-cljs/rewrite-cljs/0.4.4/rewrite-cljs-0.4.4.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
@@ -125,4 +120,3 @@ thheller/shadow-cljs/2.11.16/shadow-cljs-2.11.16-aot.jar
 thheller/shadow-cljsjs/0.0.21/shadow-cljsjs-0.0.21.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
-zprint/zprint/1.1.1/zprint-1.1.1.jar

nix/mobile/android/release.nix

@@ -45,8 +45,8 @@ in stdenv.mkDerivation rec {
     filter = lib.mkFilter {
       root = path;
       include = [
-        "package.json" "yarn.lock" "metro.config.js" "babel.config.js"
-        "resources/.*" "translations/.*" "src/js/.*"
+        "package.json" "yarn.lock" "metro.config.js" ".babelrc"
+        "resources/.*" "translations/.*" "src/js/worklet_factory.js"
         "modules/react-native-status/android.*" "android/.*"
         envFileName "VERSION" "status-go-version.json" "react-native.config.js"
       ];

nix/shell.nix

@@ -17,8 +17,6 @@ in mkShell {
     lsof # used in start-react-native.sh
     # build specific utilities
     clojure maven watchman
-    # lint specific utilities
-    clj-kondo zprint clojure-lsp
     # other nice to have stuff
     yarn nodejs python27
   ] # and some special cases

nix/shells.nix

@@ -23,7 +23,7 @@ let
 
     # for calling clojure targets in CI or Makefile
     clojure = mkShell {
-      buildInputs = with pkgs; [ clojure flock maven openjdk ];
+      buildInputs = with pkgs; [ clojure flock maven openjdk clj-kondo ];
       inputsFrom = [ nodejs-sh ];
       # CLASSPATH from clojure deps with 'src' appended to find local sources.
       shellHook = with pkgs; ''

package.json

@@ -74,7 +74,7 @@
     "react-native-touch-id": "^4.4.1",
     "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status",
     "react-syntax-highlighter": "^15.5.0",
-    "rn-emoji-keyboard": "0.7.0",
+    "rn-emoji-keyboard": "git+https://github.com/status-im/rn-emoji-keyboard.git#refs/tags/v0.4.3",
     "tdigest": "^0.1.1"
   },
   "devDependencies": {
@@ -82,22 +82,15 @@
     "@babel/helper-builder-react-jsx": "7.0.0",
     "@babel/plugin-transform-block-scoping": "7.0.0",
     "@babel/preset-env": "7.1.0",
-    "@babel/preset-react": "^7.18.6",
     "@babel/register": "7.0.0",
-    "@jest/globals": "^25.1.0",
     "@mapbox/node-pre-gyp": "^1.0.9",
-    "@testing-library/jest-native": "^5.0.0",
-    "@testing-library/react-native": "^11.2.0",
     "@types/jest": "^28.1.6",
-    "concurrently": "^7.6.0",
     "detox": "^19.9.1",
-    "jest": "^25.1.0",
-    "jest-circus": "^26.0.0",
     "jest-image-snapshot": "^5.1.0",
+    "jest": "^28.1.3",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",
     "process": "0.11.10",
-    "react-test-renderer": "16.13.1",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "2.11.16"
   },

shadow-cljs.edn

@@ -1,120 +1,109 @@
 ;; shadow-cljs configuration
-{:source-paths   ["src" "test/cljs"]
+{:source-paths ["src" "test/cljs"]
 
- :dependencies   [[reagent "1.0.0"]
-                  [re-frame "0.12.0"]
-                  [binaryage/oops "0.7.0"]
-                  [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"]
-                  ;; 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
-                  [bidi "2.1.6"]
-                  ;; test dependencies
-                  [day8.re-frame/test "0.1.5"]
-                  [com.taoensso/tufte "2.1.0"]]
+ :dependencies [[reagent "1.0.0"]
+                [re-frame "0.12.0"]
+                [binaryage/oops "0.7.0"]
+                [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"]
+                ;; 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
+                [bidi "2.1.6"]
+                ;; test dependencies
+                [day8.re-frame/test "0.1.5"]
+                [com.taoensso/tufte "2.1.0"]
+                ;; linting
+                [cljfmt/cljfmt "0.6.7"]]
 
  ;; port and middleware for repl in development
- :nrepl          {:port       7888
-                  :middleware [cider.piggieback/wrap-cljs-repl
-                               refactor-nrepl.middleware/wrap-refactor]}
+ :nrepl {:port 7888
+         :middleware [cider.piggieback/wrap-cljs-repl
+                      refactor-nrepl.middleware/wrap-refactor]}
 
  ;; shadow-cljs web interface
- :http           {:port 3449
-                  :host "0.0.0.0"}
+ :http {:port 3449
+        :host "0.0.0.0"}
 
  :cache-blockers #{status-im.utils.js-resources status-im.ui.components.icons.icons}
 
- :builds
- {:mobile
-  {:target     :react-native
-   :output-dir "app"
-   :init-fn    status-im2.setup.core/init
-   ;; When false, the Shadow-CLJS watcher won't automatically refresh
-   ;; the target files (a.k.a hot reload). When false, you can manually
-   ;; reload by calling `shadow.cljs.devtools.api/watch-compile-all!`.
-   :devtools   {:autobuild #shadow/env ["SHADOW_AUTOBUILD_ENABLED" :default true :as :bool]}
-   :dev        {:devtools         {:after-load   status-im2.setup.hot-reload/reload
-                                   :build-notify status-im2.setup.hot-reload/build-notify
-                                   :preloads     [re-frisk-remote.preload]}
-                :closure-defines
-                {status-im.utils.config/POKT_TOKEN      #shadow/env "POKT_TOKEN"
-                 status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"}
-                :compiler-options {:output-feature-set :es5
-                                   :closure-defines
-                                   {re-frame.trace/trace-enabled? true}
-                                   :source-map         false
-                                   :infer-externs      true}
-                ;; if you want to use a real device, set your local ip
-                ;; in the SHADOW_HOST env variable to make sure that
-                ;; it will use the right interface
-                :local-ip         #shadow/env "SHADOW_HOST"}
-   :chunks     {:fleets status-im.fleet.default-fleet/default-fleets
-                :chats  status-im.chat.default-chats/default-chats}
-   :release
-   {:closure-defines
-    {status-im.utils.config/POKT_TOKEN      #shadow/env "POKT_TOKEN"
-     status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"}
-    :compiler-options {:output-feature-set :es6
-                       ;;disable for android build as there
-                       ;;is an intermittent warning with deftype
-                       :warnings-as-errors false
-                       :infer-externs      :auto
-                       :static-fns         true
-                       :fn-invoke-direct   true
-                       :optimizations      :advanced
-                       :js-options         {:js-provider :closure}}}}
-  ;; the tests are ran with node, react-native dependencies are mocked
-  ;; by using node --require override.js, which uses the node-library
-  ;; produced by the target :mocks below and redefines node require
-  ;; function to use the mocks instead of the rn libraries
-  :test
-  {:output-to        "target/test/test.js"
-   :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-im.chat.models-test$"
-   :main
-   status-im.test-runner/main
-   ;; set :ui-driven to true to let shadow-cljs inject node-repl
-   :ui-driven
-   true
-   :closure-defines
-   {status-im.utils.config/POKT_TOKEN      #shadow/env "POKT_TOKEN"
-    status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"}
-   :compiler-options
-   {;; needed because we override require and it
-    ;; messes with source-map which reports callstack
-    ;; exceeded exceptions instead of real issues
-    :source-map    false
-    ;; needed because we use deref in tests
-    :static-fns    false
-    :optimizations :simple
-    :infer-externs true}}
+ :builds {:mobile
+          {:target :react-native
+           :output-dir "app"
+           :init-fn status-im2.setup.core/init
+           ;; When false, the Shadow-CLJS watcher won't automatically refresh
+           ;; the target files (a.k.a hot reload). When false, you can manually
+           ;; reload by calling `shadow.cljs.devtools.api/watch-compile-all!`.
+           :devtools {:autobuild #shadow/env ["SHADOW_AUTOBUILD_ENABLED" :default true :as :bool]}
+           :dev {:devtools {:after-load status-im2.setup.hot-reload/reload
+                            :build-notify status-im2.setup.hot-reload/build-notify
+                            :preloads [re-frisk-remote.preload]}
+                 :closure-defines
+                 {status-im.utils.config/POKT_TOKEN #shadow/env "POKT_TOKEN"
+                  status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"}
+                 :compiler-options {:output-feature-set :es5
+                                    :closure-defines
+                                    {re-frame.trace/trace-enabled? true}
+                                    :source-map false
+                                    :infer-externs true}
+                 ;; if you want to use a real device, set your local ip
+                 ;; in the SHADOW_HOST env variable to make sure that
+                 ;; it will use the right interface
+                 :local-ip #shadow/env "SHADOW_HOST"}
+           :chunks {:fleets status-im.fleet.default-fleet/default-fleets
+                    :chats status-im.chat.default-chats/default-chats}
+           :release
+           {:closure-defines
+            {status-im.utils.config/POKT_TOKEN #shadow/env "POKT_TOKEN"
+             status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"}
+                     :compiler-options {:output-feature-set :es6
+                                        ;;disable for android build as there
+                                        ;;is an intermittent warning with deftype
+                                        :warnings-as-errors false
+                                        :infer-externs :auto
+                                        :static-fns true
+                                        :fn-invoke-direct true
+                                        :optimizations :advanced
+                                        :js-options {:js-provider :closure}}}}
+          ;; the tests are ran with node, react-native dependencies are mocked
+          ;; by using node --require override.js, which uses the node-library
+          ;; produced by the target :mocks below and redefines node require
+          ;; function to use the mocks instead of the rn libraries
+          :test
+          {:output-to        "target/test/test.js"
+           :output-dir       "target/test"
+           :optimizations    :simple
+           :target           :node-test
+           :main             status-im.test-runner/main
+           ;; set :ui-driven to true to let shadow-cljs inject node-repl
+           :ui-driven        true
+           :closure-defines
+           {status-im.utils.config/POKT_TOKEN #shadow/env "POKT_TOKEN"
+            status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"}
+           :compiler-options {;; needed because we override require and it
+                              ;; messes with source-map which reports callstack
+                              ;; exceeded exceptions instead of real issues
+                              :source-map    false
+                              ;; needed because we use deref in tests
+                              :static-fns    false
+                              :optimizations :simple
+                              :infer-externs true}}
 
-  ;; mock.js-dependencies is mocking the react-native libraries
-  ;; we build it as a node library so that it can be required by
-  ;; override.js
-  :mocks
-  {:target           :node-library
-   :exports          {:mocks mocks.js-dependencies/mock}
-   :output-to        "target/mocks/mocks.js"
-   :output-dir       "target/mocks"
-   :compiler-options {:optimizations :simple
-                      :source-map    false}}
-  :component-test {:target           :npm-module
-                   :entries          [quo2.core-spec]
-                   :ns-regexp        "-component-spec$"
-                   :output-dir       "component-spec"
-                   :compiler-options {:warnings-as-errors false
-                                      :static-fns         false
-                                      :infer-externs      true}}}}
+          ;; mock.js-dependencies is mocking the react-native libraries
+          ;; we build it as a node library so that it can be required by
+          ;; override.js
+          :mocks
+          {:target :node-library
+           :exports {:mocks mocks.js-dependencies/mock}
+           :output-to "target/mocks/mocks.js"
+           :output-dir "target/mocks"
+           :compiler-options {:optimizations :simple
+                              :source-map false}}}}

src/js/record_audio_worklets.js

@@ -1,18 +0,0 @@
-import { useDerivedValue } from 'react-native-reanimated';
-
-const MAX_SCALE = 1.8;
-
-export function ringScale(scale, subtract) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      const value = scale.value;
-      const maxDelta = MAX_SCALE - 1;
-      const maxDeltaDiff = 1 - maxDelta;
-      const maxVirtualScale = MAX_SCALE + maxDelta;
-      const decimals = value - Math.floor(value);
-      const normalizedValue = value >= maxVirtualScale ? (decimals + ((parseInt(value) - 1) * maxDeltaDiff) + 1) : value;
-      return (((normalizedValue - subtract) > MAX_SCALE ? normalizedValue - maxDelta : normalizedValue) - subtract);
-    }
-  );
-}

src/js/shell_worklets.js

@@ -1,186 +0,0 @@
-import { useDerivedValue, withTiming, withSequence, withDelay, Easing } from 'react-native-reanimated';
-
-// Shell Worklets
-
-// Home Stack States
-const CLOSE_WITH_ANIMATION = 0;
-const OPEN_WITH_ANIMATION = 1;
-const CLOSE_WITHOUT_ANIMATION = 3;
-const OPEN_WITHOUT_ANIMATION = 4;
-
-// Derived Values
-export function stackOpacity (stackId, selectedStackId) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return selectedStackId.value == stackId ? 1 : 0;
-    }
-  );
-}
-
-export function stackPointer (stackId, selectedStackId) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return selectedStackId.value == stackId ? "auto" : "none";
-    }
-  );
-}
-
-export function bottomTabIconColor (stackId, selectedStackId, homeStackState,
-				    passThrough, selectedTabColor, defaultColor,
-				    passThroughColor) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      var homeStackStateValue = homeStackState.value;
-      if (selectedStackId.value == stackId &&
-	  (homeStackStateValue == OPEN_WITH_ANIMATION ||
-	   homeStackStateValue == OPEN_WITHOUT_ANIMATION)){
-	return selectedTabColor;
-      }
-      else if (passThrough.value){
-	return passThroughColor;
-      }
-      else {
-	return defaultColor;
-      }
-    }
-  );
-}
-
-export function bottomTabsHeight(homeStackState, height, extendedHeight) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      switch (homeStackState.value) {
-      case OPEN_WITH_ANIMATION:
-	return withTiming(extendedHeight, defaultDurationAndEasing);
-	break;
-      case CLOSE_WITH_ANIMATION:
-	return withTiming(height, defaultDurationAndEasing);
-	break;
-      case OPEN_WITHOUT_ANIMATION:
-	return extendedHeight;
-	break;
-      case CLOSE_WITHOUT_ANIMATION:
-	return height;
-	break;
-      }
-    }
-  )
-}
-
-
-// Home Stack
-
-const shellAnimationTime = 200;
-
-const defaultDurationAndEasing = {
-  duration: shellAnimationTime,
-  easing: Easing.bezier(0, 0, 1, 1),
-}
-
-export function homeStackOpacity (homeStackState) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      switch (homeStackState.value) {
-      case OPEN_WITH_ANIMATION:
-	return withTiming(1, defaultDurationAndEasing);
-	break;
-      case CLOSE_WITH_ANIMATION:
-	return withTiming(0, defaultDurationAndEasing);
-	break;
-      case OPEN_WITHOUT_ANIMATION:
-	return 1;
-	break;
-      case CLOSE_WITHOUT_ANIMATION:
-	return 0;
-	break;	
-      }
-    }
-  );
-}
-
-export function homeStackTop (homeStackState, top) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      switch (homeStackState.value) {
-      case OPEN_WITH_ANIMATION:
-	return withTiming(0, defaultDurationAndEasing);
-	break;
-      case CLOSE_WITH_ANIMATION:
-	return withTiming(top, defaultDurationAndEasing);
-	break;
-      case OPEN_WITHOUT_ANIMATION:
-	return 0;
-	break;
-      case CLOSE_WITHOUT_ANIMATION:
-	return top;
-	break;	
-      }
-    }
-  );
-}
-
-export function homeStackLeft (selectedStackId, animateHomeStackLeft, homeStackState, left) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      if (animateHomeStackLeft.value) {
-	var leftValue = left[selectedStackId.value];
-	switch (homeStackState.value) {
-	case OPEN_WITH_ANIMATION:
-	  return withSequence(withTiming(leftValue, {duration: 0}), withTiming(0, defaultDurationAndEasing))
-	  break;
-	case CLOSE_WITH_ANIMATION:
-	  return withTiming(leftValue, defaultDurationAndEasing);
-	  break;
-	case OPEN_WITHOUT_ANIMATION:
-	  return 0;
-	  break;
-	case CLOSE_WITHOUT_ANIMATION:
-	  return leftValue;
-	  break;	
-	}
-      } else {
-	return 0;
-      }
-    }
-  );
-}
-
-export function homeStackPointer (homeStackState) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      var homeStackStateValue = homeStackState.value;
-      return (homeStackStateValue == OPEN_WITH_ANIMATION ||
-	      homeStackStateValue == OPEN_WITHOUT_ANIMATION) ? "auto" : "none";
-    }
-  );
-}
-
-export function homeStackScale (homeStackState, minimizeScale) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      switch (homeStackState.value) {
-      case OPEN_WITH_ANIMATION:
-	return withTiming(1, defaultDurationAndEasing);
-	break;
-      case CLOSE_WITH_ANIMATION:
-	return withTiming(minimizeScale, defaultDurationAndEasing);
-	break;
-      case OPEN_WITHOUT_ANIMATION:
-	return 1;
-	break;
-      case CLOSE_WITHOUT_ANIMATION:
-	return minimizeScale;
-	break;	
-      }
-    }
-  );
-}

src/js/worklet_factory.js

@@ -1,4 +1,4 @@
-import { useDerivedValue, interpolate } from 'react-native-reanimated';
+import { useDerivedValue, withTiming, withSequence, withDelay, Easing } from 'react-native-reanimated';
 
 // Generic Worklets
 
@@ -30,11 +30,105 @@ export function applyAnimationsToStyle(animations, style) {
   };
 };
 
-export function interpolateValue(sharedValue, inputRange, outputRange) {
+// Switcher Worklets
+
+export function stackOpacity (stackId, selectedStackId) {
   return useDerivedValue(
     function () {
       'worklet'
-      return interpolate(sharedValue.value, inputRange, outputRange);
+      return selectedStackId.value == stackId ? 1 : 0;
+    }
+  );
+}
+
+export function stackPointer (stackId, selectedStackId) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return selectedStackId.value == stackId ? "auto" : "none";
+    }
+  );
+}
+
+export function bottomTabIconColor (stackId, selectedStackId, homeStackOpen,
+				    passThrough, selectedTabColor, defaultColor,
+				    passThroughColor) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      if (selectedStackId.value == stackId && homeStackOpen.value){
+	return selectedTabColor;
+      }
+      else if (passThrough.value){
+	return passThroughColor;
+      }
+      else {
+	return defaultColor;
+      }
+    }
+  );
+}
+
+
+// Home Stack
+
+const shellAnimationTime = 200;
+
+const defaultDurationAndEasing = {
+  duration: shellAnimationTime,
+  easing: Easing.bezier(0, 0, 1, 1),
+}
+
+export function homeStackOpacity (homeStackOpen) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return withTiming(homeStackOpen.value ? 1 : 0, defaultDurationAndEasing);
+    }
+  );
+}
+
+export function homeStackTop (homeStackOpen, top) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return withTiming(homeStackOpen.value ? 0 : top, defaultDurationAndEasing);
+    }
+  );
+}
+
+export function homeStackLeft (selectedStackId, animateHomeStackLeft, homeStackOpen, left) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      if (animateHomeStackLeft.value) {
+	var leftValue = left[selectedStackId.value];
+	if (homeStackOpen.value) {
+	  return withSequence(withTiming(leftValue, {duration: 0}), withTiming(0, defaultDurationAndEasing))
+	} else {
+	  return withTiming(leftValue, defaultDurationAndEasing);
+	}
+      } else {
+	return 0;
+      }
+    }
+  );
+}
+
+export function homeStackPointer (homeStackOpen) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return homeStackOpen.value ? "auto" : "none";
+    }
+  );
+}
+
+export function homeStackScale (homeStackOpen, minimizeScale) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return withTiming(homeStackOpen.value ? 1 : minimizeScale, defaultDurationAndEasing);
     }
   );
 }

src/mocks/js_dependencies.cljs

@@ -4,20 +4,6 @@
   (:require [status-im.utils.test :as utils.test])
   (:require [status-im.chat.default-chats :refer (default-chats)]))
 
-;; to generate a js Proxy at js/__STATUS_MOBILE_JS_IDENTITY_PROXY__ that accept any (.xxx) call and return itself
-;; For the convenience to mock eg.
-;; (-> reanimated/slide-out-up-animation .springify (.damping 20) (.stiffness 300))
-;; (-> reanimated/slide-out-up-animation (.damping 20) .springify (.stiffness 300))
-(js/eval "
-var globalThis
-if (typeof window === \"undefined\") {
-  globalThis = global
-} else {
-  globalThis = window
-}
-globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return () => globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__}})
-")
-
 (def action-button          #js {:default #js {:Item #js {}}})
 (def config                 #js {:default #js {}})
 (def camera                 #js {:RNCamera #js {:Constants #js {}}})
@@ -125,9 +111,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
 (def react-native-shake  #js {})
 (def react-native-share #js {:default {}})
 (def react-native-svg #js {:SvgUri #js {:render identity}
-                           :SvgXml #js {:render identity}
-                           :default #js {:render identity}
-                           :Path #js {:render identity}})
+                           :SvgXml #js {:render identity}})
 (def react-native-webview #js {:default {}})
 (def react-native-audio-toolkit #js {:MediaStates {}})
 (def net-info  #js {})
@@ -223,10 +207,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
                                   :withTiming             (fn [])
                                   :withDelay              (fn [])
                                   :Easing                 #js {:bezier identity}
-                                  :Keyframe               (fn [])
-                                  :SlideOutUp             js/__STATUS_MOBILE_JS_IDENTITY_PROXY__
-                                  :SlideInUp              js/__STATUS_MOBILE_JS_IDENTITY_PROXY__
-                                  :LinearTransition       js/__STATUS_MOBILE_JS_IDENTITY_PROXY__})
+                                  :Keyframe               (fn [])})
 (def react-native-gesture-handler #js {:default                  #js {}
                                        :State                    #js {:BEGAN        nil
                                                                       :ACTIVE       nil
@@ -301,10 +282,6 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
 (def worklet-factory
   #js {:applyAnimationsToStyle (fn [])})
 
-(def shell-worklets #js {})
-
-(def record-audio-worklets #js {})
-
 ;; Update i18n_resources.cljs
 (defn mock [module]
   (case module
@@ -351,8 +328,6 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
     "@react-native-async-storage/async-storage" async-storage
     "react-native-svg" react-native-svg
     "../src/js/worklet_factory.js" worklet-factory
-    "../src/js/shell_worklets.js" shell-worklets
-    "../src/js/record_audio_worklets.js" record-audio-worklets
     "./fleets.js" default-fleets
     "./chats.js" default-chats
     "@walletconnect/client" wallet-connect-client

src/quo/react_native.cljs

@@ -34,7 +34,7 @@
 (def touchable-opacity (reagent/adapt-react-class (.-TouchableOpacity ^js rn)))
 (def touchable-highlight (reagent/adapt-react-class (.-TouchableHighlight ^js rn)))
 (def touchable-without-feedback (reagent/adapt-react-class (.-TouchableWithoutFeedback ^js rn)))
-(def text-input (reagent/adapt-react-class (.-TextInput ^js rn)))
+(def text-input (reagent/adapt-react-class  (.-TextInput ^js rn)))
 
 (def keyboard-avoiding-view-class (reagent/adapt-react-class (.-KeyboardAvoidingView ^js rn)))
 

src/quo2/components/avatars/group_avatar.cljs

@@ -21,6 +21,6 @@
                 :align-items      :center
                 :justify-content  :center
                 :border-radius    (/ container-size 2)
-                :background-color (colors/custom-color-by-theme color 50 60)}
-       [icon/icon :i/group {:size  icon-size
+                :background-color (colors/theme-alpha color 0.5 0.6)}
+       [icon/icon :i/group {:size  icon-size ; TODO: group icon sizes 12 and 20 (small and large) are missing
                             :color colors/white-opa-70}]])))

src/quo2/components/avatars/wallet_user_avatar.cljs

@@ -2,7 +2,7 @@
   (:require [react-native.core :as rn]
             [quo2.foundations.colors :as colors]
             [quo2.components.markdown.text :as text]
-            [clojure.string :as string]))
+            [clojure.string :as clojure-string]))
 
 (def circle-sizes {:small 20
                    :medium 32
@@ -29,10 +29,10 @@
   (let [circle-size    (size circle-sizes)
         small?         (= size :small)
         f-name-initial (-> f-name
-                           string/upper-case
+                           clojure-string/upper-case
                            (subs 0 1))
         l-name-initial (-> l-name
-                           string/upper-case
+                           clojure-string/upper-case
                            (subs 0 1))
         circle-color   (colors/custom-color color 50 20)
         text-color     (colors/custom-color-by-theme color 50 60)]

src/quo2/components/buttons/button.cljs

@@ -7,149 +7,147 @@
             [quo2.components.icon :as quo2.icons]))
 
 (def themes
-  {:light {:primary         {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/primary-50
-                                                     :pressed  colors/primary-60
-                                                     :disabled colors/primary-50}}
-           :secondary       {:icon-color            colors/primary-50
-                             :label-color           colors/primary-50
-                             :background-color      {:default  colors/primary-50-opa-20
-                                                     :pressed  colors/primary-50-opa-40
-                                                     :disabled colors/primary-50-opa-20}}
-           :grey            {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-50
-                             :label-color           colors/neutral-100
-                             :background-color      {:default  colors/neutral-10
-                                                     :pressed  colors/neutral-20
-                                                     :disabled colors/neutral-10}}
-           :dark-grey       {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-50
-                             :label-color           colors/neutral-100
-                             :background-color      {:default  colors/neutral-20
-                                                     :pressed  colors/neutral-30
-                                                     :disabled colors/neutral-20}}
-           :outline         {:icon-color            colors/neutral-50
-                             :icon-secondary-color  colors/neutral-50
-                             :label-color           colors/neutral-100
-                             :border-color          {:default  colors/neutral-20
-                                                     :pressed  colors/neutral-40
-                                                     :disabled colors/neutral-20}}
-           :ghost           {:icon-color            colors/neutral-50
-                             :icon-secondary-color  colors/neutral-50
-                             :label-color           colors/neutral-100
-                             :background-color      {:pressed colors/neutral-10}}
-           :danger          {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/danger-50
-                                                     :pressed  colors/danger-60
-                                                     :disabled colors/danger-50}}
-           :positive        {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/success-50
-                                                     :pressed  colors/success-60
-                                                     :disabled colors/success-50-opa-30}}
-           :photo-bg        {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-80-opa-40
-                             :label-color           colors/neutral-100
-                             :background-color      {:default  colors/white-opa-40
-                                                     :pressed  colors/white-opa-50
-                                                     :disabled colors/white-opa-40}}
-           :blur-bg         {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-80-opa-40
-                             :label-color           colors/neutral-100
-                             :background-color      {:default  colors/neutral-80-opa-5
-                                                     :pressed  colors/neutral-80-opa-10
-                                                     :disabled colors/neutral-80-opa-5}}
-           :blur-bg-outline {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-80-opa-40
-                             :label-color           colors/neutral-100
-                             :border-color          {:default  colors/neutral-80-opa-10
-                                                     :pressed  colors/neutral-80-opa-20
-                                                     :disabled colors/neutral-80-opa-10}}
+  {:light {:primary         {:icon-color           colors/white
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/primary-50
+                                                    :pressed  colors/primary-60
+                                                    :disabled colors/primary-50}}
+           :secondary       {:icon-color           colors/primary-50
+                             :label                {:style    {:color colors/primary-50}}
+                             :background-color     {:default  colors/primary-50-opa-20
+                                                    :pressed  colors/primary-50-opa-40
+                                                    :disabled colors/primary-50-opa-20}}
+           :grey            {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-50
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:default  colors/neutral-10
+                                                    :pressed  colors/neutral-20
+                                                    :disabled colors/neutral-10}}
+           :dark-grey       {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-50
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:default  colors/neutral-20
+                                                    :pressed  colors/neutral-30
+                                                    :disabled colors/neutral-20}}
+           :outline         {:icon-color           colors/neutral-50
+                             :icon-secondary-color colors/neutral-50
+                             :label                {:style    {:color colors/neutral-100}}
+                             :border-color         {:default  colors/neutral-20
+                                                    :pressed  colors/neutral-40
+                                                    :disabled colors/neutral-20}}
+           :ghost           {:icon-color           colors/neutral-50
+                             :icon-secondary-color colors/neutral-50
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:pressed colors/neutral-10}}
+           :danger          {:icon-color           colors/white
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/danger-50
+                                                    :pressed  colors/danger-60
+                                                    :disabled colors/danger-50}}
+           :positive        {:icon-color       colors/white
+                             :label            {:style {:color colors/white}}
+                             :background-color {:default  colors/success-50
+                                                :pressed  colors/success-60
+                                                :disabled colors/success-50-opa-30}}
+           :photo-bg        {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-80-opa-40
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:default  colors/white-opa-40
+                                                    :pressed  colors/white-opa-50
+                                                    :disabled colors/white-opa-40}}
+           :blur-bg         {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-80-opa-40
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:default  colors/neutral-80-opa-5
+                                                    :pressed  colors/neutral-80-opa-10
+                                                    :disabled colors/neutral-80-opa-5}}
+           :blur-bg-outline {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-80-opa-40
+                             :label                {:style    {:color colors/neutral-100}}
+                             :border-color         {:default  colors/neutral-80-opa-10
+                                                    :pressed  colors/neutral-80-opa-20
+                                                    :disabled colors/neutral-80-opa-10}}
            :shell            {:icon-color           colors/white
-                              :label-color          colors/white
+                              :label                {:style    {:color colors/white}}
                               :background-color     {:default  colors/neutral-95
                                                      :pressed  colors/neutral-95
                                                      :disabled colors/neutral-95}}}
-   :dark  {:primary         {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/primary-60
-                                                     :pressed  colors/primary-50
-                                                     :disabled colors/primary-60}}
-           :secondary       {:icon-color            colors/primary-50
-                             :label-color           colors/primary-50
-                             :background-color      {:default  colors/primary-50-opa-20
-                                                     :pressed  colors/primary-50-opa-30
-                                                     :disabled colors/primary-50-opa-20}}
-           :grey            {:icon-color            colors/white
-                             :icon-secondary-color  colors/neutral-40
-                             :label-color           colors/white
-                             :background-color      {:default  colors/neutral-80
-                                                     :pressed  colors/neutral-60
-                                                     :disabled colors/neutral-80}}
-           :dark-grey       {:icon-color            colors/white
-                             :icon-secondary-color  colors/neutral-40
-                             :label-color           colors/white
-                             :background-color      {:default  colors/neutral-70
-                                                     :pressed  colors/neutral-60
-                                                     :disabled colors/neutral-70}}
-           :outline         {:icon-color            colors/neutral-40
-                             :icon-secondary-color  colors/neutral-40
-                             :label-color           colors/white
-                             :border-color          {:default  colors/neutral-70
-                                                     :pressed  colors/neutral-60
-                                                     :disabled colors/neutral-70}}
-           :ghost           {:icon-color            colors/neutral-40
-                             :icon-secondary-color  colors/neutral-40
-                             :label-color                 colors/white
-                             :background-color      {:pressed  colors/neutral-80}}
-           :danger          {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/danger-60
-                                                     :pressed  colors/danger-50
-                                                     :disabled colors/danger-60}}
-           :positive        {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/success-60
-                                                     :pressed  colors/success-50
-                                                     :disabled colors/success-60-opa-30}}
-           :photo-bg        {:icon-color            colors/white
-                             :icon-secondary-color  colors/neutral-30
-                             :label-color           colors/white
-                             :background-color      {:default  colors/neutral-80-opa-40
-                                                     :pressed  colors/neutral-80-opa-50
-                                                     :disabled colors/neutral-80-opa-40}}
-           :blur-bg         {:icon-color            colors/white
-                             :icon-secondary-color  colors/white-opa-40
-                             :label-color           colors/white
-                             :background-color      {:default  colors/white-opa-5
-                                                     :pressed  colors/white-opa-10
-                                                     :disabled colors/white-opa-5}}
-           :blur-bg-outline {:icon-color            colors/white
-                             :icon-secondary-color  colors/white-opa-40
-                             :label-color           colors/white
-                             :border-color          {:default  colors/white-opa-10
-                                                     :pressed  colors/white-opa-20
-                                                     :disabled colors/white-opa-5}}
-           :shell            {:icon-color           colors/white
-                              :label-color          colors/white
-                              :background-color     {:default colors/neutral-95}}}})
-
-(defn shape-style-container [type icon size]
-  {:border-radius (if (and icon (#{:primary :secondary :danger} type))
-                    24
-                    (case size
-                      56 12
-                      40 12
-                      32 10
-                      24 8))})
+   :dark  {:primary         {:icon-color          colors/white
+                             :label               {:style    {:color colors/white}}
+                             :background-color    {:default  colors/primary-60
+                                                   :pressed  colors/primary-50
+                                                   :disabled colors/primary-60}}
+           :secondary       {:icon-color          colors/primary-50
+                             :label               {:style    {:color colors/primary-50}}
+                             :background-color    {:default  colors/primary-50-opa-20
+                                                   :pressed  colors/primary-50-opa-30
+                                                   :disabled colors/primary-50-opa-20}}
+           :grey            {:icon-color           colors/white
+                             :icon-secondary-color colors/neutral-40
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/neutral-80
+                                                    :pressed  colors/neutral-60
+                                                    :disabled colors/neutral-80}}
+           :dark-grey       {:icon-color           colors/white
+                             :icon-secondary-color colors/neutral-40
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/neutral-70
+                                                    :pressed  colors/neutral-60
+                                                    :disabled colors/neutral-70}}
+           :outline         {:icon-color           colors/neutral-40
+                             :icon-secondary-color colors/neutral-40
+                             :label                {:style    {:color colors/white}}
+                             :border-color         {:default  colors/neutral-70
+                                                    :pressed  colors/neutral-60
+                                                    :disabled colors/neutral-70}}
+           :ghost           {:icon-color           colors/neutral-40
+                             :icon-secondary-color colors/neutral-40
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:pressed  colors/neutral-80}}
+           :danger          {:icon-color           colors/white
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/danger-60
+                                                    :pressed  colors/danger-50
+                                                    :disabled colors/danger-60}}
+           :positive        {:icon-color       colors/white
+                             :label            {:style {:color colors/white}}
+                             :background-color {:default  colors/success-60
+                                                :pressed  colors/success-50
+                                                :disabled colors/success-60-opa-30}}
+           :photo-bg        {:icon-color           colors/white
+                             :icon-secondary-color colors/neutral-30
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/neutral-80-opa-40
+                                                    :pressed  colors/neutral-80-opa-50
+                                                    :disabled colors/neutral-80-opa-40}}
+           :blur-bg         {:icon-color           colors/white
+                             :icon-secondary-color colors/white-opa-40
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/white-opa-5
+                                                    :pressed  colors/white-opa-10
+                                                    :disabled colors/white-opa-5}}
+           :blur-bg-outline {:icon-color           colors/white
+                             :icon-secondary-color colors/white-opa-40
+                             :label                {:style    {:color colors/white}}
+                             :border-color         {:default  colors/white-opa-10
+                                                    :pressed  colors/white-opa-20
+                                                    :disabled colors/white-opa-5}}
+           :shell            {:icon-color          colors/white
+                              :label               {:style   {:color colors/white}}
+                              :background-color    {:default colors/neutral-95}}}})
 
 (defn style-container [type size disabled background-color border-color icon above width before after]
   (merge {:height             size
           :align-items        :center
           :justify-content    :center
           :flex-direction     (if above :column :row)
+          :border-radius      (if (and icon (#{:primary :secondary :danger} type))
+                                24
+                                (case size
+                                  56 12
+                                  40 12
+                                  32 10
+                                  24 8))
           :background-color   background-color
           :padding-horizontal (when-not (or icon before after)
                                 (case size 56 16 40 16 32 12 24 8))
@@ -161,7 +159,6 @@
                                 (case size 56 0 40 9 32 5 24 3))
           :padding-bottom     (when-not (or icon before after)
                                 (case size 56 0 40 9 32 5 24 4))}
-         (shape-style-container type icon size)
          (when width
            {:width width})
          (when icon
@@ -172,19 +169,14 @@
          (when disabled
            {:opacity 0.3})))
 
-(defn community-themed? [type community-color]
-  (and (= type :community) (string? community-color)))
-
 (defn button
   "with label
    [button opts \"label\"]
    opts
    {:type   :primary/:secondary/:grey/:dark-grey/:outline/:ghost/
-            :danger/:photo-bg/:blur-bg/:blur-bg-ouline/:shell/:community
+            :danger/:photo-bg/:blur-bg/:blur-bg-ouline/:shell
     :size   40/32/24
     :icon   true/false
-    :community-color '#FFFFFF'
-    :community-text-color '#000000'
     :before :icon-keyword
     :after  :icon-keyword}
 
@@ -192,13 +184,13 @@
    [button {:icon true} :main-icons/close-circle]"
   [_ _]
   (let [pressed (reagent/atom false)]
-    (fn [{:keys [on-press disabled type size community-color community-text-color before after above width
+    (fn [{:keys [on-press disabled type size before after above width
                  override-theme override-background-color
                  on-long-press accessibility-label icon icon-no-color style test-ID]
           :or   {type :primary
                  size 40}}
          children]
-      (let [{:keys [icon-color icon-secondary-color background-color label-color border-color]}
+      (let [{:keys [icon-color icon-secondary-color background-color label border-color]}
             (get-in themes [(or
                              override-theme
                              (theme/get-theme)) type])
@@ -220,65 +212,48 @@
                                                                (reset! pressed nil))})
 
          [rn/view {:style (merge
-                           (shape-style-container type icon size)
-                           {:background-color
-                            (if (= state :pressed)
-                              (colors/theme-colors colors/neutral-100 colors/white)
-                              :transparent)}
+                           (style-container
+                            type
+                            size
+                            disabled
+                            (or override-background-color (get background-color state))
+                            (get border-color state)
+                            icon
+                            above
+                            width
+                            before
+                            after)
                            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)
-                            (when
-                             (community-themed? type community-color)
-                              (merge
-                               {:background-color community-color}
-                               (when (= state :pressed) {:opacity 0.9}))))}
-           (when above
-             [rn/view
-              [quo2.icons/icon above {:container-style {:margin-bottom 2}
+          (when above
+            [rn/view
+             [quo2.icons/icon above {:container-style {:margin-bottom 2}
+                                     :color           icon-secondary-color
+                                     :size            icon-size}]])
+          (when before
+            [rn/view
+             [quo2.icons/icon before {:container-style {:margin-left  (if (= size 40) 12 8)
+                                                        :margin-right 4}
                                       :color           icon-secondary-color
                                       :size            icon-size}]])
-           (when before
-             [rn/view
-              [quo2.icons/icon before {:container-style {:margin-left  (if (= size 40) 12 8)
-                                                         :margin-right 4}
-                                       :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}]
+          [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           (if
-                                                    (and
-                                                     (community-themed? type community-color)
-                                                     (string? community-text-color))
-                                                     community-text-color
-                                                     label-color)}}
+             (string? children)
+             [text/text (merge {:size            (when (#{56 24} size) :paragraph-2)
+                                :weight          :medium
+                                :number-of-lines 1}
+                               label)
+              children]
 
-               children]
-
-              (vector? children)
-              children)]
-           (when after
-             [rn/view
-              [quo2.icons/icon after {:container-style {:margin-left  4
-                                                        :margin-right (if (= size 40) 12 8)}
-                                      :color           icon-secondary-color
-                                      :size            icon-size}]])]]]))))
+             (vector? children)
+             children)]
+          (when after
+            [rn/view
+             [quo2.icons/icon after {:container-style {:margin-left  4
+                                                       :margin-right (if (= size 40) 12 8)}
+                                     :color           icon-secondary-color
+                                     :size            icon-size}]])]]))))

src/quo2/components/code/snippet.cljs

@@ -1,7 +1,7 @@
 (ns quo2.components.code.snippet
   (:require ["react-native" :as react-native]
             [cljs-bean.core :as bean]
-            [clojure.string :as string]
+            [clojure.string :as str]
             [oops.core :as oops]
             [react-native.core :as rn]
             [quo2.theme :as theme]
@@ -52,7 +52,7 @@
                              :style (text-style (get-in node [:properties :className]))}]
                  (render-nodes children))
            ;; Remove newlines as we already render each line separately.
-           (-> value string/trim-newline)))
+           (-> value str/trim-newline)))
        nodes))
 
 (defn- code-block [{:keys [rows line-number-width]}]

src/quo2/components/community/community_card_view.cljs

@@ -6,11 +6,15 @@
 
 (defn community-card-view-item
   [{:keys [name description locked
-           status tokens cover tags width]} on-press]
+           status tokens cover tags featured]} on-press]
   [rn/touchable-opacity {:on-press on-press}
-   [rn/view {:style (style/community-card 20)}
-    [rn/view {:style    {:width         width
-                         :height        230
+   [rn/view {:style (merge (style/community-card 20)
+                           {:margin-bottom 16}
+                           (if featured
+                             {:margin-right 12}
+                             {:flex              1
+                              :margin-horizontal 20}))}
+    [rn/view {:style    {:height        230
                          :border-radius 20}
               :on-press on-press}
      [rn/view

src/quo2/components/community/community_view.cljs

@@ -28,9 +28,13 @@
      [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}]
-     [community-stats {:icon          :i/lightning
+     [community-stats {:icon       :i/lightning
                        :members-count "112.1K"
-                       :icon-color    icon-color}]]))
+                       :icon-color icon-color}]
+     (when (= type :card-view)
+       [community-stats {:icon       :i/placeholder
+                         :count      4
+                         :icon-color icon-color}])]))
 
 (defn community-tags [tags]
   [rn/view (style/community-tags-container)
@@ -65,12 +69,10 @@
        :style               {:margin-top (if (= size :large) 8 2)}}
       description])])
 
-(defn permission-tag-container [{:keys [locked? tokens on-press]}]
+(defn permission-tag-container [{:keys [locked? tokens]}]
   [permission/tag {:background-color (colors/theme-colors
                                       colors/neutral-10
                                       colors/neutral-80)
                    :locked?          locked?
                    :tokens           tokens
-
-                   :size             24
-                   :on-press         on-press}])
+                   :size             24}])

src/quo2/components/community/token_gating.cljs

@@ -1,259 +0,0 @@
-(ns quo2.components.community.token-gating
-  (:require [quo.react-native :as rn]
-            [quo2.components.avatars.channel-avatar :as channel-avatar]
-            [quo2.components.buttons.button :as button]
-            [quo2.components.icon :as icon]
-            [quo2.components.info.information-box :as information-box]
-            [quo2.components.markdown.text :as text]
-            [quo2.components.tags.token-tag :as token-tag]
-            [quo2.foundations.colors :as colors]
-            [status-im.i18n.i18n :as i18n]
-            [status-im.ui.components.fast-image :as fast-image]))
-
-(def ^:private token-tag-horizontal-spacing 7)
-(def token-tag-vertical-spacing 5)
-
-(def styles {:container {:flex 1
-                         :padding-horizontal 20}
-             :header-container {:flex-direction :row
-                                :align-items :center}
-             :header-spacing-community {:margin-bottom 16}
-             :header-spacing-channel {:margin-bottom 24}
-             :header-avatar {:margin-right 8}
-             :header-community-avatar-image {:width 32 :height 32}
-             :header-title-container {:flex 1
-                                      :flex-direction :row
-                                      :align-items :center}
-             :header-title-lock {:margin-left 6}
-             :header-info-button {:margin-left 8}
-             :token-requirement-text-spacing {:margin-vertical 8}
-             :token-requirement-list-spacing {:padding-vertical (- 8 token-tag-vertical-spacing)}
-             :token-row {:flex-direction :row
-                         :flex-wrap :wrap
-                         :align-items :center}
-             :token-row-container {:flex-direction :row
-                                   :align-items :center
-                                   :margin-horizontal (- token-tag-horizontal-spacing)}
-             :token-row-container-no-shift {:margin-left 0}
-             :token-row-or-text {:margin-right 3}
-             :token-tag-spacing {:margin-horizontal token-tag-horizontal-spacing
-                                 :margin-vertical token-tag-vertical-spacing}
-             :divider {:height 1
-                       :margin-horizontal -20
-                       :margin-top (- 12 token-tag-vertical-spacing)
-                       :margin-bottom 8}
-             :membership-request-denied {:margin-top 13}
-             :enter-button {:margin-top 16}
-             :info-text {:margin-top 12
-                         :text-align :center
-                         :padding-horizontal 20}})
-
-(defn multiple-token-requirements? [token-requirement-lists]
-  (when (vector? (first token-requirement-lists))
-    (> (count token-requirement-lists) 1)))
-
-(defn is-token-requirement-met? [token-requirement-list]
-  (and (seq token-requirement-list)
-       (every?
-        (fn [token]
-          (get token :is-sufficient?))
-        token-requirement-list)))
-
-(defn are-multiple-token-requirements-met? [token-requirement-lists]
-  (if (multiple-token-requirements? token-requirement-lists)
-    (some is-token-requirement-met? token-requirement-lists)
-    (is-token-requirement-met? token-requirement-lists)))
-
-(defn token-requirement-list-row [tokens community-color]
-  [rn/view {:style (merge
-                    (get styles :token-row)
-                    (get styles :token-requirement-list-spacing))}
-   (map-indexed (fn [token-index token]
-                  (let [{:keys [token-img-src token amount is-sufficient? is-purchasable?]} token]
-                    ^{:key token-index}
-                    [rn/view {:style (get styles :token-tag-spacing)}
-                     [token-tag/token-tag {:token          token
-                                           :value          amount
-                                           :size           24
-                                           :border-color   community-color
-                                           :is-required    is-sufficient?
-                                           :is-purchasable is-purchasable?
-                                           :token-img-src  token-img-src}]]))
-                tokens)])
-
-(defn token-requirement-list [props community-color]
-  (let [{:keys [gate token-requirements-changed? required-tokens-lost?]} props
-        [gate-type token-requirement-lists] gate
-        multiple-token-requirements? (multiple-token-requirements? token-requirement-lists)
-        is-sufficient? (are-multiple-token-requirements-met? token-requirement-lists)
-        you-must-hold-label (if (= gate-type :join)
-                              (cond
-                                token-requirements-changed? :t/you-must-now-hold
-                                required-tokens-lost? :t/you-must-always-hold
-                                :else :t/you-must-hold)
-                              :t/you-must-hold)
-        message-label (cond
-                        (= gate-type :join)
-                        (cond
-                          token-requirements-changed? :t/community-join-requirements-changed
-                          required-tokens-lost? :t/community-join-requirements-tokens-lost
-                          :else (if is-sufficient? :t/community-join-requirements-met :t/community-join-requirements-not-met))
-                        (= gate-type :read)
-                        (if is-sufficient?
-                          :t/community-channel-read-requirements-met
-                          :t/community-channel-read-requirements-not-met)
-                        (= gate-type :write)
-                        (if is-sufficient?
-                          :t/community-channel-write-requirements-met
-                          :t/community-channel-write-requirements-not-met))]
-    [rn/view
-     [rn/view {:style (get styles :token-requirement-text-spacing)}
-      [text/text {:weight :medium
-                  :number-of-lines 1}
-       (i18n/label
-        message-label)]
-      [text/text {:size :paragraph-2
-                  :number-of-lines 1}
-       (i18n/label
-        you-must-hold-label)]]
-
-     (if multiple-token-requirements?
-       (map-indexed
-        (fn [token-requirement-index tokens]
-          ^{:key token-requirement-index}
-          [rn/view {:style (merge
-                            (get styles :token-row-container)
-                            (when-not (= token-requirement-index 0)
-                              (get styles :token-row-container-no-shift)))}
-           (when-not (= token-requirement-index 0)
-             [text/text {:style (get styles :token-row-or-text)
-                         :size :paragraph-2} "or"])
-           [token-requirement-list-row tokens community-color]])
-        token-requirement-lists)
-       [rn/view {:style (get styles :token-row-container)}
-        [token-requirement-list-row token-requirement-lists community-color]])]))
-
-(defn is-community-locked? [community]
-  (not (are-multiple-token-requirements-met? (get-in community [:gates :join]))))
-
-(defn is-channel-locked? [channel]
-  (not (are-multiple-token-requirements-met?
-        (or (get-in channel [:gates :read])
-            (get-in channel [:gates :write])))))
-
-(defn token-gating
-  "[token-gating opts]
-   opts
-   {
-     :community {
-       :name string
-       :community-avatar-img-src string
-       :community-color string
-       :community-text-color string
-       :token-requirements-changed? boolean
-       :required-tokens-lost? boolean
-     }
-     :channel {
-       :name string
-       :emoji string
-       :emoji-background-color :string
-       :on-enter-channel callback
-       :membership-request-denied? boolean
-     }
-   }"
-  [_ _]
-  (fn [{:keys [community channel]}]
-    (let [type (if (some? community) :community :channel)
-          {:keys [name
-                  emoji
-                  emoji-background-color
-                  on-enter-channel
-                  community-avatar-img-src
-                  community-color
-                  community-text-color
-                  membership-request-denied?
-                  token-requirements-changed?
-                  required-tokens-lost?
-                  gates]} (if (= type :community) community channel)
-          locked? (if
-                   (= type :community)
-                    (is-community-locked? community)
-                    (is-channel-locked? channel))]
-
-      [rn/view {:style (merge (get styles :container) {:background-color (colors/theme-colors colors/white colors/neutral-90)})}
-       [rn/view {:style (merge
-                         (get styles :header-container)
-                         (if
-                          (= type :community)
-                           (get styles :header-spacing-community)
-                           (get styles :header-spacing-channel)))}
-
-        [rn/view {:style (get styles :header-avatar)}
-         (if (= type :community)
-           [fast-image/fast-image {:source              community-avatar-img-src
-                                   :style               (get styles :header-community-avatar-image)}]
-
-           [channel-avatar/channel-avatar {:big? true
-                                           :locked? locked?
-                                           :emoji emoji
-                                           :emoji-background-color emoji-background-color}])]
-
-        [rn/view {:style (get styles :header-title-container)}
-         [text/text {:weight :semi-bold
-                     :number-of-lines 1
-                     :size  :heading-1
-                     :style (get styles :header-text)} (if (= type :community) name (str "# " name))]
-
-         (when (= type :community)
-           [icon/icon (if locked?
-                        :main-icons2/locked
-                        :main-icons2/unlocked)
-            {:container-style (get styles :header-title-lock)
-             :color           (colors/theme-colors
-                               colors/neutral-50
-                               colors/neutral-40)}])]
-
-        [button/button {:type :outline
-                        :size 32
-                        :icon true
-                        :style (get styles :header-info-button)} :main-icons2/info]]
-
-       (map-indexed (fn [gate-index gate]
-                      ^{:key gate-index}
-                      [:<>
-                       (when-not (= gate-index 0)
-                         [rn/view {:style (merge
-                                           (get styles :divider)
-                                           {:background-color (colors/theme-colors
-                                                               colors/neutral-10
-                                                               colors/neutral-80)})}])
-                       [token-requirement-list {:gate gate :token-requirements-changed? token-requirements-changed? :required-tokens-lost? required-tokens-lost?} community-color]])
-                    gates)
-
-       (when (= type :channel)
-         (if membership-request-denied?
-           [information-box/information-box {:type :error
-                                             :icon :main-icons2/untrustworthy
-                                             :no-icon-color? true
-                                             :style (get styles :membership-request-denied)}
-            (i18n/label
-             :t/membership-request-denied)]
-
-           [:<>
-            [button/button {:type :community
-                            :community-color community-color
-                            :community-text-color community-text-color
-                            :style (get styles :enter-button)
-                            :disabled locked?
-                            :on-press on-enter-channel}
-             (str "# " (i18n/label
-                        :t/enter-channel))]
-            [text/text
-             {:size :paragraph-2
-              :style (merge
-                      (get styles :info-text)
-                      {:color (colors/theme-colors
-                               colors/neutral-50
-                               colors/neutral-40)})}
-             (i18n/label
-              :t/community-enter-channel-info)]]))])))

src/quo2/components/counter/__tests__/counter_component_spec.cljs

@@ -1,34 +0,0 @@
-(ns quo2.components.counter.--tests--.counter-component-spec
-  (:require ["@testing-library/react-native" :as rtl]
-            [quo2.components.counter.counter :as counter]
-            [reagent.core :as reagent]))
-
-(defn render-counter
-  ([]
-   (render-counter {} nil))
-  ([opts value]
-   (rtl/render (reagent/as-element  [counter/counter opts value]))))
-
-(js/global.test "default render of counter component"
-                (fn []
-                  (render-counter)
-                  (-> (js/expect  (rtl/screen.getByTestId "counter-component"))
-                      (.toBeTruthy))))
-
-(js/global.test "renders counter with a string value"
-                (fn []
-                  (render-counter {} "1")
-                  (-> (js/expect  (rtl/screen.getByText "1"))
-                      (.toBeTruthy))))
-
-(js/global.test "renders counter with an integer value"
-                (fn []
-                  (render-counter {} 1)
-                  (-> (js/expect  (rtl/screen.getByText "1"))
-                      (.toBeTruthy))))
-
-(js/global.test "renders counter with value 99+ when the value is greater than 99"
-                (fn []
-                  (render-counter {} "100")
-                  (-> (js/expect  (rtl/screen.getByText "99+"))
-                      (.toBeTruthy))))

src/quo2/components/counter/counter.cljs

@@ -20,7 +20,7 @@
 (defn counter
   "type:    default, secondary, grey, outline
    value:   integer"
-  [{:keys [type override-text-color override-bg-color style accessibility-label]} value]
+  [{:keys [type override-text-color override-bg-color style]} value]
   (let [type       (or type :default)
         text-color (or override-text-color
                        (if (or
@@ -38,10 +38,7 @@
                      1     16
                      2     20
                      28)]
-    [rn/view {:test-ID :counter-component
-              :accessible true
-              :accessibility-label accessibility-label
-              :style (cond-> (merge
+    [rn/view {:style (cond-> (merge
                               {:align-items     :center
                                :justify-content :center
                                :border-radius   6

src/quo2/components/dividers/date.cljs

@@ -1,18 +0,0 @@
-(ns quo2.components.dividers.date
-  (:require [react-native.core :as rn]
-            [quo2.components.separator :as separator]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]))
-
-(defn date [value]
-  [rn/view {:margin-vertical 16
-            :padding-right 8
-            :padding-left 62}
-   [text/text {:weight              :medium
-               :accessibility-label :divider-date-text
-               :size :label
-               :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)
-                       :text-transform :capitalize
-                       :margin-bottom 4}}
-    value]
-   [separator/separator]])

src/quo2/components/drawers/__tests__/action_drawers_component_spec.cljs

@@ -1,63 +0,0 @@
-(ns quo2.components.drawers.--tests--.action-drawers-component-spec
-  (:require ["@testing-library/react-native" :as rtl]
-            [quo2.components.drawers.action-drawers :as action-drawer]
-            [reagent.core :as reagent]))
-
-(defn render-action-drawer
-  ([options]
-   (rtl/render (reagent/as-element  [action-drawer/action-drawer options]))))
-
-(js/global.test "action-drawer renders with elements label displaying"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label     "a sample label"}]])
-                  (-> (js/expect  (rtl/screen.getByText  "a sample label"))
-                      (.toBeTruthy))))
-
-(js/global.test "action-drawer renders with elements sub-label displaying"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label    "a sample label"
-                                           :sub-label "a sample sub label"}]])
-                  (-> (js/expect  (rtl/screen.getByText "a sample sub label"))
-                      (.toBeTruthy))))
-
-(js/global.test "action-drawer on click action works on element"
-                (let [event (js/jest.fn)]
-                  (fn []
-                    (render-action-drawer [[{:icon     :i/friend
-                                             :label    "a sample label"
-                                             :on-press event}]])
-                    (rtl/fireEvent.press (rtl/screen.getByText "a sample label"))
-                    (-> (js/expect  event)
-                        (.toHaveBeenCalled)))))
-
-(js/global.test "action-drawer renders two icons when set"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label    "a sample label"
-                                           :right-icon :i/friend
-                                           :accessibility-label :first-element}]])
-                  (-> (js/expect (rtl/screen.getByLabelText "right-icon-for-action"))
-                      (.toBeTruthy))
-                  (-> (js/expect (rtl/screen.queryByLabelText "left-icon-for-action"))
-                      (.toBeTruthy))))
-
-(js/global.test "action-drawer does not render a divider when the add-divider? prop is false"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label    "a sample label"
-                                           :add-divider? false
-                                           :accessibility-label :first-element}]])
-                  (-> (js/expect  (rtl/screen.getAllByLabelText "divider"))
-                      (.not)
-                      (.toBeTruthy))))
-
-(js/global.test "action-drawer renders a divider when the add-divider? prop is true"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label    "a sample label"
-                                           :add-divider? true
-                                           :accessibility-label :first-element}]])
-                  (-> (js/expect  (rtl/screen.getAllByLabelText "divider"))
-                      (.toBeTruthy))))

src/quo2/components/drawers/action_drawers.cljs

@@ -6,19 +6,16 @@
 
 (defn- get-icon-color [danger?]
   (if danger?
-    colors/danger-50
+    (colors/theme-colors colors/danger-50 colors/danger-60)
     (colors/theme-colors colors/neutral-50 colors/neutral-40)))
 
-(def divider
+(defn divider []
   [rn/view {:style {: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-80)
                     :margin-top       8
                     :margin-bottom    7
                     :align-items      :center
-                    :flex-direction   :row}
-            :accessible true
-            :accessibility-label :divider}])
+                    :flex-direction   :row}}])
 
 (defn action [{:keys [icon
                       label
@@ -26,24 +23,16 @@
                       right-icon
                       danger?
                       on-press
-                      add-divider?
-                      accessibility-label] :as action-props}]
+                      add-divider?] :as action-props}]
   (when action-props
     [:<> {:key label}
-     (when add-divider? divider)
-     [rn/touchable-highlight {:accessibility-label accessibility-label
-                              :style          {:border-radius     12
-                                               :height (if sub-label 58 50)
-                                               :margin-horizontal 8}
-                              :underlay-color (colors/theme-colors colors/neutral-5 colors/neutral-90)
-                              :on-press       on-press}
+     (when add-divider? [divider])
+     [rn/touchable-opacity {:on-press on-press}
       [rn/view {:style
-                {:height (if sub-label 58 50)
-                 :margin-horizontal 12
+                {:height            (if sub-label 56 47)
+                 :margin-horizontal 20
                  :flex-direction    :row}}
-       [rn/view {:accessibility-label :left-icon-for-action
-                 :accessible true
-                 :style
+       [rn/view {:style
                  {:height        20
                   :margin-top    :auto
                   :margin-bottom :auto
@@ -74,9 +63,7 @@
                    {:height        20
                     :margin-top    :auto
                     :margin-bottom :auto
-                    :width         20}
-                   :accessible true
-                   :accessibility-label :right-icon-for-action}
+                    :width         20}}
           [icon/icon right-icon
            {:color (get-icon-color danger?)
             :size  20}]])]]]))

src/quo2/components/icons/icons.clj

@@ -1,29 +1,24 @@
 (ns quo2.components.icons.icons
   (:require [clojure.java.io :as io]
-            [clojure.string :as string]))
+            [clojure.string :as cstr]))
 
 (def icon-path "./resources/images/icons2/")
 
-(defn combine-path [path el]
-  (if (System/getenv "COMPONENT_TEST")
-    (str "." path el "@2x.png")
-    (str "." path el ".png")))
-
 (defn require-icon [size path]
   (fn [el]
-    (let [s (combine-path path el)
+    (let [s (str "." path el ".png")
           k (-> el
-                (string/replace "_" "-")
-                (string/replace " " "-")
-                (string/lower-case)
+                (cstr/replace "_" "-")
+                (cstr/replace " " "-")
+                (cstr/lower-case)
                 (str size))]
       [k `(js/require ~s)])))
 
 (defn get-files [path]
   (->> (io/file path)
        file-seq
-       (filter #(string/ends-with? % "png"))
-       (map #(first (string/split (.getName %) #"@")))
+       (filter #(cstr/ends-with? % "png"))
+       (map #(first (cstr/split (.getName %) #"@")))
        distinct))
 
 (defn get-icons [size]

src/quo2/components/info/info_message.cljs

@@ -19,21 +19,19 @@
 (defn info-message
   "[info-message opts \"message\"]
   opts
-  {:type           :default/:success/:error
-   :size           :default/:tiny
-   :icon           :main-icons/info ;; info message icon
-   :text-color     colors/white     ;; text color override
-   :icon-color     colors/white    ;; icon color override
-   :no-icon-color? false       ;; disable tint color for icon"
-  [{:keys [type size icon text-color icon-color no-icon-color?]} message]
+  {:type       :default/:success/:error
+   :size       :default/:tiny
+   :icon       :main-icons/info ;; info message icon
+   :text-color colors/white     ;; text color override
+   :icon-color colors/white     ;; icon color override"
+  [{:keys [type size icon text-color icon-color]} message]
   (let [weight      (if (= size :default) :regular :medium)
         size        (if (= size :default) :paragraph-2 :label)
         text-color  (or text-color (get-color type))
         icon-color  (or icon-color text-color)]
     [rn/view {:style {:flex-direction :row
                       :flex           1}}
-     [quo2.icons/icon icon {:color icon-color
-                            :no-color no-icon-color?
+     [quo2.icons/icon icon {:color           icon-color
                             :size            12
                             :container-style {:margin-top 3}}]
      [text/text {:size   size

src/quo2/components/info/information_box.cljs

@@ -49,12 +49,11 @@
     :closed?         true/false          ;; information box's state
     :id              :information-box-id ;; unique id (required for closable? information box)
     :icon            :main-icons/info    ;; information box icon
-    :no-icon-color?  false               ;; disable tint color for icon
     :style           style
     :button-label    \"PressMe\"         ;; add action button with label
     :on-button-press action              ;; (required for information box with button-label)
     :on-close        on-close            ;; (optional on-close call)"
-  [{:keys [type closable? closed? id icon style button-label on-button-press on-close no-icon-color?]} message]
+  [{:keys [type closable? closed? id icon style button-label on-button-press on-close]} message]
   (let [background-color (get-color-by-type type :bg)
         border-color     (get-color-by-type type :border)
         icon-color       (get-color-by-type type :icon)
@@ -74,8 +73,7 @@
         [info-message/info-message {:size        :default
                                     :icon        icon
                                     :text-color  text-color
-                                    :icon-color  icon-color
-                                    :no-icon-color? no-icon-color?} message]
+                                    :icon-color  icon-color} message]
         (when closable?
           [rn/touchable-opacity
            {:on-press            on-close

src/quo2/components/list_items/channel.cljs

@@ -1,57 +1,56 @@
 (ns quo2.components.list-items.channel
-  (:require [quo2.components.avatars.channel-avatar :as channel-avatar]
+  (:require [react-native.core :as rn]
+            [quo2.foundations.colors :as colors]
             [quo2.components.counter.counter :as quo2.counter]
             [quo2.components.icon :as quo2.icons]
+            [quo2.components.avatars.channel-avatar :as channel-avatar]
             [quo2.components.markdown.text :as quo2.text]
-            [quo2.foundations.colors :as colors]
-            [quo2.theme :as theme]
-            [react-native.core :as rn]))
+            [quo2.theme :as theme]))
 
 (defn list-item [{:keys [name locked? mentions-count unread-messages?
-                         muted? is-active-channel? emoji channel-color on-press]
+                         muted? is-active-channel? emoji channel-color]
                   :or   {channel-color colors/primary-50}}]
-  [rn/touchable-opacity {:on-press on-press}
-   [rn/view {:style (merge {:height          48
-                            :display         :flex
-                            :border-radius   12
-                            :flex-direction  :row
-                            :justify-content :space-between
-                            :align-items     :center
-                            :width           "100%"
-                            :padding-left    12
-                            :padding-right   12}
-                           (when is-active-channel?
-                             {:background-color (colors/theme-alpha channel-color 0.05 0.05)}))}
-    [rn/view {:display         :flex
-              :flex-direction  :row
-              :justify-content :flex-start
-              :align-items     :center}
-     [channel-avatar/channel-avatar
-      {:big?                   true
-       :locked?                locked?
-       :emoji-background-color (colors/theme-alpha channel-color 0.1 0.1)
-       :emoji                  emoji}]
-     [quo2.text/text
-      {:style  (merge {:margin-left 12}
-                      (when (and (not locked?) muted?)
-                        {:color (if (theme/dark?) colors/neutral-60 colors/neutral-40)}))
-       :weight :medium :size :paragraph-1} (str "# " name)]]
-    [rn/view {:style {:height 20}}
-     (when (and (not locked?)
-                muted?)
-       [quo2.icons/icon :i/muted
-        {:size     20
-         :no-color true}])
-     (when (and (not locked?)
-                (not muted?)
-                (pos? (int mentions-count)))
-       [rn/view {:style {:margin-right 2
-                         :margin-top   2}}
-        [quo2.counter/counter {:override-bg-color channel-color} mentions-count]])
-     (when (and (not locked?)
-                (not muted?)
-                (not (pos? (int mentions-count)))
-                unread-messages?)
-       [quo2.icons/icon :i/channel-notification
-        {:size     20
-         :no-color true}])]]])
+  [rn/view {:style (merge {:height          48
+                           :display         :flex
+                           :border-radius   12
+                           :flex-direction  :row
+                           :justify-content :space-between
+                           :align-items     :center
+                           :width           "100%"
+                           :padding-left    12
+                           :padding-right   12}
+                          (when is-active-channel?
+                            {:background-color (colors/theme-alpha channel-color 0.05 0.05)}))}
+   [rn/view {:display         :flex
+             :flex-direction  :row
+             :justify-content :flex-start
+             :align-items     :center}
+    [channel-avatar/channel-avatar
+     {:big?                   true
+      :locked?                locked?
+      :emoji-background-color (colors/theme-alpha channel-color 0.1 0.1)
+      :emoji                  emoji}]
+    [quo2.text/text
+     {:style  (merge {:margin-left 12}
+                     (when (and (not locked?) muted?)
+                       {:color (if (theme/dark?) colors/neutral-60 colors/neutral-40)}))
+      :weight :medium :size :paragraph-1} (str "# " name)]]
+   [rn/view {:style {:height 20}}
+    (when (and (not locked?)
+               muted?)
+      [quo2.icons/icon :i/muted
+       {:size     20
+        :no-color true}])
+    (when (and (not locked?)
+               (not muted?)
+               (pos? (int mentions-count)))
+      [rn/view {:style {:margin-right 2
+                        :margin-top   2}}
+       [quo2.counter/counter {:override-bg-color channel-color} mentions-count]])
+    (when (and (not locked?)
+               (not muted?)
+               (not (pos? (int mentions-count)))
+               unread-messages?)
+      [quo2.icons/icon :i/channel-notification
+       {:size     20
+        :no-color true}])]])

src/quo2/components/list_items/user_list/style.cljs

@@ -0,0 +1,40 @@
+(ns quo2.components.list-items.user-list.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(defn user-list-wrapper [can-be-invited? background-type]
+  (let [height (if can-be-invited? 56 80)]
+    {:width              359
+     :border-radius      12
+     :padding-vertical   8
+     :padding-horizontal 12
+     :height             height
+     :background-color   (case background-type
+                           :5  colors/primary-50-opa-5
+                           :10 colors/primary-50-opa-10
+                           :transparent :transparent)
+     :flex-direction     :column
+     :justify-content    :center}))
+
+(def ml-8 {:margin-left 8})
+
+(def row-centered {:flex-direction :row
+                   :align-items    :center})
+
+(def icon-container-styles {:width           32
+                            :height          32
+                            :border-radius   10
+                            :border-width    1
+                            :border-color    (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10)
+                            :justify-content :center
+                            :align-items     :center})
+
+(def container (assoc row-centered :justify-content :space-between))
+
+(def cant-be-invited {:flex-direction :row
+                      :margin-top     8
+                      :margin-left    40})
+
+(def icon-container {:margin-right 2
+                     :margin-top   2})
+
+(def cant-be-invited-text-style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)})

src/quo2/components/list_items/user_list/view.cljs

@@ -0,0 +1,67 @@
+(ns quo2.components.list-items.user-list.view
+  (:require [quo2.components.avatars.user-avatar :as user-avatar]
+            [quo2.components.icon :as icons]
+            [quo2.components.list-items.user-list.style :as style]
+            [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]
+            [react-native.core :as rn]
+            [quo2.components.selectors.selectors :as selectors]
+            [status-im.multiaccounts.core :as multiaccounts]
+            [status-im.utils.utils :as utils]))
+
+(def ^:private icon-types {:options :i/options
+                           :close   :i/close})
+
+(defn- cant-be-invited-msg []
+  [rn/view {:style               style/cant-be-invited
+            :accessibility-label "user can't be invite"}
+   [icons/icon :i/info {:size            12
+                        :color           colors/neutral-40
+                        :container-style style/icon-container}]
+   [text/text {:weight :regular
+               :size   :label
+               :style  style/cant-be-invited-text-style}
+    "Can’t be invited due to their privacy settings"]])
+
+(defn- right-section [{:keys [id button-type on-press checked?]}]
+  (if (= button-type :checkbox)
+    [selectors/checkbox {:default-checked? checked?}]
+    [rn/touchable-opacity
+     {:on-press            on-press
+      :accessibility-label (str (or id "user-list") "-" (if (= button-type :options)
+                                                          "options"
+                                                          "close"))}
+     [rn/view {:style (when (= button-type :close)
+                        style/icon-container-styles)}
+      [icons/icon (button-type icon-types) {:size            20
+                                            :color           (colors/theme-colors colors/neutral-100 colors/white)}]]]))
+
+(defn- user-info [{:keys [id contact on-press checked? button-type]}]
+  [rn/view {:style style/container}
+   [rn/view style/row-centered
+    [user-avatar/user-avatar {:size              :small
+                              :ring?             true
+                              :online?           true
+                              :profile-picture   (multiaccounts/displayed-photo contact)
+                              :status-indicator? true}]
+    [rn/view {:style style/ml-8}
+     [text/text {:weight :semi-bold
+                 :size   :paragraph-1
+                 :style  {:color (colors/theme-colors colors/neutral-100 colors/white)}} (-> contact
+                                                                                             (multiaccounts/contact-two-names false))]
+     [text/text {:weight :regular
+                 :size   :paragraph-2
+                 :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}} (utils/get-shortened-address (:public-key contact))]]]
+   [right-section {:id          id
+                   :button-type button-type
+                   :on-press    on-press
+                   :checked?    checked?}]])
+
+(defn user-list [{:keys [id contact on-press background-type checked? button-type can-be-invited?]}]
+  [rn/view {:style (style/user-list-wrapper can-be-invited? background-type)}
+   [user-info {:id          id
+               :on-press    on-press
+               :checked?    checked?
+               :button-type button-type
+               :contact     contact}]
+   (when-not can-be-invited? [cant-be-invited-msg])])

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

@@ -9,28 +9,6 @@
 
 (def middle-dot "·")
 
-(defn display-name [{:keys [profile-name nickname ens-name text-style]}]
-  (let [ens?      (-> ens-name string/blank? not)
-        nickname? (-> nickname string/blank? not)]
-    (if ens?
-      [text/text (merge {:weight :semi-bold
-                         :size   :paragraph-2
-                         :style  (style/ens-text)}
-                        text-style)
-       ens-name]
-      [:<>
-       (if nickname?
-         [text/text (merge {:weight :semi-bold
-                            :size   :paragraph-2
-                            :style  (style/nickname-text)}
-                           text-style)
-          nickname]
-         [text/text (merge {:weight :semi-bold
-                            :size   :paragraph-2
-                            :style  (style/profile-name-text nickname?)}
-                           text-style)
-          profile-name])])))
-
 (defn author [{:keys [profile-name nickname chat-key ens-name time-str contact? verified? untrustworthy?]}]
   [:f>
    (fn []
@@ -85,4 +63,4 @@
         [text/text {:monospace true
                     :size      :paragraph-2
                     :style     (style/time-text ens?)}
-         time-str]]))])
+         time-str]]))])

src/quo2/components/messages/system_message.cljs

@@ -1,11 +1,11 @@
 (ns quo2.components.messages.system-message
-  (:require [quo2.components.avatars.icon-avatar :as icon-avatar]
+  (:require [react-native.core :as rn]
+            [react-native.reanimated :as reanimated]
+            [quo2.theme :as theme]
+            [quo2.components.avatars.icon-avatar :as icon-avatar]
             [quo2.components.avatars.user-avatar :as user-avatar]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
-            [quo2.theme :as theme]
-            [react-native.core :as rn]
-            [react-native.reanimated :as reanimated]
             [utils.string :as utils]))
 
 (def themes-landed {:pinned  colors/primary-50-opa-5
@@ -60,19 +60,19 @@
             :flex-direction  :row}
    [rn/view {:align-items    :center
              :flex-direction :row}
-    [sm-icon {:icon    :main-icons/delete
+    [sm-icon {:icon    :main-icons/delete16
               :color   :danger
               :opacity 5}]
     [text/text {:size  :paragraph-2
                 :style {:color        (get-color :text)
                         :margin-right 5}}
-     (or (get labels label) label (:message-deleted labels))]
+     (or label (:message-deleted labels))]
     [sm-timestamp timestamp-str]]])
 
 (defmethod sm-render :added [{:keys [state mentions timestamp-str labels]}]
   [rn/view {:align-items    :center
             :flex-direction :row}
-   [sm-icon {:icon    :main-icons/add-user
+   [sm-icon {:icon    :main-icons/add-user16
              :color   :primary
              :opacity (if (= state :landed) 0 5)}]
    [sm-user-avatar (:image (first mentions))]
@@ -94,7 +94,7 @@
   [rn/view {:flex-direction :row
             :flex           1
             :align-items    :center}
-   [sm-icon {:icon    :main-icons/pin
+   [sm-icon {:icon    :main-icons/pin16
              :color   :primary
              :opacity (if (= state :landed) 0 5)}]
    [rn/view {:flex-direction :column

src/quo2/components/navigation/floating_shell_button.cljs

@@ -14,35 +14,31 @@
       :customization-color customization-color}]))
 
 (defn floating-shell-button
-  "[floating-shell-button dynamic-buttons style opacity-anim pointer-anim]
-  dynamic-buttons {:button-type {:on-press on-press :count count}}
-  style           override style
-  opacity-anim    reanimated value (optional)"
-  ([dynamic-button style]
-   (floating-shell-button dynamic-button style nil))
-  ([dynamic-buttons style opacity-anim]
-   [:f>
-    (fn []
-      (let [original-style (merge {:flex-direction    :row
-                                   :margin-horizontal 12
-                                   :pointer-events    :box-none} style)
-            animated-style (reanimated/apply-animations-to-style
-                            (if opacity-anim
-                              {:opacity opacity-anim} {})
-                            original-style)]
-        [reanimated/view {:style animated-style}
-         ;; Left Section
-         [rn/view {:style {:flex 1}}
-          [dynamic-button-view :search dynamic-buttons {:position :absolute
-                                                        :right    8}]]
-         ;; Mid Section (jump-to)
-         [dynamic-button-view :jump-to dynamic-buttons nil]
+  "[floating-shell-button dynamic-buttons style]
+  dynamic-buttons
+  {:button-type {:on-press on-press :count count}}"
+  [dynamic-buttons style opacity-anim pointer-anim]
+  [:f>
+   (fn []
+     (let [original-style (merge {:flex-direction    :row
+                                  :margin-horizontal 12} style)
+           animated-style (reanimated/apply-animations-to-style
+                           {:opacity        opacity-anim
+                            :pointer-events pointer-anim}
+                           original-style)]
+       [reanimated/view {:style animated-style}
+        ;; Left Section
+        [rn/view {:style {:flex 1}}
+         [dynamic-button-view :search dynamic-buttons {:position :absolute
+                                                       :right    8}]]
+        ;; Mid Section (jump-to)
+        [dynamic-button-view :jump-to dynamic-buttons nil]
         ;; Right Section
-         [rn/view {:style {:flex 1}}
-          [rn/view {:style {:position       :absolute
-                            :flex-direction :row
-                            :right          0}}
-           [dynamic-button-view :mention dynamic-buttons {:margin-left 8}]
-           [dynamic-button-view :notification-down dynamic-buttons {:margin-left 8}]
-           [dynamic-button-view :notification-up dynamic-buttons {:margin-left 8}]
-           [dynamic-button-view :bottom dynamic-buttons {:margin-left 8}]]]]))]))
+        [rn/view {:style {:flex 1}}
+         [rn/view {:style {:position       :absolute
+                           :flex-direction :row
+                           :right          0}}
+          [dynamic-button-view :mention dynamic-buttons {:margin-left 8}]
+          [dynamic-button-view :notification-down dynamic-buttons {:margin-left 8}]
+          [dynamic-button-view :notification-up dynamic-buttons {:margin-left 8}]
+          [dynamic-button-view :bottom dynamic-buttons {:margin-left 8}]]]]))])

src/quo2/components/navigation/page_nav.cljs

@@ -3,9 +3,7 @@
             [quo2.foundations.colors :as colors]
             [quo2.components.icon :as icons]
             [quo2.components.markdown.text :as text]
-            [clojure.string :as string]
-            [quo2.components.buttons.button :as button]
-            [quo2.components.avatars.user-avatar :as user-avatar]))
+            [clojure.string :as string]))
 
 (def ^:private centrify-style
   {:display         :flex
@@ -14,10 +12,12 @@
 
 (def ^:private align-left (assoc centrify-style :align-items :flex-start))
 
+(def ^:private icon-styles (assoc centrify-style :width 32 :height 32 :border-radius 10))
+
 (defn- big? [size] (= size :big))
 
 (defn- icon-props [color size]
-  (merge {:size            20
+  (merge {:size      20
           :container-style {:width  (if (big? size)
                                       20
                                       16)
@@ -28,35 +28,34 @@
            {:color color}
            {:no-color true})))
 
-(defn left-section-view [{:keys [on-press icon accessibility-label type] :or {type :grey}}
-                         put-middle-section-on-left?]
-  [rn/view {:style (when put-middle-section-on-left? {:margin-right 5})}
-   [button/button {:on-press            on-press
-                   :icon                true
-                   :type                type
-                   :size                32
-                   :accessibility-label accessibility-label}
-    icon]])
+(defn render-left-section [{:keys [on-press icon
+                                   icon-color icon-background-color]}
+                           put-middle-section-on-left?]
+  [rn/view {:style (merge
+                    icon-styles
+                    {:background-color icon-background-color
+                     :width            32
+                     :height           32}
+                    (when put-middle-section-on-left? {:margin-right 5}))}
+   [rn/touchable-opacity {:on-press on-press}
+    [icons/icon icon (icon-props icon-color :big)]]])
 
 (defn- mid-section-comp
-  [{:keys [description-img description-user-icon horizontal-description?
-           text-secondary-color align-mid? text-color icon main-text type description]}]
-  [rn/view {:style (assoc centrify-style
-                          :flex-direction :row
-                          :margin-horizontal 2)}
+  [{:keys [description-user-icon horizontal-description? text-secondary-color align-mid? text-color icon main-text type description]}]
+  [rn/view {:style (assoc
+                    centrify-style
+                    :flex-direction    :row
+                    :margin-horizontal 2)}
    (when (or (and (not horizontal-description?)
                   align-mid?
                   (not= :text-with-description type))
-             (and (or description-img description-user-icon)
+             (and description-user-icon
                   (not icon)))
-     (if description-img
-       [rn/view {:margin-right 8}
-        [description-img]]
-       [rn/image {:source {:uri description-user-icon}
-                  :style  {:width         32
-                           :height        32
-                           :border-radius 32
-                           :margin-right  8}}]))
+     [rn/image {:source {:uri description-user-icon}
+                :style  {:width         32
+                         :height        32
+                         :border-radius 32
+                         :margin-right  8}}])
    [rn/view {:style {:flex-direction (if horizontal-description?
                                        :row
                                        :column)}}
@@ -74,69 +73,76 @@
                             horizontal-description? (assoc :margin-left 4 :margin-top 2))}
        description])]])
 
-(defn- mid-section-view
+(defn- render-mid-section
   [{:keys [horizontal-description? one-icon-align-left? type left-align?
-           main-text right-icon main-text-icon-color left-icon on-press avatar] :as props}]
-  (let [text-color (if (colors/dark?) colors/neutral-5 colors/neutral-95)
-        text-secondary-color (if (colors/dark?) colors/neutral-40 colors/neutral-50)
+           main-text right-icon main-text-icon-color left-icon] :as props}]
+  (let [text-color                (if (colors/dark?) colors/neutral-5 colors/neutral-95)
+        text-secondary-color      (if (colors/dark?) colors/neutral-40 colors/neutral-50)
         component-instance [mid-section-comp (assoc props :text-secondary-color text-secondary-color)]]
-    [rn/touchable-opacity {:on-press on-press}
-     [rn/view {:style (merge
-                       (if left-align?
-                         align-left
-                         centrify-style)
-                       {:flex                1
-                        :margin-left         4
-                        :text-align-vertical :center})}
-      (case type
-        :text-only [text/text {:size   :paragraph-1
-                               :weight :semi-bold
-                               :style  {:color text-color}}
-                    main-text]
-        :user-avatar [rn/view {:style (assoc centrify-style :flex-direction :row)}
-                      [user-avatar/user-avatar avatar]
-                      [text/text {:size   :paragraph-1
-                                  :weight :semi-bold
-                                  :style  {:padding-horizontal 4
-                                           :color              text-color}}
-                       main-text]]
-        :text-with-two-icons [rn/view {:style (assoc centrify-style :flex-direction :row)}
-                              [icons/icon left-icon
-                               (icon-props main-text-icon-color :big)]
-                              [text/text {:size   :paragraph-1
-                                          :weight :semi-bold
-                                          :style  {:padding-horizontal 4
-                                                   :color              text-color}}
-                               main-text]
-                              [icons/icon right-icon
-                               (icon-props main-text-icon-color :big)]]
-        :text-with-one-icon [rn/view {:style {:flex-direction :row}}
-                             (if one-icon-align-left?
-                               [rn/view {:style {:flex-direction :row
-                                                 :align-items    :center}}
-                                (when horizontal-description?
-                                  [icons/icon left-icon
-                                   (icon-props main-text-icon-color :big)])
-                                component-instance]
-                               [rn/view {:style {:flex-direction :row
-                                                 :align-items    :center}}
-                                component-instance
-                                (when horizontal-description?
-                                  [icons/icon left-icon
-                                   (icon-props main-text-icon-color :big)])])]
-        :text-with-description component-instance)]]))
+    [rn/view {:style (merge
+                      (if left-align?
+                        align-left
+                        centrify-style)
+                      {:flex                1
+                       :margin-left         4
+                       :text-align-vertical :center})}
+     (case type
+       :text-only [text/text {:size   :paragraph-1
+                              :weight :semi-bold
+                              :style  {:color text-color}}
+                   main-text]
+       :text-with-two-icons [rn/view {:style (assoc centrify-style :flex-direction :row)}
+                             [icons/icon left-icon
+                              (icon-props main-text-icon-color :big)]
+                             [text/text {:size   :paragraph-1
+                                         :weight :semi-bold
+                                         :style  {:padding-horizontal 4
+                                                  :color              text-color}}
+                              main-text]
 
-(defn- right-section-view [right-section-buttons]
-  [rn/view {:style (assoc centrify-style
-                          :flex-direction :row
-                          :flex 1
-                          :justify-content :flex-end)}
+                             [icons/icon right-icon
+                              (icon-props main-text-icon-color :big)]]
+       :text-with-one-icon   [rn/view {:style {:flex-direction :row}}
+                              (if one-icon-align-left?
+                                [rn/view {:style {:flex-direction :row
+                                                  :align-items    :center}}
+                                 (when horizontal-description?
+                                   [icons/icon left-icon
+                                    (icon-props main-text-icon-color :big)])
+                                 component-instance]
+                                [rn/view {:style {:flex-direction :row
+                                                  :align-items :center}}
+                                 component-instance
+                                 (when horizontal-description?
+                                   [icons/icon left-icon
+                                    (icon-props main-text-icon-color :big)])])]
+       :text-with-description component-instance)]))
+
+(defn- right-section-icon
+  [{:keys [background-color icon icon-color push-to-the-left?] :or {push-to-the-left? false}}]
+  [rn/view {:style (assoc
+                    icon-styles
+                    :background-color background-color
+                    :width            32
+                    :height           32
+                    :margin-right (if push-to-the-left? 8 0))}
+   [icons/icon icon (icon-props icon-color :big)]])
+
+(defn- render-right-section [right-section-buttons]
+  [rn/view {:style (assoc
+                    centrify-style
+                    :flex-direction :row
+                    :flex           1
+                    :justify-content :flex-end)}
    (let [last-icon-index (-> right-section-buttons count dec)]
-     (map-indexed (fn [index {:keys [icon on-press type] :or {type :grey}}]
+     (map-indexed (fn [index {:keys [icon background-color icon-color on-press]}]
                     ^{:key index}
-                    [rn/view {:style {:margin-right (if (not= index last-icon-index) 8 0)}}
-                     [button/button {:on-press on-press :icon true :type type :size 32}
-                      icon]])
+                    [rn/touchable-opacity {:on-press on-press}
+                     [right-section-icon
+                      {:icon             icon
+                       :background-color background-color
+                       :icon-color       icon-color
+                       :push-to-the-left? (not= index last-icon-index)}]])
                   right-section-buttons))])
 
 (defn page-nav
@@ -148,7 +154,7 @@
      :page-nav-color          color
      :page-nav-background-uri image-uri
      :mid-section 
-     {:type                  one-of :text-only :text-with-two-icons :text-with-one-icon :text-with-description :user-avatar
+     {:type                  one-of :text-only :text-with-two-icons :text-with-one-icon :text-with-description
       :icon                  icon
       :main-text             string
       :left-icon             icon       
@@ -157,19 +163,16 @@
       :description-color     color
       :description-icon      icon
       :description-user-icon icon
-      :description-img a render prop which will be used in place of :description-user-icon
       :main-text-icon-color  color
      }
      :left-section 
-     {:type                  button-type
-      :on-press              event
+     {:on-press              event
       :icon                  icon 
       :icon-color            color
       :icon-background-color color
      }
      :right-section-buttons vector of 
-      {:type                  button-type
-       :on-press              event
+      {:on-press              event
        :icon                  icon
        :icon-color            color 
        :icon-background-color color
@@ -186,35 +189,32 @@
         mid-section-props
         {:type                    (:type mid-section)
          :horizontal-description? horizontal-description?
-         :description-img         (:description-img mid-section)
          :main-text               (:main-text mid-section)
          :main-text-icon-color    (:main-text-icon-color mid-section)
          :one-icon-align-left?    one-icon-align-left?
          :right-icon              (:right-icon mid-section)
          :icon                    (:icon mid-section)
-         :left-icon               (:left-icon mid-section)
-         :avatar                  (:avatar mid-section)}]
+         :left-icon               (:left-icon mid-section)}]
     [rn/view {:style (cond-> {:display            :flex
                               :flex-direction     :row
                               ;;  iPhone 11 Pro's height in Figma divided by Component height 56/1125
                               :align-items        :center
                               :padding-horizontal 20
-                              :height             56
                               :justify-content    :space-between}
                        page-nav-background-uri (assoc :background-color page-nav-color)
                        page-nav-color (assoc :background page-nav-background-uri))}
      [rn/view {:style {:flex           1
                        :flex-direction :row
                        :align-items    :center}}
-      [left-section-view left-section put-middle-section-on-left?]
+      (render-left-section left-section put-middle-section-on-left?)
       (when put-middle-section-on-left?
-        [mid-section-view (assoc mid-section-props
-                                 :left-align? true
-                                 :description (:description mid-section)
-                                 :description-color (:description-color mid-section)
-                                 :description-icon (:description-icon mid-section)
-                                 :align-mid? align-mid?
-                                 :description-user-icon (:description-user-icon mid-section))])]
+        [render-mid-section (assoc mid-section-props
+                                   :left-align?                       true
+                                   :description           (:description mid-section)
+                                   :description-color     (:description-color mid-section)
+                                   :description-icon      (:description-icon mid-section)
+                                   :align-mid?                        align-mid?
+                                   :description-user-icon (:description-user-icon mid-section))])]
      (when-not put-middle-section-on-left?
-       [mid-section-view mid-section-props])
-     [right-section-view right-section-buttons]]))
+       [render-mid-section mid-section-props])
+     (render-right-section right-section-buttons)]))

src/quo2/components/navigation/top_nav.cljs

@@ -0,0 +1,99 @@
+(ns quo2.components.navigation.top-nav
+  (:require [react-native.core :as rn]
+            [quo2.foundations.colors :as colors]
+            [quo2.components.counter.counter :as counter]
+            [quo2.components.buttons.button :as quo2.button]
+            [quo2.components.avatars.user-avatar :as user-avatar]
+            [react-native.hole-view :as hole-view]))
+
+(defn- get-button-common-props [type]
+  (let [default? (= type :default)
+        dark?    (colors/dark?)]
+    {:icon                      true
+     :size                      32
+     :style                     {:margin-left 12}
+     :type                      (if default?
+                                  (if dark? :grey :dark-grey)
+                                  type)
+     :override-background-color (when (and dark? default?)
+                                  colors/neutral-90)}))
+
+(defn- base-button [icon on-press accessibility-label button-common-props]
+  [quo2.button/button
+   (merge
+    {:on-press            on-press
+     :accessibility-label accessibility-label}
+    button-common-props)
+   icon])
+
+(defn top-nav
+  "[top-nav opts]
+  opts
+  {:type                   :default/:blurred/:shell
+   :new-notifications?     true/false
+   :notification-indicator :unread-dot/:counter
+   :open-profile           fn
+   :open-search            fn
+   :open-scanner           fn
+   :show-qr                fn
+   :open-activity-center   fn
+   :style                  override-style
+   :avatar                 user-avatar
+   :counter-label          number}
+  "
+  [{:keys [type new-notifications? notification-indicator open-profile open-search
+           open-scanner show-qr open-activity-center style avatar counter-label]}]
+  (let [button-common-props (get-button-common-props type)]
+    [rn/view {:style (merge
+                      {:height 56}
+                      style)}
+   ;; Left Section
+     [rn/touchable-without-feedback {:on-press open-profile}
+      [rn/view {:style {:position :absolute
+                        :left     20
+                        :top      12}}
+       [user-avatar/user-avatar
+        (merge
+         {:ring?             true
+          :status-indicator? true
+          :size              :small}
+         avatar)]]]
+   ;; Right Section
+     [rn/view {:style {:position :absolute
+                       :right    20
+                       :top      12
+                       :flex-direction :row}}
+      ;; TODO component shouldn't know anything about parent system, we should pass buttons as parameters
+      [base-button :i/search open-search :open-search-button button-common-props]
+      [base-button :i/scan open-scanner :open-scanner-button button-common-props]
+      [base-button :i/qr-code show-qr :show-qr-button button-common-props]
+      [rn/view ;; Keep view instead of "[:<>" to make sure relative
+               ;; position is calculated from this view instead of its parent
+       [hole-view/hole-view {:key   new-notifications? ;; Key is required to force removal of holes
+                             :holes (cond
+                                      (not new-notifications?) ;; No new notifications, remove holes
+                                      []
+
+                                      (= notification-indicator :unread-dot)
+                                      [{:x 37 :y -3 :width 10 :height 10 :borderRadius 5}]
+
+                                      :else
+                                      [{:x 33 :y -7 :width 18 :height 18 :borderRadius 7}])}
+        [base-button :i/activity-center open-activity-center
+         :open-activity-center-button button-common-props]]
+       (when new-notifications?
+         (if (= notification-indicator :counter)
+           [counter/counter {:outline             false
+                             :override-text-color colors/white
+                             :override-bg-color   colors/primary-50
+                             :style               {:position :absolute
+                                                   :left     34
+                                                   :top      -6}}
+            counter-label]
+           [rn/view {:style {:width            8
+                             :height           8
+                             :border-radius    4
+                             :top             -2
+                             :left             38
+                             :position         :absolute
+                             :background-color colors/primary-50}}]))]]]))

src/quo2/components/notifications/activity_log/view.cljs

@@ -64,8 +64,7 @@
                       (map (fn [s]
                              [rn/view {:style {:margin-right 4
                                                :margin-top   0}}
-                              [text/text {:size  :paragraph-2
-                                          :style {:color colors/white}}
+                              [text/text {:size :paragraph-2}
                                s]])
                            (string/split detail #"\s+"))
                       [[rn/view {:margin-right 4

src/quo2/components/notifications/count_down_circle.cljs

@@ -1,106 +0,0 @@
-(ns quo2.components.notifications.count-down-circle
-  (:require
-   [goog.string             :as gstring]
-   [quo2.foundations.colors :as colors]
-   [quo2.theme              :as theme]
-   [react-native.core       :as rn]
-   [react-native.svg        :as svg]
-   [reagent.core            :as reagent]))
-
-(defn- get-path-props
-  [size stroke-width rotation]
-  (let [half-size          (/ size 2)
-        half-stroke-width  (/ stroke-width 2)
-        arc-radius         (- half-size half-stroke-width)
-        arc-diameter       (* arc-radius 2)
-        rotation-indicator (if (= rotation :clockwise) "1,0" "0,1")
-        path-length        (* js/Math.PI arc-diameter)
-        path               (gstring/format
-                            "m %s,%s a %s,%s 0 %s 0,%s a %s,%s 0 %s 0 ,-%s"
-                            half-size
-                            half-stroke-width
-                            arc-radius
-                            arc-radius
-                            rotation-indicator
-                            arc-diameter
-                            arc-radius
-                            arc-radius
-                            rotation-indicator
-                            arc-diameter)]
-    {:path        path
-     :path-length path-length}))
-
-(defn- linear-ease
-  [time start goal duration]
-  (if (zero? duration)
-    start
-    (-> time
-        (/ duration)
-        (* goal)
-        (+ start))))
-
-(defn- get-start-at
-  [duration initial-remaining-time]
-  (cond (or (zero? duration) (= duration initial-remaining-time)) 0
-        (number? initial-remaining-time)                          (- duration initial-remaining-time)
-        :else                                                     0))
-
-(def ^:private themes
-  {:color {:light colors/neutral-80-opa-40
-           :dark  colors/white-opa-40}})
-
-(defn circle-timer
-  [{:keys [color duration size stroke-width trail-color rotation initial-remaining-time]}]
-  (let [rotation                     (or rotation :clockwise)
-        duration                     (or duration 4)
-        stroke-width                 (or stroke-width 1)
-        size                         (or size 9)
-        max-stroke-width             (max stroke-width 0)
-        {:keys [path path-length]}   (get-path-props size max-stroke-width rotation)
-        start-at                     (get-start-at duration initial-remaining-time)
-        elapsed-time                 (reagent/atom 0)
-        prev-frame-time              (reagent/atom nil)
-        frame-request                (reagent/atom nil)
-        display-time                 (reagent/atom start-at)
-        ;; get elapsed frame time
-        swap-elapsed-time-each-frame (fn swap-elapsed-time-each-frame [frame-time]
-                                       (if (nil? @prev-frame-time)
-                                         (do (reset! prev-frame-time frame-time)
-                                             (reset! frame-request (js/requestAnimationFrame
-                                                                    swap-elapsed-time-each-frame)))
-                                         (let [delta                (- (/ frame-time 1000)
-                                                                       (/ @prev-frame-time 1000))
-                                               current-elapsed      (swap! elapsed-time + delta)
-                                               current-display-time (+ start-at current-elapsed)
-                                               completed?           (>= current-display-time duration)]
-                                           (reset! display-time (if completed?
-                                                                  duration
-                                                                  current-display-time))
-                                           (when-not completed?
-                                             (reset! prev-frame-time frame-time)
-                                             (reset! frame-request (js/requestAnimationFrame
-                                                                    swap-elapsed-time-each-frame))))))]
-    (reagent/create-class
-     {:component-will-unmount #(js/cancelAnimationFrame @frame-request)
-      :reagent-render
-      (fn []
-        (reset! frame-request (js/requestAnimationFrame swap-elapsed-time-each-frame))
-        [rn/view
-         {:style {:position :relative
-                  :width    size
-                  :height   size}}
-         [svg/svg
-          {:view-box (str "0 0 " size " " size)
-           :width    size
-           :height   size}
-          [svg/path
-           {:d path :fill :none :stroke (or trail-color :transparent) :stroke-width stroke-width}]
-          (when-not (= @display-time duration)
-            [svg/path
-             {:d                 path
-              :fill              :none
-              :stroke            (or color (get-in themes [:color (theme/get-theme)]))
-              :stroke-linecap    :square
-              :stroke-width      stroke-width
-              :stroke-dasharray  path-length
-              :stroke-dashoffset (linear-ease @display-time 0 path-length duration)}])]])})))

src/quo2/components/notifications/info_count.cljs

@@ -10,8 +10,6 @@
                              :position         :absolute
                              :right            22
                              :border-radius    6
-                             :justify-content  :center
-                             :align-items      :center
                              :background-color (colors/theme-colors colors/primary-50 colors/primary-60)}
                             style)}
      [rn/text {:style (merge typography/font-medium typography/label {:color colors/white :text-align :center})} count]]))

src/quo2/components/notifications/toast.cljs

@@ -1,82 +0,0 @@
-(ns quo2.components.notifications.toast
-  (:require
-   [i18n.i18n                                       :as i18n]
-   [quo2.components.icon                            :as icon]
-   [quo2.components.markdown.text                   :as text]
-   [quo2.components.notifications.count-down-circle :as count-down-circle]
-   [quo2.foundations.colors                         :as colors]
-   [quo2.theme                                      :as theme]
-   [react-native.core                               :as rn]))
-
-(def ^:private themes
-  {:container        {:light {:background-color colors/white-opa-70}
-                      :dark  {:background-color colors/neutral-80-opa-70}}
-   :text             {:light {:color colors/neutral-100}
-                      :dark  {:color colors/white}}
-   :icon             {:light {:color colors/neutral-100}
-                      :dark  {:color colors/white}}
-   :action-container {:light {:background-color :colors/neutral-80-opa-5}
-                      :dark  {:background-color :colors/white-opa-5}}})
-
-(defn- merge-theme-style
-  [component-key styles]
-  (merge (get-in themes [component-key (theme/get-theme)]) styles))
-
-(defn toast-action-container
-  [{:keys [on-press style]} & children]
-  [rn/touchable-highlight {:on-press on-press}
-   [into
-    [rn/view
-     {:style (merge
-              {:flex-direction     :row
-               :padding-vertical   3
-               :padding-horizontal 8
-               :align-items        :center
-               :border-radius      8
-               :background-color   (get-in themes
-                                           [:action-container (theme/get-theme)
-                                            :background-color])}
-              style)}]
-    children]])
-
-(defn toast-undo-action
-  [duration on-press]
-  [toast-action-container {:on-press on-press}
-   [rn/view {:style {:margin-right 5}}
-    [count-down-circle/circle-timer {:duration duration}]]
-   [text/text
-    {:size :paragraph-2 :weight :medium :style (merge-theme-style :text {})}
-    [i18n/label :undo]]])
-
-(defn- toast-container
-  [{:keys [left middle right]}]
-  [rn/view {:style {:padding-left 12 :padding-right 12}}
-   [rn/view
-    {:style (merge-theme-style :container
-                               {:flex-direction   :row
-                                :width            "100%"
-                                :margin           :auto
-                                :justify-content  :space-between
-                                :padding-vertical 8
-                                :padding-left     10
-                                :padding-right    8
-                                :border-radius    12})}
-    [rn/view {:style {:padding 2}} left]
-    [rn/view {:style {:padding 4 :flex 1}}
-     [text/text
-      {:size :paragraph-2 :weight :medium :style (merge-theme-style :text {})}
-      middle]]
-    (when right right)]])
-
-(defn toast
-  [{:keys [icon icon-color text action undo-duration undo-on-press]}]
-  [toast-container
-   {:left   (when icon
-              [icon/icon icon
-               {:container-style {:width 20 :height 20}
-                :color           (or icon-color
-                                     (get-in themes [:icon (theme/get-theme) :color]))}])
-    :middle text
-    :right  (if undo-duration
-              [toast-undo-action undo-duration undo-on-press]
-              action)}])

src/quo2/components/record_audio/record_audio/style.cljs

@@ -1,212 +0,0 @@
-(ns quo2.components.record-audio.record-audio.style
-  (:require [quo2.foundations.colors :as colors]
-            [react-native.reanimated :as reanimated]))
-
-(defn animated-circle [scale opacity color]
-  (reanimated/apply-animations-to-style
-   {:transform [{:scale scale}]
-    :opacity   opacity}
-   {:width           56
-    :height          56
-    :border-width    1
-    :border-color    color
-    :border-radius   28
-    :position        :absolute
-    :justify-content :center
-    :align-items     :center
-    :z-index         0}))
-
-(defn record-button-big-container [translate-x translate-y opacity]
-  (reanimated/apply-animations-to-style
-   {:transform [{:translateY translate-y}
-                {:translateX translate-x}]
-    :opacity    opacity}
-   {:position        :absolute
-    :bottom          0
-    :right           0
-    :width           96
-    :height          96
-    :align-items     :center
-    :justify-content :center
-    :z-index         0}))
-
-(defn record-button-big-body [button-color]
-  {:width            56
-   :height           56
-   :border-radius    28
-   :justify-content  :center
-   :align-items      :center
-   :background-color button-color
-   :overflow         :hidden})
-
-(defn record-button-big-red-overlay [red-overlay-opacity]
-  (reanimated/apply-animations-to-style
-   {:opacity red-overlay-opacity}
-   {:position         :absolute
-    :top              0
-    :left             0
-    :right            0
-    :bottom           0
-    :background-color colors/danger-50}))
-
-(defn record-button-big-gray-overlay [gray-overlay-opacity]
-  (reanimated/apply-animations-to-style
-   {:opacity gray-overlay-opacity}
-   {:position         :absolute
-    :top              0
-    :left             0
-    :right            0
-    :bottom           0
-    :background-color (colors/theme-colors colors/neutral-80-opa-5-opaque colors/neutral-80)}))
-
-(defn record-button-big-icon-container [icon-opacity]
-  (reanimated/apply-animations-to-style
-   {:opacity icon-opacity}
-   {}))
-
-(def stop-icon
-  {:width            13
-   :height           13
-   :border-radius    4
-   :background-color colors/white})
-
-(defn send-button-container [opacity]
-  (reanimated/apply-animations-to-style
-   {:opacity opacity}
-   {:justify-content :center
-    :align-items     :center
-    :position        :absolute
-    :width           56
-    :height          56
-    :top             0
-    :right           20}))
-
-(defn send-button-connector [opacity width height border-radius-first-half border-radius-second-half]
-  (reanimated/apply-animations-to-style
-   {:opacity                    opacity
-    :width                      width
-    :height                     height
-    :border-bottom-left-radius  border-radius-second-half
-    :border-top-left-radius     border-radius-first-half
-    :border-top-right-radius    border-radius-first-half
-    :border-bottom-right-radius border-radius-second-half}
-   {:justify-content  :center
-    :align-items      :center
-    :align-self       :center
-    :background-color colors/primary-50
-    :z-index          0}))
-
-(defn send-button [translate-y opacity]
-  (reanimated/apply-animations-to-style
-   {:transform [{:translateY translate-y}]
-    :opacity   opacity}
-   {:justify-content  :center
-    :align-items      :center
-    :background-color colors/primary-50
-    :width            32
-    :height           32
-    :border-radius    16
-    :position         :absolute
-    :top              0
-    :right            32
-    :z-index          10}))
-
-(def send-icon-container
-  {:z-index 10})
-
-(defn lock-button-container [opacity]
-  (reanimated/apply-animations-to-style
-   {:opacity opacity}
-   {:transform       [{:rotate "45deg"}]
-    :justify-content :center
-    :align-items     :center
-    :position        :absolute
-    :width           56
-    :height          56
-    :top             20
-    :left            20}))
-
-(defn lock-button-connector [opacity width height border-radius-first-half border-radius-second-half]
-  (reanimated/apply-animations-to-style
-   {:opacity                    opacity
-    :width                      width
-    :height                     height
-    :border-bottom-left-radius  border-radius-first-half
-    :border-top-left-radius     border-radius-first-half
-    :border-top-right-radius    border-radius-second-half
-    :border-bottom-right-radius border-radius-second-half}
-   {:justify-content  :center
-    :align-items      :center
-    :align-self       :center
-    :background-color (colors/theme-colors colors/neutral-80-opa-5-opaque colors/neutral-80)
-    :overflow         :hidden}))
-
-(defn lock-button [translate-x-y opacity]
-  (reanimated/apply-animations-to-style
-   {:transform [{:translateX translate-x-y}
-                {:translateY translate-x-y}]
-    :opacity   opacity}
-   {:width            32
-    :height           32
-    :justify-content  :center
-    :align-items      :center
-    :background-color (colors/theme-colors colors/neutral-80-opa-5-opaque colors/neutral-80)
-    :border-radius    16
-    :position         :absolute
-    :top              24
-    :left             24
-    :overflow         :hidden
-    :z-index          12}))
-
-(defn delete-button-container [opacity]
-  (reanimated/apply-animations-to-style
-   {:opacity opacity}
-   {:justify-content :center
-    :align-items     :center
-    :position        :absolute
-    :width           56
-    :height          56
-    :bottom          20
-    :left            0}))
-
-(defn delete-button-connector [opacity width height border-radius-first-half border-radius-second-half]
-  (reanimated/apply-animations-to-style
-   {:opacity                    opacity
-    :width                      width
-    :height                     height
-    :border-bottom-left-radius  border-radius-first-half
-    :border-top-left-radius     border-radius-first-half
-    :border-top-right-radius    border-radius-second-half
-    :border-bottom-right-radius border-radius-second-half}
-   {:justify-content  :center
-    :align-items      :center
-    :align-self       :center
-    :background-color colors/danger-50
-    :z-index          0}))
-
-(defn delete-button [translate-x opacity]
-  (reanimated/apply-animations-to-style
-   {:transform [{:translateX translate-x}]
-    :opacity   opacity}
-   {:width            32
-    :height           32
-    :justify-content  :center
-    :align-items      :center
-    :background-color colors/danger-50
-    :border-radius    16
-    :position         :absolute
-    :top              76
-    :left             0
-    :z-index          11}))
-
-(defn record-button-container [opacity]
-  (reanimated/apply-animations-to-style
-   {:opacity       opacity}
-   {:margin-bottom 32
-    :margin-right  32}))
-
-(def input-container
-  {:width           140
-   :height          140
-   :align-items     :flex-end
-   :justify-content :flex-end})

src/quo2/components/record_audio/record_audio/view.cljs

@@ -1,553 +0,0 @@
-(ns quo2.components.record-audio.record-audio.view
-  (:require [quo.react :refer [memo effect!]]
-            [react-native.core :as rn]
-            [quo2.foundations.colors :as colors]
-            [quo2.components.icon :as icons]
-            [quo2.components.buttons.button :as button]
-            [react-native.reanimated :as reanimated]
-            [reagent.core :as reagent]
-            [cljs-bean.core :as bean]
-            [quo2.components.record-audio.record-audio.style :as style]
-            [status-im.utils.utils :as utils]
-            [oops.core :as  oops]))
-
-(def ^:private scale-to-each 1.8)
-(def ^:private scale-to-total 2.6)
-(def ^:private scale-padding 0.16)
-(def ^:private opacity-from-lock 1)
-(def ^:private opacity-from-default 0.5)
-(def ^:private signal-anim-duration 3900)
-(def ^:private signal-anim-duration-2 1950)
-
-(def ^:private animated-ring
-  (reagent/adapt-react-class
-   (memo
-    (fn [props]
-      (let [{:keys [scale opacity color]} (bean/bean props)]
-        (reagent/as-element
-         [reanimated/view {:style (style/animated-circle scale opacity color)}]))))))
-
-(def ^:private record-button-area-big
-  {:width  56
-   :height 56
-   :x      64
-   :y      64})
-
-(def ^:private record-button-area
-  {:width  48
-   :height 48
-   :x      68
-   :y      68})
-
-(defn- delete-button-area [active?]
-  {:width  (if active? 72 82)
-   :height 56
-   :x      (if active? -16 -32)
-   :y      (if active? 64 70)})
-
-(defn- lock-button-area [active?]
-  {:width  (if active? 72 100)
-   :height (if active? 72 102)
-   :x      -32
-   :y      -32})
-
-(defn- send-button-area [active?]
-  {:width  56
-   :height (if active? 72 92)
-   :x      68
-   :y      (if active? -16 -32)})
-
-(defn- touch-inside-area? [{:keys [location-x location-y ignore-min-y? ignore-max-y? ignore-min-x? ignore-max-x?]}
-                           {:keys [width height x y]}]
-  (let [max-x (+ x width)
-        max-y (+ y height)]
-    (and
-     (and
-      (or ignore-min-x? (>= location-x x))
-      (or ignore-max-x? (<= location-x max-x)))
-     (and
-      (or ignore-min-y? (>= location-y y))
-      (or ignore-max-y? (<= location-y max-y))))))
-
-(def record-audio-worklets (js/require "../src/js/record_audio_worklets.js"))
-
-(defn- ring-scale [scale substract]
-  (.ringScale ^js record-audio-worklets
-              scale
-              substract))
-
-(defn- record-button-big [recording? ready-to-send? ready-to-lock? ready-to-delete? record-button-is-animating? record-button-at-initial-position? locked? reviewing-audio? recording-timer recording-length-ms clear-timeout touch-active?]
-  [:f>
-   (fn []
-     (let [scale                (reanimated/use-shared-value 1)
-           opacity              (reanimated/use-shared-value 0)
-           opacity-from         (if @ready-to-lock? opacity-from-lock opacity-from-default)
-           animations           (map
-                                 (fn [index]
-                                   (let [ring-scale (ring-scale scale (* scale-padding index))]
-                                     {:scale ring-scale
-                                      :opacity (reanimated/interpolate ring-scale [1 scale-to-each] [opacity-from 0])}))
-                                 (range 0 5))
-           rings-color          (cond
-                                  @ready-to-lock? (colors/theme-colors colors/neutral-80-opa-5-opaque colors/neutral-80)
-                                  @ready-to-delete? colors/danger-50
-                                  :else colors/primary-50)
-           translate-y          (reanimated/use-shared-value 0)
-           translate-x          (reanimated/use-shared-value 0)
-           button-color         colors/primary-50
-           icon-color           (if (and (not (colors/dark?)) @ready-to-lock?) colors/black colors/white)
-           icon-opacity         (reanimated/use-shared-value 1)
-           red-overlay-opacity  (reanimated/use-shared-value 0)
-           gray-overlay-opacity (reanimated/use-shared-value 0)
-           complete-animation   (fn []
-                                  (cond
-                                    (and @ready-to-lock? (not @record-button-is-animating?))
-                                    (do
-                                      (reset! locked? true)
-                                      (reset! ready-to-lock? false))
-                                    (and (not @locked?) (not @reviewing-audio?))
-                                    (do
-                                      (reset! recording? false)
-                                      (reset! ready-to-send? false)
-                                      (reset! ready-to-delete? false)
-                                      (reset! ready-to-lock? false)
-                                      (utils/clear-interval @recording-timer)
-                                      (reset! recording-length-ms 0))))
-           start-animation      (fn []
-                                  (reanimated/set-shared-value opacity 1)
-                                  (reanimated/animate-shared-value-with-timing scale 2.6 signal-anim-duration :linear)
-                                  ;; TODO: Research if we can implement this with withSequence method from Reanimated 2
-                                  ;; GitHub issue [#14561]: https://github.com/status-im/status-mobile/issues/14561
-                                  (reset! clear-timeout (utils/set-timeout #(do (reanimated/set-shared-value scale scale-to-each)
-                                                                                (reanimated/animate-shared-value-with-delay-repeat scale scale-to-total signal-anim-duration-2 :linear 0 -1))
-                                                                           signal-anim-duration)))
-           stop-animation       (fn []
-                                  (reanimated/set-shared-value opacity 0)
-                                  (reanimated/cancel-animation scale)
-                                  (reanimated/set-shared-value scale 1)
-                                  (when @clear-timeout (utils/clear-timeout @clear-timeout)))
-           start-y-animation    (fn []
-                                  (reset! record-button-at-initial-position? false)
-                                  (reset! record-button-is-animating? true)
-                                  (reanimated/animate-shared-value-with-timing translate-y -64 250 :easing1)
-                                  (reanimated/animate-shared-value-with-delay icon-opacity 0 33.33 :linear 76.66)
-                                  (utils/set-timeout (fn []
-                                                       (reset! record-button-is-animating? false)
-                                                       (when-not @touch-active? (complete-animation)))
-                                                     250))
-           reset-y-animation    (fn []
-                                  (reanimated/animate-shared-value-with-timing translate-y 0 300 :easing1)
-                                  (reanimated/animate-shared-value-with-timing icon-opacity 1 500 :linear)
-                                  (utils/set-timeout (fn [] (reset! record-button-at-initial-position? true)) 500))
-           start-x-animation    (fn []
-                                  (reset! record-button-at-initial-position? false)
-                                  (reset! record-button-is-animating? true)
-                                  (reanimated/animate-shared-value-with-timing translate-x -64 250 :easing1)
-                                  (reanimated/animate-shared-value-with-delay icon-opacity 0 33.33 :linear 76.66)
-                                  (reanimated/animate-shared-value-with-timing red-overlay-opacity 1 33.33 :linear)
-                                  (utils/set-timeout (fn []
-                                                       (reset! record-button-is-animating? false)
-                                                       (when-not @touch-active? (complete-animation)))
-                                                     250))
-           reset-x-animation    (fn []
-                                  (reanimated/animate-shared-value-with-timing translate-x 0 300 :easing1)
-                                  (reanimated/animate-shared-value-with-timing icon-opacity 1 500 :linear)
-                                  (reanimated/animate-shared-value-with-timing red-overlay-opacity 0 100 :linear)
-                                  (utils/set-timeout (fn [] (reset! record-button-at-initial-position? true)) 500))
-           start-x-y-animation  (fn []
-                                  (reset! record-button-at-initial-position? false)
-                                  (reset! record-button-is-animating? true)
-                                  (reanimated/animate-shared-value-with-timing translate-y -44 200 :easing1)
-                                  (reanimated/animate-shared-value-with-timing translate-x -44 200 :easing1)
-                                  (reanimated/animate-shared-value-with-delay icon-opacity 0 33.33 :linear 33.33)
-                                  (reanimated/animate-shared-value-with-timing gray-overlay-opacity 1 33.33 :linear)
-                                  (utils/set-timeout (fn []
-                                                       (reset! record-button-is-animating? false)
-                                                       (when-not @touch-active? (complete-animation)))
-                                                     200))
-           reset-x-y-animation  (fn []
-                                  (reanimated/animate-shared-value-with-timing translate-y 0 300 :easing1)
-                                  (reanimated/animate-shared-value-with-timing translate-x 0 300 :easing1)
-                                  (reanimated/animate-shared-value-with-timing icon-opacity 1 500 :linear)
-                                  (reanimated/animate-shared-value-with-timing gray-overlay-opacity 0 800 :linear)
-                                  (utils/set-timeout (fn [] (reset! record-button-at-initial-position? true)) 800))]
-       (effect! #(cond
-                   @recording?
-                   (start-animation)
-                   (not @ready-to-lock?)
-                   (stop-animation))
-                [@recording?])
-       (effect! #(if @ready-to-lock?
-                   (start-x-y-animation)
-                   (reset-x-y-animation))
-                [@ready-to-lock?])
-       (effect! #(if @ready-to-send?
-                   (start-y-animation)
-                   (reset-y-animation))
-                [@ready-to-send?])
-       (effect! #(if @ready-to-delete?
-                   (start-x-animation)
-                   (reset-x-animation))
-                [@ready-to-delete?])
-       [reanimated/view {:style          (style/record-button-big-container translate-x translate-y opacity)
-                         :pointer-events :none}
-        [:<>
-         (map-indexed
-          (fn [id animation]
-            ^{:key id}
-            [animated-ring {:scale   (:scale animation)
-                            :opacity (:opacity animation)
-                            :color   rings-color}])
-          animations)]
-        [rn/view {:style (style/record-button-big-body button-color)}
-         [reanimated/view {:style (style/record-button-big-red-overlay red-overlay-opacity)}]
-         [reanimated/view {:style (style/record-button-big-gray-overlay gray-overlay-opacity)}]
-         [reanimated/view {:style (style/record-button-big-icon-container icon-opacity)}
-          (if @locked?
-            [rn/view {:style style/stop-icon}]
-            [icons/icon :i/audio {:color icon-color}])]]]))])
-
-(defn- send-button [recording? ready-to-send? reviewing-audio?]
-  [:f>
-   (fn []
-     (let [opacity                   (reanimated/use-shared-value 0)
-           translate-y               (reanimated/use-shared-value 20)
-           connector-opacity         (reanimated/use-shared-value 0)
-           width                     (reanimated/use-shared-value 12)
-           height                    (reanimated/use-shared-value 24)
-           border-radius-first-half  (reanimated/use-shared-value 16)
-           border-radius-second-half (reanimated/use-shared-value 8)
-           start-y-animation         (fn []
-                                       (reanimated/animate-shared-value-with-delay translate-y 12 50 :linear 133.33)
-                                       (reanimated/animate-shared-value-with-delay connector-opacity 1 0 :easing1 93.33)
-                                       (reanimated/animate-shared-value-with-delay width 56 83.33 :easing1 80)
-                                       (reanimated/animate-shared-value-with-delay height 56 83.33 :easing1 80)
-                                       (reanimated/animate-shared-value-with-delay border-radius-first-half 28 83.33 :easing1 80)
-                                       (reanimated/animate-shared-value-with-delay border-radius-second-half 28 83.33 :easing1 80))
-           reset-y-animation         (fn []
-                                       (reanimated/animate-shared-value-with-timing translate-y 0 100 :linear)
-                                       (reanimated/set-shared-value connector-opacity 0)
-                                       (reanimated/set-shared-value width 12)
-                                       (reanimated/set-shared-value height 24)
-                                       (reanimated/set-shared-value border-radius-first-half 16)
-                                       (reanimated/set-shared-value border-radius-second-half 8))
-           fade-in-animation         (fn []
-                                       (reanimated/animate-shared-value-with-timing translate-y 0 200 :linear)
-                                       (reanimated/animate-shared-value-with-timing opacity 1 200 :linear))
-           fade-out-animation        (fn []
-                                       (reanimated/animate-shared-value-with-timing translate-y (if @reviewing-audio? 76 20) 200 :linear)
-                                       (when-not @reviewing-audio? (reanimated/animate-shared-value-with-timing opacity 0 200 :linear))
-                                       (reanimated/set-shared-value connector-opacity 0)
-                                       (reanimated/set-shared-value width 24)
-                                       (reanimated/set-shared-value height 12)
-                                       (reanimated/set-shared-value border-radius-first-half 8)
-                                       (reanimated/set-shared-value border-radius-second-half 16))
-           fade-out-reset-animation  (fn []
-                                       (reanimated/animate-shared-value-with-timing opacity 0 200 :linear)
-                                       (reanimated/animate-shared-value-with-delay translate-y 20 0 :linear 200)
-                                       (reanimated/set-shared-value connector-opacity 0)
-                                       (reanimated/set-shared-value width 24)
-                                       (reanimated/set-shared-value height 12)
-                                       (reanimated/set-shared-value border-radius-first-half 8)
-                                       (reanimated/set-shared-value border-radius-second-half 16))]
-       (effect! #(if @recording?
-                   (fade-in-animation)
-                   (fade-out-animation))
-                [@recording?])
-       (effect! #(when-not @reviewing-audio?
-                   (fade-out-reset-animation))
-                [@reviewing-audio?])
-       (effect! #(cond
-                   @ready-to-send?
-                   (start-y-animation)
-                   @recording? (reset-y-animation))
-                [@ready-to-send?])
-       [:<>
-        [reanimated/view {:style (style/send-button-container opacity)}
-         [reanimated/view {:style (style/send-button-connector connector-opacity width height border-radius-first-half border-radius-second-half)}]]
-        [reanimated/view {:style          (style/send-button translate-y opacity)
-                          :pointer-events :none}
-         [icons/icon :i/arrow-up {:color           colors/white
-                                  :size            20
-                                  :container-style style/send-icon-container}]]]))])
-
-(defn- lock-button [recording? ready-to-lock? locked?]
-  [:f>
-   (fn []
-     (let [translate-x-y             (reanimated/use-shared-value 20)
-           opacity                   (reanimated/use-shared-value 0)
-           connector-opacity         (reanimated/use-shared-value 0)
-           width                     (reanimated/use-shared-value 24)
-           height                    (reanimated/use-shared-value 12)
-           border-radius-first-half  (reanimated/use-shared-value 8)
-           border-radius-second-half (reanimated/use-shared-value 8)
-           start-x-y-animation       (fn []
-                                       (reanimated/animate-shared-value-with-delay translate-x-y 8 50 :linear 116.66)
-                                       (reanimated/animate-shared-value-with-delay connector-opacity 1 0 :easing1 80)
-                                       (reanimated/animate-shared-value-with-delay width 56 83.33 :easing1 63.33)
-                                       (reanimated/animate-shared-value-with-delay height 56 83.33 :easing1 63.33)
-                                       (reanimated/animate-shared-value-with-delay border-radius-first-half 28 83.33 :easing1 63.33)
-                                       (reanimated/animate-shared-value-with-delay border-radius-second-half 28 83.33 :easing1 63.33))
-           reset-x-y-animation       (fn []
-                                       (reanimated/animate-shared-value-with-timing translate-x-y 0 100 :linear)
-                                       (reanimated/set-shared-value connector-opacity 0)
-                                       (reanimated/set-shared-value width 24)
-                                       (reanimated/set-shared-value height 12)
-                                       (reanimated/set-shared-value border-radius-first-half 8)
-                                       (reanimated/set-shared-value border-radius-second-half 16))
-           fade-in-animation         (fn []
-                                       (reanimated/animate-shared-value-with-timing translate-x-y 0 220 :linear)
-                                       (reanimated/animate-shared-value-with-timing opacity 1 220 :linear))
-           fade-out-animation        (fn []
-                                       (reanimated/animate-shared-value-with-timing translate-x-y 20 200 :linear)
-                                       (reanimated/animate-shared-value-with-timing opacity 0 200 :linear)
-                                       (reanimated/set-shared-value connector-opacity 0)
-                                       (reanimated/set-shared-value width 24)
-                                       (reanimated/set-shared-value height 12)
-                                       (reanimated/set-shared-value border-radius-first-half 8)
-                                       (reanimated/set-shared-value border-radius-second-half 16))]
-       (effect! #(if @recording?
-                   (fade-in-animation)
-                   (fade-out-animation))
-                [@recording?])
-       (effect! #(cond
-                   @ready-to-lock?
-                   (start-x-y-animation)
-                   (and @recording? (not @locked?))
-                   (reset-x-y-animation))
-                [@ready-to-lock?])
-       (effect! #(if @locked?
-                   (fade-out-animation)
-                   (reset-x-y-animation))
-                [@locked?])
-       [:<>
-        [reanimated/view {:style (style/lock-button-container opacity)}
-         [reanimated/view {:style (style/lock-button-connector connector-opacity width height border-radius-first-half border-radius-second-half)}]]
-        [reanimated/view {:style          (style/lock-button translate-x-y opacity)
-                          :pointer-events :none}
-         [icons/icon (if @ready-to-lock? :i/locked :i/unlocked)
-          {:color (colors/theme-colors colors/black colors/white)
-           :size  20}]]]))])
-
-(defn- delete-button [recording? ready-to-delete?]
-  [:f>
-   (fn []
-     (let [opacity                   (reanimated/use-shared-value 0)
-           translate-x               (reanimated/use-shared-value 20)
-           connector-opacity         (reanimated/use-shared-value 0)
-           width                     (reanimated/use-shared-value 24)
-           height                    (reanimated/use-shared-value 12)
-           border-radius-first-half  (reanimated/use-shared-value 8)
-           border-radius-second-half (reanimated/use-shared-value 8)
-           start-x-animation         (fn []
-                                       (reanimated/animate-shared-value-with-delay translate-x 12 50 :linear 133.33)
-                                       (reanimated/animate-shared-value-with-delay connector-opacity 1 0 :easing1 93.33)
-                                       (reanimated/animate-shared-value-with-delay width 56 83.33 :easing1 80)
-                                       (reanimated/animate-shared-value-with-delay height 56 83.33 :easing1 80)
-                                       (reanimated/animate-shared-value-with-delay border-radius-first-half 28 83.33 :easing1 80)
-                                       (reanimated/animate-shared-value-with-delay border-radius-second-half 28 83.33 :easing1 80))
-           reset-x-animation         (fn []
-                                       (reanimated/animate-shared-value-with-timing translate-x 0 100 :linear)
-                                       (reanimated/set-shared-value connector-opacity 0)
-                                       (reanimated/set-shared-value width 24)
-                                       (reanimated/set-shared-value height 12)
-                                       (reanimated/set-shared-value border-radius-first-half 8)
-                                       (reanimated/set-shared-value border-radius-second-half 16))
-           fade-in-animation         (fn []
-                                       (reanimated/animate-shared-value-with-timing translate-x 0 200 :linear)
-                                       (reanimated/animate-shared-value-with-timing opacity 1 200 :linear))
-           fade-out-animation        (fn []
-                                       (reanimated/animate-shared-value-with-timing translate-x 20 200 :linear)
-                                       (reanimated/animate-shared-value-with-timing opacity 0 200 :linear)
-                                       (reanimated/set-shared-value connector-opacity 0)
-                                       (reanimated/set-shared-value width 24)
-                                       (reanimated/set-shared-value height 12)
-                                       (reanimated/set-shared-value border-radius-first-half 8)
-                                       (reanimated/set-shared-value border-radius-second-half 16))]
-       (effect! #(if @recording?
-                   (fade-in-animation)
-                   (fade-out-animation))
-                [@recording?])
-       (effect! #(cond
-                   @ready-to-delete?
-                   (start-x-animation)
-                   @recording?
-                   (reset-x-animation))
-                [@ready-to-delete?])
-       [:<>
-        [reanimated/view {:style (style/delete-button-container opacity)}
-         [reanimated/view {:style (style/delete-button-connector connector-opacity width height border-radius-first-half border-radius-second-half)}]]
-        [reanimated/view {:style          (style/delete-button translate-x opacity)
-                          :pointer-events :none}
-         [icons/icon :i/delete {:color colors/white
-                                :size  20}]]]))])
-
-(defn- record-button [recording? reviewing-audio?]
-  [:f>
-   (fn []
-     (let [opacity        (reanimated/use-shared-value 1)
-           show-animation #(reanimated/set-shared-value opacity 1)
-           hide-animation #(reanimated/set-shared-value opacity 0)]
-       (effect! #(if (or @recording? @reviewing-audio?)
-                   (hide-animation)
-                   (show-animation))
-                [@recording? @reviewing-audio?])
-       [reanimated/view {:style (style/record-button-container opacity)}
-        [button/button {:type                :outline
-                        :size                32
-                        :width               32
-                        :accessibility-label :mic-button}
-         [icons/icon :i/audio {:color (colors/theme-colors colors/neutral-100 colors/white)}]]]))])
-
-(defn input-view []
-  [:f>
-   (fn []
-     (let [recording?                         (reagent/atom false)
-           locked?                            (reagent/atom false)
-           ready-to-send?                     (reagent/atom false)
-           ready-to-lock?                     (reagent/atom false)
-           ready-to-delete?                   (reagent/atom false)
-           reviewing-audio?                   (reagent/atom false)
-           clear-timeout                      (atom nil)
-           record-button-at-initial-position? (atom true)
-           record-button-is-animating?        (atom false)
-           touch-active?                      (atom false)
-           recording-timer                    (atom nil)
-           recording-length-ms                (atom 0)
-           on-start-should-set-responder      (fn [^js e]
-                                                (when-not @locked?
-                                                  (let [pressed-record-button? (touch-inside-area?
-                                                                                {:location-x (oops/oget e "nativeEvent.locationX")
-                                                                                 :location-y (oops/oget e "nativeEvent.locationY")
-                                                                                 :ignore-min-y? false
-                                                                                 :ignore-max-y? false
-                                                                                 :ignore-min-x? false
-                                                                                 :ignore-max-x? false}
-                                                                                record-button-area)]
-                                                    (when-not @reviewing-audio?
-                                                      (reset! recording? pressed-record-button?)
-                                                      (when pressed-record-button?
-                                                        ;; TODO: By now we just track recording length, we need to add actual audio recording logic
-                                                        ;; GitHub issue [#14558]: https://github.com/status-im/status-mobile/issues/14558
-                                                        (reset! recording-timer (utils/set-interval #(reset! recording-length-ms (+ @recording-length-ms 500)) 500))))
-                                                    (reset! touch-active? true)))
-                                                true)
-           on-responder-move                  (fn [^js e]
-                                                (when-not @locked?
-                                                  (let [location-x              (oops/oget e "nativeEvent.locationX")
-                                                        location-y              (oops/oget e "nativeEvent.locationY")
-                                                        page-x                  (oops/oget e "nativeEvent.pageX")
-                                                        page-y                  (oops/oget e "nativeEvent.pageY")
-                                                        moved-to-send-button?   (touch-inside-area?
-                                                                                 {:location-x location-x
-                                                                                  :location-y location-y
-                                                                                  :ignore-min-y? true
-                                                                                  :ignore-max-y? false
-                                                                                  :ignore-min-x? false
-                                                                                  :ignore-max-x? true}
-                                                                                 (send-button-area @ready-to-send?))
-                                                        moved-to-delete-button? (touch-inside-area?
-                                                                                 {:location-x location-x
-                                                                                  :location-y location-y
-                                                                                  :ignore-min-y? false
-                                                                                  :ignore-max-y? true
-                                                                                  :ignore-min-x? true
-                                                                                  :ignore-max-x? false}
-                                                                                 (delete-button-area @ready-to-delete?))
-                                                        moved-to-lock-button?   (touch-inside-area?
-                                                                                 {:location-x location-x
-                                                                                  :location-y location-y
-                                                                                  :ignore-min-y? false
-                                                                                  :ignore-max-y? false
-                                                                                  :ignore-min-x? false
-                                                                                  :ignore-max-x? false}
-                                                                                 (lock-button-area @ready-to-lock?))
-                                                        moved-to-record-button? (and
-                                                                                 (touch-inside-area?
-                                                                                  {:location-x location-x
-                                                                                   :location-y location-y
-                                                                                   :ignore-min-y? false
-                                                                                   :ignore-max-y? false
-                                                                                   :ignore-min-x? false
-                                                                                   :ignore-max-x? false}
-                                                                                  record-button-area-big)
-                                                                                 (not= location-x page-x)
-                                                                                 (not= location-y page-y))]
-                                                    (cond
-                                                      (and
-                                                       (or
-                                                        (and moved-to-record-button? @ready-to-lock?)
-                                                        (and (not @locked?) moved-to-lock-button? @record-button-at-initial-position?))
-                                                       (not @ready-to-delete?)
-                                                       (not @ready-to-send?)
-                                                       @recording?) (reset! ready-to-lock? moved-to-lock-button?)
-                                                      (and
-                                                       (or
-                                                        (and moved-to-record-button? @ready-to-delete?)
-                                                        (and moved-to-delete-button? @record-button-at-initial-position?))
-                                                       (not @ready-to-lock?)
-                                                       (not @ready-to-send?)
-                                                       @recording?) (reset! ready-to-delete? moved-to-delete-button?)
-                                                      (and
-                                                       (or
-                                                        (and moved-to-record-button? @ready-to-send?)
-                                                        (and moved-to-send-button? @record-button-at-initial-position?))
-                                                       (not @ready-to-lock?)
-                                                       (not @ready-to-delete?)
-                                                       @recording?) (reset! ready-to-send? moved-to-send-button?)))))
-           on-responder-release               (fn [^js e]
-                                                (let [on-record-button? (touch-inside-area?
-                                                                         {:location-x (oops/oget e "nativeEvent.locationX")
-                                                                          :location-y (oops/oget e "nativeEvent.locationY")
-                                                                          :ignore-min-y? false
-                                                                          :ignore-max-y? false
-                                                                          :ignore-min-x? false
-                                                                          :ignore-max-x? false}
-                                                                         (if @reviewing-audio? record-button-area record-button-area-big))]
-                                                  (cond
-                                                    (and @reviewing-audio? on-record-button?)
-                                                    (reset! reviewing-audio? false)
-                                                    (and @ready-to-lock? (not @record-button-is-animating?))
-                                                    (do
-                                                      (reset! locked? true)
-                                                      (reset! ready-to-lock? false))
-                                                    (and (not @reviewing-audio?) on-record-button?)
-                                                    (do
-                                                      (when (>= @recording-length-ms 500) (reset! reviewing-audio? true))
-                                                      (reset! locked? false)
-                                                      (reset! recording? false)
-                                                      (reset! ready-to-lock? false)
-                                                      (utils/clear-interval @recording-timer)
-                                                      (reset! recording-length-ms 0))
-                                                    (and (not @locked?) (not @reviewing-audio?) (not @record-button-is-animating?))
-                                                    (do
-                                                      (reset! recording? false)
-                                                      (reset! ready-to-send? false)
-                                                      (reset! ready-to-delete? false)
-                                                      (reset! ready-to-lock? false)
-                                                      (utils/clear-interval @recording-timer)
-                                                      (reset! recording-length-ms 0))))
-                                                (reset! touch-active? false))]
-       (fn []
-         [rn/view {:style                         style/input-container
-                   :pointer-events                :box-only
-                   :on-start-should-set-responder on-start-should-set-responder
-                   :on-responder-move             on-responder-move
-                   :on-responder-release          on-responder-release}
-          [delete-button recording? ready-to-delete?]
-          [lock-button recording? ready-to-lock? locked?]
-          [send-button recording? ready-to-send? reviewing-audio?]
-          [record-button-big
-           recording?
-           ready-to-send?
-           ready-to-lock?
-           ready-to-delete?
-           record-button-is-animating?
-           record-button-at-initial-position?
-           locked?
-           reviewing-audio?
-           recording-timer
-           recording-length-ms
-           clear-timeout
-           touch-active?]
-          [record-button recording? reviewing-audio?]])))])

src/quo2/components/selectors/__tests__/selectors_component_spec.cljs

@@ -1,84 +0,0 @@
-(ns quo2.components.selectors.--tests--.selectors-component-spec
-  (:require ["@testing-library/react-native" :as rtl]
-            [quo2.components.selectors.selectors :as selectors]
-            [reagent.core :as reagent]))
-
-(defn render-toggle
-  ([]
-   (render-toggle {}))
-  ([opts]
-   (rtl/render (reagent/as-element  [selectors/toggle opts]))))
-
-(defn render-checkbox
-  ([]
-   (render-checkbox {}))
-  ([opts]
-   (rtl/render (reagent/as-element  [selectors/checkbox opts]))))
-
-(defn render-checkbox-prefill
-  ([]
-   (render-checkbox-prefill {}))
-  ([opts]
-   (rtl/render (reagent/as-element  [selectors/checkbox-prefill opts]))))
-
-(defn render-radio
-  ([]
-   (render-radio {}))
-  ([opts]
-   (rtl/render (reagent/as-element  [selectors/radio opts]))))
-
-(js/global.test "default render of toggle component"
-                (fn []
-                  (render-toggle)
-                  (-> (js/expect  (rtl/screen.getByTestId "toggle-component"))
-                      (.toBeTruthy))))
-
-(js/global.test "toggle component on change is working"
-                (let [mock-fn (js/jest.fn)]
-                  (fn []
-                    (render-toggle {:on-change mock-fn})
-                    (rtl/fireEvent.press (rtl/screen.getByTestId "toggle-component"))
-                    (-> (js/expect mock-fn)
-                        (.toHaveBeenCalledTimes 1)))))
-
-(js/global.test "default render of radio component"
-                (fn []
-                  (render-radio)
-                  (-> (js/expect  (rtl/screen.getByTestId "radio-component"))
-                      (.toBeTruthy))))
-
-(js/global.test "radio component on change is working"
-                (let [mock-fn (js/jest.fn)]
-                  (fn []
-                    (render-radio {:on-change mock-fn})
-                    (rtl/fireEvent.press (rtl/screen.getByTestId "radio-component"))
-                    (-> (js/expect mock-fn)
-                        (.toHaveBeenCalledTimes 1)))))
-
-(js/global.test "default render of checkbox component"
-                (fn []
-                  (render-checkbox)
-                  (-> (js/expect  (rtl/screen.getByTestId "checkbox-component"))
-                      (.toBeTruthy))))
-
-(js/global.test "checkbox component on change is working"
-                (let [mock-fn (js/jest.fn)]
-                  (fn []
-                    (render-checkbox {:on-change mock-fn})
-                    (rtl/fireEvent.press (rtl/screen.getByTestId "checkbox-component"))
-                    (-> (js/expect mock-fn)
-                        (.toHaveBeenCalledTimes 1)))))
-
-(js/global.test "default render of checkbox-prefill component"
-                (fn []
-                  (render-checkbox-prefill)
-                  (-> (js/expect  (rtl/screen.getByTestId "checkbox-prefill-component"))
-                      (.toBeTruthy))))
-
-(js/global.test "checkbox-prefill component on change is working"
-                (let [mock-fn (js/jest.fn)]
-                  (fn []
-                    (render-checkbox-prefill {:on-change mock-fn})
-                    (rtl/fireEvent.press (rtl/screen.getByTestId "checkbox-prefill-component"))
-                    (-> (js/expect mock-fn)
-                        (.toHaveBeenCalledTimes 1)))))

src/quo2/components/selectors/selectors.cljs

@@ -43,8 +43,7 @@
                                        (colors/alpha colors/neutral-20 (if disabled? 0.3 1))
                                        (colors/alpha colors/neutral-70 (if disabled? 0.3 1))))})
          :accessibility-label (str "checkbox-" (if @checked? "on" "off"))
-         :accessibility-role  :checkbox
-         :testID "checkbox-prefill-component"}
+         :accessibility-role  :checkbox}
         (when @checked?
           [rn/view {:style
                     {:height 20
@@ -83,8 +82,7 @@
                   :border-color     (if @checked? :none
                                         (get-color @checked? disabled? blurred-background?))}
           :accessibility-label (str "checkbox-" (if @checked? "on" "off"))
-          :accessibility-role  :checkbox
-          :testID "checkbox-component"}
+          :accessibility-role  :checkbox}
          (when @checked?
            [rn/view {:style
                      {:height 20
@@ -110,8 +108,7 @@
                                       (colors/theme-colors colors/white
                                                            (colors/alpha colors/neutral-80 0.4)))})
          :accessibility-label (str "radio-" (if @checked? "on" "off"))
-         :accessibility-role  :checkbox
-         :testID "radio-component"}
+         :accessibility-role  :checkbox}
 
         [rn/view {:style
                   {:margin-left :auto
@@ -136,8 +133,7 @@
                   :border-radius 20
                   :background-color (get-color @checked? disabled? blurred-background?)})
          :accessibility-label (str "toggle-" (if @checked? "on" "off"))
-         :accessibility-role  :checkbox
-         :testID "toggle-component"}
+         :accessibility-role  :checkbox}
         [rn/view {:style
                   {:margin-left (if @checked? 12 2)
                    :height 16

src/quo2/components/settings/privacy_option.cljs

@@ -1,63 +0,0 @@
-(ns quo2.components.settings.privacy-option
-  (:require [react-native.core :as rn]
-            [quo2.components.icon :as icons]
-            [quo2.components.selectors.selectors :as selectors]
-            [quo2.components.settings.style :as style]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]))
-
-(defn- bullet
-  []
-  [rn/view {:style style/bullet-container}
-   [rn/view {:style (style/bullet)}]])
-
-(defn- unordered-list
-  [container-style list-items]
-  [rn/view {:style (merge style/list-container container-style)}
-   (for [item list-items]
-     ^{:key (hash item)}
-     [rn/view {:style style/list-item}
-      [bullet]
-      [text/text {:size :paragraph-2} item]])])
-
-(defn- card-footer
-  [{:keys [active? label on-toggle]}]
-  [rn/touchable-without-feedback
-   [rn/view {:style (style/card-footer)}
-    [rn/view {:style style/card-footer-label-container}
-     [text/text {:size :paragraph-2} label]]
-    [rn/view {:style style/card-footer-toggle-container}
-     [selectors/toggle {:disabled? (not active?)
-                        :on-change on-toggle}]]]])
-
-(defn- selection-indicator
-  [active?]
-  [rn/view {:style (style/selection-indicator-container active?)}
-   [rn/view {:style (style/selection-indicator active?)}]])
-
-(defn- card-header
-  [{:keys [icon label active?]}]
-  [rn/view {:style style/card-header-container}
-   [icons/icon icon {:size  20
-                     :color (colors/theme-colors colors/neutral-50 colors/neutral-40)}]
-   [rn/view {:style style/card-header-label-container}
-    [text/text {:weight :semi-bold} label]]
-   [selection-indicator active?]])
-
-(defn card
-  [{:keys [active? header footer list-items icon on-select on-toggle]
-    :or   {icon    :i/world
-           active? false}}]
-  [rn/touchable-without-feedback
-   {:on-press            on-select
-    :accessibility-label :privacy-option-card
-    :testID              :privacy-option-card}
-   [rn/view (style/privacy-option-card active?)
-    [card-header {:active? active?
-                  :icon    icon
-                  :label   header}]
-    [unordered-list (when-not footer {:margin-bottom 8}) list-items]
-    (when footer
-      [card-footer {:active?   active?
-                    :label     footer
-                    :on-toggle on-toggle}])]])

src/quo2/components/settings/style.cljs

@@ -1,93 +0,0 @@
-(ns quo2.components.settings.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(def bullet-container
-  {:width        20
-   :height       20
-   :margin-right 8
-   :align-self   :flex-start})
-
-(defn bullet
-  []
-  {:background-color (colors/theme-colors colors/neutral-40 colors/neutral-50)
-   :border-radius    100
-   :width            8
-   :height           8
-   :position         :absolute
-   :left             6
-   :top              6})
-
-(def list-container
-  {:margin-right 12})
-
-(def list-item
-  {:flex               1
-   :flex-direction     :row
-   :align-items        :center
-   :padding-vertical   6
-   :padding-horizontal 12})
-
-(defn selection-indicator-container
-  [active?]
-  {:height        20
-   :width         20
-   :border-radius 20
-   :border-width  1
-   :border-color  (if active?
-                    (colors/theme-colors colors/primary-50 colors/primary-60)
-                    (colors/theme-colors colors/neutral-20 colors/neutral-80))})
-
-(defn selection-indicator
-  [active?]
-  {:margin-left      :auto
-   :height           14
-   :width            14
-   :background-color (if active?
-                       (colors/theme-colors colors/primary-50 colors/primary-60)
-                       (colors/theme-colors colors/white-opa-40 colors/neutral-80-opa-40))
-   :border-radius    20
-   :margin-right     :auto
-   :margin-top       :auto
-   :margin-bottom    :auto})
-
-(def card-footer-label-container
-  {:flex        0.9
-   :margin-left 16})
-
-(def card-footer-toggle-container
-  {:flex              0.1
-   :margin-horizontal 12
-   :align-self        :center})
-
-(defn card-footer
-  []
-  {:flex              1
-   :flex-direction    :row
-   :justify-content   :space-between
-   :margin-horizontal 12
-   :margin-top        8
-   :margin-bottom     12
-   :padding-vertical  12
-   :border-radius     12
-   :border-width      1
-   :background-color  (colors/theme-colors colors/neutral-5 colors/neutral-90)
-   :border-color      (colors/theme-colors colors/neutral-10 colors/neutral-80)})
-
-(def card-header-container
-  {:flex-direction     :row
-   :align-items        :center
-   :padding-top        12
-   :padding-bottom     8
-   :padding-horizontal 12})
-
-(def card-header-label-container
-  {:flex        1
-   :margin-left 4})
-
-(defn privacy-option-card
-  [active?]
-  {:border-radius 16
-   :border-width  1
-   :border-color  (if active?
-                    (colors/theme-colors colors/primary-50 colors/primary-60)
-                    (colors/theme-colors colors/neutral-10 colors/neutral-80))})

src/quo2/components/tabs/tabs.cljs

@@ -12,29 +12,26 @@
 
 (def default-tab-size 32)
 
-(defn indicator []
-  [rn/view {:position         :absolute
-            :z-index          1
-            :right            -2
-            :top              -2
-            :width            10
-            :height           10
-            :border-radius    5
-            :justify-content  :center
-            :align-items      :center
-            :background-color (colors/theme-colors colors/neutral-5 colors/neutral-95)}
-   [notification-dot]])
-
 (defn tabs [{:keys [default-active on-change style]}]
   (let [active-tab-id (reagent/atom default-active)]
     (fn [{:keys [data size] :or {size default-tab-size}}]
       [rn/view (merge {:flex-direction :row} style)
        (doall
-        (for [{:keys [label id notification-dot? accessibility-label]} data]
+        (for [{:keys [label id new-info accessibility-label]} data]
           ^{:key id}
           [rn/view {:style {:margin-right (if (= size default-tab-size) 12 8)}}
-           (when notification-dot?
-             [indicator])
+           (when new-info
+             [rn/view {:position         :absolute
+                       :z-index          1
+                       :right            -2
+                       :top              -2
+                       :width            10
+                       :height           10
+                       :border-radius    5
+                       :justify-content  :center
+                       :align-items      :center
+                       :background-color (colors/theme-colors colors/neutral-5 colors/neutral-95)}
+              [notification-dot]])
            [tab/tab
             {:id                  id
              :size                size
@@ -158,7 +155,7 @@
                                                                        :on-press       (fn [id]
                                                                                          (reset! active-tab-id id)
                                                                                          (when scroll-on-press?
-                                                                                           (.scrollToIndex ^js @flat-list-ref
+                                                                                           (.scrollToIndex @flat-list-ref
                                                                                                            #js {:animated     true
                                                                                                                 :index        index
                                                                                                                 :viewPosition 0.5}))

src/quo2/components/tags/permission_tag.cljs

@@ -104,12 +104,11 @@
 
 (defn tag
   [_ _]
-  (fn [{:keys [locked tokens size background-color on-press]
+  (fn [{:keys [locked tokens size background-color]
         :or {size 24}}]
     [base-tag/base-tag {:background-color  background-color
                         :size              size
-                        :type              :permission
-                        :on-press          on-press}
+                        :type              :permission}
      [rn/view  {:flex-direction   :row
                 :align-items      :center
                 :justify-content  :flex-end}

src/quo2/core.cljs

@@ -15,10 +15,8 @@
             quo2.components.community.community-list-view
             quo2.components.community.community-view
             quo2.components.community.discover-card
-            quo2.components.community.token-gating
             quo2.components.counter.counter
             quo2.components.dividers.divider-label
-            quo2.components.dividers.date
             quo2.components.dividers.new-messages
             quo2.components.drawers.action-drawers
             quo2.components.dropdowns.dropdown
@@ -36,18 +34,13 @@
             quo2.components.tags.tags
             quo2.components.tags.context-tags
             quo2.components.tabs.tabs
-            quo2.components.notifications.toast
             quo2.components.tabs.account-selector
+            quo2.components.navigation.top-nav
             quo2.components.navigation.floating-shell-button
             quo2.components.tags.status-tags
             quo2.components.navigation.page-nav
-            quo2.components.selectors.disclaimer
-            quo2.components.selectors.selectors
-            quo2.components.settings.privacy-option
-            quo2.components.loaders.skeleton
-            quo2.components.notifications.count-down-circle))
+            quo2.components.selectors.disclaimer))
 
-(def toast quo2.components.notifications.toast/toast)
 (def button quo2.components.buttons.button/button)
 (def dynamic-button quo2.components.buttons.dynamic-button/dynamic-button)
 (def text quo2.components.markdown.text/text)
@@ -65,16 +58,14 @@
 (def tags quo2.components.tags.tags/tags)
 (def user-avatar-tag quo2.components.tags.context-tags/user-avatar-tag)
 (def context-tag quo2.components.tags.context-tags/context-tag)
-(def group-avatar-tag quo2.components.tags.context-tags/group-avatar-tag)
 (def tabs quo2.components.tabs.tabs/tabs)
 (def scrollable-tabs quo2.components.tabs.tabs/scrollable-tabs)
 (def account-selector quo2.components.tabs.account-selector/account-selector)
+(def top-nav quo2.components.navigation.top-nav/top-nav)
 (def floating-shell-button quo2.components.navigation.floating-shell-button/floating-shell-button)
 (def status-tag quo2.components.tags.status-tags/status-tag)
 (def page-nav quo2.components.navigation.page-nav/page-nav)
 (def disclaimer quo2.components.selectors.disclaimer/disclaimer)
-(def checkbox quo2.components.selectors.selectors/checkbox)
-(def skeleton quo2.components.loaders.skeleton/skeleton)
 
 ;;;; AVATAR
 (def account-avatar quo2.components.avatars.account-avatar/account-avatar)
@@ -94,12 +85,10 @@
 (def community-title quo2.components.community.community-view/community-title)
 (def permission-tag-container quo2.components.community.community-view/permission-tag-container)
 (def discover-card quo2.components.community.discover-card/discover-card)
-(def token-gating quo2.components.community.token-gating/token-gating)
 
 ;;;; DIVIDERS
 (def divider-label quo2.components.dividers.divider-label/divider-label)
 (def new-messages quo2.components.dividers.new-messages/new-messages)
-(def divider-date quo2.components.dividers.date/date)
 
 ;;;; LIST ITEMS
 (def channel-list-item quo2.components.list-items.channel/list-item)
@@ -110,7 +99,3 @@
 (def activity-log quo2.components.notifications.activity-log.view/view)
 (def info-count quo2.components.notifications.info-count/info-count)
 (def notification-dot quo2.components.notifications.notification-dot/notification-dot)
-(def count-down-circle quo2.components.notifications.count-down-circle/circle-timer)
-
-;;;; SETTINGS
-(def privacy-option quo2.components.settings.privacy-option/card)

src/quo2/core_spec.cljs

@@ -1,4 +0,0 @@
-(ns quo2.core-spec
-  (:require [quo2.components.selectors.--tests--.selectors-component-spec]
-            [quo2.components.counter.--tests--.counter-component-spec]
-            [quo2.components.drawers.--tests--.action-drawers-component-spec]))

src/quo2/foundations/colors.cljs

@@ -13,20 +13,6 @@
       (let [rgb (string/split value #",")]
         (str (string/join "," (butlast rgb)) "," opacity ")")))))
 
-(defn- alpha-opaque [value opacity]
-  (when value
-    (if (string/starts-with? value "#")
-      (let [hex (string/replace value #"#" "")
-            r   (- 255 (* opacity (- 255 (js/parseInt (subs hex 0 2) 16))))
-            g   (- 255 (* opacity (- 255 (js/parseInt (subs hex 2 4) 16))))
-            b   (- 255 (* opacity (- 255 (js/parseInt (subs hex 4 6) 16))))]
-        (str "rgb(" r "," g "," b ")"))
-      (let [rgb (string/split value #",")
-            r   (- 255 (* opacity (- 255 (get rgb 0))))
-            g   (- 255 (* opacity (- 255 (get rgb 1))))
-            b   (- 255 (* opacity (- 255 (get rgb 2))))]
-        (str "rgb(" r "," g "," b ")")))))
-
 (def theme-alpha
   (memoize
    (fn
@@ -63,7 +49,6 @@
 ;;80 with transparency
 (def neutral-80-opa-5  (alpha neutral-80 0.05))
 (def neutral-80-opa-10 (alpha neutral-80 0.1))
-(def neutral-80-opa-15 (alpha neutral-80 0.15))
 (def neutral-80-opa-20 (alpha neutral-80 0.2))
 (def neutral-80-opa-30 (alpha neutral-80 0.3))
 (def neutral-80-opa-40 (alpha neutral-80 0.4))
@@ -82,16 +67,11 @@
 (def neutral-95-opa-95 (alpha neutral-95 0.95))
 
 ;;100 with transparency
-(def neutral-100-opa-0 (alpha neutral-100 0))
 (def neutral-100-opa-60 (alpha neutral-100 0.6))
 (def neutral-100-opa-70 (alpha neutral-100 0.7))
 (def neutral-100-opa-80 (alpha neutral-100 0.8))
 (def neutral-100-opa-90 (alpha neutral-100 0.9))
 (def neutral-100-opa-95 (alpha neutral-100 0.95))
-(def neutral-100-opa-100 (alpha neutral-100 1))
-
-;;80 with transparency opaque
-(def neutral-80-opa-5-opaque (alpha-opaque neutral-80 0.05))
 
 ;;;;White
 
@@ -111,11 +91,6 @@
 (def white-opa-90 (alpha white 0.9))
 (def white-opa-95 (alpha white 0.95))
 
-;;;;Black
-
-;;Solid
-(def black "#000000")
-
 ;;;;Primary
 
 ;;Solid

src/react_native/core.cljs

@@ -1,16 +1,10 @@
 (ns react-native.core
-  (:require ["react" :as react]
+  (:require [reagent.core :as reagent]
             ["react-native" :as react-native]
-            [cljs-bean.core :as bean]
-            ["@react-native-community/blur" :as blur]
-            [oops.core :as oops]
             [react-native.flat-list :as flat-list]
-            [react-native.section-list :as section-list]
-            [reagent.core :as reagent]
-            [react-native.platform :as platform]))
+            [react-native.section-list :as section-list]))
 
 (def app-state ^js (.-AppState ^js react-native))
-(def blur-view (reagent/adapt-react-class (.-BlurView blur)))
 
 (def view (reagent/adapt-react-class (.-View ^js react-native)))
 (def scroll-view (reagent/adapt-react-class (.-ScrollView ^js react-native)))
@@ -59,32 +53,3 @@
   (js->clj (.get (.-Dimensions ^js react-native) "window") :keywordize-keys true))
 
 (def status-bar (.-StatusBar ^js react-native))
-
-(defn status-bar-height []
-  (.-currentHeight ^js status-bar))
-
-(defn hw-back-add-listener [callback]
-  (.addEventListener (.-BackHandler ^js react-native) "hardwareBackPress" callback))
-
-(defn hw-back-remove-listener [callback]
-  (.removeEventListener (.-BackHandler ^js react-native) "hardwareBackPress" callback))
-
-(def keyboard-avoiding-view-class (reagent/adapt-react-class (.-KeyboardAvoidingView react-native)))
-
-(defn keyboard-avoiding-view [props & children]
-  (into [keyboard-avoiding-view-class
-         (merge (when platform/ios? {:behavior :padding})
-                props)]
-        children))
-
-(defn use-effect
-  ([effect] (use-effect effect []))
-  ([effect deps]
-   (react/useEffect effect  (bean/->js deps))))
-
-(def use-ref react/useRef)
-(defn use-effect-once [effect] (use-effect effect))
-(defn use-unmount [f]
-  (let [fn-ref (use-ref f)]
-    (oops/oset! fn-ref "current" f)
-    (use-effect-once (fn [] #((oops/oget fn-ref "current"))))))

src/react_native/platform.cljs

@@ -5,9 +5,5 @@
 
 (def os (when platform (.-OS ^js platform)))
 
-(def version (when platform (.-Version ^js platform)))
-
 (def android? (= os "android"))
 (def ios? (= os "ios"))
-
-(def low-device? (and android? (< version 29)))

src/react_native/reanimated.cljs

@@ -1,15 +1,10 @@
 (ns react-native.reanimated
   (:require ["react-native" :as rn]
+            [reagent.core :as reagent]
+            [clojure.string :as string]
             ["react-native-linear-gradient" :default LinearGradient]
             ["react-native-reanimated" :default reanimated
-             :refer (useSharedValue useAnimatedStyle withTiming withDelay withSpring withRepeat Easing Keyframe cancelAnimation SlideInUp SlideOutUp LinearTransition)]
-            [clojure.string :as string]
-            [reagent.core :as reagent]))
-
-;; Animations
-(def slide-in-up-animation SlideInUp)
-(def slide-out-up-animation SlideOutUp)
-(def linear-transition LinearTransition)
+             :refer (useSharedValue useAnimatedStyle withTiming withDelay withSpring withRepeat Easing Keyframe)]))
 
 ;; Animated Components
 (def create-animated-component (comp reagent/adapt-react-class (.-createAnimatedComponent reanimated)))
@@ -30,7 +25,6 @@
 (def with-spring withSpring)
 (def key-frame Keyframe)
 (def with-repeat withRepeat)
-(def cancel-animation cancelAnimation)
 
 ;; Easings
 (def bezier (.-bezier ^js Easing))
@@ -60,12 +54,6 @@
 ;; Worklets
 (def worklet-factory (js/require "../src/js/worklet_factory.js"))
 
-(defn interpolate [shared-value input-range output-range]
-  (.interpolateValue ^js worklet-factory
-                     shared-value
-                     (clj->js input-range)
-                     (clj->js output-range)))
-
 ;;;; Component Animations
 
 ;; kebab-case styles are not working for worklets
@@ -87,21 +75,4 @@
 
 (defn animate-shared-value-with-repeat [anim val duration easing number-of-repetitions reverse?]
   (set-shared-value anim (with-repeat (with-timing val (js-obj "duration" duration
-                                                               "easing"   (get easings easing))) number-of-repetitions reverse?)))
-
-(defn animate-shared-value-with-delay-repeat
-  ([anim val duration easing delay number-of-repetitions]
-   (animate-shared-value-with-delay-repeat anim val duration easing delay number-of-repetitions false))
-  ([anim val duration easing delay number-of-repetitions reverse?]
-   (set-shared-value anim
-                     (with-delay delay
-                       (with-repeat
-                         (with-timing val
-                           #js {:duration duration
-                                :easing   (get easings easing)})
-                         number-of-repetitions reverse?)))))
-
-(defn animate-shared-value-with-spring [anim val {:keys [mass stiffness damping]}]
-  (set-shared-value anim (with-spring val (js-obj "mass" mass
-                                                  "damping" damping
-                                                  "stiffness" stiffness))))
+                                                               "easing"   (get easings easing))) number-of-repetitions reverse?)))

src/react_native/safe_area.cljs

@@ -7,7 +7,7 @@
 
 (defn consumer [component]
   [consumer-raw
-   (fn [^js insets]
+   (fn [insets]
      (reagent/as-element
       [component (js->clj insets :keywordize-keys true)]))])
 

src/react_native/svg.cljs

@@ -1,7 +0,0 @@
-(ns react-native.svg
-  (:require
-   ["react-native-svg" :as Svg]
-   [reagent.core       :as reagent]))
-
-(def svg (reagent/adapt-react-class Svg/default))
-(def path (reagent/adapt-react-class Svg/Path))

src/status_im/activity_center/core.cljs

@@ -1,35 +1,26 @@
-(ns status-im2.contexts.activity-center.events
+(ns status-im.activity-center.core
   (:require [re-frame.core :as rf]
+            [status-im.activity-center.notification-types :as types]
             [status-im.data-store.activities :as data-store.activities]
-            [status-im2.common.json-rpc.events :as json-rpc]
-            [status-im2.contexts.activity-center.notification-types :as types]
-            [taoensso.timbre :as log]
-            [utils.re-frame :as urf]))
-
-(def defaults
-  {:filter-status          :unread
-   :filter-type            types/no-type
-   ;; Choose the maximum number of notifications that *usually/safely* fit on
-   ;; most screens, so that the UI doesn't have to needlessly render
-   ;; notifications.
-   :notifications-per-page 8})
+            [status-im.ethereum.json-rpc :as json-rpc]
+            [status-im.utils.fx :as fx]
+            [taoensso.timbre :as log]))
 
 ;;;; Navigation
 
-(urf/defn open-activity-center
+(fx/defn open-activity-center
   {:events [:activity-center/open]}
   [_]
-  (rf/dispatch [:show-popover
-                {:view                       :activity-center
-                 :style                      {:margin 0}
-                 :disable-touchable-overlay? true
-                 :blur-view?                 true
-                 :blur-view-props            {:blur-amount 20
-                                              :blur-type   :dark}}]))
+  (rf/dispatch [:show-popover {:view                       :activity-center
+                               :style                      {:margin 0}
+                               :disable-touchable-overlay? true
+                               :blur-view?                 true
+                               :blur-view-props            {:blur-amount 20
+                                                            :blur-type   :dark}}]))
 
 ;;;; Misc
 
-(urf/defn process-notification-failure
+(fx/defn process-notification-failure
   {:events [:activity-center/process-notification-failure]}
   [_ notification-id action error]
   (log/warn (str "Failed to " action)
@@ -69,16 +60,14 @@
           db-notifications
           new-notifications))
 
-(urf/defn notifications-reconcile
+(fx/defn notifications-reconcile
   {:events [:activity-center.notifications/reconcile]}
   [{:keys [db]} new-notifications]
   (when (seq new-notifications)
-    {:db (update-in db
-                    [:activity-center :notifications]
-                    update-notifications
-                    new-notifications)}))
+    {:db (update-in db [:activity-center :notifications]
+                    update-notifications new-notifications)}))
 
-(urf/defn notifications-reconcile-from-response
+(fx/defn notifications-reconcile-from-response
   {:events [:activity-center/reconcile-notifications-from-response]}
   [cofx response]
   (->> response
@@ -86,82 +75,47 @@
        (map data-store.activities/<-rpc)
        (notifications-reconcile cofx)))
 
-;;;; Mark notifications as read
-
-(defn- get-notification
-  [db notification-id]
-  (->> (get-in db
-               [:activity-center
-                :notifications
-                (get-in db [:activity-center :filter :type])
-                (get-in db [:activity-center :filter :status])
-                :data])
-       (filter #(= notification-id (:id %)))
-       first))
-
-(urf/defn mark-as-read
-  {:events [:activity-center.notifications/mark-as-read]}
-  [{:keys [db]} notification-id]
-  (when-let [notification (get-notification db notification-id)]
-    {::json-rpc/call [{:method     "wakuext_markActivityCenterNotificationsRead"
-                       :params     [[notification-id]]
-                       :on-success #(rf/dispatch [:activity-center.notifications/mark-as-read-success
-                                                  notification])
-                       :on-error   #(rf/dispatch [:activity-center/process-notification-failure
-                                                  notification-id
-                                                  :notification/mark-as-read
-                                                  %])}]}))
-
-(urf/defn mark-as-read-success
-  {:events [:activity-center.notifications/mark-as-read-success]}
-  [cofx notification]
-  (notifications-reconcile cofx [(assoc notification :read true)]))
-
 ;;;; Contact verification
 
-(urf/defn contact-verification-decline
+(fx/defn contact-verification-decline
   {:events [:activity-center.contact-verification/decline]}
   [_ notification-id]
   {::json-rpc/call [{:method     "wakuext_declineContactVerificationRequest"
                      :params     [notification-id]
-                     :on-success #(rf/dispatch [:activity-center/reconcile-notifications-from-response
-                                                %])
+                     :on-success #(rf/dispatch [:activity-center/reconcile-notifications-from-response %])
                      :on-error   #(rf/dispatch [:activity-center/process-notification-failure
                                                 notification-id
                                                 :contact-verification/decline
                                                 %])}]})
 
-(urf/defn contact-verification-reply
+(fx/defn contact-verification-reply
   {:events [:activity-center.contact-verification/reply]}
   [_ notification-id reply]
   {::json-rpc/call [{:method     "wakuext_acceptContactVerificationRequest"
                      :params     [notification-id reply]
-                     :on-success #(rf/dispatch [:activity-center/reconcile-notifications-from-response
-                                                %])
+                     :on-success #(rf/dispatch [:activity-center/reconcile-notifications-from-response %])
                      :on-error   #(rf/dispatch [:activity-center/process-notification-failure
                                                 notification-id
                                                 :contact-verification/reply
                                                 %])}]})
 
-(urf/defn contact-verification-mark-as-trusted
+(fx/defn contact-verification-mark-as-trusted
   {:events [:activity-center.contact-verification/mark-as-trusted]}
   [_ notification-id]
   {::json-rpc/call [{:method     "wakuext_verifiedTrusted"
                      :params     [{:id notification-id}]
-                     :on-success #(rf/dispatch [:activity-center/reconcile-notifications-from-response
-                                                %])
+                     :on-success #(rf/dispatch [:activity-center/reconcile-notifications-from-response %])
                      :on-error   #(rf/dispatch [:activity-center/process-notification-failure
                                                 notification-id
                                                 :contact-verification/mark-as-trusted
                                                 %])}]})
 
-(urf/defn contact-verification-mark-as-untrustworthy
+(fx/defn contact-verification-mark-as-untrustworthy
   {:events [:activity-center.contact-verification/mark-as-untrustworthy]}
   [_ notification-id]
   {::json-rpc/call [{:method     "wakuext_verifiedUntrustworthy"
                      :params     [{:id notification-id}]
-                     :on-success #(rf/dispatch [:activity-center/reconcile-notifications-from-response
-                                                %])
+                     :on-success #(rf/dispatch [:activity-center/reconcile-notifications-from-response %])
                      :on-error   #(rf/dispatch [:activity-center/process-notification-failure
                                                 notification-id
                                                 :contact-verification/mark-as-untrustworthy
@@ -169,6 +123,14 @@
 
 ;;;; Notifications fetching and pagination
 
+(def defaults
+  {:filter-status          :unread
+   :filter-type            types/no-type
+   ;; Choose the maximum number of notifications that *usually/safely* fit on
+   ;; most screens, so that the UI doesn't have to needlessly render
+   ;; notifications.
+   :notifications-per-page 8})
+
 (def start-or-end-cursor
   "")
 
@@ -180,60 +142,51 @@
 (def ^:const status-unread 2)
 (def ^:const status-all 3)
 
-(defn status
-  [filter-status]
+(defn status [filter-status]
   (case filter-status
     :unread status-unread
     :all    status-all
     99))
 
-(urf/defn notifications-fetch
-  [{:keys [db]} {:keys [cursor per-page filter-type filter-status reset-data?]}]
+(fx/defn notifications-fetch
+  [{:keys [db]} {:keys [cursor filter-type filter-status reset-data?]}]
   (when-not (get-in db [:activity-center :notifications filter-type filter-status :loading?])
-    (let [per-page (or per-page (defaults :notifications-per-page))]
-      {:db             (assoc-in db
-                        [:activity-center :notifications filter-type filter-status :loading?]
-                        true)
-       ::json-rpc/call [{:method     "wakuext_activityCenterNotificationsBy"
-                         :params     [cursor per-page filter-type (status filter-status)]
-                         :on-success #(rf/dispatch [:activity-center.notifications/fetch-success
-                                                    filter-type filter-status reset-data? %])
-                         :on-error   #(rf/dispatch [:activity-center.notifications/fetch-error
-                                                    filter-type filter-status %])}]})))
+    {:db             (assoc-in db [:activity-center :notifications filter-type filter-status :loading?] true)
+     ::json-rpc/call [{:method     "wakuext_activityCenterNotificationsBy"
+                       :params     [cursor (defaults :notifications-per-page) filter-type (status filter-status)]
+                       :on-success #(rf/dispatch [:activity-center.notifications/fetch-success filter-type filter-status reset-data? %])
+                       :on-error   #(rf/dispatch [:activity-center.notifications/fetch-error filter-type filter-status %])}]}))
 
-(urf/defn notifications-fetch-first-page
+(fx/defn notifications-fetch-first-page
   {:events [:activity-center.notifications/fetch-first-page]}
   [{:keys [db] :as cofx} {:keys [filter-type filter-status]}]
   (let [filter-type   (or filter-type
-                          (get-in db
-                                  [:activity-center :filter :type]
+                          (get-in db [:activity-center :filter :type]
                                   (defaults :filter-type)))
         filter-status (or filter-status
-                          (get-in db
-                                  [:activity-center :filter :status]
+                          (get-in db [:activity-center :filter :status]
                                   (defaults :filter-status)))]
-    (urf/merge cofx
-               {:db (-> db
-                        (assoc-in [:activity-center :filter :type] filter-type)
-                        (assoc-in [:activity-center :filter :status] filter-status))}
-               (notifications-fetch {:cursor        start-or-end-cursor
-                                     :filter-type   filter-type
-                                     :filter-status filter-status
-                                     :reset-data?   true}))))
+    (fx/merge cofx
+              {:db (-> db
+                       (assoc-in [:activity-center :filter :type] filter-type)
+                       (assoc-in [:activity-center :filter :status] filter-status))}
+              (notifications-fetch {:cursor        start-or-end-cursor
+                                    :filter-type   filter-type
+                                    :filter-status filter-status
+                                    :reset-data?   true}))))
 
-(urf/defn notifications-fetch-next-page
+(fx/defn notifications-fetch-next-page
   {:events [:activity-center.notifications/fetch-next-page]}
   [{:keys [db] :as cofx}]
   (let [{:keys [type status]} (get-in db [:activity-center :filter])
         {:keys [cursor]}      (get-in db [:activity-center :notifications type status])]
     (when (valid-cursor? cursor)
-      (notifications-fetch cofx
-                           {:cursor        cursor
-                            :filter-type   type
-                            :filter-status status
-                            :reset-data?   false}))))
+      (notifications-fetch cofx {:cursor        cursor
+                                 :filter-type   type
+                                 :filter-status status
+                                 :reset-data?   false}))))
 
-(urf/defn notifications-fetch-success
+(fx/defn notifications-fetch-success
   {:events [:activity-center.notifications/fetch-success]}
   [{:keys [db]}
    filter-type
@@ -249,38 +202,7 @@
                           (constantly processed)
                           #(concat %1 processed))))}))
 
-(urf/defn notifications-fetch-unread-contact-requests
-  "Unread contact requests are, in practical terms, the same as pending contact
-  requests in the new Activity Center, because pending contact requests are
-  always marked as unread, and once the user declines/accepts the request, they
-  are marked as read.
-
-  If this relationship ever changes, we will probably need to change the backend
-  to explicitly support fetching notifications for 'pending' contact requests."
-  {:events [:activity-center.notifications/fetch-unread-contact-requests]}
-  [cofx]
-  (notifications-fetch cofx
-                       {:cursor        start-or-end-cursor
-                        :filter-status :unread
-                        :filter-type   types/contact-request
-                        :per-page      20
-                        :reset-data?   true}))
-
-(urf/defn notifications-fetch-unread-count
-  {:events [:activity-center.notifications/fetch-unread-count]}
-  [_]
-  {::json-rpc/call [{:method     "wakuext_unreadActivityCenterNotificationsCount"
-                     :params     []
-                     :on-success #(rf/dispatch [:activity-center.notifications/fetch-unread-count-success
-                                                %])
-                     :on-error   #()}]})
-
-(urf/defn notifications-fetch-unread-count-success
-  {:events [:activity-center.notifications/fetch-unread-count-success]}
-  [{:keys [db]} result]
-  {:db (assoc-in db [:activity-center :unread-count] result)})
-
-(urf/defn notifications-fetch-error
+(fx/defn notifications-fetch-error
   {:events [:activity-center.notifications/fetch-error]}
   [{:keys [db]} filter-type filter-status error]
   (log/warn "Failed to load Activity Center notifications" error)

src/status_im/activity_center/core_test.cljs

@@ -0,0 +1,442 @@
+(ns status-im.activity-center.core-test
+  (:require [cljs.test :refer [deftest is testing]]
+            [day8.re-frame.test :as rf-test]
+            [re-frame.core :as rf]
+            [status-im.activity-center.notification-types :as types]
+            [status-im.constants :as constants]
+            [status-im.ethereum.json-rpc :as json-rpc]
+            status-im.events
+            [status-im.test-helpers :as h]
+            [status-im2.setup.config :as config]))
+
+(defn setup []
+  (h/register-helper-events)
+  (rf/dispatch [:setup/app-started]))
+
+;;;; Contact verification
+
+(def notification-id 24)
+
+(def contact-verification-rpc-response
+  {:activityCenterNotifications
+   [{:accepted                  false
+     :author                    "0x04d03f"
+     :chatId                    "0x04d03f"
+     :contactVerificationStatus constants/contact-verification-status-pending
+     :dismissed                 false
+     :id                        notification-id
+     :message                   {}
+     :name                      "0x04d03f"
+     :read                      true
+     :timestamp                 1666647286000
+     :type                      types/contact-verification}]})
+
+(def contact-verification-expected-notification
+  {:accepted                    false
+   :author                      "0x04d03f"
+   :chat-id                     "0x04d03f"
+   :contact-verification-status constants/contact-verification-status-pending
+   :dismissed                   false
+   :id                          notification-id
+   :last-message                nil
+   :message                     {:command-parameters nil
+                                 :content            {:chat-id     nil
+                                                      :ens-name    nil
+                                                      :image       nil
+                                                      :line-count  nil
+                                                      :links       nil
+                                                      :parsed-text nil
+                                                      :response-to nil
+                                                      :rtl?        nil
+                                                      :sticker     nil
+                                                      :text        nil}
+                                 :outgoing           false
+                                 :outgoing-status    nil
+                                 :quoted-message     nil}
+   :name                        "0x04d03f"
+   :read                        true
+   :reply-message               nil
+   :timestamp                   1666647286000
+   :type                        types/contact-verification})
+
+(defn test-log-on-failure
+  [{:keys [notification-id event action]}]
+  (rf-test/run-test-sync
+   (setup)
+   (h/using-log-test-appender
+    (fn [logs]
+      (h/stub-fx-with-callbacks ::json-rpc/call :on-error (constantly :fake-error))
+
+      (rf/dispatch event)
+
+      (is (= {:args  [(str "Failed to " action)
+                      {:notification-id notification-id
+                       :error           :fake-error}]
+              :level :warn}
+             (last @logs)))))))
+
+(defn test-contact-verification-event
+  [{:keys [event expected-rpc-call]}]
+  (rf-test/run-test-sync
+   (setup)
+   (let [spy-queue (atom [])]
+     (h/stub-fx-with-callbacks ::json-rpc/call :on-success (constantly contact-verification-rpc-response))
+     (h/spy-fx spy-queue ::json-rpc/call)
+     (rf/dispatch event)
+
+     (is (= {types/no-type
+             {:all    {:data [contact-verification-expected-notification]}
+              :unread {:data []}}
+             types/contact-verification
+             {:all    {:data [contact-verification-expected-notification]}
+              :unread {:data []}}}
+            (get-in (h/db) [:activity-center :notifications])))
+
+     (is (= expected-rpc-call
+            (-> @spy-queue
+                (get-in [0 :args 0])
+                (select-keys [:method :params])))))))
+
+(deftest contact-verification-decline-test
+  (with-redefs [config/new-activity-center-enabled? true]
+    (testing "declines notification and reconciles"
+      (test-contact-verification-event
+       {:event             [:activity-center.contact-verification/decline notification-id]
+        :expected-rpc-call {:method "wakuext_declineContactVerificationRequest"
+                            :params [notification-id]}}))
+    (testing "logs on failure"
+      (test-log-on-failure
+       {:notification-id notification-id
+        :event           [:activity-center.contact-verification/decline notification-id]
+        :action          :contact-verification/decline}))))
+
+(deftest contact-verification-reply-test
+  (with-redefs [config/new-activity-center-enabled? true]
+    (testing "sends reply and reconciles"
+      (let [reply "any answer"]
+        (test-contact-verification-event
+         {:event             [:activity-center.contact-verification/reply notification-id reply]
+          :expected-rpc-call {:method "wakuext_acceptContactVerificationRequest"
+                              :params [notification-id reply]}})))
+    (testing "logs on failure"
+      (test-log-on-failure
+       {:notification-id notification-id
+        :event           [:activity-center.contact-verification/reply notification-id "any answer"]
+        :action          :contact-verification/reply}))))
+
+(deftest contact-verification-mark-as-trusted-test
+  (with-redefs [config/new-activity-center-enabled? true]
+    (testing "marks notification as trusted and reconciles"
+      (test-contact-verification-event
+       {:event             [:activity-center.contact-verification/mark-as-trusted notification-id]
+        :expected-rpc-call {:method "wakuext_verifiedTrusted"
+                            :params [{:id notification-id}]}}))
+    (testing "logs on failure"
+      (test-log-on-failure
+       {:notification-id notification-id
+        :event           [:activity-center.contact-verification/mark-as-trusted notification-id]
+        :action          :contact-verification/mark-as-trusted}))))
+
+(deftest contact-verification-mark-as-untrustworthy-test
+  (with-redefs [config/new-activity-center-enabled? true]
+    (testing "marks notification as untrustworthy and reconciles"
+      (test-contact-verification-event
+       {:event             [:activity-center.contact-verification/mark-as-untrustworthy notification-id]
+        :expected-rpc-call {:method "wakuext_verifiedUntrustworthy"
+                            :params [{:id notification-id}]}}))
+    (testing "logs on failure"
+      (test-log-on-failure
+       {:notification-id notification-id
+        :event           [:activity-center.contact-verification/mark-as-untrustworthy notification-id]
+        :action          :contact-verification/mark-as-untrustworthy}))))
+
+;;;; Notification reconciliation
+
+(deftest notifications-reconcile-test
+  (with-redefs [config/new-activity-center-enabled? true]
+    (testing "does nothing when there are no new notifications"
+      (rf-test/run-test-sync
+       (setup)
+       (let [notifications {types/one-to-one-chat
+                            {:all    {:cursor ""
+                                      :data   [{:id   "0x1"
+                                                :read true
+                                                :type types/one-to-one-chat}
+                                               {:id   "0x2"
+                                                :read false
+                                                :type types/one-to-one-chat}]}
+                             :unread {:cursor ""
+                                      :data   [{:id   "0x3"
+                                                :read false
+                                                :type types/one-to-one-chat}]}}
+                            types/private-group-chat
+                            {:unread {:cursor ""
+                                      :data   [{:id   "0x4"
+                                                :read false
+                                                :type types/private-group-chat}]}}}]
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications] notifications])
+
+         (rf/dispatch [:activity-center.notifications/reconcile nil])
+
+         (is (= notifications (get-in (h/db) [:activity-center :notifications]))))))
+
+    (testing "removes dismissed or accepted notifications"
+      (rf-test/run-test-sync
+       (setup)
+       (let [notif-1 {:id "0x1" :read true :type types/one-to-one-chat}
+             notif-2 {:id "0x2" :read false :type types/one-to-one-chat}
+             notif-3 {:id "0x3" :read false :type types/one-to-one-chat}
+             notif-4 {:id "0x4" :read false :type types/private-group-chat}
+             notif-5 {:id "0x5" :read true :type types/private-group-chat}
+             notif-6 {:id "0x6" :read false :type types/private-group-chat}]
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications]
+                       {types/one-to-one-chat
+                        {:all    {:cursor "" :data [notif-1 notif-2]}
+                         :unread {:cursor "" :data [notif-3]}}
+                        types/private-group-chat
+                        {:unread {:cursor "" :data [notif-4 notif-6]}}}])
+
+         (rf/dispatch [:activity-center.notifications/reconcile
+                       [(assoc notif-1 :dismissed true)
+                        (assoc notif-3 :accepted true)
+                        (assoc notif-4 :dismissed true)
+                        notif-5]])
+
+         (is (= {types/no-type
+                 {:all    {:data [notif-5]}
+                  :unread {:data []}}
+                 types/one-to-one-chat
+                 {:all    {:cursor "" :data [notif-2]}
+                  :unread {:cursor "" :data []}}
+                 types/private-group-chat
+                 {:all    {:data [notif-5]}
+                  :unread {:cursor "" :data [notif-6]}}}
+                (get-in (h/db) [:activity-center :notifications]))))))
+
+    (testing "replaces old notifications with newly arrived ones"
+      (rf-test/run-test-sync
+       (setup)
+       (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat}
+             notif-4     {:id "0x4" :read false :type types/private-group-chat}
+             notif-6     {:id "0x6" :read false :type types/private-group-chat}
+             new-notif-1 (assoc notif-1 :last-message {})
+             new-notif-4 (assoc notif-4 :author "0xabc")]
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications]
+                       {types/no-type
+                        {:all    {:cursor "" :data [notif-1]}
+                         :unread {:cursor "" :data [notif-4 notif-6]}}
+                        types/one-to-one-chat
+                        {:all {:cursor "" :data [notif-1]}}
+                        types/private-group-chat
+                        {:unread {:cursor "" :data [notif-4 notif-6]}}}])
+
+         (rf/dispatch [:activity-center.notifications/reconcile [new-notif-1 new-notif-4 notif-6]])
+
+         (is (= {types/no-type
+                 {:all    {:cursor "" :data [notif-6 new-notif-4 new-notif-1]}
+                  :unread {:cursor "" :data [notif-6 new-notif-4]}}
+                 types/one-to-one-chat
+                 {:all    {:cursor "" :data [new-notif-1]}
+                  :unread {:data []}}
+                 types/private-group-chat
+                 {:all    {:data [notif-6 new-notif-4]}
+                  :unread {:cursor "" :data [notif-6 new-notif-4]}}}
+                (get-in (h/db) [:activity-center :notifications]))))))
+
+    (testing "reconciles notifications that switched their read/unread status"
+      (rf-test/run-test-sync
+       (setup)
+       (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat}
+             new-notif-1 (assoc notif-1 :read false)]
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications]
+                       {types/one-to-one-chat
+                        {:all {:cursor "" :data [notif-1]}}}])
+
+         (rf/dispatch [:activity-center.notifications/reconcile [new-notif-1]])
+
+         (is (= {types/no-type
+                 {:all    {:data [new-notif-1]}
+                  :unread {:data [new-notif-1]}}
+
+                 types/one-to-one-chat
+                 {:all    {:cursor "" :data [new-notif-1]}
+                  :unread {:data [new-notif-1]}}}
+                (get-in (h/db) [:activity-center :notifications]))))))
+
+    ;; Sorting by timestamp and ID is compatible with what the backend does when
+    ;; returning paginated results.
+    (testing "sorts notifications by timestamp and id in descending order"
+      (rf-test/run-test-sync
+       (setup)
+       (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat :timestamp 1}
+             notif-2     {:id "0x2" :read true :type types/one-to-one-chat :timestamp 1}
+             notif-3     {:id "0x3" :read false :type types/one-to-one-chat :timestamp 50}
+             notif-4     {:id "0x4" :read false :type types/one-to-one-chat :timestamp 100}
+             notif-5     {:id "0x5" :read false :type types/one-to-one-chat :timestamp 100}
+             new-notif-1 (assoc notif-1 :last-message {})
+             new-notif-4 (assoc notif-4 :last-message {})]
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications]
+                       {types/one-to-one-chat
+                        {:all    {:cursor "" :data [notif-1 notif-2]}
+                         :unread {:cursor "" :data [notif-3 notif-4 notif-5]}}}])
+
+         (rf/dispatch [:activity-center.notifications/reconcile [new-notif-1 new-notif-4]])
+
+         (is (= {types/no-type
+                 {:all    {:data [new-notif-4 new-notif-1]}
+                  :unread {:data [new-notif-4]}}
+                 types/one-to-one-chat
+                 {:all    {:cursor "" :data [new-notif-4 notif-2 new-notif-1]}
+                  :unread {:cursor "" :data [notif-5 new-notif-4 notif-3]}}}
+                (get-in (h/db) [:activity-center :notifications]))))))))
+
+;;;; Notifications fetching and pagination
+
+(deftest notifications-fetch-test
+  (with-redefs [config/new-activity-center-enabled? true]
+    (testing "fetches first page"
+      (rf-test/run-test-sync
+       (setup)
+       (let [spy-queue (atom [])]
+         (h/stub-fx-with-callbacks
+          ::json-rpc/call
+          :on-success (constantly {:cursor        "10"
+                                   :notifications [{:id     "0x1"
+                                                    :type   types/one-to-one-chat
+                                                    :read   false
+                                                    :chatId "0x9"}]}))
+         (h/spy-fx spy-queue ::json-rpc/call)
+
+         (rf/dispatch [:activity-center.notifications/fetch-first-page
+                       {:filter-type types/one-to-one-chat}])
+
+         (is (= :unread (get-in (h/db) [:activity-center :filter :status])))
+         (is (= "" (get-in @spy-queue [0 :args 0 :params 0]))
+             "Should be called with empty cursor when fetching first page")
+         (is (= {types/one-to-one-chat
+                 {:unread {:cursor "10"
+                           :data   [{:chat-id       "0x9"
+                                     :chat-name     nil
+                                     :chat-type     types/one-to-one-chat
+                                     :group-chat    false
+                                     :id            "0x1"
+                                     :public?       false
+                                     :last-message  nil
+                                     :message       nil
+                                     :read          false
+                                     :reply-message nil
+                                     :type          types/one-to-one-chat}]}}}
+                (get-in (h/db) [:activity-center :notifications]))))))
+
+    (testing "does not fetch next page when pagination cursor reached the end"
+      (rf-test/run-test-sync
+       (setup)
+       (let [spy-queue (atom [])]
+         (h/spy-fx spy-queue ::json-rpc/call)
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                       :unread])
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                       types/one-to-one-chat])
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :unread :cursor]
+                       ""])
+
+         (rf/dispatch [:activity-center.notifications/fetch-next-page])
+
+         (is (= [] @spy-queue)))))
+
+    ;; The cursor can be nil sometimes because the reconciliation doesn't care
+    ;; about updating the cursor value, but we have to make sure the next page is
+    ;; only fetched if the current cursor is valid.
+    (testing "does not fetch next page when cursor is nil"
+      (rf-test/run-test-sync
+       (setup)
+       (let [spy-queue (atom [])]
+         (h/spy-fx spy-queue ::json-rpc/call)
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                       :unread])
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                       types/one-to-one-chat])
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :unread :cursor]
+                       nil])
+
+         (rf/dispatch [:activity-center.notifications/fetch-next-page])
+
+         (is (= [] @spy-queue)))))
+
+    (testing "fetches next page when pagination cursor is not empty"
+      (rf-test/run-test-sync
+       (setup)
+       (let [spy-queue (atom [])]
+         (h/stub-fx-with-callbacks
+          ::json-rpc/call
+          :on-success (constantly {:cursor        ""
+                                   :notifications [{:id     "0x1"
+                                                    :type   types/mention
+                                                    :read   false
+                                                    :chatId "0x9"}]}))
+         (h/spy-fx spy-queue ::json-rpc/call)
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                       :unread])
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                       types/mention])
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/mention :unread :cursor]
+                       "10"])
+
+         (rf/dispatch [:activity-center.notifications/fetch-next-page])
+
+         (is (= "wakuext_activityCenterNotificationsBy" (get-in @spy-queue [0 :args 0 :method])))
+         (is (= "10" (get-in @spy-queue [0 :args 0 :params 0]))
+             "Should be called with current cursor")
+         (is (= {types/mention
+                 {:unread {:cursor ""
+                           :data   [{:chat-id       "0x9"
+                                     :chat-name     nil
+                                     :chat-type     3
+                                     :id            "0x1"
+                                     :last-message  nil
+                                     :message       nil
+                                     :read          false
+                                     :reply-message nil
+                                     :type          types/mention}]}}}
+                (get-in (h/db) [:activity-center :notifications]))))))
+
+    (testing "does not fetch next page while it is still loading"
+      (rf-test/run-test-sync
+       (setup)
+       (let [spy-queue (atom [])]
+         (h/spy-fx spy-queue ::json-rpc/call)
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                       :all])
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                       types/one-to-one-chat])
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :all :cursor]
+                       "10"])
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :all :loading?]
+                       true])
+
+         (rf/dispatch [:activity-center.notifications/fetch-next-page])
+
+         (is (= [] @spy-queue)))))
+
+    (testing "resets loading flag after an error"
+      (rf-test/run-test-sync
+       (setup)
+       (let [spy-queue (atom [])]
+         (h/stub-fx-with-callbacks ::json-rpc/call :on-error (constantly :fake-error))
+         (h/spy-event-fx spy-queue :activity-center.notifications/fetch-error)
+         (h/spy-fx spy-queue ::json-rpc/call)
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                       :unread])
+         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                       types/one-to-one-chat])
+         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :unread :cursor]
+                       ""])
+
+         (rf/dispatch [:activity-center.notifications/fetch-first-page])
+
+         (is (nil? (get-in (h/db) [:activity-center :notifications types/one-to-one-chat :unread :loading?])))
+         (is (= [:activity-center.notifications/fetch-error
+                 types/one-to-one-chat
+                 :unread
+                 :fake-error]
+                (:args (last @spy-queue)))))))))