From 740e7ef473dbcc7ecd7772144681f0a93cf63772 Mon Sep 17 00:00:00 2001
From: Szymon Lesisz <sz.lesisz@gmail.com>
Date: Mon, 1 Oct 2018 15:44:05 +0200
Subject: [PATCH] fixed conflicts in AccountReceive component

---
 .../Wallet/views/AccountReceive/index.js      | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/Wallet/views/AccountReceive/index.js b/src/views/Wallet/views/AccountReceive/index.js
index 9e80b195..202ceee1 100644
--- a/src/views/Wallet/views/AccountReceive/index.js
+++ b/src/views/Wallet/views/AccountReceive/index.js
@@ -133,10 +133,9 @@ const AccountReceive = (props: Props) => {
     const {
         account,
         discovery,
-        shouldRender,
     } = props.selectedAccount;
 
-    if (!device || !account || !discovery || !shouldRender) return null;
+    if (!device || !account || !discovery) return null;
 
     const {
         addressVerified,
@@ -158,9 +157,6 @@ const AccountReceive = (props: Props) => {
             <AddressWrapper
                 isShowingQrCode={addressVerified || addressUnverified}
             >
-                {isAddressVerifying && (
-                    <AddressInfoText>Confirm address on TREZOR</AddressInfoText>
-                )}
                 {((addressVerified || addressUnverified) && !isAddressVerifying) && (
                     <Tooltip
                         placement="bottomRight"
@@ -197,8 +193,20 @@ const AccountReceive = (props: Props) => {
                 >{address}
                 </ValueWrapper>
                 {isAddressVerifying && (
-                    <AddressInfoText>{account.network} account #{account.index + 1}</AddressInfoText>
+                    <React.Fragment>
+                        <ArrowUp />
+                        <AddressInfoText>
+                            <Icon
+                                icon={ICONS.T1}
+                                color={colors.WHITE}
+                            />
+                            Check address on your Trezor
+                        </AddressInfoText>
+                    </React.Fragment>
                 )}
+                {/* {isAddressVerifying && (
+                    <AddressInfoText>{account.network} account #{account.index + 1}</AddressInfoText>
+                )} */}
                 {(addressVerified || addressUnverified) && (
                     <QRCode
                         bgColor="#FFFFFF"
@@ -225,4 +233,4 @@ const AccountReceive = (props: Props) => {
     );
 };
 
-export default AccountReceive;
+export default AccountReceive;
\ No newline at end of file