1
0
mirror of https://github.com/trezor/trezor-wallet synced 2024-12-25 00:18:07 +00:00

Merge branch 'master' of github.com:satoshilabs/trezor-wallet

This commit is contained in:
Szymon Lesisz 2018-10-19 13:24:05 +02:00
commit 2aed4ba4f7
3 changed files with 12 additions and 3 deletions

View File

@ -6,7 +6,7 @@
"bin": {
"flow": "./node_modules/flow-bin"
},
"license": "LGPL-3.0+",
"license": "T-RSL",
"scripts": {
"dev": "npx webpack-dev-server --config webpack/dev.babel.js",
"dev:local": "npx webpack-dev-server --config webpack/local.babel.js",

View File

@ -3,6 +3,7 @@ export const FONT_SIZE = {
SMALLER: '12px',
SMALL: '14px',
BASE: '16px',
WALLET_TITLE: '18px',
TOP_MENU: '17px',
BIG: '21px',
BIGGER: '32px',

View File

@ -13,10 +13,11 @@ import Content from 'views/Wallet/components/Content';
import CoinLogo from 'components/images/CoinLogo';
import * as stateUtils from 'reducers/utils';
import Link from 'components/Link';
import { FONT_WEIGHT, FONT_SIZE } from 'config/variables';
import AccountBalance from './components/Balance';
import AddedToken from './components/Token';
import type { Props } from './Container';
import { Props } from './Container';
const AccountHeading = styled.div`
padding: 0 0 30px 0;
@ -38,9 +39,16 @@ const StyledTooltip = styled(Tooltip)`
const AccountName = styled.div`
display: flex;
justify-content: center;
align-items: center;
`;
const AccountTitle = styled.div`
font-size: ${FONT_SIZE.WALLET_TITLE};
font-weight: ${FONT_WEIGHT.BASE};
color: ${colors.WALLET_TITLE};
`;
const StyledCoinLogo = styled(CoinLogo)`
margin-right: 10px;
`;
@ -82,7 +90,7 @@ const AccountSummary = (props: Props) => {
<AccountHeading>
<AccountName>
<StyledCoinLogo network={account.network} />
<H2>Account #{parseInt(account.index, 10) + 1}</H2>
<AccountTitle>Account #{parseInt(account.index, 10) + 1}</AccountTitle>
</AccountName>
<Link href={explorerLink} isGray>See full transaction history</Link>
</AccountHeading>