From 9311038fbb8dcd0cf9fb9b3f23dfa9fc7168e2b6 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 23 Jul 2019 16:13:06 -0400
Subject: [PATCH] final cleanup I know theres bugs but ship it

---
 package.json                             |  2 +-
 src/ui/analytics.js                      |  5 ++-
 src/ui/component/walletSendTip/view.jsx  | 12 ++++---
 src/ui/index.jsx                         |  3 +-
 src/ui/modal/modalError/view.jsx         | 13 ++++++--
 src/ui/modal/modalWalletEncrypt/view.jsx |  2 +-
 src/ui/page/settings/view.jsx            |  3 +-
 src/ui/redux/actions/app.js              |  1 +
 src/ui/scss/component/_media.scss        |  3 +-
 static/locales/en.json                   | 41 ++++++++++++++++++++++--
 yarn.lock                                |  4 +--
 11 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index b8b90548b..bee1cd142 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "jsmediatags": "^3.8.1",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#e550f0ff0448fcad5f3d0365ec7ad744376b41cf",
+    "lbry-redux": "lbryio/lbry-redux#885b4679ca1918076d64af063fda15608a52a5e5",
     "lbryinc": "lbryio/lbryinc#a93596c51c8fb0a226cb84df04c26a6bb60a45fb",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
diff --git a/src/ui/analytics.js b/src/ui/analytics.js
index a30af33c6..b4c6f4f80 100644
--- a/src/ui/analytics.js
+++ b/src/ui/analytics.js
@@ -84,9 +84,8 @@ const analytics: Analytics = {
   tagFollowEvent: (tag, following, location) => {
     if (analyticsEnabled) {
       ReactGA.event({
-        category: 'Tag',
-        action: following ? 'follow' : 'unfollow',
-        value: tag,
+        category: following ? 'Tag-Follow' : 'Tag-Unfollow',
+        action: tag,
       });
     }
   },
diff --git a/src/ui/component/walletSendTip/view.jsx b/src/ui/component/walletSendTip/view.jsx
index 6d3015e4f..569a29b31 100644
--- a/src/ui/component/walletSendTip/view.jsx
+++ b/src/ui/component/walletSendTip/view.jsx
@@ -9,7 +9,7 @@ type Props = {
   title: string,
   claim: StreamClaim,
   isPending: boolean,
-  sendSupport: (number, string, string) => void,
+  sendSupport: (number, string) => void,
   onCancel: () => void,
   sendTipCallback?: () => void,
   balance: number,
@@ -71,7 +71,7 @@ class WalletSendTip extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const { title, isPending, uri, onCancel, claimIsMine, isSupport } = this.props;
+    const { title, isPending, onCancel, claimIsMine, isSupport } = this.props;
     const { tipAmount, tipError } = this.state;
 
     return (
@@ -81,7 +81,10 @@ class WalletSendTip extends React.PureComponent<Props, State> {
             autoFocus
             name="tip-input"
             label={
-              (tipAmount && tipAmount !== 0 && `Tip ${tipAmount.toFixed(8).replace(/\.?0+$/, '')} LBC`) || __('Amount')
+              (tipAmount &&
+                tipAmount !== 0 &&
+                `${isSupport ? __('Support') : __('Tip')} ${tipAmount.toFixed(8).replace(/\.?0+$/, '')} LBC`) ||
+              __('Amount')
             }
             className="form-field--price-amount"
             error={tipError}
@@ -93,6 +96,7 @@ class WalletSendTip extends React.PureComponent<Props, State> {
             inputButton={
               <Button
                 button="primary"
+                type="submit"
                 label={__('Send')}
                 disabled={isPending || tipError || !tipAmount}
                 onClick={this.handleSendButtonClicked}
@@ -111,7 +115,7 @@ class WalletSendTip extends React.PureComponent<Props, State> {
           />
         </Form>
         <div className="card__actions">
-          <Button button="link" label={__('Cancel')} onClick={onCancel} navigateParams={{ uri }} />
+          <Button button="link" label={__('Cancel')} onClick={onCancel} />
         </div>
       </React.Fragment>
     );
diff --git a/src/ui/index.jsx b/src/ui/index.jsx
index 2e2c33ecf..e3df2096f 100644
--- a/src/ui/index.jsx
+++ b/src/ui/index.jsx
@@ -229,9 +229,8 @@ function AppWrapper() {
       app.store.dispatch(doInitLanguage());
       app.store.dispatch(doBlackListedOutpointsSubscribe());
       app.store.dispatch(doFilteredOutpointsSubscribe());
+      window.sessionStorage.setItem('loaded', 'y');
     }
-
-    window.sessionStorage.setItem('loaded', 'y');
   }, [readyToLaunch, haveLaunched]);
 
   return (
diff --git a/src/ui/modal/modalError/view.jsx b/src/ui/modal/modalError/view.jsx
index 3839c6f81..69b5c46e4 100644
--- a/src/ui/modal/modalError/view.jsx
+++ b/src/ui/modal/modalError/view.jsx
@@ -10,10 +10,19 @@ type Props = {
 
 class ModalError extends React.PureComponent<Props> {
   componentDidMount() {
-    if (process.env.NODE_ENV === 'production') {
-      Lbryio.call('event', 'desktop_error', { error_message: JSON.stringify(this.props.error) });
+    const { error } = this.props;
+
+    // Yuck
+    // https://github.com/lbryio/lbry-sdk/issues/1118
+    // The sdk logs failed downloads, they happen so often that it's mostly noise in the desktop logs
+    const errorMessage = typeof error === 'string' ? error : error.message;
+    const failedToDownloadError = errorMessage.startsWith('Failed to download');
+
+    if (process.env.NODE_ENV === 'production' && !failedToDownloadError) {
+      Lbryio.call('event', 'desktop_error', { error_message: JSON.stringify(error) });
     }
   }
+
   render() {
     const { closeModal, error } = this.props;
 
diff --git a/src/ui/modal/modalWalletEncrypt/view.jsx b/src/ui/modal/modalWalletEncrypt/view.jsx
index 7d732b35b..0bcf0f15d 100644
--- a/src/ui/modal/modalWalletEncrypt/view.jsx
+++ b/src/ui/modal/modalWalletEncrypt/view.jsx
@@ -127,7 +127,7 @@ class ModalWalletEncrypt extends React.PureComponent<Props, State> {
             />
           </fieldset-section>
 
-          <div className="help help--warning">
+          <div className="card__subtitle--status">
             {__(
               'If your password is lost, it cannot be recovered. You will not be able to access your wallet without a password.'
             )}
diff --git a/src/ui/page/settings/view.jsx b/src/ui/page/settings/view.jsx
index a5644714e..bda039b48 100644
--- a/src/ui/page/settings/view.jsx
+++ b/src/ui/page/settings/view.jsx
@@ -370,7 +370,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
 
               <Form>
                 <FormField
-                  type="setting"
+                  type="checkbox"
                   name="support_option"
                   onChange={() => setClientSetting(SETTINGS.SUPPORT_OPTION, !supportOption)}
                   checked={supportOption}
@@ -387,7 +387,6 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 />
 
                 <FormField
-                  type="setting"
                   type="checkbox"
                   name="auto_download"
                   onChange={() => setClientSetting(SETTINGS.AUTO_DOWNLOAD, !autoDownload)}
diff --git a/src/ui/redux/actions/app.js b/src/ui/redux/actions/app.js
index 1e9580308..f3ea93636 100644
--- a/src/ui/redux/actions/app.js
+++ b/src/ui/redux/actions/app.js
@@ -331,6 +331,7 @@ export function doClearCache() {
     // Leaving for now
     // const reducersToClear = whiteListedReducers.filter(reducerKey => reducerKey !== 'tags');
     // window.cacheStore.purge(reducersToClear);
+    window.localStorage.clear();
     return window.persistor.purge();
   };
 }
diff --git a/src/ui/scss/component/_media.scss b/src/ui/scss/component/_media.scss
index 15fe195b2..9a4928be3 100644
--- a/src/ui/scss/component/_media.scss
+++ b/src/ui/scss/component/_media.scss
@@ -72,7 +72,7 @@
   justify-content: space-between;
 
   &:last-of-type:not(:only-of-type) {
-    margin-bottom: var(--spacing-large);
+    margin: 0;
   }
 }
 
@@ -89,6 +89,7 @@
 .media__action-group--large {
   display: flex;
   font-size: var(--font-multiplier-medium);
+  margin-bottom: var(--spacing-large);
 
   > * {
     &:not(:last-child) {
diff --git a/static/locales/en.json b/static/locales/en.json
index a4ff21cea..b834d82d5 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -592,5 +592,42 @@
   " but the LBC is returned to your wallet if revoked.": " but the LBC is returned to your wallet if revoked.",
   " Both also help secure ": " Both also help secure ",
   "vanity names": "vanity names",
-  "Add support to this claim": "Add support to this claim"
-}
+  "Add support to this claim": "Add support to this claim",
+  "Find New Tags": "Find New Tags",
+  "Send LBC to your friends or favorite creators.": "Send LBC to your friends or favorite creators.",
+  "Use this address to receive LBC. You can generate a new address at any time, and any previous addresses will continue to work.": "Use this address to receive LBC. You can generate a new address at any time, and any previous addresses will continue to work.",
+  "Your Address": "Your Address",
+  "Send a tip to this creator": "Send a tip to this creator",
+  "Support this claim": "Support this claim",
+  "We know this page won't win any design awards, we just wanted to release a very basic version that works so people can use it right now. There is a much nicer version being worked on.": "We know this page won't win any design awards, we just wanted to release a very basic version that works so people can use it right now. There is a much nicer version being worked on.",
+  "LBRY App Link": "LBRY App Link",
+  "file": "file",
+  "hidden due to your": "hidden due to your",
+  "content viewing preferences": "content viewing preferences",
+  "Encrypt Wallet": "Encrypt Wallet",
+  "Encrypting your wallet will require a password to access your local wallet data when LBRY starts. Please enter a new password for your wallet.": "Encrypting your wallet will require a password to access your local wallet data when LBRY starts. Please enter a new password for your wallet.",
+  "Password": "Password",
+  "Shh...": "Shh...",
+  "Confirm Password": "Confirm Password",
+  "Your eyes only": "Your eyes only",
+  "If your password is lost, it cannot be recovered. You will not be able to access your wallet without a password.": "If your password is lost, it cannot be recovered. You will not be able to access your wallet without a password.",
+  "Enter \"I understand\"": "Enter \"I understand\"",
+  "Dear computer, I understand": "Dear computer, I understand",
+  "Unlock Wallet": "Unlock Wallet",
+  "Unlock": "Unlock",
+  "Exit": "Exit",
+  "Your wallet has been encrypted with a local password. Please enter your wallet password to proceed.": "Your wallet has been encrypted with a local password. Please enter your wallet password to proceed.",
+  "Wallet Password": "Wallet Password",
+  "Tip must be a number": "Tip must be a number",
+  "Woah, you have a lot of friends! You've claimed the maximum amount of referral rewards. Check back soon to see if more are available!.": "Woah, you have a lot of friends! You've claimed the maximum amount of referral rewards. Check back soon to see if more are available!.",
+  "Invite History": "Invite History",
+  "Invitee Email": "Invitee Email",
+  "Invite Status": "Invite Status",
+  "Reward": "Reward",
+  "Not Accepted": "Not Accepted",
+  "Unclaimable": "Unclaimable",
+  "Enter Reward Code": "Enter Reward Code",
+  "Redeem a custom reward code for LBC": "Redeem a custom reward code for LBC",
+  "Redeem": "Redeem",
+  "Code": "Code"
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index b72073b9c..1c0c760e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6653,9 +6653,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
     yargs "^13.2.2"
     zstd-codec "^0.1.1"
 
-lbry-redux@lbryio/lbry-redux#e550f0ff0448fcad5f3d0365ec7ad744376b41cf:
+lbry-redux@lbryio/lbry-redux#885b4679ca1918076d64af063fda15608a52a5e5:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/e550f0ff0448fcad5f3d0365ec7ad744376b41cf"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/885b4679ca1918076d64af063fda15608a52a5e5"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"