From 94e104e536c8745c60bb9afe17329c8241036a93 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Fri, 23 Aug 2019 10:21:53 -0400 Subject: [PATCH] Revert "Enables wallet and rewards" --- package.json | 2 +- src/ui/page/account/view.jsx | 20 ++++++++++++++------ src/ui/page/rewards/view.jsx | 28 ++++++++++++++++------------ src/ui/page/wallet/view.jsx | 12 ++++++++---- src/ui/redux/actions/app.js | 2 -- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index c35338fc1..e0b3b89f4 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "husky": "^0.14.3", "json-loader": "^0.5.4", "lbry-format": "https://github.com/lbryio/lbry-format.git", - "lbry-redux": "lbryio/lbry-redux#f4413a8ab4928a9487274568bb72e440c45875be", + "lbry-redux": "lbryio/lbry-redux#1af092ce2cb507d9a41711b864874c0bd76935ae", "lbryinc": "lbryio/lbryinc#1ce266b3c52654190b955e9c869b8e302aa5c585", "lint-staged": "^7.0.2", "localforage": "^1.7.1", diff --git a/src/ui/page/account/view.jsx b/src/ui/page/account/view.jsx index db70024f1..fbeb5e7ba 100644 --- a/src/ui/page/account/view.jsx +++ b/src/ui/page/account/view.jsx @@ -1,20 +1,28 @@ import React from 'react'; +import classnames from 'classnames'; import RewardSummary from 'component/rewardSummary'; import RewardTotal from 'component/rewardTotal'; import Page from 'component/page'; +import UnsupportedOnWeb from 'component/common/unsupported-on-web'; import UserEmail from 'component/userEmail'; import InvitePage from 'page/invite'; const AccountPage = () => ( -
- -
- - + {/* @if TARGET='web' */} + + {/* @endif */} + +
+
+ +
+ + +
+
- ); diff --git a/src/ui/page/rewards/view.jsx b/src/ui/page/rewards/view.jsx index fe92bba19..d927e10bf 100644 --- a/src/ui/page/rewards/view.jsx +++ b/src/ui/page/rewards/view.jsx @@ -7,6 +7,7 @@ import Button from 'component/button'; import Page from 'component/page'; import classnames from 'classnames'; import { rewards as REWARD_TYPES } from 'lbryinc'; +import UnsupportedOnWeb from 'component/common/unsupported-on-web'; type Props = { doAuth: () => void, @@ -28,20 +29,22 @@ class RewardsPage extends PureComponent { renderPageHeader() { const { user, daemonSettings } = this.props; - if (user && !user.is_reward_approved && ((daemonSettings && daemonSettings.share_usage_data) || IS_WEB)) { + if (user && !user.is_reward_approved && daemonSettings && daemonSettings.share_usage_data) { if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) { return ( -
-

{__('Rewards Approval to Earn Credits (LBC)')}

-

- {__( - 'This step is optional. You can continue to use this app without rewards, but LBC may be needed for some tasks.' - )}{' '} -

+