Fix blockHeight -1 bug and undefined translations

PIVX-Labs · Jan 13, 2025 · 26b73d7 · 26b73d7
1 parent 4bc0618
commit 26b73d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/scripts/governance/Governance.vue b/scripts/governance/Governance.vue
@@ -58,7 +58,7 @@ watch(
     [blockCount, localProposals],
     async () => {
         for (const proposal of localProposals.value) {
-            if (!proposal.blockHeight) {
+            if (!proposal.blockHeight || proposal.blockHeight === -1) {
                 let tx;
                 try {
                     tx = await getNetwork().getTxInfo(proposal.txid);
@@ -74,8 +74,7 @@ watch(
                 cChainParams.current.proposalFeeConfirmRequirement
             ) {
                 // Proposal fee has the required amounts of confirms, stop watching and try to finalize
-                // TODO: remove propsal
-                finalizeProposal(proposal);
+                await finalizeProposal(proposal);
             }
         }
     },
@@ -188,12 +187,16 @@ async function createProposal(name, url, payments, monthlyPayment, address) {
 }
 async function finalizeProposal(proposal) {
     const { ok, err } = await Masternode.finalizeProposal(proposal);
+
     if (ok) {
-        createAlert('success', translation.PROPOSAL_FINALISED);
+        createAlert('success', ALERTS.PROPOSAL_FINALISED);
+        localProposals.value = localProposals.value.filter(
+            (p) => p.txid !== proposal.txid
+        );
     } else {
         createAlert(
             'warning',
-            translation.PROPOSAL_FINALISE_FAIL + '<br>' + sanitizeHTML(err)
+            ALERTS.PROPOSAL_FINALISE_FAIL + '<br>' + sanitizeHTML(err)
         );
     }
 }

diff --git a/scripts/governance/LocalProposalStatus.vue b/scripts/governance/LocalProposalStatus.vue
@@ -11,7 +11,7 @@ const props = defineProps({
 const { proposal, blockCount } = toRefs(props);
 
 const status = computed(() => {
-    if (!proposal.value.blockHeight) {
+    if (!proposal.value.blockHeight || proposal.value.blockHeight === -1) {
         // If we have no blockHeight, proposal fee is still confirming
         return translation.proposalFinalisationConfirming;
     }