Migrate to app.getVersion()

4 files changed, 18 insertions, 12 deletions

diff --git a/app/containers/SettingsPage.js b/app/containers/SettingsPage.js
index 2bcef79730..2c68fea676 100644
--- a/app/containers/SettingsPage.js
+++ b/app/containers/SettingsPage.js
@@ -3,10 +3,9 @@
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { push } from 'react-router-redux';
-import { version } from '../../package.json';
 import Settings from '../components/Settings';
 import { links } from '../config';
-import { openLink, exit } from '../lib/platform';
+import { getAppVersion, openLink, exit } from '../lib/platform';
 
 import type { ReduxState, ReduxDispatch } from '../redux/store';
 import type { SharedRouteProps } from '../routes';
@@ -14,7 +13,7 @@ import type { SharedRouteProps } from '../routes';
 const mapStateToProps = (state: ReduxState) => ({
   account: state.account,
   settings: state.settings,
-  version: version,
+  version: getAppVersion(),
 });
 const mapDispatchToProps = (dispatch: ReduxDispatch, _props: SharedRouteProps) => {
   const { push: pushHistory } = bindActionCreators({ push }, dispatch);
diff --git a/app/lib/platform.android.js b/app/lib/platform.android.js
index fe7fd533f2..1dc450b359 100644
--- a/app/lib/platform.android.js
+++ b/app/lib/platform.android.js
@@ -1,9 +1,14 @@
 // @flow
 import { BackHandler, Linking } from 'react-native';
 import { MobileAppBridge } from 'NativeModules';
+import { version } from '../../package.json';
 
 const log = console.log;
 
+const getAppVersion = () => {
+  return version;
+};
+
 const exit = () => {
   BackHandler.exitApp();
 };
@@ -16,4 +21,4 @@ const openItem = (path: string) => {
   MobileAppBridge.openItem(path);
 };
 
-export { log, exit, openLink, openItem };
+export { log, exit, openLink, openItem, getAppVersion };
diff --git a/app/lib/platform.js b/app/lib/platform.js
index 2b078b8bb6..ecbd32a27a 100644
--- a/app/lib/platform.js
+++ b/app/lib/platform.js
@@ -4,6 +4,10 @@ import electronLog from 'electron-log';
 
 const log = electronLog;
 
+const getAppVersion = () => {
+  return remote.app.getVersion();
+};
+
 const exit = () => {
   remote.app.quit();
 };
@@ -16,4 +20,4 @@ const openItem = (path: string) => {
   shell.openItem(path);
 };
 
-export { log, exit, openLink, openItem };
+export { log, exit, openLink, openItem, getAppVersion };
diff --git a/app/main.js b/app/main.js
index 1cbf72a1b9..6199b0517c 100644
--- a/app/main.js
+++ b/app/main.js
@@ -1,17 +1,15 @@
 // @flow
 import path from 'path';
+import { execFile } from 'child_process';
 import mkdirp from 'mkdirp';
-import { log } from './lib/platform';
+import uuid from 'uuid';
 import { app, BrowserWindow, ipcMain, Tray, Menu, nativeImage } from 'electron';
 import TrayIconController from './tray-icon-controller';
 import WindowController from './window-controller';
-import { version } from '../package.json';
-import { resolveBin } from './lib/proc';
 import { RpcAddressFile } from './lib/rpc-address-file';
-import { execFile } from 'child_process';
-import uuid from 'uuid';
-
 import { ShutdownCoordinator } from './shutdown-handler';
+import { log } from './lib/platform';
+import { resolveBin } from './lib/proc';
 import type { TrayIconType } from './tray-icon-controller';
 
 const ApplicationMain = {
@@ -28,7 +26,7 @@ const ApplicationMain = {
 
     this._initLogging();
 
-    log.info('Running version', version);
+    log.info(`Running version ${app.getVersion()}`);
 
     app.on('ready', () => this._onReady());
     app.on('window-all-closed', () => app.quit());