From 273b8198a3d9af5abc42d498ae51adbb5c73312e Mon Sep 17 00:00:00 2001 From: wenty22 Date: Fri, 7 Feb 2025 18:06:46 +0800 Subject: [PATCH 1/4] feat: Add log for token price --- .../src/module/token/token.service.ts | 7 +++++++ 1 file changed, 7 insertions(+) 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 a58025c3..5967db78 100644 --- a/apps/canonical-bridge-server/src/module/token/token.service.ts +++ b/apps/canonical-bridge-server/src/module/token/token.service.ts @@ -170,6 +170,10 @@ export class TokenService { tokenAddress, ); + this.logger.log( + `[token price] ${chainId} ${tokenAddress} ${tokenSymbol}, cmc platform: ${cmcPlatform}, llama platform: ${llamaPlatform}`, + ); + const reqArr: Promise[] = []; if (cmcToken) { reqArr.push(this.web3Service.getCryptoCurrencyQuotes(cmcToken.id.toString())); @@ -187,12 +191,14 @@ export class TokenService { const [cmcRes, llamaRes] = await Promise.allSettled(reqArr); if (cmcRes.status === 'fulfilled') { const price = cmcRes.value?.[0]?.quote?.USD?.price; + this.logger.log(`[cmc price] ${price}`); if (price !== undefined) { return Number(price); } } if (llamaRes.status === 'fulfilled' && llamaRes.value?.coins) { const price = Object.values(llamaRes.value.coins ?? {})?.[0]?.price; + this.logger.log(`[llama price] ${price}`); if (price !== undefined) { return Number(price); } @@ -203,6 +209,7 @@ export class TokenService { const key = `1:${tokenSymbol?.toLowerCase()}`; const price = cmcPrices?.[key]?.price ?? llamaPrices?.[key]?.price; + this.logger.log(`[cache price] ${price}`); return price; } } From d43ab2bc4acd87d04a4775d5b9cb7a9d5b78af49 Mon Sep 17 00:00:00 2001 From: wenty22 Date: Fri, 7 Feb 2025 18:43:10 +0800 Subject: [PATCH 2/4] fix: Fix token price issue --- .../src/module/token/token.service.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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 5967db78..f8012f0b 100644 --- a/apps/canonical-bridge-server/src/module/token/token.service.ts +++ b/apps/canonical-bridge-server/src/module/token/token.service.ts @@ -170,10 +170,6 @@ export class TokenService { tokenAddress, ); - this.logger.log( - `[token price] ${chainId} ${tokenAddress} ${tokenSymbol}, cmc platform: ${cmcPlatform}, llama platform: ${llamaPlatform}`, - ); - const reqArr: Promise[] = []; if (cmcToken) { reqArr.push(this.web3Service.getCryptoCurrencyQuotes(cmcToken.id.toString())); @@ -191,25 +187,22 @@ export class TokenService { const [cmcRes, llamaRes] = await Promise.allSettled(reqArr); if (cmcRes.status === 'fulfilled') { const price = cmcRes.value?.[0]?.quote?.USD?.price; - this.logger.log(`[cmc price] ${price}`); if (price !== undefined) { return Number(price); } } if (llamaRes.status === 'fulfilled' && llamaRes.value?.coins) { const price = Object.values(llamaRes.value.coins ?? {})?.[0]?.price; - this.logger.log(`[llama price] ${price}`); if (price !== undefined) { return Number(price); } } const cmcPrices = await this.cache.get(`${CACHE_KEY.CMC_CONFIG_V2}`); - const llamaPrices = await this.cache.get(`${CACHE_KEY.CMC_CONFIG_V2}`); + const llamaPrices = await this.cache.get(`${CACHE_KEY.LLAMA_CONFIG_V2}`); const key = `1:${tokenSymbol?.toLowerCase()}`; const price = cmcPrices?.[key]?.price ?? llamaPrices?.[key]?.price; - this.logger.log(`[cache price] ${price}`); return price; } } From 3ffa9d5580b584a7c4a70fb2d533d90f28422ce7 Mon Sep 17 00:00:00 2001 From: wenty22 Date: Fri, 7 Feb 2025 18:56:01 +0800 Subject: [PATCH 3/4] feat: Clear input if timeout --- .../components/TransferButtonGroup/index.tsx | 13 ++----------- .../transfer/hooks/modal/useFeeLoadTimeout.ts | 2 ++ 2 files changed, 4 insertions(+), 11 deletions(-) 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 ba9fbece..21fbe7cd 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,10 +13,9 @@ 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 { useAppDispatch, useAppSelector } from '@/modules/store/StoreProvider'; +import { 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); @@ -29,8 +28,6 @@ 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, @@ -106,13 +103,7 @@ export const TransferButtonGroup = () => { isOpen={isFailedGetQuoteModalOpen} onClose={onCloseFailedGetQuoteModal} /> - { - dispatch(setSendValue('')); - onCloseFeeTimeoutModal(); - }} - /> + ); }; diff --git a/packages/canonical-bridge-widget/src/modules/transfer/hooks/modal/useFeeLoadTimeout.ts b/packages/canonical-bridge-widget/src/modules/transfer/hooks/modal/useFeeLoadTimeout.ts index 4aeba9c2..67e110c2 100644 --- a/packages/canonical-bridge-widget/src/modules/transfer/hooks/modal/useFeeLoadTimeout.ts +++ b/packages/canonical-bridge-widget/src/modules/transfer/hooks/modal/useFeeLoadTimeout.ts @@ -2,6 +2,7 @@ import { useCallback } from 'react'; import { useAppDispatch } from '@/modules/store/StoreProvider'; import { setIsFeeTimeoutModalOpen } from '@/modules/transfer/action'; +import { setSendValue } from '@/modules/transfer/action'; export const useFeeLoadTimeout = () => { const dispatch = useAppDispatch(); @@ -12,6 +13,7 @@ export const useFeeLoadTimeout = () => { const onCloseFeeTimeoutModal = useCallback(() => { dispatch(setIsFeeTimeoutModalOpen(false)); + dispatch(setSendValue('')); }, [dispatch]); return { onOpenFeeTimeoutModal, From 8d94386fd842fe5e24bc33b84bc81dbfcba2b661 Mon Sep 17 00:00:00 2001 From: wenty22 Date: Fri, 7 Feb 2025 18:57:05 +0800 Subject: [PATCH 4/4] docs: Add change log --- .release/.changeset/big-candles-breathe.md | 5 +++++ .release/.changeset/pre.json | 1 + packages/canonical-bridge-widget/CHANGELOG.md | 6 ++++++ packages/canonical-bridge-widget/package.json | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .release/.changeset/big-candles-breathe.md diff --git a/.release/.changeset/big-candles-breathe.md b/.release/.changeset/big-candles-breathe.md new file mode 100644 index 00000000..7746891c --- /dev/null +++ b/.release/.changeset/big-candles-breathe.md @@ -0,0 +1,5 @@ +--- +"@bnb-chain/canonical-bridge-widget": patch +--- + +Clear input if timeout diff --git a/.release/.changeset/pre.json b/.release/.changeset/pre.json index 0746017e..b0636b63 100644 --- a/.release/.changeset/pre.json +++ b/.release/.changeset/pre.json @@ -6,6 +6,7 @@ "@bnb-chain/canonical-bridge-widget": "0.5.18" }, "changesets": [ + "big-candles-breathe", "blue-goats-shave", "brown-suits-matter", "curvy-dingos-end", diff --git a/packages/canonical-bridge-widget/CHANGELOG.md b/packages/canonical-bridge-widget/CHANGELOG.md index 5e5e6203..d2f21b61 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.20 + +### Patch Changes + +- Clear input if timeout + ## 0.6.0-alpha.19 ### Patch Changes diff --git a/packages/canonical-bridge-widget/package.json b/packages/canonical-bridge-widget/package.json index c8b18c30..6c2a55e6 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.19", + "version": "0.6.0-alpha.20", "description": "canonical bridge widget", "author": "bnb-chain", "private": false,