diff options
author | 2019-06-28 14:52:24 +0200 | |
---|---|---|
committer | 2019-06-28 14:52:24 +0200 | |
commit | f2fd1b3068a43c057243159f9228c8ef3aaa4428 (patch) | |
tree | e16b3daf3cde58d4e71d40f1c157af93b76051f7 /src/containers/auth | |
parent | Revert: fix spellchecker (diff) | |
download | ferdium-app-f2fd1b3068a43c057243159f9228c8ef3aaa4428.tar.gz ferdium-app-f2fd1b3068a43c057243159f9228c8ef3aaa4428.tar.zst ferdium-app-f2fd1b3068a43c057243159f9228c8ef3aaa4428.zip |
Fix settings window dependence
Diffstat (limited to 'src/containers/auth')
-rw-r--r-- | src/containers/auth/AuthLayoutContainer.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index 1f9c1ea61..20b88c500 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js | |||
@@ -24,24 +24,22 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer | |||
24 | stores, actions, children, location, | 24 | stores, actions, children, location, |
25 | } = this.props; | 25 | } = this.props; |
26 | const { | 26 | const { |
27 | app, features, globalError, settings, | 27 | app, features, globalError, |
28 | } = stores; | 28 | } = stores; |
29 | 29 | ||
30 | const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting | 30 | const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting |
31 | && !features.defaultFeaturesRequest.wasExecuted; | 31 | && !features.defaultFeaturesRequest.wasExecuted; |
32 | 32 | ||
33 | const themeType = theme(settings.app.darkMode ? 'dark' : 'default'); | ||
34 | |||
35 | if (isLoadingBaseFeatures) { | 33 | if (isLoadingBaseFeatures) { |
36 | return ( | 34 | return ( |
37 | <ThemeProvider theme={theme(themeType)}> | 35 | <ThemeProvider theme={stores.ui.theme}> |
38 | <AppLoader /> | 36 | <AppLoader /> |
39 | </ThemeProvider> | 37 | </ThemeProvider> |
40 | ); | 38 | ); |
41 | } | 39 | } |
42 | 40 | ||
43 | return ( | 41 | return ( |
44 | <ThemeProvider theme={theme(themeType)}> | 42 | <ThemeProvider theme={stores.ui.theme}> |
45 | <AuthLayout | 43 | <AuthLayout |
46 | error={globalError.response} | 44 | error={globalError.response} |
47 | pathname={location.pathname} | 45 | pathname={location.pathname} |