test

enable biometric when user signs in with syncing (#17627 )
local pair: check netIPs if empty before find server cert
2023-11-20 15:55:27 +00:00 · 2023-11-17 15:23:36 +00:00 · 2023-11-17 11:26:54 +00:00 · 2023-11-17 11:14:23 +00:00 · 2023-11-16 19:43:29 +00:00 · 2023-11-16 19:11:20 +00:00
120 changed files with 531 additions and 1827 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}}}}
@@ -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]]))
@@ -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))
@@ -131,7 +131,6 @@
    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
@@ -212,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)
@@ -361,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)
@@ -73,7 +73,6 @@
    [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.wallet.account-card.component-spec]
    [quo.components.wallet.account-origin.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))
@@ -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"]]]))
@@ -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
@@ -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")
@@ -73,12 +73,12 @@
        (data-store.settings/rpc->settings settings)
        profile-overview (profile.rpc/rpc->profiles-overview account)]
    (rf/merge cofx
-              {:db (-> db
-                       (assoc :chats/loading?           true
-                              :networks/current-network current-network
-                              :networks/networks        (merge networks config/default-networks-by-id)
-                              :profile/profile          (merge profile-overview settings))
-                       (assoc-in [:wallet :ui :tokens-loading?] true))}
+              {:db (assoc db
+                          :chats/loading?           true
+                          :networks/current-network current-network
+                          :wallet/tokens-loading?   true
+                          :networks/networks        (merge networks config/default-networks-by-id)
+                          :profile/profile          (merge profile-overview settings))}
              (notifications/load-preferences)
              (data-store.chats/fetch-chats-preview
               {:on-success
@@ -6,14 +6,14 @@


 (defn- view-internal
-  [{:keys [theme title]}]
+  [{:keys [theme]}]
  (let [logged-in?    (rf/sub [:multiaccount/logged-in?])
        has-profiles? (boolean (rf/sub [:profile/profiles-overview]))
        root          (if has-profiles? :profiles :intro)
        light?        (= theme :light)]
    [quo/page-nav
     {:type       :title
-      :title      title
+      :title      "quo components preview"
      :text-align :left
      :icon-name  :i/close
      :right-side [{:icon-name (if light? :i/dark :i/light)
@@ -26,4 +26,4 @@
        :descriptor            descriptor
        :blur?                 (:in-blur-view? @state)
        :show-blur-background? (:in-blur-view? @state)}
-       [quo/step (dissoc @state :value) (:value @state)]])))
+       [quo/step @state (:value @state)]])))
@@ -153,7 +153,6 @@
    [status-im2.contexts.quo-preview.tags.number-tag :as number-tag]
    [status-im2.contexts.quo-preview.tags.permission-tag :as permission-tag]
    [status-im2.contexts.quo-preview.tags.status-tags :as status-tags]
-    [status-im2.contexts.quo-preview.tags.summary-tag :as summary-tag]
    [status-im2.contexts.quo-preview.tags.tag :as tag]
    [status-im2.contexts.quo-preview.tags.tags :as tags]
    [status-im2.contexts.quo-preview.tags.tiny-tag :as tiny-tag]
@@ -434,8 +433,6 @@
                        :component permission-tag/view}
                       {:name      :status-tags
                        :component status-tags/view}
-                       {:name      :summary-tag
-                        :component summary-tag/view}
                       {:name      :tag
                        :component tag/view}
                       {:name      :tags
@@ -487,7 +484,7 @@
 (defn- main-screen
  []
  [:<>
-   [common/navigation-bar {:title "Quo components preview"}]
+   [common/navigation-bar]
   [rn/scroll-view {:style (style/main)}
    (for [category (sort screens-categories)]
      ^{:key (first category)}
@@ -317,10 +317,10 @@
         children)])

 (defn- f-preview-container
-  [{:keys [title state descriptor blur? blur-dark-only?
+  [{:keys [state descriptor blur? blur-dark-only?
           component-container-style
           blur-container-style blur-view-props blur-height show-blur-background?]
-    :or   {blur-height 200 title "quo component"}}
+    :or   {blur-height 200}}
   & children]
  (let [theme (quo.theme/use-theme-value)]
    (rn/use-effect (fn []
@@ -332,7 +332,7 @@
    [rn/view
     {:style {:top  (safe-area/get-top)
              :flex 1}}
-     [common/navigation-bar {:title title}]
+     [common/navigation-bar]
     [rn/scroll-view
      {:style                           (style/panel-basic)
       :shows-vertical-scroll-indicator false}
@@ -1,7 +1,6 @@
 (ns status-im2.contexts.quo-preview.settings.data-item
  (:require
    [quo.core :as quo]
-    [quo.foundations.resources :as quo.resources]
    [reagent.core :as reagent]
    [status-im2.common.resources :as resources]
    [status-im2.contexts.quo-preview.preview :as preview]))
@@ -51,7 +50,6 @@
                             :right-icon          :i/chevron-right
                             :emoji               "🎮"
                             :customization-color :yellow
-                             :network-image       (quo.resources/get-network :ethereum)
                             :communities-list    communities-list})]
    (fn []
      [preview/preview-container
@@ -1,66 +0,0 @@
-(ns status-im2.contexts.quo-preview.tags.summary-tag
-  (:require
-    [quo.core :as quo]
-    [quo.foundations.resources :as quo.resources]
-    [react-native.core :as rn]
-    [reagent.core :as reagent]
-    [status-im2.common.resources :as resources]
-    [status-im2.contexts.quo-preview.preview :as preview]))
-
-(defn data
-  [type]
-  (case type
-    :token
-    {:customization-color "#9999991A"
-     :label               "150 ETH"
-     :image-source        (quo.resources/get-token :eth)}
-    :address
-    {:label "0x39c...Bd2"}
-    :user
-    {:image-source        (resources/mock-images :user-picture-male4)
-     :customization-color :blue
-     :label               "Mark Libot"}
-    :collectible
-    {:label               "Isekai #1"
-     :image-source        (resources/mock-images :collectible2)
-     :customization-color :yellow}
-    :network
-    {:image-source (quo.resources/get-network :ethereum)
-     :label        "Mainnet"}
-    :saved-address
-    {:customization-color :flamingo
-     :label               "Peter Lambo"}
-    :account
-    {:label               "Account"
-     :emoji               "🍿"
-     :customization-color :purple}))
-
-(def descriptor
-  [{:key     :type
-    :type    :select
-    :options [{:value "Token"
-               :key   :token}
-              {:value "Address"
-               :key   :address}
-              {:value "User"
-               :key   :user}
-              {:value "Collectible"
-               :key   :collectible}
-              {:value "Network"
-               :key   :network}
-              {:value "Saved address"
-               :key   :saved-address}
-              {:value "Account"
-               :key   :account}]}])
-
-(defn view
-  []
-  (let [state (reagent/atom
-               (merge {:type :token}
-                      (data :token)))]
-    (fn []
-      [preview/preview-container
-       {:state      state
-        :descriptor descriptor}
-       [rn/view {:style {:align-items :center}}
-        [quo/summary-tag (merge @state (data (:type @state)))]]])))
@@ -1,22 +0,0 @@
-(ns status-im2.contexts.status-im-preview.common.floating-button-page.style
-  (:require [quo.foundations.colors :as colors]
-            [react-native.safe-area :as safe-area]))
-
-(defn container
-  []
-  {:flex       1
-   :margin-top (safe-area/get-top)})
-
-(def background-image
-  {:position :absolute
-   :top      (- (safe-area/get-top))
-   :left     0
-   :right    0
-   :bottom   200})
-
-(defn page-content
-  [height]
-  {:flex             1
-   :height           height
-   :overflow         :hidden
-   :background-color (colors/resolve-color :army 30)})
@@ -1,55 +0,0 @@
-(ns status-im2.contexts.status-im-preview.common.floating-button-page.view
-  (:require [quo.core :as quo]
-            [re-frame.core :as rf]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]
-            [status-im2.common.floating-button-page.view :as floating-button-page]
-            [status-im2.common.resources :as resources]
-            [status-im2.contexts.status-im-preview.common.floating-button-page.style :as style]))
-
-(defn view
-  []
-  (let [content-height (reagent/atom 450)
-        slide?         (reagent/atom false)]
-    (fn []
-      [rn/view {:style (style/container)}
-       (when-not @slide?
-         [rn/image
-          {:style  style/background-image
-           :source (resources/get-mock-image :dark-blur-bg)}])
-       [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
-                   :right-side  [{:icon-name :i/swap
-                                  :on-press  #(swap! slide? not)}]
-                   :background  :blur
-                   :icon-name   :i/close
-                   :on-press    #(rf/dispatch [:navigate-back])}]
-         :footer (if @slide?
-                   [quo/slide-button
-                    {:track-text          "We gotta slide"
-                     :track-icon          :face-id
-                     :container-style     {:z-index 2}
-                     :customization-color :blue
-                     :on-complete         #(js/alert "button slid")}
-                    "Save address"]
-                   [quo/button
-                    {:container-style {:z-index 2}
-                     :on-press        #(js/alert "button pressed")}
-                    "Save address"])}
-        [rn/view {:style (style/page-content @content-height)}
-         [quo/text {:size :heading-1} "Page Content"]
-         [quo/input
-          {:auto-focus true
-           :value      ""}]
-         [quo/button
-          {:type     :outline
-           :on-press #(swap! content-height (fn [v] (+ v 10)))}
-          "increase height"]
-         [quo/button
-          {:type     :outline
-           :on-press #(swap! content-height (fn [v] (- v 10)))}
-          "decrease height"]]]])))
@@ -1,59 +0,0 @@
-(ns status-im2.contexts.status-im-preview.main
-  (:refer-clojure :exclude [filter])
-  (:require
-    [quo.core :as quo]
-    [react-native.core :as rn]
-    [reagent.core :as reagent]
-    [status-im2.contexts.quo-preview.common :as common]
-    [status-im2.contexts.status-im-preview.common.floating-button-page.view :as floating-button-page]
-    [status-im2.contexts.status-im-preview.style :as style]
-    [utils.re-frame :as rf]))
-
-(def screens-categories
-  {:common [{:name      :floating-button-page
-             :component floating-button-page/view}]})
-
-(defn- category-view
-  []
-  (let [open?    (reagent/atom false)
-        on-press #(swap! open? not)]
-    (fn [category]
-      [rn/view {:style {:margin-vertical 8}}
-       [quo/dropdown
-        {:type     :grey
-         :state    (if @open? :active :default)
-         :on-press on-press}
-        (name (key category))]
-       (when @open?
-         (for [{category-name :name} (val category)]
-           ^{:key category-name}
-           [quo/button
-            {:type            :outline
-             :container-style {:margin-vertical 8}
-             :on-press        #(rf/dispatch [:navigate-to category-name])}
-            (name category-name)]))])))
-
-(defn- main-screen
-  []
-  [:<>
-   [common/navigation-bar {:title "Status IM components"}]
-   [rn/scroll-view {:style (style/main)}
-    (for [category (sort screens-categories)]
-      ^{:key (first category)}
-      [category-view category])]])
-
-(def screens
-  (->> screens-categories
-       (map val)
-       flatten
-       (map (fn [subcategory]
-              (update-in subcategory
-                         [:options :topBar]
-                         merge
-                         {:visible false})))))
-
-(def main-screens
-  [{:name      :status-im-preview
-    :options   {:topBar {:visible false}
-                :insets {:top? true}}
-    :component main-screen}])
@@ -1,10 +0,0 @@
-(ns status-im2.contexts.status-im-preview.style
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(defn main
-  []
-  {:flex               1
-   :padding-bottom     8
-   :padding-horizontal 16
-   :background-color   (colors/theme-colors colors/white colors/neutral-90)})
@@ -3,10 +3,11 @@
    [quo.core :as quo]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [status-im2.common.resources :as resources]
    [status-im2.contexts.wallet.account.tabs.dapps.style :as style]
    [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab]
-    [utils.i18n :as i18n]))
+    [status-im2.contexts.wallet.common.temp :as temp]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]))

 (defn dapp-options
  []
@@ -22,12 +23,13 @@

 (defn- view-internal
  [{:keys [theme]}]
-  (let [dapps-list []]
+  (let [dapps-list (temp/dapps-list {:on-press-icon #(rf/dispatch [:show-bottom-sheet
+                                                                   {:content dapp-options}])})]
    (if (empty? dapps-list)
      [empty-tab/view
-       {:title       (i18n/label :t/no-dapps)
-        :description (i18n/label :t/no-dapps-description)
-        :image       (resources/get-themed-image :no-dapps theme)}]
+       {:title        (i18n/label :t/no-dapps)
+        :description  (i18n/label :t/no-collectibles-description)
+        :placeholder? true}]
      [rn/view {:style style/dapps-container}
       [rn/flat-list
        {:data      dapps-list
@@ -1,8 +1,6 @@
 (ns status-im2.contexts.wallet.account.tabs.view
  (:require
-    [quo.theme]
    [react-native.core :as rn]
-    [status-im2.common.resources :as resources]
    [status-im2.contexts.wallet.account.tabs.about.view :as about]
    [status-im2.contexts.wallet.account.tabs.dapps.view :as dapps]
    [status-im2.contexts.wallet.common.activity-tab.view :as activity]
@@ -12,8 +10,8 @@
    [status-im2.contexts.wallet.common.token-value.view :as token-value]
    [utils.i18n :as i18n]))

-(defn- view-internal
-  [{:keys [selected-tab theme]}]
+(defn view
+  [{:keys [selected-tab]}]
  (case selected-tab
    :assets       [rn/flat-list
                   {:render-fn               token-value/view
@@ -22,13 +20,8 @@
    :collectibles [collectibles/view]
    :activity     [activity/view]
    :permissions  [empty-tab/view
-                   {:title       (i18n/label :t/no-permissions)
-                    :description (i18n/label :t/no-collectibles-description)
-                    :image       (resources/get-image
-                                  (quo.theme/theme-value :no-permissions-light
-                                                         :no-permissions-dark
-                                                         theme))}]
+                   {:title        (i18n/label :t/no-permissions)
+                    :description  (i18n/label :t/no-collectibles-description)
+                    :placeholder? true}]
    :dapps        [dapps/view]
    [about/view]))
-
-(def view (quo.theme/with-theme view-internal))
@@ -25,6 +25,7 @@
  [{:id :assets :label (i18n/label :t/assets) :accessibility-label :assets-tab}
   {:id :collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}
   {:id :activity :label (i18n/label :t/activity) :accessibility-label :activity-tab}
+   {:id :permissions :label (i18n/label :t/permissions) :accessibility-label :permissions}
   {:id :dapps :label (i18n/label :t/dapps) :accessibility-label :dapps}
   {:id :about :label (i18n/label :t/about) :accessibility-label :about}])

@@ -1,38 +0,0 @@
-(ns status-im2.contexts.wallet.add-address-to-watch.component-spec
-  (:require
-    [re-frame.core :as re-frame]
-    [status-im2.contexts.wallet.add-address-to-watch.view :as add-address-to-watch]
-    [test-helpers.component :as h]))
-
-(defn setup-subs
-  [subscriptions]
-  (doseq [keyval subscriptions]
-    (re-frame/reg-sub
-     (key keyval)
-     (fn [_] (val keyval)))))
-
-(h/describe "select address for watch only account"
-  (h/test "validation messages show for already used addressed"
-    (setup-subs {:wallet/scanned-address      nil
-                 :wallet/addresses            (set
-                                               ["0x12E838Ae1f769147b12956485dc56e57138f3AC8"
-                                                "0x22E838Ae1f769147b12956485dc56e57138f3AC8"])
-                 :profile/customization-color :blue})
-    (h/render [add-address-to-watch/view])
-    (h/is-falsy (h/query-by-label-text :error-message))
-    (h/fire-event :change-text
-                  (h/get-by-label-text :add-address-to-watch)
-                  "0x12E838Ae1f769147b12956485dc56e57138f3AC8")
-    (h/is-truthy (h/get-by-translation-text :address-already-in-use))))
-
-(h/test "validation messages show for invalid address"
-  (setup-subs {:wallet/scanned-address      nil
-               :wallet/addresses            (set
-                                             ["0x12E838Ae1f769147b12956485dc56e57138f3AC8"
-                                              "0x22E838Ae1f769147b12956485dc56e57138f3AC8"])
-               :profile/customization-color :blue})
-  (h/render [add-address-to-watch/view])
-  (h/is-falsy (h/query-by-label-text :error-message))
-  (h/fire-event :change-text (h/get-by-label-text :add-address-to-watch) "0x12E838Ae1f769147b")
-  (h/is-truthy (h/get-by-translation-text :invalid-address)))
-
@@ -3,7 +3,18 @@
 (def container
  {:flex 1})

+(def input
+  {:margin-right 12
+   :flex         1})
+
 (def data-item
  {:margin-horizontal  20
   :padding-vertical   8
   :padding-horizontal 12})
+
+(defn button-container
+  [bottom]
+  {:position :absolute
+   :bottom   (+ bottom 12)
+   :left     20
+   :right    20})
@@ -3,6 +3,7 @@
    [clojure.string :as string]
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
+    [quo.theme :as quo.theme]
    [re-frame.core :as re-frame]
    [react-native.core :as rn]
    [reagent.core :as reagent]
@@ -13,12 +14,13 @@
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

-(defn view
+(defn- view-internal
  []
  (let [{:keys [address]}  (rf/sub [:get-screen-params])
        number-of-accounts (count (rf/sub [:profile/wallet-accounts]))
        account-name       (reagent/atom (i18n/label :t/default-account-name
                                                     {:number (inc number-of-accounts)}))
+        address-title      (i18n/label :t/watch-address)
        account-color      (reagent/atom (rand-nth colors/account-colors))
        account-emoji      (reagent/atom (emoji-picker.utils/random-emoji))
        on-change-name     #(reset! account-name %)
@@ -38,9 +40,8 @@
         :on-change-name      on-change-name
         :on-change-color     on-change-color
         :on-change-emoji     on-change-emoji
-         :watch-only?         true
         :bottom-action?      true
-         :bottom-action-label :t/add-watched-address
+         :bottom-action-label :t/create-account
         :bottom-action-props {:customization-color @account-color
                               :disabled?           (string/blank? @account-name)
                               :on-press            #(re-frame/dispatch [:navigate-to
@@ -50,9 +51,11 @@
          :right-icon      :i/advanced
          :icon-right?     true
          :emoji           @account-emoji
-          :title           (i18n/label :t/watched-address)
+          :title           address-title
          :subtitle        address
          :status          :default
          :size            :default
          :container-style style/data-item
          :on-press        #(js/alert "To be implemented")}]]])))
+
+(def view (quo.theme/with-theme view-internal))
@@ -5,24 +5,13 @@
   :margin-top        12
   :margin-bottom     20})

+(def input-container
+  {:flex-direction     :row
+   :padding-horizontal 20
+   :align-items        :flex-end})
+
 (def button-container
  {:position :absolute
   :bottom   22
   :left     20
   :right    20})
-
-(def scan
-  {:align-self
-   :flex-end})
-
-(def input
-  {:flex         1
-   :margin-right 12})
-
-(def input-container
-  {:flex-direction    :row
-   :margin-horizontal 20})
-
-(def info-message
-  {:margin-top  8
-   :margin-left 20})
@@ -2,114 +2,51 @@
  (:require
    [clojure.string :as string]
    [quo.core :as quo]
+    [quo.theme :as quo.theme]
+    [re-frame.core :as re-frame]
    [react-native.clipboard :as clipboard]
    [react-native.core :as rn]
    [reagent.core :as reagent]
    [status-im2.contexts.wallet.add-address-to-watch.style :as style]
-    [status-im2.contexts.wallet.common.validation :as validation]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

-(defn validate-message
-  [addresses]
-  (fn [s]
-    (cond
-      (or (= s nil) (= s ""))             nil
-      (contains? addresses s)             (i18n/label :t/address-already-in-use)
-      (not (or (validation/eth-address? s)
-               (validation/ens-name? s))) (i18n/label :t/invalid-address)
-      :else                               nil)))
-
-(defn- address-input
-  [{:keys [input-value validation-msg validate
-           clear-input]}]
-  (let [scanned-address (rf/sub [:wallet/scanned-address])
-        empty-input?    (and (string/blank? @input-value)
-                             (string/blank? scanned-address))
-
-        on-change-text  (fn [new-text]
-                          (reset! validation-msg (validate new-text))
-                          (reset! input-value new-text)
-                          (when (and scanned-address (not= scanned-address new-text))
-                            (rf/dispatch [:wallet/clean-scanned-address])))
-        paste-on-input  #(clipboard/get-string
-                          (fn [clipboard-text]
-                            (on-change-text clipboard-text)))]
-    (rn/use-effect (fn []
-                     (when-not (string/blank? scanned-address)
-                       (on-change-text scanned-address)))
-                   [scanned-address])
-    [rn/view
-     {:style style/input-container}
-     [quo/input
-      {:accessibility-label :add-address-to-watch
-       :placeholder         (i18n/label :t/address-placeholder)
-       :container-style     style/input
-       :label               (i18n/label :t/eth-or-ens)
-       :auto-capitalize     :none
-       :multiline?          true
-       :on-clear            clear-input
-       :return-key-type     :done
-       :clearable?          (not empty-input?)
-       :on-change-text      on-change-text
-       :button              (when empty-input?
-                              {:on-press paste-on-input
-                               :text     (i18n/label :t/paste)})
-       :value               @input-value}]
-     [quo/button
-      {:type            :outline
-       :on-press        (fn []
-                          (rn/dismiss-keyboard!)
-                          (rf/dispatch [:open-modal :scan-address]))
-       :container-style style/scan
-       :size            40
-       :icon-only?      true}
-      :i/scan]]))
-
-(defn view
+(defn view-internal
  []
-  (let [addresses           (rf/sub [:wallet/addresses])
-        input-value         (reagent/atom nil)
-        validate            (validate-message (set addresses))
-        validation-msg      (reagent/atom (validate
-                                           @input-value))
-        clear-input         (fn []
-                              (reset! input-value nil)
-                              (reset! validation-msg nil)
-                              (rf/dispatch [:wallet/clean-scanned-address]))
+  (let [input-value         (reagent/atom "")
        customization-color (rf/sub [:profile/customization-color])]
-    (rf/dispatch [:wallet/clean-scanned-address])
    (fn []
      [rn/view
       {:style {:flex 1}}
       [quo/page-nav
        {:type      :no-title
         :icon-name :i/close
-         :on-press  (fn []
-                      (rf/dispatch [:wallet/clean-scanned-address])
-                      (rf/dispatch [:navigate-back]))}]
+         :on-press  #(rf/dispatch [:navigate-back])}]
       [quo/text-combinations
        {:container-style style/header-container
         :title           (i18n/label :t/add-address)
         :description     (i18n/label :t/enter-eth)}]
-       [:f> address-input
-        {:input-value    input-value
-         :validate       validate
-         :validation-msg validation-msg
-         :clear-input    clear-input}]
-       (when @validation-msg
-         [quo/info-message
-          {:accessibility-label :error-message
-           :size                :default
-           :icon                :i/info
-           :type                :error
-           :style               style/info-message}
-          @validation-msg])
+       [rn/view {:style style/input-container}
+        [quo/input
+         {:label           (i18n/label :t/eth-or-ens)
+          :button          {:on-press (fn [] (clipboard/get-string #(reset! input-value %)))
+                            :text     (i18n/label :t/paste)}
+          :placeholder     (str "0x123abc... " (string/lower-case (i18n/label :t/or)) " bob.eth")
+          :container-style {:margin-right 12
+                            :flex         1}
+          :weight          :monospace
+          :on-change-text  #(reset! input-value %)
+          :default-value   @input-value}]
+        [quo/button
+         {:icon-only? true
+          :type       :outline} :i/scan]]
       [quo/button
        {:customization-color customization-color
-         :disabled?           (string/blank? @input-value)
-         :on-press            #(rf/dispatch [:navigate-to
-                                             :confirm-address-to-watch
-                                             {:address @input-value}])
+         :disabled?           (clojure.string/blank? @input-value)
+         :on-press            #(re-frame/dispatch [:navigate-to
+                                                   :confirm-address-to-watch
+                                                   {:address @input-value}])
         :container-style     style/button-container}
        (i18n/label :t/continue)]])))
+
+(def view (quo.theme/with-theme view-internal))
@@ -1,10 +1,9 @@
 (ns status-im2.contexts.wallet.common.activity-tab.view
  (:require
    [quo.core :as quo]
-    [quo.theme]
    [react-native.core :as rn]
-    [status-im2.common.resources :as resources]
    [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab]
+    [status-im2.contexts.wallet.common.temp :as temp]
    [utils.i18n :as i18n]))

 (defn activity-item
@@ -15,17 +14,15 @@
    (merge {:on-press #(js/alert "Item pressed")}
           item)]])

-(defn- view-internal
-  [{:keys [theme]}]
-  (let [activity-list []]
+(defn view
+  []
+  (let [activity-list temp/activity-list]
    (if (empty? activity-list)
      [empty-tab/view
-       {:title       (i18n/label :t/no-activity)
-        :description (i18n/label :t/empty-tab-description)
-        :image       (resources/get-themed-image :no-activity theme)}]
+       {:title        (i18n/label :t/no-activity)
+        :description  (i18n/label :t/empty-tab-description)
+        :placeholder? true}]
      [rn/flat-list
       {:data      activity-list
        :style     {:flex 1}
        :render-fn activity-item}])))
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,21 +1,19 @@
 (ns status-im2.contexts.wallet.common.collectibles-tab.view
  (:require
    [quo.core :as quo]
-    [quo.theme]
    [react-native.core :as rn]
-    [status-im2.common.resources :as resources]
    [status-im2.contexts.wallet.common.empty-tab.view :as empty-tab]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

-(defn- view-internal
-  [{:keys [theme]}]
+(defn view
+  []
  (let [collectible-list (rf/sub [:wallet/collectibles])]
    (if (empty? collectible-list)
      [empty-tab/view
-       {:title       (i18n/label :t/no-collectibles)
-        :description (i18n/label :t/no-collectibles-description)
-        :image       (resources/get-themed-image :no-collectibles theme)}]
+       {:title        (i18n/label :t/no-collectibles)
+        :description  (i18n/label :t/no-collectibles-description)
+        :placeholder? true}]
      [rn/flat-list
       {:data                    collectible-list
        :style                   {:flex 1}
@@ -27,5 +25,3 @@
                                     :on-press #(rf/dispatch
                                                 [:navigate-to
                                                  :wallet-collectible])}])}])))
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,5 +1,6 @@
 (ns status-im2.contexts.wallet.common.screen-base.create-or-edit-account.view
  (:require [quo.core :as quo]
+            [quo.theme :as quo.theme]
            [react-native.core :as rn]
            [react-native.safe-area :as safe-area]
            [status-im2.constants :as constants]
@@ -7,12 +8,12 @@
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

-(defn view
+(defn- view-internal
  [{:keys [margin-top? page-nav-right-side account-name account-color account-emoji on-change-name
           on-change-color
           on-change-emoji on-focus on-blur section-label bottom-action?
           bottom-action-label bottom-action-props
-           custom-bottom-action watch-only?]} & children]
+           custom-bottom-action]} & children]
  (let [{:keys [top bottom]}  (safe-area/get-insets)
        margin-top            (if (false? margin-top?) 0 top)
        {window-width :width} (rn/get-window)]
@@ -35,7 +36,7 @@
         {:customization-color account-color
          :size                80
          :emoji               account-emoji
-          :type                (if watch-only? :watch-only :default)}]
+          :type                :default}]
        [quo/button
         {:size            32
          :type            :grey
@@ -80,3 +81,5 @@
             :type :primary}
            bottom-action-props)
           (i18n/label bottom-action-label)])])]))
+
+(def view (quo.theme/with-theme view-internal))
@@ -1,16 +1,13 @@
 (ns status-im2.contexts.wallet.common.sheets.account-options.view
  (:require [quo.core :as quo]
-            [quo.foundations.colors :as colors]
-            quo.theme
-            [react-native.clipboard :as clipboard]
            [react-native.core :as rn]
            [status-im2.contexts.wallet.common.sheets.account-options.style :as style]
            [status-im2.contexts.wallet.common.temp :as temp]
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

-(defn- view-internal
-  [{:keys [theme]}]
+(defn view
+  []
  (let [{:keys [name color emoji address]} (rf/sub [:wallet/current-viewing-account])]
    [:<>
     [quo/drawer-top
@@ -29,13 +26,7 @@
         :on-press            #(rf/dispatch [:navigate-to :wallet-edit-account])}
        {:icon                :i/copy
         :accessibility-label :copy-address
-         :label               (i18n/label :t/copy-address)
-         :on-press            (fn []
-                                (rf/dispatch [:toasts/upsert
-                                              {:icon       :i/correct
-                                               :icon-color (colors/resolve-color :success theme)
-                                               :text       (i18n/label :t/address-copied)}])
-                                (clipboard/set-string address))}
+         :label               (i18n/label :t/copy-address)}
        {:icon                :i/share
         :accessibility-label :share-account
         :label               (i18n/label :t/share-account)}
@@ -51,5 +42,3 @@
      {:data      temp/other-accounts
       :render-fn (fn [account] [quo/account-item {:account-props account}])
       :style     {:margin-horizontal 8}}]]))
-
-(def view (quo.theme/with-theme view-internal))
@@ -1,12 +1,22 @@
 (ns status-im2.contexts.wallet.common.utils
  (:require [clojure.string :as string]
-            [status-im2.constants :as constants]
-            [utils.number]))
+            [status-im2.constants :as constants]))

 (defn get-first-name
  [full-name]
  (first (string/split full-name #" ")))

+(defn get-balance-by-address
+  [balances address]
+  (->> balances
+       (filter #(= (:address %) address))
+       first
+       :balance))
+
+(defn get-account-by-address
+  [accounts address]
+  (some #(when (= (:address %) address) %) accounts))
+
 (defn prettify-balance
  [balance]
  (str "$" (.toFixed (if (number? balance) balance 0) 2)))
@@ -22,24 +32,3 @@
  [number-of-accounts]
  (let [path (get-derivation-path number-of-accounts)]
    (format-derivation-path path)))
-
-(defn- calculate-raw-balance
-  [raw-balance decimals]
-  (if-let [n (utils.number/parse-int raw-balance nil)]
-    (/ n (Math/pow 10 (utils.number/parse-int decimals)))
-    0))
-
-(defn- total-token-value-in-all-chains
-  [{:keys [balances-per-chain decimals]}]
-  (->> balances-per-chain
-       (vals)
-       (map #(calculate-raw-balance (:raw-balance %) decimals))
-       (reduce +)))
-
-(defn calculate-balance
-  [tokens-in-account]
-  (->> tokens-in-account
-       (map (fn [token]
-              (* (total-token-value-in-all-chains token)
-                 (-> token :market-values-per-currency :usd :price))))
-       (reduce +)))
@@ -1,5 +0,0 @@
-(ns status-im2.contexts.wallet.common.validation
-  (:require [status-im2.constants :as constants]))
-
-(defn ens-name? [s] (re-find constants/regx-ens s))
-(defn eth-address? [s] (re-find constants/regx-address s))
@@ -4,33 +4,29 @@
            [quo.theme :as quo.theme]
            [react-native.core :as rn]
            [reagent.core :as reagent]
-            [status-im2.contexts.wallet.common.screen-base.create-or-edit-account.view
-             :as create-or-edit-account]
-            [status-im2.contexts.wallet.common.sheets.network-preferences.view
-             :as network-preferences]
+            [status-im2.contexts.wallet.common.screen-base.create-or-edit-account.view :as
+             create-or-edit-account]
+            [status-im2.contexts.wallet.common.sheets.network-preferences.view :as network-preferences]
            [status-im2.contexts.wallet.edit-account.style :as style]
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

-(defn- show-save-account-toast
-  [updated-key theme]
-  (let [message (case updated-key
-                  :name  :t/edit-wallet-account-name-updated-message
-                  :color :t/edit-wallet-account-colour-updated-message
-                  :emoji :t/edit-wallet-account-emoji-updated-message
-                  nil)]
-    (rf/dispatch [:toasts/upsert
-                  {:id         :edit-account
-                   :icon       :i/correct
-                   :icon-color (colors/resolve-color :success theme)
-                   :text       (i18n/label message)}])))
-
 (defn- save-account
-  [{:keys [account updated-key new-value theme]}]
-  (let [edited-account-data (assoc account updated-key new-value)]
+  [{:keys [theme type value account]}]
+  (let [edited-account-data (assoc account type value)
+        message             (case type
+                              :name  :t/edit-wallet-account-name-updated-message
+                              :color :t/edit-wallet-account-colour-updated-message
+                              :emoji :t/edit-wallet-account-emoji-updated-message
+                              nil)
+        callback            #(rf/dispatch [:toasts/upsert
+                                           {:id         :edit-account
+                                            :icon       :i/correct
+                                            :icon-color (colors/resolve-color :success theme)
+                                            :text       (i18n/label message)}])]
    (rf/dispatch [:wallet/save-account
-                  {:account    edited-account-data
-                   :on-success #(show-save-account-toast updated-key theme)}])))
+                  {:account  edited-account-data
+                   :callback callback}])))

 (defn- view-internal
  [{:keys [theme]}]
@@ -38,22 +34,22 @@
        show-confirm-button? (reagent/atom false)
        on-change-color      (fn [edited-color {:keys [color] :as account}]
                               (when (not= edited-color color)
-                                 (save-account {:account     account
-                                                :updated-key :color
-                                                :new-value   edited-color
-                                                :theme       theme})))
+                                 (save-account {:account account
+                                                :type    :color
+                                                :value   edited-color
+                                                :theme   theme})))
        on-change-emoji      (fn [edited-emoji {:keys [emoji] :as account}]
                               (when (not= edited-emoji emoji)
-                                 (save-account {:account     account
-                                                :updated-key :emoji
-                                                :new-value   edited-emoji
-                                                :theme       theme})))
+                                 (save-account {:account account
+                                                :type    :emoji
+                                                :value   edited-emoji
+                                                :theme   theme})))
        on-confirm-name      (fn [account]
                               (rn/dismiss-keyboard!)
-                               (save-account {:account     account
-                                              :updated-key :name
-                                              :new-value   @edited-account-name
-                                              :theme       theme}))]
+                               (save-account {:account account
+                                              :type    :name
+                                              :value   @edited-account-name
+                                              :theme   theme}))]
    (fn []
      (let [{:keys [name emoji address color]
             :as   account}  (rf/sub [:wallet/current-viewing-account])
@@ -86,18 +82,17 @@
           :right-icon      :i/advanced
           :card?           true
           :title           (i18n/label :t/address)
-           :custom-subtitle (fn []
-                              [quo/address-text
-                               {:networks [{:network-name :ethereum :short-name "eth"}
-                                           {:network-name :optimism :short-name "opt"}
-                                           {:network-name :arbitrum :short-name "arb1"}]
-                                :address  address
-                                :format   :long}])
+           :custom-subtitle (fn [] [quo/address-text
+                                    {:networks [{:network-name :ethereum :short-name "eth"}
+                                                {:network-name :optimism :short-name "opt"}
+                                                {:network-name :arbitrum :short-name "arb1"}]
+                                     :address  address
+                                     :format   :long}])
           :on-press        (fn []
                              (rf/dispatch [:show-bottom-sheet
-                                            {:content (fn []
-                                                        [network-preferences/view
-                                                         {:on-save #(js/alert "calling on save")}])}]))
+                                            {:content (fn [] [network-preferences/view
+                                                              {:on-save #(js/alert
+                                                                          "calling on save")}])}]))
           :container-style style/data-item}]]))))

 (def view (quo.theme/with-theme view-internal))
@@ -11,7 +11,6 @@
    [taoensso.timbre :as log]
    [utils.ethereum.chain :as chain]
    [utils.i18n :as i18n]
-    [utils.number]
    [utils.re-frame :as rf]
    [utils.security.core :as security]
    [utils.transforms :as types]))
@@ -41,8 +40,7 @@
   {:db (update db :wallet dissoc :current-viewing-account-address)
    :fx [[:dispatch [:navigate-back]]]}))

-(rf/reg-event-fx
- :wallet/get-accounts-success
+(rf/reg-event-fx :wallet/get-accounts-success
 (fn [{:keys [db]} [accounts]]
   (let [wallet-db           (get db :wallet)
         new-account?        (:new-account? wallet-db)
@@ -63,8 +61,7 @@
                 {:dispatch [:wallet/navigate-to-account navigate-to-account]
                  :ms       300}]])))))

-(rf/reg-event-fx
- :wallet/get-accounts
+(rf/reg-event-fx :wallet/get-accounts
 (fn [_]
   {:fx [[:json-rpc/call
          [{:method     "accounts_getAccounts"
@@ -75,54 +72,35 @@

 (rf/reg-event-fx
 :wallet/save-account
- (fn [_ [{:keys [account on-success]}]]
+ (fn [_ [{:keys [account callback]}]]
   {:fx [[:json-rpc/call
          [{:method     "accounts_saveAccount"
            :params     [(data-store/<-account account)]
            :on-success (fn []
                          (rf/dispatch [:wallet/get-accounts])
-                          (when (fn? on-success)
-                            (on-success)))
+                          (when (fn? callback)
+                            (callback)))
            :on-error   #(log/info "failed to save account "
                                   {:error %
                                    :event :wallet/save-account})}]]]}))

-(rf/reg-event-fx
- :wallet/get-wallet-token
+(rf/reg-event-fx :wallet/get-wallet-token
 (fn [{:keys [db]}]
-   (let [addresses (->> (get-in db [:wallet :accounts])
-                        vals
-                        (map :address))]
+   (let [addresses (map :address (vals (get-in db [:wallet :accounts])))]
     {:fx [[:json-rpc/call
            [{:method     "wallet_getWalletToken"
              :params     [addresses]
-              :on-success [:wallet/store-wallet-token]
+              :on-success [:wallet/get-wallet-token-success]
              :on-error   #(log/info "failed to get wallet token "
                                     {:error  %
                                      :event  :wallet/get-wallet-token
                                      :params addresses})}]]]})))

-(defn- fix-chain-id-keys
-  [token]
-  (update token :balances-per-chain update-keys (comp utils.number/parse-int name)))
-
-(rf/reg-event-fx
- :wallet/store-wallet-token
- (fn [{:keys [db]} [raw-tokens-data]]
-   (let [tokens     (-> raw-tokens-data
-                        (update-keys name)
-                        (update-vals #(cske/transform-keys csk/->kebab-case %))
-                        (update-vals #(mapv fix-chain-id-keys %)))
-         add-tokens (fn [stored-accounts tokens-per-account]
-                      (reduce-kv (fn [accounts address tokens-data]
-                                   (if (accounts address)
-                                     (update accounts address assoc :tokens tokens-data)
-                                     accounts))
-                                 stored-accounts
-                                 tokens-per-account))]
-     {:db (-> db
-              (update-in [:wallet :accounts] add-tokens tokens)
-              (assoc-in [:wallet :ui :tokens-loading?] false))})))
+(rf/reg-event-fx :wallet/get-wallet-token-success
+ (fn [{:keys [db]} [tokens]]
+   {:db (assoc db
+               :wallet/tokens          tokens
+               :wallet/tokens-loading? false)}))

 (rf/defn scan-address-success
  {:events [:wallet/scan-address-success]}
@@ -144,8 +122,7 @@
              :on-success on-success
              :on-error   #(log/info "failed to derive address " %)}]]]})))

-(rf/reg-event-fx
- :wallet/add-account
+(rf/reg-event-fx :wallet/add-account
 (fn [{:keys [db]} [password {:keys [emoji account-name color]} {:keys [public-key address path]}]]
   (let [key-uid        (get-in db [:profile/profile :key-uid])
         sha3-pwd       (native-module/sha3 (security/safe-unmask-data password))
@@ -169,12 +146,11 @@
              :on-success [:wallet/get-accounts]
              :on-error   #(log/info "failed to create account " %)}]]]})))

-(rf/reg-event-fx
- :wallet/derive-address-and-add-account
+(rf/reg-event-fx :wallet/derive-address-and-add-account
 (fn [_ [password account-details]]
-   (let [on-success (fn [derived-address-details]
+   (let [on-success (fn [derived-adress-details]
                      (rf/dispatch [:wallet/add-account password account-details
-                                    (first derived-address-details)]))]
+                                    (first derived-adress-details)]))]
     {:fx [[:dispatch [:wallet/create-derived-addresses password account-details on-success]]]})))

 (rf/defn get-ethereum-chains
@@ -223,8 +199,7 @@

 (rf/reg-event-fx :wallet/clear-stored-collectibles clear-stored-collectibles)

-(rf/reg-event-fx
- :wallet/request-collectibles
+(rf/reg-event-fx :wallet/request-collectibles
 (fn [{:keys [db]} [{:keys [start-at-index new-request?]}]]
   (let [request-id          0
         collectibles-filter nil
@@ -8,6 +8,7 @@
    [status-im2.contexts.wallet.common.activity-tab.view :as activity]
    [status-im2.contexts.wallet.common.collectibles-tab.view :as collectibles]
    [status-im2.contexts.wallet.common.temp :as temp]
+    [status-im2.contexts.wallet.common.utils :as utils]
    [status-im2.contexts.wallet.home.style :as style]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -27,9 +28,9 @@
      :on-press            #(rf/dispatch [:navigate-to :add-address-to-watch])
      :add-divider?        true}]]])

-(defn- new-account-card-data
-  []
-  {:customization-color (rf/sub [:profile/customization-color])
+(defn- add-account-placeholder
+  [color]
+  {:customization-color color
   :on-press            #(rf/dispatch [:show-bottom-sheet {:content new-account}])
   :type                :add-account})

@@ -38,6 +39,21 @@
   {:id :collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}
   {:id :activity :label (i18n/label :t/activity) :accessibility-label :activity-tab}])

+(defn account-cards
+  [{:keys [accounts loading? balances profile-color]}]
+  (let [accounts-with-balances
+        (mapv
+         (fn [{:keys [color address] :as account}]
+           (assoc account
+                  :customization-color color
+                  :type                :empty
+                  :on-press            #(rf/dispatch [:wallet/navigate-to-account address])
+                  :loading?            loading?
+                  :balance             (utils/prettify-balance
+                                        (utils/get-balance-by-address balances address))))
+         accounts)]
+    (conj accounts-with-balances (add-account-placeholder profile-color))))
+
 (defn view
  []
  (rf/dispatch [:wallet/request-collectibles
@@ -46,18 +62,28 @@
  (let [top          (safe-area/get-top)
        selected-tab (reagent/atom (:id (first tabs-data)))]
    (fn []
-      (let [networks           (rf/sub [:wallet/network-details])
-            account-cards-data (rf/sub [:wallet/account-cards-data])
-            cards              (conj account-cards-data (new-account-card-data))]
-        [rn/view {:style {:margin-top top :flex 1}}
+      (let [accounts      (rf/sub [:wallet/accounts])
+            loading?      (rf/sub [:wallet/tokens-loading?])
+            balances      (rf/sub [:wallet/balances])
+            profile-color (rf/sub [:profile/customization-color])
+            networks      (rf/sub [:wallet/network-details])]
+        [rn/view
+         {:style {:margin-top top
+                  :flex       1}}
         [common.top-nav/view]
         [rn/view {:style style/overview-container}
          [quo/wallet-overview (temp/wallet-overview-state networks)]]
-         [quo/wallet-graph {:time-frame :empty}]
+         [rn/pressable
+          {:on-long-press #(rf/dispatch [:show-bottom-sheet
+                                         {:content temp/wallet-temporary-navigation}])}
+          [quo/wallet-graph {:time-frame :empty}]]
         [rn/flat-list
          {:style                             style/accounts-list
           :content-container-style           style/accounts-list-container
-           :data                              cards
+           :data                              (account-cards {:accounts      accounts
+                                                              :loading?      loading?
+                                                              :balances      balances
+                                                              :profile-color profile-color})
           :horizontal                        true
           :separator                         [rn/view {:style {:width 12}}]
           :render-fn                         quo/account-card
@@ -48,7 +48,7 @@
  (fn []
    (let [scanned-address       (rf/sub [:wallet/scanned-address])
          send-address          (rf/sub [:wallet/send-address])
-          valid-ens-or-address? (rf/sub [:wallet/valid-ens-or-address?])]
+          valid-ens-or-address? (boolean (rf/sub [:wallet/valid-ens-or-address?]))]
      [quo/address-input
       {:on-focus              #(reset! input-focused? true)
        :on-blur               #(reset! input-focused? false)
@@ -1,7 +1,5 @@
 (ns status-im2.core-spec
  (:require
-    [status-im2.common.floating-button-page.component-spec]
    [status-im2.contexts.chat.messages.content.audio.component-spec]
    [status-im2.contexts.communities.actions.community-options.component-spec]
-    [status-im2.contexts.wallet.add-address-to-watch.component-spec]
    [status-im2.contexts.wallet.create-account.edit-derivation-path.component-spec]))
@@ -1,4 +1,4 @@
-(ns status-im2.integration-test.chat-test
+(ns status-im2.integration-test.chat
  (:require
    [cljs.test :refer [deftest is]]
    [day8.re-frame.test :as rf-test]
@@ -16,7 +16,7 @@
  "0x0402905bed83f0bbf993cee8239012ccb1a8bc86907ead834c1e38476a0eda71414eed0e25f525f270592a2eebb01c9119a4ed6429ba114e51f5cb0a28dae1adfd")

 (deftest one-to-one-chat-test
-  (h/log-headline :one-to-one-chat-test)
+  (h/log-headline one-to-one-chat-test)
  (rf-test/run-test-async
   (h/with-app-initialized
    (h/with-account
@@ -1,4 +1,4 @@
-(ns status-im2.integration-test.community-test
+(ns status-im2.integration-test.community
  (:require [cljs.test :refer [deftest]]
            [day8.re-frame.test :as rf-test]
            [re-frame.core :as rf]
@@ -1,4 +1,4 @@
-(ns status-im2.integration-test.core-test
+(ns status-im2.integration-test.core
  (:require
    [cljs.test :refer [deftest]]
    [day8.re-frame.test :as rf-test]
@@ -8,14 +8,17 @@
    status-im.subs.root
    [status-im.utils.test :as utils.test]
    status-im2.events
+    status-im2.integration-test.chat
+    status-im2.integration-test.wallet
    status-im2.navigation.core
    status-im2.subs.root
    [test-helpers.integration :as h]))

+(utils.test/init!)
+
 (deftest initialize-app-test
  (h/log-headline :initialize-app-test)
  (rf-test/run-test-async
-   (utils.test/init!)
   (rf/dispatch [:app-started])
   (rf-test/wait-for
     ;; use initialize-view because it has the longest avg. time and
@@ -1,6 +1,6 @@
-(ns status-im2.integration-test.wallet-test
+(ns status-im2.integration-test.wallet
  (:require
-    [cljs.test :refer [is]]
+    [cljs.test :refer [deftest is]]
    [clojure.string :as string]
    [day8.re-frame.test :as rf-test]
    [re-frame.core :as rf]
@@ -12,9 +12,7 @@
    status-im2.subs.root
    [test-helpers.integration :as h]))

-;; Workaround to skip test. Switch to `deftest` when test is fixed.
-(defn create-wallet-account-test
-  []
+(deftest create-wallet-account-test
  (h/log-headline :create-wallet-account-test)
  (rf-test/run-test-async
   (h/with-app-initialized
@@ -26,9 +24,7 @@
       (h/logout)
       (rf-test/wait-for [::logout/logout-method]))))))

-;; Workaround to skip test. Switch to `deftest` when test is fixed.
-(defn back-up-seed-phrase-test
-  []
+(deftest back-up-seed-phrase-test
  (h/log-headline :back-up-seed-phrase-test)
  (rf-test/run-test-async
   (h/with-app-initialized
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrea Maria Piana	1e3b207c3b	test	2023-11-20 15:55:27 +00:00
John Ngei	f03671097b	enable biometric when user signs in with syncing (#17627 )	2023-11-17 15:23:36 +00:00
frank	1db63a9fa1	local pair: check netIPs if empty before find server cert	2023-11-17 11:26:54 +00:00
Lungu CristianandIbrkhalil	cd92b41214	Composer collapsing when editing canceled/done (#17785 ) * fix: composer height when entering and canceling edit * fix: blur the composer input when canceling edit * fix: focusing animation and composer height after blur * fix: input height when canceling edit while unfocused * ref: removed arbitrary keyboard check * fix: moved edit-mentions logic to use-edit to fix unresolved mention * fix: composer edit should put the cursor at the end * fix: (potentially) fixing the mention not resolved during edit * fix: emoji-kb handler changing the height when default kb appears * Fix text content when editing and reentering chat * prevent composer when focusing on opening chat with edit/reply * clean * Clauxx comments * Apply for reply * Lintil soup = yummy * refactor variable name * Extract the focusing logic from the data setting logic * Edge case * fix: composer mention key & edit re-enter issues * fix: reply cancel input blur and smooth reply focus --------- Co-authored-by: Ibrkhalil <vampirekid017@gmail.com>	2023-11-17 11:14:23 +00:00
Andrea Maria Piana	56f7206da7	Restore shards	2023-11-16 19:43:29 +00:00
Andrea Maria Piana	eb5de3506a	Revert changes in sharded keys	2023-11-16 19:11:20 +00:00
flexsurfer	22005f916e	[#17854 ] [IOS] The tutorial video animation keeps playing after openi… (#17915 ) (cherry picked from commit `7153e4da48`)	2023-11-16 12:36:13 +01:00
Flavio Fraschetti	ff50aacb3a	Hide channel list at token-gated communities overview (#17901 ) This commit hides the categorized channel list for token-gated communities overview.	2023-11-16 10:57:54 +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