lint fixes

some cleanup
improve flow
2023-12-05 02:31:24 -03:00 · 2023-12-05 02:23:06 -03:00 · 2023-12-05 01:13:05 -03:00 · 2023-12-04 21:46:33 -03:00 · 2023-12-04 20:48:48 -03:00 · 2023-12-04 20:48:48 -03:00
291 changed files with 5277 additions and 4690 deletions
@@ -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
@@ -1,4 +0,0 @@
-{:linters
- {:unresolved-symbol
-  {:exclude [(cljs.test/is [match? thrown-match?])
-             (clojure.test/is [match? thrown-match?])]}}}
@@ -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
@@ -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 "";
-        }
-    }
 }
@@ -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
@@ -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",
@@ -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
@@ -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;
@@ -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: {
@@ -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",
@@ -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"]
@@ -368,6 +368,17 @@
    :LineChart        #js {}
    :LineChartBicolor #js {}})

+(def wallet-connect-client
+  #js
+   {:default       #js {}
+    :CLIENT_EVENTS #js
+                    {:session #js
+                               {:request  nil
+                                :created  nil
+                                :deleted  nil
+                                :proposal nil
+                                :updated  nil}}})
+
 (def worklet-factory
  #js {:applyAnimationsToStyle (fn [])})

@@ -436,6 +447,7 @@
    "../src/js/worklets/parallax.js"                 #js {}
    "../src/js/worklets/identifiers_highlighting.js" #js {}
    "./fleets.js"                                    default-fleets
+    "@walletconnect/client"                          wallet-connect-client
    "../translations/ar.json"                        (js/JSON.parse (slurp "./translations/ar.json"))
    "../translations/de.json"                        (js/JSON.parse (slurp "./translations/de.json"))
    "../translations/en.json"                        (js/JSON.parse (slurp "./translations/en.json"))
@@ -10,36 +10,40 @@

 (defn token-requirement-list-row
  [tokens padding?]
-  [rn/view {:style (style/token-row padding?)}
-   (map-indexed (fn [token-index token]
-                  (let [{:keys [amount sufficient? purchasable?]} token]
-                    ^{:key token-index}
-                    [rn/view {:style style/token-tag-spacing}
-                     [token-tag/view
-                      {:token-symbol (:symbol token)
-                       :token-value  amount
-                       :size         :size-24
-                       :options      (cond
-                                       sufficient?  :hold
-                                       purchasable? :add)}]]))
-                tokens)])
+  [rn/view
+   {:style (style/token-row padding?)}
+   (doall
+    (map-indexed (fn [token-index token]
+                   (let [{:keys [img-src amount sufficient? purchasable?]} token]
+                     ^{:key token-index}
+                     [rn/view {:style style/token-tag-spacing}
+                      [token-tag/view
+                       {:token-symbol  (:symbol token)
+                        :token-value   amount
+                        :size          :size-24
+                        :options       (cond
+                                         sufficient?  :hold
+                                         purchasable? :add)
+                        :token-img-src img-src}]]))
+                 tokens))])

 (defn- internal-view
  [{:keys [tokens padding? theme]}]
  [:<>
   (if (> (count tokens) 1)
-     (map-indexed
-      (fn [token-requirement-index tokens]
-        ^{:key token-requirement-index}
-        [rn/view {:margin-bottom 12}
-         (when-not (= token-requirement-index 0)
-           [rn/view {:style (style/token-row-or-border theme)}])
-         (when-not (= token-requirement-index 0)
-           [text/text
-            {:style (style/token-row-or-text padding? theme)
-             :size  :label} (string/lower-case (i18n/label :t/or))])
-         [token-requirement-list-row tokens padding?]])
-      tokens)
+     (doall
+      (map-indexed
+       (fn [token-requirement-index tokens]
+         ^{:key token-requirement-index}
+         [rn/view {:margin-bottom 12}
+          (when-not (= token-requirement-index 0)
+            [rn/view {:style (style/token-row-or-border theme)}])
+          (when-not (= token-requirement-index 0)
+            [text/text
+             {:style (style/token-row-or-text padding? theme)
+              :size  :label} (string/lower-case (i18n/label :t/or))])
+          [token-requirement-list-row tokens padding?]])
+       tokens))
     [token-requirement-list-row (first tokens) padding?])])

 (def token-requirement-list (quo.theme/with-theme internal-view))
@@ -9,10 +9,9 @@

 (defn- valid-color?
  [color]
-  (and color
-       (or (keyword? color)
-           (and (string? color)
-                (not (string/blank? color))))))
+  (or (keyword? color)
+      (and (string? color)
+           (not (string/blank? color)))))

 (defn- image-icon-style
  [{:keys [color no-color size container-style theme]}]
@@ -38,8 +37,8 @@
         (cond-> {:size                size
                  :accessibility-label accessibility-label
                  :style               container-style}
-           (valid-color? color)   (assoc :color color)
-           (valid-color? color-2) (assoc :color-2 color-2))]
+           (and color (valid-color? color))     (assoc :color color)
+           (and color-2 (valid-color? color-2)) (assoc :color-2 color-2))]
        [rn/image
         {:style               (image-icon-style (assoc props :size size))
          :accessibility-label accessibility-label
@@ -118,61 +118,13 @@
     "M2.79504 9.01494C2.89473 8.85584 3.00297 8.70977 3.11963 8.5761C3.90594 7.67512 4.97212 7.45024 5.99992 7.45024C7.02772 7.45024 8.0939 7.67512 8.88021 8.5761C8.99688 8.70978 9.10512 8.85585 9.2048 9.01495C8.9501 9.28561 8.66149 9.52401 8.34577 9.72335C8.25403 9.55824 8.15512 9.41818 8.05145 9.29939C7.56503 8.74204 6.88121 8.55024 5.99992 8.55024C5.11862 8.55024 4.43481 8.74204 3.94839 9.29939C3.84472 9.41818 3.74582 9.55824 3.65408 9.72334C3.33835 9.524 3.04975 9.2856 2.79504 9.01494ZM5.99992 3.5502C5.47525 3.5502 5.04992 3.97552 5.04992 4.5002C5.04992 5.02487 5.47525 5.4502 5.99992 5.4502C6.52459 5.4502 6.94992 5.02487 6.94992 4.5002C6.94992 3.97552 6.52459 3.5502 5.99992 3.5502ZM3.94992 4.5002C3.94992 3.36801 4.86773 2.4502 5.99992 2.4502C7.1321 2.4502 8.04992 3.36801 8.04992 4.5002C8.04992 5.63238 7.1321 6.5502 5.99992 6.5502C4.86773 6.5502 3.94992 5.63238 3.94992 4.5002Z"
     :fill color-2}]])

-(defn- contact-20
-  [{:keys [color color-2]
-    :or   {color   colors/neutral-100
-           color-2 colors/white}
-    :as   props}]
-  [container props
-   [svg/circle
-    {:cx   10
-     :cy   10
-     :r    7.5
-     :fill color}]
-   [svg/path
-    {:d
-     "M8.65002 7.99998C8.65002 7.25439 9.25443 6.64998 10 6.64998C10.7456 6.64998 11.35 7.25439 11.35 7.99998C11.35 8.74556 10.7456 9.34998 10 9.34998C9.25443 9.34998 8.65002 8.74556 8.65002 7.99998ZM10 5.34998C8.53646 5.34998 7.35002 6.53642 7.35002 7.99998C7.35002 9.46353 8.53646 10.65 10 10.65C11.4636 10.65 12.65 9.46353 12.65 7.99998C12.65 6.53642 11.4636 5.34998 10 5.34998ZM10 13.65C8.67557 13.65 7.53064 14.4186 6.98692 15.5341C6.60094 15.3235 6.23942 15.0737 5.90771 14.79C6.69408 13.3369 8.23179 12.35 10 12.35C11.7682 12.35 13.306 13.3369 14.0923 14.79C13.7606 15.0737 13.3991 15.3235 13.0131 15.5341C12.4694 14.4186 11.3245 13.65 10 13.65Z"
-     :fill color-2}]])
-
-(defn- verified-20
-  [{:keys [color color-2]
-    :or   {color   colors/neutral-100
-           color-2 colors/white}
-    :as   props}]
-  [container props
-   [svg/path
-    {:d
-     "M18 10C18 8.77003 17.1118 7.74751 15.9418 7.53891C16.6216 6.56407 16.5267 5.21294 15.6569 4.34321C14.7872 3.47344 13.436 3.37852 12.4611 4.05845C12.2526 2.88834 11.23 2 10 2C8.77 2 7.74747 2.88827 7.53889 4.05832C6.56406 3.37846 5.21292 3.47339 4.34318 4.34313C3.47343 5.21288 3.3785 6.56404 4.05839 7.53888C2.88831 7.74743 2 8.76998 2 10C2 11.23 2.88824 12.2525 4.05826 12.4611C3.3784 13.4359 3.47333 14.7871 4.34307 15.6568C5.21284 16.5266 6.56403 16.6215 7.53887 15.9416C7.74741 17.1117 8.76996 18 10 18C11.23 18 12.2525 17.1117 12.4611 15.9417C13.4359 16.6215 14.7871 16.5266 15.6568 15.6569C16.5265 14.7871 16.6215 13.436 15.9416 12.4611C17.1117 12.2526 18 11.23 18 10Z"
-     :fill color}]
-   [svg/path
-    {:d            "M7.25 10.75L9.25 12.25L12.75 7.75"
-     :stroke       color-2
-     :stroke-width "1.2"}]])
-
-(defn- untrustworthy-20
-  [{:keys [color color-2]
-    :or   {color   colors/neutral-100
-           color-2 colors/white}
-    :as   props}]
-  [container props
-   [svg/path
-    {:d    "M10 2L15.6569 4.34315L18 10L15.6569 15.6569L10 18L4.34315 15.6569L2 10L4.34315 4.34315L10 2Z"
-     :fill color}]
-   [svg/path
-    {:d
-     "M10.75 5.5L10.55 11.5H9.45L9.25 5.5H10.75ZM10 13C10.4142 13 10.75 13.3358 10.75 13.75C10.75 14.1642 10.4142 14.5 10 14.5C9.58579 14.5 9.25 14.1642 9.25 13.75C9.25 13.3358 9.58579 13 10 13Z"
-     :fill color-2}]])
-
 (def ^:private icons
-  {:i/clear-20         clear-20
-   :i/dropdown-20      dropdown-20
-   :i/pullup-20        pullup-20
-   :i/dropdown-12      dropdown-12
-   :i/pullup-12        pullup-12
-   :i/contact-12       contact-12
-   :i/contact-20       contact-20
-   :i/verified-20      verified-20
-   :i/untrustworthy-20 untrustworthy-20})
+  {:i/clear-20    clear-20
+   :i/dropdown-20 dropdown-20
+   :i/pullup-20   pullup-20
+   :i/dropdown-12 dropdown-12
+   :i/pullup-12   pullup-12
+   :i/contact-12  contact-12})

 (defn- append-to-keyword
  [k & xs]
@@ -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)))))
@@ -1,17 +0,0 @@
-(ns quo.components.ios.drawer-bar.style
-  (:require
-    [quo.foundations.colors :as colors]
-    [quo.theme :as theme]))
-
-(def handle-container
-  {:padding-vertical 8
-   :height           20
-   :align-items      :center})
-
-(defn handle
-  [{:keys [theme]}]
-  {:width            32
-   :height           4
-   :background-color (colors/theme-colors colors/neutral-100 colors/white theme)
-   :opacity          (theme/theme-value 0.05 0.1 theme)
-   :border-radius    100})
@@ -1,12 +0,0 @@
-(ns quo.components.ios.drawer-bar.view
-  (:require
-    [quo.components.ios.drawer-bar.style :as style]
-    [quo.theme :as quo.theme]
-    [react-native.core :as rn]))
-
-(defn- view-internal
-  [props]
-  [rn/view {:style style/handle-container}
-   [rn/view {:style (style/handle props)}]])
-
-(def view (quo.theme/with-theme view-internal))
@@ -13,7 +13,7 @@
    (h/render [account/view])
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
-                              {:backgroundColor (colors/resolve-color :blue :light 5)})))
+                              {:backgroundColor (colors/custom-color :blue 50 5)})))

  (h/test "on-press-in changes state to :pressed with blur? enabled"
    (h/render [account/view {:blur? true}])
@@ -21,26 +21,31 @@
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
                              {:backgroundColor colors/white-opa-5})))

-  (h/test "render with state :active"
-    (h/render [account/view {:state :active}])
-    (h/has-style (h/query-by-label-text :container)
-                 {:backgroundColor (colors/resolve-color :blue :light 10)}))
+  (h/test "on-press-out changes state to :active"
+    (h/render [account/view])
+    (h/fire-event :on-press-in (h/get-by-label-text :container))
+    (h/fire-event :on-press-out (h/get-by-label-text :container))
+    (h/wait-for #(h/has-style (h/query-by-label-text :container)
+                              {:backgroundColor (colors/custom-color :blue 50 10)})))

-  (h/test "render with state :active and blur? enabled"
-    (h/render [account/view
-               {:blur? true
-                :state :active}])
-    (h/has-style (h/query-by-label-text :container)
-                 {:backgroundColor colors/white-opa-10}))
+  (h/test "on-press-out changes state to :active with blur? enabled"
+    (h/render [account/view {:blur? true}])
+    (h/fire-event :on-press-in (h/get-by-label-text :container))
+    (h/fire-event :on-press-out (h/get-by-label-text :container))
+    (h/wait-for #(h/has-style (h/query-by-label-text :container)
+                              {:backgroundColor colors/white-opa-10})))

-  (h/test "render with state :selected"
-    (h/render [account/view {:state :selected}])
-    (h/is-truthy (h/query-by-label-text :check-icon)))
+  (h/test "on-press-out changes state to :selected"
+    (h/render [account/view {:selectable? true}])
+    (h/fire-event :on-press-in (h/get-by-label-text :container))
+    (h/fire-event :on-press-out (h/get-by-label-text :container))
+    (h/wait-for #(h/is-truthy (h/query-by-label-text :check-icon))))

-  (h/test "calls on-press"
+  (h/test "on-press-out calls on-press"
    (let [on-press (h/mock-fn)]
      (h/render [account/view {:on-press on-press}])
-      (h/fire-event :on-press (h/get-by-label-text :container))
+      (h/fire-event :on-press-in (h/get-by-label-text :container))
+      (h/fire-event :on-press-out (h/get-by-label-text :container))
      (h/was-called on-press)))

  (h/test "renders token props if type :tag"
@@ -3,12 +3,12 @@
    [quo.foundations.colors :as colors]))

 (defn- background-color
-  [{:keys [state pressed? blur? customization-color]}]
-  (cond (or pressed? (= state :selected))
-        (if blur? colors/white-opa-5 (colors/resolve-color customization-color :light 5))
+  [{:keys [state blur? customization-color]}]
+  (cond (or (= state :pressed) (= state :selected))
+        (if blur? colors/white-opa-5 (colors/custom-color customization-color 50 5))
        (= state :active)
-        (if blur? colors/white-opa-10 (colors/resolve-color customization-color :light 10))
-        (and pressed? blur?) colors/white-opa-10
+        (if blur? colors/white-opa-10 (colors/custom-color customization-color 50 10))
+        (and (= state :pressed) blur?) colors/white-opa-10
        :else :transparent))

 (defn container
@@ -94,42 +94,62 @@
   [icon/icon :i/check
    {:color (if blur?
              colors/white
-              (colors/resolve-color customization-color theme))}]])
+              (colors/theme-colors (colors/custom-color customization-color 50)
+                                   (colors/custom-color customization-color 60)
+                                   theme))}]])

-(defn- internal-view
-  [_]
-  (let [pressed?     (reagent/atom false)
-        on-press-in  #(reset! pressed? true)
-        on-press-out #(reset! pressed? false)]
-    (fn [{:keys [type state blur? customization-color on-press]
+(defn- f-internal-view
+  []
+  (let [state               (reagent/atom :default)
+        active-or-selected? (atom false)
+        timer               (atom nil)
+        on-press-in         (fn []
+                              (when-not (= @state :selected)
+                                (reset! timer (js/setTimeout #(reset! state :pressed) 100))))]
+    (fn [{:keys [type selectable? blur? customization-color on-press]
          :or   {customization-color :blue
                 type                :default
-                 state               :default
                 blur?               false}
          :as   props}]
-      [rn/pressable
-       {:style               (style/container
-                              {:state               state
-                               :blur?               blur?
-                               :customization-color customization-color
-                               :pressed?            @pressed?})
-        :on-press-in         on-press-in
-        :on-press            on-press
-        :on-press-out        on-press-out
-        :accessibility-label :container}
-       [account-view props]
-       [rn/view {:style (when (= type :tag) style/token-tag-container)}
-        (cond
-          (#{:balance-neutral :balance-negative :balance-positive} type)
-          [balance-view props]
+      (let [on-press-out (fn []
+                           (let [new-state (if @active-or-selected?
+                                             :default
+                                             (if (and (= type :default) selectable?)
+                                               :selected
+                                               :active))]
+                             (when @timer (js/clearTimeout @timer))
+                             (reset! timer nil)
+                             (reset! active-or-selected? (or (= new-state :active)
+                                                             (= new-state :selected)))
+                             (reset! state new-state)
+                             (when on-press
+                               (on-press))))]
+        (rn/use-effect
+         #(cond (and selectable? (= type :default) (= @state :active))         (reset! state :selected)
+                (and (not selectable?) (= type :default) (= @state :selected)) (reset! state :active))
+         [selectable?])
+        [rn/pressable
+         {:style               (style/container
+                                {:state @state :blur? blur? :customization-color customization-color})
+          :on-press-in         on-press-in
+          :on-press-out        on-press-out
+          :accessibility-label :container}
+         [account-view props]
+         [rn/view {:style (when (= type :tag) style/token-tag-container)}
+          (when (or (= type :balance-neutral)
+                    (= type :balance-negative)
+                    (= type :balance-positive))
+            [balance-view props])
+          (when (= type :tag)
+            [token-tag props])
+          (when (= type :action)
+            [options-button props])
+          (when (and (= type :default)
+                     (= @state :selected))
+            [check-icon props])]]))))

-          (= type :tag)
-          [token-tag props]
-
-          (= type :action)
-          [options-button props]
-
-          (and (= type :default) (= state :selected))
-          [check-icon props])]])))
+(defn- internal-view
+  [props]
+  [:f> f-internal-view props])

 (def view (quo.theme/with-theme internal-view))
@@ -4,7 +4,6 @@
    [quo.components.avatars.user-avatar.view :as user-avatar]
    [quo.components.list-items.preview-list.properties :as properties]
    [quo.components.tags.number-tag.view :as number-tag]
-    [quo.components.utilities.token.view :as token]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [react-native.fast-image :as fast-image]
@@ -32,12 +31,7 @@
                                              :height        size
                                              :border-radius border-radius}}]

-      :tokens                      [token/view
-                                    {:token item
-                                     :size  size
-                                     :style {:border-radius border-radius}}]
-
-      (:network :dapps)            [fast-image/fast-image
+      (:tokens :network :dapps)    [fast-image/fast-image
                                    {:source (or (:source item) item)
                                     :style  {:width         size
                                              :height        size
@@ -5,7 +5,7 @@
            [test-helpers.component :as h]))

 (def props
-  {:token       :snt
+  {:token       (resources/get-token :snt)
   :state       :default
   :label       "Status"
   :networks    [(resources/get-network :ethereum)]
@@ -34,7 +34,9 @@
   :flex   1})

 (def token-image
-  {:border-width     1
+  {:width            32
+   :height           32
+   :border-width     1
   :border-radius    16
   :border-color     colors/neutral-80-opa-5
   :margin-right     8
@@ -4,7 +4,6 @@
    [quo.components.list-items.preview-list.view :as preview-list]
    [quo.components.list-items.token-network.style :as style]
    [quo.components.markdown.text :as text]
-    [quo.components.utilities.token.view :as token]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [reagent.core :as reagent]))
@@ -12,11 +11,9 @@
 (defn- info
  [{:keys [token label networks]}]
  [rn/view {:style style/info}
-   (when token
-     [token/view
-      {:style style/token-image
-       :size  :size-32
-       :token token}])
+   [rn/image
+    {:source (or (:source token) token)
+     :style  style/token-image}]
   [rn/view {:style style/token-info}
    [text/text
     {:weight          :semi-bold
@@ -1,10 +1,12 @@
 (ns quo.components.list-items.token-value.view
  (:require
+    [clojure.string :as string]
    [quo.components.icon :as icon]
    [quo.components.list-items.token-value.style :as style]
    [quo.components.markdown.text :as text]
-    [quo.components.utilities.token.view :as token]
    [quo.foundations.colors :as colors]
+    [quo.foundations.common :as common]
+    [quo.foundations.resources :as resources]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [reagent.core :as reagent]))
@@ -12,8 +14,7 @@
 (defn- internal-view
  []
  (let [state (reagent/atom :default)]
-    (fn [{:keys [theme customization-color status token metrics? values on-press
-                 on-long-press]}]
+    (fn [{:keys [theme customization-color status token metrics? values on-press on-long-press]}]
      (let [bg-opacity                                                      (case @state
                                                                              :active  10
                                                                              :pressed 5
@@ -33,13 +34,16 @@
          {:style {:flex-direction :row
                   :align-items    :center
                   :flex           1}}
-          [token/view {:token (:symbol token) :size :size-32}]
+          [rn/image
+           {:source (resources/get-token token)
+            :style  {:width  32
+                     :height 32}}]
          [rn/view {:style {:margin-left 8}}
-           [text/text {:weight :semi-bold} (:name token)]
+           [text/text {:weight :semi-bold} (common/token-label token)]
           [text/text
            {:size  :paragraph-2
             :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
-            (str crypto-value " " (:symbol token))]]]
+            (str crypto-value " " (if token (string/upper-case (clj->js token)) ""))]]]
         [rn/view
          {:style {:align-items     :flex-end
                   :justify-content :space-between}}
@@ -17,21 +17,30 @@
           {:width size})))

 (defn base-tag
-  [{:keys [id size disabled? border-color border-width background-color on-press
-           accessibility-label type labelled?]
-    :or   {size 32}}
-   children]
-  [rn/touchable-without-feedback
-   (merge {:disabled            disabled?
-           :accessibility-label accessibility-label}
-          (when on-press
-            {:on-press #(on-press id)}))
-   [rn/view
-    {:style (merge (style-container size
-                                    disabled?
-                                    border-color
-                                    border-width
-                                    background-color
-                                    labelled?
-                                    type))}
-    children]])
+  [_]
+  (fn
+    [{:keys [id
+             size
+             disabled?
+             border-color
+             border-width
+             background-color
+             on-press
+             accessibility-label
+             type
+             labelled?]
+      :or   {size 32}} children]
+    [rn/touchable-without-feedback
+     (merge {:disabled            disabled?
+             :accessibility-label accessibility-label}
+            (when on-press
+              {:on-press #(on-press id)}))
+     [rn/view
+      {:style (merge (style-container size
+                                      disabled?
+                                      border-color
+                                      border-width
+                                      background-color
+                                      labelled?
+                                      type))}
+      children]]))
@@ -59,10 +59,6 @@
  [theme]
  {:color (colors/theme-colors colors/neutral-100 colors/white theme)})

-(defn token-logo
-  [size]
-  {:border-radius (if (= size 24) 10 14)})
-
 (defn circle-logo
  [size]
  (if (= size 24)
@@ -7,7 +7,6 @@
    [quo.components.list-items.preview-list.view :as preview-list]
    [quo.components.markdown.text :as text]
    [quo.components.tags.context-tag.style :as style]
-    [quo.components.utilities.token.view :as token]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]))
@@ -74,7 +73,7 @@

 (defn- view-internal
  [{:keys [theme type size state blur? customization-color profile-picture full-name users
-           group-name amount token network-logo network-name networks
+           group-name token-logo amount token-name network-logo network-name networks
           account-name emoji collectible collectible-name collectible-number duration container-style]
    :or   {customization-color :blue
           type                :default
@@ -124,11 +123,8 @@
     [communities-tag (assoc props :channel? (= type :channel))]

     :token
-     [tag-skeleton {:theme theme :size size :text (str amount " " token)}
-      [token/view
-       {:style (style/token-logo size)
-        :token token
-        :size  (if (= size 24) :size-20 :size-28)}]]
+     [tag-skeleton {:theme theme :size size :text (str amount " " token-name)}
+      [rn/image {:style (style/circle-logo size) :source token-logo}]]

     :network
     [tag-skeleton {:theme theme :size size :text network-name}
@@ -186,8 +182,9 @@

  - `:token`
    - size
+    - token-logo (valid rn/image :source value)
    - amount
-    - token
+    - token-name

  - `:network`
    - size
@@ -47,7 +47,7 @@

  (h/test "Token view render"
    (h/render [summary-tag/view
-               {:type  :token
-                :label "1,000 SNT"
-                :token :eth}])
+               {:type         :token
+                :label        "1,000 SNT"
+                :image-source "path/to/token-image.png"}])
    (h/is-truthy (h/get-by-text "1,000 SNT"))))
@@ -24,4 +24,6 @@
   :border-radius 10})

 (def token-image
-  {:border-radius 12})
+  {:width         24
+   :height        24
+   :border-radius 12})
@@ -5,13 +5,12 @@
    [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
    [quo.components.markdown.text :as text]
    [quo.components.tags.summary-tag.style :as style]
-    [quo.components.utilities.token.view :as token]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]))

 (defn- left-view
-  [{:keys [label type customization-color emoji image-source token]}]
+  [{:keys [label type customization-color emoji image-source]}]
  (case type
    :account
    [account-avatar/view
@@ -39,10 +38,9 @@
      :profile-picture     image-source
      :customization-color customization-color}]
    :token
-    [token/view
-     {:token token
-      :size  :size-24
-      :style style/token-image}]
+    [rn/image
+     {:source image-source
+      :style  style/token-image}]
    nil))

 (defn- view-internal
@@ -52,7 +50,7 @@
      should vary based on a custom color.
    - :type - :token / :user / :collectible / :saved-address / :network / :account
    - :emoji - string - emoji used for displaying account avatar
-    - :image-source - resource - image to display on :network, :collectible and :user
+    - :image-source - resource - image to display on :network, :collectible :user and :token
    - :theme - :light / :dark"
  [{:keys [label customization-color type theme]
    :as   props
@@ -64,7 +62,6 @@
   [text/text
    {:style  (style/label type theme)
     :weight :semi-bold
-     :size   :heading-1}
-    label]])
+     :size   :heading-1} label]])

 (def view (quo.theme/with-theme view-internal))
@@ -4,7 +4,7 @@
    [quo.components.markdown.text :as text]
    [quo.components.tags.base-tag :as base-tag]
    [quo.foundations.colors :as colors]
-    [quo.theme]
+    [quo.theme :as theme]
    [react-native.core :as rn]))

 (def themes
@@ -66,45 +66,54 @@
             text-color)
      label])])

-(defn tag-internal
+(defn tag
  "opts
   {:type         :icon/:emoji/:label
    :label        string
    :size         32/24
    :on-press     fn
-    :blurred?     true/false
+    :blurred?     true/false 
    :resource     icon/image
    :labelled?    true/false
    :disabled?    true/false}
-
+  
   opts
    - `blurred`  boolean: use to determine border color if the background is blurred
    - `type`     can be icon or emoji with or without a tag label
    - `labelled` boolean: is true if tag has label else false"
-  [{:keys [id on-press disabled? size active accessibility-label label resource type
-           labelled? blurred? icon-color theme]
-    :or   {size 32}}]
-  (let [state                (cond
-                               disabled? :disabled
-                               active    :active
-                               :else     :default)
-        {:keys [border-color
-                blurred-border-color
-                text-color]} (get-in themes [theme state])]
-    [rn/view {:style {:align-items :center}}
-     [base-tag/base-tag
-      {:id                  id
-       :size                size
-       :border-width        1
-       :border-color        (if blurred?
-                              blurred-border-color
-                              border-color)
-       :on-press            on-press
-       :accessibility-label accessibility-label
-       :disabled?           disabled?
-       :type                type
-       :labelled?           (if (= type :label) true labelled?)}
-      [tag-resources size type resource icon-color label text-color labelled?]]]))
-
-(def tag (quo.theme/with-theme tag-internal))
+  [_ _]
+  (fn
+    [{:keys [id
+             on-press
+             disabled?
+             size
+             active
+             accessibility-label
+             label
+             resource
+             type
+             labelled?
+             blurred?
+             icon-color
+             override-theme]
+      :or   {size 32}}]
+    (let [state (cond disabled? :disabled
+                      active    :active
+                      :else     :default)
+          {:keys [border-color blurred-border-color text-color]}
+          (get-in themes [(or override-theme (theme/get-theme)) state])]
+      [rn/view {:style {:align-items :center}}
+       [base-tag/base-tag
+        {:id                  id
+         :size                size
+         :border-width        1
+         :border-color        (if blurred?
+                                blurred-border-color
+                                border-color)
+         :on-press            on-press
+         :accessibility-label accessibility-label
+         :disabled?           disabled?
+         :type                type
+         :labelled?           (if (= type :label) true labelled?)}
+        [tag-resources size type resource icon-color label text-color labelled?]]])))

@@ -34,10 +34,14 @@

 (defn token-img
  [size]
-  (case size
-    :size-24 {:margin-right  6
+  (condp = size
+    :size-24 {:width         20
+              :height        20
+              :margin-right  6
              :border-radius 10}
-    :size-32 {:margin-right  8
+    :size-32 {:width         28
+              :height        28
+              :margin-right  8
              :border-radius 14}))

 (defn label
@@ -4,7 +4,6 @@
    [quo.components.icon :as icons]
    [quo.components.markdown.text :as text]
    [quo.components.tags.token-tag.style :as style]
-    [quo.components.utilities.token.view :as token]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [react-native.hole-view :as hole-view]
@@ -15,12 +14,13 @@
    - :options - false / :add / :hold (default false)
    - :size - :size-24 / :size-32 (default :size-24)
    - :blur? - boolean (default false)
-    - :theme - :light / :dark
+    - :theme - :light / :dark 
+    - :token-img-src - token image source
    - :token-value - string - token value
    - :token-symbol - string"
  []
  (let [container-width (reagent/atom 0)]
-    (fn [{:keys [options size blur? theme token-value token-symbol]
+    (fn [{:keys [options size blur? theme token-img-src token-value token-symbol]
          :or   {size :size-24}}]
      [rn/view
       {:on-layout #(reset! container-width
@@ -28,25 +28,21 @@
       [hole-view/hole-view
        {:holes (if options
                  [{:x            (- @container-width
-                                     (case size
+                                     (condp = size
                                       :size-24 10
-                                       :size-32 12
-                                       nil))
-                    :y            (case size
+                                       :size-32 12))
+                    :y            (condp = size
                                    :size-24 -6
-                                    :size-32 -4
-                                    nil)
+                                    :size-32 -4)
                    :width        16
                    :height       16
                    :borderRadius 8}]
                  [])}
-        [rn/view {:style (style/container size options blur? theme)}
-         [token/view
-          {:style (style/token-img size)
-           :token token-symbol
-           :size  (case size
-                    :size-24 :size-20
-                    :size-32 :size-28)}]
+        [rn/view
+         {:style (style/container size options blur? theme)}
+         [rn/image
+          {:style  (style/token-img size)
+           :source token-img-src}]
         [text/text
          {:size   :paragraph-2
           :weight :medium
@@ -1,51 +0,0 @@
-(ns quo.components.text-combinations.standard-title.component-spec
-  (:require [quo.components.text-combinations.standard-title.view :as standard-title]
-            [test-helpers.component :as h]))
-
-(h/describe "Text combinations - Standard title"
-  (h/test "Default render"
-    (h/render [standard-title/view {:title "This is a title"}])
-    (h/is-truthy (h/get-by-text "This is a title")))
-
-  (h/test "Counter variant"
-    (h/render [standard-title/view
-               {:title         "This is a title"
-                :right         :counter
-                :counter-left  50
-                :counter-right 100}])
-    (h/is-truthy (h/get-by-text "50/100")))
-
-  (h/describe "Action variant"
-    (h/test "Default render"
-      (let [on-press-fn (h/mock-fn)]
-        (h/render [standard-title/view
-                   {:title    "This is a title"
-                    :right    :action
-                    :on-press on-press-fn}])
-        (h/is-truthy (h/get-by-text "This is a title"))))
-
-    (h/test "Action fired"
-      (let [on-press-fn (h/mock-fn)]
-        (h/render [standard-title/view
-                   {:title    "This is a title"
-                    :right    :action
-                    :on-press on-press-fn}])
-
-        (h/fire-event :on-press (h/get-by-label-text :standard-title-action))
-        (h/was-called-times on-press-fn 1))))
-
-  (h/describe "Tag variant"
-    (h/test "Default render"
-      (h/render [standard-title/view
-                 {:title "This is a title"
-                  :right :tag}])
-      (h/is-truthy (h/get-by-text "This is a title")))
-
-    (h/test "Tag callback fired"
-      (let [on-press-fn (h/mock-fn)]
-        (h/render [standard-title/view
-                   {:title    "This is a title"
-                    :right    :tag
-                    :on-press on-press-fn}])
-        (h/fire-event :on-press (h/get-by-label-text :standard-title-tag))
-        (h/was-called-times on-press-fn 1)))))
@@ -1,24 +0,0 @@
-(ns quo.components.text-combinations.standard-title.style
-  (:require [quo.foundations.colors :as colors]))
-
-(def container
-  {:flex-direction  :row
-   :justify-content :space-between})
-
-(def right-container {:margin-left 20})
-
-(def right-counter
-  {:padding-top    12
-   :padding-bottom 2})
-
-(defn right-counter-text
-  [blur? theme]
-  {:color (if blur?
-            (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
-            (colors/theme-colors colors/neutral-40 colors/neutral-50 theme))})
-
-(defn right-tag-icon-color
-  [blur? theme]
-  (if blur?
-    (colors/theme-colors colors/neutral-80-opa-70 colors/white-opa-70 theme)
-    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
@@ -1,68 +0,0 @@
-(ns quo.components.text-combinations.standard-title.view
-  (:require [clojure.string :as string]
-            [quo.components.buttons.button.view :as button]
-            [quo.components.markdown.text :as text]
-            [quo.components.tags.tag :as tag]
-            [quo.components.text-combinations.standard-title.style :as style]
-            [quo.theme]
-            [react-native.core :as rn]
-            [utils.number]))
-
-(defn- get-counter-number
-  [n]
-  (let [parsed-number (utils.number/parse-int n)]
-    (if (< n 10)
-      (str "0" parsed-number)
-      parsed-number)))
-
-(defn- right-counter
-  [{:keys [blur? theme counter-left counter-right]}]
-  [rn/view {:style style/right-counter}
-   [text/text
-    {:size   :paragraph-2
-     :weight :regular
-     :style  (style/right-counter-text blur? theme)}
-    (str (get-counter-number counter-left)
-         "/"
-         (get-counter-number counter-right))]])
-
-(defn- right-action
-  [{:keys [customization-color on-press icon]
-    :or   {icon :i/placeholder}}]
-  [button/button
-   {:accessibility-label :standard-title-action
-    :size                32
-    :icon-only?          true
-    :customization-color customization-color
-    :on-press            on-press}
-   icon])
-
-(defn- right-tag
-  [{:keys [theme blur? on-press icon label]
-    :or   {icon :i/placeholder}}]
-  (let [labelled? (not (string/blank? label))]
-    [tag/tag
-     {:accessibility-label :standard-title-tag
-      :size                32
-      :type                :icon
-      :resource            icon
-      :on-press            on-press
-      :labelled?           labelled?
-      :label               (when labelled? label)
-      :blurred?            blur?
-      :icon-color          (style/right-tag-icon-color blur? theme)}]))
-
-(defn- view-internal
-  [{:keys [title right] :as props}]
-  [rn/view {:style style/container}
-   [text/text {:size :heading-1 :weight :semi-bold}
-    title]
-   (when right
-     [rn/view {:style style/right-container}
-      (case right
-        :counter [right-counter props]
-        :action  [right-action props]
-        :tag     [right-tag props]
-        nil)])])
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,68 +0,0 @@
-(ns quo.components.text-combinations.username.component-spec
-  (:require [quo.components.text-combinations.username.view :as username]
-            [test-helpers.component :as h]))
-
-(defn test-all-status
-  [component-to-render component-props]
-  (h/test "Verified status"
-    (h/render [component-to-render (assoc component-props :status :verified)])
-    (h/is-truthy (h/get-by-label-text :username-status-icon)))
-
-  (h/test "Contact status"
-    (h/render [component-to-render (assoc component-props :status :contact)])
-    (h/is-truthy (h/get-by-label-text :username-status-icon)))
-
-  (h/test "Untrustworthy status"
-    (h/render [component-to-render (assoc component-props :status :untrustworthy)])
-    (h/is-truthy (h/get-by-label-text :username-status-icon)))
-
-  (h/test "Untrustworthy contact status"
-    (h/render [component-to-render (assoc component-props :status :untrustworthy-contact)])
-    (let [icons (h/get-all-by-label-text :username-status-icon)]
-      (h/is-truthy (aget icons 0))
-      (h/is-truthy (aget icons 1))))
-
-  (h/test "Blocked status"
-    (h/render [component-to-render (assoc component-props :status :blocked)])
-    (h/is-truthy (h/get-by-label-text :username-status-icon))))
-
-(h/describe "Text combinations - Username"
-  (h/test "Renders default"
-    (h/render [username/view {:username "Test username"}])
-    (h/is-truthy (h/get-by-text "Test username")))
-
-  (h/describe "Render different :name-type values"
-    (h/describe "default"
-      (let [props {:name-type :default
-                   :username  "Test username"}]
-
-        (h/test "default render"
-          (h/render [username/view props])
-          (h/is-truthy (h/get-by-text "Test username")))
-
-        (h/describe "All status are rendered"
-          (test-all-status username/view props))))
-
-    (h/describe "ens"
-      (let [props {:name-type :ens
-                   :username  "test-username.eth"}]
-
-        (h/test "no status render"
-          (h/render [username/view props])
-          (h/is-truthy (h/get-by-text "test-username.eth")))
-
-        (h/describe "All status are rendered"
-          (test-all-status username/view props))))
-
-    (h/describe "nickname"
-      (let [props {:name-type :nickname
-                   :username  "Nickname"
-                   :name      "Real name"}]
-
-        (h/test "no status render"
-          (h/render [username/view props])
-          (h/is-truthy (h/get-by-text "Nickname"))
-          (h/is-truthy (h/get-by-text "Real name")))
-
-        (h/describe "All status are rendered"
-          (test-all-status username/view props))))))
@@ -1,30 +0,0 @@
-(ns quo.components.text-combinations.username.style
-  (:require [quo.foundations.colors :as colors]))
-
-(def container
-  {:flex-direction :row
-   :height         32})
-
-(def username-text-container
-  {:flex-direction :row
-   :align-items    :flex-end})
-
-(defn real-name-text
-  [theme blur?]
-  {:color (if blur?
-            (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
-            (colors/theme-colors colors/neutral-60 colors/neutral-40 theme))})
-
-(defn real-name-dot
-  [theme blur?]
-  (assoc (real-name-text theme blur?) :margin-horizontal 6))
-
-(defn status-icon-container
-  [name-type status]
-  (cond-> {:flex-direction :row
-           :margin-left    4}
-    (#{:default :ens} name-type)      (assoc :margin-top    8
-                                             :margin-bottom 4)
-    (= :nickname name-type)           (assoc :margin-top    10
-                                             :margin-bottom 2)
-    (= status :untrustworthy-contact) (assoc :margin-right 2)))
@@ -1,57 +0,0 @@
-(ns quo.components.text-combinations.username.view
-  (:require [quo.components.icon :as icon]
-            [quo.components.markdown.text :as text]
-            [quo.components.text-combinations.username.style :as style]
-            [quo.foundations.colors :as colors]
-            [quo.theme]
-            [react-native.core :as rn]))
-
-(defn- username-text
-  [{:keys     [theme name-type username blur?]
-    real-name :name}]
-  [rn/view {:style style/username-text-container}
-   [text/text
-    {:size   :heading-1
-     :weight :semi-bold}
-    username]
-   (when (= name-type :nickname)
-     [:<>
-      [text/text
-       {:style  (style/real-name-dot theme blur?)
-        :size   :paragraph-1
-        :weight :medium}
-       "∙"]
-      [text/text
-       {:style  (style/real-name-text theme blur?)
-        :size   :paragraph-1
-        :weight :medium}
-       real-name]])])
-
-(defn- icon-20
-  [icon-name theme color]
-  [icon/icon icon-name
-   {:accessibility-label :username-status-icon
-    :size                20
-    :color               (colors/resolve-color color theme)}])
-
-(defn status-icon
-  [{:keys [theme name-type status]
-    :or   {name-type :default}}]
-  [rn/view {:style (style/status-icon-container name-type status)}
-   (case status
-     :verified              [icon-20 :i/verified theme :success]
-     :contact               [icon-20 :i/contact theme :blue]
-     :untrustworthy         [icon-20 :i/untrustworthy theme :danger]
-     :blocked               [icon-20 :i/block theme :danger]
-     :untrustworthy-contact [:<>
-                             [icon-20 :i/untrustworthy theme :danger]
-                             [icon-20 :i/contact theme :blue]]
-     nil)])
-
-(defn view-internal
-  [props]
-  [rn/view {:style style/container}
-   [username-text props]
-   [status-icon props]])
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,34 +0,0 @@
-(ns quo.components.utilities.token.loader
-  (:require [clojure.java.io :as io]
-            [clojure.string :as string]))
-
-(def ^:private token-path "./resources/images/tokens/mainnet/")
-
-(defn- clean-filename
-  "Return a (string) filename without the .png extension and @<number>x suffix."
-  [file]
-  (first (string/split (str file) #"@|\.png")))
-
-(defn- get-js-require
-  [filename]
-  (let [require-path (str "." filename ".png")]
-    `(js/require ~require-path)))
-
-(defn- get-file-key
-  [filename]
-  (-> filename
-      (string/split #"\/")
-      (peek)
-      (string/lower-case)))
-
-(defn get-tokens
-  []
-  (let [files         (file-seq (io/file token-path))
-        png-filenames (keep (fn [file]
-                              (when (string/ends-with? file "png")
-                                (clean-filename file)))
-                            files)]
-    (zipmap (map get-file-key png-filenames)
-            (map get-js-require png-filenames))))
-
-(defmacro resolve-tokens [] (get-tokens))
@@ -1,14 +0,0 @@
-(ns quo.components.utilities.token.loader
-  (:require-macros [quo.components.utilities.token.loader :as loader])
-  (:require [clojure.string :as string]))
-
-(def ^:private tokens (loader/resolve-tokens))
-
-(defn- get-token-image*
-  [token]
-  (let [token-symbol (cond-> token
-                       (keyword? token) name
-                       :always          string/lower-case)]
-    (get tokens token-symbol)))
-
-(def get-token-image (memoize get-token-image*))
@@ -1,58 +0,0 @@
-(ns quo.components.utilities.token.view
-  (:require [quo.components.utilities.token.loader :as token-loader]
-            [react-native.core :as rn]
-            [schema.core :as schema]
-            [utils.number]))
-
-(def ?schema
-  [:=>
-   [:cat
-    [:map {:closed true}
-     [:size {:optional true :default 32} [:or keyword? pos-int?]]
-     [:token {:optional true} [:or keyword? string?]]
-     [:style {:optional true} map?]
-     ;; Ignores `token` and uses this as parameter to `rn/image`'s source.
-     [:image-source {:optional true} [:or string? map?]]
-     ;; If true, adds `data:image/png;base64,` as prefix to the string passed as `image-source`
-     [:add-b64-prefix? {:optional true} boolean?]]]
-   :any])
-
-(defn- size->number
-  "Remove `size-` prefix in size keywords and returns a number useful for styling."
-  [size]
-  (-> size name (subs 5) utils.number/parse-int))
-
-(defn- token-style
-  [style size]
-  (let [size-number (if (keyword? size)
-                      (size->number size)
-                      size)]
-    (assoc style
-           :width  size-number
-           :height size-number)))
-
-(def ^:private b64-png-image-prefix "data:image/png;base64,")
-
-(defn view-internal
-  "Render a token image.
-   Props:
-   - style:           extra styles to apply to the `rn/image` component.
-   - size:            `:size-nn` or just `nn`, being `nn` any number. Defaults to 32.
-   - token:           string or keyword, it can contain upper case letters or not.
-                      E.g. all of these are valid and resolve to the same:
-                      :token/snt | :snt | :SNT | \"SNT\" | \"snt\".
-   - image-source:    Ignores `token` and uses this as parameter to `rn/image`'s source.
-   - add-b64-prefix?: If true, adds `data:image/png;base64,` as prefix to the string
-                      passed as `image-source`.
-  "
-  [{:keys [token size style image-source add-b64-prefix?]
-    :or   {size 32}}]
-  (let [b64-string (if (and image-source add-b64-prefix?)
-                     (str b64-png-image-prefix image-source)
-                     image-source)
-        source     (or b64-string (token-loader/get-token-image token))]
-    [rn/image
-     {:style  (token-style style size)
-      :source source}]))
-
-(def view (schema/instrument #'view-internal ?schema))
@@ -93,7 +93,7 @@
    :end    {:x 1 :y 0}}])

 (defn- user-account
-  [_]
+  []
  (let [pressed?     (reagent/atom false)
        on-press-in  #(reset! pressed? true)
        on-press-out #(reset! pressed? false)]
@@ -147,7 +147,7 @@
             [gradient-overview theme customization-color])])))))

 (defn- add-account-view
-  [_]
+  []
  (let [pressed? (reagent/atom false)]
    (fn [{:keys [on-press customization-color theme metrics?]}]
      [rn/pressable
@@ -20,13 +20,12 @@
     (i18n/label :t/trip-accounts))])

 (defn- row-icon
-  [customization-color profile-picture type secondary-color]
+  [profile-picture type secondary-color]
  (case type
    :default-keypair [user-avatar/user-avatar
-                      {:size                :xxs
-                       :ring?               false
-                       :customization-color customization-color
-                       :profile-picture     profile-picture}]
+                      {:size            :xxs
+                       :ring?           false
+                       :profile-picture profile-picture}]
    :recovery-phrase [icons/icon
                      :i/seed
                      {:accessibility-label :recovery-phrase-icon
@@ -42,11 +41,10 @@
    nil))

 (defn- row-view
-  [{:keys [type theme secondary-color customization-color profile-picture title stored subtitle
-           on-press]}]
+  [{:keys [type theme secondary-color profile-picture title stored subtitle on-press]}]
  [rn/view {:style (style/row-container type theme)}
   [rn/view {:style style/icon-container}
-    [row-icon customization-color profile-picture type secondary-color]]
+    [row-icon profile-picture type secondary-color]]
   [rn/view
    {:style style/row-content-container}
    [row-title type title]
@@ -70,19 +68,18 @@
       {:color secondary-color}]])])

 (defn- list-view
-  [{:keys [type stored customization-color profile-picture user-name theme secondary-color]}]
+  [{:keys [type stored profile-picture user-name theme secondary-color]}]
  (let [stored-name (if (= :on-device stored)
                      (i18n/label :t/on-device)
                      (i18n/label :t/on-keycard))]
    [row-view
-     {:type                type
-      :stored              stored
-      :customization-color customization-color
-      :profile-picture     profile-picture
-      :title               user-name
-      :subtitle            stored-name
-      :theme               theme
-      :secondary-color     secondary-color}]))
+     {:type            type
+      :stored          stored
+      :profile-picture profile-picture
+      :title           user-name
+      :subtitle        stored-name
+      :theme           theme
+      :secondary-color secondary-color}]))

 (defn- card-view
  [theme derivation-path secondary-color on-press]
@@ -108,13 +105,12 @@

 (def view
  "Create an account-origin UI component.
-  | key                   | values                                         |
-  | ----------------------|------------------------------------------------|
-  | :type                 | :default-keypair :recovery-phrase :private-key 
-  | :stored               | :on-device :on-keycard
-  | :profile-picture      | image source
-  | :customization-color  | profile color
-  | :derivation-path      | string
-  | :user-name            | string
-  | :on-press             | function"
+  | key               | values                                         |
+  | ------------------|------------------------------------------------|
+  | :type             | :default-keypair :recovery-phrase :private-key 
+  | :stored           | :on-device :on-keycard
+  | :profile-picture  | image source
+  | :derivation-path  | string
+  | :user-name        | string
+  | :on-press         | function"
  (quo.theme/with-theme view-internal))
@@ -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))))
@@ -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})
@@ -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))
@@ -2,15 +2,17 @@
  (:require
    [clojure.string :as string]
    [quo.components.markdown.text :as text]
-    [quo.components.utilities.token.view :as token]
    [quo.components.wallet.network-amount.style :as style]
+    [quo.foundations.resources :as resources]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]))

 (defn- view-internal
  [{:keys [amount token theme]}]
  [rn/view {:style style/container}
-   [token/view {:token token :size :size-12}]
+   [rn/image
+    {:source (resources/get-token token)
+     :style  {:width 12 :height 12}}]
   [text/text
    {:weight :medium
     :size   :paragraph-2
@@ -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}))))
@@ -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}))
@@ -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))
@@ -16,6 +16,10 @@
   :flex-direction     :row
   :justify-content    :space-between})

+(def token
+  {:width  32
+   :height 32})
+
 (defn text-input
  [theme]
  (merge typography/heading-1
@@ -5,10 +5,10 @@
    [quo.components.dividers.divider-line.view :as divider-line]
    [quo.components.markdown.text :as text]
    [quo.components.tags.network-tags.view :as network-tag]
-    [quo.components.utilities.token.view :as token]
    [quo.components.wallet.token-input.style :as style]
    [quo.foundations.colors :as colors]
    [quo.foundations.common :as common]
+    [quo.foundations.resources :as resources]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [reagent.core :as reagent]))
@@ -41,7 +41,9 @@
          :style    {:flex-direction :row
                     :flex-grow      1
                     :align-items    :flex-end}}
-         [token/view {:token token :size :size-32}]
+         [rn/image
+          {:style  style/token
+           :source (resources/get-token (keyword (string/lower-case token)))}]
         [rn/text-input
          (cond-> {:auto-focus               true
                   :ref                      #(reset! input-ref %)
@@ -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))))
@@ -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)})
@@ -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))
@@ -19,10 +19,10 @@
  (h/test "Context tag rendered"
    (h/render [transaction-summary/view
               {:transaction :send
-                :first-tag   {:size   24
-                              :type   :token
-                              :token  "SNT"
-                              :amount 1500}}])
+                :first-tag   {:size       24
+                              :type       :token
+                              :token-name "SNT"
+                              :amount     1500}}])
    (h/is-truthy (h/query-by-label-text :context-tag))))


@@ -66,7 +66,6 @@
    quo.components.inputs.recovery-phrase.view
    quo.components.inputs.search-input.view
    quo.components.inputs.title-input.view
-    quo.components.ios.drawer-bar.view
    quo.components.keycard.view
    quo.components.links.link-preview.view
    quo.components.links.url-preview-list.view
@@ -140,15 +139,11 @@
    quo.components.tags.tiny-tag.view
    quo.components.tags.token-tag.view
    quo.components.text-combinations.channel-name.view
-    quo.components.text-combinations.standard-title.view
-    quo.components.text-combinations.username.view
    quo.components.text-combinations.view
-    quo.components.utilities.token.view
    quo.components.wallet.account-card.view
    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
@@ -157,7 +152,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))
@@ -273,9 +267,6 @@
 (def search-input quo.components.inputs.search-input.view/search-input)
 (def title-input quo.components.inputs.title-input.view/view)

-;;;; iOS
-(def drawer-bar quo.components.ios.drawer-bar.view/view)
-
 ;;;; Numbered Keyboard
 (def keyboard-key quo.components.numbered-keyboard.keyboard-key.view/view)
 (def numbered-keyboard quo.components.numbered-keyboard.numbered-keyboard.view/view)
@@ -384,20 +375,14 @@
 (def token-tag quo.components.tags.token-tag.view/view)

 ;;;; Text combinations
-(def channel-name quo.components.text-combinations.channel-name.view/view)
-(def standard-title quo.components.text-combinations.standard-title.view/view)
 (def text-combinations quo.components.text-combinations.view/view)
-(def username quo.components.text-combinations.username.view/view)
-
-;;;; Utilities - Outside of design system
-(def token quo.components.utilities.token.view/view)
+(def channel-name quo.components.text-combinations.channel-name.view/view)

 ;;;; Wallet
 (def account-card quo.components.wallet.account-card.view/view)
 (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)
@@ -408,5 +393,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)
@@ -77,11 +77,9 @@
    [quo.components.tags.summary-tag.component-spec]
    [quo.components.tags.tiny-tag.component-spec]
    [quo.components.text-combinations.channel-name.component-spec]
-    [quo.components.text-combinations.username.component-spec]
    [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]
@@ -89,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]))
@@ -285,6 +285,10 @@
      (get-in colors-map [color suffix]))))

 (defn- resolve-color*
+  "(resolve-color color theme opacity)
+   color   hex string or keyword (resolves from custom, network and semantic colors)
+   theme  :light/:dark
+   opacity 0-100 (optional) - if set theme is ignored and goes to 50 suffix internally"
  ([color theme]
   (resolve-color* color theme nil))
  ([color theme opacity]
@@ -296,12 +300,7 @@
       suffix  (get-from-colors-map suffix)
       opacity (alpha (/ opacity 100))))))

-(def resolve-color
-  "(resolve-color color theme opacity)
-   color   hex string or keyword (resolves from custom, network and semantic colors)
-   theme  :light/:dark
-   opacity 0-100 (optional) - if set theme is ignored and goes to 50 suffix internally"
-  (memoize resolve-color*))
+(def resolve-color (memoize resolve-color*))

 (def ^{:deprecated true :superseded-by "resolve-color"}
     custom-color
@@ -3,3 +3,8 @@
 (def currency-label
  {:eur "€"
   :usd "$"})
+
+(def token-label
+  {:eth "Ethereum"
+   :snt "Status"
+   :dai "Dai"})
@@ -32,6 +32,197 @@
  [k]
  (get dapps k))

+(def tokens
+  {:0-native  (js/require "../resources/images/tokens/mainnet/0-native.png")
+   :0xbtc     (js/require "../resources/images/tokens/mainnet/0XBTC.png")
+   :1st       (js/require "../resources/images/tokens/mainnet/1ST.png")
+   :abt       (js/require "../resources/images/tokens/mainnet/ABT.png")
+   :abyss     (js/require "../resources/images/tokens/mainnet/ABYSS.png")
+   :ae        (js/require "../resources/images/tokens/mainnet/AE.png")
+   :agld      (js/require "../resources/images/tokens/mainnet/AGLD.png")
+   :akro      (js/require "../resources/images/tokens/mainnet/AKRO.png")
+   :amb       (js/require "../resources/images/tokens/mainnet/AMB.png")
+   :ampl      (js/require "../resources/images/tokens/mainnet/AMPL.png")
+   :ant       (js/require "../resources/images/tokens/mainnet/ANT.png")
+   :appc      (js/require "../resources/images/tokens/mainnet/APPC.png")
+   :ast       (js/require "../resources/images/tokens/mainnet/AST.png")
+   :atmchain  (js/require "../resources/images/tokens/mainnet/ATMChain.png")
+   :ausdc     (js/require "../resources/images/tokens/mainnet/aUSDC.png")
+   :bal       (js/require "../resources/images/tokens/mainnet/BAL.png")
+   :bam       (js/require "../resources/images/tokens/mainnet/BAM.png")
+   :band      (js/require "../resources/images/tokens/mainnet/BAND.png")
+   :bat       (js/require "../resources/images/tokens/mainnet/BAT.png")
+   :blt       (js/require "../resources/images/tokens/mainnet/BLT.png")
+   :blz       (js/require "../resources/images/tokens/mainnet/BLZ.png")
+   :bnb       (js/require "../resources/images/tokens/mainnet/BNB.png")
+   :bnt       (js/require "../resources/images/tokens/mainnet/BNT.png")
+   :brln      (js/require "../resources/images/tokens/mainnet/BRLN.png")
+   :btm       (js/require "../resources/images/tokens/mainnet/BTM.png")
+   :btu       (js/require "../resources/images/tokens/mainnet/BTU.png")
+   :cdai      (js/require "../resources/images/tokens/mainnet/cDAI.png")
+   :cdt       (js/require "../resources/images/tokens/mainnet/CDT.png")
+   :centra    (js/require "../resources/images/tokens/mainnet/Centra.png")
+   :cfi       (js/require "../resources/images/tokens/mainnet/CFI.png")
+   :ck        (js/require "../resources/images/tokens/mainnet/CK.png")
+   :cnd       (js/require "../resources/images/tokens/mainnet/CND.png")
+   :cob       (js/require "../resources/images/tokens/mainnet/COB.png")
+   :comp      (js/require "../resources/images/tokens/mainnet/COMP.png")
+   :crv       (js/require "../resources/images/tokens/mainnet/CRV.png")
+   :cvc       (js/require "../resources/images/tokens/mainnet/CVC.png")
+   :dai       (js/require "../resources/images/tokens/mainnet/DAI.png")
+   :dat       (js/require "../resources/images/tokens/mainnet/DAT.png")
+   :data      (js/require "../resources/images/tokens/mainnet/DATA.png")
+   :dcn       (js/require "../resources/images/tokens/mainnet/DCN.png")
+   :dgd       (js/require "../resources/images/tokens/mainnet/DGD.png")
+   :dgx       (js/require "../resources/images/tokens/mainnet/DGX.png")
+   :dlt       (js/require "../resources/images/tokens/mainnet/DLT.png")
+   :dnt       (js/require "../resources/images/tokens/mainnet/DNT.png")
+   :dpy       (js/require "../resources/images/tokens/mainnet/DPY.png")
+   :drt       (js/require "../resources/images/tokens/mainnet/DRT.png")
+   :dta       (js/require "../resources/images/tokens/mainnet/DTA.png")
+   :edg       (js/require "../resources/images/tokens/mainnet/EDG.png")
+   :edo       (js/require "../resources/images/tokens/mainnet/EDO.png")
+   :ekg       (js/require "../resources/images/tokens/mainnet/EKG.png")
+   :eko       (js/require "../resources/images/tokens/mainnet/EKO.png")
+   :elf       (js/require "../resources/images/tokens/mainnet/ELF.png")
+   :emona     (js/require "../resources/images/tokens/mainnet/EMONA.png")
+   :eng       (js/require "../resources/images/tokens/mainnet/ENG.png")
+   :enj       (js/require "../resources/images/tokens/mainnet/ENJ.png")
+   :ens       (js/require "../resources/images/tokens/mainnet/ENS.png")
+   :eos       (js/require "../resources/images/tokens/mainnet/EOS.png")
+   :equad     (js/require "../resources/images/tokens/mainnet/EQUAD.png")
+   :eth       (js/require "../resources/images/tokens/mainnet/ETH-token.png")
+   :eth2x-fli (js/require "../resources/images/tokens/mainnet/ETH2x-FLI.png")
+   :ethos     (js/require "../resources/images/tokens/mainnet/ETHOS.png")
+   :evx       (js/require "../resources/images/tokens/mainnet/EVX.png")
+   :fuel      (js/require "../resources/images/tokens/mainnet/FUEL.png")
+   :fun       (js/require "../resources/images/tokens/mainnet/FUN.png")
+   :fxc       (js/require "../resources/images/tokens/mainnet/FXC.png")
+   :gdc       (js/require "../resources/images/tokens/mainnet/GDC.png")
+   :gen       (js/require "../resources/images/tokens/mainnet/GEN.png")
+   :glm       (js/require "../resources/images/tokens/mainnet/GLM.png")
+   :gno       (js/require "../resources/images/tokens/mainnet/GNO.png")
+   :gnt       (js/require "../resources/images/tokens/mainnet/GNT.png")
+   :grid      (js/require "../resources/images/tokens/mainnet/GRID.png")
+   :grt       (js/require "../resources/images/tokens/mainnet/GRT.png")
+   :hez       (js/require "../resources/images/tokens/mainnet/HEZ.png")
+   :hst       (js/require "../resources/images/tokens/mainnet/HST.png")
+   :ht        (js/require "../resources/images/tokens/mainnet/HT.png")
+   :icn       (js/require "../resources/images/tokens/mainnet/ICN.png")
+   :icos      (js/require "../resources/images/tokens/mainnet/ICOS.png")
+   :iost      (js/require "../resources/images/tokens/mainnet/IOST.png")
+   :kdo       (js/require "../resources/images/tokens/mainnet/KDO.png")
+   :kin       (js/require "../resources/images/tokens/mainnet/KIN.png")
+   :knc       (js/require "../resources/images/tokens/mainnet/KNC.png")
+   :kudos     (js/require "../resources/images/tokens/mainnet/Kudos.png")
+   :lend      (js/require "../resources/images/tokens/mainnet/LEND.png")
+   :link      (js/require "../resources/images/tokens/mainnet/LINK.png")
+   :lisk      (js/require "../resources/images/tokens/mainnet/LISK.png")
+   :loom      (js/require "../resources/images/tokens/mainnet/LOOM.png")
+   :lpt       (js/require "../resources/images/tokens/mainnet/LPT.png")
+   :lrc       (js/require "../resources/images/tokens/mainnet/LRC.png")
+   :mana      (js/require "../resources/images/tokens/mainnet/MANA.png")
+   :mco       (js/require "../resources/images/tokens/mainnet/MCO.png")
+   :mda       (js/require "../resources/images/tokens/mainnet/MDA.png")
+   :met       (js/require "../resources/images/tokens/mainnet/MET.png")
+   :mfg       (js/require "../resources/images/tokens/mainnet/MFG.png")
+   :mgo       (js/require "../resources/images/tokens/mainnet/MGO.png")
+   :mkr       (js/require "../resources/images/tokens/mainnet/MKR.png")
+   :mln       (js/require "../resources/images/tokens/mainnet/MLN.png")
+   :moc       (js/require "../resources/images/tokens/mainnet/MOC.png")
+   :mod       (js/require "../resources/images/tokens/mainnet/MOD.png")
+   :mth       (js/require "../resources/images/tokens/mainnet/MTH.png")
+   :mtl       (js/require "../resources/images/tokens/mainnet/MTL.png")
+   :myb       (js/require "../resources/images/tokens/mainnet/MYB.png")
+   :nexo      (js/require "../resources/images/tokens/mainnet/NEXO.png")
+   :nexxo     (js/require "../resources/images/tokens/mainnet/NEXXO.png")
+   :nmr       (js/require "../resources/images/tokens/mainnet/NMR.png")
+   :npxs      (js/require "../resources/images/tokens/mainnet/NPXS.png")
+   :ogn       (js/require "../resources/images/tokens/mainnet/OGN.png")
+   :omg       (js/require "../resources/images/tokens/mainnet/OMG.png")
+   :otn       (js/require "../resources/images/tokens/mainnet/OTN.png")
+   :oxt       (js/require "../resources/images/tokens/mainnet/OXT.png")
+   :pax       (js/require "../resources/images/tokens/mainnet/PAX.png")
+   :paxg      (js/require "../resources/images/tokens/mainnet/PAXG.png")
+   :pay       (js/require "../resources/images/tokens/mainnet/PAY.png")
+   :pbtc      (js/require "../resources/images/tokens/mainnet/PBTC.png")
+   :plr       (js/require "../resources/images/tokens/mainnet/PLR.png")
+   :poe       (js/require "../resources/images/tokens/mainnet/POE.png")
+   :poly      (js/require "../resources/images/tokens/mainnet/POLY.png")
+   :powr      (js/require "../resources/images/tokens/mainnet/POWR.png")
+   :ppp       (js/require "../resources/images/tokens/mainnet/PPP.png")
+   :ppt       (js/require "../resources/images/tokens/mainnet/PPT.png")
+   :pt        (js/require "../resources/images/tokens/mainnet/PT.png")
+   :qkc       (js/require "../resources/images/tokens/mainnet/QKC.png")
+   :qrl       (js/require "../resources/images/tokens/mainnet/QRL.png")
+   :qsp       (js/require "../resources/images/tokens/mainnet/QSP.png")
+   :r         (js/require "../resources/images/tokens/mainnet/R.png")
+   :rae       (js/require "../resources/images/tokens/mainnet/RAE.png")
+   :rare      (js/require "../resources/images/tokens/mainnet/RARE.png")
+   :rcn       (js/require "../resources/images/tokens/mainnet/RCN.png")
+   :rdn       (js/require "../resources/images/tokens/mainnet/RDN.png")
+   :ren       (js/require "../resources/images/tokens/mainnet/REN.png")
+   :rep       (js/require "../resources/images/tokens/mainnet/REP.png")
+   :req       (js/require "../resources/images/tokens/mainnet/REQ.png")
+   :rhoc      (js/require "../resources/images/tokens/mainnet/RHOC.png")
+   :rlc       (js/require "../resources/images/tokens/mainnet/RLC.png")
+   :rol       (js/require "../resources/images/tokens/mainnet/ROL.png")
+   :sai       (js/require "../resources/images/tokens/mainnet/SAI.png")
+   :salt      (js/require "../resources/images/tokens/mainnet/SALT.png")
+   :san       (js/require "../resources/images/tokens/mainnet/SAN.png")
+   :sngls     (js/require "../resources/images/tokens/mainnet/SNGLS.png")
+   :snm       (js/require "../resources/images/tokens/mainnet/SNM.png")
+   :snt       (js/require "../resources/images/tokens/mainnet/SNT.png")
+   :snx       (js/require "../resources/images/tokens/mainnet/SNX.png")
+   :socks     (js/require "../resources/images/tokens/mainnet/SOCKS.png")
+   :spank     (js/require "../resources/images/tokens/mainnet/SPANK.png")
+   :spike     (js/require "../resources/images/tokens/mainnet/SPIKE.png")
+   :spn       (js/require "../resources/images/tokens/mainnet/SPN.png")
+   :st        (js/require "../resources/images/tokens/mainnet/ST.png")
+   :storj     (js/require "../resources/images/tokens/mainnet/STORJ.png")
+   :storm     (js/require "../resources/images/tokens/mainnet/STORM.png")
+   :strk      (js/require "../resources/images/tokens/mainnet/STRK.png")
+   :stx       (js/require "../resources/images/tokens/mainnet/STX.png")
+   :sub       (js/require "../resources/images/tokens/mainnet/SUB.png")
+   :supr      (js/require "../resources/images/tokens/mainnet/SUPR.png")
+   :susd      (js/require "../resources/images/tokens/mainnet/sUSD.png")
+   :taas      (js/require "../resources/images/tokens/mainnet/TAAS.png")
+   :taud      (js/require "../resources/images/tokens/mainnet/TAUD.png")
+   :tcad      (js/require "../resources/images/tokens/mainnet/TCAD.png")
+   :tgbp      (js/require "../resources/images/tokens/mainnet/TGBP.png")
+   :tkn       (js/require "../resources/images/tokens/mainnet/TKN.png")
+   :tkx       (js/require "../resources/images/tokens/mainnet/TKX.png")
+   :tnt       (js/require "../resources/images/tokens/mainnet/TNT.png")
+   :trst      (js/require "../resources/images/tokens/mainnet/TRST.png")
+   :trx       (js/require "../resources/images/tokens/mainnet/TRX.png")
+   :tusd      (js/require "../resources/images/tokens/mainnet/TUSD.png")
+   :ubi       (js/require "../resources/images/tokens/mainnet/UBI.png")
+   :ubt       (js/require "../resources/images/tokens/mainnet/UBT.png")
+   :ukg       (js/require "../resources/images/tokens/mainnet/UKG.png")
+   :uni       (js/require "../resources/images/tokens/mainnet/UNI.png")
+   :upp       (js/require "../resources/images/tokens/mainnet/UPP.png")
+   :usdc      (js/require "../resources/images/tokens/mainnet/USDC.png")
+   :usds      (js/require "../resources/images/tokens/mainnet/USDS.png")
+   :usdt      (js/require "../resources/images/tokens/mainnet/USDT.png")
+   :veri      (js/require "../resources/images/tokens/mainnet/VERI.png")
+   :vgx       (js/require "../resources/images/tokens/mainnet/VGX.png")
+   :vib       (js/require "../resources/images/tokens/mainnet/VIB.png")
+   :wabi      (js/require "../resources/images/tokens/mainnet/WaBi.png")
+   :wbtc      (js/require "../resources/images/tokens/mainnet/WBTC.png")
+   :weth      (js/require "../resources/images/tokens/mainnet/WETH.png")
+   :wings     (js/require "../resources/images/tokens/mainnet/WINGS.png")
+   :wtc       (js/require "../resources/images/tokens/mainnet/WTC.png")
+   :xaur      (js/require "../resources/images/tokens/mainnet/XAUR.png")
+   :xpa       (js/require "../resources/images/tokens/mainnet/XPA.png")
+   :xrl       (js/require "../resources/images/tokens/mainnet/XRL.png")
+   :xuc       (js/require "../resources/images/tokens/mainnet/XUC.png")
+   :zrx       (js/require "../resources/images/tokens/mainnet/ZRX.png")
+   :zsc       (js/require "../resources/images/tokens/mainnet/ZSC.png")})
+
+(defn get-token
+  [k]
+  (get tokens k))
+
 (def ^:private networks
  {:arbitrum (js/require "../resources/images/networks/Arbitrum.png")
   :ethereum (js/require "../resources/images/networks/Ethereum.png")
@@ -1,10 +0,0 @@
-(ns react-native.blob
-  (:require ["react-native-blob-util" :default ReactNativeBlobUtil]
-            [taoensso.timbre :as log]))
-
-(defn fetch
-  [base64-uri config on-success]
-  (-> (.config ReactNativeBlobUtil (clj->js config))
-      (.fetch "GET" base64-uri)
-      (.then #(on-success (.path %)))
-      (.catch #(log/error "could not download uri" {:error %}))))
@@ -0,0 +1,64 @@
+(ns status-im.chat.models.gaps
+  (:require
+    [status-im.mailserver.core :as mailserver]
+    [status-im2.contexts.chat.messages.list.events :as message-list]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+(rf/defn gaps-filled
+  {:events [:gaps/filled]}
+  [{:keys [db] :as cofx} chat-id message-ids]
+  (rf/merge
+   cofx
+   {:db (-> db
+            (update-in [:messages chat-id] (fn [messages] (apply dissoc messages message-ids)))
+            (dissoc :mailserver/fetching-gaps-in-progress))}
+   (message-list/rebuild-message-list chat-id)))
+
+(rf/defn gaps-failed
+  {:events [:gaps/failed]}
+  [{:keys [db]} chat-id gap-ids error]
+  (log/error "failed to fetch gaps" chat-id gap-ids error)
+  {:db (dissoc db :mailserver/fetching-gaps-in-progress)})
+
+(rf/defn sync-chat-from-sync-from-failed
+  {:events [::sync-chat-from-sync-from-failed]}
+  [{:keys [db]} chat-id error]
+  (log/error "failed to sync chat" chat-id error)
+  {:db (dissoc db :mailserver/fetching-gaps-in-progress)})
+
+(rf/defn sync-chat-from-sync-from-success
+  {:events [::sync-chat-from-sync-from-success]}
+  [{:keys [db] :as cofx} chat-id synced-from]
+  (log/debug "synced success" chat-id synced-from)
+  {:db
+   (-> db
+       (assoc-in [:chats chat-id :synced-from] synced-from)
+       (dissoc :mailserver/fetching-gaps-in-progress))})
+
+(rf/defn fill-gaps
+  [_ chat-id gap-ids]
+  {:json-rpc/call [{:method     "wakuext_fillGaps"
+                    :params     [chat-id gap-ids]
+                    :on-success #(rf/dispatch [:gaps/filled chat-id gap-ids %])
+                    :on-error   #(rf/dispatch [:gaps/failed chat-id gap-ids %])}]})
+
+(rf/defn sync-chat-from-sync-from
+  [_ chat-id]
+  (log/debug "syncing chat from sync from")
+  {:json-rpc/call [{:method     "wakuext_syncChatFromSyncedFrom"
+                    :params     [chat-id]
+                    :on-success #(rf/dispatch [::sync-chat-from-sync-from-success chat-id %])
+                    :on-error   #(rf/dispatch [::sync-chat-from-sync-from-failed chat-id %])}]})
+
+(rf/defn chat-ui-fill-gaps
+  {:events [:chat.ui/fill-gaps]}
+  [{:keys [db] :as cofx} chat-id gap-ids]
+  (let [use-status-nodes? (mailserver/fetch-use-mailservers? {:db db})]
+    (log/info "filling gaps if use-status-nodes = true" chat-id gap-ids)
+    (when use-status-nodes?
+      (rf/merge cofx
+                {:db (assoc db :mailserver/fetching-gaps-in-progress gap-ids)}
+                (if (= gap-ids #{:first-gap})
+                  (sync-chat-from-sync-from chat-id)
+                  (fill-gaps chat-id gap-ids))))))
@@ -0,0 +1,73 @@
+(ns status-im.chat.models.images
+  (:require
+    ["react-native-blob-util" :default ReactNativeBlobUtil]
+    [re-frame.core :as re-frame]
+    [react-native.cameraroll :as cameraroll]
+    [react-native.fs :as fs]
+    [react-native.platform :as platform]
+    [react-native.share :as share]
+    [status-im.ui.components.react :as react]
+    [status-im2.constants :as constants]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+(def temp-image-url (str (fs/cache-dir) "/StatusIm_Image.jpeg"))
+
+(defn download-image-http
+  [base64-uri on-success]
+  (-> (.config ReactNativeBlobUtil
+               (clj->js {:trusty platform/ios?
+                         :path   temp-image-url}))
+      (.fetch "GET" base64-uri)
+      (.then #(on-success (.path %)))
+      (.catch #(log/error "could not download image" {:error %}))))
+
+(defn share-image
+  [uri]
+  (download-image-http uri
+                       (fn [downloaded-url]
+                         (share/open {:url       (str (when platform/android? "file://") downloaded-url)
+                                      :isNewTask true}
+                                     #(fs/unlink downloaded-url)
+                                     #(fs/unlink downloaded-url)))))
+
+(defn save-image-to-gallery
+  [base64-uri on-success]
+  (-> (download-image-http base64-uri cameraroll/save-image)
+      (.then on-success)
+      (.catch #(log/error (str "could not save image to gallery" %)))))
+
+(re-frame/reg-fx
+ ::chat-open-image-picker-camera
+ (fn [current-chat-id]
+   (react/show-image-picker-camera
+    #(re-frame/dispatch [:chat.ui/image-captured current-chat-id (.-path %)])
+    {})))
+
+(rf/defn image-captured
+  {:events [:chat.ui/image-captured]}
+  [{:keys [db]} chat-id uri]
+  (let [current-chat-id (or chat-id (:current-chat-id db))
+        images          (get-in db [:chat/inputs current-chat-id :metadata :sending-image])]
+    (when (and (< (count images) constants/max-album-photos)
+               (not (get images uri)))
+      {::image-selected [uri current-chat-id]})))
+
+(rf/defn clear-sending-images
+  {:events [:chat.ui/clear-sending-images]}
+  [{:keys [db]}]
+  {:db (update-in db [:chat/inputs (:current-chat-id db) :metadata] assoc :sending-image {})})
+
+(rf/defn image-unselected
+  {:events [:chat.ui/image-unselected]}
+  [{:keys [db]} original]
+  (let [current-chat-id (:current-chat-id db)]
+    {:db (update-in db [:chat/inputs current-chat-id :metadata :sending-image] dissoc (:uri original))}))
+
+(rf/defn chat-show-image-picker-camera
+  {:events [:chat.ui/show-image-picker-camera]}
+  [{:keys [db]} chat-id]
+  (let [current-chat-id (or chat-id (:current-chat-id db))
+        images          (get-in db [:chat/inputs current-chat-id :metadata :sending-image])]
+    (when (< (count images) constants/max-album-photos)
+      {::chat-open-image-picker-camera current-chat-id})))
@@ -5,10 +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]
@@ -138,21 +139,14 @@
  (let [current-chat-id (:current-chat-id db)]
    {:db (assoc-in db [:chat/inputs current-chat-id :metadata :responding-to-message] nil)}))

-(defn emoji-only-content?
-  "Determines if text is just an emoji"
-  [{:keys [text response-to]}]
-  (and (not response-to)
-       (string? text)
-       (re-matches constants/regx-emoji text)))
-
 (defn build-text-message
  [{:keys [db]} input-text current-chat-id]
  (when-not (string/blank? input-text)
    (let [{:keys [message-id]}
          (get-in db [:chat/inputs current-chat-id :metadata :responding-to-message])
          preferred-name (get-in db [:profile/profile :preferred-name])
-          emoji? (emoji-only-content? {:text        input-text
-                                       :response-to message-id})]
+          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
@@ -211,7 +205,7 @@
      (rf/merge cofx
                (clean-input (:current-chat-id db))
                (link-preview/reset-unfurled)
-                (messages.transport/send-chat-messages messages)))))
+                (chat.message/send-messages messages)))))

 (rf/defn send-audio-message
  [{:keys [db] :as cofx} audio-path duration current-chat-id]
@@ -220,26 +214,25 @@
    (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]
@@ -249,7 +242,7 @@
   {:json-rpc/call [{:method      "wakuext_editMessage"
                     :params      [{:id           message-id
                                    :text         text
-                                    :content-type (if (emoji-only-content?
+                                    :content-type (if (message-content/emoji-only-content?
                                                       {:text        text
                                                        :response-to quoted-message})
                                                    constants/content-type-emoji
@@ -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]
@@ -77,9 +76,9 @@

 (rf/defn handle-mark-all-read-in-community-successful
  {:events [::mark-all-read-in-community-successful]}
-  [{:keys [db] :as cofx} {:keys [chats] :as _messenger-response}]
+  [{:keys [db] :as cofx} chat-ids]
  (rf/merge cofx
-            {:db       (reduce mark-chat-all-read db (map :id chats))
+            {:db       (reduce mark-chat-all-read db chat-ids)
             :dispatch [:activity-center.notifications/fetch-unread-count]}))

 (rf/defn handle-mark-all-read
@@ -5,10 +5,12 @@
    [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]
    [status-im2.contexts.chat.messages.list.state :as view.state]
+    [taoensso.timbre :as log]
    [utils.re-frame :as rf]))

 (defn- message-loaded?
@@ -19,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]
@@ -115,12 +123,38 @@
             (when (and (:current-chat-id db) (= "active" (:app-state db)))
               [{:ms 100 :dispatch [:chat/mark-all-as-read (:current-chat-id db)]}]))}))

-(rf/defn update-message-status
-  [{:keys [db]} chat-id message-id status]
+(rf/defn update-db-message-status
+  [{:keys [db] :as cofx} chat-id message-id status]
  (when (get-in db [:messages chat-id message-id])
-    {:db (assoc-in db [:messages chat-id message-id :outgoing-status] status)}))
+    (rf/merge cofx
+              {:db (assoc-in db
+                    [:messages chat-id message-id :outgoing-status]
+                    status)})))
+
+(rf/defn update-message-status
+  [{:keys [db] :as cofx} chat-id message-id status]
+  (rf/merge cofx
+            (update-db-message-status chat-id message-id status)))
+
+(rf/defn resend-message
+  [{:keys [db] :as cofx} chat-id message-id]
+  (rf/merge cofx
+            {:json-rpc/call [{:method     "wakuext_reSendChatMessage"
+                              :params     [message-id]
+                              :on-success #(log/debug "re-sent message successfully")
+                              :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]
  (let [mark-as-deleted-fx (->> removed-messages
                                (map #(assoc %
@@ -147,6 +181,14 @@
               (concat mark-as-seen-fx)
               (conj remove-messages-fx)))))

+(comment
+  (handle-removed-messages
+   {:db {:messages {:c1 {:m1 {:chat-id :c1 :message-id :m1}
+                         :m2 {:chat-id :c1 :message-id :m2}}
+                    :c2 {:m3 {:chat-id :c2 :message-id :m3}
+                         :m4 {:chat-id :c2 :message-id :m4}}}}}
+   [:m1 :m3]))
+
 (defn remove-cleared-message
  [messages cleared-at]
  (into {}
@@ -155,6 +197,7 @@
                messages)))

 (rf/defn handle-cleared-histories-messages
+  {:events [::handle-cleared-hisotories-messages]}
  [{:keys [db]} cleared-histories]
  {:db (reduce (fn [acc current]
                 (update-in acc
@@ -0,0 +1,10 @@
+(ns status-im.chat.models.message-content
+  (:require
+    [status-im2.constants :as constants]))
+
+(defn emoji-only-content?
+  "Determines if text is just an emoji"
+  [{:keys [text response-to]}]
+  (and (not response-to)
+       (string? text)
+       (re-matches constants/regx-emoji text)))
@@ -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
@@ -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 %])}]})
@@ -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
@@ -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 %)))))
@@ -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)))
@@ -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))
@@ -14,6 +14,6 @@
  (rf/merge cofx
            (multiaccounts.update/multiaccount-update
             :currency
-             currency
+             "USD"
             {})
            (prices/update-prices)))
@@ -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])]
@@ -10,9 +10,13 @@
    status-im.bootnodes.core
    status-im.browser.core
    status-im.browser.permissions
+    status-im.chat.models.gaps
+    status-im.chat.models.images
    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
@@ -28,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
@@ -39,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]
@@ -130,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
@@ -188,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)})
@@ -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])))

@@ -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])))

@@ -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.
@@ -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
@@ -11,6 +11,7 @@
    [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]
@@ -220,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])
@@ -277,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]}))
@@ -372,3 +373,4 @@
   cofx
   {:on-card-connected :keycard/load-recovering-key-screen
    :handler           (common/dispatch-event :keycard/import-multiaccount)}))
+
@@ -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)
@@ -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))
@@ -172,8 +172,7 @@
            :use-mailservers? true
            :recovered recovered}
           config/default-multiaccount)
-          ;; The address from which we derive any chat
-          ;; account/encryption keys
+          ;; The address from which we derive any chat account/encryption keys
          eip1581-address
          (assoc :eip1581-address eip1581-address)
          save-mnemonic?
@@ -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
@@ -89,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)}})

@@ -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]}
@@ -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]
@@ -96,14 +96,16 @@
    :contact      (handle-view-profile cofx data)
    :browser      (handle-browse cofx data)
    :eip681       (handle-eip681 cofx data)
+    ;; Re-enable with https://github.com/status-im/status-mobile/issues/13429
+    ;;:wallet-connect (handle-wallet-connect cofx data)
    :localpairing (handle-local-pairing cofx data)
    (do
      (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]}
@@ -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,34 +101,34 @@
      "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)]
-                                     (models.message/update-message-status cofx
-                                                                           chatID
-                                                                           messageID
-                                                                           :delivered))
+                                     (models.message/update-db-message-status cofx
+                                                                              chatID
+                                                                              messageID
+                                                                              :delivered))
      "mailserver.changed"         (mailserver/handle-mailserver-changed cofx (.-id event-js))
      "mailserver.available"       (mailserver/handle-mailserver-available cofx (.-id event-js))
      "mailserver.not.working"     (mailserver/handle-mailserver-not-working cofx)
      "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
@@ -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
@@ -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]
@@ -121,6 +121,14 @@
 (reg-root-key-sub :signing/tx :signing/tx)
 (reg-root-key-sub :signing/edit-fee :signing/edit-fee)

+;; wallet connect
+(reg-root-key-sub :wallet-connect/proposal-metadata :wallet-connect/proposal-metadata)
+(reg-root-key-sub :wallet-connect/enabled? :wallet-connect/enabled?)
+(reg-root-key-sub :wallet-connect/session-connected :wallet-connect/session-connected)
+(reg-root-key-sub :wallet-connect/showing-app-management-sheet?
+                  :wallet-connect/showing-app-management-sheet?)
+(reg-root-key-sub :wallet-connect/sessions :wallet-connect/sessions)
+(reg-root-key-sub :wallet-connect/session-managed :wallet-connect/session-managed)
 (reg-root-key-sub :contact-requests/pending :contact-requests/pending)

 (reg-root-key-sub :bug-report/description-error :bug-report/description-error)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brian Sztamfater	984bc74b6d	lint fixes	2023-12-05 02:31:24 -03:00
Brian Sztamfater	17cd163f25	some cleanup	2023-12-05 02:23:06 -03:00
Brian Sztamfater	f3c967f26b	improve flow	2023-12-05 01:13:05 -03:00
Brian Sztamfater	9f78eaa91d	integrate select input screen to the flow, also calculate routes prior showing transaction confirmation screen	2023-12-04 21:46:33 -03:00
Brian Sztamfater	778b06abb2	some refactor	2023-12-04 20:48:48 -03:00
Brian Sztamfater	68d7eddb4d	only allow ETH transfers for now	2023-12-04 20:48:48 -03:00
Brian Sztamfater	c7165cf078	calculate fiat balances correctly and some other fixes	2023-12-04 20:48:46 -03:00
Brian Sztamfater	50dcf9d9b9	goerli as default suggested routes network	2023-12-04 20:48:22 -03:00
Brian Sztamfater	372bf83da5	some polishing	2023-12-04 20:48:21 -03:00
Brian Sztamfater	710829d248	fix endpoints integration	2023-12-04 20:47:45 -03:00
Brian Sztamfater	23fae29f9d	try basic integration	2023-12-04 20:47:42 -03:00
Brian Sztamfater	daf3e52281	some cleanup	2023-12-04 20:46:45 -03:00
Jamie Caprani	3338a4b1a1	chore	2023-12-04 20:03:28 -03:00
Jamie Caprani	9ead91c383	progress	2023-12-04 20:02:09 -03:00
Ajay Sivan	fb84885af0	Add Test Networks Enabled option in settings	2023-12-04 19:59:06 -03:00
Ulises M	4aac04e931	Add `utils.money/add` version able to work with `nil`s	2023-12-04 19:59:05 -03:00
Brian Sztamfater	90166e8762	some refactor	2023-12-01 13:38:57 -03:00
Brian Sztamfater	d68fdb18f4	adjustment to summary info component	2023-12-01 13:38:57 -03:00
Brian Sztamfater	e46f4d9081	adjust text color	2023-12-01 13:38:56 -03:00
Brian Sztamfater	dd2fd3410b	some refactor	2023-12-01 13:38:56 -03:00
Brian Sztamfater	085e2df34c	localize strings	2023-12-01 13:38:55 -03:00
Brian Sztamfater	51bfd3567c	most of the ui in place, polishing pending	2023-12-01 13:38:54 -03:00
Brian Sztamfater	fb6d907cc5	some progress	2023-12-01 13:38:54 -03:00
Brian Sztamfater	a88c5b7bf7	feat: transaction confirmation page ui	2023-12-01 13:38:52 -03:00