aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src/redux
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-10-26 09:53:22 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-10-26 09:53:22 +0800
commit27d9e516e1cf6a8bea469998bc92513bec3d91c5 (patch)
tree2db73b2d26e432236034c411f0edd62b94dd9144 /packages/instant/src/redux
parent948d62200a23b4da59278f976e9757cfc3c9234e (diff)
parent4a96dbe085004be49dbbaa435d4552a9c920d823 (diff)
downloaddexon-sol-tools-27d9e516e1cf6a8bea469998bc92513bec3d91c5.tar
dexon-sol-tools-27d9e516e1cf6a8bea469998bc92513bec3d91c5.tar.gz
dexon-sol-tools-27d9e516e1cf6a8bea469998bc92513bec3d91c5.tar.bz2
dexon-sol-tools-27d9e516e1cf6a8bea469998bc92513bec3d91c5.tar.lz
dexon-sol-tools-27d9e516e1cf6a8bea469998bc92513bec3d91c5.tar.xz
dexon-sol-tools-27d9e516e1cf6a8bea469998bc92513bec3d91c5.tar.zst
dexon-sol-tools-27d9e516e1cf6a8bea469998bc92513bec3d91c5.zip
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/fixed-orders-in-render-method
Diffstat (limited to 'packages/instant/src/redux')
-rw-r--r--packages/instant/src/redux/reducer.ts14
1 files changed, 11 insertions, 3 deletions
diff --git a/packages/instant/src/redux/reducer.ts b/packages/instant/src/redux/reducer.ts
index c6a05ac52..25d0092b2 100644
--- a/packages/instant/src/redux/reducer.ts
+++ b/packages/instant/src/redux/reducer.ts
@@ -4,7 +4,15 @@ import { BigNumber } from '@0x/utils';
import * as _ from 'lodash';
import { assetMetaDataMap } from '../data/asset_meta_data_map';
-import { Asset, AssetMetaData, AsyncProcessState, DisplayStatus, Network, OrderState } from '../types';
+import {
+ Asset,
+ AssetMetaData,
+ AsyncProcessState,
+ DisplayStatus,
+ Network,
+ OrderProcessState,
+ OrderState,
+} from '../types';
import { assetUtils } from '../util/asset';
import { Action, ActionTypes } from './actions';
@@ -27,7 +35,7 @@ export const INITIAL_STATE: State = {
network: Network.Mainnet,
selectedAssetAmount: undefined,
assetMetaDataMap,
- buyOrderState: { processState: AsyncProcessState.NONE },
+ buyOrderState: { processState: OrderProcessState.NONE },
ethUsdPrice: undefined,
latestBuyQuote: undefined,
latestError: undefined,
@@ -106,7 +114,7 @@ export const reducer = (state: State = INITIAL_STATE, action: Action): State =>
...state,
latestBuyQuote: undefined,
quoteRequestState: AsyncProcessState.NONE,
- buyOrderState: { processState: AsyncProcessState.NONE },
+ buyOrderState: { processState: OrderProcessState.NONE },
selectedAssetAmount: undefined,
};
default: