Merge pull request #156 from SecureSECODAO/dev

fix: show correct end date for early execution
SecureSECODAO · Jul 10, 2023 · 3b9013a · 3b9013a · vercel · Jul 10, 2023
2 parents be4d99b + 869f559
commit 3b9013a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/components/proposal/ProposalHistory.tsx b/src/components/proposal/ProposalHistory.tsx
@@ -63,7 +63,8 @@ const getProposalMilestones = (proposal: Proposal) => {
       res.push({
         label: 'Succeeded',
         variant: 'done',
-        // If the executionDate is earlier than endDate, there was an early execution, so endDate executionDate is also the end date
+        // If the executionDate is earlier than endDate, there was an early execution, so executionDate is also the end date
+        // Note that in general, the exectionDate will not be defined if the proposal status is unequal to Executed
         date:
           proposal.executionDate &&
           compareAsc(proposal.executionDate, proposal.endDate) === -1

diff --git a/src/pages/ViewProposal.tsx b/src/pages/ViewProposal.tsx
@@ -50,6 +50,14 @@ const ViewProposal = () => {
         return 'Starts in ' + countdownText(proposal.startDate);
       case ProposalStatus.Active:
         return 'Ends in ' + countdownText(proposal.endDate);
+      case ProposalStatus.Executed:
+        return (
+          'Executed ' +
+          (proposal.executionDate
+            ? countdownText(proposal.executionDate)
+            : '?') +
+          ' ago'
+        );
       default:
         return 'Ended ' + countdownText(proposal.endDate) + ' ago';
     }