From b7101fb24d476869e76fa4a849ee4f812c377c4f Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 12 Jul 2020 21:57:58 -0400 Subject: [PATCH 1/2] Google Play build logic --- package.json | 1 + views/NodeInfo.tsx | 4 ++-- views/Settings/About.tsx | 6 +++--- views/Wallet/MainPane.tsx | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 5736a0bff..8d4d282dc 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "zeus", "version": "0.3.0", "private": true, + "googlePlay": false, "scripts": { "start": "react-native start", "postinstall": "rn-nodeify --install --hack; npx jetify", diff --git a/views/NodeInfo.tsx b/views/NodeInfo.tsx index a02089371..e885be783 100644 --- a/views/NodeInfo.tsx +++ b/views/NodeInfo.tsx @@ -11,7 +11,7 @@ import CollapsedQR from './../components/CollapsedQR'; import SetFeesForm from './../components/SetFeesForm'; import { inject, observer } from 'mobx-react'; import { isNil } from 'lodash'; -import { version } from './../package.json'; +import { version, googlePlay } from './../package.json'; import PrivacyUtils from './../utils/PrivacyUtils'; import NodeInfoStore from './../stores/NodeInfoStore'; @@ -279,7 +279,7 @@ export default class NodeInfo extends React.Component< - {`v${version}`} + {googlePlay ? `v${version}-play` : `v${version}`} {!!nodeInfo.synced_to_chain && ( diff --git a/views/Settings/About.tsx b/views/Settings/About.tsx index 66d24cdb0..4357e372a 100644 --- a/views/Settings/About.tsx +++ b/views/Settings/About.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { Platform, StyleSheet, Text, View, ScrollView } from 'react-native'; import { Button, Header, Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; -import { version } from './../../package.json'; +import { version, googlePlay } from './../../package.json'; import SettingsStore from './../../stores/SettingsStore'; import UrlUtils from './../../utils/UrlUtils'; @@ -53,7 +53,7 @@ export default class About extends React.Component { : styles.lightThemeTextLarge } > - Version: {version} + Version: {googlePlay ? `v${version}-play` : `v${version}`} { /> )} - {RESTUtils.supportsKeysend() && ( + {!googlePlay && RESTUtils.supportsKeysend() && (