@berachain/berajs 0.2.10 → 0.2.12

package/src/hooks/pol/useRewardVaultBalanceFromStakingToken.ts

@@ -1,9 +1,9 @@
-import useSWR from "swr";
 import { type Address, isAddress, zeroAddress } from "viem";
 
 import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { assertPublicClient } from "../../errors/assert";
 import type { DefaultHookOptions } from "../../types/global";
@@ -23,11 +23,11 @@ export const useRewardVaultBalanceFromStakingToken = (
   const { address: account } = useBeraWallet();
   const publicClient = usePublicClient();
 
-  const isEnabled = options?.opts?.isEnabled ?? true;
+  const isEnabled = options?.isEnabled ?? true;
   const {
     data: rewardVaultAddress = _rewardVaultAddress,
     error,
-    mutate: mutateRewardVaultAddress,
+    refresh: mutateRewardVaultAddress,
     isLoading: isLoadingRewardVaultAddress,
   } = useRewardVaultFromToken(
     {
@@ -43,8 +43,7 @@ export const useRewardVaultBalanceFromStakingToken = (
       account &&
       publicClient &&
       isAddress(rewardVaultAddress) &&
-      isAddress(account) &&
-      isEnabled
+      isAddress(account)
       ? ["useVaultBalanceFromStakingToken", rewardVaultAddress, account]
       : null,
 
@@ -70,13 +69,14 @@ export const useRewardVaultBalanceFromStakingToken = (
         balance: balance,
       };
     },
+    options,
   );
 
   return {
     ...swrResponse,
     refresh: () => {
       mutateRewardVaultAddress();
-      swrResponse.mutate();
+      swrResponse.refresh();
     },
     isLoading: swrResponse.isLoading || isLoadingRewardVaultAddress,
   };

package/src/hooks/pol/useRewardVaultFromToken.ts

@@ -1,9 +1,9 @@
-import useSWRImmutable from "swr/immutable";
 import { type Address, isAddress, zeroAddress } from "viem";
 
 import { rewardVaultFactoryAbi } from "@berachain/abis/pol/rewards/rewardVaultFactory";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { assertPublicClient } from "../../errors/assert";
 import { parseBaseArgs } from "../../utils/parseBaseArgs";
@@ -27,33 +27,27 @@ export const useRewardVaultFromToken = (
       ? ["useRewardVaultFromToken", tokenAddress]
       : null;
 
-  const swrResponse = useSWRImmutable<
-    Address | undefined,
-    any,
-    typeof QUERY_KEY
-  >(QUERY_KEY, async ([, tokenAddress]) => {
-    if (!tokenAddress) {
-      throw new Error("useRewardVaultFromToken needs a valid token address");
-    }
-
-    assertPublicClient(publicClient);
-
-    const { config } = parseBaseArgs({
-      chainId: publicClient.chain.id,
-    });
-
-    const res = await publicClient.readContract({
-      address: config.pol.factory,
-      abi: rewardVaultFactoryAbi,
-      functionName: "getVault",
-      args: [tokenAddress],
-    });
-
-    return res === zeroAddress ? undefined : res;
-  });
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
+  return useSWRImmutable<Address | undefined, any, typeof QUERY_KEY>(
+    QUERY_KEY,
+    async ([, tokenAddress]) => {
+      if (!tokenAddress) {
+        throw new Error("useRewardVaultFromToken needs a valid token address");
+      }
+
+      assertPublicClient(publicClient);
+
+      const { config } = parseBaseArgs({
+        chainId: publicClient.chain.id,
+      });
+
+      const res = await publicClient.readContract({
+        address: config.pol.factory,
+        abi: rewardVaultFactoryAbi,
+        functionName: "getVault",
+        args: [tokenAddress],
+      });
+
+      return res === zeroAddress ? undefined : res;
+    },
+  );
 };

package/src/hooks/pol/useRewardVaultIncentives.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getRewardVaultIncentives } from "../../actions/pol/getRewardVaultIncentives";
 import { assertPublicClient } from "../../errors/assert";
@@ -20,7 +20,7 @@ export function useRewardVaultIncentives({
       ? (["useRewardVaultIncentives", address, stakingToken] as const)
       : null;
 
-  const swrResponse = useSWR(QUERY_KEY, async ([, address, stakingToken]) => {
+  return useSWR(QUERY_KEY, async ([, address, stakingToken]) => {
     assertPublicClient(publicClient);
 
     return await getRewardVaultIncentives({
@@ -29,9 +29,4 @@ export function useRewardVaultIncentives({
       publicClient,
     });
   });
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }

package/src/hooks/pol/useRewardVaultRewards.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getRewardVaultRewards } from "../../actions/pol/getRewardVaultRewards";
 import { assertPublicClient } from "../../errors/assert";
@@ -18,7 +18,7 @@ export const useRewardVaultRewards = (
       ? (["useRewardVaultRewards", address] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, address]) => {
       assertPublicClient(publicClient);
@@ -26,12 +26,7 @@ export const useRewardVaultRewards = (
       return await getRewardVaultRewards(address, publicClient);
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 };

package/src/hooks/pol/useRewardVaults.ts

@@ -1,7 +1,6 @@
-import useSWR from "swr";
-
 import type { GetVaultsQueryVariables } from "@berachain/graphql/pol/api";
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getRewardVaults } from "../../actions/pol/getRewardVaults";
 import type { DefaultHookOptions } from "../../types/global";
@@ -25,21 +24,14 @@ export const useRewardVaults = (
     args.onChainIncentives,
   );
   const publicClient = usePublicClient();
-  const swrResponse = useSWR(
-    (options?.opts?.isEnabled ?? true) ? QUERY_KEY : null,
+  return useSWR(
+    QUERY_KEY,
     async ([, filter, onChainIncentives]) => {
       return await getRewardVaults({
         filter: filter,
         publicClient: onChainIncentives ? publicClient : undefined,
       });
     },
-    {
-      ...options?.opts,
-    },
+    options,
   );
-
-  return {
-    ...swrResponse,
-    refresh: swrResponse.mutate,
-  };
 };

package/src/hooks/pol/useStakedAPR.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import type { GqlVaultSnapshotDataRange } from "@berachain/graphql/dex/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getStakedBeraSnapshots } from "../../actions/pol/getStakedBeraSnapshots";
 import type { DefaultHookReturnType } from "../../types/global";
@@ -16,7 +15,7 @@ export function useStakedAPR({
   range: GqlVaultSnapshotDataRange;
 }): DefaultHookReturnType<UseStakedAPR> {
   const QUERY_KEY = range ? (["useStakedAPR", range] as const) : null;
-  const swrResponse = useSWR(QUERY_KEY, async ([, range]) => {
+  return useSWR(QUERY_KEY, async ([, range]) => {
     const unsortedStakedBeraSnapshots = await getStakedBeraSnapshots({
       range,
     });
@@ -30,9 +29,4 @@ export function useStakedAPR({
       apr: item.apr,
     }));
   });
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/hooks/pol/useStakedData.ts

@@ -1,8 +1,8 @@
 import { useMemo } from "react";
-import useSWR from "swr";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
 import BigNumber from "@berachain/utils/pkg/bignumber.js";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getEarnedStakedBeraVault } from "../../actions/pol/getEarnedStakedBeraVault";
 import { getRewardTokenToBeraRate } from "../../actions/pol/getRewardTokenToBeraRate";
@@ -50,11 +50,18 @@ export const useStakedData = (stakingConfigs: StakingConfig[]) => {
     { refreshInterval: POLLING.NORMAL },
   );
 
-  const { data: walletBalances, isLoading: isLoadingBalances } =
-    usePollWalletBalances({ tokens: receiptTokens });
-
-  // NOT BERA PRICE, INPUT TOKEN PRICE
-  const { getTokenPrice } = useTokenPrices({ tokens: inputTokens });
+  const {
+    data: walletBalances,
+    isLoading: isLoadingBalances,
+    error: walletBalancesError,
+  } = usePollWalletBalances({ tokens: receiptTokens });
+
+  // NOT BERA PRICE, INPUT TOKEN PRICE.
+  // A price-backend failure is handled gracefully (USD values become `undefined`
+  // → rendered as "—"), so it deliberately does NOT feed the hard `error` state.
+  const { getTokenPrice } = useTokenPrices({
+    tokens: inputTokens,
+  });
 
   // exchange rates from receipt token → input token (on-chain reads)
   const exchangeRatesKey =
@@ -62,7 +69,7 @@ export const useStakedData = (stakingConfigs: StakingConfig[]) => {
       ? (["useStakedData:exchangeRates", receiptTokens] as const)
       : null;
 
-  const { data: exchangeRates } = useSWR(
+  const { data: exchangeRates, error: exchangeRatesError } = useSWR(
     exchangeRatesKey,
     async ([, receiptTokens]) => {
       assertPublicClient(publicClient);
@@ -78,34 +85,6 @@ export const useStakedData = (stakingConfigs: StakingConfig[]) => {
     { refreshInterval: POLLING.NORMAL },
   );
 
-  // balances (fast path) — derived from hooks above, no extra requests
-  const balances = useMemo<StakedBeraAsset[] | undefined>(() => {
-    if (!walletBalances || !exchangeRates) return undefined;
-
-    return stakingConfigs.map((config, i): StakedBeraAsset => {
-      const inputToken = config.inputTokens[0];
-      const stakedBalance =
-        walletBalances.find((b) => b.address === config.receiptToken.address)
-          ?.balance.raw ?? "0";
-      const exchangeRate = exchangeRates[i] ?? 0;
-      const inputTokenPrice = getTokenPrice(inputToken) ?? 0;
-
-      const total = new BigNumber(stakedBalance).multipliedBy(exchangeRate);
-      const stakedAmount = total.dividedBy(10 ** inputToken.decimals);
-      const stakedAmountUsd = stakedAmount.multipliedBy(inputTokenPrice);
-
-      return {
-        token: inputToken,
-        apr: apr ?? 0,
-        stakedAmount: stakedAmount.toNumber(),
-        stakedAmountUsd: stakedAmountUsd.toNumber(),
-        earnedAmount: 0,
-        earnedAmountUsd: 0,
-        isLoadingEarnings: true,
-      };
-    });
-  }, [walletBalances, exchangeRates, stakingConfigs, apr, getTokenPrice]);
-
   // positions (slow path) — fetch earnings and exchange rates from the vault
   const positionsKey =
     account && publicClient && stakingConfigs.length > 0
@@ -114,6 +93,7 @@ export const useStakedData = (stakingConfigs: StakingConfig[]) => {
 
   const {
     data: positionsRaw,
+    error: positionsError,
     isLoading: isLoadingPositions,
     isValidating: isValidatingPositions,
   } = useSWR(
@@ -143,6 +123,52 @@ export const useStakedData = (stakingConfigs: StakingConfig[]) => {
     { refreshInterval: POLLING.FAST },
   );
 
+  // Earnings come from the backend (slow path). Once that request settles —
+  // whether it resolved or errored — stop showing the "loading earnings"
+  // skeleton on the fast path, so a backend outage degrades to "—" rather
+  // than a spinner that never resolves.
+  const earningsSettled = !!positionsRaw || !!positionsError;
+
+  // balances (fast path) — derived from hooks above, no extra requests
+  const balances = useMemo<StakedBeraAsset[] | undefined>(() => {
+    if (!walletBalances || !exchangeRates) return undefined;
+
+    return stakingConfigs.map((config, i): StakedBeraAsset => {
+      const inputToken = config.inputTokens[0];
+      const stakedBalance =
+        walletBalances.find((b) => b.address === config.receiptToken.address)
+          ?.balance.raw ?? "0";
+      const exchangeRate = exchangeRates[i] ?? 0;
+      // `undefined` (not 0) when the price backend is unavailable, so USD
+      // values render as "—" instead of a misleading "$0.00".
+      const inputTokenPrice = getTokenPrice(inputToken);
+
+      const total = new BigNumber(stakedBalance).multipliedBy(exchangeRate);
+      const stakedAmount = total.dividedBy(10 ** inputToken.decimals);
+      const stakedAmountUsd =
+        inputTokenPrice === undefined
+          ? undefined
+          : stakedAmount.multipliedBy(inputTokenPrice).toNumber();
+
+      return {
+        token: inputToken,
+        apr,
+        stakedAmount: stakedAmount.toNumber(),
+        stakedAmountUsd,
+        earnedAmount: 0,
+        earnedAmountUsd: earningsSettled ? undefined : 0,
+        isLoadingEarnings: !earningsSettled,
+      };
+    });
+  }, [
+    walletBalances,
+    exchangeRates,
+    stakingConfigs,
+    apr,
+    getTokenPrice,
+    earningsSettled,
+  ]);
+
   // derive full StakedBeraAsset[] from raw positions + shared hooks
   const data = useMemo<StakedBeraAsset[] | undefined>(() => {
     if (!positionsRaw || !walletBalances) return undefined;
@@ -152,7 +178,9 @@ export const useStakedData = (stakingConfigs: StakingConfig[]) => {
       const stakingToken = config.receiptToken;
       const { earnings, exchangeRate: exchangeRateRaw } = positionsRaw[i];
 
-      const inputTokenPrice = getTokenPrice(inputToken) ?? 0;
+      // `undefined` (not 0) when the price backend is unavailable, so USD
+      // values render as "—" instead of a misleading "$0.00".
+      const inputTokenPrice = getTokenPrice(inputToken);
       const stakedBalance =
         walletBalances.find((b) => b.address === stakingToken.address)?.balance
           .raw ?? "0";
@@ -166,16 +194,22 @@ export const useStakedData = (stakingConfigs: StakingConfig[]) => {
 
       const stakedAmount = deposited.dividedBy(10 ** inputToken.decimals);
       const earnedAmount = unrealisedGains.dividedBy(10 ** inputToken.decimals);
-      const stakedAmountUsd = stakedAmount.multipliedBy(inputTokenPrice);
-      const earnedAmountUsd = earnedAmount.multipliedBy(inputTokenPrice);
+      const stakedAmountUsd =
+        inputTokenPrice === undefined
+          ? undefined
+          : stakedAmount.multipliedBy(inputTokenPrice).toNumber();
+      const earnedAmountUsd =
+        inputTokenPrice === undefined
+          ? undefined
+          : earnedAmount.multipliedBy(inputTokenPrice).toNumber();
 
       return {
         token: inputToken,
-        apr: apr ?? 0,
+        apr,
         stakedAmount: stakedAmount.toNumber(),
         earnedAmount: earnedAmount.toNumber(),
-        stakedAmountUsd: stakedAmountUsd.toNumber(),
-        earnedAmountUsd: earnedAmountUsd.toNumber(),
+        stakedAmountUsd,
+        earnedAmountUsd,
       };
     });
   }, [positionsRaw, walletBalances, stakingConfigs, apr, getTokenPrice]);
@@ -190,5 +224,20 @@ export const useStakedData = (stakingConfigs: StakingConfig[]) => {
     isLoadingBalances,
     isLoadingPositions,
     isValidatingPositions,
+    /**
+     * Hard error: the RPC fast-path could not produce staked balances (wallet
+     * balances or exchange-rate reads failed). Price and earnings backend
+     * failures are intentionally excluded — those degrade gracefully (USD/APR
+     * render as "—", earnings stop loading) so RPC-derived amounts still show.
+     */
+    error: walletBalancesError ?? exchangeRatesError,
+    /** Set when the earnings (slow path) request failed. */
+    positionsError,
+    /**
+     * True once the earnings (slow path) request has settled — resolved or
+     * errored. Consumers should stop showing an earnings loading state once
+     * this is true, even if `data` never arrives (backend outage).
+     */
+    earningsSettled,
   };
 };

package/src/hooks/pol/useStakedSnapshots.ts

@@ -1,13 +1,13 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
-import type { VaultStatsByDayResponse } from "@berachain/graphql/api";
+import type { StakeStatsByDayResponse } from "@berachain/graphql/beep";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getStakingDailyAssets } from "../../actions/pol/getStakingDailyAssets";
 import type { DefaultHookReturnType } from "../../types/global";
 import { dailyResolution } from "../../utils/filter";
 
-type UseStakedBeraSnapshot = Record<Address, VaultStatsByDayResponse>;
+type UseStakedBeraSnapshot = Record<Address, StakeStatsByDayResponse>;
 export function useStakedSnapshots({
   range,
   addresses,
@@ -18,7 +18,7 @@ export function useStakedSnapshots({
   const QUERY_KEY = range
     ? (["useStakedSnapshots", range, addresses] as const)
     : null;
-  const swrResponse = useSWR(QUERY_KEY, async ([, range, addresses]) => {
+  return useSWR(QUERY_KEY, async ([, range, addresses]) => {
     const [...sortedStakingDailyAssetsArray] = await Promise.all([
       ...addresses.map(async (address) => {
         const unstakingDailyAssets = await getStakingDailyAssets({
@@ -40,9 +40,4 @@ export function useStakedSnapshots({
       {} as UseStakedBeraSnapshot,
     );
   });
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/hooks/pol/useStakingVaultsMetadata.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getSWBeraVaultMetadata } from "../../actions/pol/getSWBeraVaultMetadata";
 import { useBlockTime } from "../../contexts/block-time-provider";

package/src/hooks/pol/useTotalStakedAmount.ts

@@ -1,8 +1,7 @@
-import useSWR from "swr";
-
 import type { Address } from "@berachain/config";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getTotalStakedAmount } from "../../actions/pol/getTotalStakedAmount";
 import type { DefaultHookReturnType } from "../../types/global";
@@ -14,7 +13,7 @@ export function useTotalStakedAmount({
 }): DefaultHookReturnType<Record<Address, bigint>> {
   const publicClient = usePublicClient();
 
-  const swrResponse = useSWR(
+  return useSWR(
     vaultAddresses && publicClient
       ? ["useTotalStakedAmount", vaultAddresses]
       : null,
@@ -22,9 +21,4 @@ export function useTotalStakedAmount({
       return getTotalStakedAmount({ vaultAddresses, publicClient });
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 }

package/src/hooks/pol/useUserVaultInfo.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getUserVaultInfo } from "../../actions/pol/getUserVaultInfo";
 import { POLLING } from "../../enum/polling";
@@ -25,7 +25,7 @@ export const useUserVaultInfo = (
       ? (["useUserVaultInfo", account, args.vaultAddress] as const)
       : null;
 
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, account, vaultAddress]) => {
       assertPublicClient(publicClient);
@@ -38,12 +38,7 @@ export const useUserVaultInfo = (
     },
     {
       ...options,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.NORMAL,
+      refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

package/src/hooks/pol/useUserVaults.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import {
   type GetUserVaultsResponse,
@@ -20,7 +19,7 @@ export const useUserVaults = (
   const publicClient = usePublicClient();
   const QUERY_KEY =
     account && publicClient ? (["useUserVaults", account] as const) : null;
-  const swrResponse = useSWR<GetUserVaultsResponse, unknown, typeof QUERY_KEY>(
+  return useSWR<GetUserVaultsResponse, unknown, typeof QUERY_KEY>(
     QUERY_KEY,
     async ([, account]) => {
       assertPublicClient(publicClient);
@@ -32,12 +31,8 @@ export const useUserVaults = (
     },
     {
       ...options,
-      refreshInterval: options?.opts?.refreshInterval ?? POLLING.NORMAL,
+      refreshInterval: options?.refreshInterval ?? POLLING.NORMAL,
       keepPreviousData: true,
     },
   );
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 };

package/src/hooks/pol/useVaultAddress.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getRewardVaultStakingToken } from "../../actions/pol/getRewardVaultStakingToken";
 import { assertPublicClient } from "../../errors/assert";

package/src/hooks/pol/useVaultHistory.ts

@@ -1,6 +1,5 @@
-import useSWR from "swr";
-
 import type { GetVaultHistoryQuery } from "@berachain/graphql/pol/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import {
   type GetVaultHistoryArgs,
@@ -18,12 +17,7 @@ export const useVaultHistory = ({
   const QUERY_KEY = vault
     ? (["useVaultHistory", vault, range, resolution] as const)
     : null;
-  const swrResponse = useSWR(QUERY_KEY, ([, vault, range, resolution]) =>
+  return useSWR(QUERY_KEY, ([, vault, range, resolution]) =>
     getVaultHistory({ vault, range, resolution }),
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

package/src/hooks/pol/useVaultValidators.ts

@@ -1,7 +1,7 @@
-import useSWR from "swr";
 import type { Address } from "viem";
 
 import type { ApiValidatorFragment } from "@berachain/graphql/pol/api";
+import { useSWR } from "@berachain/utils/pkg/swr";
 
 import { getVaultValidators } from "../../actions/pol/getVaultValidators";
 import type {
@@ -17,7 +17,7 @@ export const useVaultValidators = (
   options?: DefaultHookOptions,
 ): UsePollValidatorInfoResponse => {
   const QUERY_KEY = id ? (["useVaultValidators", id] as const) : null;
-  const swrResponse = useSWR(
+  return useSWR(
     QUERY_KEY,
     async ([, address]) => {
       return await getVaultValidators({
@@ -25,12 +25,7 @@ export const useVaultValidators = (
       });
     },
     {
-      ...options?.opts,
+      ...options,
     },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse.mutate(),
-  };
 };

package/src/hooks/tokens/useMultipleTokenInformation.ts

@@ -1,9 +1,9 @@
-import useSWRImmutable from "swr/immutable";
 import { isAddress } from "viem";
 
 import { defaultChainId } from "@berachain/config/internal";
 
 import { usePublicClient } from "@berachain/wagmi/hooks";
+import { useSWRImmutable } from "@berachain/utils/pkg/swr";
 
 import { getTokenInformation } from "../../actions/tokens/getTokenInformation";
 import { assertPublicClient } from "../../errors/assert";
@@ -36,7 +36,7 @@ export function useMultipleTokenInformation(
         ] as const)
       : null;
 
-  const swrResponse = useSWRImmutable<Token[], unknown, typeof QUERY_KEY>(
+  return useSWRImmutable<Token[], unknown, typeof QUERY_KEY>(
     QUERY_KEY,
     async ([, addresses, chainId]) => {
       // We already checked for publicClient in the QUERY_KEY
@@ -64,11 +64,6 @@ export function useMultipleTokenInformation(
         }),
       );
     },
-    { ...options?.opts },
+    { ...options },
   );
-
-  return {
-    ...swrResponse,
-    refresh: () => swrResponse?.mutate?.(),
-  };
 }