From dcbdf2bfa1c82a7333802ca761aab0e1bc4ab02d Mon Sep 17 00:00:00 2001
From: Vladimir Volek <volek.vladimir@gmail.com>
Date: Thu, 16 Aug 2018 20:52:05 +0200
Subject: [PATCH] better parameter handling

---
 .../NavigationMenu/AccountMenu/index.js         |  7 ++-----
 .../NavigationMenu/CoinMenu/index.js            |  2 +-
 .../Wallet/components/LeftNavigation/index.js   | 17 ++++++++---------
 3 files changed, 11 insertions(+), 15 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 b2d9c0b4..5cfc3352 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/AccountMenu/index.js
@@ -43,6 +43,7 @@ const RowAccountWrapper = styled.div`
         }
     `}
 `;
+
 const RowAccount = ({
     accountIndex, balance, url, isSelected = false,
 }) => (
@@ -62,6 +63,7 @@ const RowAccount = ({
         </RowAccountWrapper>
     </NavLink>
 );
+
 RowAccount.propTypes = {
     accountIndex: PropTypes.number.isRequired,
     url: PropTypes.string.isRequired,
@@ -71,9 +73,6 @@ RowAccount.propTypes = {
 
 const AccountMenu = (props: Props): ?React$Element<string> => {
     const selected = props.wallet.selectedDevice;
-    console.warn('selected', selected);
-    if (!selected) return null;
-
     const { location } = props.router;
     const urlParams = location.state;
     const { accounts } = props;
@@ -81,8 +80,6 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
 
     const { config } = props.localStorage;
     const selectedCoin = config.coins.find(c => c.network === location.state.network);
-    if (!selectedCoin) return;
-
     const fiatRate = props.fiat.find(f => f.network === selectedCoin.network);
 
     const deviceAccounts: Accounts = findDeviceAccounts(accounts, selected, location.state.network);
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 40f257af..6dccb775 100644
--- a/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/NavigationMenu/CoinMenu/index.js
@@ -129,7 +129,7 @@ class CoinMenu extends Component {
                     textRight="(You will be redirected)"
                 />
                 {coins.map(coin => (
-                    <a href={coin.url}>
+                    <a key={coin.url} href={coin.url}>
                         <RowCoin
                             coin={{
                                 img: coin.image,
diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index 18335185..7cfec80c 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -4,11 +4,7 @@ import PropTypes from 'prop-types';
 import colors from 'config/colors';
 import { TransitionGroup, CSSTransition } from 'react-transition-group';
 import styled from 'styled-components';
-
-import type { TrezorDevice } from 'flowtype';
-import {
-    AccountMenu, CoinMenu, DeviceSelect, DeviceDropdown,
-} from './NavigationMenu';
+import { AccountMenu, CoinMenu, DeviceSelect, DeviceDropdown } from './NavigationMenu';
 import StickyContainer from './StickyContainer';
 
 const TransitionGroupWrapper = styled(TransitionGroup)`
@@ -42,13 +38,15 @@ class LeftNavigation extends Component {
     }
 
     componentWillReceiveProps() {
+        const { deviceDropdownOpened } = this.props;
         const { selectedDevice } = this.props.wallet;
+        const { network } = this.props.location;
         const hasFeatures = selectedDevice && selectedDevice.features;
         const deviceReady = hasFeatures && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized;
 
-        if (this.props.deviceDropdownOpened) {
+        if (deviceDropdownOpened) {
             this.setState({ shouldRenderDeviceSelection: true });
-        } else if (this.props.location.network) {
+        } else if (network) {
             this.setState({
                 shouldRenderDeviceSelection: false,
                 animationType: 'slide-left',
@@ -83,7 +81,8 @@ class LeftNavigation extends Component {
     }
 
     shouldRenderAccounts() {
-        return !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-left';
+        const { selectedDevice } = this.props.wallet;
+        return selectedDevice && !this.state.shouldRenderDeviceSelection && this.state.animationType === 'slide-left';
     }
 
     shouldRenderCoins() {
@@ -99,7 +98,7 @@ class LeftNavigation extends Component {
                 <DeviceSelect {...this.props} />
                 <MenuWrapper>
                     {this.state.shouldRenderDeviceSelection && this.getMenuTransition(<DeviceDropdown {...this.props} />) }
-                    {/* {this.shouldRenderAccounts && <AccountMenu key="accounts" {...this.props} />} */}
+                    {/* {this.shouldRenderAccounts && this.getMenuTransition(<AccountMenu key="accounts" {...this.props} />)} */}
                     {this.shouldRenderCoins && <CoinMenu key="coins" {...this.props} />}
                 </MenuWrapper>
                 <StickyBottom>