Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/beta-render-et-al

1 files changed, 46 insertions, 6 deletions

diff --git a/packages/instant/src/redux/reducer.ts b/packages/instant/src/redux/reducer.ts
index 9922131b4..657bd0e40 100644
--- a/packages/instant/src/redux/reducer.ts
+++ b/packages/instant/src/redux/reducer.ts
@@ -1,6 +1,6 @@
-import { AssetBuyer, BuyQuote } from '@0xproject/asset-buyer';
-import { ObjectMap } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
+import { AssetBuyer, BuyQuote } from '@0x/asset-buyer';
+import { ObjectMap } from '@0x/types';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 
 import { Asset, AssetMetaData, AsyncProcessState } from '../types';
@@ -8,22 +8,32 @@ import { assetUtils } from '../util/asset';
 
 import { Action, ActionTypes } from './actions';
 
+export enum LatestErrorDisplay {
+    Present,
+    Hidden,
+}
 export interface State {
     assetBuyer?: AssetBuyer;
     assetMetaDataMap: ObjectMap<AssetMetaData>;
     selectedAsset?: Asset;
     selectedAssetAmount?: BigNumber;
-    selectedAssetBuyState: AsyncProcessState;
+    buyOrderState: AsyncProcessState;
     ethUsdPrice?: BigNumber;
     latestBuyQuote?: BuyQuote;
+    quoteState: AsyncProcessState;
+    latestError?: any;
+    latestErrorDisplay: LatestErrorDisplay;
 }
 
 export const INITIAL_STATE: State = {
     selectedAssetAmount: undefined,
     assetMetaDataMap: {},
-    selectedAssetBuyState: AsyncProcessState.NONE,
+    buyOrderState: AsyncProcessState.NONE,
     ethUsdPrice: undefined,
     latestBuyQuote: undefined,
+    latestError: undefined,
+    latestErrorDisplay: LatestErrorDisplay.Hidden,
+    quoteState: AsyncProcessState.NONE,
 };
 
 // TODO: Figure out why there is an INITIAL_STATE key in the store...
@@ -43,11 +53,41 @@ export const reducer = (state: State = INITIAL_STATE, action: Action): State =>
             return {
                 ...state,
                 latestBuyQuote: action.data,
+                quoteState: AsyncProcessState.SUCCESS,
+            };
+        case ActionTypes.UPDATE_BUY_QUOTE_STATE_PENDING:
+            return {
+                ...state,
+                latestBuyQuote: undefined,
+                quoteState: AsyncProcessState.PENDING,
+            };
+        case ActionTypes.UPDATE_BUY_QUOTE_STATE_FAILURE:
+            return {
+                ...state,
+                latestBuyQuote: undefined,
+                quoteState: AsyncProcessState.FAILURE,
             };
         case ActionTypes.UPDATE_SELECTED_ASSET_BUY_STATE:
             return {
                 ...state,
-                selectedAssetBuyState: action.data,
+                buyOrderState: action.data,
+            };
+        case ActionTypes.SET_ERROR:
+            return {
+                ...state,
+                latestError: action.data,
+                latestErrorDisplay: LatestErrorDisplay.Present,
+            };
+        case ActionTypes.HIDE_ERROR:
+            return {
+                ...state,
+                latestErrorDisplay: LatestErrorDisplay.Hidden,
+            };
+        case ActionTypes.CLEAR_ERROR:
+            return {
+                ...state,
+                latestError: undefined,
+                latestErrorDisplay: LatestErrorDisplay.Hidden,
             };
         case ActionTypes.UPDATE_SELECTED_ASSET:
             const newSelectedAssetData = action.data;