Removed Franz paid plans features:

- serviceLimit
- planSelection
- trialStatusBar

and other Franz features that were for different tiers of subscription.

2 files changed, 11 insertions, 17 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index c60536f0c..756b256fb 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -831,8 +831,8 @@ export default class FranzMenu {
     // need to clone object so we don't modify computed (cached) object
     const serviceTpl = Object.assign([], this.serviceTpl());
 
-    // Don't initialize when window.franz is undefined or when we are on a payment window route
-    if (window.ferdi === undefined || this.stores.router.location.pathname.startsWith('/payment/')) {
+    // Don't initialize when window.ferdi is undefined
+    if (window.ferdi === undefined) {
       console.log('skipping menu init');
       return;
     }
@@ -1219,17 +1219,15 @@ export default class FranzMenu {
     });
 
     // Workspace items
-    if (this.stores.user.isPremium) {
-      workspaces.forEach((workspace, i) => menu.push({
-        label: workspace.name,
-        accelerator: i < 9 ? `${cmdKey}+Alt+${i + 1}` : null,
-        type: 'radio',
-        checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
-        click: () => {
-          workspaceActions.activate({ workspace });
-        },
-      }));
-    }
+    workspaces.forEach((workspace, i) => menu.push({
+      label: workspace.name,
+      accelerator: i < 9 ? `${cmdKey}+Alt+${i + 1}` : null,
+      type: 'radio',
+      checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
+      click: () => {
+        workspaceActions.activate({ workspace });
+      },
+    }));
 
     return menu;
   }
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js
index 781cd0895..3397afdb2 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.js
@@ -23,10 +23,6 @@ export default class FranzTouchBar {
   _build() {
     const currentWindow = getCurrentWindow();
 
-    if (this.stores.router.location.pathname.startsWith('/payment/')) {
-      return;
-    }
-
     if (this.stores.user.isLoggedIn) {
       const { TouchBarButton, TouchBarSpacer } = TouchBar;