From ba0d8d4095358ba40880f9439d82efab3f874d93 Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Thu, 16 Aug 2018 16:31:43 +0200 Subject: [PATCH] Cleanup & fix imports --- .../NavigationMenu/AccountMenu/index.js | 36 +++++++-------- .../NavigationMenu/CoinMenu/index.js | 46 +++++++++---------- .../NavigationMenu/DeviceMenu/index.js | 4 +- .../Wallet/components/LeftNavigation/index.js | 4 +- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js index 611ff1fd..d582e18c 100644 --- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js +++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js @@ -13,9 +13,9 @@ import { findDeviceAccounts } from 'reducers/AccountsReducer'; import { FONT_SIZE, BORDER_WIDTH } from 'config/variables'; 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` height: 64px; @@ -45,22 +45,22 @@ const RowAccountWrapper = styled.div` const RowAccount = ({ accountIndex, balance, url, isSelected = false, }) => ( - - - - Account #{accountIndex + 1} - {balance ? ( - {balance} - ) : ( - Loading... - )} - - - - ); + + + + Account #{accountIndex + 1} + {balance ? ( + {balance} + ) : ( + Loading... + )} + + + +); RowAccount.propTypes = { accountIndex: PropTypes.number.isRequired, url: PropTypes.string.isRequired, diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js index b3b36c7a..40f257af 100644 --- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js +++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js @@ -10,8 +10,8 @@ import styled from 'styled-components'; import { FONT_SIZE, ICON_SIZE } from 'config/variables'; -import Divider from '../Divider'; -import Row from '../Row'; +import Divider from '../../Divider'; +import Row from '../../Row'; const CoinNameWrapper = styled.div` display: flex; @@ -31,13 +31,13 @@ const Logo = styled.div` const CoinName = ({ coinImg, text, }) => ( - - -

{text}

-
- ); + + +

{text}

+
+); CoinName.propTypes = { coinImg: PropTypes.string.isRequired, text: PropTypes.string.isRequired, @@ -56,21 +56,21 @@ const RowCoinWrapper = styled.div` const RowCoin = ({ coin, icon, }) => ( - - - + + + {icon && ( + - {icon && ( - - )} - - - ); + )} + + +); RowCoin.propTypes = { coin: PropTypes.shape({ img: PropTypes.string.isRequired, diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js index 06c60079..1bebe707 100644 --- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js +++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js @@ -4,9 +4,9 @@ import TrezorConnect from 'trezor-connect'; 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) => { const { devices } = props; diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js index 8476eefe..c5f979c0 100644 --- a/src/js/views/Wallet/components/LeftNavigation/index.js +++ b/src/js/views/Wallet/components/LeftNavigation/index.js @@ -9,10 +9,10 @@ import { CoinMenu, DeviceSelect, DeviceDropdown, -} from './Menu'; +} from './NavigationMenu'; import StickyContainer from './StickyContainer'; -import type { Props } from './index'; +import type { Props } from './common'; type TransitionMenuProps = { animationType: string;