diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-06-19 07:57:28 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-06-19 07:57:28 +0800 |
commit | db9ff7675404b6d409cc195159a8334c59208c25 (patch) | |
tree | 6e04deafe0cdf1957bfedbfd636fd55d779bf6a5 /packages/website/ts/components/wallet | |
parent | 49f5495c459f194f3cab6ff24526da924bd64a53 (diff) | |
download | dexon-0x-contracts-db9ff7675404b6d409cc195159a8334c59208c25.tar dexon-0x-contracts-db9ff7675404b6d409cc195159a8334c59208c25.tar.gz dexon-0x-contracts-db9ff7675404b6d409cc195159a8334c59208c25.tar.bz2 dexon-0x-contracts-db9ff7675404b6d409cc195159a8334c59208c25.tar.lz dexon-0x-contracts-db9ff7675404b6d409cc195159a8334c59208c25.tar.xz dexon-0x-contracts-db9ff7675404b6d409cc195159a8334c59208c25.tar.zst dexon-0x-contracts-db9ff7675404b6d409cc195159a8334c59208c25.zip |
Only elevate wallet zIndex when onboarding is in progress
Diffstat (limited to 'packages/website/ts/components/wallet')
-rw-r--r-- | packages/website/ts/components/wallet/wallet.tsx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx index 3a6d9942d..3f24d18c5 100644 --- a/packages/website/ts/components/wallet/wallet.tsx +++ b/packages/website/ts/components/wallet/wallet.tsx @@ -23,7 +23,6 @@ import { WrapEtherItem } from 'ts/components/wallet/wrap_ether_item'; import { AllowanceToggle } from 'ts/containers/inputs/allowance_toggle'; import { Dispatcher } from 'ts/redux/dispatcher'; import { colors } from 'ts/style/colors'; -import { zIndex } from 'ts/style/z_index'; import { BlockchainErrs, ProviderType, @@ -59,6 +58,7 @@ export interface WalletProps { onAddToken: () => void; onRemoveToken: () => void; refetchTokenStateAsync: (tokenAddress: string) => Promise<void>; + style: React.CSSProperties; } interface WalletState { @@ -79,7 +79,6 @@ interface AccessoryItemConfig { const styles: Styles = { root: { width: '100%', - zIndex: zIndex.aboveOverlay, position: 'relative', }, footerItemInnerDiv: { @@ -134,6 +133,9 @@ const NO_ALLOWANCE_TOGGLE_SPACE_WIDTH = 56; const ACCOUNT_PATH = `${WebsitePaths.Portal}/account`; export class Wallet extends React.Component<WalletProps, WalletState> { + public static defaultProps = { + style: {}, + }; constructor(props: WalletProps) { super(props); this.state = { @@ -141,11 +143,10 @@ export class Wallet extends React.Component<WalletProps, WalletState> { isHoveringSidebar: false, }; } - public render(): React.ReactNode { const isBlockchainLoaded = this.props.blockchainIsLoaded && this.props.blockchainErr === BlockchainErrs.NoError; return ( - <Island className="flex flex-column wallet" style={styles.root}> + <Island className="flex flex-column wallet" style={{ ...styles.root, ...this.props.style }}> {isBlockchainLoaded ? this._renderLoadedRows() : this._renderLoadingRows()} </Island> ); |