diff --git a/app/src/component/button/view.js b/app/src/component/button/view.js
index 04f4b9d2..e0ccafdc 100644
--- a/app/src/component/button/view.js
+++ b/app/src/component/button/view.js
@@ -14,10 +14,12 @@ export default class Button extends React.PureComponent {
} = this.props;
let styles = [buttonStyle.button, buttonStyle.row];
- if (style.length) {
- styles = styles.concat(style);
- } else {
- styles.push(style);
+ if (style) {
+ if (style.length) {
+ styles = styles.concat(style);
+ } else {
+ styles.push(style);
+ }
}
if (disabled) {
diff --git a/app/src/constants.js b/app/src/constants.js
new file mode 100644
index 00000000..a0c3d277
--- /dev/null
+++ b/app/src/constants.js
@@ -0,0 +1,5 @@
+const Constants = {
+ SETTING_ALPHA_UNDERSTANDS_RISKS: "ALPHA_UNDERSTANDS_RISKS"
+};
+
+export default Constants;
diff --git a/app/src/page/wallet/index.js b/app/src/page/wallet/index.js
index c77d7e2b..10a79bed 100644
--- a/app/src/page/wallet/index.js
+++ b/app/src/page/wallet/index.js
@@ -1,4 +1,15 @@
import { connect } from 'react-redux';
+import { doSetClientSetting } from '../../redux/actions/settings';
+import { makeSelectClientSetting } from '../../redux/selectors/settings';
+import Constants from '../../constants';
import WalletPage from './view';
-export default connect(null, null)(WalletPage);
+const select = state => ({
+ understandsRisks: makeSelectClientSetting(Constants.SETTING_ALPHA_UNDERSTANDS_RISKS)(state),
+});
+
+const perform = dispatch => ({
+ setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
+});
+
+export default connect(select, perform)(WalletPage);
diff --git a/app/src/page/wallet/view.js b/app/src/page/wallet/view.js
index bfd22157..3e007fb4 100644
--- a/app/src/page/wallet/view.js
+++ b/app/src/page/wallet/view.js
@@ -1,12 +1,31 @@
import React from 'react';
-import { ScrollView } from 'react-native';
+import { ScrollView, Text, View } from 'react-native';
import TransactionListRecent from '../../component/transactionListRecent';
import WalletAddress from '../../component/walletAddress';
import WalletBalance from '../../component/walletBalance';
import WalletSend from '../../component/walletSend';
+import Button from '../../component/button';
+import Constants from '../../constants';
+import walletStyle from '../../styles/wallet';
class WalletPage extends React.PureComponent {
render() {
+ const { understandsRisks, setClientSetting } = this.props;
+
+ if (!understandsRisks) {
+ return (
+
+
+
+ This is alpha software. You may lose any LBC that you send to your wallet due to uninstallation, software bugs, deleted files, or malicious third-party software. You should not use this wallet as your primary wallet. If you understand the risks and you wish to continue, please click the button below.
+
+
+
+ );
+ }
+
return (
diff --git a/app/src/styles/colors.js b/app/src/styles/colors.js
index 387ce48c..94893780 100644
--- a/app/src/styles/colors.js
+++ b/app/src/styles/colors.js
@@ -4,6 +4,7 @@ const Colors = {
DescriptionGrey: '#999999',
LbryGreen: '#40b89a',
LightGrey: '#cccccc',
+ Orange: '#ffbb00',
Red: '#ff0000',
VeryLightGrey: '#f1f1f1',
White: '#ffffff'
diff --git a/app/src/styles/wallet.js b/app/src/styles/wallet.js
index c46b6f7c..724a22f3 100644
--- a/app/src/styles/wallet.js
+++ b/app/src/styles/wallet.js
@@ -117,6 +117,20 @@ const walletStyle = StyleSheet.create({
addressInput: {
width: '80%'
},
+ warning: {
+ backgroundColor: Colors.Orange,
+ padding: 16,
+ margin: 16
+ },
+ warningText: {
+ color: '#ffffff',
+ fontFamily: 'Metropolis-Regular',
+ fontSize: 16,
+ lineHeight: 30
+ },
+ understand: {
+ marginLeft: 16
+ },
currency: {
alignSelf: 'flex-start',
marginTop: 17
diff --git a/recipes/libgmp/__init__.py b/recipes/libgmp/__init__.py
index f1af1fa9..b0db5ce8 100644
--- a/recipes/libgmp/__init__.py
+++ b/recipes/libgmp/__init__.py
@@ -7,7 +7,8 @@ import sh
class LibGMPRecipe(Recipe):
version = '6.1.2'
- url = 'https://gmplib.org/download/gmp/gmp-{version}.tar.bz2'
+ url = 'https://ftp.gnu.org/pub/gnu/gmp/gmp-{version}.tar.bz2'
+ #url = 'https://gmplib.org/download/gmp/gmp-{version}.tar.bz2'
def should_build(self, arch):
build_dir = self.get_build_dir(arch.arch)
diff --git a/src/main/java/io/lbry/browser/reactmodules/MixpanelModule.java b/src/main/java/io/lbry/browser/reactmodules/MixpanelModule.java
index 36a25230..65977ece 100644
--- a/src/main/java/io/lbry/browser/reactmodules/MixpanelModule.java
+++ b/src/main/java/io/lbry/browser/reactmodules/MixpanelModule.java
@@ -17,8 +17,8 @@ import org.json.JSONException;
public class MixpanelModule extends ReactContextBaseJavaModule {
// TODO: Detect dev / debug and release mode and update value accordingly
- //private static final String MIXPANEL_TOKEN = "93b81fb957cb0ddcd3198c10853a6a95"; // Production
- private static final String MIXPANEL_TOKEN = "bc1630b8be64c5dfaa4700b3a62969f3"; // Dev Testing
+ private static final String MIXPANEL_TOKEN = "93b81fb957cb0ddcd3198c10853a6a95"; // Production
+ //private static final String MIXPANEL_TOKEN = "bc1630b8be64c5dfaa4700b3a62969f3"; // Dev Testing
private Context context;