arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-27 10:48:22 +00:00
Code Issues Releases Wiki Activity

fix receive address eye icon and DeviceIcon

Browse Source
This commit is contained in:
slowbackspace 2019-03-25 11:29:33 +01:00
parent 6a673d3d00
commit 71d348d9c2
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/images/DeviceIcon/index.js
View File

@ -30,10 +30,20 @@ const DeviceIcon = ({
color = COLORS.TEXT_SECONDARY,
hoverColor,
onClick,
...rest
}: Props) => {
const majorVersion = device.features ? device.features.major_version : 2;
const icon = getDeviceIcon(majorVersion);
return <Icon icon={icon} hoverColor={hoverColor} onClick={onClick} color={color} size={size} />;
return (
<Icon
icon={icon}
hoverColor={hoverColor}
onClick={onClick}
color={color}
size={size}
{...rest}
/>
);
};
DeviceIcon.propTypes = {

2
src/views/Wallet/views/Account/Receive/ethereum/index.js
View File

@ -78,7 +78,7 @@ const QrWrapper = styled.div`
`;
const StyledDeviceIcon = styled(DeviceIcon)`
margin-right: 6px;
margin: 0 6px;
`;
const AccountReceive = (props: Props) => {

16
src/views/Wallet/views/Account/Receive/ripple/index.js
View File

@ -59,9 +59,7 @@ const ShowAddressButton = styled(Button)`
const EyeButton = styled(Button)`
z-index: 10001;
padding: 0;
width: 30px;
background: transparent;
top: 5px;
top: 12px;
position: absolute;
right: 10px;
@ -85,6 +83,10 @@ const QrWrapper = styled.div`
flex-direction: column;
`;
const StyledDeviceIcon = styled(DeviceIcon)`
margin: 0 6px;
`;
const AccountReceive = (props: Props) => {
const device = props.wallet.selectedDevice;
const { account, discovery, shouldRender } = props.selectedAccount;
@ -124,7 +126,11 @@ const AccountReceive = (props: Props) => {
trezorAction={
isAddressVerifying ? (
<React.Fragment>
<DeviceIcon device={device} color={colors.WHITE} />
<StyledDeviceIcon
size={16}
device={device}
color={colors.WHITE}
/>
<FormattedMessage
{...l10nReceiveMessages.TR_CHECK_ADDRESS_ON_TREZOR}
/>
@ -145,9 +151,11 @@ const AccountReceive = (props: Props) => {
}
>
<EyeButton
isTransparent
onClick={() => props.showAddress(account.accountPath)}
>
<Icon
size={16}
icon={
addressUnverified
? ICONS.EYE_CROSSED