Merge pull request #2779 from lbryio/tvBalanceAndRewards

Enables wallet and rewards

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#1af092ce2cb507d9a41711b864874c0bd76935ae",
+    "lbry-redux": "lbryio/lbry-redux#f4413a8ab4928a9487274568bb72e440c45875be",
     "lbryinc": "lbryio/lbryinc#1ce266b3c52654190b955e9c869b8e302aa5c585",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",

src/ui/page/account/view.jsx

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

src/ui/page/rewards/view.jsx

@@ -7,7 +7,6 @@ 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,
@@ -29,22 +28,20 @@ class RewardsPage extends PureComponent<Props> {
   renderPageHeader() {
     const { user, daemonSettings } = this.props;
 
-    if (user && !user.is_reward_approved && daemonSettings && daemonSettings.share_usage_data) {
+    if (user && !user.is_reward_approved && ((daemonSettings && daemonSettings.share_usage_data) || IS_WEB)) {
       if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) {
         return (
-          !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>
+          <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 (
@@ -86,7 +83,7 @@ class RewardsPage extends PureComponent<Props> {
   renderUnclaimedRewards() {
     const { fetching, rewards, user, daemonSettings, claimed } = this.props;
 
-    if (daemonSettings && !daemonSettings.share_usage_data) {
+    if (!IS_WEB && daemonSettings && !daemonSettings.share_usage_data) {
       return (
         <section className="card card--section">
           <h2 className="card__title">{__('Disabled')}</h2>
@@ -141,7 +138,6 @@ class RewardsPage extends PureComponent<Props> {
   render() {
     return (
       <Page>
-        {IS_WEB && <UnsupportedOnWeb />}
         {this.renderPageHeader()}
         {this.renderUnclaimedRewards()}
         {<RewardListClaimed />}

src/ui/page/wallet/view.jsx

@@ -4,17 +4,13 @@ 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>
-    <UnsupportedOnWeb />
-    <div className={IS_WEB && 'card--disabled'}>
-      <WalletBalance />
-      <WalletSend />
-      <WalletAddress />
-      <TransactionListRecent />
-    </div>
+    <WalletBalance />
+    <WalletSend />
+    <WalletAddress />
+    <TransactionListRecent />
   </Page>
 );
 

src/ui/redux/actions/app.js

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