Only build transaction when execute-proposal modal is open, handle su…

…ccess button click
aragon · Apr 11, 2024 · 75ffe6f · 75ffe6f
1 parent de0257b
commit 75ffe6f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/containers/executeProposalDialog/executeProposalDialog.tsx b/src/containers/executeProposalDialog/executeProposalDialog.tsx
@@ -18,16 +18,14 @@ export const ExecuteProposalDialog: React.FC<
   const {t} = useTranslation();
 
   const {transaction, isLoading: isTransactionLoading} =
-    useCreateExecuteTransactionProposal();
+    useCreateExecuteTransactionProposal({enabled: isOpen});
 
   const sendTransactionResults = useSendExecuteProposalTransaction({
     process: executeProposalProcess,
     transaction,
   });
 
-  const onSuccessButtonClick = () => {
-    //
-  };
+  const onSuccessButtonClick = () => onClose?.();
 
   return (
     <TransactionDialog

diff --git a/src/containers/executeProposalDialog/hooks/useCreateExecuteProposalTransaction.ts b/src/containers/executeProposalDialog/hooks/useCreateExecuteProposalTransaction.ts
@@ -6,25 +6,34 @@ import {useParams} from 'react-router-dom';
 import {useCreateExecuteMultisigProposalTransaction} from 'services/transactions/queries/useCreateExecuteMultisigProposalTransaction';
 import {useCreateExecuteTokenVotingProposalTransaction} from 'services/transactions/queries/useCreateExecuteTokenVotingProposalTransaction';
 
-export const useCreateExecuteTransactionProposal = () => {
+export interface IUseCreateExecuteTransactionProposalParams {
+  /**
+   * Disables the create transaction hook when set to false.
+   */
+  enabled?: boolean;
+}
+
+export const useCreateExecuteTransactionProposal = (
+  params: IUseCreateExecuteTransactionProposalParams
+) => {
+  const {enabled} = params;
   const {id: proposalId} = useParams();
 
   const {client} = useClient();
 
   const {data: daoDetails} = useDaoDetailsQuery();
   const pluginType = daoDetails?.plugins[0].id as PluginTypes;
 
+  const enableHook = enabled !== false && client != null && proposalId != null;
+
   const {data: multisigTransaction, isLoading: isMultisigTransactionLoading} =
     useCreateExecuteMultisigProposalTransaction(
       {
         client: client as Client,
         proposalId: proposalId as string,
       },
       {
-        enabled:
-          client != null &&
-          proposalId != null &&
-          pluginType === 'multisig.plugin.dao.eth',
+        enabled: enableHook && pluginType === 'multisig.plugin.dao.eth',
       }
     );
 
@@ -37,10 +46,7 @@ export const useCreateExecuteTransactionProposal = () => {
       proposalId: proposalId as string,
     },
     {
-      enabled:
-        client != null &&
-        proposalId != null &&
-        pluginType === 'token-voting.plugin.dao.eth',
+      enabled: enableHook && pluginType === 'token-voting.plugin.dao.eth',
     }
   );