Merge pull request #724 from 0xProject/bug/website/onboarding-improvements

Fix Wallet appearing over Drawer, and Onboarding not exiting when changing routes

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}