fix: crosschain native amount wrong (#2154)

KyberNetwork · Aug 10, 2023 · b4eb153 · b4eb153
1 parent fc3a4c8
commit b4eb153
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/src/components/SearchModal/CurrencySearch.tsx b/src/components/SearchModal/CurrencySearch.tsx
@@ -385,13 +385,13 @@ export function CurrencySearch({
   const removeImportedToken = useCallback(
     (token: Token) => {
       removeToken(chainId, token.address)
-
-      toggleFavoriteToken({
-        chainId,
-        address: token.address,
-      })
+      if (favoriteTokens?.some(el => el.toLowerCase() === token.address.toLowerCase()))
+        toggleFavoriteToken({
+          chainId,
+          address: token.address,
+        })
     },
-    [chainId, toggleFavoriteToken, removeToken],
+    [chainId, toggleFavoriteToken, removeToken, favoriteTokens],
   )
 
   const removeAllImportToken = () => {

diff --git a/src/hooks/bridge/index.ts b/src/hooks/bridge/index.ts
@@ -17,20 +17,29 @@ export const useEthBalanceOfAnotherChain = (chainId: ChainId | undefined) => {
   const { readProvider } = useKyberSwapConfig(chainId)
   const { account } = useActiveWeb3React()
   const [balance, setBalance] = useState<CurrencyAmount<Currency>>()
+
   useEffect(() => {
+    const controller = new AbortController()
     async function getBalance() {
       try {
         if (!readProvider || !account || !chainId) {
           setBalance(undefined)
           return
         }
         const balance = await readProvider.getBalance(account)
+        if (controller.signal.aborted) {
+          return
+        }
         setBalance(CurrencyAmount.fromRawAmount(NativeCurrencies[chainId], JSBI.BigInt(balance)))
       } catch (error) {
+        if (controller.signal.aborted) {
+          return
+        }
         setBalance(undefined)
       }
     }
     getBalance()
+    return () => controller.abort()
   }, [chainId, readProvider, account])
 
   return balance

diff --git a/src/pages/CrossChain/TransfersHistory/HistoryTable/Desktop.tsx b/src/pages/CrossChain/TransfersHistory/HistoryTable/Desktop.tsx
@@ -2,7 +2,6 @@ import { Trans } from '@lingui/macro'
 import { Flex } from 'rebass'
 import styled, { css } from 'styled-components'
 
-import { ITEMS_PER_PAGE } from 'pages/Bridge/consts'
 import TransactionItem from 'pages/CrossChain/TransfersHistory/HistoryTable/TransactionItem'
 
 import { Props } from './index'
@@ -46,26 +45,6 @@ export const TableRow = styled.div`
 `
 
 const Desktop: React.FC<Props> = ({ transfers }) => {
-  const renderInvisibleRows = () => {
-    // don't need invisible rows for upToExtraSmall screens
-    if (transfers.length === ITEMS_PER_PAGE) {
-      return null
-    }
-
-    return Array(ITEMS_PER_PAGE - transfers.length)
-      .fill(0)
-      .map((_, i) => {
-        return (
-          <TableRow
-            key={i}
-            style={{
-              visibility: 'hidden',
-            }}
-          />
-        )
-      })
-  }
-
   return (
     <Flex flexDirection="column" style={{ flex: 1 }}>
       <TableHeader>
@@ -88,7 +67,6 @@ const Desktop: React.FC<Props> = ({ transfers }) => {
       {transfers.map(transfer => (
         <TransactionItem data={transfer} key={transfer.srcTxHash} />
       ))}
-      {renderInvisibleRows()}
     </Flex>
   )
 }