Revert "revert fleet changes"

https://github.com/status-im/status-go/compare/53044060...53044060 This reverts commit 2cc531c46fc50367680bd189999ebc519d3fe818.
revert fleet changes
2024-02-27 11:09:11 +02:00 · 2024-02-27 11:09:10 +02:00
361 changed files with 9273 additions and 13324 deletions
@@ -26,7 +26,6 @@
                                                          malli.generator         malli.generator
                                                          malli.transform         malli.transform
                                                          malli.util              malli.util
-                                                          promesa.core            p
                                                          schema.core             schema
                                                          status-im.feature-flags ff
                                                          taoensso.timbre         log}}
@@ -1,9 +0,0 @@
-{:lint-as {promesa.core/->          clojure.core/->
-           promesa.core/->>         clojure.core/->>
-           promesa.core/as->        clojure.core/as->
-           promesa.core/let         clojure.core/let
-           promesa.core/plet        clojure.core/let
-           promesa.core/loop        clojure.core/loop
-           promesa.core/recur       clojure.core/recur
-           promesa.core/with-redefs clojure.core/with-redefs
-           promesa.core/doseq       clojure.core/doseq}}
@@ -34,4 +34,3 @@ STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 TEST_STATEOFUS=1
 FAST_CREATE_COMMUNITY_ENABLED=1
-FLAG_NEW_CONTACT_UI_ENABLED=0
@@ -22,37 +22,34 @@
  :multi-lhs-hang]

 :fn-map
- {"reg-sub"           :arg1-pair
-  "h/describe"        :arg1-body
-  "h/describe-skip"   :arg1-body
-  "h/describe-only"   :arg1-body
-  "h/test"            :arg1-body
-  "h/test-skip"       :arg1-body
-  "h/test-only"       :arg1-body
-  "test/async"        :arg1-body
-  "test/use-fixtures" :arg1-body
-  "global.describe"   :arg1-body
-  "global.test"       :arg1-body
-  "list-comp"         :binding
-  "defview"           :arg1-body
-  "letsubs"           :binding
-  "with-let"          "let"
-  "reg-event-fx"      :arg1-pair
-  "reg-fx"            :arg1-pair
-  "testing"           :arg1-body
-  "deftest-sub"       :arg1-body
-  "test-async"        :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?]]}]
-  "set!"              "reset!"
-  "assoc-when"        "assoc"
-  "assoc-some"        "assoc"
-  "conj-when"         "conj"
-  "conj-some"         "conj"}
+ {"reg-sub"         :arg1-pair
+  "h/describe"      :arg1-body
+  "h/describe-skip" :arg1-body
+  "h/describe-only" :arg1-body
+  "h/test"          :arg1-body
+  "h/test-skip"     :arg1-body
+  "h/test-only"     :arg1-body
+  "global.describe" :arg1-body
+  "global.test"     :arg1-body
+  "list-comp"       :binding
+  "defview"         :arg1-body
+  "letsubs"         :binding
+  "with-let"        "let"
+  "reg-event-fx"    :arg1-pair
+  "reg-fx"          :arg1-pair
+  "testing"         :arg1-body
+  "deftest-sub"     :arg1-body
+  "wait-for"        :arg1-body
+  "with-deps-check" :arg1-body
+  "schema/=>"       :arg1-body
+  "->"              [:noarg1-body
+                     {:list               {:constant-pair? false :force-nl? false}
+                      :next-inner-restore [[:list :constant-pair?]]}]
+  "set!"            "reset!"
+  "assoc-when"      "assoc"
+  "assoc-some"      "assoc"
+  "conj-when"       "conj"
+  "conj-some"       "conj"}

 :style-map
 {:no-comma {:map {:comma? false}}
@@ -331,14 +331,13 @@ shadow-server:##@ Start shadow-cljs in server mode for watching

 _test-clojure: export TARGET := clojure
 _test-clojure: export WATCH ?= false
-_test-clojure: status-go-library
 _test-clojure:
 ifeq ($(WATCH), true)
-	yarn node-pre-gyp rebuild && \
+	yarn install && \
 	yarn shadow-cljs compile mocks && \
 	nodemon --exec "yarn shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
 else
-	yarn node-pre-gyp rebuild && \
+	yarn install && \
 	yarn shadow-cljs compile mocks && \
 	yarn shadow-cljs compile test && \
 	node --require ./test-resources/override.js "$$SHADOW_OUTPUT_TO"
@@ -351,9 +350,8 @@ test: _test-clojure

 test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
 test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
-test-watch-for-repl: status-go-library
 test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connections
-	yarn node-pre-gyp rebuild
+	yarn install
 	rm -f target/test/test.js
 	yarn shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
@@ -361,7 +359,7 @@ test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connection
 		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"

 test-unit: export SHADOW_OUTPUT_TO := target/unit_test/test.js
-test-unit: export SHADOW_NS_REGEXP := ^(?!tests\.integration-test)(?!tests\.contract-test).*-test$$
+test-unit: export SHADOW_NS_REGEXP := ^(?!tests\.integration-test)(?!tests-im\.contract-test).*-test$$
 test-unit: ##@test Run unit tests
 test-unit: _test-clojure

@@ -1,9 +1,6 @@
 module.exports = {
-  presets: [
-    "@babel/preset-env"
-  //    'module:metro-react-native-babel-preset'
-  ],
-  /*plugins: ['react-native-reanimated/plugin', '@babel/plugin-transform-named-capturing-groups-regex'],
+  presets: ['module:metro-react-native-babel-preset'],
+  plugins: ['react-native-reanimated/plugin', '@babel/plugin-transform-named-capturing-groups-regex'],
  env: {
    test: {
      presets: [
@@ -18,5 +15,5 @@ module.exports = {
        ],
      ],
    },
-  },*/
+  },
 };
@@ -15,7 +15,7 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '20',
-      artifactNumToKeepStr: '1',
+      artifactNumToKeepStr: '10',
    ))
    /* Allows combined build to copy */
    copyArtifactPermission('/status-mobile/*')
@@ -13,7 +13,7 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '30',
-      artifactNumToKeepStr: '1',
+      artifactNumToKeepStr: '10',
    ))
  }

@@ -23,7 +23,6 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '30',
-      artifactNumToKeepStr: '1',
    ))
  }

@@ -23,7 +23,7 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '20',
-      artifactNumToKeepStr: '1',
+      artifactNumToKeepStr: '10',
    ))
    /* Allows combined build to copy */
    copyArtifactPermission('/status-mobile/*')
@@ -10,12 +10,12 @@ pipeline {
  options {
    timestamps()
    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 20, unit: 'MINUTES')
+    timeout(time: 15, unit: 'MINUTES')
    /* Limit builds retained */
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '20',
-      artifactNumToKeepStr: '1',
+      artifactNumToKeepStr: '10',
    ))
    /* Abort old PR builds. */
    disableConcurrentBuilds(
@@ -62,14 +62,6 @@ pipeline {
        }
      }
    }
-    stage('Contract Tests') {
-      steps {
-        sh """#!/bin/bash
-          set -eo pipefail
-          make test-contract 2>&1 | tee -a ${LOG_FILE}
-        """
-      }
-    }
    stage('Integration Tests') {
      steps {
        sh """#!/bin/bash
@@ -29,11 +29,6 @@ pipeline {

  options {
    disableConcurrentBuilds()
-    buildDiscarder(logRotator(
-      numToKeepStr: '10',
-      daysToKeepStr: '30',
-      artifactNumToKeepStr: '1',
-    ))
  }

  stages {
@@ -47,11 +47,6 @@ pipeline {
  options {
    disableConcurrentBuilds()
    timeout(time: 90, unit: 'MINUTES')
-    buildDiscarder(logRotator(
-      numToKeepStr: '10',
-      daysToKeepStr: '30',
-      artifactNumToKeepStr: '1',
-    ))
  }

  stages {
@@ -28,11 +28,6 @@ pipeline {

  options {
    disableConcurrentBuilds()
-    buildDiscarder(logRotator(
-      numToKeepStr: '10',
-      daysToKeepStr: '30',
-      artifactNumToKeepStr: '1',
-    ))
  }


@@ -34,7 +34,6 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '20',
      daysToKeepStr: '30',
-      artifactNumToKeepStr: '1',
    ))
  }

@@ -133,7 +133,7 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<true/>
 	<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
 	<array>
 		<string>A00000080400010101</string>
@@ -1888,36 +1888,6 @@ void _InitLogging(const FunctionCallbackInfo<Value>& args) {
    delete c;
 }

-void _RestoreAccountAndLogin(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-        Local<Context> context = isolate->GetCurrentContext();
-
-	if (args.Length() != 1) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for RestoreAccountAndLogin")));
-		return;
-	}
-
-	// Check the argument types
-
-	if (!args[0]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'RestoreAccountAndLogin'")));
-		return;
-	}
-
-	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
-	char *arg0 = *arg0Obj;
-
-	// Call exported Go function, which returns a C string
-	char *c = RestoreAccountAndLogin(arg0);
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-}
-

 void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountGenerateAndDeriveAddresses", _MultiAccountGenerateAndDeriveAddresses);
@@ -1975,7 +1945,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "connectionChange", _ConnectionChange);
 	NODE_SET_METHOD(exports, "pollSignal", _PollSignal);
 	NODE_SET_METHOD(exports, "initLogging", _InitLogging);
-	NODE_SET_METHOD(exports, "restoreAccountAndLogin", _RestoreAccountAndLogin);
 }

 NODE_MODULE(NODE_GYP_MODULE_NAME, init)
@@ -90,20 +90,20 @@
  },

  {
-    "path": "cider/cider-nrepl/0.31.0/cider-nrepl-0.31.0",
+    "path": "cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "1f28a4a834a7a46cf24def971b1a705a6795c73a",
-      "sha256": "0h4pyzy8rzzh567khvimw2cs8jr640kqxgaxvbfx1s5yfp56fka2"
+      "sha1": "5ae0efd9377a5e60c084bdaf4a2ce094f759ce23",
+      "sha256": "0drxf9nm23i1pcgrkwbcr09msq37csilzww38709add0hz8spjhq"
    }
  },

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

@@ -251,6 +251,15 @@
    }
  },

+  {
+    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
+      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
+    }
+  },
+
  {
    "path": "com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0",
    "host": "https://repo1.maven.org/maven2",
@@ -297,11 +306,11 @@
  },

  {
-    "path": "com/google/javascript/closure-compiler-unshaded/v20230802/closure-compiler-unshaded-v20230802",
+    "path": "com/google/javascript/closure-compiler-unshaded/v20230411/closure-compiler-unshaded-v20230411",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "0a2498a4d45bf5896042f31da0cd30c5e7b415af",
-      "sha256": "0jvgqq0gnvm4jw2zac4677ds05klvsjalszdzcq3nw8g7fjyjv2x"
+      "sha1": "2f5d7ab921f9cc07ffeb4e1c0f156f164c650eeb",
+      "sha256": "0gphdrrhr88bcqa1scndachvhbayh7m11zm9hcsmvzn9bw72pabw"
    }
  },

@@ -323,51 +332,6 @@
    }
  },

-  {
-    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
-      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
-    }
-  },
-
-  {
-    "path": "com/taoensso/encore/3.68.0/encore-3.68.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "b098b58e27a7cf9ab5e46aedbb5ababc12805170",
-      "sha256": "1i5bmm83y9wpgvl5h6ysjsw58qrqz4b4v5vqnsprq6f1pmakjfz2"
-    }
-  },
-
-  {
-    "path": "com/taoensso/timbre/6.3.1/timbre-6.3.1",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "e1b04be262f38bbd9af8f1193b6b3f2c6a37129d",
-      "sha256": "0p6rws5gpab5qldp739lyqvwdbak28vaxbjw2bg2slflkkahszc7"
-    }
-  },
-
-  {
-    "path": "com/taoensso/truss/1.11.0/truss-1.11.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "4784f43191d5839448b58128bb455d62616086fd",
-      "sha256": "16xqav4cv3cnfik2d8v3wn7zb2a97ybnrbp6v6nj8m1nmdhr16k7"
-    }
-  },
-
-  {
-    "path": "com/taoensso/tufte/2.6.3/tufte-2.6.3",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "8862c6113ca743ebdcfa17bf4779a21fc08a7c7e",
-      "sha256": "0i0wsv2g2hswgdik6zlgcs212clj1d7fvckxfcsmyfr0vvpc1dmd"
-    }
-  },
-
  {
    "path": "commons-codec/commons-codec/1.15/commons-codec-1.15",
    "host": "https://repo1.maven.org/maven2",
@@ -404,6 +368,42 @@
    }
  },

+  {
+    "path": "com/taoensso/encore/3.68.0/encore-3.68.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "b098b58e27a7cf9ab5e46aedbb5ababc12805170",
+      "sha256": "1i5bmm83y9wpgvl5h6ysjsw58qrqz4b4v5vqnsprq6f1pmakjfz2"
+    }
+  },
+
+  {
+    "path": "com/taoensso/timbre/6.3.1/timbre-6.3.1",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "e1b04be262f38bbd9af8f1193b6b3f2c6a37129d",
+      "sha256": "0p6rws5gpab5qldp739lyqvwdbak28vaxbjw2bg2slflkkahszc7"
+    }
+  },
+
+  {
+    "path": "com/taoensso/truss/1.11.0/truss-1.11.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "4784f43191d5839448b58128bb455d62616086fd",
+      "sha256": "16xqav4cv3cnfik2d8v3wn7zb2a97ybnrbp6v6nj8m1nmdhr16k7"
+    }
+  },
+
+  {
+    "path": "com/taoensso/tufte/2.6.3/tufte-2.6.3",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "8862c6113ca743ebdcfa17bf4779a21fc08a7c7e",
+      "sha256": "0i0wsv2g2hswgdik6zlgcs212clj1d7fvckxfcsmyfr0vvpc1dmd"
+    }
+  },
+
  {
    "path": "crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1",
    "host": "https://repo.clojars.org",
@@ -449,15 +449,6 @@
    }
  },

-  {
-    "path": "funcool/promesa/11.0.678/promesa-11.0.678",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "0ee1690ba74b2609c2d85b51edacad13046a18e2",
-      "sha256": "1wif8nwdbpchwg56fz47ymjnflmva0fzy0bw1s6bacnac472pmza"
-    }
-  },
-
  {
    "path": "hiccup/hiccup/1.0.5/hiccup-1.0.5",
    "host": "https://repo.clojars.org",
@@ -513,11 +504,11 @@
  },

  {
-    "path": "io/undertow/undertow-core/2.3.10.Final/undertow-core-2.3.10.Final",
+    "path": "io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "96d1d5ca6406a75a285b95ea8f4b39e0fb2d707e",
-      "sha256": "1s1m5hfhmfr7jsp4bn4c6fhdbgiz72mz0a96494nyhfa0b4lql8l"
+      "sha1": "78650b4029dd9280c4769d9425b5559f12cb83bf",
+      "sha256": "1brpkd2l98byf76jga6hj5drv5sj2d93lxlq2xz0rxpqyqas1xm4"
    }
  },

@@ -603,11 +594,11 @@
  },

  {
-    "path": "nrepl/nrepl/0.9.0/nrepl-0.9.0",
+    "path": "nrepl/nrepl/1.0.0/nrepl-1.0.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "49beada131959f08f9a20899affbd1b10c03a668",
-      "sha256": "1phak0479s27ffw9wzz7pi8cqqs6ipsm15dhgw9szxxcfhx529qa"
+      "sha1": "f47774c43493efdc879d36b95ebd67ea0d9c890a",
+      "sha256": "1fx5ssmixgqmklliw0ng8fjz41kkhys56x8dbwv9yqrfzws9f2x3"
    }
  },

@@ -620,15 +611,6 @@
    }
  },

-  {
-    "path": "org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "ea0a0475fb6dfcdcf48b30410fd9d4f5c80df07e",
-      "sha256": "0mnj5v660qvmrsi1m6z0dnykw3df8f1213byzp45l2wqgbgk1dfs"
-    }
-  },
-
  {
    "path": "org/apache/ant/ant/1.10.11/ant-1.10.11",
    "host": "https://repo1.maven.org/maven2",
@@ -639,11 +621,11 @@
  },

  {
-    "path": "org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2",
-    "host": "https://repo.clojars.org",
+    "path": "org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11",
+    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "45a05ece33609c3ad26a6ea4e05130560da82306",
-      "sha256": "0pwwqq11rcknpcwbwsbw7pgbgnd7hqiawn0r8yvk14qfwa6p7z46"
+      "sha1": "ea0a0475fb6dfcdcf48b30410fd9d4f5c80df07e",
+      "sha256": "0mnj5v660qvmrsi1m6z0dnykw3df8f1213byzp45l2wqgbgk1dfs"
    }
  },

@@ -656,6 +638,15 @@
    }
  },

+  {
+    "path": "org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "45a05ece33609c3ad26a6ea4e05130560da82306",
+      "sha256": "0pwwqq11rcknpcwbwsbw7pgbgnd7hqiawn0r8yvk14qfwa6p7z46"
+    }
+  },
+
  {
    "path": "org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0",
    "host": "https://repo1.maven.org/maven2",
@@ -746,15 +737,6 @@
    }
  },

-  {
-    "path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "f5ea82eb1309b81ada6a14371bb848323c65e38b",
-      "sha256": "0jk9v4bfrxvz6wq1s86msry2mf47nwcjfplnn41yabqc44g82hva"
-    }
-  },
-
  {
    "path": "org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541",
    "host": "https://repo1.maven.org/maven2",
@@ -764,6 +746,15 @@
    }
  },

+  {
+    "path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f5ea82eb1309b81ada6a14371bb848323c65e38b",
+      "sha256": "0jk9v4bfrxvz6wq1s86msry2mf47nwcjfplnn41yabqc44g82hva"
+    }
+  },
+
  {
    "path": "org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0",
    "host": "https://repo1.maven.org/maven2",
@@ -791,15 +782,6 @@
    }
  },

-  {
-    "path": "org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "449691b55d7d526258ce02c69b4699f2897c494d",
-      "sha256": "0phfs1z1scvdi00348zjh223xncmgrkmlrnbca4dh7lk701gy34i"
-    }
-  },
-
  {
    "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
    "host": "https://repo1.maven.org/maven2",
@@ -809,6 +791,15 @@
    }
  },

+  {
+    "path": "org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "449691b55d7d526258ce02c69b4699f2897c494d",
+      "sha256": "0phfs1z1scvdi00348zjh223xncmgrkmlrnbca4dh7lk701gy34i"
+    }
+  },
+
  {
    "path": "org/clojure/tools.cli/1.0.206/tools.cli-1.0.206",
    "host": "https://repo1.maven.org/maven2",
@@ -837,11 +828,11 @@
  },

  {
-    "path": "org/clojure/tools.reader/1.3.7/tools.reader-1.3.7",
+    "path": "org/clojure/tools.reader/1.3.6/tools.reader-1.3.6",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "c60dfd3d79cbc5ec6264ba45c14b8d4c9b6708b2",
-      "sha256": "1mr0qx3gw1myfls07vrx3arwsi5n95b2lwk74ijpj0z3lzpzlj7m"
+      "sha1": "927809dcb44fa726e4969d993e3e733636d95ebb",
+      "sha256": "1q5q7fmshybvp55f6qys8i5sbzfaix5v9f9b55dkbhv55hgv7l8i"
    }
  },

@@ -855,38 +846,38 @@
  },

  {
-    "path": "org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final",
+    "path": "org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "c4bd7e12a745c0e7f6cf98c45cdcdf482fd827ea",
-      "sha256": "0jdcziqbdzmah981zv3q88k2zrnclr2h1k3h3vjn002m9p54qchb"
+      "sha1": "40fd4d696c55793e996d1ff3c475833f836c2498",
+      "sha256": "1f7f4kjn3v6vibhgsr3k8hl0r2xq0c2rbcl82dx0bqg5jdyqgzlf"
    }
  },

  {
-    "path": "org/jboss/threads/jboss-threads/3.5.0.Final/jboss-threads-3.5.0.Final",
+    "path": "org/jboss/threads/jboss-threads/3.1.0.Final/jboss-threads-3.1.0.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "dd23d4788b3eafe9597ef3fe028e46ceb293ba8d",
-      "sha256": "1cchp54dw1578my27siim3h5jbf240aq8q6xd3z2b1ajgxxbcl71"
+      "sha1": "9b260c0302f637a84a52d3d118214a3c59217615",
+      "sha256": "0yc0p71y7yjhqjhkvqqi9xqgljavp3aslnik2k7dppbxnkrnlff9"
    }
  },

  {
-    "path": "org/jboss/xnio/xnio-api/3.8.8.Final/xnio-api-3.8.8.Final",
+    "path": "org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "1ba9c8b9a8dea1c6cd656155943e6d4c2c631fa7",
-      "sha256": "0wvqdcbardi55l77aw5404qgw70384hw155xvc66shn7l6z8h6bh"
+      "sha1": "e2c29acf42ac6f42c34f0b74ba089e3f3d1b2394",
+      "sha256": "041qnvb74bkgmfxyd23vdl26il55cmfbhi6a4bm3fcmyrpapjfjl"
    }
  },

  {
-    "path": "org/jboss/xnio/xnio-nio/3.8.8.Final/xnio-nio-3.8.8.Final",
+    "path": "org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "a5d2faf8d02e0a0bb9e9eabca8e38173cb640331",
-      "sha256": "0pxw2iv1q1yzk39knc650rg4vflsyjzhf07mwm2s5aqn5h82sk3i"
+      "sha1": "90c57dcf7f8c846b4da331d0e6e048c39842c92a",
+      "sha256": "1zndnb5648wqw23gj80zjqk3yd8gq6grqhz9n4zrcqixx1z586jf"
    }
  },

@@ -918,20 +909,11 @@
  },

  {
-    "path": "org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9",
+    "path": "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "7cf2726fdcfbc8610f9a71fb3ed639871f315340",
-      "sha256": "0v1b7iydpnh2rvyzqvqbqm19vr2qva8icq84690bppnpr06r6608"
-    }
-  },
-
-  {
-    "path": "org/slf4j/slf4j-nop/2.0.9/slf4j-nop-2.0.9",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "fa0627049304bf501bf6a0e4d1416bcaec9a72a9",
-      "sha256": "10vdg9qkailjbzmf5mfnv328675swmnf1x3g9v7ymhxs29xkc4jn"
+      "sha1": "6c62681a2f655b49963a5983b8b0950a6120ae14",
+      "sha256": "1h512ry8g0nriazg3dqzs6s96502a77drw8vq26nfya97rg5gvyk"
    }
  },

@@ -945,11 +927,11 @@
  },

  {
-    "path": "org/wildfly/common/wildfly-common/1.5.4.Final/wildfly-common-1.5.4.Final",
+    "path": "org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "735ceee5616d5143bac1bc740e444697073c002f",
-      "sha256": "0sp48y3q7bmp3bjb7a6fpz8gb7ssizvxlw5wdv2xwa6mifpkrnlz"
+      "sha1": "8eba40cfe86bcfcc223551e75201e6e7574c7c36",
+      "sha256": "17rkkm9dqbxdzpamwl9jr8z285awsj6hzpavzmc87wcz9469hp5b"
    }
  },

@@ -962,6 +944,15 @@
    }
  },

+  {
+    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
+      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+    }
+  },
+
  {
    "path": "re-com/re-com/2.8.0/re-com-2.8.0",
    "host": "https://repo.clojars.org",
@@ -971,6 +962,15 @@
    }
  },

+  {
+    "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207",
+      "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i"
+    }
+  },
+
  {
    "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
    "host": "https://repo.clojars.org",
@@ -998,24 +998,6 @@
    }
  },

-  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
-    }
-  },
-
-  {
-    "path": "refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "f949af92dd1d6fef59d7447bd0cb62118e34eca1",
-      "sha256": "0dml9yvjmji6xk2sk3cdmkvvnh13rw29szxxl363hap8yg28xcs1"
-    }
-  },
-
  {
    "path": "ring-cors/ring-cors/0.1.8/ring-cors-0.1.8",
    "host": "https://repo.clojars.org",
@@ -1053,11 +1035,11 @@
  },

  {
-    "path": "thheller/shadow-cljs/2.26.2/shadow-cljs-2.26.2-aot",
+    "path": "thheller/shadow-cljs/2.25.0/shadow-cljs-2.25.0-aot",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "ab6b31649cb03e352369698781207db4f6da6d5f",
-      "sha256": "0mh28nykpillkym7hvplrr7vy5hn6a2ymafyf4yfl5y2kfx4yq42"
+      "sha1": "013921db91ce4a3616aec9c72c1832a014a0fece",
+      "sha256": "0ks380z7h8i2ylirvjgmlicq9jjpz9w71gjv521h4xs5fb273cl0"
    }
  },

@@ -1071,11 +1053,11 @@
  },

  {
-    "path": "thheller/shadow-undertow/0.3.3/shadow-undertow-0.3.3",
+    "path": "thheller/shadow-undertow/0.3.1/shadow-undertow-0.3.1",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "ba377c3b70fd942b3ca7e38f055412a441626711",
-      "sha256": "10w2slj4znm93j0qq3ldj9hj0i7a50vbnmn6kv8i77fakikdjc48"
+      "sha1": "9be444bea4037bb80b451cc52a8e80359c4c45be",
+      "sha256": "174s2rdxvp7d4jg9kvzjadps42bdsbi05rs2pjy5i0ssq9n23zwa"
    }
  },

@@ -8,8 +8,8 @@ borkdude/edamame/1.3.23/edamame-1.3.23.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.31.0/cider-nrepl-0.31.0.jar
-cider/piggieback/0.5.2/piggieback-0.5.2.jar
+cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
+cider/piggieback/0.4.1/piggieback-0.4.1.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
@@ -26,36 +26,35 @@ com/github/javaparser/javaparser-core/3.25.3/javaparser-core-3.25.3.jar
 com/google/auto/value/auto-value-annotations/1.6/auto-value-annotations-1.6.jar
 com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 com/google/code/gson/gson/2.9.1/gson-2.9.1.jar
+com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
 com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar
 com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
 com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar
 com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
-com/google/javascript/closure-compiler-unshaded/v20230802/closure-compiler-unshaded-v20230802.jar
+com/google/javascript/closure-compiler-unshaded/v20230411/closure-compiler-unshaded-v20230411.jar
 com/google/protobuf/protobuf-java/3.21.12/protobuf-java-3.21.12.jar
 com/google/re2j/re2j/1.3/re2j-1.3.jar
-com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
-com/taoensso/encore/3.68.0/encore-3.68.0.jar
-com/taoensso/timbre/6.3.1/timbre-6.3.1.jar
-com/taoensso/truss/1.11.0/truss-1.11.0.jar
-com/taoensso/tufte/2.6.3/tufte-2.6.3.jar
 commons-codec/commons-codec/1.15/commons-codec-1.15.jar
 commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
 commons-io/commons-io/2.11.0/commons-io-2.11.0.jar
 compojure/compojure/1.5.2/compojure-1.5.2.jar
+com/taoensso/encore/3.68.0/encore-3.68.0.jar
+com/taoensso/timbre/6.3.1/timbre-6.3.1.jar
+com/taoensso/truss/1.11.0/truss-1.11.0.jar
+com/taoensso/tufte/2.6.3/tufte-2.6.3.jar
 crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1.jar
 crypto-random/crypto-random/1.2.1/crypto-random-1.2.1.jar
 day8/re-frame/test/0.1.5/test-0.1.5.jar
 expound/expound/0.9.0/expound-0.9.0.jar
 fipp/fipp/0.6.26/fipp-0.6.26.jar
-funcool/promesa/11.0.678/promesa-11.0.678.jar
 hiccup/hiccup/1.0.5/hiccup-1.0.5.jar
 http-kit/http-kit/2.2.0/http-kit-2.2.0.jar
 instaparse/instaparse/1.4.0/instaparse-1.4.0.jar
 io/aviso/pretty/1.4.4/pretty-1.4.4.jar
 io/methvin/directory-watcher/0.17.1/directory-watcher-0.17.1.jar
 io/replikativ/datalog-parser/0.2.25/datalog-parser-0.2.25.jar
-io/undertow/undertow-core/2.3.10.Final/undertow-core-2.3.10.Final.jar
+io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final.jar
 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
@@ -65,12 +64,12 @@ 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
-nrepl/nrepl/0.9.0/nrepl-0.9.0.jar
+nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
 nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.jar
-org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
 org/apache/ant/ant/1.10.11/ant-1.10.11.jar
-org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2.jar
+org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
 org/babashka/sci/0.7.38/sci-0.7.38.jar
+org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2.jar
 org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
 org/clojure/clojure/1.11.1/clojure-1.11.1.jar
 org/clojure/clojurescript/1.11.60/clojurescript-1.11.60.jar
@@ -81,42 +80,41 @@ org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2.jar
 org/clojure/core.specs.alpha/0.2.62/core.specs.alpha-0.2.62.jar
 org/clojure/data.json/2.4.0/data.json-2.4.0.jar
 org/clojure/data.priority-map/1.1.0/data.priority-map-1.1.0.jar
-org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
 org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
+org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
 org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0.jar
 org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.jar
 org/clojure/test.check/1.1.1/test.check-1.1.1.jar
-org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.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
 org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
-org/clojure/tools.reader/1.3.7/tools.reader-1.3.7.jar
+org/clojure/tools.reader/1.3.6/tools.reader-1.3.6.jar
 org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar
-org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar
-org/jboss/threads/jboss-threads/3.5.0.Final/jboss-threads-3.5.0.Final.jar
-org/jboss/xnio/xnio-api/3.8.8.Final/xnio-api-3.8.8.Final.jar
-org/jboss/xnio/xnio-nio/3.8.8.Final/xnio-nio-3.8.8.Final.jar
+org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar
+org/jboss/threads/jboss-threads/3.1.0.Final/jboss-threads-3.1.0.Final.jar
+org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final.jar
+org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final.jar
 org/jspecify/jspecify/0.2.0/jspecify-0.2.0.jar
 org/msgpack/msgpack/0.6.12/msgpack-0.6.12.jar
 org/ow2/asm/asm/9.4/asm-9.4.jar
-org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar
-org/slf4j/slf4j-nop/2.0.9/slf4j-nop-2.0.9.jar
+org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar
 org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar
-org/wildfly/common/wildfly-common/1.5.4.Final/wildfly-common-1.5.4.Final.jar
+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
 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
-reagent/reagent/1.2.0/reagent-1.2.0.jar
-refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.2.0/ring-codec-1.2.0.jar
 ring/ring-core/1.9.6/ring-core-1.9.6.jar
 thheller/shadow-client/1.3.3/shadow-client-1.3.3.jar
-thheller/shadow-cljs/2.26.2/shadow-cljs-2.26.2-aot.jar
+thheller/shadow-cljs/2.25.0/shadow-cljs-2.25.0-aot.jar
 thheller/shadow-cljsjs/0.0.22/shadow-cljsjs-0.0.22.jar
-thheller/shadow-undertow/0.3.3/shadow-undertow-0.3.3.jar
+thheller/shadow-undertow/0.3.1/shadow-undertow-0.3.1.jar
 thheller/shadow-util/0.7.0/shadow-util-0.7.0.jar
 tigris/tigris/0.1.2/tigris-0.1.2.jar
@@ -53,14 +53,6 @@ copyNodeModules() {

 # Find files that were modified and should cause a re-copying of node modules.
 # Some files are generated/modified by build processes and should be ignored.
-#
-# react-native/ReactCommon/react/renderer/components/rncore/*
-# generated at runtime by react-native
-# related code https://github.com/facebook/react-native/blob/v0.72.5/packages/react-native/ReactCommon/React-rncore.podspec#L19
-#
-# react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m
-# generated at runtime by react-native-config
-# related code https://github.com/lugg/react-native-config/blob/v1.5.0/react-native-config.podspec#L52
 findFilesNewerThan() {
  local sentinel="${1}"
  local dir="${2}"
@@ -69,8 +61,6 @@ findFilesNewerThan() {
      -not -ipath "*/*android/build/*" -prune \
      -not -ipath "*/xcuserdata/*" -prune \
      -not -ipath "*/scripts/.packager.env" \
-      -not -path "*/node_modules/react-native/ReactCommon/react/renderer/components/rncore/*" \
-      -not -path "*/node_modules/react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m" \
      -print
 }

@@ -78,7 +78,6 @@
    "@babel/helper-builder-react-jsx": "^7.20.0",
    "@babel/plugin-transform-block-scoping": "^7.20.0",
    "@babel/preset-env": "^7.20.0",
-    "@babel/preset-es2015": "^7.0.0-beta.53",
    "@babel/preset-react": "^7.18.6",
    "@babel/register": "7.0.0",
    "@jest/globals": "^25.1.0",
@@ -10,7 +10,6 @@
                [com.cognitect/transit-cljs "0.8.280"]
                [camel-snake-kebab "0.4.3"]
                [metosin/malli "0.13.0"]
-                [funcool/promesa "11.0.678"]

                ;; Dev dependencies
                [refactor-nrepl "3.9.1"]
@@ -46,7 +45,6 @@
   ;; To match the folder created by Nix build of JSBundle.
   :output-dir "result"
   :init-fn status-im.core/init
-   :build-hooks [(status-im.setup.build-hooks.worklets/transform-output)]
   ;; When false, the Shadow-CLJS watcher won't automatically refresh
   ;; the target files (a.k.a hot reload). When false, you can manually
   ;; reload by calling `shadow.cljs.devtools.api/watch-compile-all!`.
@@ -3,6 +3,7 @@
    ["eth-phishing-detect" :as eth-phishing-detect]
    [clojure.string :as string]
    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
+    [legacy.status-im.browser.eip3085 :as eip3085]
    [legacy.status-im.browser.eip3326 :as eip3326]
    [legacy.status-im.browser.permissions :as browser.permissions]
    [legacy.status-im.browser.webview-ref :as webview-ref]
@@ -442,6 +443,9 @@
        (= method "wallet_switchEthereumChain")
        (eip3326/handle-switch-ethereum-chain cofx dapp-name id message-id (first params))

+        (= method "wallet_addEthereumChain")
+        (eip3085/handle-add-ethereum-chain cofx dapp-name id message-id (first params))
+
        :else
        {:browser/call-rpc [payload
                            #(re-frame/dispatch [:browser.callback/call-rpc
@@ -2,6 +2,10 @@
 ;(`wallet_addEthereumChain`)
 (ns legacy.status-im.browser.eip3085
  (:require
+    [clojure.string :as string]
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.screens.browser.eip3085.sheet :as sheet]
+    [legacy.status-im.utils.random :as random]
    [re-frame.core :as re-frame]
    [status-im.constants :as constants]
    [taoensso.timbre :as log]
@@ -36,3 +40,37 @@
                                        :message "User rejected the request."}}
   :dispatch               [:bottom-sheet/hide-old]})

+(rf/defn handle-add-ethereum-chain
+  {:events [:eip3085/handle-add-ethereum-chain]}
+  [{{:networks/keys [networks] :as db} :db :as cofx}
+   dapp-name id message-id
+   {:keys [chainId blockExplorerUrls chainName iconUrls nativeCurrency rpcUrls] :as params}]
+  (let [manage {:name       {:value chainName}
+                :symbol     {:value (:symbol nativeCurrency)}
+                :url        {:value (first rpcUrls)}
+                :network-id {:value chainId}
+                :chain      {:value :custom}}]
+    (if (network/valid-manage? manage)
+      (let [{:keys [name url chain network-id symbol]} manage
+            random-id                                  (string/replace (random/id) "-" "")
+            network                                    (network/new-network random-id
+                                                                            (:value name)
+                                                                            (:value symbol)
+                                                                            (:value url)
+                                                                            (:value chain)
+                                                                            (:value network-id))
+            new-networks                               (assoc networks random-id network)
+            params                                     (assoc params
+                                                              :new-networks new-networks
+                                                              :id           id
+                                                              :new-network  network)]
+        (if (network/chain-id-available? networks network)
+          {:dispatch [:bottom-sheet/show-sheet-old
+                      {:content (fn []
+                                  [sheet/permissions-panel dapp-name message-id params])}]}
+          (send-success-call-to-bridge cofx id message-id)))
+      {:browser/send-to-bridge {:type      constants/web3-send-async-callback
+                                :messageId message-id
+                                :error     {:code    -32602
+                                            :message "invalid network parameters"}}})))
+
@@ -45,12 +45,12 @@
    (query-fn (comp participant-set :public-key) (vals all-contacts))))

 (defn get-all-contacts-in-group-chat
-  [members admins contacts {:keys [public-key preferred-name name display-name] :as current-account}]
+  [members admins contacts {:keys [public-key preferred-name name] :as current-account}]
  (let [current-contact (some->
                          current-account
-                          (select-keys [:name :preferred-name :public-key :images :compressed-key])
+                          (select-keys [:name :preferred-name :public-key :images])
                          (set/rename-keys {:name :alias :preferred-name :name})
-                          (assoc :primary-name (or display-name preferred-name name)))
+                          (assoc :primary-name (or preferred-name name)))
        all-contacts    (cond-> contacts
                          current-contact
                          (assoc public-key current-contact))]
@@ -29,39 +29,37 @@

  (testing "transforms messages from RPC response"
    (is
-     (= {:last-message  {:quoted-message       nil
-                         :outgoing-status      nil
-                         :command-parameters   nil
-                         :link-previews        []
-                         :status-link-previews []
-                         :content              {:sticker     nil
-                                                :rtl?        nil
-                                                :ens-name    nil
-                                                :parsed-text nil
-                                                :response-to nil
-                                                :chat-id     nil
-                                                :image       nil
-                                                :line-count  nil
-                                                :links       nil
-                                                :text        nil}
-                         :outgoing             false}
+     (= {:last-message  {:quoted-message     nil
+                         :outgoing-status    nil
+                         :command-parameters nil
+                         :link-previews      []
+                         :content            {:sticker     nil
+                                              :rtl?        nil
+                                              :ens-name    nil
+                                              :parsed-text nil
+                                              :response-to nil
+                                              :chat-id     nil
+                                              :image       nil
+                                              :line-count  nil
+                                              :links       nil
+                                              :text        nil}
+                         :outgoing           false}
         :message       nil
-         :reply-message {:quoted-message       nil
-                         :outgoing-status      nil
-                         :command-parameters   nil
-                         :link-previews        []
-                         :status-link-previews []
-                         :content              {:sticker     nil
-                                                :rtl?        nil
-                                                :ens-name    nil
-                                                :parsed-text nil
-                                                :response-to nil
-                                                :chat-id     nil
-                                                :image       nil
-                                                :line-count  nil
-                                                :links       nil
-                                                :text        nil}
-                         :outgoing             false}}
+         :reply-message {:quoted-message     nil
+                         :outgoing-status    nil
+                         :command-parameters nil
+                         :link-previews      []
+                         :content            {:sticker     nil
+                                              :rtl?        nil
+                                              :ens-name    nil
+                                              :parsed-text nil
+                                              :response-to nil
+                                              :chat-id     nil
+                                              :image       nil
+                                              :line-count  nil
+                                              :links       nil
+                                              :text        nil}
+                         :outgoing           false}}
        (-> raw-notification
            store/<-rpc
            (select-keys [:last-message :message :reply-message])))))
@@ -4,6 +4,13 @@
    [clojure.walk :as walk]
    [status-im.constants :as constants]))

+(defn rpc->channel-permissions
+  [rpc-channels-permissions]
+  (update-vals rpc-channels-permissions
+               (fn [{:keys [viewAndPostPermissions viewOnlyPermissions]}]
+                 {:view-only     (set/rename-keys viewOnlyPermissions {:satisfied :satisfied?})
+                  :view-and-post (set/rename-keys viewAndPostPermissions {:satisfied :satisfied?})})))
+
 (defn <-revealed-accounts-rpc
  [accounts]
  (mapv
@@ -27,9 +34,8 @@
               (assoc acc
                      (name k)
                      (-> v
-                          (assoc :token-gated? (:tokenGated v)
-                                 :can-post?    (:canPost v))
-                          (dissoc :canPost :tokenGated)
+                          (assoc :can-post? (:canPost v))
+                          (dissoc :canPost)
                          (update :members walk/stringify-keys))))
             {}
             chats))
@@ -0,0 +1,23 @@
+(ns legacy.status-im.data-store.communities-test
+  (:require
+    [cljs.test :refer [deftest is]]
+    [legacy.status-im.data-store.communities :as sut]))
+
+(def permissions
+  {"community-id-chat-1"
+   {:viewOnlyPermissions    {:satisfied   false
+                             :permissions {:token-permission-id-01 {:criteria [false]}}}
+    :viewAndPostPermissions {:satisfied true :permissions {}}}
+   "community-id-chat-2"
+   {:viewOnlyPermissions    {:satisfied true :permissions {}}
+    :viewAndPostPermissions {:satisfied true :permissions {}}}})
+
+(deftest rpc->channel-permissions-test
+  (is (= {"community-id-chat-1"
+          {:view-only     {:satisfied?  false
+                           :permissions {:token-permission-id-01 {:criteria [false]}}}
+           :view-and-post {:satisfied? true :permissions {}}}
+          "community-id-chat-2"
+          {:view-only     {:satisfied? true :permissions {}}
+           :view-and-post {:satisfied? true :permissions {}}}}
+         (sut/rpc->channel-permissions permissions))))
@@ -16,41 +16,13 @@
                      :community-id      :communityId
                      :clock-value       :clock})))

-(defn- <-status-link-previews-rpc
-  [preview]
-  (-> preview
-      (update :community
-              set/rename-keys
-              {:communityId        :community-id
-               :displayName        :display-name
-               :membersCount       :members-count
-               :activeMembersCount :active-members-count})
-      (update-in [:community :banner] set/rename-keys {:dataUri :data-uri})
-      (update-in [:community :icon] set/rename-keys {:dataUri :data-uri})))
-
-(defn ->status-link-previews-rpc
-  [preview]
-  (-> preview
-      (update :community
-              set/rename-keys
-              {:community-id         :communityId
-               :display-name         :displayName
-               :members-count        :membersCount
-               :active-members-count :activeMembersCount})
-      (update-in [:community :banner] set/rename-keys {:data-uri :dataUri})
-      (update-in [:community :icon] set/rename-keys {:data-uri :dataUri})))
-
 (defn- <-link-preview-rpc
  [preview]
-  (-> preview
-      (update :thumbnail set/rename-keys {:dataUri :data-uri})
-      (update :favicon set/rename-keys {:dataUri :data-uri})))
+  (update preview :thumbnail set/rename-keys {:dataUri :data-uri}))

 (defn ->link-preview-rpc
  [preview]
-  (-> preview
-      (update :thumbnail set/rename-keys {:data-uri :dataUri})
-      (update :favicon set/rename-keys {:data-uri :dataUri})))
+  (update preview :thumbnail set/rename-keys {:data-uri :dataUri}))

 (defn <-rpc
  [message]
@@ -81,10 +53,8 @@
        :new                      :new?
        :albumImagesCount         :album-images-count
        :displayName              :display-name
-        :linkPreviews             :link-previews
-        :statusLinkPreviews       :status-link-previews})
+        :linkPreviews             :link-previews})
      (update :link-previews #(map <-link-preview-rpc %))
-      (update :status-link-previews #(map <-status-link-previews-rpc %))
      (update :quoted-message
              set/rename-keys
              {:parsedText       :parsed-text
@@ -37,19 +37,7 @@
                    :compressed-key             "c"
                    :timestamp                  3
                    :link-previews              [{:thumbnail {:url      "http://localhost"
-                                                              :data-uri "data:image/png"}
-                                                  :favicon   nil}]
-                    :status-link-previews       [{:url       "http://localhost"
-                                                  :community {:community-id "0x01"
-                                                              :display-name "Test Comm"
-                                                              :members-count 12
-                                                              :active-members-count 12
-                                                              :banner
-                                                              {:data-uri
-                                                               "data:image/png"}
-                                                              :icon
-                                                              {:data-uri
-                                                               "data:image/png"}}}]}
+                                                              :data-uri "data:image/png"}}]}
          message  {:id                       message-id
                    :whisperTimestamp         1
                    :parsedText               "parsed-text"
@@ -73,17 +61,5 @@
                    :timestamp                3
                    :outgoingStatus           "sending"
                    :linkPreviews             [{:thumbnail {:url     "http://localhost"
-                                                            :dataUri "data:image/png"}
-                                                :favicon   nil}]
-                    :statusLinkPreviews       [{:url       "http://localhost"
-                                                :community {:communityId "0x01"
-                                                            :displayName "Test Comm"
-                                                            :membersCount 12
-                                                            :activeMembersCount 12
-                                                            :banner
-                                                            {:dataUri
-                                                             "data:image/png"}
-                                                            :icon
-                                                            {:dataUri
-                                                             "data:image/png"}}}]}]
+                                                            :dataUri "data:image/png"}}]}]
      (is (= expected (m/<-rpc message))))))
@@ -37,6 +37,7 @@
    [react-native.core :as rn]
    [react-native.permissions :as permissions]
    [react-native.platform :as platform]
+    [status-im.common.biometric.events :as biometric]
    status-im.common.serialization
    status-im.common.standard-authentication.events
    [status-im.common.theme.core :as theme]
@@ -119,7 +120,7 @@
      :content             (i18n/label :t/biometric-auth-confirm-message)
      :confirm-button-text (i18n/label :t/biometric-auth-confirm-try-again)
      :cancel-button-text  (i18n/label :t/biometric-auth-confirm-logout)
-      :on-accept           #(rf/dispatch [:biometric/authenticate {:on-fail on-biometric-auth-fail}])
+      :on-accept           #(biometric/authenticate nil {:on-fail on-biometric-auth-fail})
      :on-cancel           #(re-frame/dispatch [:multiaccounts.logout.ui/logout-confirmed])})))

 (rf/defn on-return-from-background
@@ -141,7 +142,7 @@
              #(when-let [chat-id (:current-chat-id db)]
                 {:dispatch [:chat/mark-all-as-read chat-id]})
              #(when requires-bio-auth
-                 {:dispatch [:biometric/authenticate {:on-fail on-biometric-auth-fail}]}))))
+                 (biometric/authenticate % {:on-fail on-biometric-auth-fail})))))

 (rf/defn on-going-in-background
  [{:keys [db now]}]
@@ -13,14 +13,15 @@
   (native-module/logout)))

 (rf/defn initialize-app-db
-  [{{:keys         [keycard initials-avatar-font-file biometrics]
-     :network/keys [type]}
+  [{{:keys           [keycard initials-avatar-font-file]
+     :biometric/keys [supported-type]
+     :network/keys   [type]}
    :db}]
  {:db (assoc db/app-db
              :network/type              type
              :initials-avatar-font-file initials-avatar-font-file
              :keycard                   (dissoc keycard :secrets :pin :application-info)
-              :biometrics                biometrics
+              :biometric/supported-type  supported-type
              :syncing                   nil)})

 (rf/defn logout-method
@@ -28,7 +29,8 @@
  [{:keys [db] :as cofx} {:keys [auth-method logout?]}]
  (let [key-uid (get-in db [:profile/profile :key-uid])]
    (rf/merge cofx
-              {:effects.shell/reset-state              nil
+              {:set-root                               :progress
+               :effects.shell/reset-state              nil
               :hide-popover                           nil
               ::logout                                nil
               :profile.settings/webview-debug-changed false
@@ -44,7 +46,6 @@
  [_]
  ;; we need to disable notifications before starting the logout process
  {:effects/push-notifications-disable nil
-   :dispatch                           [:alert-banners/remove-all]
   :dispatch-later                     [{:ms       100
                                         :dispatch [::logout-method
                                                    {:auth-method keychain/auth-method-none
@@ -1,6 +1,11 @@
 (ns legacy.status-im.network.core
  (:require
-    [clojure.string :as string]))
+    [clojure.string :as string]
+    [re-frame.core :as re-frame]
+    [status-im.navigation.events :as navigation]
+    [utils.ethereum.chain :as chain]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]))

 (def url-regex
  #"https?://(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)")
@@ -9,6 +14,12 @@
  [url]
  (boolean (re-matches url-regex (str url))))

+(def default-manage
+  {:name   {:value ""}
+   :url    {:value ""}
+   :symbol {:value ""}
+   :chain  {:value :mainnet}})
+
 (defn validate-string
  [{:keys [value]}]
  {:value value
@@ -45,3 +56,123 @@
  [current-networks network]
  (let [chain-id (get-in network [:config :NetworkId])]
    (every? #(not= chain-id (get-in % [1 :config :NetworkId])) current-networks)))
+
+(defn get-network
+  [{:keys [db]} network-id]
+  (get-in db [:networks/networks network-id]))
+
+(rf/defn set-input
+  {:events [::input-changed]}
+  [{:keys [db]} input-key value]
+  {:db (-> db
+           (update-in [:networks/manage input-key] assoc :value value)
+           (update-in [:networks/manage] validate-manage))})
+
+;; No edit functionality actually implemented
+(rf/defn edit
+  {:events [::add-network-pressed]}
+  [{db :db}]
+  {:db       (assoc db :networks/manage (validate-manage default-manage))
+   :dispatch [:navigate-to :edit-network]})
+
+(rf/defn connect-success
+  {:events [::connect-success]}
+  [_ network-id]
+  {:ui/show-confirmation
+   {:title               (i18n/label :t/close-app-title)
+    :content             (i18n/label :t/logout-app-content)
+    :confirm-button-text (i18n/label :t/close-app-button)
+    :on-accept           #(re-frame/dispatch [::save-network-settings-pressed network-id])
+    :on-cancel           nil}})
+
+(rf/defn connect-failure
+  {:events [::connect-failure]}
+  [_ reason]
+  {:effects.utils/show-popup
+   {:title   (i18n/label :t/error)
+    :content (str reason)}})
+
+(rf/defn connect
+  {:events [::connect-network-pressed]}
+  [{:keys [db] :as cofx} network-id]
+  (if (get-in db [:networks/networks network-id :config])
+    (connect-success cofx network-id)
+    (connect-failure cofx "A network with the specified id doesn't exist")))
+
+(rf/defn delete
+  {:events [::delete-network-pressed]}
+  [{:keys [db]} network]
+  (let [current-network? (= (:networks/current-network db) network)]
+    (if (or current-network?
+            (not (get-in db [:networks/networks network])))
+      {:ui/show-error (i18n/label :t/delete-network-error)}
+      {:ui/show-confirmation {:title               (i18n/label :t/delete-network-title)
+                              :content             (i18n/label :t/delete-network-confirmation)
+                              :confirm-button-text (i18n/label :t/delete)
+                              :on-accept           #(re-frame/dispatch [::remove-network-confirmed
+                                                                        network])
+                              :on-cancel           nil}})))
+
+(rf/defn save-network-settings
+  {:events [::save-network-settings-pressed]}
+  [{:keys [db] :as cofx} network]
+  {:db            (assoc db :networks/current-network network)
+   :json-rpc/call [{:method     "settings_saveSetting"
+                    :params     [:networks/current-network network]
+                    :on-success #(re-frame/dispatch [:logout])}]})
+
+(rf/defn remove-network
+  {:events [::remove-network-confirmed]}
+  [{:keys [db] :as cofx} network]
+  (let [networks (dissoc (:networks/networks db) network)]
+    {:db            (assoc db :networks/networks networks)
+     :json-rpc/call [{:method     "settings_saveSetting"
+                      :params     [:networks/networks (vals networks)]
+                      :on-success #(re-frame/dispatch [:navigate-back])}]}))
+
+(defn new-network
+  [random-id network-name sym upstream-url chain-type chain-id]
+  (let [data-dir (str "/ethereum/" (name chain-type) "_rpc")
+        config   {:NetworkId      (or (when chain-id (int chain-id))
+                                      (chain/chain-keyword->chain-id chain-type))
+                  :DataDir        data-dir
+                  :UpstreamConfig {:Enabled true
+                                   :URL     upstream-url}}]
+    {:id     random-id
+     :name   network-name
+     :symbol sym
+     :config config}))
+
+(rf/defn save
+  {:events       [::save-network-pressed]
+   :interceptors [(re-frame/inject-cofx :random-id-generator)]}
+  [{{:networks/keys [manage networks] :as db} :db
+    random-id-generator                       :random-id-generator
+    :as                                       cofx}]
+  (if (valid-manage? manage)
+    ;; rename network-id from UI to chain-id
+    (let [{:keys [name url chain network-id symbol]} manage
+          random-id                                  (string/replace (random-id-generator) "-" "")
+          network                                    (new-network random-id
+                                                                  (:value name)
+                                                                  (:value symbol)
+                                                                  (:value url)
+                                                                  (:value chain)
+                                                                  (:value network-id))
+          custom-chain-type?                         (= :custom (:value chain))
+          new-networks                               (assoc networks random-id network)]
+      (if (or (not custom-chain-type?)
+              (chain-id-available? networks network))
+        {:db            (-> db
+                            (dissoc :networks/manage)
+                            (assoc :networks/networks new-networks))
+         :json-rpc/call [{:method     "settings_saveSetting"
+                          :params     [:networks/networks (vals new-networks)]
+                          :on-success #(re-frame/dispatch [:navigate-back])}]}
+        {:ui/show-error "chain-id already defined"}))
+    {:ui/show-error "invalid network parameters"}))
+
+(rf/defn open-network-details
+  {:events [::network-entry-pressed]}
+  [cofx network]
+  (navigation/navigate-to cofx :network-details {:networks/selected-network network}))
@@ -31,6 +31,38 @@
  (testing "an https url not on the default port"
    (is (network.core/valid-rpc-url? "https://valid.something.else:65323"))))

+(deftest new-network-test
+  (let [actual (network.core/new-network "randomid"
+                                         "network-name"
+                                         "network-symbol"
+                                         "upstream-url"
+                                         :mainnet
+                                         nil)]
+    (is (= {:id     "randomid"
+            :name   "network-name"
+            :symbol "network-symbol"
+            :config {:NetworkId      1
+                     :DataDir        "/ethereum/mainnet_rpc"
+                     :UpstreamConfig {:Enabled true
+                                      :URL     "upstream-url"}}}
+           actual))))
+
+(deftest new-network-id-test
+  (let [actual (network.core/new-network "randomid"
+                                         "network-name"
+                                         "network-symbol"
+                                         "upstream-url"
+                                         :mainnet
+                                         "5777")]
+    (is (= {:id     "randomid"
+            :name   "network-name"
+            :symbol "network-symbol"
+            :config {:NetworkId      5777
+                     :DataDir        "/ethereum/mainnet_rpc"
+                     :UpstreamConfig {:Enabled true
+                                      :URL     "upstream-url"}}}
+           actual))))
+
 (deftest valid-manage-test
  (testing "a valid manage"
    (is (network.core/valid-manage? {:url    {:value "http://valid.com"}
@@ -60,3 +92,101 @@
                                          :name   {:value "valid"}
                                          :symbol {:value ""}
                                          :chain  {:value "valid"}})))))
+
+(deftest set-input-test
+  (testing "it updates and validate a field"
+    (is
+     (= {:db {:networks/manage {:url        {:value "http://valid.com"
+                                             :error false}
+                                :name       {:value ""
+                                             :error true}
+                                :symbol     {:value "symbol"
+                                             :error false}
+                                :chain      {:value "mainnet"
+                                             :error false}
+                                :network-id {:value nil
+                                             :error false}}}}
+        (network.core/set-input {:db {:networks/manage {:url    {:value "something"
+                                                                 :error true}
+                                                        :name   {:value ""
+                                                                 :error false}
+                                                        :symbol {:value "symbol"
+                                                                 :error false}
+                                                        :chain  {:value "mainnet"
+                                                                 :error false}}}}
+                                :url
+                                "http://valid.com")))))
+
+(deftest not-save-invalid-url
+  (testing "it does not save a network with an invalid url"
+    (is
+     (:ui/show-error (network.core/save {:random-id-generator (constantly "random")
+                                         :db                  {:networks/manage {:url   {:value "wrong"}
+                                                                                 :chain {:value "1"}
+                                                                                 :name  {:value "empty"}}
+                                                               :profile/profile {}}})))))
+
+(deftest save-valid-network
+  (testing "save a valid network"
+    (let [fx (network.core/save
+              {:random-id-generator (constantly "random-id")
+               :db                  {:networks/manage   {:url    {:value "http://valid.com"}
+                                                         :chain  {:value :mainnet}
+                                                         :symbol {:value "symbol"}
+                                                         :name   {:value "valid"}}
+                                     :profile/profile   {}
+                                     :networks/networks {"random2"
+                                                         {:id     "random2"
+                                                          :name   "network-name"
+                                                          :symbol "symbol"
+                                                          :config {:NetworkId 1
+                                                                   :DataDir "/ethereum/mainnet_rpc"
+                                                                   :UpstreamConfig
+                                                                   {:Enabled true
+                                                                    :URL     "upstream-url"}}}}}})]
+      (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
+      (is (nil? (:networks/manage (:db fx))))
+      (testing "and check that it has an id with `-` and the correct mainnet NetworkId"
+        (is (= 1 (get-in fx [:db :networks/networks "randomid" :config :NetworkId])))))))
+
+(deftest not-save-custom-chain-with-non-unique-id
+  (testing "it does not save a custom chain with network-id already defined"
+    (let [result (network.core/save
+                  {:random-id-generator (constantly "already-defined")
+                   :db                  {:networks/manage   {:url        {:value "http://valid.com"}
+                                                             :chain      {:value :custom}
+                                                             :name       {:value "valid"}
+                                                             :network-id {:value 1}}
+                                         :profile/profile   {}
+                                         :networks/networks {"random"
+                                                             {:id     "random"
+                                                              :name   "network-name"
+                                                              :config {:NetworkId 1
+                                                                       :DataDir "/ethereum/mainnet_rpc"
+                                                                       :UpstreamConfig
+                                                                       {:Enabled true
+                                                                        :URL     "upstream-url"}}}}}})]
+      (is (:ui/show-error result)))))
+
+(deftest save-valid-network-with-unique-chain-id-check
+  (testing "save a valid network with chain-id not already defined"
+    (let [fx (network.core/save
+              {:random-id-generator (constantly "random")
+               :db                  {:networks/manage   {:url        {:value "http://valid.com"}
+                                                         :chain      {:value :mainnet}
+                                                         :name       {:value "valid"}
+                                                         :symbol     {:value "symbol"}
+                                                         :network-id {:value 5}}
+                                     :profile/profile   {}
+                                     :networks/networks {"randomid"
+                                                         {:id     "randomid"
+                                                          :name   "network-name"
+                                                          :symbol "symbol"
+                                                          :config {:NetworkId 3
+                                                                   :DataDir "/ethereum/mainnet_rpc"
+                                                                   :UpstreamConfig
+                                                                   {:Enabled true
+                                                                    :URL     "upstream-url"}}}}}})]
+      (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
+      (is (nil? (:networks/manage (:db fx))))
+      (is (get-in fx [:db :networks/networks "random"])))))
@@ -72,3 +72,18 @@
  {:events [:show-tooltip]}
  [_ tooltip-id]
  {:show-tooltip tooltip-id})
+
+(rf/defn show-profile
+  {:events [:chat.ui/show-profile]}
+  [{:keys [db]} identity ens-name]
+  (let [my-public-key (get-in db [:profile/profile :public-key])]
+    (if (not= my-public-key identity)
+      {:db       (-> db
+                     (assoc :contacts/identity identity)
+                     (assoc :contacts/ens-name ens-name))
+       :dispatch [:contacts/build-contact
+                  {:pubkey     identity
+                   :ens        ens-name
+                   :success-fn (fn [_]
+                                 {:dispatch [:open-modal :profile]})}]}
+      {:dispatch [:navigate-to :my-profile]})))
@@ -0,0 +1,39 @@
+(ns legacy.status-im.subs.networks
+  (:require
+    [re-frame.core :as re-frame]
+    [status-im.config :as config]
+    [utils.ethereum.chain :as chain]))
+
+(defn- filter-networks
+  [network-type]
+  (fn [network]
+    (let [chain-id (chain/network->chain-id network)
+          testnet? (chain/testnet? chain-id)
+          custom?  (:custom? network)]
+      (case network-type
+        :custom  custom?
+        :mainnet (and (not custom?) (not testnet?))
+        :testnet (and (not custom?) testnet?)))))
+
+(defn- label-networks
+  [default-networks]
+  (fn [network]
+    (let [custom? (not (default-networks (:id network)))]
+      (assoc network :custom? custom?))))
+
+(re-frame/reg-sub
+ :get-networks
+ :<- [:networks/networks]
+ (fn [networks]
+   (let [networks (map (label-networks (into #{} (map :id config/default-networks)))
+                       (sort-by :name (vals networks)))
+         types    [:mainnet :testnet :custom]]
+     (zipmap
+      types
+      (map #(filter (filter-networks %) networks) types)))))
+
+(re-frame/reg-sub
+ :manage-network-valid?
+ :<- [:networks/manage]
+ (fn [manage]
+   (not-any? :error (vals manage))))
@@ -5,6 +5,7 @@
    legacy.status-im.subs.ens
    legacy.status-im.subs.keycard
    legacy.status-im.subs.mailservers
+    legacy.status-im.subs.networks
    legacy.status-im.subs.stickers
    [re-frame.core :as re-frame]))

@@ -22,7 +23,6 @@
 (reg-root-key-sub :peers-count :peers-count)
 (reg-root-key-sub :peers-summary :peers-summary)
 (reg-root-key-sub :web3-node-version :web3-node-version)
-(reg-root-key-sub :alert-banners :alert-banners)

 ;;keycard
 (reg-root-key-sub :keycard :keycard)
@@ -100,7 +100,6 @@
 ;;; Link previews
 (reg-root-key-sub :link-previews-whitelist :link-previews-whitelist)
 (reg-root-key-sub :chat/link-previews :chat/link-previews)
-(reg-root-key-sub :chat/status-link-previews :chat/status-link-previews)

 ;;commands
 (reg-root-key-sub :commands/select-account :commands/select-account)
@@ -13,21 +13,37 @@
  (re-frame/dispatch event))

 (defn- normal-mode-settings-data
-  [{:keys [current-log-level
+  [{:keys [network-name
+           current-log-level
           light-client-enabled?
           transactions-management-enabled?
           current-fleet
           webview-debug
           test-networks-enabled?
-           is-goerli-enabled?
-           peer-syncing-enabled?]}]
+           is-goerli-enabled?]}]
  (keep
   identity
   [{:size :small
+     :title (i18n/label :t/network)
+     :accessibility-label :network-button
+     :container-margin-top 8
+     :on-press
+     #(re-frame/dispatch [:navigate-to :network-settings])
+     :accessory :text
+     :accessory-text network-name
+     :chevron true}
+    {:size :small
+     :title (i18n/label :t/network-info)
+     :accessibility-label :network-button
+     :container-margin-top 8
+     :on-press
+     #(re-frame/dispatch [:navigate-to :network-info])
+     :chevron true}
+    {:size :small
     :title (i18n/label :t/log-level)
     :accessibility-label :log-level-settings-button
     :on-press
-     #(re-frame/dispatch [:open-modal :log-level-settings])
+     #(re-frame/dispatch [:navigate-to :log-level-settings])
     :accessory :text
     :accessory-text current-log-level
     :chevron true}
@@ -35,7 +51,7 @@
     :title (i18n/label :t/fleet)
     :accessibility-label :fleet-settings-button
     :on-press
-     #(re-frame/dispatch [:open-modal :fleet-settings])
+     #(re-frame/dispatch [:navigate-to :fleet-settings])
     :accessory :text
     :accessory-text current-fleet
     :chevron true}
@@ -50,14 +66,14 @@
     :accessibility-label :rpc-usage-info
     :container-margin-top 8
     :on-press
-     #(re-frame/dispatch [:open-modal :rpc-usage-info])
+     #(re-frame/dispatch [:navigate-to :rpc-usage-info])
     :chevron true}
    {:size :small
     :title (i18n/label :t/peers-stats)
     :accessibility-label :peers-stats
     :container-margin-top 8
     :on-press
-     #(re-frame/dispatch [:open-modal :peers-stats])
+     #(re-frame/dispatch [:navigate-to :peers-stats])
     :chevron true}
    {:size :small
     :title (i18n/label :t/light-client-enabled)
@@ -103,19 +119,11 @@
     #(re-frame/dispatch [:profile.settings/toggle-goerli-test-network])
     :accessory :switch
     :active is-goerli-enabled?}
-    {:size :small
-     :title "Peer syncing"
-     :accessibility-label :peer-syncing
-     :container-margin-bottom 8
-     :on-press
-     #(re-frame/dispatch [:profile.settings/toggle-peer-syncing])
-     :accessory :switch
-     :active peer-syncing-enabled?}
    {:size                :small
     :title               (i18n/label :t/set-currency)
     :accessibility-label :wallet-change-currency
     :on-press            #(hide-sheet-and-dispatch
-                            [:open-modal :currency-settings])
+                            [:navigate-to :currency-settings])
     :chevron             true}]))

 (defn- flat-list-data
@@ -134,20 +142,20 @@
                  is-goerli-enabled?               [:profile/is-goerli-enabled?]
                  light-client-enabled?            [:profile/light-client-enabled?]
                  webview-debug                    [:profile/webview-debug]
+                  network-name                     [:network-name]
                  transactions-management-enabled? [:wallet-legacy/transactions-management-enabled?]
                  current-log-level                [:log-level/current-log-level]
-                  current-fleet                    [:fleets/current-fleet]
-                  peer-syncing-enabled?            [:profile/peer-syncing-enabled?]]
+                  current-fleet                    [:fleets/current-fleet]]
    [list/flat-list
     {:data      (flat-list-data
-                  {:current-log-level                current-log-level
+                  {:network-name                     network-name
+                   :current-log-level                current-log-level
                   :transactions-management-enabled? transactions-management-enabled?
                   :light-client-enabled?            light-client-enabled?
                   :current-fleet                    current-fleet
                   :dev-mode?                        false
                   :webview-debug                    webview-debug
                   :test-networks-enabled?           test-networks-enabled?
-                   :is-goerli-enabled?               is-goerli-enabled?
-                   :peer-syncing-enabled?            peer-syncing-enabled?})
+                   :is-goerli-enabled?               is-goerli-enabled?})
      :key-fn    (fn [_ i] (str i))
      :render-fn render-item}]))
@@ -85,7 +85,9 @@
             :accessibility-label :share-community-link
             :type                :secondary
             :on-press            #(debounce/throttle-and-dispatch
-                                    [::communities/share-community-confirmation-pressed @user-pk
+                                    [(if can-invite?
+                                       ::communities/invite-people-confirmation-pressed
+                                       ::communities/share-community-confirmation-pressed) @user-pk
                                     selected]
                                    3000)}
            (i18n/label (if can-invite? :t/invite :t/share))]}]]))))
@@ -0,0 +1,12 @@
+(ns legacy.status-im.ui.screens.network.edit-network.styles)
+
+(def edit-network-view
+  {:flex              1
+   :margin-horizontal 16
+   :margin-vertical   15})
+
+(def bottom-container
+  {:flex-direction   :row
+   :padding-vertical 4})
+
+(def container {:flex 1})
@@ -0,0 +1,72 @@
+(ns legacy.status-im.ui.screens.network.edit-network.views
+  (:require
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.components.core :as quo]
+    [legacy.status-im.ui.components.list.item :as list.item]
+    [legacy.status-im.ui.components.list.views :as list]
+    [legacy.status-im.ui.components.react :as react]
+    [legacy.status-im.ui.screens.network.edit-network.styles :as styles]
+    [re-frame.core :as re-frame]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views]))
+
+(defn- render-network-type
+  [type _ _ manage-network]
+  (let [name (case type
+               :mainnet (i18n/label :t/mainnet-network)
+               :goerli  (i18n/label :t/goerli-network)
+               :custom  (i18n/label :t/custom))]
+    [list.item/list-item
+     {:title     name
+      :accessory :radio
+      :active    (= (get-in manage-network [:chain :value]) type)
+      :on-press  #(re-frame/dispatch [::network/input-changed :chain type])}]))
+
+(views/defview edit-network
+  []
+  (views/letsubs [manage-network [:networks/manage]
+                  is-valid?      [:manage-network-valid?]]
+    (let [custom? (= (get-in manage-network [:chain :value]) :custom)]
+      [react/keyboard-avoiding-view {:flex 1}
+       [react/scroll-view
+        [react/view styles/edit-network-view
+         [react/view {:padding-vertical 8}
+          [quo/text-input
+           {:label          (i18n/label :t/name)
+            :placeholder    (i18n/label :t/specify-name)
+            :default-value  (get-in manage-network [:name :value])
+            :on-change-text #(re-frame/dispatch [::network/input-changed :name %])
+            :auto-focus     true}]]
+         [react/view {:padding-vertical 8}
+          [quo/text-input
+           {:label          (i18n/label :t/symbol)
+            :placeholder    (i18n/label :t/specify-symbol)
+            :default-value  (get-in manage-network [:symbol :value])
+            :on-change-text #(re-frame/dispatch [::network/input-changed :symbol %])
+            :auto-focus     true}]]
+         [react/view {:padding-vertical 8}
+          [quo/text-input
+           {:label          (i18n/label :t/rpc-url)
+            :placeholder    (i18n/label :t/specify-rpc-url)
+            :default-value  (get-in manage-network [:url :value])
+            :on-change-text #(re-frame/dispatch [::network/input-changed :url %])}]]]
+        [quo/list-header (i18n/label :t/network-chain)]
+        [list/flat-list
+         {:data        [:mainnet :goerli :custom]
+          :key-fn      (fn [_ i] (str i))
+          :render-data manage-network
+          :render-fn   render-network-type}]
+        (when custom?
+          [react/view styles/edit-network-view
+           [quo/text-input
+            {:label          (i18n/label :t/network-id)
+             :placeholder    (i18n/label :t/specify-network-id)
+             :on-change-text #(re-frame/dispatch [::network/input-changed :network-id %])}]])]
+       [react/view styles/bottom-container
+        [react/view {:flex 1}]
+        [quo/button
+         {:after    :main-icons/next
+          :type     :secondary
+          :disabled (not is-valid?)
+          :on-press #(re-frame/dispatch [::network/save-network-pressed])}
+         (i18n/label :t/save)]]])))
@@ -0,0 +1,47 @@
+(ns legacy.status-im.ui.screens.network.network-details.views
+  (:require
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.components.core :as quo]
+    [legacy.status-im.ui.components.react :as react]
+    [legacy.status-im.ui.screens.network.styles :as st]
+    [legacy.status-im.ui.screens.network.views :as network-settings]
+    [re-frame.core :as re-frame]
+    [utils.debounce :refer [throttle-and-dispatch]]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views]))
+
+(views/defview network-details
+  []
+  (views/letsubs [{:keys [networks/selected-network]} [:get-screen-params]
+                  current-network                     [:networks/current-network]
+                  networks                            [:get-networks]]
+    (let [{:keys [id name config]} selected-network
+          connected?               (= id current-network)
+          custom?                  (seq (filter #(= (:id %) id) (:custom networks)))]
+      [:<>
+       [react/view {:flex 1}
+        [network-settings/network-badge
+         {:name       name
+          :connected? connected?}]
+        (when-not connected?
+          [react/touchable-highlight
+           {:on-press #(throttle-and-dispatch [::network/connect-network-pressed id] 1000)}
+           [react/view st/connect-button-container
+            [react/view
+             {:style               st/connect-button
+              :accessibility-label :network-connect-button}
+             [react/text {:style st/connect-button-label}
+              (i18n/label :t/connect)]]
+            [react/i18n-text
+             {:style st/connect-button-description
+              :key   :connecting-requires-login}]]])
+        [react/view (st/network-config-container)
+         [react/text
+          {:style               st/network-config-text
+           :accessibility-label :network-details-text}
+          config]]]
+       (when custom?
+         [react/view st/bottom-container
+          [react/view {:flex 1}
+           [quo/button {:on-press #(re-frame/dispatch [::network/delete-network-pressed id])}
+            (i18n/label :t/delete)]]])])))
@@ -0,0 +1,90 @@
+(ns legacy.status-im.ui.screens.network.styles
+  (:require
+    [legacy.status-im.ui.components.colors :as colors]
+    [legacy.status-im.utils.styles :as styles]))
+
+(def wrapper
+  {:flex 1})
+
+(def badge-name-text
+  {:font-size 17})
+
+(styles/def badge-connected-text
+  {:color colors/gray
+   :ios   {:margin-top 5}})
+
+(def connect-button-container
+  {:margin-top        8
+   :margin-bottom     16
+   :margin-horizontal 16})
+
+(def connect-button
+  {:height           52
+   :align-items      :center
+   :justify-content  :center
+   :background-color colors/blue
+   :border-radius    8
+   :ios              {:opacity 0.9}})
+
+(def connect-button-label
+  {:color     colors/white-persist
+   :font-size 17})
+
+(def connect-button-description
+  {:color      colors/gray
+   :margin-top 8
+   :height     20})
+
+(styles/defn network-config-container
+  []
+  {:height            160
+   :margin-top        8
+   :padding-top       16
+   :padding-left      16
+   :margin-horizontal 16
+   :background-color  colors/gray-lighter
+   :ios               {:border-radius 9
+                       :opacity       0.9}
+   :android           {:border-radius 4}})
+
+(styles/def network-config-text
+  {:font-size 17
+   :ios       {:opacity 0.8}
+   :android   {:opacity 0.4}})
+
+(defn network-icon
+  [connected? size]
+  {:width            size
+   :height           size
+   :border-radius    (/ size 2)
+   :background-color (if connected? colors/blue colors/gray-lighter)
+   :align-items      :center
+   :justify-content  :center})
+
+(def network-badge
+  {:height         88
+   :padding-left   16
+   :flex-direction :row
+   :align-items    :center})
+
+(styles/def network-item
+  {:flex-direction     :row
+   :align-items        :center
+   :padding-horizontal 16
+   :ios                {:height 64}
+   :android            {:height 56}})
+
+(def network-item-name-text
+  {:font-size 17})
+
+(def network-item-connected-text
+  {:color      colors/gray
+   :font-size  14
+   :margin-top 6})
+
+(def bottom-container
+  {:flex-direction    :row
+   :margin-horizontal 12
+   :margin-vertical   15})
+
+(def container {:flex 1})
@@ -0,0 +1,71 @@
+(ns legacy.status-im.ui.screens.network.views
+  (:require
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.components.colors :as colors]
+    [legacy.status-im.ui.components.icons.icons :as icons]
+    [legacy.status-im.ui.components.list.item :as list.item]
+    [legacy.status-im.ui.components.list.views :as list]
+    [legacy.status-im.ui.components.react :as react]
+    [legacy.status-im.ui.components.topbar :as topbar]
+    [legacy.status-im.ui.screens.network.styles :as styles]
+    [re-frame.core :as re-frame]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views]))
+
+(defn- network-icon
+  [connected? size]
+  [react/view (styles/network-icon connected? size)
+   [icons/icon :main-icons/network {:color (if connected? colors/white-persist colors/gray)}]])
+
+(defn network-badge
+  [& [{:keys [name connected?]}]]
+  [react/view styles/network-badge
+   [network-icon connected? 56]
+   [react/view {:padding-left 16}
+    [react/text {:style styles/badge-name-text}
+     (or name (i18n/label :t/new-network))]
+    (when connected?
+      [react/i18n-text
+       {:style styles/badge-connected-text
+        :key   :connected}])]])
+
+(def mainnet?
+  #{"mainnet" "mainnet_rpc"})
+
+(defn render-network
+  [{:keys [id name] :as network} _ _ current-network]
+  (let [connected? (= id current-network)]
+    [list.item/list-item
+     {:on-press      #(re-frame/dispatch [::network/network-entry-pressed network])
+      :icon          :main-icons/network
+      :icon-bg-color (if connected? colors/blue colors/gray-lighter)
+      :icon-color    (if connected? colors/white-persist colors/gray)
+      :title         name
+      :subtitle      (when connected? (i18n/label :t/connected))
+      :chevron       true}]))
+
+(views/defview network-settings
+  []
+  (views/letsubs [current-network [:networks/current-network]
+                  networks        [:get-networks]]
+    [:<>
+     [topbar/topbar
+      {:title (i18n/label :t/network-settings)
+       :right-accessories
+       [{:icon     :main-icons/add
+         :on-press #(re-frame/dispatch [::network/add-network-pressed])}]}]
+     [react/view styles/wrapper
+      [list/section-list
+       {:sections           [{:title (i18n/label :t/main-networks)
+                              :key   :mainnet
+                              :data  (:mainnet networks)}
+                             {:title (i18n/label :t/test-networks)
+                              :key   :testnet
+                              :data  (:testnet networks)}
+                             {:title (i18n/label :t/custom-networks)
+                              :key   :custom
+                              :data  (:custom networks)}]
+        :key-fn             :id
+        :default-separator? true
+        :render-data        current-network
+        :render-fn          render-network}]]]))
@@ -0,0 +1,84 @@
+(ns legacy.status-im.ui.screens.network-info.views
+  (:require
+    [legacy.status-im.ethereum.decode :as decode]
+    [legacy.status-im.ui.components.react :as react]
+    [native-module.core :as native-module]
+    [re-frame.core :as re-frame]
+    [reagent.core :as reagent]
+    [status-im.common.json-rpc.events :as json-rpc]
+    [utils.datetime :as datetime]))
+
+(defn get-block
+  [block callback]
+  (json-rpc/call
+   {:method     "eth_getBlockByNumber"
+    :params     [block false]
+    :on-success callback
+    :on-error   #(js/alert (str "can't fetch latest block" %))}))
+
+(defn to-date
+  [timestamp]
+  (datetime/timestamp->long-date
+   (* 1000 timestamp)))
+
+(defn check-lag
+  []
+  (let [latest-block (reagent/atom nil)
+        last-loaded-block (reagent/atom nil)
+        on-press
+        (fn []
+          (get-block
+           "latest"
+           (fn [res]
+             (reset! latest-block res)
+             (get-block
+              (str "0x"
+                   (native-module/number-to-hex
+                    @(re-frame/subscribe [:ethereum/current-block])))
+              (fn [res]
+                (reset! last-loaded-block res))))))]
+    (fn []
+      [react/view
+       {:style {:flex              1
+                :margin-horizontal 16}}
+       (if-not @latest-block
+         [react/text
+          {:on-press on-press}
+          "PRESS TO REFRESH"]
+         [react/text
+          {:on-press on-press}
+          (let [latest-block-number
+                (decode/uint (:number @latest-block))
+
+                latest-block-timestamp
+                (decode/uint (:timestamp @latest-block))
+
+                last-loaded-block-number
+                (decode/uint (:number @last-loaded-block))
+
+                last-loaded-block-timestamp
+                (decode/uint (:timestamp @last-loaded-block))]
+            (str "Latest block number: "
+                 latest-block-number
+                 "\n"
+                 "Latest block time: "
+                 (to-date latest-block-timestamp)
+                 "\n"
+                 "Last loaded block: "
+                 last-loaded-block-number
+                 "\n"
+                 "Last loaded block time: "
+                 (to-date last-loaded-block-timestamp)
+                 "\n"
+                 "Seconds diff: "
+                 (- latest-block-timestamp
+                    last-loaded-block-timestamp)
+                 "\n"
+                 "Blocks diff: " (- latest-block-number
+                                    last-loaded-block-number)
+                 "\n"
+                 "PRESS TO REFRESH"))])])))
+
+(defn network-info
+  []
+  [check-lag])
@@ -8,6 +8,24 @@
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

+(defn local-notifications
+  []
+  (let [{:keys [enabled?]}               (rf/sub [:push-notifications/wallet-transactions])
+        {:keys [notifications-enabled?]} (rf/sub [:profile/profile])]
+    [:<>
+     [quo/separator
+      {:color (:ui-02 @colors/theme)
+       :style {:margin-vertical 8}}]
+     [quo/list-header (i18n/label :t/local-notifications)]
+     [list.item/list-item
+      {:size                :small
+       :title               (i18n/label :t/notifications-transactions)
+       :accessibility-label :notifications-button
+       :active              (and notifications-enabled? enabled?)
+       :on-press            #(rf/dispatch [:push-notifications.wallet/switch-transactions
+                                           (not enabled?)])
+       :accessory           :switch}]]))
+
 (defn notifications-settings-ios
  []
  (let [{:keys [notifications-enabled?
@@ -45,7 +63,8 @@
       :on-press            #(rf/dispatch
                              [:push-notifications/switch-block-mentions
                               (not push-notifications-block-mentions?)])
-       :accessory           :switch}]]))
+       :accessory           :switch}]
+     [local-notifications]]))

 (defn notifications-settings-android
  []
@@ -57,7 +76,8 @@
       :subtitle            (i18n/label :t/local-notifications-subtitle)
       :active              notifications-enabled?
       :on-press            #(rf/dispatch [:push-notifications/switch (not notifications-enabled?)])
-       :accessory           :switch}]]))
+       :accessory           :switch}]
+     [local-notifications]]))

 (defn notifications-settings
  []
@@ -102,7 +102,7 @@
               :chevron              true
               :icon                 :main-icons/username}
        registrar
-        (assoc :on-press #(re-frame/dispatch [:open-modal :ens-main registrar])))]
+        (assoc :on-press #(re-frame/dispatch [:navigate-to :ens-main registrar])))]
     [list.item/list-item
      {:title               (i18n/label :t/contacts)
       :icon                :main-icons/in-contacts
@@ -112,7 +112,7 @@
                              (str active-contacts-count)
                              (i18n/label :t/none))
       :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :contacts-list])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :contacts-list])}]
     [react/view {:padding-top 16}
      [quo/list-header (i18n/label :t/settings)]]
     [list.item/list-item
@@ -122,71 +122,71 @@
       :chevron             true
       :accessory           (when mnemonic
                              [components.common/counter {:size 22} 1])
-       :on-press            #(re-frame/dispatch [:open-modal :privacy-and-security])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :privacy-and-security])}]
     (when config/quo-preview-enabled?
       [list.item/list-item
        {:icon                :main-icons/appearance
         :title               "Quo Preview"
         :accessibility-label :appearance-settings-button
         :chevron             true
-         :on-press            #(re-frame/dispatch [:open-modal :quo-preview])}])
+         :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 [:open-modal :status-im-preview])}])
+         :on-press            #(re-frame/dispatch [:navigate-to :status-im-preview])}])
     [list.item/list-item
      {:icon                :main-icons/appearance
       :title               (i18n/label :t/appearance)
       :accessibility-label :appearance-settings-button
       :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :appearance])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :appearance])}]
     [list.item/list-item
      {:icon                :main-icons/notification
       :title               (i18n/label :t/notifications)
       :accessibility-label :notifications-settings-button
       :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :notifications])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :notifications])}]
     [list.item/list-item
      {:icon                :main-icons/mobile
       :title               (i18n/label :t/sync-settings)
       :accessibility-label :sync-settings-button
       :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :sync-settings])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :sync-settings])}]
     (when keycard-pairing
       [list.item/list-item
        {:icon                :main-icons/keycard
         :title               (i18n/label :t/keycard)
         :accessibility-label :keycard-button
         :chevron             true
-         :on-press            #(re-frame/dispatch [:open-modal :keycard-settings])}])
+         :on-press            #(re-frame/dispatch [:navigate-to :keycard-settings])}])
     [list.item/list-item
      {:icon                :main-icons/settings-advanced
       :title               (i18n/label :t/advanced)
       :accessibility-label :advanced-button
       :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :advanced-settings])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :advanced-settings])}]
     [list.item/list-item
      {:icon                :main-icons/help
       :title               (i18n/label :t/need-help)
       :accessibility-label :help-button
       :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :help-center])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :help-center])}]
     [list.item/list-item
      {:icon                :main-icons/info
       :title               (i18n/label :t/about-app)
       :accessibility-label :about-button
       :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :about-app])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :about-app])}]
     (when local-pairing-mode-enabled?
       [list.item/list-item
        {:icon                :i/mobile
         :title               (i18n/label :t/syncing)
         :accessibility-label :syncing
         :chevron             true
-         :on-press            #(re-frame/dispatch [:open-modal :settings-syncing])}])
+         :on-press            #(re-frame/dispatch [:navigate-to :settings-syncing])}])
     [react/view {:padding-vertical 24}
      [list.item/list-item
       {:icon :main-icons/log-out
@@ -1,6 +1,7 @@
 (ns legacy.status-im.ui.screens.screens
  (:require
    [legacy.status-im.ui.components.colors :as colors]
+    [legacy.status-im.ui.components.icons.icons :as icons]
    [legacy.status-im.ui.screens.about-app.views :as about-app]
    [legacy.status-im.ui.screens.advanced-settings.views :as advanced-settings]
    [legacy.status-im.ui.screens.appearance.views :as appearance]
@@ -23,6 +24,10 @@
    [legacy.status-im.ui.screens.link-previews-settings.views :as link-previews-settings]
    [legacy.status-im.ui.screens.log-level-settings.views :as log-level-settings]
    [legacy.status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
+    [legacy.status-im.ui.screens.network-info.views :as network-info]
+    [legacy.status-im.ui.screens.network.edit-network.views :as edit-network]
+    [legacy.status-im.ui.screens.network.network-details.views :as network-details]
+    [legacy.status-im.ui.screens.network.views :as network]
    [legacy.status-im.ui.screens.notifications-settings.views :as notifications-settings]
    [legacy.status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver]
    [legacy.status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings]
@@ -47,18 +52,10 @@
    [status-im.contexts.chat.group-details.view :as group-details]
    [utils.i18n :as i18n]))

-(defn topbar-options
-  [title]
-  {:elevation        0
-   :title            {:color (if (colors/dark?) colors/white colors/black)
-                      :text  (i18n/label title)}
-   :rightButtonColor (if (colors/dark?) colors/white colors/black)
-   :background       {:color (if (colors/dark?) colors/black colors/white)}
-   :backButton       {:color           (if (colors/dark?) colors/white colors/black)
-                      :id              :legacy-back-button
-                      :testID          :back-button
-                      :visible         true
-                      :popStackOnPress false}})
+(defn right-button-options
+  [id icon]
+  {:id   id
+   :icon (icons/icon-source icon)})

 (defn screens
  []
@@ -84,7 +81,7 @@

   {:name      :stickers
    :options   {:insets {:top? true}
-                :topBar (topbar-options :t/sticker-market)}
+                :topBar {:title {:text (i18n/label :t/sticker-market)}}}
    :component stickers/packs}

   {:name      :stickers-pack
@@ -97,7 +94,7 @@
    :component group-chat/new-group}

   {:name      :currency-settings
-    :options   {:topBar (topbar-options :t/main-currency)
+    :options   {:topBar {:title {:text (i18n/label :t/main-currency)}}
                :insets {:top? true}}
    :component currency-settings/currency-settings}

@@ -107,27 +104,27 @@
    :options   {:topBar {:visible false}}
    :component profile.user/my-profile}
   {:name      :contacts-list
-    :options   {:topBar (topbar-options :t/contacts)
+    :options   {:topBar {:title {:text (i18n/label :t/contacts)}}
                :insets {:top? true}}
    :component contacts-list/contacts-list}
   {:name      :ens-main
-    :options   {:topBar (topbar-options :t/ens-usernames)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-usernames)}}
                :insets {:top? true}}
    :component ens/main}
   {:name      :ens-search
-    :options   {:topBar (topbar-options :t/ens-your-username)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
                :insets {:top? true}}
    :component ens/search}
   {:name      :ens-checkout
-    :options   {:topBar (topbar-options :t/ens-your-username)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
                :insets {:top? true}}
    :component ens/checkout}
   {:name      :ens-confirmation
-    :options   {:topBar (topbar-options :t/ens-your-username)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
                :insets {:top? true}}
    :component ens/confirmation}
   {:name      :ens-terms
-    :options   {:topBar (topbar-options :t/ens-terms-registration)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-terms-registration)}}
                :insets {:top? true}}
    :component ens/terms}
   {:name      :ens-name-details
@@ -135,7 +132,7 @@
    :options   {:insets {:top? true}}
    :component ens/name-details}
   {:name      :blocked-users-list
-    :options   {:topBar (topbar-options :t/blocked-users)
+    :options   {:topBar {:title {:text (i18n/label :t/blocked-users)}}
                :insets {:top? true}}
    :component contacts-list/blocked-users-list}
   {:name      :wakuv2-settings
@@ -151,7 +148,7 @@
    :options   {:insets {:top? true}}
    :component bootnodes-settings/bootnodes-settings}
   {:name      :installations
-    :options   {:topBar (topbar-options (i18n/label :t/devices))
+    :options   {:topBar {:title {:text (i18n/label :t/devices)}}
                :insets {:top? true}}
    :component pairing/installations}
   {:name      :edit-bootnode
@@ -167,91 +164,107 @@
    :options   {:insets {:top? true}}
    :component edit-mailserver/edit-mailserver}
   {:name      :dapps-permissions
-    :options   {:topBar (topbar-options :t/dapps-permissions)
+    :options   {:topBar {:title {:text (i18n/label :t/dapps-permissions)}}
                :insets {:top? true}}
    :component dapps-permissions/dapps-permissions}
   {:name      :privacy-and-security
-    :options   {:topBar (topbar-options :t/privacy-and-security)
+    :options   {:topBar {:title {:text (i18n/label :t/privacy-and-security)}}
                :insets {:top? true}}
    :component privacy-and-security/privacy-and-security}
   {:name      :messages-from-contacts-only
-    :options   {:topBar (topbar-options :t/accept-new-chats-from)
+    :options   {:topBar {:title {:text (i18n/label :t/accept-new-chats-from)}}
                :insets {:top? true}}
    :component messages-from-contacts-only/messages-from-contacts-only-view}
   {:name      :appearance
-    :options   {:topBar (topbar-options :t/appearance)
+    :options   {:topBar {:title {:text (i18n/label :t/appearance)}}
                :insets {:top? true}}
    :component appearance/appearance-view}
   {:name      :privacy-and-security-profile-pic-show-to
-    :options   {:topbar (topbar-options :t/show-profile-pictures-to)
+    :options   {:topbar {:title {:text (i18n/label :t/show-profile-pictures-to)}}
                :insets {:top? true}}
    :component privacy-and-security/profile-pic-show-to}
   {:name      :privacy-and-security-profile-pic
-    :options   {:topBar (topbar-options :t/show-profile-pictures)
+    :options   {:topBar {:title {:text (i18n/label :t/show-profile-pictures)}}
                :insets {:top? true}}
    :component privacy-and-security/profile-pic}
   {:name      :notifications
-    :options   {:topBar (topbar-options :t/notification-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/notification-settings)}}
                :insets {:top? true}}
    :component notifications-settings/notifications-settings}
   {:name      :sync-settings
-    :options   {:topBar (topbar-options :t/sync-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/sync-settings)}}
                :insets {:top? true}}
    :component sync-settings/sync-settings}
   {:name      :advanced-settings
-    :options   {:topBar (topbar-options :t/advanced)
+    :options   {:topBar {:title {:text (i18n/label :t/advanced)}}
                :insets {:top? true}}
    :component advanced-settings/advanced-settings}
   {:name      :help-center
-    :options   {:topBar (topbar-options :t/need-help)
+    :options   {:topBar {:title {:text (i18n/label :t/need-help)}}
                :insets {:top? true}}
    :component help-center/help-center}
   {:name      :glossary
-    :options   {:topBar (topbar-options :t/glossary)
+    :options   {:topBar {:title {:text (i18n/label :t/glossary)}}
                :insets {:top? true}}
    :component glossary/glossary}
   {:name      :about-app
-    :options   {:topBar (topbar-options :t/about-app)
+    :options   {:topBar {:title {:text (i18n/label :t/about-app)}}
                :insets {:top? true}}
    :component about-app/about-app}
   {:name      :privacy-policy
-    :options   {:topBar (topbar-options :t/privacy-policy)
+    :options   {:topBar {:title {:text (i18n/label :t/privacy-policy)}}
                :insets {:top? true}}
    :component about-app/privacy-policy}
   {:name      :terms-of-service
-    :options   {:topBar (topbar-options :t/terms-of-service)
+    :options   {:topBar {:title {:text (i18n/label :t/terms-of-service)}}
                :insets {:top? true}}
    :component about-app/tos}
   {:name      :principles
-    :options   {:topBar (topbar-options :t/principles)
+    :options   {:topBar {:title {:text (i18n/label :t/principles)}}
                :insets {:top? true}}
    :component about-app/principles}
   {:name      :manage-dapps-permissions
    ;;TODO dynamic title
    :options   {:insets {:top? true}}
    :component dapps-permissions/manage}
+   {:name      :network-settings
+    ;;TODO accessories
+    :options   {:insets {:top? true}}
+    :component network/network-settings}
+   {:name      :network-details
+    :options   {:topBar {:title {:text (i18n/label :t/network-details)}}
+                :insets {:top? true}}
+    :component network-details/network-details}
+   {:name      :network-info
+    :options   {:topBar {:title {:text (i18n/label :t/network-info)}}
+                :insets {:top? true}}
+    :component network-info/network-info}
   {:name      :rpc-usage-info
-    :options   {:topBar (topbar-options :t/rpc-usage-info)
+    :options   {:topBar {:title {:text (i18n/label :t/rpc-usage-info)}}
                :insets {:top? true}}
    :component rpc-usage-info/usage-info}
   {:name      :peers-stats
-    :options   {:topBar (topbar-options :t/peers-stats)
+    :options   {:topBar {:title {:text (i18n/label :t/peers-stats)}}
                :insets {:top? true}}
    :component peers-stats/peers-stats}
+   {:name      :edit-network
+    :options   {:topBar {:title {:text (i18n/label :t/add-network)}}
+                :insets {:top? true}}
+    :component edit-network/edit-network}
   {:name      :log-level-settings
-    :options   {:topBar (topbar-options :t/log-level-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/log-level-settings)}}
                :insets {:top? true}}
    :component log-level-settings/log-level-settings}
   {:name      :fleet-settings
-    :options   {:topBar (topbar-options :t/fleet-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/fleet-settings)}}
                :insets {:top? true}}
    :component fleet-settings/fleet-settings}
   {:name      :mobile-network-settings
-    :options   {:topBar (topbar-options :t/mobile-network-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/mobile-network-settings)}}
                :insets {:top? true}}
    :component mobile-network-settings/mobile-network-settings}
   {:name      :backup-settings
-    :options   {:topBar (topbar-options :t/backup-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/backup-settings)}}
                :insets {:top? true}}
    :component backup-settings/backup-settings}
   {:name      :backup-seed
@@ -259,14 +272,14 @@
    :options   {:insets {:top? true}}
    :component profile.seed/backup-seed}
   {:name      :reset-password
-    :options   {:topBar (topbar-options :t/reset-password)
+    :options   {:topBar {:title {:text (i18n/label :t/reset-password)}}
                :insets {:top? true}}
    :component reset-password/reset-password}
   {:name      :delete-profile
    :insets    {:bottom? true}
    :component delete-profile/delete-profile}
   {:name      :default-sync-period-settings
-    :options   {:topBar (topbar-options :t/default-sync-period)
+    :options   {:topBar {:title {:text (i18n/label :t/default-sync-period)}}
                :insets {:top? true}}
    :component default-sync-period-settings/default-sync-period-settings}

@@ -275,7 +288,7 @@
   ;[Chat] Link preview settings

   {:name      :link-previews-settings
-    :options   {:topBar (topbar-options :t/chat-link-previews)
+    :options   {:topBar {:title {:text (i18n/label :t/chat-link-previews)}}
                :insets {:top? true}}
    :component link-previews-settings/link-previews-settings}

@@ -315,7 +328,7 @@
   ;;TODO WHY MODAL?
   ;[Profile] Notifications settings
   {:name      :notifications-settings
-    :options   {:topBar             (topbar-options :t/notification-settings)
+    :options   {:topBar             {:title {:text (i18n/label :t/notification-settings)}}
                :popGesture         false
                :hardwareBackButton {:dismissModalOnPress false
                                     :popStackOnPress     false}
@@ -2,7 +2,7 @@
  (:require-macros [legacy.status-im.utils.slurp :refer [slurp]])
  (:require
    [legacy.status-im.fleet.default-fleet :refer (default-fleets)])
-  (:require [tests.test-utils :as utils.test]))
+  (:require [legacy.status-im.utils.test :as utils.test]))

 ;; to generate a js Proxy at js/__STATUS_MOBILE_JS_IDENTITY_PROXY__ that accept any (.xxx) call and
 ;; return itself
@@ -53,7 +53,7 @@
    :FlatList                 {}
    :SectionList              {}
    :Text                     {}
-    :StatusBar                {:setBarStyle identity}
+    :StatusBar                {}
    :ScrollView               {}
    :SafeAreaView             {}
    :KeyboardAvoidingView     {}
@@ -106,32 +106,6 @@ The convention is `:size-<number>`, e.g size `20` is `:size-20`
 - Try to make all other vars private because they should almost never be used
  directly.

-## Default value when destructuring
-
-Too often callers pass nil values because values can be wrapped in a `when` for example.
-In this case, the default value is not applied, because :or macro will use default only when the value is absent.
-Instead, use `(or (:value props) some-default-value)` in a `let` expression or as a parameter value.
-
-```clojure
-;; bad (unreliable)
-(defn- view-internal
-  [{:keys [auto-focus?
-           init-value
-           return-key-type]
-    :or   {auto-focus?     false
-           init-value      0
-           return-key-type :done}}]
-  ...)
-
-;; good
-(defn- view-internal
-   [{:keys [theme size something] :as props}]
-   (let [auto-focus? (or (:auto-focus? props) false)
-         init-value (or (:init-value props) 0)
-         return-key-type (or (:return-key-type props) :done)]
-     ...))
-```
-
 ## Component tests

 We don't attempt to write component tests verifying how components look on the
@@ -6,7 +6,8 @@
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [react-native.platform :as platform]))
+    [react-native.platform :as platform]
+    [reagent.core :as reagent]))

 (defn remove-http-https-www
  [value]
@@ -67,86 +68,78 @@
  [:cursor-color :placeholder-text-color :editable :on-change-text :on-focus
   :on-blur :on-clear :value :disabled? :blur? :customization-color :theme])

-(defn view
-  [{:keys [disabled? blur? on-change-text customization-color
-           on-clear on-focus on-blur get-ref locked?
-           favicon favicon-color favicon-size default-value]
-    :or   {default-value ""}
-    :as   props}]
-  (let [ref               (rn/use-ref-atom nil)
-        on-ref            (rn/use-callback
-                           (fn [r]
-                             (reset! ref r)
-                             (when get-ref (get-ref r)))
-                           [get-ref])
-        theme             (quo.theme/use-theme)
-        [state set-state] (rn/use-state :default)
-        [value set-value] (rn/use-state default-value)
-        on-clear          (rn/use-callback
-                           (fn []
-                             (.clear ^js @ref)
-                             (set-value "")
-                             (when on-clear (on-clear)))
-                           [on-clear])
-        focus-input       (rn/use-callback
-                           (fn []
-                             (set-state :active)
-                             (.focus ^js @ref)))
-        on-blur           (rn/use-callback
-                           (fn []
-                             (set-state :default)
-                             (when on-blur (on-blur)))
-                           [on-blur])
-        on-change-text    (rn/use-callback
-                           (fn [new-text]
-                             (set-value new-text)
-                             (when on-change-text (on-change-text new-text)))
-                           [on-change-text])
-        on-focus          (rn/use-callback
-                           (fn []
-                             (set-state :active)
-                             (when on-focus (on-focus)))
-                           [on-focus])
-        clean-props       (apply dissoc props props-to-remove)]
-    [rn/view {:style style/root-container}
-     (when (and (seq value) (= state :default))
-       [rn/touchable-opacity
-        {:style    style/default-container
-         :on-press focus-input}
-        (when favicon
-          [icon/icon favicon
-           {:accessibility-label :browser-input-favicon
-            :color               favicon-color
-            :container-style     style/favicon-icon-container
-            :size                favicon-size}])
-        [rn/text
-         {:accessibility-label :browser-input-label
-          :style               (style/text)}
-         (remove-http-https-www value)]
-        (when locked?
-          [lock-icon {:blur? blur? :theme theme}])])
-     [rn/view {:style (style/active-container (or (empty? value) (= state :active)))}
-      [rn/text-input
-       (merge
-        clean-props
-        {:accessibility-label    :browser-input
-         :auto-capitalize        :none
-         :auto-correct           false
-         :cursor-color           (cursor-color customization-color theme)
-         :editable               (not disabled?)
-         :keyboard-appearance    (colors/theme-colors :light :dark theme)
-         :keyboard-type          :web-search
-         :on-blur                on-blur
-         :on-change-text         on-change-text
-         :on-focus               on-focus
-         :placeholder-text-color (placeholder-color state blur? theme)
-         :ref                    on-ref
-         :selection-color        (when platform/ios?
-                                   (cursor-color customization-color theme))
-         :select-text-on-focus   true
-         :style                  (style/input disabled?)})]
-      (when (seq value)
-        [clear-button
-         {:blur?    blur?
-          :on-press on-clear
-          :theme    theme}])]]))
+(defn- view-internal
+  [{:keys [default-value]
+    :or   {default-value ""}}]
+  (let [state       (reagent/atom :default)
+        value       (reagent/atom default-value)
+        set-active  #(reset! state :active)
+        set-default #(reset! state :default)
+        set-value   #(reset! value %)
+        ref         (atom nil)
+        clear-input (fn []
+                      (.clear ^js @ref)
+                      (reset! value ""))
+        focus-input (fn []
+                      (set-active)
+                      (.focus ^js @ref))]
+    (fn [{:keys [disabled? blur? on-change-text customization-color
+                 on-clear on-focus on-blur theme get-ref locked?
+                 favicon favicon-color favicon-size]
+          :as   props}]
+      (let [clean-props (apply dissoc props props-to-remove)]
+        [rn/view {:style style/root-container}
+         (when (and (seq @value) (= @state :default))
+           [rn/touchable-opacity
+            {:style    style/default-container
+             :on-press focus-input}
+            (when favicon
+              [icon/icon favicon
+               {:accessibility-label :browser-input-favicon
+                :color               favicon-color
+                :container-style     style/favicon-icon-container
+                :size                favicon-size}])
+            [rn/text
+             {:accessibility-label :browser-input-label
+              :style               (style/text)} (remove-http-https-www @value)]
+            (when locked?
+              [lock-icon
+               {:blur? blur?
+                :theme theme}])])
+         [rn/view {:style (style/active-container (or (empty? @value) (= @state :active)))}
+          [rn/text-input
+           (merge
+            clean-props
+            {:accessibility-label    :browser-input
+             :auto-capitalize        :none
+             :auto-correct           false
+             :cursor-color           (cursor-color customization-color theme)
+             :editable               (not disabled?)
+             :keyboard-appearance    (colors/theme-colors :light :dark theme)
+             :keyboard-type          :web-search
+             :on-blur                (fn []
+                                       (set-default)
+                                       (when on-blur (on-blur)))
+             :on-change-text         (fn [new-text]
+                                       (set-value new-text)
+                                       (when on-change-text (on-change-text new-text)))
+             :on-focus               (fn []
+                                       (set-active)
+                                       (when on-focus (on-focus)))
+             :placeholder-text-color (placeholder-color @state blur? theme)
+             :ref                    (fn [r]
+                                       (reset! ref r)
+                                       (when get-ref (get-ref r)))
+             :selection-color        (when platform/ios?
+                                       (cursor-color customization-color theme))
+             :select-text-on-focus   true
+             :style                  (style/input disabled?)})]
+          (when (seq @value)
+            [clear-button
+             {:blur?    blur?
+              :on-press (fn []
+                          (clear-input)
+                          (when on-clear (on-clear)))
+              :theme    theme}])]]))))
+
+(def view (quo.theme/with-theme view-internal))
@@ -7,9 +7,10 @@
    [quo.foundations.customization-colors :as customization-colors]
    [quo.theme :as theme]
    [react-native.blur :as blur]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

-(defn button
+(defn- button-internal
  "with label
   [button opts \"label\"]
   opts
@@ -28,103 +29,102 @@
    :theme :light/:dark
   only icon
   [button {:icon-only? true} :i/close-circle]"
-  [{:keys [on-press on-long-press disabled? type background size icon-left icon-right icon-top
-           customization-color accessibility-label icon-only? container-style inner-style
-           pressed? on-press-in on-press-out allow-multiple-presses?]
-    :or   {type                :primary
-           size                40
-           customization-color (if (= type :primary) :blue nil)}}
-   children]
-  (let [[pressed-state? set-pressed-state] (rn/use-state false)
-        theme (theme/use-theme-value)
-        {:keys [icon-color background-color label-color border-color blur-type
-                blur-overlay-color border-radius overlay-customization-color]}
-        (button-properties/get-values {:customization-color customization-color
-                                       :background          background
-                                       :type                type
-                                       :theme               theme
-                                       :pressed?            (if pressed? pressed? pressed-state?)
-                                       :icon-only?          icon-only?})
-        icon-size (when (= 24 size) 12)
-        on-press-in-cb (rn/use-callback
-                        (fn []
-                          (set-pressed-state true)
-                          (when on-press-in (on-press-in))))
-        on-press-out-cb (rn/use-callback
-                         (fn []
-                           (set-pressed-state nil)
-                           (when on-press-out (on-press-out))))]
-    [rn/touchable-without-feedback
-     {:disabled                disabled?
-      :accessibility-label     accessibility-label
-      :on-press-in             on-press-in-cb
-      :on-press-out            on-press-out-cb
-      :on-press                on-press
-      :allow-multiple-presses? allow-multiple-presses?
-      :on-long-press           on-long-press}
-     [rn/view
-      {:style (merge
-               (style/shape-style-container size border-radius)
-               container-style)}
-      [rn/view
-       {:style (merge
-                (style/style-container {:size             size
-                                        :disabled?        disabled?
-                                        :border-radius    border-radius
-                                        :background-color background-color
-                                        :border-color     border-color
-                                        :icon-only?       icon-only?
-                                        :icon-top         icon-top
-                                        :icon-left        icon-left
-                                        :icon-right       icon-right})
-                inner-style)}
-       (when overlay-customization-color
-         [customization-colors/overlay
-          {:customization-color overlay-customization-color
-           :theme               theme
-           :pressed?            (if pressed? pressed? pressed-state?)}])
-       (when (= background :photo)
-         [blur/view
-          {:blur-radius   20
-           :blur-type     blur-type
-           :overlay-color blur-overlay-color
-           :style         style/blur-view}])
-       (when icon-top
+  [_ _]
+  (let [pressed-state? (reagent/atom false)]
+    (fn
+      [{:keys [on-press on-long-press disabled? type background size icon-left icon-right icon-top
+               customization-color theme accessibility-label icon-only? container-style inner-style
+               pressed? on-press-in on-press-out allow-multiple-presses?]
+        :or   {type                :primary
+               size                40
+               customization-color (if (= type :primary) :blue nil)}}
+       children]
+      (let [{:keys [icon-color background-color label-color border-color blur-type
+                    blur-overlay-color border-radius overlay-customization-color]}
+            (button-properties/get-values {:customization-color customization-color
+                                           :background          background
+                                           :type                type
+                                           :theme               theme
+                                           :pressed?            (if pressed? pressed? @pressed-state?)
+                                           :icon-only?          icon-only?})
+            icon-size (when (= 24 size) 12)]
+        [rn/touchable-without-feedback
+         {:disabled                disabled?
+          :accessibility-label     accessibility-label
+          :on-press-in             (fn []
+                                     (reset! pressed-state? true)
+                                     (when on-press-in (on-press-in)))
+          :on-press-out            (fn []
+                                     (reset! pressed-state? nil)
+                                     (when on-press-out (on-press-out)))
+          :on-press                on-press
+          :allow-multiple-presses? allow-multiple-presses?
+          :on-long-press           on-long-press}
         [rn/view
-          [quo.icons/icon icon-top
-           {:container-style {:margin-bottom 2}
-            :color           icon-color
-            :size            icon-size}]])
-       (when icon-left
-         [rn/view
-          {:style (style/icon-left-icon-style
-                   {:size      size
-                    :icon-size icon-size})}
-          [quo.icons/icon icon-left
-           {:color icon-color
-            :size  icon-size}]])
-       [rn/view
-        (cond
-          icon-only?
-          [quo.icons/icon children
-           {:color label-color
-            :size  icon-size}]
+          {:style (merge
+                   (style/shape-style-container size border-radius)
+                   container-style)}
+          [rn/view
+           {:style (merge
+                    (style/style-container {:size             size
+                                            :disabled?        disabled?
+                                            :border-radius    border-radius
+                                            :background-color background-color
+                                            :border-color     border-color
+                                            :icon-only?       icon-only?
+                                            :icon-top         icon-top
+                                            :icon-left        icon-left
+                                            :icon-right       icon-right})
+                    inner-style)}
+           (when overlay-customization-color
+             [customization-colors/overlay
+              {:customization-color overlay-customization-color
+               :theme               theme
+               :pressed?            (if pressed? pressed? @pressed-state?)}])
+           (when (= background :photo)
+             [blur/view
+              {:blur-radius   20
+               :blur-type     blur-type
+               :overlay-color blur-overlay-color
+               :style         style/blur-view}])
+           (when icon-top
+             [rn/view
+              [quo.icons/icon icon-top
+               {:container-style {:margin-bottom 2}
+                :color           icon-color
+                :size            icon-size}]])
+           (when icon-left
+             [rn/view
+              {:style (style/icon-left-icon-style
+                       {:size      size
+                        :icon-size icon-size})}
+              [quo.icons/icon icon-left
+               {:color icon-color
+                :size  icon-size}]])
+           [rn/view
+            (cond
+              icon-only?
+              [quo.icons/icon children
+               {:color label-color
+                :size  icon-size}]

-          (string? children)
-          [text/text
-           {:size            (when (#{56 24} size) :paragraph-2)
-            :weight          :medium
-            :number-of-lines 1
-            :style           {:color label-color}}
-           children]
+              (string? children)
+              [text/text
+               {:size            (when (#{56 24} size) :paragraph-2)
+                :weight          :medium
+                :number-of-lines 1
+                :style           {:color label-color}}
+               children]

-          (vector? children)
-          children)]
-       (when icon-right
-         [rn/view
-          {:style (style/icon-right-icon-style
-                   {:size      size
-                    :icon-size icon-size})}
-          [quo.icons/icon icon-right
-           {:color icon-color
-            :size  icon-size}]])]]]))
+              (vector? children)
+              children)]
+           (when icon-right
+             [rn/view
+              {:style (style/icon-right-icon-style
+                       {:size      size
+                        :icon-size icon-size})}
+              [quo.icons/icon icon-right
+               {:color icon-color
+                :size  icon-size}]])]]]))))
+
+(def button (theme/with-theme button-internal))
@@ -3,24 +3,28 @@
    [quo.components.buttons.composer-button.style :as style]
    [quo.components.icon :as quo.icons]
    [quo.theme :as theme]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

-(defn view
-  [{:keys [on-press on-long-press disabled? blur? icon accessibility-label container-style]}]
-  (let [[pressed? set-pressed] (rn/use-state false)
-        theme                  (theme/use-theme-value)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed nil))]
-    [rn/pressable
-     {:accessibility-label (or accessibility-label :composer-button)
-      :on-press            on-press
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-long-press       on-long-press
-      :disabled            disabled?
-      :style               (merge (style/main {:pressed?  pressed?
-                                               :blur?     blur?
-                                               :theme     theme
-                                               :disabled? disabled?})
-                                  container-style)}
-     [quo.icons/icon icon {:color (style/get-label-color {:blur? blur? :theme theme})}]]))
+(defn- view-internal
+  [_ _]
+  (let [pressed? (reagent/atom false)]
+    (fn
+      [{:keys [on-press on-long-press disabled? theme blur? icon accessibility-label container-style]}]
+      [rn/pressable
+       {:accessibility-label (or accessibility-label :composer-button)
+        :on-press            on-press
+        :on-press-in         #(reset! pressed? true)
+        :on-press-out        #(reset! pressed? nil)
+        :on-long-press       on-long-press
+        :disabled            disabled?
+        :style               (merge (style/main {:pressed?  @pressed?
+                                                 :blur?     blur?
+                                                 :theme     theme
+                                                 :disabled? disabled?})
+                                    container-style)}
+       [quo.icons/icon icon
+        {:color (style/get-label-color {:blur? blur?
+                                        :theme theme})}]])))
+
+(def view (theme/with-theme view-internal))
@@ -5,7 +5,8 @@
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

 (defn- get-button-color
  [{:keys [type pressed? customization-color theme]}]
@@ -44,48 +45,48 @@
    :color           (get-icon-and-text-color type theme)
    :container-style (style/container type)}])

-(defn view
+(defn- view-internal
  "[dynamic-button opts]
   opts
   {:type                :jump-to/:mention/:notification-down/:notification-up/:search/:search-with-label/:scroll-to-bottom
    :on-press            fn
    :count               mentions or notifications count
    :customization-color customize jump-to and mention button color}"
-  [{:keys [type label on-press customization-color style] :as args}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        button-color           (get-button-color {:type                type
-                                                  :pressed?            pressed?
-                                                  :customization-color (or customization-color :primary)
-                                                  :theme               theme})
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/touchable-opacity
-     {:on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-press            on-press
-      :active-opacity      1
-      :hit-slop            {:top 5 :bottom 5 :left 5 :right 5}
-      :pointer-events      :auto
-      :style               {:height 24}
-      :accessibility-label type}
-     [rn/view
-      {:style (merge
-               {:flex-direction   :row
-                :height           24
-                :border-radius    12
-                :background-color button-color}
-               style)}
-      (when (#{:mention :search :search-with-label :scroll-to-bottom} type)
-        [icon-view type])
-      (when (#{:jump-to :mention :notification-down :notification-up :search-with-label} type)
-        [text/text
-         {:weight :medium
-          :size   :paragraph-2
-          :style  (assoc (style/text type) :color (get-icon-and-text-color type theme))}
-         (case type
-           :jump-to                                       label
-           :search-with-label                             label
-           (:mention :notification-down :notification-up) (str (:count args)))])
-      (when (#{:jump-to :notification-down :notification-up} type)
-        [icon-view type theme])]]))
+  [_]
+  (let [pressed? (reagent/atom false)]
+    (fn [{:keys [type label on-press customization-color style theme] :as args}]
+      [rn/touchable-opacity
+       {:on-press-in         #(reset! pressed? true)
+        :on-press-out        #(reset! pressed? false)
+        :on-press            on-press
+        :active-opacity      1
+        :hit-slop            {:top 5 :bottom 5 :left 5 :right 5}
+        :pointer-events      :auto
+        :style               {:height 24}
+        :accessibility-label type}
+       [rn/view
+        {:style (merge
+                 {:flex-direction   :row
+                  :height           24
+                  :border-radius    12
+                  :background-color (get-button-color {:type                type
+                                                       :pressed?            @pressed?
+                                                       :customization-color (or customization-color
+                                                                                :primary)
+                                                       :theme               theme})}
+                 style)}
+        (when (#{:mention :search :search-with-label :scroll-to-bottom} type)
+          [icon-view type])
+        (when (#{:jump-to :mention :notification-down :notification-up :search-with-label} type)
+          [text/text
+           {:weight :medium
+            :size   :paragraph-2
+            :style  (assoc (style/text type) :color (get-icon-and-text-color type theme))}
+           (case type
+             :jump-to                                       label
+             :search-with-label                             label
+             (:mention :notification-down :notification-up) (str (:count args)))])
+        (when (#{:jump-to :notification-down :notification-up} type)
+          [icon-view type theme])]])))
+
+(def view (quo.theme/with-theme view-internal))
@@ -6,25 +6,29 @@
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
+    [reagent.core :as reagent]
    [utils.i18n :as i18n]))

-(defn view
-  [{:keys [on-press on-long-press disabled? container-style]}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed nil))]
-    [rn/pressable
-     {:accessibility-label :log-out-button
-      :on-press            on-press
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-long-press       on-long-press
-      :disabled            disabled?
-      :style               (merge (style/main {:pressed?  pressed?
-                                               :theme     theme
-                                               :disabled? disabled?})
-                                  container-style)}
-     [icon/icon :i/log-out {:color (if pressed? colors/white-opa-40 colors/white-opa-70)}]
-     [text/text {:weight :medium :size :paragraph-1}
-      (i18n/label :t/logout)]]))
+(defn- view-internal
+  [_]
+  (let [pressed?     (reagent/atom false)
+        on-press-in  #(reset! pressed? true)
+        on-press-out #(reset! pressed? nil)]
+    (fn
+      [{:keys [on-press on-long-press disabled? theme container-style]}]
+      [rn/pressable
+       {:accessibility-label :log-out-button
+        :on-press            on-press
+        :on-press-in         on-press-in
+        :on-press-out        on-press-out
+        :on-long-press       on-long-press
+        :disabled            disabled?
+        :style               (merge (style/main {:pressed?  @pressed?
+                                                 :theme     theme
+                                                 :disabled? disabled?})
+                                    container-style)}
+       [icon/icon :i/log-out {:color (if pressed? colors/white-opa-40 colors/white-opa-70)}]
+       [text/text {:weight :medium :size :paragraph-1}
+        (i18n/label :t/logout)]])))
+
+(def view (quo.theme/with-theme view-internal))
@@ -1,5 +1,9 @@
 (ns quo.components.buttons.slide-button.animations
-  (:require [react-native.reanimated :as reanimated]))
+  (:require
+    [oops.core :as oops]
+    [quo.components.buttons.slide-button.utils :as utils]
+    [react-native.gesture :as gesture]
+    [react-native.reanimated :as reanimated]))

 (def ^:private extrapolation
  {:extrapolateLeft  "clamp"
@@ -62,6 +66,36 @@
                                                :damping   30
                                                :stiffness 400}))

+(defn- complete-animation
+  [sliding-complete?]
+  (reset! sliding-complete? true))
+
 (defn reset-track-position
  [x-pos]
  (animate-spring x-pos 0))
+
+;; Gestures
+(defn drag-gesture
+  [x-pos
+   gestures-disabled?
+   disabled?
+   track-width
+   sliding-complete?]
+  (let [gestures-enabled? (not (or disabled? @gestures-disabled?))]
+    (-> (gesture/gesture-pan)
+        (gesture/with-test-ID :slide-button-gestures)
+        (gesture/enabled gestures-enabled?)
+        (gesture/min-distance 0)
+        (gesture/on-update (fn [event]
+                             (let [x-translation (oops/oget event "translationX")
+                                   clamped-x     (utils/clamp-value x-translation 0 track-width)
+                                   reached-end?  (>= clamped-x track-width)]
+                               (reanimated/set-shared-value x-pos clamped-x)
+                               (when (and reached-end? (not @sliding-complete?))
+                                 (reset! gestures-disabled? true)
+                                 (complete-animation sliding-complete?)))))
+        (gesture/on-end (fn [event]
+                          (let [x-translation (oops/oget event "translationX")
+                                reached-end?  (>= x-translation track-width)]
+                            (when (not reached-end?)
+                              (reset-track-position x-pos))))))))
@@ -11,33 +11,94 @@
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [react-native.gesture :as gesture]
-    [react-native.reanimated :as reanimated]))
+    [react-native.reanimated :as reanimated]
+    [reagent.core :as reagent]))

-(defn drag-gesture
-  [x-pos disabled? track-width sliding-complete?
-   set-sliding-complete
-   on-complete reset-fn]
-  (-> (gesture/gesture-pan)
-      (gesture/with-test-ID :slide-button-gestures)
-      (gesture/enabled (not disabled?))
-      (gesture/min-distance 0)
-      (gesture/on-update (fn [event]
-                           (let [x-translation (oops/oget event "translationX")
-                                 clamped-x     (utils/clamp-value x-translation 0 track-width)
-                                 reached-end?  (>= clamped-x track-width)]
-                             (reanimated/set-shared-value x-pos clamped-x)
-                             (when (and reached-end? (not sliding-complete?))
-                               (set-sliding-complete true)
-                               (when on-complete (on-complete reset-fn))))))
-      (gesture/on-end (fn [event]
-                        (let [x-translation (oops/oget event "translationX")
-                              reached-end?  (>= x-translation track-width)]
-                          (when (not reached-end?)
-                            (animations/reset-track-position x-pos)))))))
+(defn- f-slider
+  [{:keys [disabled?]}]
+  (let [track-width        (reagent/atom nil)
+        sliding-complete?  (reagent/atom false)
+        gestures-disabled? (reagent/atom disabled?)
+        on-track-layout    (fn [evt]
+                             (let [width (oops/oget evt "nativeEvent.layout.width")]
+                               (reset! track-width width)))]
+    (fn [{:keys [on-reset
+                 on-complete
+                 track-text
+                 track-icon
+                 disabled?
+                 customization-color
+                 size
+                 container-style
+                 theme
+                 type
+                 blur?]}]
+      (let [x-pos             (reanimated/use-shared-value 0)
+            dimensions        (partial utils/get-dimensions
+                                       (or @track-width constants/default-width)
+                                       size)
+            interpolate-track (partial animations/interpolate-track
+                                       x-pos
+                                       (dimensions :usable-track)
+                                       (dimensions :thumb))
+            custom-color      (if (= type :danger) :danger customization-color)]
+        (rn/use-effect (fn []
+                         (when @sliding-complete?
+                           (on-complete)))
+                       [@sliding-complete?])
+        (rn/use-effect (fn []
+                         (when on-reset
+                           (reset! sliding-complete? false)
+                           (reset! gestures-disabled? false)
+                           (animations/reset-track-position x-pos)
+                           (on-reset)))
+                       [on-reset])
+        [gesture/gesture-detector
+         {:gesture (animations/drag-gesture x-pos
+                                            gestures-disabled?
+                                            disabled?
+                                            (dimensions :usable-track)
+                                            sliding-complete?)}
+         [reanimated/view
+          {:test-ID   :slide-button-track
+           :style     (merge (style/track {:disabled?           disabled?
+                                           :customization-color custom-color
+                                           :height              (dimensions :track-height)
+                                           :blur?               blur?})
+                             container-style)
+           :on-layout (when-not (some? @track-width)
+                        on-track-layout)}
+          [reanimated/view {:style (style/track-cover interpolate-track)}
+           [rn/view {:style (style/track-cover-text-container @track-width)}
+            [icon/icon track-icon
+             {:color (utils/text-color custom-color theme blur?)
+              :size  20}]
+            [rn/view {:width 4}]
+            [text/text
+             {:weight :medium
+              :size   :paragraph-1
+              :style  (style/track-text custom-color theme blur?)}
+             track-text]]]
+          [reanimated/view
+           {:style (style/thumb-container {:interpolate-track   interpolate-track
+                                           :thumb-size          (dimensions :thumb)
+                                           :customization-color custom-color
+                                           :theme               theme
+                                           :blur?               blur?})}
+           [reanimated/view {:style (style/arrow-icon-container interpolate-track)}
+            [icon/icon :arrow-right
+             {:color colors/white
+              :size  20}]]
+           [reanimated/view
+            {:style (style/action-icon interpolate-track
+                                       (dimensions :thumb))}
+            [icon/icon track-icon
+             {:color colors/white
+              :size  20}]]]]]))))

-(defn view
+(defn- view-internal
  "Options
-  - `on-complete`         Callback called when the sliding is complete, returns reset fn as a parameter
+  - `on-complete`         Callback called when the sliding is complete
  - `disabled?`           Boolean that disables the button
                          (_and gestures_)
  - `size`                :size/s-40`/`:size/s-48`
@@ -45,73 +106,9 @@
  - `track-icon`          Key of the icon shown on the track
                          (e.g. `:face-id`)
  - `customization-color` Customization color
+  - `on-reset`            A callback which can be used to reset the component and run required functionality
  "
-  [{:keys [on-complete track-text track-icon disabled? customization-color size
-           container-style type blur?]}]
-  (let [theme                         (quo.theme/use-theme-value)
-        x-pos                         (reanimated/use-shared-value 0)
-        [track-width set-track-width] (rn/use-state nil)
-        [sliding-complete?
-         set-sliding-complete]        (rn/use-state false)
-        on-track-layout               (rn/use-callback
-                                       #(set-track-width (oops/oget % "nativeEvent.layout.width")))
-        reset-fn                      (rn/use-callback
-                                       (fn []
-                                         (set-sliding-complete false)
-                                         (animations/reset-track-position x-pos)))
-        dimensions                    (rn/use-callback
-                                       (partial utils/get-dimensions
-                                                (or track-width constants/default-width)
-                                                size)
-                                       [track-width])
-        interpolate-track             (rn/use-callback
-                                       (partial animations/interpolate-track
-                                                x-pos
-                                                (dimensions :usable-track)
-                                                (dimensions :thumb))
-                                       [dimensions])
-        custom-color                  (if (= type :danger) :danger customization-color)
-        gesture                       (rn/use-memo #(drag-gesture x-pos
-                                                                  disabled?
-                                                                  (dimensions :usable-track)
-                                                                  sliding-complete?
-                                                                  set-sliding-complete
-                                                                  on-complete
-                                                                  reset-fn)
-                                                   [sliding-complete? disabled?])]
-    [gesture/gesture-detector
-     {:gesture gesture}
-     [reanimated/view
-      {:test-ID   :slide-button-track
-       :style     (merge (style/track {:disabled?           disabled?
-                                       :customization-color custom-color
-                                       :height              (dimensions :track-height)
-                                       :blur?               blur?})
-                         container-style)
-       :on-layout on-track-layout}
-      [reanimated/view {:style (style/track-cover interpolate-track)}
-       [rn/view {:style (style/track-cover-text-container track-width)}
-        [icon/icon track-icon
-         {:color (utils/text-color custom-color theme blur?)
-          :size  20}]
-        [rn/view {:width 4}]
-        [text/text
-         {:weight :medium
-          :size   :paragraph-1
-          :style  (style/track-text custom-color theme blur?)}
-         track-text]]]
-      [reanimated/view
-       {:style (style/thumb-container {:interpolate-track   interpolate-track
-                                       :thumb-size          (dimensions :thumb)
-                                       :customization-color custom-color
-                                       :theme               theme
-                                       :blur?               blur?})}
-       [reanimated/view {:style (style/arrow-icon-container interpolate-track)}
-        [icon/icon :arrow-right
-         {:color colors/white
-          :size  20}]]
-       [reanimated/view
-        {:style (style/action-icon interpolate-track (dimensions :thumb))}
-        [icon/icon track-icon
-         {:color colors/white
-          :size  20}]]]]]))
+  [props]
+  [:f> f-slider props])
+
+(def view (quo.theme/with-theme view-internal))
@@ -4,24 +4,26 @@
    [quo.components.icon :as quo.icons]
    [quo.foundations.colors :as colors]
    [quo.theme :as theme]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

-(defn view
-  [{:keys [on-press on-long-press disabled? icon accessibility-label container-style]}]
-  (let [theme                  (theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed nil))]
-    [rn/pressable
-     {:accessibility-label (or accessibility-label :wallet-button)
-      :on-press            on-press
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-long-press       on-long-press
-      :disabled            disabled?
-      :style               (merge (style/main {:pressed?  pressed?
-                                               :theme     theme
-                                               :disabled? disabled?})
-                                  container-style)}
-     [quo.icons/icon icon
-      {:color (colors/theme-colors colors/neutral-100 colors/white theme)}]]))
+(defn- view-internal
+  []
+  (let [pressed? (reagent/atom false)]
+    (fn
+      [{:keys [on-press on-long-press disabled? icon accessibility-label container-style theme]}]
+      [rn/pressable
+       {:accessibility-label (or accessibility-label :wallet-button)
+        :on-press            on-press
+        :on-press-in         #(reset! pressed? true)
+        :on-press-out        #(reset! pressed? nil)
+        :on-long-press       on-long-press
+        :disabled            disabled?
+        :style               (merge (style/main {:pressed?  @pressed?
+                                                 :theme     theme
+                                                 :disabled? disabled?})
+                                    container-style)}
+       [quo.icons/icon icon
+        {:color (colors/theme-colors colors/neutral-100 colors/white theme)}]])))
+
+(def view (theme/with-theme view-internal))
@@ -8,36 +8,36 @@
    [quo.components.calendar.calendar.years-list.view :as years-list]
    [quo.theme :as theme]
    [react-native.core :as rn]
+    [reagent.core :as reagent]
    [utils.number :as utils.number]))

-(defn view
-  [{:keys [on-change start-date end-date]}]
-  (let [theme                               (theme/use-theme-value)
-        [selected-year set-selected-year]   (rn/use-state (utils/current-year))
-        [selected-month set-selected-month] (rn/use-state (utils/current-month))
-        on-change-year                      (rn/use-callback #(set-selected-year %))
-        on-change-month                     (rn/use-callback
-                                             (fn [new-date]
-                                               (set-selected-year
-                                                (utils.number/parse-int (:year new-date)))
-                                               (set-selected-month
-                                                (utils.number/parse-int (:month new-date)))))]
-    [rn/view
-     {:style (style/container theme)}
-     [years-list/view
-      {:on-change-year on-change-year
-       :year           selected-year}]
-     [rn/view
-      {:style style/container-main}
-      [month-picker/view
-       {:year      selected-year
-        :month     selected-month
-        :on-change on-change-month}]
-      [weekdays-header/view]
-      [days-grid/view
-       {:year                selected-year
-        :month               selected-month
-        :start-date          start-date
-        :end-date            end-date
-        :on-change           on-change
-        :customization-color :blue}]]]))
+(defn- view-internal
+  []
+  (let [selected-year   (reagent/atom (utils/current-year))
+        selected-month  (reagent/atom (utils/current-month))
+        on-change-year  #(reset! selected-year %)
+        on-change-month (fn [new-date]
+                          (reset! selected-year (utils.number/parse-int (:year new-date)))
+                          (reset! selected-month (utils.number/parse-int (:month new-date))))]
+    (fn [{:keys [on-change start-date end-date theme]}]
+      [rn/view
+       {:style (style/container theme)}
+       [years-list/view
+        {:on-change-year on-change-year
+         :year           @selected-year}]
+       [rn/view
+        {:style style/container-main}
+        [month-picker/view
+         {:year      @selected-year
+          :month     @selected-month
+          :on-change on-change-month}]
+        [weekdays-header/view]
+        [days-grid/view
+         {:year                @selected-year
+          :month               @selected-month
+          :start-date          start-date
+          :end-date            end-date
+          :on-change           on-change
+          :customization-color :blue}]]])))
+
+(def view (theme/with-theme view-internal))
@@ -1,6 +1,7 @@
 (ns quo.components.colors.color-picker.component-spec
  (:require
    [quo.components.colors.color-picker.view :as color-picker]
+    [reagent.core :as reagent]
    [test-helpers.component :as h]))

 (h/describe "color-picker"
@@ -11,7 +12,7 @@
      (-> (h/expect event)
          (.toHaveBeenCalled))))
  (h/test "color picker color changed"
-    (let [selected (atom nil)]
+    (let [selected (reagent/atom nil)]
      (h/render [color-picker/view {:on-change #(reset! selected %)}])
      (h/fire-event :press (get (h/get-all-by-label-text :color-picker-item) 0))
      (-> (h/expect @selected)
@@ -3,7 +3,13 @@
    [quo.components.colors.color.constants :as constants]
    [quo.components.colors.color.view :as color]
    [quo.foundations.colors :as colors]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))
+
+(defn- on-change-handler
+  [selected color-name on-change]
+  (reset! selected color-name)
+  (when on-change (on-change color-name)))

 (defn get-item-layout
  [_ index]
@@ -12,34 +18,15 @@
    :offset (* (+ constants/color-size 8) index)
    :index  index})

-(defn view
+(defn- view-internal
  "Options
   - `default-selected` Default selected color name.
   - `on-change` Callback called when a color is selected `(fn [color-name])`.
   - `blur?` Boolean to enable blur background support.}"
  [{:keys [default-selected blur? on-change feng-shui? container-style]}]
-  (let [[selected set-selected] (rn/use-state default-selected)
-        {window-width :width}   (rn/get-window)
-        ref                     (rn/use-ref-atom nil)
-        on-ref                  (rn/use-callback #(reset! ref %))
-        render-fn               (rn/use-callback
-                                 (fn [color idx]
-                                   [color/view
-                                    {:selected?    (= color selected)
-                                     :on-press     (fn [color-name]
-                                                     (.scrollToIndex ^js @ref
-                                                                     #js
-                                                                      {:animated     true
-                                                                       :index        idx
-                                                                       :viewPosition 0.5})
-                                                     (set-selected color-name)
-                                                     (when on-change (on-change color-name)))
-                                     :blur?        blur?
-                                     :key          color
-                                     :color        color
-                                     :idx          idx
-                                     :window-width window-width}])
-                                 [selected blur? on-change @ref])]
+  (let [selected              (reagent/atom default-selected)
+        {window-width :width} (rn/get-window)
+        ref                   (atom nil)]
    (rn/use-mount
     (fn []
       (js/setTimeout
@@ -53,14 +40,32 @@
                                        :viewPosition 0.5})))))
        50)))
    [rn/flat-list
-     {:ref                               on-ref
+     {:ref                               #(reset! ref %)
      ;; TODO: using :feng-shui? temporarily while b & w is being developed.
      ;; https://github.com/status-im/status-mobile/discussions/16676
      :data                              (if feng-shui?
                                           (conj colors/account-colors :feng-shui)
                                           colors/account-colors)
-      :render-fn                         render-fn
+      :render-fn                         (fn [color idx]
+                                           [color/view
+                                            {:selected?    (= color @selected)
+                                             :on-press     (fn [e]
+                                                             (.scrollToIndex ^js @ref
+                                                                             #js
+                                                                              {:animated     true
+                                                                               :index        idx
+                                                                               :viewPosition 0.5})
+                                                             (on-change-handler selected e on-change))
+                                             :blur?        blur?
+                                             :key          color
+                                             :color        color
+                                             :idx          idx
+                                             :window-width window-width}])
      :get-item-layout                   get-item-layout
      :horizontal                        true
      :shows-horizontal-scroll-indicator false
      :content-container-style           container-style}]))
+
+(defn view
+  [props]
+  [:f> view-internal props])
@@ -35,11 +35,12 @@
 (defn image
  "Same as rn/image but cache the image source in a js/Set, so the image won't
  flicker when re-render on android"
-  [props]
-  (let [[loaded-source set-loaded-source] (rn/use-state nil)
-        on-source-loaded                  (rn/use-callback #(set-loaded-source %))]
-    (if platform/ios?
-      [rn/image props]
-      [:<>
-       [rn/image (assoc props :source loaded-source)]
-       [caching-image props on-source-loaded]])))
+  []
+  (let [loaded-source    (reagent/atom nil)
+        on-source-loaded #(reset! loaded-source %)]
+    (fn [props]
+      (if platform/ios?
+        [rn/image props]
+        [:<>
+         [rn/image (assoc props :source @loaded-source)]
+         [caching-image props on-source-loaded]]))))
@@ -20,8 +20,8 @@
    [text/text {:size :paragraph-1 :weight :medium :number-of-lines 2} label]]])

 (defn channel-actions
-  [{:keys [container-style actions]}]
-  [rn/view {:style (assoc container-style :flex-direction :row)}
+  [{:keys [style actions]}]
+  [rn/view {:style (merge {:flex-direction :row :flex 1} style)}
   (map-indexed
    (fn [index action]
      ^{:key index}
@@ -142,6 +142,7 @@
  [color]
  {:padding          12
   :height           102
+   :flex             1
   :border-radius    16
   :background-color (colors/custom-color color 50 10)
   :justify-content  :space-between})
@@ -65,7 +65,7 @@
                                   {:title                "Title"
                                    :type                 :account
                                    :account-avatar-emoji "🍿"
-                                    :networks             [{:network-name :ethereum :short-name "eth"}]
+                                    :networks             [{:name :ethereum :short-name "eth"}]
                                    :description          "0x62b...0a5"
                                    :customization-color  :purple}]
                                  theme)
@@ -76,8 +76,7 @@
   (str description " · " (i18n/label :t/on-device))])

 (defn- context-tag-subtitle
-  [{:keys [context-tag-type community-logo community-name account-name emoji customization-color
-           full-name profile-picture]}]
+  [{:keys [context-tag-type community-logo community-name account-name emoji customization-color]}]
  (let [tag-type (or context-tag-type :account)]
    [rn/view
     {:accessibility-label :context-tag-wrapper
@@ -89,9 +88,7 @@
       :community-name      community-name
       :community-logo      community-logo
       :size                24
-       :customization-color customization-color
-       :profile-picture     profile-picture
-       :full-name           full-name}]]))
+       :customization-color customization-color}]]))

 (defn- description-subtitle
  [{:keys [theme blur? description]}]
@@ -103,7 +100,7 @@

 (defn- subtitle
  [{:keys [type theme blur? keycard? networks description community-name community-logo
-           context-tag-type account-name emoji customization-color full-name profile-picture]}]
+           context-tag-type account-name emoji customization-color]}]
  (cond
    (= :keypair type)
    [keypair-subtitle
@@ -131,9 +128,7 @@
      :community-name      community-name
      :account-name        account-name
      :emoji               emoji
-      :customization-color customization-color
-      :profile-picture     profile-picture
-      :full-name           full-name}]
+      :customization-color customization-color}]

    (and (not= :label type) description)
    [description-subtitle
@@ -192,7 +187,7 @@
           on-button-press
           on-button-long-press
           button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar
-           profile-picture keycard? networks label full-name]}]
+           profile-picture keycard? networks label]}]
  [rn/view {:style style/container}
   (when (left-image-supported-types type)
     [rn/view {:style style/left-container}
@@ -223,9 +218,7 @@
      :context-tag-type    context-tag-type
      :customization-color customization-color
      :account-name        account-name
-      :emoji               emoji
-      :full-name           full-name
-      :profile-picture     profile-picture}]]
+      :emoji               emoji}]]
   [right-icon
    {:theme                theme
     :type                 type
@@ -3,23 +3,25 @@
    [quo.components.dropdowns.network-dropdown.style :as style]
    [quo.components.list-items.preview-list.view :as preview-list]
    [quo.theme :as quo.theme]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

-(defn view
-  [{:keys [on-press state] :as props} networks]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/pressable
-     {:style               (style/dropdown-container (merge props {:pressed? pressed? :theme theme}))
-      :accessibility-label :network-dropdown
-      :disabled            (= state :disabled)
-      :on-press            on-press
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out}
-     [preview-list/view
-      {:type      :network
-       :list-size (count networks)
-       :size      :size-20}
-      networks]]))
+(defn- internal-view
+  [_ _]
+  (let [pressed? (reagent/atom false)]
+    (fn
+      [{:keys [on-press state] :as props} networks]
+      [rn/pressable
+       {:style               (style/dropdown-container (merge props {:pressed? @pressed?}))
+        :accessibility-label :network-dropdown
+        :disabled            (= state :disabled)
+        :on-press            on-press
+        :on-press-in         (fn [] (reset! pressed? true))
+        :on-press-out        (fn [] (reset! pressed? false))}
+       [preview-list/view
+        {:type      :network
+         :list-size (count networks)
+         :size      :size-20}
+        networks]])))
+
+(def view (quo.theme/with-theme internal-view))
@@ -2,10 +2,5 @@

 (defn root-container
  [opacity height]
-  {:height   (or height 252)
-   :opacity  opacity
-   :position :absolute
-   :top      0
-   :left     0
-   :right    0
-   :z-index  -1})
+  {:height  (or height 252)
+   :opacity opacity})
@@ -14,6 +14,7 @@
 (def initial-spacing 56)
 (def end-spacing 22)
 (def y-axis-label-width -33)
+(def inspecting? (reagent/atom false))

 (defn- pointer
  [customization-color]
@@ -31,9 +32,14 @@
   :pointer-color                 customization-color
   :pointer-strip-enable-gradient true})

+(defn- get-pointer-props
+  [pointer-props]
+  (let [pointer-index (.-pointerIndex ^js pointer-props)]
+    (reset! inspecting? (not= pointer-index -1))))
+
 (defn- get-line-color
-  [state theme inspecting?]
-  (if inspecting?
+  [state theme]
+  (if @inspecting?
    (colors/theme-colors colors/neutral-80-opa-40
                         colors/white-opa-20
                         theme)
@@ -45,13 +51,11 @@
                           colors/danger-60
                           theme))))

-(defn view
-  [{:keys [data state customization-color reference-value reference-prefix decimal-separator]
+(defn- view-internal
+  [{:keys [data state customization-color theme reference-value reference-prefix decimal-separator]
    :or   {reference-prefix  "$"
           decimal-separator :dot}}]
-  (let [theme                            (quo.theme/use-theme-value)
-        [inspecting? set-inspecting]     (rn/use-state false)
-        data                             (if (> (count data) max-data-points)
+  (let [data                             (if (> (count data) max-data-points)
                                           (utils/downsample-data data max-data-points)
                                           data)
        highest-value                    (utils/find-highest-value data)
@@ -60,11 +64,7 @@
        max-value                        (- (utils/calculate-rounded-max highest-value) min-value)
        step-value                       (/ max-value 4)
        width                            (:width (rn/get-window))
-        line-color                       (get-line-color state theme inspecting?)
-        get-pointer-props                (rn/use-callback
-                                          (fn [pointer-props]
-                                            (let [pointer-index (.-pointerIndex ^js pointer-props)]
-                                              (set-inspecting (not= pointer-index -1)))))
+        line-color                       (get-line-color state theme)
        rules-color                      (colors/theme-colors colors/neutral-80-opa-10
                                                              colors/white-opa-5
                                                              theme)
@@ -119,7 +119,7 @@
       :show-strip-on-focus              true
       :reference-line-1-config          {:color rules-color}
       :reference-line-1-position        0
-       :show-reference-line-2            (and (not inspecting?)
+       :show-reference-line-2            (and (not @inspecting?)
                                              (<= reference-value highest-value)
                                              (>= reference-value lowest-value))
       :reference-line-2-config          {:color            y-axis-label-text-color
@@ -138,3 +138,5 @@
       :x-axis-label-text-style          (style/x-axis-label-text (/ width (count x-axis-label-texts))
                                                                  y-axis-label-text-color)
       :x-axis-label-texts               x-axis-label-texts}]]))
+
+(def view (quo.theme/with-theme view-internal))
@@ -6,7 +6,8 @@
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [react-native.reanimated :as reanimated]))
+    [react-native.reanimated :as reanimated]
+    [reagent.core :as reagent]))

 (def header-height 56)

@@ -56,7 +57,7 @@
   :justify-content :center
   :align-items     :flex-end})

-(defn get-title-style
+(defn title-style
  [{:keys [left right]} title-align]
  (merge
   absolute-fill
@@ -132,77 +133,76 @@
             :size            :large}
            title])])

-(defn header
-  [{:keys [left-accessories left-component border-bottom left-width right-width
-           right-accessories right-component insets get-layout
-           title subtitle title-component style title-align
-           background]
-    :or   {title-align   :center
-           border-bottom false}}]
-  (let [theme               (quo.theme/use-theme-value)
-        [layout set-layout] (rn/use-state {:left  {:width  (or left-width 8)
-                                                   :height header-height}
-                                           :right {:width  (or right-width 8)
-                                                   :height header-height}
-                                           :title {:width  0
-                                                   :height header-height}})
-        handle-layout       (rn/use-callback
-                             (fn [el get-layout]
-                               (fn [evt]
-                                 (let [width  (oget evt "nativeEvent" "layout" "width")
-                                       height (oget evt "nativeEvent" "layout" "height")]
-                                   (when get-layout
-                                     (get-layout el
-                                                 {:width  width
-                                                  :height height}))
-                                   (set-layout
-                                    (assoc layout
-                                           el
-                                           {:width  width
-                                            :height height})))))
-                             [layout])
-        status-bar-height   (get insets :top 0)
-        height              (+ header-height status-bar-height)
-        title-style         (rn/use-memo (fn [] (get-title-style layout title-align))
-                                         [layout title-align])]
-    [reanimated/view
-     {:style (header-wrapper-style {:height        height
-                                    :background    background
-                                    :border-bottom border-bottom
-                                    :theme         theme})}
-     [rn/view
-      {:pointer-events :box-none
-       :height         status-bar-height}]
-     [rn/view
-      {:style          (merge {:height header-height}
-                              style)
-       :pointer-events :box-none}
-      [rn/view
-       {:style          absolute-fill
-        :pointer-events :box-none}
-       [rn/view
-        {:style          content
-         :pointer-events :box-none}
-        [rn/view
-         {:style          left-style
-          :on-layout      (handle-layout :left get-layout)
-          :pointer-events :box-none}
-         [header-actions
-          {:accessories left-accessories
-           :component   left-component}]]
-        [rn/view
-         {:style          title-style
-          :on-layout      (handle-layout :title get-layout)
-          :pointer-events :box-none}
-         [header-title
-          {:title       title
-           :subtitle    subtitle
-           :title-align title-align
-           :component   title-component}]]
-        [rn/view
-         {:style          right-style
-          :on-layout      (handle-layout :right get-layout)
-          :pointer-events :box-none}
-         [header-actions
-          {:accessories right-accessories
-           :component   right-component}]]]]]]))
+(defn- header-internal
+  [{:keys [left-width right-width]}]
+  (let [layout        (reagent/atom {:left  {:width  (or left-width 8)
+                                             :height header-height}
+                                     :right {:width  (or right-width 8)
+                                             :height header-height}
+                                     :title {:width  0
+                                             :height header-height}})
+        handle-layout (fn [el get-layout]
+                        (fn [evt]
+                          (let [width  (oget evt "nativeEvent" "layout" "width")
+                                height (oget evt "nativeEvent" "layout" "height")]
+                            (when get-layout
+                              (get-layout el
+                                          {:width  width
+                                           :height height}))
+                            (swap! layout assoc
+                              el
+                              {:width  width
+                               :height height}))))]
+    (fn
+      [{:keys [left-accessories left-component border-bottom
+               right-accessories right-component insets get-layout
+               title subtitle title-component style title-align
+               background theme]
+        :or   {title-align   :center
+               border-bottom false}}]
+      (let [status-bar-height (get insets :top 0)
+            height            (+ header-height status-bar-height)]
+        [reanimated/view
+         {:style (header-wrapper-style {:height        height
+                                        :background    background
+                                        :border-bottom border-bottom
+                                        :theme         theme})}
+         [rn/view
+          {:pointer-events :box-none
+           :height         status-bar-height}]
+         [rn/view
+          {:style          (merge {:height header-height}
+                                  style)
+           :pointer-events :box-none}
+          [rn/view
+           {:style          absolute-fill
+            :pointer-events :box-none}
+           [rn/view
+            {:style          content
+             :pointer-events :box-none}
+            [rn/view
+             {:style          left-style
+              :on-layout      (handle-layout :left get-layout)
+              :pointer-events :box-none}
+             [header-actions
+              {:accessories left-accessories
+               :component   left-component}]]
+
+            [rn/view
+             {:style          (title-style @layout title-align)
+              :on-layout      (handle-layout :title get-layout)
+              :pointer-events :box-none}
+             [header-title
+              {:title       title
+               :subtitle    subtitle
+               :title-align title-align
+               :component   title-component}]]
+            [rn/view
+             {:style          right-style
+              :on-layout      (handle-layout :right get-layout)
+              :pointer-events :box-none}
+             [header-actions
+              {:accessories right-accessories
+               :component   right-component}]]]]]]))))
+
+(def header (quo.theme/with-theme header-internal))
@@ -3,7 +3,7 @@
    [quo.foundations.colors :as colors]))

 (def ^:private themes
-  {:light {:default      {:bg     colors/neutral-5
+  {:light {:default      {:bg     colors/white
                          :border colors/neutral-20
                          :icon   colors/neutral-50
                          :text   colors/neutral-100}
@@ -20,7 +20,7 @@
      (h/fire-event :on-focus (h/get-by-label-text :address-text-input))
      (h/has-prop (h/get-by-label-text :address-text-input)
                  :placeholder-text-color
-                  colors/neutral-30)))
+                  colors/neutral-40)))

  (h/test "on focus with blur? true"
    (with-redefs [clipboard/get-string #(% "")]
@@ -30,22 +30,27 @@
      (h/fire-event :on-focus (h/get-by-label-text :address-text-input))
      (h/has-prop (h/get-by-label-text :address-text-input)
                  :placeholder-text-color
-                  colors/neutral-80-opa-20)))
+                  colors/neutral-80-opa-40)))

-  (h/test "default value is properly set"
-    (let [default-value "default-value"]
+  (h/test "scanned value is properly set"
+    (let [on-change-text (h/mock-fn)
+          scanned-value  "scanned-value"]
      (with-redefs [clipboard/get-string #(% "")]
        (h/render [address-input/address-input
-                   {:default-value default-value
-                    :ens-regex     ens-regex}])
-        (h/has-prop (h/get-by-label-text :address-text-input)
-                    :value
-                    default-value))))
+                   {:scanned-value  scanned-value
+                    :on-change-text on-change-text
+                    :ens-regex      ens-regex}])
+        (-> (h/wait-for #(h/get-by-label-text :clear-button))
+            (.then (fn []
+                     (h/was-called-with on-change-text scanned-value)
+                     (h/has-prop (h/get-by-label-text :address-text-input)
+                                 :default-value
+                                 scanned-value)))))))

  (h/test "clear icon is shown when input has text"
    (with-redefs [clipboard/get-string #(% "")]
      (h/render [address-input/address-input
-                 {:default-value "default value"
+                 {:scanned-value "scanned value"
                  :ens-regex     ens-regex}])
      (-> (h/wait-for #(h/get-by-label-text :clear-button-container))
          (.then #(h/is-truthy (h/get-by-label-text :clear-button))))))
@@ -53,7 +58,7 @@
  (h/test "on blur with text and blur? false"
    (with-redefs [clipboard/get-string #(% "")]
      (h/render [address-input/address-input
-                 {:default-value "default value"
+                 {:scanned-value "scanned value"
                  :ens-regex     ens-regex}])
      (-> (h/wait-for #(h/get-by-label-text :clear-button))
          (.then (fn []
@@ -66,7 +71,7 @@
  (h/test "on blur with text blur? true"
    (with-redefs [clipboard/get-string #(% "")]
      (h/render [address-input/address-input
-                 {:default-value "default value"
+                 {:scanned-value "scanned value"
                  :blur?         true
                  :ens-regex     ens-regex}])
      (-> (h/wait-for #(h/get-by-label-text :clear-button))
@@ -101,7 +106,7 @@
    (let [on-clear (h/mock-fn)]
      (with-redefs [clipboard/get-string #(% "")]
        (h/render [address-input/address-input
-                   {:default-value "default value"
+                   {:scanned-value "scanned value"
                    :on-clear      on-clear
                    :ens-regex     ens-regex}])
        (-> (h/wait-for #(h/get-by-label-text :clear-button))
@@ -143,7 +148,7 @@
        (-> (h/wait-for #(h/get-by-label-text :clear-button))
            (.then (fn []
                     (h/has-prop (h/get-by-label-text :address-text-input)
-                                 :value
+                                 :default-value
                                 clipboard)))))))

  (h/test "ENS loading state and call on-detect-ens"
@@ -8,6 +8,7 @@
    [react-native.clipboard :as clipboard]
    [react-native.core :as rn]
    [react-native.platform :as platform]
+    [reagent.core :as reagent]
    [utils.i18n :as i18n]))

 (defn- icon-color
@@ -54,135 +55,124 @@
    (and (not= status :default) (not blur?))
    (colors/theme-colors colors/neutral-30 colors/neutral-60 theme)))

-(defn address-input
-  [{:keys [default-value blur? on-change-text on-blur on-focus on-clear on-scan
-           on-detect-ens on-detect-address on-detect-unclassified address-regex ens-regex
-           valid-ens-or-address? container-style]}]
-  (let [theme                    (quo.theme/use-theme-value)
-        [status set-status]      (rn/use-state :default)
-        value                    (rn/use-ref-atom nil)
-        [_ trigger-render-value] (rn/use-state @value)
-        [focused? set-focused]   (rn/use-state false)
-        on-change                (rn/use-callback
-                                  (fn [text]
-                                    (let [address? (when address-regex
-                                                     (boolean (re-matches address-regex text)))
-                                          ens?     (when ens-regex
-                                                     (boolean (re-matches ens-regex text)))]
-                                      (reset! value text)
-                                      (if (> (count text) 0)
-                                        (set-status :typing)
-                                        (set-status :active))
-                                      (when on-change-text
-                                        (on-change-text text))
-                                      (when (and on-detect-ens ens?)
-                                        (set-status :loading)
-                                        (on-detect-ens text #(set-status :typing)))
-                                      (when (and address? on-detect-address)
-                                        (set-status :loading)
-                                        (on-detect-address text))
-                                      (when (and (not address?)
-                                                 (not ens?)
-                                                 on-detect-unclassified)
-                                        (on-detect-unclassified text)))))
-        set-value                (rn/use-callback
-                                  (fn [new-value]
-                                    (reset! value new-value)
-                                    (on-change new-value)
-                                    (trigger-render-value new-value)))
-        on-paste                 (rn/use-callback
-                                  (fn []
-                                    (clipboard/get-string
-                                     (fn [clipboard]
-                                       (when-not (empty? clipboard)
-                                         (set-value clipboard))))))
-        on-clear                 (rn/use-callback
-                                  (fn []
-                                    (set-value "")
-                                    (set-status (if focused? :active :default))
-                                    (when on-change-text
-                                      (on-change-text ""))
-                                    (when on-clear
-                                      (on-clear)))
-                                  [focused?])
-        on-clear                 (rn/use-callback
-                                  (fn []
-                                    (set-value "")
-                                    (set-status (if focused? :active :default))
-                                    (when on-change-text
-                                      (on-change-text ""))
-                                    (when on-clear
-                                      (on-clear)))
-                                  [focused?])
-        on-scan                  (when on-scan (rn/use-callback #(on-scan set-value)))
-        on-focus                 (rn/use-callback
-                                  (fn []
-                                    (when (= (count @value) 0)
-                                      (set-status :active))
-                                    (set-focused true)
-                                    (when on-focus (on-focus))))
-        on-blur                  (rn/use-callback
-                                  (fn []
-                                    (when (= status :active)
-                                      (set-status :default))
-                                    (set-focused false)
-                                    (when on-blur (on-blur)))
-                                  [status])
-        placeholder-text-color   (rn/use-memo #(get-placeholder-text-color status theme blur?)
-                                              [status theme blur?])]
-    (rn/use-mount #(on-change (or default-value "")))
-    [rn/view {:style (style/container container-style)}
-     [rn/text-input
-      {:accessibility-label    :address-text-input
-       :style                  (style/input-text theme)
-       :placeholder            (i18n/label :t/name-ens-or-address)
-       :placeholder-text-color placeholder-text-color
-       :value                  @value
-       :auto-complete          (when platform/ios? :off)
-       :auto-capitalize        :none
-       :auto-correct           false
-       :spell-check            false
-       :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
-       :on-focus               on-focus
-       :on-blur                on-blur
-       :on-change-text         on-change}]
-     (when (or (= status :default)
-               (= status :active))
-       [rn/view
-        {:style               style/buttons-container
-         :accessibility-label :paste-scan-buttons-container}
-        [button/button
-         {:accessibility-label :paste-button
-          :type                :outline
-          :size                24
-          :container-style     {:margin-right 8}
-          :inner-style         (style/accessory-button blur? theme)
-          :on-press            on-paste}
-         (i18n/label :t/paste)]
-        (when on-scan
-          [button/button
-           {:accessibility-label :scan-button
-            :icon-only?          true
-            :type                :outline
-            :size                24
-            :inner-style         (style/accessory-button blur? theme)
-            :on-press            on-scan}
-           :main-icons/scan])])
-     (when (= status :typing)
-       [rn/view
-        {:style               style/buttons-container
-         :accessibility-label :clear-button-container}
-        [clear-button
-         {:on-press on-clear
-          :blur?    blur?
-          :theme    theme}]])
-     (when (and (= status :loading) (not valid-ens-or-address?))
-       [rn/view
-        {:style               style/buttons-container
-         :accessibility-label :loading-button-container}
-        [loading-icon blur? theme]])
-     (when (and (= status :loading) valid-ens-or-address?)
-       [rn/view
-        {:style               style/buttons-container
-         :accessibility-label :positive-button-container}
-        [positive-state-icon theme]])]))
+(defn- f-address-input-internal
+  []
+  (let [status   (reagent/atom :default)
+        value    (reagent/atom "")
+        focused? (atom false)]
+    (fn [{:keys [scanned-value theme blur? on-change-text on-blur on-focus on-clear on-scan
+                 on-detect-ens on-detect-address on-detect-unclassified address-regex ens-regex
+                 valid-ens-or-address? container-style]}]
+      (let [on-change              (fn [text]
+                                     (when (not= @value text)
+                                       (let [address? (when address-regex
+                                                        (boolean (re-matches address-regex text)))
+                                             ens?     (when ens-regex
+                                                        (boolean (re-matches ens-regex text)))]
+                                         (if (> (count text) 0)
+                                           (reset! status :typing)
+                                           (reset! status :active))
+                                         (reset! value text)
+                                         (when on-change-text
+                                           (on-change-text text))
+                                         (when (and on-detect-ens ens?)
+                                           (reset! status :loading)
+                                           (on-detect-ens text #(reset! status :typing)))
+                                         (when (and address? on-detect-address)
+                                           (reset! status :loading)
+                                           (on-detect-address text))
+                                         (when (and (not address?)
+                                                    (not ens?)
+                                                    on-detect-unclassified)
+                                           (on-detect-unclassified text)))))
+            on-paste               (fn []
+                                     (clipboard/get-string
+                                      (fn [clipboard]
+                                        (when-not (empty? clipboard)
+                                          (on-change clipboard)
+                                          (reset! value clipboard)))))
+            on-clear               (fn []
+                                     (reset! value "")
+                                     (reset! status (if @focused? :active :default))
+                                     (when on-change-text
+                                       (on-change-text ""))
+                                     (when on-clear
+                                       (on-clear)))
+            on-scan                #(when on-scan
+                                      (on-scan))
+            on-focus               (fn []
+                                     (when (= (count @value) 0)
+                                       (reset! status :active))
+                                     (reset! focused? true)
+                                     (when on-focus (on-focus)))
+            on-blur                (fn []
+                                     (when (= @status :active)
+                                       (reset! status :default))
+                                     (reset! focused? false)
+                                     (when on-blur (on-blur)))
+            placeholder-text-color (get-placeholder-text-color @status theme blur?)]
+        (rn/use-effect (fn []
+                         (when-not (empty? scanned-value)
+                           (on-change scanned-value)))
+                       [scanned-value])
+        [rn/view {:style (style/container container-style)}
+         [rn/text-input
+          {:accessibility-label    :address-text-input
+           :style                  (style/input-text theme)
+           :placeholder            (i18n/label :t/name-ens-or-address)
+           :placeholder-text-color placeholder-text-color
+           :default-value          @value
+           :auto-complete          (when platform/ios? :off)
+           :auto-capitalize        :none
+           :auto-correct           false
+           :spell-check            false
+           :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
+           :on-focus               on-focus
+           :on-blur                on-blur
+           :on-change-text         on-change}]
+         (when (or (= @status :default)
+                   (= @status :active))
+           [rn/view
+            {:style               style/buttons-container
+             :accessibility-label :paste-scan-buttons-container}
+            [button/button
+             {:accessibility-label :paste-button
+              :type                :outline
+              :size                24
+              :container-style     {:margin-right 8}
+              :inner-style         (style/accessory-button blur? theme)
+              :on-press            on-paste}
+             (i18n/label :t/paste)]
+            [button/button
+             {:accessibility-label :scan-button
+              :icon-only?          true
+              :type                :outline
+              :size                24
+              :inner-style         (style/accessory-button blur? theme)
+              :on-press            on-scan}
+             :main-icons/scan]])
+         (when (= @status :typing)
+           [rn/view
+            {:style               style/buttons-container
+             :accessibility-label :clear-button-container}
+            [clear-button
+             {:on-press on-clear
+              :blur?    blur?
+              :theme    theme}]])
+         (when (and (= @status :loading) (not valid-ens-or-address?))
+           [rn/view
+            {:style               style/buttons-container
+             :accessibility-label :loading-button-container}
+            [loading-icon blur? theme]])
+         (when (and (= @status :loading) valid-ens-or-address?)
+           [rn/view
+            {:style               style/buttons-container
+             :accessibility-label :positive-button-container}
+            [positive-state-icon theme]])]))))
+
+(defn address-input-internal
+  [props]
+  [:f> f-address-input-internal props])
+
+(def address-input
+  (quo.theme/with-theme address-input-internal))
@@ -5,7 +5,8 @@
            [quo.components.markdown.text :as text]
            [quo.theme :as quo.theme]
            [react-native.core :as rn]
-            [react-native.platform :as platform]))
+            [react-native.platform :as platform]
+            [reagent.core :as reagent]))

 (defn- label-&-counter
  [{:keys [label current-chars char-limit variant-colors]}]
@@ -55,110 +56,104 @@

 (def ^:private custom-props
  "Custom properties that must be removed from properties map passed to InputText."
-  [:type :blur? :error? :right-icon :left-icon :disabled? :small? :button
+  [:type :blur? :theme :error? :right-icon :left-icon :disabled? :small? :button
   :label :char-limit :on-char-limit-reach :icon-name :multiline? :on-focus :on-blur
   :container-style])

 (defn- base-input
-  [{:keys [blur? error? right-icon left-icon disabled? small? button
-           label char-limit multiline? clearable? on-focus on-blur container-style
-           on-change-text on-char-limit-reach weight default-value]
-    :as   props}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [status set-status]    (rn/use-state :default)
-        internal-on-focus      (rn/use-callback #(set-status :focus))
-        internal-on-blur       (rn/use-callback #(set-status :default))
-        [multiple-lines?
-         set-multiple-lines]   (rn/use-state false)
-        on-content-size-change (rn/use-callback
-                                (fn [event]
-                                  (let [height     (oops/oget event "nativeEvent.contentSize.height")
-                                        ;; In Android height comes with padding
-                                        min-height (if platform/android? 40 22)]
-                                    (if (> height min-height)
-                                      (set-multiple-lines true)
-                                      (set-multiple-lines false)))))
-        [char-count
-         set-char-count]       (rn/use-state (count default-value))
-        on-change-text         (rn/use-callback
-                                (fn [new-text]
-                                  (when on-change-text (on-change-text new-text))
-                                  (let [amount-chars (count new-text)]
-                                    (set-char-count amount-chars)
-                                    (when (and (>= amount-chars char-limit) on-char-limit-reach)
-                                      (on-char-limit-reach amount-chars)))))
-        status-kw              (cond
-                                 disabled? :disabled
-                                 error?    :error
-                                 :else     status)
-        colors-by-status       (style/status-colors status-kw blur? theme)
-        variant-colors         (style/variants-colors blur? theme)
-        clean-props            (apply dissoc props custom-props)]
-    [rn/view {:style container-style}
-     (when (or label char-limit)
-       [label-&-counter
-        {:variant-colors variant-colors
-         :label          label
-         :current-chars  char-count
-         :char-limit     char-limit}])
-     [rn/view {:style (style/input-container colors-by-status small? disabled?)}
-      (when-let [{:keys [icon-name]} left-icon]
-        [left-accessory
-         {:variant-colors variant-colors
-          :small?         small?
-          :icon-name      icon-name}])
-      [rn/text-input
-       (cond-> {:style                  (style/input colors-by-status small? multiple-lines? weight)
-                :accessibility-label    :input
-                :placeholder-text-color (:placeholder colors-by-status)
-                :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
-                :cursor-color           (:cursor variant-colors)
-                :editable               (not disabled?)
-                :on-focus               (fn []
-                                          (when on-focus (on-focus))
-                                          (internal-on-focus))
-                :on-blur                (fn []
-                                          (when on-blur (on-blur))
-                                          (internal-on-blur))}
-         :always    (merge clean-props)
-         multiline? (assoc :multiline              true
-                           :on-content-size-change on-content-size-change)
-         char-limit (assoc :on-change-text on-change-text))]
-      (when-let [{:keys [on-press icon-name style-fn]} right-icon]
-        [right-accessory
-         {:variant-colors variant-colors
-          :small?         small?
-          :disabled?      disabled?
-          :icon-style-fn  style-fn
-          :icon-name      icon-name
-          :on-press       (fn []
-                            (when clearable? (set-char-count 0))
-                            (on-press))}])
-      (when-let [{:keys [on-press text]} button]
-        [right-button
-         {:colors-by-status colors-by-status
-          :variant-colors   variant-colors
-          :small?           small?
-          :disabled?        disabled?
-          :on-press         on-press
-          :text             text}])]]))
+  [{:keys [on-change-text on-char-limit-reach weight default-value]}]
+  (let [status              (reagent/atom :default)
+        internal-on-focus   #(reset! status :focus)
+        internal-on-blur    #(reset! status :default)
+        multiple-lines?     (reagent/atom false)
+        set-multiple-lines! #(let [height     (oops/oget % "nativeEvent.contentSize.height")
+                                   ;; In Android height comes with padding
+                                   min-height (if platform/android? 40 22)]
+                               (if (> height min-height)
+                                 (reset! multiple-lines? true)
+                                 (reset! multiple-lines? false)))
+        char-count          (reagent/atom (count default-value))
+        update-char-limit!  (fn [new-text char-limit]
+                              (when on-change-text (on-change-text new-text))
+                              (let [amount-chars (count new-text)]
+                                (reset! char-count amount-chars)
+                                (when (and (>= amount-chars char-limit) on-char-limit-reach)
+                                  (on-char-limit-reach amount-chars))))]
+    (fn [{:keys [blur? theme error? right-icon left-icon disabled? small? button
+                 label char-limit multiline? clearable? on-focus on-blur container-style]
+          :as   props}]
+      (let [status-kw        (cond
+                               disabled? :disabled
+                               error?    :error
+                               :else     @status)
+            colors-by-status (style/status-colors status-kw blur? theme)
+            variant-colors   (style/variants-colors blur? theme)
+            clean-props      (apply dissoc props custom-props)]
+        [rn/view {:style container-style}
+         (when (or label char-limit)
+           [label-&-counter
+            {:variant-colors variant-colors
+             :label          label
+             :current-chars  @char-count
+             :char-limit     char-limit}])
+         [rn/view {:style (style/input-container colors-by-status small? disabled?)}
+          (when-let [{:keys [icon-name]} left-icon]
+            [left-accessory
+             {:variant-colors variant-colors
+              :small?         small?
+              :icon-name      icon-name}])
+          [rn/text-input
+           (cond-> {:style                  (style/input colors-by-status small? @multiple-lines? weight)
+                    :accessibility-label    :input
+                    :placeholder-text-color (:placeholder colors-by-status)
+                    :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
+                    :cursor-color           (:cursor variant-colors)
+                    :editable               (not disabled?)
+                    :on-focus               (fn []
+                                              (when on-focus (on-focus))
+                                              (internal-on-focus))
+                    :on-blur                (fn []
+                                              (when on-blur (on-blur))
+                                              (internal-on-blur))}
+             :always    (merge clean-props)
+             multiline? (assoc :multiline              true
+                               :on-content-size-change set-multiple-lines!)
+             char-limit (assoc :on-change-text #(update-char-limit! % char-limit)))]
+          (when-let [{:keys [on-press icon-name style-fn]} right-icon]
+            [right-accessory
+             {:variant-colors variant-colors
+              :small?         small?
+              :disabled?      disabled?
+              :icon-style-fn  style-fn
+              :icon-name      icon-name
+              :on-press       (fn []
+                                (when clearable? (reset! char-count 0))
+                                (on-press))}])
+          (when-let [{:keys [on-press text]} button]
+            [right-button
+             {:colors-by-status colors-by-status
+              :variant-colors   variant-colors
+              :small?           small?
+              :disabled?        disabled?
+              :on-press         on-press
+              :text             text}])]]))))

 (defn- password-input
  [{:keys [default-shown?]
-    :or   {default-shown? false}
-    :as   props}]
-  (let [[password-shown? set-password-shown] (rn/use-state default-shown?)]
-    [base-input
-     (assoc props
-            :accessibility-label :password-input
-            :auto-capitalize     :none
-            :auto-complete       :password
-            :secure-text-entry   (not password-shown?)
-            :right-icon          {:style-fn  style/password-icon
-                                  :icon-name (if password-shown? :i/hide-password :i/reveal)
-                                  :on-press  #(set-password-shown (not password-shown?))})]))
+    :or   {default-shown? false}}]
+  (let [password-shown? (reagent/atom default-shown?)]
+    (fn [props]
+      [base-input
+       (assoc props
+              :accessibility-label :password-input
+              :auto-capitalize     :none
+              :auto-complete       :password
+              :secure-text-entry   (not @password-shown?)
+              :right-icon          {:style-fn  style/password-icon
+                                    :icon-name (if @password-shown? :i/hide-password :i/reveal)
+                                    :on-press  #(swap! password-shown? not)})])))

-(defn input
+(defn input-internal
  "This input supports the following properties:
  - :type - Can be `:text`(default) or `:password`.
  - :blur? - Boolean to set the blur color variant.
@@ -182,15 +177,21 @@
  - :on-change-text
  ...
  "
-  [{:keys [type clearable? on-clear icon-name]
+  [{:keys [type clearable? on-clear on-change-text icon-name]
    :or   {type :text}
    :as   props}]
  (let [base-props (cond-> props
-                     icon-name  (assoc-in [:left-icon :icon-name] icon-name)
-                     clearable? (assoc :right-icon
-                                       {:style-fn  style/clear-icon
-                                        :icon-name :i/clear
-                                        :on-press  #(when on-clear (on-clear))}))]
+                     icon-name      (assoc-in [:left-icon :icon-name] icon-name)
+                     clearable?     (assoc :right-icon
+                                           {:style-fn  style/clear-icon
+                                            :icon-name :i/clear
+                                            :on-press  #(when on-clear (on-clear))})
+                     on-change-text (assoc :on-change-text
+                                           (fn [new-text]
+                                             (on-change-text new-text)
+                                             (reagent/flush))))]
    (if (= type :password)
      [password-input base-props]
      [base-input base-props])))
+
+(def input (quo.theme/with-theme input-internal))
@@ -10,7 +10,7 @@
   :background-color   (colors/theme-colors colors/neutral-10
                                            colors/neutral-80-opa-80
                                            theme)
-   :min-height         40
+   :height             40
   :padding-horizontal 12
   :padding-vertical   9
   :margin-top         4})
@@ -22,12 +22,11 @@
 (defn- locked-input-internal
  [{:keys [label icon container-style theme]} value]
  [rn/view {:style container-style}
-   (when label
-     [text/text
-      {:size   :paragraph-2
-       :weight :medium
-       :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
-      label])
+   [text/text
+    {:size   :paragraph-2
+     :weight :medium
+     :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
+    label]
   [info-box
    {:theme      theme
     :icon       icon
@@ -39,7 +39,7 @@
            {:keys [ok-words error-words]} (group-by #(if (string? %) :ok-words :error-words)
                                                     children-text-nodes)]
        (h/is-equal (apply str ok-words) "Text with some   that   the ")
-        (h/is-truthy (= (map #(-> % :props :argv first) error-words)
+        (h/is-truthy (= (map #(-> % :props :argv second) error-words)
                        ["error" "words" "don't" "satisfy" "predicate"]))))

    (h/test "Marked when words exceed the limit given"
@@ -55,7 +55,7 @@
        (h/is-equal (string/trim (apply str ok-words))
                    "these are ok words,")
        (h/is-equal (->> error-words
-                         (map #(-> % :props :argv first))
+                         (map #(-> % :props :argv second))
                         (interpose " ")
                         (apply str))
                    "these words exceed the limit")))))
@@ -3,7 +3,8 @@
    [clojure.string :as string]
    [quo.components.inputs.recovery-phrase.style :as style]
    [quo.theme :as quo.theme]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

 (def ^:private custom-props
  [:customization-color :theme :blur? :cursor-color :multiline :on-focus :on-blur
@@ -37,42 +38,42 @@
                  :idx    0})
         :result)))

-(defn recovery-phrase-input
-  [{:keys [customization-color blur? on-focus on-blur mark-errors?
-           error-pred-current-word error-pred-written-words word-limit
-           container-style]
-    :or   {customization-color      :blue
-           word-limit               ##Inf
-           error-pred-current-word  (constantly false)
-           error-pred-written-words (constantly false)}
-    :as   props}
-   text]
-  (let [theme             (quo.theme/use-theme-value)
-        [state set-state] (rn/use-state :default)
-        on-focus          (rn/use-callback
-                           (fn []
-                             (set-state :focused)
-                             (when on-focus (on-focus))))
-        on-blur           (rn/use-callback
-                           (fn []
-                             (set-state :default)
-                             (when on-blur (on-blur))))
-        extra-props       (apply dissoc props custom-props)]
-    [rn/view {:style (style/container container-style)}
-     [rn/text-input
-      (merge {:accessibility-label    :recovery-phrase-input
-              :style                  (style/input)
-              :placeholder-text-color (style/placeholder-color state theme blur?)
-              :cursor-color           (style/cursor-color customization-color theme)
-              :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
-              :multiline              true
-              :on-focus               on-focus
-              :on-blur                on-blur}
-             extra-props)
-      (if mark-errors?
-        (mark-error-words {:pred-last-word      error-pred-current-word
-                           :pred-previous-words error-pred-written-words
-                           :text                text
-                           :word-limit          word-limit
-                           :theme               theme})
-        text)]]))
+(defn recovery-phrase-input-internal
+  [_ _]
+  (let [state       (reagent/atom :default)
+        set-focused #(reset! state :focused)
+        set-default #(reset! state :default)]
+    (fn [{:keys [customization-color theme blur? on-focus on-blur mark-errors?
+                 error-pred-current-word error-pred-written-words word-limit
+                 container-style]
+          :or   {customization-color      :blue
+                 word-limit               ##Inf
+                 error-pred-current-word  (constantly false)
+                 error-pred-written-words (constantly false)}
+          :as   props}
+         text]
+      (let [extra-props (apply dissoc props custom-props)]
+        [rn/view {:style (style/container container-style)}
+         [rn/text-input
+          (merge {:accessibility-label    :recovery-phrase-input
+                  :style                  (style/input)
+                  :placeholder-text-color (style/placeholder-color @state theme blur?)
+                  :cursor-color           (style/cursor-color customization-color theme)
+                  :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
+                  :multiline              true
+                  :on-focus               (fn []
+                                            (set-focused)
+                                            (when on-focus (on-focus)))
+                  :on-blur                (fn []
+                                            (set-default)
+                                            (when on-blur (on-blur)))}
+                 extra-props)
+          (if mark-errors?
+            (mark-error-words {:pred-last-word      error-pred-current-word
+                               :pred-previous-words error-pred-written-words
+                               :text                text
+                               :word-limit          word-limit
+                               :theme               theme})
+            text)]]))))
+
+(def recovery-phrase-input (quo.theme/with-theme recovery-phrase-input-internal))
@@ -4,7 +4,8 @@
    [quo.components.icon :as icon]
    [quo.components.inputs.search-input.style :as style]
    [quo.foundations.colors :as colors]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

 (def ^:private tag-separator [rn/view {:style style/tag-separator}])

@@ -40,52 +41,54 @@
    text-input))

 (defn search-input
-  [{:keys [value tags disabled? blur? on-change-text customization-color
-           on-clear on-focus on-blur override-theme container-style]
-    :or   {customization-color :blue}
-    :as   props}
-   & children]
-  (let [[state set-state]  (rn/use-state :default)
-        on-focus           (rn/use-callback
-                            (fn []
-                              (set-state :active)
-                              (when on-focus (on-focus))))
-        on-blur            (rn/use-callback
-                            (fn []
-                              (set-state :default)
-                              (when on-blur (on-blur))))
-        scroll-view-ref    (rn/use-ref-atom nil)
-        on-scroll-view-ref (rn/use-callback #(reset! scroll-view-ref %))
-        on-key-press       (rn/use-callback #(handle-backspace % @scroll-view-ref))
-        use-value?         (boolean value)
-        clean-props        (apply dissoc props props-to-remove)]
-    [rn/view
-     {:accessibility-label :search-input
-      :style               (style/container container-style)}
-     [rn/scroll-view
-      {:ref                               on-scroll-view-ref
-       :style                             style/scroll-container
-       :content-container-style           style/scroll-content
-       :horizontal                        true
-       :shows-horizontal-scroll-indicator false}
-      (when (seq tags)
-        [inner-tags tags])
-      (add-children
-       [rn/text-input
-        (cond-> {:style                  (style/input-text disabled?)
-                 :cursor-color           (style/cursor customization-color override-theme)
-                 :placeholder-text-color (style/placeholder-color state blur? override-theme)
-                 :editable               (not disabled?)
-                 :on-key-press           on-key-press
-                 :keyboard-appearance    (colors/theme-colors :light :dark override-theme)
-                 :on-change-text         on-change-text
-                 :on-focus               on-focus
-                 :on-blur                on-blur}
-          use-value?        (assoc :value value)
-          (seq clean-props) (merge clean-props))]
-       (when-not use-value? children))]
-     (when (or (seq value) (seq children))
-       [clear-button
-        {:on-press       on-clear
-         :blur?          blur?
-         :override-theme override-theme}])]))
+  [{:keys [value]}]
+  (let [state           (reagent/atom :default)
+        set-active      #(reset! state :active)
+        set-default     #(reset! state :default)
+        scroll-view-ref (atom nil)
+        use-value?      (boolean value)]
+    (fn [{:keys [value tags disabled? blur? on-change-text customization-color
+                 on-clear on-focus on-blur override-theme container-style]
+          :or   {customization-color :blue}
+          :as   props}
+         & children]
+      (let [clean-props (apply dissoc props props-to-remove)]
+        [rn/view
+         {:accessibility-label :search-input
+          :style               (style/container container-style)}
+         [rn/scroll-view
+          {:ref                               #(reset! scroll-view-ref %)
+           :style                             style/scroll-container
+           :content-container-style           style/scroll-content
+           :horizontal                        true
+           :shows-horizontal-scroll-indicator false}
+          (when (seq tags)
+            [inner-tags tags])
+
+          (add-children
+           [rn/text-input
+            (cond-> {:style                  (style/input-text disabled?)
+                     :cursor-color           (style/cursor customization-color override-theme)
+                     :placeholder-text-color (style/placeholder-color @state blur? override-theme)
+                     :editable               (not disabled?)
+                     :on-key-press           #(handle-backspace % @scroll-view-ref)
+                     :keyboard-appearance    (colors/theme-colors :light :dark override-theme)
+                     :on-change-text         (fn [new-text]
+                                               (when on-change-text
+                                                 (on-change-text new-text))
+                                               (reagent/flush))
+                     :on-focus               (fn []
+                                               (set-active)
+                                               (when on-focus (on-focus)))
+                     :on-blur                (fn []
+                                               (set-default)
+                                               (when on-blur (on-blur)))}
+              use-value?        (assoc :value value)
+              (seq clean-props) (merge clean-props))]
+           (when-not use-value? children))]
+
+         (when (or (seq value) (seq children))
+           [clear-button
+            {:on-press       on-clear
+             :blur?          blur?
+             :override-theme override-theme}])]))))
@@ -4,7 +4,8 @@
    [quo.components.inputs.title-input.style :as style]
    [quo.components.markdown.text :as text]
    [quo.theme :as quo.theme]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

 (defn- pad-0
  [value]
@@ -12,70 +13,81 @@
    (str 0 value)
    value))

-(defn view
-  [{:keys [blur? on-change-text auto-focus placeholder max-length default-value return-key-type
-           size on-focus on-blur container-style customization-color disabled?]
+(defn- view-internal
+  [{:keys [blur?
+           on-change-text
+           auto-focus
+           placeholder
+           max-length
+           default-value
+           return-key-type
+           size
+           theme
+           on-focus
+           on-blur
+           container-style]
    :or   {max-length    0
           auto-focus    false
           default-value ""}}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [focused? set-focused] (rn/use-state auto-focus)
-        [value set-value]      (rn/use-state default-value)
-        input-ref              (rn/use-ref-atom nil)
-        on-inpur-ref           (rn/use-callback #(reset! input-ref %))
-        on-press               (rn/use-callback
-                                #(when-not disabled? (.focus ^js @input-ref))
-                                [disabled?])
-        on-change              (rn/use-callback
-                                (fn [v]
-                                  (set-value v)
-                                  (when on-change-text (on-change-text v))))
-        on-focus               (rn/use-callback
-                                (fn []
-                                  (when (fn? on-focus) (on-focus))
-                                  (set-focused true)))
-        on-blur                (rn/use-callback
-                                (fn []
-                                  (when (fn? on-blur) (on-blur))
-                                  (set-focused false)))]
-    [rn/view
-     {:style (merge (style/container disabled?) container-style)}
-     [rn/view {:style style/text-input-container}
-      [rn/text-input
-       {:style                  (text/text-style
-                                 {:size   (or size :heading-1)
-                                  :weight :semi-bold
-                                  :style  (style/title-text theme)})
-        :default-value          default-value
-        :accessibility-label    :profile-title-input
-        :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
-        :return-key-type        return-key-type
-        :on-focus               on-focus
-        :on-blur                on-blur
-        :auto-focus             auto-focus
-        :input-mode             :text
-        :on-change-text         on-change
-        :editable               (not disabled?)
-        :max-length             max-length
-        :placeholder            placeholder
-        :ref                    on-inpur-ref
-        :selection-color        (style/get-selection-color customization-color blur? theme)
-        :placeholder-text-color (if focused?
-                                  (style/get-focused-placeholder-color blur? theme)
-                                  (style/get-placeholder-color blur? theme))}]]
-     [rn/view
-      {:style (style/counter-container focused?)}
-      (if focused?
-        [text/text
-         [text/text
-          {:style (style/char-count blur? theme)
-           :size  :paragraph-2}
-          (pad-0
-           (str
-            (count value)))]
-         [text/text
-          {:style (style/char-count blur? theme)
-           :size  :paragraph-2}
-          (str "/" (pad-0 (str max-length)))]]
-        [rn/pressable {:on-press on-press}
-         [icon/icon :i/edit {:color (style/get-char-count-color blur? theme)}]])]]))
+  (let [focused?  (reagent/atom auto-focus)
+        value     (reagent/atom default-value)
+        input-ref (atom nil)
+        on-change (fn [v]
+                    (reset! value v)
+                    (when on-change-text
+                      (on-change-text v)))]
+    (fn [{:keys [customization-color disabled?]}]
+      [rn/view
+       {:style (merge (style/container disabled?) container-style)}
+       [rn/view {:style style/text-input-container}
+        [rn/text-input
+         {:style
+          (text/text-style
+           {:size   (or size :heading-1)
+            :weight :semi-bold
+            :style  (style/title-text theme)})
+          :default-value default-value
+          :accessibility-label :profile-title-input
+          :keyboard-appearance (quo.theme/theme-value :light :dark theme)
+          :return-key-type return-key-type
+          :on-focus (fn []
+                      (when (fn? on-focus)
+                        (on-focus))
+                      (reset! focused? true))
+          :on-blur (fn []
+                     (when (fn? on-blur)
+                       (on-blur))
+                     (reset! focused? false))
+          :auto-focus auto-focus
+          :input-mode :text
+          :on-change-text on-change
+          :editable (not disabled?)
+          :max-length max-length
+          :placeholder placeholder
+          :ref #(reset! input-ref %)
+          :selection-color (style/get-selection-color customization-color blur? theme)
+          :placeholder-text-color (if @focused?
+                                    (style/get-focused-placeholder-color blur? theme)
+                                    (style/get-placeholder-color blur? theme))}]]
+       [rn/view
+        {:style (style/counter-container @focused?)}
+        (if @focused?
+          [text/text
+           [text/text
+            {:style (style/char-count blur? theme)
+             :size  :paragraph-2}
+            (pad-0
+             (str
+              (count @value)))]
+           [text/text
+            {:style (style/char-count blur? theme)
+             :size  :paragraph-2}
+            (str "/"
+                 (pad-0
+                  (str max-length)))]]
+          [rn/pressable
+           {:on-press #(when-not disabled?
+                         (.focus ^js @input-ref))}
+           [icon/icon :i/edit {:color (style/get-char-count-color blur? theme)}]])]])))
+
+(def view (quo.theme/with-theme view-internal))
@@ -60,8 +60,8 @@
   :padding-horizontal 12
   :padding-top        10
   :padding-bottom     12
-   :width              (if (= :message size) 295 335)
-   :flex               1})
+   :height             (if (= :message size) 245 266)
+   :width              (if (= :message size) 295 335)})

 (def header-container
  {:flex-direction :row
@@ -7,6 +7,7 @@
  {:title       "Some title"
   :description "Some description"
   :link        "status.im"
+   :logo        "data:image/png,logo-x"
   :thumbnail   "data:image/png,whatever"})

 (h/describe "Links - Link Preview"
@@ -20,12 +21,17 @@
    (h/is-truthy (h/query-by-text (:title props)))
    (h/is-truthy (h/query-by-text (:description props)))
    (h/is-truthy (h/query-by-text (:link props)))
+    (h/is-truthy (h/query-by-label-text :logo))
    (h/is-truthy (h/query-by-label-text :thumbnail)))

  (h/test "does not render thumbnail if prop is not present"
    (h/render [view/view (dissoc props :thumbnail)])
    (h/is-null (h/query-by-label-text :thumbnail)))

+  (h/test "does not render logo if prop is not present"
+    (h/render [view/view (dissoc props :logo)])
+    (h/is-null (h/query-by-label-text :logo)))
+
  (h/test "shows button to enable preview when preview is disabled"
    (h/render [view/view
               (assoc props
@@ -1,14 +1,9 @@
 (ns quo.components.links.link-preview.view
  (:require
-    ["react-native-blob-util" :default ReactNativeBlobUtil]
-    [oops.core :as oops]
    [quo.components.buttons.button.view :as button]
    [quo.components.links.link-preview.style :as style]
    [quo.components.markdown.text :as text]
-    [react-native.core :as rn]
-    [react-native.platform :as platform]
-    [react-native.svg :as svg]
-    [taoensso.timbre :as log]))
+    [react-native.core :as rn]))

 (defn- button-disabled
  [disabled-text on-enable]
@@ -56,30 +51,14 @@
                           thumbnail)
    :accessibility-label :thumbnail}])

-(defn- get-image-data
-  [logo set-is-svg on-success]
-  (-> (.config ReactNativeBlobUtil (clj->js {:trusty platform/ios?}))
-      (.fetch "GET" logo)
-      (.then (fn [imgObj]
-               (set-is-svg (= "image/svg"
-                              (oops/oget imgObj
-                                         ["respInfo" "headers" "Content-Type"])))
-               (on-success (oops/oget imgObj "data"))))
-      (.catch #(log/error "could not fetch favicon " logo))))
-
 (defn- logo-comp
  [logo]
-  (let [[image-data set-image-data] (rn/use-state nil)
-        [is-svg? set-is-svg]        (rn/use-state nil)
-        on-success                  (fn [data-uri]
-                                      (set-image-data data-uri))
-        _get-image-data             (get-image-data logo set-is-svg on-success)]
-    (if is-svg?
-      [svg/svg-xml (merge style/logo {:xml image-data})]
-      [rn/image
-       {:accessibility-label :logo
-        :source              {:uri (str "data:image/png;base64," image-data)}
-        :style               style/logo}])))
+  [rn/image
+   {:accessibility-label :logo
+    :source              (if (string? logo)
+                           {:uri logo}
+                           logo)
+    :style               style/logo}])

 (defn view
  [{:keys [title logo description link thumbnail
@@ -21,7 +21,6 @@
   :border-radius   12
   :border-style    :dashed
   :align-items     :center
-   :flex-direction  :row
   :justify-content :center
   :align-self      :stretch
   :padding         horizontal-padding
@@ -1,31 +1,19 @@
 (ns quo.components.links.url-preview.view
  (:require
-    [clojure.string :as string]
    [quo.components.icon :as icon]
    [quo.components.links.url-preview.style :as style]
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
-    [react-native.core :as rn]
-    [react-native.svg :as svg]))
-
-(def base64-svg-prefix "data:image/svg;base64,")
+    [react-native.core :as rn]))

 (defn- logo-comp
  [{:keys [logo]}]
-  (if (and (string? logo)
-           (string/starts-with? logo base64-svg-prefix))
-    [svg/svg-xml
-     (merge style/logo
-            {:xml (-> logo
-                      (string/replace base64-svg-prefix "")
-                      js/atob)})]
-    [rn/image
-     {:accessibility-label :logo
-      :source              (if (string? logo)
-                             {:uri logo}
-                             logo)
-      :style               style/logo
-      :resize-mode         :cover}]))
+  [rn/image
+   {:accessibility-label :logo
+    :source              (if (string? logo)
+                           {:uri logo}
+                           logo)
+    :style               style/logo}])

 (defn- content
  [{:keys [title body]}]
@@ -62,10 +50,6 @@
    [rn/view
     {:accessibility-label :url-preview-loading
      :style               (merge (style/loading-container) container-style)}
-     [icon/icon :i/loading
-      {:size            12
-       :color           (colors/theme-colors colors/neutral-50 colors/neutral-40)
-       :container-style {:margin-right 8}}]
     [rn/text
      {:size            :paragraph-2
       :weight          :medium
@@ -76,9 +60,6 @@
     {:accessibility-label :url-preview
      :style               (merge (style/container) container-style)}
     (when logo
-       [logo-comp
-        {:logo (if (map? logo)
-                 (:data-uri logo)
-                 logo)}])
+       [logo-comp {:logo logo}])
     [content {:title title :body body}]
     [clear-button {:on-press on-clear}]]))
@@ -32,7 +32,7 @@
  [rn/view {:style style/url-preview-separator}])

 (defn- item-component
-  [{:keys [title body loading? logo url]} _ _
+  [{:keys [title body loading? logo]} _ _
   {:keys [width on-clear loading-message container-style]}]
  [url-preview/view
   {:logo            logo
@@ -41,8 +41,7 @@
    :loading?        loading?
    :loading-message loading-message
    :on-clear        on-clear
-    :container-style (merge container-style {:width width})
-    :url             url}])
+    :container-style (merge container-style {:width width})}])

 (defn- f-view
  []
@@ -6,101 +6,71 @@

 (def ^:private theme :light)

-(def ^:private default-props
-  {:account-props {:name                "Account name"
-                   :address             "0x1234567890"
-                   :emoji               "🍑"
-                   :customization-color "blue"}})
-
-(defn- with-defaults
-  ([] default-props)
-  ([props] (merge default-props props)))
-
 (h/describe "List items: account"
  (h/test "default render'"
-    (h/render-with-theme-provider [account/view (with-defaults)] theme)
+    (h/render-with-theme-provider [account/view] theme)
    (h/is-truthy (h/query-by-label-text :container)))

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

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

  (h/test "render with state :active"
-    (h/render-with-theme-provider [account/view (with-defaults {:state :active})] theme)
+    (h/render-with-theme-provider [account/view {:state :active}] theme)
    (h/has-style (h/query-by-label-text :container)
                 {:backgroundColor (colors/resolve-color :blue :light 10)}))

  (h/test "render with state :active and blur? enabled"
    (h/render-with-theme-provider [account/view
-                                   (with-defaults
-                                    {:blur? true
-                                     :state :active})]
+                                   {:blur? true
+                                    :state :active}]
                                  theme)
    (h/has-style (h/query-by-label-text :container)
                 {:backgroundColor colors/white-opa-10}))

  (h/test "render with state :selected"
-    (h/render-with-theme-provider [account/view (with-defaults {:state :selected})] theme)
+    (h/render-with-theme-provider [account/view {:state :selected}] theme)
    (h/is-truthy (h/query-by-label-text :check-icon)))

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

  (h/test "renders token props if type :tag"
-    (h/render-with-theme-provider [account/view
-                                   (with-defaults {:type        :tag
-                                                   :token-props {:symbol "SNT"
-                                                                 :value  "1,000"}})]
-                                  theme)
+    (h/render-with-theme-provider [account/view {:type :tag}] theme)
    (h/is-truthy (h/query-by-label-text :tag-container)))

  (h/test "renders keycard icon if title-icon is present"
-    (h/render-with-theme-provider [account/view (with-defaults {:title-icon :i/placeholder})] theme)
+    (h/render-with-theme-provider [account/view {:title-icon :i/placeholder}] theme)
    (h/is-truthy (h/query-by-label-text :title-icon)))

  (h/test "doesn't render keycard icon if title-icon is missing"
-    (h/render-with-theme-provider [account/view (with-defaults)] theme)
+    (h/render-with-theme-provider [account/view] theme)
    (h/is-falsy (h/query-by-label-text :title-icon)))

  (h/test "renders balance container but not arrow icon if type :balance-neutral"
-    (h/render-with-theme-provider [account/view
-                                   (with-defaults {:type          :balance-neutral
-                                                   :balance-props {:fiat-value        "€0.00"
-                                                                   :percentage-change "0.0"
-                                                                   :fiat-change       "€0.00"}})]
-                                  theme)
+    (h/render-with-theme-provider [account/view {:type :balance-neutral}] theme)
    (h/is-truthy (h/query-by-label-text :balance-container))
    (h/is-falsy (h/query-by-label-text :arrow-icon)))

  (h/test "renders balance container and negative arrow icon if type :balance-negative"
-    (h/render-with-theme-provider [account/view
-                                   (with-defaults {:type          :balance-negative
-                                                   :balance-props {:fiat-value        "€0.00"
-                                                                   :percentage-change "0.0"
-                                                                   :fiat-change       "€0.00"}})]
-                                  theme)
+    (h/render-with-theme-provider [account/view {:type :balance-negative}] theme)
    (h/is-truthy (h/query-by-label-text :balance-container))
    (h/is-truthy (h/query-by-label-text :icon-negative))
    (h/is-falsy (h/query-by-label-text :icon-positive)))

  (h/test "renders balance container and positive arrow icon if type :balance-positive"
-    (h/render-with-theme-provider [account/view
-                                   (with-defaults {:type          :balance-positive
-                                                   :balance-props {:fiat-value        "€0.00"
-                                                                   :percentage-change "0.0"
-                                                                   :fiat-change       "€0.00"}})]
-                                  theme)
+    (h/render-with-theme-provider [account/view {:type :balance-positive}] theme)
    (h/is-truthy (h/query-by-label-text :balance-container))
    (h/is-falsy (h/query-by-label-text :icon-negative))
    (h/is-truthy (h/query-by-label-text :icon-positive)))
@@ -108,9 +78,8 @@
  (h/test "renders options button if type :action"
    (let [on-options-press (h/mock-fn)]
      (h/render-with-theme-provider [account/view
-                                     (with-defaults
-                                      {:type             :action
-                                       :on-options-press on-options-press})]
+                                     {:type             :action
+                                      :on-options-press on-options-press}]
                                    theme)
      (h/is-truthy (h/query-by-label-text :options-button))
      (h/fire-event :on-press (h/get-by-label-text :options-button))
@@ -1,49 +0,0 @@
-(ns quo.components.list-items.account.schema)
-
-(def ^:private ?balance
-  [:map
-   [:balance-props
-    [:map
-     [:fiat-value :string]
-     [:percentage-change :string]
-     [:fiat-change :string]]]])
-
-(def ^:private ?tag
-  [:map
-   [:token-props
-    [:map
-     [:symbol :string]
-     [:value :string]]]])
-
-(def ^:private ?action
-  [:map
-   [:on-options-press {:optional true} [:maybe fn?]]])
-
-(def ^:private ?base
-  [:map
-   [:type {:optional true}
-    [:enum :default :tag :action :balance-neutral :balance-negative :balance-positive]]
-   [:state {:optional true} [:enum :default :selected :active]]
-   [:blur? {:optional true} [:maybe :boolean]]
-   [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-   [:on-press {:optional true} [:maybe fn?]]
-   [:title-icon {:optional true} [:maybe :keyword]]
-   [:account-props
-    [:map
-     [:name :string]
-     [:address :string]
-     [:emoji :string]
-     [:customization-color {:optional true} [:maybe :schema.common/customization-color]]]]])
-
-(def ?schema
-  [:=>
-   [:cat
-    [:multi {:dispatch :type}
-     [:balance-neutral [:merge ?base ?balance]]
-     [:balance-negative [:merge ?base ?balance]]
-     [:balance-positive [:merge ?base ?balance]]
-     [:tag [:merge ?base ?tag]]
-     [:action [:merge ?base ?action]]
-     [:default ?base]
-     [:malli.core/default ?base]]]
-   :any])
@@ -2,14 +2,13 @@
  (:require
    [quo.components.avatars.account-avatar.view :as account-avatar]
    [quo.components.icon :as icon]
-    [quo.components.list-items.account.schema :as component-schema]
    [quo.components.list-items.account.style :as style]
    [quo.components.markdown.text :as text]
    [quo.components.wallet.address-text.view :as address-text]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [schema.core :as schema]))
+    [reagent.core :as reagent]))

 (defn- account-view
  [{:keys [account-props title-icon blur? theme]}]
@@ -96,40 +95,39 @@
              (colors/resolve-color customization-color theme))}]])

 (defn- internal-view
-  [{:keys [type state blur? customization-color on-press]
-    :or   {customization-color :blue
-           type                :default
-           state               :default
-           blur?               false}
-    :as   props}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))
-        props                  (assoc props :theme theme)]
-    [rn/pressable
-     {:style               (style/container
-                            {:state               state
-                             :blur?               blur?
-                             :customization-color customization-color
-                             :pressed?            pressed?})
-      :on-press-in         on-press-in
-      :on-press            on-press
-      :on-press-out        on-press-out
-      :accessibility-label :container}
-     [account-view props]
-     [rn/view {:style (when (= type :tag) style/token-tag-container)}
-      (cond
-        (#{:balance-neutral :balance-negative :balance-positive} type)
-        [balance-view props]
+  [_]
+  (let [pressed?     (reagent/atom false)
+        on-press-in  #(reset! pressed? true)
+        on-press-out #(reset! pressed? false)]
+    (fn [{:keys [type state blur? customization-color on-press]
+          :or   {customization-color :blue
+                 type                :default
+                 state               :default
+                 blur?               false}
+          :as   props}]
+      [rn/pressable
+       {:style               (style/container
+                              {:state               state
+                               :blur?               blur?
+                               :customization-color customization-color
+                               :pressed?            @pressed?})
+        :on-press-in         on-press-in
+        :on-press            on-press
+        :on-press-out        on-press-out
+        :accessibility-label :container}
+       [account-view props]
+       [rn/view {:style (when (= type :tag) style/token-tag-container)}
+        (cond
+          (#{:balance-neutral :balance-negative :balance-positive} type)
+          [balance-view props]

-        (= type :tag)
-        [token-tag props]
+          (= type :tag)
+          [token-tag props]

-        (= type :action)
-        [options-button props]
+          (= type :action)
+          [options-button props]

-        (and (= type :default) (= state :selected))
-        [check-icon props])]]))
+          (and (= type :default) (= state :selected))
+          [check-icon props])]])))

-(def view (schema/instrument #'internal-view component-schema/?schema))
+(def view (quo.theme/with-theme internal-view))
@@ -13,9 +13,9 @@

 (h/describe "List items: account list card"
  (h/test "Test icon renders for ':action :icon'"
-    (h/render-with-theme-provider [account-list-card/view
-                                   {:account-props    account-props
-                                    :network          :ethereum
-                                    :action           :icon
-                                    :on-options-press (fn [])}])
+    (h/render [account-list-card/view
+               {:account-props account-props
+                :network       :ethereum
+                :state         :default
+                :action        :icon}])
    (h/is-truthy (h/get-by-label-text :icon))))
@@ -1,29 +0,0 @@
-(ns quo.components.list-items.account-list-card.schema)
-
-(def ^:private ?base
-  [:map
-   [:action {:optional true} [:enum :icon :none]]
-   [:blur? {:optional true} [:maybe :boolean]]
-   [:on-press {:optional true} [:maybe fn?]]
-   [:account-props
-    [:map {:closed true}
-     [:type [:enum :default :watch-only]]
-     [:name :string]
-     [:address :string]
-     [:emoji :string]
-     [:size {:optional true} [:enum 80 :size-64 48 32 28 24 20 16]]
-     [:customization-color {:optional true} [:maybe :schema.common/customization-color]]]]
-   [:networks {:optional true} [:* [:map [:network-name :keyword] [:short-name :string]]]]])
-
-(def ^:private ?on-option-press
-  [:map
-   [:on-options-press [:maybe fn?]]])
-
-(def ?schema
-  [:=>
-   [:cat
-    [:multi {:dispatch :action}
-     [:icon [:merge ?base ?on-option-press]]
-     [:none ?base]
-     [:malli.core/default ?base]]]
-   :any])
@@ -2,44 +2,41 @@
  (:require
    [quo.components.avatars.account-avatar.view :as account-avatar]
    [quo.components.icon :as icon]
-    [quo.components.list-items.account-list-card.schema :as component-schema]
    [quo.components.list-items.account-list-card.style :as style]
    [quo.components.markdown.text :as text]
    [quo.components.wallet.address-text.view :as address-text]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [schema.core :as schema]))
+    [reagent.core :as reagent]))

 (defn- internal-view
-  [{:keys [action blur? account-props networks on-press on-options-press]}]
-  (let [theme             (quo.theme/use-theme-value)
-        [state set-state] (rn/use-state :default)
-        on-press-in       (rn/use-callback #(set-state :pressed))
-        on-press-out      (rn/use-callback #(set-state :default))]
-    [rn/pressable
-     {:style               (style/container {:state state :blur? blur? :theme theme})
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-press            on-press
-      :accessibility-label :container}
-     [rn/view {:style style/left-container}
-      [account-avatar/view account-props]
-      [rn/view {:style {:margin-left 8}}
-       [text/text
-        {:weight :semi-bold
-         :size   :paragraph-2}
-        (:name account-props)]
-       [address-text/view
-        {:networks networks
-         :address  (:address account-props)
-         :format   :short}]]]
-     (when (= action :icon)
-       [rn/pressable {:on-press on-options-press}
-        [icon/icon :i/options
-         {:color               (if blur?
-                                 colors/white-opa-70
-                                 (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))
-          :accessibility-label :icon}]])]))
+  []
+  (let [state (reagent/atom :default)]
+    (fn [{:keys [action blur? account-props networks on-press on-options-press theme]}]
+      [rn/pressable
+       {:style               (style/container {:state @state :blur? blur? :theme theme})
+        :on-press-in         #(reset! state :pressed)
+        :on-press-out        #(reset! state :default)
+        :on-press            on-press
+        :accessibility-label :container}
+       [rn/view {:style style/left-container}
+        [account-avatar/view account-props]
+        [rn/view {:style {:margin-left 8}}
+         [text/text
+          {:weight :semi-bold
+           :size   :paragraph-2}
+          (:name account-props)]
+         [address-text/view
+          {:networks networks
+           :address  (:address account-props)
+           :format   :short}]]]
+       (when (= action :icon)
+         [rn/pressable {:on-press on-options-press}
+          [icon/icon :i/options
+           {:color               (if blur?
+                                   colors/white-opa-70
+                                   (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))
+            :accessibility-label :icon}]])])))

-(def view (schema/instrument #'internal-view component-schema/?schema))
+(def view (quo.theme/with-theme internal-view))
@@ -4,36 +4,32 @@
    [quo.foundations.colors :as colors]
    [test-helpers.component :as h]))

-(defn- with-defaults
-  ([] (with-defaults {}))
-  ([props] (merge {:address "0x0ah...78b"} props)))
-
 (h/describe "List items: address"
  (h/test "default render"
-    (h/render-with-theme-provider [address/view (with-defaults)])
+    (h/render [address/view])
    (h/is-truthy (h/query-by-label-text :container)))

  (h/test "on-press-in changes state to :pressed"
-    (h/render-with-theme-provider [address/view (with-defaults)])
+    (h/render [address/view])
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
                              {:backgroundColor (colors/custom-color :blue 50 5)})))

  (h/test "on-press-in changes state to :pressed with blur? enabled"
-    (h/render-with-theme-provider [address/view (with-defaults {:blur? true})])
+    (h/render [address/view {:blur? true}])
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
                              {:backgroundColor colors/white-opa-5})))

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

  (h/test "on-press-out changes state to :active with blur? enabled"
-    (h/render-with-theme-provider [address/view (with-defaults {:active-state? true :blur? true})])
+    (h/render [address/view {:active-state? true :blur? true}])
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/fire-event :on-press-out (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
@@ -41,6 +37,6 @@

  (h/test "on-press event is called"
    (let [on-press (h/mock-fn)]
-      (h/render-with-theme-provider [address/view (with-defaults {:on-press on-press})])
+      (h/render [address/view {:on-press on-press}])
      (h/fire-event :on-press (h/get-by-label-text :container))
      (h/was-called on-press))))
@@ -1,13 +0,0 @@
-(ns quo.components.list-items.address.schema)
-
-(def ?schema
-  [:=>
-   [:cat
-    [:map
-     [:address :string]
-     [:networks {:optional true} [:* [:map [:network-name :keyword] [:short-name :string]]]]
-     [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-     [:on-press {:optional true} [:maybe fn?]]
-     [:blur? {:optional true} [:maybe :boolean]]
-     [:active-state? {:optional true} [:maybe :boolean]]]]
-   :any])
@@ -1,13 +1,12 @@
 (ns quo.components.list-items.address.view
  (:require
    [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
-    [quo.components.list-items.address.schema :as component-schema]
    [quo.components.list-items.address.style :as style]
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [schema.core :as schema]
+    [reagent.core :as reagent]
    [utils.address :as address]))

 (defn- left-container
@@ -38,35 +37,31 @@
      (address/get-shortened-key address)]]]])

 (defn- internal-view
-  [{:keys [networks address customization-color on-press active-state? blur?]
-    :or   {customization-color :blue}}]
-  (let [theme             (quo.theme/use-theme-value)
-        [state set-state] (rn/use-state :default)
-        active?           (rn/use-ref-atom false)
-        timer             (rn/use-ref-atom nil)
-        on-press-in       (rn/use-callback
-                           (fn []
-                             (when-not (= state :selected)
-                               (reset! timer (js/setTimeout #(set-state :pressed) 100))))
-                           [state])
-        on-press-out      (rn/use-callback
-                           (fn []
-                             (let [new-state (if (or (not active-state?) @active?) :default :active)]
-                               (when @timer (js/clearTimeout @timer))
-                               (reset! timer nil)
-                               (reset! active? (= new-state :active))
-                               (set-state new-state)))
-                           [active-state?])]
-    [rn/pressable
-     {:style               (style/container state customization-color blur?)
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-press            on-press
-      :accessibility-label :container}
-     [left-container
-      {:theme    theme
-       :networks networks
-       :address  address
-       :blur?    blur?}]]))
+  []
+  (let [state       (reagent/atom :default)
+        active?     (atom false)
+        timer       (atom nil)
+        on-press-in (fn []
+                      (when-not (= @state :selected)
+                        (reset! timer (js/setTimeout #(reset! state :pressed) 100))))]
+    (fn [{:keys [networks address customization-color on-press active-state? blur? theme]
+          :or   {customization-color :blue}}]
+      (let [on-press-out (fn []
+                           (let [new-state (if (or (not active-state?) @active?) :default :active)]
+                             (when @timer (js/clearTimeout @timer))
+                             (reset! timer nil)
+                             (reset! active? (= new-state :active))
+                             (reset! state new-state)))]
+        [rn/pressable
+         {:style               (style/container @state customization-color blur?)
+          :on-press-in         on-press-in
+          :on-press-out        on-press-out
+          :on-press            on-press
+          :accessibility-label :container}
+         [left-container
+          {:theme    theme
+           :networks networks
+           :address  address
+           :blur?    blur?}]]))))

-(def view (schema/instrument #'internal-view component-schema/?schema))
+(def view (quo.theme/with-theme internal-view))
@@ -5,10 +5,11 @@
    [quo.components.icon :as quo.icons]
    [quo.components.list-items.channel.style :as style]
    [quo.components.markdown.text :as quo.text]
-    [quo.theme]
-    [react-native.core :as rn]))
+    [quo.theme :as theme]
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

-(defn view
+(defn- view-internal
  "Options:
   - notification - (nil/:notification/:mention/:mute, default: nil):
     - :notification - Display a grey dot.
@@ -26,37 +27,38 @@
   - on-press - (function, default: nil) - Function called when the component is pressed.
   - on-long-press - (function, default: nil) - Function called when the component is long pressed.
   - theme - Theme value from with-theme HOC"
-  [{:keys [notification locked? mentions-count customization-color emoji name on-press on-long-press]}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/pressable
-     {:style               (style/container pressed? customization-color theme)
-      :accessibility-label :channel-list-item
-      :on-press            on-press
-      :on-long-press       on-long-press
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out}
-     [channel-avatar/view
-      {:size                :size-32
-       :locked?             locked?
-       :full-name           name
-       :customization-color customization-color
-       :emoji               emoji}]
-     [quo.text/text
-      {:style  (style/label notification theme)
-       :weight :medium
-       :size   :paragraph-1} (str "# " name)]
-     (when-not locked?
-       (condp = notification
-         :mute         [quo.icons/icon :i/muted
-                        {:color (style/mute-notification-icon-color theme)}]
-         :mention      [counter/view
-                        {:customization-color customization-color
-                         :container-style     (style/counter mentions-count)}
-                        mentions-count]
-         :notification [quo.icons/icon :i/notification
-                        {:color               (style/mute-notification-icon-color theme)
-                         :accessibility-label :unviewed-messages-public}]
-         nil))]))
+  []
+  (let [pressed? (reagent/atom false)]
+    (fn [{:keys [notification locked? mentions-count customization-color emoji name on-press
+                 on-long-press theme]}]
+      [rn/pressable
+       {:style               (style/container @pressed? customization-color theme)
+        :accessibility-label :channel-list-item
+        :on-press            on-press
+        :on-long-press       on-long-press
+        :on-press-in         #(reset! pressed? true)
+        :on-press-out        #(reset! pressed? false)}
+       [channel-avatar/view
+        {:size                :size-32
+         :locked?             locked?
+         :full-name           name
+         :customization-color customization-color
+         :emoji               emoji}]
+       [quo.text/text
+        {:style  (style/label notification theme)
+         :weight :medium
+         :size   :paragraph-1} (str "# " name)]
+       (when-not locked?
+         (condp = notification
+           :mute         [quo.icons/icon :i/muted
+                          {:color (style/mute-notification-icon-color theme)}]
+           :mention      [counter/view
+                          {:customization-color customization-color
+                           :container-style     (style/counter mentions-count)}
+                          mentions-count]
+           :notification [quo.icons/icon :i/notification
+                          {:color               (style/mute-notification-icon-color theme)
+                           :accessibility-label :unviewed-messages-public}]
+           nil))])))
+
+(def view (theme/with-theme view-internal))
@@ -7,7 +7,8 @@
    [quo.components.markdown.text :as text]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))

 (defn- logo-component
  [logo]
@@ -82,7 +83,7 @@
        :style               {:margin-left 10}}
       component])))

-(defn view
+(defn- view-internal
  "Options:

  :type - :discover/engage/share
@@ -115,48 +116,49 @@
  :unread-count - number - When the info is :mention, it will be used to show
  the number of unread mentions.
  "
-  [{:keys [members type info tokens locked? title subtitle logo blur? customization-color
-           on-press on-long-press on-press-info container-style unread-count]}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/pressable
-     {:accessibility-label :container
+  []
+  (let [pressed? (reagent/atom false)]
+    (fn [{:keys [members type info tokens locked? title subtitle
+                 logo blur? customization-color
+                 on-press on-long-press on-press-info
+                 container-style unread-count theme]}]
+      [rn/pressable
+       {:accessibility-label :container
+        :on-press-in         (fn [] (reset! pressed? true))
+        :on-press            on-press
+        :on-long-press       on-long-press
+        :on-press-out        (fn [] (reset! pressed? false))
+        :style               (merge (style/container {:blur?               blur?
+                                                      :customization-color customization-color
+                                                      :info                info
+                                                      :type                type
+                                                      :pressed?            @pressed?
+                                                      :theme               theme})
+                                    container-style)}
+       [logo-component logo]
+       [rn/view {:style {:flex 1}}
+        [title-component
+         {:blur? blur?
+          :info  info
+          :theme theme
+          :title title
+          :type  type}]
+        (when (and (= type :share) subtitle)
+          [subtitle-component subtitle blur? theme])
+        (when (and members (= type :discover))
+          [community-view/community-stats-column
+           {:type          :list-view
+            :members-count (:members-count members)
+            :active-count  (:active-count members)}])]
+       [info-component
+        {:blur?               blur?
+         :customization-color customization-color
+         :info                info
+         :type                type
+         :locked?             locked?
+         :on-press-info       on-press-info
+         :theme               theme
+         :tokens              tokens
+         :unread-count        unread-count}]])))

-      :on-press            on-press
-      :on-long-press       on-long-press
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :style               (merge (style/container {:blur?               blur?
-                                                    :customization-color customization-color
-                                                    :info                info
-                                                    :type                type
-                                                    :pressed?            pressed?
-                                                    :theme               theme})
-                                  container-style)}
-     [logo-component logo]
-     [rn/view {:style {:flex 1}}
-      [title-component
-       {:blur? blur?
-        :info  info
-        :theme theme
-        :title title
-        :type  type}]
-      (when (and (= type :share) subtitle)
-        [subtitle-component subtitle blur? theme])
-      (when (and members (= type :discover))
-        [community-view/community-stats-column
-         {:type          :list-view
-          :members-count (:members-count members)
-          :active-count  (:active-count members)}])]
-     [info-component
-      {:blur?               blur?
-       :customization-color customization-color
-       :info                info
-       :type                type
-       :locked?             locked?
-       :on-press-info       on-press-info
-       :theme               theme
-       :tokens              tokens
-       :unread-count        unread-count}]]))
+(def view (quo.theme/with-theme view-internal))
@@ -6,41 +6,43 @@
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [react-native.fast-image :as fast-image]))
+    [react-native.fast-image :as fast-image]
+    [reagent.core :as reagent]))

-(defn view
-  [{:keys [dapp action on-press on-press-icon] :as props}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/pressable
-     {:style        (style/container (assoc props :pressed? pressed?))
-      :on-press     on-press
-      :on-press-in  on-press-in
-      :on-press-out on-press-out}
-     [rn/view {:style style/container-info}
-      [fast-image/fast-image
-       {:source (:avatar dapp)
-        :style  {:width 32 :height 32}}]
-      [rn/view {:style style/user-info}
-       [text/text
-        {:weight :semi-bold
-         :size   :paragraph-1
-         :style  (style/style-text-name theme)}
-        (:name dapp)]
-       [text/text
-        {:weight :regular
-         :size   :paragraph-2
-         :style  (style/style-text-value theme)}
-        (:value dapp)]]]
-     (when (= action :icon)
-       [rn/pressable
-        {:on-press on-press-icon
-         :testID   "dapp-component-icon"}
-        [icons/icon :i/options
-         {:color               (colors/theme-colors
-                                colors/neutral-50
-                                colors/neutral-40
-                                theme)
-          :accessibility-label :icon}]])]))
+(defn- view-internal
+  []
+  (let [pressed? (reagent/atom false)]
+    (fn [{:keys [dapp action on-press on-press-icon theme] :as props}]
+      [rn/pressable
+       {:style        (style/container (assoc props :pressed? @pressed?))
+        :on-press     on-press
+        :on-press-in  #(reset! pressed? true)
+        :on-press-out #(reset! pressed? false)}
+       [rn/view {:style style/container-info}
+        [fast-image/fast-image
+         {:source (:avatar dapp)
+          :style  {:width 32 :height 32}}]
+        [rn/view {:style style/user-info}
+         [text/text
+          {:weight :semi-bold
+           :size   :paragraph-1
+           :style  (style/style-text-name theme)}
+          (:name dapp)]
+         [text/text
+          {:weight :regular
+           :size   :paragraph-2
+           :style  (style/style-text-value theme)}
+          (:value dapp)]]]
+       (when (= action :icon)
+         [rn/pressable
+          {:on-press on-press-icon
+           :testID   "dapp-component-icon"}
+          [icons/icon :i/options
+           {:color               (colors/theme-colors
+                                  colors/neutral-50
+                                  colors/neutral-40
+                                  theme)
+            :accessibility-label :icon}]])])))
+
+(def view
+  (quo.theme/with-theme view-internal))
@@ -5,6 +5,7 @@
    [quo.components.markdown.text :as text]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
+    [reagent.core :as reagent]
    [schema.core :as schema]))

 (defn- info
@@ -21,19 +22,18 @@
     (if (string/blank? label) "-" label)]]])

 (defn- values
-  [{:keys [token-value fiat-value]}]
-  (let [theme (quo.theme/use-theme-value)]
-    [rn/view {:style style/values-container}
-     [text/text
-      {:weight          :medium
-       :size            :paragraph-2
-       :number-of-lines 1}
-      token-value]
-     [text/text
-      {:style           (style/fiat-value theme)
-       :size            :paragraph-2
-       :number-of-lines 1}
-      fiat-value]]))
+  [{:keys [token-value fiat-value theme]}]
+  [rn/view {:style style/values-container}
+   [text/text
+    {:weight          :medium
+     :size            :paragraph-2
+     :number-of-lines 1}
+    token-value]
+   [text/text
+    {:style           (style/fiat-value theme)
+     :size            :paragraph-2
+     :number-of-lines 1}
+    fiat-value]])

 (def ?schema
  [:=>
@@ -51,21 +51,26 @@
   :any])

 (defn- view-internal
-  [{:keys [on-press state customization-color]
-    :as   props
-    :or   {customization-color :blue}}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))
-        internal-state         (if pressed? :pressed state)]
-    [rn/pressable
-     {:style               (style/container internal-state customization-color theme)
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-press            on-press
-      :accessibility-label :network-list}
-     [info props]
-     [values props]]))
+  []
+  (let [pressed?     (reagent/atom false)
+        on-press-in  #(reset! pressed? true)
+        on-press-out #(reset! pressed? false)]
+    (fn [{:keys [on-press state customization-color theme]
+          :as   props
+          :or   {customization-color :blue}}]
+      (let [internal-state (if @pressed?
+                             :pressed
+                             state)]

-(def view (schema/instrument #'view-internal ?schema))
+        [rn/pressable
+         {:style               (style/container internal-state customization-color theme)
+          :on-press-in         on-press-in
+          :on-press-out        on-press-out
+          :on-press            on-press
+          :accessibility-label :network-list}
+         [info props]
+         [values props]]))))
+
+(def view
+  (quo.theme/with-theme
+   (schema/instrument #'view-internal ?schema)))
@@ -7,69 +7,70 @@
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
+    [reagent.core :as reagent]
    [utils.address :as address]))

 (defn- left-container
-  [{:keys [blur? name ens address customization-color]}]
-  (let [theme (quo.theme/use-theme-value)]
-    [rn/view {:style style/left-container}
-     [wallet-user-avatar/wallet-user-avatar
-      {:size                :size-32
-       :full-name           name
-       :customization-color customization-color}]
-     [rn/view {:style style/account-container}
-      [text/text
-       {:weight :semi-bold
-        :size   :paragraph-1
-        :style  style/name-text}
-       name]
-      [text/text {:size :paragraph-2}
-       [text/text
-        {:size   :paragraph-2
-         :weight :monospace
-         :style  (style/account-address blur? theme)}
-        (or ens (address/get-shortened-key address))]]]]))
+  [{:keys [blur? theme name ens address customization-color]}]
+  [rn/view {:style style/left-container}
+   [wallet-user-avatar/wallet-user-avatar
+    {:size                :size-32
+     :full-name           name
+     :customization-color customization-color}]
+   [rn/view {:style style/account-container}
+    [text/text
+     {:weight :semi-bold
+      :size   :paragraph-1
+      :style  style/name-text}
+     name]
+    [text/text {:size :paragraph-2}
+     [text/text
+      {:size   :paragraph-2
+       :weight :monospace
+       :style  (style/account-address blur? theme)}
+      (or ens (address/get-shortened-key address))]]]])

-(defn view
-  [{:keys [blur? user-props active-state? customization-color on-press on-options-press]
-    :or   {customization-color :blue
-           blur?               false}}]
-  (let [theme             (quo.theme/use-theme-value)
-        [state set-state] (rn/use-state :default)
-        active?           (rn/use-ref-atom false)
-        timer             (rn/use-ref-atom nil)
-        on-press-in       (rn/use-callback
-                           (fn []
-                             (when-not (= state :selected)
-                               (reset! timer (js/setTimeout #(set-state :pressed) 100))))
-                           [state])
-        on-press-out      (rn/use-callback
-                           (fn []
-                             (let [new-state (if (or (not active-state?) @active?) :default :active)]
-                               (when @timer (js/clearTimeout @timer))
-                               (reset! timer nil)
-                               (reset! active? (= new-state :active))
-                               (set-state new-state)))
-                           [active-state?])]
-    [rn/pressable
-     {:style               (style/container
-                            {:state state :blur? blur? :customization-color customization-color})
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-press            on-press
-      :accessibility-label :container}
-     [left-container
-      {:blur?               blur?
-       :theme               theme
-       :name                (:name user-props)
-       :ens                 (:ens user-props)
-       :address             (:address user-props)
-       :customization-color (or (:customization-color user-props) :blue)}]
-     (when on-options-press
-       [rn/pressable
-        {:accessibility-label :options-button
-         :on-press            on-options-press}
-        [icon/icon :i/options
-         {:color (if blur?
-                   colors/white-opa-70
-                   (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}]])]))
+(defn- internal-view
+  []
+  (let [state       (reagent/atom :default)
+        active?     (atom false)
+        timer       (atom nil)
+        on-press-in (fn []
+                      (when-not (= @state :selected)
+                        (reset! timer (js/setTimeout #(reset! state :pressed) 100))))]
+    (fn [{:keys [blur? user-props active-state? customization-color
+                 on-press
+                 on-options-press
+                 theme]
+          :or   {customization-color :blue
+                 blur?               false}}]
+      (let [on-press-out (fn []
+                           (let [new-state (if (or (not active-state?) @active?) :default :active)]
+                             (when @timer (js/clearTimeout @timer))
+                             (reset! timer nil)
+                             (reset! active? (= new-state :active))
+                             (reset! state new-state)))]
+        [rn/pressable
+         {:style               (style/container
+                                {:state @state :blur? blur? :customization-color customization-color})
+          :on-press-in         on-press-in
+          :on-press-out        on-press-out
+          :on-press            on-press
+          :accessibility-label :container}
+         [left-container
+          {:blur?               blur?
+           :theme               theme
+           :name                (:name user-props)
+           :ens                 (:ens user-props)
+           :address             (:address user-props)
+           :customization-color (or (:customization-color user-props) :blue)}]
+         (when on-options-press
+           [rn/pressable
+            {:accessibility-label :options-button
+             :on-press            on-options-press}
+            [icon/icon :i/options
+             {:color (if blur?
+                       colors/white-opa-70
+                       (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}]])]))))
+
+(def view (quo.theme/with-theme internal-view))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrea Maria Piana	1e7c701b90	Revert "revert fleet changes" https://github.com/status-im/status-go/compare/53044060...53044060 This reverts commit 2cc531c46fc50367680bd189999ebc519d3fe818.	2024-02-27 11:09:11 +02:00
Andrea Maria Piana	f05261a1e9	revert fleet changes	2024-02-27 11:09:10 +02:00