fix: avoid blinking on startup

getezy · Aug 17, 2022 · 96717fd · 96717fd
1 parent 1603446
commit 96717fd
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/app/app.tsx b/src/app/app.tsx
@@ -6,17 +6,23 @@ import { Main } from './pages';
 import { ThemeType, useSettingsStore } from './storage';
 import { DarkTheme, globalStyles, LightTheme } from './themes';
 
+export const THEMES = {
+  [ThemeType.Dark]: DarkTheme,
+  [ThemeType.Light]: LightTheme,
+};
+
 function App(): JSX.Element {
-  const theme =
-    useSettingsStore((store) => store.theme) === ThemeType.Dark ? DarkTheme : LightTheme;
+  const theme = useSettingsStore((store) => store.theme);
 
   globalStyles();
 
   return (
-    <NextUIProvider theme={theme}>
-      <NotificationContainer />
-      <Main />
-    </NextUIProvider>
+    theme && (
+      <NextUIProvider theme={THEMES[theme]}>
+        <NotificationContainer />
+        <Main />
+      </NextUIProvider>
+    )
   );
 }