From 65f133963063b012f2ca306faf49f57c768a5a82 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 21 Sep 2020 13:28:18 -0400
Subject: [PATCH] bump lbry-redux/inc + bring in fix from release branch

---
 package.json                                 | 4 ++--
 static/app-strings.json                      | 2 ++
 ui/component/userChannelFollowIntro/view.jsx | 4 +++-
 yarn.lock                                    | 8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 4223ea551..b1eb062b3 100644
--- a/package.json
+++ b/package.json
@@ -136,8 +136,8 @@
     "imagesloaded": "^4.1.4",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#e10295b5ec2ef42426755ed9fd50bd250b0d76dd",
-    "lbryinc": "lbryio/lbryinc#48347494230c6d1610cfd1c0bef23924e7428288",
+    "lbry-redux": "lbryio/lbry-redux#90012bf47c170f244039261548dab7c7597046dc",
+    "lbryinc": "lbryio/lbryinc#db0663fcc4a64cb082b6edc5798fafa67eb4300f",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
     "lodash-es": "^4.17.14",
diff --git a/static/app-strings.json b/static/app-strings.json
index a7f7ef67f..119253d7c 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -1312,5 +1312,7 @@
   "Something went wrong.": "Something went wrong.",
   "Something went wrong. Please %click_here% to learn about sync limitations.": "Something went wrong. Please %click_here% to learn about sync limitations.",
   "Buy LBC": "Buy LBC",
+  "Continue...": "Continue...",
+  "Mark all as read": "Mark all as read",
   "--end--": "--end--"
 }
diff --git a/ui/component/userChannelFollowIntro/view.jsx b/ui/component/userChannelFollowIntro/view.jsx
index df17d28d4..3cc07bf02 100644
--- a/ui/component/userChannelFollowIntro/view.jsx
+++ b/ui/component/userChannelFollowIntro/view.jsx
@@ -15,7 +15,9 @@ type Props = {
   channelSubscribe: (sub: Subscription) => void,
 };
 
-const channelsToSubscribe = AUTO_FOLLOW_CHANNELS.trim().split(' ');
+const channelsToSubscribe = AUTO_FOLLOW_CHANNELS.trim()
+  .split(' ')
+  .filter(x => x !== '');
 
 function UserChannelFollowIntro(props: Props) {
   const { subscribedChannels, channelSubscribe, onContinue, onBack } = props;
diff --git a/yarn.lock b/yarn.lock
index 7ce3461ad..65db6b317 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6411,17 +6411,17 @@ lazy-val@^1.0.4:
     yargs "^13.2.2"
     zstd-codec "^0.1.1"
 
-lbry-redux@lbryio/lbry-redux#e10295b5ec2ef42426755ed9fd50bd250b0d76dd:
+lbry-redux@lbryio/lbry-redux#90012bf47c170f244039261548dab7c7597046dc:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/e10295b5ec2ef42426755ed9fd50bd250b0d76dd"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/90012bf47c170f244039261548dab7c7597046dc"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"
     uuid "^3.3.2"
 
-lbryinc@lbryio/lbryinc#48347494230c6d1610cfd1c0bef23924e7428288:
+lbryinc@lbryio/lbryinc#db0663fcc4a64cb082b6edc5798fafa67eb4300f:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/48347494230c6d1610cfd1c0bef23924e7428288"
+  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/db0663fcc4a64cb082b6edc5798fafa67eb4300f"
   dependencies:
     reselect "^3.0.0"