fix displaying active tokens

This commit is contained in:
Mikhail Mikheev 2019-04-12 19:15:01 +04:00
parent 413cfa39d4
commit 595731d192
3 changed files with 21 additions and 11 deletions

View File

@ -67,13 +67,9 @@ class Tokens extends React.Component<Props, State> {
onSwitch = (token: Token) => (e: SyntheticInputEvent<HTMLInputElement>) => {
const { checked } = e.target
const { safeAddress, enableToken, disableToken } = this.props
const { safeAddress, updateActiveTokens } = this.props
if (checked) {
enableToken(safeAddress, token)
} else {
disableToken(safeAddress, token)
}
updateActiveTokens(safeAddress, token.address)
}
setImageToPlaceholder = (e) => {

View File

@ -13,7 +13,7 @@ type ActionReturn = {
export const updateTokenAction = createAction<string, Function, ActionReturn>(
UPDATE_SAFE_TOKENS,
(token: SafeToken): ActionReturn => ({
(safeAddress: string, token: SafeToken): ActionReturn => ({
safeAddress,
token,
}),

View File

@ -1,9 +1,10 @@
// @flow
import { Map } from 'immutable'
import { Map, List } from 'immutable'
import { handleActions, type ActionType } from 'redux-actions'
import { ADD_SAFE, buildOwnersFrom } from '~/routes/safe/store/actions/addSafe'
import SafeRecord, { type Safe, type SafeProps } from '~/routes/safe/store/models/safe'
import { type OwnerProps } from '~/routes/safe/store/models/owner'
import type { SafeToken } from '~/routes/safe/store/models/safeToken'
import { loadFromStorage } from '~/utils/storage'
import { SAFES_KEY } from '~/logic/safe/utils'
import { UPDATE_SAFE } from '~/routes/safe/store/actions/updateSafe'
@ -68,9 +69,22 @@ export default handleActions<State, *>(
return state.set(safe.address, safe)
},
[UPDATE_SAFE_TOKENS]: (state: State, action: ActionType<Function>): State => {
const { safeAddress, token } = action.payload
const tokens = state.getIn([safeAddress, 'tokens'])
}
const { safeAddress, token: updatedToken } = action.payload
const tokens: List<SafeToken> = state.getIn([safeAddress, 'tokens'])
console.log(tokens)
const index = tokens.findIndex(token => token.address === updatedToken.address)
console.log('called')
let newState
if (index !== -1) {
newState = state.setIn([safeAddress, 'tokens'], tokens.delete(index))
} else {
newState = state.setIn([safeAddress, 'tokens'], tokens.push(updatedToken))
}
console.log(newState.toJS())
return newState
},
},
Map(),
)