fix flow annotation for createAction for tokens actions

src/logic/tokens/store/actions/addToken.js

@@ -1,7 +1,7 @@
 // @flow
 import { createAction } from 'redux-actions'
 import { type Token } from '~/logic/tokens/store/model/token'
-import { setActiveTokens, getActiveTokenAddresses, setToken } from '~/logic/tokens/utils/tokensStorage'
+import { setActiveTokens, getActiveTokens, setToken } from '~/logic/tokens/utils/tokensStorage'
 import type { Dispatch as ReduxDispatch } from 'redux'
 import { type GlobalState } from '~/store/index'
 
@@ -12,7 +12,7 @@ type AddTokenProps = {
   token: Token,
 }
 
-export const addToken = createAction(
+export const addToken = createAction<string, *, *>(
   ADD_TOKEN,
   (safeAddress: string, token: Token): AddTokenProps => ({
     safeAddress,
@@ -23,9 +23,8 @@ export const addToken = createAction(
 const saveToken = (safeAddress: string, token: Token) => async (dispatch: ReduxDispatch<GlobalState>) => {
   dispatch(addToken(safeAddress, token))
 
-  const tokenAddress = token.get('address')
+  const activeTokens = await getActiveTokens(safeAddress)
-  const activeTokens = await getActiveTokenAddresses(safeAddress)
+  await setActiveTokens(safeAddress, activeTokens.push(token))
-  await setActiveTokens(safeAddress, activeTokens.push(tokenAddress))
   setToken(safeAddress, token)
 }
 

src/logic/tokens/store/actions/addTokens.js

@@ -17,7 +17,7 @@ type TokenProps = {
   tokens: Map<string, Token>,
 }
 
-export const addTokens = createAction(
+export const addTokens = createAction<string, *, *>(
   ADD_TOKENS,
   (safeAddress: string, tokens: Map<string, Token>): TokenProps => ({
     safeAddress,

src/logic/tokens/store/actions/disableToken.js

@@ -7,16 +7,15 @@ import { removeFromActiveTokens } from '~/logic/tokens/utils/tokensStorage'
 
 export const DISABLE_TOKEN = 'DISABLE_TOKEN'
 
-export const disableToken = createAction(DISABLE_TOKEN, (safeAddress: string, tokenAddress: string) => ({
+export const disableToken = createAction<string, *, *>(DISABLE_TOKEN, (safeAddress: string, token: Token) => ({
   safeAddress,
-  tokenAddress,
+  token,
 }))
 
 const hideToken = (safeAddress: string, token: Token) => async (dispatch: ReduxDispatch<GlobalState>) => {
-  const { address } = token
+  dispatch(disableToken(safeAddress, token))
-  dispatch(disableToken(safeAddress, address))
 
-  await removeFromActiveTokens(safeAddress, address)
+  await removeFromActiveTokens(safeAddress, token)
 }
 
 export default hideToken

src/logic/tokens/store/actions/enableToken.js

@@ -7,14 +7,13 @@ import { setActiveTokens, getActiveTokens } from '~/logic/tokens/utils/tokensSto
 
 export const ENABLE_TOKEN = 'ENABLE_TOKEN'
 
-export const enableToken = createAction(ENABLE_TOKEN, (safeAddress: string, tokenAddress: string) => ({
+export const enableToken = createAction<string, *, *>(ENABLE_TOKEN, (safeAddress: string, token: Token) => ({
   safeAddress,
-  tokenAddress,
+  token,
 }))
 
 const setTokenEnabled = (safeAddress: string, token: Token) => async (dispatch: ReduxDispatch<GlobalState>) => {
-  const { address } = token
+  dispatch(enableToken(safeAddress, token))
-  dispatch(enableToken(safeAddress, address))
 
   const activeTokens = await getActiveTokens(safeAddress)
   await setActiveTokens(safeAddress, activeTokens.push(token))

src/logic/tokens/store/actions/fetchTokens.js

@@ -10,7 +10,7 @@ import { getWeb3 } from '~/logic/wallets/getWeb3'
 import { type GlobalState } from '~/store/index'
 import { makeToken, type Token, type TokenProps } from '~/logic/tokens/store/model/token'
 import { ensureOnce } from '~/utils/singleton'
-import { getActiveTokenAddresses, getTokens } from '~/logic/tokens/utils/tokensStorage'
+import { getActiveTokens, getTokens } from '~/logic/tokens/utils/tokensStorage'
 import { getSafeEthToken } from '~/logic/tokens/utils/tokenHelpers'
 import addTokens from './addTokens'
 import { getRelayUrl } from '~/config/index'

src/logic/tokens/store/actions/removeToken.js

@@ -12,7 +12,7 @@ type RemoveTokenProps = {
   token: Token,
 }
 
-export const removeToken = createAction(
+export const removeToken = createAction<string, *, *>(
   REMOVE_TOKEN,
   (safeAddress: string, token: Token): RemoveTokenProps => ({
     safeAddress,
@@ -23,8 +23,7 @@ export const removeToken = createAction(
 const deleteToken = (safeAddress: string, token: Token) => async (dispatch: ReduxDispatch<GlobalState>) => {
   dispatch(removeToken(safeAddress, token))
 
-  const tokenAddress = token.get('address')
+  await removeFromActiveTokens(safeAddress, token)
-  await removeFromActiveTokens(safeAddress, tokenAddress)
   await removeTokenFromStorage(safeAddress, token)
 }