From f02486b0f5d787a5bf411e15afa96436d33750a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Manuel=20Mari=C3=B1as=20Bascoy?=
 <josemarinasbascoy@gmail.com>
Date: Thu, 20 Jul 2023 12:21:29 +0200
Subject: [PATCH] update status fucntion

---
 modules/client/src/client-common/utils.ts                      | 3 +--
 .../test/integration/addresslistVoting-client/methods.test.ts  | 1 -
 .../client/test/integration/multisig-client/methods.test.ts    | 1 -
 .../client/test/integration/tokenVoting-client/methods.test.ts | 1 -
 modules/client/test/unit/client-common/utils.test.ts           | 2 +-
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/client/src/client-common/utils.ts b/modules/client/src/client-common/utils.ts
index 80ad2ffef..69675f8b1 100644
--- 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
index 9dd9da3df..a40f3235a 100644
--- 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
index 64bf363c8..d596ead7b 100644
--- 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
index 0a6e2bfe3..f290af438 100644
--- 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
index 8a1378339..b1c02a111 100644
--- 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);