From b33695c29503b6540d7cca70d1c6051baa05ad32 Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Thu, 16 Jan 2020 22:38:16 -0500
Subject: [PATCH] show channelName instead of full url introducing referrer
 channel clear referrer modal error on close

---
 ui/component/invited/view.jsx      |  4 ++--
 ui/modal/modalSetReferrer/view.jsx | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ui/component/invited/view.jsx b/ui/component/invited/view.jsx
index 06eafc896..8624889bd 100644
--- a/ui/component/invited/view.jsx
+++ b/ui/component/invited/view.jsx
@@ -37,7 +37,7 @@ function Invited(props: Props) {
   } = props;
 
   const refUri = referrer && 'lbry://' + referrer.replace(':', '#');
-  const referrerIsChannel = parseURI(refUri).isChannel;
+  const { isChannel: referrerIsChannel, claimName: referrerChannelName } = parseURI(refUri);
   const rewardsApproved = user && user.is_reward_approved;
   const hasVerifiedEmail = user && user.has_verified_email;
   const referredRewardAvailable = rewards && rewards.some(reward => reward.reward_type === REWARDS.TYPE_REFEREE);
@@ -125,7 +125,7 @@ function Invited(props: Props) {
           referrerIsChannel
             ? __(
                 `Content freedom and and a present from %channel_name% are waiting for you. Create an account to claim it.`,
-                { channel_name: referrer }
+                { channel_name: referrerChannelName }
               )
             : __(`Content freedom and a present are waiting for you. Create an account to claim it.`)
         }
diff --git a/ui/modal/modalSetReferrer/view.jsx b/ui/modal/modalSetReferrer/view.jsx
index 4c893c81a..0e39b973b 100644
--- a/ui/modal/modalSetReferrer/view.jsx
+++ b/ui/modal/modalSetReferrer/view.jsx
@@ -29,6 +29,7 @@ class ModalSetReferrer extends React.PureComponent<Props, State> {
     };
 
     (this: any).handleSubmit = this.handleSubmit.bind(this);
+    (this: any).handleClose = this.handleClose.bind(this);
     (this: any).handleTextChange = this.handleTextChange.bind(this);
   }
 
@@ -38,6 +39,14 @@ class ModalSetReferrer extends React.PureComponent<Props, State> {
     setReferrer(referrer, true);
   }
 
+  handleClose() {
+    const { referrerSetError, resetReferrerError, closeModal } = this.props;
+    if (referrerSetError) {
+      resetReferrerError();
+    }
+    closeModal();
+  }
+
   handleTextChange(e: SyntheticInputEvent<*>) {
     const { referrerSetError, resetReferrerError } = this.props;
 
@@ -79,8 +88,7 @@ class ModalSetReferrer extends React.PureComponent<Props, State> {
                 />
               </Form>
               <div className="card__actions">
-                <Button button="primary" label={__('Done')} onClick={closeModal} />
-                <Button button="link" label={__('Close')} onClick={closeModal} />
+                <Button button="primary" label={__('Done')} onClick={this.handleClose} />
               </div>
             </React.Fragment>
           }