From 482f62d317a3db7c18fbfae6d4ad85439a84e7d1 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Mon, 18 Mar 2019 17:41:51 +0100 Subject: [PATCH] even more ui components --- src/actions/ethereum/SendFormActions.js | 2 +- src/components/Footer/index.js | 3 +-- src/components/Transaction/index.js | 3 +-- src/components/modals/QrModal/index.js | 13 +++---------- .../Context/components/Static/index.js | 2 +- src/views/Landing/views/Version/index.js | 13 ++++++------- .../LeftNavigation/components/CoinMenu/index.js | 4 +--- .../DeviceMenu/components/MenuItems/index.js | 7 ++----- src/views/Wallet/components/LeftNavigation/index.js | 5 +---- 9 files changed, 17 insertions(+), 35 deletions(-) diff --git a/src/actions/ethereum/SendFormActions.js b/src/actions/ethereum/SendFormActions.js index ad1c3f0e..19fb15ab 100644 --- a/src/actions/ethereum/SendFormActions.js +++ b/src/actions/ethereum/SendFormActions.js @@ -1,6 +1,6 @@ /* @flow */ import React from 'react'; -import Link from 'components/Link'; +import { Link } from 'trezor-ui-components'; import TrezorConnect from 'trezor-connect'; import BigNumber from 'bignumber.js'; import * as ACCOUNT from 'actions/constants/account'; diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js index 7d5bda50..1282de3b 100644 --- a/src/components/Footer/index.js +++ b/src/components/Footer/index.js @@ -3,12 +3,11 @@ import styled from 'styled-components'; import PropTypes from 'prop-types'; import React from 'react'; -import Link from 'components/Link'; +import { Link, colors } from 'trezor-ui-components'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import { FormattedMessage } from 'react-intl'; -import colors from 'config/colors'; import { FONT_SIZE, SCREEN_SIZE } from 'config/variables'; import * as LogActions from 'actions/LogActions'; import l10nMessages from './index.messages'; diff --git a/src/components/Transaction/index.js b/src/components/Transaction/index.js index db923884..b36f2b52 100644 --- a/src/components/Transaction/index.js +++ b/src/components/Transaction/index.js @@ -3,8 +3,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import colors from 'config/colors'; -import Link from 'components/Link'; +import { Link, colors } from 'trezor-ui-components'; import type { Transaction, Network } from 'flowtype'; diff --git a/src/components/modals/QrModal/index.js b/src/components/modals/QrModal/index.js index 03453dfe..1c6932fb 100644 --- a/src/components/modals/QrModal/index.js +++ b/src/components/modals/QrModal/index.js @@ -5,14 +5,7 @@ import PropTypes from 'prop-types'; import QrReader from 'react-qr-reader'; import styled from 'styled-components'; import { FormattedMessage, injectIntl } from 'react-intl'; - -import colors from 'config/colors'; -import icons from 'config/icons'; - -import { H2 } from 'components/Heading'; -import P from 'components/Paragraph'; -import Icon from 'components/Icon'; -import Link from 'components/Link'; +import { Link, Icon, P, H5, icons, colors } from 'trezor-ui-components'; import { parseUri } from 'utils/cryptoUriParser'; import type { parsedURI } from 'utils/cryptoUriParser'; @@ -144,9 +137,9 @@ class QrModal extends Component { -

+

-
+ {!this.state.readerLoaded && !this.state.error && ( diff --git a/src/components/notifications/Context/components/Static/index.js b/src/components/notifications/Context/components/Static/index.js index fa148ea1..ee4fab30 100644 --- a/src/components/notifications/Context/components/Static/index.js +++ b/src/components/notifications/Context/components/Static/index.js @@ -3,7 +3,7 @@ import * as React from 'react'; import Notification from 'components/Notification'; import Bignumber from 'bignumber.js'; -import Link from 'components/Link'; +import { Link } from 'trezor-ui-components'; import { FormattedMessage } from 'react-intl'; import l10nCommonMessages from 'views/common.messages'; import l10nMessages from './index.messages'; diff --git a/src/views/Landing/views/Version/index.js b/src/views/Landing/views/Version/index.js index 7c8b76f7..d828c89d 100644 --- a/src/views/Landing/views/Version/index.js +++ b/src/views/Landing/views/Version/index.js @@ -1,8 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { H3, H2 } from 'components/Heading'; import LandingWrapper from 'views/Landing/components/LandingWrapper'; -import Link from 'components/Link'; +import { Link, H5, H6 } from 'trezor-ui-components'; const Wrapper = styled.div` display: flex; @@ -19,12 +18,12 @@ const Line = styled.div` const Version = () => ( -

APPLICATION VERSION

-

{VERSION}

+
APPLICATION VERSION
+
{VERSION}
-

LAST COMMIT HASH

- -

{COMMITHASH}

+
LAST COMMIT HASH
+ +
{COMMITHASH}
 diff --git a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js index 30be38bb..975d4622 100644 --- a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js @@ -2,12 +2,10 @@ import styled from 'styled-components'; import coins from 'constants/coins'; -import colors from 'config/colors'; -import ICONS from 'config/icons'; import PropTypes from 'prop-types'; import React, { PureComponent } from 'react'; +import { Link, colors, icons as ICONS } from 'trezor-ui-components'; import { NavLink } from 'react-router-dom'; -import Link from 'components/Link'; import { FormattedMessage } from 'react-intl'; import Divider from '../Divider'; import RowCoin from '../RowCoin'; diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js index 7bd10306..4171be63 100644 --- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js @@ -1,14 +1,11 @@ import React, { PureComponent } from 'react'; import styled from 'styled-components'; import PropTypes from 'prop-types'; -import Icon from 'components/Icon'; -import Link from 'components/Link'; -import DeviceIcon from 'components/images/DeviceIcon'; import { FormattedMessage } from 'react-intl'; import { getPattern } from 'support/routes'; -import icons from 'config/icons'; -import colors from 'config/colors'; +import { Link, Icon, colors, icons } from 'trezor-ui-components'; +import DeviceIcon from 'components/images/DeviceIcon'; import { FONT_SIZE } from 'config/variables'; import l10nCommonMessages from 'views/common.messages'; diff --git a/src/views/Wallet/components/LeftNavigation/index.js b/src/views/Wallet/components/LeftNavigation/index.js index e5e6bc4d..bb665f49 100644 --- a/src/views/Wallet/components/LeftNavigation/index.js +++ b/src/views/Wallet/components/LeftNavigation/index.js @@ -2,18 +2,15 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import colors from 'config/colors'; +import { Icon, Tooltip, icons, colors } from 'trezor-ui-components'; import { FONT_SIZE } from 'config/variables'; -import Icon from 'components/Icon'; import WalletTypeIcon from 'components/images/WalletType'; -import icons from 'config/icons'; import { TransitionGroup, CSSTransition } from 'react-transition-group'; import styled from 'styled-components'; import DeviceHeader from 'components/DeviceHeader'; // import Link from 'components/Link'; import * as deviceUtils from 'utils/device'; -import Tooltip from 'components/Tooltip'; import { FormattedMessage } from 'react-intl'; // import { getPattern } from 'support/routes'; import AccountMenu from './components/AccountMenu';