Merge branch 'fix1127' into wenty/wallet

bnb-chain · Nov 27, 2024 · 319f1c8 · 319f1c8
2 parents 8d3b6d1 + 4889a4c
commit 319f1c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/hooks/useSelection.ts b/packages/canonical-bridge-widget/src/modules/aggregator/hooks/useSelection.ts
@@ -18,6 +18,7 @@ import { sortTokens } from '@/modules/aggregator/shared/sortTokens';
 import { useTronWeb } from '@/core/hooks/useTronWeb';
 import { useSolanaAccount } from '@/modules/wallet/hooks/useSolanaAccount';
 import { useTronAccount } from '@/modules/wallet/hooks/useTronAccount';
+import { isSameAddress } from '@/core/utils/address';
 
 export function useSelection() {
   const { getFromChains, getToChains, getTokens, getToToken, adapters } = useAggregator();
@@ -58,7 +59,7 @@ export function useSelection() {
     const newToken = getTokens({
       fromChainId: tmpFromChain?.id,
       toChainId: tmpToChain?.id,
-    }).find((t) => t.displaySymbol?.toUpperCase() === tmpToken?.displaySymbol?.toUpperCase());
+    }).find((t) => isSameAddress(t.address, tmpToken?.address));
 
     const newFromChain = getFromChains({
       toChainId: tmpToChain?.id,
@@ -101,9 +102,7 @@ export function useSelection() {
 
     const newToken =
       tmpTokens.find(
-        (t) =>
-          isChainOrTokenCompatible(t) &&
-          t.displaySymbol.toUpperCase() === selectedToken?.displaySymbol.toUpperCase(),
+        (t) => isChainOrTokenCompatible(t) && isSameAddress(t.address, selectedToken?.address),
       ) ?? tmpTokens.find((t) => isChainOrTokenCompatible(t));
 
     updateSelectedInfo({

diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/shared/aggregateTokens.ts b/packages/canonical-bridge-widget/src/modules/aggregator/shared/aggregateTokens.ts
@@ -31,7 +31,7 @@ export function aggregateTokens({ adapters, params }: IAggregateTokensParams) {
         chainId: fromChainId,
         token: fromToken,
       });
-      let bridgeToken = tokenMap.get(baseInfo.displaySymbol.toUpperCase());
+      let bridgeToken = tokenMap.get(baseInfo.address.toLowerCase());
 
       const isMatched = matchedTokens.has(baseInfo.symbol.toUpperCase());
       const isCompatible = compatibleTokens.has(baseInfo.symbol.toUpperCase());
@@ -70,7 +70,7 @@ export function aggregateTokens({ adapters, params }: IAggregateTokensParams) {
         };
       }
 
-      tokenMap.set(baseInfo.displaySymbol.toUpperCase(), bridgeToken);
+      tokenMap.set(baseInfo.address.toLowerCase(), bridgeToken);
     });
   });