From 208312b239355194de13989a3ede57e8d7393949 Mon Sep 17 00:00:00 2001
From: Esteban MIno <efmino@uc.cl>
Date: Thu, 30 Aug 2018 12:59:44 -0300
Subject: fix watched asset image rendering on confirm transaction header

---
 .../confirm-page-container/confirm-page-container.component.js        | 2 ++
 .../components/sender-to-recipient/sender-to-recipient.component.js   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/app/components/confirm-page-container/confirm-page-container.component.js b/ui/app/components/confirm-page-container/confirm-page-container.component.js
index 85b168060..b1582051e 100644
--- a/ui/app/components/confirm-page-container/confirm-page-container.component.js
+++ b/ui/app/components/confirm-page-container/confirm-page-container.component.js
@@ -74,6 +74,7 @@ export default class ConfirmPageContainer extends Component {
       assetImage,
       warning,
     } = this.props
+    const renderAssetImage = contentComponent || (!contentComponent && !identiconAddress)
 
     return (
       <div className="page-container">
@@ -86,6 +87,7 @@ export default class ConfirmPageContainer extends Component {
             senderAddress={fromAddress}
             recipientName={toName}
             recipientAddress={toAddress}
+            assetImage={renderAssetImage ? assetImage : undefined}
           />
         </ConfirmPageContainerHeader>
         {
diff --git a/ui/app/components/sender-to-recipient/sender-to-recipient.component.js b/ui/app/components/sender-to-recipient/sender-to-recipient.component.js
index 5af4045f5..445a11d8a 100644
--- a/ui/app/components/sender-to-recipient/sender-to-recipient.component.js
+++ b/ui/app/components/sender-to-recipient/sender-to-recipient.component.js
@@ -20,6 +20,7 @@ export default class SenderToRecipient extends PureComponent {
     t: PropTypes.func,
     variant: PropTypes.oneOf([DEFAULT_VARIANT, CARDS_VARIANT]),
     addressOnly: PropTypes.bool,
+    assetImage: PropTypes.string,
   }
 
   static defaultProps = {
@@ -66,13 +67,14 @@ export default class SenderToRecipient extends PureComponent {
   }
 
   renderRecipientIdenticon () {
-    const { recipientAddress } = this.props
+    const { recipientAddress, assetImage } = this.props
 
     return !this.props.addressOnly && (
       <div className="sender-to-recipient__sender-icon">
         <Identicon
           address={recipientAddress}
           diameter={24}
+          image={assetImage}
         />
       </div>
     )
-- 
cgit v1.2.3