mirror of
https://github.com/trezor/trezor-wallet
synced 2024-11-24 09:18:09 +00:00
Merge content
This commit is contained in:
parent
8375a4c48b
commit
ace0f37074
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
|
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { bindActionCreators } from 'redux';
|
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { Route, withRouter } from 'react-router-dom';
|
import { Route, withRouter } from 'react-router-dom';
|
||||||
|
|
||||||
@ -27,29 +26,22 @@ type ContentProps = {
|
|||||||
children?: React.Node
|
children?: React.Node
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const Content = (props: ContentProps) => (
|
|
||||||
<article>
|
|
||||||
<nav>
|
|
||||||
<Route path="/device/:device/network/:network/account/:account" component={AccountTabs} />
|
|
||||||
<Route path="/device/:device/device-settings" component={DeviceSettingsTabs} />
|
|
||||||
</nav>
|
|
||||||
<Notifications />
|
|
||||||
<Log />
|
|
||||||
{ props.children }
|
|
||||||
<Footer />
|
|
||||||
</article>
|
|
||||||
);
|
|
||||||
|
|
||||||
const Wallet = (props: WalletContainerProps) => (
|
const Wallet = (props: WalletContainerProps) => (
|
||||||
<div className="app">
|
<div className="app">
|
||||||
<Header />
|
<Header />
|
||||||
{/* <div>{ props.wallet.online ? "ONLINE" : "OFFLINE" }</div> */}
|
{/* <div>{ props.wallet.online ? "ONLINE" : "OFFLINE" }</div> */}
|
||||||
<main>
|
<main>
|
||||||
<AsideContainer />
|
<AsideContainer />
|
||||||
<Content>
|
<article>
|
||||||
|
<nav>
|
||||||
|
<Route path="/device/:device/network/:network/account/:account" component={AccountTabs} />
|
||||||
|
<Route path="/device/:device/device-settings" component={DeviceSettingsTabs} />
|
||||||
|
</nav>
|
||||||
|
<Notifications />
|
||||||
|
<Log />
|
||||||
{ props.children }
|
{ props.children }
|
||||||
</Content>
|
<Footer />
|
||||||
|
</article>
|
||||||
</main>
|
</main>
|
||||||
<ModalContainer />
|
<ModalContainer />
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user