From 80d7ef19dbb4271416bd8b5bbf938e180c57e5f3 Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Wed, 12 May 2021 01:26:51 +0530 Subject: Method reuse (#1379) * Used already exported common functions to avoid the same logic being repeated. * Use a different package to retrieve the os-name for the 'About Dialog'. --- src/lib/Menu.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/Menu.js') diff --git a/src/lib/Menu.js b/src/lib/Menu.js index d85f5706c..7bd273f6f 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -10,6 +10,9 @@ import { CUSTOM_WEBSITE_ID } from '../features/webControls/constants'; import { workspaceActions } from '../features/workspaces/actions'; import { workspaceStore } from '../features/workspaces/index'; import * as buildInfo from '../buildInfo.json'; // eslint-disable-line import/no-unresolved +import { ferdiVersion } from '../helpers/userAgent-helpers'; + +const osName = require('os-name'); const { app, Menu, dialog, systemPreferences, @@ -1025,7 +1028,7 @@ export default class FranzMenu { type: 'info', title: 'Franz Ferdinand', message: 'Ferdi', - detail: `Version: ${remote.app.getVersion()}\nElectron: ${process.versions.electron}\nNode.js: ${process.version}\nPlatform: ${process.platform}\nArch: ${process.arch}\nBuild date: ${new Date(Number(buildInfo.timestamp))}\nGit SHA: ${buildInfo.gitHashShort}\nGit branch: ${buildInfo.gitBranch}`, + detail: `Version: ${ferdiVersion}\nElectron: ${process.versions.electron}\nNode.js: ${process.version}\nPlatform: ${osName()}\nArch: ${process.arch}\nBuild date: ${new Date(Number(buildInfo.timestamp))}\nGit SHA: ${buildInfo.gitHashShort}\nGit branch: ${buildInfo.gitBranch}`, }); }, }; -- cgit v1.2.3-54-g00ecf