Merge pull request #668 from 0xProject/feature/website/move-disclaimer

Move portal disclaimer to the account management section
This commit is contained in:
Brandon Millman 2018-06-05 16:40:08 -07:00 committed by GitHub
commit fd4453d85e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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,6 +392,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
},
];
return (
<div>
<Switch>
{_.map(accountManagementItems, item => {
return (
@ -408,6 +405,11 @@ export class Portal extends React.Component<PortalProps, PortalState> {
})}}
<Route render={this._renderNotFoundMessage.bind(this)} />
</Switch>
<PortalDisclaimerDialog
isOpen={this.state.isDisclaimerDialogOpen}
onToggleDialog={this._onPortalDisclaimerAccepted.bind(this)}
/>
</div>
);
}
private _renderAccountManagementItem(item: AccountManagementItem): React.ReactNode {