From fc0a0ed6bc76d89bbb58862ae6b5fd82e5959fae Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Fri, 15 Nov 2019 10:13:19 -0500
Subject: [PATCH] rc-fixes

---
 ui/modal/modalPublish/view.jsx |  2 +-
 ui/page/show/view.jsx          | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui/modal/modalPublish/view.jsx b/ui/modal/modalPublish/view.jsx
index 3d519bea5..23d8aa4cb 100644
--- a/ui/modal/modalPublish/view.jsx
+++ b/ui/modal/modalPublish/view.jsx
@@ -42,7 +42,7 @@ class ModalPublishSuccess extends React.PureComponent<Props> {
           })}
         </p>
         <div className="card--inline">
-          <ClaimPreview uri={uri} />
+          <ClaimPreview type="small" uri={uri} />
         </div>
         <p className="help">
           {filePath && !IS_WEB && (
diff --git a/ui/page/show/view.jsx b/ui/page/show/view.jsx
index ec1656a90..c355a6245 100644
--- a/ui/page/show/view.jsx
+++ b/ui/page/show/view.jsx
@@ -26,20 +26,22 @@ function ShowPage(props: Props) {
   const { isResolvingUri, resolveUri, uri, claim, blackListedOutpoints, location, title } = props;
   const { channelName, channelClaimId, streamName, streamClaimId } = parseURI(uri);
   const signingChannel = claim && claim.signing_channel;
+  const canonicalUrl = claim && claim.canonical_url;
 
   useEffect(() => {
     // @if TARGET='web'
-    if (claim && claim.canonical_url) {
-      const canonicalUrlPath = '/' + claim.canonical_url.replace(/^lbry:\/\//, '').replace(/#/g, ':');
+    if (canonicalUrl) {
+      const canonicalUrlPath = '/' + canonicalUrl.replace(/^lbry:\/\//, '').replace(/#/g, ':');
       if (canonicalUrlPath !== window.location.pathname) {
         history.replaceState(history.state, '', canonicalUrlPath);
       }
     }
     // @endif
-    if (resolveUri && !isResolvingUri && uri && claim === undefined) {
+
+    if (resolveUri && !isResolvingUri && uri && (claim === undefined || !canonicalUrl)) {
       resolveUri(uri);
     }
-  }, [resolveUri, isResolvingUri, claim, uri]);
+  }, [resolveUri, isResolvingUri, canonicalUrl, uri]);
 
   useEffect(() => {
     if (title) {