From ad6dc8e891059f00f2ddda1884bbc78c1e47ea24 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 18 Oct 2018 16:04:30 -0700
Subject: fix: refactor ZeroExInstant state creation logic and fix bug

---
 packages/instant/src/components/zero_ex_instant.tsx | 9 ++++++---
 packages/instant/src/redux/reducer.ts               | 1 -
 packages/instant/src/redux/store.ts                 | 3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'packages')

diff --git a/packages/instant/src/components/zero_ex_instant.tsx b/packages/instant/src/components/zero_ex_instant.tsx
index 5b75a7556..a67c0f412 100644
--- a/packages/instant/src/components/zero_ex_instant.tsx
+++ b/packages/instant/src/components/zero_ex_instant.tsx
@@ -29,8 +29,7 @@ export class ZeroExInstant extends React.Component<ZeroExInstantProps> {
         additionalAssetMetaDataMap: {},
     };
     public store: Store;
-    constructor(props: ZeroExInstantProps) {
-        super(props);
+    private static _createPartialStoreStateFromProps(props: ZeroExInstantProps): Partial<State> {
         // TODO: Provider needs to not be hard-coded to injected web3.
         const assetBuyer = AssetBuyer.getAssetBuyerForStandardRelayerAPIUrl(getProvider(), props.sraApiUrl);
         const completeAssetMetaDataMap = {
@@ -42,7 +41,11 @@ export class ZeroExInstant extends React.Component<ZeroExInstantProps> {
             selectedAsset: assetUtils.createAssetFromAssetData(props.assetData, completeAssetMetaDataMap),
             assetMetaDataMap: completeAssetMetaDataMap,
         };
-        this.store = store.create(storeStateFromProps);
+        return storeStateFromProps;
+    }
+    constructor(props: ZeroExInstantProps) {
+        super(props);
+        this.store = store.create(ZeroExInstant._createPartialStoreStateFromProps(this.props));
         // tslint:disable-next-line:no-floating-promises
         asyncData.fetchAndDispatchToStore(this.store);
     }
diff --git a/packages/instant/src/redux/reducer.ts b/packages/instant/src/redux/reducer.ts
index 657bd0e40..83422be45 100644
--- a/packages/instant/src/redux/reducer.ts
+++ b/packages/instant/src/redux/reducer.ts
@@ -36,7 +36,6 @@ export const INITIAL_STATE: State = {
     quoteState: AsyncProcessState.NONE,
 };
 
-// TODO: Figure out why there is an INITIAL_STATE key in the store...
 export const reducer = (state: State = INITIAL_STATE, action: Action): State => {
     switch (action.type) {
         case ActionTypes.UPDATE_ETH_USD_PRICE:
diff --git a/packages/instant/src/redux/store.ts b/packages/instant/src/redux/store.ts
index 505234299..88d964bbc 100644
--- a/packages/instant/src/redux/store.ts
+++ b/packages/instant/src/redux/store.ts
@@ -9,10 +9,9 @@ export type Store = ReduxStore<State>;
 export const store = {
     create: (withState: Partial<State>): Store => {
         const allInitialState = {
-            INITIAL_STATE,
+            ...INITIAL_STATE,
             ...withState,
         };
         return createStore(reducer, allInitialState, devToolsEnhancer({}));
     },
 };
-
-- 
cgit v1.2.3