From 920cd7edd294a886a16a8ecd4a7de9b546f241d9 Mon Sep 17 00:00:00 2001
From: Jack Mallers <jimmymowschess@gmail.com>
Date: Wed, 4 Apr 2018 15:11:24 -0500
Subject: [PATCH] fix(ReceiveMOdal): remove hardcoded alias and replace with
 dynamic alias or pubkey

---
 app/components/Wallet/ReceiveModal.js     | 4 +++-
 app/routes/app/containers/AppContainer.js | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/components/Wallet/ReceiveModal.js b/app/components/Wallet/ReceiveModal.js
index e1cc7700..2d94bf27 100644
--- a/app/components/Wallet/ReceiveModal.js
+++ b/app/components/Wallet/ReceiveModal.js
@@ -37,6 +37,7 @@ class ReceiveModal extends React.Component {
       isOpen,
       pubkey,
       address,
+      alias,
       closeReceiveModal
     } = this.props
 
@@ -55,7 +56,7 @@ class ReceiveModal extends React.Component {
         <div className={styles.content}>
           <section className={styles.left}>
             <header className={styles.header}>
-              <h2>JimmyMow</h2>
+              <h2>{alias && alias.length ? alias : pubkey.substring(0, 10)}</h2>
 
               <div className={styles.qrCodeOptions}>
                 <div className={qrCodeType === 1 && styles.active} onClick={changeQrCode}>Node Pubkey</div>
@@ -105,6 +106,7 @@ ReceiveModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   pubkey: PropTypes.string,
   address: PropTypes.string.isRequired,
+  alias: PropTypes.string.isRequired,
   closeReceiveModal: PropTypes.func.isRequired
 }
 
diff --git a/app/routes/app/containers/AppContainer.js b/app/routes/app/containers/AppContainer.js
index 5937e056..200ecad5 100644
--- a/app/routes/app/containers/AppContainer.js
+++ b/app/routes/app/containers/AppContainer.js
@@ -370,6 +370,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
     isOpen: stateProps.address.walletModal,
     pubkey: stateProps.info.data.identity_pubkey,
     address: stateProps.address.address,
+    alias: stateProps.info.data.alias,
     newAddress: dispatchProps.newAddress,
     closeReceiveModal: dispatchProps.closeWalletModal
   }