status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Mikhail Mikheev 2019-04-22 17:59:22 +04:00
parent 5b109dd60a a689c3b44d
commit c6110fc8c2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/logic/tokens/utils/tokensStorage.js
View File

@ -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) const data = await loadFromStorage(ACTIVE_TOKENS_KEY)
return data || Map({}) return data || {}
} }
export const getCustomTokens = async (): Promise<List<TokenProps>> => { export const getCustomTokens = async (): Promise<List<TokenProps>> => {

2
src/routes/safe/store/actions/fetchSafe.js
View File

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