Merge pull request #308 from kaloudis/google-play-feature-removal

Google Play build logic
ZeusLN · Jul 14, 2020 · e2b3df0 · e2b3df0
2 parents c74d39c + 257f32f
commit e2b3df0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "zeus",
   "version": "0.3.0",
   "private": true,
+  "playStore": true,
   "scripts": {
     "start": "react-native start",
     "postinstall": "rn-nodeify --install --hack; npx jetify",

diff --git 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, playStore } from './../package.json';
 import PrivacyUtils from './../utils/PrivacyUtils';
 
 import NodeInfoStore from './../stores/NodeInfoStore';
@@ -279,7 +279,7 @@ export default class NodeInfo extends React.Component<
                 <Text
                     style={theme === 'dark' ? styles.valueDark : styles.value}
                 >
-                    {`v${version}`}
+                    {playStore ? `v${version}-play` : `v${version}`}
                 </Text>
 
                 {!!nodeInfo.synced_to_chain && (

diff --git 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, playStore } from './../../package.json';
 
 import SettingsStore from './../../stores/SettingsStore';
 import UrlUtils from './../../utils/UrlUtils';
@@ -53,7 +53,7 @@ export default class About extends React.Component<AboutProps, {}> {
                             : styles.lightThemeTextLarge
                     }
                 >
-                    Version: {version}
+                    Version: {playStore ? `v${version}-play` : `v${version}`}
                 </Text>
                 <Text
                     style={
@@ -134,7 +134,7 @@ export default class About extends React.Component<AboutProps, {}> {
                         />
                     </View>
                 )}
-                {RESTUtils.supportsKeysend() && (
+                {!playStore && RESTUtils.supportsKeysend() && (
                     <View style={styles.button}>
                         <Button
                             title="Send keysend donation"

diff --git a/views/Wallet/MainPane.tsx b/views/Wallet/MainPane.tsx
@@ -12,7 +12,7 @@ import SettingsStore from './../../stores/SettingsStore';
 
 const TorIcon = require('./../../images/tor.png');
 
-import { version } from './../../package.json';
+import { version, playStore } from './../../package.json';
 
 interface MainPaneProps {
     navigation: any;
@@ -392,7 +392,7 @@ export default class MainPane extends React.Component<
                             marginBottom: -40
                         }}
                     >
-                        {`v${version}`}
+                        {playStore ? `v${version}-play` : `v${version}`}
                     </Text>
                 </View>
             );