From 91c69428ed0dc2dd26b00c6dd5a6684f25515a34 Mon Sep 17 00:00:00 2001
From: Abin Mn <abinmn619@gmail.com>
Date: Tue, 26 Oct 2021 21:18:20 +0530
Subject: Cleanup/remove feature toggle for todo, workspace, service proxy
 (#2134)

* Remove DEFAULT_FEATURES_CONFIG from config
* Remove static controller

Co-authored-by: Madhuri B <MadhuriBandanadam@users.noreply.github.com>
---
 src/lib/Menu.js | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 1495fc80e..7d4c228f5 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -21,7 +21,6 @@ import {
   muteFerdiShortcutKey,
 } from '../environment';
 import { aboutAppDetails, ferdiVersion } from '../environment-remote';
-import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { workspaceActions } from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
@@ -479,12 +478,12 @@ const _titleBarTemplateFactory = (intl, locked) => [
     label: intl.formatMessage(menuItems.workspaces),
     accelerator: `${altKey()}+W`,
     submenu: [],
-    visible: !locked && workspaceStore.isFeatureEnabled,
+    visible: !locked,
   },
   {
     label: intl.formatMessage(menuItems.todos),
     submenu: [],
-    visible: !locked && todosStore.isFeatureEnabled,
+    visible: !locked,
   },
   {
     label: intl.formatMessage(menuItems.window),
@@ -698,13 +697,9 @@ class FranzMenu {
         tpl[2].submenu = serviceTpl;
       }
 
-      if (workspaceStore.isFeatureEnabled) {
-        tpl[3].submenu = this.workspacesMenu();
-      }
+      tpl[3].submenu = this.workspacesMenu();
 
-      if (todosStore.isFeatureEnabled) {
-        tpl[4].submenu = this.todosMenu();
-      }
+      tpl[4].submenu = this.todosMenu();
     } else {
       const touchIdEnabled = isMac
         ? this.stores.settings.app.useTouchIdToUnlock &&
@@ -872,13 +867,9 @@ class FranzMenu {
         tpl[3].submenu = serviceTpl;
       }
 
-      if (workspaceStore.isFeatureEnabled) {
-        tpl[4].submenu = this.workspacesMenu();
-      }
+      tpl[4].submenu = this.workspacesMenu();
 
-      if (todosStore.isFeatureEnabled) {
-        tpl[5].submenu = this.todosMenu();
-      }
+      tpl[5].submenu = this.todosMenu();
 
       tpl[tpl.length - 1].submenu.push(
         {
-- 
cgit v1.2.3-70-g09d2