Revert "refactor: reuse method from the core electron framework for the 'About' dialog."

This reverts commit af56a07359400e53cb3096e321bf6ee1bae12068.
Fixes #1928 and #1929

3 files changed, 26 insertions, 19 deletions

diff --git a/src/environment.js b/src/environment.js
index 9d7ffaf78..b30e3778d 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -5,6 +5,7 @@ import { is, api as electronApi } from 'electron-util';
 
 import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
 
+import osName from 'os-name';
 import {
   LIVE_FERDI_API,
   DEV_FRANZ_API,
@@ -23,6 +24,7 @@ import {
 } from './config';
 
 import { asarPath } from './helpers/asar-helpers';
+import * as buildInfo from './buildInfo.json'; // eslint-disable-line import/no-unresolved
 
 export const { app } = electronApi;
 export const ferdiVersion = app.getVersion();
@@ -171,3 +173,17 @@ export const DEFAULT_APP_SETTINGS = {
   alwaysShowWorkspaces: false,
   liftSingleInstanceLock: false,
 };
+
+export function aboutAppDetails() {
+  return [
+    `Version: ${ferdiVersion}`,
+    `Electron: ${electronVersion}`,
+    `Chrome: ${chromeVersion}`,
+    `Node.js: ${nodeVersion}`,
+    `Platform: ${osName()}`,
+    `Arch: ${process.arch}`,
+    `Build date: ${new Date(Number(buildInfo.timestamp))}`,
+    `Git SHA: ${buildInfo.gitHashShort}`,
+    `Git branch: ${buildInfo.gitBranch}`,
+  ].join('\n');
+}
diff --git a/src/index.js b/src/index.js
index 1f3510361..7f1f77b4e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,7 +10,6 @@ import ms from 'ms';
 
 require('@electron/remote/main').initialize();
 
-import osName from 'os-name';
 import { DEFAULT_WINDOW_OPTIONS } from './config';
 
 import {
@@ -19,12 +18,9 @@ import {
   isMac,
   isWindows,
   isLinux,
+  aboutAppDetails,
   userDataRecipesPath,
   userDataPath,
-  ferdiVersion,
-  electronVersion,
-  chromeVersion,
-  nodeVersion,
 } from './environment';
 import { ifUndefinedBoolean } from './jsUtils';
 
@@ -41,7 +37,6 @@ import './electron/exception';
 import { asarPath } from './helpers/asar-helpers';
 import { openExternalUrl } from './helpers/url-helpers';
 import userAgent from './helpers/userAgent-helpers';
-import * as buildInfo from './buildInfo.json'; // eslint-disable-line import/no-unresolved
 
 const debug = require('debug')('Ferdi:App');
 
@@ -160,17 +155,7 @@ if (!retrieveSettingValue('enableGPUAcceleration', false)) {
 }
 
 app.setAboutPanelOptions({
-  applicationVersion: [
-    `Version: ${ferdiVersion}`,
-    `Electron: ${electronVersion}`,
-    `Chrome: ${chromeVersion}`,
-    `Node.js: ${nodeVersion}`,
-    `Platform: ${osName()}`,
-    `Arch: ${process.arch}`,
-    `Build date: ${new Date(Number(buildInfo.timestamp))}`,
-    `Git SHA: ${buildInfo.gitHashShort}`,
-    `Git branch: ${buildInfo.gitBranch}`,
-  ].join('\n'),
+  applicationVersion: aboutAppDetails(),
   version: '',
 });
 
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index d7f3dbecf..623638d33 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,5 +1,5 @@
 import { clipboard } from 'electron';
-import { app, Menu, systemPreferences } from '@electron/remote';
+import { app, Menu, dialog, systemPreferences } from '@electron/remote';
 import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
 import {
@@ -14,6 +14,7 @@ import {
   settingsShortcutKey,
   isLinux,
   isMac,
+  aboutAppDetails,
   lockFerdiShortcutKey,
   todosToggleShortcutKey,
   workspaceToggleShortcutKey,
@@ -804,7 +805,12 @@ class FranzMenu {
     const about = {
       label: intl.formatMessage(menuItems.about),
       click: () => {
-        app.showAboutPanel();
+        dialog.showMessageBox({
+          type: 'info',
+          title: 'Franz Ferdinand',
+          message: 'Ferdi',
+          detail: aboutAppDetails(),
+        });
       },
     };