fix: wrong theme mechanism

status-im · Apr 29, 2024 · c2bb94e · c2bb94e
1 parent 20ef197
commit c2bb94e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/status_im/contexts/profile/settings/list_items.cljs b/src/status_im/contexts/profile/settings/list_items.cljs
@@ -111,7 +111,9 @@
        :image-props :i/light})]
    [{:title    (i18n/label :t/about)
      :on-press #(rf/dispatch [:open-modal :about-app])
-     :action   :arrow}
+     :action   :arrow
+     :blur?    true}
     {:title    (i18n/label :t/status-help)
      :on-press #(rf/dispatch [:open-modal :help-center])
-     :action   :arrow}]])
+     :action   :arrow
+     :blur?    true}]])
diff --git a/src/status_im/contexts/profile/settings/view.cljs b/src/status_im/contexts/profile/settings/view.cljs
@@ -30,8 +30,10 @@
 (defn- footer
   [{:keys [bottom]} logout-press]
   [rf/delay-render
-   [rn/view {:style (style/footer-container bottom)}
-    [quo/logout-button {:on-press logout-press}]]])
+   [quo.theme/provider :dark
+    [rn/view {:style (style/footer-container bottom)}
+     [quo/logout-button {:on-press logout-press}]]]
+  ])
 
 (defn- get-item-layout
   [_ index]

diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs
@@ -206,7 +206,7 @@
      :component communities.overview/view}
 
     {:name      :settings
-     :options   (dissoc options/transparent-screen-options :theme)
+     :options   options/transparent-screen-options
      :component settings/view}
 
     {:name      :settings-syncing

diff --git a/src/status_im/navigation/view.cljs b/src/status_im/navigation/view.cljs
@@ -71,7 +71,7 @@
            background-color            (or (get-in options [:layout :backgroundColor])
                                            (when sheet? :transparent))
            app-theme                   (rf/sub [:theme])
-           theme                       (or theme app-theme)]
+           theme                       (or app-theme theme)]
        ^{:key (str "root" screen-key @reloader/cnt)}
        [quo.theme/provider theme
         [rn/view