fix: swap quotes (#1833)

* fix tx review no opening for swap

* remove base support for swap

Author: janndriessen

src/app/store/trade-machine.ts

@@ -1,11 +1,10 @@
 import { atomWithMachine } from 'jotai-xstate'
-import { TransactionReceipt } from 'viem'
 import { assertEvent, assign, createMachine } from 'xstate'
 
-import { TransactionReview } from '@/components/swap/components/transaction-review/types'
-import { QuoteResult, QuoteType } from '@/lib/hooks/use-best-quote/types'
-
+import type { TransactionReview } from '@/components/swap/components/transaction-review/types'
 import type { PostApiV2Trade200 } from '@/gen'
+import type { QuoteResult, QuoteType } from '@/lib/hooks/use-best-quote/types'
+import type { TransactionReceipt } from 'viem'
 
 // Define the context type for our state machine
 export interface TradeMachineContext {

src/components/smart-trade-button/index.tsx

@@ -8,14 +8,15 @@ import {
   useTradeButtonState,
 } from '@/components/swap/hooks/use-trade-button-state'
 import { TradeButton } from '@/components/trade-button'
-import { Token } from '@/constants/tokens'
 import { useApproval } from '@/lib/hooks/use-approval'
 import { useIsTokenPairTradable } from '@/lib/hooks/use-is-token-pair-tradable'
 import { useNetwork } from '@/lib/hooks/use-network'
 import { useProtectionContext } from '@/lib/providers/protection'
 import { useSlippage } from '@/lib/providers/slippage'
 import { getNativeToken } from '@/lib/utils/tokens'
 
+import type { Token } from '@/constants/tokens'
+
 type SmartTradeButtonProps = {
   inputToken: Token
   outputToken: Token

src/components/swap/index.tsx

@@ -7,8 +7,7 @@ import { useDebounce } from 'use-debounce'
 import { tradeMachineAtom } from '@/app/store/trade-machine'
 import { SmartTradeButton } from '@/components/smart-trade-button'
 import { SwapNavigation } from '@/components/swap/components/navigation'
-import { ARBITRUM, BASE, MAINNET } from '@/constants/chains'
-import { Token } from '@/constants/tokens'
+import { ARBITRUM, MAINNET } from '@/constants/chains'
 import { useBestQuote } from '@/lib/hooks/use-best-quote'
 import { QuoteType } from '@/lib/hooks/use-best-quote/types'
 import { useDisclosure } from '@/lib/hooks/use-disclosure'
@@ -27,14 +26,16 @@ import { getTokenBySymbol } from '@/lib/utils/tokens'
 import { SelectTokenModal } from './components/select-token-modal'
 import { TradeDetails } from './components/trade-details'
 import {
-  InputSelectorToken,
+  type InputSelectorToken,
   TradeInputSelector,
 } from './components/trade-input-selector'
 import { TradeOutput } from './components/trade-output'
 import { TransactionReviewModal } from './components/transaction-review'
 import { useSwap } from './hooks/use-swap'
 import { useTokenlists } from './hooks/use-tokenlists'
 
+import type { Token } from '@/constants/tokens'
+
 type SwapProps = {
   isBuying: boolean
   inputToken: Token
@@ -47,7 +48,6 @@ export const Swap = (props: SwapProps) => {
   const isSupportedNetwork = useSupportedNetworks([
     MAINNET.chainId,
     ARBITRUM.chainId,
-    BASE.chainId,
   ])
   const { chainId } = useNetwork()
   const { slippage } = useSlippage()
@@ -119,6 +119,16 @@ export const Swap = (props: SwapProps) => {
     setSelectedQuote(quoteResults?.bestQuote)
   }, [quoteResults])
 
+  useEffect(() => {
+    const quote = quoteResults?.results[selectedQuote ?? QuoteType.index]
+    if (!quote) return
+    sendTradeEvent({
+      type: 'QUOTE',
+      quoteResult: quote,
+      quoteType: quote.type,
+    })
+  }, [quoteResults, selectedQuote, sendTradeEvent])
+
   const resetTradeData = useCallback(() => {
     setInputTokenAmountFormatted('')
     setSellTokenAmount('0')

src/lib/hooks/use-best-quote/index.ts

@@ -2,7 +2,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
 import { usePublicClient } from 'wagmi'
 
 import { ARBITRUM } from '@/constants/chains'
-import { Token } from '@/constants/tokens'
 import {
   isAvailableForFlashMint,
   isAvailableForSwap,
@@ -15,11 +14,18 @@ import { getAddressForToken } from '@/lib/utils/tokens'
 import { formatQuoteAnalytics, useAnalytics } from '../use-analytics'
 import { getTokenPrice, useNativeTokenPrice } from '../use-token-price'
 
-import { Quote, QuoteResults, QuoteType, ZeroExQuote } from './types'
+import {
+  type Quote,
+  type QuoteResults,
+  QuoteType,
+  type ZeroExQuote,
+} from './types'
 import { getBestQuote } from './utils/best-quote'
 import { getFlashMintQuote } from './utils/flashmint'
 import { getIndexQuote } from './utils/index-quote'
 
+import type { Token } from '@/constants/tokens'
+
 export interface FetchQuoteRequest {
   isMinting: boolean
   inputToken: Token

src/lib/hooks/use-quote-result/index.ts

@@ -4,14 +4,15 @@ import { useEffect, useState } from 'react'
 import { usePublicClient } from 'wagmi'
 
 import { tradeMachineAtom } from '@/app/store/trade-machine'
-import { Token } from '@/constants/tokens'
 import { formatQuoteAnalytics, useAnalytics } from '@/lib/hooks/use-analytics'
-import { QuoteResult, QuoteType } from '@/lib/hooks/use-best-quote/types'
+import { type QuoteResult, QuoteType } from '@/lib/hooks/use-best-quote/types'
 import { getFlashMintQuote } from '@/lib/hooks/use-best-quote/utils/flashmint'
 import { getIndexQuote } from '@/lib/hooks/use-best-quote/utils/index-quote'
 import { getBestYieldQuote } from '@/lib/hooks/use-quote-result/best-quote'
 import { getTokenPrice, useNativeTokenPrice } from '@/lib/hooks/use-token-price'
 
+import type { Token } from '@/constants/tokens'
+
 type QuoteRequest = {
   address: string | undefined
   chainId: number