diff --git a/src/status_im/common/floating_button_page/floating_container/style.cljs b/src/status_im/common/floating_button_page/floating_container/style.cljs index 58c59c8a48..5c0429e5eb 100644 --- a/src/status_im/common/floating_button_page/floating_container/style.cljs +++ b/src/status_im/common/floating_button_page/floating_container/style.cljs @@ -1,5 +1,6 @@ (ns status-im.common.floating-button-page.floating-container.style - (:require [react-native.safe-area :as safe-area])) + (:require [quo.foundations.colors :as colors] + [react-native.safe-area :as safe-area])) (defn content-container [blur? keyboard-shown?] @@ -11,7 +12,12 @@ :padding-horizontal 20} blur? (dissoc :padding-vertical :padding-horizontal)))) -(def blur-inner-container - {:background-color :transparent ; required, otherwise blur-view will shrink +(defn blur-inner-container + [theme shell-overlay?] + {:background-color (colors/theme-colors colors/white-70-blur + (if shell-overlay? + colors/neutral-80-opa-80-blur + colors/neutral-95-opa-70-blur) + theme) :padding-vertical 12 :padding-horizontal 20}) diff --git a/src/status_im/common/floating_button_page/floating_container/view.cljs b/src/status_im/common/floating_button_page/floating_container/view.cljs index a01505a8a2..2ea0207ecc 100644 --- a/src/status_im/common/floating_button_page/floating_container/view.cljs +++ b/src/status_im/common/floating_button_page/floating_container/view.cljs @@ -1,27 +1,25 @@ (ns status-im.common.floating-button-page.floating-container.view (:require [quo.core :as quo] - [quo.foundations.colors :as colors] [quo.theme :as quo.theme] [react-native.core :as rn] [status-im.common.floating-button-page.floating-container.style :as style])) (defn- blur-container - [child] + [child shell-overlay?] (let [theme (quo.theme/use-theme)] [quo/blur - {:blur-amount 52 - :blur-radius 20 - :blur-type :transparent - :blur-overlay-color (colors/theme-colors colors/white-70-blur colors/neutral-95-opa-70-blur theme)} - [rn/view {:style style/blur-inner-container} + {:blur-amount 20 + :blur-type :transparent + :overlay-color :transparent} + [rn/view {:style (style/blur-inner-container theme shell-overlay?)} child]])) (defn view - [{:keys [on-layout keyboard-shown? blur?]} child] + [{:keys [on-layout keyboard-shown? blur? shell-overlay?]} child] [rn/view {:style (style/content-container blur? keyboard-shown?) :on-layout on-layout} (if blur? - [blur-container child] + [blur-container child shell-overlay?] child)]) diff --git a/src/status_im/common/floating_button_page/view.cljs b/src/status_im/common/floating_button_page/view.cljs index f67b5f98a2..5d9cb21188 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 - content-container-style gradient-cover? keyboard-should-persist-taps] + content-container-style gradient-cover? keyboard-should-persist-taps shell-overlay?] :or {footer-container-padding (safe-area/get-top)}} & children] (reagent/with-let [scroll-view-ref (atom nil) @@ -121,7 +121,8 @@ [floating-container/view {:on-layout set-footer-container-height :keyboard-shown? keyboard-shown? - :blur? show-background?} + :blur? show-background? + :shell-overlay? shell-overlay?} footer]]]]) (finally (remove-listeners)))) diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs index 24e2ca4325..8697bb1bce 100644 --- a/src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs +++ b/src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs @@ -113,7 +113,8 @@ (defn view [] - (let [profile-color (rf/sub [:profile/customization-color]) + (let [view-id (rf/sub [:view-id]) + profile-color (rf/sub [:profile/customization-color]) accounts-addresses (rf/sub [:wallet/addresses]) saved-addresses-addresses (rf/sub [:wallet/saved-addresses-addresses]) [address-or-ens set-address-or-ens] (rn/use-state "") @@ -175,11 +176,12 @@ :on-press navigate-back :margin-top (safe-area/get-top) :accessibility-label :add-address-to-save-page-nav}] - :footer [quo/button - {:customization-color profile-color - :disabled? button-disabled? - :on-press on-press-continue} - (i18n/label :t/continue)]} + :footer (when (= view-id :screen/settings.add-address-to-save) + [quo/button + {:customization-color profile-color + :disabled? button-disabled? + :on-press on-press-continue} + (i18n/label :t/continue)])} [quo/page-top {:container-style style/header-container :blur? true diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/save_address/view.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/save_address/view.cljs index 57372f7386..34fb023444 100644 --- a/src/status_im/contexts/settings/wallet/saved_addresses/save_address/view.cljs +++ b/src/status_im/contexts/settings/wallet/saved_addresses/save_address/view.cljs @@ -121,7 +121,8 @@ :on-press on-press-save} (i18n/label :t/save-address)] :customization-color address-color - :gradient-cover? true} + :gradient-cover? true + :shell-overlay? true} [quo/wallet-user-avatar {:full-name (if (string/blank? address-label) placeholder