aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/components
diff options
context:
space:
mode:
authorBrandon Millman <brandon@0xproject.com>2018-06-06 07:40:08 +0800
committerGitHub <noreply@github.com>2018-06-06 07:40:08 +0800
commitfd4453d85ea507105be43f227967a99314e2a1d6 (patch)
tree3999dc8653078fdcd5e935fa0ec0e3e180bd7258 /packages/website/ts/components
parent7ee7f9978049383030be8fd95100a9dfcd1923a3 (diff)
parente0af60d8a7e50227ea842e268c5c2712a975f573 (diff)
downloaddexon-sol-tools-fd4453d85ea507105be43f227967a99314e2a1d6.tar
dexon-sol-tools-fd4453d85ea507105be43f227967a99314e2a1d6.tar.gz
dexon-sol-tools-fd4453d85ea507105be43f227967a99314e2a1d6.tar.bz2
dexon-sol-tools-fd4453d85ea507105be43f227967a99314e2a1d6.tar.lz
dexon-sol-tools-fd4453d85ea507105be43f227967a99314e2a1d6.tar.xz
dexon-sol-tools-fd4453d85ea507105be43f227967a99314e2a1d6.tar.zst
dexon-sol-tools-fd4453d85ea507105be43f227967a99314e2a1d6.zip
Merge pull request #668 from 0xProject/feature/website/move-disclaimer
Move portal disclaimer to the account management section
Diffstat (limited to 'packages/website/ts/components')
-rw-r--r--packages/website/ts/components/portal/portal.tsx34
1 files changed, 18 insertions, 16 deletions
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx
index 90d45208f..9420395cf 100644
--- a/packages/website/ts/components/portal/portal.tsx
+++ b/packages/website/ts/components/portal/portal.tsx
@@ -268,10 +268,6 @@ export class Portal extends React.Component<PortalProps, PortalState> {
toggleDialogFn={updateShouldBlockchainErrDialogBeOpen}
networkId={this.props.networkId}
/>
- <PortalDisclaimerDialog
- isOpen={this.state.isDisclaimerDialogOpen}
- onToggleDialog={this._onPortalDisclaimerAccepted.bind(this)}
- />
<FlashMessage dispatcher={this.props.dispatcher} flashMessage={this.props.flashMessage} />
{this.props.blockchainIsLoaded && (
<LedgerConfigDialog
@@ -396,18 +392,24 @@ export class Portal extends React.Component<PortalProps, PortalState> {
},
];
return (
- <Switch>
- {_.map(accountManagementItems, item => {
- return (
- <Route
- key={item.pathName}
- path={item.pathName}
- render={this._renderAccountManagementItem.bind(this, item)}
- />
- );
- })}}
- <Route render={this._renderNotFoundMessage.bind(this)} />
- </Switch>
+ <div>
+ <Switch>
+ {_.map(accountManagementItems, item => {
+ return (
+ <Route
+ key={item.pathName}
+ path={item.pathName}
+ render={this._renderAccountManagementItem.bind(this, item)}
+ />
+ );
+ })}}
+ <Route render={this._renderNotFoundMessage.bind(this)} />
+ </Switch>
+ <PortalDisclaimerDialog
+ isOpen={this.state.isDisclaimerDialogOpen}
+ onToggleDialog={this._onPortalDisclaimerAccepted.bind(this)}
+ />
+ </div>
);
}
private _renderAccountManagementItem(item: AccountManagementItem): React.ReactNode {