arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-12-26 17:08:07 +00:00
Code Issues Releases Wiki Activity

fixed conflicts in AccountReceive component

Browse Source
This commit is contained in:
Szymon Lesisz 2018-10-01 15:44:05 +02:00
parent 7083c6e0d1
commit 740e7ef473
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/Wallet/views/AccountReceive/index.js
View File

@ -133,10 +133,9 @@ const AccountReceive = (props: Props) => {
const { const {
account, account,
discovery, discovery,
shouldRender,
} = props.selectedAccount; } = props.selectedAccount;
if (!device || !account || !discovery || !shouldRender) return null; if (!device || !account || !discovery) return null;
const { const {
addressVerified, addressVerified,
@ -158,9 +157,6 @@ const AccountReceive = (props: Props) => {
<AddressWrapper <AddressWrapper
isShowingQrCode={addressVerified || addressUnverified} isShowingQrCode={addressVerified || addressUnverified}
> >
{isAddressVerifying && (
<AddressInfoText>Confirm address on TREZOR</AddressInfoText>
)}
{((addressVerified || addressUnverified) && !isAddressVerifying) && ( {((addressVerified || addressUnverified) && !isAddressVerifying) && (
<Tooltip <Tooltip
placement="bottomRight" placement="bottomRight"
@ -197,8 +193,20 @@ const AccountReceive = (props: Props) => {
>{address} >{address}
</ValueWrapper> </ValueWrapper>
{isAddressVerifying && ( {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) && ( {(addressVerified || addressUnverified) && (
<QRCode <QRCode
bgColor="#FFFFFF" bgColor="#FFFFFF"