Merge branch 'development' of github.com:gnosis/safe-react into 83-tokens

src/logic/tokens/utils/tokensStorage.js

@@ -19,10 +19,10 @@ export const saveActiveTokens = async (tokens: Map<string, Token>) => {
   }
 }
 
-export const getActiveTokens = async (): Promise<Map<string, TokenProps>> => {
+export const getActiveTokens = async (): Promise<Object<string, TokenProps>> => {
   const data = await loadFromStorage(ACTIVE_TOKENS_KEY)
 
-  return data || Map({})
+  return data || {}
 }
 
 export const getCustomTokens = async (): Promise<List<TokenProps>> => {

src/routes/safe/store/actions/fetchSafe.js

@@ -10,8 +10,6 @@ import { getGnosisSafeContract } from '~/logic/contracts/safeContracts'
 import { getWeb3, getBalanceInEtherOf } from '~/logic/wallets/getWeb3'
 import updateSafe from '~/routes/safe/store/actions/updateSafe'
 
-// eslint-disable-next-line
-// eslint-disable-next-line
 const buildOwnersFrom = (
   safeOwners: string[],
   storedOwners: Map<string, string>, // eslint-disable-next-line