chore:fix?

status-im · Jun 16, 2023 · b3c881e · b3c881e
1 parent c4fc9af
commit b3c881e
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/src/status_im2/navigation/view.cljs b/src/status_im2/navigation/view.cljs
@@ -50,6 +50,18 @@
    (when top?
      {:padding-top (safe-area/get-top)})))
 
+(defn screen-wrapper
+  [{:keys [insets background-color component sheet? screen-theme]}]
+  (let [user-theme (quo2.theme/get-theme)]
+    [quo2.theme/provider {:theme (or screen-theme user-theme)}
+     [rn/view {:style (wrapped-screen-style insets background-color)}
+      [inactive]
+      (if sheet?
+        [:f> bottom-sheet-screen/f-view component]
+        [component])]
+     (when js/goog.DEBUG
+       [reloader/reload-view])]))
+
 (defn screen
   [key]
   (reagent.core/reactify-component
@@ -59,18 +71,15 @@
                                                 screens)
                                               (keyword key))
            {:keys [insets sheet? theme]} options
-           user-theme                    (theme/get-theme)
            background-color              (or (get-in options [:layout :backgroundColor])
                                              (when sheet? :transparent))]
        ^{:key (str "root" key @reloader/cnt)}
-       [quo2.theme/provider {:theme (or theme user-theme)}
-        [rn/view {:style (wrapped-screen-style insets background-color)}
-         [inactive]
-         (if sheet?
-           [:f> bottom-sheet-screen/f-view component]
-           [component])]
-        (when js/goog.DEBUG
-          [reloader/reload-view])]))))
+       [screen-wrapper
+        {:insets           insets
+         :background-color background-color
+         :component        component
+         :sheet?           sheet?
+         :screen-theme     theme}]))))
 
 (def bottom-sheet
   (reagent/reactify-component