chore: much cleaner refetch

aragon · Mar 8, 2024 · b82050b · b82050b
1 parent db3fecb
commit b82050b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/plugins/dualGovernance/hooks/useProposalVeto.tsx b/plugins/dualGovernance/hooks/useProposalVeto.tsx
@@ -36,7 +36,7 @@ export function useProposalVeto(proposalId: string) {
   } = useWriteContract();
   const { isLoading: isConfirming, isSuccess: isConfirmed } =
     useWaitForTransactionReceipt({ hash: vetoTxHash });
-  const canVeto = useUserCanVeto(BigInt(proposalId), isConfirmed) as boolean;
+  const { canVeto, canVetoRefetch } = useUserCanVeto(BigInt(proposalId));
 
   useEffect(() => {
     if (vetoingStatus === "idle" || vetoingStatus === "pending") return;
@@ -66,6 +66,7 @@ export function useProposalVeto(proposalId: string) {
       type: "success",
       txHash: vetoTxHash,
     });
+    canVetoRefetch();
   }, [vetoingStatus, vetoTxHash, isConfirming, isConfirmed]);
 
   const vetoProposal = () => {

diff --git a/plugins/dualGovernance/hooks/useUserCanVeto.tsx b/plugins/dualGovernance/hooks/useUserCanVeto.tsx
@@ -3,10 +3,9 @@ import { OptimisticTokenVotingPluginAbi } from "@/plugins/dualGovernance/artifac
 import { useEffect, useState } from "react";
 import { PUB_CHAIN, PUB_DUAL_GOVERNANCE_PLUGIN_ADDRESS } from "@/constants";
 
-export function useUserCanVeto(proposalId: bigint, forceRefetch: boolean) {
+export function useUserCanVeto(proposalId: bigint) {
   const { address } = useAccount();
   const { data: blockNumber } = useBlockNumber({ watch: true });
-  const [userVetoed, setUserVetoed] = useState<boolean>(false)
 
   const { data: canVeto, refetch: canVetoRefetch } = useReadContract({
     chainId: PUB_CHAIN.id,
@@ -22,12 +21,5 @@ export function useUserCanVeto(proposalId: bigint, forceRefetch: boolean) {
     }
   }, [blockNumber])
 
-  useEffect(() => {
-    if (forceRefetch && !userVetoed) {
-      canVetoRefetch();
-    }
-    setUserVetoed(true)
-  }, [forceRefetch])
-
-  return canVeto;
+  return { canVeto, canVetoRefetch };
 }