From b596806fbcf7d8156338d8300a5cff7dd7e9c370 Mon Sep 17 00:00:00 2001
From: 6ea86b96 <6ea86b96@gmail.com>
Date: Thu, 8 Jun 2017 13:04:49 +0700
Subject: [PATCH] Refresh claim data when show page is mounted

---
 ui/js/page/showPage/view.jsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/js/page/showPage/view.jsx b/ui/js/page/showPage/view.jsx
index 2ef928c99..0c1bd830b 100644
--- a/ui/js/page/showPage/view.jsx
+++ b/ui/js/page/showPage/view.jsx
@@ -6,15 +6,13 @@ import FilePage from "page/filePage";
 
 class ShowPage extends React.PureComponent {
   componentWillMount() {
-    this.resolve(this.props);
+    const { isResolvingUri, resolveUri, uri } = this.props;
+
+    if (!isResolvingUri) resolveUri(uri);
   }
 
   componentWillReceiveProps(nextProps) {
-    this.resolve(nextProps);
-  }
-
-  resolve(props) {
-    const { isResolvingUri, resolveUri, claim, uri } = props;
+    const { isResolvingUri, resolveUri, claim, uri } = this.props;
 
     if (!isResolvingUri && claim === undefined && uri) {
       resolveUri(uri);
@@ -26,7 +24,7 @@ class ShowPage extends React.PureComponent {
 
     let innerContent = "";
 
-    if (isResolvingUri || !claim) {
+    if (isResolvingUri && !claim) {
       innerContent = (
         <section className="card">
           <div className="card__inner">
@@ -44,7 +42,7 @@ class ShowPage extends React.PureComponent {
           </div>
         </section>
       );
-    } else if (claim.name.length && claim.name[0] === "@") {
+    } else if (claim && claim.name.length && claim.name[0] === "@") {
       innerContent = <ChannelPage uri={uri} />;
     } else if (claim) {
       innerContent = <FilePage uri={uri} />;