fix bug in workspace feature initialization

2 files changed, 9 insertions, 12 deletions

diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index 524a83e3c..fb5135743 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -10,15 +10,11 @@ export const workspaceStore = new WorkspacesStore();
 
 export default function initWorkspaces(stores, actions) {
   stores.workspaces = workspaceStore;
-  const { features, user } = stores;
+  const { features } = stores;
 
   // Toggle workspace feature
   reaction(
-    () => (
-      features.features.isWorkspaceEnabled && (
-        !features.features.isWorkspacePremiumFeature || user.data.isPremium
-      )
-    ),
+    () => features.features.isWorkspaceEnabled,
     (isEnabled) => {
       if (isEnabled && !workspaceStore.isFeatureActive) {
         debug('Initializing `workspaces` feature');
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 4d65712a7..7bd969be0 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -19,9 +19,11 @@ const debug = require('debug')('Franz:feature:workspaces:store');
 export default class WorkspacesStore extends FeatureStore {
   @observable isFeatureEnabled = false;
 
+  @observable isFeatureActive = false;
+
   @observable isPremiumFeature = true;
 
-  @observable isFeatureActive = false;
+  @observable isPremiumUpgradeRequired = true;
 
   @observable activeWorkspace = null;
 
@@ -46,10 +48,6 @@ export default class WorkspacesStore extends FeatureStore {
     return getUserWorkspacesRequest.wasExecuted && this.workspaces.length > 0;
   }
 
-  @computed get isPremiumUpgradeRequired() {
-    return this.isFeatureEnabled && !this.isFeatureActive;
-  }
-
   start(stores, actions) {
     debug('WorkspacesStore::start');
     this.stores = stores;
@@ -194,8 +192,11 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   _setIsPremiumFeatureReaction = () => {
-    const { isWorkspacePremiumFeature } = this.stores.features.features;
+    const { features, user } = this.stores;
+    const { isPremium } = user.data;
+    const { isWorkspacePremiumFeature } = features.features;
     this.isPremiumFeature = isWorkspacePremiumFeature;
+    this.isPremiumUpgradeRequired = isWorkspacePremiumFeature && !isPremium;
   };
 
   _setWorkspaceBeingEditedReaction = () => {