From 34c56d8a1b92c92ffc58fff3795c37299aa9887c Mon Sep 17 00:00:00 2001
From: Jeremy Kauffman <jeremy@lbry.io>
Date: Thu, 5 Dec 2019 13:38:11 -0500
Subject: [PATCH 1/3] minor i18n fixes

---
 static/app-strings.json                    | 1 -
 ui/component/claimListDiscover/view.jsx    | 4 ++--
 ui/component/publishName/bid-help-text.jsx | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/static/app-strings.json b/static/app-strings.json
index 0898e7fd6..0cababd25 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -556,7 +556,6 @@
   "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.",
diff --git a/ui/component/claimListDiscover/view.jsx b/ui/component/claimListDiscover/view.jsx
index 0123dcfc4..0353cfa98 100644
--- a/ui/component/claimListDiscover/view.jsx
+++ b/ui/component/claimListDiscover/view.jsx
@@ -165,10 +165,10 @@ function ClaimListDiscover(props: Props) {
       <p>
         <I18nMessage
           tokens={{
-            support: <Button button="link" label={__('contact support')} href="https://lbry.com/faq/support" />,
+            contact_support: <Button button="link" label={__('contact support')} href="https://lbry.com/faq/support" />,
           }}
         >
-          If you continue to have issues, please %support%.
+          If you continue to have issues, please %contact_support%.
         </I18nMessage>
       </p>
     </div>
diff --git a/ui/component/publishName/bid-help-text.jsx b/ui/component/publishName/bid-help-text.jsx
index 73dc9080f..d9144f1f2 100644
--- a/ui/component/publishName/bid-help-text.jsx
+++ b/ui/component/publishName/bid-help-text.jsx
@@ -16,7 +16,9 @@ function BidHelpText(props: Props) {
     } else if (amountNeededForTakeover === 0) {
       bidHelpText = __('You currently have the highest bid for this name.');
     } else if (!amountNeededForTakeover) {
-      bidHelpText = __('Any amount will give you the winning bid.');
+      bidHelpText = __(
+        'Any amount will give you the highest bid, but larger amounts help your content be trusted and discovered.'
+      );
     } else {
       bidHelpText = __(
         'If you bid more than %amount% LBC, when someone navigates to %uri%, it will load your published content. However, you can get a longer version of this URL for any bid.',

From e33cf4537552b509324d39bac4b90ed20e49ebfa Mon Sep 17 00:00:00 2001
From: Jeremy Kauffman <jeremy@lbry.io>
Date: Sat, 7 Dec 2019 10:56:00 -0500
Subject: [PATCH 2/3] fix small channel image previews

---
 ui/component/channelThumbnail/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/component/channelThumbnail/view.jsx b/ui/component/channelThumbnail/view.jsx
index 3bdad9ec9..b153d35f7 100644
--- a/ui/component/channelThumbnail/view.jsx
+++ b/ui/component/channelThumbnail/view.jsx
@@ -15,7 +15,7 @@ type Props = {
 
 function ChannelThumbnail(props: Props) {
   const { thumbnail, uri, className, thumbnailPreview, obscure, small = false } = props;
-  const showThumb = !obscure && !!thumbnail;
+  const showThumb = (!obscure && !!thumbnail) || thumbnailPreview;
 
   // Generate a random color class based on the first letter of the channel name
   const { channelName } = parseURI(uri);

From fa0fce02910c960aaf36e84eef46c2a1628c65d6 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 9 Dec 2019 10:16:49 -0500
Subject: [PATCH 3/3] minor fixes

---
 static/app-strings.json     | 8 ++++++--
 ui/constants/modal_types.js | 1 +
 ui/page/channels/view.jsx   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/static/app-strings.json b/static/app-strings.json
index 0cababd25..fa41d9183 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -902,5 +902,9 @@
   "Reach out to hello@lbry.com for help, or check out %help_link%.": "Reach out to hello@lbry.com for help, or check out %help_link%.",
   "You're not following any tags. Smash that %customize% button!": "You're not following any tags. Smash that %customize% button!",
   "customize": "customize",
-  "An upgrade is available.": "An upgrade is available."
-}
+  "An upgrade is available.": "An upgrade is available.",
+  "You're not following any tags. Add tags above or smash that %customize% button!": "You're not following any tags. Add tags above or smash that %customize% button!",
+  "New Channel": "New Channel",
+  "ChannelName": "ChannelName",
+  "Pending...": "Pending..."
+}
\ No newline at end of file
diff --git a/ui/constants/modal_types.js b/ui/constants/modal_types.js
index 105d056b9..430442d2d 100644
--- a/ui/constants/modal_types.js
+++ b/ui/constants/modal_types.js
@@ -32,3 +32,4 @@ export const WALLET_PASSWORD_UNSAVE = 'wallet_password_unsave';
 export const WALLET_SEND = 'wallet_send';
 export const WALLET_RECEIVE = 'wallet_receive';
 export const CREATE_CHANNEL = 'create_channel';
+export const YOUTUBE_WELCOME = 'youtube_welcome';
diff --git a/ui/page/channels/view.jsx b/ui/page/channels/view.jsx
index 5b91c6a2c..8cd5529a4 100644
--- a/ui/page/channels/view.jsx
+++ b/ui/page/channels/view.jsx
@@ -18,7 +18,7 @@ type Props = {
 export default function ChannelsPage(props: Props) {
   const { channels, fetchChannelListMine, fetchingChannels, youtubeChannels, openModal } = props;
   const hasYoutubeChannels = youtubeChannels && Boolean(youtubeChannels.length);
-  const hasPendingChannels = channels && channels.some(channel => channel.confirmations === -1);
+  const hasPendingChannels = channels && channels.some(channel => channel.confirmations < 0);
 
   useEffect(() => {
     fetchChannelListMine();