Skip to content

Commit

Permalink
Merge pull request #309 from ZeusLN/master
Browse files Browse the repository at this point in the history
Google Play Release Branch
  • Loading branch information
ZeusLN authored Jul 14, 2020
2 parents 0967324 + e2b3df0 commit bb11c31
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Zeus is built on TypeScript and React-Native. It runs on both iOS and Android.
*Disclaimer*: Zeus and Lightning in general are software projects in their early development stages. Please be wary when using Lightning and do not fund your node with more money than you are willing to lose.

### App Store links
* [Google Play](https://play.google.com/store/apps/details?id=app.zeusln.zeus)
* [Google Play](https://play.google.com/store/apps/details?id=com.zeusln.zeus)
* [Apple TestFlight](https://testflight.apple.com/join/gpVFzEHN)
* [F-Droid](https://f-droid.org/packages/app.zeusln.zeus/)
* [F-Droid](https://f-droid.org/packages/com.zeusln.zeus/)

### Get in touch with us
* Come chat with us on
Expand Down
8 changes: 4 additions & 4 deletions ios/zeus.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1333,10 +1333,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 7222UU8F2H;
DEVELOPMENT_TEAM = "";
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-permissions/ios/**",
Expand All @@ -1354,7 +1354,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.zeusln.zeus;
PRODUCT_NAME = zeus;
PROVISIONING_PROFILE_SPECIFIER = "Zeus Distribution";
PROVISIONING_PROFILE_SPECIFIER = "";
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions views/NodeInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 && (
Expand Down
6 changes: 3 additions & 3 deletions views/Settings/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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={
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions views/Wallet/MainPane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -392,7 +392,7 @@ export default class MainPane extends React.Component<
marginBottom: -40
}}
>
{`v${version}`}
{playStore ? `v${version}-play` : `v${version}`}
</Text>
</View>
);
Expand Down

0 comments on commit bb11c31

Please sign in to comment.