2 files changed, 14 insertions, 48 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 2c24b696b..5dae56544 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,5 +1,5 @@
 import { clipboard } from 'electron';
-import { app, Menu, dialog, systemPreferences } from '@electron/remote';
+import { app, Menu, systemPreferences } from '@electron/remote';
 import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
 import {
@@ -14,7 +14,6 @@ import {
   settingsShortcutKey,
   isLinux,
   isMac,
-  aboutAppDetails,
   lockFerdiShortcutKey,
   todosToggleShortcutKey,
   workspaceToggleShortcutKey,
@@ -592,23 +591,6 @@ export default class FranzMenu {
     const tpl = _titleBarTemplateFactory(intl, this.stores.settings.app.locked);
     const { actions } = this;
 
-    // TODO: Extract this into a reusable component and remove the duplications
-    const quitApp = () => {
-      const yesButtonIndex = 0;
-      let selection = yesButtonIndex;
-      if (window.ferdi.stores.settings.app.confirmOnQuit) {
-        selection = dialog.showMessageBoxSync(app.mainWindow, {
-          type: 'question',
-          message: intl.formatMessage(globalMessages.quit),
-          detail: intl.formatMessage(globalMessages.quitConfirmation),
-          buttons: [intl.formatMessage(globalMessages.yes), intl.formatMessage(globalMessages.no)],
-        });
-      }
-      if (selection === yesButtonIndex) {
-        app.quit();
-      }
-    };
-
     if (!isMac) {
       tpl[1].submenu.push({
         label: intl.formatMessage(menuItems.autohideMenuBar),
@@ -813,7 +795,9 @@ export default class FranzMenu {
         {
           label: intl.formatMessage(globalMessages.quit),
           accelerator: `${cmdOrCtrlShortcutKey()}+Q`,
-          click: quitApp,
+          click() {
+            app.quit();
+          },
         },
       ],
     });
@@ -821,12 +805,7 @@ export default class FranzMenu {
     const about = {
       label: intl.formatMessage(menuItems.about),
       click: () => {
-        dialog.showMessageBox({
-          type: 'info',
-          title: 'Franz Ferdinand',
-          message: 'Ferdi',
-          detail: aboutAppDetails(),
-        });
+        app.showAboutPanel();
       },
     };
 
@@ -857,7 +836,7 @@ export default class FranzMenu {
     } else {
       tpl[0].submenu = [
         {
-          label: intl.formatMessage(menuItems.settings),
+          label: intl.formatMessage(globalMessages.settings),
           accelerator: `${settingsShortcutKey()}`,
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
@@ -871,7 +850,9 @@ export default class FranzMenu {
         {
           label: intl.formatMessage(globalMessages.quit),
           accelerator: `${cmdOrCtrlShortcutKey()}+Q`,
-          click: quitApp,
+          click() {
+            app.quit();
+          },
         },
       ];
 
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index c897d597a..7360611cd 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,5 +1,5 @@
 import {
-  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain, dialog,
+  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain,
 } from 'electron';
 import { join } from 'path';
 import macosVersion from 'macos-version';
@@ -10,6 +10,7 @@ const INDICATOR_TRAY_PLAIN = 'tray';
 const INDICATOR_TRAY_UNREAD = 'tray-unread';
 const INDICATOR_TRAY_INDIRECT = 'tray-indirect';
 
+// TODO: Need to support i18n for a lot of the hard-coded strings in this file
 export default class TrayIcon {
   trayIcon = null;
 
@@ -43,7 +44,9 @@ export default class TrayIcon {
     },
     {
       label: 'Quit Ferdi',
-      click: this.quitApp,
+      click() {
+        app.quit();
+      },
     },
   ];
 
@@ -176,22 +179,4 @@ export default class TrayIcon {
       __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
     ));
   }
-
-  // TODO: Extract this into a reusable component and remove the duplications
-  quitApp = () => {
-    const yesButtonIndex = 0;
-    let selection = yesButtonIndex;
-    if (window.ferdi.stores.settings.app.confirmOnQuit) {
-      selection = dialog.showMessageBoxSync(app.mainWindow, {
-        // TODO: Externalize strings
-        type: 'question',
-        message: 'Quit',
-        detail: 'Do you really want to quit Ferdi?',
-        buttons: ['Yes', 'No'],
-      });
-    }
-    if (selection === yesButtonIndex) {
-      app.quit();
-    }
-  };
 }