From 6a810982d5876139b1304482333e906aebe440e2 Mon Sep 17 00:00:00 2001 From: naturexie <786281870@qq.com> Date: Sun, 26 Jan 2025 20:52:33 +0800 Subject: [PATCH] feat: update estimating loading logic --- screens/Trading/components/TradingOperate.tsx | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/screens/Trading/components/TradingOperate.tsx b/screens/Trading/components/TradingOperate.tsx index 8ef90fcb..35190cc5 100644 --- a/screens/Trading/components/TradingOperate.tsx +++ b/screens/Trading/components/TradingOperate.tsx @@ -128,7 +128,6 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => /** * longInput shortInput deal start * */ - // TODOXX useEffect(() => { const inputUsdCharcate1 = getAssetPrice(ReduxcategoryAssets1); const inputUsdCharcate2 = getAssetPrice(ReduxcategoryAssets2); @@ -221,7 +220,6 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => // force estimating useEffect(() => { const interval = setInterval(() => { - // TODOXX if (tokenInAmount) { setForceUpdate((prev) => prev + 1); setForceUpdateLoading(true); @@ -230,7 +228,6 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => return () => clearInterval(interval); }, [tokenInAmount]); - // TODOXX // for same input, forceUpdateLoading is true useEffect(() => { if (forceUpdateLoading) { @@ -477,7 +474,6 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => function getAssetPrice(categoryId) { return categoryId ? combinedAssetsData[categoryId["token_id"]]?.price?.usd : 0; } - // TODOXX function updateOutput(tab: string, inputUsdCharcate: number) { /** * @param inputUsdCharcate category1 current price @@ -501,7 +497,6 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => outputUsdSetter(inputUsdCharcate * tokenInAmount); } } - // TODOXX function updateInputAmounts(tab, inputUsdCharcate2, inputUsdCharcate1) { /** * @param inputUsdCharcate2 category2 current price @@ -566,6 +561,7 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => } } } + const buttonLoading = estimateLoading || forceUpdateLoading; return (
@@ -596,7 +592,6 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => if (!tokenInAmount || forceUpdateLoading) { return; } - // TODOXX setForceUpdate((prev) => prev + 1); setForceUpdateLoading(true); }} @@ -756,7 +751,7 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => disabled={isDisabled || !!warnTip} onClick={handleConfirmButtonClick} > - {estimateLoading ? ( + {buttonLoading ? ( ) : ( <> @@ -768,7 +763,7 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => )} {isLongConfirmModalOpen && ( @@ -891,7 +886,7 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => disabled={isDisabled || !!warnTip} onClick={handleConfirmButtonClick} > - {estimateLoading ? ( + {buttonLoading ? ( ) : ( <> @@ -904,7 +899,7 @@ const TradingOperate: React.FC = ({ onMobileClose, id }) => accountId={accountId} className="w-full h-[46px]" isShort - loading={estimateLoading} + loading={buttonLoading} /> )} {isShortConfirmModalOpen && (