1 files changed, 10 insertions, 14 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 81efaf18f..13b31bcad 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -3,9 +3,8 @@ import { observable, autorun } from 'mobx';
 import { defineMessages } from 'react-intl';
 
 import { isMac, ctrlKey, cmdKey } from '../environment';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index';
+import { workspaceStore } from '../features/workspaces/index';
 import { workspaceActions } from '../features/workspaces/actions';
-import { gaEvent } from './analytics';
 import { announcementActions } from '../features/announcements/actions';
 import { announcementsStore } from '../features/announcements';
 import TodoStore from '../features/todos/store';
@@ -141,7 +140,7 @@ const menuItems = defineMessages({
   },
   debugInfoCopiedHeadline: {
     id: 'menu.help.debugInfoCopiedHeadline',
-    defaultMessage: '!!!Franz Debug Information',
+    defaultMessage: '!!!Ferdi Debug Information',
   },
   debugInfoCopiedBody: {
     id: 'menu.help.debugInfoCopiedBody',
@@ -262,7 +261,7 @@ const menuItems = defineMessages({
 });
 
 function getActiveWebview() {
-  return window.franz.stores.services.active.webview;
+  return window.ferdi.stores.services.active.webview;
 }
 
 const _templateFactory = intl => [
@@ -398,7 +397,7 @@ const _templateFactory = intl => [
         click: () => {
           announcementActions.show();
         },
-        visible: window.franz.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
+        visible: window.ferdi.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
       },
       {
         type: 'separator',
@@ -620,11 +619,11 @@ export default class FranzMenu {
     // need to clone object so we don't modify computed (cached) object
     const serviceTpl = Object.assign([], this.serviceTpl());
 
-    if (window.franz === undefined) {
+    if (window.ferdi === undefined) {
       return;
     }
 
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl);
 
     tpl[1].submenu.push({
@@ -821,7 +820,7 @@ export default class FranzMenu {
   }
 
   serviceTpl() {
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const { user, services, settings } = this.stores;
     if (!user.isLoggedIn) return [];
     const menu = [];
@@ -867,7 +866,7 @@ export default class FranzMenu {
 
   workspacesMenu() {
     const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } = workspaceStore;
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const menu = [];
 
     // Add new workspace item:
@@ -889,7 +888,6 @@ export default class FranzMenu {
       accelerator: `${cmdKey}+D`,
       click: () => {
         workspaceActions.toggleWorkspaceDrawer();
-        gaEvent(GA_CATEGORY_WORKSPACES, 'toggleDrawer', 'menu');
       },
       enabled: this.stores.user.isLoggedIn,
     }, {
@@ -904,7 +902,6 @@ export default class FranzMenu {
       checked: !activeWorkspace,
       click: () => {
         workspaceActions.deactivate();
-        gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
       },
     });
 
@@ -917,7 +914,6 @@ export default class FranzMenu {
         checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
         click: () => {
           workspaceActions.activate({ workspace });
-          gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
         },
       }));
     }
@@ -951,7 +947,7 @@ export default class FranzMenu {
 
 
   debugMenu() {
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
 
     return {
       label: intl.formatMessage(menuItems.debugInfo),
@@ -977,7 +973,7 @@ export default class FranzMenu {
       return service.name;
     }
 
-    let name = service.recipe.name;
+    let { name } = service.recipe;
 
     if (service.team) {
       name = `${name} (${service.team})`;