Fix(Todos): Fix Todos Menu

1 files changed, 18 insertions, 6 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 81efaf18f..6ffa007f2 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -259,6 +259,10 @@ const menuItems = defineMessages({
     id: 'menu.Todoss.closeTodosDrawer',
     defaultMessage: '!!!Close Todos drawer',
   },
+  enableTodos: {
+    id: 'menu.todos.enableTodos',
+    defaultMessage: '!!!Enable Todos',
+  },
 });
 
 function getActiveWebview() {
@@ -926,14 +930,12 @@ export default class FranzMenu {
   }
 
   todosMenu() {
-    const { isTodosPanelVisible } = TodoStore;
+    const { isTodosPanelVisible, isFeatureEnabledByUser } = this.stores.todos;
     const { intl } = window.franz;
     const menu = [];
 
-    // Open todos drawer:
-    const drawerLabel = (
-      isTodosPanelVisible ? menuItems.closeTodosDrawer : menuItems.openTodosDrawer
-    );
+    const drawerLabel = isTodosPanelVisible ? menuItems.closeTodosDrawer : menuItems.openTodosDrawer;
+
     menu.push({
       label: intl.formatMessage(drawerLabel),
       accelerator: `${cmdKey}+T`,
@@ -941,11 +943,21 @@ export default class FranzMenu {
         todoActions.toggleTodosPanel();
         gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu');
       },
-      enabled: this.stores.user.isLoggedIn,
+      enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser,
     }, {
       type: 'separator',
     });
 
+    if (!isFeatureEnabledByUser) {
+      menu.push({
+        label: intl.formatMessage(menuItems.enableTodos),
+        click: () => {
+          todoActions.toggleTodosFeatureVisibility();
+          gaEvent(GA_CATEGORY_TODOS, 'enable', 'menu');
+        },
+      });
+    }
+
     return menu;
   }