Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/maker-asset-datas-interface

2 files changed, 3 insertions, 6 deletions

diff --git a/packages/instant/src/redux/actions.ts b/packages/instant/src/redux/actions.ts
index 879af07fc..c41c5054b 100644
--- a/packages/instant/src/redux/actions.ts
+++ b/packages/instant/src/redux/actions.ts
@@ -2,8 +2,6 @@ import { BuyQuote } from '@0x/asset-buyer';
 import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 
-import { BigNumberInput } from '../util/big_number_input';
-
 import { ActionsUnion, Asset } from '../types';
 
 export interface PlainAction<T extends string> {
@@ -43,8 +41,7 @@ export enum ActionTypes {
 
 export const actions = {
     updateEthUsdPrice: (price?: BigNumber) => createAction(ActionTypes.UPDATE_ETH_USD_PRICE, price),
-    updateSelectedAssetAmount: (amount?: BigNumberInput) =>
-        createAction(ActionTypes.UPDATE_SELECTED_ASSET_AMOUNT, amount),
+    updateSelectedAssetAmount: (amount?: BigNumber) => createAction(ActionTypes.UPDATE_SELECTED_ASSET_AMOUNT, amount),
     setBuyOrderStateNone: () => createAction(ActionTypes.SET_BUY_ORDER_STATE_NONE),
     setBuyOrderStateValidating: () => createAction(ActionTypes.SET_BUY_ORDER_STATE_VALIDATING),
     setBuyOrderStateProcessing: (txHash: string, startTimeUnix: number, expectedEndTimeUnix: number) =>
diff --git a/packages/instant/src/redux/reducer.ts b/packages/instant/src/redux/reducer.ts
index 179c5902e..8c1902bb8 100644
--- a/packages/instant/src/redux/reducer.ts
+++ b/packages/instant/src/redux/reducer.ts
@@ -15,7 +15,7 @@ import {
     OrderProcessState,
     OrderState,
 } from '../types';
-import { BigNumberInput } from '../util/big_number_input';
+import { assetUtils } from '../util/asset';
 
 import { Action, ActionTypes } from './actions';
 
@@ -25,7 +25,7 @@ export interface State {
     assetMetaDataMap: ObjectMap<AssetMetaData>;
     selectedAsset?: Asset;
     availableAssets?: Asset[];
-    selectedAssetAmount?: BigNumberInput;
+    selectedAssetAmount?: BigNumber;
     buyOrderState: OrderState;
     ethUsdPrice?: BigNumber;
     latestBuyQuote?: BuyQuote;