afterStoreSetup: Move log in and theme load to afterStoreSetup.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index a51f895e..3d400ffa 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -212,6 +212,16 @@ const getNodeInfo = async ({ store }) => {
 }
 
 const afterStoreSetup = async ({ store, i18n }) => {
+  if (store.state.config.customTheme) {
+    // This is a hack to deal with async loading of config.json and themes
+    // See: style_setter.js, setPreset()
+    window.themeLoaded = true
+    store.dispatch('setOption', {
+      name: 'customTheme',
+      value: store.state.config.customTheme
+    })
+  }
+
   const apiConfig = await getStatusnetConfig({ store })
   const staticConfig = await getStaticConfig()
   await setSettings({ store, apiConfig, staticConfig })