feat: query-key-factory doesn't pass options through

src/assets/translations/en/main.json

@@ -127,6 +127,8 @@
     "yourBalance": "Your balance",
     "signTransaction": "Sign transaction",
     "halted": "Halted",
+    "poolHalted": "Pool Halted",
+    "available": "Available",
     "carousel": {
       "next": "Next",
       "prev": "Previous",

src/components/MultiHopTrade/components/TradeInput/components/TradeQuotes/TradeQuote.tsx

@@ -5,10 +5,10 @@ import { TradeQuoteError as SwapperTradeQuoteError } from '@shapeshiftoss/swappe
 import type { FC } from 'react'
 import { useCallback, useMemo } from 'react'
 import { useTranslate } from 'react-polyglot'
+import { useIsTradingActive } from 'react-queries/hooks/useIsTradingActive'
 import { Amount } from 'components/Amount/Amount'
 import { SlippageIcon } from 'components/Icons/Slippage'
 import { getQuoteErrorTranslation } from 'components/MultiHopTrade/components/TradeInput/getQuoteErrorTranslation'
-import { useIsTradingActive } from 'components/MultiHopTrade/hooks/useIsTradingActive'
 import { RawText } from 'components/Text'
 import { useLocaleFormatter } from 'hooks/useLocaleFormatter/useLocaleFormatter'
 import { bn, bnOrZero } from 'lib/bignumber/bignumber'
@@ -62,10 +62,17 @@ export const TradeQuoteLoaded: FC<TradeQuoteProps> = ({
     number: { toPercent },
   } = useLocaleFormatter()
 
-  const { isTradingActive } = useIsTradingActive()
-
   const buyAsset = useAppSelector(selectInputBuyAsset)
   const sellAsset = useAppSelector(selectInputSellAsset)
+  const { isTradingActive: isTradingActiveOnBuyPool } = useIsTradingActive({
+    assetId: buyAsset.assetId,
+  })
+  const { isTradingActive: isTradingActiveOnSellPool } = useIsTradingActive({
+    assetId: sellAsset.assetId,
+  })
+
+  const isTradingActive = Boolean(isTradingActiveOnBuyPool && isTradingActiveOnSellPool)
+
   const userSlippagePercentageDecimal = useAppSelector(selectUserSlippagePercentageDecimal)
 
   const buyAssetMarketData = useAppSelector(state =>

src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Confirm.tsx

@@ -13,7 +13,6 @@ import { fromAccountId, fromAssetId, toAssetId } from '@shapeshiftoss/caip'
 import { CONTRACT_INTERACTION, FeeDataKey } from '@shapeshiftoss/chain-adapters'
 import type { BuildCustomTxInput } from '@shapeshiftoss/chain-adapters/src/evm/types'
 import { supportsETH } from '@shapeshiftoss/hdwallet-core'
-import { SwapperName } from '@shapeshiftoss/swapper'
 import type { Asset, KnownChainIds } from '@shapeshiftoss/types'
 import { getConfig } from 'config'
 import { getOrCreateContractByType } from 'contracts/contractManager'
@@ -28,6 +27,7 @@ import type {
 import { DefiStep } from 'features/defi/contexts/DefiManagerProvider/DefiCommon'
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { useTranslate } from 'react-polyglot'
+import { useIsTradingActive } from 'react-queries/hooks/useIsTradingActive'
 import { encodeFunctionData, getAddress } from 'viem'
 import { Amount } from 'components/Amount/Amount'
 import { AssetIcon } from 'components/AssetIcon'
@@ -58,7 +58,6 @@ import {
 import { fromThorBaseUnit, getThorchainFromAddress, toThorBaseUnit } from 'lib/utils/thorchain'
 import { BASE_BPS_POINTS } from 'lib/utils/thorchain/constants'
 import { getInboundAddressDataForChain } from 'lib/utils/thorchain/getInboundAddressDataForChain'
-import { swapperApi } from 'state/apis/swapper/swapperApi'
 import {
   getMaybeThorchainSaversDepositQuote,
   getThorchainSaversPosition,
@@ -75,7 +74,7 @@ import {
   selectPortfolioCryptoBalanceBaseUnitByFilter,
   selectSelectedCurrency,
 } from 'state/slices/selectors'
-import { store, useAppDispatch, useAppSelector } from 'state/store'
+import { store, useAppSelector } from 'state/store'
 
 import { ThorchainSaversDepositActionType } from '../DepositCommon'
 import { DepositContext } from '../DepositContext'
@@ -96,7 +95,6 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
     null,
   )
   const [daysToBreakEven, setDaysToBreakEven] = useState<string | null>(null)
-  const appDispatch = useAppDispatch()
   const translate = useTranslate()
   const mixpanel = getMixPanel()
   // TODO: Allow user to set fee priority
@@ -540,6 +538,10 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
     })()
   }, [accountId, accountMetadata, accountType, assetId, bip44Params, chainAdapter, wallet])
 
+  const { isTradingActive, refetch: refetchIsTradingActive } = useIsTradingActive({
+    assetId,
+  })
+
   const handleDeposit = useCallback(async () => {
     if (!contextDispatch || !bip44Params || !accountId || !assetId) return
     try {
@@ -561,15 +563,14 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
 
       contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: true })
 
-      const { getIsTradingActive } = swapperApi.endpoints
-      const { data: isTradingActive } = await appDispatch(
-        getIsTradingActive.initiate({
-          assetId,
-          swapperName: SwapperName.Thorchain,
-        }),
-      )
+      // Was the pool active when it was fetched at the time of the component mount
+      // If it wasn't, it's definitely not going to become active again in the few seconds it takes to go from mount to sign click
+      if (isTradingActive === false) {
+        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
+      }
 
-      if (!isTradingActive) {
+      const _isTradingActive = await refetchIsTradingActive()
+      if (_isTradingActive === false) {
         throw new Error(`THORChain pool halted for assetId: ${assetId}`)
       }
 
@@ -633,7 +634,8 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
     chainAdapter,
     state?.deposit.cryptoAmount,
     state?.deposit.fiatAmount,
-    appDispatch,
+    isTradingActive,
+    refetchIsTradingActive,
     protocolFeeCryptoBaseUnit,
     maybeFromUTXOAccountAddress,
     onNext,
@@ -704,7 +706,12 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
       onCancel={handleCancel}
       onConfirm={handleDeposit}
       preFooter={preFooter}
-      isDisabled={!hasEnoughBalanceForGas || !userAddress || disableSmartContractDeposit}
+      isDisabled={
+        !hasEnoughBalanceForGas ||
+        !userAddress ||
+        disableSmartContractDeposit ||
+        isTradingActive === false
+      }
       loading={state.loading || !userAddress || isAddressByteCodeLoading}
       loadingText={translate('common.confirm')}
       headerText='modals.confirm.deposit.header'

src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx

@@ -14,7 +14,6 @@ import {
 import { QueryStatus } from '@reduxjs/toolkit/dist/query'
 import type { AccountId } from '@shapeshiftoss/caip'
 import { toAssetId } from '@shapeshiftoss/caip'
-import { SwapperName } from '@shapeshiftoss/swapper'
 import type { Asset } from '@shapeshiftoss/types'
 import { TxStatus } from '@shapeshiftoss/unchained-client'
 import BigNumber from 'bignumber.js'
@@ -28,6 +27,7 @@ import { DefiAction } from 'features/defi/contexts/DefiManagerProvider/DefiCommo
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { FaTwitter } from 'react-icons/fa'
 import { useTranslate } from 'react-polyglot'
+import { useIsTradingActive } from 'react-queries/hooks/useIsTradingActive'
 import type { AccountDropdownProps } from 'components/AccountDropdown/AccountDropdown'
 import { Amount } from 'components/Amount/Amount'
 import { CircularProgress } from 'components/CircularProgress/CircularProgress'
@@ -36,7 +36,6 @@ import { Text } from 'components/Text'
 import { useBrowserRouter } from 'hooks/useBrowserRouter/useBrowserRouter'
 import { bnOrZero } from 'lib/bignumber/bignumber'
 import { fromBaseUnit, toBaseUnit } from 'lib/math'
-import { useGetIsTradingActiveQuery } from 'state/apis/swapper/swapperApi'
 import type { ThorchainSaversStakingSpecificMetadata } from 'state/slices/opportunitiesSlice/resolvers/thorchainsavers/types'
 import {
   getMaybeThorchainSaversDepositQuote,
@@ -129,11 +128,9 @@ export const ThorchainSaversOverview: React.FC<OverviewProps> = ({
     [accountId, defaultAccountId, highestBalanceAccountId],
   )
 
-  const { data: isTradingActive, isFetching: isTradingActiveQueryPending } =
-    useGetIsTradingActiveQuery({
-      assetId,
-      swapperName: SwapperName.Thorchain,
-    })
+  const { isTradingActive, isLoading: isTradingActiveLoading } = useIsTradingActive({
+    assetId,
+  })
 
   useEffect(() => {
     if (!maybeAccountId) return
@@ -272,7 +269,7 @@ export const ThorchainSaversOverview: React.FC<OverviewProps> = ({
       isFull: opportunityMetadata?.isFull || isHardCapReached,
       hasPendingTxs,
       hasPendingQueries,
-      isHalted: !isTradingActive,
+      isHalted: isTradingActive === false,
     })
   }, [
     earnOpportunityData,
@@ -355,7 +352,7 @@ export const ThorchainSaversOverview: React.FC<OverviewProps> = ({
 
   const handleThorchainSaversEmptyClick = useCallback(() => setHideEmptyState(true), [])
 
-  if (!earnOpportunityData || isTradingActiveQueryPending) {
+  if (!earnOpportunityData || isTradingActiveLoading) {
     return (
       <Center minW='500px' minH='350px'>
         <CircularProgress />

src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx

@@ -15,7 +15,6 @@ import { bchChainId, fromAccountId, fromAssetId, toAssetId } from '@shapeshiftos
 import { FeeDataKey } from '@shapeshiftoss/chain-adapters'
 import type { BuildCustomTxInput } from '@shapeshiftoss/chain-adapters/src/evm/types'
 import { supportsETH } from '@shapeshiftoss/hdwallet-core'
-import { SwapperName } from '@shapeshiftoss/swapper'
 import { getConfig } from 'config'
 import { getOrCreateContractByType } from 'contracts/contractManager'
 import { ContractType } from 'contracts/types'
@@ -29,6 +28,7 @@ import type {
 import { DefiStep } from 'features/defi/contexts/DefiManagerProvider/DefiCommon'
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { useTranslate } from 'react-polyglot'
+import { useIsTradingActive } from 'react-queries/hooks/useIsTradingActive'
 import { encodeFunctionData, getAddress } from 'viem'
 import { Amount } from 'components/Amount/Amount'
 import { AssetIcon } from 'components/AssetIcon'
@@ -58,7 +58,6 @@ import {
 import { fromThorBaseUnit, toThorBaseUnit } from 'lib/utils/thorchain'
 import { BASE_BPS_POINTS } from 'lib/utils/thorchain/constants'
 import { getInboundAddressDataForChain } from 'lib/utils/thorchain/getInboundAddressDataForChain'
-import { swapperApi } from 'state/apis/swapper/swapperApi'
 import {
   getThorchainSaversPosition,
   getThorchainSaversWithdrawQuote,
@@ -79,7 +78,7 @@ import {
   selectPortfolioCryptoBalanceBaseUnitByFilter,
   selectSelectedCurrency,
 } from 'state/slices/selectors'
-import { useAppDispatch, useAppSelector } from 'state/store'
+import { useAppSelector } from 'state/store'
 
 import { ThorchainSaversWithdrawActionType } from '../WithdrawCommon'
 import { WithdrawContext } from '../WithdrawContext'
@@ -98,7 +97,6 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
     null,
   )
   const { state, dispatch: contextDispatch } = useContext(WithdrawContext)
-  const appDispatch = useAppDispatch()
   const translate = useTranslate()
   const mixpanel = getMixPanel()
   const { query } = useBrowserRouter<DefiQueryParams, DefiParams>()
@@ -594,6 +592,10 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
     return txId
   }, [getWithdrawInput, wallet])
 
+  const { isTradingActive, refetch: refetchIsTradingActive } = useIsTradingActive({
+    assetId,
+  })
+
   const handleConfirm = useCallback(async () => {
     if (!contextDispatch || !bip44Params || !accountId || !assetId || !opportunityData) return
     try {
@@ -625,15 +627,14 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
         return
       }
 
-      const { getIsTradingActive } = swapperApi.endpoints
-      const { data: isTradingActive } = await appDispatch(
-        getIsTradingActive.initiate({
-          assetId,
-          swapperName: SwapperName.Thorchain,
-        }),
-      )
+      // Was the pool active when it was fetched at the time of the component mount
+      // If it wasn't, it's definitely not going to become active again in the few seconds it takes to go from mount to sign click
+      if (isTradingActive === false) {
+        throw new Error(`THORChain pool halted for assetId: ${assetId}`)
+      }
 
-      if (!isTradingActive) {
+      const _isTradingActive = await refetchIsTradingActive()
+      if (_isTradingActive === false) {
         throw new Error(`THORChain pool halted for assetId: ${assetId}`)
       }
 
@@ -701,15 +702,16 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
     state?.withdraw.cryptoAmount,
     state?.withdraw.fiatAmount,
     expiry,
-    appDispatch,
-    getWithdrawInput,
+    isTradingActive,
+    refetchIsTradingActive,
     dustAmountCryptoBaseUnit,
     protocolFeeCryptoBaseUnit,
     onNext,
     assets,
     toast,
     translate,
     isTokenWithdraw,
+    getWithdrawInput,
     handleMultiTxSend,
     handleCustomTx,
   ])
@@ -809,7 +811,11 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
       preFooter={preFooter}
       headerText='modals.confirm.withdraw.header'
       isDisabled={
-        !hasEnoughBalanceForGas || !userAddress || disableSmartContractWithdraw || !canWithdraw
+        !hasEnoughBalanceForGas ||
+        !userAddress ||
+        disableSmartContractWithdraw ||
+        !canWithdraw ||
+        isTradingActive === false
       }
       loading={quoteLoading || state.loading || !userAddress || isAddressByteCodeLoading}
       loadingText={translate('common.confirm')}

src/lib/swapper/swappers/ThorchainSwapper/types.ts

@@ -123,6 +123,7 @@ export type InboundAddressResponse = {
   gas_rate: string
   gas_rate_units: string
   router?: string
+  dust_threshold?: string
   global_trading_paused: boolean
   chain_trading_paused: boolean
   chain_lp_actions_paused: boolean

src/lib/utils/thorchain/constants.ts

@@ -1,4 +1,10 @@
+import { bn } from 'lib/bignumber/bignumber'
+
 export const THOR_PRECISION = 8
 export const BASE_BPS_POINTS = '10000'
 export const THORCHAIN_AFFILIATE_NAME = 'ss'
 export const THORCHAIN_POOL_MODULE_ADDRESS = 'thor1g98cy3n9mmjrpn0sxmn63lztelera37n8n67c0'
+
+// Current blocktime as per https://thorchain.network/stats
+export const thorchainBlockTimeSeconds = '6.1'
+export const thorchainBlockTimeMs = bn(thorchainBlockTimeSeconds).times(1000).toNumber()