Merge pull request #3097 from IntersectMBO/develop

GovTool - v2.0.13
IntersectMBO · Feb 27, 2025 · 9e1651e · 9e1651e
2 parents c9a9eee + ec4639a
commit 9e1651e
Show file tree

Hide file tree

Showing 17 changed files with 248 additions and 173 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,13 +10,25 @@ changes.
 
 ## [Unreleased]
 
+### Added
+
+### Fixed
+
+### Changed
+
+### Removed
+
+## [v2.0.13](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.13) 2025-02-27
+
+
 ### Added
 
 ### Fixed
 
 - Fix responsive error on menu [Issue 3055](https://github.com/IntersectMBO/govtool/issues/3055)
 - Fix wrong placement of nav items in disconnected menu [Issue 3057](https://github.com/IntersectMBO/govtool/issues/3057)
 - Fix missing subtraction withdrawals from ada holder balance [Issue 3061](https://github.com/IntersectMBO/govtool/issues/3061)
+- Fix displaying voting power on direct voter cards
 
 ### Changed
 

diff --git a/govtool/backend/Dockerfile b/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.12/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.13/x/vva-be/build/vva-be/vva-be /usr/local/bin
diff --git a/govtool/backend/Dockerfile.qovery b/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.12/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.13/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

diff --git a/govtool/backend/vva-be.cabal b/govtool/backend/vva-be.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            2.0.12
+version:            2.0.13
 
 -- A short (one-line) description of the package.
 -- synopsis:

diff --git a/govtool/frontend/package-lock.json b/govtool/frontend/package-lock.json
diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@govtool/frontend",
   "private": true,
-  "version": "2.0.12",
+  "version": "2.0.13",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -27,7 +27,7 @@
     "@emotion/styled": "^11.11.0",
     "@emurgo/cardano-serialization-lib-asmjs": "^12.1.1",
     "@hookform/resolvers": "^3.3.1",
-    "@intersect.mbo/govtool-outcomes-pillar-ui": "1.2.3",
+    "@intersect.mbo/govtool-outcomes-pillar-ui": "1.2.4",
     "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
     "@intersect.mbo/pdf-ui": "0.6.4",
     "@mui/icons-material": "^5.14.3",

diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -71,7 +71,7 @@ export const DashboardCards = () => {
       <DirectVoterDashboardCard
         pendingTransaction={pendingTransaction}
         voter={voter}
-        votingPower={votingPower}
+        votingPower={voter.votingPower}
       />
       <ListGovActionsDashboardCards />
       <ProposeGovActionDashboardCard

diff --git a/govtool/frontend/src/components/organisms/DashboardCards/DirectVoterDashboardCard.tsx b/govtool/frontend/src/components/organisms/DashboardCards/DirectVoterDashboardCard.tsx
@@ -13,7 +13,7 @@ import { LINKS } from "@/consts/links";
 type DirectVoterDashboardCardProps = {
   pendingTransaction: PendingTransaction;
   voter: VoterInfo;
-  votingPower: number;
+  votingPower: number | null;
 };
 
 export const DirectVoterDashboardCard = ({
@@ -24,7 +24,7 @@ export const DirectVoterDashboardCard = ({
   const navigate = useNavigate();
   const { t } = useTranslation();
 
-  const ada = correctVoteAdaFormat(votingPower);
+  const ada = correctVoteAdaFormat(votingPower ?? 0);
 
   // learn more button
   const learnMoreButton: LoadingButtonProps = {
@@ -69,11 +69,13 @@ export const DirectVoterDashboardCard = ({
           },
           { ...learnMoreButton, variant: "text" },
         ],
-        description: (
+        description: votingPower ? (
           <Trans
             i18nKey="dashboard.cards.directVoter.isRegisteredDescription"
             values={{ votingPower: ada }}
           />
+        ) : (
+          <Trans i18nKey="dashboard.cards.directVoter.isRegisteredDescriptionWithoutVotingPower" />
         ),
         state: "active",
         transactionId: voter?.soleVoterRegisterTxHash,

diff --git a/govtool/frontend/src/i18n/locales/en.json b/govtool/frontend/src/i18n/locales/en.json
@@ -89,6 +89,7 @@
       },
       "directVoter": {
         "isRegisteredDescription": "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
+        "isRegisteredDescriptionWithoutVotingPower": "You can vote on Governance Actions.",
         "register": "Register",
         "registerDescription": "Register to Vote on Governance Actions.",
         "registerTitle": "Become a Direct Voter",

diff --git a/govtool/frontend/src/pages/RegisterAsDirectVoter.tsx b/govtool/frontend/src/pages/RegisterAsDirectVoter.tsx
@@ -13,12 +13,12 @@ import {
   useWalletErrorModal,
 } from "@hooks";
 import { CenteredBoxBottomButtons, CenteredBoxPageWrapper } from "@molecules";
-import { checkIsWalletConnected, openInNewTab } from "@utils";
+import { checkIsWalletConnected, correctAdaFormat, openInNewTab } from "@utils";
 import { WrongRouteInfo } from "@organisms";
 import { CertificatesBuilder } from "@emurgo/cardano-serialization-lib-asmjs";
 
 export const RegisterAsDirectVoter = () => {
-  const { cExplorerBaseUrl } = useAppContext();
+  const { cExplorerBaseUrl, epochParams } = useAppContext();
   const navigate = useNavigate();
   const [isLoading, setIsLoading] = useState(false);
   const { t } = useTranslation();
@@ -148,6 +148,10 @@ export const RegisterAsDirectVoter = () => {
               key="0"
             />,
           ]}
+          values={{
+            deposit:
+              correctAdaFormat(epochParams?.drep_deposit ?? undefined) ?? 500,
+          }}
         />
       </Typography>
       <CenteredBoxBottomButtons