fix: merge conflict

fix merge conflict
fix: publish button disabled for file uploads
2019-09-24 17:25:14 +01:00 · 2019-09-23 18:52:33 +01:00 · 2019-09-23 17:13:36 +01:00 · 2019-09-23 16:49:49 +01:00 · 2019-09-23 16:46:36 +01:00 · 2019-09-23 09:41:02 +01:00
1 changed files with 12 additions and 0 deletions
--- a/src/page/publish/view.js
+++ b/src/page/publish/view.js
@ -410,6 +410,18 @@ class PublishPage extends React.PureComponent {
      this.onComponentFocused();
    }

+    if (publishFormValues) {
+      if (publishFormValues.thumbnail && !this.state.uploadedThumbnailUri) {
+        const { thumbnail } = publishFormValues;
+        updatePublishFormState({ currentThumbnailUri: thumbnail, uploadedThumbnailUri: thumbnail });
+        this.setState({
+          currentThumbnailUri: thumbnail,
+          uploadedThumbnailUri: thumbnail,
+          uploadThumbnailStarted: false,
+        });
+      }
+    }
+
    if (
      this.state.currentPhase === Constants.PHASE_DETAILS &&
      prevDrawerStack[prevDrawerStack.length - 1].route === Constants.DRAWER_ROUTE_PUBLISH_FORM &&
Author	SHA1	Message	Date
Akinwale Ariwodola	ab4e7ee84d	fix: merge conflict	2019-09-24 17:25:14 +01:00
Akinwale Ariwodola	2466d1f0b5	fix merge conflict	2019-09-23 18:52:33 +01:00
Akinwale Ariwodola	0ddeaf0f27	fix: publish button disabled for file uploads	2019-09-23 17:13:36 +01:00
Akinwale Ariwodola	bd23736c37	fix typo	2019-09-23 16:49:49 +01:00
Akinwale Ariwodola	2cc4177bbe	remove console.log calls	2019-09-23 16:46:36 +01:00
Akinwale Ariwodola	deb863a94c	fix errors and user shared state	2019-09-23 09:41:02 +01:00
Akinwale Ariwodola	63655270f2	sync user settings	2019-09-20 17:46:07 +01:00