From 05bcaa8f0ea0b199afc9cfcc0f2221114628a237 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 17 Jul 2019 14:04:50 -0400
Subject: [PATCH] cleanup

---
 src/ui/component/claimListDiscover/view.jsx |  2 +-
 src/ui/component/common/icon-custom.jsx     |  6 ++++
 src/ui/component/socialShare/view.jsx       |  1 -
 src/ui/component/userEmail/view.jsx         | 25 +++++++++------
 src/ui/component/userVerify/view.jsx        |  2 +-
 src/ui/constants/icons.js                   |  2 +-
 src/ui/page/file/view.jsx                   |  2 +-
 src/ui/page/rewards/view.jsx                |  9 ++----
 src/ui/page/settings/view.jsx               | 10 +++---
 static/locales/en.json                      | 35 ++++++++++++++++++++-
 yarn.lock                                   |  4 +--
 11 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/src/ui/component/claimListDiscover/view.jsx b/src/ui/component/claimListDiscover/view.jsx
index b20b3ec5d..ed4dfed6a 100644
--- a/src/ui/component/claimListDiscover/view.jsx
+++ b/src/ui/component/claimListDiscover/view.jsx
@@ -57,7 +57,7 @@ function ClaimListDiscover(props: Props) {
       channel_ids?: Array<string>,
       release_time?: string,
       not_tags?: Array<string>,
-    } = { page_size: PAGE_SIZE, page };
+    } = { page_size: PAGE_SIZE, page, no_totals: true };
     const newTags = tagsString.split(',');
     const newChannelIds = channelsIdString.split(',');
 
diff --git a/src/ui/component/common/icon-custom.jsx b/src/ui/component/common/icon-custom.jsx
index 059f51491..4057af42e 100644
--- a/src/ui/component/common/icon-custom.jsx
+++ b/src/ui/component/common/icon-custom.jsx
@@ -253,4 +253,10 @@ export const icons = {
       <path d="M7 11V7a5 5 0 0 1 9.9-1" />
     </g>
   ),
+  [ICONS.SUPPORT]: buildIcon(
+    <g>
+      <polyline points="23 6 13.5 15.5 8.5 10.5 1 18" />
+      <polyline points="17 6 23 6 23 12" />
+    </g>
+  ),
 };
diff --git a/src/ui/component/socialShare/view.jsx b/src/ui/component/socialShare/view.jsx
index dac202b12..8044c5457 100644
--- a/src/ui/component/socialShare/view.jsx
+++ b/src/ui/component/socialShare/view.jsx
@@ -27,7 +27,6 @@ class SocialShare extends React.PureComponent<Props> {
   render() {
     const { claim } = this.props;
     const { short_url: shortUrl } = claim;
-
     const { speechShareable, onDone } = this.props;
 
     const lbryTvPrefix = 'https://beta.lbry.tv/';
diff --git a/src/ui/component/userEmail/view.jsx b/src/ui/component/userEmail/view.jsx
index a5d6782f4..05b69ddfe 100644
--- a/src/ui/component/userEmail/view.jsx
+++ b/src/ui/component/userEmail/view.jsx
@@ -1,5 +1,6 @@
 // @flow
-import * as React from 'react';
+import type { Node } from 'react';
+import React, { useEffect } from 'react';
 import Button from 'component/button';
 import { FormField } from 'component/common/form';
 import UserEmailNew from 'component/userEmailNew';
@@ -7,7 +8,7 @@ import UserEmailVerify from 'component/userEmailVerify';
 import cookie from 'cookie';
 
 type Props = {
-  cancelButton: React.Node,
+  cancelButton: Node,
   email: string,
   resendVerificationEmail: string => void,
   checkEmailVerified: () => void,
@@ -20,13 +21,6 @@ type Props = {
 
 function UserEmail(props: Props) {
   const { email, user, accessToken, fetchAccessToken } = props;
-  let isVerified = false;
-  if (user) {
-    isVerified = user.has_verified_email;
-  }
-
-  if (!accessToken) fetchAccessToken();
-
   const buttonsProps = IS_WEB
     ? {
         onClick: () => {
@@ -36,6 +30,17 @@ function UserEmail(props: Props) {
       }
     : { href: 'https://lbry.com/faq/how-to-change-email' };
 
+  let isVerified = false;
+  if (user) {
+    isVerified = user.has_verified_email;
+  }
+
+  useEffect(() => {
+    if (!accessToken) {
+      fetchAccessToken();
+    }
+  }, [accessToken, fetchAccessToken]);
+
   return (
     <section className="card card--section">
       {!email && <UserEmailNew />}
@@ -57,7 +62,7 @@ function UserEmail(props: Props) {
               readOnly
               label={
                 <React.Fragment>
-                  {__('Your Email - ')}{' '}
+                  {__('Your Email')}{' '}
                   <Button
                     button="link"
                     label={__('Update mailing preferences')}
diff --git a/src/ui/component/userVerify/view.jsx b/src/ui/component/userVerify/view.jsx
index 90c3d08cc..013220818 100644
--- a/src/ui/component/userVerify/view.jsx
+++ b/src/ui/component/userVerify/view.jsx
@@ -31,7 +31,7 @@ class UserVerify extends React.PureComponent<Props> {
             <h1 className="card__title">{__('Final Human Proof')}</h1>
             <p className="card__subtitle">
               To be approved for rewards, please complete <strong>one and only one</strong> of the options below. This
-              is optional, and you can click back or Skip Rewards at the bottom.
+              is optional, and you can be skipped at the bottom.
             </p>
           </header>
         </section>
diff --git a/src/ui/constants/icons.js b/src/ui/constants/icons.js
index 9ffaae038..a5306cdce 100644
--- a/src/ui/constants/icons.js
+++ b/src/ui/constants/icons.js
@@ -53,7 +53,6 @@ export const SECURE = 'Lock';
 export const MENU = 'Menu';
 export const BACKUP = 'Database';
 export const TRANSACTIONS = 'FileText';
-export const TRENDING_UP = 'TrendingUp';
 export const LBRY = 'Lbry';
 export const SEND = 'Send';
 export const DISCOVER = 'Compass';
@@ -70,3 +69,4 @@ export const MUSIC_EQUALIZER = 'Sliders';
 export const LIGHT = 'Sun';
 export const DARK = 'Moon';
 export const LIBRARY = 'Folder';
+export const SUPPORT = 'TrendingUp';
diff --git a/src/ui/page/file/view.jsx b/src/ui/page/file/view.jsx
index 1d8409fec..123e78aec 100644
--- a/src/ui/page/file/view.jsx
+++ b/src/ui/page/file/view.jsx
@@ -245,7 +245,7 @@ class FilePage extends React.Component<Props> {
                     {!claimIsMine && channelUri && <SubscribeButton uri={channelUri} channelName={channelName} />}
                     <Button
                       button="alt"
-                      icon={claimIsMine ? icons.TRENDING_UP : icons.TIP}
+                      icon={claimIsMine ? icons.SUPPORT : icons.TIP}
                       label={claimIsMine ? __('Add support') : __('Send a tip')}
                       onClick={() => openModal(MODALS.SEND_TIP, { uri, claimIsMine })}
                     />
diff --git a/src/ui/page/rewards/view.jsx b/src/ui/page/rewards/view.jsx
index 484c86b0e..010c437e1 100644
--- a/src/ui/page/rewards/view.jsx
+++ b/src/ui/page/rewards/view.jsx
@@ -38,14 +38,9 @@ class RewardsPage extends PureComponent<Props> {
                 <h2 className="card__title">{__('Rewards Approval to Earn Credits (LBC)')}</h2>
                 <p className="card__subtitle">
                   {__(
-                    'This step optional. You can continue to use this app without Rewards, but LBC may be needed for some tasks.'
+                    'This step is optional. You can continue to use this app without rewards, but LBC may be needed for some tasks.'
                   )}{' '}
-                </p>
-                <p className="card__subtitle">
-                  {__(
-                    "Rewards are for human beings only. You'll have to prove you're one of us before you can claim any."
-                  )}{' '}
-                  {<Button button="link" label={__('Learn more')} href="https://lbry.com/faq/rewards" />}
+                  <Button button="link" label={__('Learn more')} href="https://lbry.com/faq/rewards" />
                 </p>
               </header>
 
diff --git a/src/ui/page/settings/view.jsx b/src/ui/page/settings/view.jsx
index 4be64e9c0..b36f00549 100644
--- a/src/ui/page/settings/view.jsx
+++ b/src/ui/page/settings/view.jsx
@@ -313,10 +313,12 @@ class SettingsPage extends React.PureComponent<Props, State> {
                   name="share_usage_data"
                   onChange={() => setDaemonSetting('share_usage_data', !daemonSettings.share_usage_data)}
                   checked={daemonSettings.share_usage_data}
-                  label=<React.Fragment>
-                    {__('Help make LBRY better by contributing analytics and diagnostic data about my usage.')}{' '}
-                    <Button button="link" label={__('Learn more')} href="https://lbry.com/privacypolicy" />.
-                  </React.Fragment>
+                  label={
+                    <React.Fragment>
+                      {__('Help make LBRY better by contributing analytics and diagnostic data about my usage.')}{' '}
+                      <Button button="link" label={__('Learn more')} href="https://lbry.com/privacypolicy" />.
+                    </React.Fragment>
+                  }
                   helper={__('You will be ineligible to earn rewards while diagnostics are not being shared.')}
                 />
               </Form>
diff --git a/static/locales/en.json b/static/locales/en.json
index b6654a9f1..6b1c2c34f 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -541,5 +541,38 @@
   "When the alpha ends, we will attempt to transition comments, but do not promise to do so. Any transition will likely involve publishing previous comments under a single archive handle.": "When the alpha ends, we will attempt to transition comments, but do not promise to do so. Any transition will likely involve publishing previous comments under a single archive handle.",
   "Upgrade is ready to install": "Upgrade is ready to install",
   "Upgrade is ready": "Upgrade is ready",
-  "Abandon the claim for this URI": "Abandon the claim for this URI"
+  "Abandon the claim for this URI": "Abandon the claim for this URI",
+  "For video content, use MP4s in H264/AAC format for best compatibility.": "For video content, use MP4s in H264/AAC format for best compatibility.",
+  "Read the App Basics FAQ": "Read the App Basics FAQ",
+  "View all LBRY FAQs": "View all LBRY FAQs",
+  "Find Assistance": "Find Assistance",
+  "channel of our Discord chat room. Or you can always email us at help@lbry.com.": "channel of our Discord chat room. Or you can always email us at help@lbry.com.",
+  "Email Us": "Email Us",
+  "Today": "Today",
+  "This": "This",
+  "All time": "All time",
+  "For the initial release, deleting or editing comments is not possible. Please be mindful of this when posting.": "For the initial release, deleting or editing comments is not possible. Please be mindful of this when posting.",
+  "Add support": "Add support",
+  "Add support to": "Add support to",
+  "This will increase your overall bid amount for ": "This will increase your overall bid amount for ",
+  "Share on Facebook": "Share on Facebook",
+  "Share On Twitter": "Share On Twitter",
+  "View on lbry.tv": "View on lbry.tv",
+  "Your Email - ": "Your Email - ",
+  "This information is disclosed only to LBRY, Inc. and not to the LBRY network. It is only required to save account information and earn rewards.": "This information is disclosed only to LBRY, Inc. and not to the LBRY network. It is only required to save account information and earn rewards.",
+  "Rewards Approval to Earn Credits (LBC)": "Rewards Approval to Earn Credits (LBC)",
+  "This step optional. You can continue to use this app without Rewards, but LBC may be needed for some tasks.": "This step optional. You can continue to use this app without Rewards, but LBC may be needed for some tasks.",
+  "Rewards are for human beings only. You'll have to prove you're one of us before you can claim any.": "Rewards are for human beings only. You'll have to prove you're one of us before you can claim any.",
+  "This step is optional. You can continue to use this app without Rewards, but LBC may be needed for some tasks.": "This step is optional. You can continue to use this app without Rewards, but LBC may be needed for some tasks.",
+  "This step is optional. You can continue to use this app without rewards, but LBC may be needed for some tasks.": "This step is optional. You can continue to use this app without rewards, but LBC may be needed for some tasks.",
+  "1) Proof via Phone": "1) Proof via Phone",
+  "You will receive an SMS text message confirming that your phone number is correct. Does not work for Canada and possibly other regions": "You will receive an SMS text message confirming that your phone number is correct. Does not work for Canada and possibly other regions",
+  "Standard messaging rates apply. LBRY will not text or call you otherwise. Having trouble?": "Standard messaging rates apply. LBRY will not text or call you otherwise. Having trouble?",
+  "2) Proof via Credit": "2) Proof via Credit",
+  "You currently have the highest bid for this name.": "You currently have the highest bid for this name.",
+  "You sent 1 LBC as a tip, Mahalo!": "You sent 1 LBC as a tip, Mahalo!",
+  "You can generate a new address at any time, and any previous addresses will continue to work.": "You can generate a new address at any time, and any previous addresses will continue to work.",
+  "Confirm Claim Revoke": "Confirm Claim Revoke",
+  "Are you sure you want to remove this support?": "Are you sure you want to remove this support?",
+  "These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance.": "These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance."
 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 013d87c25..bb1a8fca7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6654,9 +6654,9 @@ lbry-redux@lbryio/lbry-redux#bb82aed61a5569e565daa784eb25fc1d639c0c22:
     reselect "^3.0.0"
     uuid "^3.3.2"
 
-lbryinc@lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845:
+lbryinc@lbryio/lbryinc#69f9562b016030b481375443f56147ff5e273c0e:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/43d382d9b74d396a581a74d87e4c53105e04f845"
+  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/69f9562b016030b481375443f56147ff5e273c0e"
   dependencies:
     reselect "^3.0.0"