merge fixes

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

@@ -70,7 +70,7 @@ class Tokens extends React.Component<Props, State> {
   onSwitch = (token: Token) => () => {
     const { safeAddress, updateActiveTokens } = this.props
 
-    updateActiveTokens(safeAddress, token)
+    updateActiveTokens(safeAddress, token.address)
   }
 
   setImageToPlaceholder = (e) => {

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

@@ -44,7 +44,7 @@ const fetchTokenBalances = (safeAddress: string, tokens: List<Token>) => async (
         })),
     )
 
-    dispatch(updateSafe({ address: safeAddress, tokens: List(withBalances) }))
+    dispatch(updateSafe({ address: safeAddress, balances: List(withBalances) }))
   } catch (err) {
     // eslint-disable-next-line
     console.error('Error while loading active tokens from storage:', err)

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

@@ -23,7 +23,7 @@ const updateActiveTokens = (safeAddress: string, tokenAddress: string) => async
 ) => {
   const state = getState()
   const safeTokens: List<TokenBalance> = safeActiveTokensSelector(state, generateMatchProps(safeAddress))
-  const index = safeTokens.findIndex(safeToken => safeToken === tokenAddress)
+  const index = safeTokens.findIndex(address => address === tokenAddress)
 
   let updatedTokens
   if (index !== -1) {