From c3bf8f2678aa262947bf679d8daeb95bc35a8ce9 Mon Sep 17 00:00:00 2001 From: Jamie Caprani Date: Fri, 28 Jul 2023 13:44:36 +0100 Subject: [PATCH] chore:rebase --- .../drawers/documentation_drawers/view.cljs | 4 ++-- .../onboarding/common/navigation_bar/view.cljs | 10 +++++----- .../contexts/onboarding/create_password/view.cljs | 8 ++++---- .../contexts/onboarding/new_to_status/view.cljs | 11 ++++++----- .../contexts/onboarding/syncing/results/view.cljs | 2 +- .../contexts/quo_preview/navigation/top_nav.cljs | 4 ++-- .../contexts/shell/activity_center/header/view.cljs | 4 ++-- src/status_im2/contexts/shell/share/view.cljs | 3 ++- .../contexts/syncing/scan_sync_code/view.cljs | 2 +- .../contexts/syncing/setup_syncing/view.cljs | 2 +- .../contexts/syncing/syncing_devices_list/view.cljs | 10 +++++----- 11 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/quo2/components/drawers/documentation_drawers/view.cljs b/src/quo2/components/drawers/documentation_drawers/view.cljs index 4d34fdbf8a1..ffae4101601 100644 --- a/src/quo2/components/drawers/documentation_drawers/view.cljs +++ b/src/quo2/components/drawers/documentation_drawers/view.cljs @@ -34,10 +34,10 @@ [button/button {:size 24 :type :outline - :background (when shell? :blur) + :background (when shell? :blur) :on-press on-press-button :accessibility-label :documentation-drawer-button - :icon-right button-icon} + :icon-right button-icon} button-label])]]) (def view (quo.theme/with-theme view-internal)) diff --git a/src/status_im2/contexts/onboarding/common/navigation_bar/view.cljs b/src/status_im2/contexts/onboarding/common/navigation_bar/view.cljs index 51896e3e851..e0c758cd90c 100644 --- a/src/status_im2/contexts/onboarding/common/navigation_bar/view.cljs +++ b/src/status_im2/contexts/onboarding/common/navigation_bar/view.cljs @@ -12,10 +12,10 @@ [quo/page-nav {:align-mid? true :mid-section {:type :text-only :main-text ""} - :left-section {:type :grey + :left-section {:type :grey :icon-background :blur - :icon :i/arrow-left - :on-press (fn [] - (when-not disable-back-button? - (rf/dispatch back-event)))} + :icon :i/arrow-left + :on-press (fn [] + (when-not disable-back-button? + (rf/dispatch back-event)))} :right-section-buttons right-section-buttons}]])) diff --git a/src/status_im2/contexts/onboarding/create_password/view.cljs b/src/status_im2/contexts/onboarding/create_password/view.cljs index 8e75a23ccf5..756b5322f9e 100644 --- a/src/status_im2/contexts/onboarding/create_password/view.cljs +++ b/src/status_im2/contexts/onboarding/create_password/view.cljs @@ -217,10 +217,10 @@ [navigation-bar/navigation-bar {:stack-id :new-to-status :top top - :right-section-buttons [{:type :blur-bg - :icon :i/info - :icon-override-theme :dark - :on-press on-press-info}]}] + :right-section-buttons [{:type :grey + :icon-background :blur + :icon :i/info + :on-press on-press-info}]}] [password-form] [rn/view {:style {:height (if-not @keyboard-shown? bottom 0)}}]]]]] (finally diff --git a/src/status_im2/contexts/onboarding/new_to_status/view.cljs b/src/status_im2/contexts/onboarding/new_to_status/view.cljs index f3d40be2d0a..84af75b3636 100644 --- a/src/status_im2/contexts/onboarding/new_to_status/view.cljs +++ b/src/status_im2/contexts/onboarding/new_to_status/view.cljs @@ -105,12 +105,13 @@ [quo/page-nav {:align-mid? true :mid-section {:type :text-only :main-text ""} - :left-section {:type :blur-bg - :icon :i/arrow-left - :icon-override-theme :dark - :on-press navigate-back} - :right-section-buttons [{:type :blur-bg + :left-section {:type :grey + :icon-background :blur + :icon :i/arrow-left + :on-press navigate-back} + :right-section-buttons [{:type :grey :icon :i/info + :icon-background :blur :icon-override-theme :dark :on-press #(rf/dispatch [:show-bottom-sheet diff --git a/src/status_im2/contexts/onboarding/syncing/results/view.cljs b/src/status_im2/contexts/onboarding/syncing/results/view.cljs index a78b68b6601..30cbb0d3ffc 100644 --- a/src/status_im2/contexts/onboarding/syncing/results/view.cljs +++ b/src/status_im2/contexts/onboarding/syncing/results/view.cljs @@ -47,7 +47,7 @@ (defn continue-button [on-press] - (let [profile-color (:color (rf/sub [:onboarding-2/profile]))] + (let [profile-color (rf/sub [:profile/customization-color])] [quo/button {:on-press (fn [] (when on-press diff --git a/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs b/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs index d5ae23ac30c..8a70cd03be3 100644 --- a/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs +++ b/src/status_im2/contexts/quo_preview/navigation/top_nav.cljs @@ -13,8 +13,8 @@ :value "Default"} {:key :blur-bg :value "Blurred BG"} - {:key :shell - :value "Shell"}]} + {:key :black + :value "Black"}]} {:label "New Notifications?" :key :new-notifications? :type :boolean} diff --git a/src/status_im2/contexts/shell/activity_center/header/view.cljs b/src/status_im2/contexts/shell/activity_center/header/view.cljs index af2af9a37be..0efc0695e3c 100644 --- a/src/status_im2/contexts/shell/activity_center/header/view.cljs +++ b/src/status_im2/contexts/shell/activity_center/header/view.cljs @@ -23,14 +23,14 @@ [rn/view [rn/view {:style style/header-container} [quo/button - {:icon-only? true + {:icon-only? true :type :grey :size 32 :accessibility-label :close-activity-center :on-press #(rf/dispatch [:navigate-back])} :i/close] [quo/button - {:icon-only? true + {:icon-only? true :type :grey :size 32 :accessibility-label :activity-center-open-more diff --git a/src/status_im2/contexts/shell/share/view.cljs b/src/status_im2/contexts/shell/share/view.cljs index 2db53950f27..1e5beda3961 100644 --- a/src/status_im2/contexts/shell/share/view.cljs +++ b/src/status_im2/contexts/shell/share/view.cljs @@ -18,7 +18,8 @@ [:<> [quo/button {:icon-only? true - :type :blur-bg + :type :grey + :background :blur :size 32 :accessibility-label :close-shell-share-tab :container-style style/header-button diff --git a/src/status_im2/contexts/syncing/scan_sync_code/view.cljs b/src/status_im2/contexts/syncing/scan_sync_code/view.cljs index 1d3581ffb68..b5431abed28 100644 --- a/src/status_im2/contexts/syncing/scan_sync_code/view.cljs +++ b/src/status_im2/contexts/syncing/scan_sync_code/view.cljs @@ -398,7 +398,7 @@ :background :blur :size style/flash-button-size :accessibility-label :camera-flash - :contanier-style (style/camera-flash-button @qr-view-finder) + :container-style (style/camera-flash-button @qr-view-finder) :on-press #(swap! torch? not)} flashlight-icon])]])))) diff --git a/src/status_im2/contexts/syncing/setup_syncing/view.cljs b/src/status_im2/contexts/syncing/setup_syncing/view.cljs index ac82262711a..459f4375408 100644 --- a/src/status_im2/contexts/syncing/setup_syncing/view.cljs +++ b/src/status_im2/contexts/syncing/setup_syncing/view.cljs @@ -38,7 +38,7 @@ (defn view [] - (let [profile-color (:color (rf/sub [:onboarding-2/profile])) + (let [profile-color (rf/sub [:profile/customization-color]) valid-for-ms (reagent/atom code-valid-for-ms) code (reagent/atom nil) delay (reagent/atom nil) diff --git a/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs b/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs index 63767a1b94d..263e1690958 100644 --- a/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs +++ b/src/status_im2/contexts/syncing/syncing_devices_list/view.cljs @@ -13,10 +13,10 @@ [quo/page-nav {:align-mid? true :mid-section {:type :text-only :main-text ""} - :left-section {:type :blur-bg - - :icon :i/arrow-left - :on-press #(rf/dispatch [:navigate-back])}}]]) + :left-section {:type :photo + :icon-background :blur + :icon :i/arrow-left + :on-press #(rf/dispatch [:navigate-back])}}]]) (defn view [] @@ -24,7 +24,7 @@ devices-with-button (map #(assoc % :show-button? true) devices) user-device (first devices-with-button) other-devices (rest devices-with-button) - profile-color (:color (rf/sub [:onboarding-2/profile])) + profile-color (rf/sub [:profile/customization-color]) {:keys [paired-devices unpaired-devices]} (group-by #(if (:enabled? %) :paired-devices :unpaired-devices) other-devices)]