Invalid token fix

Emurgo · Aug 8, 2022 · 7d9c0d5 · 7d9c0d5
1 parent 3722aa9
commit 7d9c0d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/Send/SendScreen/SendScreen.tsx b/src/Send/SendScreen/SendScreen.tsx
@@ -70,10 +70,6 @@ export const SendScreen = ({
   const netInfo = useNetInfo()
   const isOnline = netInfo.type !== 'none' && netInfo.type !== 'unknown'
 
-  if (!balance[selectedTokenIdentifier]) {
-    throw new Error('Invalid token')
-  }
-
   const defaultAssetAvailableAmount = new BigNumber(balance[defaultAsset.identifier])
   const selectedAssetAvailableAmount = new BigNumber(balance[selectedTokenIdentifier])
 

diff --git a/src/TxHistory/TxHistoryNavigator.tsx b/src/TxHistory/TxHistoryNavigator.tsx
@@ -1,5 +1,5 @@
 import {createStackNavigator} from '@react-navigation/stack'
-import React from 'react'
+import React, {useEffect} from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {StyleSheet, Text, TouchableOpacity, TouchableOpacityProps} from 'react-native'
 import {useSelector} from 'react-redux'
@@ -46,13 +46,14 @@ export const TxHistoryNavigator = () => {
   const [receiver, setReceiver] = React.useState('')
   const [amount, setAmount] = React.useState('')
 
-  const selectedAsset = balance[selectedTokenIdentifier]
-  if (!selectedAsset) {
-    setSelectedTokenIdentifier(defaultTokenId)
-    setSendAll(false)
-    setReceiver('')
-    setAmount('')
-  }
+  useEffect(() => {
+    if (!balance[selectedTokenIdentifier]) {
+      setSelectedTokenIdentifier(defaultTokenId)
+      setSendAll(false)
+      setReceiver('')
+      setAmount('')
+    }
+  }, [balance, defaultTokenId, selectedTokenIdentifier])
 
   return (
     <>