fix: proposal counts (#981)

geobrowser · Jan 10, 2025 · 77070a9 · 77070a9
1 parent be32032
commit 77070a9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/apps/web/app/space/[id]/governance/page.tsx b/apps/web/app/space/[id]/governance/page.tsx
@@ -96,6 +96,12 @@ async function getProposalsCount({ id }: Props['params']) {
         filter: {
           spaceId: { equalToInsensitive: "${id}" }
           status: { equalTo: PROPOSED }
+          endTime: { greaterThanOrEqualTo: ${Math.floor(Date.now() / 1000)} }
+          or: [
+            { type: { equalTo: ADD_EDIT } }
+            { type: { equalTo: ADD_SUBSPACE } }
+            { type: { equalTo: REMOVE_SUBSPACE } }
+          ]
         }
       ) {
         totalCount
@@ -105,6 +111,11 @@ async function getProposalsCount({ id }: Props['params']) {
         filter: {
           spaceId: { equalToInsensitive: "${id}" }
           status: { equalTo: ACCEPTED }
+          or: [
+            { type: { equalTo: ADD_EDIT } }
+            { type: { equalTo: ADD_SUBSPACE } }
+            { type: { equalTo: REMOVE_SUBSPACE } }
+          ]
         }
       ) {
         totalCount
@@ -113,7 +124,13 @@ async function getProposalsCount({ id }: Props['params']) {
       rejectedProposals: proposals(
         filter: {
           spaceId: { equalToInsensitive: "${id}" }
-          status: { equalTo: REJECTED }
+          status: { in: [REJECTED, PROPOSED] }
+          endTime: { greaterThanOrEqualTo: ${Math.floor(Date.now() / 1000)} }
+          or: [
+            { type: { equalTo: ADD_EDIT } }
+            { type: { equalTo: ADD_SUBSPACE } }
+            { type: { equalTo: REMOVE_SUBSPACE } }
+          ]
         }
       ) {
         totalCount

diff --git a/apps/web/partials/governance/governance-proposals-list.tsx b/apps/web/partials/governance/governance-proposals-list.tsx
@@ -27,7 +27,7 @@ interface Props {
 export async function GovernanceProposalsList({ spaceId, page }: Props) {
   const connectedAddress = cookies().get(WALLET_ADDRESS)?.value;
   const [proposals, profile] = await Promise.all([
-    fetchActiveProposals({ spaceId, first: 5, page, connectedAddress }),
+    fetchProposals({ spaceId, first: 5, page, connectedAddress }),
     connectedAddress ? fetchProfile({ address: connectedAddress }) : null,
   ]);
 
@@ -288,7 +288,7 @@ const allProposalsQuery = (spaceId: string, first: number, skip: number, connect
   }
 `;
 
-async function fetchActiveProposals({
+async function fetchProposals({
   spaceId,
   connectedAddress,
   first = 5,