From d20f10cf8be5388f3030c794556b05a70576ff14 Mon Sep 17 00:00:00 2001 From: Brian Sztamfater Date: Wed, 24 Jan 2024 10:40:53 -0300 Subject: [PATCH] fix: fix slide button padding on transaction confirmation page (#18585) Signed-off-by: Brian Sztamfater --- .../common/floating_button_page/view.cljs | 5 +- .../wallet/add_address_to_watch/view.cljs | 22 ++++----- .../wallet/send/select_address/view.cljs | 32 +++++++------ .../send/transaction_confirmation/view.cljs | 46 ++++++++++--------- .../send/transaction_progress/view.cljs | 27 +++++------ 5 files changed, 69 insertions(+), 63 deletions(-) diff --git a/src/status_im/common/floating_button_page/view.cljs b/src/status_im/common/floating_button_page/view.cljs index dc0ed27b6b..dba9ee18b4 100644 --- a/src/status_im/common/floating_button_page/view.cljs +++ b/src/status_im/common/floating_button_page/view.cljs @@ -52,7 +52,8 @@ :remove-listeners remove-listeners})) (defn view - [{:keys [header footer customization-color gradient-cover?]} & + [{:keys [header footer customization-color footer-container-padding gradient-cover?] + :or {footer-container-padding (safe-area/get-top)}} & children] (reagent/with-let [window-height (:height (rn/get-window)) footer-container-height (reagent/atom 0) @@ -94,7 +95,7 @@ children)] [rn/keyboard-avoiding-view {:style style/keyboard-avoiding-view - :keyboard-vertical-offset (if platform/ios? (safe-area/get-top) 0) + :keyboard-vertical-offset (if platform/ios? footer-container-padding 0) :pointer-events :box-none} [floating-container/view {:on-layout set-footer-container-height diff --git a/src/status_im/contexts/wallet/add_address_to_watch/view.cljs b/src/status_im/contexts/wallet/add_address_to_watch/view.cljs index 5dc0086ff0..bda75726e6 100644 --- a/src/status_im/contexts/wallet/add_address_to_watch/view.cljs +++ b/src/status_im/contexts/wallet/add_address_to_watch/view.cljs @@ -122,17 +122,17 @@ (rf/dispatch [:wallet/clean-scanned-address]) (rf/dispatch [:wallet/clear-address-activity-check]) (rf/dispatch [:navigate-back]))}] - :footer - [quo/button - {:customization-color customization-color - :disabled? (or (string/blank? @input-value) (some? (validate @input-value))) - :on-press (fn [] - (rf/dispatch [:navigate-to - :confirm-address-to-watch - {:address @input-value}]) - (clear-input)) - :container-style {:z-index 2}} - (i18n/label :t/continue)]} + :footer [quo/button + {:customization-color customization-color + :disabled? (or (string/blank? @input-value) + (some? (validate @input-value))) + :on-press (fn [] + (rf/dispatch [:navigate-to + :confirm-address-to-watch + {:address @input-value}]) + (clear-input)) + :container-style {:z-index 2}} + (i18n/label :t/continue)]} [quo/text-combinations {:container-style style/header-container :title (i18n/label :t/add-address) diff --git a/src/status_im/contexts/wallet/send/select_address/view.cljs b/src/status_im/contexts/wallet/send/select_address/view.cljs index ee21e56f1c..066439048a 100644 --- a/src/status_im/contexts/wallet/send/select_address/view.cljs +++ b/src/status_im/contexts/wallet/send/select_address/view.cljs @@ -135,21 +135,23 @@ (rf/dispatch [:wallet/clean-scanned-address]) (rf/dispatch [:wallet/clean-local-suggestions])))) [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 - :token token - :stack-id :wallet-select-address}]) - :customization-color color} - (i18n/label :t/continue)])} + {:footer-container-padding 0 + :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 + :token token + :stack-id + :wallet-select-address}]) + :customization-color color} + (i18n/label :t/continue)])} [quo/text-combinations {:title (i18n/label :t/send-to) :container-style style/title-container diff --git a/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs b/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs index 884c19d664..d6558f6dbe 100644 --- a/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs +++ b/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs @@ -162,28 +162,30 @@ :address (utils/get-shortened-address to-address)}] [rn/view {:style {:flex 1}} [floating-button-page/view - {:header [quo/page-nav - {:icon-name :i/arrow-left - :on-press on-close - :margin-top (safe-area/get-top) - :background :blur - :accessibility-label :top-bar - :right-side [{:icon-name :i/advanced - :on-press #(js/alert - "to be implemented") - :accessibility-label :advanced-options}]}] - :footer (if route - [standard-auth/slide-button - {:size :size-48 - :track-text (i18n/label :t/slide-to-send) - :container-style {:z-index 2} - :customization-color account-color - :on-auth-success #(rf/dispatch [:wallet/send-transaction - (security/safe-unmask-data %)]) - :auth-button-label (i18n/label :t/confirm)}] - [rn/activity-indicator]) - :gradient-cover? true - :customization-color (:color account)} + {:footer-container-padding 0 + :header [quo/page-nav + {:icon-name :i/arrow-left + :on-press on-close + :margin-top (safe-area/get-top) + :background :blur + :accessibility-label :top-bar + :right-side [{:icon-name :i/advanced + :on-press #(js/alert + "to be implemented") + :accessibility-label :advanced-options}]}] + :footer (if route + [standard-auth/slide-button + {:size :size-48 + :track-text (i18n/label :t/slide-to-send) + :container-style {:z-index 2} + :customization-color account-color + :on-auth-success #(rf/dispatch [:wallet/send-transaction + (security/safe-unmask-data + %)]) + :auth-button-label (i18n/label :t/confirm)}] + [rn/activity-indicator]) + :gradient-cover? true + :customization-color (:color account)} [rn/view [transaction-title {:token-symbol token-symbol diff --git a/src/status_im/contexts/wallet/send/transaction_progress/view.cljs b/src/status_im/contexts/wallet/send/transaction_progress/view.cljs index 41cd8d03c1..366e691070 100644 --- a/src/status_im/contexts/wallet/send/transaction_progress/view.cljs +++ b/src/status_im/contexts/wallet/send/transaction_progress/view.cljs @@ -32,19 +32,20 @@ (fn [] (let [transaction-details (rf/sub [:wallet/send-transaction-progress])] [floating-button-page/view - {:header [quo/page-nav - {:type :no-title - :background :blur - :icon-name :i/close - :margin-top (safe-area/get-top) - :on-press leave-page - :accessibility-label :top-bar}] - :footer [quo/button - {:customization-color color - :on-press leave-page} - (i18n/label :t/done)] - :customization-color color - :gradient-cover? true} + {:footer-container-padding 0 + :header [quo/page-nav + {:type :no-title + :background :blur + :icon-name :i/close + :margin-top (safe-area/get-top) + :on-press leave-page + :accessibility-label :top-bar}] + :footer [quo/button + {:customization-color color + :on-press leave-page} + (i18n/label :t/done)] + :customization-color color + :gradient-cover? true} [rn/view {:style style/content-container} [rn/image {:source (resources/get-image :transaction-progress)