add more checks to query enabled

osmosis-labs · Jun 4, 2024 · 67d8b87 · 67d8b87
1 parent 10725b2
commit 67d8b87
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/packages/web/hooks/use-swap.tsx b/packages/web/hooks/use-swap.tsx
@@ -102,6 +102,7 @@ export function useSwap(
   const { isOneClickTradingEnabled, oneClickTradingInfo } =
     useOneClickTradingSession();
   const { t } = useTranslation();
+  const { isLoading: isWalletLoading } = useWalletSelect();
 
   const swapAssets = useSwapAssets({
     initialFromDenom,
@@ -119,14 +120,15 @@ export function useSwap(
   // load flags
   const isToFromAssets =
     Boolean(swapAssets.fromAsset) && Boolean(swapAssets.toAsset);
-  const canLoadQuote =
+  const quoteQueryEnabled =
     isToFromAssets &&
     Boolean(inAmountInput.debouncedInAmount?.toDec().isPositive()) &&
     // since input is debounced there could be the wrong asset associated
     // with the input amount when switching assets
     inAmountInput.debouncedInAmount?.currency.coinMinimalDenom ===
       swapAssets.fromAsset?.coinMinimalDenom &&
-    !Boolean(account?.txTypeInProgress);
+    !Boolean(account?.txTypeInProgress) &&
+    !isWalletLoading;
 
   const {
     data: quote,
@@ -140,11 +142,11 @@ export function useSwap(
       forcePoolId: forceSwapInPoolId,
       maxSlippage,
     },
-    canLoadQuote
+    quoteQueryEnabled
   );
   /** If a query is not enabled, it is considered loading.
    *  Work around this by checking if the query is enabled and if the query is loading to be considered loading. */
-  const isQuoteLoading = isQuoteLoading_ && canLoadQuote;
+  const isQuoteLoading = isQuoteLoading_ && quoteQueryEnabled;
 
   const {
     data: spotPriceQuote,
@@ -196,6 +198,7 @@ export function useSwap(
   const networkFeeQueryEnabled =
     featureFlags.swapToolSimulateFee &&
     !Boolean(precedentError) &&
+    // includes check for quoteQueryEnabled
     !isQuoteLoading &&
     Boolean(quote) &&
     Boolean(account?.address);
@@ -211,10 +214,7 @@ export function useSwap(
       useOneClickTrading: isOneClickTradingEnabled,
     },
   });
-  const isLoadingNetworkFee =
-    featureFlags.swapToolSimulateFee &&
-    isLoadingNetworkFee_ &&
-    networkFeeQueryEnabled;
+  const isLoadingNetworkFee = isLoadingNetworkFee_ && networkFeeQueryEnabled;
 
   const hasExceededOneClickTradingGasLimit = useMemo(() => {
     if (
@@ -774,6 +774,7 @@ function useSwapAmountInput({
 }) {
   const { chainStore, accountStore } = useStore();
   const account = accountStore.getWallet(chainStore.osmosis.chainId);
+  const { isLoading: isLoadingWallet } = useWalletSelect();
 
   const featureFlags = useFeatureFlags();
 
@@ -785,10 +786,15 @@ function useSwapAmountInput({
   });
 
   const balanceQuoteQueryEnabled =
-    !!inAmountInput.balance &&
-    !inAmountInput.balance?.toDec().isZero() &&
+    !isLoadingWallet &&
     Boolean(swapAssets.fromAsset) &&
-    Boolean(swapAssets.toAsset);
+    Boolean(swapAssets.toAsset) &&
+    inAmountInput.debouncedInAmount?.currency.coinMinimalDenom ===
+      swapAssets.fromAsset!.coinMinimalDenom &&
+    !!inAmountInput.balance &&
+    !inAmountInput.balance.toDec().isZero() &&
+    inAmountInput.balance.currency.coinMinimalDenom ===
+      swapAssets.fromAsset?.coinMinimalDenom;
   const {
     data: quoteForCurrentBalance,
     isLoading: isQuoteForCurrentBalanceLoading_,
@@ -806,8 +812,9 @@ function useSwapAmountInput({
   const isQuoteForCurrentBalanceLoading =
     isQuoteForCurrentBalanceLoading_ && balanceQuoteQueryEnabled;
 
-  const networkQueryEnabled =
+  const networkFeeQueryEnabled =
     featureFlags.swapToolSimulateFee &&
+    // includes check for balanceQuoteQueryEnabled
     !isQuoteForCurrentBalanceLoading &&
     Boolean(quoteForCurrentBalance) &&
     !Boolean(account?.txTypeInProgress);
@@ -818,10 +825,10 @@ function useSwapAmountInput({
   } = useEstimateTxFees({
     chainId: chainStore.osmosis.chainId,
     messages: quoteForCurrentBalance?.messages,
-    enabled: networkQueryEnabled,
+    enabled: networkFeeQueryEnabled,
   });
   const isLoadingCurrentBalanceNetworkFee =
-    networkQueryEnabled && isLoadingCurrentBalanceNetworkFee_;
+    networkFeeQueryEnabled && isLoadingCurrentBalanceNetworkFee_;
 
   const hasErrorWithCurrentBalanceQuote = useMemo(() => {
     return !!currentBalanceNetworkFeeError || !!quoteForCurrentBalanceError;