arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-01-09 15:40:55 +00:00
Code Issues Releases Wiki Activity

import from tuc in Send/Receive/SignnVerify

Browse Source
This commit is contained in:
slowbackspace 2019-03-10 10:19:27 +01:00
parent 7c4b2ceb9a
commit 3e897def5b
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,15 +3,10 @@ import React from 'react';
import { QRCode } from 'react-qr-svg'; import { QRCode } from 'react-qr-svg';
import styled from 'styled-components'; import styled from 'styled-components';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { Button, Icon, Tooltip, Input, icons as ICONS } from 'trezor-ui-components';
import Title from 'views/Wallet/components/Title'; import Title from 'views/Wallet/components/Title';
import Button from 'components/Button';
import Icon from 'components/Icon';
import Tooltip from 'components/Tooltip';
import Input from 'components/inputs/Input';
import DeviceIcon from 'components/images/DeviceIcon'; import DeviceIcon from 'components/images/DeviceIcon';
import ICONS from 'config/icons';
import colors from 'config/colors'; import colors from 'config/colors';
import { CONTEXT_DEVICE } from 'actions/constants/modal'; import { CONTEXT_DEVICE } from 'actions/constants/modal';
@ -42,8 +37,6 @@ const StyledQRCode = styled(QRCode)`
`; `;
const ShowAddressButton = styled(Button)` const ShowAddressButton = styled(Button)`
min-width: 195px;
padding: 0;
white-space: nowrap; white-space: nowrap;
display: flex; display: flex;
height: 40px; height: 40px;
@ -61,12 +54,6 @@ const ShowAddressButton = styled(Button)`
} }
`; `;
const ShowAddressIcon = styled(Icon)`
margin-right: 7px;
position: relative;
top: 2px;
`;
const EyeButton = styled(Button)` const EyeButton = styled(Button)`
z-index: 10001; z-index: 10001;
padding: 0; padding: 0;
@ -177,10 +164,10 @@ const AccountReceive = (props: Props) => {
/> />
{!(addressVerified || addressUnverified) && ( {!(addressVerified || addressUnverified) && (
<ShowAddressButton <ShowAddressButton
icon={ICONS.EYE}
onClick={() => props.showAddress(account.accountPath)} onClick={() => props.showAddress(account.accountPath)}
isDisabled={device.connected && !discovery.completed} isDisabled={device.connected && !discovery.completed}
> >
<ShowAddressIcon icon={ICONS.EYE} color={colors.WHITE} />
<FormattedMessage {...l10nReceiveMessages.TR_SHOW_FULL_ADDRESS} /> <FormattedMessage {...l10nReceiveMessages.TR_SHOW_FULL_ADDRESS} />
</ShowAddressButton> </ShowAddressButton>
)} )}

15
src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js
View File

@ -4,13 +4,14 @@ import * as React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import colors from 'config/colors'; import colors from 'config/colors';
import { FormattedMessage, injectIntl } from 'react-intl'; import { FormattedMessage, injectIntl } from 'react-intl';
import {
import Link from 'components/Link'; Link,
import Input from 'components/inputs/Input'; Input,
import Textarea from 'components/Textarea'; TextArea as Textarea,
import Tooltip from 'components/Tooltip'; Tooltip,
import Icon from 'components/Icon'; Icon,
import ICONS from 'config/icons'; icons as ICONS,
} from 'trezor-ui-components';
import { FONT_SIZE } from 'config/variables'; import { FONT_SIZE } from 'config/variables';
import l10nMessages from './index.messages'; import l10nMessages from './index.messages';

8
src/views/Wallet/views/Account/Send/ethereum/index.js
View File

@ -3,12 +3,8 @@
import React from 'react'; import React from 'react';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import styled, { css } from 'styled-components'; import styled, { css } from 'styled-components';
import { Select } from 'components/Select'; import { Select, Button, Input, Link, Icon } from 'trezor-ui-components';
import Button from 'components/Button'; import ICONS from 'config/icons'; // TODO import icons from TUC
import Input from 'components/inputs/Input';
import Icon from 'components/Icon';
import Link from 'components/Link';
import ICONS from 'config/icons';
import { FONT_SIZE, FONT_WEIGHT, TRANSITION } from 'config/variables'; import { FONT_SIZE, FONT_WEIGHT, TRANSITION } from 'config/variables';
import colors from 'config/colors'; import colors from 'config/colors';
import Title from 'views/Wallet/components/Title'; import Title from 'views/Wallet/components/Title';