Merge branch 'develop' into 14620

https://github.com/status-im/status-go/compare/b4bdfd3d...d40290a6

.babelrc

@@ -1,8 +0,0 @@
-{
-  "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>=
-status-im.utils.debounce/clear-all
+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,13 +1,23 @@
-{: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
-           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]}
-           ;;TODO remove number when this is fixed
-           ;;https://github.com/borkdude/clj-kondo/issues/867
-           :unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY number]}}}
+{: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
+                test-helpers.unit/deftest-sub  clojure.core/defn
+                taoensso.tufte/defnp           clojure.core/defn}
+ :linters      {:consistent-alias  {:level   :error
+                                    :aliases {clojure.string  string
+                                              clojure.set     set
+                                              clojure.walk    walk
+                                              taoensso.timbre log}}
+                :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
+                                              status-im.test-helpers/restore-app-db]}}
+ :config-in-ns {mocks.js-dependencies {:linters {:clojure-lsp/unused-public-var {:level :off}}}}}

.detoxrc.js

@@ -0,0 +1,37 @@
+module.exports = {
+  "testRunner": "jest",
+  "testRegex": "\\.visual\\.js$",
+  "runner-config": "visual-test/config.json",
+  "devices": {
+    "simulator": {
+      "type": "ios.simulator",
+      "device": {
+        "type": "iPhone 11 Pro"
+      }
+    }
+  },
+  "apps": {
+    "ios.release": {
+      "name": "StatusIm",
+      "type": "ios.app",
+      "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/StatusIm.app",
+      "build": "make release-ios"
+    },
+    "ios.debug": {
+      "name": "StatusIm",
+      "type": "ios.app",
+      "binaryPath": process.env.TEST_BINARY_PATH,
+      "build": "make run-ios SIMULATOR='iPhone 11 Pro'"
+    }
+  },
+  "configurations": {
+    "ios.sim.release": {
+      "device": "simulator",
+      "app": "ios.release"
+    },
+    "ios.sim.debug": {
+      "device": "simulator",
+      "app": "ios.debug"
+    }
+  }
+}

.env

@@ -4,7 +4,7 @@ DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -32,3 +32,4 @@ 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=eth.staging
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
@@ -32,3 +32,4 @@ 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=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -34,3 +34,4 @@ 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=eth.prod
+FLEET=status.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=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1

.gitignore

@@ -7,6 +7,7 @@
 
 # Xcode
 #
+/component-spec
 result/
 build/
 *.pbxuser
@@ -175,3 +176,11 @@ test/appium/tests/users.py
 ##node bindings
 /bin/
 /lib/
+
+## visual tests
+/artifacts
+
+/.calva/
+
+## component-tests
+*.log

.zprintrc

@@ -0,0 +1,48 @@
+;; -*- 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
+  "h/describe"      :arg1-body
+  "h/test"          :arg1-body
+  "global.describe" :arg1-body
+  "global.test"     :arg1-body
+  "list-comp"       :binding
+  "defview"         :arg1-body
+  "letsubs"         :binding
+  "testing"         :arg1-body
+  "deftest-sub"     :arg1-body
+  "wait-for"        :arg1-body
+  "with-deps-check" :arg1-body
+  "->"              [: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}}
+  :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

@@ -48,7 +48,7 @@ export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-mobile
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
 export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE
 
-# Useful for Andoird release builds
+# Useful for Android release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
 
 # MacOS root is read-only, read nix/README.md for details
@@ -285,16 +285,19 @@ endif
 # Tests
 #--------------
 
-lint: export TARGET := clojure
+lint: export TARGET := default
 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 src && echo src) && \
-	clojure -Scp "$$CLASS_PATH" -m cljfmt.main check --indents indentation.edn $$TARGETS
+	ALL_CLOJURE_FILE=$$(git ls-files | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn$$) && \
+	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILE
 
-lint-fix: export TARGET := clojure
+lint-fix: export TARGET := default
 lint-fix: ##@test Run code style checks and fix issues
-	clojure -Scp "$$CLASS_PATH" -m cljfmt.main fix src --indents indentation.edn
+	ALL_CLOJURE_FILE=$$(git ls-files | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn$$) && \
+	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILE && \
+	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILE
+
 
 shadow-server: export TARGET := clojure
 shadow-server:##@ Start shadow-cljs in server mode for watching
@@ -305,15 +308,46 @@ 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 creates the gyp bindings for nodejs
+	# Here we create the gyp bindings for nodejs
 	yarn install
 	yarn shadow-cljs compile mocks && \
 	yarn shadow-cljs compile test && \
 	node --require ./test-resources/override.js target/test/test.js
 
-#--------------
+
+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: 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
+
 # Other
 #--------------
 

babel.config.js

@@ -0,0 +1,24 @@
+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.1'
+library 'status-jenkins-lib@v1.6.3'
 
 /* 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'
+    TARGET   = "android${utils.isE2EBuild() ? "-e2e" : ""}"
     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.1'
+library 'status-jenkins-lib@v1.6.3'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.1'
+library 'status-jenkins-lib@v1.6.3'
 
 /* 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.1'
+library 'status-jenkins-lib@v1.6.3'
 
 pipeline {
   agent { label params.AGENT_LABEL }

ci/Jenkinsfile.tests

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

ci/tests/Jenkinsfile.e2e-nightly

@@ -62,7 +62,7 @@ pipeline {
                 --rerun_count=2 \
                 --testrail_report=True \
                 -m testrail_id \
-                -m \"new_ui_critical\" \
+                -m \"new_ui_critical or new_ui_medium\" \
                 -k \"${params.KEYWORD_EXPRESSION}\" \
                 --apk=${params.APK_NAME}
             """

ci/tests/Jenkinsfile.e2e-prs

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

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.playstore-meta

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.1'
+library 'status-jenkins-lib@v1.6.3'
 
 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 HOLDINGS PTE. LTD.` as the development team and rebuild again.
+  - Select `Status Research & Development GmbH` 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,6 +20,8 @@ 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,6 +62,31 @@ 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
@@ -249,6 +274,22 @@ 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
@@ -296,6 +337,53 @@ 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 '[test-helpers.unit :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:
@@ -311,13 +399,15 @@ src
 ├── react_native
 │   ├── gesture.cljs
 │   └── platform.cljs
-├── status_im
+├── status_im/
+├── status_im2
 │   ├── common
 │   │   └── components
 │   │       └── bottom_sheet.cljs
 │   ├── contexts/
 │   ├── setup/
 │   └── subs/
+├── test_helpers/
 └── utils.cljs
 ```
 
@@ -326,17 +416,23 @@ src
 - `src/quo2/`: The component library for Status Mobile.
 - `src/react_native/`: Contains only low-level constructs to help React Native
   work in tandem with Clojure(Script).
-- `src/status_im/common/`: Directories named `common` can appear at any level of
-  the directory tree. Just like directories named `utils`, their directory
+- `src/status_im2/`: Directory where we try to be as strict as possible about
+  our guidelines and where we prefer to write code for the new, redesigned
+  mobile app.
+- `src/status_im/`: Directory containing what we call "old code", not yet
+  migrated to new guidelines for the new mobile app.
+- `src/status_im2/common/`: Directories named `common` can appear at any level
+  of the directory tree. Just like directories named `utils`, their directory
   nesting level communicates their applicable limits.
-- `src/status_im/common/components/`: Contains reusable components that are not
+- `src/status_im2/common/components/`: Contains reusable components that are not
   part of the design system (quo2).
-- `src/status_im/contexts/`: Contains [bounded contexts](#glossary), like
+- `src/status_im2/contexts/`: Contains [bounded contexts](#glossary), like
   `browser/`, `messaging/`, etc. As much as possible, _bounded contexts_ should
   not directly require each other's namespaces.
-- `src/status_im/setup/`: Contains namespaces that are mostly used to initialize
-  the application, configure test runners, etc. In general, such namespaces
-  should not be required from the outside.
+- `src/status_im2/setup/`: Contains namespaces that are mostly used to
+  initialize the application, configure test runners, etc. In general, such
+  namespaces should not be required from the outside.
+- `src/test_helpers/`: Reusable utilities for writing all kinds of tests.
 - `src/status_im/subs/`: All subscriptions should live inside it.
 
 Directories named `utils/` can appear at any level of the directory tree. The
@@ -397,18 +493,26 @@ src
 [Unit tests](#glossary) should be created alongside their respective source
 implementation. We prefer them colocated with the source and not like most
 Clojure (JVM) codebases which mirror the sources in a top-level test directory.
-Component tests should be created in a separate directory `__tests__`. Example:
 
 ```
 ├── models
 │   ├── message.cljs
 │   └── message_test.cljs
-├── __tests__
-│   └── input_bla_test.cljs
 ├── models.cljs
 └── models_test.cljs
 ```
 
+Component tests should be created in a separate directory `__tests__`, colocated
+with the source. When the entire component implementation is isolated under a
+single directory, create a test file named `component_spec.cljs` instead.
+
+```
+└── filter
+    ├── component_spec.cljs
+    ├── style.cljs
+    └── view.cljs
+```
+
 There's no hard rule on how integration test namespaces should be split, but
 we're at least striving to define them under appropriate bounded contexts that
 mirror the source code.

indentation.edn

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

ios/Podfile.lock

@@ -640,7 +640,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 352a8ca9bbc8e2f097d680747a8c97ecef12d469
   FBReactNativeSpec: 7dfb84f624136a45727c813ed21d130cd3e61beb
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 997518ea2aa2d8cd5df9797b641b758d52ecf2bc
+  glog: 36ce0530c6d2c3a5a4326885ef4069564887a1db
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
   libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c

ios/StatusIm.xcodeproj/project.pbxproj

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

modules/react-native-status/android/build.gradle

@@ -19,6 +19,11 @@ def getStatusGoSHA1 = { ->
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion

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

@@ -0,0 +1,78 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -59,8 +59,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.Map;
 import java.util.Stack;
 import java.util.zip.ZipEntry;
@@ -527,45 +531,33 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         StatusThreadPoolExecutor.getInstance().execute(r);
     }
 
-    @ReactMethod
-    public void verify(final String address, final String password, final Callback callback) {
-        Log.d(TAG, "verify");
+    private void executeRunnableStatusGoMethod(Supplier<String> method, Callback callback) throws JSONException {
         if (!checkAvailability()) {
             callback.invoke(false);
             return;
         }
 
+        Runnable runnableTask = () -> {
+            String res = method.get();
+            callback.invoke(res);
+        };
+
+        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
+    }
+
+    @ReactMethod
+    public void verify(final String address, final String password, final Callback callback) throws JSONException {
         Activity currentActivity = getCurrentActivity();
 
         final String absRootDirPath = this.getNoBackupDirectory();
         final String newKeystoreDir = pathCombine(absRootDirPath, "keystore");
 
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String result = Statusgo.verifyAccountPassword(newKeystoreDir, address, password);
-
-                callback.invoke(result);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        executeRunnableStatusGoMethod(() -> Statusgo.verifyAccountPassword(newKeystoreDir, address, password), callback);
     }
 
     @ReactMethod
-    public void verifyDatabasePassword(final String keyUID, final String password, final Callback callback) {
-        Log.d(TAG, "verifyDatabasePassword");
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String result = Statusgo.verifyDatabasePassword(keyUID, password);
-
-                callback.invoke(result);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void verifyDatabasePassword(final String keyUID, final String password, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.verifyDatabasePassword(keyUID, password), callback);
     }
 
     public String getKeyStorePath(String keyUID) {
@@ -735,361 +727,209 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     }
 
     @ReactMethod
-    public void addPeer(final String enode, final Callback callback) {
-        Log.d(TAG, "addPeer");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.addPeer(enode);
-
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void addPeer(final String enode, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.addPeer(enode), callback);
     }
 
     @ReactMethod
-    public void multiAccountStoreAccount(final String json, final Callback callback) {
-        Log.d(TAG, "multiAccountStoreAccount");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.multiAccountStoreAccount(json);
-
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void multiAccountStoreAccount(final String json, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.multiAccountStoreAccount(json), callback);
     }
 
     @ReactMethod
-    public void multiAccountLoadAccount(final String json, final Callback callback) {
-        Log.d(TAG, "multiAccountLoadAccount");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.multiAccountLoadAccount(json);
-
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void multiAccountLoadAccount(final String json, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.multiAccountLoadAccount(json), callback);
     }
 
     @ReactMethod
-    public void multiAccountReset(final Callback callback) {
-        Log.d(TAG, "multiAccountReset");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.multiAccountReset();
+    public void multiAccountReset(final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.multiAccountReset(), callback);
 
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
     }
 
     @ReactMethod
-    public void multiAccountDeriveAddresses(final String json, final Callback callback) {
-        Log.d(TAG, "multiAccountDeriveAddresses");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.multiAccountDeriveAddresses(json);
-
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void multiAccountDeriveAddresses(final String json, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.multiAccountDeriveAddresses(json), callback);
     }
 
     @ReactMethod
-    public void multiAccountGenerateAndDeriveAddresses(final String json, final Callback callback) {
-        Log.d(TAG, "multiAccountGenerateAndDeriveAddresses");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.multiAccountGenerateAndDeriveAddresses(json);
-
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void multiAccountGenerateAndDeriveAddresses(final String json, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.multiAccountGenerateAndDeriveAddresses(json), callback);
     }
 
     @ReactMethod
-    public void multiAccountStoreDerived(final String json, final Callback callback) {
-        Log.d(TAG, "multiAccountStoreDerived");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.multiAccountStoreDerivedAccounts(json);
-
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void multiAccountStoreDerived(final String json, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.multiAccountStoreDerivedAccounts(json), callback);
     }
 
     @ReactMethod
-    public void multiAccountImportMnemonic(final String json, final Callback callback) {
-        Log.d(TAG, "multiAccountImportMnemonic");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.multiAccountImportMnemonic(json);
-                callback.invoke(res);
-            }
-        };
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void multiAccountImportMnemonic(final String json, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.multiAccountImportMnemonic(json), callback);
     }
 
     @ReactMethod
-    public void multiAccountImportPrivateKey(final String json, final Callback callback) {
-        Log.d(TAG, "multiAccountImportPrivateKey");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.multiAccountImportPrivateKey(json);
-                callback.invoke(res);
-            }
-        };
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void multiAccountImportPrivateKey(final String json, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.multiAccountImportPrivateKey(json), callback);
     }
 
     @ReactMethod
-    public void hashTransaction(final String txArgsJSON, final Callback callback) {
-        Log.d(TAG, "hashTransaction");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.hashTransaction(txArgsJSON);
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void hashTransaction(final String txArgsJSON, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.hashTransaction(txArgsJSON), callback);
     }
 
     @ReactMethod
-    public void hashMessage(final String message, final Callback callback) {
-        Log.d(TAG, "hashMessage");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.hashMessage(message);
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void hashMessage(final String message, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.hashMessage(message), callback);
     }
 
     @ReactMethod
-    public void hashTypedData(final String data, final Callback callback) {
-        Log.d(TAG, "hashTypedData");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
+    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);
 
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.hashTypedData(data);
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        executeRunnableStatusGoMethod(() -> Statusgo.getConnectionStringForBootstrappingAnotherDevice(jsonConfig.toString()), callback);
     }
 
     @ReactMethod
-    public void hashTypedDataV4(final String data, final Callback callback) {
-        Log.d(TAG, "hashTypedDataV4");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
+    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);
 
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.hashTypedDataV4(data);
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        executeRunnableStatusGoMethod(() -> Statusgo.inputConnectionStringForBootstrapping(connectionString, jsonConfig.toString()), callback);
     }
 
     @ReactMethod
-    public void sendTransactionWithSignature(final String txArgsJSON, final String signature, final Callback callback) {
-        Log.d(TAG, "sendTransactionWithSignature");
+    public void multiformatSerializePublicKey(final String multiCodecKey, final String base58btc, final Callback callback) throws JSONException {
         if (!checkAvailability()) {
             callback.invoke(false);
             return;
         }
 
-        Runnable r = new Runnable() {
+        Runnable runnableTask = new Runnable() {
             @Override
             public void run() {
-                String res = Statusgo.sendTransactionWithSignature(txArgsJSON, signature);
+                String res = Statusgo.multiformatSerializePublicKey(multiCodecKey,base58btc);
                 callback.invoke(res);
             }
         };
 
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
     }
 
     @ReactMethod
-    public void sendTransaction(final String txArgsJSON, final String password, final Callback callback) {
-        Log.d(TAG, "sendTransaction");
+    public void multiformatDeserializePublicKey(final String multiCodecKey, final String base58btc, final Callback callback) throws JSONException {
         if (!checkAvailability()) {
             callback.invoke(false);
             return;
         }
 
-        Runnable r = new Runnable() {
+        Runnable runnableTask = new Runnable() {
             @Override
             public void run() {
-                String res = Statusgo.sendTransaction(txArgsJSON, password);
+                String res = Statusgo.multiformatDeserializePublicKey(multiCodecKey,base58btc);
                 callback.invoke(res);
             }
         };
 
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
     }
 
     @ReactMethod
-    public void signMessage(final String rpcParams, final Callback callback) {
-        Log.d(TAG, "signMessage");
+    public void compressPublicKey(final String multiCodecKey, final Callback callback) throws JSONException {
         if (!checkAvailability()) {
             callback.invoke(false);
             return;
         }
 
-        Runnable r = new Runnable() {
+        Runnable runnableTask = new Runnable() {
             @Override
             public void run() {
-                String res = Statusgo.signMessage(rpcParams);
+                String res = Statusgo.compressPublicKey(multiCodecKey);
                 callback.invoke(res);
             }
         };
 
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
     }
 
     @ReactMethod
-    public void recover(final String rpcParams, final Callback callback) {
-        Log.d(TAG, "recover");
+    public void decompressPublicKey(final String multiCodecKey, final Callback callback) throws JSONException {
         if (!checkAvailability()) {
             callback.invoke(false);
             return;
         }
 
-        Runnable r = new Runnable() {
+        Runnable runnableTask = new Runnable() {
             @Override
             public void run() {
-                String res = Statusgo.recover(rpcParams);
+                String res = Statusgo.decompressPublicKey(multiCodecKey);
                 callback.invoke(res);
             }
         };
 
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
     }
 
     @ReactMethod
-    public void signTypedData(final String data, final String account, final String password, final Callback callback) {
-        Log.d(TAG, "signTypedData");
+    public void deserializeAndCompressKey(final String desktopKey, final Callback callback) throws JSONException {
         if (!checkAvailability()) {
             callback.invoke(false);
             return;
         }
 
-        Runnable r = new Runnable() {
+        Runnable runnableTask = new Runnable() {
             @Override
             public void run() {
-                String res = Statusgo.signTypedData(data, account, password);
+                String res = Statusgo.deserializeAndCompressKey(desktopKey);
                 callback.invoke(res);
             }
         };
 
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
     }
 
     @ReactMethod
-    public void signTypedDataV4(final String data, final String account, final String password, final Callback callback) {
-        Log.d(TAG, "signTypedDataV4");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
+    public void hashTypedData(final String data, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.hashTypedData(data), callback);
+    }
 
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.signTypedDataV4(data, account, password);
-                callback.invoke(res);
-            }
-        };
+    @ReactMethod
+    public void hashTypedDataV4(final String data, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.hashTypedDataV4(data), callback);
+    }
+
+    @ReactMethod
+    public void sendTransactionWithSignature(final String txArgsJSON, final String signature, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.sendTransactionWithSignature(txArgsJSON, signature), callback);
+    }
+
+    @ReactMethod
+    public void sendTransaction(final String txArgsJSON, final String password, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.sendTransaction(txArgsJSON, password), callback);
+    }
+
+    @ReactMethod
+    public void signMessage(final String rpcParams, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.signMessage(rpcParams), callback);
+    }
+
+    @ReactMethod
+    public void recover(final String rpcParams, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.recover(rpcParams), callback);
+    }
+
+    @ReactMethod
+    public void signTypedData(final String data, final String account, final String password, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.signTypedData(data, account, password), callback);
+    }
+
+    @ReactMethod
+    public void signTypedDataV4(final String data, final String account, final String password, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.signTypedDataV4(data, account, password), callback);
 
-        StatusThreadPoolExecutor.getInstance().execute(r);
     }
 
     @ReactMethod
@@ -1194,29 +1034,13 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     }
 
     @ReactMethod
-    public void callRPC(final String payload, final Callback callback) {
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.callRPC(payload);
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void callRPC(final String payload, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.callRPC(payload), callback);
     }
 
     @ReactMethod
-    public void callPrivateRPC(final String payload, final Callback callback) {
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.callPrivateRPC(payload);
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void callPrivateRPC(final String payload, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.callPrivateRPC(payload), callback);
     }
 
     @ReactMethod
@@ -1279,105 +1103,30 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     }
 
     @ReactMethod
-    public void extractGroupMembershipSignatures(final String signaturePairs, final Callback callback) {
-        Log.d(TAG, "extractGroupMembershipSignatures");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String result = Statusgo.extractGroupMembershipSignatures(signaturePairs);
-
-                callback.invoke(result);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void extractGroupMembershipSignatures(final String signaturePairs, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.extractGroupMembershipSignatures(signaturePairs), callback);
     }
 
     @ReactMethod
-    public void signGroupMembership(final String content, final Callback callback) {
-        Log.d(TAG, "signGroupMembership");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String result = Statusgo.signGroupMembership(content);
-
-                callback.invoke(result);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void signGroupMembership(final String content, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.signGroupMembership(content), callback);
     }
 
     @ReactMethod
-    public void getNodeConfig(final Callback callback) {
-        Log.d(TAG, "getNodeConfig");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String result = Statusgo.getNodeConfig();
-
-                callback.invoke(result);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void getNodeConfig(final Callback callback) throws JSONException {
+         executeRunnableStatusGoMethod(() -> Statusgo.getNodeConfig(), callback);
     }
 
     @ReactMethod
-    public void deleteMultiaccount(final String keyUID, final Callback callback) {
-        Log.d(TAG, "deleteMultiaccount");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
+    public void deleteMultiaccount(final String keyUID, final Callback callback) throws JSONException {
         final String keyStoreDir = this.getKeyStorePath(keyUID);
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.deleteMultiaccount(keyUID, keyStoreDir);
-
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        executeRunnableStatusGoMethod(() -> Statusgo.deleteMultiaccount(keyUID, keyStoreDir), callback);
     }
 
     @ReactMethod
-    public void deleteImportedKey(final String keyUID, final String address, final String password, final Callback callback) {
-        Log.d(TAG, "deleteImportedKey");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
+    public void deleteImportedKey(final String keyUID, final String address, final String password, final Callback callback) throws JSONException {
         final String keyStoreDir = this.getKeyStorePath(keyUID);
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.deleteImportedKey(address, password, keyStoreDir);
-
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        executeRunnableStatusGoMethod(() -> Statusgo.deleteImportedKey(address, password, keyStoreDir), callback);
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)
@@ -1386,24 +1135,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     }
 
     @ReactMethod
-    public void generateAliasAsync(final String seed, final Callback callback) {
-        Log.d(TAG, "generateAliasAsync");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.generateAlias(seed);
-
-                Log.d(TAG, res);
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void generateAliasAsync(final String seed, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.generateAlias(seed), callback);
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)
@@ -1467,47 +1200,33 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     }
 
     @ReactMethod
-    public void identiconAsync(final String seed, final Callback callback) {
-        Log.d(TAG, "identiconAsync");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.identicon(seed);
-
-                Log.d(TAG, res);
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void identiconAsync(final String seed, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.identicon(seed), callback);
     }
 
     @ReactMethod
     public void generateAliasAndIdenticonAsync(final String seed, final Callback callback) {
-        Log.d(TAG, "generateAliasAndIdenticonAsync");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
 
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String resIdenticon = Statusgo.identicon(seed);
-                String resAlias = Statusgo.generateAlias(seed);
+         Log.d(TAG, "generateAliasAndIdenticonAsync");
+                if (!checkAvailability()) {
+                    callback.invoke(false);
+                    return;
+                }
 
-                Log.d(TAG, resIdenticon);
-                Log.d(TAG, resAlias);
-                callback.invoke(resAlias, resIdenticon);
-            }
-        };
+                Runnable r = new Runnable() {
+                    @Override
+                    public void run() {
+                        String resIdenticon = Statusgo.identicon(seed);
+                        String resAlias = Statusgo.generateAlias(seed);
+
+                        Log.d(TAG, resIdenticon);
+                        Log.d(TAG, resAlias);
+                        callback.invoke(resAlias, resIdenticon);
+                    }
+                };
+
+                StatusThreadPoolExecutor.getInstance().execute(r);
 
-        StatusThreadPoolExecutor.getInstance().execute(r);
     }
 
     @Override
@@ -1529,24 +1248,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     }
 
     @ReactMethod
-    public void validateMnemonic(final String seed, final Callback callback) {
-        Log.d(TAG, "validateMnemonic");
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String resValidateMnemonic = Statusgo.validateMnemonic(seed);
-
-                Log.d(TAG, resValidateMnemonic);
-                callback.invoke(resValidateMnemonic);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void validateMnemonic(final String seed, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.validateMnemonic(seed), callback);
     }
 
     @ReactMethod
@@ -1597,35 +1300,14 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     }
 
     @ReactMethod
-    public void reEncryptDbAndKeystore(final String keyUID, final String password, final String newPassword, final Callback callback) {
-        Log.d(TAG, "reEncryptDbAndKeyStore");
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-		// changes db password and re-encrypts keystore
-                String result = Statusgo.changeDatabasePassword(keyUID, password, newPassword);
-                callback.invoke(result);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+    public void reEncryptDbAndKeystore(final String keyUID, final String password, final String newPassword, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.changeDatabasePassword(keyUID, password, newPassword), callback);
     }
 
     @ReactMethod
-    public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String password, final String newPassword, final Callback callback) {
-        Log.d(TAG, "convertToKeycardAccount");
-
+    public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String password, final String newPassword, final Callback callback) throws JSONException {
         final String keyStoreDir = this.getKeyStorePath(keyUID);
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String result = Statusgo.convertToKeycardAccount(keyStoreDir, accountData, options, password, newPassword);
-                callback.invoke(result);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
+        executeRunnableStatusGoMethod(() -> Statusgo.convertToKeycardAccount(keyStoreDir, accountData, options, password, newPassword), callback);
     }
 
 }

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

@@ -7,6 +7,7 @@ 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;
 
@@ -29,12 +30,15 @@ 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 Collections.emptyList();
+        return Arrays.<ViewManager>asList(
+                new RNSelectableTextInputViewManager()
+        );
     }
 }

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

@@ -90,26 +90,25 @@ 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
@@ -132,9 +131,9 @@ RCT_EXPORT_METHOD(initKeystore:(NSString *)keyUID
                    });
 }
 
-////////////////////////////////////////////////////////////////////
+
 #pragma mark - SendLogs method
-//////////////////////////////////////////////////////////////////// sendLogs
+
 RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
                   jsLogs:(NSString *)jsLogs
                   callback:(RCTResponseSenderBlock)callback) {
@@ -196,7 +195,6 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
     callback(@[zipFile.absoluteString]);
 }
 
-//////////////////////////////////////////////////////////////////// addPeer
 RCT_EXPORT_METHOD(exportLogs:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"exportLogs() method called");
@@ -205,7 +203,6 @@ RCT_EXPORT_METHOD(exportLogs:(RCTResponseSenderBlock)callback) {
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// addPeer
 RCT_EXPORT_METHOD(addPeer:(NSString *)enode
                   callback:(RCTResponseSenderBlock)callback) {
   NSString *result = StatusgoAddPeer(enode);
@@ -215,7 +212,6 @@ RCT_EXPORT_METHOD(addPeer:(NSString *)enode
 #endif
 }
 
-//////////////////////////////////////////////////////////////////// multiAccountImportPrivateKey
 RCT_EXPORT_METHOD(deleteMultiaccount:(NSString *)keyUID
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -226,7 +222,6 @@ RCT_EXPORT_METHOD(deleteMultiaccount:(NSString *)keyUID
     callback(@[result]);
 }
 
-////////////////////////////////////verify//////////////////////////////// multiAccountImportPrivateKey
 RCT_EXPORT_METHOD(deleteImportedKey:(NSString *)keyUID
                   address:(NSString *)address
                   password:(NSString *)password
@@ -239,7 +234,6 @@ RCT_EXPORT_METHOD(deleteImportedKey:(NSString *)keyUID
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// multiAccountGenerateAndDeriveAddresses
 RCT_EXPORT_METHOD(multiAccountGenerateAndDeriveAddresses:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -249,7 +243,6 @@ RCT_EXPORT_METHOD(multiAccountGenerateAndDeriveAddresses:(NSString *)json
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// MultiAccountStoreAccount
 RCT_EXPORT_METHOD(multiAccountStoreAccount:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -259,7 +252,6 @@ RCT_EXPORT_METHOD(multiAccountStoreAccount:(NSString *)json
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// MultiAccountLoadAccount
 RCT_EXPORT_METHOD(multiAccountLoadAccount:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -269,7 +261,6 @@ RCT_EXPORT_METHOD(multiAccountLoadAccount:(NSString *)json
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// MultiAccountReset
 RCT_EXPORT_METHOD(multiAccountReset:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"MultiAccountReset() method called");
@@ -278,7 +269,6 @@ RCT_EXPORT_METHOD(multiAccountReset:(RCTResponseSenderBlock)callback) {
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// multiAccountStoreDerived
 RCT_EXPORT_METHOD(multiAccountStoreDerived:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -288,7 +278,6 @@ RCT_EXPORT_METHOD(multiAccountStoreDerived:(NSString *)json
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// multiAccountImportPrivateKey
 RCT_EXPORT_METHOD(multiAccountImportPrivateKey:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -298,7 +287,6 @@ RCT_EXPORT_METHOD(multiAccountImportPrivateKey:(NSString *)json
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// hashTransaction
 RCT_EXPORT_METHOD(hashTransaction:(NSString *)txArgsJSON
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -308,7 +296,6 @@ RCT_EXPORT_METHOD(hashTransaction:(NSString *)txArgsJSON
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// hashMessage
 RCT_EXPORT_METHOD(hashMessage:(NSString *)message
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -318,7 +305,72 @@ RCT_EXPORT_METHOD(hashMessage:(NSString *)message
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// hashTypedData
+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]);
+}
+
+RCT_EXPORT_METHOD(multiformatSerializePublicKey:(NSString *)multiCodecKey
+                  base58btc:(NSString *)base58btc
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoMultiformatSerializePublicKey(multiCodecKey,base58btc);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(multiformatDeserializePublicKey:(NSString *)multiCodecKey
+                  base58btc:(NSString *)base58btc
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoMultiformatDeserializePublicKey(multiCodecKey,base58btc);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(decompressPublicKey:(NSString *)multiCodecKey
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoDecompressPublicKey(multiCodecKey);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(compressPublicKey:(NSString *)multiCodecKey
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoCompressPublicKey(multiCodecKey);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(deserializeAndCompressKey:(NSString *)desktopKey
+                  callback:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoDeserializeAndCompressKey(desktopKey);
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(hashTypedData:(NSString *)data
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -328,7 +380,6 @@ RCT_EXPORT_METHOD(hashTypedData:(NSString *)data
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// hashTypedDataV4
 RCT_EXPORT_METHOD(hashTypedDataV4:(NSString *)data
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -338,7 +389,6 @@ RCT_EXPORT_METHOD(hashTypedDataV4:(NSString *)data
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// sendTransactionWithSignature
 RCT_EXPORT_METHOD(sendTransactionWithSignature:(NSString *)txArgsJSON
                   signature:(NSString *)signature
                   callback:(RCTResponseSenderBlock)callback) {
@@ -349,7 +399,6 @@ RCT_EXPORT_METHOD(sendTransactionWithSignature:(NSString *)txArgsJSON
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// multiAccountImportMnemonic
 RCT_EXPORT_METHOD(multiAccountImportMnemonic:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -359,7 +408,6 @@ RCT_EXPORT_METHOD(multiAccountImportMnemonic:(NSString *)json
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// multiAccountDeriveAddresses
 RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -379,7 +427,6 @@ RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
     return [json valueForKey:@"key-uid"];
 }
 
-//////////////////////////////////////////////////////////////////// prepareDirAndUpdateConfig
 -(NSString *) prepareDirAndUpdateConfig:(NSString *)config
                              withKeyUID:(NSString *)keyUID {
     NSFileManager *fileManager = [NSFileManager defaultManager];
@@ -452,7 +499,6 @@ RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
 }
 
 
-//////////////////////////////////////////////////////////////////// prepareDirAndUpdateConfig
 RCT_EXPORT_METHOD(prepareDirAndUpdateConfig:(NSString *)keyUID
                                      config:(NSString *)config
                                    callback:(RCTResponseSenderBlock)callback) {
@@ -464,7 +510,6 @@ RCT_EXPORT_METHOD(prepareDirAndUpdateConfig:(NSString *)keyUID
     callback(@[updatedConfig]);
 }
 
-//////////////////////////////////////////////////////////////////// saveAccountAndLogin
 RCT_EXPORT_METHOD(saveAccountAndLogin:(NSString *)multiaccountData
                   password:(NSString *)password
                   settings:(NSString *)settings
@@ -481,7 +526,6 @@ RCT_EXPORT_METHOD(saveAccountAndLogin:(NSString *)multiaccountData
     NSLog(@"%@", result);
 }
 
-//////////////////////////////////////////////////////////////////// saveAccountAndLoginWithKeycard
 RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
                   password:(NSString *)password
                   settings:(NSString *)settings
@@ -502,11 +546,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;
 }
 
@@ -543,7 +587,6 @@ RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
     }
 }
 
-//////////////////////////////////////////////////////////////////// login
 RCT_EXPORT_METHOD(login:(NSString *)accountData
                   password:(NSString *)password) {
 #if DEBUG
@@ -555,7 +598,6 @@ RCT_EXPORT_METHOD(login:(NSString *)accountData
     NSLog(@"%@", result);
 }
 
-//////////////////////////////////////////////////////////////////// loginWithConfig
 RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData
                   password:(NSString *)password
                   configJSON:(NSString *)configJSON) {
@@ -568,7 +610,6 @@ RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData
     NSLog(@"%@", result);
 }
 
-//////////////////////////////////////////////////////////////////// loginWithKeycard
 RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
                   password:(NSString *)password
                   chatKey:(NSString *)chatKey) {
@@ -583,7 +624,6 @@ RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
     NSLog(@"%@", result);
 }
 
-//////////////////////////////////////////////////////////////////// logout
 RCT_EXPORT_METHOD(logout) {
 #if DEBUG
     NSLog(@"Logout() method called");
@@ -593,7 +633,6 @@ RCT_EXPORT_METHOD(logout) {
     NSLog(@"%@", result);
 }
 
-//////////////////////////////////////////////////////////////////// openAccounts
 RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"OpenAccounts() method called");
@@ -607,7 +646,6 @@ RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// verityAccountPassword
 RCT_EXPORT_METHOD(verify:(NSString *)address
                   password:(NSString *)password
                   callback:(RCTResponseSenderBlock)callback) {
@@ -624,7 +662,6 @@ RCT_EXPORT_METHOD(verify:(NSString *)address
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// verifyDatabasePassword
 RCT_EXPORT_METHOD(verifyDatabasePassword:(NSString *)keyUID
                   password:(NSString *)password
                   callback:(RCTResponseSenderBlock)callback) {
@@ -635,7 +672,6 @@ RCT_EXPORT_METHOD(verifyDatabasePassword:(NSString *)keyUID
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// changeDatabasePassword
 RCT_EXPORT_METHOD(reEncryptDbAndKeystore:(NSString *)keyUID
                   currentPassword:(NSString *)currentPassword
                   newPassword:(NSString *)newPassword
@@ -648,7 +684,6 @@ RCT_EXPORT_METHOD(reEncryptDbAndKeystore:(NSString *)keyUID
     callback(@[result]);
 }
 
-//////////////////////////////////////////////////////////////////// convertToKeycardAccount
 RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
                   accountData:(NSString *)accountData
                   settings:(NSString *)settings
@@ -663,9 +698,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) {
@@ -676,9 +711,9 @@ RCT_EXPORT_METHOD(sendTransaction:(NSString *)txArgsJSON
     callback(@[result]);
 }
 
-////////////////////////////////////////////////////////////////////
+
 #pragma mark - SignMessage
-//////////////////////////////////////////////////////////////////// signMessage
+
 RCT_EXPORT_METHOD(signMessage:(NSString *)message
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -688,9 +723,9 @@ RCT_EXPORT_METHOD(signMessage:(NSString *)message
     callback(@[result]);
 }
 
-////////////////////////////////////////////////////////////////////
+
 #pragma mark - Recover
-//////////////////////////////////////////////////////////////////// recover
+
 RCT_EXPORT_METHOD(recover:(NSString *)message
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -700,9 +735,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
@@ -714,9 +749,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
@@ -728,9 +763,9 @@ RCT_EXPORT_METHOD(signTypedDataV4:(NSString *)data
     callback(@[result]);
 }
 
-////////////////////////////////////////////////////////////////////
+
 #pragma mark - SignGroupMembership
-//////////////////////////////////////////////////////////////////// signGroupMembership
+
 RCT_EXPORT_METHOD(signGroupMembership:(NSString *)content
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -740,9 +775,9 @@ RCT_EXPORT_METHOD(signGroupMembership:(NSString *)content
     callback(@[result]);
 }
 
-////////////////////////////////////////////////////////////////////
+
 #pragma mark - ExtractGroupMembershipSignatures
-//////////////////////////////////////////////////////////////////// extractGroupMembershipSignatures
+
 RCT_EXPORT_METHOD(extractGroupMembershipSignatures:(NSString *)content
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -752,9 +787,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");
@@ -764,9 +799,9 @@ RCT_EXPORT_METHOD(getNodeConfig:(RCTResponseSenderBlock)callback) {
 }
 
 
-////////////////////////////////////////////////////////////////////
+
 #pragma mark - only android methods
-////////////////////////////////////////////////////////////////////
+
 RCT_EXPORT_METHOD(setAdjustResize) {
 #if DEBUG
     NSLog(@"setAdjustResize() works only on Android");
@@ -957,10 +992,10 @@ RCT_EXPORT_METHOD(exportUnencryptedDatabase:(NSString *)accountData
 #if DEBUG
     NSLog(@"exportUnencryptedDatabase() method called");
 #endif
-    
+
     NSString *filePath = [self getExportDbFilePath];
     StatusgoExportUnencryptedDatabase(accountData, password, filePath);
-    
+
     callback(@[filePath]);
 }
 
@@ -995,7 +1030,7 @@ RCT_EXPORT_METHOD(deactivateKeepAwake)
     });
 }
 
-//// deviceinfo
+#pragma mark - deviceinfo
 
 - (bool) is24Hour
 {

nix/config.nix

@@ -14,7 +14,6 @@
 
     status-go = {
       src-override = null;
-      gomobile-src-override = null;
       ipfs-gateway-url = "https://ipfs.status.im/";
     };
   };

nix/deps/clojure/deps.json

@@ -51,6 +51,45 @@
     }
   },
 
+  {
+    "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",
@@ -78,15 +117,15 @@
   },
 
   {
-    "path": "cljfmt/cljfmt/0.6.7/cljfmt-0.6.7",
+    "path": "clj-stacktrace/clj-stacktrace/0.2.8/clj-stacktrace-0.2.8",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "3d7ac9112908c9c9349adc056d1d06ae2cd33c21",
-      "sha256": "1q46q43mykn61f032y5734j84gcjca41pwd3iik9xghnzmphy2mn"
+      "sha1": "c5a47e6858344c9fd42eecafc7920a7a18d6126d",
+      "sha256": "1az0fs9k5xvzl8bz564apd77kqc83nl8sxsrvmswmbmkamvy4hd3"
     },
     "jar": {
-      "sha1": "91e8afa2c19db72acdef7f881aad905871ba6e69",
-      "sha256": "0ara83gaqnafjgr2aqz5zqmywdsmhsz483xkkxpiwbn9lfqvidmh"
+      "sha1": "b0654b98763199ee57182526465d823492d1cc3f",
+      "sha256": "1029wd82qyxv6ji9pd38m32nqia56h6845lqv4ym4dsz5i201g9a"
     }
   },
 
@@ -104,15 +143,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"
     }
   },
 
@@ -130,15 +169,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"
     }
   },
 
@@ -272,32 +311,6 @@
     }
   },
 
-  {
-    "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",
@@ -428,6 +441,19 @@
     }
   },
 
+  {
+    "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",
@@ -441,58 +467,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": "com/taoensso/encore/2.105.0/encore-2.105.0",
     "host": "https://repo.clojars.org",
@@ -571,6 +545,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": "crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0",
     "host": "https://repo.clojars.org",
@@ -649,6 +675,19 @@
     }
   },
 
+  {
+    "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",
@@ -779,6 +818,32 @@
     }
   },
 
+  {
+    "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",
@@ -884,15 +949,15 @@
   },
 
   {
-    "path": "org/clojure/core.rrb-vector/0.1.1/core.rrb-vector-0.1.1",
+    "path": "org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "3231642aa1dcf628c864a5f208cd293fbd6a385a",
-      "sha256": "18kk5sds5lg8r2kidhz9qpgyrvggkj8j4sgfdsmyyl93w3f16lnp"
+      "sha1": "e9336ac820c5a7e07fe0aa431df981cbab6db3e3",
+      "sha256": "07q9qmxc7ggaxh27imgs34svn4j269rhslbnrs63ahrqzk5bmqlf"
     },
     "jar": {
-      "sha1": "aafb7677ec1e9f344fc834bbbdb91e8ba02af474",
-      "sha256": "0cqyy1vqrhilgwrdxsibd7360ch3hhwjnbbnzsak38v6i6mg66xl"
+      "sha1": "0404feea925608b921b56acd11d3b187a0d33fe4",
+      "sha256": "13hkx1285f2imqlj6wbgyxki2yg8rmfr49iq1zijxm1cgfx8xyai"
     }
   },
 
@@ -935,19 +1000,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "dea94d117aa88d75e281f877914454f79df06bf2",
-      "sha256": "1nysls9ywj3b3zvlfwy68kayx47r4bacidmq1vx8w4h043l9kxrr"
-    },
-    "jar": {
-      "sha1": "6025affb7181cd40418600864f58eed1ea80055d",
-      "sha256": "0w6waii2qps7vp3nzbj5nai809xdq26ss0cabl4wz1s8fc6js6qw"
-    }
-  },
-
   {
     "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",
@@ -961,6 +1013,19 @@
     }
   },
 
+  {
+    "path": "org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "dea94d117aa88d75e281f877914454f79df06bf2",
+      "sha256": "1nysls9ywj3b3zvlfwy68kayx47r4bacidmq1vx8w4h043l9kxrr"
+    },
+    "jar": {
+      "sha1": "6025affb7181cd40418600864f58eed1ea80055d",
+      "sha256": "0w6waii2qps7vp3nzbj5nai809xdq26ss0cabl4wz1s8fc6js6qw"
+    }
+  },
+
   {
     "path": "org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176",
     "host": "https://repo1.maven.org/maven2",
@@ -987,19 +1052,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "fa72b6392b31762b55e0dc3de1c220ecdc6bb8a7",
-      "sha256": "1yg46a9zbga7rsrhwdv877hh60hcbyaykn37r3i50icxmgqcylq4"
-    },
-    "jar": {
-      "sha1": "d2fb65426c7998647fb1fb3db1fb5b222ab91df6",
-      "sha256": "0mj1xi3v03fzcw1smpayvbvbgly2p3ysbgfz7jgfdhmxi4gl6gs6"
-    }
-  },
-
   {
     "path": "org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -1013,6 +1065,19 @@
     }
   },
 
+  {
+    "path": "org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "fa72b6392b31762b55e0dc3de1c220ecdc6bb8a7",
+      "sha256": "1yg46a9zbga7rsrhwdv877hh60hcbyaykn37r3i50icxmgqcylq4"
+    },
+    "jar": {
+      "sha1": "d2fb65426c7998647fb1fb3db1fb5b222ab91df6",
+      "sha256": "0mj1xi3v03fzcw1smpayvbvbgly2p3ysbgfz7jgfdhmxi4gl6gs6"
+    }
+  },
+
   {
     "path": "org/clojure/tools.cli/1.0.194/tools.cli-1.0.194",
     "host": "https://repo1.maven.org/maven2",
@@ -1078,19 +1143,6 @@
     }
   },
 
-  {
-    "path": "org/graalvm/js/js/20.1.0/js-20.1.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "95452a7fdac1d358f1dd66b33e49f4440e986922",
-      "sha256": "0gkazzg8771g3pc90fb99wmlk99rjimcryrmzz6zab742m4dbina"
-    },
-    "jar": {
-      "sha1": "0abe5e8068014ccb34cf075637a00b7ce37e4a8c",
-      "sha256": "0v5pxjl9p7wwfrrzkkqh6qbvnn0p8n342smxzcqk3qxl4ah3aqnk"
-    }
-  },
-
   {
     "path": "org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -1104,6 +1156,19 @@
     }
   },
 
+  {
+    "path": "org/graalvm/js/js/20.1.0/js-20.1.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "95452a7fdac1d358f1dd66b33e49f4440e986922",
+      "sha256": "0gkazzg8771g3pc90fb99wmlk99rjimcryrmzz6zab742m4dbina"
+    },
+    "jar": {
+      "sha1": "0abe5e8068014ccb34cf075637a00b7ce37e4a8c",
+      "sha256": "0v5pxjl9p7wwfrrzkkqh6qbvnn0p8n342smxzcqk3qxl4ah3aqnk"
+    }
+  },
+
   {
     "path": "org/graalvm/regex/regex/20.1.0/regex-20.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -1234,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/ow2/asm/asm-analysis/7.1/asm-analysis-7.1",
     "host": "https://repo1.maven.org/maven2",
@@ -1299,6 +1351,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/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final",
     "host": "https://repo1.maven.org/maven2",
@@ -1351,19 +1416,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": "re-com/re-com/2.8.0/re-com-2.8.0",
     "host": "https://repo.clojars.org",
@@ -1377,19 +1429,6 @@
     }
   },
 
-  {
-    "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",
@@ -1429,6 +1468,32 @@
     }
   },
 
+  {
+    "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",
@@ -1443,15 +1508,15 @@
   },
 
   {
-    "path": "rewrite-cljs/rewrite-cljs/0.4.4/rewrite-cljs-0.4.4",
+    "path": "rewrite-cljs/rewrite-cljs/0.4.5/rewrite-cljs-0.4.5",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "4e7a2542517a5b0231631305461603605bea1592",
-      "sha256": "050imgkzw5q7200klwrkd4v32xxy1f4aghs8g4ma5dbg4rl4pgcd"
+      "sha1": "378cd53218027b9a93640dcf64c040665f6c9c6b",
+      "sha256": "1qrhrgzhqdyqizh0ngnr4zgj9xkfzq0qhsws4pxxra3qc9ikl9cq"
     },
     "jar": {
-      "sha1": "dd14a371d0d09eedccb39f01e3edabefb2d1e64f",
-      "sha256": "0hb07wg71i2bjn8wzs8q6w1nb3jb2s36nhr9kv9mc0gyrr6im244"
+      "sha1": "c35be115c39dadc71a4de3f584aa8ca295e11257",
+      "sha256": "1dnw0jhr1hhqz80w3z5d8qdbaqdvgzg4fyhv6lffa51c9ca1dsr1"
     }
   },
 
@@ -1583,5 +1648,18 @@
       "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,13 +2,16 @@ 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
-cljfmt/cljfmt/0.6.7/cljfmt-0.6.7.jar
+clj-stacktrace/clj-stacktrace/0.2.8/clj-stacktrace-0.2.8.jar
 cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.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
+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
 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
@@ -19,8 +22,6 @@ 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
@@ -31,23 +32,25 @@ 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
@@ -58,6 +61,8 @@ 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
@@ -66,23 +71,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.1/core.rrb-vector-0.1.1.jar
+org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2.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/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/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-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/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.analyzer/1.0.0/tools.analyzer-1.0.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/20.1.0/js-20.1.0.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/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
@@ -93,23 +98,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.4/rewrite-cljs-0.4.4.jar
+rewrite-cljs/rewrite-cljs/0.4.5/rewrite-cljs-0.4.5.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
@@ -120,3 +125,4 @@ 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" ".babelrc"
-        "resources/.*" "translations/.*" "src/js/worklet_factory.js"
+        "package.json" "yarn.lock" "metro.config.js" "babel.config.js"
+        "resources/.*" "translations/.*" "src/js/.*"
         "modules/react-native-status/android.*" "android/.*"
         envFileName "VERSION" "status-go-version.json" "react-native.config.js"
       ];

nix/overlay.nix

@@ -9,47 +9,17 @@ self: super:
 
 let
   inherit (super) stdenv stdenvNoCC callPackage;
-  lib = (super.lib or { }) // (import ./lib {
-    inherit (super) lib;
-    inherit (self) config;
-  });
-
-  gomobileSrcOverride = "/Users/vvlasov/c/mobile";
-  # Warning message about using local sources
-  localSrcWarn = (path: "Using local gomobile sources from ${path}");
-  localGomobileSrc = rec {
-    owner = "status-im";
-    repo = "mobile";
-    rev = "unknown";
-    shortRev = rev;
-    rawVersion = "develop";
-    cleanVersion = rawVersion;
-    goPackagePath = "github.com/${owner}/${repo}";
-    # We use builtins.path so that we can name the resulting derivation,
-    # Normally the name would not be deterministic, taken from the checkout directory.
-    src = builtins.path rec {
-      path = lib.traceValFn localSrcWarn gomobileSrcOverride;
-      name = "${repo}-source-${shortRev}";
-      # Keep this filter as restrictive as possible in order
-      # to avoid unnecessary rebuilds and limit closure size
-      filter = lib.mkFilter {
-        root = path;
-        include = [ ".*" ];
-        exclude = [
-          ".*/[.]git.*" ".*[.]md" ".*[.]yml" ".*/.*_test.go$"
-          "VERSION" "_assets/.*" "build/.*"
-          ".*/.*LICENSE.*" ".*/CONTRIB.*" ".*/AUTHOR.*"
-        ];
-      };
-    };
-  };
 in {
-  inherit lib;
   # Fix for MacOS
   mkShell = super.mkShell.override { stdenv = stdenvNoCC; };
 
   # Various utilities
   utils = callPackage ./tools/utils.nix { };
+  lib = (super.lib or { }) // (import ./lib {
+    inherit (super) lib;
+    inherit (self) config;
+  });
+
   # Project dependencies
   deps = {
     clojure = callPackage ./deps/clojure { };
@@ -75,17 +45,11 @@ in {
   buildGoPackage = super.buildGo118Package;
   buildGoModule = super.buildGo118Module;
   gomobile = (super.gomobile.overrideAttrs (old: {
-    src = "/Users/vvlasov/c/mobile";
-    vendorSha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
-    # patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
-    #   url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
-    #   sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
-    # };
-    })).override rec {
-      buildGoModule = args: super.buildGoModule ( args // {
-        src =  "/Users/vvlasov/c/mobile";
-        vendorSha256 = "sha256-C6GD3NMolRIve1siG8wpcQav7ZWTugjce8K22EQDD7M=";
-    });
+    patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
+      url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
+      sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
+    };
+  })).override {
     # FIXME: No Android SDK packages for aarch64-darwin.
     withAndroidPkgs = stdenv.system != "aarch64-darwin";
     androidPkgs = self.androidEnvCustom.compose;

nix/scripts/shell.sh

@@ -46,9 +46,6 @@ config=''
 if [[ -n "${STATUS_GO_SRC_OVERRIDE}" ]]; then
     config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
 fi
-if [[ -n "${GOMOBILE_SRC_OVERRIDE}" ]]; then
-    config+="status-im.status-go.gomobile-src-override=\"${GOMOBILE_SRC_OVERRIDE}\";"
-fi
 config+="status-im.build-type=\"${BUILD_TYPE}\";"
 
 if [[ -n "$config" ]]; then

nix/shell.nix

@@ -17,6 +17,8 @@ in mkShell {
     lsof # used in start-react-native.sh
     # build specific utilities
     clojure maven watchman
+    # lint specific utilities
+    clj-kondo zprint
     # 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 clj-kondo ];
+      buildInputs = with pkgs; [ clojure flock maven openjdk ];
       inputsFrom = [ nodejs-sh ];
       # CLASSPATH from clojure deps with 'src' appended to find local sources.
       shellHook = with pkgs; ''

nix/status-go/default.nix

@@ -12,7 +12,6 @@ let
 
   # Source can be changed with a local override from config
   source = callPackage ./source.nix { };
-  nimbusSource = callPackage ./nimbus_source.nix { };
 
   # Params to be set at build time, important for About section and metrics
   goBuildParams = {
@@ -32,55 +31,14 @@ let
     "-w" # -w disables DWARF debugging information
   ];
 in rec {
-  inherit nimbusSource;
-
   mobile = callPackage ./mobile {
-    inherit meta source nimbusSource nimCompiler goBuildLdFlags;
+    inherit meta source goBuildLdFlags;
   };
 
   library = callPackage ./library {
     inherit meta source;
   };
 
-  nimCompiler = callPackage ./mobile/buildNim.nix {
-    srcRaw = nimbusSource;
-  };
-
-  liblcproxy-android-arm = callPackage ./mobile/buildNimbus.nix {
-    srcRaw = nimbusSource;
-    nimCompiler = nimCompiler;
-    platform = "android";
-    arch = "arm";
-  };
-
-  liblcproxy-android-arm64 = callPackage ./mobile/buildNimbus.nix {
-    srcRaw = nimbusSource;
-    nimCompiler = nimCompiler;
-    platform = "android";
-    arch = "arm64";
-  };
-
-  liblcproxy-android-x86 = callPackage ./mobile/buildNimbus.nix {
-    srcRaw = nimbusSource;
-    nimCompiler = nimCompiler;
-    platform = "android";
-    arch = "x86";
-  };
-
-  liblcproxy-ios-x86 = callPackage ./mobile/buildNimbus.nix {
-    srcRaw = nimbusSource;
-    nimCompiler = nimCompiler;
-    platform = "ios";
-    arch = "x86";
-  };
-
-  liblcproxy-ios-arm64 = callPackage ./mobile/buildNimbus.nix {
-    srcRaw = nimbusSource;
-    nimCompiler = nimCompiler;
-    platform = "ios";
-    arch = "arm64";
-  };
-
   shell = mkShell {
     inputsFrom = [ mobile.android mobile.ios ];
   };

nix/status-go/mobile/build.nix

@@ -2,7 +2,6 @@
 , androidPkgs, openjdk, gomobile, xcodeWrapper, removeReferencesTo
 , meta
 , source
-, buildNimbusLc
 , platform ? "android"
 , platformVersion ? "23"
 , targets ? [ "android/arm64" "android/arm" ]
@@ -14,14 +13,7 @@ let
   inherit (lib) concatStringsSep optionalString optional;
   isIOS = platform == "ios";
   isAndroid = platform == "android";
-  lc = buildNimbusLc {inherit platform targets;};
-  cgoCflags = "-I" + (builtins.elemAt lc 0);
 
-  lcDirs = (builtins.concatStringsSep " " (builtins.map (s: "-L" + s) lc));
-
-  goBuildLdFlagsModified = 
-    goBuildLdFlags ++ [("-extldflags \"-lverifproxy " + lcDirs + "\"")];
-  ldflags = concatStringsSep " " goBuildLdFlagsModified;
 in buildGoPackage {
   pname = source.repo;
   version = "${source.cleanVersion}-${source.shortRev}-${platform}";
@@ -38,6 +30,8 @@ in buildGoPackage {
     ++ optional isAndroid openjdk
     ++ optional isIOS xcodeWrapper;
 
+  ldflags = concatStringsSep " " goBuildLdFlags;
+
   ANDROID_HOME = optionalString isAndroid androidPkgs.sdk;
 
   # Ensure XCode is present for iOS, instead of failing at the end of the build.
@@ -46,13 +40,11 @@ in buildGoPackage {
   buildPhase = ''
     runHook preBuild
     echo -e "\nBuilding $pname for: ${concatStringsSep "," targets}"
-    echo -e "\n LC dirs: ${lcDirs}"
-    echo -e "\n ldflags: ${ldflags}"
+
     set -x
-    export CGO_CFLAGS=\"${cgoCflags}\" 
     gomobile bind \
       ${concatStringsSep " " goBuildFlags} \
-      -ldflags ''\'${ldflags}''\' \
+      -ldflags="$ldflags" \
       -target=${concatStringsSep "," targets} \
       ${optionalString isAndroid "-androidapi=${platformVersion}" } \
       ${optionalString isIOS "-iosversion=${platformVersion}" } \

nix/status-go/mobile/buildNim.nix

@@ -1,67 +0,0 @@
-{ pkgs, stdenv, lib, fetchFromGitHub
-# Dependencies
-, xcodeWrapper
-, srcRaw
-, writeScript
-, writeTextFile
-, androidPkgs
-, git 
-, platform ? "android"
-, arch ? "386"
-, api ? "29" }:
-
-let
-  osId = builtins.elemAt (builtins.split "\-" stdenv.hostPlatform.system) 2;
-  osArch = builtins.elemAt (builtins.split "\-" stdenv.hostPlatform.system) 0;
-
-  nimHostOs = if osId == "darwin" then "Darwin"
-              else if osId == "linux" then "Linux"
-              else "Windows_NT";
-
-  createNimbleLink = writeTextFile {
-    name = "createNimbleLink.sh";
-    text = ''
-    mkdir -p vendor/.nimble/pkgs
-
-    curdir=`pwd`
-    for dir in vendor/*/;
-    do
-      baseDirName=`basename ''${dir}`
-      dirName=vendor/.nimble/pkgs/$baseDirName-\#head
-      echo $dirName
-      mkdir -p $dirName
-
-      packageDir="''${curdir}/vendor/''${baseDirName}"
-      if [ -d "''${packageDir}/src" ]; then
-        packageDir="''${packageDir}/src"
-      fi
-      echo "''${packageDir}" > ''${dirName}/''${baseDirName}.nimble-link
-      echo "''${packageDir}" >> ''${dirName}/''${baseDirName}.nimble-link
-    done
-    '';
-    executable = true;
-  };
-
-in stdenv.mkDerivation rec {
-  pname = "nimCompiler";
-  name = "nimCompiler";
-  src = srcRaw.src;
-  #version = lib.strings.substring 0 7 src.rev;
-  buildInputs = with pkgs; [ wget git clang which tcl curl];
-
-  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
-
-
-  buildPhase = ''
-    ${createNimbleLink}
-    export HOME=$PWD
-    unset SSL_CERT_FILE
-    make V=3 CC=clang build-nim
-   '';
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r vendor/nimbus-build-system/vendor/Nim/* $out/
-  '';
-}
-

nix/status-go/mobile/buildNimbus.nix

@@ -1,231 +0,0 @@
-{ pkgs, stdenv, lib, fetchFromGitHub
-# Dependencies
-, xcodeWrapper
-, srcRaw
-, writeScript
-, writeTextFile
-, androidPkgs
-, git 
-, nimCompiler 
-, platform ? "android"
-, arch ? "386"
-, api ? "29" }:
-
-let
-  osId = builtins.elemAt (builtins.split "\-" stdenv.hostPlatform.system) 2;
-  osArch = builtins.elemAt (builtins.split "\-" stdenv.hostPlatform.system) 0;
-
-  
-  # Arg arch -> Nim arch
-  nimCpuMap = {
-    "x86" = "i386";
-    "x86-64" = "amd64"; 
-    "arm" = "arm"; 
-    "arm64" = "arm64";
-  };
-
-  iosArchMap = {
-    "x86" = "x86_64";
-    "x86-64" = "x86_64";
-    "arm" = "armv7";
-    "arm64" = "arm64";
-  };
-
-  nimCpu = if platform == "ios" && arch == "x86"
-    then "amd64" else "${lib.getAttr arch nimCpuMap}";
-  nimPlatform = "${(if platform == "ios" then "ios" else "android")}";
-
-  iosSdk = if arch == "x86" then "iphonesimulator" else "iphoneos";
-  iosArch = lib.getAttr arch iosArchMap;
-
-  isAndroid = lib.hasPrefix "android" platform;
-  isIOS = platform == "ios";
-
-
-  buildType = lib.getConfig "build-type" "";
-
-
-  routeHeader = builtins.readFile ./route.h;
-
-  PROJECT_ROOT = srcRaw.src;
-
-  iosIncludes = stdenv.mkDerivation {
-    name = "nim-status-ios-includes";
-    buildInputs = [ pkgs.coreutils ];
-    builder = writeScript "nim-ios-includes.sh"
-    ''
-      export PATH=${pkgs.coreutils}/bin
-      mkdir $out
-      cd $out
-      mkdir net
-      echo "${routeHeader}" > net/route.h
-    '';
-  };
-
-
-  ANDROID_NDK_HOME = "${androidPkgs.sdk}/ndk-bundle";
-  
-  
-  androidToolchain = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${osId}-${osArch}";
-  androidTargetArchMap = {
-    "x86" = "i686-linux-android";
-    "x86-64" = "x86_64-linux-android";
-    "arm" = "armv7a-linux-androideabi";
-    "arm64" = "aarch64-linux-android";
-  };
-
-  androidTargetArch = lib.getAttr arch androidTargetArchMap;
-
-  iosVersion = "9.0";
-
-  sysroot = if isAndroid then "${androidToolchain}/sysroot" else "$(xcrun --sdk ${iosSdk} --show-sdk-path)";  
-  compilerFlags = if isAndroid then
-    "--sysroot ${sysroot} -fPIC -target ${androidTargetArch}${api}"
-    else if isIOS then
-    # TODO The conditional for -miphoneos-version-min=8.0 is required,
-    # otherwise Nim will complain that thread-local storage is not supported for the current target
-    # when expanding 'NIM_THREADVAR' macro
-    "-isysroot ${sysroot} -fembed-bitcode -target ${iosArch}-apple-ios${iosVersion} ${if arch == "arm" then "" else "-miphoneos-version-min=${iosVersion}"} -I${iosIncludes}"
-    else throw "Unsupported platform!";
-
-  linkerFlags = if isAndroid then
-  "--sysroot ${sysroot} -target ${androidTargetArch}${api}"
-  else if isIOS then
-  "--sysroot ${sysroot} -fembed-bitcode -target ${iosArch}-apple-ios${iosVersion} ${if arch == "arm" then "" else "-miphoneos-version-min=${iosVersion}"} -v"
-  else throw "Unsupported platform!";
-  
-  ldDirMap = {
-    "x86" = "i686";
-    "x86-64" = "x86_64";
-    "arm" = "armeabi-v7a"; 
-    "arm64" = "arm64-v8a";
-  };
-
-  cmakeArgs = if isAndroid then
-    "-DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=${api} -DCMAKE_ANDROID_ARCH_ABI=${lib.getAttr arch ldDirMap} -DCMAKE_ANDROID_NDK=${ANDROID_NDK_HOME}"
-  else if isIOS then "-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=\"$(CMAKE_SYSROOT)\" -DCMAKE_OSX_ARCHITECTURES=${iosArch} -DCMAKE_OSX_DEPLOYMENT_TARGET=9.3 -DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO -DCMAKE_IOS_INSTALL_COMBINED=YES"
-  else throw "Unsupported platform!";
-  #clangPath = if isAndroid then "${androidToolchain}/bin" else "";
-  #clangName = if isAndroid then "${androidTargetArch}${api}-clang" else "";
-
-  compilerVars = if isAndroid then
-    ''
-      export PATH=${androidToolchain}/bin:$PATH
-      export CC=clang
-      export CXX=clang++
-      export AR=${androidToolchain}/bin/llvm-ar
-      export NM=${androidToolchain}/bin/llvm-nm
-      export RANLIB=${androidToolchain}/bin/llvm-ranlib
-      export LD=${androidToolchain}/bin/ld
-      export AS=$CC
-      export CFLAGS="${compilerFlags}"
-      export LDFLAGS="${linkerFlags}"
-
-      mkdir bin
-      touch bin/git
-      chmod +x bin/git
-      export PATH=./bin:$PATH
-    ''
-    else if isIOS then
-    ''
-      export PATH=${xcodeWrapper}/bin:$PATH
-      export CC=clang #$(xcrun --sdk ${iosSdk} --find clang)
-      export CXX=clang++ #$(xcrun --sdk ${iosSdk} --find clang++)
-      export LD=clang
-      export CFLAGS="${compilerFlags}"
-      export LDFLAGS="${linkerFlags}"
-
-      mkdir bin
-      touch bin/git
-      chmod +x bin/git
-      export PATH=./bin:$PATH
-
-      export CMAKE_SYSROOT=${sysroot}
-    ''
-    else throw "Unsupported platform!";
- 
-  src = srcRaw;
-
-
-  nimHostOs = if osId == "darwin" then "Darwin"
-              else if osId == "linux" then "Linux"
-              else "Windows_NT";
-  createNimbleLink = writeTextFile {
-    name = "createNimbleLink.sh";
-    text = ''
-    mkdir -p vendor/.nimble/pkgs
-
-    curdir=`pwd`
-    for dir in vendor/*/;
-    do
-      baseDirName=`basename ''${dir}`
-      dirName=vendor/.nimble/pkgs/$baseDirName-\#head
-      echo $dirName
-      mkdir -p $dirName
-
-      packageDir="''${curdir}/vendor/''${baseDirName}"
-      if [ -d "''${packageDir}/src" ]; then
-        packageDir="''${packageDir}/src"
-      fi
-      echo "''${packageDir}" > ''${dirName}/''${baseDirName}.nimble-link
-      echo "''${packageDir}" >> ''${dirName}/''${baseDirName}.nimble-link
-    done
-    '';
-    executable = true;
-  };
-
-in stdenv.mkDerivation rec {
-  pname = "libverifproxy";
-  name = "libverifproxy";
-  src = srcRaw.src;
-  #version = lib.strings.substring 0 7 src.rev;
-  buildInputs = with pkgs; [ wget git which tcl cmake libtool binutils];
-
-  phases = [ "unpackPhase" "preBuildPhase" "buildPhase" "installPhase" ];
-
-  preBuildPhase = ''
-
-    sed -E -i 's|^(LIBBACKTRACE_SED := true.*)|\1\nCMAKE_ARGS := ${cmakeArgs}|g' vendor/nim-libbacktrace/Makefile
-
-    sed -E -i 's|^(.*)(useNews\* = )(.*)|\1\2 false|g' vendor/nim-json-rpc/json_rpc/clients/config.nim
-    sed -E -i 's|(.*XOPEN_SOURCE.*)|#\1|g' vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc/Makefile
-
-    export HOME=$PWD
-
-    ${createNimbleLink}
-
-    ${compilerVars}
-    export PATH=${nimCompiler}/bin:$PATH
-    #export PATH=${pkgs.binutils}/bin:$PATH
-    ln -sf ${pkgs.binutils}/bin/ar bin/ar
-  '';
-
-
-  buildPhase = ''
-    which ar
-    make V=3 OS=${nimHostOs} \
-      CC=clang CXX=clang USE_SYSTEM_NIM=1 \
-      NIMFLAGS="\
-      --passC:\"${compilerFlags}\" \
-      --passL:\"${linkerFlags}\" \
-      --debuginfo:off \
-      --cc:clang \
-      --listcmd \
-      --cpu:${nimCpu} \
-      --os:${nimPlatform} \
-      -d:disableMarchNative" \
-    libverifproxy
-
-    echo "### ls build/libverifproxy"
-    ls -l build/libverifproxy/*
-   '';
-
-  installPhase = ''
-    set -x
-    mkdir -p $out
-    cp libverifproxy* $out/
-    cp build/libverifproxy/verifproxy.h $out/
-    cp build/libverifproxy/nimbase.h $out/
-  '';
-}
-

nix/status-go/mobile/default.nix

@@ -1,44 +1,19 @@
-{ stdenv, callPackage, meta, source, nimbusSource, nimCompiler, goBuildLdFlags }:
-
-let 
-  buildNimbusLc = { platform, targets }: builtins.map
-      (target:
-        let
-          arch =
-            if platform == "ios" then
-              (if target == "iossimulator" && stdenv.hostPlatform.isx86
-              then "x86" else "arm64")
-            else builtins.elemAt (builtins.split "\/" target) 2 ;
-        in
-        callPackage ./buildNimbus.nix {
-          inherit nimCompiler platform arch;
-          srcRaw = nimbusSource;
-        }
-      )
-      targets;
-in {
-
-  #ios-x86 = buildNimbusLc {platform = "ios"; targets = ["ios" "iossimulator"];};
-  ios-x86 = buildNimbusLc {platform = "ios"; targets = ["iossimulator"];};
-  ios-arm = buildNimbusLc {platform = "ios"; targets = ["ios"];};
-  android-arm64 = buildNimbusLc {platform = "android"; targets = ["android/arm64"];};
-  android-arm = buildNimbusLc {platform = "android"; targets = ["android/arm"];};
-
+{ callPackage, meta, source, goBuildLdFlags }:
 
+{
   android = callPackage ./build.nix {
     platform = "android";
     platformVersion = "23";
-    #targets = [ "android/arm" "android/arm64" "android/386" ];
-    targets = [ "android/arm64" ];
+    targets = [ "android/arm" "android/arm64" "android/386" ];
     outputFileName = "status-go-${source.shortRev}.aar";
-    inherit meta source buildNimbusLc goBuildLdFlags;
+    inherit meta source goBuildLdFlags;
   };
 
   ios = callPackage ./build.nix {
     platform = "ios";
     platformVersion = "8.0";
-    targets = [ "iossimulator" ];
+    targets = [ "ios" "iossimulator" ];
     outputFileName = "Statusgo.xcframework";
-    inherit meta source buildNimbusLc goBuildLdFlags;
+    inherit meta source goBuildLdFlags;
   };
 }

nix/status-go/mobile/route.h

@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2000-2017 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- *
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $FreeBSD: src/sys/net/route.h,v 1.36.2.1 2000/08/16 06:14:23 jayanth Exp $
- */
-
-#ifndef _NET_ROUTE_H_
-#define _NET_ROUTE_H_
-#include <sys/appleapiopts.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-/*
- * These numbers are used by reliable protocols for determining
- * retransmission behavior and are included in the routing structure.
- */
-struct rt_metrics {
-	u_int32_t       rmx_locks;      /* Kernel leaves these values alone */
-	u_int32_t       rmx_mtu;        /* MTU for this path */
-	u_int32_t       rmx_hopcount;   /* max hops expected */
-	int32_t         rmx_expire;     /* lifetime for route, e.g. redirect */
-	u_int32_t       rmx_recvpipe;   /* inbound delay-bandwidth product */
-	u_int32_t       rmx_sendpipe;   /* outbound delay-bandwidth product */
-	u_int32_t       rmx_ssthresh;   /* outbound gateway buffer limit */
-	u_int32_t       rmx_rtt;        /* estimated round trip time */
-	u_int32_t       rmx_rttvar;     /* estimated rtt variance */
-	u_int32_t       rmx_pksent;     /* packets sent using this route */
-	u_int32_t       rmx_state;      /* route state */
-	u_int32_t       rmx_filler[3];  /* will be used for T/TCP later */
-};
-
-/*
- * rmx_rtt and rmx_rttvar are stored as microseconds;
- */
-#define RTM_RTTUNIT     1000000 /* units for rtt, rttvar, as units per sec */
-
-
-
-#define RTF_UP          0x1             /* route usable */
-#define RTF_GATEWAY     0x2             /* destination is a gateway */
-#define RTF_HOST        0x4             /* host entry (net otherwise) */
-#define RTF_REJECT      0x8             /* host or net unreachable */
-#define RTF_DYNAMIC     0x10            /* created dynamically (by redirect) */
-#define RTF_MODIFIED    0x20            /* modified dynamically (by redirect) */
-#define RTF_DONE        0x40            /* message confirmed */
-#define RTF_DELCLONE    0x80            /* delete cloned route */
-#define RTF_CLONING     0x100           /* generate new routes on use */
-#define RTF_XRESOLVE    0x200           /* external daemon resolves name */
-#define RTF_LLINFO      0x400           /* DEPRECATED - exists ONLY for backward
-	                                 *  compatibility */
-#define RTF_LLDATA      0x400           /* used by apps to add/del L2 entries */
-#define RTF_STATIC      0x800           /* manually added */
-#define RTF_BLACKHOLE   0x1000          /* just discard pkts (during updates) */
-#define RTF_NOIFREF     0x2000          /* not eligible for RTF_IFREF */
-#define RTF_PROTO2      0x4000          /* protocol specific routing flag */
-#define RTF_PROTO1      0x8000          /* protocol specific routing flag */
-
-#define RTF_PRCLONING   0x10000         /* protocol requires cloning */
-#define RTF_WASCLONED   0x20000         /* route generated through cloning */
-#define RTF_PROTO3      0x40000         /* protocol specific routing flag */
-                                        /* 0x80000 unused */
-#define RTF_PINNED      0x100000        /* future use */
-#define RTF_LOCAL       0x200000        /* route represents a local address */
-#define RTF_BROADCAST   0x400000        /* route represents a bcast address */
-#define RTF_MULTICAST   0x800000        /* route represents a mcast address */
-#define RTF_IFSCOPE     0x1000000       /* has valid interface scope */
-#define RTF_CONDEMNED   0x2000000       /* defunct; no longer modifiable */
-#define RTF_IFREF       0x4000000       /* route holds a ref to interface */
-#define RTF_PROXY       0x8000000       /* proxying, no interface scope */
-#define RTF_ROUTER      0x10000000      /* host is a router */
-#define RTF_DEAD        0x20000000      /* Route entry is being freed */
-                                        /* 0x40000000 and up unassigned */
-
-#define RTPRF_OURS      RTF_PROTO3      /* set on routes we manage */
-#define RTF_BITS \
-	"\020\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE" \
-	"\10DELCLONE\11CLONING\12XRESOLVE\13LLINFO\14STATIC\15BLACKHOLE" \
-	"\16NOIFREF\17PROTO2\20PROTO1\21PRCLONING\22WASCLONED\23PROTO3" \
-	"\25PINNED\26LOCAL\27BROADCAST\30MULTICAST\31IFSCOPE\32CONDEMNED" \
-	"\33IFREF\34PROXY\35ROUTER"
-
-#define IS_DIRECT_HOSTROUTE(rt) \
-	(((rt)->rt_flags & (RTF_HOST | RTF_GATEWAY)) == RTF_HOST)
-/*
- * Routing statistics.
- */
-struct  rtstat {
-	short   rts_badredirect;        /* bogus redirect calls */
-	short   rts_dynamic;            /* routes created by redirects */
-	short   rts_newgateway;         /* routes modified by redirects */
-	short   rts_unreach;            /* lookups which failed */
-	short   rts_wildcard;           /* lookups satisfied by a wildcard */
-	short   rts_badrtgwroute;       /* route to gateway is not direct */
-};
-
-/*
- * Structures for routing messages.
- */
-struct rt_msghdr {
-	u_short rtm_msglen;     /* to skip over non-understood messages */
-	u_char  rtm_version;    /* future binary compatibility */
-	u_char  rtm_type;       /* message type */
-	u_short rtm_index;      /* index for associated ifp */
-	int     rtm_flags;      /* flags, incl. kern & message, e.g. DONE */
-	int     rtm_addrs;      /* bitmask identifying sockaddrs in msg */
-	pid_t   rtm_pid;        /* identify sender */
-	int     rtm_seq;        /* for sender to identify action */
-	int     rtm_errno;      /* why failed */
-	int     rtm_use;        /* from rtentry */
-	u_int32_t rtm_inits;    /* which metrics we are initializing */
-	struct rt_metrics rtm_rmx; /* metrics themselves */
-};
-
-struct rt_msghdr2 {
-	u_short rtm_msglen;     /* to skip over non-understood messages */
-	u_char  rtm_version;    /* future binary compatibility */
-	u_char  rtm_type;       /* message type */
-	u_short rtm_index;      /* index for associated ifp */
-	int     rtm_flags;      /* flags, incl. kern & message, e.g. DONE */
-	int     rtm_addrs;      /* bitmask identifying sockaddrs in msg */
-	int32_t rtm_refcnt;     /* reference count */
-	int     rtm_parentflags; /* flags of the parent route */
-	int     rtm_reserved;   /* reserved field set to 0 */
-	int     rtm_use;        /* from rtentry */
-	u_int32_t rtm_inits;    /* which metrics we are initializing */
-	struct rt_metrics rtm_rmx; /* metrics themselves */
-};
-
-
-#define RTM_VERSION     5       /* Up the ante and ignore older versions */
-
-/*
- * Message types.
- */
-#define RTM_ADD         0x1     /* Add Route */
-#define RTM_DELETE      0x2     /* Delete Route */
-#define RTM_CHANGE      0x3     /* Change Metrics or flags */
-#define RTM_GET         0x4     /* Report Metrics */
-#define RTM_LOSING      0x5     /* RTM_LOSING is no longer generated by xnu
-	                         *  and is deprecated */
-#define RTM_REDIRECT    0x6     /* Told to use different route */
-#define RTM_MISS        0x7     /* Lookup failed on this address */
-#define RTM_LOCK        0x8     /* fix specified metrics */
-#define RTM_OLDADD      0x9     /* caused by SIOCADDRT */
-#define RTM_OLDDEL      0xa     /* caused by SIOCDELRT */
-#define RTM_RESOLVE     0xb     /* req to resolve dst to LL addr */
-#define RTM_NEWADDR     0xc     /* address being added to iface */
-#define RTM_DELADDR     0xd     /* address being removed from iface */
-#define RTM_IFINFO      0xe     /* iface going up/down etc. */
-#define RTM_NEWMADDR    0xf     /* mcast group membership being added to if */
-#define RTM_DELMADDR    0x10    /* mcast group membership being deleted */
-#define RTM_IFINFO2     0x12    /* */
-#define RTM_NEWMADDR2   0x13    /* */
-#define RTM_GET2        0x14    /* */
-
-/*
- * Bitmask values for rtm_inits and rmx_locks.
- */
-#define RTV_MTU         0x1     /* init or lock _mtu */
-#define RTV_HOPCOUNT    0x2     /* init or lock _hopcount */
-#define RTV_EXPIRE      0x4     /* init or lock _expire */
-#define RTV_RPIPE       0x8     /* init or lock _recvpipe */
-#define RTV_SPIPE       0x10    /* init or lock _sendpipe */
-#define RTV_SSTHRESH    0x20    /* init or lock _ssthresh */
-#define RTV_RTT         0x40    /* init or lock _rtt */
-#define RTV_RTTVAR      0x80    /* init or lock _rttvar */
-
-/*
- * Bitmask values for rtm_addrs.
- */
-#define RTA_DST         0x1     /* destination sockaddr present */
-#define RTA_GATEWAY     0x2     /* gateway sockaddr present */
-#define RTA_NETMASK     0x4     /* netmask sockaddr present */
-#define RTA_GENMASK     0x8     /* cloning mask sockaddr present */
-#define RTA_IFP         0x10    /* interface name sockaddr present */
-#define RTA_IFA         0x20    /* interface addr sockaddr present */
-#define RTA_AUTHOR      0x40    /* sockaddr for author of redirect */
-#define RTA_BRD         0x80    /* for NEWADDR, broadcast or p-p dest addr */
-
-/*
- * Index offsets for sockaddr array for alternate internal encoding.
- */
-#define RTAX_DST        0       /* destination sockaddr present */
-#define RTAX_GATEWAY    1       /* gateway sockaddr present */
-#define RTAX_NETMASK    2       /* netmask sockaddr present */
-#define RTAX_GENMASK    3       /* cloning mask sockaddr present */
-#define RTAX_IFP        4       /* interface name sockaddr present */
-#define RTAX_IFA        5       /* interface addr sockaddr present */
-#define RTAX_AUTHOR     6       /* sockaddr for author of redirect */
-#define RTAX_BRD        7       /* for NEWADDR, broadcast or p-p dest addr */
-#define RTAX_MAX        8       /* size of array to allocate */
-
-struct rt_addrinfo {
-	int     rti_addrs;
-	struct  sockaddr *rti_info[RTAX_MAX];
-};
-
-
-#endif /* _NET_ROUTE_H_ */
-
-

nix/status-go/nimbus_source.nix

@@ -1,64 +0,0 @@
-{ utils, lib, fetchFromGitHub }:
-
-let
-  inherit (lib) strings traceValFn importJSON getConfig;
-
-  srcOverride = getConfig "nimbus-eth1.src-override" null;
-  # Warning message about using local sources
-  localSrcWarn = (path: "Using local nimbus-eth1 sources from ${path}");
-
-  localSrc = rec {
-    owner = "status-im";
-    repo = "nimbus-eth1";
-    rev = "unknown";
-    shortRev = rev;
-    rawVersion = "develop";
-    cleanVersion = rawVersion;
-    goPackagePath = "github.com/${owner}/${repo}";
-    # We use builtins.path so that we can name the resulting derivation,
-    # Normally the name would not be deterministic, taken from the checkout directory.
-    src = builtins.path rec {
-      path = traceValFn localSrcWarn srcOverride;
-      name = "${repo}-source-${shortRev}";
-      # Keep this filter as restrictive as possible in order
-      # to avoid unnecessary rebuilds and limit closure size
-      filter = lib.mkFilter {
-        root = path;
-        include = [ ".*" ];
-        exclude = [
-          ".*/[.]git.*" ".*[.]md" ".*[.]yml" ".*/.*_test.go$"
-          "VERSION" "_assets/.*" "build/.*"
-          ".*/.*LICENSE.*" ".*/CONTRIB.*" ".*/AUTHOR.*"
-        ];
-      };
-    };
-  };
-
-  githubSrc = let
-    owner = "status-im";
-    repo = "nimbus-eth1";
-    # Static lib
-    # rev = "211a0ed1e89bc836a79759e35db4a45f23a79b14";
-    # sha256 = "sha256-Z+PoQMoYJK9ort2ZiXE1oLeoNu2H44HHNnL4pbp+uI8=";
-    # Dynamic lib
-    rev = "1199e476397e271b889e54680dc632e47bc01dd6";
-    sha256 = "sha256-egx+I4h/V/56QRBtlaZffc3hrq7IaZCqL2Lm5XNqH1c=";
-    version = "0.1";
-  in rec {
-    inherit owner repo rev sha256 version;
-    shortRev = strings.substring 0 7 rev;
-    rawVersion = version;
-    cleanVersion = utils.sanitizeVersion version;
-    src = fetchFromGitHub {
-      inherit rev owner repo sha256;
-      name = "${repo}-${shortRev}-source-with-submodules";
-      fetchSubmodules = true;
-    };
-  };
-in
-  if srcOverride != null
-  # If config.status-im.status-go.src-override is defined,
-  # instruct Nix to use that path to build status-go
-  then localSrc
-  # Otherwise grab it from the location defined by status-go-version.json
-  else githubSrc

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": "git+https://github.com/status-im/rn-emoji-keyboard.git#refs/tags/v0.4.3",
+    "rn-emoji-keyboard": "0.7.0",
     "tdigest": "^0.1.1"
   },
   "devDependencies": {
@@ -82,12 +82,22 @@
     "@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",
     "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"
   },

resources/config/fleets.json

@@ -1,131 +1,165 @@
 {
-    "fleets": {
-        "eth.prod": {
-            "boot": {
-                "boot-01.ac-cn-hongkong-c.eth.prod": "enode://6e6554fb3034b211398fcd0f0082cbb6bd13619e1a7e76ba66e1809aaa0c5f1ac53c9ae79cf2fd4a7bacb10d12010899b370c75fed19b991d9c0cdd02891abad@47.75.99.169:443",
-                "boot-01.do-ams3.eth.prod": "enode://436cc6f674928fdc9a9f7990f2944002b685d1c37f025c1be425185b5b1f0900feaf1ccc2a6130268f9901be4a7d252f37302c8335a2c1a62736e9232691cc3a@178.128.138.128:443",
-                "boot-01.gc-us-central1-a.eth.prod": "enode://32ff6d88760b0947a3dee54ceff4d8d7f0b4c023c6dad34568615fcae89e26cc2753f28f12485a4116c977be937a72665116596265aa0736b53d46b27446296a@34.70.75.208:443",
-                "boot-02.ac-cn-hongkong-c.eth.prod": "enode://23d0740b11919358625d79d4cac7d50a34d79e9c69e16831c5c70573757a1f5d7d884510bc595d7ee4da3c1508adf87bbc9e9260d804ef03f8c1e37f2fb2fc69@47.52.106.107:443",
-                "boot-02.do-ams3.eth.prod": "enode://5395aab7833f1ecb671b59bf0521cf20224fe8162fc3d2675de4ee4d5636a75ec32d13268fc184df8d1ddfa803943906882da62a4df42d4fccf6d17808156a87@178.128.140.188:443",
-                "boot-02.gc-us-central1-a.eth.prod": "enode://5405c509df683c962e7c9470b251bb679dd6978f82d5b469f1f6c64d11d50fbd5dd9f7801c6ad51f3b20a5f6c7ffe248cc9ab223f8bcbaeaf14bb1c0ef295fd0@35.223.215.156:443"
-            },
-            "mail": {
-                "mail-01.ac-cn-hongkong-c.eth.prod": "enode://606ae04a71e5db868a722c77a21c8244ae38f1bd6e81687cc6cfe88a3063fa1c245692232f64f45bd5408fed5133eab8ed78049332b04f9c110eac7f71c1b429@47.75.247.214:443",
-                "mail-01.do-ams3.eth.prod": "enode://c42f368a23fa98ee546fd247220759062323249ef657d26d357a777443aec04db1b29a3a22ef3e7c548e18493ddaf51a31b0aed6079bd6ebe5ae838fcfaf3a49@178.128.142.54:443",
-                "mail-01.gc-us-central1-a.eth.prod": "enode://ee2b53b0ace9692167a410514bca3024695dbf0e1a68e1dff9716da620efb195f04a4b9e873fb9b74ac84de801106c465b8e2b6c4f0d93b8749d1578bfcaf03e@104.197.238.144:443",
-                "mail-02.ac-cn-hongkong-c.eth.prod": "enode://2c8de3cbb27a3d30cbb5b3e003bc722b126f5aef82e2052aaef032ca94e0c7ad219e533ba88c70585ebd802de206693255335b100307645ab5170e88620d2a81@47.244.221.14:443",
-                "mail-02.do-ams3.eth.prod": "enode://7aa648d6e855950b2e3d3bf220c496e0cae4adfddef3e1e6062e6b177aec93bc6cdcf1282cb40d1656932ebfdd565729da440368d7c4da7dbd4d004b1ac02bf8@178.128.142.26:443",
-                "mail-02.gc-us-central1-a.eth.prod": "enode://30211cbd81c25f07b03a0196d56e6ce4604bb13db773ff1c0ea2253547fafd6c06eae6ad3533e2ba39d59564cfbdbb5e2ce7c137a5ebb85e99dcfc7a75f99f55@23.236.58.92:443",
-                "mail-03.ac-cn-hongkong-c.eth.prod": "enode://e85f1d4209f2f99da801af18db8716e584a28ad0bdc47fbdcd8f26af74dbd97fc279144680553ec7cd9092afe683ddea1e0f9fc571ebcb4b1d857c03a088853d@47.244.129.82:443",
-                "mail-03.do-ams3.eth.prod": "enode://8a64b3c349a2e0ef4a32ea49609ed6eb3364be1110253c20adc17a3cebbc39a219e5d3e13b151c0eee5d8e0f9a8ba2cd026014e67b41a4ab7d1d5dd67ca27427@178.128.142.94:443",
-                "mail-03.gc-us-central1-a.eth.prod": "enode://44160e22e8b42bd32a06c1532165fa9e096eebedd7fa6d6e5f8bbef0440bc4a4591fe3651be68193a7ec029021cdb496cfe1d7f9f1dc69eb99226e6f39a7a5d4@35.225.221.245:443"
-            },
-            "rendezvous": {
-                "boot-01.ac-cn-hongkong-c.eth.prod": "/ip4/47.75.99.169/tcp/30703/ethv4/16Uiu2HAmV8Hq9e3zm9TMVP4zrVHo3BjqW5D6bDVV6VQntQd687e4",
-                "boot-01.do-ams3.eth.prod": "/ip4/178.128.138.128/tcp/30703/ethv4/16Uiu2HAmRHPzF3rQg55PgYPcQkyvPVH9n2hWsYPhUJBZ6kVjJgdV",
-                "boot-01.gc-us-central1-a.eth.prod": "/ip4/34.70.75.208/tcp/30703/ethv4/16Uiu2HAm6ZsERLx2BwVD2UM9SVPnnMU6NBycG8XPtu8qKys5awsU",
-                "boot-02.ac-cn-hongkong-c.eth.prod": "/ip4/47.52.106.107/tcp/30703/ethv4/16Uiu2HAmEHiptiDDd9gqNY8oQqo8hHUWMHJzfwt5aLRdD6W2zcXR",
-                "boot-02.do-ams3.eth.prod": "/ip4/178.128.140.188/tcp/30703/ethv4/16Uiu2HAmLqTXuY4Sb6G28HNooaFUXUKzpzKXCcgyJxgaEE2i5vnf",
-                "boot-02.gc-us-central1-a.eth.prod": "/ip4/35.223.215.156/tcp/30703/ethv4/16Uiu2HAmQEUFE2YaJohavWtHxPTEFv3sEGJtDqvtGEv78DFoEWQF"
-            },
-            "whisper": {
-                "node-01.ac-cn-hongkong-c.eth.prod": "enode://b957e51f41e4abab8382e1ea7229e88c6e18f34672694c6eae389eac22dab8655622bbd4a08192c321416b9becffaab11c8e2b7a5d0813b922aa128b82990dab@47.75.222.178:443",
-                "node-01.do-ams3.eth.prod": "enode://66ba15600cda86009689354c3a77bdf1a97f4f4fb3ab50ffe34dbc904fac561040496828397be18d9744c75881ffc6ac53729ddbd2cdbdadc5f45c400e2622f7@178.128.141.87:443",
-                "node-01.gc-us-central1-a.eth.prod": "enode://182ed5d658d1a1a4382c9e9f7c9e5d8d9fec9db4c71ae346b9e23e1a589116aeffb3342299bdd00e0ab98dbf804f7b2d8ae564ed18da9f45650b444aed79d509@34.68.132.118:443",
-                "node-02.ac-cn-hongkong-c.eth.prod": "enode://8bebe73ddf7cf09e77602c7d04c93a73f455b51f24ae0d572917a4792f1dec0bb4c562759b8830cc3615a658d38c1a4a38597a1d7ae3ba35111479fc42d65dec@47.75.85.212:443",
-                "node-02.do-ams3.eth.prod": "enode://4ea35352702027984a13274f241a56a47854a7fd4b3ba674a596cff917d3c825506431cf149f9f2312a293bb7c2b1cca55db742027090916d01529fe0729643b@134.209.136.79:443",
-                "node-02.gc-us-central1-a.eth.prod": "enode://fbeddac99d396b91d59f2c63a3cb5fc7e0f8a9f7ce6fe5f2eed5e787a0154161b7173a6a73124a4275ef338b8966dc70a611e9ae2192f0f2340395661fad81c0@34.67.230.193:443",
-                "node-03.ac-cn-hongkong-c.eth.prod": "enode://ac3948b2c0786ada7d17b80cf869cf59b1909ea3accd45944aae35bf864cc069126da8b82dfef4ddf23f1d6d6b44b1565c4cf81c8b98022253c6aea1a89d3ce2@47.75.88.12:443",
-                "node-03.do-ams3.eth.prod": "enode://ce559a37a9c344d7109bd4907802dd690008381d51f658c43056ec36ac043338bd92f1ac6043e645b64953b06f27202d679756a9c7cf62fdefa01b2e6ac5098e@134.209.136.123:443",
-                "node-03.gc-us-central1-a.eth.prod": "enode://c07aa0deea3b7056c5d45a85bca42f0d8d3b1404eeb9577610f386e0a4744a0e7b2845ae328efc4aa4b28075af838b59b5b3985bffddeec0090b3b7669abc1f3@35.226.92.155:443",
-                "node-04.ac-cn-hongkong-c.eth.prod": "enode://385579fc5b14e04d5b04af7eee835d426d3d40ccf11f99dbd95340405f37cf3bbbf830b3eb8f70924be0c2909790120682c9c3e791646e2d5413e7801545d353@47.244.221.249:443",
-                "node-04.do-ams3.eth.prod": "enode://4e0a8db9b73403c9339a2077e911851750fc955db1fc1e09f81a4a56725946884dd5e4d11258eac961f9078a393c45bcab78dd0e3bc74e37ce773b3471d2e29c@134.209.136.101:443",
-                "node-04.gc-us-central1-a.eth.prod": "enode://0624b4a90063923c5cc27d12624b6a49a86dfb3623fcb106801217fdbab95f7617b83fa2468b9ae3de593ff6c1cf556ccf9bc705bfae9cb4625999765127b423@35.222.158.246:443",
-                "node-05.ac-cn-hongkong-c.eth.prod": "enode://b77bffc29e2592f30180311dd81204ab845e5f78953b5ba0587c6631be9c0862963dea5eb64c90617cf0efd75308e22a42e30bc4eb3cd1bbddbd1da38ff6483e@47.75.10.177:443",
-                "node-05.do-ams3.eth.prod": "enode://a8bddfa24e1e92a82609b390766faa56cf7a5eef85b22a2b51e79b333c8aaeec84f7b4267e432edd1cf45b63a3ad0fc7d6c3a16f046aa6bc07ebe50e80b63b8c@178.128.141.249:443",
-                "node-05.gc-us-central1-a.eth.prod": "enode://a5fe9c82ad1ffb16ae60cb5d4ffe746b9de4c5fbf20911992b7dd651b1c08ba17dd2c0b27ee6b03162c52d92f219961cc3eb14286aca8a90b75cf425826c3bd8@104.154.230.58:443",
-                "node-06.ac-cn-hongkong-c.eth.prod": "enode://cf5f7a7e64e3b306d1bc16073fba45be3344cb6695b0b616ccc2da66ea35b9f35b3b231c6cf335fdfaba523519659a440752fc2e061d1e5bc4ef33864aac2f19@47.75.221.196:443",
-                "node-06.do-ams3.eth.prod": "enode://887cbd92d95afc2c5f1e227356314a53d3d18855880ac0509e0c0870362aee03939d4074e6ad31365915af41d34320b5094bfcc12a67c381788cd7298d06c875@178.128.141.0:443",
-                "node-06.gc-us-central1-a.eth.prod": "enode://282e009967f9f132a5c2dd366a76319f0d22d60d0c51f7e99795a1e40f213c2705a2c10e4cc6f3890319f59da1a535b8835ed9b9c4b57c3aad342bf312fd7379@35.223.240.17:443",
-                "node-07.ac-cn-hongkong-c.eth.prod": "enode://13d63a1f85ccdcbd2fb6861b9bd9d03f94bdba973608951f7c36e5df5114c91de2b8194d71288f24bfd17908c48468e89dd8f0fb8ccc2b2dedae84acdf65f62a@47.244.210.80:443",
-                "node-07.do-ams3.eth.prod": "enode://2b01955d7e11e29dce07343b456e4e96c081760022d1652b1c4b641eaf320e3747871870fa682e9e9cfb85b819ce94ed2fee1ac458904d54fd0b97d33ba2c4a4@134.209.136.112:443",
-                "node-07.gc-us-central1-a.eth.prod": "enode://b706a60572634760f18a27dd407b2b3582f7e065110dae10e3998498f1ae3f29ba04db198460d83ed6d2bfb254bb06b29aab3c91415d75d3b869cd0037f3853c@35.239.5.162:443",
-                "node-08.ac-cn-hongkong-c.eth.prod": "enode://32915c8841faaef21a6b75ab6ed7c2b6f0790eb177ad0f4ea6d731bacc19b938624d220d937ebd95e0f6596b7232bbb672905ee12601747a12ee71a15bfdf31c@47.75.59.11:443",
-                "node-08.do-ams3.eth.prod": "enode://0d9d65fcd5592df33ed4507ce862b9c748b6dbd1ea3a1deb94e3750052760b4850aa527265bbaf357021d64d5cc53c02b410458e732fafc5b53f257944247760@178.128.141.42:443",
-                "node-08.gc-us-central1-a.eth.prod": "enode://e87f1d8093d304c3a9d6f1165b85d6b374f1c0cc907d39c0879eb67f0a39d779be7a85cbd52920b6f53a94da43099c58837034afa6a7be4b099bfcd79ad13999@35.238.106.101:443"
-            }
-        },
-        "eth.staging": {
-            "boot": {
-                "boot-01.ac-cn-hongkong-c.eth.staging": "enode://630b0342ca4e9552f50714b6c8e28d6955bc0fd14e7950f93bc3b2b8cc8c1f3b6d103df66f51a13d773b5db0f130661fb5c7b8fa21c48890c64c79b41a56a490@47.91.229.44:443",
-                "boot-01.do-ams3.eth.staging": "enode://f79fb3919f72ca560ad0434dcc387abfe41e0666201ebdada8ede0462454a13deb05cda15f287d2c4bd85da81f0eb25d0a486bbbc8df427b971ac51533bd00fe@174.138.107.239:443",
-                "boot-01.gc-us-central1-a.eth.staging": "enode://10a78c17929a7019ef4aa2249d7302f76ae8a06f40b2dc88b7b31ebff4a623fbb44b4a627acba296c1ced3775d91fbe18463c15097a6a36fdb2c804ff3fc5b35@35.238.97.234:443"
-            },
-            "mail": {
-                "mail-01.ac-cn-hongkong-c.eth.staging": "enode://b74859176c9751d314aeeffc26ec9f866a412752e7ddec91b19018a18e7cca8d637cfe2cedcb972f8eb64d816fbd5b4e89c7e8c7fd7df8a1329fa43db80b0bfe@47.52.90.156:443",
-                "mail-01.do-ams3.eth.staging": "enode://69f72baa7f1722d111a8c9c68c39a31430e9d567695f6108f31ccb6cd8f0adff4991e7fdca8fa770e75bc8a511a87d24690cbc80e008175f40c157d6f6788d48@206.189.240.16:443",
-                "mail-01.gc-us-central1-a.eth.staging": "enode://e4fc10c1f65c8aed83ac26bc1bfb21a45cc1a8550a58077c8d2de2a0e0cd18e40fd40f7e6f7d02dc6cd06982b014ce88d6e468725ffe2c138e958788d0002a7f@35.239.193.41:443"
-            },
-            "rendezvous": {
-                "boot-01.ac-cn-hongkong-c.eth.staging": "/ip4/47.91.229.44/tcp/30703/ethv4/16Uiu2HAmRnt2Eyoknh3auxh4fJwkRgqkH1gqrWGes8Pk1k3MV4xu",
-                "boot-01.do-ams3.eth.staging": "/ip4/174.138.107.239/tcp/30703/ethv4/16Uiu2HAm8UZXUHEPZrpJbcQ3yVFH6UtKrwsG6jH4ai72PsbLfVFb",
-                "boot-01.gc-us-central1-a.eth.staging": "/ip4/35.238.97.234/tcp/30703/ethv4/16Uiu2HAm6G9sDMkrB4Xa5EH3Zx2dysCxFgBTSRzghic3Z9tRFRNE"
-            },
-            "whisper": {
-                "node-01.ac-cn-hongkong-c.eth.staging": "enode://088cf5a93c576fae52f6f075178467b8ff98bacf72f59e88efb16dfba5b30f80a4db78f8e3cb3d87f2f6521746ef4a8768465ef2896c6af24fd77a425e95b6dd@47.52.226.137:443",
-                "node-01.do-ams3.eth.staging": "enode://914c0b30f27bab30c1dfd31dad7652a46fda9370542aee1b062498b1345ee0913614b8b9e3e84622e84a7203c5858ae1d9819f63aece13ee668e4f6668063989@167.99.19.148:443",
-                "node-01.gc-us-central1-a.eth.staging": "enode://d3878441652f010326889f28360e69f2d09d06540f934fada0e17b374ce5319de64279aba3c44a5bf807d9967c6d705b3b4c6b03fa70763240e2ee6af01a539e@35.192.0.86:443"
-            }
-        },
-        "eth.test": {
-            "boot": {
-                "boot-01.ac-cn-hongkong-c.eth.test": "enode://daae2e72820e86e942fa2a8aa7d6e9954d4043a753483d8bd338e16be82cf962392d5c0e1ae57c3d793c3d3dddd8fd58339262e4234dc966f953cd73b535f5fa@47.52.188.149:443",
-                "boot-01.do-ams3.eth.test": "enode://9e0988575eb7717c25dea72fd11c7b37767dc09c1a7686f7c2ec577d308d24b377ceb675de4317474a1a870e47882732967f4fa785b02ba95d669b31d464dec0@206.189.243.164:443",
-                "boot-01.gc-us-central1-a.eth.test": "enode://c1e5018887c863d64e431b69bf617561087825430e4401733f5ba77c70db14236df381fefb0ebe1ac42294b9e261bbe233dbdb83e32c586c66ae26c8de70cb4c@35.188.168.137:443"
-            },
-            "mail": {
-                "mail-01.ac-cn-hongkong-c.eth.test": "enode://619dbb5dda12e85bf0eb5db40fb3de625609043242737c0e975f7dfd659d85dc6d9a84f9461a728c5ab68c072fed38ca6a53917ca24b8e93cc27bdef3a1e79ac@47.52.188.196:443",
-                "mail-01.do-ams3.eth.test": "enode://e4865fe6c2a9c1a563a6447990d8e9ce672644ae3e08277ce38ec1f1b690eef6320c07a5d60c3b629f5d4494f93d6b86a745a0bf64ab295bbf6579017adc6ed8@206.189.243.161:443",
-                "mail-01.gc-us-central1-a.eth.test": "enode://707e57453acd3e488c44b9d0e17975371e2f8fb67525eae5baca9b9c8e06c86cde7c794a6c2e36203bf9f56cae8b0e50f3b33c4c2b694a7baeea1754464ce4e3@35.192.229.172:443"
-            },
-            "rendezvous": {
-                "boot-01.ac-cn-hongkong-c.eth.test": "/ip4/47.52.188.149/tcp/30703/ethv4/16Uiu2HAm9Vatqr4GfVCqnyeaPtCF3q8fz8kDDUgqXVfFG7ZfSA7w",
-                "boot-01.do-ams3.eth.test": "/ip4/206.189.243.164/tcp/30703/ethv4/16Uiu2HAmBCh5bgYr6V3fDuLqUzvtSAsFTQJCQ3TVHT8ta8bTu2Jm",
-                "boot-01.gc-us-central1-a.eth.test": "/ip4/35.188.168.137/tcp/30703/ethv4/16Uiu2HAm3MUqtGjmetyZ9L4SN2R8oHDWvACUcec25LjtDD5euiRH"
-            },
-            "whisper": {
-                "node-01.ac-cn-hongkong-c.eth.test": "enode://ad38f94030a846cc7005b7a1f3b6b01bf4ef59d34e8d3d6f4d12df23d14ba8656702a435d34cf4df3b412c0c1923df5adcce8461321a0d8ffb9435b26e572c2a@47.52.255.194:443",
-                "node-01.do-ams3.eth.test": "enode://1d193635e015918fb85bbaf774863d12f65d70c6977506187ef04420d74ec06c9e8f0dcb57ea042f85df87433dab17a1260ed8dde1bdf9d6d5d2de4b7bf8e993@206.189.243.163:443",
-                "node-01.gc-us-central1-a.eth.test": "enode://f593a27731bc0f8eb088e2d39222c2d59dfb9bf0b3950d7a828d51e8ab9e08fffbd9916a82fd993c1a080c57c2bd70ed6c36f489a969de697aff93088dbee1a9@35.194.31.108:443"
-            }
-        },
-        "wakuv2.prod": {
-            "waku": {
-                "node-01.ac-cn-hongkong-c.wakuv2.prod": "/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
-                "node-01.do-ams3.wakuv2.prod": "/ip4/188.166.135.145/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-                "node-01.gc-us-central1-a.wakuv2.prod": "/ip4/34.121.100.108/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
-            },
-            "waku-websocket": {
-                "node-01.ac-cn-hongkong-c.wakuv2.prod": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
-                "node-01.do-ams3.wakuv2.prod": "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-                "node-01.gc-us-central1-a.wakuv2.prod": "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
-            }
-        },
-        "wakuv2.test": {
-            "waku": {
-                "node-01.ac-cn-hongkong-c.wakuv2.test": "/ip4/47.242.210.73/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
-                "node-01.do-ams3.wakuv2.test": "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-                "node-01.gc-us-central1-a.wakuv2.test": "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
-            },
-            "waku-websocket": {
-                "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
-                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-                "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
-            }
-        }
+  "fleets": {
+    "eth.prod": {
+      "boot": {
+        "boot-01.ac-cn-hongkong-c.eth.prod": "enode://6e6554fb3034b211398fcd0f0082cbb6bd13619e1a7e76ba66e1809aaa0c5f1ac53c9ae79cf2fd4a7bacb10d12010899b370c75fed19b991d9c0cdd02891abad@47.75.99.169:443",
+        "boot-01.do-ams3.eth.prod": "enode://436cc6f674928fdc9a9f7990f2944002b685d1c37f025c1be425185b5b1f0900feaf1ccc2a6130268f9901be4a7d252f37302c8335a2c1a62736e9232691cc3a@178.128.138.128:443",
+        "boot-01.gc-us-central1-a.eth.prod": "enode://32ff6d88760b0947a3dee54ceff4d8d7f0b4c023c6dad34568615fcae89e26cc2753f28f12485a4116c977be937a72665116596265aa0736b53d46b27446296a@34.70.75.208:443",
+        "boot-02.ac-cn-hongkong-c.eth.prod": "enode://23d0740b11919358625d79d4cac7d50a34d79e9c69e16831c5c70573757a1f5d7d884510bc595d7ee4da3c1508adf87bbc9e9260d804ef03f8c1e37f2fb2fc69@47.52.106.107:443",
+        "boot-02.do-ams3.eth.prod": "enode://5395aab7833f1ecb671b59bf0521cf20224fe8162fc3d2675de4ee4d5636a75ec32d13268fc184df8d1ddfa803943906882da62a4df42d4fccf6d17808156a87@178.128.140.188:443",
+        "boot-02.gc-us-central1-a.eth.prod": "enode://5405c509df683c962e7c9470b251bb679dd6978f82d5b469f1f6c64d11d50fbd5dd9f7801c6ad51f3b20a5f6c7ffe248cc9ab223f8bcbaeaf14bb1c0ef295fd0@35.223.215.156:443"
+      },
+      "mail": {
+        "mail-01.ac-cn-hongkong-c.eth.prod": "enode://606ae04a71e5db868a722c77a21c8244ae38f1bd6e81687cc6cfe88a3063fa1c245692232f64f45bd5408fed5133eab8ed78049332b04f9c110eac7f71c1b429@47.75.247.214:443",
+        "mail-01.do-ams3.eth.prod": "enode://c42f368a23fa98ee546fd247220759062323249ef657d26d357a777443aec04db1b29a3a22ef3e7c548e18493ddaf51a31b0aed6079bd6ebe5ae838fcfaf3a49@178.128.142.54:443",
+        "mail-01.gc-us-central1-a.eth.prod": "enode://ee2b53b0ace9692167a410514bca3024695dbf0e1a68e1dff9716da620efb195f04a4b9e873fb9b74ac84de801106c465b8e2b6c4f0d93b8749d1578bfcaf03e@104.197.238.144:443",
+        "mail-02.ac-cn-hongkong-c.eth.prod": "enode://2c8de3cbb27a3d30cbb5b3e003bc722b126f5aef82e2052aaef032ca94e0c7ad219e533ba88c70585ebd802de206693255335b100307645ab5170e88620d2a81@47.244.221.14:443",
+        "mail-02.do-ams3.eth.prod": "enode://7aa648d6e855950b2e3d3bf220c496e0cae4adfddef3e1e6062e6b177aec93bc6cdcf1282cb40d1656932ebfdd565729da440368d7c4da7dbd4d004b1ac02bf8@178.128.142.26:443",
+        "mail-02.gc-us-central1-a.eth.prod": "enode://30211cbd81c25f07b03a0196d56e6ce4604bb13db773ff1c0ea2253547fafd6c06eae6ad3533e2ba39d59564cfbdbb5e2ce7c137a5ebb85e99dcfc7a75f99f55@23.236.58.92:443",
+        "mail-03.ac-cn-hongkong-c.eth.prod": "enode://e85f1d4209f2f99da801af18db8716e584a28ad0bdc47fbdcd8f26af74dbd97fc279144680553ec7cd9092afe683ddea1e0f9fc571ebcb4b1d857c03a088853d@47.244.129.82:443",
+        "mail-03.do-ams3.eth.prod": "enode://8a64b3c349a2e0ef4a32ea49609ed6eb3364be1110253c20adc17a3cebbc39a219e5d3e13b151c0eee5d8e0f9a8ba2cd026014e67b41a4ab7d1d5dd67ca27427@178.128.142.94:443",
+        "mail-03.gc-us-central1-a.eth.prod": "enode://44160e22e8b42bd32a06c1532165fa9e096eebedd7fa6d6e5f8bbef0440bc4a4591fe3651be68193a7ec029021cdb496cfe1d7f9f1dc69eb99226e6f39a7a5d4@35.225.221.245:443"
+      },
+      "rendezvous": {
+        "boot-01.ac-cn-hongkong-c.eth.prod": "/ip4/47.75.99.169/tcp/30703/ethv4/16Uiu2HAmV8Hq9e3zm9TMVP4zrVHo3BjqW5D6bDVV6VQntQd687e4",
+        "boot-01.do-ams3.eth.prod": "/ip4/178.128.138.128/tcp/30703/ethv4/16Uiu2HAmRHPzF3rQg55PgYPcQkyvPVH9n2hWsYPhUJBZ6kVjJgdV",
+        "boot-01.gc-us-central1-a.eth.prod": "/ip4/34.70.75.208/tcp/30703/ethv4/16Uiu2HAm6ZsERLx2BwVD2UM9SVPnnMU6NBycG8XPtu8qKys5awsU",
+        "boot-02.ac-cn-hongkong-c.eth.prod": "/ip4/47.52.106.107/tcp/30703/ethv4/16Uiu2HAmEHiptiDDd9gqNY8oQqo8hHUWMHJzfwt5aLRdD6W2zcXR",
+        "boot-02.do-ams3.eth.prod": "/ip4/178.128.140.188/tcp/30703/ethv4/16Uiu2HAmLqTXuY4Sb6G28HNooaFUXUKzpzKXCcgyJxgaEE2i5vnf",
+        "boot-02.gc-us-central1-a.eth.prod": "/ip4/35.223.215.156/tcp/30703/ethv4/16Uiu2HAmQEUFE2YaJohavWtHxPTEFv3sEGJtDqvtGEv78DFoEWQF"
+      },
+      "whisper": {
+        "node-01.ac-cn-hongkong-c.eth.prod": "enode://b957e51f41e4abab8382e1ea7229e88c6e18f34672694c6eae389eac22dab8655622bbd4a08192c321416b9becffaab11c8e2b7a5d0813b922aa128b82990dab@47.75.222.178:443",
+        "node-01.do-ams3.eth.prod": "enode://66ba15600cda86009689354c3a77bdf1a97f4f4fb3ab50ffe34dbc904fac561040496828397be18d9744c75881ffc6ac53729ddbd2cdbdadc5f45c400e2622f7@178.128.141.87:443",
+        "node-01.gc-us-central1-a.eth.prod": "enode://182ed5d658d1a1a4382c9e9f7c9e5d8d9fec9db4c71ae346b9e23e1a589116aeffb3342299bdd00e0ab98dbf804f7b2d8ae564ed18da9f45650b444aed79d509@34.68.132.118:443",
+        "node-02.ac-cn-hongkong-c.eth.prod": "enode://8bebe73ddf7cf09e77602c7d04c93a73f455b51f24ae0d572917a4792f1dec0bb4c562759b8830cc3615a658d38c1a4a38597a1d7ae3ba35111479fc42d65dec@47.75.85.212:443",
+        "node-02.do-ams3.eth.prod": "enode://4ea35352702027984a13274f241a56a47854a7fd4b3ba674a596cff917d3c825506431cf149f9f2312a293bb7c2b1cca55db742027090916d01529fe0729643b@134.209.136.79:443",
+        "node-02.gc-us-central1-a.eth.prod": "enode://fbeddac99d396b91d59f2c63a3cb5fc7e0f8a9f7ce6fe5f2eed5e787a0154161b7173a6a73124a4275ef338b8966dc70a611e9ae2192f0f2340395661fad81c0@34.67.230.193:443",
+        "node-03.ac-cn-hongkong-c.eth.prod": "enode://ac3948b2c0786ada7d17b80cf869cf59b1909ea3accd45944aae35bf864cc069126da8b82dfef4ddf23f1d6d6b44b1565c4cf81c8b98022253c6aea1a89d3ce2@47.75.88.12:443",
+        "node-03.do-ams3.eth.prod": "enode://ce559a37a9c344d7109bd4907802dd690008381d51f658c43056ec36ac043338bd92f1ac6043e645b64953b06f27202d679756a9c7cf62fdefa01b2e6ac5098e@134.209.136.123:443",
+        "node-03.gc-us-central1-a.eth.prod": "enode://c07aa0deea3b7056c5d45a85bca42f0d8d3b1404eeb9577610f386e0a4744a0e7b2845ae328efc4aa4b28075af838b59b5b3985bffddeec0090b3b7669abc1f3@35.226.92.155:443",
+        "node-04.ac-cn-hongkong-c.eth.prod": "enode://385579fc5b14e04d5b04af7eee835d426d3d40ccf11f99dbd95340405f37cf3bbbf830b3eb8f70924be0c2909790120682c9c3e791646e2d5413e7801545d353@47.244.221.249:443",
+        "node-04.do-ams3.eth.prod": "enode://4e0a8db9b73403c9339a2077e911851750fc955db1fc1e09f81a4a56725946884dd5e4d11258eac961f9078a393c45bcab78dd0e3bc74e37ce773b3471d2e29c@134.209.136.101:443",
+        "node-04.gc-us-central1-a.eth.prod": "enode://0624b4a90063923c5cc27d12624b6a49a86dfb3623fcb106801217fdbab95f7617b83fa2468b9ae3de593ff6c1cf556ccf9bc705bfae9cb4625999765127b423@35.222.158.246:443",
+        "node-05.ac-cn-hongkong-c.eth.prod": "enode://b77bffc29e2592f30180311dd81204ab845e5f78953b5ba0587c6631be9c0862963dea5eb64c90617cf0efd75308e22a42e30bc4eb3cd1bbddbd1da38ff6483e@47.75.10.177:443",
+        "node-05.do-ams3.eth.prod": "enode://a8bddfa24e1e92a82609b390766faa56cf7a5eef85b22a2b51e79b333c8aaeec84f7b4267e432edd1cf45b63a3ad0fc7d6c3a16f046aa6bc07ebe50e80b63b8c@178.128.141.249:443",
+        "node-05.gc-us-central1-a.eth.prod": "enode://a5fe9c82ad1ffb16ae60cb5d4ffe746b9de4c5fbf20911992b7dd651b1c08ba17dd2c0b27ee6b03162c52d92f219961cc3eb14286aca8a90b75cf425826c3bd8@104.154.230.58:443",
+        "node-06.ac-cn-hongkong-c.eth.prod": "enode://cf5f7a7e64e3b306d1bc16073fba45be3344cb6695b0b616ccc2da66ea35b9f35b3b231c6cf335fdfaba523519659a440752fc2e061d1e5bc4ef33864aac2f19@47.75.221.196:443",
+        "node-06.do-ams3.eth.prod": "enode://887cbd92d95afc2c5f1e227356314a53d3d18855880ac0509e0c0870362aee03939d4074e6ad31365915af41d34320b5094bfcc12a67c381788cd7298d06c875@178.128.141.0:443",
+        "node-06.gc-us-central1-a.eth.prod": "enode://282e009967f9f132a5c2dd366a76319f0d22d60d0c51f7e99795a1e40f213c2705a2c10e4cc6f3890319f59da1a535b8835ed9b9c4b57c3aad342bf312fd7379@35.223.240.17:443",
+        "node-07.ac-cn-hongkong-c.eth.prod": "enode://13d63a1f85ccdcbd2fb6861b9bd9d03f94bdba973608951f7c36e5df5114c91de2b8194d71288f24bfd17908c48468e89dd8f0fb8ccc2b2dedae84acdf65f62a@47.244.210.80:443",
+        "node-07.do-ams3.eth.prod": "enode://2b01955d7e11e29dce07343b456e4e96c081760022d1652b1c4b641eaf320e3747871870fa682e9e9cfb85b819ce94ed2fee1ac458904d54fd0b97d33ba2c4a4@134.209.136.112:443",
+        "node-07.gc-us-central1-a.eth.prod": "enode://b706a60572634760f18a27dd407b2b3582f7e065110dae10e3998498f1ae3f29ba04db198460d83ed6d2bfb254bb06b29aab3c91415d75d3b869cd0037f3853c@35.239.5.162:443",
+        "node-08.ac-cn-hongkong-c.eth.prod": "enode://32915c8841faaef21a6b75ab6ed7c2b6f0790eb177ad0f4ea6d731bacc19b938624d220d937ebd95e0f6596b7232bbb672905ee12601747a12ee71a15bfdf31c@47.75.59.11:443",
+        "node-08.do-ams3.eth.prod": "enode://0d9d65fcd5592df33ed4507ce862b9c748b6dbd1ea3a1deb94e3750052760b4850aa527265bbaf357021d64d5cc53c02b410458e732fafc5b53f257944247760@178.128.141.42:443",
+        "node-08.gc-us-central1-a.eth.prod": "enode://e87f1d8093d304c3a9d6f1165b85d6b374f1c0cc907d39c0879eb67f0a39d779be7a85cbd52920b6f53a94da43099c58837034afa6a7be4b099bfcd79ad13999@35.238.106.101:443"
+      }
     },
-    "meta": {
-        "hostname": "node-01.do-ams3.proxy.misc",
-        "timestamp": "2021-06-07T00:00:09.836740"
+    "eth.staging": {
+      "boot": {
+        "boot-01.ac-cn-hongkong-c.eth.staging": "enode://630b0342ca4e9552f50714b6c8e28d6955bc0fd14e7950f93bc3b2b8cc8c1f3b6d103df66f51a13d773b5db0f130661fb5c7b8fa21c48890c64c79b41a56a490@47.91.229.44:443",
+        "boot-01.do-ams3.eth.staging": "enode://f79fb3919f72ca560ad0434dcc387abfe41e0666201ebdada8ede0462454a13deb05cda15f287d2c4bd85da81f0eb25d0a486bbbc8df427b971ac51533bd00fe@174.138.107.239:443",
+        "boot-01.gc-us-central1-a.eth.staging": "enode://10a78c17929a7019ef4aa2249d7302f76ae8a06f40b2dc88b7b31ebff4a623fbb44b4a627acba296c1ced3775d91fbe18463c15097a6a36fdb2c804ff3fc5b35@35.238.97.234:443"
+      },
+      "mail": {
+        "mail-01.ac-cn-hongkong-c.eth.staging": "enode://b74859176c9751d314aeeffc26ec9f866a412752e7ddec91b19018a18e7cca8d637cfe2cedcb972f8eb64d816fbd5b4e89c7e8c7fd7df8a1329fa43db80b0bfe@47.52.90.156:443",
+        "mail-01.do-ams3.eth.staging": "enode://69f72baa7f1722d111a8c9c68c39a31430e9d567695f6108f31ccb6cd8f0adff4991e7fdca8fa770e75bc8a511a87d24690cbc80e008175f40c157d6f6788d48@206.189.240.16:443",
+        "mail-01.gc-us-central1-a.eth.staging": "enode://e4fc10c1f65c8aed83ac26bc1bfb21a45cc1a8550a58077c8d2de2a0e0cd18e40fd40f7e6f7d02dc6cd06982b014ce88d6e468725ffe2c138e958788d0002a7f@35.239.193.41:443"
+      },
+      "rendezvous": {
+        "boot-01.ac-cn-hongkong-c.eth.staging": "/ip4/47.91.229.44/tcp/30703/ethv4/16Uiu2HAmRnt2Eyoknh3auxh4fJwkRgqkH1gqrWGes8Pk1k3MV4xu",
+        "boot-01.do-ams3.eth.staging": "/ip4/174.138.107.239/tcp/30703/ethv4/16Uiu2HAm8UZXUHEPZrpJbcQ3yVFH6UtKrwsG6jH4ai72PsbLfVFb",
+        "boot-01.gc-us-central1-a.eth.staging": "/ip4/35.238.97.234/tcp/30703/ethv4/16Uiu2HAm6G9sDMkrB4Xa5EH3Zx2dysCxFgBTSRzghic3Z9tRFRNE"
+      },
+      "whisper": {
+        "node-01.ac-cn-hongkong-c.eth.staging": "enode://088cf5a93c576fae52f6f075178467b8ff98bacf72f59e88efb16dfba5b30f80a4db78f8e3cb3d87f2f6521746ef4a8768465ef2896c6af24fd77a425e95b6dd@47.52.226.137:443",
+        "node-01.do-ams3.eth.staging": "enode://914c0b30f27bab30c1dfd31dad7652a46fda9370542aee1b062498b1345ee0913614b8b9e3e84622e84a7203c5858ae1d9819f63aece13ee668e4f6668063989@167.99.19.148:443",
+        "node-01.gc-us-central1-a.eth.staging": "enode://d3878441652f010326889f28360e69f2d09d06540f934fada0e17b374ce5319de64279aba3c44a5bf807d9967c6d705b3b4c6b03fa70763240e2ee6af01a539e@35.192.0.86:443"
+      }
+    },
+    "eth.test": {
+      "boot": {
+        "boot-01.ac-cn-hongkong-c.eth.test": "enode://daae2e72820e86e942fa2a8aa7d6e9954d4043a753483d8bd338e16be82cf962392d5c0e1ae57c3d793c3d3dddd8fd58339262e4234dc966f953cd73b535f5fa@47.52.188.149:443",
+        "boot-01.do-ams3.eth.test": "enode://9e0988575eb7717c25dea72fd11c7b37767dc09c1a7686f7c2ec577d308d24b377ceb675de4317474a1a870e47882732967f4fa785b02ba95d669b31d464dec0@206.189.243.164:443",
+        "boot-01.gc-us-central1-a.eth.test": "enode://c1e5018887c863d64e431b69bf617561087825430e4401733f5ba77c70db14236df381fefb0ebe1ac42294b9e261bbe233dbdb83e32c586c66ae26c8de70cb4c@35.188.168.137:443"
+      },
+      "mail": {
+        "mail-01.ac-cn-hongkong-c.eth.test": "enode://619dbb5dda12e85bf0eb5db40fb3de625609043242737c0e975f7dfd659d85dc6d9a84f9461a728c5ab68c072fed38ca6a53917ca24b8e93cc27bdef3a1e79ac@47.52.188.196:443",
+        "mail-01.do-ams3.eth.test": "enode://e4865fe6c2a9c1a563a6447990d8e9ce672644ae3e08277ce38ec1f1b690eef6320c07a5d60c3b629f5d4494f93d6b86a745a0bf64ab295bbf6579017adc6ed8@206.189.243.161:443",
+        "mail-01.gc-us-central1-a.eth.test": "enode://707e57453acd3e488c44b9d0e17975371e2f8fb67525eae5baca9b9c8e06c86cde7c794a6c2e36203bf9f56cae8b0e50f3b33c4c2b694a7baeea1754464ce4e3@35.192.229.172:443"
+      },
+      "rendezvous": {
+        "boot-01.ac-cn-hongkong-c.eth.test": "/ip4/47.52.188.149/tcp/30703/ethv4/16Uiu2HAm9Vatqr4GfVCqnyeaPtCF3q8fz8kDDUgqXVfFG7ZfSA7w",
+        "boot-01.do-ams3.eth.test": "/ip4/206.189.243.164/tcp/30703/ethv4/16Uiu2HAmBCh5bgYr6V3fDuLqUzvtSAsFTQJCQ3TVHT8ta8bTu2Jm",
+        "boot-01.gc-us-central1-a.eth.test": "/ip4/35.188.168.137/tcp/30703/ethv4/16Uiu2HAm3MUqtGjmetyZ9L4SN2R8oHDWvACUcec25LjtDD5euiRH"
+      },
+      "whisper": {
+        "node-01.ac-cn-hongkong-c.eth.test": "enode://ad38f94030a846cc7005b7a1f3b6b01bf4ef59d34e8d3d6f4d12df23d14ba8656702a435d34cf4df3b412c0c1923df5adcce8461321a0d8ffb9435b26e572c2a@47.52.255.194:443",
+        "node-01.do-ams3.eth.test": "enode://1d193635e015918fb85bbaf774863d12f65d70c6977506187ef04420d74ec06c9e8f0dcb57ea042f85df87433dab17a1260ed8dde1bdf9d6d5d2de4b7bf8e993@206.189.243.163:443",
+        "node-01.gc-us-central1-a.eth.test": "enode://f593a27731bc0f8eb088e2d39222c2d59dfb9bf0b3950d7a828d51e8ab9e08fffbd9916a82fd993c1a080c57c2bd70ed6c36f489a969de697aff93088dbee1a9@35.194.31.108:443"
+      }
+    },
+    "status.prod": {
+      "waku": {
+        "node-01.ac-cn-hongkong-c.status.prod": "/dns4/node-01.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkvEZgh3KLwhLwXg95e5ojM8XykJ4Kxi2T7hk22rnA7pJC",
+        "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
+        "node-01.gc-us-central1-a.status.prod": "/dns4/node-01.gc-us-central1-a.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkwBp8T6G77kQXSNMnxgaMky1JeyML5yqoTHRM8dbeCBNb",
+        "node-02.ac-cn-hongkong-c.status.prod": "/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8",
+        "node-02.do-ams3.status.prod": "/dns4/node-02.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmSve7tR5YZugpskMv2dmJAsMUKmfWYEKRXNUxRaTCnsXV",
+        "node-02.gc-us-central1-a.status.prod": "/dns4/node-02.gc-us-central1-a.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmDQugwDHM3YeUp86iGjrUvbdw3JPRgikC7YoGBsT2ymMg"
+      },
+      "waku-websocket": {
+        "node-01.ac-cn-hongkong-c.status.prod": "/dns4/node-01.ac-cn-hongkong-c.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkvEZgh3KLwhLwXg95e5ojM8XykJ4Kxi2T7hk22rnA7pJC",
+        "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
+        "node-01.gc-us-central1-a.status.prod": "/dns4/node-01.gc-us-central1-a.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkwBp8T6G77kQXSNMnxgaMky1JeyML5yqoTHRM8dbeCBNb",
+        "node-02.ac-cn-hongkong-c.status.prod": "/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8",
+        "node-02.do-ams3.status.prod": "/dns4/node-02.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmSve7tR5YZugpskMv2dmJAsMUKmfWYEKRXNUxRaTCnsXV",
+        "node-02.gc-us-central1-a.status.prod": "/dns4/node-02.gc-us-central1-a.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmDQugwDHM3YeUp86iGjrUvbdw3JPRgikC7YoGBsT2ymMg"
+      },
+      "waku-nodes": ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.nodes.status.im"]
+    },
+    "status.test": {
+      "waku": {
+        "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi",
+        "node-01.do-ams3.status.test": "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
+        "node-01.gc-us-central1-a.status.test": "/dns4/node-01.gc-us-central1-a.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76"
+      },
+      "waku-websocket": {
+        "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi",
+        "node-01.do-ams3.status.test": "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
+        "node-01.gc-us-central1-a.status.test": "/dns4/node-01.gc-us-central1-a.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76"
+      },
+      "waku-nodes": ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.nodes.status.im"]
+    },
+    "wakuv2.prod": {
+      "waku": {
+        "node-01.ac-cn-hongkong-c.wakuv2.prod": "/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
+        "node-01.do-ams3.wakuv2.prod": "/ip4/188.166.135.145/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+        "node-01.gc-us-central1-a.wakuv2.prod": "/ip4/34.121.100.108/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
+      },
+      "waku-websocket": {
+        "node-01.ac-cn-hongkong-c.wakuv2.prod": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
+        "node-01.do-ams3.wakuv2.prod": "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+        "node-01.gc-us-central1-a.wakuv2.prod": "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
+      },
+      "waku-nodes": ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.waku.nodes.status.im"]
+    },
+    "wakuv2.test": {
+      "waku": {
+        "node-01.ac-cn-hongkong-c.wakuv2.test": "/ip4/47.242.210.73/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
+        "node-01.do-ams3.wakuv2.test": "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+        "node-01.gc-us-central1-a.wakuv2.test": "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
+      },
+      "waku-websocket": {
+        "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
+        "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+        "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
+      },
+      "waku-nodes": ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.waku.nodes.status.im"]
     }
+  },
+  "meta": {
+    "hostname": "node-01.do-ams3.proxy.misc",
+    "timestamp": "2021-06-07T00:00:09.836740"
+  }
 }

scripts/lint-re-frame-in-quo-components.sh

@@ -2,10 +2,10 @@
 
 CHANGES=$(git diff --no-ext-diff --diff-filter=d --cached --unified=0 --no-prefix --minimal --exit-code src/quo src/quo2 | grep '^+' || echo '')
 
-INVALID_CHANGES=$(echo "$CHANGES" | grep -E '(re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt)')
+INVALID_CHANGES=$(echo "$CHANGES" | grep -E '(re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt|status-im)')
 
 if test -n "$INVALID_CHANGES"; then
-    echo "re-frame dispatch/subscribe is not allowed in quo/quo2 components"
+    echo "re-frame dispatch/subscribe and status-im are not allowed in quo/quo2 components"
     echo ''
     echo "$INVALID_CHANGES"
     exit 1

shadow-cljs.edn

@@ -1,109 +1,121 @@
 ;; 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"]
-                ;; linting
-                [cljfmt/cljfmt "0.6.7"]]
+ :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
+                  [camel-snake-kebab "0.4.3"]
+                  [day8.re-frame/test "0.1.5"]
+                  [com.taoensso/tufte "2.1.0"]]
 
  ;; 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
-           :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
+   ;; When running tests without a REPL you can uncomment below line to `make test-watch` a specific file
+   ;;:ns-regexp        "status-im2.subs.subs-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}}}}
+  ;; 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}}}}

src/i18n/i18n.cljs

@@ -1,22 +1,25 @@
 (ns i18n.i18n
-  (:require
-   ["i18n-js" :as i18n]
-   [clojure.string :as string]
-   [status-im.goog.i18n :as goog.i18n]))
+  (:require ["i18n-js" :as i18n]
+            [clojure.string :as string]
+            [status-im.goog.i18n :as goog.i18n]))
 
-(defn init [default-device-language translations-by-locale]
+(defn setup
+  [default-device-language translations-by-locale]
   (set! (.-fallbacks i18n) true)
   (set! (.-defaultSeparator i18n) "/")
   (set! (.-locale i18n) default-device-language)
   (set! (.-translations i18n) translations-by-locale))
 
-(defn get-translations []
+(defn get-translations
+  []
   (.-translations i18n))
 
-(defn set-language [lang]
+(defn set-language
+  [lang]
   (set! (.-locale i18n) lang))
 
-;;:zh, :zh-hans-xx, :zh-hant-xx have been added until this bug will be fixed https://github.com/fnando/i18n-js/issues/460
+;;:zh, :zh-hans-xx, :zh-hant-xx have been added until this bug will be fixed
+;;https://github.com/fnando/i18n-js/issues/460
 
 (def delimeters
   "This function is a hack: mobile Safari doesn't support toLocaleString(), so we need to pass
@@ -29,7 +32,8 @@
       {:delimiter ""
        :separator (subs n 4 5)})))
 
-(defn label-number [number]
+(defn label-number
+  [number]
   (when number
     (let [{:keys [delimiter separator]} delimeters]
       (.toNumber i18n
@@ -41,7 +45,8 @@
 
 (def default-option-value "<no value>")
 
-(defn label-options [options]
+(defn label-options
+  [options]
   ;; i18n ignores nil value, leading to misleading messages
   (into {} (for [[k v] options] [k (or v default-option-value)])))
 
@@ -55,7 +60,8 @@
 
 (def label (memoize label-fn))
 
-(defn label-pluralize [count path & options]
+(defn label-pluralize
+  [count path & options]
   (if (exists? (.t i18n))
     (.p i18n count (name path) (clj->js options))
     (name path)))

src/js/bottom_sheet.js

@@ -0,0 +1,15 @@
+import {useDerivedValue, runOnJS as reaRunOnJS, runOnJS} from "react-native-reanimated";
+
+export function useTranslateY(initialTranslationY, bottomSheetDy, panY) {
+  return useDerivedValue(() => {
+    return initialTranslationY - (bottomSheetDy.value - panY.value)
+  })
+}
+
+export function useBackgroundOpacity(translateY, backgroundHeight, windowHeight) {
+  return useDerivedValue(() => {
+    const opacity = ((translateY.value - windowHeight) / -backgroundHeight) * 0.5
+
+    return Math.max(Math.min(opacity, 0.5), 0)
+  })
+}

src/js/record_audio_worklets.js

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,186 @@
+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, withTiming, withSequence, withDelay, Easing } from 'react-native-reanimated';
+import { useDerivedValue, interpolate } from 'react-native-reanimated';
 
 // Generic Worklets
 
@@ -30,105 +30,11 @@ export function applyAnimationsToStyle(animations, style) {
   };
 };
 
-// Switcher Worklets
-
-export function stackOpacity (stackId, selectedStackId) {
+export function interpolateValue(sharedValue, inputRange, outputRange) {
   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, 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);
+      return interpolate(sharedValue.value, inputRange, outputRange);
     }
   );
 }

src/mocks/js_dependencies.cljs

@@ -4,24 +4,40 @@
   (:require [status-im.utils.test :as utils.test])
   (:require [status-im.chat.default-chats :refer (default-chats)]))
 
-(def action-button          #js {:default #js {:Item #js {}}})
-(def config                 #js {:default #js {}})
-(def camera                 #js {:RNCamera #js {:Constants #js {}}})
-(def dialogs                #js {})
-(def dismiss-keyboard       #js {})
-(def emoji-picker           #js {:default #js {}})
-(def fs                     #js {})
-(def i18n                   #js {:locale "en"})
-(def image-crop-picker      #js {})
-(def image-resizer          #js {})
-(def qr-code                #js {})
-(def svg                    #js {})
+;; 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 {}}})
+(def dialogs #js {})
+(def dismiss-keyboard #js {})
+(def emoji-picker #js {:default #js {}})
+(def fs #js {})
+(def i18n #js {:locale "en"})
+(def image-crop-picker #js {})
+(def image-resizer #js {})
+(def qr-code #js {})
+(def svg #js {})
 
 (def react-native
-  (clj->js {:NativeModules {:RNGestureHandlerModule {:Direction (fn [])}
-                            :PushNotifications      {}
-                            :Status                 utils.test/status
-                            :ReanimatedModule       {:configureProps (fn [])}}
+  (clj->js {:NativeModules            {:RNGestureHandlerModule {:Direction (fn [])}
+                                       :PushNotifications      {}
+                                       :Status                 utils.test/status
+                                       :ReanimatedModule       {:configureProps (fn [])}}
 
             :View                     {}
             :RefreshControl           {}
@@ -64,9 +80,10 @@
             :Platform                 {:select (fn [])}
             :I18nManager              {:isRTL ""}
             :NativeEventEmitter       (fn [])
-            :LayoutAnimation          {:Presets       #js {:easeInEaseOut nil
-                                                           :linear        nil
-                                                           :spring        nil}
+            :LayoutAnimation          {:Presets       #js
+                                                       {:easeInEaseOut nil
+                                                        :linear        nil
+                                                        :spring        nil}
                                        :Types         #js {}
                                        :Properties    #{}
                                        :create        (fn [])
@@ -77,163 +94,199 @@
 
 (set! js/ReactNative react-native)
 
-(def reanimated-bottom-sheet           #js {:default #js {}})
+(def reanimated-bottom-sheet #js {:default #js {}})
 
-(def icons           #js {:default #js {}})
-(def webview                #js {:WebView #js {}})
-(def status-keycard         #js {:default #js {:nfcIsSupported (fn [] #js {:then identity})
-                                               :nfcIsEnabled (fn [] #js {:then identity})}})
+(def icons #js {:default #js {}})
+(def webview #js {:WebView #js {}})
+(def status-keycard
+  #js
+   {:default #js
+              {:nfcIsSupported (fn [] #js {:then identity})
+               :nfcIsEnabled   (fn [] #js {:then identity})}})
 
-(def snoopy                 #js {:default #js {}})
-(def snoopy-filter          #js {:default #js {}})
-(def snoopy-bars            #js {:default #js {}})
-(def snoopy-buffer          #js {:default #js {}})
-(def fetch                  #js {})
+(def snoopy #js {:default #js {}})
+(def snoopy-filter #js {:default #js {}})
+(def snoopy-bars #js {:default #js {}})
+(def snoopy-buffer #js {:default #js {}})
+(def fetch #js {})
 
 (def async-storage-atom (atom {}))
-(def async-storage #js {:default #js {:setItem #(js/Promise.resolve)
-                                      :multiGet #(js/Promise.resolve)
-                                      :getItem #(js/Promise.resolve)}})
+(def async-storage
+  #js
+   {:default #js
+              {:setItem  #(js/Promise.resolve)
+               :multiGet #(js/Promise.resolve)
+               :getItem  #(js/Promise.resolve)}})
 
-(def background-timer (clj->js {:default {:setTimeout js/setTimeout
-                                          :setInterval js/setInterval
-                                          :clearTimeout js/clearTimeout
-                                          :clearInterval js/clearInterval}}))
+(def background-timer
+  (clj->js {:default {:setTimeout    js/setTimeout
+                      :setInterval   js/setInterval
+                      :clearTimeout  js/clearTimeout
+                      :clearInterval js/clearInterval}}))
 
-(def keychain #js {:setGenericPassword (constantly (.resolve js/Promise true))
-                   :setInternetCredentials #(js/Promise.resolve)
-                   :resetInternetCredentials #(js/Promise.resolve)
-                   "ACCESSIBLE" {}
-                   "ACCESS_CONTROL" {}})
+(def keychain
+  #js
+   {:setGenericPassword       (constantly (.resolve js/Promise true))
+    :setInternetCredentials   #(js/Promise.resolve)
+    :resetInternetCredentials #(js/Promise.resolve)
+    "ACCESSIBLE"              {}
+    "ACCESS_CONTROL"          {}})
 
 (def react-native-mail #js {:mail #js {}})
-(def react-native-screens  #js {})
-(def react-native-shake  #js {})
+(def react-native-screens #js {})
+(def react-native-shake #js {})
 (def react-native-share #js {:default {}})
-(def react-native-svg #js {:SvgUri #js {:render identity}
-                           :SvgXml #js {:render identity}})
+(def react-native-svg
+  #js
+   {:SvgUri  #js {:render identity}
+    :SvgXml  #js {:render identity}
+    :default #js {:render identity}
+    :Path    #js {:render identity}})
 (def react-native-webview #js {:default {}})
 (def react-native-audio-toolkit #js {:MediaStates {}})
-(def net-info  #js {})
-(def touchid  #js {})
+(def net-info #js {})
+(def touchid #js {})
 (def react-native-image-viewing #js {:default {}})
-(def safe-area-context (clj->js {:SafeAreaProvider {:_reactNativeIphoneXHelper {:getStatusBarHeight (fn [])}}
-                                 :SafeAreaInsetsContext {:Consumer (fn [])}
-                                 :SafeAreaView {}}))
+(def safe-area-context
+  (clj->js {:SafeAreaProvider      {:_reactNativeIphoneXHelper {:getStatusBarHeight (fn [])}}
+            :SafeAreaInsetsContext {:Consumer (fn [])}
+            :SafeAreaView          {}}))
 
-(def back-handler #js {:addEventListener identity
-                       :removeEventListener identity})
-(def react #js {:useCallback nil
-                :useEffect nil
-                :useRef nil
-                :createRef nil
-                :Fragment identity})
-(def react-navigation-native #js {:NavigationContainer #js {}
-                                  :useFocusEffect      identity
-                                  :CommonActions       #js {}
-                                  :StackActions        #js {}})
+(def back-handler
+  #js
+   {:addEventListener    identity
+    :removeEventListener identity})
+(def react
+  #js
+   {:useCallback nil
+    :useEffect   nil
+    :useRef      nil
+    :createRef   nil
+    :Fragment    identity})
+(def react-navigation-native
+  #js
+   {:NavigationContainer #js {}
+    :useFocusEffect      identity
+    :CommonActions       #js {}
+    :StackActions        #js {}})
 
-(def react-native-navigation #js {:Navigation #js {:constants (fn [] #js {:then identity})
-                                                   :setDefaultOptions identity
-                                                   :setRoot identity
-                                                   :dismissOverlay #(js/Promise.resolve)
-                                                   :showOverlay identity
-                                                   :setLazyComponentRegistrator identity
-                                                   :pop identity
-                                                   :push identity
-                                                   :mergeOptions identity
-                                                   :popToRoot identity
-                                                   :showModal identity
-                                                   :dismissModal identity
-                                                   :registerComponent identity
-                                                   :events
-                                                   (fn []
-                                                     #js {:registerModalDismissedListener identity
-                                                          :registerAppLaunchedListener identity
-                                                          :registerBottomTabSelectedListener identity
-                                                          :registerComponentDidDisappearListener identity
-                                                          :registerComponentDidAppearListener identity
-                                                          :registerNavigationButtonPressedListener identity})}})
+(def react-native-navigation
+  #js
+   {:Navigation #js
+                 {:constants                   (fn [] #js {:then identity})
+                  :setDefaultOptions           identity
+                  :setRoot                     identity
+                  :dismissOverlay              #(js/Promise.resolve)
+                  :showOverlay                 identity
+                  :setLazyComponentRegistrator identity
+                  :pop                         identity
+                  :push                        identity
+                  :mergeOptions                identity
+                  :popToRoot                   identity
+                  :showModal                   identity
+                  :dismissModal                identity
+                  :registerComponent           identity
+                  :events
+                  (fn []
+                    #js
+                     {:registerModalDismissedListener          identity
+                      :registerAppLaunchedListener             identity
+                      :registerBottomTabSelectedListener       identity
+                      :registerComponentDidDisappearListener   identity
+                      :registerComponentDidAppearListener      identity
+                      :registerNavigationButtonPressedListener identity})}})
 
-(def react-navigation-stack #js {:createStackNavigator identity
-                                 :TransitionPresets    #js {:ModalPresentationIOS #js {}}})
+(def react-navigation-stack
+  #js
+   {:createStackNavigator identity
+    :TransitionPresets    #js {:ModalPresentationIOS #js {}}})
 (def react-navigation-bottom-tabs #js {:createBottomTabNavigator identity})
 
 (def react-native-haptic-feedback #js {:default #js {:trigger nil}})
 
-(def react-native-reanimated #js {:default                #js {:createAnimatedComponent identity
-                                                               :eq                      nil
-                                                               :greaterOrEq             nil
-                                                               :greaterThan             nil
-                                                               :lessThan                nil
-                                                               :lessOrEq                nil
-                                                               :add                     nil
-                                                               :diff                    nil
-                                                               :divide                  nil
-                                                               :sub                     nil
-                                                               :multiply                nil
-                                                               :abs                     nil
-                                                               :min                     nil
-                                                               :max                     nil
-                                                               :neq                     nil
-                                                               :and                     nil
-                                                               :or                      nil
-                                                               :not                     nil
-                                                               :set                     nil
-                                                               :startClock              nil
-                                                               :stopClock               nil
-                                                               :Value                   nil
-                                                               :Clock                   nil
-                                                               :debug                   nil
-                                                               :log                     nil
-                                                               :event                   nil
-                                                               :cond                    nil
-                                                               :block                   nil
-                                                               :interpolateNode         nil
-                                                               :call                    nil
-                                                               :timing                  nil
-                                                               :onChange                nil
-                                                               :View                    #js {}
-                                                               :Image                   #js {}
-                                                               :ScrollView              #js {}
-                                                               :Text                    #js {}
-                                                               :Extrapolate             #js {:CLAMP nil}
-                                                               :Code                    #js {}}
-                                  :EasingNode             #js {:bezier identity
-                                                               :linear identity}
-                                  :clockRunning nil
-                                  :useSharedValue         (fn [])
-                                  :useAnimatedStyle       (fn [])
-                                  :withTiming             (fn [])
-                                  :withDelay              (fn [])
-                                  :Easing                 #js {:bezier identity}
-                                  :Keyframe               (fn [])})
-(def react-native-gesture-handler #js {:default                  #js {}
-                                       :State                    #js {:BEGAN        nil
-                                                                      :ACTIVE       nil
-                                                                      :CANCELLED    nil
-                                                                      :END          nil
-                                                                      :FAILED       nil
-                                                                      :UNDETERMINED nil}
-                                       :PureNativeButton         #js {}
-                                       :TapGestureHandler        #js {}
-                                       :PanGestureHandler        #js {}
-                                       :TouchableHighlight       #js {}
-                                       :LongPressGestureHandler  #js {}
-                                       :TouchableWithoutFeedback #js {}
-                                       :NativeViewGestureHandler #js {}
-                                       :FlatList                 #js {}
-                                       :ScrollView               #js {}
-                                       :TouchableOpacity         #js {}
-                                       :GestureDetector          #js {}
-                                       :Gesture                  #js {:Pan nil}
-                                       :createNativeWrapper      identity})
+(def react-native-reanimated
+  #js
+   {:default          #js
+                       {:createAnimatedComponent identity
+                        :eq                      nil
+                        :greaterOrEq             nil
+                        :greaterThan             nil
+                        :lessThan                nil
+                        :lessOrEq                nil
+                        :add                     nil
+                        :diff                    nil
+                        :divide                  nil
+                        :sub                     nil
+                        :multiply                nil
+                        :abs                     nil
+                        :min                     nil
+                        :max                     nil
+                        :neq                     nil
+                        :and                     nil
+                        :or                      nil
+                        :not                     nil
+                        :set                     nil
+                        :startClock              nil
+                        :stopClock               nil
+                        :Value                   nil
+                        :Clock                   nil
+                        :debug                   nil
+                        :log                     nil
+                        :event                   nil
+                        :cond                    nil
+                        :block                   nil
+                        :interpolateNode         nil
+                        :call                    nil
+                        :timing                  nil
+                        :onChange                nil
+                        :View                    #js {}
+                        :Image                   #js {}
+                        :ScrollView              #js {}
+                        :Text                    #js {}
+                        :Extrapolate             #js {:CLAMP nil}
+                        :Code                    #js {}}
+    :EasingNode       #js
+                       {:bezier identity
+                        :linear identity}
+    :clockRunning     nil
+    :useSharedValue   (fn [])
+    :useAnimatedStyle (fn [])
+    :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__})
+(def react-native-gesture-handler
+  #js
+   {:default                  #js {}
+    :State                    #js
+                               {:BEGAN        nil
+                                :ACTIVE       nil
+                                :CANCELLED    nil
+                                :END          nil
+                                :FAILED       nil
+                                :UNDETERMINED nil}
+    :PureNativeButton         #js {}
+    :TapGestureHandler        #js {}
+    :PanGestureHandler        #js {}
+    :TouchableHighlight       #js {}
+    :LongPressGestureHandler  #js {}
+    :TouchableWithoutFeedback #js {}
+    :NativeViewGestureHandler #js {}
+    :FlatList                 #js {}
+    :ScrollView               #js {}
+    :TouchableOpacity         #js {}
+    :GestureDetector          #js {}
+    :Gesture                  #js {:Pan nil}
+    :createNativeWrapper      identity})
 
 (def react-native-redash #js {:clamp nil})
 
 (def react-native-languages
-  (clj->js {:default {:language "en",
-                      :addEventListener (fn []),
+  (clj->js {:default {:language            "en"
+                      :addEventListener    (fn [])
                       :removeEventListener (fn [])}}))
 
 (def react-native-device-info
@@ -243,8 +296,9 @@
   #js {:CameraKitCamera #js {}})
 
 (def react-native-push-notification
-  #js {:localNotification identity
-       :requestPermission identity})
+  #js
+   {:localNotification identity
+    :requestPermission identity})
 
 (def react-native-gradien #js {:default #js {}})
 
@@ -272,79 +326,92 @@
 (def react-native-camera-roll
   (clj->js {:default #js {}}))
 
-(def wallet-connect-client #js {:default       #js {}
-                                :CLIENT_EVENTS #js {:session #js {:request nil
-                                                                  :created nil
-                                                                  :deleted nil
-                                                                  :proposal nil
-                                                                  :updated nil}}})
+(def wallet-connect-client
+  #js
+   {:default       #js {}
+    :CLIENT_EVENTS #js
+                    {:session #js
+                               {:request  nil
+                                :created  nil
+                                :deleted  nil
+                                :proposal nil
+                                :updated  nil}}})
 
 (def worklet-factory
   #js {:applyAnimationsToStyle (fn [])})
 
+(def shell-worklets #js {})
+
+(def bottom-sheet #js {})
+(def record-audio-worklets #js {})
+
 ;; Update i18n_resources.cljs
-(defn mock [module]
+(defn mock
+  [module]
   (case module
-    "react-native-languages" react-native-languages
-    "react-native-background-timer" background-timer
-    "react-native-image-crop-picker" image-crop-picker
-    "react-native-gesture-handler" react-native-gesture-handler
-    "react-native-safe-area-context" safe-area-context
-    "react-native-config" config
-    "react-native-iphone-x-helper" (clj->js {:getStatusBarHeight (fn [])
-                                             :getBottomSpace (fn [])})
-    "react-native-screens" (clj->js {})
-    "react-native-reanimated" react-native-reanimated
-    "react-native-redash/lib/module/v1" react-native-redash
-    "react-native-fetch-polyfill" fetch
-    "react-native-status-keycard" status-keycard
-    "react-native-keychain" keychain
-    "react-native-touch-id" touchid
-    "@react-native-community/netinfo" net-info
-    "react-native-dialogs" dialogs
-    "react-native" react-native
-    "react-native-fs" fs
-    "react-native-mail" react-native-mail
-    "react-native-image-resizer" image-resizer
-    "react-native-haptic-feedback" react-native-haptic-feedback
-    "react-native-device-info" react-native-device-info
-    "react-native-push-notification" react-native-push-notification
-    "react-native-linear-gradient" react-native-gradien
-    "@react-native-community/masked-view" masked-view
-    "react-native-blob-util" react-native-blob-util
-    "react-native-navigation" react-native-navigation
+    "react-native-languages"                        react-native-languages
+    "react-native-background-timer"                 background-timer
+    "react-native-image-crop-picker"                image-crop-picker
+    "react-native-gesture-handler"                  react-native-gesture-handler
+    "react-native-safe-area-context"                safe-area-context
+    "react-native-config"                           config
+    "react-native-iphone-x-helper"                  (clj->js {:getStatusBarHeight (fn [])
+                                                              :getBottomSpace     (fn [])})
+    "react-native-screens"                          (clj->js {})
+    "react-native-reanimated"                       react-native-reanimated
+    "react-native-redash/lib/module/v1"             react-native-redash
+    "react-native-fetch-polyfill"                   fetch
+    "react-native-status-keycard"                   status-keycard
+    "react-native-keychain"                         keychain
+    "react-native-touch-id"                         touchid
+    "@react-native-community/netinfo"               net-info
+    "react-native-dialogs"                          dialogs
+    "react-native"                                  react-native
+    "react-native-fs"                               fs
+    "react-native-mail"                             react-native-mail
+    "react-native-image-resizer"                    image-resizer
+    "react-native-haptic-feedback"                  react-native-haptic-feedback
+    "react-native-device-info"                      react-native-device-info
+    "react-native-push-notification"                react-native-push-notification
+    "react-native-linear-gradient"                  react-native-gradien
+    "@react-native-community/masked-view"           masked-view
+    "react-native-blob-util"                        react-native-blob-util
+    "react-native-navigation"                       react-native-navigation
     "@react-native-community/push-notification-ios" push-notification-ios
-    "@react-native-community/blur" react-native-blur
-    "@react-native-community/cameraroll" react-native-camera-roll
-    "react-native-camera-kit" react-native-camera-kit
-    "react-native-permissions" react-native-permissions
-    "rn-emoji-keyboard" rn-emoji-keyboard
-    "react-native-hole-view" react-native-hole-view
-    "react-native-draggable-flatlist" react-native-draggable-flatlist
-    "react-native-webview" react-native-webview
-    "@react-native-community/audio-toolkit" react-native-audio-toolkit
-    "react-native-image-viewing" react-native-image-viewing
-    "react-native-share" react-native-share
-    "@react-native-async-storage/async-storage" async-storage
-    "react-native-svg" react-native-svg
-    "../src/js/worklet_factory.js" worklet-factory
-    "./fleets.js" default-fleets
-    "./chats.js" default-chats
-    "@walletconnect/client" wallet-connect-client
-    "../translations/ar.json" (js/JSON.parse (slurp "./translations/ar.json"))
-    "../translations/de.json" (js/JSON.parse (slurp "./translations/de.json"))
-    "../translations/en.json" (js/JSON.parse (slurp "./translations/en.json"))
-    "../translations/es.json" (js/JSON.parse (slurp "./translations/es.json"))
-    "../translations/es_419.json" (js/JSON.parse (slurp "./translations/es_419.json"))
-    "../translations/fil.json" (js/JSON.parse (slurp "./translations/fil.json"))
-    "../translations/fr.json" (js/JSON.parse (slurp "./translations/fr.json"))
-    "../translations/id.json" (js/JSON.parse (slurp "./translations/id.json"))
-    "../translations/it.json" (js/JSON.parse (slurp "./translations/it.json"))
-    "../translations/ko.json" (js/JSON.parse (slurp "./translations/ko.json"))
-    "../translations/pt_BR.json" (js/JSON.parse (slurp "./translations/pt_BR.json"))
-    "../translations/ru.json" (js/JSON.parse (slurp "./translations/ru.json"))
-    "../translations/tr.json" (js/JSON.parse (slurp "./translations/tr.json"))
-    "../translations/zh.json" (js/JSON.parse (slurp "./translations/zh.json"))
-    "../translations/zh_hant.json" (js/JSON.parse (slurp "./translations/zh_hant.json"))
-    "../translations/zh_TW.json" (js/JSON.parse (slurp "./translations/zh_TW.json"))
+    "@react-native-community/blur"                  react-native-blur
+    "@react-native-community/cameraroll"            react-native-camera-roll
+    "react-native-camera-kit"                       react-native-camera-kit
+    "react-native-permissions"                      react-native-permissions
+    "rn-emoji-keyboard"                             rn-emoji-keyboard
+    "react-native-hole-view"                        react-native-hole-view
+    "react-native-draggable-flatlist"               react-native-draggable-flatlist
+    "react-native-webview"                          react-native-webview
+    "@react-native-community/audio-toolkit"         react-native-audio-toolkit
+    "react-native-image-viewing"                    react-native-image-viewing
+    "react-native-share"                            react-native-share
+    "@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/bottom_sheet.js"                     bottom-sheet
+    "../src/js/record_audio_worklets.js"            record-audio-worklets
+    "./fleets.js"                                   default-fleets
+    "./chats.js"                                    default-chats
+    "@walletconnect/client"                         wallet-connect-client
+    "../translations/ar.json"                       (js/JSON.parse (slurp "./translations/ar.json"))
+    "../translations/de.json"                       (js/JSON.parse (slurp "./translations/de.json"))
+    "../translations/en.json"                       (js/JSON.parse (slurp "./translations/en.json"))
+    "../translations/es.json"                       (js/JSON.parse (slurp "./translations/es.json"))
+    "../translations/es_419.json"                   (js/JSON.parse (slurp "./translations/es_419.json"))
+    "../translations/fil.json"                      (js/JSON.parse (slurp "./translations/fil.json"))
+    "../translations/fr.json"                       (js/JSON.parse (slurp "./translations/fr.json"))
+    "../translations/id.json"                       (js/JSON.parse (slurp "./translations/id.json"))
+    "../translations/it.json"                       (js/JSON.parse (slurp "./translations/it.json"))
+    "../translations/ko.json"                       (js/JSON.parse (slurp "./translations/ko.json"))
+    "../translations/pt_BR.json"                    (js/JSON.parse (slurp "./translations/pt_BR.json"))
+    "../translations/ru.json"                       (js/JSON.parse (slurp "./translations/ru.json"))
+    "../translations/tr.json"                       (js/JSON.parse (slurp "./translations/tr.json"))
+    "../translations/zh.json"                       (js/JSON.parse (slurp "./translations/zh.json"))
+    "../translations/zh_hant.json"                  (js/JSON.parse (slurp "./translations/zh_hant.json"))
+    "../translations/zh_TW.json"                    (js/JSON.parse (slurp "./translations/zh_TW.json"))
     nil))

src/quo/animated.cljs

@@ -1,12 +1,12 @@
 (ns quo.animated
   (:refer-clojure :exclude [abs set delay divide])
-  (:require [reagent.core :as reagent]
-            [quo.react-native :as rn]
-            [quo.gesture-handler :as gh]
-            [oops.core :refer [oget ocall]]
-            ["react-native-reanimated" :default animated :refer (clockRunning EasingNode)]
+  (:require ["react-native-reanimated" :default animated :refer (clockRunning EasingNode)]
             ["react-native-redash/lib/module/v1" :as redash]
-            quo.react)
+            [oops.core :refer [ocall oget]]
+            [quo.gesture-handler :as gh]
+            quo.react
+            [quo.react-native :as rn]
+            [reagent.core :as reagent])
   (:require-macros [quo.react :refer [maybe-js-deps]]))
 
 (def create-animated-component (comp reagent/adapt-react-class (.-createAnimatedComponent animated)))
@@ -15,9 +15,10 @@
 (def text (reagent/adapt-react-class (.-Text animated)))
 (def scroll-view (reagent/adapt-react-class (.-ScrollView animated)))
 (def code (reagent/adapt-react-class (.-Code animated)))
-(def animated-flat-list  (create-animated-component gh/flat-list-raw))
+(def animated-flat-list (create-animated-component gh/flat-list-raw))
 
-(defn flat-list [props]
+(defn flat-list
+  [props]
   [animated-flat-list (rn/base-list-props props)])
 
 (def useCode (.-useCode animated))
@@ -58,37 +59,42 @@
 (def bezier (.-bezier ^js EasingNode))
 (def linear (.-linear ^js EasingNode))
 
-(def easings {:linear      linear
-              :ease-in     (bezier 0.42 0 1 1)
-              :ease-out    (bezier 0 0 0.58 1)
-              :ease-in-out (bezier 0.42 0 0.58 1)
-              :cubic       (bezier 0.55 0.055 0.675 0.19)
-              :keyboard    (bezier 0.17 0.59 0.4 0.77)})
+(def easings
+  {:linear      linear
+   :ease-in     (bezier 0.42 0 1 1)
+   :ease-out    (bezier 0 0 0.58 1)
+   :ease-in-out (bezier 0.42 0 0.58 1)
+   :cubic       (bezier 0.55 0.055 0.675 0.19)
+   :keyboard    (bezier 0.17 0.59 0.4 0.77)})
 
-(def springs {:lazy {:damping           50
-                     :mass              0.3
-                     :stiffness         120
-                     :overshootClamping true
-                     :bouncyFactor      1}
-              :jump {:damping                   13
-                     :mass                      0.5
-                     :stiffness                 170
-                     :overshootClamping         false
-                     :bouncyFactor              1
-                     :restSpeedThreshold        0.001
-                     :restDisplacementThreshold 0.001}})
+(def springs
+  {:lazy {:damping           50
+          :mass              0.3
+          :stiffness         120
+          :overshootClamping true
+          :bouncyFactor      1}
+   :jump {:damping                   13
+          :mass                      0.5
+          :stiffness                 170
+          :overshootClamping         false
+          :bouncyFactor              1
+          :restSpeedThreshold        0.001
+          :restDisplacementThreshold 0.001}})
 
-(defn set-value [anim val]
+(defn set-value
+  [anim val]
   (ocall anim "setValue" val))
 
 (def Value (oget animated "Value"))
 
-(defn value [x]
+(defn value
+  [x]
   (new Value x))
 
 (def Clock (oget animated "Clock"))
 
-(defn clock []
+(defn clock
+  []
   (new Clock))
 
 (def debug (oget animated "debug"))
@@ -100,8 +106,10 @@
   ([config options]
    (ocall animated "event" (clj->js config) (clj->js options))))
 
-(defn on-change [state node]
-  (ocall animated "onChange"
+(defn on-change
+  [state node]
+  (ocall animated
+         "onChange"
          state
          (if (vector? node)
            (clj->js node)
@@ -124,24 +132,31 @@
             (clj->js else-node)
             else-node))))
 
-(defn block [opts]
+(defn block
+  [opts]
   (.block ^js animated (to-array opts)))
 
-(defn interpolate [anim-value config]
+(defn interpolate
+  [anim-value config]
   (.interpolateNode ^js animated anim-value (clj->js config)))
 
-(defn call* [args callback]
+(defn call*
+  [args callback]
   (.call ^js animated (to-array args) callback))
 
-(defn timing [clock-value opts config]
+(defn timing
+  [clock-value opts config]
   (.timing ^js animated
            clock-value
            (clj->js opts)
            (clj->js config)))
 
-(defn spring [clock-value opts config]
-  (.spring ^js animated clock-value
-           (clj->js opts) (clj->js config)))
+(defn spring
+  [clock-value opts config]
+  (.spring ^js animated
+           clock-value
+           (clj->js opts)
+           (clj->js config)))
 
 (def extrapolate {:clamp (oget animated "Extrapolate" "CLAMP")})
 
@@ -150,37 +165,48 @@
 (def clamp (oget redash "clamp"))
 (def diff-clamp (.-diffClamp ^js redash))
 
-(defn with-spring [config]
+(defn with-spring
+  [config]
   (ocall redash "withSpring" (clj->js config)))
 
-(defn with-decay [config]
+(defn with-decay
+  [config]
   (.withDecay ^js redash (clj->js config)))
 
-(defn with-offset [config]
+(defn with-offset
+  [config]
   (.withOffset ^js redash (clj->js config)))
 
-(defn with-spring-transition [val config]
+(defn with-spring-transition
+  [val config]
   (.withSpringTransition ^js redash val (clj->js config)))
 
-(defn with-timing-transition [val config]
+(defn with-timing-transition
+  [val config]
   (.withTimingTransition ^js redash val (clj->js config)))
 
-(defn use-spring-transition [val config]
+(defn use-spring-transition
+  [val config]
   (.useSpringTransition ^js redash val (clj->js config)))
 
-(defn use-timing-transition [val config]
+(defn use-timing-transition
+  [val config]
   (.useTimingTransition ^js redash val (clj->js config)))
 
-(defn re-timing [config]
+(defn re-timing
+  [config]
   (.timing ^js redash (clj->js config)))
 
-(defn re-spring [config]
+(defn re-spring
+  [config]
   (.spring ^js redash (clj->js config)))
 
-(defn on-scroll [opts]
+(defn on-scroll
+  [opts]
   (ocall redash "onScrollEvent" (clj->js opts)))
 
-(defn on-gesture [opts]
+(defn on-gesture
+  [opts]
   (let [gesture-event (event #js [#js {:nativeEvent (clj->js opts)}])]
     {:onHandlerStateChange gesture-event
      :onGestureEvent       gesture-event}))
@@ -191,19 +217,22 @@
 
 (def delay (.-delay ^js redash))
 
-(defn loop* [opts]
+(defn loop*
+  [opts]
   (ocall redash "loop" (clj->js opts)))
 
 (def use-value (.-useValue ^js redash))
 
 (def use-clock (.-useClock ^js redash))
 
-(defn use-gesture [opts]
+(defn use-gesture
+  [opts]
   (let [gesture (.useGestureHandler ^js redash (clj->js opts))]
     {:onHandlerStateChange (.-onHandlerStateChange ^js gesture)
      :onGestureEvent       (.-onGestureEvent ^js gesture)}))
 
-(defn snap-point [value velocity snap-points]
+(defn snap-point
+  [value velocity snap-points]
   (.snapPoint ^js redash value velocity (to-array snap-points)))
 
 (defn cancelable-loop
@@ -256,12 +285,13 @@
               (set position (add offset val))])
       (cond* (and* (eq state (:end gh/states))
                    (not* animation-over))
-             [(set position (re-timing
-                             {:clock    c
-                              :easing   easing
-                              :duration duration
-                              :from     position
-                              :to       to}))
+             [(set position
+                   (re-timing
+                    {:clock    c
+                     :easing   easing
+                     :duration duration
+                     :from     position
+                     :to       to}))
               (cond* (not* (clock-running c))
                      finish-animation)])
       position])))

src/quo/components/animated/pressable.cljs

@@ -1,9 +1,9 @@
 (ns quo.components.animated.pressable
-  (:require [quo.animated :as animated]
+  (:require [cljs-bean.core :as bean]
+            [quo.animated :as animated]
+            [quo.gesture-handler :as gesture-handler]
             [quo.react :as react]
-            [reagent.core :as reagent]
-            [cljs-bean.core :as bean]
-            [quo.gesture-handler :as gesture-handler]))
+            [reagent.core :as reagent]))
 
 (def long-press-duration 500)
 (def scale-down-small 0.95)
@@ -54,7 +54,8 @@
    :right    0
    :position :absolute})
 
-(defn pressable-hooks [props]
+(defn pressable-hooks
+  [props]
   (let [{background-color    :bgColor
          border-radius       :borderRadius
          border-color        :borderColor
@@ -69,23 +70,24 @@
          :or                 {border-radius 0
                               type          "primary"}}
         (bean/bean props)
-        long-press-ref       (react/create-ref)
-        state                (animated/use-value (:undetermined gesture-handler/states))
-        active               (animated/eq state (:began gesture-handler/states))
-        gesture-handler      (animated/use-gesture {:state state})
-        animation            (react/use-memo
-                              (fn []
-                                (animated/with-timing-transition active
-                                  {:duration (animated/cond* active time-in time-out)
-                                   :easing   (:ease-in animated/easings)}))
-                              [])
+        long-press-ref (react/create-ref)
+        state (animated/use-value (:undetermined gesture-handler/states))
+        active (animated/eq state (:began gesture-handler/states))
+        gesture-handler (animated/use-gesture {:state state})
+        animation (react/use-memo
+                   (fn []
+                     (animated/with-timing-transition active
+                                                      {:duration (animated/cond* active time-in time-out)
+                                                       :easing   (:ease-in animated/easings)}))
+                   [])
         {:keys [background
-                foreground]} (react/use-memo
-                              (fn []
-                                (type->animation {:type      (keyword type)
-                                                  :animation animation}))
-                              [type])
-        handle-press         (fn [] (when on-press (on-press)))
+                foreground]}
+        (react/use-memo
+         (fn []
+           (type->animation {:type      (keyword type)
+                             :animation animation}))
+         [type])
+        handle-press (fn [] (when on-press (on-press)))
         long-gesture-handler (react/callback
                               (fn [^js evt]
                                 (let [gesture-state (-> evt .-nativeEvent .-state)]
@@ -111,8 +113,9 @@
        :min-duration-ms         long-press-duration
        :max-dist                22
        :ref                     long-press-ref}
-      [animated/view {:accessible          true
-                      :accessibility-label accessibility-label}
+      [animated/view
+       {:accessible          true
+        :accessibility-label accessibility-label}
        [gesture-handler/tap-gesture-handler
         (merge gesture-handler
                {:shouldCancelWhenOutside true
@@ -120,12 +123,13 @@
                 :enabled                 (boolean (and (or on-press on-long-press on-press-start)
                                                        (not disabled)))})
         [animated/view
-         [animated/view {:style (merge absolute-fill
-                                       background
-                                       {:background-color background-color
-                                        :border-radius    border-radius
-                                        :border-color     border-color
-                                        :border-width     border-width})}]
+         [animated/view
+          {:style (merge absolute-fill
+                         background
+                         {:background-color background-color
+                          :border-radius    border-radius
+                          :border-color     border-color
+                          :border-width     border-width})}]
          (into [animated/view {:style foreground}]
                (react/get-children children))]]]])))
 

src/quo/components/animated_header.cljs

@@ -7,7 +7,8 @@
             [quo.platform :as platform]
             [reagent.core :as reagent]))
 
-(defn header-wrapper-style [{:keys [value offset]}]
+(defn header-wrapper-style
+  [{:keys [value offset]}]
   (merge
    {:background-color (:ui-background @colors/theme)}
    (when (and offset platform/android?)
@@ -27,66 +28,78 @@
       :shadow-color   (:shadow-01 @colors/theme)
       :shadow-offset  {:width 0 :height 4}})))
 
-(defn title-style [layout]
-  {:flex          1
+(defn title-style
+  [layout]
+  {:flex            1
    :justify-content :center
-   :padding-right (get-in layout [:right :width])})
+   :padding-right   (get-in layout [:right :width])})
 
-(defn header-container []
+(defn header-container
+  []
   (let [y               (animated/value 0)
         animation-value (animated/value 0)
         animation       (animated/with-timing-transition
-                          animation-value
-                          {:duration 250
-                           :easing   (:ease-in animated/easings)})
+                         animation-value
+                         {:duration 250
+                          :easing   (:ease-in animated/easings)})
         on-scroll       (animated/on-scroll {:y y})
         layout          (reagent/atom {})
         offset          (reagent/atom 0)
         on-layout       (fn [evt]
                           (reset! offset (oget evt "nativeEvent" "layout" "height")))]
     (fn [{:keys [extended-header refresh-control refreshing-sub refreshing-counter] :as props} children]
-      [animated/view {:flex           1
-                      :pointer-events :box-none}
-       [animated/code {:key  (str @offset)
-                       :exec (animated/cond*
-                              (animated/and* (animated/greater-or-eq y @offset)
-                                             (animated/greater-or-eq y 1))
-                              (animated/set animation-value 1)
-                              (animated/set animation-value 0))}]
-       [animated/view {:pointer-events :box-none
-                       :style          (header-wrapper-style {:value  y
-                                                              :offset @offset})}
-        [header/header (merge
-                        {:get-layout      (fn [el l] (swap! layout assoc el l))
-                         :border-bottom   false
-                         :title-component [animated/view {:style (title-style @layout)}
-                                           [extended-header {:value     y
-                                                             :animation animation
-                                                             :minimized true
-                                                             :offset    @offset}]]
-                         :title-align     :left}
-                        (dissoc props :extended-header))]]
-       (into [animated/scroll-view {:on-scroll           on-scroll
-                                    :refreshControl      (when refresh-control
-                                                           (refresh-control
-                                                            (and @refreshing-sub
-                                                                 @refreshing-counter)))
-                                    :style               {:z-index 1}
-                                    :scrollEventThrottle 16}
+      [animated/view
+       {:flex           1
+        :pointer-events :box-none}
+       [animated/code
+        {:key  (str @offset)
+         :exec (animated/cond*
+                (animated/and* (animated/greater-or-eq y @offset)
+                               (animated/greater-or-eq y 1))
+                (animated/set animation-value 1)
+                (animated/set animation-value 0))}]
+       [animated/view
+        {:pointer-events :box-none
+         :style          (header-wrapper-style {:value  y
+                                                :offset @offset})}
+        [header/header
+         (merge
+          {:get-layout      (fn [el l] (swap! layout assoc el l))
+           :border-bottom   false
+           :title-component [animated/view {:style (title-style @layout)}
+                             [extended-header
+                              {:value     y
+                               :animation animation
+                               :minimized true
+                               :offset    @offset}]]
+           :title-align     :left}
+          (dissoc props :extended-header))]]
+       (into [animated/scroll-view
+              {:on-scroll           on-scroll
+               :refreshControl      (when refresh-control
+                                      (refresh-control
+                                       (and @refreshing-sub
+                                            @refreshing-counter)))
+               :style               {:z-index 1}
+               :scrollEventThrottle 16}
               [animated/view {:pointer-events :box-none}
-               [animated/view {:pointer-events :box-none
-                               :on-layout      on-layout}
-                [extended-header {:value     y
-                                  :animation animation
-                                  :offset    @offset}]]]]
+               [animated/view
+                {:pointer-events :box-none
+                 :on-layout      on-layout}
+                [extended-header
+                 {:value     y
+                  :animation animation
+                  :offset    @offset}]]]]
              children)])))
 
-(defn header [{:keys [use-insets] :as props} & children]
+(defn header
+  [{:keys [use-insets] :as props} & children]
   (if use-insets
     [safe-area/consumer
      (fn [insets]
-       [header-container (-> props
-                             (dissoc :use-insets)
-                             (assoc :insets insets))
+       [header-container
+        (-> props
+            (dissoc :use-insets)
+            (assoc :insets insets))
         children])]
     [header-container props children]))

src/quo/components/bottom_sheet/style.cljs

@@ -15,13 +15,14 @@
    :flex            1
    :justify-content :flex-end})
 
-(defn backdrop []
-  {:flex             1
-   :position         :absolute
-   :left             0
-   :top              0
-   :right            0
-   :bottom           0})
+(defn backdrop
+  []
+  {:flex     1
+   :position :absolute
+   :left     0
+   :top      0
+   :right    0
+   :bottom   0})
 
 (defn content-container
   [window-height]

src/quo/components/bottom_sheet/view.cljs

@@ -1,25 +1,27 @@
 (ns quo.components.bottom-sheet.view
-  (:require [reagent.core :as reagent]
+  (:require [cljs-bean.core :as bean]
             [quo.animated :as animated]
-            [quo.react-native :as rn]
-            [quo.react :as react]
-            [quo.platform :as platform]
-            [cljs-bean.core :as bean]
-            [quo.components.safe-area :as safe-area]
             [quo.components.bottom-sheet.style :as styles]
+            [quo.components.safe-area :as safe-area]
+            [quo.design-system.colors :as colors]
             [quo.gesture-handler :as gesture-handler]
-            [quo.design-system.colors :as colors]))
+            [quo.platform :as platform]
+            [quo.react :as react]
+            [quo.react-native :as rn]
+            [reagent.core :as reagent]))
 
 (def opacity-coeff 0.8)
 (def close-duration 150)
-(def spring-config {:damping                   15
-                    :mass                      0.7
-                    :stiffness                 150
-                    :overshootClamping         false
-                    :restSpeedThreshold        0.1
-                    :restDisplacementThreshold 0.1})
+(def spring-config
+  {:damping                   15
+   :mass                      0.7
+   :stiffness                 150
+   :overshootClamping         false
+   :restSpeedThreshold        0.1
+   :restDisplacementThreshold 0.1})
 
-(defn bottom-sheet-hooks [props]
+(defn bottom-sheet-hooks
+  [props]
   (let [{on-cancel          :onCancel
          disable-drag?      :disableDrag?
          show-handle?       :showHandle?
@@ -31,77 +33,83 @@
                              backdrop-dismiss?  true
                              back-button-cancel true}}
         (bean/bean props)
-        body-ref   (react/create-ref)
+        body-ref (react/create-ref)
         master-ref (react/create-ref)
 
-        height                    (react/state 0)
-        {window-height :height}   (rn/use-window-dimensions)
+        height (react/state 0)
+        {window-height :height} (rn/use-window-dimensions)
         {:keys [keyboard-shown
-                keyboard-height]} (rn/use-keyboard)
-        keyboard-height-android-delta (if (and platform/android? keyboard-shown) (+ keyboard-height 20) 0)
-        safe-area                 (safe-area/use-safe-area)
-        window-height             (- window-height (if platform/android?
-                                                     (+ 50 keyboard-height-android-delta) ;; TODO : remove 50 when react-native-navigation v8 will be implemented https://github.com/wix/react-native-navigation/issues/7225
-                                                     0))
-        min-height                (+ (* styles/vertical-padding 2) (:bottom safe-area))
-        max-height                (- window-height (:top safe-area))
-        visible                   (react/state false)
+                keyboard-height]}
+        (rn/use-keyboard)
+        keyboard-height-android-delta
+        (if (and platform/android? keyboard-shown) (+ keyboard-height 20) 0)
+        safe-area (safe-area/use-safe-area)
+        window-height (- window-height
+                         (if platform/android?
+                           (+ 50 keyboard-height-android-delta) ;; TODO : remove 50 when
+                                                                ;; react-native-navigation v8 will be
+                                                                ;; implemented
+                                                                ;; https://github.com/wix/react-native-navigation/issues/7225
+                           0))
+        min-height (+ (* styles/vertical-padding 2) (:bottom safe-area))
+        max-height (- window-height (:top safe-area))
+        visible (react/state false)
 
         master-translation-y (animated/use-value 0)
-        master-velocity-y    (animated/use-value (:undetermined gesture-handler/states))
-        master-state         (animated/use-value (:undetermined gesture-handler/states))
-        tap-state            (animated/use-value 0)
-        manual-open          (animated/use-value 0)
-        manual-close         (animated/use-value 0)
-        offset               (animated/use-value 0)
-        drag-over            (animated/use-value 1)
-        clock                (animated/use-clock)
-        tap-gesture-handler  (animated/use-gesture {:state tap-state})
-        on-master-event      (animated/use-gesture
-                              {:translationY master-translation-y
-                               :state        master-state
-                               :velocityY    master-velocity-y})
-        on-body-event        on-master-event
-        sheet-height         (min max-height
-                                  (+ styles/border-radius @height))
+        master-velocity-y (animated/use-value (:undetermined gesture-handler/states))
+        master-state (animated/use-value (:undetermined gesture-handler/states))
+        tap-state (animated/use-value 0)
+        manual-open (animated/use-value 0)
+        manual-close (animated/use-value 0)
+        offset (animated/use-value 0)
+        drag-over (animated/use-value 1)
+        clock (animated/use-clock)
+        tap-gesture-handler (animated/use-gesture {:state tap-state})
+        on-master-event (animated/use-gesture
+                         {:translationY master-translation-y
+                          :state        master-state
+                          :velocityY    master-velocity-y})
+        on-body-event on-master-event
+        sheet-height (min max-height
+                          (+ styles/border-radius @height))
 
-        open-snap-point  (animated/use-value 0)
+        open-snap-point (animated/use-value 0)
         close-snap-point 0
-        on-close         (fn []
-                           (when @visible
-                             (reset! visible false)
-                             (reset! height 0)
-                             (when on-cancel
-                               (on-cancel))))
-        close-sheet      (fn []
-                           (animated/set-value manual-close 1))
-        on-snap          (fn [pos]
-                           (when (= close-snap-point (aget pos 0))
-                             (on-close)))
-        interrupted      (animated/and* (animated/eq master-state (:began gesture-handler/states))
-                                        (animated/clock-running clock))
-        translate-y      (react/use-memo
-                          (fn []
-                            (animated/with-easing
-                              {:value          (animated/cond* (animated/less-or-eq master-translation-y 0)
-                                                               (animated/divide master-translation-y 2)
-                                                               master-translation-y)
-                               :velocity       master-velocity-y
-                               :offset         offset
-                               :state          master-state
-                               :animation-over drag-over
-                               :snap-points    [open-snap-point close-snap-point]}))
-                          [])
-        opacity          (react/use-memo
-                          (fn []
-                            (animated/cond*
-                             open-snap-point
-                             (animated/interpolate
-                              translate-y
-                              {:inputRange  [(animated/multiply open-snap-point opacity-coeff) 0]
-                               :outputRange [1 0]
-                               :extrapolate (:clamp animated/extrapolate)})))
-                          [])]
+        on-close (fn []
+                   (when @visible
+                     (reset! visible false)
+                     (reset! height 0)
+                     (when on-cancel
+                       (on-cancel))))
+        close-sheet (fn []
+                      (animated/set-value manual-close 1))
+        on-snap (fn [pos]
+                  (when (= close-snap-point (aget pos 0))
+                    (on-close)))
+        interrupted (animated/and* (animated/eq master-state (:began gesture-handler/states))
+                                   (animated/clock-running clock))
+        translate-y (react/use-memo
+                     (fn []
+                       (animated/with-easing
+                        {:value          (animated/cond* (animated/less-or-eq master-translation-y 0)
+                                                         (animated/divide master-translation-y 2)
+                                                         master-translation-y)
+                         :velocity       master-velocity-y
+                         :offset         offset
+                         :state          master-state
+                         :animation-over drag-over
+                         :snap-points    [open-snap-point close-snap-point]}))
+                     [])
+        opacity (react/use-memo
+                 (fn []
+                   (animated/cond*
+                    open-snap-point
+                    (animated/interpolate
+                     translate-y
+                     {:inputRange  [(animated/multiply open-snap-point opacity-coeff) 0]
+                      :outputRange [1 0]
+                      :extrapolate (:clamp animated/extrapolate)})))
+                 [])]
     (animated/code!
      (fn []
        (animated/cond* (animated/and* (animated/eq master-state (:end gesture-handler/states))
@@ -177,39 +185,48 @@
          (close-sheet)))
      [visible?])
     (reagent/as-element
-     [rn/view {:style          styles/container
-               :pointer-events :box-none}
-      [gesture-handler/tap-gesture-handler (merge {:enabled backdrop-dismiss?}
-                                                  tap-gesture-handler)
-       [animated/view {:style (merge (styles/backdrop)
-                                     (when platform/ios?
-                                       {:opacity          opacity
-                                        :background-color (:backdrop @colors/theme)}))}]]
-      [animated/view {:style (merge (styles/content-container window-height)
-                                    {:transform [{:translateY (if (= sheet-height max-height)
-                                                                (animated/add translate-y keyboard-height-android-delta)
-                                                                translate-y)}
-                                                 {:translateY (* window-height 2)}]})}
-       [gesture-handler/pan-gesture-handler (merge on-master-event
-                                                   {:ref      master-ref
-                                                    :wait-for body-ref
-                                                    :enabled  (not disable-drag?)})
-        [animated/view  {:style styles/content-header}
+     [rn/view
+      {:style          styles/container
+       :pointer-events :box-none}
+      [gesture-handler/tap-gesture-handler
+       (merge {:enabled backdrop-dismiss?}
+              tap-gesture-handler)
+       [animated/view
+        {:style (merge (styles/backdrop)
+                       (when platform/ios?
+                         {:opacity          opacity
+                          :background-color (:backdrop @colors/theme)}))}]]
+      [animated/view
+       {:style (merge (styles/content-container window-height)
+                      {:transform [{:translateY (if (= sheet-height max-height)
+                                                  (animated/add translate-y
+                                                                keyboard-height-android-delta)
+                                                  translate-y)}
+                                   {:translateY (* window-height 2)}]})}
+       [gesture-handler/pan-gesture-handler
+        (merge on-master-event
+               {:ref      master-ref
+                :wait-for body-ref
+                :enabled  (not disable-drag?)})
+        [animated/view {:style styles/content-header}
          (when show-handle?
            [rn/view {:style styles/handle}])]]
-       [gesture-handler/pan-gesture-handler (merge on-body-event
-                                                   {:ref      body-ref
-                                                    :wait-for master-ref
-                                                    :enabled  (and (not disable-drag?)
-                                                                   (not= sheet-height max-height))})
-        [animated/view {:height sheet-height
-                        :flex           1}
-         [animated/view {:style     {:padding-top    styles/vertical-padding
-                                     :padding-bottom (+ styles/vertical-padding
-                                                        (if (and platform/ios? keyboard-shown)
-                                                          keyboard-height
-                                                          (:bottom safe-area)))}
-                         :on-layout #(reset! height (.-nativeEvent.layout.height ^js %))}
+       [gesture-handler/pan-gesture-handler
+        (merge on-body-event
+               {:ref      body-ref
+                :wait-for master-ref
+                :enabled  (and (not disable-drag?)
+                               (not= sheet-height max-height))})
+        [animated/view
+         {:height sheet-height
+          :flex   1}
+         [animated/view
+          {:style     {:padding-top    styles/vertical-padding
+                       :padding-bottom (+ styles/vertical-padding
+                                          (if (and platform/ios? keyboard-shown)
+                                            keyboard-height
+                                            (:bottom safe-area)))}
+           :on-layout #(reset! height (.-nativeEvent.layout.height ^js %))}
           (into [:<>]
                 (react/get-children children))]]]]])))
 

src/quo/components/button/view.cljs

@@ -1,14 +1,14 @@
 (ns quo.components.button.view
   (:require [quo.components.animated.pressable :as animation]
-            [quo.react-native :as rn]
-            [quo.haptic :as haptic]
+            [quo.components.text :as text] ;; FIXME:
             [quo.design-system.colors :as colors]
             [quo.design-system.spacing :as spacing]
-            [quo.components.text :as text]
-            ;; FIXME:
+            [quo.haptic :as haptic]
+            [quo.react-native :as rn]
             [status-im.ui.components.icons.icons :as icons]))
 
-(defn style-container [type]
+(defn style-container
+  [type]
   (merge {:height          44
           :align-items     :center
           :justify-content :center
@@ -19,14 +19,16 @@
            :icon      {}
            nil)))
 
-(defn content-style [type]
+(defn content-style
+  [type]
   (case type
     :primary   (:base spacing/padding-horizontal)
     :secondary (:x-tiny spacing/padding-horizontal)
     :icon      (:tiny spacing/padding-horizontal)
     nil))
 
-(defn themes [theme]
+(defn themes
+  [theme]
   (case theme
     :main         {:icon-color       (:icon-04 @colors/theme)
                    :background-color (:interactive-02 @colors/theme)
@@ -54,62 +56,66 @@
                    :text-color       (:text-01 @colors/theme)
                    :border-color     (:ui-01 @colors/theme)}))
 
-(defn button [{:keys [on-press disabled type theme before after
-                      haptic-feedback haptic-type on-long-press on-press-start
-                      accessibility-label loading border-radius style]
-               :or   {theme           :main
-                      type            :primary
-                      haptic-feedback true
-                      border-radius   8
-                      haptic-type     :selection}}
-              children]
-  (let [theme' (cond
-                 disabled :disabled
-                 :else    theme)
+(defn button
+  [{:keys [on-press disabled type theme before after
+           haptic-feedback haptic-type on-long-press on-press-start
+           accessibility-label loading border-radius style test-ID]
+    :or   {theme           :main
+           type            :primary
+           haptic-feedback true
+           border-radius   8
+           haptic-type     :selection}}
+   children]
+  (let [theme'                                                        (cond
+                                                                        disabled :disabled
+                                                                        :else    theme)
         {:keys [icon-color background-color text-color border-color]}
         (themes theme')
 
-        optional-haptic (fn []
-                          (when haptic-feedback
-                            (haptic/trigger haptic-type)))]
-    [animation/pressable (merge {:bg-color            background-color
-                                 :border-radius       border-radius
-                                 :type                type
-                                 :disabled            disabled
-                                 :accessibility-label accessibility-label}
-                                (when border-color
-                                  {:border-color border-color
-                                   :border-width 1})
-                                (when on-press
-                                  {:on-press (fn []
-                                               (optional-haptic)
-                                               (on-press))})
-                                (when on-long-press
-                                  {:on-long-press (fn []
-                                                    (optional-haptic)
-                                                    (on-long-press))})
-                                (when on-press-start
-                                  {:on-press-start (fn []
-                                                     (optional-haptic)
-                                                     (on-press-start))}))
-     [rn/view {:style (merge (style-container type) style)}
+        optional-haptic                                               (fn []
+                                                                        (when haptic-feedback
+                                                                          (haptic/trigger haptic-type)))]
+    [animation/pressable
+     (merge {:bg-color            background-color
+             :border-radius       border-radius
+             :type                type
+             :disabled            disabled
+             :accessibility-label accessibility-label}
+            (when border-color
+              {:border-color border-color
+               :border-width 1})
+            (when on-press
+              {:on-press (fn []
+                           (optional-haptic)
+                           (on-press))})
+            (when on-long-press
+              {:on-long-press (fn []
+                                (optional-haptic)
+                                (on-long-press))})
+            (when on-press-start
+              {:on-press-start (fn []
+                                 (optional-haptic)
+                                 (on-press-start))}))
+     [rn/view {:test-ID test-ID :style (merge (style-container type) style)}
       (when before
         [rn/view
          [icons/icon before {:color icon-color}]])
       (when loading
         [rn/view {:style {:position :absolute}}
          [rn/activity-indicator]])
-      [rn/view {:style (merge (content-style type)
-                              (when loading
-                                {:opacity 0}))}
+      [rn/view
+       {:style (merge (content-style type)
+                      (when loading
+                        {:opacity 0}))}
        (cond
          (= type :icon)
          [icons/icon children {:color icon-color}]
 
          (string? children)
-         [text/text {:weight          :medium
-                     :number-of-lines 1
-                     :style           {:color text-color}}
+         [text/text
+          {:weight          :medium
+           :number-of-lines 1
+           :style           {:color text-color}}
           children]
 
          (vector? children)

src/quo/components/controls/styles.cljs

@@ -2,7 +2,8 @@
   (:require [quo.animated :as animated]
             [quo.design-system.colors :as colors]))
 
-(defn switch-style [state disabled]
+(defn switch-style
+  [state disabled]
   {:width            52
    :height           28
    :border-radius    14
@@ -13,7 +14,8 @@
                                            (:interactive-04 @colors/theme)
                                            (:interactive-01 @colors/theme)))})
 
-(defn switch-bullet-style [state hold]
+(defn switch-bullet-style
+  [state hold]
   {:width            20
    :height           20
    :border-radius    10
@@ -26,7 +28,8 @@
    :shadow-color     (:shadow-01 @colors/theme)
    :shadow-offset    {:width 0 :height 4}})
 
-(defn radio-style [state disabled]
+(defn radio-style
+  [state disabled]
   {:width            20
    :height           20
    :border-radius    10
@@ -37,7 +40,8 @@
                                            (:interactive-04 @colors/theme)
                                            (:interactive-01 @colors/theme)))})
 
-(defn radio-bullet-style [state hold]
+(defn radio-bullet-style
+  [state hold]
   {:width            12
    :height           12
    :border-radius    6
@@ -50,7 +54,8 @@
    :shadow-color     (:shadow-01 @colors/theme)
    :shadow-offset    {:width 0 :height 4}})
 
-(defn animated-checkbox-style [state disabled]
+(defn animated-checkbox-style
+  [state disabled]
   {:width            18
    :height           18
    :border-radius    4
@@ -62,7 +67,8 @@
                                            (:interactive-04 @colors/theme)
                                            (:interactive-01 @colors/theme)))})
 
-(defn checkbox-style [value disabled]
+(defn checkbox-style
+  [value disabled]
   {:width            18
    :height           18
    :border-radius    4
@@ -74,9 +80,11 @@
                          (:interactive-01 @colors/theme))
                        (:ui-01 @colors/theme))})
 
-(defn animated-check-icon-style [state hold]
-  {:opacity       (animated/mix hold 1 0.6)
-   :transform     [{:scale (animated/mix state 0.0001 1)}]})
+(defn animated-check-icon-style
+  [state hold]
+  {:opacity   (animated/mix hold 1 0.6)
+   :transform [{:scale (animated/mix state 0.0001 1)}]})
 
-(defn check-icon-style [value]
+(defn check-icon-style
+  [value]
   {:opacity (if value 1 0)})

src/quo/components/controls/view.cljs

@@ -1,34 +1,37 @@
 (ns quo.components.controls.view
-  (:require [reagent.core :as reagent]
-            [cljs-bean.core :as bean]
+  (:require [cljs-bean.core :as bean]
+            [quo.animated :as animated]
+            [quo.components.controls.styles :as styles]
+            [quo.design-system.colors :as colors]
+            [quo.gesture-handler :as gh]
             [quo.react :as react]
             [quo.react-native :as rn]
-            [quo.animated :as animated]
-            [quo.gesture-handler :as gh]
-            [quo.design-system.colors :as colors]
-            [quo.components.controls.styles :as styles]
+            [reagent.core :as reagent]
             [status-im.ui.components.icons.icons :as icons]))
 
-(defn control-builder [component]
+(defn control-builder
+  [component]
   (fn [props]
     (let [{:keys [value onChange disabled]}
           (bean/bean props)
-          state       (animated/use-value 0)
-          tap-state   (animated/use-value (:undetermined gh/states))
-          tap-handler (animated/on-gesture {:state tap-state})
-          hold        (react/use-memo
-                       (fn []
-                         (animated/with-timing-transition
-                           (animated/eq tap-state (:began gh/states))
-                           {}))
-                       [])
-          transition  (react/use-memo
-                       (fn []
-                         (animated/with-spring-transition state (:lazy animated/springs)))
-                       [])
-          press-end   (fn []
-                        (when (and (not disabled) onChange)
-                          (onChange (not value))))]
+          state                             (animated/use-value 0)
+          tap-state                         (animated/use-value (:undetermined gh/states))
+          tap-handler                       (animated/on-gesture {:state tap-state})
+          hold                              (react/use-memo
+                                             (fn []
+                                               (animated/with-timing-transition
+                                                (animated/eq tap-state (:began gh/states))
+                                                {}))
+                                             [])
+          transition                        (react/use-memo
+                                             (fn []
+                                               (animated/with-spring-transition state
+                                                                                (:lazy
+                                                                                 animated/springs)))
+                                             [])
+          press-end                         (fn []
+                                              (when (and (not disabled) onChange)
+                                                (onChange (not value))))]
       (animated/code!
        (fn []
          (animated/cond* (animated/eq tap-state (:end gh/states))
@@ -41,38 +44,47 @@
          (animated/set state (if (true? value) 1 0)))
        [value])
       (reagent/as-element
-       [gh/tap-gesture-handler (merge tap-handler
-                                      {:shouldCancelWhenOutside true
-                                       :enabled                 (boolean (and onChange (not disabled)))})
+       [gh/tap-gesture-handler
+        (merge tap-handler
+               {:shouldCancelWhenOutside true
+                :enabled                 (boolean (and onChange (not disabled)))})
         [animated/view
-         [component {:transition transition
-                     :hold       hold
-                     :disabled   disabled}]]]))))
+         [component
+          {:transition transition
+           :hold       hold
+           :disabled   disabled}]]]))))
 
-(defn switch-view [{:keys [transition hold disabled value]}]
-  [animated/view {:style               (styles/switch-style transition disabled)
-                  :accessibility-label (str "switch-" (if value "on" "off"))
-                  :accessibility-role  :switch}
+(defn switch-view
+  [{:keys [transition hold disabled value]}]
+  [animated/view
+   {:style               (styles/switch-style transition disabled)
+    :accessibility-label (str "switch-" (if value "on" "off"))
+    :accessibility-role  :switch}
    [animated/view {:style (styles/switch-bullet-style transition hold)}]])
 
-(defn radio-view [{:keys [transition hold disabled value]}]
-  [animated/view {:style (styles/radio-style transition disabled)
-                  :accessibility-label (str "radio-" (if value "on" "off"))
-                  :accessibility-role  :radio}
+(defn radio-view
+  [{:keys [transition hold disabled value]}]
+  [animated/view
+   {:style               (styles/radio-style transition disabled)
+    :accessibility-label (str "radio-" (if value "on" "off"))
+    :accessibility-role  :radio}
    [animated/view {:style (styles/radio-bullet-style transition hold)}]])
 
-(defn checkbox-view [props]
+(defn checkbox-view
+  [props]
   (let [{:keys [value onChange disabled]} (bean/bean props)]
     (reagent/as-element
      [rn/touchable-without-feedback
       {:on-press (when (and onChange (not disabled)) onChange)}
-      [rn/view {:style               (styles/checkbox-style value disabled)
-                :accessibility-label (str "checkbox-" (if value "on" "off"))
-                :accessibility-role  :checkbox}
+      [rn/view
+       {:style               (styles/checkbox-style value disabled)
+        :accessibility-label (str "checkbox-" (if value "on" "off"))
+        :accessibility-role  :checkbox}
        [rn/view {:style (styles/check-icon-style value)}
         [icons/tiny-icon :tiny-icons/tiny-check {:color colors/white}]]]])))
 
-(defn animated-checkbox-view [{:keys [transition hold disabled value]}]
+(defn animated-checkbox-view
+  [{:keys [transition hold disabled value]}]
   [animated/view
    {:style               (styles/animated-checkbox-style transition disabled)
     :accessibility-label (str "checkbox-" (if value "on" "off"))

src/quo/components/header.cljs

@@ -10,7 +10,8 @@
 
 (def header-height 56)
 
-(defn header-wrapper-style [{:keys [height border-bottom background]}]
+(defn header-wrapper-style
+  [{:keys [height border-bottom background]}]
   (merge
    (:x-tiny spacing/padding-horizontal)
    {:background-color (:ui-background @colors/theme)
@@ -21,32 +22,37 @@
      {:border-bottom-width 1
       :border-bottom-color (:ui-01 @colors/theme)})))
 
-(def absolute-fill {:position :absolute
-                    :top      0
-                    :bottom   0
-                    :left     0
-                    :right    0})
+(def absolute-fill
+  {:position :absolute
+   :top      0
+   :bottom   0
+   :left     0
+   :right    0})
 
-(def content  {:flex            1
-               :flex-direction  :row
-               :align-items     :center
-               :justify-content :center})
+(def content
+  {:flex            1
+   :flex-direction  :row
+   :align-items     :center
+   :justify-content :center})
 
-(def left {:position        :absolute
-           :left            0
-           :top             0
-           :bottom          0
-           :justify-content :center
-           :align-items     :flex-start})
+(def left
+  {:position        :absolute
+   :left            0
+   :top             0
+   :bottom          0
+   :justify-content :center
+   :align-items     :flex-start})
 
-(def right {:position        :absolute
-            :right           0
-            :top             0
-            :bottom          0
-            :justify-content :center
-            :align-items     :flex-end})
+(def right
+  {:position        :absolute
+   :right           0
+   :top             0
+   :bottom          0
+   :justify-content :center
+   :align-items     :flex-end})
 
-(defn title-style [{:keys [left right]} title-align]
+(defn title-style
+  [{:keys [left right]} title-align]
   (merge
    absolute-fill
    (case title-align
@@ -59,66 +65,75 @@
 
 (def header-actions-style
   (merge
-   {:flex               1
-    :flex-direction     :row
-    :align-items        :center
-    :justify-content    :center}
+   {:flex            1
+    :flex-direction  :row
+    :align-items     :center
+    :justify-content :center}
    (:x-tiny spacing/padding-horizontal)))
 
 (def header-action-placeholder
   {:width (:base spacing/spacing)})
 
-(def element {:align-items        :center
-              :justify-content    :center
-              :flex               1})
+(def element
+  {:align-items     :center
+   :justify-content :center
+   :flex            1})
 
-(defn header-action [{:keys [icon label on-press disabled accessibility-label]}]
-  [button/button (merge {:on-press on-press
-                         :disabled disabled}
-                        (cond
-                          icon  {:type  :icon
-                                 :theme :icon}
-                          label {:type :secondary})
-                        (when accessibility-label
-                          {:accessibility-label accessibility-label}))
+(defn header-action
+  [{:keys [icon label on-press disabled accessibility-label]}]
+  [button/button
+   (merge {:on-press on-press
+           :disabled disabled}
+          (cond
+            icon  {:type  :icon
+                   :theme :icon}
+            label {:type :secondary})
+          (when accessibility-label
+            {:accessibility-label accessibility-label}))
    (cond
      icon  icon
      label label)])
 
-(defn header-actions [{:keys [accessories component]}]
+(defn header-actions
+  [{:keys [accessories component]}]
   [rn/view {:style element}
    (cond
      (seq accessories)
      (into [rn/view {:style header-actions-style}]
            (map header-action accessories))
 
-     component component
+     component         component
 
      :else
      [rn/view {:style header-action-placeholder}])])
 
-(defn header-title [{:keys [title subtitle component title-align]}]
+(defn header-title
+  [{:keys [title subtitle component title-align]}]
   [:<>
    (cond
-     component component
+     component            component
 
      (and title subtitle)
      [:<>
-      [text/text {:weight          :medium
-                  :number-of-lines 1}
+      [text/text
+       {:weight          :medium
+        :number-of-lines 1}
        title]
-      [text/text {:weight          :regular
-                  :color           :secondary
-                  :number-of-lines 1}
+      [text/text
+       {:weight          :regular
+        :color           :secondary
+        :number-of-lines 1}
        subtitle]]
 
-     title [text/text {:weight          :bold
-                       :number-of-lines 0
-                       :align           title-align
-                       :size            :large}
-            title])])
+     title                [text/text
+                           {:weight          :bold
+                            :number-of-lines 0
+                            :align           title-align
+                            :size            :large}
+                           title])])
 
-(defn header [{:keys [left-width right-width]}]
+(defn header
+  [{:keys [left-width right-width]}]
   (let [layout        (reagent/atom {:left  {:width  (or left-width 8)
                                              :height header-height}
                                      :right {:width  (or right-width 8)
@@ -130,46 +145,61 @@
                           (let [width  (oget evt "nativeEvent" "layout" "width")
                                 height (oget evt "nativeEvent" "layout" "height")]
                             (when get-layout
-                              (get-layout el {:width  width
-                                              :height height}))
-                            (swap! layout assoc el {:width  width
-                                                    :height height}))))]
-    (fn [{:keys [left-accessories left-component border-bottom
-                 right-accessories right-component insets get-layout
-                 title subtitle title-component style title-align
-                 background]
-          :or   {title-align   :center
-                 border-bottom true}}]
+                              (get-layout el
+                                          {:width  width
+                                           :height height}))
+                            (swap! layout assoc
+                              el
+                              {:width  width
+                               :height height}))))]
+    (fn
+      [{:keys [left-accessories left-component border-bottom
+               right-accessories right-component insets get-layout
+               title subtitle title-component style title-align
+               background]
+        :or   {title-align   :center
+               border-bottom true}}]
       (let [status-bar-height (get insets :top 0)
             height            (+ header-height status-bar-height)]
-        [animated/view {:style (header-wrapper-style {:height        height
-                                                      :background    background
-                                                      :border-bottom border-bottom})}
-         [rn/view {:pointer-events :box-none
-                   :height         status-bar-height}]
-         [rn/view {:style          (merge {:height header-height}
-                                          style)
-                   :pointer-events :box-none}
-          [rn/view {:style          absolute-fill
-                    :pointer-events :box-none}
-           [rn/view {:style          content
-                     :pointer-events :box-none}
-            [rn/view {:style          left
-                      :on-layout      (handle-layout :left get-layout)
-                      :pointer-events :box-none}
-             [header-actions {:accessories left-accessories
-                              :component   left-component}]]
+        [animated/view
+         {:style (header-wrapper-style {:height        height
+                                        :background    background
+                                        :border-bottom border-bottom})}
+         [rn/view
+          {:pointer-events :box-none
+           :height         status-bar-height}]
+         [rn/view
+          {:style          (merge {:height header-height}
+                                  style)
+           :pointer-events :box-none}
+          [rn/view
+           {:style          absolute-fill
+            :pointer-events :box-none}
+           [rn/view
+            {:style          content
+             :pointer-events :box-none}
+            [rn/view
+             {:style          left
+              :on-layout      (handle-layout :left get-layout)
+              :pointer-events :box-none}
+             [header-actions
+              {:accessories left-accessories
+               :component   left-component}]]
 
-            [rn/view {:style          (title-style @layout title-align)
-                      :on-layout      (handle-layout :title get-layout)
-                      :pointer-events :box-none}
-             [header-title {:title       title
-                            :subtitle    subtitle
-                            :title-align title-align
-                            :component   title-component}]]
+            [rn/view
+             {:style          (title-style @layout title-align)
+              :on-layout      (handle-layout :title get-layout)
+              :pointer-events :box-none}
+             [header-title
+              {:title       title
+               :subtitle    subtitle
+               :title-align title-align
+               :component   title-component}]]
 
-            [rn/view {:style          right
-                      :on-layout      (handle-layout :right get-layout)
-                      :pointer-events :box-none}
-             [header-actions {:accessories right-accessories
-                              :component   right-component}]]]]]]))))
+            [rn/view
+             {:style          right
+              :on-layout      (handle-layout :right get-layout)
+              :pointer-events :box-none}
+             [header-actions
+              {:accessories right-accessories
+               :component   right-component}]]]]]]))))

src/quo/components/list/footer.cljs

@@ -1,14 +1,17 @@
 (ns quo.components.list.footer
-  (:require [quo.react-native :as rn]
+  (:require [quo.components.text :as text]
             [quo.design-system.spacing :as spacing]
-            [quo.components.text :as text]
+            [quo.react-native :as rn]
             [reagent.core :as reagent]))
 
-(defn footer []
-  (let [this                       (reagent/current-component)
+(defn footer
+  []
+  (let [this (reagent/current-component)
         {:keys [color]
-         :or   {color :secondary}} (reagent/props this)]
-    [rn/view {:style (merge (:base spacing/padding-horizontal)
-                            (:small spacing/padding-vertical))}
+         :or   {color :secondary}}
+        (reagent/props this)]
+    [rn/view
+     {:style (merge (:base spacing/padding-horizontal)
+                    (:small spacing/padding-vertical))}
      (into [text/text {:color color}]
            (reagent/children this))]))

src/quo/components/list/header.cljs

@@ -1,15 +1,19 @@
 (ns quo.components.list.header
-  (:require [reagent.core :as reagent]
-            [quo.react-native :as rn]
+  (:require [quo.components.text :as text]
             [quo.design-system.spacing :as spacing]
-            [quo.components.text :as text]))
+            [quo.react-native :as rn]
+            [reagent.core :as reagent]))
 
-(defn header []
-  (let [this                       (reagent/current-component)
+(defn header
+  []
+  (let [this (reagent/current-component)
         {:keys [color]
-         :or   {color :secondary}} (reagent/props this)]
-    [rn/view {:style (merge (:base spacing/padding-horizontal)
-                            (:x-tiny spacing/padding-vertical))}
-     (into [text/text {:color color
-                       :style {:margin-top 10}}]
+         :or   {color :secondary}}
+        (reagent/props this)]
+    [rn/view
+     {:style (merge (:base spacing/padding-horizontal)
+                    (:x-tiny spacing/padding-vertical))}
+     (into [text/text
+            {:color color
+             :style {:margin-top 10}}]
            (reagent/children this))]))

src/quo/components/list/index.cljs

@@ -1,16 +1,18 @@
 (ns quo.components.list.index
-  (:require [quo.react-native :as rn]
-            [quo.components.text :as text]
-            [quo.design-system.colors :as colors]))
+  (:require [quo.components.text :as text]
+            [quo.design-system.colors :as colors]
+            [quo.react-native :as rn]))
 
-(defn index [{:keys [title]}]
+(defn index
+  [{:keys [title]}]
   [rn/view {:style {:padding-right 16}}
-   [rn/view {:style {:border-top-width           1
-                     :border-bottom-width        1
-                     :border-right-width         1
-                     :border-color               (colors/get-color :border-01)
-                     :padding-vertical           3
-                     :padding-horizontal         16
-                     :border-top-right-radius    16
-                     :border-bottom-right-radius 16}}
+   [rn/view
+    {:style {:border-top-width           1
+             :border-bottom-width        1
+             :border-right-width         1
+             :border-color               (colors/get-color :border-01)
+             :padding-vertical           3
+             :padding-horizontal         16
+             :border-top-right-radius    16
+             :border-bottom-right-radius 16}}
     [text/text title]]])

src/quo/components/list/item.cljs

@@ -1,28 +1,29 @@
 (ns quo.components.list.item
-  (:require [quo.react-native :as rn]
-            [quo.platform :as platform]
-            [quo.haptic :as haptic]
-            [quo.gesture-handler :as gh]
-            [quo.design-system.spacing :as spacing]
-            [quo.design-system.colors :as colors]
-            [quo.components.text :as text]
+  (:require [quo.components.animated.pressable :as animated]
             [quo.components.controls.view :as controls]
+            [quo.components.text :as text]
             [quo.components.tooltip :as tooltip]
-            [status-im.ui.components.icons.icons :as icons]
-            [quo.components.animated.pressable :as animated]))
+            [quo.design-system.colors :as colors]
+            [quo.design-system.spacing :as spacing]
+            [quo.gesture-handler :as gh]
+            [quo.haptic :as haptic]
+            [quo.platform :as platform]
+            [quo.react-native :as rn]
+            [status-im.ui.components.icons.icons :as icons]))
 
-(defn themes [theme]
+(defn themes
+  [theme]
   (case theme
-    :main {:icon-color         (:icon-04 @colors/theme)
-           :icon-bg-color      (:interactive-02 @colors/theme)
-           :active-background  (:interactive-02 @colors/theme)
-           :passive-background (:ui-background @colors/theme)
-           :text-color         (:text-01 @colors/theme)}
-    :accent {:icon-color         (:icon-04 @colors/theme)
-             :icon-bg-color      (:interactive-02 @colors/theme)
-             :active-background  (:interactive-02 @colors/theme)
-             :passive-background (:ui-background @colors/theme)
-             :text-color         (:text-04 @colors/theme)}
+    :main     {:icon-color         (:icon-04 @colors/theme)
+               :icon-bg-color      (:interactive-02 @colors/theme)
+               :active-background  (:interactive-02 @colors/theme)
+               :passive-background (:ui-background @colors/theme)
+               :text-color         (:text-01 @colors/theme)}
+    :accent   {:icon-color         (:icon-04 @colors/theme)
+               :icon-bg-color      (:interactive-02 @colors/theme)
+               :active-background  (:interactive-02 @colors/theme)
+               :passive-background (:ui-background @colors/theme)
+               :text-color         (:text-04 @colors/theme)}
     :negative {:icon-color         (:negative-01 @colors/theme)
                :icon-bg-color      (:negative-02 @colors/theme)
                :active-background  (:negative-02 @colors/theme)
@@ -39,28 +40,34 @@
                :passive-background (:ui-background @colors/theme)
                :text-color         (:text-02 @colors/theme)}))
 
-(defn size->icon-size [size]
+(defn size->icon-size
+  [size]
   (case size
     :small 36
     40))
 
-(defn size->container-size [size]
+(defn size->container-size
+  [size]
   (case size
     :small 52
     64))
 
-(defn size->single-title-size [size]
+(defn size->single-title-size
+  [size]
   (case size
     :small :base
     :large))
 
-(defn container [{:keys [size container-style]} & children]
-  (into [rn/view {:style (merge (:tiny spacing/padding-horizontal)
-                                {:min-height       (size->container-size size)
-                                 :padding-vertical 8
-                                 :flex-direction   :row
-                                 :align-items      :center
-                                 :justify-content  :space-between} container-style)}]
+(defn container
+  [{:keys [size container-style]} & children]
+  (into [rn/view
+         {:style (merge (:tiny spacing/padding-horizontal)
+                        {:min-height       (size->container-size size)
+                         :padding-vertical 8
+                         :flex-direction   :row
+                         :align-items      :center
+                         :justify-content  :space-between}
+                        container-style)}]
         children))
 
 (defn icon-column
@@ -72,103 +79,118 @@
          (vector? icon)
          icon
          (keyword? icon)
-         [rn/view {:style {:width            icon-size
-                           :height           icon-size
-                           :align-items      :center
-                           :justify-content  :center
-                           :border-radius    (/ icon-size 2)
-                           :background-color icon-bg-color}}
+         [rn/view
+          {:style {:width            icon-size
+                   :height           icon-size
+                   :align-items      :center
+                   :justify-content  :center
+                   :border-radius    (/ icon-size 2)
+                   :background-color icon-bg-color}}
           [icons/icon icon {:color icon-color}]])])))
 
 (defn title-column
   [{:keys [title text-color subtitle subtitle-max-lines subtitle-secondary
            title-accessibility-label size text-size title-text-weight
            right-side-present?]}]
-  [rn/view {:style (merge (:tiny spacing/padding-horizontal)
-                          ;; make left-side title grow if nothing is present on right-side
-                          (when-not right-side-present?
-                            {:flex            1
-                             :justify-content :center}))}
+  [rn/view
+   {:style (merge (:tiny spacing/padding-horizontal)
+                  ;; make left-side title grow if nothing is present on right-side
+                  (when-not right-side-present?
+                    {:flex            1
+                     :justify-content :center}))}
    (cond
 
      (and title subtitle)
      [:<>
-      ;; FIXME(Ferossgp): ReactNative 63 will support view inside text on andrid, remove thess if when migrating
+      ;; FIXME(Ferossgp): ReactNative 63 will support view inside text on andrid, remove thess if when
+      ;; migrating
       (if (string? title)
-        [text/text {:weight              (or title-text-weight :medium)
-                    :style               {:color text-color}
-                    :accessibility-label title-accessibility-label
-                    :ellipsize-mode      :tail
-                    :number-of-lines     1
-                    :size                text-size}
+        [text/text
+         {:weight              (or title-text-weight :medium)
+          :style               {:color text-color}
+          :accessibility-label title-accessibility-label
+          :ellipsize-mode      :tail
+          :number-of-lines     1
+          :size                text-size}
          title]
         title)
       (if (string? subtitle-secondary)
         [rn/view {:flex-direction :row}
-         [text/text {:style {:max-width "56.5%"}
-                     :weight          :regular
-                     :color           :secondary
-                     :ellipsize-mode  :tail
-                     :number-of-lines subtitle-max-lines
-                     :size            text-size}
+         [text/text
+          {:style           {:max-width "56.5%"}
+           :weight          :regular
+           :color           :secondary
+           :ellipsize-mode  :tail
+           :number-of-lines subtitle-max-lines
+           :size            text-size}
           subtitle]
-         [text/text {:style {:width "7%" :text-align :center}
-                     :weight          :regular
-                     :color           :secondary
-                     :ellipsize-mode  :middle
-                     :number-of-lines subtitle-max-lines
-                     :size            text-size}
+         [text/text
+          {:style           {:width "7%" :text-align :center}
+           :weight          :regular
+           :color           :secondary
+           :ellipsize-mode  :middle
+           :number-of-lines subtitle-max-lines
+           :size            text-size}
           "•"]
-         [text/text {:style {:max-width "36.5%"}
-                     :weight          :regular
-                     :color           :secondary
-                     :ellipsize-mode  :middle
-                     :number-of-lines subtitle-max-lines
-                     :size            text-size}
+         [text/text
+          {:style           {:max-width "36.5%"}
+           :weight          :regular
+           :color           :secondary
+           :ellipsize-mode  :middle
+           :number-of-lines subtitle-max-lines
+           :size            text-size}
           subtitle-secondary]]
         (if (string? subtitle)
-          [text/text {:weight          :regular
-                      :color           :secondary
-                      :ellipsize-mode  :tail
-                      :number-of-lines subtitle-max-lines
-                      :size            text-size}
+          [text/text
+           {:weight          :regular
+            :color           :secondary
+            :ellipsize-mode  :tail
+            :number-of-lines subtitle-max-lines
+            :size            text-size}
            subtitle]
           subtitle))]
 
      title
      (if (string? title)
-       [text/text {:weight                    (or title-text-weight :regular)
-                   :number-of-lines           1
-                   :style                     {:color text-color}
-                   :title-accessibility-label title-accessibility-label
-                   :ellipsize-mode            :tail
-                   :size                      (or text-size (size->single-title-size size))}
+       [text/text
+        {:weight                    (or title-text-weight :regular)
+         :number-of-lines           1
+         :style                     {:color text-color}
+         :title-accessibility-label title-accessibility-label
+         :ellipsize-mode            :tail
+         :size                      (or text-size (size->single-title-size size))}
         title]
        title))])
 
-(defn left-side [props]
-  [rn/view {:style {:flex-direction :row
-                    ;; Occupy only content width, never grow, but shrink if need be
-                    :flex-grow      0
-                    :flex-shrink    1
-                    :padding-right  16
-                    :align-items    (or (:left-side-alignment props) :center)}}
+(defn left-side
+  [props]
+  [rn/view
+   {:style {:flex-direction :row
+            ;; Occupy only content width, never grow, but shrink if need be
+            :flex-grow      0
+            :flex-shrink    1
+            :padding-right  16
+            :align-items    (or (:left-side-alignment props) :center)}}
    [icon-column props]
    [title-column props]])
 
-(defn right-side [{:keys [chevron active disabled accessory accessory-text accessory-style animated-accessory?]}]
+(defn right-side
+  [{:keys [chevron active disabled accessory accessory-text accessory-style animated-accessory?]}]
   (when (or chevron accessory)
-    [rn/view {:style (merge {:align-items     :center
-                             :justify-content :flex-end
-                             :flex-direction  :row
-                             ;; Grow to occupy full space, shrink when need be, but always maitaining 16px left gutter
-                             :flex-grow       1
-                             :flex-shrink     0
-                             :margin-left     16
-                             ;; When the left-side leaves no room for right-side, the rendered element is pushed out. A flex-basis ensures that there is some room reserved.
-                             ;; The number 80px was determined by trial and error.
-                             :flex-basis      80}
-                            accessory-style)}
+    [rn/view
+     {:style (merge {:align-items     :center
+                     :justify-content :flex-end
+                     :flex-direction  :row
+                     ;; Grow to occupy full space, shrink when need be, but always maitaining 16px left
+                     ;; gutter
+                     :flex-grow       1
+                     :flex-shrink     0
+                     :margin-left     16
+                     ;; When the left-side leaves no room for right-side, the rendered element is pushed
+                     ;; out. A flex-basis ensures that there is some room reserved.
+                     ;; The number 80px was determined by trial and error.
+                     :flex-basis      80}
+                    accessory-style)}
      [rn/view {:style (:tiny spacing/padding-horizontal)}
       (case accessory
         :radio    [controls/radio {:value active :disabled disabled}]
@@ -177,25 +199,28 @@
                      controls/checkbox)
                    {:value active :disabled disabled}]
         :switch   [controls/switch {:value active :disabled disabled}]
-        :text     [text/text {:color           :secondary
-                              :ellipsize-mode  :middle
-                              :number-of-lines 1}
+        :text     [text/text
+                   {:color           :secondary
+                    :ellipsize-mode  :middle
+                    :number-of-lines 1}
                    accessory-text]
         accessory)]
      (when (and chevron platform/ios?)
        [rn/view {:style {:padding-right (:tiny spacing/spacing)}}
-        [icons/icon :main-icons/next {:container-style {:opacity         0.4
-                                                        :align-items     :center
-                                                        :justify-content :center}
-                                      :resize-mode     :center
-                                      :color           (:icon-02 @colors/theme)}]])]))
+        [icons/icon :main-icons/next
+         {:container-style {:opacity         0.4
+                            :align-items     :center
+                            :justify-content :center}
+          :resize-mode     :center
+          :color           (:icon-02 @colors/theme)}]])]))
 
 (defn list-item
   [{:keys [theme accessory disabled subtitle-max-lines icon icon-container-style
            left-side-alignment icon-color icon-bg-color
            title subtitle subtitle-secondary active on-press on-long-press chevron size text-size
            accessory-text accessibility-label title-accessibility-label accessory-style
-           haptic-feedback haptic-type error animated animated-accessory? title-text-weight container-style
+           haptic-feedback haptic-type error animated animated-accessory? title-text-weight
+           container-style
            active-background-enabled background-color]
     :or   {subtitle-max-lines        1
            theme                     :main
@@ -203,26 +228,29 @@
            animated                  platform/ios?
            active-background-enabled true
            haptic-type               :selection}}]
-  (let [theme           (if disabled :disabled theme)
+  (let [theme                                                     (if disabled :disabled theme)
         {:keys [text-color active-background passive-background]}
         (themes theme)
-        icon-color      (or icon-color (:icon-color (themes theme)))
-        icon-bg-color   (or icon-bg-color (:icon-bg-color (themes theme)))
-        optional-haptic (fn []
-                          (when haptic-feedback
-                            (haptic/trigger haptic-type)))
-        component       (cond
-                          (and (not on-press)
-                               (not on-long-press))
-                          rn/view
-                          animated animated/pressable
-                          :else    gh/touchable-highlight)]
-    [rn/view {:background-color (cond (not= background-color nil)
-                                      background-color
-                                      (and (= accessory :radio) active)
-                                      active-background
-                                      :else
-                                      passive-background)}
+        icon-color                                                (or icon-color
+                                                                      (:icon-color (themes theme)))
+        icon-bg-color                                             (or icon-bg-color
+                                                                      (:icon-bg-color (themes theme)))
+        optional-haptic                                           (fn []
+                                                                    (when haptic-feedback
+                                                                      (haptic/trigger haptic-type)))
+        component                                                 (cond
+                                                                    (and (not on-press)
+                                                                         (not on-long-press))
+                                                                    rn/view
+                                                                    animated animated/pressable
+                                                                    :else gh/touchable-highlight)]
+    [rn/view
+     {:background-color (cond (not= background-color nil)
+                              background-color
+                              (and (= accessory :radio) active)
+                              active-background
+                              :else
+                              passive-background)}
      [component
       (merge {:type                :list-item
               :disabled            disabled
@@ -237,35 +265,39 @@
                                  (optional-haptic)
                                  (on-long-press))}))
       [container {:size size :container-style container-style}
-       [left-side {:icon-color                icon-color
-                   :text-color                (if on-press
-                                                text-color
-                                                (:text-color (themes :main)))
-                   :left-side-alignment       left-side-alignment
-                   :icon-bg-color             icon-bg-color
-                   :title-accessibility-label title-accessibility-label
-                   :icon                      icon
-                   :icon-container-style      icon-container-style
-                   :title                     title
-                   :title-text-weight         title-text-weight
-                   :size                      size
-                   :text-size                 text-size
-                   :subtitle                  subtitle
-                   :subtitle-max-lines        subtitle-max-lines
-                   :subtitle-secondary        subtitle-secondary
-                   :right-side-present?       (or accessory chevron)}]
-       [right-side {:chevron             chevron
-                    :active              active
-                    :disabled            disabled
-                    :on-press            on-press
-                    :accessory-text      accessory-text
-                    :animated-accessory? animated-accessory?
-                    :accessory-style     accessory-style
-                    :accessory           accessory}]]]
+       [left-side
+        {:icon-color                icon-color
+         :text-color                (if on-press
+                                      text-color
+                                      (:text-color (themes :main)))
+         :left-side-alignment       left-side-alignment
+         :icon-bg-color             icon-bg-color
+         :title-accessibility-label title-accessibility-label
+         :icon                      icon
+         :icon-container-style      icon-container-style
+         :title                     title
+         :title-text-weight         title-text-weight
+         :size                      size
+         :text-size                 text-size
+         :subtitle                  subtitle
+         :subtitle-max-lines        subtitle-max-lines
+         :subtitle-secondary        subtitle-secondary
+         :right-side-present?       (or accessory chevron)}]
+       [right-side
+        {:chevron             chevron
+         :active              active
+         :disabled            disabled
+         :on-press            on-press
+         :accessory-text      accessory-text
+         :animated-accessory? animated-accessory?
+         :accessory-style     accessory-style
+         :accessory           accessory}]]]
      (when error
-       [tooltip/tooltip (merge {:bottom-value 0}
-                               (when accessibility-label
-                                 {:accessibility-label (str (name accessibility-label) "-error")}))
-        [text/text {:color :negative
-                    :size  :small}
+       [tooltip/tooltip
+        (merge {:bottom-value 0}
+               (when accessibility-label
+                 {:accessibility-label (str (name accessibility-label) "-error")}))
+        [text/text
+         {:color :negative
+          :size  :small}
          error]])]))

src/quo/components/safe_area.cljs

@@ -1,19 +1,21 @@
 (ns quo.components.safe-area
-  (:require ["react-native-safe-area-context" :as safe-area-context
-             :refer (SafeAreaView SafeAreaProvider SafeAreaInsetsContext useSafeAreaInsets)]
+  (:require ["react-native-safe-area-context" :as safe-area-context :refer
+             (SafeAreaView SafeAreaProvider SafeAreaInsetsContext useSafeAreaInsets)]
             [reagent.core :as reagent]))
 
 (def provider (reagent/adapt-react-class SafeAreaProvider))
 (def ^:private consumer-raw (reagent/adapt-react-class (.-Consumer ^js SafeAreaInsetsContext)))
 (def view (reagent/adapt-react-class SafeAreaView))
 
-(defn consumer [component]
+(defn consumer
+  [component]
   [consumer-raw
    (fn [insets]
      (reagent/as-element
       [component (js->clj insets :keywordize-keys true)]))])
 
-(defn use-safe-area []
+(defn use-safe-area
+  []
   (let [insets (useSafeAreaInsets)]
     {:top    (.-top ^js insets)
      :bottom (.-bottom ^js insets)

src/quo/components/separator.cljs

@@ -1,8 +1,9 @@
 (ns quo.components.separator
-  (:require [quo.react-native :as react]
-            [quo.design-system.colors :as colors]))
+  (:require [quo.design-system.colors :as colors]
+            [quo.react-native :as react]))
 
-(defn separator [{:keys [color style]}]
+(defn separator
+  [{:keys [color style]}]
   [react/view
    {:style
     (merge

src/quo/components/text.cljs

@@ -5,7 +5,8 @@
             [quo.react-native :as rn]
             [reagent.core :as reagent]))
 
-(defn text-style [{:keys [size align weight monospace color style]}]
+(defn text-style
+  [{:keys [size align weight monospace color style]}]
   ;; NOTE(Ferossgo): or in destructoring will keep nil as a value
   (merge (if monospace
            ;; TODO(Ferossgp): Add all weights for monospace
@@ -38,12 +39,15 @@
          {:text-align (or align :auto)}
          style))
 
-(defn text []
+(defn text
+  []
   (let [this      (reagent/current-component)
         props     (reagent/props this)
         component (if (:animated? props) animated/text rn/text)]
-    (into [component (merge {:style (text-style props)}
-                            (dissoc props
-                                    :style :size :weight :color
-                                    :align :animated?))]
+    (into [component
+           (merge {:style (text-style props)}
+                  (dissoc props
+                          :style  :size
+                          :weight :color
+                          :align  :animated?))]
           (reagent/children this))))

src/quo/components/text_input.cljs

@@ -1,16 +1,15 @@
 (ns quo.components.text-input
   (:require [clojure.spec.alpha :as s]
-            [reagent.core :as reagent]
             [oops.core :refer [ocall]]
-            [quo.react-native :as rn]
-            ;; TODO(Ferossgp): Move icon component to lib
-            [status-im.ui.components.icons.icons :as icons]
+            [quo.components.text :as text]
             [quo.components.tooltip :as tooltip]
-            [quo.platform :as platform]
-            [quo.design-system.typography :as typography]
-            [quo.design-system.spacing :as spacing]
             [quo.design-system.colors :as colors]
-            [quo.components.text :as text]))
+            [quo.design-system.spacing :as spacing]
+            [quo.design-system.typography :as typography]
+            [quo.platform :as platform]
+            [quo.react-native :as rn] ;; TODO(Ferossgp): Move icon component to lib
+            [reagent.core :as reagent]
+            [status-im.ui.components.icons.icons :as icons]))
 
 ;; NOTE(Ferossgp): Refactor with hooks when available
 ;; We track all currently mounted text input refs
@@ -22,19 +21,26 @@
 (s/def ::multiline boolean?)
 (s/def ::secure-text-entry boolean?)
 (s/def ::show-cancel boolean?)
-(s/def ::label (s/nilable (s/or :string string? :component vector?)))
+(s/def ::label
+  (s/nilable (s/or :string    string?
+                   :component vector?)))
 (s/def ::cancel-label (s/nilable string?))
 (s/def ::default-value (s/nilable string?))
 (s/def ::placeholder (s/nilable string?))
-(s/def ::keyboard-type (s/nilable (s/or :string string? :keyword keyword?))) ; TODO: make set
-(s/def ::accessibility-label (s/nilable (s/or :string string? :keyword keyword?)))
+(s/def ::keyboard-type
+  (s/nilable (s/or :string  string?
+                   :keyword keyword?))) ; TODO: make set
+(s/def ::accessibility-label
+  (s/nilable (s/or :string  string?
+                   :keyword keyword?)))
 (s/def ::on-focus fn?)
 (s/def ::on-blur fn?)
 (s/def ::on-press fn?)
 
-(s/def ::accessory (s/keys :opt-un [::on-press
-                                    ::icon
-                                    ::component]))
+(s/def ::accessory
+  (s/keys :opt-un [::on-press
+                   ::icon
+                   ::component]))
 (s/def ::after (s/nilable ::accessory))
 (s/def ::before (s/nilable ::accessory))
 
@@ -42,25 +48,27 @@
 (s/def ::input-style ::style)
 (s/def ::container-style ::style)
 
-(s/def ::text-input (s/keys :opt-un
-                            [::label
-                             ::multiline
-                             ::error
-                             ::style
-                             ::input-style
-                             ::keyboard-type
-                             ::before
-                             ::after
-                             ::cancel-label
-                             ::on-focus
-                             ::on-blur
-                             ::container-style
-                             ::show-cancel
-                             ::accessibility-label
-                             ::bottom-value
-                             ::secure-text-entry]))
+(s/def ::text-input
+  (s/keys :opt-un
+          [::label
+           ::multiline
+           ::error
+           ::style
+           ::input-style
+           ::keyboard-type
+           ::before
+           ::after
+           ::cancel-label
+           ::on-focus
+           ::on-blur
+           ::container-style
+           ::show-cancel
+           ::accessibility-label
+           ::bottom-value
+           ::secure-text-entry]))
 
-(defn check-spec [spec prop]
+(defn check-spec
+  [spec prop]
   (if (s/valid? spec prop)
     true
     (do
@@ -70,14 +78,17 @@
 (def height 44)                         ; 22 line-height + 11*2 vertical padding
 (def multiline-height 88)               ; 3 * 22 three line-height + 11* vertical padding
 
-(defn label-style []
+(defn label-style
+  []
   {:margin-bottom (:tiny spacing/spacing)})
 
-(defn text-input-row-style []
+(defn text-input-row-style
+  []
   {:flex-direction :row
    :align-items    :center})
 
-(defn text-input-view-style [style]
+(defn text-input-view-style
+  [style]
   (merge {:border-radius    8
           :flex-direction   :row
           :flex             1
@@ -85,7 +96,8 @@
           :background-color (:ui-01 @colors/theme)}
          style))
 
-(defn text-input-style [multiline input-style monospace before after]
+(defn text-input-style
+  [multiline input-style monospace before after]
   (merge (if monospace
            typography/monospace
            typography/font-regular)
@@ -107,66 +119,76 @@
             :height              multiline-height})
          input-style))
 
-(defn cancel-style []
+(defn cancel-style
+  []
   {:margin-left     (:tiny spacing/spacing)
    :padding-left    (:tiny spacing/spacing)
    :justify-content :center
    :align-self      :stretch})
 
-(defn accessory-style []
+(defn accessory-style
+  []
   (merge (:base spacing/padding-horizontal)
          {:flex            1
           :justify-content :center}))
 
-(defn accessory-element [{:keys [icon component icon-opts style accessibility-label on-press]}]
+(defn accessory-element
+  [{:keys [icon component icon-opts style accessibility-label on-press]}]
   (let [el (if on-press
              rn/touchable-opacity
              rn/view)]
-    [el (merge {:style {:align-self :stretch}}
-               (when on-press
-                 {:on-press on-press}))
-     [rn/view (merge {:style (merge (accessory-style)
-                                    style)}
-                     (when accessibility-label
-                       {:accessibility-label accessibility-label}))
+    [el
+     (merge {:style {:align-self :stretch}}
+            (when on-press
+              {:on-press on-press}))
+     [rn/view
+      (merge {:style (merge (accessory-style)
+                            style)}
+             (when accessibility-label
+               {:accessibility-label accessibility-label}))
       (cond
         icon
-        [icons/icon icon (merge {:color (:icon-01 @colors/theme)}
-                                icon-opts)]
+        [icons/icon icon
+         (merge {:color (:icon-01 @colors/theme)}
+                icon-opts)]
         component
         component
 
         :else
         nil)]]))
 
-(defn text-input-raw []
+(defn text-input-raw
+  []
   (let [focused (reagent/atom nil)
         visible (reagent/atom false)
         ref     (atom nil)
         blur    (fn []
-                  (some-> @ref (ocall "blur")))]
-    (fn [{:keys [label multiline error style input-style keyboard-type before after
-                 cancel-label on-focus on-blur show-cancel accessibility-label
-                 bottom-value secure-text-entry container-style get-ref on-cancel
-                 monospace auto-complete-type auto-correct]
-          :or  {cancel-label "Cancel"}
-          :as  props}]
+                  (some-> @ref
+                          (ocall "blur")))]
+    (fn
+      [{:keys [label multiline error style input-style keyboard-type before after
+               cancel-label on-focus on-blur show-cancel accessibility-label
+               bottom-value secure-text-entry container-style get-ref on-cancel
+               monospace auto-complete-type auto-correct]
+        :or   {cancel-label "Cancel"}
+        :as   props}]
       {:pre [(check-spec ::text-input props)]}
-      (let [show-cancel (if (nil? show-cancel)
-                          ;; Enabled by default on iOs and disabled on Android
-                          platform/ios?
-                          show-cancel)
-            after       (cond
-                          (and secure-text-entry @visible)
-                          {:icon     :main-icons/hide
-                           :on-press #(reset! visible false)}
+      (let [show-cancel   (if (nil? show-cancel)
+                            ;; Enabled by default on iOs and disabled on Android
+                            platform/ios?
+                            show-cancel)
+            after         (cond
+                            (and secure-text-entry @visible)
+                            {:icon     :main-icons/hide
+                             :on-press #(reset! visible false)}
 
-                          (and secure-text-entry (not @visible))
-                          {:icon     :main-icons/show
-                           :on-press #(reset! visible true)}
+                            (and secure-text-entry (not @visible))
+                            {:icon     :main-icons/show
+                             :on-press #(reset! visible true)}
 
-                          :else after)
-            secure        (boolean (and secure-text-entry (not @visible))) ; must be a boolean to work on iOS
+                            :else                                  after)
+            secure        (boolean (and secure-text-entry (not @visible))) ; must be a boolean to work on
+                                                                           ; iOS
             auto-complete (cond
                             (= keyboard-type :visible-password)
                             :off
@@ -176,7 +198,9 @@
 
                             :else
                             auto-complete-type)
-            auto-correct  (and (not= keyboard-type :visible-password) (not secure-text-entry) auto-correct)
+            auto-correct  (and (not= keyboard-type :visible-password)
+                               (not secure-text-entry)
+                               auto-correct)
             on-cancel     (fn []
                             (when on-cancel
                               (on-cancel))
@@ -185,8 +209,10 @@
                             (and platform/ios? (= keyboard-type :visible-password))
                             :default
 
-                            ; the correct approach on Android would be keep secure-text-entry on set keyboard type
-                            ; to visible-password. But until https://github.com/facebook/react-native/issues/27946
+                            ; the correct approach on Android would be keep secure-text-entry on set
+                            ; keyboard type
+                            ; to visible-password. But until
+                            ; https://github.com/facebook/react-native/issues/27946
                             ; is solved that's the second best way.
                             (and platform/android? secure-text-entry)
                             :default
@@ -198,59 +224,71 @@
            [text/text {:style (label-style)}
             label])
          [rn/view {:style (text-input-row-style)}
-          [rn/view {:style                       (text-input-view-style style)
-                    :important-for-accessibility (if secure-text-entry
-                                                   :no-hide-descendants
-                                                   :auto)}
+          [rn/view
+           {:style                       (text-input-view-style style)
+            :important-for-accessibility (if secure-text-entry
+                                           :no-hide-descendants
+                                           :auto)}
            (when before
              [accessory-element before])
            [rn/text-input
-            (merge {:style                   (text-input-style multiline input-style monospace before after)
-                    :ref                     (fn [r]
-                                               (reset! ref r)
-                                               (when get-ref (get-ref r)))
-                    :placeholder-text-color  (:text-02 @colors/theme)
-                    :underline-color-android :transparent
-                    :auto-capitalize         :none
-                    :secure-text-entry       secure
-                    :auto-correct            auto-correct
-                    :auto-complete-type      auto-complete
-                    :on-focus                (fn [evt]
-                                               (when on-focus (on-focus evt))
-                                               (when show-cancel
-                                                 (rn/configure-next (:ease-in-ease-out rn/layout-animation-presets)))
-                                               (reset! focused true))
-                    :on-blur                 (fn [evt]
-                                               (when on-blur (on-blur evt))
-                                               (when show-cancel
-                                                 (rn/configure-next (:ease-in-ease-out rn/layout-animation-presets)))
-                                               (reset! focused false))
-                    :keyboard-type           keyboard-type}
-                   (when (and platform/ios? (not after))
-                     {:clear-button-mode :while-editing})
-                   (dissoc props
-                           :style :keyboard-type :on-focus :on-blur
-                           :secure-text-entry :ref :get-ref :auto-correct :auto-complete-type))]
+            (merge
+             {:style                   (text-input-style multiline input-style monospace before after)
+              :ref                     (fn [r]
+                                         (reset! ref r)
+                                         (when get-ref (get-ref r)))
+              :placeholder-text-color  (:text-02 @colors/theme)
+              :underline-color-android :transparent
+              :auto-capitalize         :none
+              :secure-text-entry       secure
+              :auto-correct            auto-correct
+              :auto-complete-type      auto-complete
+              :on-focus                (fn [evt]
+                                         (when on-focus (on-focus evt))
+                                         (when show-cancel
+                                           (rn/configure-next (:ease-in-ease-out
+                                                               rn/layout-animation-presets)))
+                                         (reset! focused true))
+              :on-blur                 (fn [evt]
+                                         (when on-blur (on-blur evt))
+                                         (when show-cancel
+                                           (rn/configure-next (:ease-in-ease-out
+                                                               rn/layout-animation-presets)))
+                                         (reset! focused false))
+              :keyboard-type           keyboard-type}
+             (when (and platform/ios? (not after))
+               {:clear-button-mode :while-editing})
+             (dissoc props
+                     :style
+                     :keyboard-type :on-focus
+                     :on-blur
+                     :secure-text-entry
+                     :ref           :get-ref
+                     :auto-correct  :auto-complete-type))]
            (when after
              [accessory-element after])]
           (when (and show-cancel
                      (not multiline)
                      @focused)
-            [rn/touchable-opacity {:style    (cancel-style)
-                                   :on-press on-cancel}
+            [rn/touchable-opacity
+             {:style    (cancel-style)
+              :on-press on-cancel}
              [text/text {:color :link} cancel-label]])
           (when error
-            [tooltip/tooltip (merge {:bottom-value (if bottom-value bottom-value 0)}
-                                    (when accessibility-label
-                                      {:accessibility-label (str (name accessibility-label) "-error")}))
-             [text/text {:color :negative
-                         :align :center
-                         :size  :small}
+            [tooltip/tooltip
+             (merge {:bottom-value (if bottom-value bottom-value 0)}
+                    (when accessibility-label
+                      {:accessibility-label (str (name accessibility-label) "-error")}))
+             [text/text
+              {:color :negative
+               :align :center
+               :size  :small}
               error]])]]))))
 
 ;; TODO(Ferossgp): Refactor me when hooks available
-(defn text-input [{:keys [preserve-input?]
-                   :as   props}]
+(defn text-input
+  [{:keys [preserve-input?]
+    :as   props}]
   (if preserve-input?
     [text-input-raw props]
     (let [id (random-uuid)]
@@ -261,10 +299,11 @@
         :reagent-render
         (fn [{:keys [get-ref default-value]
               :as   props}]
-          [text-input-raw (merge props
-                                 {:get-ref (fn [r]
-                                             ;; Store input and its defaultValue
-                                             ;; one we receive a non-nil ref
-                                             (when r
-                                               (swap! text-input-refs assoc id  {:ref r :value default-value}))
-                                             (when get-ref (get-ref r)))})])}))))
+          [text-input-raw
+           (merge props
+                  {:get-ref (fn [r]
+                              ;; Store input and its defaultValue
+                              ;; one we receive a non-nil ref
+                              (when r
+                                (swap! text-input-refs assoc id {:ref r :value default-value}))
+                              (when get-ref (get-ref r)))})])}))))

src/quo/components/tooltip.cljs

@@ -1,17 +1,17 @@
 (ns quo.components.tooltip
-  (:require [reagent.core :as reagent]
-            [oops.core :refer [oget]]
+  (:require [oops.core :refer [oget]]
             [quo.animated :as animated]
-            [quo.react-native :as rn]
             [quo.design-system.colors :as colors]
             [quo.design-system.spacing :as spacing]
-            [quo.platform :as platform]
-            ;; FIXME(Ferossgp): Dependecy on status
+            [quo.platform :as platform] ;; FIXME(Ferossgp): Dependecy on status
+            [quo.react-native :as rn]
+            [reagent.core :as reagent]
             [status-im.ui.components.icons.icons :as icons]))
 
 (def ^:private initial-height 22)
 
-(defn tooltip-style [{:keys [bottom-value animation]}]
+(defn tooltip-style
+  [{:keys [bottom-value animation]}]
   (merge
    (:base spacing/padding-horizontal)
    {:position    :absolute
@@ -22,7 +22,8 @@
     :opacity     animation
     :transform   [{:translateY (animated/mix animation 10 0)}]}))
 
-(defn container-style []
+(defn container-style
+  []
   {:z-index        2
    :align-items    :center
    :shadow-radius  16
@@ -30,43 +31,50 @@
    :shadow-color   (:shadow-01 @colors/theme)
    :shadow-offset  {:width 0 :height 4}})
 
-(defn content-style []
+(defn content-style
+  []
   (merge (:base spacing/padding-horizontal)
          {:padding-vertical 6
           :elevation        2
           :background-color (:ui-background @colors/theme)
           :border-radius    8}))
 
-(defn tooltip []
+(defn tooltip
+  []
   (let [layout      (reagent/atom {:height initial-height})
         animation-v (animated/value 0)
         animation   (animated/with-timing-transition
-                      animation-v
-                      {:easing (:ease-in animated/easings)})
+                     animation-v
+                     {:easing (:ease-in animated/easings)})
         on-layout   (fn [evt]
                       (let [width  (oget evt "nativeEvent" "layout" "width")
                             height (oget evt "nativeEvent" "layout" "height")]
                         (reset! layout {:width  width
                                         :height height})))]
-    (fn  [{:keys [bottom-value accessibility-label]} & children]
+    (fn [{:keys [bottom-value accessibility-label]} & children]
       [:<>
-       [animated/code {:exec (animated/cond* (animated/not* animation-v)
-                                             (animated/set animation-v 1))}]
-       [animated/view {:style          (tooltip-style {:bottom-value (- (get @layout :height)
-                                                                        bottom-value)
-                                                       :animation    animation})
-                       :pointer-events :box-none}
-        [animated/view {:style          (container-style)
-                        :pointer-events :box-none}
-         (into [rn/view {:style               (content-style)
-                         :pointer-events      :box-none
-                         :accessibility-label accessibility-label
-                         :on-layout           on-layout}]
+       [animated/code
+        {:exec (animated/cond* (animated/not* animation-v)
+                               (animated/set animation-v 1))}]
+       [animated/view
+        {:style          (tooltip-style {:bottom-value (- (get @layout :height)
+                                                          bottom-value)
+                                         :animation    animation})
+         :pointer-events :box-none}
+        [animated/view
+         {:style          (container-style)
+          :pointer-events :box-none}
+         (into [rn/view
+                {:style               (content-style)
+                 :pointer-events      :box-none
+                 :accessibility-label accessibility-label
+                 :on-layout           on-layout}]
                children)
 
          (when platform/ios?
            ;; NOTE(Ferossgp): Android does not show elevation for tooltip making it lost on white bg
-           [icons/icon :icons/tooltip-tip {:width           18
-                                           :height          8
-                                           :container-style {:elevation 3}
-                                           :color           (:ui-background @colors/theme)}])]]])))
+           [icons/icon :icons/tooltip-tip
+            {:width           18
+             :height          8
+             :container-style {:elevation 3}
+             :color           (:ui-background @colors/theme)}])]]])))

src/quo/core.cljs

@@ -1,18 +1,18 @@
 (ns quo.core
   (:require [quo.components.animated-header :as animated-header]
+            [quo.components.bottom-sheet.view :as bottom-sheet]
+            [quo.components.button.view :as button]
+            [quo.components.controls.view :as controls]
             [quo.components.header :as header]
+            [quo.components.list.footer :as list-footer]
+            [quo.components.list.header :as list-header]
+            [quo.components.list.index :as list-index]
+            [quo.components.list.item :as list-item]
             [quo.components.safe-area :as safe-area]
+            [quo.components.separator :as separator]
+            [quo.components.text :as text]
             [quo.components.text-input :as text-input]
             [quo.components.tooltip :as tooltip]
-            [quo.components.text :as text]
-            [quo.components.button.view :as button]
-            [quo.components.list.header :as list-header]
-            [quo.components.list.footer :as list-footer]
-            [quo.components.list.item :as list-item]
-            [quo.components.list.index :as list-index]
-            [quo.components.controls.view :as controls]
-            [quo.components.bottom-sheet.view :as bottom-sheet]
-            [quo.components.separator :as separator]
             [quo.design-system.colors :as colors]))
 
 (def text text/text)

src/quo/design_system/colors.cljs

@@ -1,6 +1,6 @@
 (ns quo.design-system.colors
-  (:require [reagent.core :as reagent]
-            [clojure.string :as string]))
+  (:require [clojure.string :as string]
+            [reagent.core :as reagent]))
 
 ;; Colors mapping from figma to code, note that theme is more extended and
 ;; one can follow the comments from the light theme to choose what to use in a component.
@@ -19,14 +19,17 @@
 
 (def light-theme
   {:positive-01    "rgba(68,208,88,1)"     ; Primary Positive, text, icons color
-   :positive-02    "rgba(78,188,96,0.1)"   ; Secondary Positive, Supporting color for success illustrations
+   :positive-02    "rgba(78,188,96,0.1)"   ; Secondary Positive, Supporting color for success
+                                           ; illustrations
    :positive-03    "rgba(78,188,96,1)"     ; Lighter Positive, Supporting color for success illustrations
    :negative-01    "rgba(255,45,85,1)"     ; Primary Negative, text, icons color
-   :negative-02    "rgba(255,45,85,0.1))"  ; Secondary Negative, Supporting color for errors illustrations
+   :negative-02    "rgba(255,45,85,0.1))"  ; Secondary Negative, Supporting color for errors
+                                           ; illustrations
    :warning-01     "rgba(255, 202, 15, 1)"
    :warning-02     "rgba(255, 202, 15, 0.1)"
    :interactive-01 "rgba(67,96,223,1)"     ; Accent color, buttons, own message, actions,active state
-   :interactive-02 "rgba(236,239,252,1)"   ; Light Accent, buttons background, actions background, messages
+   :interactive-02 "rgba(236,239,252,1)"   ; Light Accent, buttons background, actions background,
+                                           ; messages
    :interactive-03 "rgba(255,255,255,0.1)" ; Background for interactive above accent
    :interactive-04 "rgba(147,155,161,1)"   ; Disabled state
    :ui-background  "rgba(255,255,255,1)"   ; Default view background
@@ -85,12 +88,14 @@
 
 (def theme (reagent/atom light-theme))
 
-(defn get-color [color]
+(defn get-color
+  [color]
   (get @theme color))
 
 ;; LEGACY COLORS
 
-(defn alpha [value opacity]
+(defn alpha
+  [value opacity]
   (if (string/starts-with? value "#")
     (let [hex (string/replace value #"#" "")
           r   (js/parseInt (subs hex 0 2) 16)
@@ -100,13 +105,15 @@
     (let [rgb (string/split value #",")]
       (str (string/join "," (butlast rgb)) "," opacity ")"))))
 
-(def old-colors-mapping-light {:mentioned-background "#def6fc"
-                               :mentioned-border     "#b8ecf9"
-                               :pin-background         "#FFEECC"})
+(def old-colors-mapping-light
+  {:mentioned-background "#def6fc"
+   :mentioned-border     "#b8ecf9"
+   :pin-background       "#FFEECC"})
 
-(def old-colors-mapping-dark {:mentioned-background "#2a4046"
-                              :mentioned-border     "#2a4046"
-                              :pin-background         "#34232B"})
+(def old-colors-mapping-dark
+  {:mentioned-background "#2a4046"
+   :mentioned-border     "#2a4046"
+   :pin-background       "#34232B"})
 
 (def old-colors-mapping-themes {:dark old-colors-mapping-dark :light old-colors-mapping-light})
 
@@ -127,7 +134,8 @@
 ;; BLACK
 (def black (:text-01 light-theme))                                  ;; Used as the default text color
 (def black-persist (:ui-background dark-theme))                           ;; this doesn't with theme
-(def black-transparent (:ui-02 light-theme))                   ;; Used as background color for rounded button on dark background and as background color for containers like "Backup recovery phrase"
+(def black-transparent (:ui-02 light-theme))                   ;; Used as background color for rounded button on dark background and as background
+                   ;; color for containers like "Backup recovery phrase"
 (def black-transparent-20 (:backdrop light-theme))                ; accounts divider
 (def black-transparent-40 (:backdrop light-theme))
 (def black-transparent-40-persist (:backdrop light-theme))
@@ -136,7 +144,8 @@
 (def black-transparent-86 (:ui-03 light-theme))
 
 ;; DARK GREY
-(def gray (:text-02 light-theme))                                    ;; Dark grey, used as a background for a light foreground and as section header and secondary text color
+(def gray (:text-02 light-theme))                                    ;; Dark grey, used as a background for a light foreground and as
+                                    ;; section header and secondary text color
 (def gray-transparent-10 (alpha gray 0.1))
 (def gray-transparent-40 (alpha gray 0.4))
 ;; LIGHT GREY
@@ -164,20 +173,22 @@
 (def purple "#887af9")
 (def orange "#FE8F59")
 
-(def chat-colors ["#fa6565"
-                  "#7cda00"
-                  purple
-                  "#51d0f0"
-                  orange
-                  "#d37ef4"])
+(def chat-colors
+  ["#fa6565"
+   "#7cda00"
+   purple
+   "#51d0f0"
+   orange
+   "#d37ef4"])
 
-(def account-colors ["#9B832F"
-                     "#D37EF4"
-                     "#1D806F"
-                     "#FA6565"
-                     "#7CDA00"
-                     purple
-                     "#8B3131"])
+(def account-colors
+  ["#9B832F"
+   "#D37EF4"
+   "#1D806F"
+   "#FA6565"
+   "#7CDA00"
+   purple
+   "#8B3131"])
 
 (def mention-incoming "#0DA4C9")
 (def mention-outgoing "#9EE8FA")
@@ -191,10 +202,12 @@
 
 (def theme-type (reagent/atom :light))
 
-(defn dark? []
+(defn dark?
+  []
   (= :dark @theme-type))
 
-(defn set-legacy-theme-type [type]
+(defn set-legacy-theme-type
+  [type]
   (when-not (= type @theme-type)
     (let [old-colors-mapping-colors (get old-colors-mapping-themes type)]
       (set! white (:ui-background @theme))

src/quo/design_system/spacing.cljs

@@ -1,19 +1,22 @@
 (ns quo.design-system.spacing)
 
-(def spacing {:x-tiny   4
-              :tiny     8
-              :small    12
-              :base     16
-              :large    24
-              :x-large  32
-              :xx-large 48})
+(def spacing
+  {:x-tiny   4
+   :tiny     8
+   :small    12
+   :base     16
+   :large    24
+   :x-large  32
+   :xx-large 48})
 
-(def padding-horizontal (reduce-kv (fn [m k v]
-                                     (assoc m k {:padding-horizontal v}))
-                                   {}
-                                   spacing))
+(def padding-horizontal
+  (reduce-kv (fn [m k v]
+               (assoc m k {:padding-horizontal v}))
+             {}
+             spacing))
 
-(def padding-vertical (reduce-kv (fn [m k v]
-                                   (assoc m k {:padding-vertical v}))
-                                 {}
-                                 spacing))
+(def padding-vertical
+  (reduce-kv (fn [m k v]
+               (assoc m k {:padding-vertical v}))
+             {}
+             spacing))

src/quo/design_system/typography.cljs

@@ -1,25 +1,32 @@
 (ns quo.design-system.typography)
 
-(def tiny {:font-size    10
-           :line-height 14})
+(def tiny
+  {:font-size   10
+   :line-height 14})
 
-(def x-small {:font-size 12
-              :line-height 16})
+(def x-small
+  {:font-size   12
+   :line-height 16})
 
-(def small {:font-size   13
-            :line-height 18})
+(def small
+  {:font-size   13
+   :line-height 18})
 
-(def base {:font-size   15
-           :line-height 22})
+(def base
+  {:font-size   15
+   :line-height 22})
 
-(def large {:font-size   17
-            :line-height 24})
+(def large
+  {:font-size   17
+   :line-height 24})
 
-(def x-large {:font-size   22
-              :line-height 30})
+(def x-large
+  {:font-size   22
+   :line-height 30})
 
-(def xx-large {:font-size  28
-               :line-height 38})
+(def xx-large
+  {:font-size   28
+   :line-height 38})
 
 (def font-regular {:font-family "Inter-Regular"}) ; 400