feat: query client import migration

therealemjy · therealemjy · commit 67ccafeefeab · 2026-04-10T10:11:54.000+02:00
diff --git a/.changeset/yield-plus-pr01-query-client.md b/.changeset/yield-plus-pr01-query-client.md
@@ -0,0 +1,5 @@
+---
+"@venusprotocol/evm": patch
+---
+
+refactor React Query client imports to use the direct `queryClient` module consistently across the app and tests
diff --git a/apps/evm/src/App/index.tsx b/apps/evm/src/App/index.tsx
@@ -1,5 +1,5 @@
 import { QueryClientProvider } from '@tanstack/react-query';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import config from 'config';
 import { AnalyticProvider } from 'libs/analytics';
 import { ErrorBoundary } from 'libs/errors';
diff --git a/apps/evm/src/clients/api/index.ts b/apps/evm/src/clients/api/index.ts
@@ -1,6 +1,5 @@
-export { default as queryClient } from './queryClient';
-
 // Mutations
+export * from './queryClient';
 export * from './mutations/useEnterMarket';
 export * from './mutations/useExitMarket';
 export * from './mutations/useApproveToken';
diff --git a/apps/evm/src/clients/api/mutations/useApproveToken/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useApproveToken/__tests__/index.spec.ts
@@ -2,7 +2,7 @@ import { ChainId } from '@venusprotocol/chains';
 import fakeAccountAddress, { altAddress as fakeSpenderAddress } from '__mocks__/models/address';
 import { xvs } from '__mocks__/models/tokens';
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useApproveToken/index.ts b/apps/evm/src/clients/api/mutations/useApproveToken/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import MAX_UINT256 from 'constants/maxUint256';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useBorrow/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useBorrow/__tests__/index.spec.ts
@@ -1,6 +1,6 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { vWeth, vXvs } from '__mocks__/models/vTokens';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
 import { getContractAddress } from 'libs/contracts';
diff --git a/apps/evm/src/clients/api/mutations/useBorrow/index.ts b/apps/evm/src/clients/api/mutations/useBorrow/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useBridgeXvs/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useBridgeXvs/__tests__/index.spec.ts
@@ -1,7 +1,7 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { xvs } from '__mocks__/models/tokens';
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useBridgeXvs/index.ts b/apps/evm/src/clients/api/mutations/useBridgeXvs/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { NULL_ADDRESS } from 'constants/address';
 import FunctionKey from 'constants/functionKey';
 import { DEFAULT_ADAPTER_PARAMS, LAYER_ZERO_CHAIN_IDS } from 'constants/layerZero';
diff --git a/apps/evm/src/clients/api/mutations/useCancelProposal/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useCancelProposal/__tests__/index.spec.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useCancelProposal/index.ts b/apps/evm/src/clients/api/mutations/useCancelProposal/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useClaimPrimeToken/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useClaimPrimeToken/__tests__/index.spec.ts
@@ -1,5 +1,5 @@
 import fakeAccountAddress from '__mocks__/models/address';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useClaimPrimeToken/index.ts b/apps/evm/src/clients/api/mutations/useClaimPrimeToken/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useClaimRewards/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useClaimRewards/__tests__/index.spec.ts
@@ -1,6 +1,6 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { xvs } from '__mocks__/models/tokens';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useClaimRewards/index.ts b/apps/evm/src/clients/api/mutations/useClaimRewards/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useCreateProposal/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useCreateProposal/__tests__/index.spec.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useCreateProposal/index.ts b/apps/evm/src/clients/api/mutations/useCreateProposal/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useEnterMarket/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useEnterMarket/__tests__/index.spec.ts
@@ -1,7 +1,7 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { vXvs } from '__mocks__/models/vTokens';
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useEnterMarket/index.ts b/apps/evm/src/clients/api/mutations/useEnterMarket/index.ts
@@ -1,5 +1,5 @@
 import type BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useExecuteProposal/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useExecuteProposal/__tests__/index.spec.ts
@@ -1,5 +1,5 @@
 import { ChainId } from '@venusprotocol/chains';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { getContractAddress } from 'libs/contracts';
 import { governanceChainId } from 'libs/wallet';
diff --git a/apps/evm/src/clients/api/mutations/useExecuteProposal/index.ts b/apps/evm/src/clients/api/mutations/useExecuteProposal/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
 import {
diff --git a/apps/evm/src/clients/api/mutations/useExecuteWithdrawalFromXvsVault/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useExecuteWithdrawalFromXvsVault/__tests__/index.spec.ts
@@ -1,6 +1,6 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { vai, xvs } from '__mocks__/models/tokens';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useExecuteWithdrawalFromXvsVault/index.ts b/apps/evm/src/clients/api/mutations/useExecuteWithdrawalFromXvsVault/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useExitMarket/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useExitMarket/__tests__/index.spec.ts
@@ -1,7 +1,7 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { vXvs } from '__mocks__/models/vTokens';
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useExitMarket/index.ts b/apps/evm/src/clients/api/mutations/useExitMarket/index.ts
@@ -1,5 +1,5 @@
 import type BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useImportSupplyPosition/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useImportSupplyPosition/__tests__/index.spec.ts
@@ -9,7 +9,7 @@ import fakeAccountAddress, {
 } from '__mocks__/models/address';
 import { importablePositions } from '__mocks__/models/importablePositions';
 import { vUsdc } from '__mocks__/models/vTokens';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useMeeClient } from 'libs/wallet';
diff --git a/apps/evm/src/clients/api/mutations/useImportSupplyPosition/index.ts b/apps/evm/src/clients/api/mutations/useImportSupplyPosition/index.ts
@@ -3,7 +3,7 @@ import {
   greaterThanOrEqualTo,
   runtimeERC20BalanceOf,
 } from '@biconomy/abstractjs';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import MAX_UINT256 from 'constants/maxUint256';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
diff --git a/apps/evm/src/clients/api/mutations/useMintVai/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useMintVai/__tests__/index.spec.ts
@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useMintVai/index.ts b/apps/evm/src/clients/api/mutations/useMintVai/index.ts
@@ -1,5 +1,5 @@
 import type BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useOpenLeveragedPosition/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useOpenLeveragedPosition/__tests__/index.spec.ts
@@ -1,6 +1,6 @@
 import { exactInSwapQuote as fakeSwapQuote } from '__mocks__/models/swap';
 import { vLisUSD, vUsdc } from '__mocks__/models/vTokens';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useOpenLeveragedPosition/index.tsx b/apps/evm/src/clients/api/mutations/useOpenLeveragedPosition/index.tsx
@@ -1,6 +1,6 @@
 import type { Account, Address, Chain, Hex, WriteContractParameters } from 'viem';
 
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useQueueProposal/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useQueueProposal/__tests__/index.spec.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useQueueProposal/index.ts b/apps/evm/src/clients/api/mutations/useQueueProposal/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useRepay/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useRepay/__tests__/index.spec.ts
@@ -3,7 +3,7 @@ import fakeAccountAddress, {
 } from '__mocks__/models/address';
 import { vBnb, vWeth, vXvs } from '__mocks__/models/vTokens';
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useRepay/index.ts b/apps/evm/src/clients/api/mutations/useRepay/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import MAX_UINT256 from 'constants/maxUint256';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
diff --git a/apps/evm/src/clients/api/mutations/useRepayVai/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useRepayVai/__tests__/index.spec.ts
@@ -1,7 +1,7 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { vai } from '__mocks__/models/tokens';
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useGetToken } from 'libs/tokens';
diff --git a/apps/evm/src/clients/api/mutations/useRepayVai/index.ts b/apps/evm/src/clients/api/mutations/useRepayVai/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useRepayWithCollateral/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useRepayWithCollateral/__tests__/index.spec.ts
@@ -1,7 +1,7 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { exactInSwapQuote as fakeSwapQuote } from '__mocks__/models/swap';
 import { vLisUSD, vUsdc } from '__mocks__/models/vTokens';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useRepayWithCollateral/index.ts b/apps/evm/src/clients/api/mutations/useRepayWithCollateral/index.ts
@@ -1,6 +1,6 @@
 import type { Account, Address, Chain, Hex, WriteContractParameters } from 'viem';
 
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useRequestWithdrawalFromXvsVault/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useRequestWithdrawalFromXvsVault/__tests__/index.spec.ts
@@ -1,6 +1,6 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { xvs } from '__mocks__/models/tokens';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useRequestWithdrawalFromXvsVault/index.tsx b/apps/evm/src/clients/api/mutations/useRequestWithdrawalFromXvsVault/index.tsx
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useSetEModeGroup/index.ts b/apps/evm/src/clients/api/mutations/useSetEModeGroup/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useSetVoteDelegate/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useSetVoteDelegate/__tests__/index.spec.ts
@@ -1,5 +1,5 @@
 import fakeAccountAddress from '__mocks__/models/address';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useSetVoteDelegate/index.ts b/apps/evm/src/clients/api/mutations/useSetVoteDelegate/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useStakeInVaiVault/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useStakeInVaiVault/__tests__/index.spec.ts
@@ -1,6 +1,6 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useStakeInVaiVault/index.ts b/apps/evm/src/clients/api/mutations/useStakeInVaiVault/index.ts
@@ -1,5 +1,5 @@
 import type BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useStakeInXvsVault/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useStakeInXvsVault/__tests__/index.spec.ts
@@ -1,7 +1,7 @@
 import fakeAccountAddress from '__mocks__/models/address';
 import { vai, xvs } from '__mocks__/models/tokens';
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useStakeInXvsVault/index.ts b/apps/evm/src/clients/api/mutations/useStakeInXvsVault/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useSupply/__tests__/index.spec.tsx b/apps/evm/src/clients/api/mutations/useSupply/__tests__/index.spec.tsx
@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useSupply/index.ts b/apps/evm/src/clients/api/mutations/useSupply/index.ts
@@ -1,5 +1,5 @@
 import type BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useSwapTokens/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useSwapTokens/__tests__/index.spec.ts
@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
 import { renderHook } from 'testUtils/render';
diff --git a/apps/evm/src/clients/api/mutations/useSwapTokens/index.ts b/apps/evm/src/clients/api/mutations/useSwapTokens/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { DEFAULT_SLIPPAGE_TOLERANCE_PERCENTAGE } from 'constants/swap';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useSwapTokensAndRepay/__tests__/index.spec.tsx b/apps/evm/src/clients/api/mutations/useSwapTokensAndRepay/__tests__/index.spec.tsx
@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
 import { getContractAddress } from 'libs/contracts';
diff --git a/apps/evm/src/clients/api/mutations/useSwapTokensAndRepay/index.ts b/apps/evm/src/clients/api/mutations/useSwapTokensAndRepay/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { DEFAULT_SLIPPAGE_TOLERANCE_PERCENTAGE } from 'constants/swap';
 import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';
diff --git a/apps/evm/src/clients/api/mutations/useSwapTokensAndSupply/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useSwapTokensAndSupply/__tests__/index.spec.ts
@@ -2,7 +2,7 @@ import fakeAccountAddress from '__mocks__/models/address';
 import { bnb, usdc, xvs } from '__mocks__/models/tokens';
 import { vXvs } from '__mocks__/models/vTokens';
 import BigNumber from 'bignumber.js';
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
 import { useSendTransaction } from 'hooks/useSendTransaction';
 import { useAnalytics } from 'libs/analytics';
diff --git a/apps/evm/src/clients/api/mutations/useSwapTokensAndSupply/index.ts b/apps/evm/src/clients/api/mutations/useSwapTokensAndSupply/index.ts
@@ -1,4 +1,4 @@
-import { queryClient } from 'clients/api';
+import { queryClient } from 'clients/api/queryClient';
 import FunctionKey from 'constants/functionKey';
 import { DEFAULT_SLIPPAGE_TOLERANCE_PERCENTAGE } from 'constants/swap';
 import { useGetContractAddress } from 'hooks/useGetContractAddress';
diff --git a/apps/evm/src/clients/api/mutations/useUpdatePoolDelegateStatus/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useUpdatePoolDelegateStatus/__tests__/index.spec.ts
diff --git a/apps/evm/src/clients/api/mutations/useUpdatePoolDelegateStatus/index.ts b/apps/evm/src/clients/api/mutations/useUpdatePoolDelegateStatus/index.ts
diff --git a/apps/evm/src/clients/api/mutations/useVote/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useVote/__tests__/index.spec.ts
diff --git a/apps/evm/src/clients/api/mutations/useVote/index.tsx b/apps/evm/src/clients/api/mutations/useVote/index.tsx
diff --git a/apps/evm/src/clients/api/mutations/useWithdraw/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useWithdraw/__tests__/index.spec.ts
diff --git a/apps/evm/src/clients/api/mutations/useWithdraw/index.ts b/apps/evm/src/clients/api/mutations/useWithdraw/index.ts
diff --git a/apps/evm/src/clients/api/mutations/useWithdrawFromVaiVault/__tests__/index.spec.ts b/apps/evm/src/clients/api/mutations/useWithdrawFromVaiVault/__tests__/index.spec.ts
diff --git a/apps/evm/src/clients/api/mutations/useWithdrawFromVaiVault/index.ts b/apps/evm/src/clients/api/mutations/useWithdrawFromVaiVault/index.ts
diff --git a/apps/evm/src/clients/api/queries/getSwapQuote/formatSwapQuote/applySlippagePercentage/index.spec.ts b/apps/evm/src/clients/api/queries/getSwapQuote/formatSwapQuote/applySlippagePercentage/index.spec.ts
diff --git a/apps/evm/src/clients/api/queries/getSwapQuote/formatSwapQuote/applySlippagePercentage/index.ts b/apps/evm/src/clients/api/queries/getSwapQuote/formatSwapQuote/applySlippagePercentage/index.ts
diff --git a/apps/evm/src/clients/api/queries/getSwapQuote/useGetSwapQuote.ts b/apps/evm/src/clients/api/queries/getSwapQuote/useGetSwapQuote.ts
diff --git a/apps/evm/src/clients/api/queries/getTokenUsdPrice/useGetTokenUsdPrice.ts b/apps/evm/src/clients/api/queries/getTokenUsdPrice/useGetTokenUsdPrice.ts
diff --git a/apps/evm/src/clients/api/queries/getXvsBridgeFeeEstimation/useGetXvsBridgeFeeEstimation.ts b/apps/evm/src/clients/api/queries/getXvsBridgeFeeEstimation/useGetXvsBridgeFeeEstimation.ts
diff --git a/apps/evm/src/clients/api/queries/getXvsVaultPaused/useGetXvsVaultPaused.ts b/apps/evm/src/clients/api/queries/getXvsVaultPaused/useGetXvsVaultPaused.ts
diff --git a/apps/evm/src/clients/api/queries/useGetPrimeEstimation/index.ts b/apps/evm/src/clients/api/queries/useGetPrimeEstimation/index.ts
diff --git a/apps/evm/src/clients/api/queries/useGetVaults/useGetVestingVaults/useGetXvsVaultPoolBalances.ts b/apps/evm/src/clients/api/queries/useGetVaults/useGetVestingVaults/useGetXvsVaultPoolBalances.ts
diff --git a/apps/evm/src/clients/api/queries/useGetVaults/useGetVestingVaults/useGetXvsVaultPools.ts b/apps/evm/src/clients/api/queries/useGetVaults/useGetVestingVaults/useGetXvsVaultPools.ts
diff --git a/apps/evm/src/clients/api/queryClient.ts b/apps/evm/src/clients/api/queryClient.ts
diff --git a/apps/evm/src/setupTests.tsx b/apps/evm/src/setupTests.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { queryClient } from 'clients/api';`
	`1`	`+import { queryClient } from 'clients/api/queryClient';`
`2`	`2`	`import FunctionKey from 'constants/functionKey';`
`3`	`3`	`import MAX_UINT256 from 'constants/maxUint256';`
`4`	`4`	`import { type UseSendTransactionOptions, useSendTransaction } from 'hooks/useSendTransaction';`