conflict ifx

src/routes/safe/component/Balances/Tokens/index.jsx

@@ -25,6 +25,7 @@ import Spacer from '~/components/Spacer'
 import Row from '~/components/layout/Row'
 import { ETH_ADDRESS } from '~/logic/tokens/utils/tokenHelpers'
 import { type Token } from '~/logic/tokens/store/model/token'
+import { type SafeToken } from '~/routes/safe/store/models/safeToken'
 import actions, { type Actions } from './actions'
 import TokenPlaceholder from './assets/token_placeholder.png'
 import { styles } from './style'
@@ -34,6 +35,7 @@ type Props = Actions & {
   classes: Object,
   tokens: List<Token>,
   safeAddress: string,
+  activeTokens: List<SafeToken>
 }
 
 type State = {
@@ -68,7 +70,7 @@ class Tokens extends React.Component<Props, State> {
   onSwitch = (token: Token) => () => {
     const { safeAddress, updateActiveTokens } = this.props
 
-    updateActiveTokens(safeAddress, token.address)
+    updateActiveTokens(safeAddress, token)
   }
 
   setImageToPlaceholder = (e) => {

src/routes/safe/container/index.jsx

@@ -32,7 +32,7 @@ class SafeView extends React.Component<Props> {
   componentDidUpdate(prevProps) {
     const { activeTokens } = this.props
 
-    if (!activeTokens.equals(prevProps.activeTokens)) {
+    if (activeTokens.size > prevProps.activeTokens.size) {
       this.checkForUpdates()
     }
   }

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

@@ -2,6 +2,7 @@
 import { List } from 'immutable'
 import type { Dispatch as ReduxDispatch, GetState } from 'redux'
 import { type GlobalState } from '~/store'
+import { type TokenBalance } from '/routes/safe/store/models/tokenBalance'
 import { safeActiveTokensSelector } from '~/routes/safe/store/selectors'
 import { SAFE_PARAM_ADDRESS } from '~/routes/routes'
 import updateSafe from './updateSafe'
@@ -21,7 +22,7 @@ const updateActiveTokens = (safeAddress: string, tokenAddress: string) => async
   getState: GetState<GlobalState>,
 ) => {
   const state = getState()
-  const safeTokens: List<SafeToken> = safeActiveTokensSelector(state, generateMatchProps(safeAddress))
+  const safeTokens: List<TokenBalance> = safeActiveTokensSelector(state, generateMatchProps(safeAddress))
   const index = safeTokens.findIndex(safeToken => safeToken === tokenAddress)
 
   let updatedTokens