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

Merge pull request #92 from satoshilabs/receive-address-notification

Browse Source 
enhancement: receive address notification
This commit is contained in:
Vladimir Volek 2018-09-27 14:59:51 +02:00 committed by GitHub
commit badf140006
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,23 +62,40 @@ const ValueWrapper = styled.div`
`}; `};
${props => props.isVerifying && css` ${props => props.isVerifying && css`
background: ${colors.WHITE};
z-index: 10001; /* bigger than modal container */ z-index: 10001; /* bigger than modal container */
border-color: ${colors.GREEN_PRIMARY}; border-color: ${colors.WHITE};
border-width: 2px; border-width: 2px;
transform: translate(-1px, -1px); transform: translate(-1px, -1px);
background: ${colors.DIVIDER};
`}; `};
`; `;
const AddressInfoText = styled.div` const ArrowUp = styled.div`
display: block; position: absolute;
position: relative; top: 30px;
background: ${colors.WHITE}; left: 70px;
width: 0;
height: 0;
border-left: 9px solid transparent;
border-right: 9px solid transparent;
border-bottom: 9px solid black;
z-index: 10001; z-index: 10001;
width: 100%; `;
padding: 6px 12px;
transform: translate(-1px, -1px); const AddressInfoText = styled.div`
display: flex;
align-items: center;
height: 37px;
margin: 0px 2px; margin: 0px 2px;
padding: 0 14px 0 5px;
position: absolute;
top: 39px;
background: black;
color: ${colors.WHITE};
border-radius: 5px;
line-height: 37px;
z-index: 10001;
transform: translate(-1px, -1px);
`; `;
const ShowAddressButton = styled(Button)` const ShowAddressButton = styled(Button)`
@ -143,9 +160,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"
@ -182,8 +196,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"