Wholesale replace the tokenByAddress and de-dup properly

2 files changed, 9 insertions, 12 deletions

diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts
index 9df18e54c..aae7683ff 100644
--- a/packages/website/ts/redux/dispatcher.ts
+++ b/packages/website/ts/redux/dispatcher.ts
@@ -12,6 +12,7 @@ import {
     SideToAssetToken,
     SignatureData,
     Token,
+    TokenByAddress,
     TokenStateByAddress,
 } from 'ts/types';
 
@@ -121,10 +122,15 @@ export class Dispatcher {
             type: ActionTypes.RemoveTokenFromTokenByAddress,
         });
     }
-    public batchDispatch(tokens: Token[], networkId: number, userAddress: string, sideToAssetToken: SideToAssetToken) {
+    public batchDispatch(
+        tokenByAddress: TokenByAddress,
+        networkId: number,
+        userAddress: string,
+        sideToAssetToken: SideToAssetToken,
+    ) {
         this._dispatch({
             data: {
-                tokens,
+                tokenByAddress,
                 networkId,
                 userAddress,
                 sideToAssetToken,
diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts
index f94da003f..4b5a9138f 100644
--- a/packages/website/ts/redux/reducer.ts
+++ b/packages/website/ts/redux/reducer.ts
@@ -175,21 +175,12 @@ export function reducer(state: State = INITIAL_STATE, action: Action) {
         }
 
         case ActionTypes.BatchDispatch: {
-            const tokenByAddress = state.tokenByAddress;
-            const tokens = action.data.tokens;
-            _.each(tokens, token => {
-                const updatedToken = {
-                    ...tokenByAddress[token.address],
-                    ...token,
-                };
-                tokenByAddress[token.address] = updatedToken;
-            });
             return {
                 ...state,
                 networkId: action.data.networkId,
                 userAddress: action.data.userAddress,
                 sideToAssetToken: action.data.sideToAssetToken,
-                tokenByAddress,
+                tokenByAddress: action.data.tokenByAddress,
             };
         }