Merge pull request #307 from bnb-chain/wenty/aggregator

fix: Fix issues
bnb-chain · Feb 7, 2025 · f6d0b70 · f6d0b70
2 parents 7ab76cc + 74fb8b4
commit f6d0b70
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 15 deletions.
diff --git a/.release/.changeset/large-years-cover.md b/.release/.changeset/large-years-cover.md
@@ -0,0 +1,5 @@
+---
+"@bnb-chain/canonical-bridge-widget": patch
+---
+
+Fix issues
diff --git a/.release/.changeset/pre.json b/.release/.changeset/pre.json
@@ -9,6 +9,7 @@
     "blue-goats-shave",
     "brown-suits-matter",
     "curvy-dingos-end",
+    "large-years-cover",
     "modern-toys-give",
     "short-ants-love",
     "smooth-vans-work",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,12 +8,12 @@
     "**/.hg": true,
     "**/CVS": true,
     "**/.DS_Store": true,
-    // "**/node_modules": true,
-    // "**/.next": true,
+    "**/node_modules": true,
+    "**/.next": true,
     "**/*.log": true,
-    // "**/dist": true,
-    // "**/.rush": true,
-    // "**/temp": true,
+    "**/dist": true,
+    "**/.rush": true,
+    "**/temp": true,
     "**/tsconfig.tsbuildinfo": true
   },
   "[typescript]": {

diff --git a/apps/canonical-bridge-server/src/module/bridge/bridge.processor.ts b/apps/canonical-bridge-server/src/module/bridge/bridge.processor.ts
@@ -57,14 +57,15 @@ export class BridgeProcessor extends WorkerHost {
 
   async fetchDeBridge() {
     const config = await this.web3Service.getDebridgeChains();
-
     if (!config) return;
 
     const tokenMap: Record<string, IDeBridgeToken[]> = {};
 
     for (const chain of config.chains) {
       const data = await this.web3Service.getDebridgeChainTokens(chain.chainId);
-      tokenMap[chain.chainId] = Object.values(data.tokens);
+      if (data) {
+        tokenMap[chain.chainId] = Object.values(data.tokens);
+      }
     }
 
     const data = { chains: config.chains, tokens: tokenMap };

diff --git a/apps/canonical-bridge-server/src/module/token/token.service.ts b/apps/canonical-bridge-server/src/module/token/token.service.ts
@@ -200,8 +200,9 @@ export class TokenService {
 
     const cmcPrices = await this.cache.get(`${CACHE_KEY.CMC_CONFIG_V2}`);
     const llamaPrices = await this.cache.get(`${CACHE_KEY.CMC_CONFIG_V2}`);
-    const key = `${chainId}:${tokenSymbol}`;
+    const key = `1:${tokenSymbol?.toLowerCase()}`;
 
-    return cmcPrices?.[key] ?? llamaPrices?.[key];
+    const price = cmcPrices?.[key]?.price ?? llamaPrices?.[key]?.price;
+    return price;
   }
 }
diff --git a/packages/canonical-bridge-widget/CHANGELOG.md b/packages/canonical-bridge-widget/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @bnb-chain/canonical-bridge-widget
 
+## 0.6.0-alpha.19
+
+### Patch Changes
+
+- d70611c: Fix issues
+
 ## 0.6.0-alpha.18
 
 ### 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.6.0-alpha.18",
+  "version": "0.6.0-alpha.19",
   "description": "canonical bridge widget",
   "author": "bnb-chain",
   "private": false,

diff --git a/packages/canonical-bridge-widget/src/CanonicalBridgeProvider.tsx b/packages/canonical-bridge-widget/src/CanonicalBridgeProvider.tsx
@@ -156,7 +156,7 @@ export function CanonicalBridgeProvider(props: CanonicalBridgeProviderProps) {
         brandChains: [],
         externalChains: [],
 
-        dollarUpperLimit: 500000,
+        dollarUpperLimit: 200000,
 
         chainOrders: [],
         tokenOrders: [],

diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/hooks/useSelection.ts b/packages/canonical-bridge-widget/src/modules/aggregator/hooks/useSelection.ts
@@ -21,6 +21,7 @@ import {
   setFromChain,
   setSelectedToken,
   setSendValue,
+  setToAccount,
   setToChain,
   setToToken,
   setToTokens,
@@ -206,6 +207,7 @@ export function useSelection() {
 
   const exchange = async () => {
     dispatch(setSendValue(''));
+    dispatch(setToAccount({ address: '' }));
 
     const fromChainId = toChain!.id;
     const toChainId = fromChain!.id;

diff --git a/...ges/canonical-bridge-widget/src/modules/transfer/components/TransferButtonGroup/index.tsx b/...ges/canonical-bridge-widget/src/modules/transfer/components/TransferButtonGroup/index.tsx
@@ -13,9 +13,10 @@ import { MIN_SOL_TO_ENABLED_TX } from '@/core/constants';
 import { FailedToGetQuoteModal } from '@/modules/transfer/components/Modal/FailedToGetQuoteModal';
 import { FeeTimeoutModal } from '@/modules/transfer/components/Modal/FeeTimeoutModal';
 import { useFailGetQuoteModal } from '@/modules/transfer/hooks/modal/useFailGetQuoteModal';
-import { useAppSelector } from '@/modules/store/StoreProvider';
+import { useAppDispatch, useAppSelector } from '@/modules/store/StoreProvider';
 import { useSummaryModal } from '@/modules/transfer/hooks/modal/useSummaryModal';
 import { useFeeLoadTimeout } from '@/modules/transfer/hooks/modal/useFeeLoadTimeout';
+import { setSendValue } from '@/modules/transfer/action';
 
 export const TransferButtonGroup = () => {
   const [hash, setHash] = useState<string | null>(null);
@@ -28,6 +29,8 @@ export const TransferButtonGroup = () => {
   const isFeeTimeoutModalOpen = useAppSelector((state) => state.transfer.isFeeTimeoutModalOpen);
   const isSummaryModalOpen = useAppSelector((state) => state.transfer.isSummaryModalOpen);
 
+  const dispatch = useAppDispatch();
+
   const {
     isOpen: isSubmittedModalOpen,
     onOpen: onOpenSubmittedModal,
@@ -103,7 +106,13 @@ export const TransferButtonGroup = () => {
         isOpen={isFailedGetQuoteModalOpen}
         onClose={onCloseFailedGetQuoteModal}
       />
-      <FeeTimeoutModal isOpen={isFeeTimeoutModalOpen} onClose={onCloseFeeTimeoutModal} />
+      <FeeTimeoutModal
+        isOpen={isFeeTimeoutModalOpen}
+        onClose={() => {
+          dispatch(setSendValue(''));
+          onCloseFeeTimeoutModal();
+        }}
+      />
     </>
   );
 };
diff --git a/packages/canonical-bridge-widget/src/modules/transfer/hooks/useInputValidation.ts b/packages/canonical-bridge-widget/src/modules/transfer/hooks/useInputValidation.ts
@@ -56,11 +56,11 @@ export const useInputValidation = () => {
           };
         }
 
-        if (priceInfo?.upperLimit && Number(value) >= Number(priceInfo?.upperLimit)) {
+        if (priceInfo?.upperLimit && Number(value) > Number(priceInfo?.upperLimit)) {
           return {
             text: `Transfer value over $${formatNumber(dollarUpperLimit)} (${formatNumber(
               priceInfo.upperLimit,
-            )} ${selectedToken?.symbol}) or equivalent is not allowed`,
+            )} ${selectedToken?.symbol}) is not allowed`,
             isError: true,
           };
         }