Merge pull request #196 from bnb-chain/hotfix/1213

fix: Fixed the bridgedTokenGroup case issue
bnb-chain · Dec 13, 2024 · d8b4f23 · d8b4f23
2 parents 6cec12f + 4992f44
commit d8b4f23
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.release/.changeset/wild-spoons-sip.md b/.release/.changeset/wild-spoons-sip.md
@@ -0,0 +1,5 @@
+---
+"@bnb-chain/canonical-bridge-widget": patch
+---
+
+Fixed the bridgedTokenGroup case issue
diff --git a/packages/canonical-bridge-widget/src/core/utils/string.ts b/packages/canonical-bridge-widget/src/core/utils/string.ts
@@ -49,3 +49,7 @@ export function utf8ToHex(utf8Str: any) {
     .map((char: any) => char.charCodeAt(0).toString(16).padStart(2, '0'))
     .join('');
 }
+
+export function includesIgnoreCase(strArr: string[], target: string) {
+  return !!strArr?.find((e) => e.toUpperCase() === target?.toUpperCase());
+}
diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/shared/BaseAdapter.ts b/packages/canonical-bridge-widget/src/modules/aggregator/shared/BaseAdapter.ts
@@ -3,6 +3,7 @@ import { BridgeType } from '@bnb-chain/canonical-bridge-sdk';
 
 import { IBridgeTokenBaseInfo, IExternalChain, INativeCurrency } from '@/modules/aggregator/types';
 import { isSameAddress } from '@/core/utils/address';
+import { includesIgnoreCase } from '@/core/utils/string';
 
 export interface ITransferTokenPair<T, P = unknown> {
   fromChainId: number;
@@ -274,7 +275,9 @@ export abstract class BaseAdapter<G extends object, C = unknown, T = unknown> {
 
     let toToken = tokenMap?.get(fromTokenSymbol);
     if (!toToken) {
-      const bridgedGroup = this.bridgedTokenGroups.find((group) => group.includes(fromTokenSymbol));
+      const bridgedGroup = this.bridgedTokenGroups.find((group) =>
+        includesIgnoreCase(group, fromTokenSymbol),
+      );
       const nextToken = bridgedGroup?.find((item) => item.toUpperCase() !== fromTokenSymbol);
       if (nextToken) {
         toToken = tokenMap?.get(nextToken?.toUpperCase());