aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src/components/zero_ex_instant_overlay.tsx
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-11-10 06:20:06 +0800
committerFabio Berger <me@fabioberger.com>2018-11-10 06:20:06 +0800
commit773cf3cd143769a93cea66b30d46cb9f4620b74d (patch)
tree549d12546b0076d5e69d1a4570ca7a42b628c5c1 /packages/instant/src/components/zero_ex_instant_overlay.tsx
parent53d0f5b98ebd132d51b1fdf463fe57481c895ec4 (diff)
parentb4a11de097258d37fa9271e64fc28a1d012a8d26 (diff)
downloaddexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.gz
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.bz2
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.lz
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.xz
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.tar.zst
dexon-sol-tools-773cf3cd143769a93cea66b30d46cb9f4620b74d.zip
Merge branch 'development' into fixOrderValidation
* development: (25 commits) Publish Updated CHANGELOGS fix(instant): fix bug where we potentially fetch balance for the wrong account fix: Lock Ledger hw-transport to 4.24.0 fix: wrong prop names used chore: PR feedback fix: broken features because of merge fix: remove default props, fix lint problems chore: convert payment method to stateless component feat: add boxShadow on dropdown hover fix: various style issues fix: remove all:initial rule from all div based ui compoennts fix: token selector scrolling container height chore(instant): fix lint errors feat(instant): fetch balance at startup feat(instant): fetch account address at startup and drive account state changes chore: cleanup fix: restore button to previous state feat: implement copy-to-clipboard feat: add MetaMask sign, refactor Circle ...
Diffstat (limited to 'packages/instant/src/components/zero_ex_instant_overlay.tsx')
-rw-r--r--packages/instant/src/components/zero_ex_instant_overlay.tsx23
1 files changed, 21 insertions, 2 deletions
diff --git a/packages/instant/src/components/zero_ex_instant_overlay.tsx b/packages/instant/src/components/zero_ex_instant_overlay.tsx
index 3461600e1..10438ab7a 100644
--- a/packages/instant/src/components/zero_ex_instant_overlay.tsx
+++ b/packages/instant/src/components/zero_ex_instant_overlay.tsx
@@ -1,5 +1,10 @@
import * as React from 'react';
+import { ColorOption } from '../style/theme';
+
+import { Container } from './ui/container';
+import { Flex } from './ui/flex';
+import { Icon } from './ui/icon';
import { Overlay } from './ui/overlay';
import { ZeroExInstantContainer } from './zero_ex_instant_container';
import { ZeroExInstantProvider, ZeroExInstantProviderProps } from './zero_ex_instant_provider';
@@ -13,8 +18,22 @@ export const ZeroExInstantOverlay: React.StatelessComponent<ZeroExInstantOverlay
const { onClose, zIndex, ...rest } = props;
return (
<ZeroExInstantProvider {...rest}>
- <Overlay onClose={onClose} zIndex={zIndex}>
- <ZeroExInstantContainer />
+ <Overlay zIndex={zIndex}>
+ <Flex height="100vh">
+ <Container position="absolute" top="0px" right="0px" display={{ default: 'initial', sm: 'none' }}>
+ <Icon
+ height={18}
+ width={18}
+ color={ColorOption.white}
+ icon="closeX"
+ onClick={onClose}
+ padding="2em 2em"
+ />
+ </Container>
+ <Container width={{ default: 'auto', sm: '100%' }} height={{ default: 'auto', sm: '100%' }}>
+ <ZeroExInstantContainer />
+ </Container>
+ </Flex>
</Overlay>
</ZeroExInstantProvider>
);