Fix proposal xdr execution

Author: tupui

dapp/src/components/page/proposal/ExecuteProposalModal.tsx

@@ -70,13 +70,8 @@ const ExecuteProposalModal: React.FC<ExecuteProposalModalProps> = ({
 
     try {
       const { executeProposal } = await import("@service/WriteContractService");
-      const res = await executeProposal(
-        projectName,
-        proposalId,
-        voteResultAndXdr.xdr,
-      );
+      await executeProposal(projectName, proposalId, voteResultAndXdr.xdr);
       setStep(step + 1);
-      console.log("execute result:", res.data);
       toast.success("Congratulation!", "Proposal executed successfully");
     } catch (error: any) {
       toast.error("Execute Proposal", error.message);
@@ -114,25 +109,24 @@ const ExecuteProposalModal: React.FC<ExecuteProposalModalProps> = ({
               <Step step={step} totalSteps={3} />
               <Title
                 title="Finalize the Vote Execution"
-                description="Review the transaction details before execution. You can verify the XDR and proceed with the final step."
+                description={
+                  voteResultAndXdr.xdr
+                    ? "Review the transaction details before execution. You can verify the XDR and proceed with the final step."
+                    : "Review the vote outcome and proceed with finalizing the proposal."
+                }
               />
               <VotingResult voteStatus={voteStatus} />
-              {/* <div className="flex flex-col gap-[18px]">
-                  <p className="leading-4 text-base text-secondary">
-                    Description
-                  </p>
-                  <p className="text-lg text-primary">
-                  </p>
-                </div> */}
-              <div className="flex flex-col items-start gap-[18px]">
-                <p className="leading-4 text-base text-secondary">XDR</p>
-                <div className="p-[8px_18px] bg-[#FFEFA8] flex items-center gap-[18px]">
-                  <p className="leading-[18px] text-lg text-primary">
-                    {(voteResultAndXdr.xdr || "").slice(0, 24) + "..."}
-                  </p>
-                  <img src="/icons/clipboard.svg" />
+              {voteResultAndXdr.xdr && (
+                <div className="flex flex-col items-start gap-[18px]">
+                  <p className="leading-4 text-base text-secondary">XDR</p>
+                  <div className="p-[8px_18px] bg-[#FFEFA8] flex items-center gap-[18px]">
+                    <p className="leading-[18px] text-lg text-primary">
+                      {voteResultAndXdr.xdr.slice(0, 24) + "..."}
+                    </p>
+                    <img src="/icons/clipboard.svg" />
+                  </div>
                 </div>
-              </div>
+              )}
             </div>
           </div>
           <div className="flex justify-end gap-[18px]">

dapp/src/service/WriteContractService.ts

@@ -297,41 +297,49 @@ async function executeProposal(
   }
 
   try {
-    await execute(project_name, proposal_id);
-    const executorAccount = await server.getAccount(publicKey);
-    const outcomeTransactionEnvelope = executeXdr
-      ? xdr.TransactionEnvelope.fromXDR(executeXdr, "base64")
-      : undefined;
+    // Execute the proposal in the smart contract first
+    const result = await execute(project_name, proposal_id);
 
-    const outcomeTransaction = outcomeTransactionEnvelope?.v1().tx();
+    // Only proceed with the outcome transaction if we have an XDR to execute
+    if (executeXdr) {
+      const executorAccount = await server.getAccount(publicKey);
+      const outcomeTransactionEnvelope = xdr.TransactionEnvelope.fromXDR(
+        executeXdr,
+        "base64",
+      );
+      const outcomeTransaction = outcomeTransactionEnvelope?.v1().tx();
 
-    const transactionBuilder = new TransactionBuilder(executorAccount, {
-      fee: import.meta.env.PUBLIC_DEFAULT_FEE,
-      networkPassphrase: import.meta.env.PUBLIC_SOROBAN_NETWORK_PASSPHRASE,
-    });
+      const transactionBuilder = new TransactionBuilder(executorAccount, {
+        fee: import.meta.env.PUBLIC_DEFAULT_FEE,
+        networkPassphrase: import.meta.env.PUBLIC_SOROBAN_NETWORK_PASSPHRASE,
+      });
 
-    outcomeTransaction?.operations().forEach((operation) => {
-      transactionBuilder.addOperation(operation);
-    });
+      outcomeTransaction?.operations().forEach((operation) => {
+        transactionBuilder.addOperation(operation);
+      });
+
+      const compositeTransaction = transactionBuilder.setTimeout(180).build();
 
-    const compositeTransaction = transactionBuilder.setTimeout(180).build();
+      const { signedTxXdr } = await kit.signTransaction(
+        compositeTransaction.toXDR(),
+      );
 
-    const { signedTxXdr } = await kit.signTransaction(
-      compositeTransaction.toXDR(),
-    );
+      const signedTransaction = new Transaction(
+        signedTxXdr,
+        import.meta.env.PUBLIC_SOROBAN_NETWORK_PASSPHRASE,
+      );
 
-    const signedTransaction = new Transaction(
-      signedTxXdr,
-      import.meta.env.PUBLIC_SOROBAN_NETWORK_PASSPHRASE,
-    );
+      const txResult = await server.sendTransaction(signedTransaction);
 
-    const result = await server.sendTransaction(signedTransaction);
+      if (txResult.status === "ERROR") {
+        throw new Error("Outcome transaction failed");
+      }
 
-    if (result.status === "ERROR") {
-      throw new Error("Transaction failed");
-    } else {
-      return result.hash;
+      return txResult.hash;
     }
+
+    // If no XDR to execute, just return the execution result
+    return result.result;
   } catch (e: any) {
     throw new Error(e.message);
   }