mirror of
https://github.com/trezor/trezor-wallet
synced 2024-11-28 03:08:30 +00:00
Merge branch 'styled-components-refactor' of github.com:satoshilabs/trezor-wallet into styled-components-refactor
This commit is contained in:
commit
bd54457fb6
@ -13,9 +13,9 @@ import { findDeviceAccounts } from 'reducers/AccountsReducer';
|
|||||||
import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
|
import { FONT_SIZE, BORDER_WIDTH } from 'config/variables';
|
||||||
|
|
||||||
import type { Accounts } from 'flowtype';
|
import type { Accounts } from 'flowtype';
|
||||||
import type { Props } from './index';
|
import type { Props } from '../../common';
|
||||||
|
|
||||||
import Row from '../Row';
|
import Row from '../../Row';
|
||||||
|
|
||||||
const RowAccountWrapper = styled.div`
|
const RowAccountWrapper = styled.div`
|
||||||
height: 64px;
|
height: 64px;
|
||||||
@ -60,7 +60,7 @@ const RowAccount = ({
|
|||||||
</Row>
|
</Row>
|
||||||
</RowAccountWrapper>
|
</RowAccountWrapper>
|
||||||
</NavLink>
|
</NavLink>
|
||||||
);
|
);
|
||||||
RowAccount.propTypes = {
|
RowAccount.propTypes = {
|
||||||
accountIndex: PropTypes.number.isRequired,
|
accountIndex: PropTypes.number.isRequired,
|
||||||
url: PropTypes.string.isRequired,
|
url: PropTypes.string.isRequired,
|
||||||
|
@ -10,8 +10,8 @@ import styled from 'styled-components';
|
|||||||
|
|
||||||
import { FONT_SIZE, ICON_SIZE } from 'config/variables';
|
import { FONT_SIZE, ICON_SIZE } from 'config/variables';
|
||||||
|
|
||||||
import Divider from '../Divider';
|
import Divider from '../../Divider';
|
||||||
import Row from '../Row';
|
import Row from '../../Row';
|
||||||
|
|
||||||
const CoinNameWrapper = styled.div`
|
const CoinNameWrapper = styled.div`
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -37,7 +37,7 @@ const CoinName = ({
|
|||||||
/>
|
/>
|
||||||
<p>{text}</p>
|
<p>{text}</p>
|
||||||
</CoinNameWrapper>
|
</CoinNameWrapper>
|
||||||
);
|
);
|
||||||
CoinName.propTypes = {
|
CoinName.propTypes = {
|
||||||
coinImg: PropTypes.string.isRequired,
|
coinImg: PropTypes.string.isRequired,
|
||||||
text: PropTypes.string.isRequired,
|
text: PropTypes.string.isRequired,
|
||||||
@ -70,7 +70,7 @@ const RowCoin = ({
|
|||||||
)}
|
)}
|
||||||
</Row>
|
</Row>
|
||||||
</RowCoinWrapper>
|
</RowCoinWrapper>
|
||||||
);
|
);
|
||||||
RowCoin.propTypes = {
|
RowCoin.propTypes = {
|
||||||
coin: PropTypes.shape({
|
coin: PropTypes.shape({
|
||||||
img: PropTypes.string.isRequired,
|
img: PropTypes.string.isRequired,
|
||||||
|
@ -4,9 +4,9 @@ import TrezorConnect from 'trezor-connect';
|
|||||||
|
|
||||||
import type { TrezorDevice } from 'flowtype';
|
import type { TrezorDevice } from 'flowtype';
|
||||||
|
|
||||||
import type { Props } from '../common';
|
import type { Props } from '../../common';
|
||||||
|
|
||||||
import AsideDivider from '../Divider';
|
import AsideDivider from '../../Divider';
|
||||||
|
|
||||||
export const DeviceSelect = (props: Props) => {
|
export const DeviceSelect = (props: Props) => {
|
||||||
const { devices } = props;
|
const { devices } = props;
|
||||||
|
@ -9,10 +9,10 @@ import {
|
|||||||
CoinMenu,
|
CoinMenu,
|
||||||
DeviceSelect,
|
DeviceSelect,
|
||||||
DeviceDropdown,
|
DeviceDropdown,
|
||||||
} from './Menu';
|
} from './NavigationMenu';
|
||||||
import StickyContainer from './StickyContainer';
|
import StickyContainer from './StickyContainer';
|
||||||
|
|
||||||
import type { Props } from './index';
|
import type { Props } from './common';
|
||||||
|
|
||||||
type TransitionMenuProps = {
|
type TransitionMenuProps = {
|
||||||
animationType: string;
|
animationType: string;
|
||||||
|
@ -9,10 +9,10 @@ import type { State, Dispatch } from 'flowtype';
|
|||||||
|
|
||||||
import Header from 'components/Header';
|
import Header from 'components/Header';
|
||||||
import Footer from 'components/Footer';
|
import Footer from 'components/Footer';
|
||||||
import DeviceSettingsTabs from 'components/wallet/pages/DeviceSettingsTabs';
|
|
||||||
import ModalContainer from 'components/modal';
|
import ModalContainer from 'components/modal';
|
||||||
import Notifications from 'components/Notification';
|
import Notifications from 'components/Notification';
|
||||||
import Log from 'components/Log';
|
import Log from 'components/Log';
|
||||||
|
import DeviceSettingsTabs from './views/DeviceSettingsTabs';
|
||||||
|
|
||||||
import LeftNavigation from './components/LeftNavigation/Container';
|
import LeftNavigation from './components/LeftNavigation/Container';
|
||||||
import AccountTabs from './components/Tabs';
|
import AccountTabs from './components/Tabs';
|
||||||
|
Loading…
Reference in New Issue
Block a user