Merge branch 'master' into autoplay

CHANGELOG.md

@@ -16,8 +16,8 @@ Web UI version numbers should always match the corresponding version of LBRY App
   *
 
 ### Fixed
-  *
-  *
+  * Closing modal dialogs was broken on some download and stream errors
+  * Discover landing page improperly showed loading error when it was loading correctly
 
 ### Deprecated
   *

ui/js/component/fileActions/view.jsx

@@ -122,7 +122,7 @@ class FileActions extends React.Component {
             <DropDownMenuItem key={1} onClick={() => openModal('confirmRemove')} label="Remove..." />
           </DropDownMenu> : '' }
         <Modal type="confirm" isOpen={modal == 'affirmPurchase'}
-               contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase.bind(this)} onAborted={this.props.closeModal}>
+               contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase.bind(this)} onAborted={closeModal}>
           This will purchase <strong>{title}</strong> for <strong><FilePrice uri={uri} look="plain" /></strong> credits.
         </Modal>
         <Modal isOpen={modal == 'notEnoughCredits'} contentLabel="Not enough credits"

ui/js/component/video/view.jsx

@@ -52,7 +52,7 @@ class VideoPlayButton extends React.Component {
             className="video__play-button"
             icon="icon-play"
             onClick={this.onWatchClick.bind(this)} />
-      <Modal contentLabel="Not enough credits" isOpen={modal == 'notEnoughCredits'} onConfirmed={() => { this.closeModal() }}>
+      <Modal contentLabel="Not enough credits" isOpen={modal == 'notEnoughCredits'} onConfirmed={closeModal}>
         You don't have enough LBRY credits to pay for this stream.
       </Modal>
       <Modal
@@ -64,7 +64,7 @@ class VideoPlayButton extends React.Component {
         This will purchase <strong>{title}</strong> for <strong><FilePrice uri={uri} look="plain" /></strong> credits.
       </Modal>
       <Modal
-        isOpen={modal == 'timedOut'} onConfirmed={() => { this.closeModal() }} contentLabel="Timed Out">
+        isOpen={modal == 'timedOut'} onConfirmed={closeModal} contentLabel="Timed Out">
         Sorry, your download timed out :(
       </Modal>
     </div>);

ui/js/page/discover/view.jsx

@@ -33,6 +33,10 @@ class DiscoverPage extends React.Component{
       featuredUris,
       fetchingFeaturedUris,
     } = this.props
+    const failedToLoad = !fetchingFeaturedUris && (
+      featuredUris === undefined ||
+      (featuredUris !== undefined && Object.keys(featuredUris).length === 0)
+    )
 
     return (
       <main>
@@ -47,7 +51,7 @@ class DiscoverPage extends React.Component{
           ))
         }
         {
-          typeof featuredUris !== undefined &&
+        failedToLoad &&
           <div className="empty">Failed to load landing content.</div>
         }
       </main>