Fix close button not working

* feat: confirmation dialog

README.md

@@ -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,29 +22,37 @@ 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.
+- **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.
 
-- **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!

doc/codebase-structure-and-guidelines.md

@@ -1,5 +1,9 @@
 # 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/).
@@ -85,7 +89,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:

doc/new-guidelines.md

@@ -0,0 +1,440 @@
+# 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.

ios/Podfile.lock

@@ -4,14 +4,14 @@ PODS:
     - React
   - CryptoSwift (1.5.1)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.63.4)
-  - FBReactNativeSpec (0.63.4):
+  - FBLazyVector (0.63.5)
+  - FBReactNativeSpec (0.63.5):
     - Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.63.4)
-    - RCTTypeSafety (= 0.63.4)
-    - React-Core (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - ReactCommon/turbomodule/core (= 0.63.4)
+    - RCTRequired (= 0.63.5)
+    - RCTTypeSafety (= 0.63.5)
+    - React-Core (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
   - 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.4)
-  - RCTTypeSafety (0.63.4):
-    - FBLazyVector (= 0.63.4)
+  - RCTRequired (0.63.5)
+  - RCTTypeSafety (0.63.5):
+    - FBLazyVector (= 0.63.5)
     - Folly (= 2020.01.13.00)
-    - 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):
+    - 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):
     - Folly (= 2020.01.13.00)
     - glog
-    - React-Core/Default (= 0.63.4)
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-Core/Default (= 0.63.5)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.63.4):
+  - React-Core/CoreModulesHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/Default (0.63.4):
+  - React-Core/Default (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/DevSupport (0.63.4):
+  - React-Core/DevSupport (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
-    - 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)
+    - 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)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.63.4):
+  - React-Core/RCTActionSheetHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.63.4):
+  - React-Core/RCTAnimationHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.63.4):
+  - React-Core/RCTBlobHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/RCTImageHeaders (0.63.4):
+  - React-Core/RCTImageHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.63.4):
+  - React-Core/RCTLinkingHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.63.4):
+  - React-Core/RCTNetworkHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.63.4):
+  - React-Core/RCTSettingsHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/RCTTextHeaders (0.63.4):
+  - React-Core/RCTTextHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.63.4):
+  - React-Core/RCTVibrationHeaders (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-Core/RCTWebSocket (0.63.4):
+  - React-Core/RCTWebSocket (0.63.5):
     - Folly (= 2020.01.13.00)
     - glog
-    - React-Core/Default (= 0.63.4)
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - React-jsiexecutor (= 0.63.4)
+    - React-Core/Default (= 0.63.5)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
     - Yoga
-  - React-CoreModules (0.63.4):
-    - FBReactNativeSpec (= 0.63.4)
+  - React-CoreModules (0.63.5):
+    - FBReactNativeSpec (= 0.63.5)
     - Folly (= 2020.01.13.00)
-    - 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):
+    - 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):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
     - Folly (= 2020.01.13.00)
     - glog
-    - React-callinvoker (= 0.63.4)
-    - React-jsinspector (= 0.63.4)
-  - React-jsi (0.63.4):
+    - React-callinvoker (= 0.63.5)
+    - React-jsinspector (= 0.63.5)
+  - React-jsi (0.63.5):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
     - Folly (= 2020.01.13.00)
     - glog
-    - React-jsi/Default (= 0.63.4)
-  - React-jsi/Default (0.63.4):
+    - React-jsi/Default (= 0.63.5)
+  - React-jsi/Default (0.63.5):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
     - Folly (= 2020.01.13.00)
     - glog
-  - React-jsiexecutor (0.63.4):
+  - React-jsiexecutor (0.63.5):
     - DoubleConversion
     - Folly (= 2020.01.13.00)
     - glog
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
-  - React-jsinspector (0.63.4)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+  - React-jsinspector (0.63.5)
   - 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.4):
-    - React-Core/RCTActionSheetHeaders (= 0.63.4)
-  - React-RCTAnimation (0.63.4):
-    - FBReactNativeSpec (= 0.63.4)
+  - React-RCTActionSheet (0.63.5):
+    - React-Core/RCTActionSheetHeaders (= 0.63.5)
+  - React-RCTAnimation (0.63.5):
+    - FBReactNativeSpec (= 0.63.5)
     - Folly (= 2020.01.13.00)
-    - 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)
+    - 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)
     - Folly (= 2020.01.13.00)
-    - 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)
+    - 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)
     - Folly (= 2020.01.13.00)
-    - 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)
+    - 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)
     - Folly (= 2020.01.13.00)
-    - 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)
+    - 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)
     - Folly (= 2020.01.13.00)
-    - 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)
+    - 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)
     - Folly (= 2020.01.13.00)
-    - React-Core/RCTVibrationHeaders (= 0.63.4)
-    - React-jsi (= 0.63.4)
-    - ReactCommon/turbomodule/core (= 0.63.4)
-  - ReactCommon/turbomodule/core (0.63.4):
+    - React-Core/RCTVibrationHeaders (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
+  - ReactCommon/turbomodule/core (0.63.5):
     - DoubleConversion
     - Folly (= 2020.01.13.00)
     - glog
-    - React-callinvoker (= 0.63.4)
-    - React-Core (= 0.63.4)
-    - React-cxxreact (= 0.63.4)
-    - React-jsi (= 0.63.4)
+    - React-callinvoker (= 0.63.5)
+    - React-Core (= 0.63.5)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
   - ReactNativeAudioToolkit (2.0.3):
     - React
   - ReactNativeNavigation (7.27.1):
@@ -637,25 +637,25 @@ SPEC CHECKSUMS:
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   DoubleConversion: cde416483dac037923206447da6e1454df403714
-  FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
-  FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
+  FBLazyVector: 352a8ca9bbc8e2f097d680747a8c97ecef12d469
+  FBReactNativeSpec: 7dfb84f624136a45727c813ed21d130cd3e61beb
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 997518ea2aa2d8cd5df9797b641b758d52ecf2bc
+  glog: 36ce0530c6d2c3a5a4326885ef4069564887a1db
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
   libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
   Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
   Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c
-  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
+  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
   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: 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
+  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
   ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
   ReactNativeNavigation: 94979dd1572a3f093fc85d4599360530a1bed8c8
   RNCAsyncStorage: b2489b49e38c85e10ed45a888d13a2a4c7b32ea1
@@ -708,7 +708,7 @@ SPEC CHECKSUMS:
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
-  Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
+  Yoga: 0276e9f20976c8568e107cfc1163a8629051adc0
 
 PODFILE CHECKSUM: a1de9468266e7f0b5273acea713782ab759690f1
 

resources/config/fleets.json

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

shadow-cljs.edn

@@ -38,13 +38,13 @@
  :builds {:mobile
           {:target :react-native
            :output-dir "app"
-           :init-fn status-im.core/init
+           :init-fn status-im2.setup.core/init
            ;; When false, the Shadow-CLJS watcher won't automatically refresh
            ;; the target files (a.k.a hot reload). When false, you can manually
            ;; reload by calling `shadow.cljs.devtools.api/watch-compile-all!`.
            :devtools {:autobuild #shadow/env ["SHADOW_AUTOBUILD_ENABLED" :default true :as :bool]}
-           :dev {:devtools {:after-load status-im.reloader/reload
-                            :build-notify status-im.reloader/build-notify
+           :dev {:devtools {:after-load status-im2.setup.hot-reload/reload
+                            :build-notify status-im2.setup.hot-reload/build-notify
                             :preloads [re-frisk-remote.preload]}
                  :closure-defines
                  {status-im.utils.config/POKT_TOKEN #shadow/env "POKT_TOKEN"

src/i18n/i18n.cljs

@@ -0,0 +1,66 @@
+(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)

src/js/worklet_factory.js

@@ -50,11 +50,13 @@ export function stackPointer (stackId, selectedStackId) {
   );
 }
 
-export function bottomTabIconColor (stackId, selectedStackId, passThrough, selectedTabColor, defaultColor, passThroughColor) {
+export function bottomTabIconColor (stackId, selectedStackId, homeStackOpen,
+				    passThrough, selectedTabColor, defaultColor,
+				    passThroughColor) {
   return useDerivedValue(
     function () {
       'worklet'
-      if (selectedStackId.value == stackId){
+      if (selectedStackId.value == stackId && homeStackOpen.value){
 	return selectedTabColor;
       }
       else if (passThrough.value){
@@ -70,8 +72,10 @@ export function bottomTabIconColor (stackId, selectedStackId, passThrough, selec
 
 // Home Stack
 
+const shellAnimationTime = 200;
+
 const defaultDurationAndEasing = {
-  duration: 300,
+  duration: shellAnimationTime,
   easing: Easing.bezier(0, 0, 1, 1),
 }
 

src/quo2/components/avatars/group_avatar.cljs

@@ -4,25 +4,29 @@
             [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 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])]
+  (fn [{:keys [color size]}]
+    (let [container-size (get-in sizes [:container size])
+          icon-size      (get-in sizes [:icon size])
+          ;; theme          (or override-theme (if (colors/dark?) :dark :light))
+          ]
       [rn/view {:width            container-size
                 :height           container-size
                 :align-items      :center
                 :justify-content  :center
                 :border-radius    (/ container-size 2)
-                :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}]])))
+                :background-color color
+                ;; :background-color (if (= theme :light) TODO: colors/custom-color method here is not working for some reason.
+                ;;                    (colors/custom-color color 50)
+                ;;                    (colors/custom-color color 60))
+                }
+       [icon/icon :i/group {:size  icon-size ; TODO: group icon sizes 12 and 20 (small and large) are missing
+                            :color colors/white-opa-70}]])))

src/quo2/components/buttons/dynamic_button.cljs

@@ -22,13 +22,13 @@
 (defn- icon-view [type]
   [icon/icon
    (case type
-     :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)
+     :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)
    {:size            12
     :color           (get-icon-and-text-color type)
     :container-style {:margin-top    6
@@ -60,10 +60,12 @@
   [_]
   (let [pressed? (reagent/atom false)]
     (fn [{:keys [type label on-press count customization-color style]}]
-      [rn/touchable-without-feedback
+      [rn/touchable-opacity
        {: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

src/quo2/components/community/community_list_view.cljs

@@ -6,10 +6,49 @@
    [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]))
 
-(defn communities-list-view-item [props {:keys [name locked? status notifications
-                                                tokens background-color]}]
+(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})}
@@ -24,8 +63,8 @@
                :padding-vertical   8
                :background-color   background-color}
       [rn/view]
-       ;;TODO new pure component based on quo2 should be implemented without status-im usage
-       ;[communities.icon/community-icon-redesign community 32]]
+      (when community-icon
+        [community-icon-view community-icon])
       [rn/view {:flex              1
                 :margin-horizontal 12}
        [text/text {:weight              :semi-bold
@@ -33,7 +72,7 @@
                    :accessibility-label :community-name-text
                    :number-of-lines     1
                    :ellipsize-mode      :tail
-                   :style               {:color (when (= notifications :muted)
+                   :style               {:color (when muted?
                                                   (colors/theme-colors
                                                    colors/neutral-40
                                                    colors/neutral-60))}}
@@ -42,28 +81,18 @@
       (if (= status :gated)
         [community-view/permission-tag-container {:locked? locked?
                                                   :tokens  tokens}]
-        (cond
-          (= notifications :unread-messages-count)
-          [rn/view {:style {:width            8
-                            :height           8
-                            :border-radius    4
-                            :background-color (colors/theme-colors
-                                               colors/neutral-40
-                                               colors/neutral-60)}}]
+        [notification-view {:muted?                muted?
+                            :unread-mentions-count unread-mentions-count
+                            :unread-messages?      unread-messages?}])]]]])
 
-          (= notifications :unread-mentions-count)
-          [counter/counter {:type :default} 5]
-
-          (= 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 [props {:keys [name status tokens locked?]}]
+(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}}
@@ -72,8 +101,9 @@
      [rn/view {:flex-direction :row
                :border-radius  16
                :align-items    :center}
-      ;;TODO new pure component based on quo2 should be implemented without status-im usage
-      ;[communities.icon/community-icon-redesign community 32]
+
+      (when community-icon
+        [community-icon-view community-icon])
       [rn/view {:flex            1
                 :margin-left     12
                 :justify-content :center}
@@ -84,8 +114,12 @@
          :weight              :semi-bold
          :size                :paragraph-1}
         name]]
-      (when (= status :gated)
-        [rn/view {:justify-content :center
-                  :margin-right    12}
+
+      [rn/view {:justify-content :center
+                :margin-right    16}
+       (if (= status :gated)
          [community-view/permission-tag-container {:locked? locked?
-                                                   :tokens  tokens}]])]]]])
+                                                   :tokens  tokens}]
+         [notification-view {:muted?                muted?
+                             :unread-mentions-count unread-mentions-count
+                             :unread-messages?      unread-messages?}])]]]]])

src/quo2/components/community/community_view.cljs

@@ -25,14 +25,14 @@
     [rn/view (if (= type :card-view)
                (style/card-stats-container)
                (style/list-stats-container))
-     [community-stats {:icon       :main-icons2/group
+     [community-stats {:icon       :i/group
                        :members-count "629.2K" ;;TODO here should be formatted value, use money/format-members from outside this component
                        :icon-color icon-color}]
-     [community-stats {:icon       :main-icons2/lightning
+     [community-stats {:icon       :i/lightning
                        :members-count "112.1K"
                        :icon-color icon-color}]
      (when (= type :card-view)
-       [community-stats {:icon       :main-icons2/placeholder
+       [community-stats {:icon       :i/placeholder
                          :count      4
                          :icon-color icon-color}])]))
 
@@ -75,4 +75,4 @@
                                       colors/neutral-80)
                    :locked?          locked?
                    :tokens           tokens
-                   :size             24}])
+                   :size             24}])

src/quo2/components/drawers/action_drawers.cljs

@@ -1,8 +1,8 @@
 (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 [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?
@@ -14,47 +14,48 @@
                       sub-label
                       right-icon
                       danger?
-                      on-press]}]
-  [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
+                      on-press] :as action-props}]
+  (when action-props
+    [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
-                 :width 20}}
-       [icon/icon right-icon
+                 :margin-right  12
+                 :width         20}}
+       [icon/icon icon
         {:color (get-icon-color danger?)
-         :size 20}]])]])
+         :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 divider []
   [rn/view {:style {:border-top-width 1

src/quo2/components/header.cljs

@@ -138,13 +138,14 @@
     (fn [{:keys [left-accessories left-component border-bottom
                  right-accessories right-component insets get-layout
                  title subtitle title-component style title-align
-                 background]
+                 background header-style]
           :or   {title-align   :center
                  border-bottom false}}]
       (let [status-bar-height (get insets :top 0)
             height            (+ header-height status-bar-height)]
         [reanimated/view {:style (header-wrapper-style {:height        height
                                                         :background    background
+                                                        :header-style  header-style
                                                         :border-bottom border-bottom})}
          [rn/view {:pointer-events :box-none
                    :height         status-bar-height}]

src/quo2/components/info/information_box.cljs

@@ -78,10 +78,10 @@
           [rn/touchable-opacity
            {:on-press            on-close
             :accessibility-label (str (or id "information-box") "-close-button")}
-           [quo2.icons/icon :main-icons2/close {:size            12
-                                                :color           (get-color :close-button)
-                                                :container-style {:margin-top  4
-                                                                  :margin-left 8}}]])]
+           [quo2.icons/icon :i/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

src/quo2/components/list_items/channel.cljs

@@ -38,7 +38,7 @@
    [rn/view {:style {:height 20}}
     (when (and (not locked?)
                muted?)
-      [quo2.icons/icon :main-icons2/muted
+      [quo2.icons/icon :i/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 :main-icons2/channel-notification
+      [quo2.icons/icon :i/channel-notification
        {:size     20
-        :no-color true}])]])
+        :no-color true}])]])

src/quo2/components/list_items/index.cljs

@@ -0,0 +1,15 @@
+(ns quo2.components.list-items.index
+  (:require [quo.react-native :as rn]
+            [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]))
+
+(defn index [{:keys [title]}]
+  [rn/view
+   [rn/view {:style {:border-top-width           1
+                     :border-color               (colors/theme-colors colors/neutral-10 colors/neutral-80)
+                     :padding-vertical           8
+                     :padding-horizontal         16}}
+    [text/text {:weight          :medium
+                :size            :paragraph-2
+                :secondary-color (colors/theme-colors colors/neutral-50 colors/neutral-40)}
+     title]]])

src/quo2/components/list_items/list_item.cljs

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

src/quo2/components/list_items/preview_list.cljs

@@ -70,13 +70,13 @@
                                        colors/neutral-70
                                        override-theme)}}
    (if (= size 16)
-     [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.icons/icon :i/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

src/quo2/components/markdown/text.cljs

@@ -1,11 +1,10 @@
 (ns quo2.components.markdown.text
   (:require [react-native.core :as rn]
-            [quo2.theme :as theme]
             [quo2.foundations.colors :as colors]
             [quo2.foundations.typography :as typography]
             [reagent.core :as reagent]))
 
-(defn text-style [{:keys [size align weight style]}]
+(defn text-style [{:keys [size align weight style secondary-color]}]
   (merge (case (or weight :regular)
            :regular   typography/font-regular
            :medium    typography/font-medium
@@ -24,7 +23,8 @@
          {:text-align (or align :auto)}
          (if (:color style)
            style
-           (assoc style :color (if (= (theme/get-theme) :dark) colors/white colors/neutral-100)))))
+           (assoc style :color (or secondary-color
+                                   (colors/theme-colors colors/neutral-100 colors/white))))))
 
 (defn text []
   (let [this  (reagent/current-component)

src/quo2/components/markdown/text_input.cljs

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

src/quo2/components/navigation/bottom_nav_tab.cljs

@@ -17,7 +17,7 @@
 (defn bottom-nav-tab
   "[bottom-nav-tab opts]
    opts
-   {:icon                   :main-icons2/communities
+   {:icon                   :i/communities
     :new-notifications?     true/false
     :notification-indicator :unread-dot/:counter
     :counter-label          number

src/quo2/components/navigation/floating_shell_button.cljs

@@ -1,5 +1,6 @@
 (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]
@@ -16,21 +17,28 @@
   "[floating-shell-button dynamic-buttons style]
   dynamic-buttons
   {:button-type {:on-press on-press :count count}}"
-  [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}]]]])
+  [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}]]]]))])

src/quo2/components/navigation/top_nav.cljs

@@ -63,9 +63,9 @@
                        :right    20
                        :top      12
                        :flex-direction :row}}
-      [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]
+      [base-button :i/search open-search :open-search-button button-common-props]
+      [base-button :i/scan open-scanner :open-scanner-button button-common-props]
+      [base-button :i/qr-code show-qr :show-qr-button button-common-props]
       [rn/view ;; Keep view instead of "[:<>" to make sure relative
                ;; position is calculated from this view instead of its parent
        [hole-view/hole-view {:key   new-notifications? ;; Key is required to force removal of holes
@@ -78,7 +78,7 @@
 
                                       :else
                                       [{:x 33 :y -7 :width 18 :height 18 :borderRadius 7}])}
-        [base-button :main-icons2/activity-center open-activity-center
+        [base-button :i/activity-center open-activity-center
          :open-activity-center-button button-common-props]]
        (when new-notifications?
          (if (= notification-indicator :counter)

src/quo2/components/reactions/reaction.cljs

@@ -26,7 +26,7 @@
                                           :border-color           (if dark?
                                                                     colors/neutral-70
                                                                     colors/neutral-30)})}
-     [icons/icon :main-icons2/add
+     [icons/icon :i/add
       {:size 20
        :color (if dark?
                 colors/white

src/quo2/components/selectors/selectors.cljs

@@ -1,14 +1,19 @@
 (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?]
-  (if checked?
+(defn- get-color [checked? disabled? blurred-background?]
+  (cond
+    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)))))
@@ -21,7 +26,7 @@
 
 (defn checkbox-prefill [{:keys [default-checked?]}]
   (let [checked? (reagent/atom (or default-checked? false))]
-    (fn [{:keys [on-change disabled? container-style]}]
+    (fn [{:keys [on-change disabled? blurred-background? container-style]}]
       [rn/touchable-without-feedback
        {:on-press (handle-press disabled? on-change checked?)}
        [rn/view
@@ -30,16 +35,20 @@
                  {:height 21
                   :width 21
                   :border-radius 6
-                  :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)))})
+                  :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))))})
          :accessibility-label (str "checkbox-" (if @checked? "on" "off"))
          :accessibility-role  :checkbox}
         (when @checked?
           [rn/view {:style
                     {:height 20
                      :width 20}}
-           [icons/icon :main-icons2/check-small
+           [icons/icon :i/check-small
             {:size 20
              :color (colors/theme-colors
                      (colors/alpha colors/neutral-100 (if disabled? 0.3 1))
@@ -47,7 +56,7 @@
 
 (defn checkbox [{:keys [default-checked?]}]
   (let [checked? (reagent/atom (or default-checked? false))]
-    (fn [{:keys [on-change disabled? container-style]}]
+    (fn [{:keys [on-change disabled? blurred-background? container-style]}]
       [rn/touchable-without-feedback
        {:on-press (handle-press disabled? on-change checked?)}
        [rn/view
@@ -59,26 +68,32 @@
          {:style {:flex             1
                   :border-radius    6
                   :border-width     (if @checked? 0 1)
-                  :background-color (if @checked?
-                                      (get-color @checked? disabled?)
+                  :background-color (cond
+                                      @checked?
+                                      (get-color @checked? disabled? blurred-background?)
+                                      blurred-background?
+                                      (colors/theme-colors
+                                       colors/white-opa-5
+                                       colors/white-opa-10)
+                                      :else
                                       (colors/theme-colors
                                        colors/white
                                        colors/neutral-80-opa-40))
                   :border-color     (if @checked? :none
-                                        (get-color @checked? disabled?))}
+                                        (get-color @checked? disabled? blurred-background?))}
           :accessibility-label (str "checkbox-" (if @checked? "on" "off"))
           :accessibility-role  :checkbox}
          (when @checked?
            [rn/view {:style
                      {:height 20
                       :width 20}}
-            [icons/icon :main-icons2/check-small
+            [icons/icon :i/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? container-style]}]
+    (fn [{:keys [on-change disabled? blurred-background? container-style]}]
       [rn/touchable-without-feedback
        {:on-press (handle-press disabled? on-change checked?)}
        [rn/view
@@ -88,9 +103,10 @@
                   :width 20
                   :border-radius 20
                   :border-width 1
-                  :border-color (get-color @checked? disabled?)
-                  :background-color (colors/theme-colors colors/white
-                                                         (colors/alpha colors/neutral-80 0.4))})
+                  :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)))})
          :accessibility-label (str "radio-" (if @checked? "on" "off"))
          :accessibility-role  :checkbox}
 
@@ -98,7 +114,7 @@
                   {:margin-left :auto
                    :height 14
                    :width 14
-                   :background-color (when @checked? (get-color @checked? disabled?))
+                   :background-color (when @checked? (get-color @checked? disabled? blurred-background?))
                    :border-radius 20
                    :margin-right :auto
                    :margin-top :auto
@@ -106,7 +122,7 @@
 
 (defn toggle [{:keys [default-checked?]}]
   (let [checked? (reagent/atom (or default-checked? false))]
-    (fn [{:keys [on-change disabled? container-style]}]
+    (fn [{:keys [on-change disabled? blurred-background? container-style]}]
       [rn/touchable-without-feedback
        {:on-press (handle-press disabled? on-change checked?)}
        [rn/view
@@ -115,17 +131,20 @@
                  {:height 20
                   :width 30
                   :border-radius 20
-                  :background-color (get-color @checked? disabled?)})
+                  :background-color (get-color @checked? disabled? blurred-background?)})
          :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 (colors/alpha colors/white
-                                                   (if (theme/dark?)
-                                                     (if disabled? 0.3 1)
-                                                     1))
+                   :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))))
                    :border-radius 20
                    :margin-right :auto
                    :margin-top :auto

src/quo2/components/tags/permission_tag.cljs

@@ -36,12 +36,12 @@
                                                 colors/neutral-50
                                                 colors/neutral-40)}}
            (str "+" extra-group-count)]
-          [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}])]])))
+          [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}])]])))
 
 (defn selected-token-count [group]
   (cond
@@ -114,8 +114,8 @@
                 :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 :main-icons2/locked
-                       :main-icons2/unlocked)
+       [icons/icon (if locked :i/locked
+                       :i/unlocked)
         {:resize-mode      :center
          :size             (case size 32 20 24 16)
          :color            (colors/theme-colors
@@ -123,4 +123,4 @@
                             colors/neutral-40)}]]
       [tag-tokens {:tokens     tokens
                    :size             size
-                   :background-color background-color}]]]))
+                   :background-color background-color}]]]))

src/quo2/components/tags/tags.cljs

@@ -22,7 +22,7 @@
                      :icon-color    icon-color
                      :labelled      (if (= type :label) true labelled)
                      :resource      (if (= type :icon)
-                                      :main-icons2/placeholder
+                                      :i/placeholder
                                       resource)
                      :on-press      #(do (reset! active-tab-id %)
-                                         (when on-change (on-change %)))})]])]))))
+                                         (when on-change (on-change %)))})]])]))))

src/quo2/components/tags/token_tag.cljs

@@ -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 :main-icons2/hold :main-icons2/add)
+             [icons/icon (if is-required :i/hold :i/add)
               {:no-color true
                :size 12}]])}
      (str value " " token)]))

src/quo2/components/wallet/network_amount.cljs

@@ -9,7 +9,7 @@
    opts
    {:style        style                 ;; extra styles for the container (takes precedence)
     :network-name \"Mainnet\"             ;; shown network name
-    :icon         :main-icons2/ethereum ;; key of icon belonging to the network
+    :icon         :i/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}]
   [rn/view (merge {:accessibility-label :network-amount

src/quo2/components/wallet/token_overview.cljs

@@ -51,7 +51,7 @@
                     :size  :heading-2} (str currency price)]
 
        [rn/view {:style {:display :flex :flex-direction :row :margin-top 6 :align-items :center}}
-        (when (not (zero? direction)) [icons/icon (if (>= direction 0) :main-icons2/price-increase12 :main-icons2/price-decrease12)
+        (when (not (zero? direction)) [icons/icon (if (>= direction 0) :i/price-increase12 :i/price-decrease12)
                                        {:no-color true
                                         :width 14
                                         :height 14
@@ -88,7 +88,7 @@
                    :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) :main-icons2/price-increase :main-icons2/price-decrease)
+        (when (not (zero? direction)) [icons/icon (if (pos? direction) :i/price-increase :i/price-decrease)
                                        {:no-color true
                                         :size 12
                                         :container-style {:margin-right 4}}])

src/quo2/core.cljs

@@ -33,7 +33,9 @@
             quo2.components.notifications.notification-dot
             quo2.components.tags.tags
             quo2.components.tabs.tabs
-            quo2.components.tabs.account-selector))
+            quo2.components.tabs.account-selector
+            quo2.components.list-items.index
+            quo2.components.list-items.list-item))
 
 (def button quo2.components.buttons.button/button)
 (def dynamic-button quo2.components.buttons.dynamic-button/dynamic-button)
@@ -80,6 +82,8 @@
 (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)
+(def index quo2.components.list-items.index/index)
+(def list-item quo2.components.list-items.list-item/list-item)
 
 ;;;; NOTIFICATIONS
 (def activity-log quo2.components.notifications.activity-logs/activity-log)

src/quo2/foundations/colors.cljs

@@ -91,6 +91,11 @@
 (def white-opa-90 (alpha white 0.9))
 (def white-opa-95 (alpha white 0.95))
 
+;;;;Black
+
+;;Solid
+(def black "#000000")
+
 ;;;;Primary
 
 ;;Solid

src/react_native/background_timer.cljs

@@ -0,0 +1,14 @@
+(ns react-native.background-timer
+  (:require ["react-native-background-timer" :default background-timer]))
+
+(defn set-timeout [cb ms]
+  (.setTimeout background-timer cb ms))
+
+(defn clear-timeout [id]
+  (.clearTimeout background-timer id))
+
+(defn set-interval [cb ms]
+  (.setInterval background-timer cb ms))
+
+(defn clear-interval [id]
+  (.clearInterval background-timer id))

src/react_native/config.cljs

@@ -0,0 +1,8 @@
+(ns react-native.config
+  (:require ["react-native-config" :default react-native-config]))
+
+(def config (js->clj react-native-config :keywordize-keys true))
+
+(defn get-config
+  ([k] (get config k))
+  ([k not-found] (get config k not-found)))

src/react_native/core.cljs

@@ -3,6 +3,8 @@
             ["react-native" :as react-native]
             [react-native.flat-list :as flat-list]))
 
+(def app-state ^js (.-AppState ^js react-native))
+
 (def view (reagent/adapt-react-class (.-View ^js react-native)))
 (def scroll-view (reagent/adapt-react-class (.-ScrollView ^js react-native)))
 (def image (reagent/adapt-react-class (.-Image ^js react-native)))
@@ -28,4 +30,21 @@
     {:font-scale (.-fontScale window)
      :height     (.-height window)
      :scale      (.-scale window)
-     :width      (.-width window)}))
+     :width      (.-width window)}))
+
+(defn hide-splash-screen []
+  (.hide ^js (-> react-native .-NativeModules .-SplashScreen)))
+
+(defn alert [title message buttons options]
+  (.alert (.-Alert ^js react-native) title message (clj->js buttons) (clj->js options)))
+
+(def appearance ^js (.-Appearance ^js react-native))
+
+(defn get-color-scheme []
+  (.getColorScheme appearance))
+
+(defn appearance-add-change-listener [handler]
+  (.addChangeListener appearance handler))
+
+(defn get-window []
+  (js->clj (.get (.-Dimensions ^js react-native) "window") :keywordize-keys true))

src/react_native/flat_list.cljs

@@ -32,4 +32,4 @@
          (dissoc props :data :header :footer :empty-component :separator :render-fn :key-fn :on-drag-end-fn)))
 
 (defn flat-list [props]
-  [react-native-flat-list (base-list-props props)])
+  [react-native-flat-list (base-list-props props)])

src/react_native/gesture.cljs

@@ -1,8 +1,9 @@
 (ns react-native.gesture
-  (:require ["react-native-gesture-handler" :refer (GestureDetector Gesture)]
+  (:require ["react-native-gesture-handler" :refer (GestureDetector Gesture gestureHandlerRootHOC)]
             [reagent.core :as reagent]))
 
 (def gesture-detector (reagent/adapt-react-class GestureDetector))
+(def gesture-handler-root-hoc gestureHandlerRootHOC)
 
 (defn gesture-pan [] (.Pan ^js Gesture))
 
@@ -10,4 +11,4 @@
 
 (defn on-start [^js pan handler] (.onStart pan handler))
 
-(defn on-end [^js pan handler] (.onEnd pan handler))
+(defn on-end [^js pan handler] (.onEnd pan handler))

src/react_native/hole_view.cljs

@@ -2,4 +2,4 @@
   (:require [reagent.core :as reagent]
             ["react-native-hole-view" :refer (RNHoleView)]))
 
-(def hole-view (reagent/adapt-react-class RNHoleView))
+(def hole-view (reagent/adapt-react-class RNHoleView))

src/react_native/languages.cljs

@@ -0,0 +1,8 @@
+(ns react-native.languages
+  (:require ["react-native-languages" :default react-native-languages]))
+
+(defn add-change-listener [handler]
+  (.addEventListener ^js react-native-languages "change" (fn [^js event] (handler (.-language event)))))
+
+(defn get-lang-keyword []
+  (keyword (.-language ^js react-native-languages)))

src/react_native/linear_gradient.cljs

@@ -2,4 +2,4 @@
   (:require ["react-native-linear-gradient" :default LinearGradient]
             [reagent.core :as reagent]))
 
-(def linear-gradient (reagent/adapt-react-class LinearGradient))
+(def linear-gradient (reagent/adapt-react-class LinearGradient))

src/react_native/mail.cljs

@@ -0,0 +1,5 @@
+(ns react-native.mail
+  (:require ["react-native-mail" :default react-native-mail]))
+
+(defn mail [opts callback]
+  (.mail react-native-mail (clj->js opts) callback))

src/react_native/masked_view.cljs

@@ -2,4 +2,4 @@
   (:require ["@react-native-community/masked-view" :default MaskedView]
             [reagent.core :as reagent]))
 
-(def masked-view (reagent/adapt-react-class MaskedView))
+(def masked-view (reagent/adapt-react-class MaskedView))

src/react_native/navigation.cljs

@@ -0,0 +1,58 @@
+(ns react-native.navigation
+  (:refer-clojure :exclude [pop])
+  (:require ["react-native-navigation" :refer (Navigation)]))
+
+(defn set-default-options [opts]
+  (.setDefaultOptions ^js Navigation (clj->js opts)))
+
+(defn register-component [arg1 arg2 arg3] (.registerComponent ^js Navigation arg1 arg2 arg3))
+(defn set-lazy-component-registrator [handler] (.setLazyComponentRegistrator ^js Navigation handler))
+
+(defn set-root [root]
+  (.setRoot ^js Navigation (clj->js root)))
+
+(defn set-stack-root [stack comp]
+  (.setStackRoot ^js Navigation stack (clj->js comp)))
+
+(defn push [arg1 arg2]
+  (.push ^js Navigation arg1 (clj->js arg2)))
+
+(defn pop [comp] (.pop ^js Navigation comp))
+
+(defn show-modal [arg]
+  (.showModal ^js Navigation (clj->js arg)))
+
+(defn dismiss-modal [comp] (.dismissModal ^js Navigation comp))
+
+(defn show-overlay [comp]
+  (.showOverlay Navigation (clj->js comp)))
+
+(defn dissmiss-overlay [comp]
+  (.catch (.dismissOverlay Navigation comp) #()))
+
+(defn reg-app-launched-listener [handler]
+  (.registerAppLaunchedListener ^js (.events ^js Navigation) handler))
+
+(defn reg-button-pressed-listener [handler]
+  (.registerNavigationButtonPressedListener
+   (.events Navigation)
+   (fn [^js evn]
+     (handler (.-buttonId evn)))))
+
+(defn reg-modal-dismissed-listener [handler]
+  (.registerModalDismissedListener ^js (.events ^js Navigation) handler))
+
+(defn reg-component-did-appear-listener [handler]
+  (.registerComponentDidAppearListener
+   ^js (.events ^js Navigation)
+   (fn [^js evn]
+     (handler (keyword (.-componentName evn))))))
+
+(defn reg-component-did-disappear-listener [handler]
+  (.registerComponentDidDisappearListener
+   ^js (.events ^js Navigation)
+   (fn [^js evn]
+     (handler (.-componentName evn)))))
+
+(defn merge-options [id opts]
+  (.mergeOptions Navigation id (clj->js opts)))

src/react_native/platform.cljs

@@ -6,4 +6,4 @@
 (def os (when platform (.-OS ^js platform)))
 
 (def android? (= os "android"))
-(def ios? (= os "ios"))
+(def ios? (= os "ios"))

src/react_native/safe_area.cljs

@@ -1,6 +1,6 @@
 (ns react-native.safe-area
   (:require ["react-native-safe-area-context" :as safe-area-context
-             :refer (SafeAreaInsetsContext)]
+             :refer (SafeAreaProvider SafeAreaInsetsContext)]
             [reagent.core :as reagent]))
 
 (def ^:private consumer-raw (reagent/adapt-react-class (.-Consumer ^js SafeAreaInsetsContext)))
@@ -10,3 +10,6 @@
    (fn [insets]
      (reagent/as-element
       [component (js->clj insets :keywordize-keys true)]))])
+
+(def safe-area-provider (reagent/adapt-react-class SafeAreaProvider))
+(def safe-area-consumer consumer-raw)

src/react_native/shake.cljs

@@ -0,0 +1,5 @@
+(ns react-native.shake
+  (:require ["react-native-shake" :as react-native-shake]))
+
+(defn add-shake-listener [handler]
+  (.addEventListener react-native-shake "ShakeEvent" handler))

src/react_native/syntax_highlighter.cljs

@@ -2,4 +2,4 @@
   (:require ["react-syntax-highlighter" :default Highlighter]
             [reagent.core :as reagent]))
 
-(def highlighter (reagent/adapt-react-class Highlighter))
+(def highlighter (reagent/adapt-react-class Highlighter))

src/status_im/activity_center/core.cljs

@@ -86,18 +86,23 @@
   (and (some? cursor)
        (not= cursor start-or-end-cursor)))
 
-(defn- filter-status->rpc-method
-  [filter-status]
-  (if (= filter-status :read)
-    "wakuext_readActivityCenterNotifications"
-    "wakuext_unreadActivityCenterNotifications"))
+(def ^:const status-read 1)
+(def ^:const status-unread 2)
+(def ^:const status-all 3)
+
+(defn status [filter-status]
+  (case filter-status
+    :read status-read
+    :unread status-unread
+    :all status-all
+    99))
 
 (fx/defn notifications-fetch
   [{:keys [db]} {:keys [cursor filter-type filter-status reset-data?]}]
   (when-not (get-in db [:activity-center :notifications filter-type filter-status :loading?])
     {:db             (assoc-in db [:activity-center :notifications filter-type filter-status :loading?] true)
-     ::json-rpc/call [{:method     (filter-status->rpc-method filter-status)
-                       :params     [cursor (defaults :notifications-per-page) filter-type]
+     ::json-rpc/call [{:method     "wakuext_activityCenterNotificationsBy"
+                       :params     [cursor (defaults :notifications-per-page) filter-type (status filter-status)]
                        :on-success #(rf/dispatch [:activity-center.notifications/fetch-success filter-type filter-status reset-data? %])
                        :on-error   #(rf/dispatch [:activity-center.notifications/fetch-error filter-type filter-status %])}]}))
 

src/status_im/activity_center/core_test.cljs

@@ -10,7 +10,7 @@
 
 (defn setup []
   (h/register-helper-events)
-  (rf/dispatch [:init/app-started]))
+  (rf/dispatch [:setup/app-started]))
 
 ;;;; Contact verification
 
@@ -434,7 +434,7 @@
 
          (rf/dispatch [:activity-center.notifications/fetch-next-page])
 
-         (is (= "wakuext_unreadActivityCenterNotifications" (get-in @spy-queue [0 :args 0 :method])))
+         (is (= "wakuext_activityCenterNotificationsBy" (get-in @spy-queue [0 :args 0 :method])))
          (is (= "10" (get-in @spy-queue [0 :args 0 :params 0]))
              "Should be called with current cursor")
          (is (= {types/mention

src/status_im/add_new/core.cljs

@@ -11,7 +11,7 @@
             [status-im.i18n.i18n :as i18n]
             [status-im.contact.core :as contact]
             [status-im.router.core :as router]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.ethereum.stateofus :as stateofus]
             [status-im.utils.db :as utils.db]))
 

src/status_im/add_new/db.cljs

@@ -1,6 +1,7 @@
 (ns status-im.add-new.db
   (:require [status-im.ethereum.ens :as ens]
-            [cljs.spec.alpha :as spec]))
+            [cljs.spec.alpha :as spec]
+            [status-im.utils.db :as utils.db]))
 
 (defn own-public-key?
   [{:keys [multiaccount]} public-key]
@@ -8,18 +9,19 @@
 
 (defn validate-pub-key [db public-key]
   (cond
-    (or (not (spec/valid? :global/public-key public-key))
+    (or (not (utils.db/valid-public-key? public-key))
         (= public-key ens/default-key))
     :invalid
     (own-public-key? db public-key)
     :yourself))
 
-(spec/def ::name :global/not-empty-string)
+(spec/def ::name (spec/and string? not-empty))
 
-(spec/def ::topic (spec/and :global/not-empty-string
+(spec/def ::topic (spec/and string?
+                            not-empty
                             (partial re-matches #"[a-z0-9\-]+")))
 
 (defn valid-topic? [topic]
   (and topic
        (spec/valid? ::topic topic)
-       (not (spec/valid? :global/public-key topic))))
+       (not (utils.db/valid-public-key? topic))))

src/status_im/bootnodes/core.cljs

@@ -3,7 +3,7 @@
             [re-frame.core :as re-frame]
             [status-im.i18n.i18n :as i18n]
             [status-im.multiaccounts.update.core :as multiaccounts.update]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]))
 
 (def address-regex #"enode://[a-zA-Z0-9]+:?(.*)\@\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b:(\d{1,5})")

src/status_im/browser/core.cljs

@@ -9,7 +9,7 @@
             [status-im.i18n.i18n :as i18n]
             [status-im.native-module.core :as status]
             [status-im.ui.components.list-selection :as list-selection]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.utils.http :as http]
             [status-im.utils.platform :as platform]

src/status_im/browser/permissions.cljs

@@ -2,7 +2,7 @@
   (:require [status-im.constants :as constants]
             [status-im.ethereum.json-rpc :as json-rpc]
             [status-im.i18n.i18n :as i18n]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.qr-scanner.core :as qr-scanner]
             [status-im.utils.fx :as fx]))
 

src/status_im/chat/models.cljs

@@ -10,8 +10,6 @@
             [status-im.i18n.i18n :as i18n]
             [quo.design-system.colors :as colors]
             [status-im.constants :as constants]
-            [status-im.navigation :as navigation]
-            [status-im.navigation2 :as navigation2]
             [status-im.utils.clocks :as utils.clocks]
             [status-im.utils.fx :as fx]
             [status-im.utils.utils :as utils]
@@ -19,7 +17,8 @@
             [status-im.add-new.db :as new-public-chat.db]
             [status-im.chat.models.loading :as loading]
             [status-im.ui.screens.chat.state :as chat.state]
-            [clojure.set :as set]))
+            [clojure.set :as set]
+            [status-im2.navigation.events :as navigation]))
 
 (defn chats []
   (:chats (types/json->clj (js/require "./chats.js"))))
@@ -253,7 +252,8 @@
   (fx/merge cofx
             {:dispatch [:navigate-to :chat]}
             (navigation/change-tab :chat)
-            (navigation/pop-to-root-tab :chat-stack)
+            (when-not (= (:view-id db) :community)
+              (navigation/pop-to-root-tab :chat-stack))
             (close-chat)
             (force-close-chat chat-id)
             (fn [{:keys [db]}]
@@ -270,7 +270,7 @@
             {:db (assoc db :current-chat-id chat-id)}
             (offload-messages chat-id)
             (preload-chat-data chat-id)
-            (navigation2/navigate-to-nav2 :chat chat-id nil from-switcher?)))
+            (navigation/navigate-to-nav2 :chat chat-id nil from-switcher?)))
 
 (fx/defn handle-clear-history-response
   {:events [::history-cleared]}

src/status_im/communities/core.cljs

@@ -12,7 +12,7 @@
    [status-im.utils.universal-links.core :as universal-links]
    [status-im.ethereum.json-rpc :as json-rpc]
    [quo.design-system.colors :as colors]
-   [status-im.navigation :as navigation]
+   [status-im2.navigation.events :as navigation]
    [status-im.utils.handlers :refer [>evt]]
    [status-im.ui.components.emoji-thumbnail.styles :as emoji-thumbnail-styles]
    [status-im.notifications-center.core :as notification-center]))

src/status_im/constants.cljs

@@ -56,12 +56,12 @@
                     emoji-reaction-sad         (:sad resources/reactions-old)
                     emoji-reaction-angry       (:angry resources/reactions-old)})
 
-(def reactions {emoji-reaction-love        :main-icons2/love
-                emoji-reaction-thumbs-up   :main-icons2/angry
-                emoji-reaction-thumbs-down :main-icons2/sad
-                emoji-reaction-laugh       :main-icons2/laugh
-                emoji-reaction-sad         :main-icons2/thumbs-up
-                emoji-reaction-angry       :main-icons2/thumbs-down})
+(def reactions {emoji-reaction-love        :i/love
+                emoji-reaction-thumbs-up   :i/thumbs-up
+                emoji-reaction-thumbs-down :i/thumbs-down
+                emoji-reaction-laugh       :i/laugh
+                emoji-reaction-sad         :i/sad
+                emoji-reaction-angry       :i/angry})
 
 (def ^:const invitation-state-unknown 0)
 (def ^:const invitation-state-requested 1)
@@ -195,3 +195,5 @@
 (def ^:const sticker-pack-status-installed 1)
 (def ^:const sticker-pack-status-pending 2)
 (def ^:const sticker-pack-status-owned 3)
+
+(def ^:const delete-message-for-me-undo-time-limit-ms 4000)

src/status_im/contact/block.cljs

@@ -4,7 +4,7 @@
             [status-im.contact.db :as contact.db]
             [status-im.data-store.chats :as chats-store]
             [status-im.data-store.contacts :as contacts-store]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.types :as types]
             [status-im.notifications-center.core :as notification-center]
             [status-im.utils.fx :as fx]))

src/status_im/contact/chat.cljs

@@ -1,6 +1,6 @@
 (ns status-im.contact.chat
   (:require [re-frame.core :as re-frame]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.chat.models :as chat]
             [status-im.contact.core :as contact]

src/status_im/contact/core.cljs

@@ -3,7 +3,7 @@
             [status-im.contact.db :as contact.db]
             [status-im.data-store.contacts :as contacts-store]
             [status-im.ethereum.json-rpc :as json-rpc]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.multiaccounts.update.core :as multiaccounts.update]
             [status-im.utils.fx :as fx]
             [taoensso.timbre :as log]

src/status_im/core.cljs

@@ -1,54 +0,0 @@
-(ns status-im.core
-  (:require ["react-native" :refer (DevSettings LogBox)]
-            ["react-native-languages" :default react-native-languages]
-            ["react-native-shake" :as react-native-shake]
-            [re-frame.core :as re-frame]
-            [re-frame.interop :as interop]
-            [reagent.impl.batching :as batching]
-            status-im.events
-            [status-im.i18n.i18n :as i18n]
-            [status-im.native-module.core :as status]
-            status-im.navigation.core
-            [status-im.notifications.local :as notifications]
-            status-im.subs.root
-            [status-im.ui.components.react :as react]
-            [status-im.utils.config :as config]
-            status-im.utils.db
-            [status-im.utils.error-handler :as error-handler]
-            [status-im.utils.logging.core :as utils.logs]
-            [status-im.utils.platform :as platform]
-            [status-im.utils.snoopy :as snoopy]
-            [status-im.switcher.animation :as animation]
-            [status-im.async-storage.core :as async-storage]
-            [status-im.utils.universal-links.core :as utils.universal-links]))
-
-(set! interop/next-tick js/setTimeout)
-(set! batching/fake-raf #(js/setTimeout % 0))
-(.ignoreAllLogs LogBox)
-
-(defn init []
-  (utils.logs/init-logs config/log-level)
-  (error-handler/register-exception-handler!)
-  (when platform/android?
-    (status/set-soft-input-mode status/adjust-resize))
-  (notifications/listen-notifications)
-  (.addEventListener ^js react/app-state "change" #(re-frame/dispatch [:app-state-change %]))
-  (.addEventListener react-native-languages "change" (fn [^js event]
-                                                       (i18n/set-language (.-language event))))
-  (.addEventListener react-native-shake "ShakeEvent" #(re-frame/dispatch [:shake-event]))
-
-  (re-frame/dispatch-sync [:init/app-started])
-
-  (utils.universal-links/initialize)
-
-  ;; TODO(parvesh) - Remove while moving functionality to status-go
-  (async-storage/get-item :selected-stack-id #(animation/selected-stack-id-loaded %))
-
-  ;;DEV
-  (snoopy/subscribe!)
-  (when (and js/goog.DEBUG platform/ios? DevSettings)
-    ;;on Android this method doesn't work
-    (when-let [nm (.-_nativeModule DevSettings)]
-      ;;there is a bug in RN, so we have to enable it first and then disable
-      (.setHotLoadingEnabled ^js nm true)
-      (js/setTimeout #(.setHotLoadingEnabled ^js nm false) 1000))))

src/status_im/data_store/contacts.cljs

@@ -6,15 +6,17 @@
 
 (defn <-rpc [contact]
   (-> contact
-      (clojure.set/rename-keys {:id :public-key
-                                :ensVerifiedAt :ens-verified-at
-                                :ensVerified :ens-verified
-                                :ensVerificationRetries :ens-verification-retries
-                                :hasAddedUs :has-added-us
-                                :contactRequestState :contact-request-state
-                                :lastENSClockValue :last-ens-clock-value
-                                :lastUpdated :last-updated
-                                :localNickname :nickname})
+      (clojure.set/rename-keys
+       {:id                     :public-key
+        :ensVerifiedAt          :ens-verified-at
+        :displayName            :display-name
+        :ensVerified            :ens-verified
+        :ensVerificationRetries :ens-verification-retries
+        :hasAddedUs             :has-added-us
+        :contactRequestState    :contact-request-state
+        :lastENSClockValue      :last-ens-clock-value
+        :lastUpdated            :last-updated
+        :localNickname          :nickname})
       (assoc :mutual? (and (:added contact)
                            (:hasAddedUs contact)))))
 

src/status_im/data_store/contacts_test.cljs

@@ -3,16 +3,18 @@
             [status-im.data-store.contacts :as c]))
 
 (deftest contact<-rpc
-  (let [contact {:id "pk"
-                 :address "address"
-                 :name "name"
-                 :identicon "identicon"
+  (let [contact {:id          "pk"
+                 :address     "address"
+                 :name        "name"
+                 :displayName "display-name"
+                 :identicon   "identicon"
                  :lastUpdated 1}
-        expected-contact {:public-key "pk"
-                          :address "address"
-                          :mutual? nil
-                          :name "name"
-                          :identicon "identicon"
+        expected-contact {:public-key   "pk"
+                          :address      "address"
+                          :display-name "display-name"
+                          :mutual?      nil
+                          :name         "name"
+                          :identicon    "identicon"
                           :last-updated 1}]
     (testing "<-rpc"
       (is (= expected-contact (c/<-rpc contact))))))

src/status_im/ens/core.cljs

@@ -7,7 +7,7 @@
             [status-im.ethereum.ens :as ens]
             [status-im.ethereum.stateofus :as stateofus]
             [status-im.multiaccounts.update.core :as multiaccounts.update]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.datetime :as datetime]
             [status-im.utils.fx :as fx]
             [status-im.utils.random :as random]

src/status_im/events.cljs

@@ -5,7 +5,6 @@
             [status-im.async-storage.core :as async-storage]
             status-im.backup.core
             status-im.bootnodes.core
-            [status-im.bottom-sheet.core :as bottom-sheet]
             status-im.browser.core
             status-im.browser.permissions
             [status-im.chat.models :as chat]
@@ -23,7 +22,6 @@
             status-im.fleet.core
             status-im.http.core
             [status-im.i18n.i18n :as i18n]
-            status-im.init.core
             [status-im.keycard.core :as keycard]
             status-im.log-level.core
             status-im.mailserver.constants
@@ -34,11 +32,10 @@
             status-im.multiaccounts.logout.core
             status-im.multiaccounts.update.core
             [status-im.native-module.core :as status]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             status-im.notifications-center.core
             status-im.activity-center.core
             status-im.pairing.core
-            [status-im.popover.core :as popover]
             status-im.profile.core
             status-im.search.core
             status-im.signals.core
@@ -49,23 +46,17 @@
             status-im.ui.screens.privacy-and-security-settings.events
             [status-im.utils.dimensions :as dimensions]
             [status-im.utils.fx :as fx]
-            status-im.utils.logging.core
             [status-im.utils.universal-links.core :as universal-links]
             [status-im.utils.utils :as utils]
-            [status-im.visibility-status-popover.core :as visibility-status-popover]
             status-im.visibility-status-updates.core
             status-im.waku.core
             status-im.wallet.accounts.core
             status-im.wallet.choose-recipient.core
             [status-im.wallet.core :as wallet]
             status-im.wallet.custom-tokens.core
-            [status-im.navigation.core :as navigation.core]
-            [status-im.navigation.state :as navigation.state]
-            [status-im.signing.core :as signing]
             status-im.wallet-connect.core
             status-im.wallet-connect-legacy.core
-            status-im.navigation2
-            status-im.navigation2.core))
+            status-im.network.net-info))
 
 (re-frame/reg-fx
  :dismiss-keyboard
@@ -119,56 +110,9 @@
 
 (fx/defn system-theme-mode-changed
   {:events [:system-theme-mode-changed]}
-  [{:keys [db] :as cofx} theme]
-  (let [cur-theme        (get-in db [:multiaccount :appearance])
-        current-tab      (get db :current-tab :chat)
-        view-id          (:view-id db)
-        screen-params    (get-in db [:navigation/screen-params view-id])
-        root-id          @navigation.state/root-id
-        key-uid          (get-in db [:multiaccounts/login :key-uid])
-        keycard-account? (boolean (get-in db [:multiaccounts/multiaccounts
-                                              key-uid
-                                              :keycard-pairing]))
-        dispatch-later   (cond-> []
-                           (= view-id :chat)
-                           (conj {:ms       1000
-                                  :dispatch [:chat.ui/navigate-to-chat (:current-chat-id db)]})
-
-                           (and
-                            (= root-id :chat-stack)
-                            (not-any? #(= view-id %) '(:home :empty-tab :wallet :status :my-profile :chat)))
-                           (conj {:ms       1000
-                                  :dispatch [:navigate-to view-id screen-params]})
-
-                           (some #(= view-id %) navigation.core/community-screens)
-                           (conj {:ms 800 :dispatch
-                                  [:navigate-to :community
-                                   (get-in db [:navigation/screen-params :community])]})
-
-                           (= view-id :community-emoji-thumbnail-picker)
-                           (conj {:ms 900 :dispatch
-                                  [:navigate-to :create-community-channel
-                                   (get-in db [:navigation/screen-params :create-community-channel])]}))]
-    (when (and (some? root-id) (or (nil? cur-theme) (zero? cur-theme)))
-      (navigation.core/dismiss-all-modals)
-      (fx/merge cofx
-                (merge
-                 {::multiaccounts/switch-theme (if (= :dark theme) 2 1)}
-                 (when (seq dispatch-later)
-                   {:utils/dispatch-later dispatch-later}))
-                (when (get-in db [:bottom-sheet/show?])
-                  (bottom-sheet/hide-bottom-sheet))
-                (when (get-in db [:popover/popover])
-                  (popover/hide-popover))
-                (when (get-in db [:visibility-status-popover/popover])
-                  (visibility-status-popover/hide-visibility-status-popover))
-                (when (get-in db [:signing/tx])
-                  (signing/discard))
-                (if (and (= root-id :multiaccounts) keycard-account?)
-                  (navigation/init-root-with-component :multiaccounts-keycard :multiaccounts)
-                  (navigation/init-root root-id))
-                (when (= root-id :chat-stack)
-                  (navigation/change-tab current-tab))))))
+  [_ theme]
+  {::multiaccounts/switch-theme (if (= :dark theme) 2 1)
+   :dispatch [:reload-new-ui]})
 
 (def authentication-options
   {:reason (i18n/label :t/biometric-auth-reason-login)})
@@ -195,9 +139,7 @@
                            (>= (- now app-in-background-since)
                                constants/ms-in-bg-for-require-bioauth))]
     (fx/merge cofx
-              {:db (-> db
-                       (dissoc :app-in-background-since)
-                       (assoc :app-active-since now))}
+              {:db (dissoc db :app-in-background-since)}
               (mailserver/process-next-messages-request)
               (wallet/restart-wallet-service-after-background app-in-background-since)
               (universal-links/process-stored-event)
@@ -207,10 +149,8 @@
                  (biometric/authenticate % on-biometric-auth-result authentication-options)))))
 
 (fx/defn on-going-in-background
-  [{:keys [db now] :as cofx}]
-  {:db         (-> db
-                   (dissoc :app-active-since)
-                   (assoc :app-in-background-since now))
+  [{:keys [db now]}]
+  {:db         (assoc db :app-in-background-since now)
    :dispatch-n [[:audio-recorder/on-background] [:audio-message/on-background]]})
 
 (fx/defn app-state-change

src/status_im/group_chats/core.cljs

@@ -5,7 +5,7 @@
             [re-frame.core :as re-frame]
             [status-im.chat.models :as models.chat]
             [status-im.ethereum.json-rpc :as json-rpc]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.constants :as constants]
             [status-im.i18n.i18n :as i18n]

src/status_im/i18n/i18n.cljs

@@ -4,6 +4,8 @@
    ["i18n-js" :as i18n]
    [status-im.i18n.i18n-resources :as i18n-resources]
    [status-im.goog.i18n :as goog.i18n]))
+;;TODO (14/11/22 flexsurfer) this namespace has been moved to the root level, we keep this only for old (status 1.0) code,
+;; can be removed with old code later
 
 (set! (.-locale i18n) (name i18n-resources/default-device-language))
 (set! (.-fallbacks i18n) true)

src/status_im/i18n/i18n_resources.cljs

@@ -2,6 +2,8 @@
   (:require [clojure.string :as string]
             ["i18n-js" :as i18n-js]
             ["react-native-languages" :default react-native-languages]))
+;;TODO (14/11/22 flexsurfer) this namespace has been moved to the status-im2 namespace, we keep this only for old (status 1.0) code,
+;; can be removed with old code later
 
 (def default-device-language
   (keyword (.-language react-native-languages)))

src/status_im/i18n/i18n_test.cljs

@@ -5,6 +5,8 @@
             [clojure.set :as set]
             [cljs.spec.alpha :as spec]
             [clojure.string :as string]))
+;;TODO (14/11/22 flexsurfer) this namespace has been moved to the status-im2 namespace, we keep this only for old (status 1.0) code,
+;; can be removed with old code later
 
 ;; english as source of truth
 (def labels (set (keys (js->clj (:en i18n-resources/translations-by-locale)
@@ -108,7 +110,7 @@
     :blank-keycard-title
     :block
     :block-contact
-    :block-contact-details
+    :block-user-confirmation
     :blocked-users
     :bootnode-address
     :bootnode-details

src/status_im/integration_test.cljs

@@ -4,11 +4,12 @@
             [clojure.string :as string]
             [re-frame.core :as rf]
             status-im.events
+            status-im2.navigation.core
             [status-im.chat.models :as chat.models]
             [status-im.utils.security :as security]
             [status-im.multiaccounts.logout.core :as logout]
             [status-im.transport.core :as transport]
-            status-im.subs.root ;;so integration tests can run independently
+            status-im2.subs.root ;;so integration tests can run independently
             [status-im.ethereum.core :as ethereum]
             [status-im.utils.test :as utils.test]
             [taoensso.timbre :as log]))
@@ -22,7 +23,7 @@
 (utils.test/init!)
 
 (defn initialize-app! []
-  (rf/dispatch [:init/app-started]))
+  (rf/dispatch [:setup/app-started]))
 
 (defn generate-and-derive-addresses! []
   (rf/dispatch [:generate-and-derive-addresses]))
@@ -71,11 +72,11 @@
 (deftest initialize-app-test
   (log/info "========= initialize-app-test ==================")
   (rf-test/run-test-async
-   (rf/dispatch [:init/app-started])
+   (rf/dispatch [:setup/app-started])
    (rf-test/wait-for
     ;; use initialize-view because it has the longest avg. time and
     ;; is dispatched by initialize-multiaccounts (last non-view event)
-    [:status-im.init.core/initialize-view]
+    [:setup/initialize-view]
     (assert-app-initialized))))
 
 (deftest create-account-test
@@ -83,7 +84,7 @@
   (rf-test/run-test-async
    (initialize-app!) ; initialize app
    (rf-test/wait-for
-    [:status-im.init.core/initialize-view]
+    [:setup/initialize-view]
     (generate-and-derive-addresses!) ; generate 5 new keys
     (rf-test/wait-for
      [:multiaccount-generate-and-derive-addresses-success] ; wait for the keys
@@ -101,7 +102,7 @@
   (rf-test/run-test-async
    (initialize-app!) ; initialize app
    (rf-test/wait-for
-    [:status-im.init.core/initialize-view]
+    [:setup/initialize-view]
     (generate-and-derive-addresses!) ; generate 5 new keys      
     (rf-test/wait-for
      [:multiaccount-generate-and-derive-addresses-success]
@@ -126,7 +127,7 @@
   (rf-test/run-test-async
    (initialize-app!)
    (rf-test/wait-for
-    [:status-im.init.core/initialize-view]
+    [:setup/initialize-view]
     (generate-and-derive-addresses!) ; generate 5 new keys
     (rf-test/wait-for
      [:multiaccount-generate-and-derive-addresses-success]
@@ -148,7 +149,7 @@
   (rf-test/run-test-async
    (initialize-app!)
    (rf-test/wait-for
-    [:status-im.init.core/initialize-view]
+    [:setup/initialize-view]
     (generate-and-derive-addresses!)
     (rf-test/wait-for
      [:multiaccount-generate-and-derive-addresses-success]
@@ -185,7 +186,7 @@
   (rf-test/run-test-async
    (initialize-app!)
    (rf-test/wait-for
-    [:status-im.init.core/initialize-view]
+    [:setup/initialize-view]
     (rf/dispatch-sync [:init-root :onboarding])
     (rf/dispatch-sync [:multiaccounts.recover.ui/recover-multiaccount-button-pressed])
     (rf/dispatch-sync [:status-im.multiaccounts.recover.core/enter-phrase-pressed])
@@ -215,7 +216,7 @@
   (rf-test/run-test-async
    (initialize-app!)
    (rf-test/wait-for
-    [:status-im.init.core/initialize-view]
+    [:setup/initialize-view]
     (generate-and-derive-addresses!)
     (rf-test/wait-for
      [:multiaccount-generate-and-derive-addresses-success] ; wait for the keys
@@ -237,7 +238,7 @@
   (rf-test/run-test-async
    (initialize-app!)
    (rf-test/wait-for
-    [:status-im.init.core/initialize-view]
+    [:setup/initialize-view]
     (generate-and-derive-addresses!)
     (rf-test/wait-for
      [:multiaccount-generate-and-derive-addresses-success] ; wait for the keys
@@ -265,7 +266,7 @@
   (rf-test/run-test-async
    (initialize-app!)
    (rf-test/wait-for
-    [:status-im.init.core/initialize-view]
+    [:setup/initialize-view]
     (generate-and-derive-addresses!)
     (rf-test/wait-for
      [:multiaccount-generate-and-derive-addresses-success] ; wait for the keys

src/status_im/keycard/backup_key.cljs

@@ -6,7 +6,7 @@
             [status-im.ethereum.mnemonic :as mnemonic]
             [status-im.keycard.common :as common]
             [status-im.multiaccounts.recover.core :as multiaccounts.recover]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.signing.core :as signing.core]
             [taoensso.timbre :as log]))
 

src/status_im/keycard/change_pin.cljs

@@ -1,6 +1,6 @@
 (ns status-im.keycard.change-pin
   (:require [status-im.i18n.i18n :as i18n]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.keycard.onboarding :as onboarding]
             [status-im.utils.fx :as fx]
             [taoensso.timbre :as log]

src/status_im/keycard/common.cljs

@@ -4,7 +4,7 @@
             [status-im.ethereum.core :as ethereum]
             [status-im.keycard.nfc :as nfc]
             [status-im.i18n.i18n :as i18n]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.ui.screens.keycard.keycard-interaction :as keycard-sheet]
             [status-im.utils.fx :as fx]
             [status-im.utils.keychain.core :as keychain]

src/status_im/keycard/core.cljs

@@ -16,7 +16,7 @@
             [status-im.i18n.i18n :as i18n]
             [status-im.multiaccounts.recover.core :as multiaccounts.recover]
             [status-im.multiaccounts.update.core :as multiaccounts.update]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.datetime :as utils.datetime]
             [status-im.utils.fx :as fx]
             [taoensso.timbre :as log]))

src/status_im/keycard/delete_key.cljs

@@ -1,5 +1,5 @@
 (ns status-im.keycard.delete-key
-  (:require [status-im.navigation :as navigation]
+  (:require [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.keycard.common :as common]))
 

src/status_im/keycard/login.cljs

@@ -1,6 +1,6 @@
 (ns status-im.keycard.login
   (:require [status-im.ethereum.core :as ethereum]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.utils.types :as types]
             [taoensso.timbre :as log]

src/status_im/keycard/mnemonic.cljs

@@ -1,5 +1,5 @@
 (ns status-im.keycard.mnemonic
-  (:require [status-im.navigation :as navigation]
+  (:require [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [taoensso.timbre :as log]
             [status-im.keycard.common :as common]

src/status_im/keycard/onboarding.cljs

@@ -2,7 +2,7 @@
   (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
             [status-im.i18n.i18n :as i18n]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.utils.utils :as utils]
             [status-im.keycard.common :as common]

src/status_im/keycard/recovery.cljs

@@ -1,5 +1,5 @@
 (ns status-im.keycard.recovery
-  (:require [status-im.navigation :as navigation]
+  (:require [status-im2.navigation.events :as navigation]
             [status-im.utils.datetime :as utils.datetime]
             [status-im.multiaccounts.create.core :as multiaccounts.create]
             [status-im.multiaccounts.model :as multiaccounts.model]

src/status_im/keycard/unpair.cljs

@@ -2,7 +2,7 @@
   (:require [re-frame.core :as re-frame]
             [status-im.multiaccounts.update.core :as multiaccounts.update]
             [status-im.i18n.i18n :as i18n]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [taoensso.timbre :as log]
             [status-im.keycard.common :as common]

src/status_im/mailserver/core.cljs

@@ -7,7 +7,7 @@
             [status-im.multiaccounts.update.core :as multiaccounts.update]
             [status-im.node.core :as node]
             [status-im.utils.mobile-sync :as mobile-network-utils]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [taoensso.timbre :as log]))
 

src/status_im/mobile_sync_settings/core.cljs

@@ -5,7 +5,7 @@
    [status-im.wallet.core :as wallet]
    [status-im.bottom-sheet.core :as bottom-sheet]
    [status-im.multiaccounts.model :as multiaccounts.model]
-   [status-im.navigation :as navigation]
+   [status-im2.navigation.events :as navigation]
    [status-im.mailserver.core :as mailserver]
    [status-im.utils.mobile-sync :as utils]
    [taoensso.timbre :as log]))

src/status_im/multiaccounts/core.cljs

@@ -8,12 +8,12 @@
             [status-im.utils.fx :as fx]
             [status-im.utils.gfycat.core :as gfycat]
             [status-im.utils.identicon :as identicon]
-            [status-im.utils.theme :as utils.theme]
             [status-im.theme.core :as theme]
             [status-im.utils.utils :as utils]
             [quo.platform :as platform]
             [taoensso.timbre :as log]
-            [clojure.string :as string]))
+            [clojure.string :as string]
+            [status-im2.common.theme.core :as utils.theme]))
 
 ;; validate that the given mnemonic was generated from Status Dictionary
 (re-frame/reg-fx
@@ -23,29 +23,36 @@
 
 (defn contact-names
   "Returns map of all existing names for contact"
-  [{:keys [name preferred-name alias public-key ens-verified nickname]}]
+  [{:keys [name
+           display-name
+           preferred-name
+           alias
+           public-key
+           ens-verified
+           nickname]}]
   (let [ens-name (or preferred-name
                      name)]
     (cond-> {:nickname         nickname
+             :display-name     display-name
              :three-words-name (or alias (gfycat/generate-gfy public-key))}
             ;; Preferred name is our own otherwise we make sure it's verified
       (or preferred-name (and ens-verified name))
       (assoc :ens-name (str "@" (or (stateofus/username ens-name) ens-name))))))
 
+;; NOTE: this does a bit of unnecessary work, we could short-circuit the work
+;; once the first two are found, i.e don't calculate short key if 2 are already
+;; available
 (defn contact-two-names
-  "Returns vector of two names in next order nickname, ens name, three word name, public key"
+  "Returns vector of two names in next order nickname, ens name, display-name, three word name, public key"
   [{:keys [names public-key] :as contact} public-key?]
-  (let [{:keys [nickname ens-name three-words-name]} (or names (contact-names contact))
+  (let [{:keys [nickname
+                ens-name
+                display-name
+                three-words-name]} (or names (contact-names contact))
         short-public-key (when public-key? (utils/get-shortened-address public-key))]
-    (cond (not (string/blank? nickname))
-          [nickname (or ens-name three-words-name short-public-key)]
-          (not (string/blank? ens-name))
-          [ens-name (or three-words-name short-public-key)]
-          (not (string/blank? three-words-name))
-          [three-words-name short-public-key]
-          :else
-          (when public-key?
-            [short-public-key short-public-key]))))
+    (->> [nickname ens-name display-name three-words-name short-public-key]
+         (remove string/blank?)
+         (take 2))))
 
 (defn contact-with-names
   "Returns contact with :names map "
@@ -157,7 +164,7 @@
 (re-frame/reg-fx
  ::switch-theme
  (fn [theme-id]
-   (let [theme (if (or (= 2 theme-id) (and (= 0 theme-id) (utils.theme/is-dark-mode)))
+   (let [theme (if (or (= 2 theme-id) (and (= 0 theme-id) (utils.theme/dark-mode?)))
                  :dark
                  :light)]
      (theme/change-theme theme))))

src/status_im/multiaccounts/core_test.cljs

@@ -0,0 +1,85 @@
+(ns status-im.multiaccounts.core-test
+  (:require [cljs.test :refer-macros [deftest is testing]]
+            [status-im.multiaccounts.core :as ma]))
+
+(def public-key "0x0461f576da67dc0bca9888cdb4cb28c80285b756b324109da94a081585ed6f007cf00afede6b3ee5638593674fee100b590318fc7bdb0054b8dd9445acea216ad2")
+(def short-public-key "0x0461…ad2")
+(def random-name "Studious Gold Mustang")
+(def override-random-name (str "override" random-name))
+(def nickname "nickname")
+(def override-nickname (str nickname "override"))
+(def display-name "display-name")
+(def override-display-name (str display-name "override"))
+(def ens-name "jakubgs.eth")
+(def formatted-ens (str "@" ens-name))
+(def override-ens-name (str "override" ens-name))
+
+(def contact
+  {:nickname     nickname
+   :name         ens-name
+   :ens-verified true
+   :public-key   public-key
+   :display-name display-name})
+
+(deftest contact-two-names-test
+  (testing "names is nil"
+    (testing "nickname has precedence"
+      (is
+       (= [nickname formatted-ens]
+          (ma/contact-two-names contact public-key))))
+    (testing "ens name is second option"
+      (is
+       (= [formatted-ens display-name]
+          (ma/contact-two-names
+           (dissoc contact :nickname)
+           public-key))))
+    (testing "ens name is second option but not verified"
+      (is
+       (= [display-name random-name]
+          (ma/contact-two-names
+           (dissoc contact :nickname :ens-verified)
+           public-key))))
+    (testing "display name is third option"
+      (is
+       (= [display-name random-name]
+          (ma/contact-two-names
+           (dissoc contact :nickname :name)
+           public-key))))
+    (testing "3 random words is fallback"
+      (is
+       (= [random-name short-public-key]
+          (ma/contact-two-names
+           (dissoc contact
+                   :nickname
+                   :name
+                   :display-name)
+           public-key)))))
+  (testing "names is provided"
+    (let [names              {:nickname         override-nickname
+                              :display-name     override-display-name
+                              :three-words-name override-random-name
+                              :ens-name         override-ens-name}
+          contact-with-names (assoc contact :names names)]
+
+      (testing "nickname has precedence"
+        (is
+         (= [override-nickname override-ens-name]
+            (ma/contact-two-names contact-with-names public-key))))
+      (testing "ens name is second option"
+        (is
+         (= [override-ens-name override-display-name]
+            (ma/contact-two-names
+             (update contact-with-names :names dissoc :nickname)
+             public-key))))
+      (testing "display name is third option"
+        (is
+         (= [override-display-name override-random-name]
+            (ma/contact-two-names
+             (update contact-with-names :names dissoc :nickname :ens-name)
+             public-key))))
+      (testing "3 random words is fallback"
+        (is
+         (= [override-random-name short-public-key]
+            (ma/contact-two-names
+             (update contact-with-names :names dissoc :nickname :ens-name :display-name)
+             public-key)))))))

src/status_im/multiaccounts/db.cljs

@@ -5,4 +5,4 @@
 (defn valid-length? [password]
   (>= (count password) const/min-password-length))
 
-(spec/def ::password  (spec/and :global/not-empty-string valid-length?))
+(spec/def ::password  (spec/and string? not-empty valid-length?))

src/status_im/multiaccounts/key_storage/core.cljs

@@ -8,7 +8,7 @@
             [status-im.multiaccounts.model :as multiaccounts.model]
             [status-im.multiaccounts.logout.core :as multiaccounts.logout]
             [status-im.native-module.core :as native-module]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.popover.core :as popover]
             [status-im.utils.fx :as fx]
             [status-im.utils.security :as security]

src/status_im/multiaccounts/login/core.cljs

@@ -20,7 +20,7 @@
             [status-im.mobile-sync-settings.core :as mobile-network]
             [status-im.utils.fx :as fx]
             [status-im.utils.keychain.core :as keychain]
-            [status-im.utils.logging.core :as logging]
+            [status-im2.setup.log :as logging]
             [status-im.utils.security :as security]
             [status-im.utils.types :as types]
             [status-im.utils.utils :as utils]
@@ -33,7 +33,7 @@
             [status-im.utils.mobile-sync :as utils.mobile-sync]
             [status-im.async-storage.core :as async-storage]
             [status-im.notifications-center.core :as notifications-center]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.signing.eip1559 :as eip1559]
             [status-im.data-store.chats :as data-store.chats]
             [status-im.data-store.visibility-status-updates :as visibility-status-updates-store]

src/status_im/multiaccounts/logout/core.cljs

@@ -1,13 +1,13 @@
 (ns status-im.multiaccounts.logout.core
   (:require [re-frame.core :as re-frame]
             [status-im.i18n.i18n :as i18n]
-            [status-im.init.core :as init]
             [status-im.native-module.core :as status]
             [status-im.utils.fx :as fx]
             [status-im.multiaccounts.core :as multiaccounts]
             [status-im.utils.keychain.core :as keychain]
             [status-im.notifications.core :as notifications]
-            [status-im.wallet.core :as wallet]))
+            [status-im.wallet.core :as wallet]
+            [status-im2.setup.events :as init]))
 
 (fx/defn logout-method
   {:events [::logout-method]}
@@ -22,7 +22,7 @@
                ::logout                              nil
                ::multiaccounts/webview-debug-changed false
                :keychain/clear-user-password         key-uid
-               ::init/open-multiaccounts             #(re-frame/dispatch [::init/initialize-multiaccounts % {:logout? logout?}])}
+               :setup/open-multiaccounts             #(re-frame/dispatch [:setup/initialize-multiaccounts % {:logout? logout?}])}
               (keychain/save-auth-method key-uid auth-method)
               (wallet/clear-timeouts)
               (init/initialize-app-db))))

src/status_im/multiaccounts/recover/core.cljs

@@ -10,7 +10,7 @@
             [status-im.multiaccounts.create.core :as multiaccounts.create]
             [status-im.native-module.core :as status]
             [status-im.popover.core :as popover]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.utils.security :as security]
             [status-im.utils.types :as types]

src/status_im/navigation/roots.cljs

@@ -1,193 +0,0 @@
-(ns status-im.navigation.roots
-  (:require [quo.design-system.colors :as colors]
-            [status-im.utils.platform :as platform]
-            [status-im.ui.components.icons.icons :as icons]
-            [status-im.ui.screens.views :as views]
-            [status-im.navigation2.roots :as nav2-roots]))
-
-(defn status-bar-options []
-  (if platform/android?
-    {:navigationBar {:backgroundColor colors/white}
-     :statusBar     {:backgroundColor colors/white
-                     :style           (if (colors/dark?) :light :dark)}}
-    {:statusBar {:style (if (colors/dark?) :light :dark)}}))
-
-(defn topbar-options []
-  {:noBorder   true
-   :scrollEdgeAppearance {:active   false
-                          :noBorder true}
-   :elevation  0
-   :title {:color colors/black}
-   :rightButtonColor colors/black
-   :background {:color colors/white}
-   :backButton {:icon  (icons/icon-source :main-icons/arrow-left)
-                :color colors/black}})
-
-(defn bottom-tab-general [icon accessibility]
-  (merge
-   {:testID accessibility
-    :accessibilityLabel accessibility
-    :fontSize  11
-    :icon (icons/icon-source icon)
-    :badgeColor colors/blue
-    :dotIndicator {:color colors/blue :visible false :size 10}
-    :iconColor colors/gray :selectedIconColor colors/blue
-    :textColor colors/gray :selectedTextColor colors/blue}
-   (when platform/android?
-     {:badge ""})))
-
-(defn default-root []
-  {:layout {:componentBackgroundColor colors/white
-            :orientation              "portrait"
-            :backgroundColor          colors/white}})
-
-(defn merge-top-bar [root-options options]
-  (let [options (:topBar options)]
-    {:topBar
-     (merge root-options
-            options
-            (when (or (:title root-options) (:title options))
-              {:title (merge (:title root-options) (:title options))})
-            (when (or (:background root-options) (:background options))
-              {:background (merge (:background root-options) (:background options))})
-            (when (or (:backButton root-options) (:backButton options))
-              {:backButton (merge (:backButton root-options) (:backButton options))})
-            (when (or (:leftButtons root-options) (:leftButtons options))
-              {:leftButtons (merge (:leftButtons root-options) (:leftButtons options))})
-            (when (or (:rightButtons root-options) (:rightButtons options))
-              {:rightButtons (merge (:rightButtons root-options) (:rightButtons options))}))}))
-
-(defn get-screen-options [screen]
-  (merge (get-in views/screens [screen :options])
-         (status-bar-options)
-         (merge-top-bar (topbar-options)
-                        (get-in views/screens [screen :options]))))
-
-;;TODO problem here is that we have two places for screens, here and in screens ns, and we have handler in navigate
-(defn roots []
-  ;;TABS
-  (merge
-   {:chat-stack
-    {:root
-     {:bottomTabs
-      {:id       :tabs-stack
-       :options  (merge (default-root)
-                        {:bottomTabs {:titleDisplayMode :alwaysHide
-                                      :tabsAttachMode :onSwitchToTab
-                                      :backgroundColor  colors/white}})
-       :children [;CHAT STACK
-                  {:stack {:id       :chat-stack
-                           :children [{:component {:name    :home
-                                                   :id      :home
-                                                   :options (merge (status-bar-options)
-                                                                   {:topBar (assoc (topbar-options) :visible false)})}}]
-                           :options  {:bottomTab (bottom-tab-general :main-icons/message :home-tab-button)}}}
-                  ;BROWSER STACK
-                  {:stack {:id       :browser-stack
-                           :children [{:component {:name    :empty-tab
-                                                   :id      :empty-tab
-                                                   :options (merge (status-bar-options)
-                                                                   {:topBar (assoc (topbar-options) :visible false)})}}]
-
-                           :options  {:bottomTab (bottom-tab-general :main-icons/browser :dapp-tab-button)}}}
-                  ;WALLET STACK
-                  {:stack {:id       :wallet-stack
-                           :children [{:component {:name    :wallet
-                                                   :id      :wallet
-                                                   :options (merge (status-bar-options)
-                                                                   {:topBar (assoc (topbar-options) :visible false)})}}]
-                           :options  {:bottomTab (bottom-tab-general :main-icons/wallet :wallet-tab-button)}}}
-                  ;STATUS STACK
-                  {:stack {:id       :status-stack
-                           :children [{:component {:name    :status
-                                                   :id      :status
-                                                   :options (merge (status-bar-options)
-                                                                   {:topBar (assoc (topbar-options) :visible false)})}}]
-                           :options  {:bottomTab (bottom-tab-general :main-icons/status :status-tab-button)}}}
-                  ;PROFILE STACK
-                  {:stack {:id       :profile-stack
-                           :children [{:component {:name    :my-profile
-                                                   :id      :my-profile
-                                                   :options (merge (status-bar-options)
-                                                                   {:topBar (assoc (topbar-options) :visible false)})}}]
-                           :options  {:bottomTab (bottom-tab-general :main-icons/user-profile :profile-tab-button)}}}]}}}
-
-    ;;INTRO (onboarding carousel)
-    :intro
-    {:root {:stack {:children [{:component {:name    :intro
-                                            :id      :intro
-                                            :options (status-bar-options)}}]
-                    :options  (merge (default-root)
-                                     (status-bar-options)
-                                     {:topBar (assoc (topbar-options) :visible false)})}}}
-
-    ;; ONBOARDING
-    :onboarding
-    {:root {:stack {:id       :onboarding
-                    :children [{:component {:name    :get-your-keys
-                                            :id      :get-your-keys
-                                            :options (status-bar-options)}}]
-                    :options  (merge (default-root)
-                                     (status-bar-options)
-                                     {:topBar (assoc (topbar-options) :elevation 0 :noBorder true :animate false)})}}}
-
-    ;;PROGRESS
-    :progress
-    {:root {:stack {:children [{:component {:name    :progress
-                                            :id      :progress
-                                            :options (status-bar-options)}}]
-                    :options  (merge (default-root)
-                                     {:topBar (assoc (topbar-options) :visible false)})}}}
-
-    ;;LOGIN
-    :multiaccounts
-    {:root {:stack {:id       :multiaccounts-stack
-                    :children [{:component {:name    :multiaccounts
-                                            :id      :multiaccounts
-                                            :options (get-screen-options :multiaccounts)}}
-                               {:component {:name    :login
-                                            :id      :login
-                                            :options (get-screen-options :login)}}]
-                    :options  (merge (default-root)
-                                     (status-bar-options)
-                                     {:topBar (topbar-options)})}}}
-
-    :multiaccounts-keycard
-    {:root {:stack {:id       :multiaccounts-stack
-                    :children [{:component {:name    :multiaccounts
-                                            :id      :multiaccounts
-                                            :options (get-screen-options :multiaccounts)}}
-                               {:component {:name    :keycard-login-pin
-                                            :id      :keycard-login-pin
-                                            :options (get-screen-options :keycard-login-pin)}}]
-                    :options  (merge (default-root)
-                                     (status-bar-options)
-                                     {:topBar (topbar-options)})}}}
-
-    ;;WELCOME
-    :welcome
-    {:root {:stack {:children [{:component {:name    :welcome
-                                            :id      :welcome
-                                            :options (status-bar-options)}}]
-                    :options  (merge (default-root)
-                                     (status-bar-options)
-                                     {:topBar (assoc (topbar-options) :visible false)})}}}
-
-    ;;NOTIFICATIONS
-    :onboarding-notification
-    {:root {:stack {:children [{:component {:name    :onboarding-notification
-                                            :id      :onboarding-notification
-                                            :options (status-bar-options)}}]
-                    :options  (merge (default-root)
-                                     (status-bar-options)
-                                     {:topBar (assoc (topbar-options) :visible false)})}}}
-
-    ;; TERMS OF SERVICE
-    :tos
-    {:root {:stack {:children [{:component {:name    :force-accept-tos
-                                            :id      :force-accept-tos
-                                            :options (get-screen-options :force-accept-tos)}}]
-                    :options  (merge (default-root)
-                                     (status-bar-options)
-                                     {:topBar (assoc (topbar-options) :visible false)})}}}}
-   (nav2-roots/roots)))

src/status_im/navigation2.cljs

@@ -1,60 +0,0 @@
-(ns status-im.navigation2
-  (:require [status-im.utils.fx :as fx]
-            [status-im.reloader :as reloader]
-            [status-im.utils.datetime :as datetime]))
-
-(def parent-stack (atom :shell-stack))
-
-(fx/defn reload-new-ui
-  {:events [:reload-new-ui]}
-  [_]
-  (reloader/reload)
-  {:new-ui/reset-bottom-tabs nil
-   :dispatch                 [:init-root :shell-stack]})
-
-(fx/defn init-root-nav2
-  {:events [:init-root-nav2]}
-  [_ root-id]
-  {:init-root-fx-nav2 root-id})
-
-(fx/defn open-modal-nav2
-  {:events [:open-modal-nav2]}
-  [_ modal]
-  {:open-modal-fx-nav2 modal})
-
-(fx/defn close-modal-nav2
-  {:events [:close-modal-nav2]}
-  [_ modal]
-  {:close-modal-fx-nav2 modal})
-
-(defn navigate-from-shell-stack [go-to-view-id id db]
-  (reset! parent-stack go-to-view-id)
-  {:navigate-to-fx-nav2 [go-to-view-id id]
-   :db (assoc-in db [:navigation2/navigation2-stacks id] {:type  go-to-view-id
-                                                          :id    id
-                                                          :clock (datetime/timestamp)})})
-
-(defn navigate-from-switcher [go-to-view-id id db from-home?]
-  (reset! parent-stack go-to-view-id)
-  {:navigate-from-switcher-fx [go-to-view-id id from-home?]
-   :db (assoc-in db [:navigation2/navigation2-stacks id] {:type  go-to-view-id
-                                                          :id    id
-                                                          :clock (datetime/timestamp)})})
-
-(fx/defn navigate-to-nav2
-  {:events [:navigate-to-nav2]}
-  [{:keys [db]} go-to-view-id id _ from-switcher?]
-  (let [view-id     (:view-id db)
-        from-home?  (= view-id :chat-stack)]
-    (if from-switcher?
-      (navigate-from-switcher go-to-view-id id db from-home?)
-      (if from-home?
-        (navigate-from-shell-stack go-to-view-id id db)
-        ;; TODO(parvesh) - new stacks created from other screens should be stacked on current stack, instead of creating new entry
-        (navigate-from-shell-stack go-to-view-id id db)))))
-
-(fx/defn change-root-status-bar-style
-  {:events [:change-root-status-bar-style]}
-  [_ style]
-  {:change-root-status-bar-style-fx style})
-

src/status_im/navigation2/core.cljs

@@ -1,85 +0,0 @@
-(ns status-im.navigation2.core
-  (:require [re-frame.core :as re-frame]
-            [quo2.foundations.colors :as colors]
-            [status-im.ui.screens.views :as views]
-            [status-im.navigation2.roots :as roots]
-            [status-im.utils.platform :as platform]
-            [status-im.navigation.roots :as nav-roots]
-            [status-im.navigation2.utils :as nav2-utils]
-            ["react-native-navigation" :refer (Navigation)]))
-
-(def tab-key-idx {:home        0
-                  :communities 1
-                  :wallet      2
-                  :browser     3})
-
-(defn change-root-status-bar-style [style]
-  (.mergeOptions Navigation
-                 "shell-stack"
-                 (clj->js {:statusBar {:style style}})))
-
-;; TODO (parvesh) - improve open-modal and close-modal
-(defn open-modal [comp]
-  (.showModal Navigation
-              (clj->js {:stack {:children
-                                [{:component
-                                  {:name      comp
-                                   :id        comp
-                                   :options   {:topBar {:visible false}}}}]}})))
-
-(defn close-modal [_])
-
-(defn close-all-modals []
-  (.dismissAllModals Navigation))
-
-(defn get-id [comp id]
-  (str comp "-" id))
-
-(defn get-options [show-topbar? options]
-  (merge options
-         (roots/status-bar-options)
-         (when platform/android?
-           {:navigationBar {:backgroundColor (colors/theme-colors colors/white colors/neutral-90)}})
-         (if show-topbar?
-           (nav-roots/merge-top-bar (nav-roots/topbar-options) options)
-           {:topBar {:visible false}})))
-
-(defn change-stack-root [[comp _]]
-  (let [{:keys [options]} (get views/screens comp)]
-    (.setStackRoot Navigation
-                   (name comp)
-                   (clj->js {:stack {:id       comp
-                                     :children [{:component {:id      comp
-                                                             :name    comp
-                                                             :options (get-options false options)}}]}}))))
-
-(defn navigate [[comp _]]
-  (let [{:keys [options]} (get views/screens comp)]
-    (reset! nav2-utils/container-stack-view-id comp)
-    (.push Navigation
-           "shell-stack"
-           (clj->js {:stack {:id       comp
-                             :children [{:component {:id      comp
-                                                     :name    comp
-                                                     :options (get-options false options)}}]}}))))
-
-(defn navigate-from-switcher [[comp id from-home?]]
-  (if from-home?
-    (navigate [comp id])
-    (change-stack-root [comp id])))
-
-(re-frame/reg-fx
- :init-root-fx-nav2
- (fn [new-root-id]
-   (reset! nav2-utils/container-stack-view-id new-root-id)
-   (.setRoot Navigation (clj->js (get (roots/roots) new-root-id)))))
-
-(re-frame/reg-fx :open-modal-fx-nav2 open-modal)
-
-(re-frame/reg-fx :close-modal-fx-nav2 close-modal)
-
-(re-frame/reg-fx :navigate-to-fx-nav2 navigate)
-
-(re-frame/reg-fx :navigate-from-switcher-fx navigate-from-switcher)
-
-(re-frame/reg-fx :change-root-status-bar-style-fx change-root-status-bar-style)

src/status_im/navigation2/roots.cljs

@@ -1,20 +0,0 @@
-(ns status-im.navigation2.roots
-  (:require [quo2.foundations.colors :as colors]
-            [status-im.utils.platform :as platform]))
-
-(defn status-bar-options []
-  (if platform/android?
-    {:navigationBar {:backgroundColor colors/neutral-100}
-     :statusBar     {:backgroundColor :transparent
-                     :style           :light
-                     :drawBehind      true}}
-    {:statusBar {:style :light}}))
-
-(defn roots []
-  {:shell-stack
-   {:root
-    {:stack {:id       :shell-stack
-             :children [{:component {:name    :chat-stack
-                                     :id      :chat-stack
-                                     :options (merge (status-bar-options)
-                                                     {:topBar {:visible false}})}}]}}}})

src/status_im/navigation2/screens.cljs

@@ -1,22 +0,0 @@
-(ns status-im.navigation2.screens
-  (:require [status-im.ui2.screens.chat.view :as chat]
-            [status-im.switcher.shell-stack :as shell-stack]
-            [status-im.ui2.screens.communities.discover-communities :as discover-communities]))
-
-
-;; We have to use the home screen name :chat-stack for now, for compatibility with navigation.cljs
-
-
-(def screens [{:name      :chat-stack                       ;; TODO(parvesh) - rename to shell-stack
-               :insets    {:top false}
-               :component shell-stack/shell-stack}
-              {:name      :discover-communities
-               ;;TODO animated-header scroll behaviours
-               :options   {:topBar {:visible false}}
-               :component discover-communities/communities}])
-
-;; These screens will overwrite navigation/screens.cljs screens on enabling new UI toggle
-(def screen-overwrites
-  [{:name      :chat
-    :options   {:topBar {:visible false}}
-    :component chat/chat}])

src/status_im/navigation2/utils.cljs

@@ -1,3 +0,0 @@
-(ns status-im.navigation2.utils)
-
-(defonce container-stack-view-id (atom nil))

src/status_im/network/core.cljs

@@ -5,7 +5,7 @@
             [status-im.ethereum.json-rpc :as json-rpc]
             [status-im.i18n.i18n :as i18n]
             [status-im.node.core :as node]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.utils.http :as http]
             [status-im.utils.types :as types]))

src/status_im/network/net_info.cljs

@@ -51,7 +51,7 @@
                                             (js->clj % :keywordize-keys true)]))))
 
 (re-frame/reg-fx
- ::listen-to-network-info
+ :network/listen-to-network-info
  (fn []
    (add-net-info-listener)))
 

src/status_im/node/core.cljs

@@ -43,7 +43,7 @@
   "returns discovery v5 topic derived from genesis of the provided network"
   [network]
   (let [les-discovery-identifier "LES2@"
-        hash-prefix (get-network-genesis-hash-prefix network)]
+        hash-prefix              (get-network-genesis-hash-prefix network)]
     (when hash-prefix
       (str les-discovery-identifier hash-prefix))))
 
@@ -92,13 +92,13 @@
 
 (defn- get-multiaccount-node-config
   [{:keys [multiaccount :networks/networks :networks/current-network]
-    :as db}]
-  (let [wakuv2-config (get multiaccount :wakuv2-config {})
-        current-fleet-key (current-fleet-key db)
-        current-fleet (get-current-fleet db)
-        wakuv2-enabled (boolean (:waku current-fleet))
-        wakuv2-nodes (into (vals (:waku current-fleet)) (vals (get wakuv2-config :CustomNodes)))
-        rendezvous-nodes (pick-nodes 3 (vals (:rendezvous current-fleet)))
+    :as   db}]
+  (let [wakuv2-config        (get multiaccount :wakuv2-config {})
+        current-fleet-key    (current-fleet-key db)
+        current-fleet        (get-current-fleet db)
+        wakuv2-enabled       (boolean (:waku current-fleet))
+        waku-nodes           (:waku-nodes current-fleet)
+        rendezvous-nodes     (pick-nodes 3 (vals (:rendezvous current-fleet)))
         {:keys [installation-id log-level
                 waku-bloom-filter-mode
                 custom-bootnodes custom-bootnodes-enabled?]} multiaccount
@@ -111,10 +111,10 @@
       (get-login-node-config)
 
       current-fleet
-      (assoc :NoDiscovery   wakuv2-enabled
-             :Rendezvous    (if wakuv2-enabled false (boolean (seq rendezvous-nodes)))
-             :ClusterConfig {:Enabled true
-                             :Fleet              (name current-fleet-key)
+      (assoc :NoDiscovery wakuv2-enabled
+             :Rendezvous (if wakuv2-enabled false (boolean (seq rendezvous-nodes)))
+             :ClusterConfig {:Enabled         true
+                             :Fleet           (name current-fleet-key)
                              :BootNodes
                              (if wakuv2-enabled [] (pick-nodes 4 (vals (:boot current-fleet))))
                              :TrustedMailServers
@@ -124,9 +124,8 @@
                                  (into (pick-nodes 2
                                                    (vals (:whisper current-fleet)))
                                        (vals (:static current-fleet))))
-                             :RelayNodes wakuv2-nodes
-                             :StoreNodes wakuv2-nodes
-                             :RendezvousNodes    (if wakuv2-enabled [] rendezvous-nodes)})
+                             :RendezvousNodes (if wakuv2-enabled [] rendezvous-nodes)
+                             :WakuNodes       (or waku-nodes [])})
 
       :always
       (assoc :LocalNotificationsConfig {:Enabled true}
@@ -135,10 +134,10 @@
              :MailserversConfig {:Enabled true}
              :EnableNTPSync true
              :WakuConfig
-             {:Enabled true
+             {:Enabled         true
               :BloomFilterMode waku-bloom-filter-mode
-              :LightClient true
-              :MinimumPoW 0.000001}
+              :LightClient     true
+              :MinimumPoW      0.000001}
              :WakuV2Config (assoc wakuv2-config :Enabled wakuv2-enabled :Host "0.0.0.0")
              :ShhextConfig
              {:BackupDisabledDataDir      (utils.platform/no-backup-directory)
@@ -174,8 +173,8 @@
 app-db"
   {:events [::save-new-config]}
   [{:keys [db]} config {:keys [on-success]}]
-  {::json-rpc/call [{:method "settings_saveSetting"
-                     :params [:node-config config]
+  {::json-rpc/call [{:method     "settings_saveSetting"
+                     :params     [:node-config config]
                      :on-success on-success}]})
 
 (fx/defn prepare-new-config

src/status_im/pairing/core.cljs

@@ -2,7 +2,7 @@
   (:require [re-frame.core :as re-frame]
             [status-im.ethereum.json-rpc :as json-rpc]
             [status-im.i18n.i18n :as i18n]
-            [status-im.navigation :as navigation]
+            [status-im2.navigation.events :as navigation]
             [status-im.utils.config :as config]
             [status-im.utils.fx :as fx]
             [status-im.utils.platform :as utils.platform]