feat: support rq options, remove update on block

OriginProtocol · Oct 1, 2023 · 2893203 · 2893203
1 parent 26fcb43
commit 2893203
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/libs/oeth/swap/src/components/SwapRouteCard.tsx b/libs/oeth/swap/src/components/SwapRouteCard.tsx
@@ -41,7 +41,7 @@ export function SwapRouteCard({
     route.gas,
   );
   const { data: approvalGasPrice, isLoading: approvalGasPriceLoading } =
-    useGasPrice(route.approvalGas);
+    useGasPrice(route.approvalGas, { refetchInterval: 30e3 });
   const { data: allowance } = useSwapRouteAllowance(route);
 
   const estimatedAmount = +formatUnits(

diff --git a/libs/shared/providers/src/gas/hooks.ts b/libs/shared/providers/src/gas/hooks.ts
@@ -2,15 +2,31 @@ import { contracts } from '@origin/shared/contracts';
 import { useQuery } from '@tanstack/react-query';
 import { fetchFeeData, readContract } from '@wagmi/core';
 import { formatUnits } from 'viem';
-import { useBlockNumber } from 'wagmi';
+
+import type { UseQueryOptions } from '@tanstack/react-query';
 
 const GAS_MARGIN = 1.3;
 
-export const useGasPrice = (gasAmount = 0n) => {
-  const { data: blockNumber } = useBlockNumber();
+type GasPrice = {
+  gweiUsd: number;
+  gasPrice: number;
+  gasCostUsd: number;
+  gasCostGwei: number;
+  maxGasCostUsd: number;
+  maxGasCostGwei: number;
+};
 
+export const useGasPrice = (
+  gasAmount = 0n,
+  options?: UseQueryOptions<
+    GasPrice,
+    Error,
+    GasPrice,
+    [['useGasPrice', string]]
+  >,
+) => {
   return useQuery({
-    queryKey: ['useGasPrice', gasAmount?.toString(), blockNumber?.toString()],
+    queryKey: ['useGasPrice', gasAmount?.toString()] as const,
     queryFn: async () => {
       const [price, data] = await Promise.all([
         readContract({
@@ -40,5 +56,6 @@ export const useGasPrice = (gasAmount = 0n) => {
         maxGasCostGwei,
       };
     },
+    ...options,
   });
 };