diff --git a/src/quo/components/inputs/address_input/view.cljs b/src/quo/components/inputs/address_input/view.cljs index 85391b2cf9..a727fd24c4 100644 --- a/src/quo/components/inputs/address_input/view.cljs +++ b/src/quo/components/inputs/address_input/view.cljs @@ -133,8 +133,7 @@ :on-focus on-focus :on-blur on-blur :on-change-text on-change}] - (when (or (= status :default) - (= status :active)) + (when (empty? value) [rn/view {:style style/buttons-container :accessibility-label :paste-scan-buttons-container} @@ -155,7 +154,9 @@ :inner-style (style/accessory-button blur? theme) :on-press on-scan} :main-icons/scan])]) - (when (= status :typing) + (when (or (= status :typing) + (and (= status :active) + (not-empty value))) [rn/view {:style style/buttons-container :accessibility-label :clear-button-container} @@ -168,7 +169,10 @@ {:style style/buttons-container :accessibility-label :loading-button-container} [loading-icon blur? theme]]) - (when (and (= status :loading) valid-ens-or-address?) + (when (and (or (= status :loading) + (= status :default)) + valid-ens-or-address? + (not-empty value)) [rn/view {:style style/buttons-container :accessibility-label :positive-button-container} diff --git a/src/status_im/common/floating_button_page/view.cljs b/src/status_im/common/floating_button_page/view.cljs index 7daf089991..31b8f59bcd 100644 --- a/src/status_im/common/floating_button_page/view.cljs +++ b/src/status_im/common/floating_button_page/view.cljs @@ -58,7 +58,7 @@ (defn view [{:keys [header footer customization-color footer-container-padding header-container-style - gradient-cover?] + gradient-cover? keyboard-should-persist-taps] :or {footer-container-padding (safe-area/get-top)}} & children] (reagent/with-let [scroll-view-ref (atom nil) @@ -108,7 +108,8 @@ :padding-bottom (when @keyboard-did-show? @footer-container-height)} :always-bounce-vertical @keyboard-did-show? - :shows-vertical-scroll-indicator false} + :shows-vertical-scroll-indicator false + :keyboard-should-persist-taps keyboard-should-persist-taps} (into [rn/view {:on-layout set-content-container-height}] children)] [rn/keyboard-avoiding-view 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 439e188088..498e03c09f 100644 --- a/src/status_im/contexts/wallet/send/select_address/view.cljs +++ b/src/status_im/contexts/wallet/send/select_address/view.cljs @@ -156,24 +156,26 @@ local-suggestion-address (rf/sub [:wallet/local-suggestions->full-address]) color (rf/sub [:wallet/current-viewing-account-color])] [floating-button-page/view - {: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 (or local-suggestion-address - @input-value) - :stack-id - :screen/wallet.select-address}]) - :customization-color color} - (i18n/label :t/continue)])} + {:footer-container-padding 0 + :keyboard-should-persist-taps true + :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 (or + local-suggestion-address + @input-value) + :stack-id + :screen/wallet.select-address}]) + :customization-color color} + (i18n/label :t/continue)])} [quo/page-top {:title (i18n/label :t/send-to) :title-accessibility-label :title-label}]