Test -> Staging

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.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/src/components/molecules/GovernanceActionNewCommitteeDetailsTabContent.tsx

@@ -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/VotesSubmitted.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/organisms/DrawerMobile.tsx

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

govtool/frontend/src/components/organisms/GovernanceActionDetailsCardData.tsx

@@ -1,5 +1,5 @@
 import { useMemo, useState, useEffect } from "react";
-import { Box, Tabs, Tab, styled, Skeleton } from "@mui/material";
+import { Box, Tabs, Tab, styled, Skeleton, Link } from "@mui/material";
 import { useLocation } from "react-router-dom";
 import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline";
 import CancelOutlinedIcon from "@mui/icons-material/CancelOutlined";
@@ -29,9 +29,11 @@ import {
   validateSignature,
 } from "@utils";
 import { MetadataValidationStatus, ProposalData } from "@models";
+import { Trans } from "react-i18next";
 import { errorRed, successGreen } from "@/consts";
 import { GovernanceActionType } from "@/types/governanceAction";
 import { useAppContext } from "@/context";
+import { theme } from "@/theme";
 
 type TabPanelProps = {
   children?: React.ReactNode;
@@ -165,6 +167,11 @@ export const GovernanceActionDetailsCardData = ({
     hash ?? ""
   }`;
 
+  const isItMLabsWithdrawal =
+    type === GovernanceActionType.TreasuryWithdrawals &&
+    cip129GovernanceActionId ===
+      "gov_action18nefry4qacd80xzs2srjahxm2e4vz3c8wvrr03rrtk8mdqfuknysq66459t";
+
   const tabs = useMemo(
     () =>
       [
@@ -390,6 +397,7 @@ export const GovernanceActionDetailsCardData = ({
                   publicKey={author.publicKey}
                   algorithm={author.witnessAlgorithm}
                   jsonContent={jsonContent}
+                  forceValidStatus={isItMLabsWithdrawal}
                 />
                 <span>{author.name}</span>
                 <Tooltip
@@ -409,6 +417,7 @@ export const GovernanceActionDetailsCardData = ({
                 </Tooltip>
               </Box>
               ))}
+          {isItMLabsWithdrawal && authors && authors.length > 0 && <AuthorsVerificationInfoBox />}
         </Box>
       </GovernanceActionCardElement>
 
@@ -520,13 +529,16 @@ const AuthorSignatureStatus = ({
   publicKey,
   signature,
   jsonContent,
+  forceValidStatus = false,
 }: {
   algorithm?: string;
   publicKey?: string;
   signature?: string;
   jsonContent?: Record<string, unknown>;
+  forceValidStatus: boolean;
 }) => {
   const { t } = useTranslation();
+
   const [isSignatureValid, setIsSignatureValid] = useState<boolean | null>(
     null,
   );
@@ -543,6 +555,9 @@ const AuthorSignatureStatus = ({
       const result = await validateSignature(args);
       if (!cancelled) setIsSignatureValid(result);
     }
+    if (forceValidStatus) {
+      return setIsSignatureValid(true);
+    }
     checkSignature();
     return () => {
       cancelled = true;
@@ -573,3 +588,46 @@ const AuthorSignatureStatus = ({
     </Tooltip>
   );
 };
+
+const AuthorsVerificationInfoBox = () => {
+  const { t } = useTranslation();
+  const {
+    palette: { lightBlue, secondaryBlue },
+  } = theme;
+
+  return (
+    <Box
+      sx={{
+        display: "flex",
+        gap: 1,
+        backgroundColor: lightBlue,
+        p: 2,
+        borderRadius: "5px",
+      }}
+    >
+      <InfoOutlinedIcon fontSize="small" style={{ color: secondaryBlue }} />
+      <Box sx={{ display: "flex", flexDirection: "column", gap: 2 }}>
+        <Typography variant="body2">
+          {t("govActions.safeModeInfoBox.title")}
+        </Typography>
+        <Typography variant="body2">
+          {t("govActions.safeModeInfoBox.line1")}
+        </Typography>
+        <Typography variant="body2">
+          <Trans
+            i18nKey="govActions.safeModeInfoBox.line2"
+            components={[<span style={{ fontWeight: 700 }} key="0" />]}
+          />
+        </Typography>
+        <Link
+          href="https://docs.gov.tools/cardano-govtool/faqs/how-was-the-author-of-withdraw-ara45-217-for-mlabs-core...-ga-verified"
+          target="_blank"
+          rel="noopener noreferrer"
+          sx={{ fontSize: "14px" }}
+        >
+          {t("govActions.safeModeInfoBox.link")}
+        </Link>
+      </Box>
+    </Box>
+  );
+};

govtool/frontend/src/i18n/locales/en.json

@@ -482,6 +482,12 @@
     "additionalInformationAboutYourVote": "Additional information about your vote",
     "provideNewContextAboutYourVote": "Provide new context about your vote",
     "rationale": "Rationale",
+    "safeModeInfoBox": {
+      "title": "How this Author got verified?",
+      "line1": "Due to a metadata formatting issue, only a part of the data was signed, which prevented GovTool's automatic verification. However, the signature is valid and can be confirmed manually.",
+      "line2": "<0>Govtool Builders have manually verified the signature, confirming that this Treasury action genuinely originates from Intersect.</0> It has been marked accordingly to make this clear to DReps.",
+      "link": "More details"
+    },
     "seeExternalData": "See external data",
     "selectDifferentOption": "Select a different option to change your vote",
     "showVotes": "Show votes",

govtool/metadata-validation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@govtool/metadata-validation",
-  "version": "2.0.23",
+  "version": "2.0.29",
   "description": "",
   "author": "",
   "private": true,

govtool/metadata-validation/src/main.ts

@@ -13,7 +13,7 @@ async function bootstrap() {
   const config = new DocumentBuilder()
     .setTitle('Metadata Validation Tool')
     .setDescription('The Metadata Validation Tool API description')
-    .setVersion("2.0.23")
+    .setVersion("2.0.29")
     .build();
 
   const document = SwaggerModule.createDocument(app, config);

tests/govtool-frontend/playwright/.env.example

@@ -20,5 +20,7 @@ FAUCET_ADDRESS=
 FAUCET_PAYMENT_PRIVATE=
 FAUCET_STAKE_PRIVATE=
 
+IS_HARDFORK_PROPOSAL_ENABLED=false
+
 CI=true
 TEST_WORKERS=6 // Number of workers to run in parallel

tests/govtool-frontend/playwright/lib/constants/environments.ts

@@ -34,6 +34,8 @@ const environments = {
     (process.env.SCHEDULED_WORKFLOW &&
       process.env.SCHEDULED_WORKFLOW == "true") ||
     false,
+  isHardforkProposalEnabled:
+    process.env.IS_HARDFORK_PROPOSAL_ENABLED === "true" || false,
 };
 
 export default environments;