Merge branch 'fix/ui-20240801' into tmp/20240731

RabbyHub · Aug 1, 2024 · 52e74e4 · 52e74e4
2 parents a39380c + c4b4580
commit 52e74e4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/ui/views/Bridge/Component/BridgeContent.tsx b/src/ui/views/Bridge/Component/BridgeContent.tsx
@@ -128,6 +128,10 @@ export const BridgeContent = () => {
 
   const quoteOrAmountLoading = quoteLoading || payAmountLoading;
 
+  const amountAvailable = useMemo(() => Number(debouncePayAmount) > 0, [
+    debouncePayAmount,
+  ]);
+
   const aggregatorIds = useRabbySelector(
     (s) => s.bridge.aggregatorsList.map((e) => e.id) || []
   );
@@ -386,13 +390,14 @@ export const BridgeContent = () => {
         />
 
         {quoteOrAmountLoading &&
+          amountAvailable &&
           !inSufficient &&
           !selectedBridgeQuote?.manualClick && <BestQuoteLoading />}
 
         {payToken &&
           !inSufficient &&
           receiveToken &&
-          Number(debouncePayAmount) > 0 &&
+          amountAvailable &&
           (!quoteOrAmountLoading || selectedBridgeQuote?.manualClick) && (
             <BridgeReceiveDetails
               openQuotesList={openQuotesList}
@@ -484,6 +489,7 @@ export const BridgeContent = () => {
           disabled={
             !payToken ||
             !receiveToken ||
+            !amountAvailable ||
             inSufficient ||
             payAmountLoading ||
             !selectedBridgeQuote

diff --git a/src/ui/views/Swap/Component/Main.tsx b/src/ui/views/Swap/Component/Main.tsx
@@ -195,6 +195,10 @@ export const Main = () => {
 
   const quoteOrAmountLoading = quoteLoading || payAmountLoading;
 
+  const amountAvailable = useMemo(() => Number(debouncePayAmount) > 0, [
+    debouncePayAmount,
+  ]);
+
   const btnText = useMemo(() => {
     if (slippageChanged) {
       return t('page.swap.slippage-adjusted-refresh-quote');
@@ -450,11 +454,13 @@ export const Main = () => {
         />
 
         {quoteOrAmountLoading &&
+          amountAvailable &&
           !inSufficient &&
           !activeProvider?.manualClick && <BestQuoteLoading />}
 
         {Number(debouncePayAmount) > 0 &&
           !inSufficient &&
+          amountAvailable &&
           (!quoteOrAmountLoading ||
             (activeProvider && !!activeProvider.manualClick)) &&
           payToken &&
@@ -589,7 +595,7 @@ export const Main = () => {
           disabled={
             !payToken ||
             !receiveToken ||
-            !debouncePayAmount ||
+            !amountAvailable ||
             inSufficient ||
             payAmountLoading ||
             !activeProvider