update status fucntion

aragon · Jul 20, 2023 · f02486b · f02486b
1 parent 049a362
commit f02486b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/modules/client/src/client-common/utils.ts b/modules/client/src/client-common/utils.ts
@@ -76,13 +76,12 @@ export function computeProposalStatusFilter(
       where = { executed: true };
       break;
     case ProposalStatus.SUCCEEDED:
-      where = { potentiallyExecutable: true };
+      where = { potentiallyExecutable: true, endDate_lt: now };
       break;
     case ProposalStatus.DEFEATED:
       where = {
         endDate_lt: now,
         executed: false,
-        potentiallyExecutable: false,
       };
       break;
     default:

diff --git a/modules/client/test/integration/addresslistVoting-client/methods.test.ts b/modules/client/test/integration/addresslistVoting-client/methods.test.ts
@@ -871,7 +871,6 @@ describe("Client Address List", () => {
           where: {
             endDate_lt: nowFilter,
             executed: false,
-            potentiallyExecutable: false,
           },
           skip: 0,
           limit: params.limit,

diff --git a/modules/client/test/integration/multisig-client/methods.test.ts b/modules/client/test/integration/multisig-client/methods.test.ts
@@ -608,7 +608,6 @@ describe("Client Multisig", () => {
           where: {
             endDate_lt: nowFilter,
             executed: false,
-            potentiallyExecutable: false,
           },
           skip: 0,
           limit: params.limit,

diff --git a/modules/client/test/integration/tokenVoting-client/methods.test.ts b/modules/client/test/integration/tokenVoting-client/methods.test.ts
@@ -1167,7 +1167,6 @@ describe("Token Voting Client", () => {
             where: {
               endDate_lt: nowFilter,
               executed: false,
-              potentiallyExecutable: false,
             },
             skip: 0,
             limit: params.limit,

diff --git a/modules/client/test/unit/client-common/utils.test.ts b/modules/client/test/unit/client-common/utils.test.ts
@@ -125,7 +125,7 @@ describe("client-common utils", () => {
       expect(computeProposalStatus({
         endDate: endDate.toString(),
         startDate: startDate.toString(),
-        potentiallyExecutable: false,
+        potentiallyExecutable: true,
         executed: false,
         earlyExecutable: false,
       })).toBe(ProposalStatus.DEFEATED);