Reduce AppLayout flashing

3 files changed, 8 insertions, 9 deletions

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index c70144c8e..4bcd17409 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -22,7 +22,6 @@ import AppLoader from '../../components/ui/AppLoader';
 import { workspaceActions } from '../../features/workspaces/actions';
 import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer';
 import { workspaceStore } from '../../features/workspaces';
-import WorkspacesStore from '../../features/workspaces/store';
 
 class AppLayoutContainer extends Component {
   static defaultProps = {
@@ -39,7 +38,6 @@ class AppLayoutContainer extends Component {
       globalError,
       requests,
       user,
-      workspaces,
       router
     } = this.props.stores;
 
@@ -85,10 +83,12 @@ class AppLayoutContainer extends Component {
       services.allServicesRequest.isExecuting &&
       services.allServicesRequest.isExecutingFirstTime;
 
+    const isLoadingSettings = !settings.loaded;
+
     if (
+      isLoadingSettings ||
       isLoadingFeatures ||
-      isLoadingServices ||
-      workspaces.isLoadingWorkspaces
+      isLoadingServices
     ) {
       return (
         <ThemeProvider theme={ui.theme}>
@@ -191,7 +191,6 @@ AppLayoutContainer.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
     requests: PropTypes.instanceOf(RequestStore).isRequired,
     globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired,
-    workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
     service: PropTypes.instanceOf(ServicesStore).isRequired,
diff --git a/src/stores.types.ts b/src/stores.types.ts
index 34922c199..92531eb4a 100644
--- a/src/stores.types.ts
+++ b/src/stores.types.ts
@@ -212,7 +212,7 @@ interface SettingsStore {
   actions: Actions;
   api: Api;
   fileSystemSettingsTypes: any[];
-  startup: boolean;
+  loaded: boolean;
   stores: Stores;
   updateAppSettingsRequest: () => void;
   _fileSystemSettingsCache: () => void;
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index ac9356404..e638d84b8 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -19,7 +19,7 @@ export default class SettingsStore extends Store {
     'updateAppSettings',
   );
 
-  startup = true;
+  loaded = false;
 
   fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
 
@@ -84,11 +84,10 @@ export default class SettingsStore extends Store {
     ipcRenderer.on('appSettings', (event, resp) => {
       // Lock on startup if enabled in settings
       if (
-        this.startup &&
+        !this.loaded &&
         resp.type === 'app' &&
         resp.data.lockingFeatureEnabled
       ) {
-        this.startup = false;
         process.nextTick(() => {
           if (!this.all.app.locked) {
             this.all.app.locked = true;
@@ -97,6 +96,7 @@ export default class SettingsStore extends Store {
       }
       debug('Get appSettings resolves', resp.type, resp.data);
       Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
+      this.loaded = true;
       ipcRenderer.send('initialAppSettings', resp);
     });