aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src/components/zero_ex_instant_container.tsx
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-10-18 01:30:29 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-10-18 01:30:29 +0800
commit84057934c6cda3fe3e4f86cf686b163db017cf9e (patch)
tree0160c132e134fb04106f232834f0ed021d06ebd5 /packages/instant/src/components/zero_ex_instant_container.tsx
parentaa1085c8f3866da4965c0102be27c0f5e19b3db6 (diff)
parentc767404ad09ca9fdacf9ab43c0e6b13fc70bffb9 (diff)
downloaddexon-sol-tools-84057934c6cda3fe3e4f86cf686b163db017cf9e.tar
dexon-sol-tools-84057934c6cda3fe3e4f86cf686b163db017cf9e.tar.gz
dexon-sol-tools-84057934c6cda3fe3e4f86cf686b163db017cf9e.tar.bz2
dexon-sol-tools-84057934c6cda3fe3e4f86cf686b163db017cf9e.tar.lz
dexon-sol-tools-84057934c6cda3fe3e4f86cf686b163db017cf9e.tar.xz
dexon-sol-tools-84057934c6cda3fe3e4f86cf686b163db017cf9e.tar.zst
dexon-sol-tools-84057934c6cda3fe3e4f86cf686b163db017cf9e.zip
Merge branch 'development' into feature/website/asset-buyer-docs
* development: (31 commits) Update CODEOWNERS Update CODEOWNERS Update CODEOWNERS Add leo to CODEOWNERS on some packages fix(monorepo-scripts): Format date as UTC not local time. Bump max bundle size for instant fix: dont use enum string as type as typedoc gets confused feat: export AssetData from order-utils feat: export AssetData from utils chore: temporarily increase the bundle size for instant Remove order-utils from dependencies Run tests on circle CI Add tests for format and use toFixed instead of round for usd Remove expiry buffer seconds option from AssetBuyer init Add ts-optchain and use it instead of lodash get Hide USD price when ETH-USD price is not available Rename OrderDetailsRow to EthAmountRow fix: add Steve's github account to about page, and capitalize AppFolio correctly Put boundNoop in a util file Add tnxHash to buy button callbacks ...
Diffstat (limited to 'packages/instant/src/components/zero_ex_instant_container.tsx')
-rw-r--r--packages/instant/src/components/zero_ex_instant_container.tsx13
1 files changed, 7 insertions, 6 deletions
diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx
index a384c5f1b..51f9dc63e 100644
--- a/packages/instant/src/components/zero_ex_instant_container.tsx
+++ b/packages/instant/src/components/zero_ex_instant_container.tsx
@@ -1,10 +1,11 @@
import * as React from 'react';
+import { LatestBuyQuoteOrderDetails } from '../containers/latest_buy_quote_order_details';
+import { SelectedAssetBuyButton } from '../containers/selected_asset_buy_button';
+import { SelectedAssetInstantHeading } from '../containers/selected_asset_instant_heading';
+
import { ColorOption } from '../style/theme';
-import { BuyButton } from './buy_button';
-import { InstantHeading } from './instant_heading';
-import { OrderDetails } from './order_details';
import { Container, Flex } from './ui';
export interface ZeroExInstantContainerProps {}
@@ -19,9 +20,9 @@ export const ZeroExInstantContainer: React.StatelessComponent<ZeroExInstantConta
hasBoxShadow={true}
>
<Flex direction="column" justify="flex-start">
- <InstantHeading />
- <OrderDetails />
- <BuyButton />
+ <SelectedAssetInstantHeading />
+ <LatestBuyQuoteOrderDetails />
+ <SelectedAssetBuyButton />
</Flex>
</Container>
</Container>