From 113b2535e0a5ebd7d1c78abc929f8befe3761fdf Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Thu, 16 Aug 2018 16:26:44 +0200 Subject: [PATCH] Rename 'Selection' components to 'Menu' in 'LeftNavigation' --- .../AccountMenu/index.js} | 36 +++++++------- .../CoinMenu/index.js} | 48 +++++++++---------- .../DeviceMenu/index.js} | 0 .../LeftNavigation/NavigationMenu/index.js | 4 ++ .../LeftNavigation/Selection/index.js | 4 -- .../Wallet/components/LeftNavigation/index.js | 14 +++--- 6 files changed, 53 insertions(+), 53 deletions(-) rename src/js/views/Wallet/components/LeftNavigation/{Selection/AccountSelection.js => NavigationMenu/AccountMenu/index.js} (91%) rename src/js/views/Wallet/components/LeftNavigation/{Selection/CoinSelection.js => NavigationMenu/CoinMenu/index.js} (86%) rename src/js/views/Wallet/components/LeftNavigation/{Selection/DeviceSelection.js => NavigationMenu/DeviceMenu/index.js} (100%) create mode 100644 src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js delete mode 100644 src/js/views/Wallet/components/LeftNavigation/Selection/index.js diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js similarity index 91% rename from src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js rename to src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js index eecbff04..611ff1fd 100644 --- a/src/js/views/Wallet/components/LeftNavigation/Selection/AccountSelection.js +++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js @@ -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, @@ -68,7 +68,7 @@ RowAccount.propTypes = { isSelected: PropTypes.bool, }; -const AccountSelection = (props: Props): ?React$Element => { +const AccountMenu = (props: Props): ?React$Element => { const selected = props.wallet.selectedDevice; if (!selected) return null; @@ -204,4 +204,4 @@ const AccountSelection = (props: Props): ?React$Element => { ); }; -export default AccountSelection; +export default AccountMenu; diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js similarity index 86% rename from src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js rename to src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js index 3379af09..b3b36c7a 100644 --- a/src/js/views/Wallet/components/LeftNavigation/Selection/CoinSelection.js +++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js @@ -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, @@ -83,7 +83,7 @@ RowCoin.propTypes = { }; -class CoinSelection extends Component { +class CoinMenu extends Component { getBaseUrl() { const { selectedDevice } = this.props.wallet; let baseUrl = ''; @@ -147,11 +147,11 @@ class CoinSelection extends Component { } } -CoinSelection.propTypes = { +CoinMenu.propTypes = { config: PropTypes.object, wallet: PropTypes.object, selectedDevice: PropTypes.object, localStorage: PropTypes.object, }; -export default CoinSelection; +export default CoinMenu; diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/DeviceSelection.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js similarity index 100% rename from src/js/views/Wallet/components/LeftNavigation/Selection/DeviceSelection.js rename to src/js/views/Wallet/components/LeftNavigation/NavigationMenu/DeviceMenu/index.js diff --git a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js new file mode 100644 index 00000000..aab425a4 --- /dev/null +++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/index.js @@ -0,0 +1,4 @@ +export { default as AccountMenu } from './AccountMenu'; +export { default as CoinMenu } from './CoinMenu'; +export { DeviceSelect } from './DeviceMenu'; +export { DeviceDropdown } from './DeviceMenu'; diff --git a/src/js/views/Wallet/components/LeftNavigation/Selection/index.js b/src/js/views/Wallet/components/LeftNavigation/Selection/index.js deleted file mode 100644 index 2d5ec492..00000000 --- a/src/js/views/Wallet/components/LeftNavigation/Selection/index.js +++ /dev/null @@ -1,4 +0,0 @@ -export { default as AccountSelection } from './AccountSelection'; -export { default as CoinSelection } from './CoinSelection'; -export { DeviceSelect } from './DeviceSelection'; -export { DeviceDropdown } from './DeviceSelection'; diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js index 6554e706..8476eefe 100644 --- a/src/js/views/Wallet/components/LeftNavigation/index.js +++ b/src/js/views/Wallet/components/LeftNavigation/index.js @@ -5,11 +5,11 @@ import styled from 'styled-components'; import type { TrezorDevice } from 'flowtype'; import { - AccountSelection, - CoinSelection, + AccountMenu, + CoinMenu, DeviceSelect, DeviceDropdown, -} from './Selection'; +} from './Menu'; import StickyContainer from './StickyContainer'; import type { Props } from './index'; @@ -72,7 +72,7 @@ const LeftNavigation = (props: Props): React$Element - // + // // // ); } else if (selected.features && !selected.features.bootloader_mode && selected.features.initialized) { @@ -81,7 +81,7 @@ const LeftNavigation = (props: Props): React$Element - // + // // // ); } @@ -97,8 +97,8 @@ const LeftNavigation = (props: Props): React$Element - {animationType === 'slide-left' && } - {animationType === 'slide-right' && } + {animationType === 'slide-left' && } + {animationType === 'slide-right' && } )}