From 289f5f6febe9b5695173abe39b5d807f60802222 Mon Sep 17 00:00:00 2001
From: mmv <mmvsha73@gmail.com>
Date: Wed, 17 Apr 2019 18:37:15 +0400
Subject: [PATCH] token redux-related stuff cleanup after refactor

---
 .../tokens/store/actions/disableToken.js      | 21 -------------
 src/logic/tokens/store/actions/enableToken.js | 22 -------------
 src/logic/tokens/store/actions/fetchTokens.js |  8 ++---
 .../tokens/store/actions/updateTokens.js      | 31 -------------------
 .../safe/store/actions/fetchTokenBalances.js  |  1 -
 5 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 src/logic/tokens/store/actions/disableToken.js
 delete mode 100644 src/logic/tokens/store/actions/enableToken.js
 delete mode 100644 src/logic/tokens/store/actions/updateTokens.js

diff --git a/src/logic/tokens/store/actions/disableToken.js b/src/logic/tokens/store/actions/disableToken.js
deleted file mode 100644
index ceafec7c..00000000
--- a/src/logic/tokens/store/actions/disableToken.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// @flow
-import { createAction } from 'redux-actions'
-import { type Token } from '~/logic/tokens/store/model/token'
-import type { Dispatch as ReduxDispatch } from 'redux'
-import { type GlobalState } from '~/store/index'
-import { removeFromActiveTokens } from '~/logic/tokens/utils/tokensStorage'
-
-export const DISABLE_TOKEN = 'DISABLE_TOKEN'
-
-export const disableToken = createAction<string, *, *>(DISABLE_TOKEN, (safeAddress: string, token: Token) => ({
-  safeAddress,
-  token,
-}))
-
-const hideToken = (safeAddress: string, token: Token) => async (dispatch: ReduxDispatch<GlobalState>) => {
-  dispatch(disableToken(safeAddress, token))
-
-  await removeFromActiveTokens(safeAddress, token)
-}
-
-export default hideToken
diff --git a/src/logic/tokens/store/actions/enableToken.js b/src/logic/tokens/store/actions/enableToken.js
deleted file mode 100644
index 055433db..00000000
--- a/src/logic/tokens/store/actions/enableToken.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// @flow
-import { createAction } from 'redux-actions'
-import type { Dispatch as ReduxDispatch } from 'redux'
-import { type GlobalState } from '~/store/index'
-import { type Token } from '~/logic/tokens/store/model/token'
-import { setActiveTokens, getActiveTokens } from '~/logic/tokens/utils/tokensStorage'
-
-export const ENABLE_TOKEN = 'ENABLE_TOKEN'
-
-export const enableToken = createAction<string, *, *>(ENABLE_TOKEN, (safeAddress: string, token: Token) => ({
-  safeAddress,
-  token,
-}))
-
-const setTokenEnabled = (safeAddress: string, token: Token) => async (dispatch: ReduxDispatch<GlobalState>) => {
-  dispatch(enableToken(safeAddress, token))
-
-  const activeTokens = await getActiveTokens(safeAddress)
-  await setActiveTokens(safeAddress, activeTokens.push(token))
-}
-
-export default setTokenEnabled
diff --git a/src/logic/tokens/store/actions/fetchTokens.js b/src/logic/tokens/store/actions/fetchTokens.js
index a1a3ab21..82ae59f7 100644
--- a/src/logic/tokens/store/actions/fetchTokens.js
+++ b/src/logic/tokens/store/actions/fetchTokens.js
@@ -1,5 +1,5 @@
 // @flow
-import { Map } from 'immutable'
+import { List } from 'immutable'
 import contract from 'truffle-contract'
 import axios from 'axios'
 import type { Dispatch as ReduxDispatch } from 'redux'
@@ -44,11 +44,9 @@ export const fetchTokens = () => async (dispatch: ReduxDispatch<GlobalState>) =>
       data: { results: tokenList },
     } = await fetchTokenList()
 
-    const tokensMap: Map<string, Token> = Map().withMutations((map) => {
-      tokenList.forEach((token: TokenProps) => map.set(token.address, makeToken(token)))
-    })
+    const tokens = List(tokenList.map((token: TokenProps) => makeToken(token)))
 
-    dispatch(saveTokens(tokensMap))
+    dispatch(saveTokens(tokens))
   } catch (err) {
     // eslint-disable-next-line
     console.log('Error fetching token list ' + err)
diff --git a/src/logic/tokens/store/actions/updateTokens.js b/src/logic/tokens/store/actions/updateTokens.js
deleted file mode 100644
index 601f241d..00000000
--- a/src/logic/tokens/store/actions/updateTokens.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// @flow
-import { createAction } from 'redux-actions'
-import { type Token } from '~/logic/tokens/store/model/token'
-import { setActiveTokens, getActiveTokens, setToken } from '~/logic/tokens/utils/tokensStorage'
-import type { Dispatch as ReduxDispatch } from 'redux'
-import { type GlobalState } from '~/store/index'
-
-export const ADD_TOKEN = 'ADD_TOKEN'
-
-type AddTokenProps = {
-  safeAddress: string,
-  token: Token,
-}
-
-export const addToken = createAction<string, *, *>(
-  ADD_TOKEN,
-  (safeAddress: string, token: Token): AddTokenProps => ({
-    safeAddress,
-    token,
-  }),
-)
-
-const saveToken = (safeAddress: string, token: Token) => async (dispatch: ReduxDispatch<GlobalState>) => {
-  dispatch(addToken(safeAddress, token))
-
-  const activeTokens = await getActiveTokens(safeAddress)
-  await setActiveTokens(safeAddress, activeTokens.push(token.toJS()))
-  setToken(safeAddress, token)
-}
-
-export default saveToken
diff --git a/src/routes/safe/store/actions/fetchTokenBalances.js b/src/routes/safe/store/actions/fetchTokenBalances.js
index 2c602fde..96437d7c 100644
--- a/src/routes/safe/store/actions/fetchTokenBalances.js
+++ b/src/routes/safe/store/actions/fetchTokenBalances.js
@@ -37,7 +37,6 @@ const fetchTokenBalances = (safeAddress: string, tokens: List<Token>) => async (
   try {
     const withBalances = await Promise.all(
       tokens
-        .filter(token => token.address !== ETH_ADDRESS)
         .map(async token => TokenBalanceRecord({
           address: token.address,
           balance: await calculateBalanceOf(token.address, safeAddress, token.decimals),