status-go-issue

Fix: unable to join token-gated communities (#17894 )
Fixes the bug by explicitly passing all available addresses to be revealed to wakuext_requestToJoinCommunity and picking up the first available address as the airdrop address. This is a temporary solution while we work on the feature to allow users to choose which addresses to expose. Fixes https://github.com/status-im/status-mobile/issues/17861 *Areas that may be impacted*: join community flows. ---------------------------------------------------------------------- Community "Request to join" option is enabled. User holds more than X ETH. Anyone who holds <X> ETH is allowed to Become member in <COMMUNITY>. Expected: request to join is received by desktop client and accepted, mobile user joins the community. ---------------------------------------------------------------------- ---------------------------------------------------------------------- Community "Request to join" option is enabled. User holds less than X ETH. Anyone who holds <X> ETH is allowed to View and post in <CHANNEL>. Expected: request to join is received by desktop client and accepted, mobile user joins the community, but can't post in <CHANNEL>. ---------------------------------------------------------------------- ---------------------------------------------------------------------- Community "Request to join" option is enabled. No token permissions. Expected: request to join is received by desktop client and accepted, mobile user joins the community. ----------------------------------------------------------------------
2023-11-16 12:58:22 +00:00 · 2023-11-15 06:46:55 -03:00 · 2023-11-14 10:54:02 +00:00 · 2023-11-14 10:52:00 +00:00
182 changed files with 1019 additions and 3071 deletions
@@ -16,18 +16,10 @@
                :clj-kondo-config              {:level :error}
                :cond-else                     {:level :error}
                :consistent-alias              {:level   :error
-                                                :aliases {clojure.set      set
-                                                          clojure.string   string
-                                                          clojure.walk     walk
-                                                          malli.core       malli
-                                                          malli.dev.pretty malli.pretty
-                                                          malli.dev.virhe  malli.virhe
-                                                          malli.error      malli.error
-                                                          malli.generator  malli.generator
-                                                          malli.transform  malli.transform
-                                                          malli.util       malli.util
-                                                          schema.core      schema
-                                                          taoensso.timbre  log}}
+                                                :aliases {clojure.string  string
+                                                          clojure.set     set
+                                                          clojure.walk    walk
+                                                          taoensso.timbre log}}
                :deprecated-namespace          {:level :warning}
                :docstring-blank               {:level :error}
                :equals-true                   {:level :error}
@@ -1,2 +0,0 @@
-{:lint-as {malli.experimental/defn schema.core/defn}
- :linters {:unresolved-symbol {:exclude [(malli.core/=>)]}}}
@@ -36,7 +36,6 @@
  "deftest-sub"     :arg1-body
  "wait-for"        :arg1-body
  "with-deps-check" :arg1-body
-  "schema/=>"       :arg1-body
  "->"              [:noarg1-body
                     {:list               {:constant-pair? false :force-nl? false}
                      :next-inner-restore [[:list :constant-pair?]]}]
@@ -311,14 +311,13 @@ endef
 lint: export TARGET := clojure
 lint: export CLJ_LINTER_PRINT_WARNINGS ?= false
 lint: ##@test Run code style checks
-	@sh scripts/lint/re-frame-in-quo-components.sh && \
-	sh scripts/lint/direct-require-component-outside-quo.sh && \
-	sh scripts/lint/require-i18n-resource-first.sh && \
+	@sh scripts/lint-re-frame-in-quo-components.sh && \
+	sh scripts/lint-direct-require-component-outside-quo.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --fail-level error --lint src $(if $(filter $(CLJ_LINTER_PRINT_WARNINGS),true),,| grep -v ': warning: ') && \
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
-	scripts/lint/translations.clj && \
+	scripts/lint_translations.clj && \
 	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
-	sh scripts/lint/trailing-newline.sh && \
+	sh scripts/lint-trailing-newline.sh && \
 	node_modules/.bin/prettier --write .

 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
@@ -328,7 +327,7 @@ lint-fix: ##@test Run code style checks and fix issues
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	clojure-lsp --ns-exclude-regex ".*/src/status_im2/core\.cljs$$" clean-ns && \
-	sh scripts/lint/trailing-newline.sh --fix && \
+	sh scripts/lint-trailing-newline.sh --fix && \
 	node_modules/.bin/prettier --write .

 shadow-server: export TARGET := clojure
@@ -1 +1 @@
-1.25.0
+1.26.0
@@ -45,20 +45,11 @@
  },

  {
-    "path": "borkdude/dynaload/0.3.5/dynaload-0.3.5",
+    "path": "borkdude/edamame/1.1.17/edamame-1.1.17",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "accd696ba364b850b4d92e38f5a34d0e828a0ad1",
-      "sha256": "0k62m1f29xfh3cp67w7kcvkp5aj35simi8kf95ycvkmgp76w11q8"
-    }
-  },
-
-  {
-    "path": "borkdude/edamame/1.3.23/edamame-1.3.23",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "254d023e97ed438f0f44532b5a06d928d031ede4",
-      "sha256": "0l7mxza2nimslhg0qh6jp7gmb8sd6l89fk5d1zvzq2xskscq2vly"
+      "sha1": "9087f7abf0104e0354d7db7fc4576608eac558f4",
+      "sha256": "1n1872i240lakn4pzsag4grf7bv7lcsipmqllxd9m4k1zp3dgla1"
    }
  },

@@ -90,20 +81,20 @@
  },

  {
-    "path": "cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3",
+    "path": "cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "5ae0efd9377a5e60c084bdaf4a2ce094f759ce23",
-      "sha256": "0drxf9nm23i1pcgrkwbcr09msq37csilzww38709add0hz8spjhq"
+      "sha1": "45f6034b26a14138e74145b7a4059628c0fedcd1",
+      "sha256": "1dy1l6y8cb8xiqq97a4lf8giyiicq4wfl4s2lxn5fb6614cjxqx2"
    }
  },

  {
-    "path": "cider/piggieback/0.4.1/piggieback-0.4.1",
+    "path": "cider/piggieback/0.5.2/piggieback-0.5.2",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "0a02a3e2ecd7a126ab60d8a44793342f20ced79b",
-      "sha256": "142vl5np33akcrnn6pksi0rjfsmmi528villxsj6cwcndvybiw4m"
+      "sha1": "ecfd5c286a85db3f059e75c37fca5722d9e26f79",
+      "sha256": "1ps9yf3cxmlm447hqkidjb5xry90n0wl3jk0jn28fagq31lzylkl"
    }
  },

@@ -548,24 +539,6 @@
    }
  },

-  {
-    "path": "metosin/malli/0.13.0/malli-0.13.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "286c52d26a3a9d613b5f692971bd19c581cdc4b0",
-      "sha256": "0vaq9d6cln5j4ww302fwlgg7m647cf2j16gs2i1p1d4klbn4jddz"
-    }
-  },
-
-  {
-    "path": "mvxcvi/arrangement/2.1.0/arrangement-2.1.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "1bc8f3bba7a28de85f319b7d464aa8d955f44918",
-      "sha256": "1j1rkwrs4wm8zk9v7ilgpnyav5sipdd2bmb83sazh392blw52wpk"
-    }
-  },
-
  {
    "path": "net/cgrand/macrovich/0.2.1/macrovich-0.2.1",
    "host": "https://repo.clojars.org",
@@ -755,15 +728,6 @@
    }
  },

-  {
-    "path": "org/clojure/test.check/1.1.1/test.check-1.1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "f33d988fd57bc9c11af1952db81c10f319c91416",
-      "sha256": "0y2hpkj7zl4yrpsl35ifpdaja5c72b8fpjcnmdgmld9c7cb1hlcl"
-    }
-  },
-
  {
    "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
    "host": "https://repo1.maven.org/maven2",
@@ -945,11 +909,11 @@
  },

  {
-    "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0",
+    "path": "refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207",
-      "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i"
+      "sha1": "2b3bb82da53b5db9c2b2aa298417816b81d0ed97",
+      "sha256": "1ysqabmlnghki6x0636zngxza2d83c85276wp9ma9wk183mkv52a"
    }
  },

@@ -3,13 +3,12 @@ babashka/fs/0.2.16/fs-0.2.16.jar
 bidi/bidi/2.1.6/bidi-2.1.6.jar
 binaryage/env-config/0.2.2/env-config-0.2.2.jar
 binaryage/oops/0.7.2/oops-0.7.2.jar
-borkdude/dynaload/0.3.5/dynaload-0.3.5.jar
-borkdude/edamame/1.3.23/edamame-1.3.23.jar
+borkdude/edamame/1.1.17/edamame-1.1.17.jar
 borkdude/sci.impl.reflector/0.0.1/sci.impl.reflector-0.0.1.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
 cheshire/cheshire/5.11.0/cheshire-5.11.0.jar
-cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
-cider/piggieback/0.4.1/piggieback-0.4.1.jar
+cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0.jar
+cider/piggieback/0.5.2/piggieback-0.5.2.jar
 clj-kondo/clj-kondo/2023.09.07/clj-kondo-2023.09.07.jar
 cljs-bean/cljs-bean/1.9.0/cljs-bean-1.9.0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
@@ -59,8 +58,6 @@ javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar
 javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
 javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar
 medley/medley/0.8.2/medley-0.8.2.jar
-metosin/malli/0.13.0/malli-0.13.0.jar
-mvxcvi/arrangement/2.1.0/arrangement-2.1.0.jar
 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
@@ -82,7 +79,6 @@ 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/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
 org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.jar
 org/clojure/tools.cli/1.0.206/tools.cli-1.0.206.jar
@@ -103,7 +99,7 @@ org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
 reagent/reagent/1.2.0/reagent-1.2.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
-refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
+refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0.jar
 re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar
@@ -67,12 +67,9 @@ stdenv.mkDerivation {
  '';
  buildPhase = ''
    # Assemble CLASSPATH from available clojure dependencies.
-    # We prepend 'src' so it can find the local sources and prioritize
-    # our own namespaces over dependencies, given that indirect dependencies
-    # can also cause naming conflicts (e.g. prismatic/schema already uses
-    # namespace schema.core).
-    export CLASS_PATH="src:$(find ${deps.clojure} \
-      -iname '*.jar' | tr '\n' ':')"
+    # We append 'src' so it can find the local sources.
+    export CLASS_PATH="$(find ${deps.clojure} \
+      -iname '*.jar' | tr '\n' ':')src"

    # target must be one of the builds defined in shadow-cljs.edn
    java -cp "$CLASS_PATH" clojure.main \
@@ -1,10 +0,0 @@
-#!/usr/bin/env sh
-
-if rg --quiet --multiline '^\(ns.*\n^\s*\(:require\n(^\s*(;|#_).*\n)*(^\s*\[status-im2\.setup\.i18n-resources\W)' src/status_im2/core.cljs; then
-  exit 0
-elif [ $? -eq 1 ]; then
-  echo "status-im2.setup.i18n-resources must be loaded first (be the first one in ns :require form) in status-im2.core"
-  echo "For more info, check the comment here https://github.com/status-im/status-mobile/pull/17618#discussion_r1361275489"
-else
-  exit $?
-fi
@@ -9,7 +9,6 @@
                [cljs-bean "1.9.0"]
                [com.cognitect/transit-cljs "0.8.280"]
                [camel-snake-kebab "0.4.3"]
-                [metosin/malli "0.13.0"]

                ;; Dev dependencies
                [refactor-nrepl "2.5.0"]
@@ -51,7 +50,6 @@
                    :after-load-async  status-im2.setup.hot-reload/reload
                    :build-notify      status-im2.setup.hot-reload/build-notify
                    :preloads          [re-frisk-remote.preload
-                                        status-im2.setup.schema-preload
                                        ;; In order to use component test helpers in the REPL we
                                        ;; need to preload namespaces that are not normally required
                                        ;; by production code, such as
@@ -73,10 +71,6 @@
                            :warnings           {:fn-deprecated false}
                            :closure-defines    {re-frame.trace/trace-enabled? true}
                            :source-map         false
-                            ;; This seems to be necessary while using the REPL,
-                            ;; otherwise sometimes you'll get weird errors when
-                            ;; instrumenting functions.
-                            :static-fns         false
                            :infer-externs      true}
         ;; if you want to use a real device, set your local ip
         ;; in the SHADOW_HOST env variable to make sure that
@@ -110,15 +104,13 @@
   :output-dir "target/test"
   :optimizations :simple
   :target :node-test
-   :dev {:devtools {:preloads [status-im2.setup.schema-preload]}}
   ;; Uncomment line below to `make test-watch` a specific file
   ;; :ns-regexp "status-im2.subs.messages-test$"
   :main status-im.test-runner/main
   ;; set :ui-driven to true to let shadow-cljs inject node-repl
   :ui-driven true
   :closure-defines
-   {schema.core/throw-on-error?                      true
-    status-im2.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
+   {status-im2.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
    status-im2.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
    status-im2.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
    status-im2.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
@@ -147,17 +139,9 @@
   :compiler-options {:optimizations :simple
                      :source-map    false}}
  :component-test {:target           :npm-module
-                   :entries          [;; We need to tell shadow-cljs to compile
-                                      ;; the preloads namespace because it will
-                                      ;; be used directly by Jest in the option
-                                      ;; setupFilesAfterEnv.
-                                      status-im2.setup.schema-preload
-
-                                      quo.core-spec
-                                      status-im2.core-spec]
+                   :entries          [quo.core-spec status-im2.core-spec]
                   :ns-regexp        "component-spec$"
                   :output-dir       "component-spec"
-                   :closure-defines  {schema.core/throw-on-error? true}
                   :compiler-options {:warnings-as-errors false
                                      :static-fns         false
                                      :infer-externs      true}}}}
@@ -49,7 +49,6 @@
    :Text                     {}
    :StatusBar                {}
    :ScrollView               {}
-    :SafeAreaView             {}
    :KeyboardAvoidingView     {}
    :TextInput                {}
    :Image                    {}
@@ -2,30 +2,26 @@
  (:require [quo.foundations.colors :as colors]))

 (defn- circle-color
-  [customization-color neutral? theme]
-  (if neutral?
-    (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5 theme)
-    (colors/custom-color customization-color 50 20)))
+  [customization-color]
+  (colors/custom-color customization-color 50 20))

 (defn- text-color
-  [customization-color neutral? theme]
-  (if neutral?
-    (colors/theme-colors colors/neutral-80-opa-70 colors/white-opa-70 theme)
-    (colors/theme-colors
-     (colors/custom-color customization-color 50)
-     (colors/custom-color customization-color 60)
-     theme)))
+  [customization-color theme]
+  (colors/theme-colors
+   (colors/custom-color customization-color 50)
+   (colors/custom-color customization-color 60)
+   theme))

 (defn container
-  [circle-size customization-color neutral? theme]
+  [circle-size customization-color]
  {:width            circle-size
   :height           circle-size
   :border-radius    circle-size
   :text-align       :center
   :justify-content  :center
   :align-items      :center
-   :background-color (circle-color customization-color neutral? theme)})
+   :background-color (circle-color customization-color)})

 (defn text
-  [customization-color neutral? theme]
-  {:color (text-color customization-color neutral? theme)})
+  [customization-color theme]
+  {:color (text-color customization-color theme)})
@@ -1,6 +1,5 @@
 (ns quo.components.avatars.wallet-user-avatar.view
-  (:require [clojure.string :as string]
-            [quo.components.avatars.wallet-user-avatar.style :as style]
+  (:require [quo.components.avatars.wallet-user-avatar.style :as style]
            [quo.components.markdown.text :as text]
            [quo.theme :as quo.theme]
            [react-native.core :as rn]
@@ -41,21 +40,18 @@
  :customization-color  - keyword (default: nil) - color of the avatar
  :size   - keyword (default: last element of properties object) - size of the
  avatar
-  :monospace? - boolean (default: false) - use monospace font
-  :lowercase? - boolean (default: false) - lowercase text
-  :neutral? - boolean (default: false) - use neutral colors variant"
-  [{:keys [full-name customization-color size theme monospace? lowercase? neutral?]
+  :monospace? - boolean (default: false) - use monospace font"
+  [{:keys [full-name customization-color size theme monospace?]
    :or   {size biggest-possible}}]
  (let [circle-size (:size (size properties))
-        small?      (check-if-size-small size)
-        initials    (utils.string/get-initials full-name (if small? 1 2))]
+        small?      (check-if-size-small size)]
    [rn/view
-     {:style (style/container circle-size customization-color neutral? theme)}
+     {:style (style/container circle-size customization-color)}
     [text/text
      {:accessibility-label :wallet-user-avatar
       :size                (:font-size (size properties))
       :weight              (if monospace? :monospace (:font-weight (size properties)))
-       :style               (style/text customization-color neutral? theme)}
-      (if lowercase? (string/lower-case initials) initials)]]))
+       :style               (style/text customization-color theme)}
+      (utils.string/get-initials full-name (if small? 1 2))]]))

 (def wallet-user-avatar (quo.theme/with-theme view-internal))
@@ -3,22 +3,18 @@
    [quo.components.counter.step.view :as step]
    [test-helpers.component :as h]))

-(defn render
-  [component]
-  (h/render-with-theme-provider component :dark))
-
 (h/describe "step component"
  (h/test "default render of step component"
-    (render [step/view {} nil])
+    (h/render [step/view {} nil])
    (-> (h/expect (h/query-by-label-text :step-counter))
        (h/is-truthy)))

  (h/test "renders step with a string value"
-    (render [step/view {} "1"])
+    (h/render [step/view {} "1"])
    (-> (h/expect (h/get-by-text "1"))
        (h/is-truthy)))

  (h/test "renders step with an integer value"
-    (render [step/view {} 1])
+    (h/render [step/view {} 1])
    (-> (h/expect (h/get-by-text "1"))
        (h/is-truthy))))
@@ -2,24 +2,10 @@
  (:require
    [quo.components.counter.step.style :as style]
    [quo.components.markdown.text :as text]
-    quo.theme
+    [quo.theme :as theme]
    [react-native.core :as rn]
-    [schema.core :as schema]
    [utils.number]))

-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:accessibility-label {:optional true} [:maybe :keyword]]
-      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-      [:in-blur-view? {:optional true} [:maybe :boolean]]
-      [:theme :schema.common/theme]
-      [:type {:optional true} [:enum :active :complete :neutral]]]]
-    [:value [:maybe [:or :string :int]]]]
-   :any])
-
 (defn- view-internal
  [{:keys [type accessibility-label theme in-blur-view? customization-color]} value]
  (let [type  (or type :neutral)
@@ -37,9 +23,6 @@
     [text/text
      {:weight :medium
       :size   :label
-       :style  {:color (style/text-color type theme)}}
-      label]]))
+       :style  {:color (style/text-color type theme)}} label]]))

-(def view
-  (quo.theme/with-theme
-   (schema/instrument #'view-internal ?schema)))
+(def view (theme/with-theme view-internal))
@@ -19,7 +19,3 @@
   :background-color colors/danger-50
   :align-items      :center
   :justify-content  :center})
-
-(def empty-state
-  {:width  375
-   :height 116})
@@ -2,12 +2,11 @@
  (:require
    [quo.components.graph.utils :as utils]
    [quo.components.graph.wallet-graph.style :as style]
+    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
-    [quo.foundations.resources :as resources]
    [quo.theme :as quo.theme]
    [react-native.charts :as charts]
    [react-native.core :as rn]
-    [react-native.fast-image :as fast-image]
    [react-native.linear-gradient :as linear-gradient]))

 (defn- time-frame->max-data-points
@@ -43,10 +42,11 @@
        gradient-colors [(colors/alpha line-color 0.1) (colors/alpha line-color 0)]
        fill-color      (colors/theme-colors colors/white colors/neutral-95)]
    (if (= time-frame :empty)
-      [fast-image/fast-image
-       {:style               style/empty-state
-        :source              (resources/get-themed-image :no-funds theme)
-        :accessibility-label :illustration}]
+      [rn/view
+       {:accessibility-label :illustration
+        :style               style/illustration}
+       [text/text {:style {:color colors/white}}
+        "Illustration here"]]
      [rn/view
       [linear-gradient/linear-gradient
        {:colors gradient-colors
@@ -3,17 +3,22 @@
    [quo.components.icon :as quo.icons]
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
-    [quo.theme :as quo.theme]
+    [quo.theme :as theme]
    [react-native.core :as rn]))

-(defn get-color
-  [k theme]
-  (case k
-    :success (colors/resolve-color :success theme)
-    :error   (colors/resolve-color :danger theme)
-    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
+(def themes
+  {:light {:default colors/neutral-50
+           :success colors/success-50
+           :error   colors/danger-50}
+   :dark  {:default colors/neutral-40
+           :success colors/success-60
+           :error   colors/danger-60}})

-(defn view-internal
+(defn get-color
+  [k]
+  (get-in themes [(theme/get-theme) k]))
+
+(defn info-message
  "[info-message opts \"message\"]
  opts
  {:type           :default/:success/:error
@@ -22,11 +27,11 @@
   :text-color     colors/white  ;; text color override
   :icon-color     colors/white  ;; icon color override
   :no-icon-color? false         ;; disable tint color for icon"
-  [{:keys [type size theme icon text-color icon-color no-icon-color? style accessibility-label]} message]
+  [{:keys [type size icon text-color icon-color no-icon-color? style]} message]
  (let [weight     (if (= size :default) :regular :medium)
        icon-size  (if (= size :default) 16 12)
        size       (if (= size :default) :paragraph-2 :label)
-        text-color (or text-color (get-color type theme))
+        text-color (or text-color (get-color type))
        icon-color (or icon-color text-color)]
    [rn/view
     {:style (merge {:flex-direction :row
@@ -37,10 +42,7 @@
       :no-color no-icon-color?
       :size     icon-size}]
     [text/text
-      {:accessibility-label accessibility-label
-       :size                size
-       :weight              weight
-       :style               {:color             text-color
-                             :margin-horizontal 4}} message]]))
-
-(def info-message (quo.theme/with-theme view-internal))
+      {:size   size
+       :weight weight
+       :style  {:color             text-color
+                :margin-horizontal 4}} message]]))
@@ -13,11 +13,11 @@
  [{:keys [theme address networks blur?]}]
  [rn/view {:style style/left-container}
   [wallet-user-avatar/wallet-user-avatar
-    {:size       :size-32
-     :full-name  "0 x"
+    {:size       :medium
+     :f-name     "0"
+     :l-name     "x"
     :monospace? true
-     :lowercase? true
-     :neutral?   true}]
+     :uppercase? false}]
   [rn/view {:style style/account-container}
    [text/text {:size :paragraph-1}
     (map (fn [network]
@@ -25,8 +25,8 @@
            [text/text
             {:size   :paragraph-1
              :weight :semi-bold
-              :style  {:color (colors/resolve-color (:network-name network) theme)}}
-             (str (:short-name network) ":")])
+              :style  {:color (colors/resolve-color network theme)}}
+             (str (subs (name network) 0 3) ":")])
          networks)
     [text/text
      {:size   :paragraph-1
@@ -1,5 +1,6 @@
 (ns quo.components.list-items.saved-address.view
  (:require
+    [clojure.string :as string]
    [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
    [quo.components.icon :as icon]
    [quo.components.list-items.saved-address.style :as style]
@@ -12,23 +13,27 @@

 (defn- left-container
  [{:keys [blur? theme name ens address customization-color]}]
-  [rn/view {:style style/left-container}
-   [wallet-user-avatar/wallet-user-avatar
-    {:size                :size-32
-     :full-name           name
-     :customization-color customization-color}]
-   [rn/view {:style style/account-container}
-    [text/text
-     {:weight :semi-bold
-      :size   :paragraph-1
-      :style  style/name-text}
-     name]
-    [text/text {:size :paragraph-2}
-     [text/text
-      {:size   :paragraph-2
-       :weight :monospace
-       :style  (style/account-address blur? theme)}
-      (or ens (address/get-shortened-key address))]]]])
+  (let [names      (remove string/blank? (string/split name " "))
+        first-name (if (> (count names) 0) (first names) "")
+        last-name  (if (> (count names) 1) (last names) "")]
+    [rn/view {:style style/left-container}
+     [wallet-user-avatar/wallet-user-avatar
+      {:size                :medium
+       :f-name              first-name
+       :l-name              last-name
+       :customization-color customization-color}]
+     [rn/view {:style style/account-container}
+      [text/text
+       {:weight :semi-bold
+        :size   :paragraph-1
+        :style  style/name-text}
+       name]
+      [text/text {:size :paragraph-2}
+       [text/text
+        {:size   :paragraph-2
+         :weight :monospace
+         :style  (style/account-address blur? theme)}
+        (or ens (address/get-shortened-key address))]]]]))

 (defn- internal-view
  []
@@ -26,25 +26,21 @@

 (def info
  {:flex-direction :row
-   :align-items    :center
-   :width          "70%"})
+   :align-items    :center})

 (def token-info
-  {:height 40
-   :flex   1})
+  {:height 40})

 (def token-image
-  {:width            32
-   :height           32
-   :border-width     1
-   :border-radius    16
-   :border-color     colors/neutral-80-opa-5
-   :margin-right     8
-   :background-color colors/neutral-80-opa-5})
+  {:width         32
+   :height        32
+   :border-width  1
+   :border-radius 16
+   :border-color  colors/neutral-80-opa-5
+   :margin-right  8})

 (def values-container
-  {:align-items :flex-end
-   :max-width   "30%"})
+  {:align-items :flex-end})

 (defn fiat-value
  [theme]
@@ -15,14 +15,11 @@
    {:source (or (:source token) token)
     :style  style/token-image}]
   [rn/view {:style style/token-info}
-    [text/text
-     {:weight          :semi-bold
-      :number-of-lines 1}
-     (if-not (empty? label) label "-")]
+    [text/text {:weight :semi-bold} label]
    [preview-list/view
     {:type   :network
      :size   :size-14
-      :number (count networks)}
+      :number 3}
     networks]]])

 (defn- values
@@ -33,14 +30,12 @@
      :accessibility-label :check-icon}]
    [rn/view {:style style/values-container}
     [text/text
-      {:weight          :medium
-       :size            :paragraph-2
-       :number-of-lines 1}
+      {:weight :medium
+       :size   :paragraph-2}
      token-value]
     [text/text
-      {:style           (style/fiat-value theme)
-       :size            :paragraph-2
-       :number-of-lines 1}
+      {:style (style/fiat-value theme)
+       :size  :paragraph-2}
      fiat-value]]))

 (defn- view-internal
@@ -22,10 +22,9 @@
    (h/is-truthy (h/get-by-text "test description")))

  (h/test "renders step component when step-number is valid and type is step"
-    (h/render-with-theme-provider [list/view
-                                   {:type        :step
-                                    :step-number 1}]
-                                  :dark)
+    (h/render [list/view
+               {:type        :step
+                :step-number 1}])
    (h/is-truthy (h/get-by-label-text :step-counter)))

  (h/test "renders decription with a context tag component and description after the tag"
@@ -1,7 +1,6 @@
 (ns quo.components.settings.data-item.component-spec
  (:require
    [quo.core :as quo]
-    [quo.foundations.resources :as quo.resources]
    [test-helpers.component :as h]))

 (h/describe
@@ -162,8 +161,7 @@
                :subtitle            "Description"
                :icon                :i/placeholder
                :emoji               "🎮"
-                :customization-color :yellow
-                :network-image       (quo.resources/get-network :ethereum)}])
+                :customization-color :yellow}])
    (h/is-truthy (h/query-by-label-text :description-image)))

  (h/test "description emoji is visible when description is account"
@@ -7,6 +7,7 @@
    [quo.components.markdown.text :as text]
    [quo.components.settings.data-item.style :as style]
    [quo.foundations.colors :as colors]
+    [quo.foundations.resources :as quo.resources]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [utils.i18n :as i18n]))
@@ -16,8 +17,7 @@
  [rn/view {:style (style/loading-container size blur? theme)}])

 (defn- left-subtitle
-  [{:keys [theme size description icon icon-color blur? subtitle customization-color emoji
-           network-image]}]
+  [{:keys [theme size description icon icon-color blur? subtitle customization-color emoji]}]
  [rn/view {:style style/subtitle-container}
   (when (not= :small size)
     [rn/view {:style (style/subtitle-icon-container description)}
@@ -33,7 +33,7 @@
                   :type                :default}]
        :network [rn/image
                  {:accessibility-label :description-image
-                   :source              network-image
+                   :source              (quo.resources/tokens :eth)
                   :style               style/image}]
        nil)])
   [text/text
@@ -60,7 +60,7 @@
 (defn- left-side
  "The description can either be given as a string `description` or a component `custom-subtitle`"
  [{:keys [theme title status size blur? description custom-subtitle icon subtitle label icon-color
-           customization-color network-image
+           customization-color
           emoji]
    :as   props}]
  [rn/view {:style style/left-side}
@@ -85,8 +85,7 @@
         :blur?               blur?
         :subtitle            subtitle
         :customization-color customization-color
-         :emoji               emoji
-         :network-image       network-image}]))])
+         :emoji               emoji}]))])

 (defn- right-side
  [{:keys [label icon-right? right-icon icon-color communities-list]}]
@@ -1,53 +0,0 @@
-(ns quo.components.tags.summary-tag.component-spec
-  (:require
-    [quo.components.tags.summary-tag.view :as summary-tag]
-    [test-helpers.component :as h]))
-
-(h/describe "Summary tag component tests"
-  (h/test "Basic render"
-    (h/render [summary-tag/view])
-    (h/is-truthy (h/query-by-label-text :container)))
-
-  (h/test "Account view render"
-    (h/render [summary-tag/view
-               {:type                :account
-                :label               "Alice's Account"
-                :customization-color "#ff0000"
-                :emoji               "🎉"}])
-    (h/is-truthy (h/get-by-text "Alice's Account")))
-
-  (h/test "Network view render"
-    (h/render [summary-tag/view
-               {:type         :network
-                :label        "Ethereum Network"
-                :image-source "path/to/ethereum-logo.png"}])
-    (h/is-truthy (h/get-by-text "Ethereum Network")))
-
-  (h/test "Saved address view render"
-    (h/render [summary-tag/view
-               {:type                :saved-address
-                :label               "Charlie's Wallet"
-                :customization-color "#00ff00"}])
-    (h/is-truthy (h/get-by-text "Charlie's Wallet")))
-
-  (h/test "Collectible view render"
-    (h/render [summary-tag/view
-               {:type         :collectible
-                :label        "Rare Artifact"
-                :image-source "path/to/artifact-image.png"}])
-    (h/is-truthy (h/get-by-text "Rare Artifact")))
-
-  (h/test "User view render"
-    (h/render [summary-tag/view
-               {:type                :user
-                :label               "Bob Smith"
-                :image-source        "path/to/profile-pic.png"
-                :customization-color "#0000ff"}])
-    (h/is-truthy (h/get-by-text "Bob Smith")))
-
-  (h/test "Token view render"
-    (h/render [summary-tag/view
-               {:type         :token
-                :label        "1,000 SNT"
-                :image-source "path/to/token-image.png"}])
-    (h/is-truthy (h/get-by-text "1,000 SNT"))))
@@ -1,29 +0,0 @@
-(ns quo.components.tags.summary-tag.style
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(defn main
-  [{:keys [type theme customization-color]}]
-  {:justify-content  :center
-   :align-items      :center
-   :height           32
-   :padding-left     4
-   :padding-right    10
-   :flex-direction   :row
-   :border-radius    (if (#{:account :collectible} type) 10 16)
-   :background-color (colors/resolve-color customization-color theme 10)})
-
-(defn label
-  [type theme]
-  {:color       (colors/theme-colors colors/neutral-100 colors/white theme)
-   :margin-left (if (= type :address) 6 4)})
-
-(def collectible-image
-  {:width         24
-   :height        24
-   :border-radius 10})
-
-(def token-image
-  {:width         24
-   :height        24
-   :border-radius 12})
@@ -1,67 +0,0 @@
-(ns quo.components.tags.summary-tag.view
-  (:require
-    [quo.components.avatars.account-avatar.view :as account-avatar]
-    [quo.components.avatars.user-avatar.view :as user-avatar]
-    [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.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]}]
-  (case type
-    :account
-    [account-avatar/view
-     {:customization-color customization-color
-      :size                24
-      :emoji               emoji
-      :type                :default}]
-    :network
-    [rn/image
-     {:source image-source
-      :style  style/token-image}]
-    :saved-address
-    [wallet-user-avatar/wallet-user-avatar
-     {:full-name           label
-      :size                :size-24
-      :customization-color customization-color}]
-    :collectible
-    [rn/image
-     {:source image-source
-      :style  style/collectible-image}]
-    :user
-    [user-avatar/user-avatar
-     {:full-name           label
-      :size                :xs
-      :profile-picture     image-source
-      :customization-color customization-color}]
-    :token
-    [rn/image
-     {:source image-source
-      :style  style/token-image}]
-    nil))
-
-(defn- view-internal
-  "Options:
-    - :label - string - tag label
-    - :customization-color - color - It will be passed down to components that
-      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 :user and :token
-    - :theme - :light / :dark"
-  [{:keys [label customization-color type theme]
-    :as   props
-    :or   {customization-color colors/neutral-80-opa-5}}]
-  [rn/view
-   {:accessibility-label :container
-    :style               (style/main (assoc props :customization-color customization-color))}
-   [left-view props]
-   [text/text
-    {:style  (style/label type theme)
-     :weight :semi-bold
-     :size   :heading-1} label]])
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,28 +0,0 @@
-(ns quo.components.text-combinations.channel-name.component-spec
-  (:require [quo.components.text-combinations.channel-name.view :as channel-name]
-            [test-helpers.component :as h]))
-
-(h/describe "Channel name"
-  (h/test "Renders Default"
-    (h/render [channel-name/view {:channel-name "Test channel"}])
-    (h/is-truthy (h/get-by-text "# Test channel")))
-
-  (h/test "Renders unlocked icon"
-    (h/render [channel-name/view
-               {:channel-name "Test channel"
-                :unlocked?    true}])
-    (h/is-truthy (h/get-by-label-text :channel-name-unlocked-icon)))
-
-  (h/test "Renders muted icon"
-    (h/render [channel-name/view
-               {:channel-name "Test channel"
-                :muted?       true}])
-    (h/is-truthy (h/get-by-label-text :channel-name-muted-icon)))
-
-  (h/test "Renders muted and unlocked icon"
-    (h/render [channel-name/view
-               {:channel-name "Test channel"
-                :muted?       true
-                :unlocked?    true}])
-    (h/is-truthy (h/get-by-label-text :channel-name-unlocked-icon))
-    (h/is-truthy (h/get-by-label-text :channel-name-muted-icon))))
@@ -1,30 +0,0 @@
-(ns quo.components.text-combinations.channel-name.style
-  (:require [quo.foundations.colors :as colors]))
-
-(def container {:flex-direction :row})
-
-(def icons-container
-  {:flex-direction :row
-   :padding-top    8
-   :padding-bottom 4
-   :margin-left    6})
-
-(def icon {:width 20 :height 20})
-
-(def icons-gap {:width 4})
-
-(defn- blur-icon-color
-  [theme]
-  (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme))
-
-(defn unlocked-icon-color
-  [theme blur?]
-  (if blur?
-    (blur-icon-color theme)
-    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
-
-(defn muted-icon-color
-  [theme blur?]
-  (if blur?
-    (blur-icon-color theme)
-    (colors/theme-colors colors/neutral-40 colors/neutral-60 theme)))
@@ -1,40 +0,0 @@
-(ns quo.components.text-combinations.channel-name.view
-  (:require [quo.components.icon :as icon]
-            [quo.components.markdown.text :as text]
-            [quo.components.text-combinations.channel-name.style :as style]
-            [quo.theme]
-            [react-native.core :as rn]))
-
-(defn icons
-  [{:keys [theme unlocked? muted? blur?]}]
-  [rn/view {:style style/icons-container}
-   (when unlocked?
-     [rn/view
-      {:style               style/icon
-       :accessibility-label :channel-name-unlocked-icon}
-      [icon/icon :i/unlocked
-       {:color (style/unlocked-icon-color theme blur?)
-        :size  20}]])
-
-   (when (and unlocked? muted?)
-     [rn/view {:style style/icons-gap}])
-
-   (when muted?
-     [rn/view
-      {:style               style/icon
-       :accessibility-label :channel-name-muted-icon}
-      [icon/icon :i/muted
-       {:color (style/muted-icon-color theme blur?)
-        :size  20}]])])
-
-(defn- view-internal
-  [{:keys [unlocked? muted? channel-name] :as props}]
-  [rn/view {:style style/container}
-   [text/text
-    {:size   :heading-1
-     :weight :semi-bold}
-    (str "# " channel-name)]
-   (when (or unlocked? muted?)
-     [icons props])])
-
-(def view (quo.theme/with-theme view-internal))
@@ -28,9 +28,3 @@
  {:flex-direction  :row
   :align-items     :center
   :justify-content :space-between})
-
-(defn subtitle
-  [blur? theme]
-  {:color (if blur?
-            colors/white-opa-40
-            (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))})
@@ -11,7 +11,6 @@
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [react-native.platform :as platform]
    [reagent.core :as reagent]
    [utils.i18n :as i18n]))

@@ -20,6 +19,11 @@
  (let [first-name (first (string/split full-name #" "))]
    (i18n/label :t/keypair-title {:name first-name})))

+(defn details-string
+  [address stored]
+  (str (when address (str address " ∙ "))
+       (if (= stored :on-device) (i18n/label :t/on-device) (i18n/label :t/on-keycard))))
+
 (defn avatar
  [{{:keys [full-name]} :details
    avatar-type         :type
@@ -63,21 +67,15 @@
  [{:keys [details stored blur? theme]}]
  (let [{:keys [address]} details]
    [rn/view
-     {:style               {:flex-direction :row
-                            :align-items    :center}
-      :accessibility-label :details}
+     {:style {:flex-direction :row
+              :align-items    :center}}
     [text/text
-      {:size  :paragraph-2
-       :style (style/subtitle blur? theme)}
-      address]
-     [text/text
-      {:size  :paragraph-2
-       :style (merge (style/subtitle blur? theme) {:bottom (if platform/ios? 2 -2)})}
-      " ∙ "]
-     [text/text
-      {:size  :paragraph-2
-       :style (style/subtitle blur? theme)}
-      (if (= stored :on-device) (i18n/label :t/on-device) (i18n/label :t/on-keycard))]
+      {:size                :paragraph-2
+       :accessibility-label :details
+       :style               {:color (if blur?
+                                      colors/white-opa-40
+                                      (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}}
+      (details-string address stored)]
     (when (= stored :on-keycard)
       [rn/view {:style {:margin-left 4}}
        [icon/icon :i/keycard-card
@@ -131,12 +131,10 @@
    quo.components.tags.number-tag.view
    quo.components.tags.permission-tag
    quo.components.tags.status-tags
-    quo.components.tags.summary-tag.view
    quo.components.tags.tag
    quo.components.tags.tags
    quo.components.tags.tiny-tag.view
    quo.components.tags.token-tag.view
-    quo.components.text-combinations.channel-name.view
    quo.components.text-combinations.view
    quo.components.wallet.account-card.view
    quo.components.wallet.account-origin.view
@@ -213,7 +211,7 @@

 ;;;; Counter
 (def counter quo.components.counter.counter.view/view)
-(def step #'quo.components.counter.step.view/view)
+(def step quo.components.counter.step.view/view)

 ;;;; Dividers
 (def divider-label quo.components.dividers.divider-label.view/view)
@@ -362,7 +360,6 @@
 (def number-tag quo.components.tags.number-tag.view/view)
 (def permission-tag quo.components.tags.permission-tag/tag)
 (def status-tag quo.components.tags.status-tags/status-tag)
-(def summary-tag quo.components.tags.summary-tag.view/view)
 (def tag quo.components.tags.tag/tag)
 (def tags quo.components.tags.tags/tags)
 (def tiny-tag quo.components.tags.tiny-tag.view/view)
@@ -370,7 +367,6 @@

 ;;;; Text combinations
 (def text-combinations quo.components.text-combinations.view/view)
-(def channel-name quo.components.text-combinations.channel-name.view/view)

 ;;;; Wallet
 (def account-card quo.components.wallet.account-card.view/view)
@@ -73,9 +73,7 @@
    [quo.components.switchers.group-messaging-card.component-spec]
    [quo.components.tags.network-tags.component-spec]
    [quo.components.tags.status-tags-component-spec]
-    [quo.components.tags.summary-tag.component-spec]
    [quo.components.tags.tiny-tag.component-spec]
-    [quo.components.text-combinations.channel-name.component-spec]
    [quo.components.wallet.account-card.component-spec]
    [quo.components.wallet.account-origin.component-spec]
    [quo.components.wallet.account-overview.component-spec]
@@ -7,15 +7,6 @@
   :keycard-watermark  (js/require "../resources/images/ui2/keycard-watermark.png")
   :bored-ape          (js/require "../resources/images/mock2/bored-ape.png")})

-(def ui-themed
-  {:no-funds
-   {:light (js/require "../resources/images/ui2/no-funds-light.png")
-    :dark  (js/require "../resources/images/ui2/no-funds-dark.png")}})
-
-(defn get-themed-image
-  [k theme]
-  (get-in ui-themed [k theme]))
-
 (defn get-image
  [k]
  (get ui k))
@@ -33,191 +24,14 @@
  (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")})
+  {:eth  (js/require "../resources/images/tokens/mainnet/ETH-token.png")
+   :knc  (js/require "../resources/images/tokens/mainnet/KNC.png")
+   :mana (js/require "../resources/images/tokens/mainnet/MANA.png")
+   :rare (js/require "../resources/images/tokens/mainnet/RARE.png")
+   :dai  (js/require "../resources/images/tokens/mainnet/DAI.png")
+   :fxc  (js/require "../resources/images/tokens/mainnet/FXC.png")
+   :usdt (js/require "../resources/images/tokens/mainnet/USDT.png")
+   :snt  (js/require "../resources/images/tokens/mainnet/SNT.png")})

 (defn get-token
  [k]
@@ -17,7 +17,6 @@

 (def view (reagent/adapt-react-class (.-View ^js react-native)))
 (def scroll-view (reagent/adapt-react-class (.-ScrollView ^js react-native)))
-(def safe-area-view (reagent/adapt-react-class (.-SafeAreaView ^js react-native)))

 (def ^:private image-native
  (reagent/adapt-react-class (.-Image ^js react-native)))
@@ -1,68 +0,0 @@
-# Schemas
-
-This document will grow to describe how we use Malli in the project and our
-conventions. It's still early days 🐪
-
-## Guidelines
-### Use var quote `#'` when aliasing instrumented vars
-
-It is common in this repository to have aliases to vars. For example, `view`
-referring to `var-internal`, or `quo.core/button` referring to
-`quo.components.buttons.button.view`.
-
-If the original var being aliased is instrumented, the alias var MUST [var
-quote](https://clojure.org/guides/weird_characters#_var_quote) the original var.
-If you don't do this, the aliased var will not be instrumented.
-
-```clojure
-;; bad, view-internal is instrumented, but both aliases don't use a var quote.
-(schema.core/=> view-internal ?schema)
-(def view (quo.theme/with-theme view-internal))
-(def button quo.components.buttons.button.view/button)
-
-;; good
-(schema.core/=> view-internal ?schema)
-(def view (quo.theme/with-theme #'view-internal))
-(def button #'quo.components.buttons.button.view/button)
-```
-
-### Prefix schema references with `?`
-
-Prefix schema bindings and vars with a question mark `?`. This is the naming
-convention used by malli itself when functions receive instances of schemas and
-it's an unambiguous way to avoid naming clashes.
-
-```clojure
-;; bad
-(def message-type [:enum ...])
-
-(defn view
-  [message-type] ; Shadows `message-type` schema
-  (do-something message-type))
-
-;; good
-(def ?message-type [:enum ...])
-
-(defn view
-  [message-type] ; Unambiguous naming strategy
-  (do-something message-type))
-```
-
-### Define schemas as functions when needed
-
-Malli has many utility functions to manipulate schemas as data, and they will
-automatically check if the schemas were already defined in the registry.
-
-For schemas we want to conveniently access from the global registry, like
-`:schema.common/theme`, they must be registered before Malli tries to use them.
-
-```clojure
-;; bad, will fail if :schema.common/bar is not registered.
-(def ^:private ?foo
-  (malli.util/select-keys :schema.common/bar [:id :name]))
-
-;; good, execution will be delayed until the schema ?foo is correctly registered.
-(defn- ?foo
-  []
-  (malli.util/select-keys :schema.common/bar [:id :name]))
-```
@@ -1,14 +0,0 @@
-(ns schema.common
-  (:require
-    [schema.registry :as registry]))
-
-(def ^:private ?theme
-  [:enum :light :dark])
-
-(def ^:private ?customization-color
-  [:or :string :keyword])
-
-(defn register-schemas
-  []
-  (registry/register ::theme ?theme)
-  (registry/register ::customization-color ?customization-color))
@@ -1,17 +0,0 @@
-(ns schema.core)
-
-(defmacro =>
-  "Similar to `malli.core/=>`, but instrumentation code will be completely removed
-  in non-debug environments.
-
-  `value` is first transformed via `malli.core/schema` to make sure we fail fast
-  and only register valid schemas."
-  [sym value]
-  `(if ^boolean js/goog.DEBUG
-     (try
-       (malli.core/=> ~sym (malli.core/schema ~value))
-       (catch js/Error e#
-         (taoensso.timbre/error "Failed to instrument function"
-                                {:symbol ~sym :error e#})
-         ~sym))
-     ~sym))
@@ -1,95 +0,0 @@
-(ns schema.core
-  (:require-macros schema.core)
-  (:require
-    [malli.core :as malli]
-    [malli.dev.pretty :as malli.pretty]
-    schema.state
-    [taoensso.timbre :as log]))
-
-(goog-define throw-on-error? false)
-
-(defn- ui-reporter
-  "Prints to STDOUT and signals a schema error should be displayed on screen."
-  [schema-id printer]
-  (let [report (malli.pretty/reporter printer)]
-    (fn [type data]
-      (report type data)
-      (swap! schema.state/errors conj schema-id))))
-
-(defn- thrower
-  "Similar to `malli.dev.pretty/thrower`, but this reporter uses js/Error instead
-  of ex-info, otherwise invalid schema errors will be printed in one long and
-  incomprehensible line in unit test failures."
-  ([] (thrower (malli.pretty/-printer)))
-  ([printer]
-   (let [report (malli.pretty/reporter printer)]
-     (fn [type data]
-       (let [message (with-out-str (report type data))]
-         (throw (js/Error. (str "\n" message))))))))
-
-(defn reporter
-  ([]
-   (reporter nil nil))
-  ([schema-id]
-   (reporter schema-id nil))
-  ([schema-id opts]
-   (let [printer (malli.pretty/-printer
-                  (merge {:width        60
-                          :print-length 6
-                          :print-level  3
-                          :print-meta   false}
-                         opts))]
-     (if throw-on-error?
-       ;; The thrower reporter should be used to short-circuit tests on schema errors.
-       (thrower printer)
-       (ui-reporter schema-id printer)))))
-
-(defn- with-clear-schema-error
-  "Clears current schema error on app if args passed to `f` are valid."
-  [schema-id validate-input f]
-  (fn [& args]
-    (when (validate-input args)
-      (swap! schema.state/errors disj schema-id))
-    (apply f args)))
-
-(defn instrument
-  "Similar to `malli/-instrument`, but will automatically clear up visible schema
-  errors if `f` is called with valid arguments.
-
-  We use a validator cached by `malli.core/validator`, so that validation is
-  performed once.
-
-  If `?schema` is invalid, then behave like a nop, log the error and return `f`.
-
-  `schema-id` is optional, but should be passed when instrumenting anonymous
-  functions. Consider using a namespaced keyword. For example:
-
-    (schema/instrument ::foo
-                       (fn [x] (inc x))
-                       [:=> [:cat :int] :int])
-  "
-  ([f ?schema]
-   (if ^boolean js/goog.DEBUG
-     (let [schema-id (when (var? f) (symbol f))]
-       (when-not schema-id
-         (log/warn "Anonymous function instrumented without an explicit identifier."
-                   {:schema ?schema}))
-       (instrument schema-id f ?schema))
-     f))
-  ([schema-id f ?schema]
-   (if ^boolean js/goog.DEBUG
-     (try
-       (let [?schema               (malli/schema ?schema)
-             {schema-input :input} (malli/-function-info ?schema)
-             [validate-input _]    (malli/-vmap malli/validator [schema-input])]
-         (malli/-instrument {:schema ?schema
-                             :report (reporter schema-id
-                                               {:title (str "Schema error at " schema-id)})}
-                            (with-clear-schema-error schema-id validate-input f)))
-       (catch js/Error e
-         (log/error "Failed to instrument function"
-                    {:schema-id schema-id
-                     :error     e
-                     :function  f})
-         f))
-     f)))
@@ -1,26 +0,0 @@
-(ns schema.registry
-  (:refer-clojure :exclude [merge])
-  (:require
-    [malli.core :as malli]
-    malli.registry))
-
-(defonce ^:private registry
-  (atom (malli/default-schemas)))
-
-(defn init-global-registry
-  []
-  (malli.registry/set-default-registry! (malli.registry/mutable-registry registry)))
-
-(defn register
-  "Defines a new schema in mutable `registry`.
-
-  We normalize `?schema` by always registering it as a proper instance of
-  `malli.core/Schema` to avoid inconsistencies down the road."
-  [type ?schema]
-  (swap! registry assoc type (malli/schema ?schema))
-  ?schema)
-
-(defn merge
-  [& schemas]
-  (apply swap! registry cljs.core/merge schemas)
-  schemas)
@@ -1,11 +0,0 @@
-(ns schema.state
-  (:require [reagent.core :as reagent]))
-
-(def errors
-  "Set of schema identifiers, usually namespaced keywords. When the set is empty,
-  no schema errors will be displayed on the app. See `schema.view/view`."
-  (reagent/atom #{}))
-
-(defn clear-errors
-  []
-  (reset! errors #{}))
@@ -1,28 +0,0 @@
-(ns schema.style)
-
-(defn container
-  [{:keys [bottom-inset]}]
-  {:align-items               :center
-   :flex-direction            :row
-   :background-color          "#cc0000"
-   :border-bottom-left-radius 8
-   :border-top-left-radius    8
-   :justify-content           :center
-   :padding-vertical          6
-   :padding-right             16
-   :position                  :absolute
-   :bottom                    (+ 12 bottom-inset)
-   :right                     0
-   :z-index                   10000000})
-
-(def icon
-  {:margin-horizontal 8})
-
-(def text
-  {:font-family "Inter-SemiBold"
-   :font-size   13
-   :color       "#ddd"})
-
-(def text-suffix
-  {:font-style :italic
-   :font-size  9})
@@ -1,18 +0,0 @@
-(ns schema.view
-  (:require
-    [quo.core :as quo]
-    [react-native.core :as rn]
-    [react-native.safe-area :as safe-area]
-    schema.state
-    [schema.style :as style]))
-
-(defn view
-  []
-  (when (seq @schema.state/errors)
-    [rn/pressable
-     {:on-press schema.state/clear-errors
-      :style    (style/container {:bottom-inset (safe-area/get-bottom)})}
-     [quo/icon :i/close {:size 12 :color "#ddd" :container-style style/icon}]
-     [rn/text {:style style/text}
-      "Schema error(s)"
-      [rn/text {:style (merge style/text style/text-suffix)} " check logs"]]]))
@@ -107,15 +107,14 @@
  [{:keys [db] :as cofx} message]
  (let [current-chat-id (:current-chat-id db)
        text            (get-in message [:content :text])]
-    {:db         (-> db
-                     (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
-                               message)
-                     (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
-                     (update-in [:chat/inputs current-chat-id :metadata]
-                                dissoc
-                                :sending-image))
-     :dispatch-n [[:chat.ui/set-chat-input-text nil current-chat-id]
-                  [:mention/to-input-field text current-chat-id]]}))
+    {:db       (-> db
+                   (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
+                             message)
+                   (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
+                   (update-in [:chat/inputs current-chat-id :metadata]
+                              dissoc
+                              :sending-image))
+     :dispatch [:mention/to-input-field text current-chat-id]}))

 (rf/defn show-contact-request-input
  "Sets reference to previous chat message and focuses on input"
@@ -82,7 +82,4 @@
    "wallet-owned-collectibles-filtering-done" {:fx [[:dispatch
                                                      [:wallet/owned-collectibles-filtering-done
                                                       event]]]}
-    "wallet-get-collectibles-details-done"     {:fx [[:dispatch
-                                                      [:wallet/get-collectible-details-done
-                                                       event]]]}
    (log/warn ::unknown-wallet-event :type type :event event)))
@@ -31,8 +31,8 @@
  (let [old-network-status  (:network-status db)
        old-network-type    (:network/type db)
        connectivity-status (if isConnected :online :offline)
-        status-changed?     (not= connectivity-status old-network-status)
-        type-changed?       (not= type old-network-type)]
+        status-changed?     (= connectivity-status old-network-status)
+        type-changed?       (= type old-network-type)]
    (log/debug "[net-info]"
               "old-network-status"  old-network-status
               "old-network-type"    old-network-type
@@ -40,9 +40,9 @@
               "type"                type
               "details"             details)
    (rf/merge cofx
-              (when status-changed?
+              (when-not status-changed?
                (change-network-status isConnected))
-              (when type-changed?
+              (when-not type-changed?
                (change-network-type old-network-type type (:is-connection-expensive details))))))

 (defn add-net-info-listener
@@ -74,8 +74,7 @@
   :Nameserver     "8.8.8.8"
   :PeerExchange   true
   :Port           0
-   :UDPPort        0
-   :LightClient    true})
+   :UDPPort        0})

 (def login-node-config
  {:WalletConfig (cond-> {:Enabled true}
@@ -8,7 +8,6 @@
    status-im.subs.root
    status-im2.setup.i18n-resources
    [status-im2.setup.interceptors :as interceptors]
-    [status-im2.setup.schema :as schema]
    status-im2.subs.root
    [utils.re-frame :as rf]))

@@ -119,7 +118,6 @@
  [& args]
  (reset-test-data!)
  (interceptors/register-global-interceptors)
-  (schema/setup!)
  (rf/set-mergeable-keys #{:filters/load-filters
                           :pairing/set-installation-metadata
                           :dispatch-n
@@ -225,9 +225,7 @@
                                                                         (.. ^js % -nativeEvent -data)])
        :on-load                                    #(re-frame/dispatch [:browser/loading-started])
        :on-error                                   #(re-frame/dispatch [:browser/error-occured])
-        :injected-java-script-before-content-loaded (js-res/ethereum-provider (str network-id))
-        ;; https://github.com/status-im/status-mobile/issues/17854
-        :allows-inline-media-playback               true}])]
+        :injected-java-script-before-content-loaded (js-res/ethereum-provider (str network-id))}])]
   [navigation
    {:url             url-original
     :name            name
@@ -131,13 +131,6 @@
         :accessibility-label :appearance-settings-button
         :chevron             true
         :on-press            #(re-frame/dispatch [:navigate-to :quo-preview])}])
-     (when config/quo-preview-enabled?
-       [list.item/list-item
-        {:icon                :main-icons/appearance
-         :title               "Status IM Components"
-         :accessibility-label :status-im-common-components
-         :chevron             true
-         :on-press            #(re-frame/dispatch [:navigate-to :status-im-preview])}])
     [list.item/list-item
      {:icon                :main-icons/appearance
       :title               (i18n/label :t/appearance)
@@ -15,8 +15,6 @@

 (def test-dir (.mkdtempSync fs test-dir-prefix))

-(def initialized? (atom false))
-
 (defn signal-received-callback
  [a]
  (re-frame/dispatch [:signals/signal-received a]))
@@ -24,12 +22,10 @@
 ;; We poll for signals, could not get callback working
 (defn init!
  []
-  (when-not @initialized?
-    (.setSignalEventCallback native-status)
-    (reset! initialized? true)
-    (js/setInterval (fn []
-                      (.pollSignal native-status signal-received-callback)
-                      100))))
+  (.setSignalEventCallback native-status)
+  (js/setInterval (fn []
+                    (.pollSignal native-status signal-received-callback)
+                    100)))

 (def status
  (clj->js
@@ -1,32 +0,0 @@
-(ns status-im2.common.floating-button-page.component-spec
-  (:require [quo.core :as quo]
-            [status-im2.common.floating-button-page.view :as floating-button-page]
-            [test-helpers.component :as h]))
-
-(h/describe "floating button page"
-  (h/test "renders with a header and standard button"
-    (h/render [floating-button-page/view
-               {:header [quo/page-nav
-                         {:type        :title-description
-                          :title       "floating button page"
-                          :description "press right icon to swap button type"
-                          :text-align  :left
-                          :background  :blur
-                          :icon-name   :i/close}]
-                :footer [quo/button {} "continue"]}])
-    (h/is-truthy (h/get-by-text "continue"))
-    (h/is-truthy (h/get-by-text "floating button page")))
-
-  (h/test "renders with a header and a slide button"
-    (h/render [floating-button-page/view
-               {:header [quo/page-nav
-                         {:type        :title-description
-                          :title       "floating button page"
-                          :description "press right icon to swap button type"
-                          :text-align  :left
-                          :background  :blur
-                          :icon-name   :i/close}]
-                :footer [quo/slide-button
-                         {:track-text "We gotta slide"
-                          :track-icon :face-id}]}])
-    (h/is-truthy (h/get-by-text "We gotta slide"))))
@@ -1,17 +0,0 @@
-(ns status-im2.common.floating-button-page.floating-container.style
-  (:require [react-native.safe-area :as safe-area]))
-
-(defn content-container
-  [blur? keyboard-shown?]
-  (let [margin-bottom (if keyboard-shown? 0 (safe-area/get-bottom))]
-    (cond-> {:margin-top         :auto
-             :overflow           :hidden
-             :margin-bottom      margin-bottom
-             :padding-vertical   12
-             :padding-horizontal 20}
-      blur? (dissoc :padding-vertical :padding-horizontal))))
-
-(def blur-inner-container
-  {:background-color   :transparent ; required, otherwise blur-view will shrink
-   :padding-vertical   12
-   :padding-horizontal 20})
@@ -1,25 +0,0 @@
-(ns status-im2.common.floating-button-page.floating-container.view
-  (:require [quo.theme :as quo.theme]
-            [react-native.blur :as blur]
-            [react-native.core :as rn]
-            [status-im2.common.floating-button-page.floating-container.style :as style]))
-
-(defn- blur-container
-  [child theme]
-  [blur/view
-   {:blur-amount 12
-    :blur-radius 12
-    :blur-type   (quo.theme/theme-value :light :dark theme)}
-   [rn/view {:style style/blur-inner-container}
-    child]])
-
-(defn view-internal
-  [{:keys [theme on-layout keyboard-shown? blur?]} child]
-  [rn/view
-   {:style     (style/content-container blur? keyboard-shown?)
-    :on-layout on-layout}
-   (if blur?
-     [blur-container child theme]
-     child)])
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,15 +0,0 @@
-(ns status-im2.common.floating-button-page.style)
-
-(def page-container
-  {:position :absolute
-   :top      0
-   :bottom   0
-   :left     0
-   :right    0})
-
-(def keyboard-avoiding-view
-  {:position :absolute
-   :top      0
-   :bottom   0
-   :left     0
-   :right    0})
@@ -1,102 +0,0 @@
-(ns status-im2.common.floating-button-page.view
-  (:require
-    [oops.core :as oops]
-    [react-native.core :as rn]
-    [react-native.platform :as platform]
-    [react-native.safe-area :as safe-area]
-    [reagent.core :as reagent]
-    [status-im2.common.floating-button-page.floating-container.view :as floating-container]
-    [status-im2.common.floating-button-page.style :as style]))
-
-(defn- show-background
-  [{:keys [window-height keyboard-height footer-container-height content-scroll-y
-           content-container-height header-height keyboard-shown?]}]
-  (let [available-space    (- window-height
-                              (safe-area/get-top)
-                              header-height
-                              keyboard-height ; Already contains the bottom safe area value
-                              footer-container-height)
-        scroll-view-height (- content-container-height content-scroll-y)
-        overlap?           (< available-space scroll-view-height)]
-    (and keyboard-shown? overlap?)))
-
-(defn- set-height-on-layout
-  [ratom]
-  (fn [event]
-    (let [height (oops/oget event "nativeEvent.layout.height")]
-      (reset! ratom height))))
-
-(defn- init-keyboard-listeners
-  [{:keys [on-did-show]}]
-  (let [keyboard-will-show? (reagent/atom false)
-        keyboard-did-show?  (reagent/atom false)
-        add-listener        (fn [listener callback]
-                              (oops/ocall rn/keyboard "addListener" listener callback))
-        will-show-listener  (add-listener "keyboardWillShow"
-                                          #(reset! keyboard-will-show? true))
-        did-show-listener   (add-listener "keyboardDidShow"
-                                          (fn [e]
-                                            (reset! keyboard-did-show? true)
-                                            (when on-did-show (on-did-show e))))
-        will-hide-listener  (add-listener "keyboardWillHide"
-                                          #(reset! keyboard-will-show? false))
-        did-hide-listener   (add-listener "keyboardDidHide"
-                                          #(reset! keyboard-did-show? false))
-        remove-listeners    (fn []
-                              (doseq [listener [will-show-listener will-hide-listener
-                                                did-show-listener did-hide-listener]]
-                                (oops/ocall listener "remove")))]
-    {:keyboard-will-show? keyboard-will-show?
-     :keyboard-did-show?  keyboard-did-show?
-     :remove-listeners    remove-listeners}))
-
-(defn view
-  [{:keys [header footer]} & children]
-  (reagent/with-let [window-height                (:height (rn/get-window))
-                     footer-container-height      (reagent/atom 0)
-                     header-height                (reagent/atom 0)
-                     content-container-height     (reagent/atom 0)
-                     content-scroll-y             (reagent/atom 0)
-                     keyboard-height              (reagent/atom 0)
-                     {:keys [keyboard-will-show?
-                             keyboard-did-show?
-                             remove-listeners]}   (init-keyboard-listeners
-                                                   {:on-did-show
-                                                    (fn [e]
-                                                      (reset! keyboard-height
-                                                        (oops/oget e "endCoordinates.height")))})
-                     set-header-height            (set-height-on-layout header-height)
-                     set-content-container-height (set-height-on-layout content-container-height)
-                     set-footer-container-height  (set-height-on-layout footer-container-height)
-                     set-content-y-scroll         (fn [event]
-                                                    (reset! content-scroll-y
-                                                      (oops/oget event "nativeEvent.contentOffset.y")))]
-    (let [keyboard-shown?  (if platform/ios? @keyboard-will-show? @keyboard-did-show?)
-          show-background? (show-background {:window-height            window-height
-                                             :footer-container-height  @footer-container-height
-                                             :keyboard-height          @keyboard-height
-                                             :content-scroll-y         @content-scroll-y
-                                             :content-container-height @content-container-height
-                                             :header-height            @header-height
-                                             :keyboard-shown?          keyboard-shown?})]
-
-      [rn/view {:style style/page-container}
-       [rn/view {:on-layout set-header-height}
-        header]
-       [rn/scroll-view
-        {:on-scroll               set-content-y-scroll
-         :scroll-event-throttle   64
-         :content-container-style {:flex-grow 1}}
-        (into [rn/view {:on-layout set-content-container-height}]
-              children)]
-       [rn/keyboard-avoiding-view
-        {:style                    style/keyboard-avoiding-view
-         :keyboard-vertical-offset (if platform/ios? (safe-area/get-top) 0)
-         :pointer-events           :box-none}
-        [floating-container/view
-         {:on-layout       set-footer-container-height
-          :keyboard-shown? keyboard-shown?
-          :blur?           show-background?}
-         footer]]])
-    (finally
-     (remove-listeners))))
@@ -31,10 +31,10 @@
           :on-change-text #(reset! entered-password %)}]
         (when (not-empty error)
           [quo/info-message
-            {:type         :error
-             :size         :default
-             :icon         :i/info
-             :containstyle {:margin-top 8}}
+            {:type  :error
+             :size  :default
+             :icon  :i/info
+             :style {:margin-top 8}}
            (i18n/label :t/oops-wrong-password)])
         [quo/button
          {:container-style {:margin-bottom 12 :margin-top 40}
@@ -79,19 +79,7 @@
    :dark  (js/require "../resources/images/ui2/no-contacts-to-invite-dark.png")}
   :no-notifications
   {:light (js/require "../resources/images/ui2/no-notifications-light.png")
-    :dark  (js/require "../resources/images/ui2/no-notifications-dark.png")}
-   :no-activity
-   {:light (js/require "../resources/images/ui2/no-activity-light.png")
-    :dark  (js/require "../resources/images/ui2/no-activity-dark.png")}
-   :no-collectibles
-   {:light (js/require "../resources/images/ui2/no-collectibles-light.png")
-    :dark  (js/require "../resources/images/ui2/no-collectibles-dark.png")}
-   :no-dapps
-   {:light (js/require "../resources/images/ui2/no-dapps-light.png")
-    :dark  (js/require "../resources/images/ui2/no-dapps-dark.png")}
-   :no-permissions
-   {:light (js/require "../resources/images/ui2/no-permissions-light.png")
-    :dark  (js/require "../resources/images/ui2/no-permissions-dark.png")}})
+    :dark  (js/require "../resources/images/ui2/no-notifications-dark.png")}})

 (def mock-images
  {:bored-ape             (js/require "../resources/images/mock2/bored-ape.png")
@@ -1,7 +0,0 @@
-(ns status-im2.common.standard-authentication.core
-  (:require
-    status-im2.common.standard-authentication.standard-auth.button.view
-    status-im2.common.standard-authentication.standard-auth.slide-button.view))
-
-(def button status-im2.common.standard-authentication.standard-auth.button.view/view)
-(def slide-button status-im2.common.standard-authentication.standard-auth.slide-button.view/view)
@@ -1,44 +0,0 @@
-(ns status-im2.common.standard-authentication.standard-auth.button.view
-  (:require
-    [quo.core :as quo]
-    [quo.theme :as quo.theme]
-    [reagent.core :as reagent]
-    [status-im2.common.standard-authentication.standard-auth.authorize :as authorize]))
-
-(defn- view-internal
-  [_]
-  (let [reset-slider? (reagent/atom false)
-        on-close      #(reset! reset-slider? true)]
-    (fn [{:keys [biometric-auth?
-                 customization-color
-                 auth-button-label
-                 on-enter-password
-                 on-auth-success
-                 on-press
-                 on-auth-fail
-                 auth-button-icon-left
-                 size
-                 button-label
-                 theme
-                 blur?
-                 container-style
-                 icon-left]}]
-      [quo/button
-       {:size                size
-        :container-style     container-style
-        :customization-color customization-color
-        :icon-left           icon-left
-        :on-press            (if on-press
-                               on-press
-                               #(authorize/authorize {:on-close              on-close
-                                                      :auth-button-icon-left auth-button-icon-left
-                                                      :theme                 theme
-                                                      :blur?                 blur?
-                                                      :on-enter-password     on-enter-password
-                                                      :biometric-auth?       biometric-auth?
-                                                      :on-auth-success       on-auth-success
-                                                      :on-auth-fail          on-auth-fail
-                                                      :auth-button-label     auth-button-label}))}
-       button-label])))
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,43 +0,0 @@
-(ns status-im2.common.standard-authentication.standard-auth.slide-button.view
-  (:require
-    [quo.core :as quo]
-    [quo.theme :as quo.theme]
-    [react-native.core :as rn]
-    [reagent.core :as reagent]
-    [status-im2.common.standard-authentication.standard-auth.authorize :as authorize]))
-
-(defn- view-internal
-  [_]
-  (let [reset-slider? (reagent/atom false)
-        on-close      #(reset! reset-slider? true)]
-    (fn [{:keys [biometric-auth?
-                 track-text
-                 customization-color
-                 auth-button-label
-                 on-enter-password
-                 on-auth-success
-                 on-auth-fail
-                 auth-button-icon-left
-                 size
-                 theme
-                 blur?
-                 container-style]}]
-      [rn/view {:style {:flex 1}}
-       [quo/slide-button
-        {:size                size
-         :container-style     container-style
-         :customization-color customization-color
-         :on-reset            (when @reset-slider? #(reset! reset-slider? false))
-         :on-complete         #(authorize/authorize {:on-close              on-close
-                                                     :auth-button-icon-left auth-button-icon-left
-                                                     :theme                 theme
-                                                     :blur?                 blur?
-                                                     :on-enter-password     on-enter-password
-                                                     :biometric-auth?       biometric-auth?
-                                                     :on-auth-success       on-auth-success
-                                                     :on-auth-fail          on-auth-fail
-                                                     :auth-button-label     auth-button-label})
-         :track-icon          (if biometric-auth? :i/face-id :password)
-         :track-text          track-text}]])))
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,6 +1,10 @@
-(ns status-im2.common.standard-authentication.standard-auth.authorize
+(ns status-im2.common.standard-authentication.standard-auth.view
  (:require
+    [quo.core :as quo]
+    [quo.theme :as quo.theme]
+    [react-native.core :as rn]
    [react-native.touch-id :as biometric]
+    [reagent.core :as reagent]
    [status-im2.common.standard-authentication.enter-password.view :as enter-password]
    [taoensso.timbre :as log]
    [utils.i18n :as i18n]
@@ -42,3 +46,39 @@
                                     {:on-enter-password on-enter-password
                                      :button-icon-left  auth-button-icon-left
                                      :button-label      auth-button-label}])}]))))))
+
+(defn- view-internal
+  [_]
+  (let [reset-slider? (reagent/atom false)
+        on-close      #(reset! reset-slider? true)]
+    (fn [{:keys [biometric-auth?
+                 track-text
+                 customization-color
+                 auth-button-label
+                 on-enter-password
+                 on-auth-success
+                 on-auth-fail
+                 auth-button-icon-left
+                 size
+                 theme
+                 blur?
+                 container-style]}]
+      [rn/view {:style {:flex 1}}
+       [quo/slide-button
+        {:size                size
+         :container-style     container-style
+         :customization-color customization-color
+         :on-reset            (when @reset-slider? #(reset! reset-slider? false))
+         :on-complete         #(authorize {:on-close              on-close
+                                           :auth-button-icon-left auth-button-icon-left
+                                           :theme                 theme
+                                           :blur?                 blur?
+                                           :on-enter-password     on-enter-password
+                                           :biometric-auth?       biometric-auth?
+                                           :on-auth-success       on-auth-success
+                                           :on-auth-fail          on-auth-fail
+                                           :auth-button-label     auth-button-label})
+         :track-icon          (if biometric-auth? :i/face-id :password)
+         :track-text          track-text}]])))
+
+(def view (quo.theme/with-theme view-internal))
@@ -193,7 +193,7 @@
 (def regx-address #"^0x[a-fA-F0-9]{40}$")
 (def regx-address-contains #"(?i)0x[a-fA-F0-9]{40}")
 (def regx-starts-with-uuid #"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
-(def regx-full-or-partial-address #"^0x[a-fA-F0-9]{1,40}$")
+(def regx-address-fragment #"^0x[a-fA-F0-9]{1,40}$")

 (def ^:const dapp-permission-contact-code "contact-code")
 (def ^:const dapp-permission-web3 "web3")
@@ -11,7 +11,7 @@
    [utils.re-frame :as rf]))

 (defn edit-message
-  [{:keys [text-value input-ref]}]
+  [state]
  [rn/view
   {:style               style/container
    :accessibility-label :edit-message}
@@ -30,18 +30,20 @@
    {:size                24
     :icon-only?          true
     :accessibility-label :edit-cancel-button
-     :on-press            #(utils/cancel-edit-message text-value input-ref)
+     :on-press            (fn []
+                            (utils/cancel-edit-message state)
+                            (rf/dispatch [:chat.ui/cancel-message-edit]))
     :type                :outline}
    :i/close]])

 (defn- f-view
-  [props]
+  [state]
  (let [edit   (rf/sub [:chats/edit-message])
        height (reanimated/use-shared-value (if edit constants/edit-container-height 0))]
    (rn/use-effect #(reanimated/animate height (if edit constants/edit-container-height 0)) [edit])
    [reanimated/view {:style (reanimated/apply-animations-to-style {:height height} {})}
-     (when edit [edit-message props])]))
+     (when edit [edit-message state])]))

 (defn view
-  [props]
-  [:f> f-view props])
+  [state]
+  [:f> f-view state])
@@ -6,7 +6,6 @@
    [react-native.core :as rn]
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
-    [reagent.core :as reagent]
    [status-im2.contexts.chat.composer.constants :as constants]
    [status-im2.contexts.chat.composer.keyboard :as kb]
    [status-im2.contexts.chat.composer.utils :as utils]
@@ -106,62 +105,53 @@

 (defn use-edit
  [{:keys [input-ref]}
-   {:keys [text-value saved-cursor-position cursor-position]}
-   {:keys [edit input-with-mentions]}
-   messages-list-on-layout-finished?]
-  (let [mention?              (some #(= :mention (first %)) (seq input-with-mentions))
-        composer-just-opened? (not @messages-list-on-layout-finished?)]
-    (rn/use-effect
-     (fn []
-       (let [mention-text     (reduce (fn [acc item]
-                                        (str acc (second item)))
-                                      ""
-                                      input-with-mentions)
-             edit-text        (cond
-                                mention? mention-text
-                                ;; NOTE: using text-value for cases when the user
-                                ;; leaves the app with an unfinished edit and re-opens
-                                ;; the chat.
-                                (and (seq @text-value) composer-just-opened?)
-                                @text-value
-                                :else (get-in edit [:content :text]))
-             selection-pos    (count edit-text)
-             inject-edit-text (fn []
-                                (reset! text-value edit-text)
-                                (reset! cursor-position selection-pos)
-                                (reset! saved-cursor-position selection-pos)
-                                (when @input-ref
-                                  (.setNativeProps ^js @input-ref
-                                                   (clj->js {:text edit-text}))))]
-
-         (when (and edit @input-ref)
-           ;; NOTE: A small setTimeout is necessary to ensure the focus is enqueued and is executed
-           ;; ASAP. Check https://github.com/software-mansion/react-native-screens/issues/472
-           ;;
-           ;; The nested setTimeout is necessary to avoid both `on-focus` and
-           ;; `on-content-size-change` handlers triggering the height animation simultaneously, as
-           ;; this causes a jump in the
-           ;; UI. This way, `on-focus` will trigger first without changing the height, after which
-           ;; `on-content-size-change` will animate the height of the input based on the injected
-           ;; text.
-           (js/setTimeout #(do (when @messages-list-on-layout-finished? (.focus ^js @input-ref))
-                               (reagent/next-tick inject-edit-text))
-                          600))))
-     [(:message-id edit)])))
+   {:keys [text-value saved-cursor-position]}
+   {:keys [edit]}]
+  (rn/use-effect
+   (fn []
+     (let [edit-text        (get-in edit [:content :text])
+           text-value-count (count @text-value)]
+       (when (and edit @input-ref)
+         ;; A small setTimeout is necessary to ensure the statement is enqueued and will get executed
+         ;; ASAP.
+         ;; https://github.com/software-mansion/react-native-screens/issues/472
+         (js/setTimeout #(.focus ^js @input-ref) 250)
+         (.setNativeProps ^js @input-ref (clj->js {:text edit-text}))
+         (reset! text-value edit-text)
+         (reset! saved-cursor-position (if (zero? text-value-count)
+                                         (count edit-text)
+                                         text-value-count)))))
+   [(:message-id edit)]))

 (defn use-reply
  [{:keys [input-ref]}
   {:keys [container-opacity]}
-   {:keys [reply]}
-   messages-list-on-layout-finished?]
+   {:keys [reply]}]
  (rn/use-effect
   (fn []
     (when reply
       (reanimated/animate container-opacity 1))
-     (when (and reply @input-ref @messages-list-on-layout-finished?)
-       (js/setTimeout #(.focus ^js @input-ref) 600)))
+     (when (and reply @input-ref)
+       (js/setTimeout #(.focus ^js @input-ref) 250)))
   [(:message-id reply)]))

+(defn edit-mentions
+  [{:keys [input-ref]} {:keys [text-value cursor-position]} {:keys [input-with-mentions]}]
+  (rn/use-effect (fn []
+                   (let [input-text (reduce (fn [acc item]
+                                              (str acc (second item)))
+                                            ""
+                                            input-with-mentions)]
+                     (reset! text-value input-text)
+                     (reset! cursor-position (count input-text))
+                     (js/setTimeout #(when @input-ref
+                                       (.setNativeProps ^js @input-ref
+                                                        (clj->js {:selection {:start (count input-text)
+                                                                              :end   (count
+                                                                                      input-text)}})))
+                                    300)))
+                 [(some #(= :mention (first %)) (seq input-with-mentions))]))
+
 (defn update-input-mention
  [{:keys [input-ref]}
   {:keys [text-value]}
@@ -43,7 +43,8 @@
    (reset! emoji-kb-extra-height nil))
  (reset! maximized? false)
  (rf/dispatch [:chat.ui/set-input-maximized false])
-  (utils/blur-input input-ref))
+  (when @input-ref
+    (.blur ^js @input-ref)))

 (defn bounce-back
  [{:keys [height saved-height opacity background-y]}
@@ -95,13 +96,13 @@
                                max-height
                                bounded-height
                                saved-height))
-                 ; sheet at min-height, collapse keyboard
-                 (utils/blur-input input-ref))))))
+                 (when @input-ref ; sheet at min-height, collapse keyboard
+                   (.blur ^js @input-ref)))))))
        (gesture/on-end (fn []
                          (let [diff (- (reanimated/get-shared-value height)
                                        (reanimated/get-shared-value saved-height))]
                            (if @gesture-enabled?
-                              (if (and @expanding? (>= diff 0))
+                              (if (>= diff 0)
                                (if (> diff constants/drag-threshold)
                                  (maximize state animations dimensions)
                                  (bounce-back animations dimensions starting-opacity))
@@ -23,14 +23,12 @@
   show-floating-scroll-down-button?]
  (reset! focused? true)
  (rf/dispatch [:chat.ui/set-input-focused true])
-  (let [last-height-value (reanimated/get-shared-value last-height)]
-    (reanimated/animate height last-height-value)
-    (reanimated/set-shared-value saved-height last-height-value)
-    (reanimated/animate container-opacity 1)
-    (when (> last-height-value (* constants/background-threshold max-height))
-      (reanimated/animate opacity 1)
-      (reanimated/set-shared-value background-y 0)))
-
+  (reanimated/animate height (reanimated/get-shared-value last-height))
+  (reanimated/set-shared-value saved-height (reanimated/get-shared-value last-height))
+  (reanimated/animate container-opacity 1)
+  (when (> (reanimated/get-shared-value last-height) (* constants/background-threshold max-height))
+    (reanimated/animate opacity 1)
+    (reanimated/set-shared-value background-y 0))
  (js/setTimeout #(reset! lock-selection? false) 300)
  (when (and (not-empty @text-value) @input-ref)
    (.setNativeProps ^js @input-ref
@@ -74,7 +72,7 @@
  "Save new text height, expand composer if possible, show background overlay if needed"
  [event
   {:keys [maximized? lock-layout? text-value]}
-   {:keys [height saved-height last-height opacity background-y]}
+   {:keys [height saved-height opacity background-y]}
   {:keys [content-height window-height max-height]}
   keyboard-shown]
  (when keyboard-shown
@@ -89,9 +87,8 @@
                                                    max-height)
          new-height   (min new-height max-height)]
      (reset! content-height content-size)
-      (when (utils/update-height? content-size height max-height)
+      (when (utils/update-height? content-size height max-height maximized?)
        (reanimated/animate height new-height)
-        (reanimated/set-shared-value last-height new-height)
        (reanimated/set-shared-value saved-height new-height))
      (when (= new-height max-height)
        (reset! maximized? true)
@@ -4,8 +4,7 @@
    [react-native.async-storage :as async-storage]
    [react-native.core :as rn]
    [react-native.platform :as platform]
-    [react-native.reanimated :as reanimated]
-    [status-im2.contexts.chat.composer.utils :as utils]))
+    [react-native.reanimated :as reanimated]))

 (defn get-kb-height
  [curr-height default-height]
@@ -21,24 +20,18 @@
      (async-storage/set-item! :kb-default-height (str height)))))

 (defn handle-emoji-kb-ios
-  "Opening emoji KB on iOS will cause a flicker up and down due to height differences.
-  This method handles that by adding the extra difference between the keyboards. When the input is
-  expanded to a point where the added difference will make the composer go beyond the screen causing a flicker,
-  we're subtracting the difference so it only reaches the allowed max-height. We're not animating these
-  changes to make it appear seamless during transitions between keyboard types when maximized."
+  "Opening emoji KB on iOS while maximized will cause a flicker up and down. This method handles that."
  [event
   {:keys [emoji-kb-extra-height]}
-   {:keys [text-value kb-height]}
+   {:keys [text-value]}
   {:keys [height saved-height]}
   {:keys [max-height]}]
-  (let [start-h                 (oops/oget event "startCoordinates.height")
-        end-h                   (oops/oget event "endCoordinates.height")
-        diff                    (- end-h start-h)
-        max-height-diff         (- max-height diff)
-        curr-text               @text-value
-        bigger-than-default-kb? (> end-h @kb-height)
-        almost-expanded?        (> (reanimated/get-shared-value height) max-height-diff)]
-    (if (and almost-expanded? bigger-than-default-kb? (pos? diff))
+  (let [start-h         (oops/oget event "startCoordinates.height")
+        end-h           (oops/oget event "endCoordinates.height")
+        diff            (- end-h start-h)
+        max-height-diff (- max-height diff)
+        curr-text       @text-value]
+    (if (> (reanimated/get-shared-value height) max-height-diff)
      (do
        (reanimated/set-shared-value height (- (reanimated/get-shared-value height) diff))
        (reanimated/set-shared-value saved-height (- (reanimated/get-shared-value saved-height) diff))
@@ -65,8 +58,8 @@
                                   #(handle-emoji-kb-ios % props state animations dimensions)))
  (reset! keyboard-hide-listener (.addListener rn/keyboard
                                               "keyboardDidHide"
-                                               #(when platform/android?
-                                                  (utils/blur-input input-ref)))))
+                                               #(when (and platform/android? @input-ref)
+                                                  (.blur ^js @input-ref)))))

 (defn handle-refocus-emoji-kb-ios
  [{:keys [saved-emoji-kb-extra-height]}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrea Maria Piana	88c56a4f2f	status-go-issue	2023-11-16 12:58:22 +00:00
Icaro Motta	91300b9ff8	Fix: unable to join token-gated communities (#17894 ) Fixes the bug by explicitly passing all available addresses to be revealed to wakuext_requestToJoinCommunity and picking up the first available address as the airdrop address. This is a temporary solution while we work on the feature to allow users to choose which addresses to expose. Fixes https://github.com/status-im/status-mobile/issues/17861 Areas that may be impacted: join community flows. ---------------------------------------------------------------------- Community "Request to join" option is enabled. User holds more than X ETH. Anyone who holds <X> ETH is allowed to Become member in <COMMUNITY>. Expected: request to join is received by desktop client and accepted, mobile user joins the community. ---------------------------------------------------------------------- ---------------------------------------------------------------------- Community "Request to join" option is enabled. User holds less than X ETH. Anyone who holds <X> ETH is allowed to View and post in <CHANNEL>. Expected: request to join is received by desktop client and accepted, mobile user joins the community, but can't post in <CHANNEL>. ---------------------------------------------------------------------- ---------------------------------------------------------------------- Community "Request to join" option is enabled. No token permissions. Expected: request to join is received by desktop client and accepted, mobile user joins the community. ----------------------------------------------------------------------	2023-11-15 06:46:55 -03:00
Andrea Maria Piana	d93b20242a	Point to shared release branch	2023-11-14 10:54:02 +00:00
Andrea Maria Piana	0a43e5c97a	Bump release to 1.26.0	2023-11-14 10:52:00 +00:00
@@ -1 +1 @@
 .25.0
 .26.0