chore: run lint:fix

packages/swapper/src/swappers/ChainflipSwapper/endpoints.ts

@@ -101,7 +101,7 @@ export const chainflipApi: SwapperApi = {
 
     const depositAddress = swapResponse.address!
     step.chainflipSwapId = swapResponse.id!
-    
+
     const { assetReference } = fromAssetId(step.sellAsset.assetId)
 
     const adapter = assertGetEvmChainAdapter(step.sellAsset.chainId)

packages/swapper/src/swappers/ChainflipSwapper/swapperApi/getTradeQuote.ts

@@ -287,9 +287,10 @@ export const _getTradeQuote = async (
             allowanceContract: '0x0', // Chainflip does not use contracts
             estimatedExecutionTimeMs:
               (singleQuoteResponse.boostQuote.estimatedDurationsSeconds!.deposit! +
-               singleQuoteResponse.boostQuote.estimatedDurationsSeconds!.swap!) * 1000,
-            chainflipNumberOfChunks: isStreaming 
-              ? singleQuoteResponse.boostQuote.numberOfChunks ?? undefined 
+                singleQuoteResponse.boostQuote.estimatedDurationsSeconds!.swap!) *
+              1000,
+            chainflipNumberOfChunks: isStreaming
+              ? singleQuoteResponse.boostQuote.numberOfChunks ?? undefined
               : undefined,
             chainflipChunkIntervalBlocks: isStreaming
               ? singleQuoteResponse.boostQuote.chunkIntervalBlocks ?? undefined
@@ -333,13 +334,14 @@ export const _getTradeQuote = async (
           allowanceContract: '0x0', // Chainflip does not use contracts - all Txs are sends
           estimatedExecutionTimeMs:
             (singleQuoteResponse.estimatedDurationsSeconds!.deposit! +
-             singleQuoteResponse.estimatedDurationsSeconds!.swap!) * 1000,
-          chainflipNumberOfChunks: isStreaming 
-            ? singleQuoteResponse.numberOfChunks ?? undefined 
+              singleQuoteResponse.estimatedDurationsSeconds!.swap!) *
+            1000,
+          chainflipNumberOfChunks: isStreaming
+            ? singleQuoteResponse.numberOfChunks ?? undefined
             : undefined,
           chainflipChunkIntervalBlocks: isStreaming
             ? singleQuoteResponse.chunkIntervalBlocks ?? undefined
-            : undefined
+            : undefined,
         },
       ],
     }

packages/swapper/src/swappers/ChainflipSwapper/types.ts

@@ -5,8 +5,8 @@ import type { ChainflipBaasStatusSwap } from './models/ChainflipBaasStatusSwap'
 export type ChainFlipStatus = {
   status: {
     state: 'waiting' | 'receiving' | 'swapping' | 'sending' | 'sent' | 'completed' | 'failed'
-    swap?: ChainflipBaasStatusSwap,
-    swapEgress?: ChainflipBaasStatusEgress,
+    swap?: ChainflipBaasStatusSwap
+    swapEgress?: ChainflipBaasStatusEgress
   }
 }
 

packages/swapper/src/swappers/ChainflipSwapper/utils/helpers.ts

@@ -99,12 +99,12 @@ export const getChainFlipSwap = ({
   refundAddress,
   retryDurationInBlocks = 10,
   commissionBps,
-  numberOfChunks = undefined, 
-  chunkIntervalBlocks = 2                
+  numberOfChunks = undefined,
+  chunkIntervalBlocks = 2,
 }: GetChainFlipSwapArgs): Promise<
   Result<AxiosResponse<ChainflipBaasSwapDepositAddress, any>, SwapErrorRight>
 > => {
-  let swapUrl = 
+  let swapUrl =
     `${brokerUrl}/swap` +
     `?apiKey=${apiKey}` +
     `&sourceAsset=${sourceAsset}` +
@@ -117,9 +117,8 @@ export const getChainFlipSwap = ({
     `&commissionBps=${commissionBps}`
 
   if (numberOfChunks) {
-    swapUrl += 
-      `&numberOfChunks=${numberOfChunks}` +
-      `&chunkIntervalBlocks=${chunkIntervalBlocks}`
+    swapUrl += `&numberOfChunks=${numberOfChunks}`
+    swapUrl += `&chunkIntervalBlocks=${chunkIntervalBlocks}`
   }
 
   return chainflipService.get<ChainflipBaasSwapDepositAddress>(swapUrl)

packages/swapper/src/types.ts

@@ -265,9 +265,9 @@ export type TradeQuoteStep = {
     value: string
     gasLimit: string
   }
-  cowswapQuoteResponse?: CowSwapQuoteResponse,
-  chainflipSwapId?: number | undefined,
-  chainflipNumberOfChunks?: number | undefined,
+  cowswapQuoteResponse?: CowSwapQuoteResponse
+  chainflipSwapId?: number | undefined
+  chainflipNumberOfChunks?: number | undefined
   chainflipChunkIntervalBlocks?: number | undefined
 }
 

src/components/MultiHopTrade/components/MultiHopTradeConfirm/components/HopTransactionStep.tsx

@@ -5,14 +5,14 @@ import type {
   TradeQuoteStep,
 } from '@shapeshiftoss/swapper'
 import { SwapperName } from '@shapeshiftoss/swapper'
+import {
+  CHAINFLIP_DCA_BOOST_SWAP_SOURCE,
+  CHAINFLIP_DCA_SWAP_SOURCE,
+} from '@shapeshiftoss/swapper/dist/swappers/ChainflipSwapper/constants'
 import {
   THORCHAIN_LONGTAIL_STREAMING_SWAP_SOURCE,
   THORCHAIN_STREAM_SWAP_SOURCE,
 } from '@shapeshiftoss/swapper/dist/swappers/ThorchainSwapper/constants'
-import {
-  CHAINFLIP_DCA_SWAP_SOURCE,
-  CHAINFLIP_DCA_BOOST_SWAP_SOURCE,
-} from '@shapeshiftoss/swapper/dist/swappers/ChainflipSwapper/constants'
 import type { KnownChainIds } from '@shapeshiftoss/types'
 import { useCallback, useMemo } from 'react'
 import { useTranslate } from 'react-polyglot'
@@ -32,15 +32,14 @@ import { TransactionExecutionState } from 'state/slices/tradeQuoteSlice/types'
 import { useAppSelector } from 'state/store'
 
 import { SwapperIcon } from '../../TradeInput/components/SwapperIcon/SwapperIcon'
+import { useChainflipStreamingProgress } from '../hooks/useChainflipStreamingProgress'
+import { useThorStreamingProgress } from '../hooks/useThorStreamingProgress'
 import { useTradeExecution } from '../hooks/useTradeExecution'
 import { getChainShortName } from '../utils/getChainShortName'
 import { StatusIcon } from './StatusIcon'
 import { StepperStep } from './StepperStep'
 import { StreamingSwap } from './StreamingSwap'
 
-import { useThorStreamingProgress } from '../hooks/useThorStreamingProgress'
-import { useChainflipStreamingProgress } from '../hooks/useChainflipStreamingProgress'
-
 export type HopTransactionStepProps = {
   swapperName: SwapperName
   tradeQuoteStep: TradeQuoteStep
@@ -186,36 +185,37 @@ export const HopTransactionStep = ({
       THORCHAIN_STREAM_SWAP_SOURCE,
       THORCHAIN_LONGTAIL_STREAMING_SWAP_SOURCE,
       CHAINFLIP_DCA_SWAP_SOURCE,
-      CHAINFLIP_DCA_BOOST_SWAP_SOURCE
+      CHAINFLIP_DCA_BOOST_SWAP_SOURCE,
     ].includes(tradeQuoteStep.source)
 
     if (sellTxHash !== undefined && isStreamingSwap) {
-      const isThor = tradeQuoteStep.source == THORCHAIN_STREAM_SWAP_SOURCE || tradeQuoteStep.source == THORCHAIN_LONGTAIL_STREAMING_SWAP_SOURCE
-      const streamingProgress = isThor
-        ? useThorStreamingProgress
-        : useChainflipStreamingProgress
-        
+      const isThor =
+        tradeQuoteStep.source === THORCHAIN_STREAM_SWAP_SOURCE ||
+        tradeQuoteStep.source === THORCHAIN_LONGTAIL_STREAMING_SWAP_SOURCE
+      const streamingProgress = isThor ? useThorStreamingProgress : useChainflipStreamingProgress
+
       return (
         <Card width='full'>
           <CardBody px={2} py={2}>
-            <StreamingSwap 
-              tradeQuoteStep={tradeQuoteStep} 
-              hopIndex={hopIndex} 
-              activeTradeId={activeTradeId} 
-              streamingProgress={streamingProgress} />
+            <StreamingSwap
+              tradeQuoteStep={tradeQuoteStep}
+              hopIndex={hopIndex}
+              activeTradeId={activeTradeId}
+              streamingProgress={streamingProgress}
+            />
           </CardBody>
         </Card>
       )
     }
   }, [
     isActive,
     swapTxState,
-    tradeQuoteStep.source,
     sellTxHash,
     handleSignTx,
     isFetching,
     tradeQuoteQueryData,
     translate,
+    tradeQuoteStep,
     hopIndex,
     activeTradeId,
   ])

src/components/MultiHopTrade/components/MultiHopTradeConfirm/components/StreamingSwap.tsx

@@ -1,22 +1,19 @@
 import { WarningIcon } from '@chakra-ui/icons'
 import { Progress, Stack } from '@chakra-ui/react'
-import type { 
-  TradeQuote,
-  TradeQuoteStep
-} from '@shapeshiftoss/swapper'
+import type { TradeQuote, TradeQuoteStep } from '@shapeshiftoss/swapper'
 import { useMemo } from 'react'
 import { useTranslate } from 'react-polyglot'
 import { Row } from 'components/Row/Row'
 import type { StreamingSwapFailedSwap } from 'state/slices/tradeQuoteSlice/types'
 
 export type StreamingSwapProps = {
-  tradeQuoteStep: TradeQuoteStep,
+  tradeQuoteStep: TradeQuoteStep
   hopIndex: number
-  activeTradeId: TradeQuote['id'],
+  activeTradeId: TradeQuote['id']
   streamingProgress: (
     tradeQuoteStep: TradeQuoteStep,
     hopIndex: number,
-    confirmedTradeId: TradeQuote['id']
+    confirmedTradeId: TradeQuote['id'],
   ) => {
     isComplete: boolean
     attemptedSwapCount: number
@@ -33,7 +30,7 @@ export const StreamingSwap = (props: StreamingSwapProps) => {
   const { totalSwapCount, attemptedSwapCount, isComplete, failedSwaps } = streamingProgress(
     tradeQuoteStep,
     hopIndex,
-    activeTradeId
+    activeTradeId,
   )
 
   const isInitializing = useMemo(() => {

src/components/MultiHopTrade/components/MultiHopTradeConfirm/hooks/types.ts

@@ -19,6 +19,6 @@ export type ThornodeStreamingSwapResponse =
   | ThornodeStreamingSwapResponseError
 
 export type ChainflipStreamingSwapResponseSuccess = {
-  executedChunks: number,
+  executedChunks: number
   remainingChunks: number
 }

src/components/MultiHopTrade/components/MultiHopTradeConfirm/hooks/useChainflipStreamingProgress.tsx

@@ -1,7 +1,6 @@
-import type {
-  TradeQuote, 
-  TradeQuoteStep
-} from '@shapeshiftoss/swapper'
+import type { TradeQuote, TradeQuoteStep } from '@shapeshiftoss/swapper'
+// TODO: Is this import allowed?
+import type { ChainFlipStatus } from '@shapeshiftoss/swapper/dist/swappers/ChainflipSwapper/types'
 import axios from 'axios'
 import { getConfig } from 'config'
 import { useEffect, useMemo } from 'react'
@@ -14,12 +13,7 @@ import type {
 } from 'state/slices/tradeQuoteSlice/types'
 import { useAppDispatch, useAppSelector } from 'state/store'
 
-import {
-  ChainflipStreamingSwapResponseSuccess
-} from './types'
-
-// TODO: Is this import allowed?
-import type { ChainFlipStatus } from "@shapeshiftoss/swapper/dist/swappers/ChainflipSwapper/types";
+import type { ChainflipStreamingSwapResponseSuccess } from './types'
 
 const POLL_INTERVAL_MILLISECONDS = 30_000 // 30 seconds
 
@@ -32,34 +26,35 @@ const DEFAULT_STREAMING_SWAP_METADATA: StreamingSwapMetadata = {
 const getChainflipStreamingSwap = async (
   swapId: number | undefined,
 ): Promise<ChainflipStreamingSwapResponseSuccess | undefined> => {
-  console.log('getChainflipStreamingSwap.swapId', swapId);
-  
-  if (!swapId) return;
-  
+  console.log('getChainflipStreamingSwap.swapId', swapId)
+
+  if (!swapId) return
+
   const config = getConfig()
   const brokerUrl = config.REACT_APP_CHAINFLIP_API_URL
   const apiKey = config.REACT_APP_CHAINFLIP_API_KEY
 
   const { data: statusResponse } = await axios.get<ChainFlipStatus>(
-    `${brokerUrl}/status-by-id?apiKey=${apiKey}&swapId=${swapId}`)
-
+    `${brokerUrl}/status-by-id?apiKey=${apiKey}&swapId=${swapId}`,
+  )
+
   console.log('getChainflipStreamingSwap.statusResponse', statusResponse)
 
   if (!statusResponse) return
-  
+
   // TODO: Check for real errors
   if ('error' in statusResponse) {
     console.error('failed to fetch streaming swap data', statusResponse.error)
     return
   }
 
   const dcaStatus = statusResponse.status?.swap?.dca
-  
-  if (!dcaStatus) return;
-  
+
+  if (!dcaStatus) return
+
   return {
     executedChunks: dcaStatus!.executedChunks!,
-    remainingChunks: dcaStatus!.remainingChunks!
+    remainingChunks: dcaStatus!.remainingChunks!,
   }
 }
 
@@ -70,7 +65,7 @@ const getStreamingSwapMetadata = (
   const failedSwaps: StreamingSwapFailedSwap[] = []
 
   return {
-    totalSwapCount: (data.executedChunks + data.remainingChunks) ?? 0,
+    totalSwapCount: data.executedChunks + data.remainingChunks ?? 0,
     attemptedSwapCount: data.executedChunks ?? 0,
     failedSwaps,
   }
@@ -94,17 +89,17 @@ export const useChainflipStreamingProgress = (
       hopIndex,
     }
   }, [confirmedTradeId, hopIndex])
-  
+
   const {
     swap: { sellTxHash, streamingSwap: streamingSwapMeta },
   } = useAppSelector(state => selectHopExecutionMetadata(state, hopExecutionMetadataFilter))
 
-  const bla = useAppSelector(state => selectHopExecutionMetadata(state, hopExecutionMetadataFilter));
-  console.log('useChainflipStreamingProgress.useAppSelector', bla);
-  
+  const bla = useAppSelector(state => selectHopExecutionMetadata(state, hopExecutionMetadataFilter))
+  console.log('useChainflipStreamingProgress.useAppSelector', bla)
+
   const swapId = tradeQuoteStep.chainflipSwapId
-  console.log('useChainflipStreamingProgress.chainflipSwapId', swapId);
-  
+  console.log('useChainflipStreamingProgress.chainflipSwapId', swapId)
+
   useEffect(() => {
     // don't start polling until we have a tx
     if (!sellTxHash) return
@@ -136,8 +131,8 @@ export const useChainflipStreamingProgress = (
 
     // stop polling on dismount
     return cancelPolling
-  }, [cancelPolling, dispatch, hopIndex, poll, sellTxHash, confirmedTradeId])
-  
+  }, [cancelPolling, dispatch, hopIndex, poll, sellTxHash, confirmedTradeId, swapId])
+
   const result = useMemo(() => {
     const numSuccessfulSwaps =
       (streamingSwapMeta?.attemptedSwapCount ?? 0) - (streamingSwapMeta?.failedSwaps?.length ?? 0)
@@ -152,4 +147,4 @@ export const useChainflipStreamingProgress = (
   }, [streamingSwapMeta])
 
   return result
-}
+}

src/components/MultiHopTrade/components/MultiHopTradeConfirm/hooks/useThorStreamingProgress.tsx

@@ -1,7 +1,4 @@
-import type { 
-  TradeQuote, 
-  TradeQuoteStep 
-} from '@shapeshiftoss/swapper'
+import type { TradeQuote, TradeQuoteStep } from '@shapeshiftoss/swapper'
 import axios from 'axios'
 import { getConfig } from 'config'
 import { useEffect, useMemo, useRef } from 'react'