9 files changed, 90 insertions, 77 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index de379875e..f7bacfe0f 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -6,6 +6,7 @@ import { observer } from 'mobx-react';
 
 import Tabbar from '../services/tabs/Tabbar';
 import { ctrlKey } from '../../environment';
+import { workspaceStore } from '../../features/workspaces';
 
 const messages = defineMessages({
   settings: {
@@ -88,17 +89,19 @@ export default @observer class Sidebar extends Component {
           enableToolTip={() => this.enableToolTip()}
           disableToolTip={() => this.disableToolTip()}
         />
-        <button
-          type="button"
-          onClick={() => {
-            toggleWorkspaceDrawer();
-            this.updateToolTip();
-          }}
-          className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
-          data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+Shift+D)`}
-        >
-          <i className="mdi mdi-view-grid" />
-        </button>
+        {workspaceStore.isFeatureActive ? (
+          <button
+            type="button"
+            onClick={() => {
+              toggleWorkspaceDrawer();
+              this.updateToolTip();
+            }}
+            className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
+            data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+Shift+D)`}
+          >
+            <i className="mdi mdi-view-grid" />
+          </button>
+        ) : null}
         <button
           type="button"
           onClick={() => {
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 3f570f3b6..a0eb7d796 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -4,6 +4,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import { inject, observer } from 'mobx-react';
 
 import Link from '../../ui/Link';
+import { workspaceStore } from '../../../features/workspaces';
 
 const messages = defineMessages({
   availableServices: {
@@ -68,15 +69,17 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
           {' '}
           <span className="badge">{serviceCount}</span>
         </Link>
-        <Link
-          to="/settings/workspaces"
-          className="settings-navigation__link"
-          activeClassName="is-active"
-        >
-          {intl.formatMessage(messages.yourWorkspaces)}
-          {' '}
-          <span className="badge">{workspaceCount}</span>
-        </Link>
+        {workspaceStore.isFeatureActive ? (
+          <Link
+            to="/settings/workspaces"
+            className="settings-navigation__link"
+            activeClassName="is-active"
+          >
+            {intl.formatMessage(messages.yourWorkspaces)}
+            {' '}
+            <span className="badge">{workspaceCount}</span>
+          </Link>
+        ) : null}
         <Link
           to="/settings/user"
           className="settings-navigation__link"
diff --git a/src/config.js b/src/config.js
index d619a7492..242675762 100644
--- a/src/config.js
+++ b/src/config.js
@@ -42,7 +42,7 @@ export const DEFAULT_FEATURES_CONFIG = {
   isServiceProxyEnabled: false,
   isServiceProxyPremiumFeature: true,
   isWorkspacePremiumFeature: true,
-  isWorkspaceEnabled: true,
+  isWorkspaceEnabled: false,
 };
 
 export const DEFAULT_WINDOW_OPTIONS = {
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index dbb1d7b05..86a8a2c76 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -63,6 +63,11 @@ export default class WorkspacesStore {
     debug('WorkspacesStore::stop');
     this._reactions.forEach(r => r.stop());
     this.isFeatureActive = false;
+    this.activeWorkspace = null;
+    this.nextWorkspace = null;
+    this.workspaceBeingEdited = null;
+    this.isSwitchingWorkspace = false;
+    this.isWorkspaceDrawerOpen = false;
   }
 
   filterServicesByActiveWorkspace = (services) => {
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 480f5c6cb..03e96fc40 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -708,78 +708,78 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 14
+          "line": 15
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.settings",
         "start": {
           "column": 12,
-          "line": 11
+          "line": 12
         }
       },
       {
         "defaultMessage": "!!!Add new service",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 19
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.addNewService",
         "start": {
           "column": 17,
-          "line": 15
+          "line": 16
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 8,
-          "line": 19
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 27
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 10,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 31
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 27
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 31
+          "line": 32
         }
       }
     ],
@@ -1302,91 +1302,91 @@
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 12
+          "line": 13
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.availableServices",
         "start": {
           "column": 21,
-          "line": 9
+          "line": 10
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 17
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourServices",
         "start": {
           "column": 16,
-          "line": 13
+          "line": 14
         }
       },
       {
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 21
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourWorkspaces",
         "start": {
           "column": 18,
-          "line": 17
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 25
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.account",
         "start": {
           "column": 11,
-          "line": 21
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 29
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.settings",
         "start": {
           "column": 12,
-          "line": 25
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Invite Friends",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 33
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.inviteFriends",
         "start": {
           "column": 17,
-          "line": 29
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Logout",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 37
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.logout",
         "start": {
           "column": 10,
-          "line": 33
+          "line": 34
         }
       }
     ],
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index 0254af8da..8fc508f71 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 11,
+      "line": 12,
       "column": 12
     },
     "end": {
-      "line": 14,
+      "line": 15,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Add new service",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 15,
+      "line": 16,
       "column": 17
     },
     "end": {
-      "line": 18,
+      "line": 19,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 8
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 10
     },
     "end": {
-      "line": 26,
+      "line": 27,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 27,
+      "line": 28,
       "column": 23
     },
     "end": {
-      "line": 30,
+      "line": 31,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 24
     },
     "end": {
-      "line": 34,
+      "line": 35,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
index 4d8443b02..96a42aa80 100644
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 9,
+      "line": 10,
       "column": 21
     },
     "end": {
-      "line": 12,
+      "line": 13,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 13,
+      "line": 14,
       "column": 16
     },
     "end": {
-      "line": 16,
+      "line": 17,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 17,
+      "line": 18,
       "column": 18
     },
     "end": {
-      "line": 20,
+      "line": 21,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 21,
+      "line": 22,
       "column": 11
     },
     "end": {
-      "line": 24,
+      "line": 25,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 25,
+      "line": 26,
       "column": 12
     },
     "end": {
-      "line": 28,
+      "line": 29,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Invite Friends",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 29,
+      "line": 30,
       "column": 17
     },
     "end": {
-      "line": 32,
+      "line": 33,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Logout",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 33,
+      "line": 34,
       "column": 10
     },
     "end": {
-      "line": 36,
+      "line": 37,
       "column": 3
     }
   }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 3435e04f7..3d6b6c824 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -322,6 +322,7 @@ const _templateFactory = intl => [
   {
     label: intl.formatMessage(menuItems.workspaces),
     submenu: [],
+    visible: workspaceStore.isFeatureActive,
   },
   {
     label: intl.formatMessage(menuItems.window),
@@ -563,7 +564,6 @@ export default class FranzMenu {
   _build() {
     // need to clone object so we don't modify computed (cached) object
     const serviceTpl = Object.assign([], this.serviceTpl());
-    const workspacesMenu = Object.assign([], this.workspacesMenu());
 
     if (window.franz === undefined) {
       return;
@@ -731,7 +731,9 @@ export default class FranzMenu {
       tpl[3].submenu = serviceTpl;
     }
 
-    tpl[4].submenu = workspacesMenu;
+    if (workspaceStore.isFeatureActive) {
+      tpl[4].submenu = this.workspacesMenu();
+    }
 
     this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index b7130904b..2bda82e17 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -23,7 +23,7 @@ export default class FeaturesStore extends Store {
     ]);
 
     await this.featuresRequest._promise;
-    setTimeout(this._enableFeatures.bind(this), 1);
+    setTimeout(this._setupFeatures.bind(this), 1);
 
     // single key reaction
     reaction(() => this.stores.user.data.isPremium, () => {
@@ -53,7 +53,7 @@ export default class FeaturesStore extends Store {
     }
   }
 
-  _enableFeatures() {
+  _setupFeatures() {
     delayApp(this.stores, this.actions);
     spellchecker(this.stores, this.actions);
     serviceProxy(this.stores, this.actions);