From ebbae051bd03b2d823a5b020ccf3d468d0cc61f9 Mon Sep 17 00:00:00 2001 From: Brian Sztamfater Date: Wed, 24 Jan 2024 10:27:00 -0300 Subject: [PATCH] fix: fix button color on input amount screen (#18572) Signed-off-by: Brian Sztamfater --- .../contexts/wallet/send/input_amount/view.cljs | 12 +++++++----- .../contexts/wallet/send/select_address/view.cljs | 6 ++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/status_im/contexts/wallet/send/input_amount/view.cljs b/src/status_im/contexts/wallet/send/input_amount/view.cljs index c5cf2c7186..e91c509898 100644 --- a/src/status_im/contexts/wallet/send/input_amount/view.cljs +++ b/src/status_im/contexts/wallet/send/input_amount/view.cljs @@ -128,7 +128,8 @@ (empty? @input-value) (<= input-num-value 0) (> input-num-value (:amount @current-limit))) - amount (str @input-value " " token-symbol)] + amount (str @input-value " " token-symbol) + {:keys [color]} (rf/sub [:wallet/current-viewing-account])] (rn/use-effect (fn [] (let [dismiss-keyboard-fn #(when (= % "active") (rn/dismiss-keyboard!)) @@ -170,10 +171,11 @@ :loading-networks (find-affordable-networks token @input-value) :networks (:networks token)}] [quo/bottom-actions - {:actions :1-action - :button-one-label (i18n/label :t/confirm) - :button-one-props {:disabled? confirm-disabled? - :on-press on-confirm}}] + {:actions :1-action + :button-one-label (i18n/label :t/confirm) + :button-one-props {:disabled? confirm-disabled? + :on-press on-confirm} + :customization-color color}] [quo/numbered-keyboard {:container-style (style/keyboard-container bottom) :left-action :dot 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 07ae2e684c..ee21e56f1c 100644 --- a/src/status_im/contexts/wallet/send/select_address/view.cljs +++ b/src/status_im/contexts/wallet/send/select_address/view.cljs @@ -128,7 +128,8 @@ (fn [] (let [selected-tab (or (rf/sub [:wallet/send-tab]) (:id (first tabs-data))) token (rf/sub [:wallet/wallet-send-token]) - valid-ens-or-address? (boolean (rf/sub [:wallet/valid-ens-or-address?]))] + valid-ens-or-address? (boolean (rf/sub [:wallet/valid-ens-or-address?])) + {:keys [color]} (rf/sub [:wallet/current-viewing-account])] (rn/use-effect (fn [] (fn [] (rf/dispatch [:wallet/clean-scanned-address]) @@ -146,7 +147,8 @@ :on-press #(rf/dispatch [:wallet/select-send-address {:address @input-value :token token - :stack-id :wallet-select-address}])} + :stack-id :wallet-select-address}]) + :customization-color color} (i18n/label :t/continue)])} [quo/text-combinations {:title (i18n/label :t/send-to)