Merge branch 'develop' into 17842

.clj-kondo/metosin/malli/config.edn

@@ -1,2 +0,0 @@
-{:lint-as {malli.experimental/defn schema.core/defn}
- :linters {:unresolved-symbol {:exclude [(malli.core/=>)]}}}

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

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

VERSION

@@ -1 +1 @@
-1.26.0
+1.25.0

ci/Jenkinsfile.ios

@@ -77,6 +77,7 @@ pipeline {
           }
         }
         stage('Upload') {
+          when { expression { !utils.isReleaseBuild() } }
           steps { script {
             env.DIAWI_URL = ios.uploadToDiawi()
             env.PKG_URL = env.DIAWI_URL

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java

@@ -1183,11 +1183,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         return pathCombine(absRootDirPath, "keystore");
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String fleets() {
-        return Statusgo.fleets();
-    }
-
     @ReactMethod(isBlockingSynchronousMethod = true)
     public String backupDisabledDataDir() {
         return this.getNoBackupDirectory();

modules/react-native-status/ios/RCTStatus/RCTStatus.m

@@ -981,10 +981,6 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(isAddress:(NSString *)address) {
   return StatusgoIsAddress(address);
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(fleets) {
-  return StatusgoFleets();
-}
-
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(toChecksumAddress:(NSString *)address) {
   return StatusgoToChecksumAddress(address);
 }

modules/react-native-status/nodejs/status.cpp

@@ -298,7 +298,6 @@ void _MultiAccountStoreAccount(const FunctionCallbackInfo<Value>& args) {
 	delete c;
 }
 
-
 void _InitKeystore(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -563,17 +562,6 @@ void _CheckAddressChecksum(const FunctionCallbackInfo<Value>& args) {
 
 }
 
-void _Fleets(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-	// Call exported Go function, which returns a C string
-	char *c = Fleets();
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-}
-
-
 void _IsAddress(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -1900,7 +1888,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreDerivedAccounts", _MultiAccountStoreDerivedAccounts);
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
-	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
 	NODE_SET_METHOD(exports, "encodeFunctionCall", _EncodeFunctionCall);

src/native_module/core.cljs

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

src/quo/components/colors/color/constants.cljs

@@ -1,3 +1,3 @@
 (ns quo.components.colors.color.constants)
 
-(def ^:const color-size 48)
+(def ^:const IPHONE_11_PRO_VIEWPORT_WIDTH 375)

src/quo/components/colors/color/style.cljs

@@ -1,13 +1,12 @@
 (ns quo.components.colors.color.style
   (:require
-    [quo.components.colors.color.constants :as constants]
     [quo.foundations.colors :as colors]
     [utils.responsiveness :as responsiveness]))
 
 (defn color-button-common
   [window-width]
-  {:width         constants/color-size
-   :height        constants/color-size
+  {:width         48
+   :height        48
    :border-width  4
    :border-radius 24
    :margin-right  (-> window-width

src/quo/components/colors/color_picker/component_spec.cljs

@@ -5,6 +5,10 @@
     [test-helpers.component :as h]))
 
 (h/describe "color-picker"
+  (h/test "color picker rendered"
+    (h/render [color-picker/view])
+    (-> (h/expect (h/get-all-by-label-text :color-picker-item))
+        (.toHaveLength 11)))
   (h/test "clicks on a color item"
     (let [event (h/mock-fn)]
       (h/render [color-picker/view {:on-change #(event)}])
@@ -16,6 +20,11 @@
       (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)
-          (.toStrictEqual :blue)))))
+          (.toStrictEqual :blue))))
+  (h/test "all of the values of colors-list are rendered"
+    (h/render [color-picker/view])
+    (js/Promise.all (map (fn [color]
+                           (h/is-truthy (h/get-all-by-label-text color)))
+                         color-picker/color-list))))
 
 

src/quo/components/colors/color_picker/view.cljs

@@ -1,67 +1,39 @@
 (ns quo.components.colors.color-picker.view
   (:require
-    [quo.components.colors.color.constants :as constants]
     [quo.components.colors.color.view :as color]
-    [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [reagent.core :as reagent]))
 
+(def color-list
+  [:blue :yellow :purple :turquoise :magenta :sky :orange :army :flamingo :camel :copper])
+
 (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]
-  #js
-   {:length constants/color-size
-    :offset (* (+ constants/color-size 8) index)
-    :index  index})
-
-(defn- view-internal
+(defn view
   "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]}]
+  [{:keys [default-selected]}]
   (let [selected              (reagent/atom default-selected)
-        {window-width :width} (rn/get-window)
-        ref                   (atom nil)]
-    (rn/use-effect #(js/setTimeout (fn []
-                                     (.scrollToIndex ^js @ref
-                                                     #js
-                                                      {:animated     true
-                                                       :index        (.indexOf colors/account-colors
-                                                                               default-selected)
-                                                       :viewPosition 0.5}))
-                                   50))
-    [rn/flat-list
-     {: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                         (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])
+        {window-width :width} (rn/get-window)]
+    (fn [{:keys [blur? on-change feng-shui? container-style]}]
+      [rn/scroll-view
+       {:horizontal                        true
+        :shows-horizontal-scroll-indicator false
+        :content-container-style           container-style}
+       (doall (map-indexed (fn [idx color]
+                             [color/view
+                              {:selected?    (= color @selected)
+                               :on-press     #(on-change-handler selected % on-change)
+                               :blur?        blur?
+                               :key          color
+                               :color        color
+                               :idx          idx
+                               :window-width window-width}])
+                           ;; TODO: using :feng-shui? temporarily while b & w is being developed.
+                           ;; https://github.com/status-im/status-mobile/discussions/16676
+                           (if feng-shui? (conj color-list :feng-shui) color-list)))])))

src/quo/components/drawers/bottom_actions/view.cljs

@@ -24,9 +24,9 @@
   :scroll? - bool (default false) - Whether the iOS Home Indicator should be rendered"
   [props]
   (let [{:keys [actions description button-one-label button-two-label
-                button-one-props button-two-props theme scroll? customization-color container-style]}
+                button-one-props button-two-props theme scroll? customization-color]}
         (merge default-props props)]
-    [rn/view {:style container-style}
+    [:<>
      [rn/view {:style style/buttons-container}
       (when (= actions :2-actions)
         [button/button

src/quo/components/text_combinations/view.cljs

@@ -1,6 +1,5 @@
 (ns quo.components.text-combinations.view
   (:require
-    [quo.components.buttons.button.view :as button]
     [quo.components.markdown.text :as text]
     [quo.components.text-combinations.style :as style]
     [quo.theme :as theme]
@@ -24,31 +23,20 @@
            avatar
            title-accessibility-label
            description
-           description-accessibility-label
-           button-icon
-           button-on-press
-           customization-color]}]
+           description-accessibility-label]}]
   [rn/view {:style container-style}
-   [rn/view
-    {:style {:flex-direction  :row
-             :justify-content :space-between}}
-    [rn/view {:style style/title-container}
-     (when avatar
-       [rn/view {:style style/avatar-container}
-        [icon avatar 32]])
-     [text/text
-      {:accessibility-label title-accessibility-label
-       :weight              :semi-bold
-       :ellipsize-mode      :tail
-       :number-of-lines     1
-       :size                :heading-1}
-      title]]
-    (when button-icon
-      [button/button
-       {:icon-only?          true
-        :on-press            button-on-press
-        :customization-color customization-color
-        :size                32} button-icon])]
+   [rn/view {:style style/title-container}
+    (when avatar
+      [rn/view {:style style/avatar-container}
+       [icon avatar 32]])
+
+    [text/text
+     {:accessibility-label title-accessibility-label
+      :weight              :semi-bold
+      :ellipsize-mode      :tail
+      :number-of-lines     1
+      :size                :heading-1}
+     title]]
    (when description
      [text/text
       {:accessibility-label description-accessibility-label

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

@@ -4,7 +4,8 @@
 
 (defn container
   [{:keys [blur? customization-color theme selected?]}]
-  {:border-radius  16
+  {:flex           1
+   :border-radius  20
    :border-width   1
    :border-color   (if selected?
                      (if blur?
@@ -27,4 +28,5 @@
 (def title-container
   {:flex-direction  :row
    :align-items     :center
-   :justify-content :space-between})
+   :justify-content :space-between
+   :flex            1})

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

@@ -27,16 +27,13 @@
 (defn avatar
   [{{:keys [full-name]} :details
     avatar-type         :type
-    customization-color :customization-color
-    profile-picture     :profile-picture}]
+    customization-color :customization-color}]
   (if (= avatar-type :default-keypair)
     [user-avatar/user-avatar
      {:full-name           full-name
       :ring?               true
       :size                :small
-      :status-indicator?   false
-      :customization-color customization-color
-      :profile-picture     profile-picture}]
+      :customization-color customization-color}]
     [icon-avatar/icon-avatar
      {:size    :size-32
       :icon    :i/placeholder
@@ -87,9 +84,9 @@
 (defn- view-internal
   []
   (let [selected? (reagent/atom true)]
-    (fn [{:keys [accounts action container-style] :as props}]
+    (fn [{:keys [accounts action] :as props}]
       [rn/pressable
-       {:style    (merge (style/container (merge props {:selected? @selected?})) container-style)
+       {:style    (style/container (merge props {:selected? @selected?}))
         :on-press #(when (= action :selector) (reset! selected? (not @selected?)))}
        [rn/view {:style style/header-container}
         [avatar props]

src/quo/foundations/colors.cljs

@@ -4,9 +4,6 @@
     [quo.theme :as theme]
     [react-native.platform :as platform]))
 
-(def account-colors
-  [:blue :yellow :purple :turquoise :magenta :sky :orange :army :flamingo :camel :copper])
-
 (defn alpha
   [value opacity]
   (when value

src/quo/foundations/colors_test.cljs

@@ -29,6 +29,3 @@
   (testing
     "when using opacity theme is ignored and uses the light suffix resolver"
     (is (colors/resolve-color :blue :light 10) (colors/resolve-color :blue :dark 10))))
-
-(deftest test-account-colors-customization
-  (is (every? #(contains? colors/customization %) colors/account-colors)))

src/status_im/chat/models/input.cljs

@@ -107,15 +107,14 @@
   [{:keys [db] :as cofx} message]
   (let [current-chat-id (:current-chat-id db)
         text            (get-in message [:content :text])]
-    {:db         (-> db
-                     (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
-                               message)
-                     (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
-                     (update-in [:chat/inputs current-chat-id :metadata]
-                                dissoc
-                                :sending-image))
-     :dispatch-n [[:chat.ui/set-chat-input-text nil current-chat-id]
-                  [:mention/to-input-field text current-chat-id]]}))
+    {:db       (-> db
+                   (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
+                             message)
+                   (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
+                   (update-in [:chat/inputs current-chat-id :metadata]
+                              dissoc
+                              :sending-image))
+     :dispatch [:mention/to-input-field text current-chat-id]}))
 
 (rf/defn show-contact-request-input
   "Sets reference to previous chat message and focuses on input"

src/status_im/contexts/profile/rpc.cljs

@@ -1,20 +0,0 @@
-(ns status-im.contexts.profile.rpc
-  (:require
-    clojure.set
-    [clojure.string :as string]
-    [utils.ens.core :as utils.ens]))
-
-(defn rpc->wakuv2-config
-  [wakuv2-config]
-  (clojure.set/rename-keys wakuv2-config {:LightClient :light-client}))
-
-(defn rpc->profiles-overview
-  [{:keys [customizationColor keycard-pairing] :as profile}]
-  (if (map? profile)
-    (-> profile
-        (update :wakuv2-config rpc->wakuv2-config)
-        (dissoc :customizationColor)
-        (assoc :customization-color (keyword customizationColor))
-        (assoc :ens-name? (utils.ens/is-valid-eth-name? (:name profile)))
-        (assoc :keycard-pairing (when-not (string/blank? keycard-pairing) keycard-pairing)))
-    profile))

src/status_im/fleet/core.cljs

@@ -1,26 +1,17 @@
 (ns status-im.fleet.core
   (:require
-    [native-module.core :as native-module]
     [re-frame.core :as re-frame]
     [status-im.multiaccounts.update.core :as multiaccounts.update]
     [status-im.node.core :as node]
+    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
-    [utils.transforms :as transforms]))
-
-(def ^:private default-fleets (transforms/json->clj (native-module/fleets)))
-(def ^:private default-fleet (:defaultFleet default-fleets))
-(def fleets
-  (->> default-fleets
-       :fleets
-       keys
-       (map name)))
+    [utils.re-frame :as rf]))
 
 (defn current-fleet-sub
   [multiaccount]
   (keyword (or (get multiaccount :fleet)
-               default-fleet)))
+               config/fleet)))
 
 (defn format-mailserver
   [mailserver address]
@@ -87,9 +78,10 @@
   [{:keys [db now] :as cofx} fleet]
   (let [old-fleet (get-in db [:profile/profile :fleet])]
     (when (not= fleet old-fleet)
-      (multiaccounts.update/multiaccount-update
+      (rf/merge
        cofx
-       :fleet
-       fleet
-       {:on-success
-        #(re-frame/dispatch [:logout])}))))
+       (multiaccounts.update/multiaccount-update :fleet fleet {})
+       (node/prepare-new-config
+        {:on-success
+         #(re-frame/dispatch
+           [:multiaccounts.update.callback/save-settings-success])})))))

src/status_im/keycard/card.cljs

@@ -523,7 +523,8 @@
         (error-object->map response)]))}))
 
 (defn save-multiaccount-and-login
-  [_])
+  [args]
+  (keycard/save-multiaccount-and-login card args))
 
 (defn login
   [args]

src/status_im/keycard/recovery.cljs

@@ -17,6 +17,7 @@
     [taoensso.timbre :as log]
     [utils.address :as address]
     [utils.datetime :as datetime]
+    [utils.ethereum.eip.eip55 :as eip55]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
     [utils.security.core :as security]))
@@ -151,7 +152,6 @@
              :keycard/check-nfc-enabled nil}
             (intro-wizard)))
 
-;; NOTE: currently non functional, keycard needs to be reimplemented
 (rf/defn create-keycard-multiaccount
   {:events       [::create-keycard-multiaccount]
    :interceptors [(re-frame/inject-cofx :random-guid-generator)
@@ -182,7 +182,27 @@
     (rf/merge cofx
               {:db (-> db
                        (assoc-in [:keycard :setup-step] nil)
-                       (dissoc :intro-wizard))})))
+                       (dissoc :intro-wizard))}
+              (multiaccounts.create/on-multiaccount-created
+               {:recovered            (or recovered (get-in db [:intro-wizard :recovering?]))
+                :derived              {constants/path-wallet-root-keyword
+                                       {:public-key wallet-root-public-key
+                                        :address    (eip55/address->checksum wallet-root-address)}
+                                       constants/path-whisper-keyword
+                                       {:public-key whisper-public-key
+                                        :address    (eip55/address->checksum whisper-address)}
+                                       constants/path-default-wallet-keyword
+                                       {:public-key wallet-public-key
+                                        :address    (eip55/address->checksum wallet-address)}}
+                :address              address
+                :public-key           public-key
+                :keycard-instance-uid instance-uid
+                :key-uid              (address/normalized-hex key-uid)
+                :keycard-pairing      pairing
+                :keycard-paired-on    paired-on
+                :chat-key             whisper-private-key}
+               encryption-public-key
+               {}))))
 
 (rf/defn return-to-keycard-login
   [{:keys [db] :as cofx}]

src/status_im/keycard/simulated_keycard.cljs

@@ -489,7 +489,14 @@
   (log/warn "sign-typed-data not implemented" args))
 
 (defn save-multiaccount-and-login
-  [_])
+  [{:keys [key-uid multiaccount-data password settings node-config accounts-data]}]
+  (native-module/save-account-and-login
+   key-uid
+   (types/clj->json multiaccount-data)
+   password
+   (types/clj->json settings)
+   node-config
+   (types/clj->json accounts-data)))
 
 (defn login
   [{:keys [key-uid multiaccount-data password]}]

src/status_im/log_level/core.cljs

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

src/status_im/multiaccounts/create/core.cljs

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

src/status_im/network/core.cljs

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

src/status_im/node/core.cljs

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

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

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

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

@@ -225,9 +225,7 @@
                                                                          (.. ^js % -nativeEvent -data)])
         :on-load                                    #(re-frame/dispatch [:browser/loading-started])
         :on-error                                   #(re-frame/dispatch [:browser/error-occured])
-        :injected-java-script-before-content-loaded (js-res/ethereum-provider (str network-id))
-        ;; https://github.com/status-im/status-mobile/issues/17854
-        :allows-inline-media-playback               true}])]
+        :injected-java-script-before-content-loaded (js-res/ethereum-provider (str network-id))}])]
    [navigation
     {:url             url-original
      :name            name

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

@@ -1,7 +1,7 @@
 (ns status-im.ui.screens.fleet-settings.views
   (:require
     [re-frame.core :as re-frame]
-    [status-im.fleet.core :as fleets]
+    [status-im.node.core :as node]
     [status-im.ui.components.icons.icons :as icons]
     [status-im.ui.components.list.views :as list]
     [status-im.ui.components.react :as react]
@@ -30,11 +30,16 @@
        [react/text {:style styles/fleet-item-name-text}
         fleet]]]]))
 
+(defn fleets
+  [custom-fleets]
+  (map name (keys (node/fleets {:custom-fleets custom-fleets}))))
+
 (views/defview fleet-settings
   []
-  (views/letsubs [current-fleet [:fleets/current-fleet]]
+  (views/letsubs [custom-fleets [:fleets/custom-fleets]
+                  current-fleet [:fleets/current-fleet]]
     [list/flat-list
-     {:data               fleets/fleets
+     {:data               (fleets custom-fleets)
       :default-separator? false
       :key-fn             identity
       :render-data        (name current-fleet)

src/status_im/utils/test.cljs

@@ -117,9 +117,6 @@
     :isAddress
     (fn [address] (.isAddress native-status address))
 
-    :fleets
-    (fn [] (.fleets native-status))
-
     :validateMnemonic
     (fn [json callback] (callback (.validateMnemonic native-status json)))
 

src/status_im/waku/core.cljs

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

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

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

src/status_im2/common/standard_authentication/core.cljs

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

src/status_im2/common/standard_authentication/standard_auth/button/view.cljs

@@ -1,44 +0,0 @@
-(ns status-im2.common.standard-authentication.standard-auth.button.view
-  (:require
-    [quo.core :as quo]
-    [quo.theme :as quo.theme]
-    [reagent.core :as reagent]
-    [status-im2.common.standard-authentication.standard-auth.authorize :as authorize]))
-
-(defn- view-internal
-  [_]
-  (let [reset-slider? (reagent/atom false)
-        on-close      #(reset! reset-slider? true)]
-    (fn [{:keys [biometric-auth?
-                 customization-color
-                 auth-button-label
-                 on-enter-password
-                 on-auth-success
-                 on-press
-                 on-auth-fail
-                 auth-button-icon-left
-                 size
-                 button-label
-                 theme
-                 blur?
-                 container-style
-                 icon-left]}]
-      [quo/button
-       {:size                size
-        :container-style     container-style
-        :customization-color customization-color
-        :icon-left           icon-left
-        :on-press            (if on-press
-                               on-press
-                               #(authorize/authorize {:on-close              on-close
-                                                      :auth-button-icon-left auth-button-icon-left
-                                                      :theme                 theme
-                                                      :blur?                 blur?
-                                                      :on-enter-password     on-enter-password
-                                                      :biometric-auth?       biometric-auth?
-                                                      :on-auth-success       on-auth-success
-                                                      :on-auth-fail          on-auth-fail
-                                                      :auth-button-label     auth-button-label}))}
-       button-label])))
-
-(def view (quo.theme/with-theme view-internal))

src/status_im2/common/standard_authentication/standard_auth/slide_button/view.cljs

@@ -1,43 +0,0 @@
-(ns status-im2.common.standard-authentication.standard-auth.slide-button.view
-  (:require
-    [quo.core :as quo]
-    [quo.theme :as quo.theme]
-    [react-native.core :as rn]
-    [reagent.core :as reagent]
-    [status-im2.common.standard-authentication.standard-auth.authorize :as authorize]))
-
-(defn- view-internal
-  [_]
-  (let [reset-slider? (reagent/atom false)
-        on-close      #(reset! reset-slider? true)]
-    (fn [{:keys [biometric-auth?
-                 track-text
-                 customization-color
-                 auth-button-label
-                 on-enter-password
-                 on-auth-success
-                 on-auth-fail
-                 auth-button-icon-left
-                 size
-                 theme
-                 blur?
-                 container-style]}]
-      [rn/view {:style {:flex 1}}
-       [quo/slide-button
-        {:size                size
-         :container-style     container-style
-         :customization-color customization-color
-         :on-reset            (when @reset-slider? #(reset! reset-slider? false))
-         :on-complete         #(authorize/authorize {:on-close              on-close
-                                                     :auth-button-icon-left auth-button-icon-left
-                                                     :theme                 theme
-                                                     :blur?                 blur?
-                                                     :on-enter-password     on-enter-password
-                                                     :biometric-auth?       biometric-auth?
-                                                     :on-auth-success       on-auth-success
-                                                     :on-auth-fail          on-auth-fail
-                                                     :auth-button-label     auth-button-label})
-         :track-icon          (if biometric-auth? :i/face-id :password)
-         :track-text          track-text}]])))
-
-(def view (quo.theme/with-theme view-internal))

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

@@ -1,6 +1,10 @@
-(ns status-im2.common.standard-authentication.standard-auth.authorize
+(ns status-im2.common.standard-authentication.standard-auth.view
   (:require
+    [quo.core :as quo]
+    [quo.theme :as quo.theme]
+    [react-native.core :as rn]
     [react-native.touch-id :as biometric]
+    [reagent.core :as reagent]
     [status-im2.common.standard-authentication.enter-password.view :as enter-password]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
@@ -42,3 +46,39 @@
                                      {:on-enter-password on-enter-password
                                       :button-icon-left  auth-button-icon-left
                                       :button-label      auth-button-label}])}]))))))
+
+(defn- view-internal
+  [_]
+  (let [reset-slider? (reagent/atom false)
+        on-close      #(reset! reset-slider? true)]
+    (fn [{:keys [biometric-auth?
+                 track-text
+                 customization-color
+                 auth-button-label
+                 on-enter-password
+                 on-auth-success
+                 on-auth-fail
+                 auth-button-icon-left
+                 size
+                 theme
+                 blur?
+                 container-style]}]
+      [rn/view {:style {:flex 1}}
+       [quo/slide-button
+        {:size                size
+         :container-style     container-style
+         :customization-color customization-color
+         :on-reset            (when @reset-slider? #(reset! reset-slider? false))
+         :on-complete         #(authorize {:on-close              on-close
+                                           :auth-button-icon-left auth-button-icon-left
+                                           :theme                 theme
+                                           :blur?                 blur?
+                                           :on-enter-password     on-enter-password
+                                           :biometric-auth?       biometric-auth?
+                                           :on-auth-success       on-auth-success
+                                           :on-auth-fail          on-auth-fail
+                                           :auth-button-label     auth-button-label})
+         :track-icon          (if biometric-auth? :i/face-id :password)
+         :track-text          track-text}]])))
+
+(def view (quo.theme/with-theme view-internal))

src/status_im2/config.cljs

@@ -170,5 +170,3 @@
 (def default-kdf-iterations 3200)
 
 (def shell-navigation-disabled? false)
-(def community-accounts-selection-enabled? false)
-(def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))

src/status_im2/contexts/chat/actions/view.cljs

@@ -4,16 +4,6 @@
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
-(defn fetch-messages
-  [chat-id]
-  {:icon                :i/download
-   :right-icon          :i/chevron-right
-   :accessibility-label :chat-fetch-messages
-   :on-press            (fn []
-                          (rf/dispatch [:hide-bottom-sheet])
-                          (rf/dispatch [:chat/fetch-messages chat-id]))
-   :label               (i18n/label :t/fetch-messages)})
-
 (defn new-chat
   []
   [quo/action-drawer

src/status_im2/contexts/chat/composer/edit/view.cljs

@@ -11,7 +11,7 @@
     [utils.re-frame :as rf]))
 
 (defn edit-message
-  [{:keys [text-value input-ref]}]
+  [state]
   [rn/view
    {:style               style/container
     :accessibility-label :edit-message}
@@ -30,18 +30,20 @@
     {:size                24
      :icon-only?          true
      :accessibility-label :edit-cancel-button
-     :on-press            #(utils/cancel-edit-message text-value input-ref)
+     :on-press            (fn []
+                            (utils/cancel-edit-message state)
+                            (rf/dispatch [:chat.ui/cancel-message-edit]))
      :type                :outline}
     :i/close]])
 
 (defn- f-view
-  [props]
+  [state]
   (let [edit   (rf/sub [:chats/edit-message])
         height (reanimated/use-shared-value (if edit constants/edit-container-height 0))]
     (rn/use-effect #(reanimated/animate height (if edit constants/edit-container-height 0)) [edit])
     [reanimated/view {:style (reanimated/apply-animations-to-style {:height height} {})}
-     (when edit [edit-message props])]))
+     (when edit [edit-message state])]))
 
 (defn view
-  [props]
-  [:f> f-view props])
+  [state]
+  [:f> f-view state])

src/status_im2/contexts/chat/composer/effects.cljs

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

src/status_im2/contexts/chat/composer/gesture.cljs

@@ -43,7 +43,8 @@
     (reset! emoji-kb-extra-height nil))
   (reset! maximized? false)
   (rf/dispatch [:chat.ui/set-input-maximized false])
-  (utils/blur-input input-ref))
+  (when @input-ref
+    (.blur ^js @input-ref)))
 
 (defn bounce-back
   [{:keys [height saved-height opacity background-y]}
@@ -95,13 +96,13 @@
                                 max-height
                                 bounded-height
                                 saved-height))
-                 ; sheet at min-height, collapse keyboard
-                 (utils/blur-input input-ref))))))
+                 (when @input-ref ; sheet at min-height, collapse keyboard
+                   (.blur ^js @input-ref)))))))
         (gesture/on-end (fn []
                           (let [diff (- (reanimated/get-shared-value height)
                                         (reanimated/get-shared-value saved-height))]
                             (if @gesture-enabled?
-                              (if (and @expanding? (>= diff 0))
+                              (if (>= diff 0)
                                 (if (> diff constants/drag-threshold)
                                   (maximize state animations dimensions)
                                   (bounce-back animations dimensions starting-opacity))

src/status_im2/contexts/chat/composer/handlers.cljs

@@ -23,14 +23,12 @@
    show-floating-scroll-down-button?]
   (reset! focused? true)
   (rf/dispatch [:chat.ui/set-input-focused true])
-  (let [last-height-value (reanimated/get-shared-value last-height)]
-    (reanimated/animate height last-height-value)
-    (reanimated/set-shared-value saved-height last-height-value)
-    (reanimated/animate container-opacity 1)
-    (when (> last-height-value (* constants/background-threshold max-height))
-      (reanimated/animate opacity 1)
-      (reanimated/set-shared-value background-y 0)))
-
+  (reanimated/animate height (reanimated/get-shared-value last-height))
+  (reanimated/set-shared-value saved-height (reanimated/get-shared-value last-height))
+  (reanimated/animate container-opacity 1)
+  (when (> (reanimated/get-shared-value last-height) (* constants/background-threshold max-height))
+    (reanimated/animate opacity 1)
+    (reanimated/set-shared-value background-y 0))
   (js/setTimeout #(reset! lock-selection? false) 300)
   (when (and (not-empty @text-value) @input-ref)
     (.setNativeProps ^js @input-ref
@@ -74,7 +72,7 @@
   "Save new text height, expand composer if possible, show background overlay if needed"
   [event
    {:keys [maximized? lock-layout? text-value]}
-   {:keys [height saved-height last-height opacity background-y]}
+   {:keys [height saved-height opacity background-y]}
    {:keys [content-height window-height max-height]}
    keyboard-shown]
   (when keyboard-shown
@@ -89,9 +87,8 @@
                                                     max-height)
           new-height   (min new-height max-height)]
       (reset! content-height content-size)
-      (when (utils/update-height? content-size height max-height)
+      (when (utils/update-height? content-size height max-height maximized?)
         (reanimated/animate height new-height)
-        (reanimated/set-shared-value last-height new-height)
         (reanimated/set-shared-value saved-height new-height))
       (when (= new-height max-height)
         (reset! maximized? true)

src/status_im2/contexts/chat/composer/keyboard.cljs

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

src/status_im2/contexts/chat/composer/reply/view.cljs

@@ -9,7 +9,6 @@
     [status-im2.constants :as constant]
     [status-im2.contexts.chat.composer.constants :as constants]
     [status-im2.contexts.chat.composer.reply.style :as style]
-    [status-im2.contexts.chat.composer.utils :as utils]
     [utils.ens.stateofus :as stateofus]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -86,7 +85,7 @@
 (defn quoted-message
   [{:keys [from content-type contentType parsed-text content deleted? deleted-for-me?
            album-images-count]}
-   in-chat-input? pin? recording-audio? input-ref]
+   in-chat-input? pin? recording-audio?]
   (let [[primary-name _]   (rf/sub [:contacts/contact-two-names-by-identity from])
         current-public-key (rf/sub [:multiaccount/public-key])
         content-type       (or content-type contentType)
@@ -137,7 +136,7 @@
         {:icon-only?          true
          :size                24
          :accessibility-label :reply-cancel-button
-         :on-press            #(utils/cancel-reply-message input-ref)
+         :on-press            #(rf/dispatch [:chat.ui/cancel-message-reply])
          :type                :outline}
         :i/close])
      (when (and in-chat-input? recording-audio?)
@@ -149,13 +148,13 @@
          :style  style/gradient}])]))
 
 (defn- f-view
-  [recording? input-ref]
+  [recording?]
   (let [reply  (rf/sub [:chats/reply-message])
         height (reanimated/use-shared-value (if reply constants/reply-container-height 0))]
     (rn/use-effect #(reanimated/animate height (if reply constants/reply-container-height 0)) [reply])
     [reanimated/view {:style (reanimated/apply-animations-to-style {:height height} {})}
-     (when reply [quoted-message reply true false recording? input-ref])]))
+     (when reply [quoted-message reply true false recording?])]))
 
 (defn view
-  [{:keys [recording?]} input-ref]
-  [:f> f-view @recording? input-ref])
+  [{:keys [recording?]}]
+  [:f> f-view @recording?])

src/status_im2/contexts/chat/composer/utils.cljs

@@ -16,10 +16,11 @@
   (max min-v (min v max-v)))
 
 (defn update-height?
-  [content-size height max-height]
-  (let [diff (Math/abs (- content-size (reanimated/get-shared-value height)))]
-    (and (not= (reanimated/get-shared-value height) max-height)
-         (> diff constants/content-change-threshold))))
+  [content-size height max-height maximized?]
+  (when-not @maximized?
+    (let [diff (Math/abs (- content-size (reanimated/get-shared-value height)))]
+      (and (not= (reanimated/get-shared-value height) max-height)
+           (> diff constants/content-change-threshold)))))
 
 (defn show-top-gradient?
   [y lines max-lines gradient-opacity focused?]
@@ -99,28 +100,10 @@
        (not reply?)
        (not audio?)))
 
-(defn blur-input
-  [input-ref]
-  (when @input-ref
-    (rf/dispatch [:chat.ui/set-input-focused false])
-    (.blur ^js @input-ref)))
-
-(defn cancel-reply-message
-  [input-ref]
-  (js/setTimeout #(blur-input input-ref) 100)
-  (rf/dispatch [:chat.ui/set-input-content-height constants/input-height])
-  (rf/dispatch [:chat.ui/cancel-message-reply]))
-
 (defn cancel-edit-message
-  [text-value input-ref]
+  [{:keys [text-value]}]
   (reset! text-value "")
-  ;; NOTE: adding a timeout to assure the input is blurred on the next tick
-  ;; after the `text-value` was cleared. Otherwise the height will be calculated
-  ;; with the old `text-value`, leading to wrong composer height after blur.
-  (js/setTimeout #(blur-input input-ref) 100)
-  (.setNativeProps ^js @input-ref (clj->js {:text ""}))
-  (rf/dispatch [:chat.ui/set-input-content-height constants/input-height])
-  (rf/dispatch [:chat.ui/cancel-message-edit]))
+  (rf/dispatch [:chat.ui/set-input-content-height constants/input-height]))
 
 (defn count-lines
   [s]

src/status_im2/contexts/chat/composer/view.cljs

@@ -33,8 +33,7 @@
            blur-height
            opacity
            background-y
-           theme
-           messages-list-on-layout-finished?]} props state]
+           theme]} props state]
   (let [{:keys [chat-screen-loaded?]
          :as   subscriptions}    (utils/init-subs)
         content-height           (reagent/atom (or (:input-content-height ; Actual text height
@@ -74,9 +73,10 @@
                         animations
                         dimensions
                         subscriptions)
-    (effects/use-edit props state subscriptions messages-list-on-layout-finished?)
-    (effects/use-reply props animations subscriptions messages-list-on-layout-finished?)
+    (effects/use-edit props state subscriptions)
+    (effects/use-reply props animations subscriptions)
     (effects/update-input-mention props state subscriptions)
+    (effects/edit-mentions props state subscriptions)
     (effects/link-previews props state animations subscriptions)
     (effects/use-images props state animations subscriptions)
     [:<>
@@ -98,10 +98,8 @@
         [sub-view/bar]
         (when chat-screen-loaded?
           [:<>
-           [reply/view state (:input-ref props)]
-           [edit/view
-            {:text-value (:text-value state)
-             :input-ref  (:input-ref props)}]])
+           [reply/view state]
+           [edit/view state]])
         [reanimated/touchable-opacity
          {:active-opacity      1
           :on-press            (fn []
@@ -149,13 +147,11 @@
          subscriptions]]]]]))
 
 (defn composer
-  [{:keys [insets scroll-to-bottom-fn show-floating-scroll-down-button?
-           messages-list-on-layout-finished?]}]
+  [{:keys [insets scroll-to-bottom-fn show-floating-scroll-down-button?]}]
   (let [window-height (:height (rn/get-window))
         theme         (quo.theme/use-theme-value)
         opacity       (reanimated/use-shared-value 0)
-        background-y  (reanimated/use-shared-value (- window-height)) ; Y position of background
-                                                                      ; overlay
+        background-y  (reanimated/use-shared-value (- window-height)) ; Y position of background overlay
         blur-height   (reanimated/use-shared-value (+ constants/composer-default-height
                                                       (:bottom insets)))
         extra-params  {:insets                            insets
@@ -165,8 +161,7 @@
                        :blur-height                       blur-height
                        :opacity                           opacity
                        :background-y                      background-y
-                       :theme                             theme
-                       :messages-list-on-layout-finished? messages-list-on-layout-finished?}
+                       :theme                             theme}
         props         (utils/init-non-reactive-state)
         state         (utils/init-reactive-state)]
     [rn/view (when platform/ios? {:style {:z-index 1}})

src/status_im2/contexts/chat/events.cljs

@@ -449,20 +449,3 @@
   {:events [:chat/check-last-chat]}
   [{:keys [db]}]
   {:chat/open-last-chat (get-in db [:profile/profile :key-uid])})
-
-(rf/defn status-tag-pressed
-  {:events [:communities/status-tag-pressed]}
-  [{:keys [db] :as cofx} community-id literal]
-  (let [{:keys [id]} (some #(when (= (:name %) literal) %)
-                           (vals (get-in db [:communities community-id :chats])))]
-    (when (and id
-               (not= (:current-chat-id db) (str community-id id)))
-      (navigate-to-chat cofx (str community-id id) nil))))
-
-(rf/defn fetch-messages
-  {:events [:chat/fetch-messages]}
-  [_ chat-id]
-  {:json-rpc/call [{:method     "wakuext_fetchMessages"
-                    :params     [{:id chat-id}]
-                    :on-success #()
-                    :on-error   #(log/error "failed to fetch messages for chat" chat-id %)}]})

src/status_im2/contexts/chat/messages/content/image/view.cljs

@@ -8,10 +8,6 @@
     [utils.re-frame :as rf]
     [utils.url :as url]))
 
-;; these constants are used when there is no width or height defined for a specific image
-(def ^:const fallback-image-width 1000)
-(def ^:const fallback-image-height 1000)
-
 (defn calculate-dimensions
   [width height max-container-width max-container-height]
   (let [max-width  (if (> width height) max-container-width (* 1.5 constants/image-size))
@@ -19,12 +15,7 @@
     {:width (min width max-width) :height (min height max-height)}))
 
 (defn image-message
-  [index
-   {:keys [content image-width image-height message-id]
-    :as   message
-    :or   {image-width  fallback-image-width
-           image-height fallback-image-height}}
-   {:keys [on-long-press]}
+  [index {:keys [content image-width image-height message-id] :as message} {:keys [on-long-press]}
    message-container-data]
   (let [insets                        (safe-area/get-insets)
         {:keys [window-width padding-left padding-right avatar-container-width

src/status_im2/contexts/chat/messages/list/view.cljs

@@ -298,7 +298,7 @@
 
 (defn f-messages-list-content
   [{:keys [chat insets scroll-y content-height cover-bg-color keyboard-shown? inner-state-atoms
-           big-name-visible? animate-topbar-opacity? composer-active? messages-list-on-layout-finished?
+           big-name-visible? animate-topbar-opacity? composer-active?
            on-end-reached? animate-topbar-name?]}]
   (rn/use-effect (fn []
                    (if (and (not @on-end-reached?)
@@ -412,15 +412,6 @@
        ;;TODO(rasom) https://github.com/facebook/react-native/issues/30034
        :inverted                          (when platform/ios? true)
        :on-layout                         (fn [e]
-                                            ;; FIXME: the 1s timeout is to assure all effects with
-                                            ;; timeouts that depend on the value are considered.
-                                            ;; Hacky, but we're heavily relying on timeouts in the
-                                            ;; composer and need to react to differently (e.g.
-                                            ;; inside effects/use-edit) when the chat has just
-                                            ;; opened and the subsequent times.
-                                            (js/setTimeout #(reset! messages-list-on-layout-finished?
-                                                              true)
-                                                           1000)
                                             (let [layout-height (oops/oget e
                                                                            "nativeEvent.layout.height")]
                                               (reset! messages-view-height layout-height)))

src/status_im2/contexts/chat/messages/navigation/style.cljs

@@ -44,7 +44,7 @@
 
 (defn navigation-view
   [loaded?]
-  {:z-index  1
+  {:z-index  1000
    :top      0
    :right    0
    :left     0

src/status_im2/contexts/chat/messages/view.cljs

@@ -15,7 +15,7 @@
 
 (defn f-chat
   [{:keys [show-floating-scroll-down-button? animate-topbar-name?
-           big-name-visible? animate-topbar-opacity? on-end-reached? messages-list-on-layout-finished?]
+           big-name-visible? animate-topbar-opacity? on-end-reached?]
     :as   inner-state-atoms}]
   (let [insets                   (safe-area/get-insets)
         scroll-y                 (reanimated/use-shared-value 0)
@@ -53,19 +53,18 @@
       :keyboard-vertical-offset (- (:bottom insets))}
 
      [list.view/message-list-content-view
-      {:chat                              chat
-       :insets                            insets
-       :scroll-y                          scroll-y
-       :content-height                    content-height
-       :cover-bg-color                    :turquoise
-       :keyboard-shown?                   keyboard-shown
-       :inner-state-atoms                 inner-state-atoms
-       :animate-topbar-name?              animate-topbar-name?
-       :big-name-visible?                 big-name-visible?
-       :animate-topbar-opacity?           animate-topbar-opacity?
-       :composer-active?                  focused?
-       :on-end-reached?                   on-end-reached?
-       :messages-list-on-layout-finished? messages-list-on-layout-finished?}]
+      {:chat                    chat
+       :insets                  insets
+       :scroll-y                scroll-y
+       :content-height          content-height
+       :cover-bg-color          :turquoise
+       :keyboard-shown?         keyboard-shown
+       :inner-state-atoms       inner-state-atoms
+       :animate-topbar-name?    animate-topbar-name?
+       :big-name-visible?       big-name-visible?
+       :animate-topbar-opacity? animate-topbar-opacity?
+       :composer-active?        focused?
+       :on-end-reached?         on-end-reached?}]
 
      [messages.navigation/navigation-view
       {:scroll-y                scroll-y
@@ -87,8 +86,7 @@
          [:f> composer.view/composer
           {:insets                            insets
            :scroll-to-bottom-fn               list.view/scroll-to-bottom
-           :show-floating-scroll-down-button? show-floating-scroll-down-button?
-           :messages-list-on-layout-finished? messages-list-on-layout-finished?}]
+           :show-floating-scroll-down-button? show-floating-scroll-down-button?}]
          [contact-requests.bottom-drawer/view chat-id contact-request-state group-chat]))]))
 
 (defn chat
@@ -101,6 +99,5 @@
          :animate-topbar-name?              (reagent/atom false)
          :big-name-visible?                 (reagent/atom :initial-render)
          :animate-topbar-opacity?           (reagent/atom false)
-         :on-end-reached?                   (reagent/atom false)
-         :messages-list-on-layout-finished? (reagent/atom false)}]
+         :on-end-reached?                   (reagent/atom false)}]
     [:f> f-chat inner-state-atoms]))

src/status_im2/contexts/communities/actions/chat/view.cljs

@@ -4,8 +4,6 @@
     [status-im2.common.mute-drawer.view :as mute-drawer]
     [status-im2.common.muting.helpers :refer [format-mute-till]]
     [status-im2.common.not-implemented :as not-implemented]
-    [status-im2.config :as config]
-    [status-im2.contexts.chat.actions.view :as chat-actions]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -85,6 +83,13 @@
    :on-press            not-implemented/alert
    :label               (i18n/label :t/pinned-messages)})
 
+(defn- action-fetch-messages
+  []
+  {:icon                :i/download
+   :right-icon          :i/chevron-right
+   :accessibility-label :chat-fetch-messages
+   :on-press            not-implemented/alert
+   :label               (i18n/label :t/fetch-messages)})
 
 (defn- action-invite-people
   []
@@ -136,8 +141,7 @@
          (action-mark-as-read)
          (action-toggle-muted chat-id muted muted-till chat-type)
          (action-notification-settings)
-         (when config/fetch-messages-enabled?
-           (chat-actions/fetch-messages chat-id))
+         (action-fetch-messages)
          (action-invite-people)
          (action-qr-code)
          (action-share)]]]

src/status_im2/contexts/communities/overview/events.cljs

@@ -42,31 +42,26 @@
                                                community-id %])
                     :on-error   #(log/error "failed to request to join community" community-id %)}]})
 
-(defn request-to-join
-  [{:keys [db]} [{:keys [community-id password]}]]
-  (let [pub-key             (get-in db [:profile/profile :public-key])
-        addresses-to-reveal []]
-    {:fx [[:json-rpc/call
-           [{:method     "wakuext_generateJoiningCommunityRequestsForSigning"
-             :params     [pub-key community-id addresses-to-reveal]
-             :on-success [:communities/sign-data community-id password]
-             :on-error   [:communities/requested-to-join-error community-id]}]]]}))
-
 ;; Event to be called to request to join a community.
 ;; This event will generate the data to be signed and then call the sign-data event.
 ;; This is the only event that should be called from the UI.
-(rf/reg-event-fx :communities/request-to-join request-to-join)
+(rf/reg-event-fx :communities/request-to-join
+ (fn [{:keys [db]} [{:keys [community-id password]}]]
+   (let [pub-key             (get-in db [:profile/profile :public-key])
+         addresses-to-reveal []]
+     {:fx [[:json-rpc/call
+            [{:method     "wakuext_generateJoiningCommunityRequestsForSigning"
+              :params     [pub-key community-id addresses-to-reveal]
+              :on-success [:communities/sign-data community-id password]
+              :on-error   [:communities/requested-to-join-error community-id]}]]]})))
 
-(defn sign-data
-  [_ [community-id password sign-params]]
-  (let [addresses-to-reveal (map :account sign-params)]
-    {:fx [[:json-rpc/call
-           [{:method     "wakuext_signData"
-             :params     [(map #(assoc % :password password) sign-params)]
-             :on-success [:communities/request-to-join-with-signatures community-id addresses-to-reveal]
-             :on-error   [:communities/requested-to-join-error community-id]}]]]}))
-
-(rf/reg-event-fx :communities/sign-data sign-data)
+(rf/reg-event-fx :communities/sign-data
+ (fn [_ [community-id password sign-params]]
+   {:fx [[:json-rpc/call
+          [{:method     "wakuext_signData"
+            :params     [(map #(assoc % :password password) sign-params)]
+            :on-success [:communities/request-to-join-with-signatures community-id]
+            :on-error   [:communities/requested-to-join-error community-id]}]]]}))
 
 (rf/reg-event-fx :communities/requested-to-join-error
  (fn [{:keys [db]} [community-id error]]
@@ -76,19 +71,11 @@
                :event        :communities/requested-to-join-error})
    {:db (assoc-in db [:password-authentication :error] error)}))
 
-(defn request-to-join-with-signatures
-  [_ [community-id addresses-to-reveal signatures]]
-  {:fx [[:json-rpc/call
-         [{:method      "wakuext_requestToJoinCommunity"
-           :params      [{:communityId       community-id
-                          :signatures        signatures
-                          :addressesToReveal addresses-to-reveal
-                          ;; NOTE: At least one airdrop address is required.
-                          ;; This is a temporary solution while the address
-                          ;; selection feature is not implemented in mobile.
-                          :airdropAddress    (first addresses-to-reveal)}]
-           :js-response true
-           :on-success  [:communities/requested-to-join]
-           :on-error    [:communities/requested-to-join-error community-id]}]]]})
-
-(rf/reg-event-fx :communities/request-to-join-with-signatures request-to-join-with-signatures)
+(rf/reg-event-fx :communities/request-to-join-with-signatures
+ (fn [_ [community-id signatures]]
+   {:fx [[:json-rpc/call
+          [{:method      "wakuext_requestToJoinCommunity"
+            :params      [{:communityId community-id :signatures signatures}]
+            :js-response true
+            :on-success  [:communities/requested-to-join]
+            :on-error    [:communities/requested-to-join-error community-id]}]]]}))

src/status_im2/contexts/communities/overview/events_test.cljs

@@ -1,53 +0,0 @@
-(ns status-im2.contexts.communities.overview.events-test
-  (:require [cljs.test :refer [deftest is]]
-            [native-module.core :as native-module]
-            [status-im2.contexts.communities.overview.events :as sut]))
-
-(def password (native-module/sha3 "password123"))
-(def community-id "0x99")
-(def account-pub-key "0x1")
-
-(deftest request-to-join-test
-  (let [cofx     {:db {:profile/profile {:public-key account-pub-key}}}
-        expected {:fx [[:json-rpc/call
-                        [{:method     "wakuext_generateJoiningCommunityRequestsForSigning"
-                          :params     [account-pub-key community-id []]
-                          :on-success [:communities/sign-data community-id password]
-                          :on-error   [:communities/requested-to-join-error community-id]}]]]}]
-    (is (= expected
-           (sut/request-to-join cofx
-                                [{:community-id community-id
-                                  :password     password}])))))
-
-(deftest sign-data-test
-  (let [cofx                {:db {}}
-        sign-params         [{:data "123" :account account-pub-key}
-                             {:data "456" :account "0x2"}]
-        addresses-to-reveal [account-pub-key "0x2"]
-        expected            {:fx
-                             [[:json-rpc/call
-                               [{:method     "wakuext_signData"
-                                 :params     [[{:data "123" :account account-pub-key :password password}
-                                               {:data "456" :account "0x2" :password password}]]
-                                 :on-success [:communities/request-to-join-with-signatures
-                                              community-id addresses-to-reveal]
-                                 :on-error   [:communities/requested-to-join-error community-id]}]]]}]
-    (is (= expected
-           (sut/sign-data cofx [community-id password sign-params])))))
-
-(deftest request-to-join-with-signatures-test
-  (let [cofx                {:db {}}
-        addresses-to-reveal [account-pub-key "0x2"]
-        signatures          ["11111" "222222"]
-        expected            {:fx [[:json-rpc/call
-                                   [{:method      "wakuext_requestToJoinCommunity"
-                                     :params      [{:communityId       community-id
-                                                    :signatures        signatures
-                                                    :addressesToReveal addresses-to-reveal
-                                                    :airdropAddress    "0x1"}]
-                                     :js-response true
-                                     :on-success  [:communities/requested-to-join]
-                                     :on-error    [:communities/requested-to-join-error
-                                                   community-id]}]]]}]
-    (is (= expected
-           (sut/request-to-join-with-signatures cofx [community-id addresses-to-reveal signatures])))))

src/status_im2/contexts/communities/overview/view.cljs

@@ -255,7 +255,7 @@
 (defn community-content
   [community]
   (rf/dispatch [:communities/check-all-community-channels-permissions (:id community)])
-  (fn [{:keys [name description joined images tags color id token-permissions] :as community}
+  (fn [{:keys [name description joined images tags color id] :as community}
        pending?
        {:keys [on-category-layout
                collapsed?
@@ -273,14 +273,12 @@
             :last-item-style style/last-community-tag
             :container-style style/community-tag-container}])
         [join-community community pending?]]
-       (when (or (and (seq token-permissions) joined)
-                 (empty? token-permissions))
-         [channel-list-component
-          {:on-category-layout              on-category-layout
-           :community-id                    id
-           :community-color                 color
-           :on-first-channel-height-changed on-first-channel-height-changed}
-          (add-handlers-to-categorized-chats id chats-by-category joined)])])))
+       [channel-list-component
+        {:on-category-layout              on-category-layout
+         :community-id                    id
+         :community-color                 color
+         :on-first-channel-height-changed on-first-channel-height-changed}
+        (add-handlers-to-categorized-chats id chats-by-category joined)]])))
 
 (defn sticky-category-header
   [_]

src/status_im2/contexts/onboarding/enable_biometrics/view.cljs

@@ -1,20 +1,15 @@
 (ns status-im2.contexts.onboarding.enable-biometrics.view
   (:require
     [quo.core :as quo]
-    [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
     [status-im2.common.biometric.events :as biometric]
     [status-im2.common.parallax.view :as parallax]
     [status-im2.common.parallax.whitelist :as whitelist]
     [status-im2.common.resources :as resources]
-    [status-im2.common.standard-authentication.core :as standard-auth]
     [status-im2.contexts.onboarding.enable-biometrics.style :as style]
-    [status-im2.navigation.state :as state]
     [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
-    [utils.security.core :as security]))
-
+    [utils.re-frame :as rf]))
 
 (defn page-title
   []
@@ -26,39 +21,22 @@
     :description-accessibility-label :enable-biometrics-sub-title}])
 
 (defn enable-biometrics-buttons
-  [insets theme]
+  [insets]
   (let [supported-biometric-type (rf/sub [:biometric/supported-type])
         bio-type-label           (biometric/get-label-by-type supported-biometric-type)
-        profile-color            (or (:color (rf/sub [:onboarding-2/profile]))
-                                     (rf/sub [:profile/customization-color]))
-        syncing-results?         (= :syncing-results @state/root-id)]
+        profile-color            (:color (rf/sub [:onboarding-2/profile]))]
     [rn/view {:style (style/buttons insets)}
-     [standard-auth/button
-      (merge
-       {:size                40
-        :accessibility-label :enable-biometrics-button
-        :icon-left           :i/face-id
-        :customization-color profile-color
-        :button-label        (i18n/label :t/biometric-enable-button {:bio-type-label bio-type-label})}
-       (if syncing-results?
-         {:theme             theme
-          :blur?             true
-          :on-enter-password (fn [entered-password]
-                               (rf/dispatch
-                                [:onboarding-2/authenticate-enable-biometrics
-                                 (security/safe-unmask-data
-                                  entered-password)])
-                               (rf/dispatch [:hide-bottom-sheet]))
-          :auth-button-label (i18n/label :t/confirm)}
-         {:on-press #(rf/dispatch [:onboarding-2/enable-biometrics])}))]
+     [quo/button
+      {:accessibility-label :enable-biometrics-button
+       :on-press            #(rf/dispatch [:onboarding-2/enable-biometrics])
+       :icon-left           :i/face-id
+       :customization-color profile-color}
+      (i18n/label :t/biometric-enable-button {:bio-type-label bio-type-label})]
      [quo/button
       {:accessibility-label :maybe-later-button
        :background          :blur
        :type                :grey
-       :on-press            #(rf/dispatch (if syncing-results?
-                                            [:navigate-to-within-stack
-                                             [:enable-notifications :enable-biometrics]]
-                                            [:onboarding-2/create-account-and-login]))
+       :on-press            #(rf/dispatch [:onboarding-2/create-account-and-login])
        :container-style     {:margin-top 12}}
       (i18n/label :t/maybe-later)]]))
 
@@ -77,19 +55,12 @@
       :style       (style/page-illustration width)
       :source      (resources/get-image :biometrics)}]))
 
-(defn f-enable-biometrics
-  [{:keys [theme]}]
+(defn enable-biometrics
+  []
   (let [insets (safe-area/get-insets)]
     [rn/view {:style (style/page-container insets)}
      [page-title]
      (if whitelist/whitelisted?
        [enable-biometrics-parallax]
        [enable-biometrics-simple])
-     [enable-biometrics-buttons insets theme]]))
-
-
-(defn- internale-enable-biometrics
-  [params]
-  [:f> f-enable-biometrics params])
-
-(def view (quo.theme/with-theme internale-enable-biometrics))
+     [enable-biometrics-buttons insets]]))

src/status_im2/contexts/onboarding/enable_notifications/view.cljs

@@ -51,7 +51,7 @@
      [quo/page-nav
       {:background :blur
        :icon-name  :i/arrow-left
-       :on-press   #(rf/dispatch [:navigate-back-within-stack :enable-biometrics])}]
+       :on-press   #(rf/dispatch [:navigate-back-within-stack :new-to-status])}]
      [page-title]
      [rn/view {:style style/page-illustration}
       [quo/text

src/status_im2/contexts/onboarding/events.cljs

@@ -35,30 +35,11 @@
   {:biometric/authenticate {:on-success #(rf/dispatch [:onboarding-2/biometrics-done])
                             :on-fail    #(rf/dispatch [:onboarding-2/biometrics-fail %])}})
 
-(rf/defn authenticate-enable-biometrics
-  {:events [:onboarding-2/authenticate-enable-biometrics]}
-  [{:keys [db]} password]
-  {:db                     (-> db
-                               (assoc-in [:onboarding-2/profile :password] password)
-                               (assoc-in [:onboarding-2/profile :syncing?] true))
-   :biometric/authenticate {:on-success #(rf/dispatch [:onboarding-2/biometrics-done])
-                            :on-fail    #(rf/dispatch [:onboarding-2/biometrics-fail %])}})
-
-(rf/defn navigate-to-enable-notifications
-  {:events [:onboarding-2/navigate-to-enable-notifications]}
-  [{:keys [db]}]
-  (let [key-uid (get-in db [:profile/profile :key-uid])]
-    {:db       (dissoc db :onboarding-2/profile)
-     :dispatch [:navigate-to-within-stack [:enable-notifications :enable-biometrics]]}))
-
 (rf/defn biometrics-done
   {:events [:onboarding-2/biometrics-done]}
   [{:keys [db]}]
-  (let [syncing? (get-in db [:onboarding-2/profile :syncing?])]
-    {:db       (assoc-in db [:onboarding-2/profile :auth-method] constants/auth-method-biometric)
-     :dispatch (if syncing?
-                 [:onboarding-2/finalize-setup]
-                 [:onboarding-2/create-account-and-login])}))
+  {:db       (assoc-in db [:onboarding-2/profile :auth-method] constants/auth-method-biometric)
+   :dispatch [:onboarding-2/create-account-and-login]})
 
 (rf/defn biometrics-fail
   {:events [:onboarding-2/biometrics-fail]}
@@ -102,14 +83,6 @@
                  [:navigate-to-within-stack [:enable-biometrics :new-to-status]]
                  [:onboarding-2/create-account-and-login])}))
 
-(rf/defn navigate-to-enable-biometrics
-  {:events [:onboarding-2/navigate-to-enable-biometrics]}
-  [{:keys [db]}]
-  (let [supported-type (:biometric/supported-type db)]
-    {:dispatch (if supported-type
-                 [:open-modal :enable-biometrics]
-                 [:open-modal :enable-notifications])}))
-
 (rf/defn seed-phrase-entered
   {:events [:onboarding-2/seed-phrase-entered]}
   [_ seed-phrase on-error]
@@ -147,7 +120,6 @@
   [{:keys [db]}]
   (let [masked-password    (get-in db [:onboarding-2/profile :password])
         key-uid            (get-in db [:profile/profile :key-uid])
-        syncing?           (get-in db [:onboarding-2/profile :syncing?])
         biometric-enabled? (= (get-in db [:onboarding-2/profile :auth-method])
                               constants/auth-method-biometric)]
     (cond-> {:db (assoc db :onboarding-2/generated-keys? true)}
@@ -155,10 +127,7 @@
       (assoc :keychain/save-password-and-auth-method
              {:key-uid         key-uid
               :masked-password masked-password
-              :on-success      (fn []
-                                 (if syncing?
-                                   (rf/dispatch [:onboarding-2/navigate-to-enable-notifications])
-                                   (log/error "successfully saved biometrics")))
+              :on-success      #(log/debug "successfully saved biometric")
               :on-error        #(log/error "failed to save biometrics"
                                            {:key-uid key-uid
                                             :error   %})}))))

src/status_im2/contexts/onboarding/syncing/results/view.cljs

@@ -54,7 +54,7 @@
      {:on-press            (fn []
                              (when on-press
                                (on-press))
-                             (rf/dispatch [:onboarding-2/navigate-to-enable-biometrics]))
+                             (rf/dispatch [:open-modal :enable-notifications]))
       :accessibility-label :continue-button
       :customization-color profile-color
       :container-style     style/continue-button}

src/status_im2/contexts/quo_preview/wallet/keypair.cljs

@@ -1,7 +1,6 @@
 (ns status-im2.contexts.quo-preview.wallet.keypair
   (:require
     [quo.core :as quo]
-    [react-native.core :as rn]
     [reagent.core :as reagent]
     [status-im2.contexts.quo-preview.preview :as preview]))
 
@@ -102,9 +101,8 @@
         :component-container-style {:padding-vertical 30
                                     :flex-direction   :row
                                     :justify-content  :center}}
-       [rn/view {:style {:flex 1}}
-        [quo/keypair
-         (merge
-          @state
-          {:details  (if (= (:type @state) :default-keypair) default-details other-details)
-           :accounts (get-accounts (:blur? @state))})]]])))
+       [quo/keypair
+        (merge
+         @state
+         {:details  (if (= (:type @state) :default-keypair) default-details other-details)
+          :accounts (get-accounts (:blur? @state))})]])))

src/status_im2/contexts/syncing/events.cljs

@@ -2,7 +2,6 @@
   (:require
     [clojure.string :as string]
     [native-module.core :as native-module]
-    [quo.foundations.colors :as colors]
     [re-frame.core :as re-frame]
     [react-native.platform :as platform]
     [status-im.data-store.settings :as data-store.settings]
@@ -37,26 +36,6 @@
                                        :custom-bootnodes-enabled? false}}]
     (node/get-multiaccount-node-config db)))
 
-(defn- extract-error
-  [json-str]
-  (-> json-str
-      transforms/json->clj
-      (get :error "")
-      not-empty))
-
-(defn- input-connection-string-callback
-  [res]
-  (log/info "[local-pairing] input-connection-string-for-bootstrapping callback"
-            {:response res
-             :event    :syncing/input-connection-string-for-bootstrapping})
-  (let [error (when (extract-error res)
-                (str "generic-error: " res))]
-    (when (some? error)
-      (rf/dispatch [:toasts/upsert
-                    {:icon       :i/alert
-                     :icon-color colors/danger-50
-                     :text       error}]))))
-
 (rf/defn preflight-outbound-check-for-local-pairing
   {:events [:syncing/preflight-outbound-check]}
   [_ set-checks-passed]
@@ -81,18 +60,19 @@
         (fn [final-node-config]
           (let [config-map (.stringify js/JSON
                                        (clj->js
-                                        {:receiverConfig
-                                         {:kdfIterations config/default-kdf-iterations
-                                          :nodeConfig final-node-config
-                                          :settingCurrentNetwork config/default-network
-                                          :deviceType platform/os
-                                          :deviceName
-                                          (native-module/get-installation-name)}}))]
+                                        {:receiverConfig {:kdfIterations config/default-kdf-iterations
+                                                          :nodeConfig final-node-config
+                                                          :settingCurrentNetwork config/default-network
+                                                          :deviceType platform/os
+                                                          :deviceName
+                                                          (native-module/get-installation-name)}}))]
             (rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver])
             (native-module/input-connection-string-for-bootstrapping
              connection-string
              config-map
-             input-connection-string-callback)))]
+             #(log/info "Initiated local pairing"
+                        {:response %
+                         :event    :syncing/input-connection-string-for-bootstrapping}))))]
     (native-module/prepare-dir-and-update-config "" default-node-config-string callback)))
 
 (rf/defn preparations-for-connection-string

src/status_im2/contexts/syncing/setup_syncing/view.cljs

@@ -8,7 +8,7 @@
     [reagent.core :as reagent]
     [status-im2.common.qr-codes.view :as qr-codes]
     [status-im2.common.resources :as resources]
-    [status-im2.common.standard-authentication.core :as standard-auth]
+    [status-im2.common.standard-authentication.standard-auth.view :as standard-auth]
     [status-im2.contexts.syncing.setup-syncing.style :as style]
     [status-im2.contexts.syncing.utils :as sync-utils]
     [utils.datetime :as datetime]
@@ -119,7 +119,7 @@
               (i18n/label :t/copy-qr)]])
           (when-not (sync-utils/valid-connection-string? @code)
             [rn/view {:style style/standard-auth}
-             [standard-auth/slide-button
+             [standard-auth/view
               {:blur?                 true
                :size                  :size-40
                :track-text            (i18n/label :t/slide-to-reveal-code)

src/status_im2/contexts/wallet/account/view.cljs

@@ -62,11 +62,10 @@
                                          {:content buy-drawer}])
            :bridge-action #(rf/dispatch [:open-modal :wallet-bridge])}]
          [quo/tabs
-          {:style            style/tabs
-           :size             32
-           :default-active   @selected-tab
-           :data             tabs-data
-           :on-change        #(reset! selected-tab %)
-           :scrollable?      true
-           :scroll-on-press? true}]
+          {:style          style/tabs
+           :size           32
+           :default-active @selected-tab
+           :data           tabs-data
+           :on-change      #(reset! selected-tab %)
+           :scrollable?    true}]
          [tabs/view {:selected-tab @selected-tab}]]))))

src/status_im2/contexts/wallet/add_watch_only_account/style.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.contexts.wallet.add-address-to-watch.confirm-address.style)
+(ns status-im2.contexts.wallet.add-watch-only-account.style)
 
 (def container
   {:flex 1})

src/status_im2/contexts/wallet/add_watch_only_account/views.cljs

@@ -1,14 +1,13 @@
-(ns status-im2.contexts.wallet.add-address-to-watch.confirm-address.view
+(ns status-im2.contexts.wallet.add-watch-only-account.views
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
-    [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [re-frame.core :as re-frame]
     [react-native.core :as rn]
     [reagent.core :as reagent]
     [status-im2.contexts.emoji-picker.utils :as emoji-picker.utils]
-    [status-im2.contexts.wallet.add-address-to-watch.confirm-address.style :as style]
+    [status-im2.contexts.wallet.add-watch-only-account.style :as style]
     [status-im2.contexts.wallet.common.screen-base.create-or-edit-account.view :as
      create-or-edit-account]
     [utils.i18n :as i18n]
@@ -21,7 +20,7 @@
         account-name       (reagent/atom (i18n/label :t/default-account-name
                                                      {:number (inc number-of-accounts)}))
         address-title      (i18n/label :t/watch-address)
-        account-color      (reagent/atom (rand-nth colors/account-colors))
+        account-color      (reagent/atom :blue)
         account-emoji      (reagent/atom (emoji-picker.utils/random-emoji))
         on-change-name     #(reset! account-name %)
         on-change-color    #(reset! account-color %)
@@ -58,4 +57,4 @@
           :container-style style/data-item
           :on-press        #(js/alert "To be implemented")}]]])))
 
-(def view (quo.theme/with-theme view-internal))
+(def address-add-edit (quo.theme/with-theme view-internal))

src/status_im2/contexts/wallet/common/screen_base/create_or_edit_account/view.cljs

@@ -58,8 +58,7 @@
        [quo/section-label
         {:section         (i18n/label :t/colour)
          :container-style style/section-container}]
-       [rn/view
-        {:style style/color-picker-container}
+       [rn/view {:style style/color-picker-container}
         [quo/color-picker
          {:default-selected account-color
           :on-change        on-change-color

src/status_im2/contexts/wallet/common/utils.cljs

@@ -24,6 +24,7 @@
 (defn get-derivation-path
   [number-of-accounts]
   (str constants/path-wallet-root "/" number-of-accounts))
+
 (defn format-derivation-path
   [path]
   (string/replace path "/" " / "))

src/status_im2/contexts/wallet/create_account/select_keypair/style.cljs

@@ -1,12 +0,0 @@
-(ns status-im2.contexts.wallet.create-account.select-keypair.style)
-
-(def header-container
-  {:margin-horizontal 20
-   :margin-top        12
-   :margin-bottom     20})
-
-(def bottom-action-container
-  {:position :absolute
-   :bottom   0
-   :left     0
-   :right    0})

src/status_im2/contexts/wallet/create_account/select_keypair/view.cljs

@@ -1,62 +0,0 @@
-(ns status-im2.contexts.wallet.create-account.select-keypair.view
-  (:require
-    [quo.core :as quo]
-    [react-native.core :as rn]
-    [status-im2.contexts.profile.utils :as profile.utils]
-    [status-im2.contexts.wallet.create-account.select-keypair.style :as style]
-    [utils.address :as utils]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
-
-(def accounts
-  [{:account-props {:customization-color :turquoise
-                    :size                32
-                    :emoji               "\uD83C\uDFB2"
-                    :type                :default
-                    :name                "Trip to Vegas"
-                    :address             "0x0ah...71a"}
-    :networks      [{:network-name :ethereum :short-name "eth"}
-                    {:network-name :optimism :short-name "opt"}]
-    :state         :default
-    :action        :none}])
-
-(defn view
-  []
-  (let [{:keys [public-key compressed-key
-                customization-color]} (rf/sub [:profile/profile])
-        display-name                  (first (rf/sub [:contacts/contact-two-names-by-identity
-                                                      public-key]))
-        profile-with-image            (rf/sub [:profile/profile-with-image])
-        profile-picture               (profile.utils/photo profile-with-image)]
-    [rn/view {:style {:flex 1}}
-     [quo/page-nav
-      {:icon-name           :i/close
-       :on-press            #(rf/dispatch [:navigate-back])
-       :accessibility-label :top-bar}]
-     [quo/text-combinations
-      {:container-style     style/header-container
-       :title               (i18n/label :t/keypairs)
-       :description         (i18n/label :t/keypairs-description)
-       :button-icon         :i/add
-       :button-on-press     #(js/alert "not implemented")
-       :customization-color customization-color}]
-     [quo/keypair
-      (merge
-       {:customization-color customization-color
-        :profile-picture     profile-picture
-        :status-indicator    false
-        :type                :default-keypair
-        :stored              :on-device
-        :on-options-press    #(js/alert "Options pressed")
-        :action              :selector
-        :blur?               false
-        :details             {:full-name display-name
-                              :address   (utils/get-shortened-compressed-key compressed-key)}
-        :accounts            accounts
-        :container-style     {:margin-horizontal 20
-                              :margin-vertical   8}})]
-     [quo/bottom-actions
-      {:button-one-label (i18n/label :t/confirm-account-origin)
-       :button-one-props {:disabled?           true
-                          :customization-color customization-color}
-       :container-style  style/bottom-action-container}]]))

src/status_im2/contexts/wallet/create_account/view.cljs

@@ -1,21 +1,18 @@
 (ns status-im2.contexts.wallet.create-account.view
   (:require
-    [clojure.string :as string]
     [quo.core :as quo]
-    [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
-    [status-im2.common.standard-authentication.core :as standard-auth]
+    [status-im2.common.standard-authentication.standard-auth.view :as standard-auth]
     [status-im2.constants :as constants]
     [status-im2.contexts.emoji-picker.utils :as emoji-picker.utils]
     [status-im2.contexts.wallet.common.utils :as utils]
     [status-im2.contexts.wallet.create-account.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
-    [utils.responsiveness :refer [iphone-11-Pro-20-pixel-from-width]]
-    [utils.string]))
+    [utils.responsiveness :refer [iphone-11-Pro-20-pixel-from-width]]))
 
 (defn keypair-string
   [full-name]
@@ -23,34 +20,30 @@
     (i18n/label :t/keypair-title {:name first-name})))
 
 (defn get-keypair-data
-  [name derivation-path account-color]
+  [name derivation-path]
   [{:title             (keypair-string name)
-    :image             :avatar
-    :image-props       {:full-name           (utils.string/get-initials name 1)
-                        :size                :xxs
-                        :customization-color account-color}
+    :left-icon         :i/placeholder
     :action            :button
-    :action-props      {:on-press    #(rf/dispatch [:navigate-to :wallet-select-keypair])
+    :action-props      {:on-press    #(js/alert "Button pressed!")
                         :button-text (i18n/label :t/edit)
                         :alignment   :flex-start}
     :description       :text
     :description-props {:text (i18n/label :t/on-device)}}
    {:title             (i18n/label :t/derivation-path)
-    :image             :icon
-    :image-props       :i/derivated-path
     :action            :button
-    :action-props      {:on-press    #(js/alert "Button pressed!")
+    :action-props      {:on-press    #(rf/dispatch [:navigate-to :wallet-edit-derivation-path])
                         :button-text (i18n/label :t/edit)
                         :icon-left   :i/placeholder
                         :alignment   :flex-start}
+    :left-icon         :i/derivated-path
     :description       :text
-    :description-props {:text (string/replace derivation-path #"/" " / ")}}])
+    :description-props {:text derivation-path}}])
 
 (defn- view-internal
   []
   (let [top                   (safe-area/get-top)
         bottom                (safe-area/get-bottom)
-        account-color         (reagent/atom (rand-nth colors/account-colors))
+        account-color         (reagent/atom :blue)
         emoji                 (reagent/atom (emoji-picker.utils/random-emoji))
         number-of-accounts    (count (rf/sub [:wallet/accounts]))
         account-name          (reagent/atom (i18n/label :t/default-account-name
@@ -113,8 +106,8 @@
        [quo/category
         {:list-type :settings
          :label     (i18n/label :t/origin)
-         :data      (get-keypair-data primary-name @derivation-path @account-color)}]
-       [standard-auth/slide-button
+         :data      (get-keypair-data primary-name @derivation-path)}]
+       [standard-auth/view
         {:size                :size-48
          :track-text          (i18n/label :t/slide-to-create-account)
          :customization-color @account-color

src/status_im2/contexts/wallet/home/view.cljs

@@ -25,7 +25,7 @@
       :accessibility-label :add-a-contact
       :label               (i18n/label :t/add-address)
       :sub-label           (i18n/label :t/add-address-description)
-      :on-press            #(rf/dispatch [:navigate-to :add-address-to-watch])
+      :on-press            #(rf/dispatch [:navigate-to :wallet-address-watch])
       :add-divider?        true}]]])
 
 (defn- add-account-placeholder

src/status_im2/contexts/wallet/select_address_to_watch/style.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.contexts.wallet.add-address-to-watch.style)
+(ns status-im2.contexts.wallet.select-address-to-watch.style)
 
 (def header-container
   {:margin-horizontal 20
@@ -10,8 +10,9 @@
    :padding-horizontal 20
    :align-items        :flex-end})
 
-(def button-container
+(defn button-container
+  [bottom]
   {:position :absolute
-   :bottom   22
+   :bottom   (- bottom 22)
    :left     20
    :right    20})

src/status_im2/contexts/wallet/select_address_to_watch/view.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.contexts.wallet.add-address-to-watch.view
+(ns status-im2.contexts.wallet.select-address-to-watch.view
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
@@ -6,18 +6,22 @@
     [re-frame.core :as re-frame]
     [react-native.clipboard :as clipboard]
     [react-native.core :as rn]
+    [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
-    [status-im2.contexts.wallet.add-address-to-watch.style :as style]
+    [status-im2.contexts.wallet.select-address-to-watch.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
 (defn view-internal
   []
-  (let [input-value         (reagent/atom "")
+  (let [top                 (safe-area/get-top)
+        bottom              (safe-area/get-bottom)
+        input-value         (reagent/atom "")
         customization-color (rf/sub [:profile/customization-color])]
     (fn []
       [rn/view
-       {:style {:flex 1}}
+       {:style {:flex       1
+                :margin-top top}}
        [quo/page-nav
         {:type      :no-title
          :icon-name :i/close
@@ -44,9 +48,9 @@
         {:customization-color customization-color
          :disabled?           (clojure.string/blank? @input-value)
          :on-press            #(re-frame/dispatch [:navigate-to
-                                                   :confirm-address-to-watch
+                                                   :address-to-watch-edit
                                                    {:address @input-value}])
-         :container-style     style/button-container}
+         :container-style     (style/button-container bottom)}
         (i18n/label :t/continue)]])))
 
 (def view (quo.theme/with-theme view-internal))

src/status_im2/navigation/screens.cljs

@@ -39,15 +39,14 @@
     [status-im2.contexts.syncing.syncing-devices-list.view :as settings-syncing]
     [status-im2.contexts.wallet.account.bridge.view :as bridge]
     [status-im2.contexts.wallet.account.view :as wallet-accounts]
-    [status-im2.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address-to-watch]
-    [status-im2.contexts.wallet.add-address-to-watch.view :as add-address-to-watch]
+    [status-im2.contexts.wallet.add-watch-only-account.views :as address-add-edit]
     [status-im2.contexts.wallet.collectible.view :as wallet-collectible]
     [status-im2.contexts.wallet.create-account.edit-derivation-path.view :as wallet-edit-derivation-path]
-    [status-im2.contexts.wallet.create-account.select-keypair.view :as wallet-select-keypair]
     [status-im2.contexts.wallet.create-account.view :as wallet-create-account]
     [status-im2.contexts.wallet.edit-account.view :as wallet-edit-account]
     [status-im2.contexts.wallet.saved-address.view :as wallet-saved-address]
     [status-im2.contexts.wallet.scan-account.view :as scan-address]
+    [status-im2.contexts.wallet.select-address-to-watch.view :as wallet-address-watch]
     [status-im2.contexts.wallet.send.select-address.view :as wallet-select-address]
     [status-im2.navigation.options :as options]
     [status-im2.navigation.transitions :as transitions]))
@@ -161,15 +160,11 @@
      :component create-password/create-password}
 
     {:name      :enable-biometrics
-     :options   {:theme                  :dark
-                 :layout                 options/onboarding-transparent-layout
-                 :animations             (merge transitions/new-to-status-modal-animations
-                                                transitions/push-animations-for-transparent-background)
-                 :popGesture             false
-                 :modalPresentationStyle :overCurrentContext
-                 :hardwareBackButton     {:dismissModalOnPress false
-                                          :popStackOnPress     false}}
-     :component enable-biometrics/view}
+     :options   {:theme      :dark
+                 :layout     options/onboarding-transparent-layout
+                 :animations transitions/push-animations-for-transparent-background
+                 :popGesture false}
+     :component enable-biometrics/enable-biometrics}
 
     {:name      :generating-keys
      :options   {:theme              :dark
@@ -253,16 +248,16 @@
      :options   {:insets {:top? true}}
      :component wallet-accounts/view}
 
+    {:name      :address-to-watch-edit
+     :component address-add-edit/address-add-edit}
+
     {:name      :wallet-edit-account
      :component wallet-edit-account/view}
 
-    {:name      :add-address-to-watch
+    {:name      :wallet-address-watch
      :options   {:insets {:top?    true
                           :bottom? true}}
-     :component add-address-to-watch/view}
-
-    {:name      :confirm-address-to-watch
-     :component confirm-address-to-watch/view}
+     :component wallet-address-watch/view}
 
     {:name      :wallet-bridge
      :options   {:insets                 {:top? true}
@@ -275,10 +270,6 @@
     {:name      :wallet-collectible
      :component wallet-collectible/view}
 
-    {:name      :wallet-select-keypair
-     :options   {:insets {:top? true}}
-     :component wallet-select-keypair/view}
-
     {:name      :wallet-create-account
      :options   {:insets {:top? true}}
      :component wallet-create-account/view}

src/status_im2/subs/profile.cljs

@@ -63,25 +63,6 @@
  (fn [{:keys [public-key]}]
    public-key))
 
-(re-frame/reg-sub
- :profile/webview-debug
- :<- [:profile/profile]
- (fn [{:keys [webview-debug]}]
-   webview-debug))
-
-(re-frame/reg-sub
- :profile/light-client-enabled?
- :<- [:profile/profile]
- (fn [profile]
-   (get-in profile [:wakuv2-config :LightClient])))
-
-(re-frame/reg-sub
- :profile/test-networks-enabled?
- :<- [:profile/profile]
- (fn [profile]
-   (:test-networks-enabled? profile)))
-
-
 (re-frame/reg-sub
  :multiaccount/contact
  :<- [:profile/profile]
@@ -131,6 +112,12 @@
  (fn [multiaccount]
    (get multiaccount :log-level)))
 
+(re-frame/reg-sub
+ :waku/bloom-filter-mode
+ :<- [:profile/profile]
+ (fn [multiaccount]
+   (boolean (get multiaccount :waku-bloom-filter-mode))))
+
 (re-frame/reg-sub
  :waku/v2-flag
  :<- [:fleets/current-fleet]

src/utils/address.cljs

@@ -68,7 +68,7 @@
     (let [first-part-of-public-key (subs public-key 0 3)
           ellipsis                 "..."
           public-key-size          (count public-key)
-          last-part-of-public-key  (subs public-key (- public-key-size 5) public-key-size)
+          last-part-of-public-key  (subs public-key (- public-key-size 6) public-key-size)
           abbreviated-public-key   (str first-part-of-public-key ellipsis last-part-of-public-key)]
       abbreviated-public-key)
     nil))

src/utils/address_test.cljs

@@ -5,7 +5,7 @@
 
 (deftest get-shortened-compressed-key
   (testing "Ensure the function correctly abbreviates a valid public key"
-    (is (= "zQ3...sgt5N"
+    (is (= "zQ3...1sgt5N"
            (utils.address/get-shortened-compressed-key
             "zQ3ssgRy5TtB47MMiMKMKaGyaawkCgMqqbrnAUYrZJ1sgt5N"))))
 

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "test-shard-test",
-    "commit-sha1": "1a74a963384ec9598b6c6ed504cccdebd0a521f0",
-    "src-sha256": "0cbbqwjshq1m4z3mcrw7iyzv16xyp7ffpnbpfwx869mbhcnir0vm"
+    "version": "v0.171.11",
+    "commit-sha1": "8a4c2d8d2f17117aa0a00338e83b0f753ebf1328",
+    "src-sha256": "160qnl9dsl1ypvqg9w6z8wps4fvgq3qxi16piymhrlzgssdwkz8h"
 }

translations/en.json

@@ -2372,18 +2372,14 @@
     "edit-derivation-path": "Edit derivation path",
     "path-format": "Path format",
     "reset": "Reset",
-    "light-client-enabled": "Light client",
     "reveal-address": "Reveal address",
     "derive-addresses": "Derive addresses",
+    "address-activity": "This address has activity",
     "sign transactions": "sign transactions",
+    "search-assets": "Search assets",
     "account-created": "{{name}} created",
     "update-account-name": "Update account name",
     "edit-wallet-account-emoji-updated-message": "Account emoji has been updated",
     "edit-wallet-account-name-updated-message": "Account name has been updated",
-    "edit-wallet-account-colour-updated-message": "Account colour has been updated",
-    "search-assets": "Search assets",
-    "address-activity": "This address has activity",
-    "keypairs": "Keypairs",
-    "keypairs-description": "Select keypair to derive your new account from",
-    "confirm-account-origin": "Confirm account origin"
+    "edit-wallet-account-colour-updated-message": "Account colour has been updated"
 }