Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-master

1 files changed, 19 insertions, 8 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index e36b03977..7af1b36cb 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -7,7 +7,6 @@ import { workspaceStore } from '../features/workspaces/index';
 import { workspaceActions } from '../features/workspaces/actions';
 import { announcementActions } from '../features/announcements/actions';
 import { announcementsStore } from '../features/announcements';
-import TodoStore from '../features/todos/store';
 import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 
@@ -258,6 +257,10 @@ const menuItems = defineMessages({
     id: 'menu.Todoss.closeTodosDrawer',
     defaultMessage: '!!!Close Todos drawer',
   },
+  enableTodos: {
+    id: 'menu.todos.enableTodos',
+    defaultMessage: '!!!Enable Todos',
+  },
 });
 
 function getActiveWebview() {
@@ -922,25 +925,33 @@ export default class FranzMenu {
   }
 
   todosMenu() {
-    const { isTodosPanelVisible } = TodoStore;
-    const { intl } = window.ferdi;
+    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`,
       click: () => {
         todoActions.toggleTodosPanel();
       },
-      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;
   }