Merge pull request #175 from bnb-chain/hotfix/ChainSearch

Hotfix/chain search
bnb-chain · Dec 6, 2024 · 741b022 · 741b022
2 parents 54cf211 + 0c58bf2
commit 741b022
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 53 deletions.
diff --git a/.release/.changeset/light-emus-switch.md b/.release/.changeset/light-emus-switch.md
diff --git a/.release/.changeset/pre.json b/.release/.changeset/pre.json
diff --git a/.release/.changeset/sharp-dryers-hear.md b/.release/.changeset/sharp-dryers-hear.md
diff --git a/.release/.changeset/slimy-crabs-know.md b/.release/.changeset/slimy-crabs-know.md
diff --git a/packages/canonical-bridge-widget/CHANGELOG.md b/packages/canonical-bridge-widget/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @bnb-chain/canonical-bridge-widget
 
+## 0.5.8
+
+### Patch Changes
+
+- 49e31fc: Update token list sort rules
+- f86dcd0: Show token address on `You Receive`
+- f86dcd0: Support searching token by address
+- f86dcd0: Show token address on `You Receive`
+
+## 0.5.8-alpha.5
+
+### Patch Changes
+
+- Update token list sort rules
+
 ## 0.5.8-alpha.4
 
 ### 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-alpha.4",
+  "version": "0.5.8",
   "description": "canonical bridge widget",
   "author": "bnb-chain",
   "private": false,

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/...nonical-bridge-widget/src/modules/aggregator/components/SelectModal/hooks/useTokenList.ts b/...nonical-bridge-widget/src/modules/aggregator/components/SelectModal/hooks/useTokenList.ts
@@ -38,28 +38,11 @@ export function useTokenList(tokens: IBridgeToken[] = [], keyword?: string) {
     const sortedTokens = sortTokens({
       tokens: tmpTokens,
       orders: transferConfig.order?.tokens,
-    })
-      .sort((a, b) => {
-        if (keyword) {
-          const isA = isChainOrTokenCompatible(a);
-          const isB = isChainOrTokenCompatible(b);
-          const findA = a.displaySymbol?.toLowerCase()?.includes(keyword?.toLowerCase());
-          const findB = b.displaySymbol?.toLowerCase()?.includes(keyword?.toLowerCase());
-
-          if (findA && isA) {
-            return -1;
-          }
-          if (findB && isB) {
-            return 1;
-          }
-        }
-        return 0;
-      })
-      .sort((a) => {
-        return isSameAddress(a.address, selectedToken?.address) && isChainOrTokenCompatible(a)
-          ? -1
-          : 0;
-      });
+    }).sort((a) => {
+      return isSameAddress(a.address, selectedToken?.address) && isChainOrTokenCompatible(a)
+        ? -1
+        : 0;
+    });
 
     return sortedTokens;
   }, [
@@ -68,7 +51,6 @@ export function useTokenList(tokens: IBridgeToken[] = [], keyword?: string) {
     getTokenBalance,
     getTokenPrice,
     selectedToken?.address,
-    keyword,
   ]);
 
   return { data: sortedTokens, isLoading: isLoadingTokenBalances || isLoadingTokenPrices };