fix: not able to get quote from exact output

pancakeswap · Sep 10, 2024 · 52d5e2e · 52d5e2e
1 parent 99327de
commit 52d5e2e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/apps/web/src/hooks/useBestAMMTrade.ts b/apps/web/src/hooks/useBestAMMTrade.ts
@@ -589,10 +589,11 @@ export function useBestTradeFromApi({
       })
       const serializedRes = await serverRes.json()
 
+      const isExactIn = tradeType === TradeType.EXACT_INPUT
       const result = parseQuoteResponse(serializedRes, {
         chainId: currency.chainId,
-        currencyIn: amount.currency,
-        currencyOut: currency,
+        currencyIn: isExactIn ? amount.currency : currency,
+        currencyOut: isExactIn ? currency : amount.currency,
         tradeType,
       })
 

diff --git a/apps/web/src/views/Swap/V3Swap/containers/SwapCommitButton.tsx b/apps/web/src/views/Swap/V3Swap/containers/SwapCommitButton.tsx
@@ -39,7 +39,6 @@ interface SwapCommitButtonPropsType {
   order?: PriceOrder
   tradeError?: Error | null
   tradeLoading?: boolean
-  // setLock: (lock: boolean) => void
 }
 
 const useSettingModal = (onDismiss) => {
@@ -163,7 +162,7 @@ const SwapCommitButtonInner = memo(function SwapCommitButtonInner({
   }
   const parsedAmounts = useParsedAmounts(order?.trade, currencyBalances, false)
   const parsedIndependentFieldAmount = parsedAmounts[independentField]
-  const swapInputError = useSwapInputError(isClassicOrder(order) ? order : undefined, currencyBalances)
+  const swapInputError = useSwapInputError(order, currencyBalances)
   const [tradeToConfirm, setTradeToConfirm] = useState<PriceOrder | undefined>(undefined)
   const [indirectlyOpenConfirmModalState, setIndirectlyOpenConfirmModalState] = useState(false)
 

diff --git a/apps/web/src/views/Swap/V3Swap/hooks/useSwapBestTrade.ts b/apps/web/src/views/Swap/V3Swap/hooks/useSwapBestTrade.ts
@@ -46,7 +46,7 @@ export function useSwapBestOrder({ maxHops }: Options = {}) {
 
   const [xEnabled] = useUserXEnable()
 
-  const { isLoading, data, isStale, error, refetch } = useBestTradeFromApi({
+  const { fetchStatus, data, isStale, error, refetch } = useBestTradeFromApi({
     enabled: xEnabled,
     amount,
     currency: dependentCurrency,
@@ -65,7 +65,7 @@ export function useSwapBestOrder({ maxHops }: Options = {}) {
     refresh: refetch,
     isStale,
     error,
-    isLoading: useDeferredValue(Boolean(isLoading || (typedValue && !data && !error))),
+    isLoading: useDeferredValue(Boolean(fetchStatus === 'fetching' || (typedValue && !data && !error))),
     order: typedValue ? data : undefined,
   }
 }