temp

src/components/TradeRouting/RouteRowV3.tsx

@@ -0,0 +1,13 @@
+import { SwapRouteV3 } from 'utils/aggregationRouting'
+
+export const RouteRowV3 = ({ tradeComposition }: { tradeComposition: SwapRouteV3[] }) => {
+  const firstSwaps = tradeComposition.filter(item => item.depth === 1)
+
+  return (
+    <>
+      {firstSwaps.map((swap, index) => {
+        return <div>{swap.exchange}</div>
+      })}
+    </>
+  )
+}

src/components/TradeRouting/index.tsx

@@ -28,7 +28,9 @@ import { useActiveWeb3React } from 'hooks'
 import { useCurrencyV2 } from 'hooks/Tokens'
 import { useAllDexes } from 'state/customizeDexes/hooks'
 import { getEtherscanLink, isAddress } from 'utils'
-import { SwapRouteV2 } from 'utils/aggregationRouting'
+import { SwapRouteV2, SwapRouteV3 } from 'utils/aggregationRouting'
+
+import { RouteRowV3 } from './RouteRowV3'
 
 interface RouteRowProps {
   route: SwapRouteV2
@@ -117,7 +119,7 @@ const RouteRow = ({ route, chainId, backgroundColor }: RouteRowProps) => {
 interface RoutingProps {
   maxHeight?: string
 
-  tradeComposition: SwapRouteV2[] | undefined
+  tradeComposition: SwapRouteV2[] | SwapRouteV3[] | undefined
   currencyIn: Currency | undefined
   currencyOut: Currency | undefined
   inputAmount: CurrencyAmount<Currency> | undefined
@@ -171,6 +173,7 @@ const Routing = ({
   useEffect(() => {
     handleScroll()
   }, [tradeComposition, maxHeight, handleScroll])
+  const isSwapRouteV3 = tradeComposition?.every(item => 'pool' in item)
 
   return (
     <Shadow ref={shadowRef}>
@@ -187,16 +190,22 @@ const Routing = ({
               <StyledRoutes>
                 <StyledDot />
                 <StyledDot out />
-                {tradeComposition.map(route => (
-                  <StyledRoute key={route.id}>
-                    <StyledPercent>{getSwapPercent(route.swapPercentage, tradeComposition.length)}</StyledPercent>
-                    <StyledRouteLine />
-                    <RouteRow route={route} chainId={chainId} />
-                    <StyledHopChevronWrapper style={{ marginRight: '2px' }}>
-                      <StyledHopChevronRight />
-                    </StyledHopChevronWrapper>
-                  </StyledRoute>
-                ))}
+                {isSwapRouteV3 ? (
+                  <RouteRowV3 tradeComposition={tradeComposition as SwapRouteV3[]} />
+                ) : (
+                  (tradeComposition as SwapRouteV2[]).map(route => {
+                    return (
+                      <StyledRoute key={route.id}>
+                        <StyledPercent>{getSwapPercent(route.swapPercentage, tradeComposition.length)}</StyledPercent>
+                        <StyledRouteLine />
+                        <RouteRow route={route} chainId={chainId} />
+                        <StyledHopChevronWrapper style={{ marginRight: '2px' }}>
+                          <StyledHopChevronRight />
+                        </StyledHopChevronWrapper>
+                      </StyledRoute>
+                    )
+                  })
+                )}
               </StyledRoutes>
             </div>
           ) : null}

src/pages/Earns/useLiquidityWidget.tsx

@@ -199,10 +199,7 @@ const useLiquidityWidget = () => {
             onOpenZapMigration: handleOpenZapMigrationWidget,
             onSubmitTx: async (txData: { from: string; to: string; data: string; value: string; gasLimit: string }) => {
               try {
-                console.log('txData', txData)
                 if (!library) throw new Error('Library is not ready!')
-                const gas = await library.estimateGas(txData)
-                console.log(gas)
                 const res = await library?.getSigner().sendTransaction(txData)
                 if (!res) throw new Error('Transaction failed')
                 return res.hash

src/pages/SwapV3/index.tsx

@@ -153,7 +153,14 @@ export default function Swap() {
   }, [tabFromUrl, searchParams, setSearchParams])
 
   const tradeRouteComposition = useMemo(() => {
-    return getTradeComposition(chainId, routeSummary?.parsedAmountIn, undefined, routeSummary?.route, defaultTokens)
+    return getTradeComposition(
+      chainId,
+      routeSummary?.parsedAmountIn,
+      undefined,
+      routeSummary?.route,
+      defaultTokens,
+      routeSummary?.tokenOut || '',
+    )
   }, [chainId, defaultTokens, routeSummary])
 
   const onBackToSwapTab = () => setActiveTab(getDefaultTab())