diff --git a/src/views/Wallet/views/Account/Receive/ethereum/index.js b/src/views/Wallet/views/Account/Receive/ethereum/index.js index 04f67c0d..5e6741c2 100644 --- a/src/views/Wallet/views/Account/Receive/ethereum/index.js +++ b/src/views/Wallet/views/Account/Receive/ethereum/index.js @@ -3,15 +3,10 @@ import React from 'react'; import { QRCode } from 'react-qr-svg'; import styled from 'styled-components'; 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 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 ICONS from 'config/icons'; import colors from 'config/colors'; import { CONTEXT_DEVICE } from 'actions/constants/modal'; @@ -42,8 +37,6 @@ const StyledQRCode = styled(QRCode)` `; const ShowAddressButton = styled(Button)` - min-width: 195px; - padding: 0; white-space: nowrap; display: flex; 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)` z-index: 10001; padding: 0; @@ -177,10 +164,10 @@ const AccountReceive = (props: Props) => { /> {!(addressVerified || addressUnverified) && ( props.showAddress(account.accountPath)} isDisabled={device.connected && !discovery.completed} > - )} diff --git a/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js b/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js index 2afa2880..90f8adce 100644 --- a/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js +++ b/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js @@ -4,13 +4,14 @@ import * as React from 'react'; import styled from 'styled-components'; import colors from 'config/colors'; import { FormattedMessage, injectIntl } from 'react-intl'; - -import Link from 'components/Link'; -import Input from 'components/inputs/Input'; -import Textarea from 'components/Textarea'; -import Tooltip from 'components/Tooltip'; -import Icon from 'components/Icon'; -import ICONS from 'config/icons'; +import { + Link, + Input, + TextArea as Textarea, + Tooltip, + Icon, + icons as ICONS, +} from 'trezor-ui-components'; import { FONT_SIZE } from 'config/variables'; import l10nMessages from './index.messages'; diff --git a/src/views/Wallet/views/Account/Send/ethereum/index.js b/src/views/Wallet/views/Account/Send/ethereum/index.js index 161801c0..87765e6d 100644 --- a/src/views/Wallet/views/Account/Send/ethereum/index.js +++ b/src/views/Wallet/views/Account/Send/ethereum/index.js @@ -3,12 +3,8 @@ import React from 'react'; import BigNumber from 'bignumber.js'; import styled, { css } from 'styled-components'; -import { Select } from 'components/Select'; -import Button from 'components/Button'; -import Input from 'components/inputs/Input'; -import Icon from 'components/Icon'; -import Link from 'components/Link'; -import ICONS from 'config/icons'; +import { Select, Button, Input, Link, Icon } from 'trezor-ui-components'; +import ICONS from 'config/icons'; // TODO import icons from TUC import { FONT_SIZE, FONT_WEIGHT, TRANSITION } from 'config/variables'; import colors from 'config/colors'; import Title from 'views/Wallet/components/Title';