fix: Fix the issue of to token cannot be selected after exchange chain

.release/.changeset/brown-suits-matter.md

@@ -0,0 +1,6 @@
+---
+"@bnb-chain/canonical-bridge-widget": patch
+"@bnb-chain/canonical-bridge-sdk": patch
+---
+
+Fix the issue of to token cannot be selected after exchange chain

.release/.changeset/pre.json

@@ -7,6 +7,7 @@
   },
   "changesets": [
     "blue-goats-shave",
+    "brown-suits-matter",
     "curvy-dingos-end",
     "thick-donkeys-kneel"
   ]

apps/canonical-bridge-server/src/module/bridge/bridge.processor.ts

@@ -184,9 +184,19 @@ export class BridgeProcessor extends WorkerHost {
       return false;
     }
 
+    let key: string | undefined;
     const isNative = isNativeToken(tokenAddress, chainInfo.chainType);
-    const key = isNative ? `${chainId}` : `${chainId}:${tokenAddress}`;
+    if (isNative) {
+      key = `${chainId}`;
+    } else {
+      if (chainInfo.chainType === 'evm') {
+        key = `${chainId}:${tokenAddress.toLowerCase()}`;
+      } else {
+        key = `${chainId}:${tokenAddress}`;
+      }
+    }
     const price = cmcPrices[key] ?? llamaPrices[key];
+
     return !!price;
   }
 

packages/canonical-bridge-sdk/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @bnb-chain/canonical-bridge-sdk
 
+## 0.5.0-alpha.10
+
+### Patch Changes
+
+- Fix the issue of to token cannot be selected after exchange chain
+
 ## 0.5.0-alpha.9
 
 ### Patch Changes

packages/canonical-bridge-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bnb-chain/canonical-bridge-sdk",
-  "version": "0.5.0-alpha.9",
+  "version": "0.5.0-alpha.10",
   "description": "canonical bridge sdk",
   "author": "bnb-chain",
   "private": false,

packages/canonical-bridge-widget/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @bnb-chain/canonical-bridge-widget
 
+## 0.6.0-alpha.15
+
+### Patch Changes
+
+- Fix the issue of to token cannot be selected after exchange chain
+- Updated dependencies
+  - @bnb-chain/[email protected]
+
 ## 0.6.0-alpha.14
 
 ### Patch Changes

packages/canonical-bridge-widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bnb-chain/canonical-bridge-widget",
-  "version": "0.6.0-alpha.14",
+  "version": "0.6.0-alpha.15",
   "description": "canonical bridge widget",
   "author": "bnb-chain",
   "private": false,
@@ -46,7 +46,7 @@
     "@solana/web3.js": "^1",
     "tronweb": "^6",
     "@tronweb3/tronwallet-adapter-react-hooks": "^1",
-    "@bnb-chain/canonical-bridge-sdk": "^0.5.0-alpha.9"
+    "@bnb-chain/canonical-bridge-sdk": "^0.5.0-alpha.10"
   },
   "devDependencies": {
     "@bnb-chain/canonical-bridge-sdk": "workspace:*",

packages/canonical-bridge-widget/src/modules/aggregator/hooks/useSelection.ts

@@ -72,8 +72,10 @@ export function useSelection() {
         // eslint-disable-next-line no-console
         console.log('[aggregator]', `has multiple toTokens (${toTokens.length})`);
         dispatch(setToTokens(toTokens));
+        dispatch(setToToken(undefined));
       } else {
         dispatch(setToTokens([]));
+        dispatch(setToToken(undefined));
       }
 
       if (toTokens.length === 1) {

packages/canonical-bridge-widget/src/modules/transfer/BridgeRoutes.tsx

@@ -74,6 +74,7 @@ export function BridgeRoutes() {
     dispatch,
     bridgeConfig.http.refetchingInterval,
     isManuallyReload,
+    toToken,
   ]);
 
   if (isBase) {

packages/canonical-bridge-widget/src/modules/transfer/components/ReceiveInfo/index.tsx

@@ -85,7 +85,7 @@ export const ReceiveInfo = ({ onOpen }: ReceiveInfoProps) => {
   const debouncedSendValue = useDebounce(sendValue, DEBOUNCE_DELAY);
 
   useEffect(() => {
-    if (!isBase || !toToken) return;
+    if (!isBase || !toToken || !sendValue) return;
 
     // On mobile
     if (sendValue === debouncedSendValue) {

packages/canonical-bridge-widget/src/modules/transfer/components/TransferOverview/index.tsx

@@ -58,7 +58,7 @@ export function TransferOverview(props: TransferOverviewProps) {
   const toToken = useAppSelector((state) => state.transfer.toToken);
 
   useEffect(() => {
-    if (isBase || !toToken) return;
+    if (isBase || !toToken || !sendValue) return;
 
     if (sendValue === debouncedSendValue) {
       dispatch(setTransferActionInfo(undefined));

packages/canonical-bridge-widget/src/modules/transfer/hooks/useLoadingBridgeFees.ts

@@ -503,27 +503,24 @@ export const useLoadingBridgeFees = () => {
       fromChain,
       toChain,
       debouncedSendValue,
+      toToken,
       bridgeSDK,
       address,
       publicClient,
-      toToken?.layerZero?.raw?.endpointID,
-      toToken?.stargate?.raw?.endpointID,
-      toToken?.meson?.raw?.id,
-      toToken?.deBridge?.raw?.address,
       max_slippage,
       tronAddress,
       deBridgeAccessToken,
       deBridgeReferralCode,
       solanaAddress,
       isSolanaAvailableToAccount,
+      feeReloadMaxTime,
+      onOpenFeeTimeoutModal,
       formatMessage,
       getToDecimals,
       isWalletCompatible,
       nativeToken,
-      preSelectRoute,
       onOpenFailedGetQuoteModal,
-      onOpenFeeTimeoutModal,
-      feeReloadMaxTime,
+      preSelectRoute,
     ],
   );