chore:rebase

status-im · Aug 1, 2023 · a91fd0c · a91fd0c
1 parent 3036ce4
commit a91fd0c
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -13,18 +13,18 @@
    [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
   []
   (let [devices                                   (rf/sub [:pairing/installations])
         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)]