Merge pull request #178 from bnb-chain/fix1206v1

fix: Fix searching issue
bnb-chain · Dec 9, 2024 · a8ffc99 · a8ffc99
2 parents 5a30bc4 + 6e1cd4e
commit a8ffc99
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 6 deletions.
diff --git a/.release/.changeset/healthy-wombats-applaud.md b/.release/.changeset/healthy-wombats-applaud.md
@@ -0,0 +1,5 @@
+---
+'@bnb-chain/canonical-bridge-widget': patch
+---
+
+Use own token address for deBridge
diff --git a/.release/.changeset/nice-worms-turn.md b/.release/.changeset/nice-worms-turn.md
@@ -0,0 +1,5 @@
+---
+"@bnb-chain/canonical-bridge-widget": patch
+---
+
+Fix from & to chain search
diff --git a/.release/.changeset/pre.json b/.release/.changeset/pre.json
@@ -0,0 +1,12 @@
+{
+  "mode": "pre",
+  "tag": "alpha",
+  "initialVersions": {
+    "@bnb-chain/canonical-bridge-sdk": "0.4.2",
+    "@bnb-chain/canonical-bridge-widget": "0.5.8"
+  },
+  "changesets": [
+    "healthy-wombats-applaud",
+    "nice-worms-turn"
+  ]
+}
diff --git a/packages/canonical-bridge-widget/CHANGELOG.md b/packages/canonical-bridge-widget/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @bnb-chain/canonical-bridge-widget
 
+## 0.5.9-alpha.1
+
+### Patch Changes
+
+- Use own token address for deBridge
+
+## 0.5.9-alpha.0
+
+### Patch Changes
+
+- Fix from & to chain search
+
 ## 0.5.8
 
 ### Patch Changes

diff --git a/packages/canonical-bridge-widget/package.json b/packages/canonical-bridge-widget/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bnb-chain/canonical-bridge-widget",
-  "version": "0.5.8",
+  "version": "0.5.9-alpha.1",
   "description": "canonical bridge widget",
   "author": "bnb-chain",
   "private": false,

diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/adapters/meson/MesonAdapter.ts b/packages/canonical-bridge-widget/src/modules/aggregator/adapters/meson/MesonAdapter.ts
@@ -126,7 +126,7 @@ export class MesonAdapter extends BaseAdapter<IMesonChain[], IMesonChain, IMeson
 
   public getTokenInfo({ chainId, token }: { chainId: number; token: IMesonToken }) {
     return {
-      name: (token as any).id, // TODO
+      name: (token as any).id?.toUpperCase(), // TODO
       symbol: token.id.toUpperCase(),
       address: token.addr ?? '0x0000000000000000000000000000000000000000',
       decimals: token.decimals,

diff --git a/...l-bridge-widget/src/modules/aggregator/components/SelectModal/DestinationNetworkModal.tsx b/...l-bridge-widget/src/modules/aggregator/components/SelectModal/DestinationNetworkModal.tsx
@@ -35,7 +35,7 @@ export function DestinationNetworkModal(props: DestinationNetworkModalProps) {
   });
 
   const { isNoResult, result, onSearch } = useSearch({
-    filter: (item, keyword) => item.name.toLowerCase().includes(keyword),
+    filter: (item, keyword) => item.name.toLowerCase().includes(keyword?.toLowerCase()),
     sorter: (a) => (toChain?.id === a.id ? -1 : 0),
     data: toChains,
   });

diff --git a/...onical-bridge-widget/src/modules/aggregator/components/SelectModal/SourceNetworkModal.tsx b/...onical-bridge-widget/src/modules/aggregator/components/SelectModal/SourceNetworkModal.tsx
@@ -36,7 +36,7 @@ export function SourceNetworkModal(props: SourceNetworkModalProps) {
   });
 
   const { isNoResult, result, onSearch } = useSearch({
-    filter: (item, keyword) => item.name.toLowerCase().includes(keyword),
+    filter: (item, keyword) => item.name.toLowerCase().includes(keyword?.toLowerCase()),
     sorter: (a) => (fromChain?.id === a.id ? -1 : 0),
     data: fromChains,
   });

diff --git a/packages/canonical-bridge-widget/src/modules/transfer/hooks/useLoadingBridgeFees.ts b/packages/canonical-bridge-widget/src/modules/transfer/hooks/useLoadingBridgeFees.ts
@@ -157,10 +157,10 @@ export const useLoadingBridgeFees = () => {
         },
         deBridgeOpts: {
           fromChainId: fromChain.id,
-          fromTokenAddress: selectedToken.address as `0x${string}`,
+          fromTokenAddress: selectedToken.deBridge?.address as `0x${string}`,
           amount,
           toChainId: toChain?.id,
-          toTokenAddress: toToken?.address as `0x${string}`,
+          toTokenAddress: toToken?.deBridge?.address as `0x${string}`,
           accesstoken: deBridgeAccessToken,
           userAddress:
             fromChain.chainType === 'solana'