1 files changed, 55 insertions, 15 deletions

diff --git a/packages/instant/src/containers/selected_asset_amount_input.ts b/packages/instant/src/containers/selected_asset_amount_input.ts
index f2ca96ae4..b75a22a0e 100644
--- a/packages/instant/src/containers/selected_asset_amount_input.ts
+++ b/packages/instant/src/containers/selected_asset_amount_input.ts
@@ -1,3 +1,5 @@
+import { AssetBuyer } from '@0xproject/asset-buyer';
+import { AssetProxyId } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
@@ -5,12 +7,10 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 
-import { zrxDecimals } from '../constants';
 import { Action, actions } from '../redux/actions';
 import { State } from '../redux/reducer';
 import { ColorOption } from '../style/theme';
-import { AsyncProcessState } from '../types';
-import { assetBuyer } from '../util/asset_buyer';
+import { AsyncProcessState, ERC20Asset } from '../types';
 
 import { AssetAmountInput } from '../components/asset_amount_input';
 
@@ -20,30 +20,54 @@ export interface SelectedAssetAmountInputProps {
 }
 
 interface ConnectedState {
+    assetBuyer?: AssetBuyer;
     value?: BigNumber;
-    assetData?: string;
+    asset?: ERC20Asset;
 }
 
 interface ConnectedDispatch {
-    onChange: (value?: BigNumber, assetData?: string) => void;
+    updateBuyQuote: (assetBuyer?: AssetBuyer, value?: BigNumber, asset?: ERC20Asset) => void;
 }
 
-const mapStateToProps = (state: State, _ownProps: SelectedAssetAmountInputProps): ConnectedState => ({
-    value: state.selectedAssetAmount,
-    assetData: state.selectedAssetData,
-});
+interface ConnectedProps {
+    value?: BigNumber;
+    asset?: ERC20Asset;
+    onChange: (value?: BigNumber, asset?: ERC20Asset) => void;
+}
+
+type FinalProps = ConnectedProps & SelectedAssetAmountInputProps;
+
+const mapStateToProps = (state: State, _ownProps: SelectedAssetAmountInputProps): ConnectedState => {
+    const selectedAsset = state.selectedAsset;
+    if (_.isUndefined(selectedAsset) || selectedAsset.assetProxyId !== AssetProxyId.ERC20) {
+        return {
+            value: state.selectedAssetAmount,
+        };
+    }
+    return {
+        assetBuyer: state.assetBuyer,
+        value: state.selectedAssetAmount,
+        asset: selectedAsset as ERC20Asset,
+    };
+};
 
 const updateBuyQuoteAsync = async (
     dispatch: Dispatch<Action>,
-    assetData?: string,
+    assetBuyer?: AssetBuyer,
+    asset?: ERC20Asset,
     assetAmount?: BigNumber,
 ): Promise<void> => {
-    if (_.isUndefined(assetAmount) || _.isUndefined(assetData)) {
+    if (
+        _.isUndefined(assetBuyer) ||
+        _.isUndefined(assetAmount) ||
+        _.isUndefined(asset) ||
+        _.isUndefined(asset.metaData)
+    ) {
         return;
     }
     // get a new buy quote.
-    const baseUnitValue = Web3Wrapper.toBaseUnitAmount(assetAmount, zrxDecimals);
-    const newBuyQuote = await assetBuyer.getBuyQuoteAsync(assetData, baseUnitValue);
+    const baseUnitValue = Web3Wrapper.toBaseUnitAmount(assetAmount, asset.metaData.decimals);
+    const newBuyQuote = await assetBuyer.getBuyQuoteAsync(asset.assetData, baseUnitValue);
     // invalidate the last buy quote.
     dispatch(actions.updateLatestBuyQuote(newBuyQuote));
 };
@@ -54,7 +78,7 @@ const mapDispatchToProps = (
     dispatch: Dispatch<Action>,
     _ownProps: SelectedAssetAmountInputProps,
 ): ConnectedDispatch => ({
-    onChange: (value, assetData) => {
+    updateBuyQuote: (assetBuyer, value, asset) => {
         // Update the input
         dispatch(actions.updateSelectedAssetAmount(value));
         // invalidate the last buy quote.
@@ -62,11 +86,27 @@ const mapDispatchToProps = (
         // reset our buy state
         dispatch(actions.updateSelectedAssetBuyState(AsyncProcessState.NONE));
         // tslint:disable-next-line:no-floating-promises
-        debouncedUpdateBuyQuoteAsync(dispatch, assetData, value);
+        debouncedUpdateBuyQuoteAsync(dispatch, assetBuyer, asset, value);
     },
 });
 
+const mergeProps = (
+    connectedState: ConnectedState,
+    connectedDispatch: ConnectedDispatch,
+    ownProps: SelectedAssetAmountInputProps,
+): FinalProps => {
+    return {
+        ...ownProps,
+        asset: connectedState.asset,
+        value: connectedState.value,
+        onChange: (value, asset) => {
+            connectedDispatch.updateBuyQuote(connectedState.assetBuyer, value, asset);
+        },
+    };
+};
+
 export const SelectedAssetAmountInput: React.ComponentClass<SelectedAssetAmountInputProps> = connect(
     mapStateToProps,
     mapDispatchToProps,
+    mergeProps,
 )(AssetAmountInput);