From a9738d2241f4ca1f6fee5ba2050615410762f184 Mon Sep 17 00:00:00 2001 From: wenty22 Date: Fri, 24 Jan 2025 14:18:57 +0800 Subject: [PATCH 1/4] fix: Fix token price issue --- apps/canonical-bridge-server/src/module/token/token.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/canonical-bridge-server/src/module/token/token.service.ts b/apps/canonical-bridge-server/src/module/token/token.service.ts index 4bcf53f2..bd90974c 100644 --- a/apps/canonical-bridge-server/src/module/token/token.service.ts +++ b/apps/canonical-bridge-server/src/module/token/token.service.ts @@ -200,7 +200,7 @@ 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}`; return cmcPrices?.[key] ?? llamaPrices?.[key]; } From 06bd8b11c267c8bf4078ad641762b18e03936fa2 Mon Sep 17 00:00:00 2001 From: wenty22 Date: Fri, 24 Jan 2025 16:51:02 +0800 Subject: [PATCH 2/4] fix: Fix token price fallback issue --- .vscode/settings.json | 10 +++++----- .../src/module/bridge/bridge.processor.ts | 5 +++-- .../src/module/token/token.service.ts | 5 +++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ed861c9a..019c135e 100644 --- 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 index eac55200..49144426 100644 --- 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 = {}; 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 index bd90974c..a58025c3 100644 --- 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 = `1:${tokenSymbol}`; + const key = `1:${tokenSymbol?.toLowerCase()}`; - return cmcPrices?.[key] ?? llamaPrices?.[key]; + const price = cmcPrices?.[key]?.price ?? llamaPrices?.[key]?.price; + return price; } } From d70611c72729d4260d3e69d88a41c8289b20f4ca Mon Sep 17 00:00:00 2001 From: wenty22 Date: Fri, 7 Feb 2025 16:08:07 +0800 Subject: [PATCH 3/4] fix: Fix issues --- .release/.changeset/large-years-cover.md | 5 +++++ .../src/CanonicalBridgeProvider.tsx | 2 +- .../src/modules/aggregator/hooks/useSelection.ts | 2 ++ .../components/TransferButtonGroup/index.tsx | 13 +++++++++++-- .../modules/transfer/hooks/useInputValidation.ts | 4 ++-- 5 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 .release/.changeset/large-years-cover.md diff --git a/.release/.changeset/large-years-cover.md b/.release/.changeset/large-years-cover.md new file mode 100644 index 00000000..1d79f6d5 --- /dev/null +++ b/.release/.changeset/large-years-cover.md @@ -0,0 +1,5 @@ +--- +"@bnb-chain/canonical-bridge-widget": patch +--- + +Fix issues diff --git a/packages/canonical-bridge-widget/src/CanonicalBridgeProvider.tsx b/packages/canonical-bridge-widget/src/CanonicalBridgeProvider.tsx index 7f63a8d7..e8332bdd 100644 --- 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 index 0a5581c4..9821384e 100644 --- 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/packages/canonical-bridge-widget/src/modules/transfer/components/TransferButtonGroup/index.tsx b/packages/canonical-bridge-widget/src/modules/transfer/components/TransferButtonGroup/index.tsx index 21fbe7cd..ba9fbece 100644 --- a/packages/canonical-bridge-widget/src/modules/transfer/components/TransferButtonGroup/index.tsx +++ b/packages/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(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} /> - + { + 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 index 7bb2df3b..cc23e657 100644 --- 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, }; } From 74fb8b499747c813c4ffb927d78489e86c12aef6 Mon Sep 17 00:00:00 2001 From: wenty22 Date: Fri, 7 Feb 2025 16:08:46 +0800 Subject: [PATCH 4/4] docs: Add change logs --- .release/.changeset/pre.json | 1 + packages/canonical-bridge-widget/CHANGELOG.md | 6 ++++++ packages/canonical-bridge-widget/package.json | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release/.changeset/pre.json b/.release/.changeset/pre.json index d82c6472..0746017e 100644 --- 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/packages/canonical-bridge-widget/CHANGELOG.md b/packages/canonical-bridge-widget/CHANGELOG.md index 8cc8442c..5e5e6203 100644 --- 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 index 394b0fb3..c8b18c30 100644 --- 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,