add fixes for statuses

aragon · Jul 12, 2023 · db408b3 · db408b3
1 parent 38e5144
commit db408b3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/client/src/client-common/utils.ts b/modules/client/src/client-common/utils.ts
@@ -48,7 +48,10 @@ export function computeProposalStatus(
   if (startDate >= now) {
     return ProposalStatus.PENDING;
   }
-  if (proposal.potentiallyExecutable || proposal.earlyExecutable) {
+  if (
+    (proposal.potentiallyExecutable || proposal.earlyExecutable) &&
+    endDate >= now
+  ) {
     return ProposalStatus.SUCCEEDED;
   }
   if (endDate >= now) {
@@ -77,7 +80,6 @@ export function computeProposalStatusFilter(
       break;
     case ProposalStatus.DEFEATED:
       where = {
-        potentiallyExecutable: false,
         endDate_lt: now,
         executed: false,
       };