From 16787316018f488a2e1dcd47bb971efdaa47e2f1 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 13 Sep 2019 08:48:33 +0100
Subject: [PATCH 1/3] fix channel selector issues on publish page

---
 src/component/channelSelector/view.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/component/channelSelector/view.js b/src/component/channelSelector/view.js
index 4584ce9..e5e8c29 100644
--- a/src/component/channelSelector/view.js
+++ b/src/component/channelSelector/view.js
@@ -30,11 +30,14 @@ export default class ChannelSelector extends React.PureComponent {
     if (!channels.length && !fetchingChannels) {
       fetchChannelListMine();
     }
+    this.setState({ currentSelectedValue: channelName });
   }
 
-  componentDidUpdate() {
-    const { channelName } = this.props;
-    if (this.state.currentSelectedValue !== channelName) {
+  componentWillReceiveProps(nextProps) {
+    const { channels: prevChannels = [], channelName } = this.props;
+    const { channels = [] } = nextProps;
+
+    if (channels.length !== prevChannels.length && channelName !== this.state.currentSelectedValue) {
       this.setState({ currentSelectedValue: channelName });
     }
   }
-- 
2.45.2


From ab9a7f183cf52bfdfb39ffd857f6525ab1239649 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 13 Sep 2019 08:51:46 +0100
Subject: [PATCH 2/3] remove future release warning

---
 src/page/publish/view.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/page/publish/view.js b/src/page/publish/view.js
index 908694b..b786dc8 100644
--- a/src/page/publish/view.js
+++ b/src/page/publish/view.js
@@ -1035,13 +1035,6 @@ class PublishPage extends React.PureComponent {
             />
           </View>
 
-          <View style={publishStyle.warning}>
-            <Text style={publishStyle.warningText}>
-              Please ensure that you have filled everything correctly as you cannot edit published content in this
-              release. This feature will be available in a future release.
-            </Text>
-          </View>
-
           <View style={publishStyle.actionButtons}>
             {(this.state.publishStarted || publishFormValues.publishing) && (
               <View style={publishStyle.progress}>
-- 
2.45.2


From 46ec1feb929f655e17ad9fa707327959a3a985cb Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Sun, 15 Sep 2019 12:01:34 +0100
Subject: [PATCH 3/3] fix channel creation error

---
 package.json                    | 2 +-
 src/page/channelCreator/view.js | 2 +-
 src/page/publish/view.js        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 89c12a7..37ce2c8 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
         "base-64": "^0.1.0",
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
-        "lbry-redux": "lbryio/lbry-redux#3133ea60b0302c162f7b6f67cc858997f1d2ab52",
+        "lbry-redux": "lbryio/lbry-redux#123efacf4d45289ebda9dc291976d475de227a55",
         "lbryinc": "lbryio/lbryinc#b9f354ae50bd57691765a7d042c5054167878bf4",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
diff --git a/src/page/channelCreator/view.js b/src/page/channelCreator/view.js
index 900eba2..8a4af4a 100644
--- a/src/page/channelCreator/view.js
+++ b/src/page/channelCreator/view.js
@@ -388,7 +388,7 @@ export default class ChannelCreator extends React.PureComponent {
       return;
     }
 
-    if (email.trim().length > 0 && (email.indexOf('@') === -1 || email.indexOf('.') === -1)) {
+    if (email && email.trim().length > 0 && (email.indexOf('@') === -1 || email.indexOf('.') === -1)) {
       notify({ message: 'Please provide a valid email address.' });
       return;
     }
diff --git a/src/page/publish/view.js b/src/page/publish/view.js
index b786dc8..e8c2b80 100644
--- a/src/page/publish/view.js
+++ b/src/page/publish/view.js
@@ -1038,7 +1038,7 @@ class PublishPage extends React.PureComponent {
           <View style={publishStyle.actionButtons}>
             {(this.state.publishStarted || publishFormValues.publishing) && (
               <View style={publishStyle.progress}>
-                <ActivityIndicator size={'small'} color={Colors.LbryGreen} />
+                <ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />
               </View>
             )}
 
-- 
2.45.2