diff --git a/src/status_im2/contexts/wallet/add_address_to_watch/style.cljs b/src/status_im2/contexts/wallet/add_address_to_watch/style.cljs index 325cd607f0..1b01f32705 100644 --- a/src/status_im2/contexts/wallet/add_address_to_watch/style.cljs +++ b/src/status_im2/contexts/wallet/add_address_to_watch/style.cljs @@ -5,12 +5,6 @@ :margin-top 12 :margin-bottom 20}) -(def button-container - {:position :absolute - :bottom 22 - :left 20 - :right 20}) - (def scan {:align-self :flex-end}) diff --git a/src/status_im2/contexts/wallet/add_address_to_watch/view.cljs b/src/status_im2/contexts/wallet/add_address_to_watch/view.cljs index aa8483492a..44f7a924fd 100644 --- a/src/status_im2/contexts/wallet/add_address_to_watch/view.cljs +++ b/src/status_im2/contexts/wallet/add_address_to_watch/view.cljs @@ -5,6 +5,7 @@ [react-native.clipboard :as clipboard] [react-native.core :as rn] [reagent.core :as reagent] + [status-im2.common.floating-button-page.view :as floating-button-page] [status-im2.contexts.wallet.add-address-to-watch.style :as style] [status-im2.contexts.wallet.common.validation :as validation] [utils.i18n :as i18n] @@ -82,34 +83,36 @@ (fn [] [rn/view {:style {:flex 1}} - [quo/page-nav - {:type :no-title - :icon-name :i/close - :on-press (fn [] - (rf/dispatch [:wallet/clean-scanned-address]) - (rf/dispatch [:navigate-back]))}] - [quo/text-combinations - {:container-style style/header-container - :title (i18n/label :t/add-address) - :description (i18n/label :t/enter-eth)}] - [:f> address-input - {:input-value input-value - :validate validate - :validation-msg validation-msg - :clear-input clear-input}] - (when @validation-msg - [quo/info-message - {:accessibility-label :error-message - :size :default - :icon :i/info - :type :error - :style style/info-message} - @validation-msg]) - [quo/button - {:customization-color customization-color - :disabled? (string/blank? @input-value) - :on-press #(rf/dispatch [:navigate-to - :confirm-address-to-watch - {:address @input-value}]) - :container-style style/button-container} - (i18n/label :t/continue)]]))) + [floating-button-page/view + {:header [quo/page-nav + {:type :no-title + :icon-name :i/close + :on-press (fn [] + (rf/dispatch [:wallet/clean-scanned-address]) + (rf/dispatch [:navigate-back]))}] + :footer + [quo/button + {:customization-color customization-color + :disabled? (string/blank? @input-value) + :on-press #(rf/dispatch [:navigate-to + :confirm-address-to-watch + {:address @input-value}]) + :container-style {:z-index 2}} + (i18n/label :t/continue)]} + [quo/text-combinations + {:container-style style/header-container + :title (i18n/label :t/add-address) + :description (i18n/label :t/enter-eth)}] + [:f> address-input + {:input-value input-value + :validate validate + :validation-msg validation-msg + :clear-input clear-input}] + (when @validation-msg + [quo/info-message + {:accessibility-label :error-message + :size :default + :icon :i/info + :type :error + :style style/info-message} + @validation-msg])]])))