Improvements

src/status_im/config.cljs

@@ -55,7 +55,7 @@
 (def commands-enabled? (enabled? (get-config :COMMANDS_ENABLED "0")))
 (def keycard-test-menu-enabled? (enabled? (get-config :KEYCARD_TEST_MENU "1")))
 (def qr-test-menu-enabled? (enabled? (get-config :QR_READ_TEST_MENU "0")))
-(def quo-preview-enabled? (enabled? (get-config :ENABLE_QUO_PREVIEW "0")))
+(def quo-preview-enabled? (enabled? (get-config :ENABLE_QUO_PREVIEW "1")))
 (def database-management-enabled? (enabled? (get-config :DATABASE_MANAGEMENT_ENABLED "0")))
 (def debug-webview? (enabled? (get-config :DEBUG_WEBVIEW "0")))
 (def collectibles-enabled? (enabled? (get-config :COLLECTIBLES_ENABLED "1")))

src/status_im/contexts/wallet/add_account/add_address_to_save/view.cljs

@@ -6,7 +6,7 @@
     [status-im.common.floating-button-page.view :as floating-button-page]
     [status-im.contexts.wallet.activity-indicator.view :as activity-indicator]
     [status-im.contexts.wallet.add-account.add-address-to-save.style :as style]
-    [status-im.contexts.wallet.address-input.view :as address-input]
+    [status-im.contexts.wallet.common.address-input.view :as address-input]
     [status-im.contexts.wallet.utils :as wallet.utils]
     [status-im.subs.wallet.add-account.address-to-watch]
     [utils.ens.core :as utils.ens]

src/status_im/contexts/wallet/add_account/add_address_to_watch/view.cljs

@@ -6,7 +6,7 @@
     [status-im.common.floating-button-page.view :as floating-button-page]
     [status-im.contexts.wallet.activity-indicator.view :as activity-indicator]
     [status-im.contexts.wallet.add-account.add-address-to-watch.style :as style]
-    [status-im.contexts.wallet.address-input.view :as address-input]
+    [status-im.contexts.wallet.common.address-input.view :as address-input]
     [status-im.contexts.wallet.utils :as wallet.utils]
     [status-im.subs.wallet.add-account.address-to-watch]
     [utils.ens.core :as utils.ens]

src/status_im/contexts/wallet/add_account/events.cljs

@@ -53,3 +53,35 @@
                 :on-error   #(log/info "failed to get address details"
                                        {:error %
                                         :event :wallet/get-address-details})}]])]})))
+
+(defn add-address-to-watch
+  [{:keys [db]} [{:keys [screen] :as props}]]
+  {:fx [[:dispatch [:navigate-to screen props]]]
+   :db (assoc-in db [:wallet :ui :currently-added-address] props)})
+
+(rf/reg-event-fx :wallet/add-address-to-watch add-address-to-watch)
+
+(defn add-address-to-save
+  [{:keys [db]} [{:keys [screen] :as props}]]
+  {:fx [[:dispatch [:open-modal screen props]]]
+   :db (assoc-in db [:wallet :ui :currently-added-address] props)})
+
+(rf/reg-event-fx :wallet/add-address-to-save add-address-to-save)
+
+(defn confirm-add-address-to-save
+  [{:keys [db]} [{:keys [ens? address]}]]
+  (let [confirm-screen (get-in db [:wallet :ui :currently-added-address :confirm-screen])]
+    {:fx [[:dispatch
+           [:open-modal confirm-screen]]]
+     :db (update-in db [:wallet :ui :currently-added-address] assoc :ens ens? :address address)}))
+
+(rf/reg-event-fx :wallet/confirm-add-address-to-save confirm-add-address-to-save)
+
+(defn confirm-add-address-to-watch
+  [{:keys [db]} [{:keys [ens? address]}]]
+  (let [confirm-screen (get-in db [:wallet :ui :currently-added-address :confirm-screen])]
+    {:fx [[:dispatch [:navigate-to confirm-screen]]]
+     :db (update-in db [:wallet :ui :currently-added-address] assoc :ens ens? :address address)}))
+
+(rf/reg-event-fx :wallet/confirm-add-address-to-watch confirm-add-address-to-watch)
+

src/status_im/contexts/wallet/common/activity_indicator/style.cljs

@@ -0,0 +1,5 @@
+(ns status-im.contexts.wallet.common.activity-indicator.style)
+
+(def info-message
+  {:margin-top  8
+   :margin-left 20})

src/status_im/contexts/wallet/activity_indicator/view.cljs → src/status_im/contexts/wallet/common/activity_indicator/view.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.activity-indicator.view
+(ns status-im.contexts.wallet.common.activity-indicator.view
   (:require [quo.core :as quo]
             [status-im.contexts.wallet.activity-indicator.style :as style]
             [utils.i18n :as i18n]))

src/status_im/contexts/wallet/address_input/style.cljs → src/status_im/contexts/wallet/common/address_input/style.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.address-input.style)
+(ns status-im.contexts.wallet.common.address-input.style)
 
 (def input
   {:flex         1

src/status_im/contexts/wallet/address_input/view.cljs → src/status_im/contexts/wallet/common/address_input/view.cljs

@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.address-input.view
+(ns status-im.contexts.wallet.common.address-input.view
   (:require [clojure.string :as string]
             [quo.core :as quo]
             [react-native.clipboard :as clipboard]

src/status_im/contexts/wallet/events.cljs

@@ -510,34 +510,3 @@
          activities           (cske/transform-keys transforms/->kebab-case-keyword activities)
          sorted-activities    (sort :timestamp activities)]
      {:db (assoc-in db [:wallet :activities] sorted-activities)})))
-
-(defn add-address-to-watch
-  [{:keys [db]} [{:keys [screen] :as props}]]
-  {:fx [[:dispatch [:navigate-to screen props]]]
-   :db (assoc-in db [:wallet :ui :currently-added-address] props)})
-
-(rf/reg-event-fx :wallet/add-address-to-watch add-address-to-watch)
-
-(defn add-address-to-save
-  [{:keys [db]} [{:keys [screen] :as props}]]
-  {:fx [[:dispatch [:open-modal screen props]]]
-   :db (assoc-in db [:wallet :ui :currently-added-address] props)})
-
-(rf/reg-event-fx :wallet/add-address-to-save add-address-to-save)
-
-(defn confirm-add-address-to-save
-  [{:keys [db]} [{:keys [ens? address]}]]
-  (let [confirm-screen (get-in db [:wallet :ui :currently-added-address :confirm-screen])]
-    {:fx [[:dispatch
-           [:open-modal confirm-screen]]]
-     :db (update-in db [:wallet :ui :currently-added-address] assoc :ens ens? :address address)}))
-
-(rf/reg-event-fx :wallet/confirm-add-address-to-save confirm-add-address-to-save)
-
-(defn confirm-add-address-to-watch
-  [{:keys [db]} [{:keys [ens? address]}]]
-  (let [confirm-screen (get-in db [:wallet :ui :currently-added-address :confirm-screen])]
-    {:fx [[:dispatch [:navigate-to confirm-screen]]]
-     :db (update-in db [:wallet :ui :currently-added-address] assoc :ens ens? :address address)}))
-
-(rf/reg-event-fx :wallet/confirm-add-address-to-watch confirm-add-address-to-watch)

src/status_im/navigation/screens.cljs

@@ -395,7 +395,7 @@
      :component wallet-confirm-address-to-watch/view}
 
     {:name      :screen/wallet.confirm-address-to-save
-     :options   options/dark-screen
+     :options   (assoc options/dark-screen :sheet? true)
      :component wallet-confirm-address-to-save/view}
 
     {:name      :screen/wallet.bridge-select-asset
@@ -560,7 +560,7 @@
    (when config/quo-preview-enabled?
      status-im-preview/main-screens)
 
-   (when config/quo-preview-enabled?
+   (when true
      [{:name      :feature-flags
        :options   {:insets {:top? true}}
        :component feature-flags/view}])))