Merge pull request #2297 from lbryio/normalization-fixes

Normalization fixes

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.30.0] - [Unreleased]
+
+### Added
+
+### Changed
+
+- Minor changes for normalization hardfork ([#2297](https://github.com/lbryio/lbry-desktop/pull/2297))
+
+### Fixed
+
 ## [0.29.1] - 2019-3-1
 
 ### Fixed

src/renderer/page/show/view.jsx

@@ -42,17 +42,22 @@ class ShowPage extends React.PureComponent<Props> {
 
     let innerContent = '';
 
-    if ((isResolvingUri && !claim) || !claim) {
+    if (isResolvingUri || !claim || !claim.name) {
+      if (claim && !claim.name) {
+        // While testing the normalization changes, Brannon found that `name` was missing sometimes
+        // This shouldn't happen, so hopefully this helps track it down
+        console.error('No name for associated claim: ', claim.claim_id);
+      }
+
       innerContent = (
         <Page notContained>
           {isResolvingUri && <BusyIndicator message={__('Loading decentralized data...')} />}
-          {claim === null &&
+          {!isResolvingUri && (
-            !isResolvingUri && (
+            <span className="empty">{__("There's nothing available at this location.")}</span>
-              <span className="empty">{__("There's nothing at this location.")}</span>
           )}
         </Page>
       );
-    } else if (claim && claim.name.length && claim.name[0] === '@') {
+    } else if (claim.name.length && claim.name[0] === '@') {
       innerContent = <ChannelPage uri={uri} />;
     } else if (claim && blackListedOutpoints) {
       let isClaimBlackListed = false;