Merge pull request #3905 from IntersectMBO/staging

Staging -> main

Author: aaboyle878

CHANGELOG.md

@@ -10,6 +10,17 @@ changes.
 
 ## [Unreleased]
 
+### Added
+
+### Fixed
+
+### Changed
+
+### Removed
+
+## [v2.0.29](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.29) 2025-07-16
+
+
 ### Added
 
 - Preserve maintenance ending banner state on the wallet connection change [Issue 3681](https://github.com/IntersectMBO/govtool/issues/3681)

govtool/backend/Dockerfile

@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.23/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.29/x/vva-be/build/vva-be/vva-be /usr/local/bin

govtool/backend/Dockerfile.qovery

@@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.23/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.29/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

govtool/backend/sql/get-network-metrics.sql

@@ -186,9 +186,10 @@ CommitteeThreshold AS (
     SELECT
         c.*
     FROM committee c
-    LEFT JOIN LatestGovAction lga ON c.gov_action_proposal_id = lga.id
-    WHERE (c.gov_action_proposal_id IS NOT NULL AND lga.id IS NOT NULL)
-        OR (c.gov_action_proposal_id IS NULL)
+    where
+            ( c.gov_action_proposal_id = (Select id from LatestGovAction))
+        OR  ( c.gov_action_proposal_id IS NULL)
+            order by gov_action_proposal_id nulls last limit 1
 )
 SELECT
     UniqueDelegators.count AS unique_delegators,

govtool/backend/vva-be.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            2.0.23
+version:            2.0.29
 
 -- A short (one-line) description of the package.
 -- synopsis:

govtool/frontend/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@govtool/frontend",
   "private": true,
-  "version": "2.0.23",
+  "version": "2.0.29",
   "type": "module",
   "scripts": {
     "build": "vite build",

govtool/frontend/package.json

@@ -13,6 +13,12 @@ type CCMember = {
   newExpirationEpoch?: number;
 };
 
+function isArrayOfStrings(value: unknown): value is string[] {
+  return (
+    Array.isArray(value) && value.every((item) => typeof item === "string")
+  );
+}
+
 export const GovernanceActionNewCommitteeDetailsTabContent = ({
   details,
 }: Pick<ProposalData, "details">) => {
@@ -38,6 +44,10 @@ export const GovernanceActionNewCommitteeDetailsTabContent = ({
       newExpirationEpoch: member.newExpirationEpoch,
     }));
 
+  const membersToBeRemoved = isArrayOfStrings(details?.membersToBeRemoved)
+    ? details.membersToBeRemoved
+    : [];
+
   return (
     <Box>
       {membersToBeAdded.length > 0 && (
@@ -78,7 +88,7 @@ export const GovernanceActionNewCommitteeDetailsTabContent = ({
           ))}
         </Box>
       )}
-      {(details?.membersToBeRemoved as string[]).length > 0 && (
+      {membersToBeRemoved.length > 0 && (
         <Box mb="32px">
           <Typography
             sx={{
@@ -93,8 +103,8 @@ export const GovernanceActionNewCommitteeDetailsTabContent = ({
           >
             {t("govActions.membersToBeRemoved")}
           </Typography>
-          {(details?.membersToBeRemoved as string[]).map((hash) => (
-            <Box display="flex" flexDirection="row">
+          {membersToBeRemoved.map((hash) => (
+            <Box display="flex" flexDirection="row" key={hash}>
               <Typography
                 sx={{
                   fontSize: 16,

govtool/frontend/src/components/molecules/GovernanceActionNewCommitteeDetailsTabContent.tsx

@@ -84,6 +84,8 @@ export const VotesSubmitted = ({
     dRepAbstainVotes + (networkTotalStake?.alwaysAbstainVotingPower ?? 0);
 
   // TODO: Move this logic to backend
+
+  // DRep votes
   const dRepYesVotesPercentage = totalStakeControlledByDReps
     ? (dRepYesVotes / totalStakeControlledByDReps) * 100
     : undefined;
@@ -108,25 +110,45 @@ export const VotesSubmitted = ({
   const dRepNotVotedVotesPercentage =
     100 - (dRepYesVotesPercentage ?? 0) - (dRepNoVotesPercentage ?? 0);
 
+  // SPO/Pool votes
   const poolYesVotesPercentage =
-    poolYesVotes + poolNoVotes
-      ? (poolYesVotes / (poolYesVotes + poolNoVotes)) * 100
+    typeof poolYesVotes === "number" &&
+    typeof networkTotalStake?.totalStakeControlledBySPOs === "number" &&
+    networkTotalStake.totalStakeControlledBySPOs > 0
+      ? (poolYesVotes / networkTotalStake.totalStakeControlledBySPOs) * 100
       : undefined;
-  const poolNoVotesPercentage = poolYesVotesPercentage
-    ? 100 - poolYesVotesPercentage
-    : poolNoVotes
-    ? 100
-    : undefined;
 
+  const poolNoVotesPercentage =
+    typeof poolNoVotes === "number" &&
+    typeof networkTotalStake?.totalStakeControlledBySPOs === "number" &&
+    networkTotalStake.totalStakeControlledBySPOs > 0
+      ? (poolNoVotes / networkTotalStake.totalStakeControlledBySPOs) * 100
+      : undefined;
+
+  const poolNotVotedVotes =
+    typeof networkTotalStake?.totalStakeControlledBySPOs === "number"
+      ? networkTotalStake.totalStakeControlledBySPOs -
+        (poolYesVotes + poolNoVotes + poolAbstainVotes)
+      : undefined;
+
+  const poolNotVotedVotesPercentage =
+    100 -
+    (typeof poolYesVotesPercentage === "number" ? poolYesVotesPercentage : 0) -
+    (typeof poolNoVotesPercentage === "number" ? poolNoVotesPercentage : 0);
+
+  // Constitutional Commission votes
   const ccYesVotesPercentage = noOfCommitteeMembers
     ? (ccYesVotes / noOfCommitteeMembers) * 100
     : undefined;
-  const ccNoVotesPercentage = noOfCommitteeMembers
+
+    const ccNoVotesPercentage = noOfCommitteeMembers
     ? (ccNoVotes / noOfCommitteeMembers) * 100
     : undefined;
-  const ccNotVotedVotes =
+
+    const ccNotVotedVotes =
     noOfCommitteeMembers - ccYesVotes - ccNoVotes - ccAbstainVotes;
-  const ccNotVotedVotesPercentage =
+
+    const ccNotVotedVotesPercentage =
     100 - (ccYesVotesPercentage ?? 0) - (ccNoVotesPercentage ?? 0);
 
   return (
@@ -200,6 +222,8 @@ export const VotesSubmitted = ({
             noVotes={poolNoVotes}
             noVotesPercentage={poolNoVotesPercentage}
             abstainVotes={poolAbstainVotes}
+            notVotedVotes={poolNotVotedVotes}
+            notVotedPercentage={poolNotVotedVotesPercentage}
             threshold={
               (() => {
                 const votingThresholdKey = getGovActionVotingThresholdKey({

govtool/frontend/src/components/molecules/VotesSubmitted.tsx

@@ -90,6 +90,7 @@ export const DrawerMobile = ({
                     <MenuNavItem
                       closeDrawer={() => setIsDrawerOpen(false)}
                       navItem={navItem}
+                      key={navItem.label}
                     />
                   );
                 }