Merge branch 'develop' into 17116

.carve_ignore

@@ -95,6 +95,7 @@ react-native.fs/unlink
 react-native.fs/file-exists?
 status-im.ui.components.colors/white
 status-im.ui.components.colors/black
+status-im.transport.core-test/messages
 status-im.ui.components.core/animated-header
 status-im.ui.components.core/safe-area-provider
 status-im.ui.components.core/safe-area-consumer

.clj-kondo/nubank/matcher-combinators/config.edn

@@ -1,4 +0,0 @@
-{:linters
- {:unresolved-symbol
-  {:exclude [(cljs.test/is [match? thrown-match?])
-             (clojure.test/is [match? thrown-match?])]}}}

.zprintrc

@@ -32,7 +32,6 @@
   "letsubs"         :binding
   "with-let"        "let"
   "reg-event-fx"    :arg1-pair
-  "reg-fx"          :arg1-pair
   "testing"         :arg1-body
   "deftest-sub"     :arg1-body
   "wait-for"        :arg1-body

android/app/src/main/java/im/status/ethereum/StatusOkHttpClientFactory.java

@@ -27,23 +27,18 @@ class StatusOkHttpClientFactory implements OkHttpClientFactory {
       X509Certificate cert = null;
       HandshakeCertificates clientCertificates;
       String certPem = "";
-      // Get TLS PEM certificate from status-go
-      try {
-         // induce half second sleep because sometimes a cert is not immediately available
-         // TODO : remove sleep if App no longer crashes on Android 10 devices with
-         // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-         Thread.sleep(500);
-         certPem = getCertificatePem();
-      } catch(Exception e) {
-          Log.e(TAG, "Could not getImageTLSCert",e);
-      }
 
-      if (certPem.isEmpty()) {
-          Log.e(TAG, "Certificate is empty, cannot create OkHttpClient without a valid certificate");
-          return null;
-      }
-
-      // Convert PEM certificate string to X509Certificate object
+    // Get TLS PEM certificate from status-go
+    try {
+        // induce half second sleep because sometimes a cert is not immediately available
+        // TODO : remove sleep if App no longer crashes on Android 10 devices with
+        // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
+        Thread.sleep(500);
+        certPem = StatusPackage.getImageTLSCert();
+    } catch(Exception e) {
+        Log.e(TAG, "Could not getImageTLSCert",e);
+    }
+    // Convert PEM certificate string to X509Certificate object
     try {
       // induce half second sleep because sometimes a cert is not immediately available
       // TODO : remove sleep if App no longer crashes on Android 10 devices
@@ -79,17 +74,4 @@ class StatusOkHttpClientFactory implements OkHttpClientFactory {
       return null;
     }
   }
-    private String getCertificatePem() {
-        try {
-            String certPem = StatusPackage.getImageTLSCert();
-            if (certPem == null || certPem.trim().isEmpty()) {
-                Log.e(TAG, "Certificate PEM string is null or empty");
-                return "";
-            }
-            return certPem;
-        } catch (Exception e) {
-            Log.e(TAG, "Could not getImageTLSCert", e);
-            return "";
-        }
-    }
 }

doc/new-guidelines.md

@@ -641,26 +641,6 @@ keywords and concatenating them into a single string.
 ```
 
 ### Tests
-#### Prefer `match?` over `=` when comparing data structures
-
-Prefer the `match?` directive over `=` when comparing data structures, otherwise
-when the check fails the output can be too difficult to read. `match?` is
-defined by library https://github.com/nubank/matcher-combinators.
-
-```clojure
-;; bad
-(deftest some-test
-  (let [expected {...}
-        actual {...}]
-    (is (= expected actual))))
-
-;; good
-(deftest some-test
-  (let [expected {...}
-        actual {...}]
-    (is (match? expected actual))))
-```
-
 #### Subscription tests
 
 Test [layer-3 subscriptions](https://day8.github.io/re-frame/subscriptions/) by

nix/deps/clojure/deps.json

@@ -602,15 +602,6 @@
     }
   },
 
-  {
-    "path": "nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "4c94bd510f0c18a20191e46dd6becedebc640bbd",
-      "sha256": "0wpla2hx0s4mda58ndyd8938zmnz1gyhgfr6pzfphy27xfbvsssl"
-    }
-  },
-
   {
     "path": "org/apache/ant/ant/1.10.11/ant-1.10.11",
     "host": "https://repo1.maven.org/maven2",
@@ -755,15 +746,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "aa95d25ea98bfe1152ea540f6e58a303c8cacc86",
-      "sha256": "0qvdsr5ryjmrpz622ivpyq5aayn42y4bk531vbasyj2yj7gcg35h"
-    }
-  },
-
   {
     "path": "org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218",
     "host": "https://repo1.maven.org/maven2",

nix/deps/clojure/deps.list

@@ -65,7 +65,6 @@ net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
 net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
 nrepl/bencode/1.1.0/bencode-1.1.0.jar
 nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
-nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.jar
 org/apache/ant/ant/1.10.11/ant-1.10.11.jar
 org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
 org/babashka/sci/0.7.38/sci-0.7.38.jar
@@ -82,7 +81,6 @@ org/clojure/data.json/2.4.0/data.json-2.4.0.jar
 org/clojure/data.priority-map/1.1.0/data.priority-map-1.1.0.jar
 org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
 org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
-org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0.jar
 org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.jar
 org/clojure/test.check/1.1.1/test.check-1.1.1.jar
 org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0.jar

nix/deps/nodejs-patched/default.nix

@@ -14,7 +14,6 @@ stdenv.mkDerivation {
     "patchJavaPhase"
     "patchReactNativePhase"
     "patchPodPhase"
-    "patchGlogPhase"
     "installPhase"
   ];
 
@@ -99,14 +98,6 @@ stdenv.mkDerivation {
           '[RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];'
   '';
 
-  # Fix pod issue after upgrading to MacOS Sonoma and Xcode 15
-  # https://github.com/status-im/status-mobile/issues/17682
-  patchGlogPhase = ''
-    substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh \
-    --replace 'export CC="' '#export CC="' \
-    --replace 'export CXX="' '#export CXX="'
-  '';
-
   # The ELF types are incompatible with the host platform, so let's not even try
   # TODO: Use Android NDK to strip binaries manually
   dontPatchELF = true;

nix/overlay.nix

@@ -73,7 +73,6 @@ in {
     allowHigher = true;
   };
   go = super.go_1_19;
-  clang = super.clang_15;
   buildGoPackage = super.buildGo119Package;
   buildGoModule = super.buildGo119Module;
   gomobile = (super.gomobile.overrideAttrs (old: {

package.json

@@ -94,7 +94,7 @@
     "process": "0.11.10",
     "react-test-renderer": "18.0.0",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
-    "shadow-cljs": "2.26.2"
+    "shadow-cljs": "2.25.0"
   },
   "binary": {
     "module_name": "status_nodejs_addon",

shadow-cljs.edn

@@ -12,12 +12,10 @@
                 [metosin/malli "0.13.0"]
 
                 ;; Dev dependencies
-                [refactor-nrepl "3.9.1"]
-                [cider/cider-nrepl "0.31.0"]
+                [refactor-nrepl "2.5.0"]
+                [cider/cider-nrepl "0.25.3"]
                 [cider/piggieback "0.4.1"]
-                [org.slf4j/slf4j-nop "2.0.9"]
                 [re-frisk-remote "1.6.0"]
-                [nubank/matcher-combinators "3.8.8"]
 
                 ;; Use the same version specified in the Nix dependency.
                 [clj-kondo/clj-kondo "2023.09.07"]

src/native_module/core.cljs

@@ -40,6 +40,23 @@
                               config
                               #(callback (types/json->clj %))))
 
+(defn save-account-and-login
+  "NOTE: beware, the password has to be sha3 hashed"
+  [key-uid multiaccount-data hashed-password settings config accounts-data]
+  (log/debug "[native-module] save-account-and-login"
+             "multiaccount-data"
+             multiaccount-data)
+  (clear-web-data)
+  (init-keystore
+   key-uid
+   #(.saveAccountAndLogin
+     ^js (status)
+     multiaccount-data
+     hashed-password
+     settings
+     config
+     accounts-data)))
+
 (defn save-multiaccount-and-login-with-keycard
   "NOTE: chat-key is a whisper private key sent from keycard"
   [key-uid multiaccount-data password settings config accounts-data chat-key]

src/quo/components/inputs/address_input/view.cljs

@@ -61,10 +61,14 @@
         value    (reagent/atom "")
         focused? (atom false)]
     (fn [{:keys [scanned-value theme blur? on-change-text on-blur on-focus on-clear on-scan on-detect-ens
-                 on-detect-address address-regex valid-ens-or-address?]}]
+                 on-detect-address
+                 ens-regex address-regex
+                 valid-ens-or-address?]}]
       (let [on-change              (fn [text]
                                      (when (not= @value text)
-                                       (let [address? (when address-regex
+                                       (let [ens?     (when ens-regex
+                                                        (boolean (re-matches ens-regex text)))
+                                             address? (when address-regex
                                                         (boolean (re-matches address-regex text)))]
                                          (if (> (count text) 0)
                                            (reset! status :typing)
@@ -72,9 +76,9 @@
                                          (reset! value text)
                                          (when on-change-text
                                            (on-change-text text))
-                                         (when (and on-detect-ens (> (count text) 0))
+                                         (when (and ens? on-detect-ens)
                                            (reset! status :loading)
-                                           (on-detect-ens text #(reset! status :typing)))
+                                           (on-detect-ens text))
                                          (when (and address? on-detect-address)
                                            (reset! status :loading)
                                            (on-detect-address text)))))

src/quo/components/status_link_previews/community/component_spec.cljs

@@ -0,0 +1,35 @@
+(ns quo.components.status-link-previews.community.component-spec
+  (:require
+    [quo.components.status-link-previews.community.view :as view]
+    [test-helpers.component :as h]))
+
+(def props
+  {:title                "Some title"
+   :description          "Some description"
+   :link                 "status.im"
+   :logo                 "data:image/png,logo-x"
+   :thumbnail            "data:image/png,whatever"
+   :member-count         20
+   :active-members-count 20})
+
+(h/describe "Status link previews - Community"
+  (h/test "default render"
+    (h/render [view/view])
+    (h/is-truthy (h/query-by-label-text :link-preview))
+    (h/is-null (h/query-by-label-text :button-enable-preview)))
+
+  (h/test "renders with most common props"
+    (h/render [view/view props])
+    (h/is-truthy (h/query-by-text (:title props)))
+    (h/is-truthy (h/query-by-text (:description props)))
+    (h/is-truthy (h/query-by-text (:link props)))
+    (h/is-truthy (h/query-by-label-text :logo))
+    (h/is-truthy (h/query-by-label-text :thumbnail)))
+
+  (h/test "does not render thumbnail if prop is not present"
+    (h/render [view/view (dissoc props :thumbnail)])
+    (h/is-null (h/query-by-label-text :thumbnail)))
+
+  (h/test "does not render logo if prop is not present"
+    (h/render [view/view (dissoc props :logo)])
+    (h/is-null (h/query-by-label-text :logo))))

src/quo/components/status_link_previews/community/style.cljs

@@ -0,0 +1,51 @@
+(ns quo.components.status-link-previews.community.style
+  (:require [quo.foundations.colors :as colors]))
+
+(defn loading-circle
+  [theme]
+  {:background-color (colors/theme-colors colors/neutral-5 colors/neutral-80 theme)
+   :margin-right     4
+   :width            16
+   :height           16
+   :border-radius    16})
+
+(defn loading-stat
+  [theme]
+  {:background-color (colors/theme-colors colors/neutral-5 colors/neutral-80 theme)
+   :margin-right     4
+   :width            32
+   :height           8
+   :border-radius    16})
+
+(def loading-stat-container {:flex-direction :row :align-items :center :margin-right 12})
+
+(defn loading-first-line-bar
+  [theme]
+  {:style {:background-color (colors/theme-colors colors/neutral-5 colors/neutral-80 theme)
+           :width            145
+           :height           16
+           :border-radius    6}})
+
+(defn loading-second-line-bar
+  [theme]
+  {:background-color (colors/theme-colors colors/neutral-5 colors/neutral-80 theme)
+   :width            112
+   :height           8
+   :border-radius    6
+   :margin-bottom    17})
+
+(defn loading-thumbnail-box
+  [theme]
+  {:background-color (colors/theme-colors colors/neutral-5 colors/neutral-80 theme)
+   :margin-right     4
+   :width            271
+   :height           139
+   :border-radius    16})
+
+(def thumbnail
+  {:width         "100%"
+   :height        139
+   :margin-top    8
+   :border-radius 12})
+
+(def row-spacing {:flex-direction :row :margin-bottom 12})

src/quo/components/status_link_previews/community/view.cljs

@@ -0,0 +1,101 @@
+(ns quo.components.status-link-previews.community.view
+  (:require
+    [quo.components.community.community-stat.view :as community-stat]
+    [quo.components.links.link-preview.style :as style]
+    [quo.components.markdown.text :as text]
+    [quo.components.status-link-previews.community.style :as status-link-previews-style]
+    [quo.theme :as theme]
+    [react-native.core :as rn]))
+
+(defn- description-comp
+  [description members-count active-members-count]
+  [rn/view
+   [text/text
+    {:size                :paragraph-2
+     :number-of-lines     3
+     :accessibility-label :description} description]
+   [rn/view {:flex-direction :row :margin-top 12}
+    [community-stat/view
+     {:value               members-count
+      :icon                :i/members
+      :accessibility-label :members-count
+      :style               {:margin-right 12}}]
+    [community-stat/view
+     {:value               (or active-members-count 0)
+      :icon                :i/active-members
+      :accessibility-label :active-members-count}]]])
+
+(defn- title-comp
+  [title]
+  [text/text
+   {:size                :paragraph-1
+    :number-of-lines     1
+    :weight              :semi-bold
+    :style               style/title
+    :accessibility-label :title}
+   title])
+
+(defn- thumbnail-comp
+  [thumbnail]
+  [rn/image
+   {:style               status-link-previews-style/thumbnail
+    :source              (if (string? thumbnail)
+                           {:uri thumbnail}
+                           thumbnail)
+    :accessibility-label :thumbnail}])
+
+(defn- logo-comp
+  [logo]
+  [rn/image
+   {:accessibility-label :logo
+    :source              (if (string? logo)
+                           {:uri logo}
+                           logo)
+    :style               style/logo}])
+
+(defn- stat-loading
+  [theme]
+  [rn/view {:style status-link-previews-style/loading-stat-container}
+   [rn/view {:style (status-link-previews-style/loading-circle theme)}]
+   [rn/view {:style (status-link-previews-style/loading-stat theme)}]])
+
+(defn- loading-view
+  [theme]
+  [rn/view
+   {:accessibility-label :loading}
+   [rn/view {:style status-link-previews-style/row-spacing}
+    [rn/view (status-link-previews-style/loading-circle theme)]
+    [rn/view (status-link-previews-style/loading-first-line-bar theme)]]
+   [rn/view {:style (status-link-previews-style/loading-second-line-bar theme)}]
+   [rn/view status-link-previews-style/row-spacing
+    [stat-loading theme]
+    [stat-loading theme]]
+   [rn/view {:style (status-link-previews-style/loading-thumbnail-box theme)}]])
+
+(defn f-internal-view
+  [{:keys [title description loading? thumbnail-size icon banner members-count active-members-count
+           theme on-press]
+    :or   {loading? false}}]
+  [rn/touchable-opacity
+   {:style               (merge (style/container (not loading?))
+                                {:width  295
+                                 :height 245})
+    :accessibility-label :link-preview
+    :on-press            on-press}
+   (if loading?
+     [loading-view theme]
+     [:<>
+      [rn/view {:style style/header-container}
+       (when icon
+         [logo-comp icon])
+       [title-comp title]]
+      (when description
+        [description-comp description members-count active-members-count])
+      (when banner
+        [thumbnail-comp banner thumbnail-size])])])
+
+(defn- internal-view
+  [props]
+  [:f> f-internal-view props])
+
+(def view (theme/with-theme internal-view))

src/quo/components/tags/tag.cljs

@@ -107,4 +107,3 @@
       [tag-resources size type resource icon-color label text-color labelled?]]]))
 
 (def tag (quo.theme/with-theme tag-internal))
-

src/quo/components/wallet/confirmation_progress/component_spec.cljs

@@ -1,99 +0,0 @@
-(ns quo.components.wallet.confirmation-progress.component-spec
-  (:require [quo.core :as quo]
-            [reagent.core :as reagent]
-            [test-helpers.component :as h]))
-
-(defn- get-test-data
-  [{:keys [state network]
-    :or   {state :pending network :mainnet}}]
-  {:counter             (reagent/atom 0)
-   :total-box           85
-   :progress-value      "10"
-   :network             network
-   :state               state
-   :customization-color :blue})
-
-(h/describe "Confirmation Progress"
-  (h/test "component renders when state is sending and network is optimism"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :sending
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is confirmed and network is optimism"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :confirmed
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is finalising and network is optimism"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :finalising
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is finalized and network is optimism"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :finalized
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is error and network is optimism"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :error
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is sending and network is arbitrum"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :sending
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is confirmed and network is arbitrum"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :confirmed
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is finalising and network is arbitrum"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :finalising
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is finalized and network is arbitrum"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :finalized
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is error and network is arbitrum"
-    (h/render [quo/confirmation-propgress
-               (get-test-data {:state   :error
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :progress-box)))
-
-  (h/test "component renders when state is pending and network is mainnet"
-    (h/render [quo/confirmation-propgress (get-test-data {})])
-    (h/is-truthy (h/get-by-label-text :mainnet-progress-box)))
-
-  (h/test "component renders when state is sending and network is mainnet"
-    (h/render [quo/confirmation-propgress (get-test-data {:state :sending})])
-    (h/is-truthy (h/get-by-label-text :mainnet-progress-box)))
-
-  (h/test "component renders when state is confirmed and network is mainnet"
-    (h/render [quo/confirmation-propgress (get-test-data {:state :confirmed})])
-    (h/is-truthy (h/get-by-label-text :mainnet-progress-box)))
-
-  (h/test "component renders when state is finalising and network is mainnet"
-    (h/render [quo/confirmation-propgress (get-test-data {:state :finalising})])
-    (h/is-truthy (h/get-by-label-text :mainnet-progress-box)))
-
-  (h/test "component renders when state is finalized and network is mainnet"
-    (h/render [quo/confirmation-propgress (get-test-data {:state :finalized})])
-    (h/is-truthy (h/get-by-label-text :mainnet-progress-box)))
-
-  (h/test "component renders when state is error and network is mainnet"
-    (h/render [quo/confirmation-propgress (get-test-data {:state :error})])
-    (h/is-truthy (h/get-by-label-text :mainnet-progress-box))))

src/quo/components/wallet/confirmation_progress/style.cljs

@@ -1,9 +0,0 @@
-(ns quo.components.wallet.confirmation-progress.style)
-
-(def progress-box-container
-  {:flex-direction     :row
-   :align-items        :center
-   :padding-horizontal 12
-   :padding-bottom     10
-   :padding-top        4
-   :flex-wrap          :wrap})

src/quo/components/wallet/confirmation_progress/view.cljs

@@ -1,69 +0,0 @@
-(ns quo.components.wallet.confirmation-progress.view
-  (:require [quo.components.wallet.confirmation-progress.style :as style]
-            [quo.components.wallet.progress-bar.view :as progress-box]
-            [quo.theme :as quo.theme]
-            [react-native.core :as rn]))
-
-(def ^:private max-progress 100)
-(def ^:private min-progress 0)
-
-(defn- calculate-box-state
-  [state counter index]
-  (cond
-    (and (= state :sending) (>= counter index) (< index 3))                 :confirmed
-    (and (= state :confirmed) (>= counter index) (< index 5))               :confirmed
-    (and (= state :finalising) (>= counter index) (< index 5))              :confirmed
-    (and (= state :finalising) (>= counter index) (> index 4) (< index 20)) :finalized
-    (and (= state :finalized) (>= counter index) (< index 5))               :confirmed
-    (and (= state :finalized) (>= counter index) (> index 4))               :finalized
-    (and (= state :error) (>= counter index) (< index 2))                   :error
-    :else                                                                   :pending))
-
-(defn- calculate-box-state-sidenet
-  [state]
-  (case state
-    :error                              :error
-    (:confirmed :finalising :finalized) :finalized
-    :pending))
-
-(defn- calculate-progressed-value
-  [state progress-value]
-  (case state
-    :finalising progress-value
-    :finalized  max-progress
-    min-progress))
-
-(defn- progress-boxes-mainnet
-  [{:keys [state counter total-box]}]
-  [rn/view
-   {:accessibility-label :mainnet-progress-box
-    :style               style/progress-box-container}
-   (let [numbers (range 1 total-box)]
-     (doall (for [n numbers]
-              [progress-box/view
-               {:state               (calculate-box-state state counter n)
-                :customization-color :blue
-                :key                 n}])))])
-
-(defn- progress-boxes-sidenet
-  [{:keys [state progress-value]}]
-  [rn/view
-   {:accessibility-label :progress-box
-    :style               style/progress-box-container}
-   [progress-box/view
-    {:state               (calculate-box-state-sidenet state)
-     :customization-color :success}]
-   [progress-box/view
-    {:state               (calculate-box-state-sidenet state)
-     :full-width?         true
-     :progressed-value    (calculate-progressed-value state progress-value)
-     :customization-color :blue}]])
-
-(defn- view-internal
-  [{:keys [network] :as props}]
-  (case network
-    :mainnet              [progress-boxes-mainnet props]
-    (:arbitrum :optimism) [progress-boxes-sidenet props]
-    nil))
-
-(def view (quo.theme/with-theme view-internal))

src/quo/components/wallet/progress_bar/component_spec.cljs

@@ -39,7 +39,7 @@
                     :width           8
                     :borderRadius    3
                     :borderColor     colors/neutral-80-opa-5
-                    :backgroundColor (colors/resolve-color (:customization-color props) theme)})))
+                    :backgroundColor (colors/custom-color (:customization-color props) 50)})))
 
   (h/test "finalized state with customtization-color blue in dark mode"
     (let [theme :dark
@@ -51,7 +51,7 @@
                     :width           8
                     :borderRadius    3
                     :borderColor     colors/neutral-80-opa-5
-                    :backgroundColor (colors/resolve-color (:customization-color props) theme)})))
+                    :backgroundColor (colors/custom-color (:customization-color props) 60)})))
 
   (h/test "finalized state with customtization-color army in light mode"
     (let [theme :light
@@ -63,7 +63,7 @@
                     :width           8
                     :borderRadius    3
                     :borderColor     colors/neutral-80-opa-5
-                    :backgroundColor (colors/resolve-color (:customization-color props) theme)})))
+                    :backgroundColor (colors/custom-color (:customization-color props) 50)})))
 
   (h/test "confirmed state in light mode"
     (let [theme :light
@@ -75,7 +75,7 @@
                     :width           8
                     :borderRadius    3
                     :borderColor     colors/neutral-80-opa-5
-                    :backgroundColor (colors/resolve-color :success theme)})))
+                    :backgroundColor colors/success-50})))
 
   (h/test "confirmed state in dark mode"
     (let [theme :dark
@@ -99,7 +99,7 @@
                     :width           8
                     :borderRadius    3
                     :borderColor     colors/neutral-80-opa-5
-                    :backgroundColor (colors/resolve-color :danger theme)})))
+                    :backgroundColor colors/danger-50})))
 
   (h/test "error state in dark mode"
     (let [theme :dark
@@ -111,4 +111,4 @@
                     :width           8
                     :borderRadius    3
                     :borderColor     colors/white-opa-5
-                    :backgroundColor (colors/resolve-color :danger theme)}))))
+                    :backgroundColor colors/danger-60}))))

src/quo/components/wallet/progress_bar/style.cljs

@@ -3,48 +3,31 @@
     [quo.foundations.colors :as colors]))
 
 (defn- border-and-background-color
-  [customization-color theme]
+  [customization-color]
   {:light {:pending   {:border-color     colors/neutral-80-opa-5
                        :background-color colors/neutral-5}
            :confirmed {:border-color     colors/neutral-80-opa-5
-                       :background-color (colors/resolve-color :success theme)}
+                       :background-color (colors/custom-color :success 50)}
            :finalized {:border-color     colors/neutral-80-opa-5
-                       :background-color (colors/resolve-color customization-color theme)}
+                       :background-color (colors/custom-color customization-color 50)}
            :error     {:border-color     colors/neutral-80-opa-5
-                       :background-color (colors/resolve-color :danger theme)}}
+                       :background-color (colors/custom-color :danger 50)}}
    :dark  {:pending   {:border-color     colors/neutral-70
                        :background-color colors/neutral-80}
            :confirmed {:border-color     colors/white-opa-5
-                       :background-color (colors/resolve-color :success theme)}
+                       :background-color (colors/custom-color :success 60)}
            :finalized {:border-color     colors/neutral-80-opa-5
-                       :background-color (colors/resolve-color customization-color theme)}
+                       :background-color (colors/custom-color customization-color 60)}
            :error     {:border-color     colors/white-opa-5
-                       :background-color (colors/resolve-color :danger theme)}}})
-
-(def max-value 100)
+                       :background-color (colors/custom-color :danger 60)}}})
 
 (defn root-container
-  [{:keys [customization-color state theme full-width?]}]
-  (let [{:keys [background-color border-color]} (get-in (border-and-background-color customization-color
-                                                                                     theme)
-                                                        [theme (if full-width? :pending state)])]
-    {:height            12
-     :flex              (when full-width? 1)
-     :width             (when (not full-width?) 8)
-     :border-radius     3
-     :border-width      1
-     :border-color      border-color
-     :background-color  background-color
-     :margin-horizontal 1
-     :margin-vertical   2}))
-
-(defn progressed-bar
-  [{:keys [customization-color state theme progressed-value]}]
-  (let [{:keys [background-color]} (get-in (border-and-background-color customization-color theme)
-                                           [theme state])
-        progress                   (if (> progressed-value max-value) max-value progressed-value)]
+  [{:keys [customization-color state theme]}]
+  (let [{:keys [background-color border-color]} (get-in (border-and-background-color customization-color)
+                                                        [theme state])]
     {:height           12
-     :margin-top       -1
-     :width            (str progress "%")
+     :width            8
      :border-radius    3
+     :border-width     1
+     :border-color     border-color
      :background-color background-color}))

src/quo/components/wallet/progress_bar/view.cljs

@@ -5,11 +5,9 @@
     [react-native.core :as rn]))
 
 (defn- view-internal
-  [{:keys [full-width?] :as props}]
+  [props]
   [rn/view
    {:accessibility-label :progress-bar
-    :style               (style/root-container props)}
-   (when full-width?
-     [rn/view {:style (style/progressed-bar props)}])])
+    :style               (style/root-container props)}])
 
 (def view (quo.theme/with-theme view-internal))

src/quo/components/wallet/summary_info/style.cljs

@@ -4,7 +4,7 @@
 
 (defn container
   [networks? theme]
-  {:width         "100%"
+  {:width         335
    :height        (if networks? 90 56)
    :border-radius 16
    :border-width  1

src/quo/components/wallet/transaction_progress/component_spec.cljs

@@ -1,200 +0,0 @@
-(ns quo.components.wallet.transaction-progress.component-spec
-  (:require [quo.core :as quo]
-            [reagent.core :as reagent]
-            [test-helpers.component :as h]))
-
-(defn- get-test-data
-  [{:keys [state network]
-    :or   {state :pending network :mainnet}}]
-  {:title               "Title"
-   :tag-name            "Doodle"
-   :tag-number          "120"
-   :network             network
-   :customization-color :blue
-   :networks            [{:network      :mainnet
-                          :state        state
-                          :counter      (reagent/atom 0)
-                          :total-box    85
-                          :progress     30
-                          :epoch-number "123"}
-                         {:network      :optimism
-                          :state        state
-                          :progress     "50"
-                          :epoch-number "123"}
-                         {:network      :arbitrum
-                          :state        state
-                          :progress     "30"
-                          :epoch-number "123"}]
-   :on-press            (fn []
-                          (js/alert "Transaction progress item pressed"))})
-
-(h/describe "Transaction Progress"
-  (h/test "component renders without props"
-    (h/render [quo/transaction-progress])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is pending and network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {:network :optimism-arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is sending and network is optimism-arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :sending
-                               :network :optimism-arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is confirmed and network is optimism-arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :confirmed
-                               :network :optimism-arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is finalising and network is optimism-arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :finalising
-                               :network :optimism-arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is finalized and network is optimism-arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :finalized
-                               :network :optimism-arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is error and network is optimism-arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :error
-                               :network :optimism-arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is sending and network is optimism"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :sending
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is confirmed and network is optimism"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :confirmed
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is finalising and network is optimism"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :finalising
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is finalized and network is optimism"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :finalized
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is error and network is optimism"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :error
-                               :network :optimism})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is sending and network is arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :sending
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is confirmed and network is arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :confirmed
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is finalising and network is arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :finalising
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is finalized and network is arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :finalized
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is error and network is arbitrum"
-    (h/render [quo/transaction-progress
-               (get-test-data {:state   :error
-                               :network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is pending and network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is sending and network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {:state :sending})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is confirmed and network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {:state :confirmed})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is finalising and network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {:state :finalising})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is finalized and network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {:state :finalized})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "component renders when state is error and network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {:state :error})])
-    (h/is-truthy (h/get-by-label-text :transaction-progress)))
-
-  (h/test "mainnet progress box is visible network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {})])
-    (h/is-truthy (h/get-by-label-text :mainnet-progress-box)))
-
-  (h/test "arbitrum-optimism progress box is visible network is optimism-arbitrum"
-    (h/render [quo/transaction-progress (get-test-data {:network :optimism-arbitrum})])
-    (h/is-truthy (h/get-all-by-label-text :progress-box)))
-
-  (h/test "arbitrum progress box is visible network is arbitrum"
-    (h/render [quo/transaction-progress (get-test-data {:network :arbitrum})])
-    (h/is-truthy (h/get-all-by-label-text :progress-box)))
-
-  (h/test "optimism progress box is visible network is optimism"
-    (h/render [quo/transaction-progress (get-test-data {:network :optimism})])
-    (h/is-truthy (h/get-all-by-label-text :progress-box)))
-
-  (h/test "title is visible network is optimism-arbitrum"
-    (h/render [quo/transaction-progress (get-test-data {:network :optimism-arbitrum})])
-    (h/is-truthy (h/get-by-text "Title")))
-
-  (h/test "title is visible network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {})])
-    (h/is-truthy (h/get-by-text "Title")))
-
-  (h/test "title is visible network is optimism"
-    (h/render [quo/transaction-progress (get-test-data {:network :optimism})])
-    (h/is-truthy (h/get-by-text "Title")))
-
-  (h/test "title is visible network is arbitrum"
-    (h/render [quo/transaction-progress (get-test-data {:network :arbitrum})])
-    (h/is-truthy (h/get-by-text "Title")))
-
-  (h/test "context tag is visible network is optimism-arbitrum"
-    (h/render [quo/transaction-progress (get-test-data {:network :optimism-arbitrum})])
-    (h/is-truthy (h/get-by-label-text :context-tag)))
-
-  (h/test "context tag is visible network is mainnet"
-    (h/render [quo/transaction-progress (get-test-data {})])
-    (h/is-truthy (h/get-by-label-text :context-tag)))
-
-  (h/test "context tag is visible network is optimism"
-    (h/render [quo/transaction-progress (get-test-data {:network :optimism})])
-    (h/is-truthy (h/get-by-label-text :context-tag)))
-
-  (h/test "context tag is visible network is optimism"
-    (h/render [quo/transaction-progress (get-test-data {:network :arbitrum})])
-    (h/is-truthy (h/get-by-label-text :context-tag))))

src/quo/components/wallet/transaction_progress/style.cljs

@@ -1,38 +0,0 @@
-(ns quo.components.wallet.transaction-progress.style
-  (:require [quo.foundations.colors :as colors]))
-
-(def title-text-container
-  {:flex 1})
-
-(def icon
-  {:margin-right 4})
-
-(defn box-style
-  [theme]
-  {:border-radius 16
-   :border-width  1
-   :border-color  (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)})
-
-(def title-container
-  {:align-items    :center
-   :flex-direction :row
-   :padding-left   12
-   :padding-top    8
-   :padding-right  8
-   :padding-bottom 4})
-
-(def status-row-container
-  {:flex-direction     :row
-   :align-items        :center
-   :flex               1
-   :padding-horizontal 12
-   :padding-top        8
-   :padding-bottom     4})
-
-(defn context-tag-container
-  [theme]
-  {:padding-horizontal  12
-   :padding-bottom      8
-   :flex-direction      :row
-   :border-bottom-width 1
-   :border-color        (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)})

src/quo/components/wallet/transaction_progress/view.cljs

@@ -1,187 +0,0 @@
-(ns quo.components.wallet.transaction-progress.view
-  (:require [quo.components.buttons.button.view :as button]
-            [quo.components.icon :as icons]
-            [quo.components.markdown.text :as text]
-            [quo.components.tags.context-tag.view :as context-tag]
-            [quo.components.wallet.confirmation-progress.view :as confirmation-progress]
-            [quo.components.wallet.transaction-progress.style :as style]
-            [quo.foundations.colors :as colors]
-            [quo.theme :as quo.theme]
-            [react-native.core :as rn]
-            [utils.i18n :as i18n]))
-
-(def ^:private max-mainnet-verifications 4)
-(def ^:private max-sidenet-verifications 1)
-
-(defn- icon-internal
-  ([icon]
-   (icon-internal icon nil 20))
-  ([icon color]
-   (icon-internal icon color 20))
-  ([icon color size]
-   [rn/view {:style style/icon}
-    [icons/icon
-     icon
-     {:color    color
-      :size     size
-      :no-color (when (not color) true)}]]))
-
-(defn- text-internal
-  [{:keys [weight size accessibility-label color]
-    :or   {weight :semi-bold
-           size   :paragraph-1}}
-   title]
-  [text/text
-   {:accessibility-label accessibility-label
-    :ellipsize-mode      :tail
-    :number-of-lines     1
-    :weight              weight
-    :size                size
-    :style               {:color color}}
-   title])
-
-(defn- network-type-text
-  [state]
-  (case state
-    (:sending :pending)      (i18n/label :t/pending-on)
-    (:confirmed :finalising) (i18n/label :t/confirmed-on)
-    :finalized               (i18n/label :t/finalized-on)
-    :error                   (i18n/label :t/failed-on)
-    nil))
-
-(defn- calculate-counter
-  [counter]
-  (if (< counter 4) counter max-mainnet-verifications))
-
-(defn mainnet-label
-  [counter]
-  (str counter "/" max-mainnet-verifications))
-
-(defn subnet-label
-  [counter]
-  (str counter "/" max-sidenet-verifications))
-
-(defn- text-steps
-  [network state epoch-number counter]
-  (let [steps (case network
-                :mainnet
-                {:pending    (mainnet-label 0)
-                 :sending    (mainnet-label (calculate-counter counter))
-                 :confirmed  (mainnet-label (calculate-counter counter))
-                 :finalising (mainnet-label (calculate-counter counter))
-                 :finalized  (i18n/label :t/epoch-number {:number epoch-number})
-                 :error      (mainnet-label 0)}
-                (or :optimism :arbitrum)
-                {:pending    (subnet-label 0)
-                 :sending    (subnet-label 0)
-                 :confirmed  (subnet-label 0)
-                 :finalising (subnet-label 1)
-                 :finalized  (i18n/label :t/epoch-number {:number epoch-number})
-                 :error      (subnet-label 0)}
-                nil)]
-    (get steps state)))
-
-(defn- get-status-icon
-  [theme state]
-  (case state
-    (:pending :sending)      {:icon  :i/pending-state
-                              :color (colors/theme-colors colors/neutral-50
-                                                          colors/neutral-40
-                                                          theme)}
-    (:confirmed :finalising) {:icon  :i/positive-state
-                              :color (colors/resolve-color :success theme)}
-    :finalized               {:icon :i/diamond}
-    :error                   {:icon  :i/negative-state
-                              :color (colors/resolve-color :danger theme)}
-    nil))
-
-(defn- get-network
-  [networks network]
-  (some #(when (= (:network %) network) %)
-        networks))
-
-(defn- calculate-error-state
-  [networks]
-  (some #(= (:state %) :error) networks))
-
-(defn- title-internal
-  [{:keys [title theme networks]}]
-  [rn/view {:style style/title-container}
-   [icon-internal :i/placeholder (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)]
-   [rn/view {:style style/title-text-container}
-    [text-internal nil title]]
-   (when (calculate-error-state networks)
-     [button/button
-      {:size      24
-       :icon-left :i/refresh}
-      (i18n/label :t/retry)])])
-
-(defn- tag-internal
-  [tag-photo tag-name tag-number theme]
-  [rn/view {:style (style/context-tag-container theme)}
-   [context-tag/view
-    {:size               24
-     :collectible        tag-photo
-     :collectible-name   tag-name
-     :collectible-number tag-number
-     :type               :collectible}]])
-
-(defn- get-network-text
-  [network]
-  (case network
-    :arbitrum (i18n/label :t/arbitrum)
-    :mainnet  (i18n/label :t/mainnet)
-    :optimism (i18n/label :t/optimism)
-    nil))
-
-(defn- status-row
-  [{:keys [theme state network epoch-number counter]}]
-  (let [{:keys [icon color]} (get-status-icon theme state)]
-    [rn/view {:style style/status-row-container}
-     [icon-internal icon color 16]
-     [rn/view {:style style/title-text-container}
-      [text-internal
-       {:weight :regular
-        :size   :paragraph-2}
-       (str (network-type-text state) " " (get-network-text network))]]
-     [rn/view
-      [text-internal
-       {:weight :regular
-        :size   :paragraph-2
-        :color  (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}
-       (text-steps network state epoch-number counter)]]]))
-
-(defn- view-network
-  [{:keys [theme state epoch-number counter total-box progress network]}]
-  [:<>
-   [status-row
-    {:theme        theme
-     :state        state
-     :network      network
-     :epoch-number epoch-number
-     :counter      counter}]
-   [confirmation-progress/view
-    {:state          state
-     :network        network
-     :counter        counter
-     :total-box      total-box
-     :progress-value progress}]])
-
-(defn- view-internal
-  [{:keys [title on-press accessibility-label theme tag-photo tag-name tag-number networks]
-    :or   {accessibility-label :transaction-progress}}]
-  [rn/touchable-without-feedback
-   {:on-press            on-press
-    :accessibility-label accessibility-label}
-   [rn/view {:style (style/box-style theme)}
-    [title-internal
-     {:title    title
-      :theme    theme
-      :networks networks}]
-    [tag-internal tag-photo tag-name tag-number theme]
-    (for [network networks]
-      ^{:key (:network network)}
-      (let [assoc-props #(get-network networks %)]
-        [view-network (assoc-props (:network network))]))]])
-
-(def view (quo.theme/with-theme view-internal))

src/quo/core.cljs

@@ -125,6 +125,7 @@
     quo.components.settings.settings-item.view
     quo.components.share.qr-code.view
     quo.components.share.share-qr-code.view
+    quo.components.status-link-previews.community.view
     quo.components.switchers.group-messaging-card.view
     quo.components.tabs.account-selector
     quo.components.tabs.segmented-tab
@@ -146,7 +147,6 @@
     quo.components.wallet.account-origin.view
     quo.components.wallet.account-overview.view
     quo.components.wallet.address-text.view
-    quo.components.wallet.confirmation-progress.view
     quo.components.wallet.keypair.view
     quo.components.wallet.network-amount.view
     quo.components.wallet.network-bridge.view
@@ -155,7 +155,6 @@
     quo.components.wallet.progress-bar.view
     quo.components.wallet.summary-info.view
     quo.components.wallet.token-input.view
-    quo.components.wallet.transaction-progress.view
     quo.components.wallet.transaction-summary.view
     quo.components.wallet.wallet-activity.view
     quo.components.wallet.wallet-overview.view))
@@ -283,6 +282,9 @@
 (def url-preview quo.components.links.url-preview.view/view)
 (def url-preview-list quo.components.links.url-preview-list.view/view)
 
+;;;; Status links
+(def status-link-preview-community quo.components.status-link-previews.community.view/view)
+
 ;;;; List items
 (def account-item quo.components.list-items.account.view/view)
 (def account-list-card quo.components.list-items.account-list-card.view/view)
@@ -391,7 +393,6 @@
 (def account-origin quo.components.wallet.account-origin.view/view)
 (def account-overview quo.components.wallet.account-overview.view/view)
 (def address-text quo.components.wallet.address-text.view/view)
-(def confirmation-propgress quo.components.wallet.confirmation-progress.view/view)
 (def keypair quo.components.wallet.keypair.view/view)
 (def network-amount quo.components.wallet.network-amount.view/view)
 (def network-bridge quo.components.wallet.network-bridge.view/view)
@@ -402,5 +403,4 @@
 (def token-input quo.components.wallet.token-input.view/view)
 (def wallet-overview quo.components.wallet.wallet-overview.view/view)
 (def wallet-activity quo.components.wallet.wallet-activity.view/view)
-(def transaction-progress quo.components.wallet.transaction-progress.view/view)
 (def transaction-summary quo.components.wallet.transaction-summary.view/view)

src/quo/core_spec.cljs

@@ -80,7 +80,6 @@
     [quo.components.wallet.account-card.component-spec]
     [quo.components.wallet.account-origin.component-spec]
     [quo.components.wallet.account-overview.component-spec]
-    [quo.components.wallet.confirmation-progress.component-spec]
     [quo.components.wallet.keypair.component-spec]
     [quo.components.wallet.network-amount.component-spec]
     [quo.components.wallet.network-bridge.component-spec]
@@ -88,7 +87,6 @@
     [quo.components.wallet.progress-bar.component-spec]
     [quo.components.wallet.summary-info.component-spec]
     [quo.components.wallet.token-input.component-spec]
-    [quo.components.wallet.transaction-progress.component-spec]
     [quo.components.wallet.transaction-summary.component-spec]
     [quo.components.wallet.wallet-activity.component-spec]
     [quo.components.wallet.wallet-overview.component-spec]))

src/status_im/chat/models/input.cljs

@@ -5,11 +5,11 @@
     [goog.object :as object]
     [re-frame.core :as re-frame]
     [status-im.chat.models.mentions :as mentions]
+    [status-im.chat.models.message :as chat.message]
     [status-im.chat.models.message-content :as message-content]
     [status-im.data-store.messages :as data-store-messages]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.composer.link-preview.events :as link-preview]
-    [status-im2.contexts.chat.messages.transport.events :as messages.transport]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
@@ -147,15 +147,48 @@
           preferred-name (get-in db [:profile/profile :preferred-name])
           emoji? (message-content/emoji-only-content? {:text        input-text
                                                        :response-to message-id})]
-      {:chat-id       current-chat-id
-       :content-type  (if emoji?
-                        constants/content-type-emoji
-                        constants/content-type-text)
-       :text          input-text
-       :response-to   message-id
-       :ens-name      preferred-name
-       :link-previews (map #(select-keys % [:url :title :description :thumbnail])
-                           (get-in db [:chat/link-previews :unfurled]))})))
+      {:chat-id              current-chat-id
+       :content-type         (if emoji?
+                               constants/content-type-emoji
+                               constants/content-type-text)
+       :text                 input-text
+       :response-to          message-id
+       :ens-name             preferred-name
+       :link-previews        (map #(select-keys % [:url :title :description :thumbnail])
+                                  (get-in db [:chat/link-previews :unfurled]))
+       :status-link-previews (map (fn [item]
+                                    {:url (:url item)
+                                     :community
+                                     {:community-id         (get-in item [:community :community-id])
+                                      :color                (get-in item
+                                                                    [:community :color])
+                                      :description          (get-in item
+                                                                    [:community :description])
+                                      :display-name         (get-in item
+                                                                    [:community :display-name])
+                                      :members-count        (get-in item
+                                                                    [:community :members-count])
+                                      :active-members-count (get-in item
+                                                                    [:community :active-members-count])
+                                      :icon                 {:data-uri (get-in item
+                                                                               [:community :icon
+                                                                                :data-uri])
+                                                             :width    (get-in item
+                                                                               [:community :icon
+                                                                                :width])
+                                                             :height   (get-in item
+                                                                               [:community :icon
+                                                                                :height])}
+                                      :banner               {:data-uri (get-in item
+                                                                               [:community :banner
+                                                                                :data-uri])
+                                                             :width    (get-in item
+                                                                               [:community :banner
+                                                                                :width])
+                                                             :height   (get-in item
+                                                                               [:community :banner
+                                                                                :height])}}})
+                                  (get-in db [:chat/status-link-previews :unfurled]))})))
 
 (defn build-image-messages
   [{db :db} chat-id input-text]
@@ -193,6 +226,7 @@
     (rf/merge cofx
               (clean-input current-chat-id)
               (link-preview/reset-unfurled)
+              (link-preview/clear-status-link-previews)
               (mentions/clear-mentions))))
 
 (rf/defn send-messages
@@ -205,7 +239,8 @@
       (rf/merge cofx
                 (clean-input (:current-chat-id db))
                 (link-preview/reset-unfurled)
-                (messages.transport/send-chat-messages messages)))))
+                (link-preview/clear-status-link-previews)
+                (chat.message/send-messages messages)))))
 
 (rf/defn send-audio-message
   [{:keys [db] :as cofx} audio-path duration current-chat-id]
@@ -214,51 +249,55 @@
     (when-not (string/blank? audio-path)
       (rf/merge
        {:db (assoc-in db [:chat/inputs current-chat-id :metadata :responding-to-message] nil)}
-       (messages.transport/send-chat-messages
-        [(merge
-          {:chat-id           current-chat-id
-           :content-type      constants/content-type-audio
-           :audio-path        audio-path
-           :audio-duration-ms duration
-           :text              (i18n/label :t/update-to-listen-audio {"locale" "en"})}
-          (when message-id
-            {:response-to message-id}))])))))
+       (chat.message/send-message
+        (merge
+         {:chat-id           current-chat-id
+          :content-type      constants/content-type-audio
+          :audio-path        audio-path
+          :audio-duration-ms duration
+          :text              (i18n/label :t/update-to-listen-audio {"locale" "en"})}
+         (when message-id
+           {:response-to message-id})))))))
 
 (rf/defn send-sticker-message
   [cofx {:keys [hash packID pack]} current-chat-id]
   (when-not (or (string/blank? hash) (and (string/blank? packID) (string/blank? pack)))
-    (messages.transport/send-chat-messages
-     cofx
-     [{:chat-id      current-chat-id
-       :content-type constants/content-type-sticker
-       :sticker      {:hash hash
-                      :pack (int (if (string/blank? packID) pack packID))}
-       :text         (i18n/label :t/update-to-see-sticker {"locale" "en"})}])))
+    (chat.message/send-message cofx
+                               {:chat-id      current-chat-id
+                                :content-type constants/content-type-sticker
+                                :sticker      {:hash hash
+                                               :pack (int (if (string/blank? packID) pack packID))}
+                                :text         (i18n/label :t/update-to-see-sticker {"locale" "en"})})))
 
 (rf/defn send-edited-message
   [{:keys [db]
     :as   cofx} text {:keys [message-id quoted-message chat-id]}]
   (rf/merge
    cofx
-   {:json-rpc/call [{:method      "wakuext_editMessage"
-                     :params      [{:id           message-id
-                                    :text         text
-                                    :content-type (if (message-content/emoji-only-content?
-                                                       {:text        text
-                                                        :response-to quoted-message})
-                                                    constants/content-type-emoji
-                                                    constants/content-type-text)
-                                    :linkPreviews (map #(-> %
-                                                            (select-keys [:url :title :description
-                                                                          :thumbnail])
-                                                            data-store-messages/->link-preview-rpc)
-                                                       (get-in db [:chat/link-previews :unfurled]))}]
-                     :js-response true
-                     :on-error    #(log/error "failed to edit message " %)
-                     :on-success  (fn [result]
-                                    (re-frame/dispatch [:sanitize-messages-and-process-response
-                                                        result]))}]}
+   {:json-rpc/call
+    [{:method      "wakuext_editMessage"
+      :params      [{:id                 message-id
+                     :text               text
+                     :content-type       (if (message-content/emoji-only-content?
+                                              {:text        text
+                                               :response-to quoted-message})
+                                           constants/content-type-emoji
+                                           constants/content-type-text)
+                     :linkPreviews       (map #(-> %
+                                                   (select-keys [:url :title :description
+                                                                 :thumbnail])
+                                                   data-store-messages/->link-preview-rpc)
+                                              (get-in db [:chat/link-previews :unfurled]))
+                     :statusLinkPreviews (map
+                                          data-store-messages/<-status-link-previews-rpc
+                                          (get-in db [:chat/status-link-previews :unfurled]))}]
+      :js-response true
+      :on-error    #(log/error "failed to edit message " %)
+      :on-success  (fn [result]
+                     (re-frame/dispatch [:sanitize-messages-and-process-response
+                                         result]))}]}
    (link-preview/reset-unfurled)
+   (link-preview/clear-status-link-previews)
    (cancel-message-edit)))
 
 (rf/defn send-current-message

src/status_im/chat/models/loading.cljs

@@ -45,7 +45,6 @@
     {:db (update-in db [:chats chat-id] merge chat)}))
 
 (rf/defn load-chat
-  {:events [:chats-list/load-chat]}
   [_ chat-id]
   {:json-rpc/call [{:method     "wakuext_chat"
                     :params     [chat-id]

src/status_im/chat/models/message.cljs

@@ -5,6 +5,7 @@
     [react-native.platform :as platform]
     [status-im.chat.models.loading :as chat.loading]
     [status-im.data-store.messages :as data-store.messages]
+    [status-im.transport.message.protocol :as protocol]
     [status-im.utils.deprecated-types :as types]
     [status-im2.contexts.chat.messages.delete-message.events :as delete-message]
     [status-im2.contexts.chat.messages.list.events :as message-list]
@@ -20,6 +21,12 @@
   [db chat-id clock-value]
   (>= (get-in db [:chats chat-id :deleted-at-clock-value]) clock-value))
 
+(defn add-timeline-message
+  [acc chat-id message-id message]
+  (-> acc
+      (update-in [:db :messages chat-id] assoc message-id message)
+      (update-in [:db :message-lists chat-id] message-list/add message)))
+
 (defn hide-message
   "Hide chat message, rebuild message-list"
   [{:keys [db]} chat-id message-id]
@@ -138,6 +145,14 @@
                               :on-error   #(log/error "failed to re-send message" %)}]}
             (update-message-status chat-id message-id :sending)))
 
+(rf/defn send-message
+  [cofx message]
+  (protocol/send-chat-messages cofx [message]))
+
+(rf/defn send-messages
+  [cofx messages]
+  (protocol/send-chat-messages cofx messages))
+
 (rf/defn handle-removed-messages
   {:events [::handle-removed-messages]}
   [{:keys [db] :as cofx} removed-messages]

src/status_im/chat/models/reactions.cljs

@@ -2,6 +2,7 @@
   (:require
     [re-frame.core :as re-frame]
     [status-im.data-store.reactions :as data-store.reactions]
+    [status-im.transport.message.protocol :as message.protocol]
     [status-im2.constants :as constants]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]
@@ -62,6 +63,23 @@
     (let [reactions-w-chat-id (map #(assoc % :chat-id chat-id) reactions)]
       {:db (update db :reactions (process-reactions (:chats db)) reactions-w-chat-id)})))
 
+
+;; Send reactions
+
+
+(rf/defn send-emoji-reaction
+  {:events [:models.reactions/send-emoji-reaction]}
+  [{{:keys [current-chat-id]} :db :as cofx} reaction]
+  (message.protocol/send-reaction cofx
+                                  (update reaction :chat-id #(or % current-chat-id))))
+
+(rf/defn send-retract-emoji-reaction
+  {:events [:models.reactions/send-emoji-reaction-retraction]}
+  [{{:keys [current-chat-id]} :db :as cofx} reaction]
+  (message.protocol/send-retract-reaction cofx
+                                          (update reaction :chat-id #(or % current-chat-id))))
+
+
 (defn message-reactions
   [current-public-key reactions]
   (reduce

src/status_im/commands/core.cljs

@@ -0,0 +1,46 @@
+(ns status-im.commands.core
+  (:require
+    [re-frame.core :as re-frame]
+    [status-im.wallet.utils :as wallet.utils]
+    [utils.re-frame :as rf]))
+
+(rf/defn handle-prepare-accept-request-address-for-transaction
+  {:events [::prepare-accept-request-address-for-transaction]}
+  [{:keys [db]} message]
+  {:db                    (assoc db
+                                 :commands/select-account
+                                 {:message message
+                                  :from    (wallet.utils/get-default-account (:profile/wallet-accounts
+                                                                              db))})
+   :show-select-acc-sheet nil})
+
+(rf/defn set-selected-account
+  {:events [::set-selected-account]}
+  [{:keys [db]} _ account]
+  {:db (-> (assoc-in db [:commands/select-account :from] account)
+           (assoc :bottom-sheet/show? false))})
+
+(rf/defn handle-accept-request-address-for-transaction
+  {:events [::accept-request-address-for-transaction]}
+  [{:keys [db]} message-id address]
+  {:db            (dissoc db :commands/select-account)
+   :json-rpc/call [{:method      "wakuext_acceptRequestAddressForTransaction"
+                    :params      [message-id address]
+                    :js-response true
+                    :on-success  #(re-frame/dispatch [:transport/message-sent %])}]})
+
+(rf/defn handle-decline-request-address-for-transaction
+  {:events [::decline-request-address-for-transaction]}
+  [_ message-id]
+  {:json-rpc/call [{:method      "wakuext_declineRequestAddressForTransaction"
+                    :params      [message-id]
+                    :js-response true
+                    :on-success  #(re-frame/dispatch [:transport/message-sent %])}]})
+
+(rf/defn handle-decline-request-transaction
+  {:events [::decline-request-transaction]}
+  [cofx message-id]
+  {:json-rpc/call [{:method      "wakuext_declineRequestTransaction"
+                    :params      [message-id]
+                    :js-response true
+                    :on-success  #(re-frame/dispatch [:transport/message-sent %])}]})

src/status_im/communities/core.cljs

@@ -74,7 +74,6 @@
                         :adminSettings               :admin-settings
                         :tokenPermissions            :token-permissions
                         :communityTokensMetadata     :tokens-metadata
-                        :introMessage                :intro-message
                         :muteTill                    :muted-till})
       (update :admin-settings
               set/rename-keys
@@ -327,7 +326,7 @@
                        (conj contacts user-pk)
                        contacts)]
     (when (seq pks)
-      {:json-rpc/call [{:method      "wakuext_shareCommunity"
+      {:json-rpc/call [{:method      "wakuext_shareCommunityV2"
                         :params      [{:communityId community-id
                                        :users       pks}]
                         :js-response true

src/status_im/contact/chat.cljs

@@ -0,0 +1,18 @@
+(ns status-im.contact.chat
+  (:require
+    [re-frame.core :as re-frame]
+    [status-im2.contexts.contacts.events :as contact]
+    [status-im2.navigation.events :as navigation]
+    [utils.re-frame :as rf]))
+
+(rf/defn contact-code-submitted
+  {:events       [:contact.ui/contact-code-submitted]
+   :interceptors [(re-frame/inject-cofx :random-id-generator)]}
+  [{{:contacts/keys [new-identity]} :db :as cofx} new-contact? nickname]
+  (let [{:keys [public-key ens-name]} new-identity]
+    (rf/merge cofx
+              #(if new-contact?
+                 (contact/send-contact-request % public-key)
+                 {:dispatch [:chat.ui/start-chat public-key ens-name]})
+              #(when new-contact?
+                 (navigation/navigate-back %)))))

src/status_im/contact/core.cljs

@@ -0,0 +1,13 @@
+(ns status-im.contact.core
+  (:require
+    [status-im2.navigation.events :as navigation]
+    [utils.re-frame :as rf]))
+
+(rf/defn open-contact-toggle-list
+  {:events [:contact.ui/start-group-chat-pressed]}
+  [{:keys [db] :as cofx}]
+  (rf/merge cofx
+            {:db (assoc db
+                        :group/selected-contacts #{}
+                        :new-chat-name           "")}
+            (navigation/navigate-to :contact-toggle-list nil)))

src/status_im/contact/db.cljs

@@ -85,3 +85,12 @@
      (assoc acc public-key (enrich-contact contact profile-pictures-visibility own-public-key)))
    {}
    contacts))
+
+(defn get-blocked-contacts
+  [contacts]
+  (reduce (fn [acc {:keys [public-key] :as contact}]
+            (if (:blocked? contact)
+              (conj acc public-key)
+              acc))
+          #{}
+          contacts))

src/status_im/data_store/messages.cljs

@@ -5,7 +5,8 @@
     [utils.re-frame :as rf]))
 
 (defn ->rpc
-  [{:keys [content] :as message}]
+  [{:keys [content]
+    :as   message}]
   (cond-> message
     content
     (assoc :text    (:text content)
@@ -16,6 +17,18 @@
                       :community-id      :communityId
                       :clock-value       :clock})))
 
+(defn- <-status-link-previews-rpc
+  [preview]
+  (-> preview
+      (update :community
+              set/rename-keys
+              {:communityId        :community-id
+               :displayName        :display-name
+               :membersCount       :members-count
+               :activeMembersCount :active-members-count})
+      (update-in [:community :banner] set/rename-keys {:dataUri :data-uri})
+      (update-in [:community :icon] set/rename-keys {:dataUri :data-uri})))
+
 (defn- <-link-preview-rpc
   [preview]
   (update preview :thumbnail set/rename-keys {:dataUri :data-uri}))
@@ -53,8 +66,10 @@
         :new                      :new?
         :albumImagesCount         :album-images-count
         :displayName              :display-name
-        :linkPreviews             :link-previews})
+        :linkPreviews             :link-previews
+        :statusLinkPreviews       :status-link-previews})
       (update :link-previews #(map <-link-preview-rpc %))
+      (update :status-link-previews #(map <-status-link-previews-rpc %))
       (update :quoted-message
               set/rename-keys
               {:parsedText       :parsed-text

src/status_im/ens/core.cljs

@@ -91,11 +91,11 @@
                                             {:chainId :chain-id
                                              :removed :removed?})
                           name-details)]
-    {:db (reduce (fn [db {:keys [username removed? chain-id] :as name-detail}]
+    {:db (reduce (fn [db {:keys [username removed?] :as name-detail}]
                    (if removed?
-                     (update-in db [:ens/names chain-id] dissoc username)
-                     (let [old (get-in db [:ens/names chain-id username])]
-                       (assoc-in db [:ens/names chain-id username] (merge old name-detail)))))
+                     (update-in db [:ens/names] dissoc username)
+                     (let [old (get-in db [:ens/names username])]
+                       (assoc-in db [:ens/names username] (merge old name-detail)))))
                  db
                  name-details)}))
 
@@ -103,8 +103,8 @@
   {:events [:ens/save-username]}
   [{:keys [db] :as cofx} custom-domain? username redirect-to-summary? connected?]
   (let [name     (fullname custom-domain? username)
-        chain-id (chain/chain-id db)
-        names    (get-in db [:ens/names chain-id] [])]
+        names    (get-in db [:ens/names] [])
+        chain-id (chain/chain-id db)]
     (rf/merge cofx
               (cond-> {:dispatch-n [[:ens/update-usernames [{:username name :chain-id chain-id}]]]}
                 connected?           (assoc :json-rpc/call
@@ -240,8 +240,7 @@
   {:events [::set-username-candidate]}
   [{:keys [db]} username]
   (let [{:keys [custom-domain?]} (:ens/registration db)
-        chain-id                 (chain/chain-id db)
-        usernames                (into #{} (keys (get-in db [:ens/names chain-id])))
+        usernames                (into #{} (keys (get-in db [:ens/names])))
         state                    (state custom-domain? username usernames)]
     (reset! resolve-last-id (random/id))
     (merge
@@ -311,23 +310,20 @@
 (rf/defn store-name-address
   {:events [::address-resolved]}
   [{:keys [db]} username address]
-  (let [chain-id (chain/chain-id db)]
-    {:db (assoc-in db [:ens/names chain-id username :address] address)}))
+  {:db (assoc-in db [:ens/names username :address] address)})
 
 (rf/defn store-name-public-key
   {:events [::public-key-resolved]}
   [{:keys [db]} username public-key]
-  (let [chain-id (chain/chain-id db)]
-    {:db (assoc-in db [:ens/names chain-id username :public-key] public-key)}))
+  {:db (assoc-in db [:ens/names username :public-key] public-key)})
 
 (rf/defn store-expiration-date
   {:events [::get-expiration-time-success]}
   [{:keys [now db]} username timestamp]
-  (let [chain-id (chain/chain-id db)]
-    {:db (-> db
-             (assoc-in [:ens/names chain-id username :expiration-date]
-                       (datetime/timestamp->year-month-day-date timestamp))
-             (assoc-in [:ens/names chain-id username :releasable?] (<= timestamp now)))}))
+  {:db (-> db
+           (assoc-in [:ens/names username :expiration-date]
+                     (datetime/timestamp->year-month-day-date timestamp))
+           (assoc-in [:ens/names username :releasable?] (<= timestamp now)))})
 
 (rf/defn navigate-to-name
   {:events [::navigate-to-name]}
@@ -356,8 +352,7 @@
 (rf/defn remove-username
   {:events [::remove-username]}
   [{:keys [db] :as cofx} name]
-  (let [chain-id                    (chain/chain-id db)
-        names                       (get-in db [:ens/names chain-id] [])
+  (let [names                       (get-in db [:ens/names] [])
         preferred-name              (get-in db [:profile/profile :preferred-name])
         new-names                   (remove #(= name %) (keys names))
         {:keys [chain-id username]} (get-in names [name])]

src/status_im/events.cljs

@@ -15,6 +15,8 @@
     status-im.chat.models.input
     status-im.chat.models.loading
     status-im.contact.block
+    status-im.contact.chat
+    status-im.contact.core
     status-im.currency.core
     status-im.ethereum.subscriptions
     status-im.fleet.core
@@ -30,7 +32,9 @@
     status-im.pairing.core
     status-im.profile.core
     status-im.search.core
+    status-im.signals.core
     status-im.stickers.core
+    status-im.transport.core
     status-im.ui.components.invite.events
     [status-im.ui.components.react :as react]
     status-im.ui.screens.notifications-settings.events
@@ -41,12 +45,12 @@
     status-im.visibility-status-popover.core
     status-im.visibility-status-updates.core
     status-im.waku.core
+    status-im.wallet-connect.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-im2.common.biometric.events :as biometric]
-    status-im2.common.standard-authentication.events
     [status-im2.common.theme.core :as theme]
     [status-im2.common.universal-links :as universal-links]
     [status-im2.constants :as constants]
@@ -132,7 +136,7 @@
 
 (rf/defn on-return-from-background
   [{:keys [db now] :as cofx}]
-  (let [new-account?            (get db :onboarding/new-account?)
+  (let [new-account?            (get db :onboarding-2/new-account?)
         app-in-background-since (get db :app-in-background-since)
         signed-up?              (get-in db [:profile/profile :signed-up?])
         requires-bio-auth       (and
@@ -190,9 +194,9 @@
   (rf/merge cofx
             (cond
               (= :chat view-id)
-              {:effects.async-storage/set {:chat-id (get-in cofx [:db :current-chat-id])
-                                           :key-uid (get-in cofx [:db :profile/profile :key-uid])}
-               :db                        (assoc db :screens/was-focused-once? true)}
+              {:async-storage-set {:chat-id (get-in cofx [:db :current-chat-id])
+                                   :key-uid (get-in cofx [:db :profile/profile :key-uid])}
+               :db                (assoc db :screens/was-focused-once? true)}
 
               (not (get db :screens/was-focused-once?))
               {:db (assoc db :screens/was-focused-once? true)})

src/status_im/fleet/core.cljs

@@ -3,6 +3,7 @@
     [re-frame.core :as re-frame]
     [status-im.multiaccounts.update.core :as multiaccounts.update]
     [status-im.node.core :as node]
+    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -77,9 +78,10 @@
   [{:keys [db now] :as cofx} fleet]
   (let [old-fleet (get-in db [:profile/profile :fleet])]
     (when (not= fleet old-fleet)
-      (multiaccounts.update/multiaccount-update
+      (rf/merge
        cofx
-       :fleet
-       fleet
-       {:on-success
-        #(re-frame/dispatch [:logout])}))))
+       (multiaccounts.update/multiaccount-update :fleet fleet {})
+       (node/prepare-new-config
+        {:on-success
+         #(re-frame/dispatch
+           [:multiaccounts.update.callback/save-settings-success])})))))

src/status_im/keycard/change_pin.cljs

@@ -141,14 +141,14 @@
   (let [pin          (get-in db [:keycard :pin :original])
         puk-restore? (get-in db [:keycard :pin :puk-restore?])]
     (rf/merge cofx
-              {:db                       (assoc-in db
-                                          [:keycard :pin]
-                                          {:status       nil
-                                           :login        pin
-                                           :confirmation []
-                                           :error-label  nil})
-               :effects.utils/show-popup {:title   ""
-                                          :content (i18n/label :t/pin-changed)}}
+              {:db               (assoc-in db
+                                  [:keycard :pin]
+                                  {:status       nil
+                                   :login        pin
+                                   :confirmation []
+                                   :error-label  nil})
+               :utils/show-popup {:title   ""
+                                  :content (i18n/label :t/pin-changed)}}
               (common/hide-connection-sheet)
               (if puk-restore?
                 (navigation/navigate-to :multiaccounts nil)
@@ -160,14 +160,14 @@
   {:events [:keycard.callback/on-change-puk-success]}
   [{:keys [db] :as cofx}]
   (rf/merge cofx
-            {:db                       (assoc-in db
-                                        [:keycard :pin]
-                                        {:status           nil
-                                         :puk-original     []
-                                         :puk-confirmation []
-                                         :error-label      nil})
-             :effects.utils/show-popup {:title   ""
-                                        :content (i18n/label :t/puk-changed)}}
+            {:db               (assoc-in db
+                                [:keycard :pin]
+                                {:status           nil
+                                 :puk-original     []
+                                 :puk-confirmation []
+                                 :error-label      nil})
+             :utils/show-popup {:title   ""
+                                :content (i18n/label :t/puk-changed)}}
             (common/hide-connection-sheet)
             (navigation/set-stack-root :profile-stack [:my-profile :keycard-settings])))
 
@@ -175,13 +175,13 @@
   {:events [:keycard.callback/on-change-pairing-success]}
   [{:keys [db] :as cofx}]
   (rf/merge cofx
-            {:db                       (assoc-in db
-                                        [:keycard :pin]
-                                        {:status       nil
-                                         :pairing-code nil
-                                         :error-label  nil})
-             :effects.utils/show-popup {:title   ""
-                                        :content (i18n/label :t/pairing-changed)}}
+            {:db               (assoc-in db
+                                [:keycard :pin]
+                                {:status       nil
+                                 :pairing-code nil
+                                 :error-label  nil})
+             :utils/show-popup {:title   ""
+                                :content (i18n/label :t/pairing-changed)}}
             (common/hide-connection-sheet)
             (navigation/set-stack-root :profile-stack [:my-profile :keycard-settings])))
 

src/status_im/keycard/common.cljs

@@ -293,14 +293,14 @@
 (rf/defn show-wrong-keycard-alert
   [_]
   (log/debug "show-wrong-keycard-alert")
-  {:effects.utils/show-popup {:title   (i18n/label :t/wrong-card)
-                              :content (i18n/label :t/wrong-card-text)}})
+  {:utils/show-popup {:title   (i18n/label :t/wrong-card)
+                      :content (i18n/label :t/wrong-card-text)}})
 
 (rf/defn unauthorized-operation
   [cofx]
   (rf/merge cofx
-            {:effects.utils/show-popup {:title   ""
-                                        :content (i18n/label :t/keycard-unauthorized-operation)}}
+            {:utils/show-popup {:title   ""
+                                :content (i18n/label :t/keycard-unauthorized-operation)}}
             (clear-on-card-connected)
             (navigation/set-stack-root :profile-stack [:my-profile :keycard-settings])))
 

src/status_im/keycard/core.cljs

@@ -24,12 +24,12 @@
 (rf/defn show-keycard-has-multiaccount-alert
   [{:keys [db] :as cofx}]
   (rf/merge cofx
-            {:db                              (assoc-in db [:keycard :setup-step] nil)
-             :effects.utils/show-confirmation {:title               nil
-                                               :content             (i18n/label
-                                                                     :t/keycard-has-multiaccount-on-it)
-                                               :cancel-button-text  ""
-                                               :confirm-button-text :t/okay}}))
+            {:db                      (assoc-in db [:keycard :setup-step] nil)
+             :utils/show-confirmation {:title               nil
+                                       :content             (i18n/label
+                                                             :t/keycard-has-multiaccount-on-it)
+                                       :cancel-button-text  ""
+                                       :confirm-button-text :t/okay}}))
 
 (rf/defn load-pin-screen
   [{:keys [db] :as cofx}]
@@ -548,11 +548,10 @@
 
 (rf/defn show-no-keycard-applet-alert
   [_]
-  {:effects.utils/show-confirmation {:title               (i18n/label :t/no-keycard-applet-on-card)
-                                     :content             (i18n/label
-                                                           :t/keycard-applet-install-instructions)
-                                     :cancel-button-text  ""
-                                     :confirm-button-text :t/okay}})
+  {:utils/show-confirmation {:title               (i18n/label :t/no-keycard-applet-on-card)
+                             :content             (i18n/label :t/keycard-applet-install-instructions)
+                             :cancel-button-text  ""
+                             :confirm-button-text :t/okay}})
 
 ;; NOTE: Maybe replaced by multiple events based on on flow to make it easier to maintain.
 ;; Because there are many execution paths it is harder to follow all possible states.

src/status_im/keycard/onboarding.cljs

@@ -35,8 +35,8 @@
       (do
         (log/debug (str "Cannot start keycard installation from state: " card-state))
         (rf/merge cofx
-                  {:effects.utils/show-popup {:title   (i18n/label :t/error)
-                                              :content (i18n/label :t/something-went-wrong)}}
+                  {:utils/show-popup {:title   (i18n/label :t/error)
+                                      :content (i18n/label :t/something-went-wrong)}}
                   (navigation/navigate-to :keycard-authentication-method nil))))))
 
 (rf/defn load-preparing-screen

src/status_im/keycard/recovery.cljs

@@ -11,11 +11,13 @@
     [status-im.multiaccounts.model :as multiaccounts.model]
     [status-im.popover.core :as popover]
     [status-im.utils.deprecated-types :as types]
+    [status-im.utils.keychain.core :as keychain]
     [status-im2.constants :as constants]
     [status-im2.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.address :as address]
     [utils.datetime :as datetime]
+    [utils.ethereum.eip.eip55 :as eip55]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
     [utils.security.core :as security]))
@@ -181,28 +183,26 @@
               {:db (-> db
                        (assoc-in [:keycard :setup-step] nil)
                        (dissoc :intro-wizard))}
-              ;; NOTE: Disabling as keycard not functional and this needs to be moved to
-              ;; status-go
-              #_(multiaccounts.create/on-multiaccount-created
-                 {:recovered            (or recovered (get-in db [:intro-wizard :recovering?]))
-                  :derived              {constants/path-wallet-root-keyword
-                                         {:public-key wallet-root-public-key
-                                          :address    (eip55/address->checksum wallet-root-address)}
-                                         constants/path-whisper-keyword
-                                         {:public-key whisper-public-key
-                                          :address    (eip55/address->checksum whisper-address)}
-                                         constants/path-default-wallet-keyword
-                                         {:public-key wallet-public-key
-                                          :address    (eip55/address->checksum wallet-address)}}
-                  :address              address
-                  :public-key           public-key
-                  :keycard-instance-uid instance-uid
-                  :key-uid              (address/normalized-hex key-uid)
-                  :keycard-pairing      pairing
-                  :keycard-paired-on    paired-on
-                  :chat-key             whisper-private-key}
-                 encryption-public-key
-                 {}))))
+              (multiaccounts.create/on-multiaccount-created
+               {:recovered            (or recovered (get-in db [:intro-wizard :recovering?]))
+                :derived              {constants/path-wallet-root-keyword
+                                       {:public-key wallet-root-public-key
+                                        :address    (eip55/address->checksum wallet-root-address)}
+                                       constants/path-whisper-keyword
+                                       {:public-key whisper-public-key
+                                        :address    (eip55/address->checksum whisper-address)}
+                                       constants/path-default-wallet-keyword
+                                       {:public-key wallet-public-key
+                                        :address    (eip55/address->checksum wallet-address)}}
+                :address              address
+                :public-key           public-key
+                :keycard-instance-uid instance-uid
+                :key-uid              (address/normalized-hex key-uid)
+                :keycard-pairing      pairing
+                :keycard-paired-on    paired-on
+                :chat-key             whisper-private-key}
+               encryption-public-key
+               {}))))
 
 (rf/defn return-to-keycard-login
   [{:keys [db] :as cofx}]
@@ -221,12 +221,12 @@
 (rf/defn on-backup-success
   [{:keys [db] :as cofx} backup-type]
   (rf/merge cofx
-            {:effects.utils/show-popup {:title   (i18n/label (if (= backup-type :recovery-card)
-                                                               :t/keycard-access-reset
-                                                               :t/keycard-backup-success-title))
-                                        :content (i18n/label (if (= backup-type :recovery-card)
-                                                               :t/keycard-can-use-with-new-passcode
-                                                               :t/keycard-backup-success-body))}}
+            {:utils/show-popup {:title   (i18n/label (if (= backup-type :recovery-card)
+                                                       :t/keycard-access-reset
+                                                       :t/keycard-backup-success-title))
+                                :content (i18n/label (if (= backup-type :recovery-card)
+                                                       :t/keycard-can-use-with-new-passcode
+                                                       :t/keycard-backup-success-body))}}
             (cond
               (multiaccounts.model/logged-in? db)
               (navigation/set-stack-root :profile-stack [:my-profile :keycard-settings])
@@ -278,7 +278,7 @@
     {:db                (-> db
                             (assoc-in [:profile/profiles-overview key-uid :keycard-pairing] pairing)
                             (assoc :profile/login account)
-                            (assoc :auth-method "none")
+                            (assoc :auth-method keychain/auth-method-none)
                             (update :keycard dissoc :flow :migration-password)
                             (dissoc :recovered-account?))
      ::finish-migration [account settings password encryption-pass login-params]}))
@@ -373,3 +373,4 @@
    cofx
    {:on-card-connected :keycard/load-recovering-key-screen
     :handler           (common/dispatch-event :keycard/import-multiaccount)}))
+

src/status_im/keycard/simulated_keycard.cljs

@@ -489,15 +489,14 @@
   (log/warn "sign-typed-data not implemented" args))
 
 (defn save-multiaccount-and-login
-  [_]
-  ;; NOTE: disabling as we don't support keycard for now and it's using an outdated endpoint
-  #_(native-module/save-account-and-login
-     key-uid
-     (types/clj->json multiaccount-data)
-     password
-     (types/clj->json settings)
-     node-config
-     (types/clj->json accounts-data)))
+  [{:keys [key-uid multiaccount-data password settings node-config accounts-data]}]
+  (native-module/save-account-and-login
+   key-uid
+   (types/clj->json multiaccount-data)
+   password
+   (types/clj->json settings)
+   node-config
+   (types/clj->json accounts-data)))
 
 (defn login
   [{:keys [key-uid multiaccount-data password]}]

src/status_im/keycard/unpair.cljs

@@ -83,7 +83,7 @@
                                                :error-label nil
                                                :on-verified nil}))
       :keycard/persist-pairings (dissoc pairings (keyword instance-uid))
-      :effects.utils/show-popup {:title   ""
+      :utils/show-popup         {:title   ""
                                  :content (i18n/label :t/card-unpaired)}}
      (common/clear-on-card-connected)
      (remove-pairing-from-multiaccount nil)
@@ -100,7 +100,7 @@
                                              :error-label nil
                                              :on-verified nil})
              :keycard/get-application-info nil
-             :effects.utils/show-popup     {:title   ""
+             :utils/show-popup             {:title   ""
                                             :content (i18n/label :t/something-went-wrong)}}
             (common/clear-on-card-connected)
             (navigation/navigate-to :keycard-settings nil)))
@@ -139,14 +139,15 @@
                                                :error-label nil
                                                :on-verified nil}))
       :keycard/persist-pairings (dissoc pairings (keyword instance-uid))
-      :effects.utils/show-popup {:title      (i18n/label (if keys-removed-from-card?
+      :utils/show-popup         {:title      (i18n/label (if keys-removed-from-card?
                                                            :t/profile-deleted-title
                                                            :t/database-reset-title))
                                  :content    (i18n/label (if keys-removed-from-card?
                                                            :t/profile-deleted-keycard
                                                            :t/database-reset-content))
                                  :on-dismiss #(re-frame/dispatch [:logout])}}
-     ;;should be reimplemented :key-storage/delete-profile {:key-uid    key-uid
+     ;;should be reimplemented
+     ;;:key-storage/delete-profile {:key-uid    key-uid
      ;;:on-success #(log/debug "[keycard] remove account ok")
      ;;                                  :on-error   #(log/warn "[keycard] remove account: " %)}
      (common/clear-on-card-connected)

src/status_im/log_level/core.cljs

@@ -2,6 +2,7 @@
   (:require
     [re-frame.core :as re-frame]
     [status-im.multiaccounts.update.core :as multiaccounts.update]
+    [status-im.node.core :as node]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -10,11 +11,13 @@
   [{:keys [db now] :as cofx} log-level]
   (let [old-log-level (get-in db [:profile/profile :log-level])]
     (when (not= old-log-level log-level)
-      (multiaccounts.update/multiaccount-update
-       cofx
-       :log-level
-       log-level
-       {:on-success #(re-frame/dispatch [:logout])}))))
+      (rf/merge cofx
+                (multiaccounts.update/multiaccount-update
+                 :log-level
+                 log-level
+                 {})
+                (node/prepare-new-config
+                 {:on-success #(re-frame/dispatch [:logout])})))))
 
 (rf/defn show-change-log-level-confirmation
   {:events [:log-level.ui/log-level-selected]}

src/status_im/mailserver/core.cljs

@@ -194,7 +194,7 @@
   {:events [:mailserver.ui/request-error-pressed]}
   [{:keys [db]}]
   (let [mailserver-error (:mailserver/request-error db)]
-    {:effects.utils/show-confirmation
+    {:utils/show-confirmation
      {:title               (i18n/label :t/mailserver-request-error-title)
       :content             (i18n/label :t/mailserver-request-error-content
                                        {:error mailserver-error})
@@ -290,7 +290,8 @@
          [{:method     "mailservers_addMailserver"
            :params     [(mailserver->rpc mailserver current-fleet)]
            :on-success (fn []
-                         ;; we naively logout if the user is connected to the edited mailserver
+                         ;; we naively logout if the user is connected to
+                         ;; the edited mailserver
                          (when current
                            (re-frame/dispatch
                             [:multiaccounts.logout.ui/logout-confirmed]))
@@ -412,17 +413,3 @@
   (rf/merge cofx
             {:db (dissoc db :mailserver.edit/mailserver)}
             (navigation/navigate-to :edit-mailserver nil)))
-
-(defn add-mailservers
-  [db mailservers]
-  (reduce (fn [db {:keys [fleet id name] :as mailserver}]
-            (let [updated-mailserver
-                  (-> mailserver
-                      (update :id keyword)
-                      (assoc :name (if (seq name) name id))
-                      (dissoc :fleet))]
-              (assoc-in db
-               [:mailserver/mailservers (keyword fleet) (keyword id)]
-               updated-mailserver)))
-          db
-          mailservers))

src/status_im/multiaccounts/create/core.cljs

@@ -2,10 +2,17 @@
   (:require
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
+    [status-im.data-store.settings :as data-store.settings]
+    [status-im.node.core :as node]
+    [status-im.ui.components.colors :as colors]
     [status-im.utils.deprecated-types :as types]
     [status-im.utils.signing-phrase.core :as signing-phrase]
+    [status-im2.config :as config]
     [status-im2.constants :as constants]
-    [utils.re-frame :as rf]))
+    [utils.ethereum.eip.eip55 :as eip55]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]
+    [utils.security.core :as security]))
 
 (defn normalize-derived-data-keys
   [derived-data]
@@ -75,3 +82,134 @@
 (rf/defn save-multiaccount-and-login-with-keycard
   [_ args]
   {:keycard/save-multiaccount-and-login args})
+
+(re-frame/reg-fx
+ ::save-account-and-login
+ (fn [[key-uid multiaccount-data hashed-password settings config accounts-data]]
+   (native-module/save-account-and-login
+    key-uid
+    multiaccount-data
+    hashed-password
+    settings
+    config
+    accounts-data)))
+
+(rf/defn save-account-and-login
+  [_ key-uid multiaccount-data password settings node-config accounts-data]
+  {::save-account-and-login [key-uid
+                             (types/clj->json multiaccount-data)
+                             password
+                             (types/clj->json settings)
+                             node-config
+                             (types/clj->json accounts-data)]})
+
+(defn prepare-accounts-data
+  [multiaccount]
+  [(let [{:keys [public-key address]}
+         (get-in multiaccount [:derived constants/path-default-wallet-keyword])]
+     {:public-key public-key
+      :address    (eip55/address->checksum address)
+      :color      colors/blue-persist
+      :wallet     true
+      :path       constants/path-default-wallet
+      :name       (i18n/label :t/main-account)})
+   (let [{:keys [compressed-key public-key address name]}
+         (get-in multiaccount [:derived constants/path-whisper-keyword])]
+     {:public-key     public-key
+      :compressed-key compressed-key
+      :address        (eip55/address->checksum address)
+      :name           name
+      :path           constants/path-whisper
+      :chat           true})])
+
+(rf/defn on-multiaccount-created
+  [{:keys [signing-phrase random-guid-generator db] :as cofx}
+   {:keys [address chat-key keycard-instance-uid key-uid
+           keycard-pairing keycard-paired-on mnemonic recovered]
+    :as   multiaccount}
+   password
+   {:keys [save-mnemonic? login?] :or {login? true save-mnemonic? false}}]
+  (let [[wallet-account
+         {:keys [public-key
+                 compressed-key
+                 name]} :as accounts-data]
+        (prepare-accounts-data
+         multiaccount)
+        multiaccount-data {:name            name
+                           :address         address
+                           :key-uid         key-uid
+                           :keycard-pairing keycard-pairing}
+        keycard-multiaccount? (boolean keycard-pairing)
+        eip1581-address (get-in multiaccount
+                                [:derived
+                                 constants/path-eip1581-keyword
+                                 :address])
+        new-multiaccount
+        (cond->
+          (merge
+           {;; address of the master key
+            :address address
+            ;; sha256 of master public key
+            :key-uid key-uid
+            ;; The address from which we derive any wallet
+            :wallet-root-address
+            (get-in multiaccount
+                    [:derived
+                     constants/path-wallet-root-keyword
+                     :address])
+            :name name
+            ;; public key of the chat account
+            :public-key public-key
+            ;; compressed key of the chat account
+            :compressed-key compressed-key
+            ;; default address for Dapps
+            :dapps-address (:address wallet-account)
+            :latest-derived-path 0
+            :signing-phrase signing-phrase
+            :backup-enabled? true
+            :installation-id (random-guid-generator)
+            ;; default mailserver (history node) setting
+            :use-mailservers? true
+            :recovered recovered}
+           config/default-multiaccount)
+          ;; The address from which we derive any chat
+          ;; account/encryption keys
+          eip1581-address
+          (assoc :eip1581-address eip1581-address)
+          save-mnemonic?
+          (assoc :mnemonic mnemonic)
+          keycard-multiaccount?
+          (assoc :keycard-instance-uid keycard-instance-uid
+                 :keycard-pairing      keycard-pairing
+                 :keycard-paired-on    keycard-paired-on))
+        db (assoc db
+                  :profile/login            {:key-uid    key-uid
+                                             :name       name
+                                             :password   password
+                                             :creating?  true
+                                             :processing true}
+                  :profile/profile          new-multiaccount
+                  :profile/wallet-accounts  [wallet-account]
+                  :networks/current-network config/default-network
+                  :networks/networks        (data-store.settings/rpc->networks config/default-networks))
+        settings (assoc new-multiaccount
+                        :networks/current-network config/default-network
+                        :networks/networks        config/default-networks)]
+    (rf/merge cofx
+              {:db db}
+              (if keycard-multiaccount?
+                (save-multiaccount-and-login-with-keycard
+                 {:key-uid           key-uid
+                  :multiaccount-data multiaccount-data
+                  :password          password
+                  :settings          settings
+                  :node-config       (node/get-new-config db)
+                  :accounts-data     accounts-data
+                  :chat-key          chat-key})
+                (save-account-and-login
+                 key-uid
+                 multiaccount-data
+                 (native-module/sha3 (security/safe-unmask-data password))
+                 settings
+                 (node/get-new-config db)
+                 accounts-data)))))

src/status_im/multiaccounts/logout/core.cljs

@@ -31,7 +31,7 @@
     (rf/merge cofx
               {:set-root                               :progress
                :chat.ui/clear-inputs                   nil
-               :effects.shell/reset-state              nil
+               :shell/reset-state                      nil
                :hide-popover                           nil
                ::logout                                nil
                :profile.settings/webview-debug-changed false

src/status_im/network/core.cljs

@@ -2,6 +2,7 @@
   (:require
     [clojure.string :as string]
     [re-frame.core :as re-frame]
+    [status-im.node.core :as node]
     [status-im2.navigation.events :as navigation]
     [utils.ethereum.chain :as chain]
     [utils.i18n :as i18n]
@@ -88,7 +89,7 @@
 (rf/defn connect-failure
   {:events [::connect-failure]}
   [_ reason]
-  {:effects.utils/show-popup
+  {:utils/show-popup
    {:title   (i18n/label :t/error)
     :content (str reason)}})
 
@@ -116,10 +117,12 @@
 (rf/defn save-network-settings
   {:events [::save-network-settings-pressed]}
   [{:keys [db] :as cofx} network]
-  {:db            (assoc db :networks/current-network network)
-   :json-rpc/call [{:method     "settings_saveSetting"
-                    :params     [:networks/current-network network]
-                    :on-success #(re-frame/dispatch [:logout])}]})
+  (rf/merge cofx
+            {:db            (assoc db :networks/current-network network)
+             :json-rpc/call [{:method     "settings_saveSetting"
+                              :params     [:networks/current-network network]
+                              :on-success #()}]}
+            (node/prepare-new-config {:on-success #(re-frame/dispatch [:logout])})))
 
 (rf/defn remove-network
   {:events [::remove-network-confirmed]}

src/status_im/node/core.cljs

@@ -1,9 +1,12 @@
 (ns status-im.node.core
   (:require
     [clojure.string :as string]
+    [native-module.core :as native-module]
+    [re-frame.core :as re-frame]
     [react-native.platform :as platform]
     [status-im.utils.deprecated-types :as types]
-    [status-im2.config :as config]))
+    [status-im2.config :as config]
+    [utils.re-frame :as rf]))
 
 (defn- add-custom-bootnodes
   [config network all-bootnodes]
@@ -193,4 +196,32 @@
       :always
       (add-log-level log-level))))
 
+(defn get-new-config
+  [db]
+  (types/clj->json (get-multiaccount-node-config db)))
 
+(rf/defn save-new-config
+  "Saves a new status-go config for the current account
+   This RPC method is the only way to change the node config of an account.
+   NOTE: it is better used indirectly through `prepare-new-config`,
+    which will take care of building up the proper config based on settings in
+app-db"
+  {:events [::save-new-config]}
+  [_ config {:keys [on-success]}]
+  {:json-rpc/call [{:method     "settings_saveSetting"
+                    :params     [:node-config config]
+                    :on-success on-success}]})
+
+(rf/defn prepare-new-config
+  "Use this function to apply settings to the current account node config"
+  [{:keys [db]} {:keys [on-success]}]
+  (let [key-uid (get-in db [:profile/profile :key-uid])]
+    {::prepare-new-config [key-uid
+                           (get-new-config db)
+                           #(re-frame/dispatch
+                             [::save-new-config % {:on-success on-success}])]}))
+
+(re-frame/reg-fx
+ ::prepare-new-config
+ (fn [[key-uid config callback]]
+   (native-module/prepare-dir-and-update-config key-uid config callback)))

src/status_im/pairing/core.cljs

@@ -165,9 +165,9 @@
   (if (< (count (filter :enabled? (vals (get-in cofx [:db :pairing/installations]))))
          (inc config/max-installations))
     {:pairing/enable-installation [installation-id]}
-    {:effects.utils/show-popup {:title   (i18n/label :t/pairing-maximum-number-reached-title)
+    {:utils/show-popup {:title   (i18n/label :t/pairing-maximum-number-reached-title)
 
-                                :content (i18n/label :t/pairing-maximum-number-reached-content)}}))
+                        :content (i18n/label :t/pairing-maximum-number-reached-content)}}))
 
 (rf/defn disable-fx
   {:events [:pairing.ui/disable-installation-pressed]}

src/status_im/qr_scanner/core.cljs

@@ -49,8 +49,8 @@
   [{:keys [db] :as cofx} {:keys [chat-id]}]
   (if-not (own-public-key? db chat-id)
     {:dispatch [:chat.ui/start-chat chat-id]}
-    {:effects.utils/show-popup {:title   (i18n/label :t/unable-to-read-this-code)
-                                :content (i18n/label :t/can-not-add-yourself)}}))
+    {:utils/show-popup {:title   (i18n/label :t/unable-to-read-this-code)
+                        :content (i18n/label :t/can-not-add-yourself)}}))
 
 (rf/defn handle-group-chat
   [cofx params]
@@ -71,9 +71,9 @@
                 (navigation/navigate-back))
 
       :else
-      {:effects.utils/show-popup {:title      (i18n/label :t/unable-to-read-this-code)
-                                  :content    (i18n/label :t/ens-name-not-found)
-                                  :on-dismiss #(re-frame/dispatch [:pop-to-root :shell-stack])}})))
+      {:utils/show-popup {:title      (i18n/label :t/unable-to-read-this-code)
+                          :content    (i18n/label :t/ens-name-not-found)
+                          :on-dismiss #(re-frame/dispatch [:pop-to-root :shell-stack])}})))
 
 (rf/defn handle-eip681
   [cofx data]
@@ -103,9 +103,9 @@
       (log/info "Unable to find matcher for scanned value"
                 {:type  type
                  :event ::match-scanned-value})
-      {:dispatch                 [:navigate-back]
-       :effects.utils/show-popup {:title      (i18n/label :t/unable-to-read-this-code)
-                                  :on-dismiss #(re-frame/dispatch [:pop-to-root :shell-stack])}})))
+      {:dispatch         [:navigate-back]
+       :utils/show-popup {:title      (i18n/label :t/unable-to-read-this-code)
+                          :on-dismiss #(re-frame/dispatch [:pop-to-root :shell-stack])}})))
 
 (rf/defn on-scan
   {:events [::on-scan-success]}

src/status_im/signals/core.cljs

@@ -1,12 +1,13 @@
-(ns status-im2.common.signals.events
+(ns status-im.signals.core
   (:require
+    [quo.foundations.colors :as colors]
     [status-im.chat.models.message :as models.message]
     [status-im.ethereum.subscriptions :as ethereum.subscriptions]
     [status-im.mailserver.core :as mailserver]
+    [status-im.transport.message.core :as transport.message]
     [status-im.visibility-status-updates.core :as visibility-status-updates]
-    [status-im2.common.pairing.events :as pairing]
+    [status-im2.constants :as constants]
     [status-im2.contexts.chat.messages.link-preview.events :as link-preview]
-    [status-im2.contexts.chat.messages.transport.events :as messages.transport]
     [status-im2.contexts.communities.discover.events]
     [status-im2.contexts.profile.login.events :as profile.login]
     [status-im2.contexts.push-notifications.local.events :as local-notifications]
@@ -28,6 +29,64 @@
   [{:keys [db]} peer-stats]
   {:db (assoc db :peer-stats peer-stats :peers-count (count (:peers peer-stats)))})
 
+(rf/defn handle-local-pairing-signals
+  [{:keys [db]} {:keys [type action data error] :as event}]
+  (log/info "local pairing signal received"
+            {:event event})
+  (let [{:keys [account password]}      data
+        role                            (get-in db [:syncing :role])
+        receiver?                       (= role constants/local-pairing-role-receiver)
+        sender?                         (= role constants/local-pairing-role-sender)
+        connection-success?             (and (= type
+                                                constants/local-pairing-event-connection-success)
+                                             (= action
+                                                constants/local-pairing-action-connect))
+        error-on-pairing?               (contains? constants/local-pairing-event-errors type)
+        completed-pairing?              (and (= type
+                                                constants/local-pairing-event-transfer-success)
+                                             (= action
+                                                constants/local-pairing-action-pairing-installation))
+        received-account?               (and (= type
+                                                constants/local-pairing-event-received-account)
+                                             (= action
+                                                constants/local-pairing-action-pairing-account)
+                                             (and (some? account) (some? password)))
+        multiaccount-data               (when received-account?
+                                          (merge account {:password password}))
+        navigate-to-syncing-devices?    (and (or connection-success? error-on-pairing?) receiver?)
+        user-in-syncing-devices-screen? (or (= (:view-id db) :syncing-progress)
+                                            (= (:view-id db) :syncing-progress-intro))
+        user-in-sign-in-intro-screen?   (= (:view-id db) :sign-in-intro)]
+    (merge {:db (cond-> db
+                  connection-success?
+                  (assoc-in [:syncing :pairing-status] :connected)
+
+                  received-account?
+                  (assoc-in [:syncing :profile] multiaccount-data)
+
+                  error-on-pairing?
+                  (assoc-in [:syncing :pairing-status] :error)
+
+                  completed-pairing?
+                  (assoc-in [:syncing :pairing-status] :completed))}
+           (cond
+             (and navigate-to-syncing-devices? (not user-in-syncing-devices-screen?))
+             {:dispatch (if user-in-sign-in-intro-screen?
+                          [:navigate-to-within-stack [:syncing-progress-intro :sign-in-intro]]
+                          [:navigate-to :syncing-progress])}
+
+             (and completed-pairing? sender?)
+             {:dispatch [:syncing/clear-states]}
+
+             (and completed-pairing? receiver?)
+             {:dispatch [:profile.login/local-paired-user]}
+
+             (and error-on-pairing? (some? error))
+             {:dispatch [:toasts/upsert
+                         {:icon       :i/alert
+                          :icon-color colors/danger-50
+                          :text       error}]}))))
+
 (rf/defn process
   {:events [:signals/signal-received]}
   [{:keys [db] :as cofx} event-str]
@@ -42,18 +101,18 @@
       "backup.performed"           {:db (assoc-in db
                                          [:profile/profile :last-backup]
                                          (.-lastBackup event-js))}
-      "envelope.sent"              (messages.transport/update-envelopes-status cofx
-                                                                               (:ids
-                                                                                (js->clj event-js
-                                                                                         :keywordize-keys
-                                                                                         true))
-                                                                               :sent)
-      "envelope.expired"           (messages.transport/update-envelopes-status cofx
-                                                                               (:ids
-                                                                                (js->clj event-js
-                                                                                         :keywordize-keys
-                                                                                         true))
-                                                                               :not-sent)
+      "envelope.sent"              (transport.message/update-envelopes-status cofx
+                                                                              (:ids
+                                                                               (js->clj event-js
+                                                                                        :keywordize-keys
+                                                                                        true))
+                                                                              :sent)
+      "envelope.expired"           (transport.message/update-envelopes-status cofx
+                                                                              (:ids
+                                                                               (js->clj event-js
+                                                                                        :keywordize-keys
+                                                                                        true))
+                                                                              :not-sent)
       "message.delivered"          (let [{:keys [chatID messageID]} (js->clj event-js
                                                                              :keywordize-keys
                                                                              true)]
@@ -67,9 +126,9 @@
       "discovery.summary"          (summary cofx (js->clj event-js :keywordize-keys true))
       "mediaserver.started"        {:db (assoc db :mediaserver/port (.-port event-js))}
       "wakuv2.peerstats"           (wakuv2-peer-stats cofx (js->clj event-js :keywordize-keys true))
-      "messages.new"               (messages.transport/sanitize-messages-and-process-response cofx
-                                                                                              event-js
-                                                                                              true)
+      "messages.new"               (transport.message/sanitize-messages-and-process-response cofx
+                                                                                             event-js
+                                                                                             true)
       "wallet"                     (ethereum.subscriptions/new-wallet-event cofx
                                                                             (js->clj event-js
                                                                                      :keywordize-keys
@@ -82,7 +141,7 @@
       "status.updates.timedout"    (visibility-status-updates/handle-visibility-status-updates
                                     cofx
                                     (js->clj event-js :keywordize-keys true))
-      "localPairing"               (pairing/handle-local-pairing-signals
+      "localPairing"               (handle-local-pairing-signals
                                     cofx
                                     (js->clj event-js :keywordize-keys true))
       "curated.communities.update" (rf/dispatch [:fetched-contract-communities

src/status_im/signing/keycard.cljs

@@ -78,9 +78,9 @@
   [{:keys [db]} data typed? result]
   (let [{:keys [result error]} (types/json->clj result)]
     (if error
-      {:dispatch                 [:signing.ui/cancel-is-pressed]
-       :effects.utils/show-popup {:title   (i18n/label :t/sign-request-failed)
-                                  :content (:message error)}}
+      {:dispatch         [:signing.ui/cancel-is-pressed]
+       :utils/show-popup {:title   (i18n/label :t/sign-request-failed)
+                          :content (:message error)}}
       {:db (update db
                    :keycard assoc
                    :hash    result

src/status_im/subs/ens.cljs

@@ -60,17 +60,10 @@
    {:state    state
     :username username}))
 
-(re-frame/reg-sub
- :ens/current-names
- :<- [:ens/names]
- :<- [:chain-id]
- (fn [[all-names chain-id]]
-   (get all-names chain-id)))
-
 (re-frame/reg-sub
  :ens.name/screen
  :<- [:get-screen-params :ens-name-details]
- :<- [:ens/current-names]
+ :<- [:ens/names]
  (fn [[name ens]]
    (let [{:keys [address public-key expiration-date releasable?]} (get ens name)
          pending?                                                 (nil? address)]
@@ -86,7 +79,7 @@
 
 (re-frame/reg-sub
  :ens.main/screen
- :<- [:ens/current-names]
+ :<- [:ens/names]
  :<- [:profile/profile]
  :<- [:ens/preferred-name]
  :<- [:ens/registrations]

src/status_im/subs/root.cljs

@@ -104,6 +104,7 @@
 ;;; Link previews
 (reg-root-key-sub :link-previews-whitelist :link-previews-whitelist)
 (reg-root-key-sub :chat/link-previews :chat/link-previews)
+(reg-root-key-sub :chat/status-link-previews :chat/status-link-previews)
 
 ;;commands
 (reg-root-key-sub :commands/select-account :commands/select-account)

src/status_im/transport/core.cljs

@@ -0,0 +1,58 @@
+(ns ^{:doc "API to init and stop whisper messaging"} status-im.transport.core
+  (:require
+    [re-frame.core :as re-frame]
+    [status-im.pairing.core :as pairing]
+    [status-im.stickers.core :as stickers]
+    status-im.transport.shh
+    [status-im2.common.universal-links :as universal-links]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+(rf/defn set-node-info
+  {:events [:transport.callback/node-info-fetched]}
+  [{:keys [db]} node-info]
+  {:db (assoc db :node-info node-info)})
+
+(rf/defn fetch-node-info-fx
+  [_]
+  {:json-rpc/call [{:method     "admin_nodeInfo"
+                    :on-success #(re-frame/dispatch [:transport.callback/node-info-fetched %])
+                    :on-error   #(log/error "node-info: failed error" %)}]})
+
+(defn add-mailservers
+  [db mailservers]
+  (reduce (fn [db {:keys [fleet id name] :as mailserver}]
+            (let [updated-mailserver
+                  (-> mailserver
+                      (update :id keyword)
+                      (assoc :name (if (seq name) name id))
+                      (dissoc :fleet))]
+              (assoc-in db
+               [:mailserver/mailservers (keyword fleet) (keyword id)]
+               updated-mailserver)))
+          db
+          mailservers))
+
+(rf/defn start-messenger
+  "We should only start receiving messages/processing topics once all the
+  initializiation is completed, otherwise we might receive messages/topics
+  when the state has not been properly initialized."
+  [_]
+  {:json-rpc/call [{:method     "wakuext_startMessenger"
+                    :on-success #(re-frame/dispatch [::messenger-started %])
+                    :on-error   #(log/error "failed to start messenger")}]})
+
+(rf/defn messenger-started
+  {:events [::messenger-started]}
+  [{:keys [db] :as cofx} {:keys [mailservers] :as response}]
+  (log/info "Messenger started")
+  (let [new-account? (get db :onboarding-2/new-account?)]
+    (rf/merge cofx
+              {:db (-> db
+                       (assoc :messenger/started? true)
+                       (add-mailservers mailservers))}
+              (fetch-node-info-fx)
+              (pairing/init)
+              (stickers/load-packs)
+              (when-not new-account?
+                (universal-links/process-stored-event)))))

src/status_im/transport/message/core.cljs

@@ -1,6 +1,5 @@
-(ns status-im2.contexts.chat.messages.transport.events
+(ns ^{:doc "Definition of the StatusMessage protocol"} status-im.transport.message.core
   (:require
-    [clojure.set :as set]
     [clojure.string :as string]
     [status-im.browser.core :as browser]
     [status-im.chat.models.message :as models.message]
@@ -21,7 +20,6 @@
     [status-im2.contexts.chat.messages.pin.events :as messages.pin]
     [status-im2.contexts.contacts.events :as models.contact]
     [status-im2.contexts.shell.activity-center.events :as activity-center]
-    [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
 
 (rf/defn process-next
@@ -349,58 +347,3 @@
            cofx
            (conj set-hash-fxs
                  #(sanitize-messages-and-process-response % response-js false)))))
-
-(defn- link-preview->rpc
-  [preview]
-  (update preview
-          :thumbnail
-          (fn [thumbnail]
-            (set/rename-keys thumbnail {:data-uri :dataUri}))))
-
-(defn build-message
-  [msg]
-  (-> msg
-      (update :link-previews #(map link-preview->rpc %))
-      (set/rename-keys
-       {:album-id          :albumId
-        :audio-duration-ms :audioDurationMs
-        :audio-path        :audioPath
-        :chat-id           :chatId
-        :community-id      :communityId
-        :content-type      :contentType
-        :ens-name          :ensName
-        :image-height      :imageHeight
-        :image-path        :imagePath
-        :image-width       :imageWidth
-        :link-previews     :linkPreviews
-        :response-to       :responseTo
-        :sticker           :sticker
-        :text              :text})))
-
-(rf/defn send-chat-messages
-  [_ messages]
-  {:json-rpc/call [{:method      "wakuext_sendChatMessages"
-                    :params      [(mapv build-message messages)]
-                    :js-response true
-                    :on-success  #(rf/dispatch [:transport/message-sent %])
-                    :on-error    #(do
-                                    (log/warn "failed to send a message" %)
-                                    (js/alert (str "failed to send a message: " %)))}]})
-
-(rf/defn send-emoji-reaction
-  {:events [:reactions/send-emoji-reaction]}
-  [{{:keys [current-chat-id]} :db} {:keys [message-id emoji-id]}]
-  {:json-rpc/call [{:method      "wakuext_sendEmojiReaction"
-                    :params      [current-chat-id message-id emoji-id]
-                    :js-response true
-                    :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])
-                    :on-error    #(log/error "failed to send a reaction" %)}]})
-
-(rf/defn send-retract-emoji-reaction
-  {:events [:reactions/send-emoji-reaction-retraction]}
-  [_ emoji-reaction-id]
-  {:json-rpc/call [{:method      "wakuext_sendEmojiReactionRetraction"
-                    :params      [emoji-reaction-id]
-                    :js-response true
-                    :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])
-                    :on-error    #(log/error "failed to send a reaction retraction" %)}]})

src/status_im/transport/message/protocol.cljs

@@ -0,0 +1,76 @@
+(ns ^{:doc "Protocol API and protocol utils"} status-im.transport.message.protocol
+  (:require
+    [clojure.set :as set]
+    [re-frame.core :as re-frame]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+(defn- image->rpc [image] (set/rename-keys image {:data-uri :dataUri}))
+
+(defn- link-preview->rpc
+  [preview]
+  (update preview
+          :thumbnail
+          (fn [thumbnail]
+            (image->rpc thumbnail))))
+
+(defn- status-link-preview->rpc
+  [preview]
+  (update preview
+          :community
+          (fn [community]
+            (-> community
+                (set/rename-keys {:community-id         :communityId
+                                  :display-name         :displayName
+                                  :members-count        :membersCount
+                                  :active-members-count :activeMembersCount})
+                (update :banner image->rpc)
+                (update :icon image->rpc)))))
+
+(defn build-message
+  [msg]
+  (-> msg
+      (update :link-previews #(map link-preview->rpc %))
+      (update :status-link-previews #(set (map status-link-preview->rpc %)))
+      (set/rename-keys
+       {:album-id             :albumId
+        :audio-duration-ms    :audioDurationMs
+        :audio-path           :audioPath
+        :chat-id              :chatId
+        :community-id         :communityId
+        :content-type         :contentType
+        :ens-name             :ensName
+        :image-height         :imageHeight
+        :image-path           :imagePath
+        :image-width          :imageWidth
+        :link-previews        :linkPreviews
+        :status-link-previews :statusLinkPreviews
+        :response-to          :responseTo
+        :sticker              :sticker
+        :text                 :text})))
+
+(rf/defn send-chat-messages
+  [_ messages]
+  {:json-rpc/call [{:method      "wakuext_sendChatMessages"
+                    :params      [(mapv build-message messages)]
+                    :js-response true
+                    :on-success  #(re-frame/dispatch [:transport/message-sent %])
+                    :on-error    #(do
+                                    (log/warn "failed to send a message" %)
+                                    (js/alert (str "failed to send a message: " %)))}]})
+
+(rf/defn send-reaction
+  [_ {:keys [message-id chat-id emoji-id]}]
+  {:json-rpc/call [{:method      "wakuext_sendEmojiReaction"
+                    :params      [chat-id message-id emoji-id]
+                    :js-response true
+                    :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])
+                    :on-error    #(log/error "failed to send a reaction" %)}]})
+
+(rf/defn send-retract-reaction
+  [_ {:keys [emoji-reaction-id]}]
+  {:json-rpc/call [{:method      "wakuext_sendEmojiReactionRetraction"
+                    :params      [emoji-reaction-id]
+                    :js-response true
+                    :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])
+                    :on-error    #(log/error "failed to send a reaction retraction" %)}]})

src/status_im/transport/shh.cljs

@@ -0,0 +1,35 @@
+(ns ^{:doc "Whisper API and events for managing keys and posting messages"} status-im.transport.shh
+  (:require
+    [re-frame.core :as re-frame]
+    [status-im2.common.json-rpc.events :as json-rpc]
+    [taoensso.timbre :as log]))
+
+(defn generate-sym-key-from-password
+  [{:keys [password on-success on-error]}]
+  (json-rpc/call {:method     "waku_generateSymKeyFromPassword"
+                  :params     [password]
+                  :on-success on-success
+                  :on-error   on-error}))
+
+(defn get-sym-key
+  [{:keys [sym-key-id on-success on-error]}]
+  (json-rpc/call {:method     "waku_getSymKey"
+                  :params     [sym-key-id]
+                  :on-success on-success
+                  :on-error   on-error}))
+
+(defn log-error
+  [error]
+  (log/error :shh/get-new-sym-key-error error))
+
+(re-frame/reg-fx
+ :shh/generate-sym-key-from-password
+ (fn [{:keys [password on-success]}]
+   (generate-sym-key-from-password
+    {:password   password
+     :on-success (fn [sym-key-id]
+                   (get-sym-key {:sym-key-id sym-key-id
+                                 :on-success (fn [sym-key]
+                                               (on-success sym-key sym-key-id))
+                                 :on-error   log-error}))
+     :on-error   log-error})))

src/status_im/transport/utils.cljs

@@ -0,0 +1,18 @@
+(ns ^{:doc "Utils for transport layer"} status-im.transport.utils
+  (:require
+    [clojure.string :as string]))
+
+(defn extract-enode-id
+  [enode]
+  (-> enode
+      (string/split #"/")
+      (get 2 "")
+      (string/split #":")
+      (get 0 "")
+      (string/split "@")
+      (get 0)))
+
+(defn extract-url-components
+  [address]
+  (when address
+    (rest (re-matches #"enode://(.*?)@(.*):(.*)" address))))

src/status_im/ui/screens/advanced_settings/views.cljs

@@ -7,16 +7,12 @@
     [utils.i18n :as i18n])
   (:require-macros [status-im.utils.views :as views]))
 
-(defn hide-sheet-and-dispatch
-  [event]
-  (re-frame/dispatch [:bottom-sheet/hide-old])
-  (re-frame/dispatch event))
-
 (defn- normal-mode-settings-data
   [{:keys [network-name
            current-log-level
-           light-client-enabled?
+           waku-bloom-filter-mode
            transactions-management-enabled?
+           wakuv2-flag
            current-fleet
            webview-debug]}]
   (keep
@@ -53,12 +49,19 @@
      :accessory :text
      :accessory-text current-fleet
      :chevron true}
-    {:size :small
-     :title (i18n/label :t/wakuv2-settings)
-     :accessibility-label :wakuv2-settings-button
-     :on-press
-     #(re-frame/dispatch [:wakuv2.ui/enter-settings-pressed])
-     :chevron true}
+    (if wakuv2-flag
+      {:size :small
+       :title (i18n/label :t/wakuv2-settings)
+       :accessibility-label :wakuv2-settings-button
+       :on-press
+       #(re-frame/dispatch [:wakuv2.ui/enter-settings-pressed])
+       :chevron true}
+      {:size :small
+       :title (i18n/label :t/bootnodes)
+       :accessibility-label :bootnodes-settings-button
+       :on-press
+       #(re-frame/dispatch [:navigate-to :bootnodes-settings])
+       :chevron true})
     {:size :small
      :title (i18n/label :t/rpc-usage-info)
      :accessibility-label :rpc-usage-info
@@ -73,15 +76,6 @@
      :on-press
      #(re-frame/dispatch [:navigate-to :peers-stats])
      :chevron true}
-    {:size :small
-     :title (i18n/label :t/light-client-enabled)
-     :accessibility-label :light-client-enabled
-     :container-margin-bottom 8
-     :on-press
-     #(re-frame/dispatch
-       [:wakuv2.ui/toggle-light-client (not light-client-enabled?)])
-     :accessory :switch
-     :active light-client-enabled?}
     {:size :small
      :title (i18n/label :t/transactions-management-enabled)
      :accessibility-label :transactions-management-enabled
@@ -100,7 +94,16 @@
      #(re-frame/dispatch
        [:profile.settings/change-webview-debug (not webview-debug)])
      :accessory :switch
-     :active webview-debug}]))
+     :active webview-debug}
+    {:size :small
+     :title (i18n/label :t/waku-bloom-filter-mode)
+     :accessibility-label :waku-bloom-filter-mode-settings-switch
+     :container-margin-bottom 8
+     :on-press
+     #(re-frame/dispatch
+       [:multiaccounts.ui/waku-bloom-filter-mode-switched (not waku-bloom-filter-mode)])
+     :accessory :switch
+     :active waku-bloom-filter-mode}]))
 
 (defn- flat-list-data
   [options]
@@ -114,9 +117,10 @@
 
 (views/defview advanced-settings
   []
-  (views/letsubs [webview-debug                    [:profile/webview-debug]
-                  light-client-enabled?            [:profile/light-client-enabled?]
+  (views/letsubs [{:keys [webview-debug]}          [:profile/profile]
                   network-name                     [:network-name]
+                  waku-bloom-filter-mode           [:waku/bloom-filter-mode]
+                  wakuv2-flag                      [:waku/v2-flag]
                   transactions-management-enabled? [:wallet-legacy/transactions-management-enabled?]
                   current-log-level                [:log-level/current-log-level]
                   current-fleet                    [:fleets/current-fleet]]
@@ -125,9 +129,10 @@
                   {:network-name                     network-name
                    :current-log-level                current-log-level
                    :transactions-management-enabled? transactions-management-enabled?
-                   :light-client-enabled?            light-client-enabled?
                    :current-fleet                    current-fleet
                    :dev-mode?                        false
+                   :wakuv2-flag                      wakuv2-flag
+                   :waku-bloom-filter-mode           waku-bloom-filter-mode
                    :webview-debug                    webview-debug})
       :key-fn    (fn [_ i] (str i))
       :render-fn render-item}]))

src/status_im/ui/screens/fleet_settings/views.cljs

@@ -1,6 +1,7 @@
 (ns status-im.ui.screens.fleet-settings.views
   (:require
     [re-frame.core :as re-frame]
+    [status-im.node.core :as node]
     [status-im.ui.components.icons.icons :as icons]
     [status-im.ui.components.list.views :as list]
     [status-im.ui.components.react :as react]

src/status_im/ui/screens/privacy_and_security_settings/events.cljs

@@ -56,7 +56,7 @@
   {:events [::on-delete-profile-success]}
   [cofx]
   (log/info "[delete-profile] on-success")
-  {:effects.utils/show-popup
+  {:utils/show-popup
    {:title      (i18n/label :t/profile-deleted-title)
     :content    (i18n/label :t/profile-deleted-content)
     :on-dismiss #(re-frame/dispatch [:logout])}})

src/status_im/ui/screens/profile/seed/views.cljs

@@ -46,8 +46,7 @@
      :key   :your-data-belongs-to-you-description}]
    [react/view {:style styles/intro-button}
     [quo/button
-     {:on-press #(do (re-frame/dispatch [:set-in [:my-profile/seed :step] :12-words])
-                     (re-frame/dispatch [:profile.settings/mnemonic-was-shown]))}
+     {:on-press #(re-frame/dispatch [:set-in [:my-profile/seed :step] :12-words])}
      (i18n/label :t/ok-continue)]]])
 
 (defn six-words

src/status_im/ui/screens/profile/user/views.cljs

@@ -207,7 +207,7 @@
                   key-uid]
            :as   profile}
           @(re-frame/subscribe [:profile/profile-with-image])
-          customization-color (or (:color @(re-frame/subscribe [:onboarding/profile]))
+          customization-color (or (:color @(re-frame/subscribe [:onboarding-2/profile]))
                                   @(re-frame/subscribe [:profile/customization-color key-uid]))
           on-share #(re-frame/dispatch [:show-popover
                                         {:view     :share-chat-key

src/status_im/ui/screens/wallet/send/views.cljs

@@ -1,8 +1,10 @@
 (ns status-im.ui.screens.wallet.send.views
-  (:require-macros [status-im.utils.views :as views])
+  (:require-macros [status-im.utils.views :refer [defview letsubs] :as views])
   (:require
     [quo.core :as quo]
     [re-frame.core :as re-frame]
+    [status-im.commands.core :as commands]
+    [status-im.ui.components.bottom-panel.views :as bottom-panel]
     [status-im.ui.components.chat-icon.screen :as chat-icon]
     [status-im.ui.components.colors :as colors]
     [status-im.ui.components.core :as components.core]
@@ -127,6 +129,47 @@
             " "
             (:code wallet-currency))])))
 
+(defn select-account-sheet
+  [{:keys [from message]}]
+  [react/view {:style (styles/acc-sheet)}
+   [header
+    {:small-screen? false
+     :label         :t/select-account}]
+   [react/view
+    {:flex-direction     :row
+     :padding-horizontal 24
+     :align-items        :center
+     :margin-vertical    16}]
+   [components.core/list-header
+    (i18n/label :t/from-capitalized)]
+   [react/view {:flex-direction :row :flex 1 :align-items :center}
+    [react/view {:flex 1}
+     [render-account from nil ::commands/set-selected-account]]]
+   [toolbar/toolbar
+    {:left
+     [react/view {:padding-horizontal 8}
+      [components.core/button
+       {:type     :secondary
+        :on-press #(re-frame/dispatch [:set :commands/select-account nil])}
+       (i18n/label :t/cancel)]]
+     :right
+     [components.core/button
+      {:accessibility-label :select-account-bottom-sheet
+       :disabled            (nil? from)
+       :on-press            #(re-frame/dispatch
+                              [::commands/accept-request-address-for-transaction
+                               (:message-id message)
+                               (:address from)])}
+      (i18n/label :t/share)]}]])
+
+(defview select-account
+  []
+  (letsubs [data [:commands/select-account]]
+    [bottom-panel/animated-bottom-panel
+     data
+     select-account-sheet
+     #(re-frame/dispatch [:hide-select-acc-sheet])]))
+
 (views/defview request-transaction
   [_]
   (views/letsubs [{:keys [amount-error amount-text from token sign-enabled?] :as tx}

src/status_im/utils/keychain/core.cljs

@@ -6,6 +6,10 @@
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
 
+(def auth-method-biometric "biometric")
+(def auth-method-biometric-prepare "biometric-prepare")
+(def auth-method-none "none")
+
 (defn- whisper-key-name
   [address]
   (str address "-whisper"))

src/status_im/utils/logging/core.cljs

@@ -7,6 +7,7 @@
     [react-native.mail :as react-native-mail]
     [react-native.platform :as platform]
     [status-im.bottom-sheet.events :as bottom-sheet]
+    [status-im.transport.utils :as transport.utils]
     [status-im.ui.components.react :as react]
     [status-im.utils.build :as build]
     [status-im.utils.deprecated-types :as types]
@@ -37,11 +38,6 @@
   {:json-rpc/call [{:method     "web3_clientVersion"
                     :on-success #(re-frame/dispatch [:logging/store-web3-client-version %])}]})
 
-(defn extract-url-components
-  [address]
-  (when address
-    (rest (re-matches #"enode://(.*?)@(.*):(.*)" address))))
-
 (defn email-body
   "logs attached"
   [{:keys [:web3-node-version :mailserver/current-id
@@ -50,7 +46,7 @@
         build-version (str build/version " (" build-number ")")
         separator (string/join (take 40 (repeat "-")))
         [enode-id ip-address port]
-        (extract-url-components (:enode node-info))]
+        (transport.utils/extract-url-components (:enode node-info))]
     (string/join
      "\n"
      (concat [(i18n/label :t/report-bug-email-template
@@ -72,7 +68,7 @@
              (mapcat
               (fn [{:keys [enode]}]
                 (let [[enode-id ip-address port]
-                      (extract-url-components enode)]
+                      (transport.utils/extract-url-components enode)]
                   [(str "id: " enode-id)
                    (str "ip: " ip-address)
                    (str "port: " port)
@@ -155,15 +151,15 @@
 (rf/defn show-client-error
   {:events [:show-client-error]}
   [_]
-  {:effects.utils/show-popup {:title   (i18n/label :t/cant-report-bug)
-                              :content (i18n/label :t/mail-should-be-configured)}})
+  {:utils/show-popup {:title   (i18n/label :t/cant-report-bug)
+                      :content (i18n/label :t/mail-should-be-configured)}})
 
 (rf/defn show-logs-dialog
   {:events [:shake-event]}
   [{:keys [db]}]
   (when-not (:logging/dialog-shown? db)
     {:db (assoc db :logging/dialog-shown? true)
-     :effects.utils/show-confirmation
+     :utils/show-confirmation
      (cond-> {:title               (i18n/label :t/send-logs)
               :content             (i18n/label :t/send-logs-to
                                                {:email report-email})

src/status_im/utils/pairing.cljs

@@ -0,0 +1,11 @@
+(ns ^{:doc "Pairing utils"} status-im.utils.pairing)
+
+(defn has-paired-installations?
+  [cofx]
+  (let [our-installation-id (get-in cofx [:db :profile/profile :installation-id])]
+    (->>
+      (get-in cofx [:db :pairing/installations])
+      vals
+      (some (fn [{:keys [enabled? installation-id]}]
+              (and (not= installation-id our-installation-id)
+                   enabled?))))))

src/status_im/utils/snoopy.cljs

@@ -0,0 +1,120 @@
+(ns status-im.utils.snoopy
+  (:require
+    ["react-native/Libraries/vendor/emitter/EventEmitter" :refer [EventEmitter]]
+    ["rn-snoopy" :default snoopy]
+    ["rn-snoopy/stream/bars" :default bars]
+    ["rn-snoopy/stream/buffer" :default buffer]
+    ["rn-snoopy/stream/filter" :default sn-filter]
+    [clojure.string :as string]
+    [status-im2.config :as config]))
+
+(defn create-filter
+  [f]
+  (fn [^js message]
+    (let [method    (.-method message)
+          module    (.-module message)
+          ^js args  (.-args message)
+          first-arg (when (pos? (.-length args))
+                      (aget args 0))]
+      (f {:method    method
+          :module    module
+          :first-arg first-arg}))))
+
+(defn status-module-filter
+  [{:keys [method module first-arg]}]
+  (or (= module "Status")
+      (and (= module "RCTNativeAppEventEmitter")
+           (= method "emit")
+           (= first-arg "gethEvent"))
+      (and
+       (string? method)
+       (string/starts-with? method "<callback for Status."))))
+
+(defn timer-filter
+  [{:keys [method]}]
+  (contains? #{"callTimers" "createTimer"} method))
+
+(defn websocket-filter
+  [{:keys [module first-arg]}]
+  (or (= module "WebSocketModule")
+      (and (= module "RCTDeviceEventEmitter")
+           (contains? #{"websocketFailed" "websocketMessage"} first-arg))))
+
+(defn ui-manager-filter
+  [{:keys [module]}]
+  (= module "UIManager"))
+
+(defn touches-filter
+  [{:keys [method module]}]
+  (and (= module "RCTEventEmitter")
+       (= method "receiveTouches")))
+
+(defn native-animation-filter
+  [{:keys [method module]}]
+  (or (= module "NativeAnimatedModule")
+      (and
+       (string? method)
+       (string/starts-with? method "<callback for NativeAnimatedModule."))))
+
+(defn keyboard-observer-filter
+  [{:keys [module]}]
+  ;; mostly all calls to KeyboardObserver are done by FlatList
+  (= module "KeyboardObserver"))
+
+(defn threshold-warnings
+  [{:keys [filter-fn label tick? print-events? threshold events threshold-message]}]
+  (.subscribe ^js
+              ((bars
+                (fn [^js a] (.-length a))
+                threshold
+                tick?
+                true
+                label
+                threshold-message)
+               ((buffer)
+                ((sn-filter (create-filter filter-fn)
+                            print-events?)
+                 events)))))
+
+;; In order to enable snoopy set SNOOPY=1 in .env file.
+;; By default events are not printed and you will see warnings only when
+;; the number of events is exceeding the threshold.
+;; For debugging UI perf, in particular the number of bridge calls caused
+;; by view components set `:print-events?=true` for `ui-manager-filter`,
+;; and then collect printed data in logs.
+(defn subscribe!
+  []
+  (when config/snoopy-enabled?
+    (let [emitter-class EventEmitter
+          emitter       (emitter-class.)
+          events        (.stream snoopy emitter)]
+      (threshold-warnings
+       {:filter-fn         (constantly true)
+        :label             "all messages"
+        :threshold-message "too many calls to bridge, something suspicious is happening"
+        :tick?             false
+        :print-events?     false
+        :threshold         400
+        :events            events})
+
+      (threshold-warnings
+       {:filter-fn         timer-filter
+        :label             "timer"
+        :threshold-message "too many setTimeout/setInterval calls"
+        :tick?             false
+        :print-events?     false
+        :threshold         70
+        :events            events})
+
+      (threshold-warnings
+       {:filter-fn         ui-manager-filter
+        :label             "timer"
+        :threshold-message (str
+                            "too many calls to UIManager, most likely during navigation. "
+                            "Please consider preloading of screens or lazy loading of some components")
+        :tick?             false
+        :print-events?     true
+        ;; todo(rasom): revisit this number when/if
+        ;; https://github.com/status-im/status-mobile/pull/2849 will be merged
+        :threshold         200
+        :events            events}))))

src/status_im/utils/wallet_connect.cljs

@@ -0,0 +1,31 @@
+(ns status-im.utils.wallet-connect
+  (:require
+    ["@react-native-async-storage/async-storage" :default AsyncStorage]
+    ["@walletconnect/client" :refer [CLIENT_EVENTS] :default WalletConnectClient]
+    [clojure.string :as string]
+    [status-im2.config :as config]))
+
+(defn init
+  [on-success on-error]
+  (-> ^js WalletConnectClient
+      (.init (clj->js {:controller     true
+                       :projectId      config/wallet-connect-project-id
+                       :logger         "debug"
+                       :metadata       config/default-wallet-connect-metadata
+                       :storageOptions {:asyncStorage ^js AsyncStorage}}))
+      (.then on-success)
+      (.catch on-error)))
+
+(defn session-request-event [] (.-request (.-session CLIENT_EVENTS)))
+
+(defn session-created-event [] (.-created (.-session CLIENT_EVENTS)))
+
+(defn session-deleted-event [] (.-deleted (.-session CLIENT_EVENTS)))
+
+(defn session-proposal-event [] (.-proposal (.-session CLIENT_EVENTS)))
+
+(defn session-updated-event [] (.-updated (.-session CLIENT_EVENTS)))
+
+(defn url?
+  [url]
+  (string/starts-with? url "wc:"))

src/status_im/waku/core.cljs

@@ -2,11 +2,22 @@
   (:require
     [clojure.string :as string]
     [re-frame.core :as re-frame]
+    [status-im.multiaccounts.update.core :as multiaccounts.update]
+    [status-im.node.core :as node]
     [status-im2.navigation.events :as navigation]
-    [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
+(rf/defn switch-waku-bloom-filter-mode
+  {:events [:multiaccounts.ui/waku-bloom-filter-mode-switched]}
+  [cofx enabled?]
+  (rf/merge cofx
+            (multiaccounts.update/multiaccount-update
+             :waku-bloom-filter-mode
+             enabled?
+             {})
+            (node/prepare-new-config
+             {:on-success #(re-frame/dispatch [:logout])})))
 
 (def address-regex #"/ip4/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/tcp/\d{1,5}/p2p/[a-zA-Z0-9]+")
 
@@ -97,16 +108,13 @@
                        vals
                        (map #(vector (:name %1) (:address %1)))
                        (into {}))]
-    {:db            (-> db
-                        (assoc-in [:profile/profile :wakuv2-config :CustomNodes] new-nodes)
-                        (dissoc :wakuv2-nodes/manage :wakuv2-nodes/list))
-     :json-rpc/call [{:method     "wakuext_setCustomNodes"
-                      :params     [{:customNodes new-nodes}]
-                      :on-success #(log/info "updated custom nodes")
-                      :on-error   #(log/error "failed to set custom nodes"
-                                              {:error        %
-                                               :custom-nodes new-nodes})}]
-     :dispatch      [:navigate-back]}))
+    (rf/merge cofx
+              {:db       (-> db
+                             (assoc-in [:profile/profile :wakuv2-config :CustomNodes] new-nodes)
+                             (dissoc :wakuv2-nodes/manage :wakuv2-nodes/list))
+               :dispatch [:navigate-back]}
+              (node/prepare-new-config
+               {:on-success #(re-frame/dispatch [:logout])}))))
 
 (rf/defn show-delete-node-confirmation
   {:events [:wakuv2.ui/delete-pressed]}
@@ -123,17 +131,3 @@
   (rf/merge cofx
             (delete id)
             (navigation/navigate-back)))
-
-(rf/defn toggle-light-client
-  {:events [:wakuv2.ui/toggle-light-client]}
-  [{:keys [db]} enabled?]
-  {:db            (assoc-in db [:profile/profile :wakuv2-config :LightClient] enabled?)
-
-   :json-rpc/call [{:method     "wakuext_setLightClient"
-                    :params     [{:enabled enabled?}]
-                    :on-success (fn []
-                                  (log/info "light client set successfully" enabled?)
-                                  (re-frame/dispatch [:logout]))
-                    :on-error   #(log/error "failed to set light client"
-                                            {:error    %
-                                             :enabled? enabled?})}]})

src/status_im/wallet/accounts/core.cljs

@@ -359,8 +359,8 @@
   (let [deleted-address (:address account)
         dapps-address   (get-in cofx [:db :profile/profile :dapps-address])]
     (if (= (string/lower-case dapps-address) (string/lower-case deleted-address))
-      {:effects.utils/show-popup {:title   (i18n/label :t/warning)
-                                  :content (i18n/label :t/account-is-used)}}
+      {:utils/show-popup {:title   (i18n/label :t/warning)
+                          :content (i18n/label :t/account-is-used)}}
       {:key-storage/delete-imported-key
        {:key-uid    (get-in db [:profile/profile :key-uid])
         :address    (:address account)
@@ -379,8 +379,8 @@
                               (assoc-in [:add-account :scanned-address] address)
                               (assoc-in [:add-account :address] address))}
                      (when-not address
-                       {:effects.utils/show-popup {:title   (i18n/label :t/error)
-                                                   :content (i18n/label :t/invalid-address-qr-code)}}))
+                       {:utils/show-popup {:title   (i18n/label :t/error)
+                                           :content (i18n/label :t/invalid-address-qr-code)}}))
               (navigation/navigate-back))))
 
 (re-frame/reg-fx
@@ -392,3 +392,4 @@
   {:events [:wallet-legacy.accounts/share]}
   [_ address]
   {:list.selection/open-share {:message (eip55/address->checksum address)}})
+

src/status_im/wallet/choose_recipient/core.cljs

@@ -7,6 +7,7 @@
     [status-im.ethereum.ens :as ens]
     [status-im.ethereum.tokens :as tokens]
     [status-im.qr-scanner.core :as qr-scaner]
+    [status-im.utils.wallet-connect :as wallet-connect]
     [status-im.wallet.utils :as wallet.utils]
     [status-im2.common.router :as router]
     [status-im2.navigation.events :as navigation]
@@ -172,7 +173,11 @@
       (if (links/universal-link? uri)
         {:dispatch [:universal-links/handle-url uri]}
         {:browser/show-browser-selection uri})
-      {:ui/show-error (i18n/label :t/wallet-invalid-address {:data uri})})))
+      (if (wallet-connect/url? uri)
+        {:ui/show-error "Wallet Connect not implemented"}
+        ;; Re-enable with https://github.com/status-im/status-mobile/issues/13429
+        ;; {:dispatch [::qr-scaner/handle-wallet-connect-uri {:data uri}]}
+        {:ui/show-error (i18n/label :t/wallet-invalid-address {:data uri})}))))
 
 (rf/defn qr-scanner-result
   {:events [:wallet-legacy.send/qr-scanner-result]}

src/status_im/wallet/core.cljs

@@ -246,8 +246,8 @@
         assets                                  (get visible-tokens chain)
         tokens                                  (->> (vals all-tokens)
                                                      (remove #(or (:hidden? %)
-                                                                  ;;if not scan-all-tokens? remove
-                                                                  ;;not visible tokens
+                                                                  ;;if not scan-all-tokens? remove not
+                                                                  ;;visible tokens
                                                                   (and (not scan-all-tokens?)
                                                                        (not (get assets (:symbol %))))))
                                                      (reduce (fn [acc {:keys [address symbol]}]
@@ -822,8 +822,8 @@
 (rf/defn get-buy-crypto-preference
   {:events [::get-buy-crypto]}
   [_]
-  {:effects.async-storage/get {:keys [:buy-crypto-hidden]
-                               :cb   #(re-frame/dispatch [::store-buy-crypto-preference %])}})
+  {:async-storage-get {:keys [:buy-crypto-hidden]
+                       :cb   #(re-frame/dispatch [::store-buy-crypto-preference %])}})
 
 (rf/defn wallet-will-focus
   {:events [::wallet-stack]}
@@ -844,8 +844,8 @@
 (rf/defn hide-buy-crypto
   {:events [::hide-buy-crypto]}
   [{:keys [db]}]
-  {:db                        (assoc db :wallet-legacy/buy-crypto-hidden true)
-   :effects.async-storage/set {:buy-crypto-hidden true}})
+  {:db                (assoc db :wallet-legacy/buy-crypto-hidden true)
+   :async-storage-set {:buy-crypto-hidden true}})
 
 (rf/defn store-buy-crypto
   {:events [::store-buy-crypto-preference]}
@@ -1023,8 +1023,8 @@
 (rf/defn switch-transactions-management-enabled
   {:events [:multiaccounts.ui/switch-transactions-management-enabled]}
   [{:keys [db]} enabled?]
-  {:effects.async-storage/set {:transactions-management-enabled? enabled?}
-   :db                        (assoc db :wallet-legacy/transactions-management-enabled? enabled?)})
+  {:async-storage-set {:transactions-management-enabled? enabled?}
+   :db                (assoc db :wallet-legacy/transactions-management-enabled? enabled?)})
 
 (re-frame/reg-fx
  :wallet-legacy/initialize-transactions-management-enabled
@@ -1072,9 +1072,10 @@
                                                        true])}))
     2000)))
 
-;;TODO: this could be replaced by a single API call on status-go side
-(re-frame/reg-fx :wallet-legacy/initialize-wallet
- (fn [[network-id _network callback]]
+(re-frame/reg-fx
+ ;;TODO: this could be replaced by a single API call on status-go side
+ :wallet-legacy/initialize-wallet
+ (fn [[network-id network callback]]
    (-> (js/Promise.all
         (clj->js
          [(js/Promise.
@@ -1082,6 +1083,24 @@
              (json-rpc/call {:method     "accounts_getAccounts"
                              :on-success resolve-fn
                              :on-error   reject})))
+          (js/Promise.
+           (fn [resolve-fn _]
+             (json-rpc/call
+              {:method "wallet_addEthereumChain"
+               :params
+               [{:isTest                 false
+                 :tokenOverrides         []
+                 :rpcUrl                 (get-in network [:config :UpstreamConfig :URL])
+                 :chainColor             "green"
+                 :chainName              (:name network)
+                 :nativeCurrencyDecimals 10
+                 :shortName              "erc20"
+                 :layer                  1
+                 :chainId                (int network-id)
+                 :enabled                false
+                 :fallbackURL            (get-in network [:config :UpstreamConfig :URL])}]
+               :on-success resolve-fn
+               :on-error (fn [_] (resolve-fn nil))})))
           (js/Promise.
            (fn [resolve-fn _]
              (json-rpc/call {:method     "wallet_getTokens"

src/status_im/wallet/custom_tokens/core.cljs

@@ -65,8 +65,8 @@
 (rf/defn not-supported
   {:events [:wallet-legacy.custom-token/not-supported]}
   [{:keys [db]}]
-  {:db                       (assoc-in db [:wallet-legacy/custom-token-screen :in-progress?] nil)
-   :effects.utils/show-popup {:content (i18n/label :t/contract-isnt-supported)}})
+  {:db               (assoc-in db [:wallet-legacy/custom-token-screen :in-progress?] nil)
+   :utils/show-popup {:content (i18n/label :t/contract-isnt-supported)}})
 
 (rf/defn add-custom-token
   {:events [:wallet-legacy.custom-token.ui/add-pressed]}

src/status_im/wallet_connect/core.cljs

@@ -0,0 +1,288 @@
+(ns status-im.wallet-connect.core
+  (:require
+    [clojure.string :as string]
+    [re-frame.core :as re-frame]
+    [status-im.browser.core :as browser]
+    [status-im.signing.core :as signing]
+    [status-im.utils.deprecated-types :as types]
+    [status-im.utils.wallet-connect :as wallet-connect]
+    [status-im2.config :as config]
+    [status-im2.constants :as constants]
+    [taoensso.timbre :as log]
+    [utils.address :as address]
+    [utils.re-frame :as rf]))
+
+(rf/defn proposal-handler
+  {:events [:wallet-connect/proposal]}
+  [{:keys [db] :as cofx} request-event]
+  (let [proposal (types/js->clj request-event)
+        proposer (:proposer proposal)
+        metadata (:metadata proposer)]
+    {:db                        (assoc db
+                                       :wallet-connect/proposal          proposal
+                                       :wallet-connect/proposal-metadata metadata)
+     :show-wallet-connect-sheet nil}))
+
+(rf/defn session-connected
+  {:events [:wallet-connect/created]}
+  [{:keys [db]} session]
+  (let [session (merge (types/js->clj session) {:wc-version 2})
+        client  (get db :wallet-connect/client)]
+    (log/debug "[wallet connect] session created - " session)
+    {:show-wallet-connect-success-sheet nil
+     :db                                (assoc db
+                                               :wallet-connect/session-connected session
+                                               :wallet-connect/sessions          (types/js->clj
+                                                                                  (.-values
+                                                                                   (.-session
+                                                                                    client))))}))
+
+(rf/defn manage-app
+  {:events [:wallet-connect/manage-app]}
+  [{:keys [db]} session]
+  (let [session (types/js->clj session)]
+    {:db                                       (assoc db
+                                                      :wallet-connect/session-managed session
+                                                      :wallet-connect/showing-app-management-sheet? true)
+     :show-wallet-connect-app-management-sheet nil}))
+
+(rf/defn request-handler
+  {:events [:wallet-connect/request]}
+  [{:keys [db] :as cofx} request-event]
+  (let [request              (types/js->clj request-event)
+        params               (:request request)
+        pending-requests     (or (:wallet-connect/pending-requests db) [])
+        new-pending-requests (conj pending-requests request)
+        client               (get db :wallet-connect/client)
+        topic                (:topic request)]
+    {:db       (assoc db :wallet-connect/pending-requests new-pending-requests)
+     :dispatch [:wallet-connect/request-received request]}))
+
+(rf/defn request-handler-test
+  {:events [:wallet-connect/request-test]}
+  [{:keys [db] :as cofx}]
+  {:show-wallet-connect-sheet nil})
+
+(defn subscribe-to-events
+  [^js wallet-connect-client]
+  (.on wallet-connect-client
+       (wallet-connect/session-request-event)
+       #(re-frame/dispatch [:wallet-connect/request %]))
+  (.on wallet-connect-client
+       (wallet-connect/session-created-event)
+       #(re-frame/dispatch [:wallet-connect/created %]))
+  (.on wallet-connect-client
+       (wallet-connect/session-deleted-event)
+       #(re-frame/dispatch [:wallet-connect/update-sessions]))
+  (.on wallet-connect-client
+       (wallet-connect/session-updated-event)
+       #(re-frame/dispatch [:wallet-connect/update-sessions]))
+  (.on wallet-connect-client
+       (wallet-connect/session-proposal-event)
+       #(re-frame/dispatch [:wallet-connect/proposal %])))
+
+(re-frame/reg-fx
+ :wc-2-init
+ (fn []
+   (wallet-connect/init
+    #(re-frame/dispatch [:wallet-connect/client-init %])
+    #(log/error "[wallet-connect]" %))))
+
+(re-frame/reg-fx
+ :wc-2-subscribe-to-events
+ (fn [client]
+   (subscribe-to-events client)))
+
+(re-frame/reg-fx
+ :wc-2-client-approve-proposal
+ (fn [[client proposal response]]
+   (-> ^js client
+       (.approve (clj->js {:proposal proposal :response response}))
+       (.then #(log/debug "[wallet-connect] session proposal approved"))
+       (.catch #(log/error "[wallet-connect] session proposal approval error:" %)))))
+
+(re-frame/reg-fx
+ :wc-2-client-reject-proposal
+ (fn [[client proposal]]
+   (-> ^js client
+       (.reject (clj->js {:proposal proposal}))
+       (.then #(log/debug "[wallet-connect] session proposal rejected"))
+       (.catch #(log/error "[wallet-connect] " %)))))
+
+(re-frame/reg-fx
+ :wc-2-client-disconnect
+ (fn [[client topic]]
+   (-> ^js client
+       (.disconnect (clj->js {:topic topic}))
+       (.then #(log/debug "[wallet-connect] session disconnected - topic " topic))
+       (.catch #(log/error "[wallet-connect] " %)))))
+
+(re-frame/reg-fx
+ :wc-2-change-session
+ (fn [[client topic accounts]]
+   (-> ^js client
+       (.update (clj->js {:topic topic
+                          :state {:accounts accounts}}))
+       (.then #(log/debug "[wallet-connect] session topic " topic
+                          " changed to account "            (first accounts)))
+       (.catch #(log/error "[wallet-connect] " %)))))
+
+(re-frame/reg-fx
+ :wc-2-pair
+ (fn [[client uri]]
+   (.pair client (clj->js {:uri uri}))))
+
+(re-frame/reg-fx
+ :wc-2-respond
+ (fn [[client response]]
+   (.respond client (clj->js response))))
+
+(rf/defn approve-proposal
+  {:events [:wallet-connect/approve-proposal]}
+  [{:keys [db]} account]
+  (let [client              (get db :wallet-connect/client)
+        proposal            (get db :wallet-connect/proposal)
+        topic               (:topic proposal)
+        permissions         (:permissions proposal)
+        blockchain          (:blockchain permissions)
+        proposal-chain-ids  (map #(last (string/split % #":")) (:chains blockchain))
+        available-chain-ids (map #(get-in % [:config :NetworkId]) (vals (get db :networks/networks)))
+        supported-chain-ids (filter (fn [chain-id] #(boolean (some #{chain-id} available-chain-ids)))
+                                    proposal-chain-ids)
+        address             (:address account)
+        accounts            (map #(str "eip155:" % ":" (address/normalized-hex address))
+                                 supported-chain-ids)
+        ;; TODO: Check for unsupported
+        metadata            (get db :wallet-connect/proposal-metadata)
+        response            {:state    {:accounts accounts}
+                             :metadata config/default-wallet-connect-metadata}]
+    {:hide-wallet-connect-sheet    nil
+     :wc-2-client-approve-proposal [client proposal response]}))
+
+(rf/defn reject-proposal
+  {:events [:wallet-connect/reject-proposal]}
+  [{:keys [db]} account]
+  (let [client   (get db :wallet-connect/client)
+        proposal (get db :wallet-connect/proposal)]
+    {:hide-wallet-connect-sheet   nil
+     :wc-2-client-reject-proposal client}))
+
+(rf/defn change-session-account
+  {:events [:wallet-connect/change-session-account]}
+  [{:keys [db]} topic account]
+  (let [client              (get db :wallet-connect/client)
+        sessions            (get db :wallet-connect/sessions)
+        session             (first (filter #(= (:topic %) topic) sessions))
+        permissions         (:permissions session)
+        blockchain          (:blockchain permissions)
+        proposal-chain-ids  (map #(last (string/split % #":")) (:chains blockchain))
+        address             (:address account)
+        available-chain-ids (map #(get-in % [:config :NetworkId]) (vals (get db :networks/networks)))
+        supported-chain-ids (filter (fn [chain-id] #(boolean (some #{chain-id} available-chain-ids)))
+                                    proposal-chain-ids)
+        accounts            (map #(str "eip155:" % ":" (address/normalized-hex address))
+                                 supported-chain-ids)]
+    {:db                                       (assoc db
+                                                      :wallet-connect/showing-app-management-sheet?
+                                                      false)
+     :hide-wallet-connect-app-management-sheet nil
+     :wc-2-change-session                      [client topic accounts]}))
+
+(rf/defn disconnect-session
+  {:events [:wallet-connect/disconnect]}
+  [{:keys [db]} topic]
+  (let [client (get db :wallet-connect/client)]
+    {:hide-wallet-connect-app-management-sheet nil
+     :hide-wallet-connect-success-sheet        nil
+     :wc-2-client-disconnect                   [client topic]
+     :db                                       (-> db
+                                                   (assoc :wallet-connect/sessions
+                                                          (types/js->clj (.-values (.-session client))))
+                                                   (dissoc :wallet-connect/session-managed))}))
+
+(rf/defn pair-session
+  {:events [:wallet-connect/pair]}
+  [{:keys [db]} {:keys [data]}]
+  (let [client (get db :wallet-connect/client)]
+    {:db        (assoc db :wallet-connect/scanned-uri data)
+     :dispatch  [:navigate-back]
+     :wc-2-pair [client data]}))
+
+(rf/defn wallet-connect-client-initate
+  {:events [:wallet-connect/client-init]}
+  [{:keys [db] :as cofx} ^js client]
+  {:db                       (assoc db
+                                    :wallet-connect/client   client
+                                    :wallet-connect/sessions (types/js->clj (.-values (.-session
+                                                                                       client))))
+   :wc-2-subscribe-to-events client})
+
+(rf/defn update-sessions
+  {:events [:wallet-connect/update-sessions]}
+  [{:keys [db] :as cofx}]
+  (let [client (get db :wallet-connect/client)]
+    {:db (-> db
+             (assoc :wallet-connect/sessions (types/js->clj (.-values (.-session client))))
+             (dissoc :wallet-connect/session-managed))}))
+
+(rf/defn wallet-connect-complete-transaction
+  {:events [:wallet-connect.dapp/transaction-on-result]}
+  [{:keys [db]} message-id topic result]
+  (let [client   (get db :wallet-connect/client)
+        response {:topic    topic
+                  :response {:jsonrpc "2.0"
+                             :id      message-id
+                             :result  result}}]
+    {:db           (assoc db :wallet-connect/response response)
+     :wc-2-respond [client response]}))
+
+(rf/defn wallet-connect-send-async
+  [cofx {:keys [method params id] :as payload} message-id topic]
+  (let [message?      (browser/web3-sign-message? method)
+        dapps-address (get-in cofx [:db :profile/profile :dapps-address])
+        accounts      (get-in cofx [:db :multiaccount/visible-accounts])
+        typed?        (and (not= constants/web3-personal-sign method)
+                           (not= constants/web3-eth-sign method))]
+    (if (or message? (= constants/web3-send-transaction method))
+      (let [[address data] (cond (and (= method constants/web3-keycard-sign-typed-data)
+                                      (not (vector? params)))
+                                 ;; We don't use signer argument for keycard sign-typed-data
+                                 ["0x0" params]
+                                 message?                     (browser/normalize-sign-message-params
+                                                               params
+                                                               typed?)
+                                 :else                        [nil nil])]
+        (when (or (not message?) (and address data))
+          (signing/sign cofx
+                        (merge
+                         (if message?
+                           {:message {:address  address
+                                      :data     data
+                                      :v4       (= constants/web3-sign-typed-data-v4 method)
+                                      :typed?   typed?
+                                      :pinless? (= method constants/web3-keycard-sign-typed-data)
+                                      :from     address}}
+                           {:tx-obj (-> params
+                                        first
+                                        (update :from #(or % dapps-address))
+                                        (dissoc :gasPrice))})
+                         {:on-result [:wallet-connect.dapp/transaction-on-result message-id topic]
+                          :on-error  [:wallet-connect.dapp/transaction-on-error message-id topic]}))))
+      (when (#{"eth_accounts" "eth_coinbase"} method)
+        (wallet-connect-complete-transaction
+         cofx
+         message-id
+         topic
+         (if (= method "eth_coinbase") dapps-address [dapps-address]))))))
+
+(rf/defn wallet-connect-send-async-read-only
+  [{:keys [db] :as cofx} {:keys [method] :as payload} message-id topic]
+  (wallet-connect-send-async cofx payload message-id topic))
+
+(rf/defn process-request
+  {:events [:wallet-connect/request-received]}
+  [{:keys [db] :as cofx} session-request]
+  (let [pending-requests        (get db :wallet-connect/pending-requests)
+        {:keys [topic request]} session-request
+        {:keys [id]}            request]
+    (wallet-connect-send-async-read-only cofx request id topic)))

src/status_im2/common/alert/events.cljs

@@ -1,8 +1,8 @@
-(ns status-im2.common.alert.effects
+(ns status-im2.common.alert.events
   (:require
+    [re-frame.core :as re-frame]
     [react-native.core :as rn]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
+    [utils.i18n :as i18n]))
 
 (defn show-popup
   ([title content]
@@ -26,7 +26,8 @@
       (when on-dismiss
         {:cancelable false})))))
 
-(rf/reg-fx :effects.utils/show-popup
+(re-frame/reg-fx
+ :utils/show-popup
  (fn [{:keys [title content on-dismiss]}]
    (show-popup title content on-dismiss)))
 
@@ -49,7 +50,8 @@
     (or extra-options nil))
    {:cancelable false}))
 
-(rf/reg-fx :effects.utils/show-confirmation
+(re-frame/reg-fx
+ :utils/show-confirmation
  (fn [{:keys [title content confirm-button-text on-accept on-cancel cancel-button-text extra-options]}]
    (show-confirmation {:title               title
                        :content             content
@@ -58,3 +60,18 @@
                        :on-accept           on-accept
                        :on-cancel           on-cancel
                        :extra-options       extra-options})))
+
+(defn show-question
+  ([title content on-accept]
+   (show-question title content on-accept nil))
+  ([title content on-accept on-cancel]
+   (rn/alert
+    title
+    content
+    (vector (merge {:text                (i18n/label :t/no)
+                    :accessibility-label :no-button}
+                   (when on-cancel {:onPress on-cancel}))
+            {:text                (i18n/label :t/yes)
+             :onPress             on-accept
+             :accessibility-label :yes-button})
+    nil)))

src/status_im2/common/async_storage.cljs

@@ -0,0 +1,8 @@
+(ns status-im2.common.async-storage
+  (:require
+    [re-frame.core :as re-frame]
+    react-native.async-storage))
+
+(re-frame/reg-fx :async-storage-set (react-native.async-storage/set-item-factory))
+(re-frame/reg-fx :async-storage-get
+                 (fn [{ks :keys cb :cb}] (react-native.async-storage/get-items ks cb)))

src/status_im2/common/async_storage/effects.cljs

@@ -1,11 +0,0 @@
-(ns status-im2.common.async-storage.effects
-  (:require
-    [react-native.async-storage :as async-storage]
-    [utils.re-frame :as rf]))
-
-(rf/reg-fx :effects.async-storage/set
- (async-storage/set-item-factory))
-
-(rf/reg-fx :effects.async-storage/get
- (fn [{ks :keys cb :cb}]
-   (async-storage/get-items ks cb)))

src/status_im2/common/biometric/events.cljs

@@ -51,7 +51,7 @@
                         (i18n/label :t/grant-face-id-permissions)
                         (i18n/label :t/biometric-auth-error {:code code}))]
     (when handle-error?
-      {:effects.utils/show-popup
+      {:utils/show-popup
        {:title   (i18n/label :t/biometric-auth-login-error-title)
         :content content}})))
 

src/status_im2/common/font.cljs

@@ -1,9 +1,15 @@
-(ns status-im2.common.font.events
+(ns status-im2.common.font
   (:require
     [clojure.string :as string]
-    status-im2.common.font.effects
+    [re-frame.core :as re-frame]
+    utils.image-server
     [utils.re-frame :as rf]))
 
+(re-frame/reg-fx
+ :font/get-font-file-for-initials-avatar
+ (fn [callback]
+   (utils.image-server/get-font-file-ready callback)))
+
 (rf/defn init-abs-root-path
   {:events [:font/init-font-file-for-initials-avatar]}
   [{:keys [db]} initials-avatar-font-file]

src/status_im2/common/font/effects.cljs

@@ -1,8 +0,0 @@
-(ns status-im2.common.font.effects
-  (:require
-    utils.image-server
-    [utils.re-frame :as rf]))
-
-(rf/reg-fx :effects.font/get-font-file-for-initials-avatar
- (fn [callback]
-   (utils.image-server/get-font-file-ready callback)))

src/status_im2/common/home/actions/view.cljs

@@ -6,10 +6,8 @@
     [status-im2.common.confirmation-drawer.view :as confirmation-drawer]
     [status-im2.common.mute-drawer.view :as mute-drawer]
     [status-im2.common.muting.helpers :refer [format-mute-till]]
-    [status-im2.config :as config]
     [status-im2.constants :as constants]
-    [status-im2.contexts.chat.actions.view :as chat-actions]
-    [status-im2.contexts.communities.actions.chat.view :as communities-chat-actions]
+    [status-im2.contexts.communities.actions.chat.view :as chat-actions]
     [status-im2.contexts.contacts.drawers.nickname-drawer.view :as nickname-drawer]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -255,6 +253,16 @@
           :chevron?            true
           :add-divider?        add-divider?}))
 
+;; TODO(OmarBasem): Requires design input.
+(defn fetch-messages-entry
+  []
+  (entry {:icon                :i/save
+          :label               (i18n/label :t/fetch-messages)
+          :on-press            #(js/alert "TODO: to be implemented, requires design input")
+          :danger?             false
+          :accessibility-label :fetch-messages
+          :sub-label           nil
+          :chevron?            true}))
 
 (defn remove-from-contacts-entry
   [contact]
@@ -411,8 +419,8 @@
   [(mark-as-read-entry chat-id needs-divider?)
    (mute-chat-entry chat-id chat-type muted-till)
    (notifications-entry false)
-   (when (and config/fetch-messages-enabled? inside-chat?)
-     (chat-actions/fetch-messages chat-id))
+   (when inside-chat?
+     (fetch-messages-entry))
    (when (or (not group-chat) public?)
      (show-qr-entry))
    (when-not group-chat
@@ -473,7 +481,7 @@
     constants/private-group-chat-type
     [private-group-chat-actions chat inside-chat?]
     constants/community-chat-type
-    [communities-chat-actions/actions chat inside-chat?]
+    [chat-actions/actions chat inside-chat?]
     nil))
 
 (defn group-details-actions

src/status_im2/common/pairing/events.cljs

@@ -1,65 +0,0 @@
-(ns status-im2.common.pairing.events
-  (:require
-    [quo.foundations.colors :as colors]
-    [status-im2.constants :as constants]
-    [status-im2.contexts.communities.discover.events]
-    [taoensso.timbre :as log]
-    [utils.re-frame :as rf]))
-
-(rf/defn handle-local-pairing-signals
-  [{:keys [db]} {:keys [type action data error] :as event}]
-  (log/info "local pairing signal received"
-            {:event event})
-  (let [{:keys [account password]}      data
-        role                            (get-in db [:syncing :role])
-        receiver?                       (= role constants/local-pairing-role-receiver)
-        sender?                         (= role constants/local-pairing-role-sender)
-        connection-success?             (and (= type
-                                                constants/local-pairing-event-connection-success)
-                                             (= action
-                                                constants/local-pairing-action-connect))
-        error-on-pairing?               (contains? constants/local-pairing-event-errors type)
-        completed-pairing?              (and (= type
-                                                constants/local-pairing-event-transfer-success)
-                                             (= action
-                                                constants/local-pairing-action-pairing-installation))
-        received-account?               (and (= type
-                                                constants/local-pairing-event-received-account)
-                                             (= action
-                                                constants/local-pairing-action-pairing-account)
-                                             (and (some? account) (some? password)))
-        multiaccount-data               (when received-account?
-                                          (merge account {:password password}))
-        navigate-to-syncing-devices?    (and (or connection-success? error-on-pairing?) receiver?)
-        user-in-syncing-devices-screen? (or (= (:view-id db) :syncing-progress)
-                                            (= (:view-id db) :syncing-progress-intro))
-        user-in-sign-in-intro-screen?   (= (:view-id db) :sign-in-intro)]
-    (merge {:db (cond-> db
-                  connection-success?
-                  (assoc-in [:syncing :pairing-status] :connected)
-
-                  received-account?
-                  (assoc-in [:syncing :profile] multiaccount-data)
-
-                  error-on-pairing?
-                  (assoc-in [:syncing :pairing-status] :error)
-
-                  completed-pairing?
-                  (assoc-in [:syncing :pairing-status] :completed))}
-           (cond
-             (and navigate-to-syncing-devices? (not user-in-syncing-devices-screen?))
-             {:dispatch (if user-in-sign-in-intro-screen?
-                          [:navigate-to-within-stack [:syncing-progress-intro :sign-in-intro]]
-                          [:navigate-to :syncing-progress])}
-
-             (and completed-pairing? sender?)
-             {:dispatch [:syncing/clear-states]}
-
-             (and completed-pairing? receiver?)
-             {:dispatch [:profile.login/local-paired-user]}
-
-             (and error-on-pairing? (some? error))
-             {:dispatch [:toasts/upsert
-                         {:icon       :i/alert
-                          :icon-color colors/danger-50
-                          :text       error}]}))))

src/status_im2/common/scan_qr_code/style.cljs

@@ -38,11 +38,10 @@
    :padding-horizontal screen-padding
    :margin-vertical    12})
 
-(defn header-text
-  [bottom-padding?]
+(def header-text
   {:padding-horizontal screen-padding
    :padding-top        12
-   :padding-bottom     (when bottom-padding? 8)
+   :padding-bottom     8
    :color              colors/white})
 
 (def header-sub-text
@@ -54,7 +53,7 @@
    :margin-top         20})
 
 (def scan-qr-code-container
-  {:margin-top 20})
+  {:margin-top 19})
 
 (def qr-view-finder
   {:margin-horizontal screen-padding

src/status_im2/common/scan_qr_code/view.cljs

@@ -35,14 +35,13 @@
    [quo/text
     {:size   :heading-1
      :weight :semi-bold
-     :style  (style/header-text (when subtitle true))}
+     :style  style/header-text}
     title]
-   (when subtitle
-     [quo/text
-      {:size   :paragraph-1
-       :weight :regular
-       :style  style/header-sub-text}
-      subtitle])])
+   [quo/text
+    {:size   :paragraph-1
+     :weight :regular
+     :style  style/header-sub-text}
+    subtitle]])
 
 (defn get-labels-and-on-press-method
   []
@@ -110,22 +109,21 @@
     [white-border :bottom-right]]])
 
 (defn- viewfinder
-  [qr-view-finder helper-text?]
+  [qr-view-finder]
   (let [layout-size (+ (:width qr-view-finder) 2)]
     [rn/view {:style (style/viewfinder-container qr-view-finder)}
      [white-square layout-size]
-     (when helper-text?
-       [quo/text
-        {:size   :paragraph-2
-         :weight :regular
-         :style  style/viewfinder-text}
-        (i18n/label :t/ensure-qr-code-is-in-focus-to-scan)])]))
+     [quo/text
+      {:size   :paragraph-2
+       :weight :regular
+       :style  style/viewfinder-text}
+      (i18n/label :t/ensure-qr-code-is-in-focus-to-scan)]]))
 
 (defn- scan-qr-code-tab
-  [qr-view-finder helper-text?]
+  [qr-view-finder]
   (if (and @camera-permission-granted?
            (boolean (not-empty qr-view-finder)))
-    [viewfinder qr-view-finder helper-text?]
+    [viewfinder qr-view-finder]
     [camera-permission-view]))
 
 (defn- check-qr-code-and-navigate
@@ -225,7 +223,7 @@
             [:<>
              [rn/view {:style style/scan-qr-code-container}]
              [qr-scan-hole-area qr-view-finder]])
-          [scan-qr-code-tab @qr-view-finder (when subtitle true)]
+          [scan-qr-code-tab @qr-view-finder]
           [rn/view {:style style/flex-spacer}]
           (when show-camera?
             [quo.theme/provider {:theme :light}

src/status_im2/common/standard_authentication/core.cljs

@@ -1,7 +1,7 @@
 (ns status-im2.common.standard-authentication.core
   (:require
-    status-im2.common.standard-authentication.password-input.view
+    status-im2.common.standard-authentication.standard-auth.button.view
     status-im2.common.standard-authentication.standard-auth.slide-button.view))
 
-(def password-input status-im2.common.standard-authentication.password-input.view/view)
+(def button status-im2.common.standard-authentication.standard-auth.button.view/view)
 (def slide-button status-im2.common.standard-authentication.standard-auth.slide-button.view/view)

src/status_im2/common/standard_authentication/enter_password/view.cljs

@@ -9,7 +9,7 @@
     [utils.re-frame :as rf]))
 
 (defn view
-  [{:keys [on-enter-password on-press-biometrics button-label button-icon-left]}]
+  [{:keys [on-enter-password button-label button-icon-left]}]
   (let [{:keys [key-uid customization-color] :as profile} (rf/sub [:profile/profile-with-image])
         {:keys [error processing password]}               (rf/sub [:profile/login])
         sign-in-enabled?                                  (rf/sub [:sign-in-enabled?])]
@@ -32,21 +32,20 @@
           :customization-color customization-color
           :size                24}]]
        [password-input/view
-        {:on-press-biometrics on-press-biometrics
-         :processing          processing
-         :error               error
-         :default-password    password
-         :sign-in-enabled?    sign-in-enabled?}]
-       [quo/button
-        {:size                40
-         :container-style     style/enter-password-button
-         :type                :primary
-         :customization-color (or customization-color :primary)
-         :accessibility-label :login-button
-         :icon-left           button-icon-left
-         :disabled?           (or (not sign-in-enabled?) processing)
-         :on-press            (fn []
-                                (rf/dispatch [:set-in [:profile/login :key-uid] key-uid])
-                                (rf/dispatch [:profile.login/verify-database-password password
-                                              #(on-enter-password password)]))}
-        button-label]]]]))
+        {:processing       processing
+         :error            error
+         :default-password password
+         :sign-in-enabled? sign-in-enabled?}]
+       [rn/view {:style style/enter-password-button}
+        [quo/button
+         {:size                40
+          :type                :primary
+          :customization-color (or customization-color :primary)
+          :accessibility-label :login-button
+          :icon-left           button-icon-left
+          :disabled?           (or (not sign-in-enabled?) processing)
+          :on-press            (fn []
+                                 (rf/dispatch [:set-in [:profile/login :key-uid] key-uid])
+                                 (rf/dispatch [:profile.login/verify-database-password password
+                                               #(on-enter-password password)]))}
+         button-label]]]]]))

src/status_im2/common/standard_authentication/events.cljs

@@ -1,8 +0,0 @@
-(ns status-im2.common.standard-authentication.events
-  (:require
-    [utils.re-frame :as rf]))
-
-(rf/reg-event-fx :standard-auth/on-biometric-success
- (fn [{:keys [db]} [callback]]
-   (let [key-uid (get-in db [:profile/profile :key-uid])]
-     {:fx [[:keychain/get-user-password [key-uid callback]]]})))

src/status_im2/common/standard_authentication/password_input/style.cljs

@@ -4,7 +4,3 @@
   {:margin-top     8
    :flex-direction :row
    :align-items    :center})
-
-(def auth-button
-  {:align-self  :flex-end
-   :margin-left 8})

src/status_im2/common/standard_authentication/password_input/view.cljs

@@ -27,30 +27,21 @@
   (rf/dispatch [:set-in [:profile/login :error] ""]))
 
 (defn- view-internal
-  [{:keys [default-password theme shell? on-press-biometrics]}]
+  [{:keys [default-password theme shell?]}]
   (let [{:keys [error processing]} (rf/sub [:profile/login])
         error-message              (get-error-message error)
         error?                     (boolean (seq error-message))]
     [:<>
-     [rn/view {:style {:flex-direction :row}}
-      [quo/input
-       {:container-style {:flex 1}
-        :type            :password
-        :blur?           true
-        :disabled?       processing
-        :placeholder     (i18n/label :t/type-your-password)
-        :auto-focus      true
-        :error?          error?
-        :label           (i18n/label :t/profile-password)
-        :on-change-text  on-change-password
-        :default-value   (security/safe-unmask-data default-password)}]
-      (when on-press-biometrics
-        [quo/button
-         {:container-style style/auth-button
-          :on-press        on-press-biometrics
-          :icon-only?      true
-          :type            :outline}
-         :i/face-id])]
+     [quo/input
+      {:type           :password
+       :blur?          true
+       :disabled?      processing
+       :placeholder    (i18n/label :t/type-your-password)
+       :auto-focus     true
+       :error?         error?
+       :label          (i18n/label :t/profile-password)
+       :on-change-text on-change-password
+       :default-value  (security/safe-unmask-data default-password)}]
      (when error?
        [rn/view {:style style/error-message}
         [quo/info-message
@@ -69,7 +60,10 @@
                                      :shell?  shell?}]))}
          [rn/text
           {:style                 {:text-decoration-line :underline
-                                   :color                (colors/resolve-color :danger theme)}
+                                   :color                (colors/theme-colors
+                                                          (colors/custom-color :danger 50)
+                                                          (colors/custom-color :danger 60)
+                                                          theme)}
            :size                  :paragraph-2
            :suppress-highlighting true}
           (i18n/label :t/forgot-password)]]])]))