crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/website/ts/components/portal/portal.tsx
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,18 +392,24 @@ export class Portal extends React.Component<PortalProps, PortalState> {
}, },
]; ];
return ( return (
<Switch> <div>
{_.map(accountManagementItems, item => { <Switch>
return ( {_.map(accountManagementItems, item => {
<Route return (
key={item.pathName} <Route
path={item.pathName} key={item.pathName}
render={this._renderAccountManagementItem.bind(this, item)} path={item.pathName}
/> render={this._renderAccountManagementItem.bind(this, item)}
); />
})}} );
<Route render={this._renderNotFoundMessage.bind(this)} /> })}}
</Switch> <Route render={this._renderNotFoundMessage.bind(this)} />
</Switch>
<PortalDisclaimerDialog
isOpen={this.state.isDisclaimerDialogOpen}
onToggleDialog={this._onPortalDisclaimerAccepted.bind(this)}
/>
</div>
); );
} }
private _renderAccountManagementItem(item: AccountManagementItem): React.ReactNode { private _renderAccountManagementItem(item: AccountManagementItem): React.ReactNode {