fixed gov proposal total and deposit period loading

DA0-DA0 · Apr 5, 2024 · d8ac389 · d8ac389
1 parent 3d0384a
commit d8ac389
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 28 deletions.
diff --git a/packages/state/recoil/selectors/chain.ts b/packages/state/recoil/selectors/chain.ts
@@ -729,42 +729,76 @@ export const govProposalsSelector = selectorFamily<
       let total = 0
 
       // Try to load from indexer first.
-      const indexerProposals: {
-        id: string
-        data: string
-      }[] =
-        get(
-          queryGenericIndexerSelector({
-            chainId,
-            formula: 'gov/reverseProposals',
-            args: {
-              limit,
-              offset,
-            },
-          })
-        )?.proposals ?? []
+      const indexerProposals:
+        | {
+            proposals: {
+              id: string
+              data: string
+            }[]
+            total: number
+          }
+        | undefined = get(
+        queryGenericIndexerSelector({
+          chainId,
+          formula: 'gov/reverseProposals',
+          args: {
+            limit,
+            offset,
+          },
+        })
+      )
 
-      if (indexerProposals.length) {
+      if (indexerProposals?.proposals.length) {
         if (supportsV1Gov) {
-          v1Proposals = indexerProposals.flatMap(
+          v1Proposals = indexerProposals.proposals.flatMap(
             ({ data }): ProposalV1 | [] => {
               try {
-                return ProposalV1.decode(fromBase64(data))
-              } catch {
-                return []
-              }
+                const proposal = ProposalV1.decode(fromBase64(data))
+
+                if (
+                  status === ProposalStatus.PROPOSAL_STATUS_UNSPECIFIED ||
+                  proposal.status === status
+                ) {
+                  return proposal
+                }
+              } catch {}
+
+              return []
             }
           )
+
+          if (status === ProposalStatus.PROPOSAL_STATUS_UNSPECIFIED) {
+            total = indexerProposals.total
+          } else {
+            total = v1Proposals.length
+          }
         } else {
-          v1Beta1Proposals = indexerProposals.flatMap(
+          v1Beta1Proposals = indexerProposals.proposals.flatMap(
             ({ data }): ProposalV1Beta1 | [] => {
               try {
-                return ProposalV1Beta1.decode(fromBase64(data), undefined, true)
-              } catch {
-                return []
-              }
+                const proposal = ProposalV1Beta1.decode(
+                  fromBase64(data),
+                  undefined,
+                  true
+                )
+
+                if (
+                  status === ProposalStatus.PROPOSAL_STATUS_UNSPECIFIED ||
+                  proposal.status === status
+                ) {
+                  return proposal
+                }
+              } catch {}
+
+              return []
             }
           )
+
+          if (status === ProposalStatus.PROPOSAL_STATUS_UNSPECIFIED) {
+            total = indexerProposals.total
+          } else {
+            total = v1Beta1Proposals.length
+          }
         }
 
         // Fallback to querying chain if indexer failed.

diff --git a/packages/stateful/components/gov/GovProposalList.tsx b/packages/stateful/components/gov/GovProposalList.tsx
@@ -148,9 +148,14 @@ export const GovProposalList = () => {
             (a.proposal.proposal.depositEndTime ?? new Date(0)).getTime()
         )
 
-  const historyCount = loadingAllGovProposals.loading
-    ? 0
-    : loadingAllGovProposals.data.total - openProposals.length
+  const historyCount =
+    loadingAllGovProposals.loading ||
+    openGovProposalsVotingPeriod.loading ||
+    govProposalsDepositPeriod.loading
+      ? 0
+      : loadingAllGovProposals.data.total -
+        openGovProposalsVotingPeriod.data.total -
+        govProposalsDepositPeriod.data.total
 
   return (
     <StatelessProposalList