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

View File

@@ -268,10 +268,6 @@ export class Portal extends React.Component<PortalProps, PortalState> {
toggleDialogFn={updateShouldBlockchainErrDialogBeOpen} toggleDialogFn={updateShouldBlockchainErrDialogBeOpen}
networkId={this.props.networkId} networkId={this.props.networkId}
/> />
<PortalDisclaimerDialog
isOpen={this.state.isDisclaimerDialogOpen}
onToggleDialog={this._onPortalDisclaimerAccepted.bind(this)}
/>
<FlashMessage dispatcher={this.props.dispatcher} flashMessage={this.props.flashMessage} /> <FlashMessage dispatcher={this.props.dispatcher} flashMessage={this.props.flashMessage} />
{this.props.blockchainIsLoaded && ( {this.props.blockchainIsLoaded && (
<LedgerConfigDialog <LedgerConfigDialog
@@ -396,6 +392,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
}, },
]; ];
return ( return (
<div>
<Switch> <Switch>
{_.map(accountManagementItems, item => { {_.map(accountManagementItems, item => {
return ( return (
@@ -408,6 +405,11 @@ export class Portal extends React.Component<PortalProps, PortalState> {
})}} })}}
<Route render={this._renderNotFoundMessage.bind(this)} /> <Route render={this._renderNotFoundMessage.bind(this)} />
</Switch> </Switch>
<PortalDisclaimerDialog
isOpen={this.state.isDisclaimerDialogOpen}
onToggleDialog={this._onPortalDisclaimerAccepted.bind(this)}
/>
</div>
); );
} }
private _renderAccountManagementItem(item: AccountManagementItem): React.ReactNode { private _renderAccountManagementItem(item: AccountManagementItem): React.ReactNode {