change where version comes from

StoDevX · Aug 4, 2017 · 45c865b · 45c865b
1 parent b24ba78
commit 45c865b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/source/views/settings/sections/odds-and-ends.js b/source/views/settings/sections/odds-and-ends.js
@@ -1,9 +1,8 @@
 // @flow
 import React from 'react'
 import {View} from 'react-native'
-import {getVersion} from 'react-native-device-info'
 import {Cell, Section} from 'react-native-tableview-simple'
-import {allaboutolaf} from '../../../../package.json'
+import {version, allaboutolaf} from '../../../../package.json'
 import type {TopLevelViewPropsType} from '../../types'
 import {setFeedbackStatus} from '../../../flux/parts/settings'
 import {connect} from 'react-redux'
@@ -41,8 +40,6 @@ class OddsAndEndsSection extends React.Component {
       ? '[dev] '
       : allaboutolaf.source ? `[${allaboutolaf.source}] ` : ''
 
-    const versionString = getVersion()
-
     return (
       <View>
         <Section header="MISCELLANY">
@@ -59,7 +56,7 @@ class OddsAndEndsSection extends React.Component {
           <Cell
             cellStyle="RightDetail"
             title="Version"
-            detail={`${versionMoniker}${versionString}`}
+            detail={`${versionMoniker}${version}`}
           />
 
           <CellToggle

diff --git a/source/views/settings/sections/support.js b/source/views/settings/sections/support.js
@@ -5,6 +5,7 @@ import {Section} from 'react-native-tableview-simple'
 import type {TopLevelViewPropsType} from '../../types'
 import Communications from 'react-native-communications'
 import DeviceInfo from 'react-native-device-info'
+import {version} from '../../../../package.json'
 import {PushButtonCell} from '../components/push-button'
 import {refreshApp} from '../../../lib/refresh'
 
@@ -24,7 +25,7 @@ export default class SupportSection extends React.Component {
       ----- Please do not edit below here -----
       ${DeviceInfo.getBrand()} ${DeviceInfo.getModel()}
       ${DeviceInfo.getDeviceId()}
-      ${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}
+      ${DeviceInfo.getSystemName()} ${version}
       ${DeviceInfo.getReadableVersion()}
     `