fix: trivial refetch after tx

Author: Jeday

features/adjustment/mint/hooks/use-mint.ts

@@ -14,7 +14,7 @@ import { useReportStatus } from 'features/report';
 import { GoToVault } from 'modules/vaults/components/go-to-vault';
 
 export const useMint = () => {
-  const { activeVault } = useVaultInfo();
+  const { activeVault, refetchVaultInfo } = useVaultInfo();
   const { isReportAvailable, prepareReportCall } = useReportStatus();
   const { sendTX, ...rest } = useSendTransaction();
 
@@ -53,9 +53,19 @@ export const useMint = () => {
           }),
         );
 
+        if (success) {
+          await refetchVaultInfo();
+        }
+
         return success;
       },
-      [activeVault?.owner, prepareReportCall, sendTX, isReportAvailable],
+      [
+        activeVault?.owner,
+        refetchVaultInfo,
+        prepareReportCall,
+        sendTX,
+        isReportAvailable,
+      ],
     ),
     ...rest,
   };

features/adjustment/repay/hooks/use-burn.ts

@@ -15,7 +15,7 @@ import {
 import { GoToVault } from 'modules/vaults/components/go-to-vault';
 
 export const useBurn = () => {
-  const { activeVault } = useVaultInfo();
+  const { activeVault, refetchVaultInfo } = useVaultInfo();
   const { stETH, wstETH } = useLidoSDK();
   const { sendTX, ...rest } = useSendTransaction();
 
@@ -70,9 +70,13 @@ export const useBurn = () => {
           }),
         );
 
+        if (success) {
+          await refetchVaultInfo();
+        }
+
         return success;
       },
-      [activeVault?.owner, sendTX, stETH, wstETH],
+      [activeVault?.owner, refetchVaultInfo, sendTX, stETH, wstETH],
     ),
     ...rest,
   };

features/claim/claim-form/hooks/use-claim.ts

@@ -10,7 +10,7 @@ import { useSendTransaction, withSuccess } from 'modules/web3';
 import { GoToVault } from 'modules/vaults/components/go-to-vault';
 
 export const useClaim = () => {
-  const { activeVault } = useVaultInfo();
+  const { activeVault, refetchVaultInfo } = useVaultInfo();
   const owner = activeVault?.owner;
   const { sendTX, ...rest } = useSendTransaction();
 
@@ -41,9 +41,13 @@ export const useClaim = () => {
           }),
         );
 
+        if (success) {
+          await refetchVaultInfo();
+        }
+
         return success;
       },
-      [owner, sendTX],
+      [owner, refetchVaultInfo, sendTX],
     ),
     ...rest,
   };

features/settings/main/contexts/main-settings-provider.tsx

@@ -18,7 +18,7 @@ import { useVaultInfo } from 'modules/vaults';
 import { Address } from 'viem';
 
 export const MainSettingsProvider: FC<PropsWithChildren> = ({ children }) => {
-  const { activeVault, refetch, isRefetching } = useVaultInfo();
+  const { activeVault, isRefetching } = useVaultInfo();
   const { editMainSettings, retryEvent } = useEditMainSettings();
 
   const formObject = useForm<EditMainSettingsSchema>({
@@ -54,13 +54,9 @@ export const MainSettingsProvider: FC<PropsWithChildren> = ({ children }) => {
     async (data: EditMainSettingsSchema): Promise<boolean> => {
       const { success } = await editMainSettings(data);
 
-      // refetch even when error because some transactions may be successful
-      // or reverted due to state change
-      await refetch({ cancelRefetch: true, throwOnError: true });
-
       return success;
     },
-    [editMainSettings, refetch],
+    [editMainSettings],
   );
 
   return (

features/settings/main/hooks/use-edit-main-settings.ts

@@ -30,7 +30,7 @@ const toMethodArg =
 
 export const useEditMainSettings = () => {
   const { hasBothConfirmingRoles } = useVaultConfirmingRoles();
-  const { activeVault } = useVaultInfo();
+  const { activeVault, refetchVaultInfo } = useVaultInfo();
   const owner = activeVault?.owner;
 
   const { sendTX, ...rest } = useSendTransaction();
@@ -138,16 +138,20 @@ export const useEditMainSettings = () => {
           });
         }
 
-        return withSuccess(
+        const result = withSuccess(
           sendTX({
             transactions,
             mainActionLoadingText: 'Editing vault settings',
             mainActionCompleteText: 'Edited vault settings',
             renderSuccessContent: GoToVault,
           }),
         );
+
+        await refetchVaultInfo();
+
+        return result;
       },
-      [hasBothConfirmingRoles, owner, sendTX],
+      [hasBothConfirmingRoles, owner, refetchVaultInfo, sendTX],
     ),
     ...rest,
   };

features/settings/permissions/hooks/use-edit-permissions.ts

@@ -18,13 +18,13 @@ type EditPermissionsArgs = {
 };
 
 export const useEditPermissions = () => {
-  const { activeVault } = useVaultInfo();
+  const { activeVault, refetchVaultInfo } = useVaultInfo();
   const owner = activeVault?.owner;
   const { sendTX, ...rest } = useSendTransaction();
 
   return {
     editPermissions: useCallback(
-      ({ toGrant, toRevoke }: EditPermissionsArgs) => {
+      async ({ toGrant, toRevoke }: EditPermissionsArgs) => {
         invariant(owner, '[useEditPermissions] owner is not defined');
         const transactions: TransactionEntry[] = [];
         if (toGrant.length > 0) {
@@ -53,16 +53,20 @@ export const useEditPermissions = () => {
             ),
           });
         }
-        return withSuccess(
+        const result = withSuccess(
           sendTX({
             transactions,
             mainActionLoadingText: 'Editing vault permissions',
             mainActionCompleteText: 'Vault permissions edited',
             renderSuccessContent: GoToVault,
           }),
         );
+
+        await refetchVaultInfo();
+
+        return result;
       },
-      [owner, sendTX],
+      [owner, refetchVaultInfo, sendTX],
     ),
     ...rest,
   };

features/supply/fund/hooks/use-fund.ts

@@ -15,7 +15,7 @@ import { GoToVault } from 'modules/vaults/components/go-to-vault';
 import { dashboardAbi } from 'abi/dashboard-abi';
 
 export const useFund = () => {
-  const { activeVault } = useVaultInfo();
+  const { activeVault, refetchVaultInfo } = useVaultInfo();
   const { sendTX, ...rest } = useSendTransaction();
 
   return {
@@ -42,9 +42,13 @@ export const useFund = () => {
           }),
         );
 
+        if (success) {
+          await refetchVaultInfo();
+        }
+
         return success;
       },
-      [activeVault?.owner, sendTX],
+      [activeVault.owner, refetchVaultInfo, sendTX],
     ),
     ...rest,
   };

features/supply/withdraw/hooks/use-withdraw.ts

@@ -17,7 +17,7 @@ type WithdrawArgs = {
 };
 
 export const useWithdraw = () => {
-  const { activeVault } = useVaultInfo();
+  const { activeVault, refetchVaultInfo } = useVaultInfo();
   const vaultOwner = activeVault?.owner;
   const { sendTX, ...rest } = useSendTransaction();
   const { isReportAvailable, prepareReportCall } = useReportStatus();
@@ -41,7 +41,7 @@ export const useWithdraw = () => {
         ? async () => [await prepareReportCall(), withdrawCall]
         : [withdrawCall];
 
-      return withSuccess(
+      const { success } = await withSuccess(
         sendTX({
           transactions,
           forceAtomic: true,
@@ -50,8 +50,20 @@ export const useWithdraw = () => {
           renderSuccessContent: GoToVault,
         }),
       );
+
+      if (success) {
+        await refetchVaultInfo();
+      }
+
+      return success;
     },
-    [vaultOwner, isReportAvailable, sendTX, prepareReportCall],
+    [
+      vaultOwner,
+      isReportAvailable,
+      refetchVaultInfo,
+      sendTX,
+      prepareReportCall,
+    ],
   );
 
   return {

modules/vaults/vault-context/index.tsx

@@ -11,15 +11,14 @@ import { Address, isAddress } from 'viem';
 import invariant from 'tiny-invariant';
 import { useSingleVaultData } from 'modules/vaults/hooks/use-vault-data';
 import { VaultInfo } from 'types';
+import { QueryObserverResult } from '@tanstack/react-query';
 
 type VaultContextType = {
   vaultAddress: Address | undefined;
   activeVault?: VaultInfo;
-  isLoadingVault?: boolean;
-} & Pick<
-  ReturnType<typeof useSingleVaultData>,
-  'refetch' | 'isRefetching' | 'error'
->;
+  refetchVaultInfo: () => Promise<QueryObserverResult<VaultInfo, Error>>;
+  isLoadingVault: boolean;
+} & Pick<ReturnType<typeof useSingleVaultData>, 'isRefetching' | 'error'>;
 
 const VaultContext = createContext<VaultContextType | null>(null);
 VaultContext.displayName = 'VaultContext';
@@ -30,34 +29,26 @@ export const VaultProvider: FC<PropsWithChildren> = ({ children }) => {
   const sanitizedVaultAddress = isAddress(vaultAddress)
     ? vaultAddress
     : undefined;
-  const query = useSingleVaultData(sanitizedVaultAddress);
+  const { data, error, refetch, isPending, isRefetching } = useSingleVaultData(
+    sanitizedVaultAddress,
+  );
 
   useEffect(() => {
-    if (query.error)
-      console.error(
-        `[VaultProvider] error fetching ${vaultAddress}`,
-        query.error,
-      );
-  }, [query.error, vaultAddress]);
+    if (error)
+      console.error(`[VaultProvider] error fetching ${vaultAddress}`, error);
+  }, [error, vaultAddress]);
 
-  const contextValue = useMemo<VaultContextType>(
-    () => ({
+  const contextValue = useMemo<VaultContextType>(() => {
+    return {
       vaultAddress: sanitizedVaultAddress,
-      activeVault: query.data,
-      isLoadingVault: query.isPending,
-      error: query.error,
-      refetch: query.refetch,
-      isRefetching: query.isRefetching,
-    }),
-    [
-      sanitizedVaultAddress,
-      query.data,
-      query.isPending,
-      query.error,
-      query.refetch,
-      query.isRefetching,
-    ],
-  );
+      activeVault: data,
+      isLoadingVault: isPending,
+      error: error,
+      refetchVaultInfo: () =>
+        refetch({ cancelRefetch: true, throwOnError: false }),
+      isRefetching: isRefetching,
+    };
+  }, [sanitizedVaultAddress, data, isPending, error, isRefetching, refetch]);
 
   return (
     <VaultContext.Provider value={contextValue}>