Merge pull request #2820 from IntersectMBO/staging

GovTool - v2.0.10

Author: MSzalowski

CHANGELOG.md

@@ -12,15 +12,34 @@ changes.
 
 ### Added
 
+-
+
+### Fixed
+
+-
+
+### Changed
+
+-
+
+### Removed
+
+-
+
+## [v2.0.10](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.10) 2025-01-29
+
+### Added
+
 - Add exception handler on stake key voting power query execution [Issue 2757](https://github.com/IntersectMBO/govtool/issues/2757)
+- Add script hash to new consitution governance action [Issue 2745](https://github.com/IntersectMBO/govtool/issues/2745)
 
 ### Fixed
 
 -
 
 ### Changed
 
-- Bump @intersect.mbo/pdf-ui to v0.5.10
+- Bump @intersect.mbo/pdf-ui to v0.5.11
 
 ### Removed
 

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.9/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.10/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.9/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.10/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

govtool/backend/sql/list-proposals.sql

@@ -175,7 +175,8 @@ SELECT
 
             WHEN gov_action_proposal.type::text = 'NewConstitution' THEN
             json_build_object(
-                'anchor', gov_action_proposal.description->'contents'->1->'anchor'
+                'anchor', gov_action_proposal.description->'contents'->1->'anchor',
+                'script', gov_action_proposal.description->'contents'->1->'script'
             )
             WHEN gov_action_proposal.type::text = 'NewCommittee' THEN
             (

govtool/backend/vva-be.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            2.0.9
+version:            2.0.10
 
 -- 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.9",
+  "version": "2.0.10",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -29,7 +29,7 @@
     "@hookform/resolvers": "^3.3.1",
     "@intersect.mbo/govtool-outcomes-pillar-ui": "^1.0.0-beta.1",
     "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
-    "@intersect.mbo/pdf-ui": "^0.5.10",
+    "@intersect.mbo/pdf-ui": "^0.5.11",
     "@mui/icons-material": "^5.14.3",
     "@mui/material": "^5.14.4",
     "@rollup/plugin-babel": "^6.0.4",

govtool/frontend/package.json

@@ -16,6 +16,7 @@ type DataMissingHeaderProps = {
   titleStyle?: SxProps;
   isDRep?: boolean;
   image?: string | null;
+  shareLink?: string;
 };
 
 export const DataMissingHeader = ({
@@ -24,6 +25,7 @@ export const DataMissingHeader = ({
   titleStyle,
   isDRep,
   image,
+  shareLink,
 }: DataMissingHeaderProps) => {
   const base64Image = getBase64ImageDetails(image ?? "");
   const { screenWidth } = useScreenDimension();
@@ -81,7 +83,9 @@ export const DataMissingHeader = ({
             title}
         </Typography>
       </Box>
-      {screenWidth >= 1020 && <Share link={window.location.href} />}
+      {screenWidth >= 1020 && (
+        <Share link={shareLink || window.location.href} />
+      )}
     </Box>
   );
 };

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

@@ -1,30 +1,38 @@
 import { Box } from "@mui/material";
 
 import { NewConstitutionAnchor, ProposalData } from "@/models";
-import { useScreenDimension } from "@/hooks";
+import { useScreenDimension, useTranslation } from "@/hooks";
 
 import { GovernanceActionCardElement } from "./GovernanceActionCardElement";
 
 export const GovernanceActionNewConstitutionDetailsTabContent = ({
   details,
 }: Pick<ProposalData, "details">) => {
   const { screenWidth } = useScreenDimension();
+  const { t } = useTranslation();
   return (
     <Box>
       <GovernanceActionCardElement
         isLinkButton
-        label="New constitution link"
+        label={t("govActions.newConstitution.url")}
         text={(details?.anchor as NewConstitutionAnchor)?.url as string}
         dataTestId="new-constitution-url"
         textVariant={screenWidth > 1600 ? "longText" : "oneLine"}
       />
       <GovernanceActionCardElement
         isCopyButton
-        label="New constitution hash"
+        label={t("govActions.newConstitution.hash")}
         text={(details?.anchor as NewConstitutionAnchor)?.dataHash as string}
         dataTestId="new-constitution-data-hash"
         textVariant={screenWidth > 1600 ? "longText" : "oneLine"}
       />
+      <GovernanceActionCardElement
+        isCopyButton
+        label={t("govActions.newConstitution.scriptHash")}
+        text={details?.script as string}
+        dataTestId="new-constitution-script-hash"
+        textVariant={screenWidth > 1600 ? "longText" : "oneLine"}
+      />
     </Box>
   );
 };

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

@@ -5,11 +5,9 @@ import { useScreenDimension } from "@hooks";
 import {
   GovernanceActionCardStatePill,
   GovernanceActionDetailsCardVotes,
-  Share,
 } from "@molecules";
 import { GovernanceActionDetailsCardData } from "@organisms";
 import { MetadataValidationStatus, ProposalData, ProposalVote } from "@models";
-import { useLocation } from "react-router-dom";
 
 type GovernanceActionDetailsCardProps = {
   isDashboard?: boolean;
@@ -32,13 +30,6 @@ export const GovernanceActionDetailsCard = ({
   const { screenWidth, isMobile } = useScreenDimension();
 
   const isOneColumn = (isDashboard && screenWidth < 1036) ?? isMobile;
-  const { pathname, hash } = useLocation();
-
-  const govActionLinkToShare = `${window.location.protocol}//${
-    window.location.hostname
-  }${window.location.port ? `:${window.location.port}` : ""}${pathname}${
-    hash ?? ""
-  }`;
 
   return (
     <Box
@@ -82,9 +73,6 @@ export const GovernanceActionDetailsCard = ({
         isInProgress={isInProgress}
         proposal={proposal}
       />
-      <Box position="absolute" right={40} top={40}>
-        <Share link={govActionLinkToShare} />
-      </Box>
     </Box>
   );
 };