review

status-im · Jan 5, 2024 · 3661446 · 3661446
1 parent 8e12634
commit 3661446
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/src/status_im/contexts/wallet/common/account_switcher/view.cljs b/src/status_im/contexts/wallet/common/account_switcher/view.cljs
@@ -13,14 +13,15 @@
     nil))
 
 (defn view
-  [{:keys [on-press accessibility-label icon-name switcher-type]
+  [{:keys [on-press accessibility-label icon-name switcher-type margin-top]
     :or   {icon-name           :i/close
            accessibility-label :top-bar
            switcher-type       :account-options}}]
   (let [{:keys [color emoji watch-only?]} (rf/sub [:wallet/current-viewing-account])
         networks                          (rf/sub [:wallet/network-details])]
     [quo/page-nav
      {:icon-name           icon-name
+      :margin-top          margin-top
       :background          :blur
       :on-press            on-press
       :accessibility-label accessibility-label

diff --git a/src/status_im/contexts/wallet/send/select_address/view.cljs b/src/status_im/contexts/wallet/send/select_address/view.cljs
@@ -3,7 +3,9 @@
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
+    [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
+    [status-im.common.floating-button-page.view :as floating-button-page]
     [status-im.constants :as constants]
     [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
     [status-im.contexts.wallet.item-types :as types]
@@ -127,13 +129,20 @@
                          (fn []
                            (rf/dispatch [:wallet/clean-scanned-address])
                            (rf/dispatch [:wallet/clean-local-suggestions]))))
-        [rn/scroll-view
-         {:content-container-style      style/container
-          :keyboard-should-persist-taps :handled
-          :scroll-enabled               false}
-         [account-switcher/view
-          {:on-press      on-close
-           :switcher-type :select-account}]
+        [floating-button-page/view
+         {:header [account-switcher/view
+                   {:on-press      on-close
+                    :margin-top    (safe-area/get-top)
+                    :switcher-type :select-account}]
+          :footer (when (> (count @input-value) 0)
+                    [quo/button
+                     {:accessibility-label :continue-button
+                      :type                :primary
+                      :disabled?           (not valid-ens-or-address?)
+                      :on-press            #(rf/dispatch [:wallet/select-send-address
+                                                          {:address  @input-value
+                                                           :stack-id :wallet-select-address}])}
+                     (i18n/label :t/continue)])}
          [quo/text-combinations
           {:title                     (i18n/label :t/send-to)
            :container-style           style/title-container
@@ -147,17 +156,7 @@
             [rn/view
              {:style {:flex    1
                       :padding 8}}
-             [local-suggestions-list]]
-            (when (> (count @input-value) 0)
-              [quo/button
-               {:accessibility-label :continue-button
-                :type                :primary
-                :disabled?           (not valid-ens-or-address?)
-                :container-style     style/button
-                :on-press            #(rf/dispatch [:wallet/select-send-address
-                                                    {:address  @input-value
-                                                     :stack-id :wallet-select-address}])}
-               (i18n/label :t/continue)])]
+             [local-suggestions-list]]]
            [:<>
             [quo/tabs
              {:style            style/tabs
@@ -173,4 +172,3 @@
 (defn view
   []
   [:f> f-view])
-