no contacts mostly done, working on contacts

2022-11-09 17:11:52 -05:00
356 changed files with 6367 additions and 11138 deletions
@@ -2,13 +2,12 @@
           status-im.utils.views/letsubs  clojure.core/let
           reagent.core/with-let          clojure.core/let
           status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all
-           utils.re-frame/defn            clj-kondo.lint-as/def-catch-all
           quo.react/with-deps-check      clojure.core/fn
           quo.previews.preview/list-comp clojure.core/for
           status-im.utils.styles/def     clojure.core/def
           status-im.utils.styles/defn    clojure.core/defn
           taoensso.tufte/defnp           clojure.core/defn}
- :linters {:invalid-arity     {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
+ :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"
-    }
-  }
-}
@@ -175,6 +175,3 @@ test/appium/tests/users.py
 ##node bindings
 /bin/
 /lib/
-
-## visual tests
-/artifacts
@@ -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
@@ -313,16 +312,6 @@ test: ##@test Run tests once in NodeJS
 	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 := $(shell ls $(XCODE_DERIVED_DATA) | grep -E '\bStatusIm-')
-run-visual-test-ios: export TEST_BINARY_PATH := $(XCODE_DERIVED_DATA)/$(APPLICATION_NAME)/Build/Products/Debug-iphonesimulator/StatusIm.app
-run-visual-test-ios: ##@test Run tests once in NodeJS
-	yarn install
-	detox build --configuration ios.sim.debug && \
-	detox test --configuration ios.sim.debug 
-
 #--------------
 # 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!
@@ -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,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,440 +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)]])
-```
-
-### 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]))
-```
-
-### 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})
-```
-
-## 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.
@@ -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

@@ -12,9 +12,6 @@
    "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"
-  },
  "dependencies": {
    "@babel/preset-typescript": "^7.17.12",
    "@react-native-async-storage/async-storage": "^1.17.9",
@@ -84,10 +81,7 @@
    "@babel/preset-env": "7.1.0",
    "@babel/register": "7.0.0",
    "@mapbox/node-pre-gyp": "^1.0.9",
-    "@types/jest": "^28.1.6",
-    "detox": "^19.9.1",
-    "jest-image-snapshot": "^5.1.0",
-    "jest": "^28.1.3",
+    "jest": "^25.1.0",
    "nodemon": "^2.0.16",
    "nyc": "^14.1.1",
    "process": "0.11.10",
@@ -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"
@@ -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)
@@ -50,13 +50,11 @@ export function stackPointer (stackId, selectedStackId) {
  );
 }

-export function bottomTabIconColor (stackId, selectedStackId, homeStackOpen,
-				    passThrough, selectedTabColor, defaultColor,
-				    passThroughColor) {
+export function bottomTabIconColor (stackId, selectedStackId, passThrough, selectedTabColor, defaultColor, passThroughColor) {
  return useDerivedValue(
    function () {
      'worklet'
-      if (selectedStackId.value == stackId && homeStackOpen.value){
+      if (selectedStackId.value == stackId){
 	return selectedTabColor;
      }
      else if (passThrough.value){
@@ -72,10 +70,8 @@ export function bottomTabIconColor (stackId, selectedStackId, homeStackOpen,

 // Home Stack

-const shellAnimationTime = 200;
-
 const defaultDurationAndEasing = {
-  duration: shellAnimationTime,
+  duration: 300,
  easing: Easing.bezier(0, 0, 1, 1),
 }

@@ -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}]])
@@ -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();
-    })
-});
@@ -1,11 +1,11 @@
 (ns quo2.components.avatars.account-avatar
  (:require [react-native.core :as rn]
            [quo2.foundations.colors :as colors]
-            [quo2.components.icon :as icons]
+            [status-im.ui.components.icons.icons :as icons]
            [quo2.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}}]]))
@@ -4,23 +4,25 @@
            [react-native.core :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/theme-alpha color 0.5 0.6)}
-       [icon/icon :i/group {:size  icon-size ; TODO: group icon sizes 12 and 20 (small and large) are missing
-                            :color colors/white-opa-70}]])))
+                :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]
            [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,11 @@
 (ns quo2.components.avatars.user-avatar
  (:require [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]
            [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]
            [quo2.components.icon :as icons]
+            [clojure.string :refer [upper-case split blank?]]
            [quo2.theme :refer [dark?]]
-            [clojure.string :refer [upper-case split blank?]]))
+            [status-im.ui.components.fast-image :as fast-image]))

 (def sizes {:big {:outer 80
                  :inner 72
@@ -122,20 +122,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)}]
       ;; 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}}
@@ -186,7 +186,7 @@
  (let [pressed (reagent/atom false)]
    (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]
@@ -197,8 +197,7 @@
            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 []
@@ -1,6 +1,7 @@
 (ns quo2.components.buttons.dynamic-button
  (:require [react-native.core :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,5 +1,6 @@
 (ns quo2.components.code.snippet
  (:require ["react-native" :as react-native]
+            ["react-syntax-highlighter" :default Highlighter]
            [cljs-bean.core :as bean]
            [clojure.string :as str]
            [oops.core :as oops]
@@ -9,9 +10,7 @@
            [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]))
+            [status-im.ui.components.react :as react]))

 ;; Example themes:
 ;; https://github.com/react-syntax-highlighter/react-syntax-highlighter/tree/master/src/styles/hljs
@@ -92,12 +91,12 @@
            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
+                                    [react/masked-view
                                     {:mask-element
                                      (reagent/as-element
-                                       [linear-gradient/linear-gradient {:colors    ["black" "transparent"]
-                                                                         :locations [0.75 1]
-                                                                         :style     {:flex 1}}])}]
+                                       [react/linear-gradient {:colors ["black" "transparent"]
+                                                               :locations [0.75 1]
+                                                               :style {:flex 1}}])}]
                                    [:<>])]

        [rn/view {:style {:overflow         :hidden
@@ -141,15 +140,15 @@
                                :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}}
+  [:> 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,44 +1,47 @@
 (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 featured]} on-press]
-  [rn/touchable-opacity {:on-press on-press}
-   [rn/view {:style (merge (style/community-card 20)
-                           {:margin-bottom 16}
-                           (if featured
-                             {:margin-right 12}
-                             {:flex              1
-                              :margin-horizontal 20}))}
-    [rn/view {:style    {:height        230
-                         :border-radius 20}
-              :on-press on-press}
-     [rn/view
-      {: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}]
+         [react/view {:style (styles/card-stats-position)}
+          [community-view/community-stats-column :card-view]]
+         [react/view {:style (styles/community-tags-position)}
+          [community-view/community-tags tags]]]]]]]))

@@ -5,108 +5,92 @@
   [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 notifications
+                                          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))}}
+                   :style               {:color   (when (= notifications :muted)
+                                                    (colors/theme-colors
+                                                     colors/neutral-40
+                                                     colors/neutral-60))}}
        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?}])]]]])
+      (if  (= status :gated)
+        [community-view/permission-tag-container {:locked?      locked?
+                                                  :tokens       tokens}]
+        (cond
+          (= notifications :unread-messages-count)
+          [react/view {:style {:width            8
+                               :height           8
+                               :border-radius    4
+                               :background-color (colors/theme-colors
+                                                  colors/neutral-40
+                                                  colors/neutral-60)}}]

-(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}
+          (= notifications :unread-mentions-count)
+          [counter/counter {:type :default} 5]

-      (when community-icon
-        [community-icon-view community-icon])
-      [rn/view {:flex            1
-                :margin-left     12
-                :justify-content :center}
+          (= notifications :muted)
+          [icons/icon  :main-icons2/muted {:container-style {:align-items     :center
+                                                             :justify-content :center}
+                                           :resize-mode      :center
+                                           :size             20
+                                           :color            (colors/theme-colors
+                                                              colors/neutral-40
+                                                              colors/neutral-50)}]))]]]])
+
+(defn communities-membership-list-item [{:keys [id name status tokens locked?] :as community}]
+  [react/view {:margin-bottom       20}
+   [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}
+     [react/view {:flex-direction    :row
+                  :border-radius     16
+                  :align-items       :center}
+      [communities.icon/community-icon-redesign community 32]
+      [react/view {:flex              1
+                   :margin-left       12
+                   :justify-content   :center}
       [text/text
        {:accessibility-label :chat-name-text
         :number-of-lines     1
@@ -114,12 +98,8 @@
         :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?}])]]]]])
+      (when (= status :gated)
+        [react/view {:justify-content   :center
+                     :margin-right      12}
+         [community-view/permission-tag-container {:locked?      locked?
+                                                   :tokens       tokens}]])]]]])
@@ -4,69 +4,78 @@
   [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"
+     [community-stats {:icon       :main-icons2/lightning
+                       :count      "112.1K"
                       :icon-color icon-color}]
     (when (= type :card-view)
-       [community-stats {:icon       :i/placeholder
+       [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]}]
@@ -75,4 +84,4 @@
                                      colors/neutral-80)
                   :locked?          locked?
                   :tokens           tokens
-                   :size             24}])
+                   :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,53 @@
     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]}]
  (let [on-joined-images     (get images   :images)]
-    [rn/touchable-without-feedback
+    [react/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/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 +91,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,8 +1,8 @@
 (ns quo2.components.dividers.divider-label
  (:require [react-native.core :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,14 +1,62 @@
 (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]
+             [react-native.core :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/theme-colors colors/danger-50 colors/danger-60)
    (colors/theme-colors colors/neutral-50 colors/neutral-40)))

+(defn action [{:keys [icon
+                      label
+                      sub-label
+                      right-icon
+                      danger?
+                      on-press]}]
+  [rn/touchable-opacity {:on-press on-press}
+   [react/view {:style
+                {:height            (if sub-label 56 47)
+                 :margin-horizontal 20
+                 :flex-direction    :row}}
+    [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}]]
+    [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}}
+       [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)
@@ -17,60 +65,10 @@
                    :align-items      :center
                    :flex-direction   :row}}])

-(defn action [{:keys [icon
-                      label
-                      sub-label
-                      right-icon
-                      danger?
-                      on-press
-                      add-divider?] :as action-props}]
-  (when action-props
-    [:<> {:key label}
-     (when add-divider? [divider])
-     [rn/touchable-opacity {:on-press on-press}
-      [rn/view {:style
-                {:height            (if sub-label 56 47)
-                 :margin-horizontal 20
-                 :flex-direction    :row}}
-       [rn/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
-                   {:height        20
-                    :margin-top    :auto
-                    :margin-bottom :auto
-                    :width         20}}
-          [icon/icon right-icon
-           {:color (get-icon-color danger?)
-            :size  20}]])]]]))
-
 (defn action-drawer [sections]
-  [:<>
-   (doall
+  [:<> {:style
+        {:flex 1}}
+   (interpose
+    [divider]
    (for [actions sections]
-      (doall
-       (map action actions))))])
+      (map action actions)))])
@@ -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}
@@ -30,5 +30,4 @@
   (get-icons 12)
   (get-icons 16)
   (get-icons 20)
-   (get-icons 24)
-   (get-icons 32)))
+   (get-icons 24)))
@@ -78,10 +78,10 @@
          [rn/touchable-opacity
           {:on-press            on-close
            :accessibility-label (str (or id "information-box") "-close-button")}
-           [quo2.icons/icon :i/close {:size            12
-                                      :color           (get-color :close-button)
-                                      :container-style {:margin-top  4
-                                                        :margin-left 8}}]])]
+           [quo2.icons/icon :main-icons2/close {:size            12
+                                                :color           (get-color :close-button)
+                                                :container-style {:margin-top  4
+                                                                  :margin-left 8}}]])]
       (when include-button?
         [quo2.button/button {:type     :primary
                              :size     24
@@ -38,7 +38,7 @@
   [rn/view {:style {:height 20}}
    (when (and (not locked?)
               muted?)
-      [quo2.icons/icon :i/muted
+      [quo2.icons/icon :main-icons2/muted
       {:size     20
        :no-color true}])
    (when (and (not locked?)
@@ -51,6 +51,6 @@
               (not muted?)
               (not (pos? (int mentions-count)))
               unread-messages?)
-      [quo2.icons/icon :i/channel-notification
+      [quo2.icons/icon :main-icons2/channel-notification
       {:size     20
-        :no-color true}])]])
+        :no-color true}])]])
@@ -1,9 +1,10 @@
 (ns quo2.components.list-items.preview-list
  (:require [react-native.core :as rn]
            [react-native.hole-view :as hole-view]
-            [react-native.fast-image :as fast-image]
+            [status-im.i18n.i18n :as i18n]
            [quo2.foundations.colors :as colors]
            [quo2.components.icon :as quo2.icons]
+            [status-im.ui.components.fast-image :as fast-image]
            [quo2.components.avatars.user-avatar :as user-avatar]
            [quo2.components.markdown.text :as quo2.text]))

@@ -56,7 +57,7 @@
    transparent-color
    (colors/theme-colors light-color dark-color override-theme)))

-(defn overflow-label [label size transparent? border-radius margin-left override-theme more-than-99-label]
+(defn overflow-label [label size transparent? border-radius margin-left override-theme]
  [rn/view {:style {:width            size
                    :height           size
                    :margin-left      margin-left
@@ -70,13 +71,13 @@
                                       colors/neutral-70
                                       override-theme)}}
   (if (= size 16)
-     [quo2.icons/icon :i/more {:size 12
-                               :color (get-overflow-color
-                                       transparent?
-                                       colors/white-opa-70
-                                       colors/neutral-50
-                                       colors/neutral-40
-                                       override-theme)}]
+     [quo2.icons/icon :main-icons2/more {:size 12
+                                         :color (get-overflow-color
+                                                 transparent?
+                                                 colors/white-opa-70
+                                                 colors/neutral-50
+                                                 colors/neutral-40
+                                                 override-theme)}]
     [quo2.text/text {:size   (if (= size 32) :paragraph-2 :label)
                      :weight :medium
                      :style  {:color       (get-overflow-color
@@ -89,7 +90,7 @@
      ;; If overflow label is below 100, show label as +label (ex. +30), else just show 99+
      (if (< label 100)
        (str "+" label)
-        more-than-99-label)])])
+        (i18n/label :counter-99-plus))])])

 (defn border-type [type]
  (case type
@@ -105,7 +106,7 @@
    :transparent?  overflow-label transparent?}
   items           preview list items (only 4 items is required for preview)
  "
-  [{:keys [type size list-size transparent? override-theme more-than-99-label]} items]
+  [{:keys [type size list-size transparent? override-theme]} items]
  (let [items-arr     (into [] items)
        list-size     (or list-size (count items))
        margin-left   (get-in params [size :margin-left])
@@ -120,4 +121,4 @@
       [list-item index type size (get items-arr index) list-size
        margin-left hole-size hole-radius hole-x hole-y border-radius])
     (when (> list-size 4)
-       [overflow-label (- list-size 3) size transparent? border-radius margin-left override-theme more-than-99-label])]))
+       [overflow-label (- list-size 3) size transparent? border-radius margin-left override-theme])]))
@@ -1,4 +1,4 @@
-(ns status-im.ui2.screens.chat.components.received-cr-item
+(ns quo2.components.list-items.received-cr-item
  (:require [react-native.core :as rn]
            [quo2.foundations.colors :as colors]
            [status-im.utils.handlers :refer [<sub >evt]]
@@ -1,40 +0,0 @@
-(ns quo2.components.list-items.user-list.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(defn user-list-wrapper [can-be-invited? background-type]
-  (let [height (if can-be-invited? 56 80)]
-    {:width              359
-     :border-radius      12
-     :padding-vertical   8
-     :padding-horizontal 12
-     :height             height
-     :background-color   (case background-type
-                           :5  colors/primary-50-opa-5
-                           :10 colors/primary-50-opa-10
-                           :transparent :transparent)
-     :flex-direction     :column
-     :justify-content    :center}))
-
-(def ml-8 {:margin-left 8})
-
-(def row-centered {:flex-direction :row
-                   :align-items    :center})
-
-(def icon-container-styles {:width           32
-                            :height          32
-                            :border-radius   10
-                            :border-width    1
-                            :border-color    (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10)
-                            :justify-content :center
-                            :align-items     :center})
-
-(def container (assoc row-centered :justify-content :space-between))
-
-(def cant-be-invited {:flex-direction :row
-                      :margin-top     8
-                      :margin-left    40})
-
-(def icon-container {:margin-right 2
-                     :margin-top   2})
-
-(def cant-be-invited-text-style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)})
@@ -1,67 +0,0 @@
-(ns quo2.components.list-items.user-list.view
-  (:require [quo2.components.avatars.user-avatar :as user-avatar]
-            [quo2.components.icon :as icons]
-            [quo2.components.list-items.user-list.style :as style]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            [quo2.components.selectors.selectors :as selectors]
-            [status-im.multiaccounts.core :as multiaccounts]
-            [status-im.utils.utils :as utils]))
-
-(def ^:private icon-types {:options :i/options
-                           :close   :i/close})
-
-(defn- cant-be-invited-msg []
-  [rn/view {:style               style/cant-be-invited
-            :accessibility-label "user can't be invite"}
-   [icons/icon :i/info {:size            12
-                        :color           colors/neutral-40
-                        :container-style style/icon-container}]
-   [text/text {:weight :regular
-               :size   :label
-               :style  style/cant-be-invited-text-style}
-    "Can’t be invited due to their privacy settings"]])
-
-(defn- right-section [{:keys [id button-type on-press checked?]}]
-  (if (= button-type :checkbox)
-    [selectors/checkbox {:default-checked? checked?}]
-    [rn/touchable-opacity
-     {:on-press            on-press
-      :accessibility-label (str (or id "user-list") "-" (if (= button-type :options)
-                                                          "options"
-                                                          "close"))}
-     [rn/view {:style (when (= button-type :close)
-                        style/icon-container-styles)}
-      [icons/icon (button-type icon-types) {:size            20
-                                            :color           (colors/theme-colors colors/neutral-100 colors/white)}]]]))
-
-(defn- user-info [{:keys [id contact on-press checked? button-type]}]
-  [rn/view {:style style/container}
-   [rn/view style/row-centered
-    [user-avatar/user-avatar {:size              :small
-                              :ring?             true
-                              :online?           true
-                              :profile-picture   (multiaccounts/displayed-photo contact)
-                              :status-indicator? true}]
-    [rn/view {:style style/ml-8}
-     [text/text {:weight :semi-bold
-                 :size   :paragraph-1
-                 :style  {:color (colors/theme-colors colors/neutral-100 colors/white)}} (-> contact
-                                                                                             (multiaccounts/contact-two-names false))]
-     [text/text {:weight :regular
-                 :size   :paragraph-2
-                 :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}} (utils/get-shortened-address (:public-key contact))]]]
-   [right-section {:id          id
-                   :button-type button-type
-                   :on-press    on-press
-                   :checked?    checked?}]])
-
-(defn user-list [{:keys [id contact on-press background-type checked? button-type can-be-invited?]}]
-  [rn/view {:style (style/user-list-wrapper can-be-invited? background-type)}
-   [user-info {:id          id
-               :on-press    on-press
-               :checked?    checked?
-               :button-type button-type
-               :contact     contact}]
-   (when-not can-be-invited? [cant-be-invited-msg])])
@@ -1,39 +0,0 @@
-(ns quo2.components.messages.author.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(def container
-  {:flex           1
-   :flex-wrap      :wrap
-   :height         18
-   :flex-direction :row
-   :align-items    :center})
-
-(defn ens-text []
-  {:color (colors/theme-colors colors/neutral-100 colors/white)})
-
-(defn nickname-text []
-  {:color (colors/theme-colors colors/neutral-100 colors/white)})
-
-(def middle-dot-nickname
-  {:color             colors/neutral-50
-   :margin-horizontal 4})
-
-(def chat-key-text
-  {:color       colors/neutral-50
-   :margin-left 8})
-
-(def middle-dot-chat-key
-  {:color       colors/neutral-50
-   :margin-left 4})
-
-(defn profile-name-text [nickname?]
-  {:color (if nickname?
-            (colors/theme-colors colors/neutral-60 colors/neutral-40)
-            (colors/theme-colors colors/neutral-100 colors/white))})
-
-(def icon-container
-  {:margin-left 4})
-
-(defn time-text [ens?]
-  {:color       colors/neutral-50
-   :margin-left (if ens? 8 4)})
@@ -1,66 +0,0 @@
-(ns quo2.components.messages.author.view
-  (:require
-   [quo2.components.messages.author.style :as style]
-   [react-native.core :as rn]
-   [quo2.components.markdown.text :as text]
-   [quo2.components.icon :as icons]
-   [status-im.utils.utils :as utils]
-   [clojure.string :as string]))
-
-(def middle-dot "·")
-
-(defn author [{:keys [profile-name nickname chat-key ens-name time-str contact? verified? untrustworthy?]}]
-  [:f>
-   (fn []
-     (let [ens? (-> ens-name string/blank? not)
-           nickname? (-> nickname string/blank? not)]
-       [rn/view {:style style/container}
-        (if ens?
-          [text/text {:weight :semi-bold
-                      :size   :paragraph-2
-                      :style  (style/ens-text)}
-           ens-name]
-          [:<>
-           (when nickname?
-             [:<>
-              [text/text {:weight :semi-bold
-                          :size   :paragraph-2
-                          :style  (style/nickname-text)}
-               nickname]
-              [text/text {:size  :paragraph-2
-                          :style style/middle-dot-nickname}
-               middle-dot]])
-           [text/text {:weight (if nickname? :medium :semi-bold)
-                       :size   :paragraph-2
-                       :style  (style/profile-name-text nickname?)}
-            profile-name]])
-        (when contact?
-          [icons/icon :main-icons2/contact
-           {:size            12
-            :no-color        true
-            :container-style style/icon-container}])
-        (cond
-          verified?
-          [icons/icon :main-icons2/verified
-           {:size            12
-            :no-color        true
-            :container-style style/icon-container}]
-          untrustworthy?
-          [icons/icon :main-icons2/untrustworthy
-           {:size            12
-            :no-color        true
-            :container-style style/icon-container}])
-        (when-not ens?
-          [text/text {:monospace true
-                      :size      :paragraph-2
-                      :style     style/chat-key-text}
-           (utils/get-shortened-address chat-key)])
-        (when-not ens?
-          [text/text {:monospace true
-                      :size      :paragraph-2
-                      :style     style/middle-dot-chat-key}
-           middle-dot])
-        [text/text {:monospace true
-                    :size      :paragraph-2
-                    :style     (style/time-text ens?)}
-         time-str]]))])
@@ -6,7 +6,10 @@
   [quo2.components.icon :as icon]
   [quo2.components.markdown.text :as text]
   [quo2.foundations.colors :as colors]
-   [reagent.core :as reagent]))
+   [reagent.core :as reagent]
+   [status-im.i18n.i18n :as i18n]
+   [status-im.ui.components.react :refer [pressable-class]]
+   [status-im.utils.handlers :refer [>evt]]))

 ;;; helpers
 (def themes
@@ -81,7 +84,7 @@
                      :color          (get-color :time)}} str])

 (defn info-button [on-press]
-  [rn/touchable-without-feedback
+  [pressable-class
   {:on-press on-press}
   [icon/icon "message-gap-info" {:size 12 :no-color true :container-style {:padding 4}}]])

@@ -96,7 +99,7 @@
   [rn/image {:style {:flex 1} :source (get-image :circles) :resize-mode :repeat}]
   [circle]])

-(defn body [timestamp-far timestamp-near on-info-button-pressed on-press warning-label]
+(defn body [timestamp-far timestamp-near chat-id gap-ids on-info-button-pressed]
  [rn/view {:flex 1}
   [rn/view
    {:flex-direction    :row
@@ -106,10 +109,12 @@
    [timestamp timestamp-far]
    (when on-info-button-pressed [info-button on-info-button-pressed])]

-   [rn/touchable-without-feedback
+   [pressable-class
    {:style    {:flex 1 :margin-top 16 :margin-bottom 20}
-     :on-press #(when on-press (on-press))}
-    [text/text warning-label]]
+     :on-press #(when (and chat-id gap-ids)
+                  (>evt [:chat.ui/fill-gaps chat-id gap-ids]))}
+    [text/text
+     (i18n/label :messages-gap-warning)]]

   [timestamp timestamp-near]])

@@ -119,10 +124,10 @@
  if `on-info-button-pressed` fn is provided, the info button will show up and is pressable"
  [{:keys [timestamp-far
           timestamp-near
+           gap-ids
+           chat-id
           on-info-button-pressed
-           style
-           on-press
-           warning-label]}]
+           style]}]
  (let [body-height (reagent/atom nil)]
    (fn []
      [rn/view
@@ -140,6 +145,6 @@
                       style)

        [timeline]
-        [body timestamp-far timestamp-near on-info-button-pressed on-press warning-label]]
+        [body timestamp-far timestamp-near chat-id gap-ids on-info-button-pressed]]
       [vborder :left body-height]
       [vborder :right body-height]])))
@@ -6,7 +6,8 @@
            [quo2.components.avatars.user-avatar :as user-avatar]
            [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]
-            [utils.string :as utils]))
+            [status-im.i18n.i18n :as i18n]
+            [status-im.utils.core :as utils]))

 (def themes-landed {:pinned  colors/primary-50-opa-5
                    :added   colors/primary-50-opa-5
@@ -53,7 +54,7 @@

 (defmulti sm-render :type)

-(defmethod sm-render :deleted [{:keys [label timestamp-str labels]}]
+(defmethod sm-render :deleted [{:keys [label timestamp-str]}]
  [rn/view {:align-items     :center
            :justify-content :space-between
            :flex            1
@@ -66,10 +67,10 @@
    [text/text {:size  :paragraph-2
                :style {:color        (get-color :text)
                        :margin-right 5}}
-     (or label (:message-deleted labels))]
+     (i18n/label (or label :message-deleted))]
    [sm-timestamp timestamp-str]]])

-(defmethod sm-render :added [{:keys [state mentions timestamp-str labels]}]
+(defmethod sm-render :added [{:keys [state mentions timestamp-str]}]
  [rn/view {:align-items    :center
            :flex-direction :row}
   [sm-icon {:icon    :main-icons/add-user16
@@ -83,14 +84,14 @@
               :style {:color        (get-color :text)
                       :margin-left  3
                       :margin-right 3}}
-    (:added labels)]
+    (i18n/label :added)]
   [sm-user-avatar (:image (second mentions))]
   [text/text {:weight :semi-bold
               :size   :paragraph-2}
    (:name (second mentions))]
   [sm-timestamp timestamp-str]])

-(defmethod sm-render :pinned [{:keys [state pinned-by content timestamp-str labels]}]
+(defmethod sm-render :pinned [{:keys [state pinned-by content timestamp-str]}]
  [rn/view {:flex-direction :row
            :flex           1
            :align-items    :center}
@@ -109,7 +110,7 @@
               :margin-right 2}
      [text/text {:size  :paragraph-2
                  :style {:color (get-color :text)}}
-       (:pinned-a-message labels)]]
+       (i18n/label :pinned-a-message)]]
     [sm-timestamp timestamp-str]]
    [rn/view {:flex-direction :row}
     [rn/view {:flex-direction :row
@@ -136,7 +137,7 @@
         (utils/truncate-str (:info content) 24)])]]]])

 (defn system-message
-  [{:keys [type style non-pressable? animate-landing? labels] :as message}]
+  [{:keys [type style non-pressable? animate-landing?] :as message}]
  [:f>
   (fn []
     (let [sv-color (reanimated/use-shared-value
@@ -158,4 +159,4 @@
                      :padding-horizontal 11
                      :background-color   sv-color}
                     style))}
-        [sm-render message labels]]))])
+        [sm-render message]]))])
@@ -17,7 +17,7 @@
 (defn bottom-nav-tab
  "[bottom-nav-tab opts]
   opts
-   {:icon                   :i/communities
+   {:icon                   :main-icons2/communities
    :new-notifications?     true/false
    :notification-indicator :unread-dot/:counter
    :counter-label          number
@@ -26,7 +26,7 @@
    :icon-color-anim        reanimated shared value
  "
  [{:keys [icon new-notifications? notification-indicator counter-label
-           on-press pass-through? icon-color-anim accessibility-label test-ID]}]
+           on-press pass-through? icon-color-anim accessibility-label]}]
  [:f>
   (fn []
     (let [icon-animated-style       (reanimated/apply-animations-to-style
@@ -40,8 +40,7 @@
                                       :height           40
                                       :border-radius    10})]
       [rn/touchable-without-feedback
-        {:test-ID test-ID
-         :on-press            on-press
+        {:on-press            on-press
         :on-press-in         #(toggle-background-color background-color false pass-through?)
         :on-press-out        #(toggle-background-color background-color true pass-through?)
         :accessibility-label accessibility-label}
@@ -1,13 +1,11 @@
 (ns quo2.components.navigation.floating-shell-button
  (:require [react-native.core :as rn]
-            [react-native.reanimated :as reanimated]
            [quo2.components.buttons.dynamic-button :as dynamic-button]))

 (defn dynamic-button-view [type dynamic-buttons style]
-  (when-let [{:keys [count on-press customization-color label]} (get dynamic-buttons type)]
+  (when-let [{:keys [count on-press customization-color]} (get dynamic-buttons type)]
    [dynamic-button/dynamic-button
     {:type                type
-      :label               label
      :on-press            on-press
      :count               count
      :style               style
@@ -17,28 +15,21 @@
  "[floating-shell-button dynamic-buttons style]
  dynamic-buttons
  {:button-type {:on-press on-press :count count}}"
-  [dynamic-buttons style opacity-anim pointer-anim]
-  [:f>
-   (fn []
-     (let [original-style (merge {:flex-direction    :row
-                                  :margin-horizontal 12} style)
-           animated-style (reanimated/apply-animations-to-style
-                           {:opacity        opacity-anim
-                            :pointer-events pointer-anim}
-                           original-style)]
-       [reanimated/view {:style animated-style}
-        ;; Left Section
-        [rn/view {:style {:flex 1}}
-         [dynamic-button-view :search dynamic-buttons {:position :absolute
-                                                       :right    8}]]
-        ;; Mid Section (jump-to)
-        [dynamic-button-view :jump-to dynamic-buttons nil]
-        ;; Right Section
-        [rn/view {:style {:flex 1}}
-         [rn/view {:style {:position       :absolute
-                           :flex-direction :row
-                           :right          0}}
-          [dynamic-button-view :mention dynamic-buttons {:margin-left 8}]
-          [dynamic-button-view :notification-down dynamic-buttons {:margin-left 8}]
-          [dynamic-button-view :notification-up dynamic-buttons {:margin-left 8}]
-          [dynamic-button-view :bottom dynamic-buttons {:margin-left 8}]]]]))])
+  [dynamic-buttons style]
+  [rn/view {:style (merge {:flex-direction    :row
+                           :margin-horizontal 12} style)}
+   ;; Left Section
+   [rn/view {:style {:flex 1}}
+    [dynamic-button-view :search dynamic-buttons {:position :absolute
+                                                  :right    8}]]
+   ;; Mid Section (jump-to)
+   [dynamic-button-view :jump-to dynamic-buttons nil]
+   ;; Right Section   
+   [rn/view {:style {:flex 1}}
+    [rn/view {:style {:position       :absolute
+                      :flex-direction :row
+                      :right          0}}
+     [dynamic-button-view :mention dynamic-buttons {:margin-left 8}]
+     [dynamic-button-view :notification-down dynamic-buttons {:margin-left 8}]
+     [dynamic-button-view :notification-up dynamic-buttons {:margin-left 8}]
+     [dynamic-button-view :bottom dynamic-buttons {:margin-left 8}]]]])
@@ -2,6 +2,7 @@
  (:require [react-native.core :as rn]
            [quo2.foundations.colors :as colors]
            [quo2.components.icon :as icons]
+            [status-im.utils.dimensions :as dimensions]
            [quo2.components.markdown.text :as text]
            [clojure.string :as string]))

@@ -184,7 +185,8 @@
           mid-section
           left-section
           right-section-buttons]}]
-  (let [put-middle-section-on-left? (or align-mid?
+  (let [{:keys [height width]}      (dimensions/window)
+        put-middle-section-on-left? (or align-mid?
                                        (> (count right-section-buttons) 1))
        mid-section-props
        {:type                    (:type mid-section)
@@ -195,12 +197,15 @@
         :right-icon              (:right-icon mid-section)
         :icon                    (:icon mid-section)
         :left-icon               (:left-icon mid-section)}]
-    [rn/view {:style (cond-> {:display            :flex
-                              :flex-direction     :row
-                              ;;  iPhone 11 Pro's height in Figma divided by Component height 56/1125
-                              :align-items        :center
-                              :padding-horizontal 20
-                              :justify-content    :space-between}
+    [rn/view {:style (cond->
+                      {:display            :flex
+                       :flex-direction     :row
+                       :width              width
+                       :height             (* 0.0497 height)
+                      ;;  iPhone 11 Pro's height in Figma divided by Component height 56/1125
+                       :align-items        :center
+                       :padding-horizontal 20
+                       :justify-content    :space-between}
                       page-nav-background-uri (assoc :background-color page-nav-color)
                       page-nav-color (assoc :background page-nav-background-uri))}
     [rn/view {:style {:flex           1
@@ -63,10 +63,9 @@
                       :right    20
                       :top      12
                       :flex-direction :row}}
-      ;; TODO component shouldn't know anything about parent system, we should pass buttons as parameters
-      [base-button :i/search open-search :open-search-button button-common-props]
-      [base-button :i/scan open-scanner :open-scanner-button button-common-props]
-      [base-button :i/qr-code show-qr :show-qr-button button-common-props]
+      [base-button :main-icons2/search open-search :open-search-button button-common-props]
+      [base-button :main-icons2/scan open-scanner :open-scanner-button button-common-props]
+      [base-button :main-icons2/qr-code show-qr :show-qr-button button-common-props]
      [rn/view ;; Keep view instead of "[:<>" to make sure relative
               ;; position is calculated from this view instead of its parent
       [hole-view/hole-view {:key   new-notifications? ;; Key is required to force removal of holes
@@ -79,7 +78,7 @@

                                      :else
                                      [{:x 33 :y -7 :width 18 :height 18 :borderRadius 7}])}
-        [base-button :i/activity-center open-activity-center
+        [base-button :main-icons2/activity-center open-activity-center
         :open-activity-center-button button-common-props]]
       (when new-notifications?
         (if (= notification-indicator :counter)
@@ -1,76 +0,0 @@
-(ns quo2.components.notifications.activity-log.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(def container
-  {:flex-direction     :row
-   :flex-grow          1
-   :align-items        :flex-start
-   :padding-top        8
-   :padding-horizontal 12
-   :padding-bottom     12})
-
-(def icon
-  {:height          32
-   :width           32
-   :border-radius   100
-   :margin-top      10
-   :border-width    1
-   :border-color    colors/white-opa-5
-   :align-items     :center
-   :justify-content :center})
-
-(def message-title
-  {:color         colors/white-opa-40
-   :margin-bottom 2})
-
-(def message-body
-  {:color colors/white})
-
-(def message-container
-  {:border-radius      12
-   :margin-top         12
-   :padding-horizontal 12
-   :padding-vertical   8
-   :background-color   colors/white-opa-5})
-
-(def buttons-container
-  {:margin-top     12
-   :flex-direction :row
-   :align-items    :flex-start})
-
-(def status
-  {:margin-top  12
-   :align-items :flex-start
-   :flex        1})
-
-(defn title [replying?]
-  {:color       colors/white
-   :flex-shrink 1
-   :max-width   (when-not replying? "60%")})
-
-(def timestamp
-  {:text-transform :none
-   :flex-grow      1
-   :margin-left    8
-   :color          colors/neutral-40})
-
-(def unread-dot
-  {:background-color colors/primary-50
-   :border-radius    4
-   :width            8
-   :height           8})
-
-(def unread-dot-container
-  {:margin-left        8
-   :padding-horizontal 12
-   :padding-vertical   7})
-
-(def context-container
-  {:flex-direction  :row
-   :align-items     :center
-   :justify-content :flex-start
-   :flex-wrap       :wrap})
-
-(def top-section-container
-  {:align-items    :center
-   :flex-direction :row})
@@ -1,178 +0,0 @@
-(ns quo2.components.notifications.activity-log.view
-  (:require [clojure.string :as string]
-            [quo.core :as quo]
-            [quo2.components.buttons.button :as button]
-            [quo2.components.icon :as icon]
-            [quo2.components.markdown.text :as text]
-            [quo2.components.tags.status-tags :as status-tags]
-            [quo2.foundations.colors :as colors]
-            [quo2.components.notifications.activity-log.style :as style]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]
-            [status-im.i18n.i18n :as i18n]))
-
-(def ^:private max-reply-length
-  280)
-
-(defn- valid-reply?
-  [reply]
-  (<= (count reply) max-reply-length))
-
-(defn- activity-reply-text-input
-  [reply-input on-update-reply]
-  [rn/view
-   [rn/view {:style {:margin-top     16
-                     :margin-bottom  8
-                     :flex-direction :row}}
-    [text/text {:weight :medium
-                :style  {:flex-grow 1
-                         :color     colors/neutral-40}}
-     (i18n/label :t/your-answer)]
-    [text/text {:style {:flex-shrink 1
-                        :color       (if (valid-reply? @reply-input)
-                                       colors/neutral-40
-                                       colors/danger-60)}}
-     (str (count @reply-input) "/" max-reply-length)]]
-   [rn/view
-    ;; TODO(@ilmotta): Replace with quo2 component when available.
-    ;; https://github.com/status-im/status-mobile/issues/14364
-    [quo/text-input
-     {:on-change-text      #(do (reset! reply-input %)
-                                (when on-update-reply
-                                  (on-update-reply %)))
-      :auto-capitalize     :none
-      :auto-focus          true
-      :accessibility-label :identity-verification-reply-text-input
-      :placeholder         (i18n/label :t/type-something)
-      :return-key-type     :none
-      :multiline           false
-      :auto-correct        false}]]])
-
-(defn- activity-icon
-  [icon]
-  [rn/view {:style style/icon}
-   [icon/icon icon {:color colors/white}]])
-
-(defn- activity-context
-  [context replying?]
-  (let [first-line-offset (if replying? 4 0)
-        gap-between-lines 4]
-    (into [rn/view {:style (assoc style/context-container :margin-top first-line-offset)}]
-          (mapcat (fn [detail]
-                    ^{:key (hash detail)}
-                    (if (string? detail)
-                      (map (fn [s]
-                             [rn/view {:style {:margin-right 4
-                                               :margin-top   0}}
-                              [text/text {:size :paragraph-2}
-                               s]])
-                           (string/split detail #"\s+"))
-                      [[rn/view {:margin-right 4
-                                 :margin-top   gap-between-lines}
-                        detail]]))
-                  context))))
-
-(defn- activity-message
-  [{:keys [title body]}]
-  [rn/view {:style style/message-container}
-   (when title
-     [text/text {:size                :paragraph-2
-                 :accessibility-label :activity-message-title
-                 :style               style/message-title}
-      title])
-   (if (string? body)
-     [text/text {:style               style/message-body
-                 :accessibility-label :activity-message-body
-                 :size                :paragraph-1}
-      body]
-     body)])
-
-(defn- activity-buttons
-  [button-1 button-2 replying? reply-input]
-  (let [size         (if replying? 40 24)
-        common-style (when replying?
-                       {:padding-vertical 9
-                        :flex-grow        1
-                        :flex-basis       0})]
-    [rn/view style/buttons-container
-     (when button-1
-       [button/button (-> button-1
-                          (assoc :size size)
-                          (update :style merge common-style {:margin-right 8}))
-        (:label button-1)])
-     (when button-2
-       [button/button (-> button-2
-                          (assoc :size size)
-                          (assoc :disabled (and replying? (not (valid-reply? @reply-input))))
-                          (update :style merge common-style))
-        (:label button-2)])]))
-
-(defn- activity-status
-  [status]
-  [rn/view {:style               style/status
-            :accessibility-label :activity-status}
-   [status-tags/status-tag {:size   :small
-                            :label  (:label status)
-                            :status status}]])
-
-(defn- activity-title
-  [title replying?]
-  [text/text {:weight              :semi-bold
-              :accessibility-label :activity-title
-              :style               (style/title replying?)
-              :size                (if replying? :heading-2 :paragraph-1)}
-   title])
-
-(defn- activity-timestamp
-  [timestamp]
-  [text/text {:size                :label
-              :accessibility-label :activity-timestamp
-              :style               style/timestamp}
-   timestamp])
-
-(defn- activity-unread-dot
-  []
-  [rn/view {:accessibility-label :activity-unread-indicator
-            :style               style/unread-dot-container}
-   [rn/view {:style style/unread-dot}]])
-
-(defn- footer
-  [_]
-  (let [reply-input (reagent/atom "")]
-    (fn [{:keys [replying? on-update-reply status button-1 button-2]}]
-      [:<>
-       (when replying?
-         [activity-reply-text-input reply-input on-update-reply])
-       (cond (some? status)
-             [activity-status status]
-
-             (or button-1 button-2)
-             [activity-buttons button-1 button-2 replying? reply-input])])))
-
-(defn view
-  [{:keys [icon
-           message
-           context
-           timestamp
-           title
-           replying?
-           unread?]
-    :as   props}]
-  [rn/view {:accessibility-label :activity
-            :style               style/container}
-   (when-not replying?
-     [activity-icon icon])
-   [rn/view {:style {:padding-left (when-not replying? 8)
-                     :flex         1}}
-    [rn/view
-     [rn/view {:style style/top-section-container}
-      [activity-title title replying?]
-      (when-not replying?
-        [activity-timestamp timestamp])
-      (when (and unread? (not replying?))
-        [activity-unread-dot])]
-     (when context
-       [activity-context context replying?])]
-    (when message
-      [activity-message message])
-    [footer props]]])
@@ -0,0 +1,157 @@
+(ns quo2.components.notifications.activity-logs
+  (:require [react-native.core :as rn]
+            [quo2.components.buttons.button :as button]
+            [quo2.components.icon :as icon]
+            [quo2.components.markdown.text :as text]
+            [quo2.components.tags.status-tags :as status-tags]
+            [quo2.foundations.colors :as colors]))
+
+(defn- activity-icon
+  [icon]
+  [rn/view {:height          32
+            :width           32
+            :border-radius   100
+            :margin-top      10
+            :border-width    1
+            :border-color    colors/white-opa-5
+            :flex-direction  :column
+            :align-items     :center
+            :justify-content :center}
+   [icon/icon icon {:color colors/white}]])
+
+(defn- activity-unread-dot
+  []
+  [rn/view {:margin-left      14
+            :margin-right     6
+            :background-color colors/primary-50
+            :width            8
+            :height           8
+            :border-radius    4}])
+
+(defn- activity-context
+  [context]
+  (let [margin-top 4]
+    (into [rn/view {:flex           1
+                    :flex-direction :row
+                    :align-items    :center
+                    :flex-wrap      :wrap
+                    :margin-top     (+ 4 (- margin-top))}]
+          (map-indexed (fn [index detail]
+                         ^{:key index}
+                         [rn/view {:margin-right 4
+                                   :margin-top   margin-top}
+                          (if (string? detail)
+                            [text/text {:size :paragraph-2}
+                             detail]
+                            detail)])
+                       context))))
+
+(defn- activity-message
+  [{:keys [title body]}]
+  [rn/view {:border-radius      12
+            :margin-top         12
+            :padding-horizontal 12
+            :padding-vertical   8
+            :background-color   colors/white-opa-5
+            :flex               1
+            :flex-direction     :column}
+   (when title
+     [text/text {:size  :paragraph-2
+                 :style {:color colors/white-opa-40}}
+      title])
+   (if (string? body)
+     [text/text {:style {:color colors/white}
+                 :size  :paragraph-1}
+      body]
+     body)])
+
+(defn- activity-buttons
+  [button-1 button-2]
+  (let [size         24
+        common-style {:padding-top    3
+                      :padding-right  8
+                      :padding-bottom 4
+                      :padding-left   8}]
+    [rn/view {:margin-top     12
+              :flex           1
+              :flex-direction :row
+              :align-items    :flex-start}
+     (when button-1
+       [button/button (-> button-1
+                          (assoc :size size)
+                          (assoc-in [:style :margin-right] 8)
+                          (update :style merge common-style))
+        (:label button-1)])
+     (when button-2
+       [button/button (-> button-2
+                          (assoc :size size)
+                          (update :style merge common-style))
+        (:label button-2)])]))
+
+(defn- activity-status
+  [status]
+  [rn/view {:margin-top  12
+            :align-items :flex-start
+            :flex        1}
+   [status-tags/status-tag {:size   :small
+                            :label  (:label status)
+                            :status status}]])
+
+(defn- activity-title
+  [title]
+  [text/text {:weight :semi-bold
+              :style  {:color colors/white}
+              :size   :paragraph-1}
+   title])
+
+(defn- activity-timestamp
+  [timestamp]
+  [rn/view {:margin-left 8}
+   [text/text {:size  :label
+               :style {:text-transform :none
+                       :color          colors/neutral-40}}
+    timestamp]])
+
+(defn activity-log
+  [{:keys [button-1
+           button-2
+           icon
+           message
+           status
+           context
+           timestamp
+           title
+           unread?]}]
+  [rn/view {:flex-direction     :row
+            :flex               1
+            :border-radius      16
+            :padding-top        8
+            :padding-horizontal 12
+            :padding-bottom     12
+            :background-color   (when unread?
+                                  colors/primary-50-opa-10)}
+   [activity-icon icon]
+   [rn/view {:flex-direction :column
+             :padding-left   8
+             :flex           1}
+    [rn/view {:flex           1
+              :align-items    :center
+              :flex-direction :row}
+     [rn/view {:flex           1
+               :align-items    :center
+               :flex-direction :row}
+      [rn/view {:flex-shrink 1}
+       [activity-title title]]
+      [activity-timestamp timestamp]]
+     (when unread?
+       [activity-unread-dot])]
+    (when context
+      [activity-context context])
+    (when message
+      [activity-message message])
+    (cond
+      (some? status)
+      [activity-status status]
+
+      (or button-1 button-2)
+      [activity-buttons button-1 button-2])]])
@@ -26,7 +26,7 @@
                                          :border-color           (if dark?
                                                                    colors/neutral-70
                                                                    colors/neutral-30)})}
-     [icons/icon :i/add
+     [icons/icon :main-icons2/add
      {:size 20
       :color (if dark?
                colors/white
@@ -1,19 +1,14 @@
 (ns quo2.components.selectors.selectors
  (:require [react-native.core :as rn]
            [quo2.foundations.colors :as colors]
+            [quo2.theme :as theme]
            [reagent.core :as reagent]
            [quo2.components.icon :as icons]))

-(defn- get-color [checked? disabled? blurred-background?]
-  (cond
-    checked?
+(defn- get-color [checked? disabled?]
+  (if checked?
    (colors/custom-color-by-theme
     :primary 50 60 (when disabled? 30) (when disabled? 30))
-    blurred-background?
-    (colors/theme-colors
-     (colors/alpha colors/neutral-80 (if disabled? 0.05 0.1))
-     (colors/alpha colors/white (if disabled? 0.05 0.1)))
-    :else
    (colors/theme-colors
     (colors/alpha colors/neutral-20 (if disabled? 0.4 1))
     (colors/alpha colors/neutral-70 (if disabled? 0.3 1)))))
@@ -26,7 +21,7 @@

 (defn checkbox-prefill [{:keys [default-checked?]}]
  (let [checked? (reagent/atom (or default-checked? false))]
-    (fn [{:keys [on-change disabled? blurred-background? container-style]}]
+    (fn [{:keys [on-change disabled? container-style]}]
      [rn/touchable-without-feedback
       {:on-press (handle-press disabled? on-change checked?)}
       [rn/view
@@ -35,20 +30,16 @@
                 {:height 21
                  :width 21
                  :border-radius 6
-                  :background-color (if blurred-background?
-                                      (colors/theme-colors
-                                       (colors/alpha colors/neutral-80 (if disabled? 0.05 0.1))
-                                       (colors/alpha colors/white (if disabled? 0.05 0.1)))
-                                      (colors/theme-colors
-                                       (colors/alpha colors/neutral-20 (if disabled? 0.3 1))
-                                       (colors/alpha colors/neutral-70 (if disabled? 0.3 1))))})
+                  :background-color (colors/theme-colors
+                                     (colors/alpha colors/neutral-20 (if disabled? 0.3 1))
+                                     (colors/alpha colors/neutral-70 (if disabled? 0.3 1)))})
         :accessibility-label (str "checkbox-" (if @checked? "on" "off"))
         :accessibility-role  :checkbox}
        (when @checked?
          [rn/view {:style
                    {:height 20
                     :width 20}}
-           [icons/icon :i/check-small
+           [icons/icon :main-icons2/check-small
            {:size 20
             :color (colors/theme-colors
                     (colors/alpha colors/neutral-100 (if disabled? 0.3 1))
@@ -56,7 +47,7 @@

 (defn checkbox [{:keys [default-checked?]}]
  (let [checked? (reagent/atom (or default-checked? false))]
-    (fn [{:keys [on-change disabled? blurred-background? container-style]}]
+    (fn [{:keys [on-change disabled? container-style]}]
      [rn/touchable-without-feedback
       {:on-press (handle-press disabled? on-change checked?)}
       [rn/view
@@ -68,32 +59,26 @@
         {:style {:flex             1
                  :border-radius    6
                  :border-width     (if @checked? 0 1)
-                  :background-color (cond
-                                      @checked?
-                                      (get-color @checked? disabled? blurred-background?)
-                                      blurred-background?
-                                      (colors/theme-colors
-                                       colors/white-opa-5
-                                       colors/white-opa-10)
-                                      :else
+                  :background-color (if @checked?
+                                      (get-color @checked? disabled?)
                                      (colors/theme-colors
                                       colors/white
                                       colors/neutral-80-opa-40))
                  :border-color     (if @checked? :none
-                                        (get-color @checked? disabled? blurred-background?))}
+                                        (get-color @checked? disabled?))}
          :accessibility-label (str "checkbox-" (if @checked? "on" "off"))
          :accessibility-role  :checkbox}
         (when @checked?
           [rn/view {:style
                     {:height 20
                      :width 20}}
-            [icons/icon :i/check-small
+            [icons/icon :main-icons2/check-small
             {:size 20
              :color colors/white}]])]]])))

 (defn radio [{:keys [default-checked?]}]
  (let [checked? (reagent/atom (or default-checked? false))]
-    (fn [{:keys [on-change disabled? blurred-background? container-style]}]
+    (fn [{:keys [on-change disabled? container-style]}]
      [rn/touchable-without-feedback
       {:on-press (handle-press disabled? on-change checked?)}
       [rn/view
@@ -103,10 +88,9 @@
                  :width 20
                  :border-radius 20
                  :border-width 1
-                  :border-color (get-color @checked? disabled? blurred-background?)
-                  :background-color (when-not blurred-background?
-                                      (colors/theme-colors colors/white
-                                                           (colors/alpha colors/neutral-80 0.4)))})
+                  :border-color (get-color @checked? disabled?)
+                  :background-color (colors/theme-colors colors/white
+                                                         (colors/alpha colors/neutral-80 0.4))})
         :accessibility-label (str "radio-" (if @checked? "on" "off"))
         :accessibility-role  :checkbox}

@@ -114,7 +98,7 @@
                  {:margin-left :auto
                   :height 14
                   :width 14
-                   :background-color (when @checked? (get-color @checked? disabled? blurred-background?))
+                   :background-color (when @checked? (get-color @checked? disabled?))
                   :border-radius 20
                   :margin-right :auto
                   :margin-top :auto
@@ -122,7 +106,7 @@

 (defn toggle [{:keys [default-checked?]}]
  (let [checked? (reagent/atom (or default-checked? false))]
-    (fn [{:keys [on-change disabled? blurred-background? container-style]}]
+    (fn [{:keys [on-change disabled? container-style]}]
      [rn/touchable-without-feedback
       {:on-press (handle-press disabled? on-change checked?)}
       [rn/view
@@ -131,20 +115,17 @@
                 {:height 20
                  :width 30
                  :border-radius 20
-                  :background-color (get-color @checked? disabled? blurred-background?)})
+                  :background-color (get-color @checked? disabled?)})
         :accessibility-label (str "toggle-" (if @checked? "on" "off"))
         :accessibility-role  :checkbox}
        [rn/view {:style
                  {:margin-left (if @checked? 12 2)
                   :height 16
                   :width 16
-                   :background-color (if blurred-background?
-                                       (colors/theme-colors
-                                        (colors/alpha colors/white (if disabled? 0.4 1))
-                                        (colors/alpha colors/white (if disabled? 0.3 1)))
-                                       (colors/theme-colors
-                                        (colors/alpha colors/white 1)
-                                        (colors/alpha colors/white (if disabled? 0.4 1))))
+                   :background-color (colors/alpha colors/white
+                                                   (if (theme/dark?)
+                                                     (if disabled? 0.3 1)
+                                                     1))
                   :border-radius 20
                   :margin-right :auto
                   :margin-top :auto
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.shell.cards.style
+(ns quo2.components.switcher.styles
  (:require [quo2.foundations.colors :as colors]))

 (def colors-map
@@ -1,40 +1,40 @@
-(ns status-im2.contexts.shell.cards.view
-  (:require [i18n.i18n :as i18n]
-            [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]
+(ns quo2.components.switcher.switcher-cards
+  (:require [react-native.core :as rn]
+            [status-im.i18n.i18n :as i18n]
            [quo2.foundations.colors :as colors]
            [quo2.components.markdown.text :as text]
            [quo2.components.buttons.button :as button]
+            [quo2.components.switcher.styles :as styles]
            [quo2.components.counter.counter :as counter]
            [quo2.components.tags.status-tags :as status-tags]
+            [status-im.ui.components.fast-image :as fast-image]
            [quo2.components.avatars.user-avatar :as user-avatar]
            [quo2.components.avatars.group-avatar :as group-avatar]
            [quo2.components.list-items.preview-list :as preview-list]
-            [quo2.components.avatars.channel-avatar :as channel-avatar]
-            [status-im2.contexts.shell.cards.style :as style]))
+            [quo2.components.avatars.channel-avatar :as channel-avatar]))
+
+;; Supporting Components

 (defn content-container [{:keys [content-type data new-notifications? color-50]}]
-  [rn/view {:style (style/content-container new-notifications?)}
+  [rn/view {:style (styles/content-container new-notifications?)}
   (case content-type
-     :text [text/text (style/last-message-text-props) data]
-     :photo [preview-list/preview-list {:type               :photo
-                                        :more-than-99-label (i18n/label :counter-99-plus)
-                                        :size               24
-                                        :override-theme     :dark} data]
+     :text [text/text (styles/last-message-text-props) data]
+     :photo [preview-list/preview-list {:type           :photo
+                                        :size           24
+                                        :override-theme :dark} data]
     :sticker [fast-image/fast-image {:source (:source data)
-                                      :style  (style/sticker)}]
+                                      :style  (styles/sticker)}]
     :gif [fast-image/fast-image {:source (:source data)
-                                  :style  (style/gif)}]
+                                  :style  (styles/gif)}]
     :channel [rn/view {:style {:flex-direction :row
                                :align-items    :center}}
               [channel-avatar/channel-avatar
                {:emoji                  (:emoji data)
                 :emoji-background-color (colors/alpha color-50 0.1)}]
-               [text/text (style/community-channel-props) (:channel-name data)]]
+               [text/text (styles/community-channel-props) (:channel-name data)]]
     :community-info (case (:type data)
                       :pending      [status-tags/status-tag
                                      {:status         :pending
-                                       :label          (i18n/label :t/pending)
                                       :size           :small
                                       :override-theme :dark}]
                       :kicked      [status-tags/status-tag
@@ -42,17 +42,17 @@
                                      :size           :small
                                      :override-theme :dark
                                      :label          (i18n/label :t/kicked)}]
-                       (:count :permission) [:<>]) ;; Add components for these cases
+                       (:count :permission) [:<>]) ;; Add components for these cases                                
     (:audio :community :link :code) ;; Components not available
     [:<>])])

 (defn notification-container [{:keys [notification-indicator counter-label color-60]}]
-  [rn/view {:style (style/notification-container)}
+  [rn/view {:style (styles/notification-container)}
   (if (= notification-indicator :counter)
     [counter/counter {:outline             false
                       :override-text-color colors/white
                       :override-bg-color   color-60} counter-label]
-     [rn/view {:style (style/unread-dot color-60)}])])
+     [rn/view {:style (styles/unread-dot color-60)}])])

 (defn bottom-container [{:keys [new-notifications?] :as content}]
  [:<>
@@ -71,19 +71,19 @@
                                                 :size           :large
                                                 :override-theme :dark}]
    :community-card  [fast-image/fast-image {:source (:source avatar-params)
-                                             :style  (style/community-avatar)}]))
+                                             :style  (styles/community-avatar)}]))

 (defn subtitle [{:keys [content-type data]}]
  (case content-type
-    :text (i18n/label :t/message)
-    :photo (i18n/label :t/n-photos {:count (count data)})
-    :sticker (i18n/label :t/sticker)
-    :gif (i18n/label :t/gif)
-    :audio (i18n/label :t/audio-message)
-    :community (i18n/label :t/link-to-community)
-    :link (i18n/label :t/external-link)
-    :code (i18n/label :t/code-snippet)
-    :channel (i18n/label :t/community-channel)
+    :text           (i18n/label :t/message)
+    :photo          (i18n/label :t/n-photos {:count (count data)})
+    :sticker        (i18n/label :t/sticker)
+    :gif            (i18n/label :t/gif)
+    :audio          (i18n/label :t/audio-message)
+    :community      (i18n/label :t/link-to-community)
+    :link           (i18n/label :t/external-link)
+    :code           (i18n/label :t/code-snippet)
+    :channel        (i18n/label :t/community-channel)
    :community-info (i18n/label :t/community)))

 ;; Screens Card
@@ -92,18 +92,18 @@
  (let [color-50 (colors/custom-color customization-color 50)
        color-60 (colors/custom-color customization-color 60)]
    [rn/touchable-without-feedback {:on-press on-press}
-     [rn/view {:style (style/base-container color-50)}
+     [rn/view {:style (styles/base-container color-50)}
      (when banner
        [rn/image {:source (:source banner)
                   :style  {:width  160}}])
-      [rn/view {:style (style/secondary-container)}
-       [text/text (style/title-props) title]
-       [text/text (style/subtitle-props) (subtitle content)]
+      [rn/view {:style (styles/secondary-container)}
+       [text/text (styles/title-props) title]
+       [text/text (styles/subtitle-props) (subtitle content)]
       [bottom-container (merge {:color-50 color-50 :color-60 color-60} content)]]
      (when avatar
-        [rn/view {:style (style/avatar-container)}
+        [rn/view {:style (styles/avatar-container)}
         [avatar avatar-params type customization-color]])
-      [button/button (style/close-button-props on-close) :i/close]]]))
+      [button/button (styles/close-button-props on-close) :main-icons2/close]]]))

 ;; browser Card
 (defn browser-card [_]
@@ -2,8 +2,8 @@
  (:require [quo2.foundations.colors :as colors]
            [react-native.core :as rn]
            [quo2.theme :as theme]
-            [quo2.components.markdown.text :as text]
-            [quo2.components.icon :as icons]))
+            [status-im.ui.components.icons.icons :as icons]
+            [quo2.components.markdown.text :as text]))

 (def themes {:light {:default  {:background-color colors/neutral-20
                                :icon-color       colors/neutral-50
@@ -3,12 +3,11 @@
            [react-native.core :as rn]
            [quo2.components.tabs.tab :as tab]
            [reagent.core :as reagent]
-            [utils.number :as utils.number]
-            [utils.collection :as utils.collection]
+            [status-im.ui.components.react :as react]
+            [status-im.utils.core :as utils]
+            [status-im.utils.number :as number-utils]
            [quo2.foundations.colors :as colors]
-            [quo2.components.notifications.notification-dot :refer [notification-dot]]
-            [react-native.masked-view :as masked-view]
-            [react-native.linear-gradient :as linear-gradient]))
+            [quo2.components.notifications.notification-dot :refer [notification-dot]]))

 (def default-tab-size 32)

@@ -51,7 +50,7 @@
    ;; Truncate to avoid unnecessary rendering.
    (if (> fade-percentage 0.99)
      0.99
-      (utils.number/naive-round fade-percentage 2))))
+      (number-utils/naive-round fade-percentage 2))))

 (defn scrollable-tabs
  "Just like the component `tabs`, displays horizontally scrollable tabs with
@@ -99,17 +98,15 @@
                 size                  default-tab-size}
          :as   props}]
      (let [maybe-mask-wrapper (if fade-end?
-                                 [masked-view/masked-view
-                                  {:mask-element
-                                   (reagent/as-element
-                                    [linear-gradient/linear-gradient
-                                     {:colors         [:black :transparent]
-                                      :locations      [(get @fading :fade-end-percentage) 1]
-                                      :start          {:x 0 :y 0}
-                                      :end            {:x 1 :y 0}
-                                      :pointer-events :none
-                                      :style          {:width  "100%"
-                                                       :height "100%"}}])}]
+                                 [react/masked-view
+                                  {:mask-element (reagent/as-element
+                                                  [react/linear-gradient {:colors         [:black :transparent]
+                                                                          :locations      [(get @fading :fade-end-percentage) 1]
+                                                                          :start          {:x 0 :y 0}
+                                                                          :end            {:x 1 :y 0}
+                                                                          :pointer-events :none
+                                                                          :style          {:width  "100%"
+                                                                                           :height "100%"}}])}]
                                 [:<>])]
        (conj maybe-mask-wrapper
              [rn/flat-list
@@ -121,7 +118,7 @@
                              :scroll-on-press?
                              :size)
                      (when scroll-on-press?
-                        {:initial-scroll-index (utils.collection/first-index #(= @active-tab-id (:id %)) data)})
+                        {:initial-scroll-index (utils/first-index #(= @active-tab-id (:id %)) data)})
                      {:ref                               #(reset! flat-list-ref %)
                       :extra-data                        (str @active-tab-id)
                       :horizontal                        true
@@ -1,9 +1,10 @@
 (ns quo2.components.tags.permission-tag
-  (:require [react-native.core :as rn]
+  (:require [status-im.ui.components.react :as react]
            [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]
            [quo2.components.icon :as icons]
-            [quo2.components.tags.base-tag :as base-tag]))
+            [quo2.components.tags.base-tag :as base-tag]
+            [status-im.i18n.i18n :as i18n]))

 (defn outer-resource-container [size background-color]
  {:background-color background-color
@@ -27,8 +28,8 @@
 (defn extra-count [total-group-count selected-count size background-color]
  (let [extra-group-count (- total-group-count selected-count)]
    (when (> extra-group-count 0)
-      [rn/view (outer-resource-container size background-color)
-       [rn/view (extra-count-styles size)
+      [react/view (outer-resource-container size background-color)
+       [react/view (extra-count-styles size)
        (if (< extra-group-count 4)
          [text/text {:size :label
                      :style {:align-items     :center
@@ -36,12 +37,12 @@
                                                colors/neutral-50
                                                colors/neutral-40)}}
           (str "+" extra-group-count)]
-          [icons/icon :i/pending-default {:container-style {:align-items     :center
-                                                            :justify-content :center}
-                                          :color (colors/theme-colors
-                                                  colors/neutral-50
-                                                  colors/neutral-40)
-                                          :size  12}])]])))
+          [icons/icon :main-icons2/pending-default {:container-style {:align-items     :center
+                                                                      :justify-content :center}
+                                                    :color (colors/theme-colors
+                                                            colors/neutral-50
+                                                            colors/neutral-40)
+                                                    :size  12}])]])))

 (defn selected-token-count [group]
  (cond
@@ -57,20 +58,20 @@
        :or {size 24}}]
    (let [tokens-count (count group)
          selected-tokens (take (selected-token-count group) group)]
-      [rn/view {:flex-direction :row
-                :align-items    :center}
+      [react/view {:flex-direction :row
+                   :align-items    :center}
       (for [{:keys [token-icon]} selected-tokens]
         ^{:key token-icon}
-         [rn/view {:flex-direction :row}
-          [rn/view (outer-resource-container size background-color)
-           [rn/image {:source token-icon
-                      :style  {:height        (case size 32 28 24 20)
-                               :width         (case size 32 28 24 20)
-                               :border-radius size}}]]])
+         [react/view {:flex-direction :row}
+          [react/view (outer-resource-container size background-color)
+           [react/image {:source token-icon
+                         :style  {:height        (case size 32 28 24 20)
+                                  :width         (case size 32 28 24 20)
+                                  :border-radius size}}]]])

       [extra-count tokens-count (count selected-tokens) size]
       (when-not last-group
-         [rn/view {:align-items   :center}
+         [react/view {:align-items   :center}
          [text/text {:weight        :medium
                      :size          (case size 32       :paragraph-2 24 :label)
                      :style         {:color             (colors/theme-colors
@@ -79,7 +80,7 @@
                                      :padding-left      4
                                      :text-transform    :lowercase
                                      :padding-right     (case size 32 16 24 12)}}
-           "or"]])])))
+           (i18n/label :t/or)]])])))

 (defn selected-group-count [tokens]
  (cond
@@ -93,8 +94,8 @@
        :or {size 24}}]
    (let [selected-groups (take (selected-group-count tokens) tokens)
          last-group-id ((last selected-groups) :id)]
-      [rn/view {:flex-direction :row
-                :align-items    :center}
+      [react/view {:flex-direction :row
+                   :align-items    :center}
       (for [{:keys [id group]} selected-groups]
         ^{:key id}
         [token-group {:group                 group
@@ -109,13 +110,13 @@
    [base-tag/base-tag {:background-color  background-color
                        :size              size
                        :type              :permission}
-     [rn/view  {:flex-direction   :row
-                :align-items      :center
-                :justify-content  :flex-end}
-      [rn/view {:padding-left    (case 32 8 24 6)
-                :padding-right   (case size 32 16 24 12)}
-       [icons/icon (if locked :i/locked
-                       :i/unlocked)
+     [react/view  {:flex-direction   :row
+                   :align-items      :center
+                   :justify-content  :flex-end}
+      [react/view {:padding-left    (case 32 8 24 6)
+                   :padding-right   (case size 32 16 24 12)}
+       [icons/icon (if locked :main-icons2/locked
+                       :main-icons2/unlocked)
        {:resize-mode      :center
         :size             (case size 32 20 24 16)
         :color            (colors/theme-colors
@@ -123,4 +124,4 @@
                            colors/neutral-40)}]]
      [tag-tokens {:tokens     tokens
                   :size             size
-                   :background-color background-color}]]]))
+                   :background-color background-color}]]]))
@@ -3,7 +3,8 @@
            [quo2.theme :as quo2.theme]
            [quo2.components.icon :as icon]
            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]))
+            [quo2.foundations.colors :as colors]
+            [status-im.i18n.i18n :as i18n]))

 (def default-container-style
  {:border-radius 20
@@ -53,7 +54,7 @@
             :background-color colors/success-50-opa-10
             :icon             :verified
             :border-color     colors/success-50-opa-20
-             :label            label
+             :label            (or label (i18n/label :positive))
             :text-color       (if (= theme :light) colors/success-50
                                   colors/success-60)}])

@@ -63,7 +64,7 @@
             :icon             :untrustworthy
             :background-color colors/danger-50-opa-10
             :border-color     colors/danger-50-opa-20
-             :label            label
+             :label            (or label (i18n/label :negative))
             :text-color       (if (= theme :light)
                                 colors/danger-50
                                 colors/danger-60)}])
@@ -72,7 +73,7 @@
  [size theme label]
  [base-tag {:size             size
             :icon             :pending
-             :label            label
+             :label            (or label (i18n/label :pending))
             :background-color (if (= theme :light)
                                 colors/neutral-10
                                 colors/neutral-80)
@@ -22,7 +22,7 @@
                     :icon-color    icon-color
                     :labelled      (if (= type :label) true labelled)
                     :resource      (if (= type :icon)
-                                      :i/placeholder
+                                      :main-icons2/placeholder
                                      resource)
                     :on-press      #(do (reset! active-tab-id %)
-                                         (when on-change (on-change %)))})]])]))))
+                                         (when on-change (on-change %)))})]])]))))
@@ -88,7 +88,7 @@
                             :border-width     1
                             :right            (get-value-from-size size -3.75 -5.75)
                             :bottom           (get-value-from-size size (- 32 7.75 4) (- 24 7.75 2))})}
-             [icons/icon (if is-required :i/hold :i/add)
+             [icons/icon (if is-required :main-icons2/hold :main-icons2/add)
              {:no-color true
               :size 12}]])}
     (str value " " token)]))
@@ -1,17 +1,19 @@
 (ns quo2.components.wallet.network-amount
-  (:require [react-native.core :as rn]
+  (:require [clojure.string :as string]
+            [react-native.core :as rn]
            [quo2.components.icon :as icon]
            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]))
+            [quo2.foundations.colors :as colors]
+            [status-im.i18n.i18n :as i18n]))

 (defn network-amount
  "[network-amount opts]
   opts
   {:style        style                 ;; extra styles for the container (takes precedence)
    :network-name \"Mainnet\"             ;; shown network name
-    :icon         :i/ethereum ;; key of icon belonging to the network
+    :icon         :main-icons2/ethereum ;; key of icon belonging to the network
    :eth-value    1.2345678             ;; shown ETH value}"
-  [{:keys [show-right-border? style network-name icon eth-value labels] :as _opts}]
+  [{:keys [show-right-border? style network-name icon eth-value] :as _opts}]
  [rn/view (merge {:accessibility-label :network-amount
                   :background-color    (colors/theme-colors colors/white colors/neutral-95)
                   :border-radius       16
@@ -33,7 +35,7 @@
      [text/text {:weight :medium
                  :size   :paragraph-2
                  :style  {:color (colors/theme-colors colors/neutral-100 colors/white)}}
-       eth-value \space (:eth labels)]
+       eth-value \space (i18n/label :t/eth)]
      [rn/view {:style {:border-right-width (when show-right-border? 1)
                        :border-right-color (colors/theme-colors colors/neutral-40 colors/neutral-50)
                        :padding-left       8
@@ -42,4 +44,4 @@
     [text/text {:weight :medium
                 :size   :label
                 :style  {:color colors/neutral-50}}
-      (:on labels) \space network-name]]]])
+      (string/lower-case (i18n/label :t/on)) \space network-name]]]])
@@ -5,7 +5,7 @@
            [quo2.components.wallet.network-amount :refer [network-amount]]))

 (defn network-breakdown
-  [{:keys [top-value network-conversions labels]}]
+  [{:keys [top-value network-conversions]}]
  [rn/view {:style {:background-color   (colors/theme-colors
                                         colors/white
                                         colors/neutral-95)
@@ -41,6 +41,5 @@
          [network-amount {:show-right-border? (not= idx last-item-idx)
                           :icon               icon
                           :network-name       network
-                           :eth-value          conversion
-                           :labels             labels}]])
+                           :eth-value          conversion}]])
       network-conversions))]])
@@ -1,10 +1,12 @@
 (ns quo2.components.wallet.token-overview
  (:require
   [quo2.foundations.colors :as colors]
+   [status-im.i18n.i18n :as i18n]
   [react-native.core :as rn]
   [clojure.string :as string]
-   [quo2.components.markdown.text :as text]
-   [quo2.components.icon :as icons]))
+   [status-im.utils.currency :as currencies]
+   [status-im.ui.components.icons.icons :as icons]
+   [quo2.components.markdown.text :as text]))

 (def container-style {:display :flex :width "100%" :padding-left 20 :padding-right 20 :padding-top 12 :padding-bottom 12})

@@ -40,18 +42,18 @@
    }"
  []
  (fn
-    [{:keys [currency price percentage-change label] :or {price "0.00" percentage-change "0.0"}}]
+    [{:keys [currency price  percentage-change] :or {currency :usd price "0.00" percentage-change "0.0"}}]
    (let [direction (get-direction percentage-change)]
      [rn/view {:style container-style}
       [text/text  {:number-of-lines 1
-                    :size  :paragraph-2} label]
+                    :size  :paragraph-2} (i18n/label :token-price)]
       [text/text  {:style {:margin-top 4}
                    :weight :semi-bold
                    :number-of-lines 1
-                    :size  :heading-2} (str currency price)]
+                    :size  :heading-2} (str (get-in currencies/currencies [currency :symbol]) price)]

       [rn/view {:style {:display :flex :flex-direction :row :margin-top 6 :align-items :center}}
-        (when (not (zero? direction)) [icons/icon (if (>= direction 0) :i/price-increase12 :i/price-decrease12)
+        (when (not (zero? direction)) [icons/icon (if (>= direction 0) :main-icons2/price-increase12 :main-icons2/price-decrease12)
                                       {:no-color true
                                        :width 14
                                        :height 14
@@ -74,7 +76,7 @@
    :percentage-change :string
    }"
  []
-  (fn [{:keys [token token-img-src currency account-balance price percentage-change] :or {account-balance "0.00" price "0.00" percentage-change "0.0"}}]
+  (fn [{:keys [token token-img-src currency account-balance price percentage-change] :or {currency :usd account-balance "0.00" price "0.00" percentage-change "0.0"}}]
    (let [direction (get-direction percentage-change)]
      [rn/view {:style container-style}
       [text/text  {:weight :regular
@@ -83,19 +85,20 @@
       [rn/view {:style {:display :flex :flex-direction :row :flex 1 :justify-content :space-between}}
        [text/text  {:number-of-lines 1
                     :weight :semi-bold
-                     :size  :heading-1} (str currency account-balance)]
+                     :size  :heading-1} (str (get-in currencies/currencies [currency :symbol]) account-balance)]
        [rn/image {:source token-img-src
                   :style {:height 32
                           :width 32}}]]
       [rn/view {:style {:display :flex :flex-direction :row :margin-top 6 :align-items :center}}
-        (when (not (zero? direction)) [icons/icon (if (pos? direction) :i/price-increase :i/price-decrease)
+        (when (not (zero? direction)) [icons/icon (if (pos? direction) :main-icons2/price-increase12 :main-icons2/price-decrease12)
                                       {:no-color true
-                                        :size 12
+                                        :width 12
+                                        :height 12
                                        :container-style {:margin-right 4}}])
        [text/text  {:number-of-lines 1
                     :weight :medium
                     :size  :paragraph-2
-                     :style {:color  (price-color direction)}} (str currency price)]
+                     :style {:color  (price-color direction)}} (str (get-in currencies/currencies [currency :symbol]) price)]
        [divider direction]
        [text/text {:number-of-lines 1
                    :weight :medium
@@ -1,101 +0,0 @@
-(ns quo2.core
-  (:require quo2.components.buttons.button
-            quo2.components.buttons.dynamic-button
-            quo2.components.markdown.text
-            quo2.components.icon
-            quo2.components.separator
-            quo2.components.header
-            quo2.components.avatars.account-avatar
-            quo2.components.avatars.channel-avatar
-            quo2.components.avatars.group-avatar
-            quo2.components.avatars.icon-avatar
-            quo2.components.avatars.user-avatar
-            quo2.components.avatars.wallet-user-avatar
-            quo2.components.community.community-card-view
-            quo2.components.community.community-list-view
-            quo2.components.community.community-view
-            quo2.components.community.discover-card
-            quo2.components.counter.counter
-            quo2.components.dividers.divider-label
-            quo2.components.dividers.new-messages
-            quo2.components.drawers.action-drawers
-            quo2.components.dropdowns.dropdown
-            quo2.components.info.info-message
-            quo2.components.info.information-box
-            quo2.components.list-items.channel
-            quo2.components.list-items.menu-item
-            quo2.components.list-items.preview-list
-            quo2.components.messages.gap
-            quo2.components.messages.system-message
-            quo2.components.reactions.reaction
-            quo2.components.notifications.activity-log.view
-            quo2.components.notifications.info-count
-            quo2.components.notifications.notification-dot
-            quo2.components.tags.tags
-            quo2.components.tags.context-tags
-            quo2.components.tabs.tabs
-            quo2.components.tabs.account-selector
-            quo2.components.navigation.top-nav
-            quo2.components.navigation.floating-shell-button
-            quo2.components.tags.status-tags
-            quo2.components.navigation.page-nav
-            quo2.components.selectors.disclaimer))
-
-(def button quo2.components.buttons.button/button)
-(def dynamic-button quo2.components.buttons.dynamic-button/dynamic-button)
-(def text quo2.components.markdown.text/text)
-(def icon quo2.components.icon/icon)
-(def separator quo2.components.separator/separator)
-(def counter quo2.components.counter.counter/counter)
-(def header quo2.components.header/header)
-(def action-drawer quo2.components.drawers.action-drawers/action-drawer)
-(def dropdown quo2.components.dropdowns.dropdown/dropdown)
-(def info-message quo2.components.info.info-message/info-message)
-(def information-box quo2.components.info.information-box/information-box)
-(def gap quo2.components.messages.gap/gap)
-(def system-message quo2.components.messages.system-message/system-message)
-(def reaction quo2.components.reactions.reaction/reaction)
-(def tags quo2.components.tags.tags/tags)
-(def user-avatar-tag quo2.components.tags.context-tags/user-avatar-tag)
-(def context-tag quo2.components.tags.context-tags/context-tag)
-(def tabs quo2.components.tabs.tabs/tabs)
-(def scrollable-tabs quo2.components.tabs.tabs/scrollable-tabs)
-(def account-selector quo2.components.tabs.account-selector/account-selector)
-(def top-nav quo2.components.navigation.top-nav/top-nav)
-(def floating-shell-button quo2.components.navigation.floating-shell-button/floating-shell-button)
-(def status-tag quo2.components.tags.status-tags/status-tag)
-(def page-nav quo2.components.navigation.page-nav/page-nav)
-(def disclaimer quo2.components.selectors.disclaimer/disclaimer)
-
-;;;; AVATAR
-(def account-avatar quo2.components.avatars.account-avatar/account-avatar)
-(def channel-avatar quo2.components.avatars.channel-avatar/channel-avatar)
-(def group-avatar quo2.components.avatars.group-avatar/group-avatar)
-(def icon-avatar quo2.components.avatars.icon-avatar/icon-avatar)
-(def user-avatar quo2.components.avatars.user-avatar/user-avatar)
-(def wallet-user-avatar quo2.components.avatars.wallet-user-avatar/wallet-user-avatar)
-
-;;;; COMMUNITY
-(def community-card-view-item quo2.components.community.community-card-view/community-card-view-item)
-(def communities-list-view-item quo2.components.community.community-list-view/communities-list-view-item)
-(def communities-membership-list-item quo2.components.community.community-list-view/communities-membership-list-item)
-(def community-stats-column quo2.components.community.community-view/community-stats-column)
-(def community-stats quo2.components.community.community-view/community-stats)
-(def community-tags quo2.components.community.community-view/community-tags)
-(def community-title quo2.components.community.community-view/community-title)
-(def permission-tag-container quo2.components.community.community-view/permission-tag-container)
-(def discover-card quo2.components.community.discover-card/discover-card)
-
-;;;; DIVIDERS
-(def divider-label quo2.components.dividers.divider-label/divider-label)
-(def new-messages quo2.components.dividers.new-messages/new-messages)
-
-;;;; LIST ITEMS
-(def channel-list-item quo2.components.list-items.channel/list-item)
-(def menu-item quo2.components.list-items.menu-item/menu-item)
-(def preview-list quo2.components.list-items.preview-list/preview-list)
-
-;;;; NOTIFICATIONS
-(def activity-log quo2.components.notifications.activity-log.view/view)
-(def info-count quo2.components.notifications.info-count/info-count)
-(def notification-dot quo2.components.notifications.notification-dot/notification-dot)
@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.avatars.account-avatar
+(ns quo2.screens.avatars.account-avatar
  (:require [reagent.core :as reagent]
            [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.components.avatars.account-avatar :as quo2]))

 (def descriptor [{:label   "Icon"
@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.avatars.channel-avatar
+(ns quo2.screens.avatars.channel-avatar
  (:require [reagent.core :as reagent]
            [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [quo2.components.avatars.channel-avatar :as quo2]))

@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.avatars.group-avatar
+(ns quo2.screens.avatars.group-avatar
  (:require [reagent.core :as reagent]
            [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [quo2.components.avatars.group-avatar :as quo2]))

@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.avatars.icon-avatar
+(ns quo2.screens.avatars.icon-avatar
  (:require [reagent.core :as reagent]
            [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [quo2.components.avatars.icon-avatar :as quo2]))

@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.avatars.user-avatar
+(ns quo2.screens.avatars.user-avatar
  (:require [react-native.core :as rn]
            [quo2.foundations.colors :as colors]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.components.avatars.user-avatar :as quo2]
            [reagent.core :as reagent]
            [status-im.react-native.resources :as resources]))
@@ -1,6 +1,6 @@
-(ns status-im2.contexts.quo-preview.avatars.wallet-user-avatar
+(ns quo2.screens.avatars.wallet-user-avatar
  (:require [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [reagent.core :as reagent]
            [quo2.components.avatars.wallet-user-avatar :as quo2]
            [quo2.foundations.colors :as colors]))
@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.buttons.button
+(ns quo2.screens.buttons.button
  (:require [reagent.core :as reagent]
            [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [quo2.components.buttons.button :as quo2]))

@@ -74,12 +74,12 @@
                                     :theme :before :after)
                             {:on-press #(println "Hello world!")}
                             (when @above
-                               {:above :i/placeholder})
+                               {:above :main-icons2/placeholder})
                             (when @before
-                               {:before :i/placeholder})
+                               {:before :main-icons2/placeholder})
                             (when @after
-                               {:after :i/placeholder}))
-          (if @icon :i/placeholder @label)]]]])))
+                               {:after :main-icons2/placeholder}))
+          (if @icon :main-icons2/placeholder @label)]]]])))

 (defn preview-button []
  [rn/view {:background-color (colors/theme-colors colors/white colors/neutral-90)
@@ -1,10 +1,9 @@
-(ns status-im2.contexts.quo-preview.buttons.dynamic-button
+(ns quo2.screens.buttons.dynamic-button
  (:require [react-native.core :as rn]
            [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
-            [quo2.components.buttons.dynamic-button :as quo2]
-            [status-im.i18n.i18n :as i18n]))
+            [quo2.components.buttons.dynamic-button :as quo2]))

 (def descriptor [{:label   "Type:"
                  :key     :type
@@ -28,10 +27,7 @@
                  :type  :text}])

 (defn cool-preview []
-  (let [state (reagent/atom {:count  "5"
-                             :type   :jump-to
-                             :labels {:jump-to           (i18n/label :t/jump-to)
-                                      :search-with-label (i18n/label :t/back)}})]
+  (let [state (reagent/atom {:count "5" :type :jump-to})]
    (fn []
      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
       [rn/view {:padding-bottom 150}
@@ -1,5 +1,5 @@
-(ns status-im2.contexts.quo-preview.code.snippet
-  (:require [status-im2.contexts.quo-preview.preview :as preview]
+(ns quo2.screens.code.snippet
+  (:require [quo2.screens.preview :as preview]
            [react-native.core :as rn]
            [quo2.components.code.snippet :as snippet]
            [quo2.foundations.colors :as colors]
@@ -1,6 +1,6 @@
-(ns status-im2.contexts.quo-preview.community.community-card-view
+(ns quo2.screens.community.community-card-view
  (:require [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [reagent.core :as reagent]
            [status-im.constants :as constants]
            [quo2.foundations.colors :as colors]
@@ -1,10 +1,25 @@
-(ns status-im2.contexts.quo-preview.community.community-membership-list-view
+(ns quo2.screens.community.community-list-view
  (:require [quo.react-native :as rn]
            [quo.previews.preview :as preview]
            [reagent.core :as reagent]
+            [status-im.constants :as constants]
+            [quo.design-system.colors :as quo.colors]
            [quo2.foundations.colors :as colors]
-            [status-im2.contexts.quo-preview.community.data :as data]
-            [quo2.components.community.community-list-view :as community-list-view]))
+            [quo2.components.community.community-list-view :as community-list-view]
+            [status-im.i18n.i18n :as i18n]
+            [status-im.react-native.resources :as resources]))
+
+(def community-data
+  {:id             constants/status-community-id
+   :name           "Status"
+   :description    "Status is a secure messaging app, crypto wallet and web3 browser built with the state of the art technology"
+   :cover          (resources/get-image :community-cover)
+   :community-icon (resources/get-image :status-logo)
+   :color          (rand-nth quo.colors/chat-colors)
+   :tokens         [{:id 1 :group [{:id 1 :token-icon (resources/get-image :status-logo)}]}]
+   :tags           [{:id 1 :tag-label (i18n/label :t/music) :resource (resources/get-image :music)}
+                    {:id 2 :tag-label (i18n/label :t/lifestyle) :resource (resources/get-image :lifestyle)}
+                    {:id 3 :tag-label (i18n/label :t/podcasts) :resource (resources/get-image :podcasts)}]})

 (def descriptor [{:label   "Notifications:"
                  :key     :notifications
@@ -41,15 +56,8 @@
         [preview/customizer state descriptor]]
        [rn/view {:padding-vertical 60
                  :justify-content  :center}
-         [community-list-view/communities-membership-list-item {} (cond-> (merge @state data/community)
-                                                                    (= :muted (:notifications @state))
-                                                                    (assoc :muted? true)
-
-                                                                    (= :unread-mentions-count (:notifications @state))
-                                                                    (assoc :unread-mentions-count 5)
-
-                                                                    (= :unread-messages-count (:notifications @state))
-                                                                    (assoc :unread-messages? true))]]]])))
+         [community-list-view/communities-list-view-item (merge @state
+                                                                community-data)]]]])))

 (defn preview-community-list-view []
  [rn/view {:background-color (colors/theme-colors colors/neutral-5
@@ -59,3 +67,4 @@
                  :keyboardShouldPersistTaps :always
                  :header                    [cool-preview]
                  :key-fn                    str}]])
+
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.quo-preview.community.discover-card
+(ns quo2.screens.community.discover-card
  (:require [quo.react-native :as rn]
            [quo.previews.preview :as preview]
            [reagent.core :as reagent]
@@ -1,6 +1,6 @@
-(ns status-im2.contexts.quo-preview.counter.counter
+(ns quo2.screens.counter.counter
  (:require [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [reagent.core :as reagent]
            [quo2.components.counter.counter :as quo2]
            [quo2.foundations.colors :as colors]))
@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.dividers.divider-label
+(ns quo2.screens.dividers.divider-label
  (:require [react-native.core :as rn]
            [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [quo2.components.dividers.divider-label :as divider-label]))

@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.dividers.new-messages
+(ns quo2.screens.dividers.new-messages
  (:require [react-native.core :as rn]
            [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [quo2.components.dividers.new-messages :as new-messages]
            [status-im.i18n.i18n :as i18n]))
@@ -1,5 +1,5 @@
-(ns status-im2.contexts.quo-preview.drawers.action-drawers
-  (:require [status-im2.contexts.quo-preview.preview :as preview]
+(ns quo2.screens.drawers.action-drawers
+  (:require [quo2.screens.preview :as preview]
            [react-native.core :as rn]
            [quo2.components.drawers.action-drawers :as quo2]
            [quo2.components.buttons.button :as button]
@@ -14,23 +14,23 @@
                  :key     :show-red-options?
                  :type    :boolean}])

-(def options-with-consequences [{:icon    :i/delete
+(def options-with-consequences [{:icon    :main-icons2/delete
                                 :danger? true
                                 :label   "Clear history"}])

 (defn render-action-sheet [state]
-  [quo2/action-drawer (cond-> [[{:icon  :i/friend
+  [quo2/action-drawer (cond-> [[{:icon  :main-icons2/friend
                                 :label "View channel members and details"}
-                                {:icon  :i/communities
+                                {:icon  :main-icons2/communities
                                 :label "Mark as read"}
-                                {:icon       :i/muted
+                                {:icon       :main-icons2/muted
                                 :label      (if (:muted? @state) "Unmute channel" "Mute channel")
-                                 :right-icon :i/chevron-right
+                                 :right-icon :main-icons2/chevron-right
                                 :sub-label  (when (:muted? @state) "Muted for 15 min")}
-                                {:icon       :i/scan
-                                 :right-icon :i/chevron-right
+                                {:icon       :main-icons2/scan
+                                 :right-icon :main-icons2/chevron-right
                                 :label      "Fetch messages"}
-                                {:icon  :i/add-user
+                                {:icon  :main-icons2/add-user
                                 :label "Share link to the channel"}]]

                        (:show-red-options? @state)
@@ -1,6 +1,6 @@
-(ns status-im2.contexts.quo-preview.dropdowns.dropdown
+(ns quo2.screens.dropdowns.dropdown
  (:require [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.components.dropdowns.dropdown :as quo2]
            [quo2.foundations.colors :as colors]
            [reagent.core :as reagent]))
@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.info.info-message
+(ns quo2.screens.info.info-message
  (:require [react-native.core :as rn]
            [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [quo2.components.info.info-message :as quo2]))

@@ -28,7 +28,7 @@
 (defn cool-preview []
  (let [state (reagent/atom {:type    :default
                             :size    :default
-                             :icon    :i/placeholder
+                             :icon    :main-icons2/placeholder
                             :message "This is a message"})]
    (fn []
      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.info.information-box
+(ns quo2.screens.info.information-box
  (:require [react-native.core :as rn]
            [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [quo2.components.info.information-box :as quo2]))

@@ -27,7 +27,7 @@
 (defn cool-preview []
  (let [state    (reagent/atom {:type        :default
                                :closable?    true
-                                :icon         :i/placeholder
+                                :icon         :main-icons2/placeholder
                                :message      "This is an information box This is an information"
                                :button-label "Press Me"
                                :style         {:width 335}
@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.list-items.channel
+(ns quo2.screens.list-items.channel
  (:require [react-native.core :as rn]
            [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [quo2.components.list-items.channel :as quo2-channel]))

@@ -1,11 +1,10 @@
-(ns status-im2.contexts.quo-preview.list-items.preview-lists
+(ns quo2.screens.list-items.preview-lists
  (:require [react-native.core :as rn]
            [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.foundations.colors :as colors]
            [status-im.react-native.resources :as resources]
-            [quo2.components.list-items.preview-list :as quo2]
-            [status-im.i18n.i18n :as i18n]))
+            [quo2.components.list-items.preview-list :as quo2]))

 (def descriptor [{:label   "Size:"
                  :key     :size
@@ -44,10 +43,9 @@
   {:source (resources/get-mock-image :photo6)}])

 (defn cool-preview []
-  (let [state (reagent/atom {:type               :user
-                             :size               32
-                             :list-size          10
-                             :more-than-99-label (i18n/label :counter-99-plus)})
+  (let [state (reagent/atom {:type      :user
+                             :size      32
+                             :list-size 10})
        type  (reagent/cursor state [:type])]
    (fn []
      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
@@ -1,59 +1,55 @@
-(ns status-im2.contexts.quo-preview.main
+(ns quo2.screens.main
  (:require [react-native.core :as rn]
            [react-native.safe-area :as safe-area]
            [quo2.foundations.colors :as colors]
            [quo2.theme :as theme]
            [quo2.components.markdown.text :as quo2-text]
            [quo2.components.buttons.button :as quo2-button]
-            [status-im2.contexts.quo-preview.avatars.channel-avatar :as channel-avatar]
-            [status-im2.contexts.quo-preview.avatars.icon-avatar :as icon-avatar]
-            [status-im2.contexts.quo-preview.avatars.group-avatar :as group-avatar]
-            [status-im2.contexts.quo-preview.avatars.user-avatar :as user-avatar]
-            [status-im2.contexts.quo-preview.avatars.wallet-user-avatar :as wallet-user-avatar]
-            [status-im2.contexts.quo-preview.buttons.button :as button]
-            [status-im2.contexts.quo-preview.buttons.dynamic-button :as dynamic-button]
-            [status-im2.contexts.quo-preview.code.snippet :as code-snippet]
-            [status-im2.contexts.quo-preview.counter.counter :as counter]
-            [status-im2.contexts.quo-preview.community.community-card-view :as community-card]
-            [status-im2.contexts.quo-preview.community.community-list-view :as community-list-view]
-            [status-im2.contexts.quo-preview.community.community-membership-list-view :as community-membership-list-view]
-            [status-im2.contexts.quo-preview.community.discover-card :as discover-card]
-            [status-im2.contexts.quo-preview.dividers.divider-label :as divider-label]
-            [status-im2.contexts.quo-preview.dividers.new-messages :as new-messages]
-            [status-im2.contexts.quo-preview.drawers.action-drawers :as drawers]
-            [status-im2.contexts.quo-preview.dropdowns.dropdown :as dropdown]
-            [status-im2.contexts.quo-preview.info.info-message :as info-message]
-            [status-im2.contexts.quo-preview.info.information-box :as information-box]
-            [status-im2.contexts.quo-preview.wallet.lowest-price :as lowest-price]
-            [status-im2.contexts.quo-preview.list-items.preview-lists :as preview-lists]
-            [status-im2.contexts.quo-preview.list-items.channel :as channel]
-            [status-im2.contexts.quo-preview.markdown.text :as text]
-            [status-im2.contexts.quo-preview.messages.author :as messages-author]
-            [status-im2.contexts.quo-preview.messages.gap :as messages-gap]
-            [status-im2.contexts.quo-preview.messages.system-message :as system-message]
-            [status-im2.contexts.quo-preview.notifications.activity-logs :as activity-logs]
-            [status-im2.contexts.quo-preview.posts-and-attachments.messages-skeleton :as messages-skeleton]
-            [status-im2.contexts.quo-preview.reactions.react :as react]
-            [status-im2.contexts.quo-preview.selectors.disclaimer :as disclaimer]
-            [status-im2.contexts.quo-preview.selectors.selectors :as selectors]
-            [status-im2.contexts.quo-preview.switcher.switcher-cards :as switcher-cards]
-            [status-im2.contexts.quo-preview.navigation.top-nav :as top-nav]
-            [status-im2.contexts.quo-preview.navigation.bottom-nav-tab :as bottom-nav-tab]
-            [status-im2.contexts.quo-preview.navigation.floating-shell-button :as floating-shell-button]
-            [status-im2.contexts.quo-preview.tabs.account-selector :as account-selector]
-            [status-im2.contexts.quo-preview.tabs.segmented-tab :as segmented]
-            [status-im2.contexts.quo-preview.tabs.tabs :as tabs]
-            [status-im2.contexts.quo-preview.tags.context-tags :as context-tags]
-            [status-im2.contexts.quo-preview.tags.tags :as tags]
-            [status-im2.contexts.quo-preview.tags.permission-tag :as permission-tag]
-            [status-im2.contexts.quo-preview.tags.status-tags :as status-tags]
-            [status-im2.contexts.quo-preview.tags.token-tag :as token-tag]
-            [status-im2.contexts.quo-preview.wallet.token-overview :as token-overview]
-            [status-im2.contexts.quo-preview.wallet.network-breakdown :as network-breakdown]
-            [status-im2.contexts.quo-preview.wallet.network-amount :as network-amount]
-            [status-im2.contexts.quo-preview.navigation.page-nav :as page-nav]
-            [status-im2.contexts.quo-preview.avatars.account-avatar :as account-avatar]
-            [status-im2.contexts.quo-preview.list-items.user-list :as user-list]
+            [quo2.screens.avatars.channel-avatar :as channel-avatar]
+            [quo2.screens.avatars.icon-avatar :as icon-avatar]
+            [quo2.screens.avatars.group-avatar :as group-avatar]
+            [quo2.screens.avatars.user-avatar :as user-avatar]
+            [quo2.screens.avatars.wallet-user-avatar :as wallet-user-avatar]
+            [quo2.screens.buttons.button :as button]
+            [quo2.screens.buttons.dynamic-button :as dynamic-button]
+            [quo2.screens.code.snippet :as code-snippet]
+            [quo2.screens.counter.counter :as counter]
+            [quo2.screens.community.community-card-view :as community-card]
+            [quo2.screens.community.discover-card :as discover-card]
+            [quo2.screens.community.community-list-view :as community-list-view]
+            [quo2.screens.dividers.divider-label :as divider-label]
+            [quo2.screens.dividers.new-messages :as new-messages]
+            [quo2.screens.drawers.action-drawers :as drawers]
+            [quo2.screens.dropdowns.dropdown :as dropdown]
+            [quo2.screens.info.info-message :as info-message]
+            [quo2.screens.info.information-box :as information-box]
+            [quo2.screens.wallet.lowest-price :as lowest-price]
+            [quo2.screens.list-items.preview-lists :as preview-lists]
+            [quo2.screens.list-items.channel :as channel]
+            [quo2.screens.markdown.text :as text]
+            [quo2.screens.messages.gap :as messages-gap]
+            [quo2.screens.messages.system-message :as system-message]
+            [quo2.screens.notifications.activity-logs :as activity-logs]
+            [quo2.screens.reactions.react :as react]
+            [quo2.screens.selectors.disclaimer :as disclaimer]
+            [quo2.screens.selectors.selectors :as selectors]
+            [quo2.screens.switcher.switcher-cards :as switcher-cards]
+            [quo2.screens.navigation.top-nav :as top-nav]
+            [quo2.screens.navigation.bottom-nav-tab :as bottom-nav-tab]
+            [quo2.screens.navigation.floating-shell-button :as floating-shell-button]
+            [quo2.screens.tabs.account-selector :as account-selector]
+            [quo2.screens.tabs.segmented-tab :as segmented]
+            [quo2.screens.tabs.tabs :as tabs]
+            [quo2.screens.tags.context-tags :as context-tags]
+            [quo2.screens.tags.tags :as tags]
+            [quo2.screens.tags.permission-tag :as permission-tag]
+            [quo2.screens.tags.status-tags :as status-tags]
+            [quo2.screens.tags.token-tag :as token-tag]
+            [quo2.screens.wallet.token-overview :as token-overview]
+            [quo2.screens.wallet.network-breakdown :as network-breakdown]
+            [quo2.screens.wallet.network-amount :as network-amount]
+            [quo2.screens.navigation.page-nav :as page-nav]
+            [quo2.screens.avatars.account-avatar :as account-avatar]
            [re-frame.core :as re-frame]))

 (def screens-categories
@@ -90,9 +86,6 @@
               {:name      :community-list-view
                :insets    {:top false}
                :component community-list-view/preview-community-list-view}
-               {:name      :community-membership-list-view
-                :insets    {:top false}
-                :component community-membership-list-view/preview-community-list-view}
               {:name      :discover-card
                :insets    {:top false}
                :component discover-card/preview-discoverd-card}]
@@ -122,10 +115,7 @@
                 :component channel/preview-channel}
                {:name      :preview-lists
                 :insets    {:top false}
-                 :component preview-lists/preview-preview-lists}
-                {:name      :user-list
-                 :insets    {:top false}
-                 :component user-list/preview-channel}]
+                 :component preview-lists/preview-preview-lists}]
   :markdown [{:name      :texts
               :insets    {:top false}
               :component text/preview-text}]
@@ -134,10 +124,7 @@
               :component messages-gap/preview-messages-gap}
              {:name      :system-messages
               :insets    {:top false}
-               :component system-message/preview-system-message}
-              {:name      :author
-               :insets    {:top false}
-               :component messages-author/preview-author}]
+               :component system-message/preview-system-message}]
   :navigation [{:name      :bottom-nav-tab
                 :insets    {:top false}
                 :component bottom-nav-tab/preview-bottom-nav-tab}
@@ -153,9 +140,6 @@
   :notifications [{:name      :activity-logs
                    :insets    {:top false}
                    :component activity-logs/preview-activity-logs}]
-   :posts-and-attachments [{:name      :messages-skeleton
-                            :insets    {:top false}
-                            :component messages-skeleton/preview-messages-skeleton}]
   :reactions [{:name      :react
                :insets    {:top false}
                :component react/preview-react}]
@@ -235,8 +219,7 @@
                 (for [{:keys [name]} (val category)]
                   ^{:key name}
                   [quo2-button/button
-                    {:test-ID (str "quo2-" name)
-                     :style {:margin-vertical 8}
+                    {:style {:margin-vertical 8}
                     :on-press #(re-frame/dispatch [:navigate-to name])}
                    (clojure.core/name name)])]) (sort screens-categories))]])]))

@@ -1,6 +1,6 @@
-(ns status-im2.contexts.quo-preview.markdown.text
+(ns quo2.screens.markdown.text
  (:require [quo2.foundations.colors :as colors]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [react-native.core :as rn]
            [quo2.components.markdown.text :as quo2]
            [reagent.core :as reagent]))
@@ -1,10 +1,9 @@
-(ns status-im2.contexts.quo-preview.messages.gap
+(ns quo2.screens.messages.gap
  (:require
-   [status-im2.contexts.quo-preview.preview :as preview]
+   [quo2.screens.preview :as preview]
   [react-native.core :as rn]
   [quo2.components.messages.gap :as gap]
-   [reagent.core :as reagent]
-   [status-im.i18n.i18n :as i18n]))
+   [reagent.core :as reagent]))

 (def descriptor [{:label "Timestamp Far"
                  :key   :timestamp-far
@@ -14,8 +13,7 @@
                  :type  :text}])

 (defn preview []
-  (let [state (reagent/atom {:timestamp-far "Jan 8 · 09:12" :timestamp-near "Mar 8 · 22:42" :on-info-button-pressed identity
-                             :on-press #(println "fill gaps") :warning-label (i18n/label :messages-gap-warning)})]
+  (let [state (reagent/atom {:timestamp-far "Jan 8 · 09:12" :timestamp-near "Mar 8 · 22:42" :on-info-button-pressed identity})]
    (fn []
      [rn/view {:margin-bottom 50}
       [rn/view {:padding 16}
@@ -1,11 +1,10 @@
-(ns status-im2.contexts.quo-preview.messages.system-message
+(ns quo2.screens.messages.system-message
  (:require [reagent.core :as reagent]
            [status-im.react-native.resources :as resources]
            [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [quo2.components.messages.system-message :as system-message]
-            [quo2.foundations.colors :as colors]
-            [status-im.i18n.i18n :as i18n]))
+            [quo2.foundations.colors :as colors]))

 (def descriptor [{:label   "Message Type"
                  :key     :type
@@ -51,10 +50,7 @@
                             :pinned-by     "Steve"
                             :content-text  "Hello! This is an example of a pinned message!"
                             :content-info  "3 photos"
-                             :timestamp-str "09:41"
-                             :labels        {:pinned-a-message (i18n/label :pinned-a-message)
-                                             :message-deleted  (i18n/label :message-deleted)
-                                             :added            (i18n/label :added)}})]
+                             :timestamp-str "09:41"})]
    (fn []
      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
       [rn/view {:padding-bottom 150}
@@ -1,7 +1,7 @@
-(ns status-im2.contexts.quo-preview.navigation.bottom-nav-tab
+(ns quo2.screens.navigation.bottom-nav-tab
  (:require [react-native.core :as rn]
            [react-native.reanimated :as reanimated]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [reagent.core :as reagent]
            [quo2.components.navigation.bottom-nav-tab :as quo2]
            [quo2.foundations.colors :as colors]))
@@ -9,13 +9,13 @@
 (def descriptor [{:label   "Type"
                  :key     :icon
                  :type    :select
-                  :options [{:key   :i/communities
+                  :options [{:key   :main-icons2/communities
                             :value "Communities"}
-                            {:key   :i/messages
+                            {:key   :main-icons2/messages
                             :value "Messages"}
-                            {:key   :i/wallet
+                            {:key   :main-icons2/wallet
                             :value "Wallet"}
-                            {:key   :i/browser
+                            {:key   :main-icons2/browser
                             :value "Browser"}]}
                 {:label "Selected?"
                  :key   :selected?
@@ -44,7 +44,7 @@
    :else          colors/neutral-50))

 (defn cool-preview []
-  (let [state         (reagent/atom {:icon                   :i/communities
+  (let [state         (reagent/atom {:icon                   :main-icons2/communities
                                     :new-notifications?     true
                                     :notification-indicator :counter
                                     :counter-label          8
@@ -1,11 +1,9 @@
-(ns status-im2.contexts.quo-preview.navigation.floating-shell-button
+(ns quo2.screens.navigation.floating-shell-button
  (:require [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [reagent.core :as reagent]
-            [react-native.reanimated :as reanimated]
            [quo2.components.navigation.floating-shell-button :as quo2]
-            [quo2.foundations.colors :as colors]
-            [status-im.i18n.i18n :as i18n]))
+            [quo2.foundations.colors :as colors]))

 (def descriptor [{:label "Show jump to?"
                  :key   :show-jump-to?
@@ -29,7 +27,7 @@
 (defn mock-data [{:keys [show-jump-to? show-search? show-mention? scroll-type]}]
  (cond-> {}
    show-jump-to?
-    (assoc :jump-to {:on-press #() :label (i18n/label :t/jump-to)})
+    (assoc :jump-to {:on-press #()})
    show-search?
    (assoc :search {:on-press #()})
    show-mention?
@@ -44,16 +42,13 @@
 (defn cool-preview []
  (let [state (reagent/atom {:show-jump-to? true
                             :scroll-type   :notification-down})]
-    [:f>
-     (fn []
-       [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
-        [rn/view {:padding-bottom 150}
-         [preview/customizer state descriptor]
-         [rn/view {:padding-vertical 60
-                   :align-items      :center}
-          [quo2/floating-shell-button (mock-data @state)
-           nil (reanimated/use-shared-value 1)
-           (reanimated/use-shared-value "auto")]]]])]))
+    (fn []
+      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
+       [rn/view {:padding-bottom 150}
+        [preview/customizer state descriptor]
+        [rn/view {:padding-vertical 60
+                  :align-items      :center}
+         [quo2/floating-shell-button (mock-data @state)]]]])))

 (defn preview-floating-shell-button []
  [rn/view {:background-color (colors/theme-colors colors/white colors/neutral-90)
@@ -1,5 +1,5 @@
-(ns status-im2.contexts.quo-preview.navigation.page-nav
-  (:require [status-im2.contexts.quo-preview.preview :as preview]
+(ns quo2.screens.navigation.page-nav
+  (:require [quo2.screens.preview :as preview]
            [react-native.core :as rn]
            [quo2.components.navigation.page-nav :as quo2]
            [quo2.foundations.colors :as colors]
@@ -44,7 +44,7 @@
  (let [right-icon         {:background-color (if (colors/dark?)
                                                colors/neutral-80
                                                colors/neutral-20)
-                            :icon             :i/placeholder
+                            :icon             :main-icons2/placeholder
                            :icon-color       nil}
        base-props         {:horizontal-description?            true
                            :one-icon-align-left?               true
@@ -52,16 +52,16 @@
                            :page-nav-color                     :transparent
                            :page-nav-background-uri            ""
                            :mid-section {:type                   :text-with-description
-                                          :icon                   :i/placeholder
+                                          :icon                   :main-icons2/placeholder
                                          :main-text              "Status"
-                                          :left-icon              :i/placeholder
-                                          :right-icon             :i/placeholder
+                                          :left-icon              :main-icons2/placeholder
+                                          :right-icon             :main-icons2/placeholder
                                          :description            "SNT"
                                          :description-color      "black"
-                                          :description-icon       :i/placeholder
+                                          :description-icon       :main-icons2/placeholder
                                          :description-user-icon  "https://i.picsum.photos/id/810/200/300.jpg?hmac=HgwlXd-OaLOAqhGyCiZDUb_75EgUI4u0GtS7nfgxd8s"}
                            :left-section
-                            {:icon                  :i/unlocked
+                            {:icon                  :main-icons2/unlocked
                             :icon-background-color (if (colors/dark?)
                                                      colors/neutral-80
                                                      colors/neutral-20)}}
@@ -1,6 +1,6 @@
-(ns status-im2.contexts.quo-preview.navigation.top-nav
+(ns quo2.screens.navigation.top-nav
  (:require [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [reagent.core :as reagent]
            [quo2.components.navigation.top-nav :as quo2]
            [quo2.foundations.colors :as colors]))
@@ -1,17 +1,16 @@
-(ns status-im2.contexts.quo-preview.notifications.activity-logs
-  (:require [quo2.core :as quo2]
-            [quo2.foundations.colors :as colors]
+(ns quo2.screens.notifications.activity-logs
+  (:require [quo2.screens.preview :as preview]
            [react-native.core :as rn]
-            [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]
-            [status-im2.contexts.quo-preview.tags.status-tags :as status-tags]))
+            [quo2.components.markdown.text :as text]
+            [quo2.components.notifications.activity-logs :as activity-logs]
+            [quo2.components.tags.context-tags :as context-tags]
+            [quo2.foundations.colors :as colors]
+            [quo2.screens.tags.status-tags :as status-tags]
+            [reagent.core :as reagent]))

 (def descriptor [{:label "Unread?"
                  :key   :unread?
                  :type  :boolean}
-                 {:label "Replying?"
-                  :key   :replying?
-                  :type  :boolean}
                 {:label   "Icon"
                  :key     :icon
                  :type    :select
@@ -66,14 +65,12 @@
                 status-tags/status-tags-options])

 (def basic-user-action
-  [[quo2/user-avatar-tag
-    {:color          :purple
-     :override-theme :dark
-     :size           :small
-     :style          {:background-color colors/white-opa-10}
-     :text-style     {:color colors/white}}
-    "Name"]
-   "did something here."])
+  [[context-tags/group-avatar-tag "Name" {:color          :purple
+                                          :override-theme :dark
+                                          :size           :small
+                                          :style          {:background-color colors/white-opa-10}
+                                          :text-style     {:color colors/white}}]
+   [rn/text {:style {:color colors/white}} "did something here."]])

 (def complex-user-action
  (let [tag-props {:color          :purple
@@ -81,28 +78,28 @@
                   :size           :small
                   :style          {:background-color colors/white-opa-10}
                   :text-style     {:color colors/white}}]
-    [[quo2/user-avatar-tag tag-props "Alice"]
-     "from"
-     [quo2/user-avatar-tag tag-props "Mainnet"]
-     "to"
-     [quo2/user-avatar-tag tag-props "Optimism"]
-     "on"
-     [quo2/user-avatar-tag tag-props "My savings"]]))
+    [[context-tags/group-avatar-tag "250,000 SNT" tag-props]
+     [rn/text {:style {:color colors/white}} "from"]
+     [context-tags/group-avatar-tag "Mainnet" tag-props]
+     [rn/text {:style {:color colors/white}} "to"]
+     [context-tags/group-avatar-tag "Optimism" tag-props]
+     [rn/text {:style {:color colors/white}} "on"]
+     [context-tags/group-avatar-tag "My savings" tag-props]]))

 (def message-with-mention
  (let [common-text-style {:style {:color colors/white}
                           :size  :paragraph-1}]
    {:body [rn/view {:flex           1
                     :flex-direction :row}
-            [quo2/text common-text-style "Hello"]
-            [quo2/text {:style {:background-color   colors/primary-50-opa-10
+            [text/text common-text-style "Hello"]
+            [text/text {:style {:background-color   colors/primary-50-opa-10
                                :border-radius      6
                                :color              colors/primary-50
                                :margin-horizontal  3
                                :padding-horizontal 3
                                :size               :paragraph-1}}
             "@name"]
-            [quo2/text common-text-style "! How are you feeling?"]]}))
+            [text/text common-text-style "! How are you feeling?"]]}))

 (def message-with-title
  {:body  "Your favorite color is Turquoise."
@@ -141,10 +138,6 @@
                                       (= (:message @state) :with-mention)
                                       (assoc :message message-with-mention)

-                                       (some? (:status @state))
-                                       (update :status (fn [status]
-                                                         {:label (name status) :type status}))
-
                                       (= (:message @state) :with-title)
                                       (assoc :message message-with-title)

@@ -161,7 +154,7 @@
                   :flex-direction   :row
                   :justify-content  :center
                   :padding-vertical 60}
-          [quo2/activity-log props]]]))))
+          [activity-logs/activity-log props]]]))))

 (defn preview-activity-logs []
  [rn/view {:flex 1}
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.quo-preview.preview)
+(ns quo2.screens.preview)

 (defmacro list-comp [[binding seq-expr & bindings] body-expr]
  (cond (not binding)
@@ -1,9 +1,8 @@
-(ns status-im2.contexts.quo-preview.preview
+(ns quo2.screens.preview
  (:require [reagent.core :as reagent]
            [react-native.core :as rn]
-            [quo2.foundations.colors :as colors]
-            [clojure.string :as string])
-  (:require-macros status-im2.contexts.quo-preview.preview))
+            [quo2.foundations.colors :as colors])
+  (:require-macros quo2.screens.preview))

 (def container {:flex-direction   :row
                :padding-vertical 8
@@ -84,24 +83,19 @@
        "False"]]]]))

 (defn customizer-text
-  [{:keys [label key state limit suffix]}]
+  [{:keys [label key state]}]
  (let [state* (reagent/cursor state [key])]
    [rn/view {:style container}
     [label-view state label]
     [rn/view {:style {:flex 0.6}}
-      [rn/text-input (merge
-                      {:value          @state*
-                       :show-cancel    false
-                       :style          {:border-radius 4
-                                        :border-width  1
-                                        :border-color  (colors/theme-colors colors/neutral-100 colors/white)}
-                       :on-change-text #(do
-                                          (reset! state* (if (and suffix (> (count %) (count @state*)))
-                                                           (str (string/replace % suffix "") suffix)
-                                                           %))
-                                          (reagent/flush))}
-                      (when limit
-                        {:max-length limit}))]]]))
+      [rn/text-input {:value          @state*
+                      :show-cancel    false
+                      :style          {:border-radius 4
+                                       :border-width  1
+                                       :border-color  (colors/theme-colors colors/neutral-100 colors/white)}
+                      :on-change-text #(do
+                                         (reset! state* %)
+                                         (reagent/flush))}]]]))

 (defn value-for-key
  [id v]
@@ -1,6 +1,6 @@
-(ns status-im2.contexts.quo-preview.reactions.react
+(ns quo2.screens.reactions.react
  (:require [react-native.core :as rn]
-            [status-im2.contexts.quo-preview.preview :as preview]
+            [quo2.screens.preview :as preview]
            [reagent.core :as reagent]
            [quo2.foundations.colors :as colors]
            [quo2.components.reactions.reaction :as quo2.reaction]))
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.quo-preview.selectors.disclaimer
+(ns quo2.screens.selectors.disclaimer
  (:require [react-native.core :as rn]
            [reagent.core :as reagent]
            [quo2.components.buttons.button :as button]
--- a/Show More
+++ b/Show More