diff options
author | Francesco Agosti <francesco.agosti93@gmail.com> | 2018-06-20 04:47:52 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-20 04:47:52 +0800 |
commit | 0438fdde4919df13471f9b566b218ff9379d6d27 (patch) | |
tree | 081c2423903a9b7eec29b7eef9fa80621f044e07 /packages/website/ts/components/portal | |
parent | be4ea18119d6007cb7f94954c6cb117f30402673 (diff) | |
parent | a75d6531f207aac8aeefa94bb44fa96a5b295998 (diff) | |
download | dexon-sol-tools-0438fdde4919df13471f9b566b218ff9379d6d27.tar dexon-sol-tools-0438fdde4919df13471f9b566b218ff9379d6d27.tar.gz dexon-sol-tools-0438fdde4919df13471f9b566b218ff9379d6d27.tar.bz2 dexon-sol-tools-0438fdde4919df13471f9b566b218ff9379d6d27.tar.lz dexon-sol-tools-0438fdde4919df13471f9b566b218ff9379d6d27.tar.xz dexon-sol-tools-0438fdde4919df13471f9b566b218ff9379d6d27.tar.zst dexon-sol-tools-0438fdde4919df13471f9b566b218ff9379d6d27.zip |
Merge pull request #724 from 0xProject/bug/website/onboarding-improvements
Fix Wallet appearing over Drawer, and Onboarding not exiting when changing routes
Diffstat (limited to 'packages/website/ts/components/portal')
-rw-r--r-- | packages/website/ts/components/portal/portal.tsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx index 0a8f0094f..67314678b 100644 --- a/packages/website/ts/components/portal/portal.tsx +++ b/packages/website/ts/components/portal/portal.tsx @@ -33,6 +33,7 @@ import { localStorage } from 'ts/local_storage/local_storage'; import { trackedTokenStorage } from 'ts/local_storage/tracked_token_storage'; import { FullscreenMessage } from 'ts/pages/fullscreen_message'; import { Dispatcher } from 'ts/redux/dispatcher'; +import { zIndex } from 'ts/style/z_index'; import { BlockchainErrs, HashData, @@ -74,6 +75,7 @@ export interface PortalProps { flashMessage?: string | React.ReactNode; lastForceTokenStateRefetch: number; translate: Translate; + isPortalOnboardingShowing: boolean; portalOnboardingStep: number; } @@ -341,6 +343,7 @@ export class Portal extends React.Component<PortalProps, PortalState> { return ( <div> <Wallet + style={this.props.isPortalOnboardingShowing ? { zIndex: zIndex.aboveOverlay } : undefined} userAddress={this.props.userAddress} networkId={this.props.networkId} blockchain={this._blockchain} |