status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix slide button padding on transaction confirmation page (#18585) 

Signed-off-by: Brian Sztamfater <brian@status.im>
This commit is contained in:
Brian Sztamfater 2024-01-24 10:40:53 -03:00 committed by GitHub
parent ebbae051bd
commit d20f10cf8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 69 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/status_im/common/floating_button_page/view.cljs
View File

@ -52,7 +52,8 @@
:remove-listeners remove-listeners})) :remove-listeners remove-listeners}))
(defn view (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] children]
(reagent/with-let [window-height (:height (rn/get-window)) (reagent/with-let [window-height (:height (rn/get-window))
footer-container-height (reagent/atom 0) footer-container-height (reagent/atom 0)
@ -94,7 +95,7 @@
children)] children)]
[rn/keyboard-avoiding-view [rn/keyboard-avoiding-view
{:style style/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} :pointer-events :box-none}
[floating-container/view [floating-container/view
{:on-layout set-footer-container-height {:on-layout set-footer-container-height

6
src/status_im/contexts/wallet/add_address_to_watch/view.cljs
View File

@ -122,10 +122,10 @@
(rf/dispatch [:wallet/clean-scanned-address]) (rf/dispatch [:wallet/clean-scanned-address])
(rf/dispatch [:wallet/clear-address-activity-check]) (rf/dispatch [:wallet/clear-address-activity-check])
(rf/dispatch [:navigate-back]))}] (rf/dispatch [:navigate-back]))}]
:footer :footer [quo/button
[quo/button
{:customization-color customization-color {:customization-color customization-color
:disabled? (or (string/blank? @input-value) (some? (validate @input-value))) :disabled? (or (string/blank? @input-value)
(some? (validate @input-value)))
:on-press (fn [] :on-press (fn []
(rf/dispatch [:navigate-to (rf/dispatch [:navigate-to
:confirm-address-to-watch :confirm-address-to-watch

6
src/status_im/contexts/wallet/send/select_address/view.cljs
View File

@ -135,7 +135,8 @@
(rf/dispatch [:wallet/clean-scanned-address]) (rf/dispatch [:wallet/clean-scanned-address])
(rf/dispatch [:wallet/clean-local-suggestions])))) (rf/dispatch [:wallet/clean-local-suggestions]))))
[floating-button-page/view [floating-button-page/view
{:header [account-switcher/view {:footer-container-padding 0
:header [account-switcher/view
{:on-press on-close {:on-press on-close
:margin-top (safe-area/get-top) :margin-top (safe-area/get-top)
:switcher-type :select-account}] :switcher-type :select-account}]
@ -147,7 +148,8 @@
:on-press #(rf/dispatch [:wallet/select-send-address :on-press #(rf/dispatch [:wallet/select-send-address
{:address @input-value {:address @input-value
:token token :token token
:stack-id :wallet-select-address}]) :stack-id
:wallet-select-address}])
:customization-color color} :customization-color color}
(i18n/label :t/continue)])} (i18n/label :t/continue)])}
[quo/text-combinations [quo/text-combinations

6
src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs
View File

@ -162,7 +162,8 @@
:address (utils/get-shortened-address to-address)}] :address (utils/get-shortened-address to-address)}]
[rn/view {:style {:flex 1}} [rn/view {:style {:flex 1}}
[floating-button-page/view [floating-button-page/view
{:header [quo/page-nav {:footer-container-padding 0
:header [quo/page-nav
{:icon-name :i/arrow-left {:icon-name :i/arrow-left
:on-press on-close :on-press on-close
:margin-top (safe-area/get-top) :margin-top (safe-area/get-top)
@ -179,7 +180,8 @@
:container-style {:z-index 2} :container-style {:z-index 2}
:customization-color account-color :customization-color account-color
:on-auth-success #(rf/dispatch [:wallet/send-transaction :on-auth-success #(rf/dispatch [:wallet/send-transaction
(security/safe-unmask-data %)]) (security/safe-unmask-data
%)])
:auth-button-label (i18n/label :t/confirm)}] :auth-button-label (i18n/label :t/confirm)}]
[rn/activity-indicator]) [rn/activity-indicator])
:gradient-cover? true :gradient-cover? true

3
src/status_im/contexts/wallet/send/transaction_progress/view.cljs
View File

@ -32,7 +32,8 @@
(fn [] (fn []
(let [transaction-details (rf/sub [:wallet/send-transaction-progress])] (let [transaction-details (rf/sub [:wallet/send-transaction-progress])]
[floating-button-page/view [floating-button-page/view
{:header [quo/page-nav {:footer-container-padding 0
:header [quo/page-nav
{:type :no-title {:type :no-title
:background :blur :background :blur
:icon-name :i/close :icon-name :i/close