pair with JC to setup visual testing

2022-11-05 23:40:01 +03:00
613 changed files with 12092 additions and 21872 deletions
@@ -0,0 +1,8 @@
+{
+  "presets": [
+    "module:metro-react-native-babel-preset"
+  ],
+  "plugins": [
+    "react-native-reanimated/plugin"
+  ]
+}
@@ -200,7 +200,7 @@ status-im.utils.platform/isMacOs?
 status-im.utils.platform/isNix?
 status-im.utils.platform/isWin?
 status-im.utils.platform/android-version>=
-utils.debounce/clear-all
+status-im.utils.debounce/clear-all
 status-im.transport.db/create-chat
 status-im.utils.priority-map/priority-map
 status-im.utils.priority-map/priority-map-by
@@ -1,20 +1,13 @@
-{: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
-           status-im.test-helpers/deftest-sub clojure.core/defn
-           taoensso.tufte/defnp               clojure.core/defn}
- :linters {:consistent-alias  {:level   :error
-                               :aliases {clojure.string  string
-                                         taoensso.timbre log}}
-           :invalid-arity     {:skip-args [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]}}}
+{: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]}}}
@@ -1,37 +0,0 @@
-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"
-    }
-  }
-}
@@ -0,0 +1,38 @@
+{
+   "testRunner": "jest",
+   "testRegex": "\\.visual\\.js$",
+
+    "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": "/Users/erik/Library/Developer/Xcode/DerivedData/StatusIm-dkjkfsbgallhrnchhutvuvbicfsa/Build/Products/Debug-iphonesimulator/StatusIm.app",
+        "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"
+      }
+    }
+  }
@@ -4,7 +4,7 @@ DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -32,4 +32,3 @@ COMMANDS_ENABLED=1
 TWO_MINUTES_SYNCING=1
 SWAP_ENABLED=1
 STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1
@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.staging
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
@@ -32,4 +32,3 @@ COMMUNITIES_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
 STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1
@@ -3,7 +3,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -34,4 +34,3 @@ DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
 ENABLE_QUO_PREVIEW=1
 STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1
@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -7,7 +7,6 @@

 # Xcode
 #
-/component-spec
 result/
 build/
 *.pbxuser
@@ -176,11 +175,3 @@ test/appium/tests/users.py
 ##node bindings
 /bin/
 /lib/
-
-## visual tests
-/artifacts
-
-/.calva/
-
-## component-tests
-*.log
@@ -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 Android release builds
+# Useful for Andoird 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
@@ -287,7 +287,6 @@ endif

 lint: export TARGET := clojure
 lint: ##@test Run code style checks
-	sh scripts/lint-re-frame-in-quo-components.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
 	TARGETS=$$(git diff --diff-filter=d --cached --name-only src && echo src) && \
 	clojure -Scp "$$CLASS_PATH" -m cljfmt.main check --indents indentation.edn $$TARGETS
@@ -307,36 +306,13 @@ test-watch: ##@ Watch tests and re-run no changes to cljs files

 test: export TARGET := clojure
 test: ##@test Run tests once in NodeJS
-	# Here we create the gyp bindings for nodejs
+	# Here we creates the gyp bindings for nodejs
 	yarn install
 	yarn shadow-cljs compile mocks && \
 	yarn shadow-cljs compile test && \
 	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
 #--------------

@@ -10,11 +10,11 @@ Join us in creating a browser, messenger, and gateway to a decentralized world.

 ## Why?

-We believe in a medium of pure free trade, economies with fair, permission-less access and a world without intermediaries. We want to create policies that can exist between friends or scale globally, we want to communicate securely and be uninhibited by legacy systems.
+We believe in a medium of pure free trade, economies with fair, permission-less access and a world without intermediaries. We want to create policies that can exist between friends or scale globally, we want to communicate securely and be uninhibited by legacy systems.   

 We want to take responsibility for our data, the way we conduct ourselves privately and promote this way of life to a mass audience.

-We want deep insights into our own economies so we can make informed, data-driven decisions on how to make our lives better. The Ethereum blockchain, Smart Contracts, Swarm and Whisper provides us a path forward.
+We want deep insights into our own economies so we can make informed, data-driven decisions on how to make our lives better. The Ethereum blockchain, Smart Contracts, Swarm and Whisper provides us a path forward.  

 If this interests you, **help us make Status a reality** - anyone can contribute and we need everyone at any skill level to participate.

@@ -22,37 +22,29 @@ If this interests you, **help us make Status a reality** - anyone can contribute

 Go straight to the [docs](https://status.im/docs) or [join our chat](https://join.status.im/chat/public/status) and choose what interests you:

- **Developer** Developers are the heart of software and to keep Status beating
-we need all the help we can get! If you're looking to code in ClojureScript or
-Golang then Status is the project for you! We use React Native and there is even
-some Java/Objective-C too! Want to learn more about it? Start by reading our
-[Developer Introduction](https://status.im/developer_tools/) which guides you
-through the technology stack and start browsing [beginner
-issues](https://github.com/status-im/status-mobile/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20).
-Then you can read how to [Build
-Status](https://status.im/technical/build_status/), which talks about managing
-project dependencies, coding guidelines and testing procedures. The [doc/](doc/)
-directory also has valuable information for contributors.
+- **Developer**
+Developers are the heart of software and to keep Status beating we need all the help we can get! If you're looking to code in ClojureScript or Golang then Status is the project for you! We use React Native and there is even some Java/Objective-C too!  
+Want to learn more about it? Start by reading our [Developer Introduction](https://status.im/developer_tools/) which guides you through the technology stack and start browsing [beginner issues](https://github.com/status-im/status-mobile/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20). Then you can read how to [Build Status](https://status.im/technical/build_status/), which talks about managing project dependencies, coding guidelines and testing procedures.

- **Community Management**
+- **Community Management**  
 Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and long lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.im/about)

- **Specification / Documentation**
+- **Specification / Documentation**  
 John Dewey once said "Education is not preparation for life; education is life *itself* ". Developers & Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, head over to our [docs](https://status.im/docs) and see how you can improve what we have.

- **Blog Writing**
+- **Blog Writing**  
 Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page. [Jump into our chat](https://join.status.im/chat/public/status) and discuss with the team how you can contribute!

- **Testers**
+- **Testers**  
 It's bug hunting season! Status is currently under active development and there is sure to be a bunch of learning, [build status from scratch](https://status.im/technical/build_status/) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-mobile/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!

- **Security**
+- **Security**  
 Status is a visual interface to make permanent changes on the Blockchain, it handles crypto-tokens that have real value and allows 3rd party code execution. Security is paramount to its success. You are given permission to break Status as hard as you can, as long as you share your findings with the community!

- **Evangelism**
+- **Evangelism**  
 Help us spread the word! Tell a friend *right now*, in fact tell **everyone** - yell from a mountain if you have to, every person counts! If you've got a great story to tell or have some interesting way you've spread the word about Status let us know about it in our [chat](https://join.status.im/chat/public/status)

-## Status API
+## Status API 
 View our [API Docs](https://status.im/developer_tools/status_web_api.html) and learn how to integrate your DApp into Status. You can read more about how to add your DApp to Status [here](https://status.im/developer_tools/add_your_dapp.html).

 ## Give me Binaries!
@@ -1,24 +0,0 @@
-module.exports = {
-
-    "presets": [
-        "module:metro-react-native-babel-preset"
-    ],
-    "plugins": [
-        "react-native-reanimated/plugin"
-    ],
-    "env": {
-        "test": {
-            "presets": [
-                '@babel/preset-react',
-                [
-                    '@babel/preset-env',
-                    {
-                        targets: {
-                            node: '14',
-                        },
-                    },
-                ],
-            ],
-        }
-    }
-}
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'

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

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

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

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

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -62,7 +62,7 @@ pipeline {
                --rerun_count=2 \
                --testrail_report=True \
                -m testrail_id \
-                -m \"new_ui_critical or new_ui_medium\" \
+                -m \"new_ui_critical\" \
                -k \"${params.KEYWORD_EXPRESSION}\" \
                --apk=${params.APK_NAME}
            """
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@v1.6.1'

 pipeline {

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

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

 pipeline {
  agent { label 'linux' }
@@ -93,6 +93,6 @@ To use a physical iPhone your device UDID must be added to provisioning profiles
  - Invite your Apple account to be Developer in Status team.
 3. Run a build in XCode using the project from `status-mobile/ios` directory.
  - You might see error: `Select a development team in the Signing & Capabilities editor`
-  - Select `Status Research & Development GmbH` as the development team and rebuild again.
+  - Select `STATUS HOLDINGS PTE. LTD.` as the development team and rebuild again.

 Once build finishes Status should start on your iPhone with its logs in terminal running `make run-metro`.
@@ -1,9 +1,5 @@
 # Codebase Structure and Guidelines

-As of Nov/2022, we're starting to document and migrate the codebase to [new
-guidelines](new-guidelines.md), which will supersede some of the guidelines in
-this document.
-
 ## Starting the app

 The app is bundled and run in a Nix environment. Information regarding how to run it locally can be found [here](https://status.im/technical/build_status/).
@@ -89,7 +85,7 @@ These guidelines make db.cljs namespaces the place to go when making changes to
    - If issues - label 'TESTED-ISSUES' and comment from QA with bugs.
    - After fix and/or discussion the process is repeated.

-  - If manual QA is not needed but all tests don't pass, you can ping @churik or @Serhy to confirm that failed E2E tests are not unrelated.
+  - If manual QA is not needed but all tests don't pass, you can ping @churik or @Serhy to confirm that failed E2E tests are not unrelated. 

 ## Enabling debug logs
 Calls to `log/debug` will not be printed to the console by default. It can be enabled under "Advanced settings" in the app:
@@ -1,528 +0,0 @@
-# Guidelines
-
->The goal of this document is to help all contributors (core and external) to
->write code in _unison_ and help establish good practices that serve the Status
->Mobile contributors well.
-
-We don't want to turn this document into an exhaustive list of rules to be
-followed that nobody will read. As much as possible, we'll try to document only
-what we consider important for Status Mobile. In other words, we don't want to
-maintain a general Clojure convention/style guide, nor do we want to turn this
-document into a long tutorial.
-
-This is a **work in progress**, and not all conventions are properly implemented
-in the codebase yet. The project structure is also going over major changes (as
-of Nov/2022), and it'll take a considerable amount of time until we migrate the
-existing code to the new structure.
-
-If you find out anything is outdated or missing, please, share with us or even
-better, create a pull-request! 🤸
-
-## Style guide
-
-We mostly follow the [Clojure Style
-Guide](https://github.com/bbatsov/clojure-style-guide), so it's recommended to
-get familiar with it.
-
-As of Nov/2022, running `make lint` should fix the most basic formatting issues,
-and we are in the process of integrating a tool to format non-trivial code
-according to the Clojure Style Guide. This should greatly reduce noise in
-pull-request reviews and it'll simplify the life of all contributors.
-
-Pay special attention to:
-
- Align let bindings https://github.com/bbatsov/clojure-style-guide#bindings-alignment
- Align map keys https://github.com/bbatsov/clojure-style-guide#map-keys-alignment
-
-## Dos and don'ts
-
-### Component styles
-
-Prefer to define styles in separate files named `style.cljs`, usually colocated
-with the source file using it. For a real example, see
-[src/status_im/ui2/screens/chat/messages/style.cljs](../src/status_im/ui2/screens/chat/messages/style.cljs).
-
-```clojure
-;; bad
-(defn animated-checkbox-view [{:keys [size]}]
-  [animated/view
-   {:style {:width           size
-            :height          size
-            :border-radius   4
-            :justify-content :center
-            :align-items     :center}}
-   [animated/view
-    (do-something)]])
-
-;; good
-(defn animated-checkbox-view [{:keys [size]}]
-  [animated/view
-   {:style (style/animated-checkbox-style size)}
-   [animated/view
-    (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
-only when strictly necessary and when an issue is not enough to track the work
-left to be done.
-
-These are all good examples:
-
-```clojure
-;; TODO(@username): <message>
-;; TODO(@username): <message>, <issue URL>
-;; TODO(YYYY-MM-DD): <message>
-;; TODO(@username,YYYY-MM-DD): <message>
-```
-
-### Subscription names and event names
-
-Always register events and subscriptions using a meaningful namespace, but don't
-namespace them with `::`. We understand it's a controversial decision because
-there are both pros and cons to such practice.
-
-Whenever appropriate, it's also recommended to use _fake_ namespaces to convey
-more knowledge in the keyword about which bounded context (domain) it refers to.
-You may also use dots to convey hierarchical structures.
-
-```clojure
-;; bad
-;; Don't use real namespaced keywords.
-(re-frame/reg-sub
- ::profile-pictures-visibility
- :<- [:multiaccount]
- (fn [multiaccount]
-   (:profile-pictures-visibility multiaccount)))
-
-;; good
-;; Uses a fake namespaced keyword.
-(re-frame/reg-sub
- :profile/pictures-visibility
- :<- [:multiaccount]
- (fn [multiaccount]
-   (:profile-pictures-visibility multiaccount)))
-
-;; better
-;; Uses a fake namespaced keyword with a parent namespace (multiaccount).
-(re-frame/reg-sub
- :multiaccount.profile/pictures-visibility
- :<- [:multiaccount]
- (fn [multiaccount]
-   (:profile-pictures-visibility multiaccount)))
-```
-
-### Declaring view components
-
-Use the simple `defn` to declare components. Don't use `utils.views/defview` and
-`utils.views/letsubs`.
-
-```clojure
-;; bad
-(utils.views/defview browser []
-  (utils.views/letsubs [window-width [:dimensions/window-width]]
-    (do-something window-width)))
-
-;; good
-(defn browser []
-  (let [window-width (rf/sub [:dimensions/window-width])]
-    (do-something window-width)))
-```
-
-### Using re-frame subscriptions and dispatching events
-
-Use the `utils.re-frame` namespace instead of `re-frame.core` to subscribe and
-dispatch.
-
-```clojure
-;; bad
-(ns my-namespace
-  (:require [re-frame.core :as rf]))
-
-(let [username @(rf/subscribe [:username])]
-  [pressable/pressable {:on-press #(rf/dispatch [:do-something])}
-   [rn/view
-    (str "Hello " username)]])
-
-;; good
-(ns my-namespace
-  (:require [utils.re-frame :as rf]))
-
-(let [username (rf/sub [:username])]
-  [pressable/pressable {:on-press #(rf/dispatch [:do-something])}
-   [rn/view
-    (str "Hello " username)]])
-```
-
-### Registering event handlers
-
-Events must always be declared with the `utils.fx/defn` macro. Also, don't use
-`re-frame.core/reg-event-db`.
-
-```clojure
-;; bad
-(re-frame/reg-event-fx
- :wakuv2.ui/save-all-confirmed
- (fn [{:keys [db] :as cofx}]
-   ...))
-
-;; good
-(fx/defn save-all
-  {:events [:wakuv2.ui/save-all-confirmed]}
-  [{:keys [db] :as cofx}]
-  ...)
-```
-
-### Registering top-level re-frame subscriptions
-
-Use `subs.root/reg-root-key-sub` to register top-level (root) subscriptions.
-Additionally, register root subscriptions in the `subs.root` namespace.
-
-```clojure
-;; bad
-(re-frame/reg-sub
- :view-id
- (fn [db]
-   (:view-id db)))
-
-;; good
-(reg-root-key-sub :view-id :view-id)
-```
-
-### Registering layer-3 subscriptions
-
-The majority of the subscriptions should be defined as [layer-3
-subscriptions](https://day8.github.io/re-frame/subscriptions/#the-four-layer)
-due to performance constraints.
-
-```clojure
-;; bad
-(re-frame/reg-sub
- :ens/preferred-name
- (fn [db]
-   (get-in db [:multiaccount :preferred-name])))
-
-;; good
-(re-frame/reg-sub
- :ens/preferred-name
- :<- [:multiaccount]
- (fn [multiaccount]
-   (:preferred-name multiaccount)))
-```
-
-### Requiring quo2 components
-
-Consume `quo2` components from `quo2.core`, unless the namespace is also inside
-the `quo2/` directory.
-
-```clojure
-;; bad
-(ns my-namespace
-  (:require [quo2.components.icon :as icon]))
-
-(icon/icon :i/verified)
-
-;; good
-(ns my-namespace
-  (:require [quo2.core :as quo2]))
-
-(quo2/icon :i/verified)
-
-;; also good because both namespaces are inside quo2/
-(ns quo2.components.tabs.account-selector
-  (:require [quo2.components.markdown.text :as text]))
-```
-
-### Require/import
-
-Prefer `:as` instead of `:refer`. There are exceptions to this rule, e.g. the
-test macros `deftest` and `is`, which are ubiquitous in the Clojure community.
-
-```clojure
-;; bad
-(ns status-im.utils.datetime
-  (:require [cljs-time.coerce :refer [from-long]]))
-
-;; good
-(ns status-im.utils.datetime
-  (: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
-memory.
-
-```clojure
-;; bad
-[text/text {:accessibility-label "profile-nickname"}
- "Markov"]
-
-;; good
-[text/text {:accessibility-label :profile-nickname}
- "Markov"]
-```
-
-### Icons
-
-Use the appropriate keyword qualification/namespace and don't directly require
-namespaces inside `quo2/components/`.
-
-```clojure
-;; bad
-(require '[quo2.components.icon :as icons])
-(icons/icon :main-icons2/verified)
-
-;; good
-(require '[quo2.core :as quo2])
-(quo2/icon :i/verified)
-```
-
-### Translations
-
-Prefer to use translation placeholders instead of creating multiple translation
-keywords and concatenating them into a single string.
-
-```clojure
-;; bad
-;; Assume the translation key is:
-;;   "biometric-auth-error": "Unable perform biometric authentication"
-(str (i18n/label :t/biometric-auth-error) "(" error-code ")")
-
-;; good
-;; Assume the translation key is:
-;;   "biometric-auth-error": "Unable perform biometric authentication ({{code}})"
-(i18n/label :t/biometric-auth-error {:code error-code})
-```
-
-### Tests
-#### Subscription tests
-
-Test [layer-3 subscriptions](https://day8.github.io/re-frame/subscriptions/) by
-actually subscribing to them, so reframe's signal graph gets validated too.
-
-```clojure
-;; bad
-(defn user-recipes
-  [[current-user all-recipes location]]
-  ...)
-
-(re-frame/reg-sub
- :user/recipes
- :<- [:current-user]
- :<- [:all-recipes]
- :<- [:location]
- user-recipes)
-
-(deftest user-recipes-test
-  (testing "builds list of recipes"
-    (let [current-user {...}
-          all-recipes  {...}
-          location     [...]]
-      (is (= expected (recipes [current-user all-recipes location]))))))
-
-;; good
-(require '[status-im.test-helpers :as h])
-
-(re-frame/reg-sub
- :user/recipes
- :<- [:current-user]
- :<- [:all-recipes]
- :<- [:location]
- (fn [[current-user all-recipes location]]
-   ...))
-
-(h/deftest-sub :user/recipes
-  [sub-name]
-  (testing "builds list of recipes"
-    (swap! rf-db/app-db assoc
-           :current-user {...}
-           :all-recipes {...}
-           :location [...])
-    (is (= expected (rf/sub [sub-name])))))
-```
-
-## Project Structure
-
-First, the bird's-eye view with some example ClojureScript files:
-
-```
-src
-├── js/
-├── mocks/
-├── quo2
-│   ├── components/
-│   ├── foundations/
-│   └── theme.cljs
-├── react_native
-│   ├── gesture.cljs
-│   └── platform.cljs
-├── status_im
-│   ├── common
-│   │   └── components
-│   │       └── bottom_sheet.cljs
-│   ├── contexts/
-│   ├── setup/
-│   └── subs/
-└── utils.cljs
-```
-
- `src/js`: Raw Javascript files, e.g. React Native Reanimated worklets.
- `src/mocks`: Plumbing configuration to be able to run tests.
- `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
-  nesting level communicates their applicable limits.
- `src/status_im/common/components/`: Contains reusable components that are not
-  part of the design system (quo2).
- `src/status_im/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_im/subs/`: All subscriptions should live inside it.
-
-Directories named `utils/` can appear at any level of the directory tree. The
-directory nesting level precisely indicates its boundaries. For example, a
-`contexts/user_settings/utils/datetime.cljs` file communicates that it should
-only be used in the `user_settings` context.
-
-### src/quo2
-
-The `src/quo2/` directory holds all components for the new design system. As
-much as possible, its sub-directories and component names should reflect the
-same language used by designers.
-
-Even though the directory lives alongside the rest of the codebase, we should
-think of it as an external entity that abstracts away particular Status domain
-knowledge.
-
-Components inside `src/quo2/` should not rely on re-frame, i.e. they should not
-dispatch events or use subscriptions.
-
-Example structure:
-
-```
-src
-└── quo2
-    ├── components
-    │   └── dropdown
-    │       ├── style.cljs
-    │       ├── test.cljs
-    │       └── view.cljs
-    └── screens
-        └── dropdown
-            └── view.cljs
-```
-
-### Re-frame events
-
-Event handlers should be defined in files named `events.cljs`, and they should
-be _close_ to other _things_, like view files, components, etc.
-
-For example:
-
-```
-src
-└── contexts
-    └── browser
-        ├── bookmarks/
-        ├── options/
-        ├── permissions/
-        ├── events.cljs
-        ├── events_test.cljs
-        ├── style.cljs
-        └── view.cljs
-```
-
-### Test structure
-
-[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
-```
-
-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.
-
-```
-test
-├── appium/
-└── integration
-    ├── browser/
-    ├── communities/
-    ├── messaging/
-    ├── user_settings/
-    └── wallet
-        └── payment_test.cljs
-```
-
-## Glossary
-
-**Unit test**: The smallest atomic unit that's meaningful to test. For example,
-tests for utility functions and event handlers are considered unit tests in the
-mobile codebase. They should be completely deterministic, _fast_, and they
-should work flawlessly in the REPL.
-
-**Bounded context**: A logical separation between different domains. It's an
-important concept in the [Domain-Driven
-Design](https://en.wikipedia.org/wiki/Domain-driven_design) literature. See
-[Bounded Context, by Martin
-Fowler](https://martinfowler.com/bliki/BoundedContext.html) for an introduction
-to the topic.
@@ -0,0 +1,52 @@
+const waitToNavigate = duration => new Promise(resolve => setTimeout(() => resolve(), duration));
+
+describe('Example (hello)', () => {
+    beforeAll(async () => {
+        if (device.getPlatform() === 'ios') {
+            await device.setStatusBar({ time: '12:34', dataNetwork: 'wifi', wifiBars: '3', batteryState: 'charging', batteryLevel: '100' });
+        }
+        await device.reloadReactNative();
+
+        await element(by.text('I accept Status Terms of Use')).tap();
+        // close alert
+        await element(by.text('Get started')).tap();
+        await waitToNavigate(200);
+
+        await element(by.text('Generate keys')).tap();
+        await waitToNavigate(200);
+
+        await element(by.text('Next')).tap();
+        await waitToNavigate(700);
+        await element(by.text('Next')).tap();
+        await waitToNavigate(700);
+        // await element(by.text('Password...')).typeText('infinitbility@gmail.com');
+        // await element(by.text('Confirm your password...')).typeText('infinitbility@gmail.com');
+        await element(by.text('Next')).tap();
+        await waitToNavigate(700);
+        await element(by.text('Maybe later')).tap();
+        await waitToNavigate(700);
+        await element(by.text("Let's go")).tap();
+        await waitToNavigate(700);
+
+        await element(by.text("1")).tap();
+        await waitToNavigate(400);
+        await element(by.text("Quo2.0 Preview")).tap();
+        await waitToNavigate(400);
+    })
+    beforeEach(async () => {
+    });
+    afterEach(async () => {
+        await element(by.text("1")).tap();
+        await waitToNavigate(200);
+        await element(by.text("Quo2.0 Preview")).tap();
+        await waitToNavigate(200);
+    });
+
+
+    it(`button page should match snapshot`, async () => {
+        await element(by.text(`:button`)).tap();
+        await waitToNavigate(200);
+        const res = await jestExpect(`default-render-button`).toMatchImageSnapshot();
+    })
+
+});
@@ -0,0 +1,13 @@
+{
+    "globalSetup": "./global-setup.js",
+    "globalTeardown": "./global-teardown.js",
+    "setupFilesAfterEnv": ["./setup.js"],
+    "maxWorkers": 1,
+    "testEnvironment": "./environment",
+    "testRunner": "jest-circus/runner",
+    "testTimeout": 120000,
+    "testRegex": "\\.e2e\\.js$",
+
+    "reporters": ["detox/runners/jest/streamlineReporter"],
+    "verbose": true
+}
@@ -27,8 +27,8 @@ function downloadTestButlerAPK() {
 }

 function resolveSelectedConfiguration() {
-  const { configurations } = require('../.detoxrc');
-  const configName = process.env.DETOX_CONFIGURATION; 
+  const { configurations } = require('../.detoxrc.json');
+  const configName = process.env.DETOX_CONFIGURATION;
  return configurations[configName];
 }

@@ -2,7 +2,7 @@ const { configureToMatchImageSnapshot } = require('jest-image-snapshot');
 const fs = require('fs');
 const path = require('path');
 const kebabCase = require('lodash/kebabCase');
-const expect = require('expect');
+const {expect} = require('expect');


 const toMatchImage = configureToMatchImageSnapshot({
@@ -15,8 +15,8 @@ expect.extend({ toMatchImage });
 expect.extend({
  async toMatchImageSnapshot(screenName) {
    const platform = await device.getPlatform();
-    const deviceName = await device.name.split(' ').slice(1).join('');
-    const deviceType = 'iPhone 11 Pro';
+    const deviceName = await device.name.split(' ').slice(1).join ('') ;
+    const deviceType = 'iPhone 11 Pro' //JSON.parse(deviceName).type.replace(',','');

    const SNAPSHOTS_DIR = `__image_snapshots__/${platform}/${deviceType}`;

@@ -37,5 +37,5 @@ global.jestExpect = expect


 beforeAll(async () => {
-  await device.launchApp();
-});
+    await device.launchApp();
+  });
@@ -4,14 +4,14 @@ PODS:
    - React
  - CryptoSwift (1.5.1)
  - DoubleConversion (1.1.6)
-  - FBLazyVector (0.63.5)
-  - FBReactNativeSpec (0.63.5):
+  - FBLazyVector (0.63.4)
+  - FBReactNativeSpec (0.63.4):
    - Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.63.5)
-    - RCTTypeSafety (= 0.63.5)
-    - React-Core (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.63.5)
+    - RCTRequired (= 0.63.4)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
  - Folly (2020.01.13.00):
    - boost-for-react-native
    - DoubleConversion
@@ -40,172 +40,172 @@ PODS:
    - RNPermissions
  - Permission-Microphone (2.1.5):
    - RNPermissions
-  - RCTRequired (0.63.5)
-  - RCTTypeSafety (0.63.5):
-    - FBLazyVector (= 0.63.5)
+  - RCTRequired (0.63.4)
+  - RCTTypeSafety (0.63.4):
+    - FBLazyVector (= 0.63.4)
    - Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.63.5)
-    - React-Core (= 0.63.5)
-  - React (0.63.5):
-    - React-Core (= 0.63.5)
-    - React-Core/DevSupport (= 0.63.5)
-    - React-Core/RCTWebSocket (= 0.63.5)
-    - React-RCTActionSheet (= 0.63.5)
-    - React-RCTAnimation (= 0.63.5)
-    - React-RCTBlob (= 0.63.5)
-    - React-RCTImage (= 0.63.5)
-    - React-RCTLinking (= 0.63.5)
-    - React-RCTNetwork (= 0.63.5)
-    - React-RCTSettings (= 0.63.5)
-    - React-RCTText (= 0.63.5)
-    - React-RCTVibration (= 0.63.5)
-  - React-callinvoker (0.63.5)
-  - React-Core (0.63.5):
+    - RCTRequired (= 0.63.4)
+    - React-Core (= 0.63.4)
+  - React (0.63.4):
+    - React-Core (= 0.63.4)
+    - React-Core/DevSupport (= 0.63.4)
+    - React-Core/RCTWebSocket (= 0.63.4)
+    - React-RCTActionSheet (= 0.63.4)
+    - React-RCTAnimation (= 0.63.4)
+    - React-RCTBlob (= 0.63.4)
+    - React-RCTImage (= 0.63.4)
+    - React-RCTLinking (= 0.63.4)
+    - React-RCTNetwork (= 0.63.4)
+    - React-RCTSettings (= 0.63.4)
+    - React-RCTText (= 0.63.4)
+    - React-RCTVibration (= 0.63.4)
+  - React-callinvoker (0.63.4)
+  - React-Core (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
-    - React-Core/Default (= 0.63.5)
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-Core/Default (= 0.63.4)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.63.5):
+  - React-Core/CoreModulesHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/Default (0.63.5):
+  - React-Core/Default (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/DevSupport (0.63.5):
+  - React-Core/DevSupport (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
-    - React-Core/Default (= 0.63.5)
-    - React-Core/RCTWebSocket (= 0.63.5)
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
-    - React-jsinspector (= 0.63.5)
+    - React-Core/Default (= 0.63.4)
+    - React-Core/RCTWebSocket (= 0.63.4)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
+    - React-jsinspector (= 0.63.4)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.63.5):
+  - React-Core/RCTActionSheetHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.63.5):
+  - React-Core/RCTAnimationHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.63.5):
+  - React-Core/RCTBlobHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/RCTImageHeaders (0.63.5):
+  - React-Core/RCTImageHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.63.5):
+  - React-Core/RCTLinkingHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.63.5):
+  - React-Core/RCTNetworkHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.63.5):
+  - React-Core/RCTSettingsHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/RCTTextHeaders (0.63.5):
+  - React-Core/RCTTextHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.63.5):
+  - React-Core/RCTVibrationHeaders (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
    - React-Core/Default
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-Core/RCTWebSocket (0.63.5):
+  - React-Core/RCTWebSocket (0.63.4):
    - Folly (= 2020.01.13.00)
    - glog
-    - React-Core/Default (= 0.63.5)
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-jsiexecutor (= 0.63.5)
+    - React-Core/Default (= 0.63.4)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-jsiexecutor (= 0.63.4)
    - Yoga
-  - React-CoreModules (0.63.5):
-    - FBReactNativeSpec (= 0.63.5)
+  - React-CoreModules (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.5)
-    - React-Core/CoreModulesHeaders (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-RCTImage (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.63.5)
-  - React-cxxreact (0.63.5):
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/CoreModulesHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-RCTImage (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-cxxreact (0.63.4):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
    - Folly (= 2020.01.13.00)
    - glog
-    - React-callinvoker (= 0.63.5)
-    - React-jsinspector (= 0.63.5)
-  - React-jsi (0.63.5):
+    - React-callinvoker (= 0.63.4)
+    - React-jsinspector (= 0.63.4)
+  - React-jsi (0.63.4):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
    - Folly (= 2020.01.13.00)
    - glog
-    - React-jsi/Default (= 0.63.5)
-  - React-jsi/Default (0.63.5):
+    - React-jsi/Default (= 0.63.4)
+  - React-jsi/Default (0.63.4):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
    - Folly (= 2020.01.13.00)
    - glog
-  - React-jsiexecutor (0.63.5):
+  - React-jsiexecutor (0.63.4):
    - DoubleConversion
    - Folly (= 2020.01.13.00)
    - glog
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
-  - React-jsinspector (0.63.5)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
+  - React-jsinspector (0.63.4)
  - react-native-background-timer (2.2.0):
    - React
  - react-native-blob-util (0.13.18):
@@ -243,66 +243,66 @@ PODS:
    - React
  - react-native-webview (11.16.0):
    - React-Core
-  - React-RCTActionSheet (0.63.5):
-    - React-Core/RCTActionSheetHeaders (= 0.63.5)
-  - React-RCTAnimation (0.63.5):
-    - FBReactNativeSpec (= 0.63.5)
+  - React-RCTActionSheet (0.63.4):
+    - React-Core/RCTActionSheetHeaders (= 0.63.4)
+  - React-RCTAnimation (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.5)
-    - React-Core/RCTAnimationHeaders (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.63.5)
-  - React-RCTBlob (0.63.5):
-    - FBReactNativeSpec (= 0.63.5)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/RCTAnimationHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTBlob (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
    - Folly (= 2020.01.13.00)
-    - React-Core/RCTBlobHeaders (= 0.63.5)
-    - React-Core/RCTWebSocket (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-RCTNetwork (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.63.5)
-  - React-RCTImage (0.63.5):
-    - FBReactNativeSpec (= 0.63.5)
+    - React-Core/RCTBlobHeaders (= 0.63.4)
+    - React-Core/RCTWebSocket (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-RCTNetwork (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTImage (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.5)
-    - React-Core/RCTImageHeaders (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - React-RCTNetwork (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.63.5)
-  - React-RCTLinking (0.63.5):
-    - FBReactNativeSpec (= 0.63.5)
-    - React-Core/RCTLinkingHeaders (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.63.5)
-  - React-RCTNetwork (0.63.5):
-    - FBReactNativeSpec (= 0.63.5)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/RCTImageHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - React-RCTNetwork (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTLinking (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
+    - React-Core/RCTLinkingHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTNetwork (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.5)
-    - React-Core/RCTNetworkHeaders (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.63.5)
-  - React-RCTSettings (0.63.5):
-    - FBReactNativeSpec (= 0.63.5)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/RCTNetworkHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTSettings (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.5)
-    - React-Core/RCTSettingsHeaders (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.63.5)
-  - React-RCTText (0.63.5):
-    - React-Core/RCTTextHeaders (= 0.63.5)
-  - React-RCTVibration (0.63.5):
-    - FBReactNativeSpec (= 0.63.5)
+    - RCTTypeSafety (= 0.63.4)
+    - React-Core/RCTSettingsHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - React-RCTText (0.63.4):
+    - React-Core/RCTTextHeaders (= 0.63.4)
+  - React-RCTVibration (0.63.4):
+    - FBReactNativeSpec (= 0.63.4)
    - Folly (= 2020.01.13.00)
-    - React-Core/RCTVibrationHeaders (= 0.63.5)
-    - React-jsi (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.63.5)
-  - ReactCommon/turbomodule/core (0.63.5):
+    - React-Core/RCTVibrationHeaders (= 0.63.4)
+    - React-jsi (= 0.63.4)
+    - ReactCommon/turbomodule/core (= 0.63.4)
+  - ReactCommon/turbomodule/core (0.63.4):
    - DoubleConversion
    - Folly (= 2020.01.13.00)
    - glog
-    - React-callinvoker (= 0.63.5)
-    - React-Core (= 0.63.5)
-    - React-cxxreact (= 0.63.5)
-    - React-jsi (= 0.63.5)
+    - React-callinvoker (= 0.63.4)
+    - React-Core (= 0.63.4)
+    - React-cxxreact (= 0.63.4)
+    - React-jsi (= 0.63.4)
  - ReactNativeAudioToolkit (2.0.3):
    - React
  - ReactNativeNavigation (7.27.1):
@@ -637,25 +637,25 @@ SPEC CHECKSUMS:
  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
  DoubleConversion: cde416483dac037923206447da6e1454df403714
-  FBLazyVector: 352a8ca9bbc8e2f097d680747a8c97ecef12d469
-  FBReactNativeSpec: 7dfb84f624136a45727c813ed21d130cd3e61beb
+  FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
+  FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 36ce0530c6d2c3a5a4326885ef4069564887a1db
+  glog: 997518ea2aa2d8cd5df9797b641b758d52ecf2bc
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
  libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
  Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
  Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c
-  RCTRequired: 5520387431beaa5f32aa8726bf746cd5353119fe
-  RCTTypeSafety: bc90d6e287fa427c50ed770922bac30faf0bbfa3
-  React: 83a7f231f462b09260a53c5c51005e7659c66890
-  React-callinvoker: 1c3fdb5562c792212e149637b8a167516bb4b58e
-  React-Core: 8baca8644a516e772c77e3923697cfe2b58c1606
-  React-CoreModules: 200c931e17b332024c2e9d878f67b87c00c2c83b
-  React-cxxreact: 9096ebaeebf6a1475a14448fa8bfc380c13d7882
-  React-jsi: 7d908b17758178b076a05a254523f1a4227b53d2
-  React-jsiexecutor: e06a32e42affb2bd89e4c8369349b5fcf787710c
-  React-jsinspector: fdbc08866b34ae8e1b788ea1cbd9f9d1ca2aa3d6
+  RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
+  RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b
+  React: b0a957a2c44da4113b0c4c9853d8387f8e64e615
+  React-callinvoker: c3f44dd3cb195b6aa46621fff95ded79d59043fe
+  React-Core: d3b2a1ac9a2c13c3bcde712d9281fc1c8a5b315b
+  React-CoreModules: 0581ff36cb797da0943d424f69e7098e43e9be60
+  React-cxxreact: c1480d4fda5720086c90df537ee7d285d4c57ac3
+  React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31
+  React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
+  React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
  react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
  react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
  react-native-blur: 4568dd93d1d82748c180df8beb2d929c97b13b47
@@ -673,16 +673,16 @@ SPEC CHECKSUMS:
  react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
  react-native-status-keycard: f60ca57d789aad6875c64ece81ab06ef0609e0d3
  react-native-webview: 28a8636d97ee641f2ee8f20492d7a6c269c1d703
-  React-RCTActionSheet: e911b99f0d6fa7711ffc2f62d236b12a32771835
-  React-RCTAnimation: ad8b853170a059faf31d6add34f67d22391bbe01
-  React-RCTBlob: 134c7270b6672c9c05383b2e0f7f044ba39d7dda
-  React-RCTImage: c5c74ba8850a193d73aef8efb8fcbb4f9cad7653
-  React-RCTLinking: 12468e952704555c8cb4e3de94c7b5a266811326
-  React-RCTNetwork: e9cfaeb9f3657ae91f895e798734141db6e1af5b
-  React-RCTSettings: 9a09419bd5e8494f6e146e2c9f5c8e2c6e90ed58
-  React-RCTText: 393f059d7ec02c733da57240694201e734f0dc84
-  React-RCTVibration: 3e83f53610d63d3c1fc4db303305e934e73047cc
-  ReactCommon: b9ff54b6dd22ba4a776eda22d7f83ec27544ca35
+  React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
+  React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
+  React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
+  React-RCTImage: c1b1f2d3f43a4a528c8946d6092384b5c880d2f0
+  React-RCTLinking: 35ae4ab9dc0410d1fcbdce4d7623194a27214fb2
+  React-RCTNetwork: 29ec2696f8d8cfff7331fac83d3e893c95ef43ae
+  React-RCTSettings: 60f0691bba2074ef394f95d4c2265ec284e0a46a
+  React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c
+  React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
+  ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
  ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
  ReactNativeNavigation: 94979dd1572a3f093fc85d4599360530a1bed8c8
  RNCAsyncStorage: b2489b49e38c85e10ed45a888d13a2a4c7b32ea1
@@ -708,7 +708,7 @@ SPEC CHECKSUMS:
  SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
  TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
-  Yoga: 0276e9f20976c8568e107cfc1163a8629051adc0
+  Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6

 PODFILE CHECKSUM: a1de9468266e7f0b5273acea713782ab759690f1

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 46;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -41,8 +41,6 @@
 		65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1426DF592BA248FC81D955CB /* Inter-Regular.otf */; };
-		715D8132290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
-		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
 		A0093AB50DA85E1D01818CCA /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E88D313E5D854BE6BC81FC1 /* libPods-Status-StatusIm-StatusImTests.a */; };
@@ -123,7 +121,6 @@
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
 		693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = "<group>"; };
-		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
 		7AFBE28450C0239119FBDBA2 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
@@ -232,7 +229,6 @@
 				693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */,
 				A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */,
 				9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */,
-				715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -319,6 +315,7 @@
 				FBF6AB84EBC2085D28C3CDEF /* Pods-Status-StatusImPR.debug.xcconfig */,
 				BF23313BEFBC84C6BB7E7677 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
+			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -400,12 +397,12 @@
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
-						DevelopmentTeam = 8B5X2M6H2Y;
+						DevelopmentTeam = DTX7Z4U3YA;
 						ProvisioningStyle = Manual;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
-						DevelopmentTeam = 8B5X2M6H2Y;
+						DevelopmentTeam = DTX7Z4U3YA;
 						LastSwiftMigration = 1140;
 						ProvisioningStyle = Manual;
 						SystemCapabilities = {
@@ -424,7 +421,7 @@
 						};
 					};
 					3AAD2AB924A3A60E0075D594 = {
-						DevelopmentTeam = 8B5X2M6H2Y;
+						DevelopmentTeam = DTX7Z4U3YA;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -478,7 +475,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */,
-				715D8132290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */,
 				B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */,
 				D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */,
 				D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */,
@@ -497,7 +493,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				3AAD2ACA24A3A60E0075D594 /* launch-image-universal.storyboard in Resources */,
-				715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */,
 				3AAD2ACB24A3A60E0075D594 /* Images.xcassets in Resources */,
 				3AAD2ACC24A3A60E0075D594 /* Inter-Bold.otf in Resources */,
 				3AAD2ACD24A3A60E0075D594 /* Inter-BoldItalic.otf in Resources */,
@@ -756,7 +751,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -767,11 +762,7 @@
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -794,18 +785,14 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -825,12 +812,12 @@
 				BUNDLE_ID_SUFFIX = .debug;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -864,11 +851,7 @@
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					/usr/lib/swift,
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -899,12 +882,12 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
@@ -930,11 +913,7 @@
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					/usr/lib/swift,
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -968,7 +947,7 @@
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -999,11 +978,7 @@
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					/usr/lib/swift,
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -1015,7 +990,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr;
 				PRODUCT_NAME = "Status PR";
-				PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum.pr";
+				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum.pr";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -1032,12 +1007,12 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -1062,11 +1037,7 @@
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					/usr/lib/swift,
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -1119,7 +1090,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1202,7 +1173,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
-				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				DEVELOPMENT_TEAM = DTX7Z4U3YA;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -105,7 +105,6 @@
 		<string>Inter-Thin-BETA.otf</string>
 		<string>Inter-ThinItalic-BETA.otf</string>
 		<string>InterStatus-Regular.otf</string>
-		<string>UbuntuMono-Regular.ttf</string>
 	</array>
 	<key>UIBackgroundModes</key>
 	<array>
@@ -108,7 +108,6 @@
 		<string>Inter-Thin-BETA.otf</string>
 		<string>Inter-ThinItalic-BETA.otf</string>
 		<string>InterStatus-Regular.otf</string>
-		<string>UbuntuMono-Regular.ttf</string>
 	</array>
 	<key>UIBackgroundModes</key>
 	<array>
@@ -1,78 +0,0 @@
-package im.status.ethereum.module;
-
-import android.view.ActionMode;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.UIBlock;
-import com.facebook.react.uimanager.UIManagerModule;
-import com.facebook.react.views.textinput.ReactEditText;
-import javax.annotation.Nonnull;
-
-class RNSelectableTextInputModule extends ReactContextBaseJavaModule {
-
-    private ActionMode lastActionMode;
-
-    public RNSelectableTextInputModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @Nonnull
-    @Override
-    public String getName() {
-        return "RNSelectableTextInputManager";
-    }
-
-    @ReactMethod
-    public void setupMenuItems(final Integer selectableTextViewReactTag, final Integer textInputReactTag) {
-        ReactApplicationContext reactContext = this.getReactApplicationContext();
-        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-        uiManager.addUIBlock(new UIBlock() {
-            public void execute (NativeViewHierarchyManager nvhm) {
-                RNSelectableTextInputViewManager rnSelectableTextManager = (RNSelectableTextInputViewManager) nvhm.resolveViewManager(selectableTextViewReactTag);
-                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
-                rnSelectableTextManager.registerSelectionListener(reactTextView);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void startActionMode(final Integer textInputReactTag) {
-        ReactApplicationContext reactContext = this.getReactApplicationContext();
-        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-        uiManager.addUIBlock(new UIBlock() {
-            public void execute (NativeViewHierarchyManager nvhm) {
-                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
-                lastActionMode = reactTextView.startActionMode(reactTextView.getCustomSelectionActionModeCallback(), ActionMode.TYPE_FLOATING);
-            }
-        });
-    }
-
-    @ReactMethod
-    public void hideLastActionMode(){
-        ReactApplicationContext reactContext = this.getReactApplicationContext();
-        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-        uiManager.addUIBlock(new UIBlock() {
-            public void execute (NativeViewHierarchyManager nvhm) {
-                if(lastActionMode!=null){
-                    lastActionMode.finish();
-                    lastActionMode = null;
-                }
-            }
-        });
-    }
-
-    @ReactMethod
-    public void setSelection(final Integer textInputReactTag, final Integer start, final Integer end){
-        ReactApplicationContext reactContext = this.getReactApplicationContext();
-        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-        uiManager.addUIBlock(new UIBlock() {
-            public void execute (NativeViewHierarchyManager nvhm) {
-                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
-                reactTextView.setSelection(start, end);
-            }
-        });
-    }
- 
-}
@@ -1,102 +0,0 @@
-package im.status.ethereum.module;
-
-import android.view.ActionMode;
-import android.view.ActionMode.Callback;
-import android.view.Menu;
-import android.view.MenuItem;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.facebook.react.views.textinput.ReactEditText;
-import com.facebook.react.views.view.ReactViewGroup;
-import com.facebook.react.views.view.ReactViewManager;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class RNSelectableTextInputViewManager extends ReactViewManager {
-    public static final String REACT_CLASS = "RNSelectableTextInput";
-    private String[] _menuItems = new String[0];
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    public ReactViewGroup createViewInstance(ThemedReactContext context) {
-        return new ReactViewGroup(context);
-    }
-
-    @ReactProp(name = "menuItems")
-    public void setMenuItems(ReactViewGroup reactViewGroup, ReadableArray items) {
-        if(items != null) {
-            List<String> result = new ArrayList<String>(items.size());
-            for (int i = 0; i < items.size(); i++) {
-                result.add(items.getString(i));
-            }
-            this._menuItems = result.toArray(new String[items.size()]);
-        }
-    }
-
-    public void registerSelectionListener(final ReactEditText view) {
-        view.setCustomSelectionActionModeCallback(new Callback() {
-            @Override
-            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                menu.clear();
-                for (int i = 0; i < _menuItems.length; i++) {
-                    menu.add(0, i, 0, _menuItems[i]);
-                }
-                return true;
-            }
-
-            @Override
-            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                return true;
-            }
-
-            @Override
-            public void onDestroyActionMode(ActionMode mode) {
-            }
-
-            @Override
-            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                int selectionStart = view.getSelectionStart();
-                int selectionEnd = view.getSelectionEnd();
-                String selectedText = view.getText().toString().substring(selectionStart, selectionEnd);
-
-                // Dispatch event
-                onSelectNativeEvent(view, item.getItemId(), selectedText, selectionStart, selectionEnd);
-
-                mode.finish();
-
-                return true;
-            }
-
-        });
-    }
-
-    public void onSelectNativeEvent(ReactEditText view, int eventType, String content, int selectionStart, int selectionEnd) {
-        WritableMap event = Arguments.createMap();
-        event.putInt("eventType", eventType);
-        event.putString("content", content);
-        event.putInt("selectionStart", selectionStart);
-        event.putInt("selectionEnd", selectionEnd);
-
-        // Dispatch
-        ReactContext reactContext = (ReactContext) view.getContext();
-        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(view.getId(), "topSelection", event);
-    }
-
-    @Override
-    public Map getExportedCustomDirectEventTypeConstants() {
-        return MapBuilder.builder()
-                         .put("topSelection", MapBuilder.of("registrationName","onSelection"))
-                         .build();
-    }
-}
@@ -940,52 +940,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
        StatusThreadPoolExecutor.getInstance().execute(r);
    }

-    @ReactMethod
-    public void getConnectionStringForBootstrappingAnotherDevice(final String configJSON, final Callback callback) throws JSONException {
-         final JSONObject jsonConfig = new JSONObject(configJSON);
-         final String keyUID = jsonConfig.getString("keyUID");
-         final String keyStorePath = this.getKeyStorePath(keyUID);
-         jsonConfig.put("keystorePath", keyStorePath);
-
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable runnableTask = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.getConnectionStringForBootstrappingAnotherDevice(jsonConfig.toString());
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
-    }
-
-    @ReactMethod
-    public void inputConnectionStringForBootstrapping(final String connectionString, final String configJSON, final Callback callback) throws JSONException {
-         final JSONObject jsonConfig = new JSONObject(configJSON);
-         final String keyStorePath = pathCombine(this.getNoBackupDirectory(), "/keystore");
-         jsonConfig.put("keystorePath", keyStorePath);
-
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable runnableTask = new Runnable() {
-            @Override
-            public void run() {
-                String res = Statusgo.inputConnectionStringForBootstrapping(connectionString,jsonConfig.toString());
-                callback.invoke(res);
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
-    }
-
-
    @ReactMethod
    public void hashTypedData(final String data, final Callback callback) {
        Log.d(TAG, "hashTypedData");
@@ -7,7 +7,6 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

@@ -30,15 +29,12 @@ public class StatusPackage implements ReactPackage {
        List<NativeModule> modules = new ArrayList<>();

        modules.add(new StatusModule(reactContext, this.rootedDevice));
-        modules.add(new RNSelectableTextInputModule(reactContext));

        return modules;
    }

    @Override
    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Arrays.<ViewManager>asList(
-                new RNSelectableTextInputViewManager()
-        );
+        return Collections.emptyList();
    }
 }
@@ -318,42 +318,6 @@ RCT_EXPORT_METHOD(hashMessage:(NSString *)message
    callback(@[result]);
 }

-//////////////////////////////////////////////////////////////////// getConnectionStringForBootstrappingAnotherDevice
-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]);
-}
-
-//////////////////////////////////////////////////////////////////// inputConnectionStringForBootstrapping
-RCT_EXPORT_METHOD(inputConnectionStringForBootstrapping:(NSString *)cs
-                  configJSON:(NSString *)configJSON
-                  callback:(RCTResponseSenderBlock)callback) {
-
-    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
-    NSDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil];
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSURL *rootUrl =[[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
-    NSURL *multiaccountKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
-    NSString *keystoreDir = multiaccountKeystoreDir.path;
-
-    [configDict setValue:keystoreDir forKey:@"keystorePath"];
-    NSString *modifiedConfigJSON = [configDict bv_jsonStringWithPrettyPrint:NO];
-
-    NSString *result = StatusgoInputConnectionStringForBootstrapping(cs,modifiedConfigJSON);
-    callback(@[result]);
-}
-
 //////////////////////////////////////////////////////////////////// hashTypedData
 RCT_EXPORT_METHOD(hashTypedData:(NSString *)data
                  callback:(RCTResponseSenderBlock)callback) {
@@ -538,11 +502,11 @@ RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
 - (NSString *) getExportDbFilePath {
    NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"export.db"];
    NSFileManager *fileManager = [NSFileManager defaultManager];
-
+    
    if ([fileManager fileExistsAtPath:filePath]) {
        [fileManager removeItemAtPath:filePath error:nil];
    }
-
+    
    return filePath;
 }

@@ -993,10 +957,10 @@ RCT_EXPORT_METHOD(exportUnencryptedDatabase:(NSString *)accountData
 #if DEBUG
    NSLog(@"exportUnencryptedDatabase() method called");
 #endif
-
+    
    NSString *filePath = [self getExportDbFilePath];
    StatusgoExportUnencryptedDatabase(accountData, password, filePath);
-
+    
    callback(@[filePath]);
 }

@@ -45,8 +45,8 @@ in stdenv.mkDerivation rec {
    filter = lib.mkFilter {
      root = path;
      include = [
-        "package.json" "yarn.lock" "metro.config.js" "babel.config.js"
-        "resources/.*" "translations/.*" "src/js/.*"
+        "package.json" "yarn.lock" "metro.config.js" ".babelrc"
+        "resources/.*" "translations/.*" "src/js/worklet_factory.js"
        "modules/react-native-status/android.*" "android/.*"
        envFileName "VERSION" "status-go-version.json" "react-native.config.js"
      ];
@@ -20,11 +20,7 @@ buildGoPackage {
  # Build the Go library
  buildPhase = ''
    runHook preBuild
-    go build \
-      -buildmode='c-archive' \
-      -tags='gowaku_skip_migrations' \
-      -o "$out/libstatus.a" \
-      $NIX_BUILD_TOP/main.go
+    go build -buildmode=c-archive -o $out/libstatus.a $NIX_BUILD_TOP/main.go
    runHook postBuild
  '';
 }
@@ -11,9 +11,6 @@

 let
  inherit (lib) concatStringsSep optionalString optional;
-  isIOS = platform == "ios";
-  isAndroid = platform == "android";
-
 in buildGoPackage {
  pname = source.repo;
  version = "${source.cleanVersion}-${source.shortRev}-${platform}";
@@ -23,32 +20,30 @@ in buildGoPackage {

  # Sandbox causes Xcode issues on MacOS. Requires sandbox=relaxed.
  # https://github.com/status-im/status-mobile/pull/13912
-  __noChroot = isIOS;
+  __noChroot = (platform == "ios");

  extraSrcPaths = [ gomobile ];
  nativeBuildInputs = [ gomobile removeReferencesTo ]
-    ++ optional isAndroid openjdk
-    ++ optional isIOS xcodeWrapper;
+    ++ optional (platform == "android") openjdk
+    ++ optional (platform == "ios") xcodeWrapper;

  ldflags = concatStringsSep " " goBuildLdFlags;

-  ANDROID_HOME = optionalString isAndroid androidPkgs.sdk;
+  ANDROID_HOME = optionalString (platform == "android") androidPkgs.sdk;

  # Ensure XCode is present for iOS, instead of failing at the end of the build.
-  preConfigure = optionalString isIOS utils.enforceXCodeAvailable;
+  preConfigure = optionalString (platform == "ios") utils.enforceXCodeAvailable;

  buildPhase = ''
    runHook preBuild
    echo -e "\nBuilding $pname for: ${concatStringsSep "," targets}"

-    set -x
    gomobile bind \
      ${concatStringsSep " " goBuildFlags} \
      -ldflags="$ldflags" \
      -target=${concatStringsSep "," targets} \
-      ${optionalString isAndroid "-androidapi=${platformVersion}" } \
-      ${optionalString isIOS "-iosversion=${platformVersion}" } \
-     -tags='${optionalString isIOS "nowatchdog"} gowaku_skip_migrations' \
+      ${optionalString (platform == "android") "-androidapi=${platformVersion}"} \
+      ${optionalString (platform == "ios") "-iosversion=${platformVersion}"} \
      -o ${outputFileName} \
      ${source.goPackagePath}/mobile

@@ -63,7 +58,7 @@ in buildGoPackage {
  # Drop govers from disallowedReferences.
  dontRenameImports = true;
  # Replace hardcoded paths to go package in /nix/store.
-  preFixup = optionalString isIOS ''
+  preFixup = optionalString (platform == "ios") ''
    find $out -type f -exec \
      remove-references-to -t $disallowedReferences '{}' + || true
  '';
@@ -10,10 +10,11 @@
    "app:compile:android": "shadow-cljs compile android",
    "app:watch": "shadow-cljs watch android",
    "app:packager": "react-native start --host 0.0.0.0 --port 8081",
-    "app:android": "react-native run-android"
-  },
-  "resolutions": {
-    "react-devtools-core": "^4.26.0"
+    "app:android": "react-native run-android",
+    "detox": "detox build --configuration ios.sim.debug",
+    "visual-test": "detox test --configuration ios.sim.debug --config e2e/config.json",
+    "help": "detox test -- --help"
+
  },
  "dependencies": {
    "@babel/preset-typescript": "^7.17.12",
@@ -40,7 +41,7 @@
    "qrcode": "^1.4.1",
    "react": "16.13.1",
    "react-dom": "^16.4.2",
-    "react-native": "0.63.5",
+    "react-native": "0.63.4",
    "react-native-background-timer": "^2.1.1",
    "react-native-blob-util": "^0.13.18",
    "react-native-camera-kit": "^8.0.4",
@@ -73,8 +74,7 @@
    "react-native-svg": "^9.8.4",
    "react-native-touch-id": "^4.4.1",
    "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status",
-    "react-syntax-highlighter": "^15.5.0",
-    "rn-emoji-keyboard": "0.7.0",
+    "rn-emoji-keyboard": "git+https://github.com/status-im/rn-emoji-keyboard.git#refs/tags/v0.4.3",
    "tdigest": "^0.1.1"
  },
  "devDependencies": {
@@ -82,21 +82,15 @@
    "@babel/helper-builder-react-jsx": "7.0.0",
    "@babel/plugin-transform-block-scoping": "7.0.0",
    "@babel/preset-env": "7.1.0",
-    "@babel/preset-react": "^7.18.6",
    "@babel/register": "7.0.0",
-    "@jest/globals": "^25.1.0",
    "@mapbox/node-pre-gyp": "^1.0.9",
-    "@testing-library/jest-native": "^5.0.0",
-    "@testing-library/react-native": "^11.2.0",
    "@types/jest": "^28.1.6",
    "detox": "^19.9.1",
-    "jest": "^25.1.0",
-    "jest-circus": "^26.0.0",
    "jest-image-snapshot": "^5.1.0",
+    "jest": "^28.1.3",
    "nodemon": "^2.0.16",
    "nyc": "^14.1.1",
    "process": "0.11.10",
-    "react-test-renderer": "16.13.1",
    "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
    "shadow-cljs": "2.11.16"
  },
@@ -1,165 +1,131 @@
 {
-  "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"
-      }
+    "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"
+            }
+        }
    },
-    "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"
    }
-  },
-  "meta": {
-    "hostname": "node-01.do-ams3.proxy.misc",
-    "timestamp": "2021-06-07T00:00:09.836740"
-  }
 }
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-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|status-im)')
-
-if test -n "$INVALID_CHANGES"; then
-    echo "re-frame dispatch/subscribe and status-im are not allowed in quo/quo2 components"
-    echo ''
-    echo "$INVALID_CHANGES"
-    exit 1
-fi
@@ -38,13 +38,13 @@
 :builds {:mobile
          {:target :react-native
           :output-dir "app"
-           :init-fn status-im2.setup.core/init
+           :init-fn status-im.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
+           :dev {:devtools {:after-load status-im.reloader/reload
+                            :build-notify status-im.reloader/build-notify
                            :preloads [re-frisk-remote.preload]}
                 :closure-defines
                 {status-im.utils.config/POKT_TOKEN #shadow/env "POKT_TOKEN"
@@ -64,15 +64,15 @@
           {: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
+                     :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}}}}
+                                        :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
@@ -106,11 +106,4 @@
           :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}}}}
+                              :source-map false}}}}
@@ -1,66 +0,0 @@
-(ns i18n.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]
-  (set! (.-fallbacks i18n) true)
-  (set! (.-defaultSeparator i18n) "/")
-  (set! (.-locale i18n) default-device-language)
-  (set! (.-translations i18n) translations-by-locale))
-
-(defn get-translations []
-  (.-translations i18n))
-
-(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
-
-(def delimeters
-  "This function is a hack: mobile Safari doesn't support toLocaleString(), so we need to pass
-  this map to WKWebView to make number formatting work."
-  (let [n          (.toLocaleString ^js (js/Number 1000.1))
-        delimiter? (= (count n) 7)]
-    (if delimiter?
-      {:delimiter (subs n 1 2)
-       :separator (subs n 5 6)}
-      {:delimiter ""
-       :separator (subs n 4 5)})))
-
-(defn label-number [number]
-  (when number
-    (let [{:keys [delimiter separator]} delimeters]
-      (.toNumber i18n
-                 (string/replace number #"," ".")
-                 (clj->js {:precision                 10
-                           :strip_insignificant_zeros true
-                           :delimiter                 delimiter
-                           :separator                 separator})))))
-
-(def default-option-value "<no value>")
-
-(defn label-options [options]
-  ;; i18n ignores nil value, leading to misleading messages
-  (into {} (for [[k v] options] [k (or v default-option-value)])))
-
-(defn label-fn
-  ([path] (label-fn path {}))
-  ([path options]
-   (if (exists? (.t i18n))
-     (let [options (update options :amount label-number)]
-       (.t i18n (name path) (clj->js (label-options options))))
-     (name path))))
-
-(def label (memoize label-fn))
-
-(defn label-pluralize [count path & options]
-  (if (exists? (.t i18n))
-    (.p i18n count (name path) (clj->js options))
-    (name path)))
-
-(def locale
-  (.-locale i18n))
-
-(def format-currency goog.i18n/format-currency)
@@ -1,186 +0,0 @@
-import { useDerivedValue, withTiming, withSequence, withDelay, Easing } from 'react-native-reanimated';
-
-// Shell Worklets
-
-// Home Stack States
-const CLOSE_WITH_ANIMATION = 0;
-const OPEN_WITH_ANIMATION = 1;
-const CLOSE_WITHOUT_ANIMATION = 3;
-const OPEN_WITHOUT_ANIMATION = 4;
-
-// Derived Values
-export function stackOpacity (stackId, selectedStackId) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return selectedStackId.value == stackId ? 1 : 0;
-    }
-  );
-}
-
-export function stackPointer (stackId, selectedStackId) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return selectedStackId.value == stackId ? "auto" : "none";
-    }
-  );
-}
-
-export function bottomTabIconColor (stackId, selectedStackId, homeStackState,
-				    passThrough, selectedTabColor, defaultColor,
-				    passThroughColor) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      var homeStackStateValue = homeStackState.value;
-      if (selectedStackId.value == stackId &&
-	  (homeStackStateValue == OPEN_WITH_ANIMATION ||
-	   homeStackStateValue == OPEN_WITHOUT_ANIMATION)){
-	return selectedTabColor;
-      }
-      else if (passThrough.value){
-	return passThroughColor;
-      }
-      else {
-	return defaultColor;
-      }
-    }
-  );
-}
-
-export function bottomTabsHeight(homeStackState, height, extendedHeight) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      switch (homeStackState.value) {
-      case OPEN_WITH_ANIMATION:
-	return withTiming(extendedHeight, defaultDurationAndEasing);
-	break;
-      case CLOSE_WITH_ANIMATION:
-	return withTiming(height, defaultDurationAndEasing);
-	break;
-      case OPEN_WITHOUT_ANIMATION:
-	return extendedHeight;
-	break;
-      case CLOSE_WITHOUT_ANIMATION:
-	return height;
-	break;
-      }
-    }
-  )
-}
-
-
-// Home Stack
-
-const shellAnimationTime = 200;
-
-const defaultDurationAndEasing = {
-  duration: shellAnimationTime,
-  easing: Easing.bezier(0, 0, 1, 1),
-}
-
-export function homeStackOpacity (homeStackState) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      switch (homeStackState.value) {
-      case OPEN_WITH_ANIMATION:
-	return withTiming(1, defaultDurationAndEasing);
-	break;
-      case CLOSE_WITH_ANIMATION:
-	return withTiming(0, defaultDurationAndEasing);
-	break;
-      case OPEN_WITHOUT_ANIMATION:
-	return 1;
-	break;
-      case CLOSE_WITHOUT_ANIMATION:
-	return 0;
-	break;	
-      }
-    }
-  );
-}
-
-export function homeStackTop (homeStackState, top) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      switch (homeStackState.value) {
-      case OPEN_WITH_ANIMATION:
-	return withTiming(0, defaultDurationAndEasing);
-	break;
-      case CLOSE_WITH_ANIMATION:
-	return withTiming(top, defaultDurationAndEasing);
-	break;
-      case OPEN_WITHOUT_ANIMATION:
-	return 0;
-	break;
-      case CLOSE_WITHOUT_ANIMATION:
-	return top;
-	break;	
-      }
-    }
-  );
-}
-
-export function homeStackLeft (selectedStackId, animateHomeStackLeft, homeStackState, left) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      if (animateHomeStackLeft.value) {
-	var leftValue = left[selectedStackId.value];
-	switch (homeStackState.value) {
-	case OPEN_WITH_ANIMATION:
-	  return withSequence(withTiming(leftValue, {duration: 0}), withTiming(0, defaultDurationAndEasing))
-	  break;
-	case CLOSE_WITH_ANIMATION:
-	  return withTiming(leftValue, defaultDurationAndEasing);
-	  break;
-	case OPEN_WITHOUT_ANIMATION:
-	  return 0;
-	  break;
-	case CLOSE_WITHOUT_ANIMATION:
-	  return leftValue;
-	  break;	
-	}
-      } else {
-	return 0;
-      }
-    }
-  );
-}
-
-export function homeStackPointer (homeStackState) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      var homeStackStateValue = homeStackState.value;
-      return (homeStackStateValue == OPEN_WITH_ANIMATION ||
-	      homeStackStateValue == OPEN_WITHOUT_ANIMATION) ? "auto" : "none";
-    }
-  );
-}
-
-export function homeStackScale (homeStackState, minimizeScale) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      switch (homeStackState.value) {
-      case OPEN_WITH_ANIMATION:
-	return withTiming(1, defaultDurationAndEasing);
-	break;
-      case CLOSE_WITH_ANIMATION:
-	return withTiming(minimizeScale, defaultDurationAndEasing);
-	break;
-      case OPEN_WITHOUT_ANIMATION:
-	return 1;
-	break;
-      case CLOSE_WITHOUT_ANIMATION:
-	return minimizeScale;
-	break;	
-      }
-    }
-  );
-}
@@ -1,3 +1,5 @@
+import { useDerivedValue, withTiming, withSequence, withDelay, Easing } from 'react-native-reanimated';
+
 // Generic Worklets

 export function applyAnimationsToStyle(animations, style) {
@@ -27,3 +29,102 @@ export function applyAnimationsToStyle(animations, style) {
    return Object.assign(animatedStyle, style);
  };
 };
+
+// Switcher Worklets
+
+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, passThrough, selectedTabColor, defaultColor, passThroughColor) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      if (selectedStackId.value == stackId){
+	return selectedTabColor;
+      }
+      else if (passThrough.value){
+	return passThroughColor;
+      }
+      else {
+	return defaultColor;
+      }
+    }
+  );
+}
+
+
+// Home Stack
+
+const defaultDurationAndEasing = {
+  duration: 300,
+  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);
+    }
+  );
+}
@@ -282,8 +282,6 @@
 (def worklet-factory
  #js {:applyAnimationsToStyle (fn [])})

-(def shell-worklets #js {})
-
 ;; Update i18n_resources.cljs
 (defn mock [module]
  (case module
@@ -330,7 +328,6 @@
    "@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
    "./fleets.js" default-fleets
    "./chats.js" default-chats
    "@walletconnect/client" wallet-connect-client
@@ -56,7 +56,7 @@

 (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]
+                      accessibility-label loading border-radius style]
               :or   {theme           :main
                      type            :primary
                      haptic-feedback true
@@ -92,7 +92,7 @@
                                  {:on-press-start (fn []
                                                     (optional-haptic)
                                                     (on-press-start))}))
-     [rn/view {:test-ID test-ID :style (merge (style-container type) style)}
+     [rn/view {:style (merge (style-container type) style)}
      (when before
        [rn/view
         [icons/icon before {:color icon-color}]])
@@ -34,7 +34,7 @@
 (def touchable-opacity (reagent/adapt-react-class (.-TouchableOpacity ^js rn)))
 (def touchable-highlight (reagent/adapt-react-class (.-TouchableHighlight ^js rn)))
 (def touchable-without-feedback (reagent/adapt-react-class (.-TouchableWithoutFeedback ^js rn)))
-(def text-input (reagent/adapt-react-class (.-TextInput ^js rn)))
+(def text-input (reagent/adapt-react-class  (.-TextInput ^js rn)))

 (def keyboard-avoiding-view-class (reagent/adapt-react-class (.-KeyboardAvoidingView ^js rn)))

@@ -1,44 +0,0 @@
-const waitToNavigate = duration => new Promise(resolve => setTimeout(() => resolve(), duration));
-
-const SUPER_SECRET_PASSWORD = 'password'
-
-const loginToHomePage = async () => {
-    if (device.getPlatform() === 'ios') {
-        await device.setStatusBar({ time: '12:34', dataNetwork: 'wifi', wifiBars: '3', batteryState: 'charging', batteryLevel: '100' });
-    }
-    await device.reloadReactNative();
-    await element(by.id('terms-of-service')).tap();
-    await waitToNavigate(400);
-    await element(by.id('get-started')).tap();
-    await waitToNavigate(300);
-    await element(by.id('generate-keys')).tap();
-    await waitToNavigate(200);
-    await element(by.text('Next')).tap();
-    await waitToNavigate(700);
-    await element(by.text('Next')).tap();
-    await waitToNavigate(700);
-    await element(by.id('password-placeholder')).typeText(SUPER_SECRET_PASSWORD);
-    await element(by.id('confirm-password-placeholder')).typeText(SUPER_SECRET_PASSWORD);
-    await element(by.text('Next')).tap();
-    await waitToNavigate(200);
-    await element(by.id("browser-stack")).tap();
-    await waitToNavigate(400);
-    await element(by.text("Quo2.0 Preview")).tap();
-    await waitToNavigate(400);
-}
-
-describe('Default Renders', () => {
-    beforeAll(async () => loginToHomePage())
-    beforeEach(async () => {
-    });
-    afterEach(async () => {
-        await element(by.id("back-button")).tap();
-        await waitToNavigate(200);
-    });
-
-    it(`button page should match image render`, async () => {
-        await element(by.id(`quo2-:button`)).tap();
-        await waitToNavigate(200);
-        const res = await jestExpect(`button`).toMatchImageSnapshot();
-    })
-});
@@ -0,0 +1,55 @@
+const data = require('./visual-tests.json')
+
+const waitToNavigate = duration => new Promise(resolve => setTimeout(() => resolve(), duration));
+
+describe('Example (hello)', () => {
+    beforeAll(async () => {
+        if (device.getPlatform() === 'ios') {
+            await device.setStatusBar({ time: '12:34', dataNetwork: 'wifi', wifiBars: '3', batteryState: 'charging', batteryLevel: '100' });
+        }
+        await device.reloadReactNative();
+
+        await element(by.text('I accept Status Terms of Use')).tap();
+        // close alert
+        await element(by.text('Get started')).tap();
+        await waitToNavigate(200);
+
+        await element(by.text('Generate keys')).tap();
+        await waitToNavigate(200);
+
+        await element(by.text('Next')).tap();
+        await waitToNavigate(700);
+        await element(by.text('Next')).tap();
+        await waitToNavigate(700);
+        // await element(by.text('Password...')).typeText('infinitbility@gmail.com');
+        // await element(by.text('Confirm your password...')).typeText('infinitbility@gmail.com');
+        await element(by.text('Next')).tap();
+        await waitToNavigate(700);
+        await element(by.text('Maybe later')).tap();
+        await waitToNavigate(700);
+        await element(by.text("Let's go")).tap();
+        await waitToNavigate(700);
+
+        await element(by.text("1")).tap();
+        await waitToNavigate(400);
+        await element(by.text("Quo2.0 Preview")).tap();
+        await waitToNavigate(400);
+    })
+    beforeEach(async () => {
+    });
+    afterEach(async () => {
+        await element(by.text("1")).tap();
+        await waitToNavigate(200);
+        await element(by.text("Quo2.0 Preview")).tap();
+        await waitToNavigate(200);
+    });
+
+    const pages = Object.keys(data)
+
+    it(`button page should match snapshot`, async () => {
+        await element(by.text(`:button`)).tap();
+        await waitToNavigate(200);
+        const res = await jestExpect(`default-render-button`).toMatchImageSnapshot();
+    })
+
+});
@@ -1,11 +1,11 @@
 (ns quo2.components.avatars.account-avatar
-  (:require [react-native.core :as rn]
+  (:require [quo.react-native :as rn]
            [quo2.foundations.colors :as colors]
-            [quo2.components.icon :as icons]
-            [quo2.theme :as theme]))
+            [status-im.ui.components.icons.icons :as icons]
+            [quo.theme :as theme]))

 (def icon-color-value
-  {:dark  (get-in colors/customization [:dark :purple])
+  {:dark (get-in colors/customization [:dark :purple])
   :light (get-in colors/customization [:light :purple])})

 (defn get-border-radius [size]
@@ -28,11 +28,11 @@
  [{:keys [size icon]
    :or   {size 80
           icon :main-icons/placeholder}}]
-  (let [icon-color (if (theme/dark?)
-                     (:dark icon-color-value)
-                     (:light icon-color-value))
+  (let [icon-color           (if (theme/dark?)
+                               (:dark icon-color-value)
+                               (:light icon-color-value))
        avatar-border-radius (get-border-radius size)
-        inner-icon-size (get-inner-icon-sizes size)]
+        inner-icon-size      (get-inner-icon-sizes size)]
    [rn/view {:style {:width            size
                      :background-color icon-color
                      :height           size
@@ -40,5 +40,6 @@
                      :justify-content  :center
                      :align-items      :center}}
     [icons/icon icon
-      {:no-color true
-       :size     inner-icon-size}]]))
+      {:no-color        true
+       :container-style {:width  inner-icon-size
+                         :height inner-icon-size}}]]))
@@ -1,9 +1,9 @@
 (ns quo2.components.avatars.channel-avatar
  (:require [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
+            [quo.react-native :as rn]
            [quo2.components.icon :as icons]
            [quo2.components.markdown.text :as text]
-            [quo2.theme :as theme]))
+            [quo.theme :as theme]))

 (defn channel-avatar [{:keys [big? locked? emoji-background-color emoji]}]
  (let [lock-exists? (some? locked?)
@@ -1,26 +1,28 @@
 (ns quo2.components.avatars.group-avatar
  (:require [quo2.foundations.colors :as colors]
            [quo2.components.icon :as icon]
-            [react-native.core :as rn]))
+            [quo.react-native :as rn]))

 (def sizes
-  {:icon      {:small  12
-               :medium 16
-               :large  20}
-   :container {:small  20
+  {:icon {:small 12
+          :medium 16
+          :large 20}
+   :container {:small 20
               :medium 32
-               :large  48}})
+               :large 48}})

-;; TODO: this implementation does not support group display picture (can only display default group icon).
 (defn group-avatar [_]
-  (fn [{:keys [color size]}]
-    (let [container-size (get-in sizes [:container size])
+  (fn [{:keys [color size override-theme]}]
+    (let [theme          (or override-theme (if (colors/dark?) :dark :light))
+          container-size (get-in sizes [:container size])
          icon-size      (get-in sizes [:icon size])]
      [rn/view {:width            container-size
                :height           container-size
                :align-items      :center
                :justify-content  :center
                :border-radius    (/ container-size 2)
-                :background-color (colors/custom-color-by-theme color 50 60)}
-       [icon/icon :i/group {:size  icon-size
-                            :color colors/white-opa-70}]])))
+                :background-color (if (= theme :light)
+                                    (colors/custom-color color 50)
+                                    (colors/custom-color color 60))}
+       [icon/icon :total-members {:size icon-size
+                                  :color colors/white-opa-70}]])))
@@ -1,28 +1,29 @@
 (ns quo2.components.avatars.icon-avatar
-  (:require [react-native.core :as rn]
+  (:require [quo.react-native :as rn]
            [quo2.foundations.colors :as colors]
-            [quo2.components.icon :as icons]))
+            [status-im.ui.components.icons.icons :as icons]))

 (def sizes
-  {:big    48
+  {:big 48
   :medium 32
-   :small  20})
+   :small 20})

 (defn icon-avatar
  [{:keys [size icon color opacity]
    :or   {opacity 20}}]
  (let [component-size (size sizes)
-        circle-color (colors/custom-color color 50 opacity)
-        icon-color (colors/custom-color-by-theme color 50 60)
-        icon-size (case size
-                    :big 20
-                    :medium 16
-                    :small 12)]
+        circle-color   (colors/custom-color color 50 opacity)
+        icon-color     (colors/custom-color-by-theme color 50 60)
+        icon-size      (case size
+                         :big    20
+                         :medium 16
+                         :small  12)]
    [rn/view {:style {:width            component-size
                      :height           component-size
                      :border-radius    component-size
                      :background-color circle-color
                      :justify-content  :center
                      :align-items      :center}}
-     [icons/icon icon {:size  icon-size
-                       :color icon-color}]]))
+     [icons/icon icon {:container-style {:width  icon-size
+                                         :height icon-size}
+                       :color           icon-color}]]))
@@ -1,11 +1,10 @@
 (ns quo2.components.avatars.user-avatar
-  (:require [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]
+  (:require [quo.react-native :as rn]
            [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]
            [quo2.components.icon :as icons]
-            [quo2.theme :refer [dark?]]
-            [clojure.string :refer [upper-case split blank?]]))
+            [clojure.string :refer [upper-case split blank?]]
+            [quo.theme :refer [dark?]]))

 (def sizes {:big {:outer 80
                  :inner 72
@@ -122,20 +121,20 @@
                                 first-initial-letter
                                 initials)
                               "")]
-    [rn/view {:accessibility-label :user-avatar
-              :style               {:width         outer-dimensions
-                                    :height        outer-dimensions
-                                    :border-radius outer-dimensions}}
+    [rn/view {:style {:width         outer-dimensions
+                      :height        outer-dimensions
+                      :border-radius outer-dimensions}}
     (when (and ring? identicon?)
-       [icons/icon :i/identicon-ring {:size     outer-dimensions
-                                      :no-color true}])
+       [icons/icon :main-icons/identicon-ring {:width    outer-dimensions
+                                               :height   outer-dimensions
+                                               :size     outer-dimensions
+                                               :no-color true}])
     (if profile-picture
       ;; display image
-       [fast-image/fast-image {:source              {:uri profile-picture}
-                               :style               (container-styling inner-dimensions outer-dimensions)}]
+       [rn/image {:style  (container-styling inner-dimensions outer-dimensions)
+                  :source profile-picture}]
       ;; else display initials
       [container inner-dimensions outer-dimensions
-        ^{:key :icon-text}
        [text/text {:weight :semi-bold
                    :size   font-size
                    :style  {:color colors/white-opa-70}}
@@ -1,8 +1,8 @@
 (ns quo2.components.avatars.wallet-user-avatar
-  (:require [react-native.core :as rn]
+  (:require [quo.react-native :as rn]
            [quo2.foundations.colors :as colors]
            [quo2.components.markdown.text :as text]
-            [clojure.string :as string]))
+            [clojure.string :as clojure-string]))

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

 (def themes
-  {:light {:primary         {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/primary-50
-                                                     :pressed  colors/primary-60
-                                                     :disabled colors/primary-50}}
-           :secondary       {:icon-color            colors/primary-50
-                             :label-color           colors/primary-50
-                             :background-color      {:default  colors/primary-50-opa-20
-                                                     :pressed  colors/primary-50-opa-40
-                                                     :disabled colors/primary-50-opa-20}}
-           :grey            {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-50
-                             :label-color           colors/neutral-100
-                             :background-color      {:default  colors/neutral-10
-                                                     :pressed  colors/neutral-20
-                                                     :disabled colors/neutral-10}}
-           :dark-grey       {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-50
-                             :label-color           colors/neutral-100
-                             :background-color      {:default  colors/neutral-20
-                                                     :pressed  colors/neutral-30
-                                                     :disabled colors/neutral-20}}
-           :outline         {:icon-color            colors/neutral-50
-                             :icon-secondary-color  colors/neutral-50
-                             :label-color           colors/neutral-100
-                             :border-color          {:default  colors/neutral-20
-                                                     :pressed  colors/neutral-40
-                                                     :disabled colors/neutral-20}}
-           :ghost           {:icon-color            colors/neutral-50
-                             :icon-secondary-color  colors/neutral-50
-                             :label-color           colors/neutral-100
-                             :background-color      {:pressed colors/neutral-10}}
-           :danger          {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/danger-50
-                                                     :pressed  colors/danger-60
-                                                     :disabled colors/danger-50}}
-           :positive        {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/success-50
-                                                     :pressed  colors/success-60
-                                                     :disabled colors/success-50-opa-30}}
-           :photo-bg        {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-80-opa-40
-                             :label-color           colors/neutral-100
-                             :background-color      {:default  colors/white-opa-40
-                                                     :pressed  colors/white-opa-50
-                                                     :disabled colors/white-opa-40}}
-           :blur-bg         {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-80-opa-40
-                             :label-color           colors/neutral-100
-                             :background-color      {:default  colors/neutral-80-opa-5
-                                                     :pressed  colors/neutral-80-opa-10
-                                                     :disabled colors/neutral-80-opa-5}}
-           :blur-bg-outline {:icon-color            colors/neutral-100
-                             :icon-secondary-color  colors/neutral-80-opa-40
-                             :label-color           colors/neutral-100
-                             :border-color          {:default  colors/neutral-80-opa-10
-                                                     :pressed  colors/neutral-80-opa-20
-                                                     :disabled colors/neutral-80-opa-10}}
+  {:light {:primary         {:icon-color           colors/white
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/primary-50
+                                                    :pressed  colors/primary-60
+                                                    :disabled colors/primary-50}}
+           :secondary       {:icon-color           colors/primary-50
+                             :label                {:style    {:color colors/primary-50}}
+                             :background-color     {:default  colors/primary-50-opa-20
+                                                    :pressed  colors/primary-50-opa-40
+                                                    :disabled colors/primary-50-opa-20}}
+           :grey            {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-50
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:default  colors/neutral-10
+                                                    :pressed  colors/neutral-20
+                                                    :disabled colors/neutral-10}}
+           :dark-grey       {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-50
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:default  colors/neutral-20
+                                                    :pressed  colors/neutral-30
+                                                    :disabled colors/neutral-20}}
+           :outline         {:icon-color           colors/neutral-50
+                             :icon-secondary-color colors/neutral-50
+                             :label                {:style    {:color colors/neutral-100}}
+                             :border-color         {:default  colors/neutral-20
+                                                    :pressed  colors/neutral-40
+                                                    :disabled colors/neutral-20}}
+           :ghost           {:icon-color           colors/neutral-50
+                             :icon-secondary-color colors/neutral-50
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:pressed colors/neutral-10}}
+           :danger          {:icon-color           colors/white
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/danger-50
+                                                    :pressed  colors/danger-60
+                                                    :disabled colors/danger-50}}
+           :positive        {:icon-color       colors/white
+                             :label            {:style {:color colors/white}}
+                             :background-color {:default  colors/success-50
+                                                :pressed  colors/success-60
+                                                :disabled colors/success-50-opa-30}}
+           :photo-bg        {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-80-opa-40
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:default  colors/white-opa-40
+                                                    :pressed  colors/white-opa-50
+                                                    :disabled colors/white-opa-40}}
+           :blur-bg         {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-80-opa-40
+                             :label                {:style    {:color colors/neutral-100}}
+                             :background-color     {:default  colors/neutral-80-opa-5
+                                                    :pressed  colors/neutral-80-opa-10
+                                                    :disabled colors/neutral-80-opa-5}}
+           :blur-bg-outline {:icon-color           colors/neutral-100
+                             :icon-secondary-color colors/neutral-80-opa-40
+                             :label                {:style    {:color colors/neutral-100}}
+                             :border-color         {:default  colors/neutral-80-opa-10
+                                                    :pressed  colors/neutral-80-opa-20
+                                                    :disabled colors/neutral-80-opa-10}}
           :shell            {:icon-color           colors/white
-                              :label-color          colors/white
+                              :label                {:style    {:color colors/white}}
                              :background-color     {:default  colors/neutral-95
                                                     :pressed  colors/neutral-95
                                                     :disabled colors/neutral-95}}}
-   :dark  {:primary         {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/primary-60
-                                                     :pressed  colors/primary-50
-                                                     :disabled colors/primary-60}}
-           :secondary       {:icon-color            colors/primary-50
-                             :label-color           colors/primary-50
-                             :background-color      {:default  colors/primary-50-opa-20
-                                                     :pressed  colors/primary-50-opa-30
-                                                     :disabled colors/primary-50-opa-20}}
-           :grey            {:icon-color            colors/white
-                             :icon-secondary-color  colors/neutral-40
-                             :label-color           colors/white
-                             :background-color      {:default  colors/neutral-80
-                                                     :pressed  colors/neutral-60
-                                                     :disabled colors/neutral-80}}
-           :dark-grey       {:icon-color            colors/white
-                             :icon-secondary-color  colors/neutral-40
-                             :label-color           colors/white
-                             :background-color      {:default  colors/neutral-70
-                                                     :pressed  colors/neutral-60
-                                                     :disabled colors/neutral-70}}
-           :outline         {:icon-color            colors/neutral-40
-                             :icon-secondary-color  colors/neutral-40
-                             :label-color           colors/white
-                             :border-color          {:default  colors/neutral-70
-                                                     :pressed  colors/neutral-60
-                                                     :disabled colors/neutral-70}}
-           :ghost           {:icon-color            colors/neutral-40
-                             :icon-secondary-color  colors/neutral-40
-                             :label-color                 colors/white
-                             :background-color      {:pressed  colors/neutral-80}}
-           :danger          {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/danger-60
-                                                     :pressed  colors/danger-50
-                                                     :disabled colors/danger-60}}
-           :positive        {:icon-color            colors/white
-                             :label-color           colors/white
-                             :background-color      {:default  colors/success-60
-                                                     :pressed  colors/success-50
-                                                     :disabled colors/success-60-opa-30}}
-           :photo-bg        {:icon-color            colors/white
-                             :icon-secondary-color  colors/neutral-30
-                             :label-color           colors/white
-                             :background-color      {:default  colors/neutral-80-opa-40
-                                                     :pressed  colors/neutral-80-opa-50
-                                                     :disabled colors/neutral-80-opa-40}}
-           :blur-bg         {:icon-color            colors/white
-                             :icon-secondary-color  colors/white-opa-40
-                             :label-color           colors/white
-                             :background-color      {:default  colors/white-opa-5
-                                                     :pressed  colors/white-opa-10
-                                                     :disabled colors/white-opa-5}}
-           :blur-bg-outline {:icon-color            colors/white
-                             :icon-secondary-color  colors/white-opa-40
-                             :label-color           colors/white
-                             :border-color          {:default  colors/white-opa-10
-                                                     :pressed  colors/white-opa-20
-                                                     :disabled colors/white-opa-5}}
-           :shell            {:icon-color           colors/white
-                              :label-color          colors/white
-                              :background-color     {:default colors/neutral-95}}}})
-
-(defn shape-style-container [type icon size]
-  {:border-radius (if (and icon (#{:primary :secondary :danger} type))
-                    24
-                    (case size
-                      56 12
-                      40 12
-                      32 10
-                      24 8))})
+   :dark  {:primary         {:icon-color          colors/white
+                             :label               {:style    {:color colors/white}}
+                             :background-color    {:default  colors/primary-60
+                                                   :pressed  colors/primary-50
+                                                   :disabled colors/primary-60}}
+           :secondary       {:icon-color          colors/primary-50
+                             :label               {:style    {:color colors/primary-50}}
+                             :background-color    {:default  colors/primary-50-opa-20
+                                                   :pressed  colors/primary-50-opa-30
+                                                   :disabled colors/primary-50-opa-20}}
+           :grey            {:icon-color           colors/white
+                             :icon-secondary-color colors/neutral-40
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/neutral-80
+                                                    :pressed  colors/neutral-60
+                                                    :disabled colors/neutral-80}}
+           :dark-grey       {:icon-color           colors/white
+                             :icon-secondary-color colors/neutral-40
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/neutral-70
+                                                    :pressed  colors/neutral-60
+                                                    :disabled colors/neutral-70}}
+           :outline         {:icon-color           colors/neutral-40
+                             :icon-secondary-color colors/neutral-40
+                             :label                {:style    {:color colors/white}}
+                             :border-color         {:default  colors/neutral-70
+                                                    :pressed  colors/neutral-60
+                                                    :disabled colors/neutral-70}}
+           :ghost           {:icon-color           colors/neutral-40
+                             :icon-secondary-color colors/neutral-40
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:pressed  colors/neutral-80}}
+           :danger          {:icon-color           colors/white
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/danger-60
+                                                    :pressed  colors/danger-50
+                                                    :disabled colors/danger-60}}
+           :positive        {:icon-color       colors/white
+                             :label            {:style {:color colors/white}}
+                             :background-color {:default  colors/success-60
+                                                :pressed  colors/success-50
+                                                :disabled colors/success-60-opa-30}}
+           :photo-bg        {:icon-color           colors/white
+                             :icon-secondary-color colors/neutral-30
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/neutral-80-opa-40
+                                                    :pressed  colors/neutral-80-opa-50
+                                                    :disabled colors/neutral-80-opa-40}}
+           :blur-bg         {:icon-color           colors/white
+                             :icon-secondary-color colors/white-opa-40
+                             :label                {:style    {:color colors/white}}
+                             :background-color     {:default  colors/white-opa-5
+                                                    :pressed  colors/white-opa-10
+                                                    :disabled colors/white-opa-5}}
+           :blur-bg-outline {:icon-color           colors/white
+                             :icon-secondary-color colors/white-opa-40
+                             :label                {:style    {:color colors/white}}
+                             :border-color         {:default  colors/white-opa-10
+                                                    :pressed  colors/white-opa-20
+                                                    :disabled colors/white-opa-5}}
+           :shell            {:icon-color          colors/white
+                              :label               {:style   {:color colors/white}}
+                              :background-color    {:default colors/neutral-95}}}})

 (defn style-container [type size disabled background-color border-color icon above width before after]
  (merge {:height             size
          :align-items        :center
          :justify-content    :center
          :flex-direction     (if above :column :row)
+          :border-radius      (if (and icon (#{:primary :secondary :danger} type))
+                                24
+                                (case size
+                                  56 12
+                                  40 12
+                                  32 10
+                                  24 8))
          :background-color   background-color
          :padding-horizontal (when-not (or icon before after)
                                (case size 56 16 40 16 32 12 24 8))
@@ -161,7 +159,6 @@
                                (case size 56 0 40 9 32 5 24 3))
          :padding-bottom     (when-not (or icon before after)
                                (case size 56 0 40 9 32 5 24 4))}
-         (shape-style-container type icon size)
         (when width
           {:width width})
         (when icon
@@ -172,19 +169,14 @@
         (when disabled
           {:opacity 0.3})))

-(defn community-themed? [type community-color]
-  (and (= type :community) (string? community-color)))
-
 (defn button
  "with label
   [button opts \"label\"]
   opts
   {:type   :primary/:secondary/:grey/:dark-grey/:outline/:ghost/
-            :danger/:photo-bg/:blur-bg/:blur-bg-ouline/:shell/:community
+            :danger/:photo-bg/:blur-bg/:blur-bg-ouline/:shell
    :size   40/32/24
    :icon   true/false
-    :community-color '#FFFFFF'
-    :community-text-color '#000000'
    :before :icon-keyword
    :after  :icon-keyword}

@@ -192,21 +184,20 @@
   [button {:icon true} :main-icons/close-circle]"
  [_ _]
  (let [pressed (reagent/atom false)]
-    (fn [{:keys [on-press disabled type size community-color community-text-color before after above width
+    (fn [{:keys [on-press disabled type size before after above width
                 override-theme override-background-color
-                 on-long-press accessibility-label icon icon-no-color style test-ID]
+                 on-long-press accessibility-label icon icon-no-color style]
          :or   {type :primary
                 size 40}}
         children]
-      (let [{:keys [icon-color icon-secondary-color background-color label-color border-color]}
+      (let [{:keys [icon-color icon-secondary-color background-color label border-color]}
            (get-in themes [(or
                             override-theme
                             (theme/get-theme)) type])
            state                (cond disabled :disabled @pressed :pressed :else :default)
            icon-size            (when (= 24 size) 12)
            icon-secondary-color (or icon-secondary-color icon-color)]
-        [rn/touchable-without-feedback (merge {:test-ID test-ID
-                                               :disabled            disabled
+        [rn/touchable-without-feedback (merge {:disabled            disabled
                                               :accessibility-label accessibility-label}
                                              (when on-press
                                                {:on-press (fn []
@@ -220,65 +211,48 @@
                                                               (reset! pressed nil))})

         [rn/view {:style (merge
-                           (shape-style-container type icon size)
-                           {:background-color
-                            (if (= state :pressed)
-                              (colors/theme-colors colors/neutral-100 colors/white)
-                              :transparent)}
+                           (style-container
+                            type
+                            size
+                            disabled
+                            (or override-background-color (get background-color state))
+                            (get border-color state)
+                            icon
+                            above
+                            width
+                            before
+                            after)
                           style)}
-          [rn/view {:style (merge
-                            (style-container
-                             type
-                             size
-                             disabled
-                             (or override-background-color (get background-color state))
-                             (get border-color state)
-                             icon
-                             above
-                             width
-                             before
-                             after)
-                            (when
-                             (community-themed? type community-color)
-                              (merge
-                               {:background-color community-color}
-                               (when (= state :pressed) {:opacity 0.9}))))}
-           (when above
-             [rn/view
-              [quo2.icons/icon above {:container-style {:margin-bottom 2}
+          (when above
+            [rn/view
+             [quo2.icons/icon above {:container-style {:margin-bottom 2}
+                                     :color           icon-secondary-color
+                                     :size            icon-size}]])
+          (when before
+            [rn/view
+             [quo2.icons/icon before {:container-style {:margin-left  (if (= size 40) 12 8)
+                                                        :margin-right 4}
                                      :color           icon-secondary-color
                                      :size            icon-size}]])
-           (when before
-             [rn/view
-              [quo2.icons/icon before {:container-style {:margin-left  (if (= size 40) 12 8)
-                                                         :margin-right 4}
-                                       :color           icon-secondary-color
-                                       :size            icon-size}]])
-           [rn/view
-            (cond
-              (or icon icon-no-color)
-              [quo2.icons/icon children {:color icon-color
-                                         :no-color icon-no-color
-                                         :size  icon-size}]
+          [rn/view
+           (cond
+             (or icon icon-no-color)
+             [quo2.icons/icon children {:color icon-color
+                                        :no-color icon-no-color
+                                        :size  icon-size}]

-              (string? children)
-              [text/text {:size            (when (#{56 24} size) :paragraph-2)
-                          :weight          :medium
-                          :number-of-lines 1
-                          :style {:color           (if
-                                                    (and
-                                                     (community-themed? type community-color)
-                                                     (string? community-text-color))
-                                                     community-text-color
-                                                     label-color)}}
+             (string? children)
+             [text/text (merge {:size            (when (#{56 24} size) :paragraph-2)
+                                :weight          :medium
+                                :number-of-lines 1}
+                               label)
+              children]

-               children]
-
-              (vector? children)
-              children)]
-           (when after
-             [rn/view
-              [quo2.icons/icon after {:container-style {:margin-left  4
-                                                        :margin-right (if (= size 40) 12 8)}
-                                      :color           icon-secondary-color
-                                      :size            icon-size}]])]]]))))
+             (vector? children)
+             children)]
+          (when after
+            [rn/view
+             [quo2.icons/icon after {:container-style {:margin-left  4
+                                                       :margin-right (if (= size 40) 12 8)}
+                                     :color           icon-secondary-color
+                                     :size            icon-size}]])]]))))
@@ -1,6 +1,7 @@
 (ns quo2.components.buttons.dynamic-button
-  (:require [react-native.core :as rn]
+  (:require [quo.react-native :as rn]
            [reagent.core :as reagent]
+            [status-im.i18n.i18n :as i18n]
            [quo2.components.icon :as icon]
            [quo2.foundations.colors :as colors]
            [quo2.components.markdown.text :as text]))
@@ -22,13 +23,13 @@
 (defn- icon-view [type]
  [icon/icon
   (case type
-     :jump-to           :i/jump-to
-     :mention           :i/mention
-     :notification-down :i/arrow-down
-     :notification-up   :i/arrow-up
-     :search-with-label :i/search
-     :search            :i/search
-     :bottom            :i/arrow-down)
+     :jump-to           :main-icons2/jump-to
+     :mention           :main-icons2/mention
+     :notification-down :main-icons2/arrow-down
+     :notification-up   :main-icons2/arrow-up
+     :search-with-label :main-icons2/search
+     :search            :main-icons2/search
+     :bottom            :main-icons2/arrow-down)
   {:size            12
    :color           (get-icon-and-text-color type)
    :container-style {:margin-top    6
@@ -59,13 +60,11 @@
    :customization-color customize jump-to and mention button color}"
  [_]
  (let [pressed? (reagent/atom false)]
-    (fn [{:keys [type label on-press count customization-color style]}]
-      [rn/touchable-opacity
+    (fn [{:keys [type on-press count customization-color style]}]
+      [rn/touchable-without-feedback
       {:on-press-in         #(reset! pressed? true)
        :on-press-out        #(reset! pressed? false)
        :on-press            on-press
-        :active-opacity      1
-        :style               {:padding 5}
        :accessibility-label type}
       [rn/view {:style (merge
                         {:flex-direction   :row
@@ -94,8 +93,8 @@
                                                :notification-up   0
                                                :search-with-label 8)}}
           (case type
-             :jump-to                                       label
-             :search-with-label                             label
+             :jump-to                                       (i18n/label :t/jump-to)
+             :search-with-label                             (i18n/label :t/back)
             (:mention :notification-down :notification-up) (str count))])
        (when (#{:jump-to :notification-down :notification-up} type)
          [icon-view type])]])))
@@ -1,155 +0,0 @@
-(ns quo2.components.code.snippet
-  (:require ["react-native" :as react-native]
-            [cljs-bean.core :as bean]
-            [clojure.string :as string]
-            [oops.core :as oops]
-            [react-native.core :as rn]
-            [quo2.theme :as theme]
-            [quo2.components.buttons.button :as button]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [reagent.core :as reagent]
-            [react-native.linear-gradient :as linear-gradient]
-            [react-native.masked-view :as masked-view]
-            [react-native.syntax-highlighter :as highlighter]))
-
-;; Example themes:
-;; https://github.com/react-syntax-highlighter/react-syntax-highlighter/tree/master/src/styles/hljs
-(def ^:private themes
-  {:light {:hljs-comment {:color colors/neutral-40},
-           :hljs-title   {:color (colors/custom-color :blue 50)},
-           :hljs-keyword {:color (colors/custom-color :green 50)},
-           :hljs-string  {:color (colors/custom-color :turquoise 50)},
-           :hljs-literal {:color (colors/custom-color :turquoise 50)}
-           :hljs-number  {:color (colors/custom-color :turquoise 50)}
-           :line-number  {:color colors/neutral-40}}
-   :dark  {:hljs-comment {:color colors/neutral-60},
-           :hljs-title   {:color (colors/custom-color :blue 60)},
-           :hljs-keyword {:color (colors/custom-color :green 60)},
-           :hljs-string  {:color (colors/custom-color :turquoise 60)},
-           :hljs-literal {:color (colors/custom-color :turquoise 60)}
-           :hljs-number  {:color (colors/custom-color :turquoise 60)}
-           :line-number  {:color colors/neutral-40}}})
-
-(defn- text-style [class-names]
-  (->> class-names
-       (map keyword)
-       (reduce #(merge %1 (get-in themes [(theme/get-theme) %2]))
-               {:flex-shrink 1
-                ;; Round to a nearest whole number to achieve consistent
-                ;; spacing (also important for calculating `max-text-height`).
-                ;; Line height seems to be inconsistent between text being
-                ;; wrapped and text being rendered on a newline using Flexbox
-                ;; layout.
-                :line-height 18})))
-
-(defn- render-nodes [nodes]
-  (map (fn [{:keys [children value] :as node}]
-         ;; Node can have :children or a :value.
-         (if children
-           (into [text/text {:weight :code
-                             :size :paragraph-2
-                             :style (text-style (get-in node [:properties :className]))}]
-                 (render-nodes children))
-           ;; Remove newlines as we already render each line separately.
-           (-> value string/trim-newline)))
-       nodes))
-
-(defn- code-block [{:keys [rows line-number-width]}]
-  [into [:<>]
-   (->> rows
-        (render-nodes)
-        ;; Line numbers
-        (map-indexed (fn [idx row]
-                       (conj [rn/view {:style {:flex-direction :row}}
-                              [rn/view {:style {:width line-number-width
-                                                ;; 8+12 margin
-                                                :margin-right 20}}
-                               [text/text {:weight :code
-                                           :size :paragraph-2
-                                           :style (text-style ["line-number"])}
-                                (inc idx)]]]
-                             row))))])
-
-(defn- native-renderer []
-  (let [text-height (reagent/atom nil)]
-    (fn [{:keys [rows max-lines on-copy-press]}]
-      (let [background-color      (colors/theme-colors
-                                   colors/white
-                                   colors/neutral-80-opa-40)
-            background-color-left (colors/theme-colors
-                                   colors/neutral-5
-                                   colors/neutral-80)
-            border-color          (colors/theme-colors
-                                   colors/neutral-20
-                                   colors/neutral-80)
-            rows                  (bean/->clj rows)
-            font-scale            (:font-scale (rn/use-window-dimensions))
-            max-rows              (or max-lines (count rows)) ;; Cut down on rows to process.
-            max-line-digits       (-> rows count (min max-rows) str count)
-            ;; ~ 9 is char width, 18 is width used in Figma.
-            line-number-width     (* font-scale (max 18 (* 9 max-line-digits)))
-            max-text-height       (some-> max-lines (* font-scale 18)) ;; 18 is font's line height.
-            truncated?            (and max-text-height (< max-text-height @text-height))
-            maybe-mask-wrapper    (if truncated?
-                                    [masked-view/masked-view
-                                     {:mask-element
-                                      (reagent/as-element
-                                       [linear-gradient/linear-gradient {:colors    ["black" "transparent"]
-                                                                         :locations [0.75 1]
-                                                                         :style     {:flex 1}}])}]
-                                    [:<>])]
-
-        [rn/view {:style {:overflow         :hidden
-                          :padding          8
-                          :background-color background-color
-                          :border-color     border-color
-                          :border-width     1
-                          :border-radius    8
-                          ;; Hide on intial render to avoid flicker when mask-wrapper is shown.
-                          :opacity          (if @text-height 1 0)}}
-         ;; Line number container
-         [rn/view {:style {:position           :absolute
-                           :bottom             0
-                           :top                0
-                           :left               0
-                           :width              (+ line-number-width 8 8)
-                           :background-color   background-color-left
-                           :border-right-color border-color
-                           :border-right-width 1}}]
-         (conj maybe-mask-wrapper [rn/view {:max-height max-text-height}
-                                   [rn/view {:on-layout (fn [evt]
-                                                          (let [height (oops/oget evt "nativeEvent.layout.height")]
-                                                            (reset! text-height height)))}
-                                    [code-block {:rows (take max-rows rows)
-                                                 :line-number-width line-number-width}]]])
-
-         ;; Copy button
-         [rn/view {:style {:position :absolute
-                           :bottom   8
-                           :right    8}}
-          [button/button {:icon     true
-                          :type     :grey
-                          :size     24
-                          :on-press on-copy-press}
-           :main-icons/copy]]]))))
-
-(defn- wrap-renderer-fn [f {:keys [max-lines on-copy-press]}]
-  (fn [^js props]
-    (reagent/as-element [:f> f {:rows (.-rows props)
-                                :max-lines max-lines
-                                :on-copy-press on-copy-press}])))
-
-(defn snippet [{:keys [language max-lines on-copy-press]} children]
-  [highlighter/highlighter {:language          language
-                            :renderer          (wrap-renderer-fn
-                                                native-renderer {:max-lines max-lines
-                                                                 :on-copy-press #(when on-copy-press
-                                                                                   (on-copy-press children))})
-                            ;; Default props to adapt Highlighter for react-native.
-                            :CodeTag           react-native/View
-                            :PreTag            react-native/View
-                            :show-line-numbers false
-                            :style             #js {}
-                            :custom-style      #js {:backgroundColor nil}}
-   children])
@@ -1,40 +1,45 @@
 (ns quo2.components.community.community-card-view
  (:require
   [quo2.components.community.community-view :as community-view]
-   [quo2.components.community.style :as style]
-   [react-native.core :as rn]))
+   [status-im.utils.handlers :refer [<sub]]
+   [status-im.ui.components.react :as react]
+   [status-im.ui.screens.communities.styles :as styles]
+   [status-im.ui.screens.communities.icon :as communities.icon]))

 (defn community-card-view-item
  [{:keys [name description locked
-           status tokens cover tags width]} on-press]
-  [rn/touchable-opacity {:on-press on-press}
-   [rn/view {:style (style/community-card 20)}
-    [rn/view {:style    {:width         width
-                         :height        230
-                         :border-radius 20}
-              :on-press on-press}
-     [rn/view
-      {:flex 1}
-      [rn/view (style/community-cover-container 40)
-       [rn/image
-        {:source cover
-         :style
-         {:flex          1
-          :border-radius 20}}]]
-      [rn/view (style/card-view-content-container 12)
-       [rn/view (style/card-view-chat-icon 48)]
-       ;;TODO new pure component based on quo2 should be implemented without status-im usage
-       ;[communities.icon/community-icon-redesign community 48]]
-       (when (= status :gated)
-         [rn/view (style/permission-tag-styles)
-          [community-view/permission-tag-container {:locked locked
-                                                    :status status
-                                                    :tokens tokens}]])
-       [community-view/community-title
-        {:title       name
-         :description description}]
-       [rn/view {:style (style/card-stats-position)}
-        [community-view/community-stats-column :card-view]]
-       [rn/view {:style (style/community-tags-position)}
-        [community-view/community-tags tags]]]]]]])
+           status tokens cover tags featured] :as community} on-press]
+  (let [width (* (<sub [:dimensions/window-width]) 0.90)]
+    [react/touchable-opacity {:on-press on-press}
+     [react/view {:style (merge (styles/community-card 20)
+                                {:margin-bottom 16}
+                                (if featured
+                                  {:margin-right 12
+                                   :width width}
+                                  {:flex              1
+                                   :margin-horizontal 20}))}
+      [react/view {:style         {:height          230
+                                   :border-radius   20}
+                   :on-press      on-press}
+       [react/view
+        {:flex 1}
+        [react/view (styles/community-cover-container 40)
+         [react/image
+          {:source cover
+           :style
+           {:flex 1
+            :border-radius 20}}]]
+        [react/view (styles/card-view-content-container 12)
+         [react/view (styles/card-view-chat-icon 48)
+          [communities.icon/community-icon-redesign community 48]]
+         (when (= status :gated)
+           [react/view (styles/permission-tag-styles)
+            [community-view/permission-tag-container {:locked locked
+                                                      :status status
+                                                      :tokens tokens}]])
+         [community-view/community-title
+          {:title name
+           :description description}]
+         [community-view/community-stats-column :card-view]
+         [community-view/community-tags tags]]]]]]))

@@ -3,123 +3,74 @@
   [quo2.components.community.community-view :as community-view]
   [quo2.components.markdown.text :as text]
   [quo2.foundations.colors :as colors]
-   [quo2.components.counter.counter :as counter]
-   [quo2.components.icon :as icons]
-   [quo2.components.community.style :as style]
-   [react-native.fast-image :as fast-image]
-   [react-native.core :as rn]))
+   [status-im.communities.core :as communities]
+   [status-im.utils.handlers :refer [>evt]]
+   [status-im.ui.components.react :as react]
+   [status-im.ui.screens.communities.styles :as styles]
+   [status-im.ui.screens.communities.community :as community]
+   [status-im.ui.screens.communities.icon :as communities.icon]))

-(defn community-icon-view [community-icon]
-  [rn/view {:width  32
-            :height 32}
-   [fast-image/fast-image {:source {:uri community-icon}
-                           :style  {:height        32
-                                    :border-radius 16
-                                    :width         32}}]])
-
-(defn notification-view [{:keys [muted?
-                                 unread-messages?
-                                 unread-mentions-count]}]
-  (cond
-    muted?
-    [icons/icon :i/muted {:container-style {:align-items     :center
-                                            :justify-content :center}
-                          :resize-mode     :center
-                          :size            20
-                          :color           (colors/theme-colors
-                                            colors/neutral-40
-                                            colors/neutral-50)}]
-    (pos? unread-mentions-count)
-    [counter/counter {:type :default} unread-mentions-count]
-
-    unread-messages?
-    [rn/view {:style {:width            8
-                      :height           8
-                      :border-radius    4
-                      :background-color (colors/theme-colors
-                                         colors/neutral-40
-                                         colors/neutral-60)}}]))
-
-(defn communities-list-view-item [props {:keys [name
-                                                locked?
-                                                status
-                                                muted?
-                                                unread-messages?
-                                                unread-mentions-count
-                                                community-icon
-                                                tokens
-                                                background-color]}]
-  [rn/view {:style (merge (style/community-card 16)
-                          {:margin-bottom     12
-                           :margin-horizontal 20})}
-   [rn/touchable-highlight (merge {:style {:height        56
-                                           :border-radius 16}}
-                                  props)
-    [rn/view {:flex 1}
-     [rn/view {:flex-direction     :row
-               :border-radius      16
-               :padding-horizontal 12
-               :align-items        :center
-               :padding-vertical   8
-               :background-color   background-color}
-      [rn/view]
-      (when community-icon
-        [community-icon-view community-icon])
-      [rn/view {:flex              1
-                :margin-horizontal 12}
+(defn communities-list-view-item [{:keys [id name locked status tokens background-color] :as community}]
+  [react/view {:style (merge (styles/community-card 16)
+                             {:margin-bottom    12
+                              :margin-horizontal 20})}
+   [react/view {:style         {:height             56
+                                :border-radius      16}
+                :on-press      (fn []
+                                 (>evt [::communities/load-category-states id])
+                                 (>evt [:dismiss-keyboard])
+                                 (>evt [:navigate-to :community {:community-id id}]))
+                :on-long-press #(>evt [:bottom-sheet/show-sheet
+                                       {:content (fn []
+                                                   [community/community-actions community])}])}
+    [react/view {:flex    1}
+     [react/view {:flex-direction     :row
+                  :border-radius      16
+                  :padding-horizontal 12
+                  :align-items        :center
+                  :padding-vertical   8
+                  :background-color   background-color}
+      [react/view
+       [communities.icon/community-icon-redesign community 32]]
+      [react/view {:flex              1
+                   :margin-horizontal 12}
       [text/text {:weight              :semi-bold
                   :size                :paragraph-1
                   :accessibility-label :community-name-text
                   :number-of-lines     1
-                   :ellipsize-mode      :tail
-                   :style               {:color (when muted?
-                                                  (colors/theme-colors
-                                                   colors/neutral-40
-                                                   colors/neutral-60))}}
+                   :ellipsize-mode      :tail}
        name]
       [community-view/community-stats-column :list-view]]
-      (if (= status :gated)
-        [community-view/permission-tag-container {:locked? locked?
-                                                  :tokens  tokens}]
-        [notification-view {:muted?                muted?
-                            :unread-mentions-count unread-mentions-count
-                            :unread-messages?      unread-messages?}])]]]])
+      (when (= status :gated)
+        [community-view/permission-tag-container {:locked       locked
+                                                  :status       status
+                                                  :tokens       tokens}])]]]])

-(defn communities-membership-list-item [props {:keys [name
-                                                      muted?
-                                                      unread-messages?
-                                                      unread-mentions-count
-                                                      status
-                                                      community-icon
-                                                      tokens
-                                                      locked?]}]
-  [rn/view {:margin-bottom 20}
-   [rn/touchable-highlight (merge {:underlay-color colors/primary-50-opa-5
-                                   :style          {:border-radius 12}}
-                                  props)
-    [rn/view {:flex 1}
-     [rn/view {:flex-direction :row
-               :border-radius  16
-               :align-items    :center}
-
-      (when community-icon
-        [community-icon-view community-icon])
-      [rn/view {:flex            1
-                :margin-left     12
-                :justify-content :center}
-       [text/text
-        {:accessibility-label :chat-name-text
-         :number-of-lines     1
-         :ellipsize-mode      :tail
-         :weight              :semi-bold
-         :size                :paragraph-1}
-        name]]
-
-      [rn/view {:justify-content :center
-                :margin-right    16}
-       (if (= status :gated)
-         [community-view/permission-tag-container {:locked? locked?
-                                                   :tokens  tokens}]
-         [notification-view {:muted?                muted?
-                             :unread-mentions-count unread-mentions-count
-                             :unread-messages?      unread-messages?}])]]]]])
+(defn communities-membership-list-item [{:keys [id name status tokens locked] :as community}]
+  [react/view {:margin-bottom       12
+               :padding-horizontal  8}
+   [react/touchable-highlight {:underlay-color      colors/primary-50-opa-5
+                               :style               {:border-radius 12}
+                               :on-press      (fn []
+                                                (>evt [::communities/load-category-states id])
+                                                (>evt [:dismiss-keyboard])
+                                                (>evt [:navigate-to :community {:community-id id}]))
+                               :on-long-press #(>evt [:bottom-sheet/show-sheet
+                                                      {:content (fn []
+                                                                  [community/community-actions community])}])}
+    [react/view {:flex               1
+                 :padding-vertical   8
+                 :padding-horizontal 12}
+     [react/view {:flex-direction    :row
+                  :border-radius     16
+                  :align-items       :center}
+      [communities.icon/community-icon-redesign community 48]
+      [react/view {:margin-left   12
+                   :flex          1}
+       [community-view/community-title {:title  name}]]
+      (when (= status :gated)
+        [react/view {:justify-content   :center
+                     :margin-right      12}
+         [community-view/permission-tag-container {:locked       locked
+                                                   :status       status
+                                                   :tokens       tokens}]])]]]])
@@ -4,73 +4,83 @@
   [quo2.components.icon :as icons]
   [quo2.foundations.colors :as colors]
   [quo2.components.tags.permission-tag :as permission]
-   [quo2.components.tags.tag :as tag]
-   [quo2.components.community.style :as style]
-   [react-native.core :as rn]))
+   [quo2.components.tags.tag  :as tag]
+   [status-im.ui.components.react :as react]
+   [status-im.utils.money :as money]
+   [status-im.i18n.i18n :as i18n]
+   [status-im.ui.screens.communities.styles :as styles]))

-(defn community-stats [{:keys [icon members-count icon-color]}]
-  [rn/view (style/stats-count-container)
-   [rn/view {:margin-right 4}
+(defn format-members [count]
+  (if (> count 1000000)
+    (str (money/with-precision (/ count 1000000) 1) (i18n/label :t/M))
+    (if (and (> count 999) (< count 1000000))
+      (str (money/with-precision (/ count 1000) 1) (i18n/label :t/K))
+      count)))
+
+(defn community-stats [{:keys [icon count icon-color]}]
+  [react/view (styles/stats-count-container)
+   [react/view {:margin-right  4}
    [icons/icon icon {:container-style {:align-items     :center
                                        :justify-content :center}
-                      :resize-mode     :center
-                      :size            16
-                      :color           icon-color}]]
-   [text/text {:weight :regular
-               :size   :paragraph-1}
-    members-count]])
+                      :resize-mode      :center
+                      :size             16
+                      :color            icon-color}]]
+   [text/text {:weight  :regular
+               :size    :paragraph-1}
+    (format-members count)]])

 (defn community-stats-column [type]
-  (let [icon-color (colors/theme-colors colors/neutral-50 colors/neutral-40)]
-    [rn/view (if (= type :card-view)
-               (style/card-stats-container)
-               (style/list-stats-container))
-     [community-stats {:icon       :i/group
-                       :members-count "629.2K" ;;TODO here should be formatted value, use money/format-members from outside this component
+  (let [icon-color  (colors/theme-colors colors/neutral-50 colors/neutral-40)]
+    [react/view (if (= type :card-view)
+                  (styles/card-stats-container)
+                  (styles/list-stats-container))
+     [community-stats {:icon       :main-icons2/group
+                       :count      "629.2K"
                       :icon-color icon-color}]
-     [community-stats {:icon          :i/lightning
-                       :members-count "112.1K"
-                       :icon-color    icon-color}]]))
+     [community-stats {:icon       :main-icons2/lightning
+                       :count      "112.1K"
+                       :icon-color icon-color}]
+     [community-stats {:icon       :main-icons2/placeholder
+                       :count      4
+                       :icon-color icon-color}]]))

 (defn community-tags [tags]
-  [rn/view (style/community-tags-container)
+  [react/view (styles/community-tags-container)
   (for [{:keys [id tag-label resource]} tags]
     ^{:key id}
-     [rn/view {:margin-right 8}
+     [react/view {:margin-right 8}
      [tag/tag
-       {:id       id
-        :size     24
-        :label    tag-label
-        :type     :emoji
-        :labelled true
-        :resource resource}]])])
+       {:id          id
+        :size        24
+        :label       tag-label
+        :type        :emoji
+        :labelled    true
+        :resource    resource}]])])

 (defn community-title [{:keys [title description size] :or {size :small}}]
-  [rn/view (style/community-title-description-container (if (= size :large) 56 32))
+  [react/view (styles/community-title-description-container (if (= size :large) 56 32))
   (when title
     [text/text
      {:accessibility-label :chat-name-text
       :number-of-lines     1
       :ellipsize-mode      :tail
       :weight              :semi-bold
-       :size                (if (= size :large) :heading-1 :heading-2)}
+       :size               (if (= size :large) :heading-1 :heading-2)}
      title])
   (when description
     [text/text
      {:accessibility-label :community-description-text
       :number-of-lines     2
       :ellipsize-mode      :tail
-       :weight              :regular
-       :size                :paragraph-1
-       :style               {:margin-top (if (= size :large) 8 2)}}
+       :weight  :regular
+       :size    :paragraph-1
+       :style {:margin-top (if (= size :large) 8 2)}}
      description])])

-(defn permission-tag-container [{:keys [locked? tokens on-press]}]
+(defn permission-tag-container [{:keys [locked tokens]}]
  [permission/tag {:background-color (colors/theme-colors
                                      colors/neutral-10
                                      colors/neutral-80)
-                   :locked?          locked?
+                   :locked           locked
                   :tokens           tokens
-
-                   :size             24
-                   :on-press         on-press}])
+                   :size             24}])
@@ -1,8 +1,8 @@
 (ns quo2.components.community.discover-card
  (:require [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]
-            [quo2.components.community.style :as style]
-            [react-native.core :as rn]))
+            [status-im.ui.screens.communities.styles :as styles]
+            [status-im.ui.components.react :as react]))

 ;; Discover card placeholders images.
 ;; TODO replaced when real data is available
@@ -11,13 +11,13 @@
            {:id 2 :column-images [{}]}]})

 (defn card-title-and-description [title description]
-  [rn/view
+  [react/view
   {:flex               1
    :padding-top        8
    :padding-bottom     8
    :border-radius      12}
-   [rn/view {:flex                1
-             :padding-horizontal  12}
+   [react/view {:flex                1
+                :padding-horizontal  12}
    [text/text {:accessibility-label :community-name-text
                :ellipsize-mode      :tail
                :number-of-lines     1
@@ -35,53 +35,52 @@
     description]]])

 (defn placeholder-list-images [{:keys [images width height border-radius]}]
-  [rn/view
-   [rn/view {:justify-content    :center}
+  [react/view
+   [react/view {:justify-content    :center}
    (for [{:keys [id]} images]
      ^{:key id}
-      [rn/view {:border-radius    border-radius
-                :margin-top       4
-                :margin-right     4
-                :width            width
-                :height           height
-                :background-color colors/neutral-10}])]])
+      [react/view {:border-radius    border-radius
+                   :margin-top       4
+                   :margin-right     4
+                   :width            width
+                   :height           height
+                   :background-color colors/neutral-10}])]])

 (defn placeholder-row-images [{:keys [first-image last-image images width height
                                      border-radius]}]
-  [rn/view
+  [react/view
   (when first-image
-     [rn/view {:border-bottom-right-radius 6
-               :border-bottom-left-radius  6
-               :margin-right               4
-               :width                      width
-               :height                     height
-               :background-color           colors/neutral-10}])
+     [react/view {:border-bottom-right-radius 6
+                  :border-bottom-left-radius  6
+                  :margin-right               4
+                  :width                      width
+                  :height                     height
+                  :background-color           colors/neutral-10}])
   (when images
     [placeholder-list-images {:images        images
                               :width         32
                               :height        32
                               :border-radius 6}])
   (when last-image
-     [rn/view {:border-top-left-radius    border-radius
-               :border-top-right-radius   6
-               :margin-top                4
-               :width                     width
-               :height                    height
-               :background-color          colors/neutral-10}])])
+     [react/view {:border-top-left-radius    border-radius
+                  :border-top-right-radius   6
+                  :margin-top                4
+                  :width                     width
+                  :height                    height
+                  :background-color          colors/neutral-10}])])

-(defn discover-card [{:keys [title description on-press accessibility-label]}]
+(defn discover-card [{:keys [title description on-press]}]
  (let [on-joined-images     (get images   :images)]
-    [rn/touchable-without-feedback
-     {:on-press            on-press
-      :accessibility-label accessibility-label}
-     [rn/view (merge (style/community-card 16)
-                     {:background-color  (colors/theme-colors
-                                          colors/white
-                                          colors/neutral-90)}
-                     {:flex-direction  :row
-                      :margin-horizontal 20
-                      :height          56
-                      :padding-right   12})
+    [react/touchable-without-feedback
+     {:on-press on-press}
+     [react/view (merge (styles/community-card 16)
+                        {:background-color  (colors/theme-colors
+                                             colors/white
+                                             colors/neutral-90)}
+                        {:flex-direction  :row
+                         :margin-horizontal 20
+                         :height          56
+                         :padding-right   12})
      [card-title-and-description title description]
      (for [{:keys [id column-images]} on-joined-images]
        ^{:key id}
@@ -91,4 +90,5 @@
                                 :height        (if (= id 1) 8 26)
                                 :border-radius 6
                                 :first-image   "" ; TODO replace with real data
-                                 :last-image    ""}])]])) ; TODO replace with real data
+                                 :last-image    ""}]) ; TODO replace with real data
+      ]]))
@@ -1,259 +0,0 @@
-(ns quo2.components.community.token-gating
-  (:require [quo.react-native :as rn]
-            [quo2.components.avatars.channel-avatar :as channel-avatar]
-            [quo2.components.buttons.button :as button]
-            [quo2.components.icon :as icon]
-            [quo2.components.info.information-box :as information-box]
-            [quo2.components.markdown.text :as text]
-            [quo2.components.tags.token-tag :as token-tag]
-            [quo2.foundations.colors :as colors]
-            [status-im.i18n.i18n :as i18n]
-            [status-im.ui.components.fast-image :as fast-image]))
-
-(def ^:private token-tag-horizontal-spacing 7)
-(def token-tag-vertical-spacing 5)
-
-(def styles {:container {:flex 1
-                         :padding-horizontal 20}
-             :header-container {:flex-direction :row
-                                :align-items :center}
-             :header-spacing-community {:margin-bottom 16}
-             :header-spacing-channel {:margin-bottom 24}
-             :header-avatar {:margin-right 8}
-             :header-community-avatar-image {:width 32 :height 32}
-             :header-title-container {:flex 1
-                                      :flex-direction :row
-                                      :align-items :center}
-             :header-title-lock {:margin-left 6}
-             :header-info-button {:margin-left 8}
-             :token-requirement-text-spacing {:margin-vertical 8}
-             :token-requirement-list-spacing {:padding-vertical (- 8 token-tag-vertical-spacing)}
-             :token-row {:flex-direction :row
-                         :flex-wrap :wrap
-                         :align-items :center}
-             :token-row-container {:flex-direction :row
-                                   :align-items :center
-                                   :margin-horizontal (- token-tag-horizontal-spacing)}
-             :token-row-container-no-shift {:margin-left 0}
-             :token-row-or-text {:margin-right 3}
-             :token-tag-spacing {:margin-horizontal token-tag-horizontal-spacing
-                                 :margin-vertical token-tag-vertical-spacing}
-             :divider {:height 1
-                       :margin-horizontal -20
-                       :margin-top (- 12 token-tag-vertical-spacing)
-                       :margin-bottom 8}
-             :membership-request-denied {:margin-top 13}
-             :enter-button {:margin-top 16}
-             :info-text {:margin-top 12
-                         :text-align :center
-                         :padding-horizontal 20}})
-
-(defn multiple-token-requirements? [token-requirement-lists]
-  (when (vector? (first token-requirement-lists))
-    (> (count token-requirement-lists) 1)))
-
-(defn is-token-requirement-met? [token-requirement-list]
-  (and (seq token-requirement-list)
-       (every?
-        (fn [token]
-          (get token :is-sufficient?))
-        token-requirement-list)))
-
-(defn are-multiple-token-requirements-met? [token-requirement-lists]
-  (if (multiple-token-requirements? token-requirement-lists)
-    (some is-token-requirement-met? token-requirement-lists)
-    (is-token-requirement-met? token-requirement-lists)))
-
-(defn token-requirement-list-row [tokens community-color]
-  [rn/view {:style (merge
-                    (get styles :token-row)
-                    (get styles :token-requirement-list-spacing))}
-   (map-indexed (fn [token-index token]
-                  (let [{:keys [token-img-src token amount is-sufficient? is-purchasable?]} token]
-                    ^{:key token-index}
-                    [rn/view {:style (get styles :token-tag-spacing)}
-                     [token-tag/token-tag {:token          token
-                                           :value          amount
-                                           :size           24
-                                           :border-color   community-color
-                                           :is-required    is-sufficient?
-                                           :is-purchasable is-purchasable?
-                                           :token-img-src  token-img-src}]]))
-                tokens)])
-
-(defn token-requirement-list [props community-color]
-  (let [{:keys [gate token-requirements-changed? required-tokens-lost?]} props
-        [gate-type token-requirement-lists] gate
-        multiple-token-requirements? (multiple-token-requirements? token-requirement-lists)
-        is-sufficient? (are-multiple-token-requirements-met? token-requirement-lists)
-        you-must-hold-label (if (= gate-type :join)
-                              (cond
-                                token-requirements-changed? :t/you-must-now-hold
-                                required-tokens-lost? :t/you-must-always-hold
-                                :else :t/you-must-hold)
-                              :t/you-must-hold)
-        message-label (cond
-                        (= gate-type :join)
-                        (cond
-                          token-requirements-changed? :t/community-join-requirements-changed
-                          required-tokens-lost? :t/community-join-requirements-tokens-lost
-                          :else (if is-sufficient? :t/community-join-requirements-met :t/community-join-requirements-not-met))
-                        (= gate-type :read)
-                        (if is-sufficient?
-                          :t/community-channel-read-requirements-met
-                          :t/community-channel-read-requirements-not-met)
-                        (= gate-type :write)
-                        (if is-sufficient?
-                          :t/community-channel-write-requirements-met
-                          :t/community-channel-write-requirements-not-met))]
-    [rn/view
-     [rn/view {:style (get styles :token-requirement-text-spacing)}
-      [text/text {:weight :medium
-                  :number-of-lines 1}
-       (i18n/label
-        message-label)]
-      [text/text {:size :paragraph-2
-                  :number-of-lines 1}
-       (i18n/label
-        you-must-hold-label)]]
-
-     (if multiple-token-requirements?
-       (map-indexed
-        (fn [token-requirement-index tokens]
-          ^{:key token-requirement-index}
-          [rn/view {:style (merge
-                            (get styles :token-row-container)
-                            (when-not (= token-requirement-index 0)
-                              (get styles :token-row-container-no-shift)))}
-           (when-not (= token-requirement-index 0)
-             [text/text {:style (get styles :token-row-or-text)
-                         :size :paragraph-2} "or"])
-           [token-requirement-list-row tokens community-color]])
-        token-requirement-lists)
-       [rn/view {:style (get styles :token-row-container)}
-        [token-requirement-list-row token-requirement-lists community-color]])]))
-
-(defn is-community-locked? [community]
-  (not (are-multiple-token-requirements-met? (get-in community [:gates :join]))))
-
-(defn is-channel-locked? [channel]
-  (not (are-multiple-token-requirements-met?
-        (or (get-in channel [:gates :read])
-            (get-in channel [:gates :write])))))
-
-(defn token-gating
-  "[token-gating opts]
-   opts
-   {
-     :community {
-       :name string
-       :community-avatar-img-src string
-       :community-color string
-       :community-text-color string
-       :token-requirements-changed? boolean
-       :required-tokens-lost? boolean
-     }
-     :channel {
-       :name string
-       :emoji string
-       :emoji-background-color :string
-       :on-enter-channel callback
-       :membership-request-denied? boolean
-     }
-   }"
-  [_ _]
-  (fn [{:keys [community channel]}]
-    (let [type (if (some? community) :community :channel)
-          {:keys [name
-                  emoji
-                  emoji-background-color
-                  on-enter-channel
-                  community-avatar-img-src
-                  community-color
-                  community-text-color
-                  membership-request-denied?
-                  token-requirements-changed?
-                  required-tokens-lost?
-                  gates]} (if (= type :community) community channel)
-          locked? (if
-                   (= type :community)
-                    (is-community-locked? community)
-                    (is-channel-locked? channel))]
-
-      [rn/view {:style (merge (get styles :container) {:background-color (colors/theme-colors colors/white colors/neutral-90)})}
-       [rn/view {:style (merge
-                         (get styles :header-container)
-                         (if
-                          (= type :community)
-                           (get styles :header-spacing-community)
-                           (get styles :header-spacing-channel)))}
-
-        [rn/view {:style (get styles :header-avatar)}
-         (if (= type :community)
-           [fast-image/fast-image {:source              community-avatar-img-src
-                                   :style               (get styles :header-community-avatar-image)}]
-
-           [channel-avatar/channel-avatar {:big? true
-                                           :locked? locked?
-                                           :emoji emoji
-                                           :emoji-background-color emoji-background-color}])]
-
-        [rn/view {:style (get styles :header-title-container)}
-         [text/text {:weight :semi-bold
-                     :number-of-lines 1
-                     :size  :heading-1
-                     :style (get styles :header-text)} (if (= type :community) name (str "# " name))]
-
-         (when (= type :community)
-           [icon/icon (if locked?
-                        :main-icons2/locked
-                        :main-icons2/unlocked)
-            {:container-style (get styles :header-title-lock)
-             :color           (colors/theme-colors
-                               colors/neutral-50
-                               colors/neutral-40)}])]
-
-        [button/button {:type :outline
-                        :size 32
-                        :icon true
-                        :style (get styles :header-info-button)} :main-icons2/info]]
-
-       (map-indexed (fn [gate-index gate]
-                      ^{:key gate-index}
-                      [:<>
-                       (when-not (= gate-index 0)
-                         [rn/view {:style (merge
-                                           (get styles :divider)
-                                           {:background-color (colors/theme-colors
-                                                               colors/neutral-10
-                                                               colors/neutral-80)})}])
-                       [token-requirement-list {:gate gate :token-requirements-changed? token-requirements-changed? :required-tokens-lost? required-tokens-lost?} community-color]])
-                    gates)
-
-       (when (= type :channel)
-         (if membership-request-denied?
-           [information-box/information-box {:type :error
-                                             :icon :main-icons2/untrustworthy
-                                             :no-icon-color? true
-                                             :style (get styles :membership-request-denied)}
-            (i18n/label
-             :t/membership-request-denied)]
-
-           [:<>
-            [button/button {:type :community
-                            :community-color community-color
-                            :community-text-color community-text-color
-                            :style (get styles :enter-button)
-                            :disabled locked?
-                            :on-press on-enter-channel}
-             (str "# " (i18n/label
-                        :t/enter-channel))]
-            [text/text
-             {:size :paragraph-2
-              :style (merge
-                      (get styles :info-text)
-                      {:color (colors/theme-colors
-                               colors/neutral-50
-                               colors/neutral-40)})}
-             (i18n/label
-              :t/community-enter-channel-info)]]))])))
@@ -1,34 +0,0 @@
-(ns quo2.components.counter.--tests--.counter-component-spec
-  (:require ["@testing-library/react-native" :as rtl]
-            [quo2.components.counter.counter :as counter]
-            [reagent.core :as reagent]))
-
-(defn render-counter
-  ([]
-   (render-counter {} nil))
-  ([opts value]
-   (rtl/render (reagent/as-element  [counter/counter opts value]))))
-
-(js/global.test "default render of counter component"
-                (fn []
-                  (render-counter)
-                  (-> (js/expect  (rtl/screen.getByTestId "counter-component"))
-                      (.toBeTruthy))))
-
-(js/global.test "renders counter with a string value"
-                (fn []
-                  (render-counter {} "1")
-                  (-> (js/expect  (rtl/screen.getByText "1"))
-                      (.toBeTruthy))))
-
-(js/global.test "renders counter with an integer value"
-                (fn []
-                  (render-counter {} 1)
-                  (-> (js/expect  (rtl/screen.getByText "1"))
-                      (.toBeTruthy))))
-
-(js/global.test "renders counter with value 99+ when the value is greater than 99"
-                (fn []
-                  (render-counter {} "100")
-                  (-> (js/expect  (rtl/screen.getByText "99+"))
-                      (.toBeTruthy))))
@@ -1,6 +1,6 @@
 (ns quo2.components.counter.counter
-  (:require [quo2.theme :as theme]
-            [react-native.core :as rn]
+  (:require [quo.theme :as theme]
+            [quo.react-native :as rn]
            [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]))

@@ -20,7 +20,7 @@
 (defn counter
  "type:    default, secondary, grey, outline
   value:   integer"
-  [{:keys [type override-text-color override-bg-color style accessibility-label]} value]
+  [{:keys [type override-text-color override-bg-color style]} value]
  (let [type       (or type :default)
        text-color (or override-text-color
                       (if (or
@@ -38,10 +38,7 @@
                     1     16
                     2     20
                     28)]
-    [rn/view {:test-ID :counter-component
-              :accessible true
-              :accessibility-label accessibility-label
-              :style (cond-> (merge
+    [rn/view {:style (cond-> (merge
                              {:align-items     :center
                               :justify-content :center
                               :border-radius   6
@@ -1,18 +0,0 @@
-(ns quo2.components.dividers.date
-  (:require [react-native.core :as rn]
-            [quo2.components.separator :as separator]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]))
-
-(defn date [value]
-  [rn/view {:margin-vertical 16
-            :padding-right 8
-            :padding-left 62}
-   [text/text {:weight              :medium
-               :accessibility-label :divider-date-text
-               :size :label
-               :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)
-                       :text-transform :capitalize
-                       :margin-bottom 4}}
-    value]
-   [separator/separator]])
@@ -1,8 +1,8 @@
 (ns quo2.components.dividers.divider-label
-  (:require [react-native.core :as rn]
+  (:require [quo.react-native :as rn]
            [quo2.components.markdown.text :as markdown.text]
-            [quo2.foundations.colors :as colors]
-            [quo2.components.icon :as icons]))
+            [status-im.ui.components.icons.icons :as icons]
+            [quo2.foundations.colors :as colors]))

 (def chevron-icon-container-width 20)

@@ -42,7 +42,8 @@
       [icons/icon
        :main-icons/chevron-down
        {:color  text-and-icon-color
-         :size  chevron-icon-container-width}])
+         :width  chevron-icon-container-width
+         :height chevron-icon-container-height}])
     (when (pos? counter-value)
       [rn/view {:style {:border-radius 6
                         :height 16
@@ -1,16 +1,18 @@
 (ns quo2.components.dividers.new-messages
-  (:require [react-native.core :as rn]
+  (:require [quo.react-native :as rn]
            [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]
-            [react-native.linear-gradient :as linear-gradient]))
+            [status-im.i18n.i18n :as i18n]
+            [status-im.ui.components.react :as react]))

 (defn new-messages
  "new-messages params - label, color"
-  [{:keys [label color] :or {color :primary}}]
+  [{:keys [label color] :or {label (i18n/label :new-messages-header)
+                             color :primary}}]
  (let [bg-color   (colors/custom-color-by-theme color 50 60 5 5)
        text-color (colors/custom-color-by-theme color 50 60)]
-    [linear-gradient/linear-gradient {:colors [bg-color "rgba(0,0,0,0)"]
-                                      :start {:x 0 :y 0} :end {:x 0 :y 1}}
+    [react/linear-gradient {:colors [bg-color "rgba(0,0,0,0)"]
+                            :start {:x 0 :y 0} :end {:x 0 :y 1}}
     [rn/view {:style {:padding-left     60
                       :padding-vertical 12
                       :padding-right    24}}
@@ -1,63 +0,0 @@
-(ns quo2.components.drawers.--tests--.action-drawers-component-spec
-  (:require ["@testing-library/react-native" :as rtl]
-            [quo2.components.drawers.action-drawers :as action-drawer]
-            [reagent.core :as reagent]))
-
-(defn render-action-drawer
-  ([options]
-   (rtl/render (reagent/as-element  [action-drawer/action-drawer options]))))
-
-(js/global.test "action-drawer renders with elements label displaying"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label     "a sample label"}]])
-                  (-> (js/expect  (rtl/screen.getByText  "a sample label"))
-                      (.toBeTruthy))))
-
-(js/global.test "action-drawer renders with elements sub-label displaying"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label    "a sample label"
-                                           :sub-label "a sample sub label"}]])
-                  (-> (js/expect  (rtl/screen.getByText "a sample sub label"))
-                      (.toBeTruthy))))
-
-(js/global.test "action-drawer on click action works on element"
-                (let [event (js/jest.fn)]
-                  (fn []
-                    (render-action-drawer [[{:icon     :i/friend
-                                             :label    "a sample label"
-                                             :on-press event}]])
-                    (rtl/fireEvent.press (rtl/screen.getByText "a sample label"))
-                    (-> (js/expect  event)
-                        (.toHaveBeenCalled)))))
-
-(js/global.test "action-drawer renders two icons when set"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label    "a sample label"
-                                           :right-icon :i/friend
-                                           :accessibility-label :first-element}]])
-                  (-> (js/expect (rtl/screen.getByLabelText "right-icon-for-action"))
-                      (.toBeTruthy))
-                  (-> (js/expect (rtl/screen.queryByLabelText "left-icon-for-action"))
-                      (.toBeTruthy))))
-
-(js/global.test "action-drawer does not render a divider when the add-divider? prop is false"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label    "a sample label"
-                                           :add-divider? false
-                                           :accessibility-label :first-element}]])
-                  (-> (js/expect  (rtl/screen.getAllByLabelText "divider"))
-                      (.not)
-                      (.toBeTruthy))))
-
-(js/global.test "action-drawer renders a divider when the add-divider? prop is true"
-                (fn []
-                  (render-action-drawer [[{:icon     :i/friend
-                                           :label    "a sample label"
-                                           :add-divider? true
-                                           :accessibility-label :first-element}]])
-                  (-> (js/expect  (rtl/screen.getAllByLabelText "divider"))
-                      (.toBeTruthy))))
@@ -1,89 +1,74 @@
 (ns quo2.components.drawers.action-drawers
-  (:require [react-native.core :as rn]
-            [quo2.components.markdown.text :as text]
-            [quo2.components.icon :as icon]
-            [quo2.foundations.colors :as colors]))
+  (:require  [status-im.ui.components.react :as react]
+             [quo.react-native :as rn]
+             [quo2.components.markdown.text :as text]
+             [quo2.components.icon :as icon]
+             [quo2.foundations.colors :as colors]))

 (defn- get-icon-color [danger?]
  (if danger?
-    colors/danger-50
+    (colors/theme-colors colors/danger-50 colors/danger-60)
    (colors/theme-colors colors/neutral-50 colors/neutral-40)))

-(def divider
-  [rn/view {:style {:border-top-width 1
-                    :border-top-color (colors/theme-colors
-                                       colors/neutral-10 colors/neutral-90)
-                    :margin-top       8
-                    :margin-bottom    7
-                    :align-items      :center
-                    :flex-direction   :row}
-            :accessible true
-            :accessibility-label :divider}])
-
 (defn action [{:keys [icon
                      label
                      sub-label
                      right-icon
                      danger?
-                      on-press
-                      add-divider?
-                      accessibility-label] :as action-props}]
-  (when action-props
-    [:<> {:key label}
-     (when add-divider? divider)
-     [rn/touchable-highlight {:accessibility-label accessibility-label
-                              :style          {:border-radius     12
-                                               :height (if sub-label 58 50)
-                                               :margin-horizontal 8}
-                              :underlay-color (colors/theme-colors colors/neutral-5 colors/neutral-90)
-                              :on-press       on-press}
-      [rn/view {:style
-                {:height (if sub-label 58 50)
-                 :margin-horizontal 12
+                      on-press]}]
+  [rn/touchable-opacity {:on-press on-press}
+   [react/view {:style
+                {:height            (if sub-label 56 47)
+                 :margin-horizontal 20
                 :flex-direction    :row}}
-       [rn/view {:accessibility-label :left-icon-for-action
-                 :accessible true
-                 :style
+    [react/view {:style
                 {:height        20
                  :margin-top    :auto
                  :margin-bottom :auto
                  :margin-right  12
                  :width         20}}
-        [icon/icon icon
-         {:color (get-icon-color danger?)
-          :size  20}]]
-       [rn/view
-        {:style
-         {:flex            1
-          :justify-content :center}}
-        [text/text
-         {:size   :paragraph-1
-          :weight :medium
-          :style  {:color
-                   (when danger?
-                     (colors/theme-colors colors/danger-50 colors/danger-60))}}
-         label]
-        (when sub-label
-          [text/text
-           {:size  :paragraph-2
-            :style {:color
-                    (colors/theme-colors colors/neutral-50 colors/neutral-40)}}
-           sub-label])]
-       (when right-icon
-         [rn/view {:style
+     [icon/icon icon
+      {:color (get-icon-color danger?)
+       :size 20}]]
+    [react/view
+     {:style
+      {:flex            1
+       :justify-content :center}}
+     [text/text
+      {:size   :paragraph-1
+       :weight :medium
+       :style  {:color
+                (when danger?
+                  (colors/theme-colors colors/danger-50 colors/danger-60))}}
+      label]
+     (when sub-label
+       [text/text
+        {:size  :paragraph-2
+         :style {:color
+                 (colors/theme-colors colors/neutral-50 colors/neutral-40)}}
+        sub-label])]
+    (when right-icon
+      [react/view {:style
                   {:height        20
                    :margin-top    :auto
                    :margin-bottom :auto
-                    :width         20}
-                   :accessible true
-                   :accessibility-label :right-icon-for-action}
-          [icon/icon right-icon
-           {:color (get-icon-color danger?)
-            :size  20}]])]]]))
+                    :width 20}}
+       [icon/icon right-icon
+        {:color (get-icon-color danger?)
+         :size 20}]])]])
+
+(defn divider []
+  [rn/view {:style {:border-top-width 1
+                    :border-top-color (colors/theme-colors colors/neutral-10 colors/neutral-80)
+                    :margin-top       8
+                    :margin-bottom    7
+                    :align-items      :center
+                    :flex-direction   :row}}])

 (defn action-drawer [sections]
-  [:<>
-   (doall
+  [:<> {:style
+        {:flex 1}}
+   (interpose
+    [divider]
    (for [actions sections]
-      (doall
-       (map action actions))))])
+      (map action actions)))])
@@ -1,9 +1,9 @@
 (ns quo2.components.dropdowns.dropdown
-  (:require [react-native.core :as rn]
+  (:require [quo.react-native :as rn]
            [quo2.components.icon :as icons]
            [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]
-            [react-native.reanimated :as reanimated]
+            [quo2.reanimated :as reanimated]
            [reagent.core :as reagent]))

 (defn apply-anim [dd-height val]
@@ -1,10 +1,11 @@
 (ns quo2.components.header
  (:require [oops.core :refer [oget]]
-            [react-native.reanimated :as reanimated]
+            [quo.animated :as animated]
            [quo2.components.buttons.button :as button]
            [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
+            [quo.design-system.spacing :as spacing]
+            [quo.react-native :as rn]
            [reagent.core :as reagent]))

 (def header-height 56)
@@ -60,14 +61,15 @@
      :right           (max (:width left) (:width right))})))

 (def header-actions-style
-  {:flex               1
-   :flex-direction     :row
-   :align-items        :center
-   :justify-content    :center
-   :padding-horizontal 4})
+  (merge
+   {:flex               1
+    :flex-direction     :row
+    :align-items        :center
+    :justify-content    :center}
+   (:x-tiny spacing/padding-horizontal)))

 (def header-action-placeholder
-  {:width 16})
+  {:width (:base spacing/spacing)})

 (def element {:align-items        :center
              :justify-content    :center
@@ -143,9 +145,9 @@
                 border-bottom false}}]
      (let [status-bar-height (get insets :top 0)
            height            (+ header-height status-bar-height)]
-        [reanimated/view {:style (header-wrapper-style {:height        height
-                                                        :background    background
-                                                        :border-bottom border-bottom})}
+        [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}
@@ -1,8 +1,8 @@
 (ns quo2.components.icon
  (:require
-   [clojure.string :as string]
-   [react-native.core :as rn]
   [quo2.components.icons.icons :as icons]
+   [status-im.ui.components.react :as react]
+   [clojure.string :as string]
   [quo2.foundations.colors :as colors]))

 (defn memo-icon-fn
@@ -12,7 +12,7 @@
               :or   {accessibility-label :icon}}]
   (let [size (or size 20)]
     ^{:key icon-name}
-     [rn/image
+     [react/image
      {:style
       (merge {:width  size
               :height size}
@@ -1,29 +1,24 @@
 (ns quo2.components.icons.icons
  (:require [clojure.java.io :as io]
-            [clojure.string :as string]))
+            [clojure.string :as cstr]))

 (def icon-path "./resources/images/icons2/")

-(defn combine-path [path el]
-  (if (System/getenv "COMPONENT_TEST")
-    (str "." path el "@2x.png")
-    (str "." path el ".png")))
-
 (defn require-icon [size path]
  (fn [el]
-    (let [s (combine-path path el)
+    (let [s (str "." path el ".png")
          k (-> el
-                (string/replace "_" "-")
-                (string/replace " " "-")
-                (string/lower-case)
+                (cstr/replace "_" "-")
+                (cstr/replace " " "-")
+                (cstr/lower-case)
                (str size))]
      [k `(js/require ~s)])))

 (defn get-files [path]
  (->> (io/file path)
       file-seq
-       (filter #(string/ends-with? % "png"))
-       (map #(first (string/split (.getName %) #"@")))
+       (filter #(cstr/ends-with? % "png"))
+       (map #(first (cstr/split (.getName %) #"@")))
       distinct))

 (defn get-icons [size]
@@ -35,5 +30,4 @@
   (get-icons 12)
   (get-icons 16)
   (get-icons 20)
-   (get-icons 24)
-   (get-icons 32)))
+   (get-icons 24)))
--- a/Show More
+++ b/Show More