Revert "Enables wallet and rewards" #2785

Merged
neb-b merged 1 commit from revert-2779-tvBalanceAndRewards into master 2019-08-23 16:22:05 +02:00
5 changed files with 39 additions and 25 deletions

View file

@ -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",

View file

@ -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 = () => (
<Page>
<div className="columns">
<UserEmail />
<div>
<RewardSummary />
<RewardTotal />
{/* @if TARGET='web' */}
<UserEmail />
{/* @endif */}
<UnsupportedOnWeb />
<div className={classnames({ 'card--disabled': IS_WEB })}>
<div className="columns">
<UserEmail />
<div>
<RewardSummary />
<RewardTotal />
</div>
</div>
<InvitePage />
</div>
<InvitePage />
</Page>
);

View file

@ -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<Props> {
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 (
<section className="card card--section">
<h2 className="card__title">{__('Rewards Approval to Earn Credits (LBC)')}</h2>
<p className="card__subtitle">
{__(
'This step is optional. You can continue to use this app without rewards, but LBC may be needed for some tasks.'
)}{' '}
<Button button="link" label={__('Learn more')} href="https://lbry.com/faq/rewards" />.
</p>
!IS_WEB && (
<section className="card card--section">
<h2 className="card__title">{__('Rewards Approval to Earn Credits (LBC)')}</h2>
<p className="card__subtitle">
{__(
'This step is optional. You can continue to use this app without rewards, but LBC may be needed for some tasks.'
)}{' '}
<Button button="link" label={__('Learn more')} href="https://lbry.com/faq/rewards" />.
</p>
<Button navigate="/$/auth?redirect=rewards" button="primary" label="Prove Humanity" />
</section>
<Button navigate="/$/auth?redirect=rewards" button="primary" label="Prove Humanity" />
</section>
)
);
}
return (
@ -83,7 +86,7 @@ class RewardsPage extends PureComponent<Props> {
renderUnclaimedRewards() {
const { fetching, rewards, user, daemonSettings, claimed } = this.props;
if (!IS_WEB && daemonSettings && !daemonSettings.share_usage_data) {
if (daemonSettings && !daemonSettings.share_usage_data) {
return (
<section className="card card--section">
<h2 className="card__title">{__('Disabled')}</h2>
@ -138,6 +141,7 @@ class RewardsPage extends PureComponent<Props> {
render() {
return (
<Page>
{IS_WEB && <UnsupportedOnWeb />}
{this.renderPageHeader()}
{this.renderUnclaimedRewards()}
{<RewardListClaimed />}

View file

@ -4,13 +4,17 @@ import WalletSend from 'component/walletSend';
import WalletAddress from 'component/walletAddress';
import TransactionListRecent from 'component/transactionListRecent';
import Page from 'component/page';
import UnsupportedOnWeb from 'component/common/unsupported-on-web';
const WalletPage = () => (
<Page>
<WalletBalance />
<WalletSend />
<WalletAddress />
<TransactionListRecent />
<UnsupportedOnWeb />
<div className={IS_WEB && 'card--disabled'}>
<WalletBalance />
<WalletSend />
<WalletAddress />
<TransactionListRecent />
</div>
</Page>
);

View file

@ -322,9 +322,7 @@ export function doDaemonReady() {
// @if TARGET='app'
dispatch(doFetchDaemonSettings());
// @endif
dispatch(doBalanceSubscribe());
// @if TARGET='app'
dispatch(doFetchFileInfosAndPublishedClaims());
if (!selectIsUpgradeSkipped(state)) {
dispatch(doCheckUpgradeAvailable());