arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-24 17:28:10 +00:00
Code Issues Releases Wiki Activity

Better handling of menu rendering

Browse Source
This commit is contained in:
Vladimir Volek 2018-09-10 16:03:09 +02:00
parent 089aa0e829
commit 160210890f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/Wallet/components/LeftNavigation/index.js
View File

@ -150,13 +150,11 @@ class LeftNavigation extends Component {
} }
render() { render() {
const { selectedDevice } = this.props.wallet;
return ( return (
<StickyContainer <StickyContainer
location={this.props.location.pathname} location={this.props.location.pathname}
deviceSelection={this.props.deviceDropdownOpened} deviceSelection={this.props.deviceDropdownOpened}
> >
{selectedDevice && (
<DeviceHeader <DeviceHeader
onClickWrapper={() => this.handleOpen()} onClickWrapper={() => this.handleOpen()}
device={this.props.wallet.selectedDevice} device={this.props.wallet.selectedDevice}
@ -165,7 +163,6 @@ class LeftNavigation extends Component {
isOpen={this.props.deviceDropdownOpened} isOpen={this.props.deviceDropdownOpened}
{...this.props} {...this.props}
/> />
) }
<MenuWrapper> <MenuWrapper>
{this.state.shouldRenderDeviceSelection && <DeviceMenu {...this.props} />} {this.state.shouldRenderDeviceSelection && <DeviceMenu {...this.props} />}
{this.shouldRenderAccounts() && this.getMenuTransition(<AccountMenu {...this.props} />)} {this.shouldRenderAccounts() && this.getMenuTransition(<AccountMenu {...this.props} />)}

2
src/views/Wallet/index.js
View File

@ -83,7 +83,7 @@ const Wallet = (props: WalletContainerProps) => (
<AppWrapper> <AppWrapper>
<Header /> <Header />
<WalletWrapper> <WalletWrapper>
<LeftNavigation /> {props.wallet.selectedDevice && <LeftNavigation />}
<MainContent> <MainContent>
<Navigation> <Navigation>
<Route path="/device/:device/network/:network/account/:account" component={TopNavigationAccount} /> <Route path="/device/:device/network/:network/account/:account" component={TopNavigationAccount} />