Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion govtool/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion govtool/backend/Dockerfile.qovery
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion govtool/backend/vva-be.cabal
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
12 changes: 6 additions & 6 deletions govtool/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions govtool/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@govtool/frontend",
"private": true,
"version": "2.0.12",
"version": "2.0.13",
"type": "module",
"scripts": {
"build": "vite build",
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const DashboardCards = () => {
<DirectVoterDashboardCard
pendingTransaction={pendingTransaction}
voter={voter}
votingPower={votingPower}
votingPower={voter.votingPower}
/>
<ListGovActionsDashboardCards />
<ProposeGovActionDashboardCard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { LINKS } from "@/consts/links";
type DirectVoterDashboardCardProps = {
pendingTransaction: PendingTransaction;
voter: VoterInfo;
votingPower: number;
votingPower: number | null;
};

export const DirectVoterDashboardCard = ({
Expand All @@ -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 = {
Expand Down Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions govtool/frontend/src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 6 additions & 2 deletions govtool/frontend/src/pages/RegisterAsDirectVoter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -148,6 +148,10 @@ export const RegisterAsDirectVoter = () => {
key="0"
/>,
]}
values={{
deposit:
correctAdaFormat(epochParams?.drep_deposit ?? undefined) ?? 500,
}}
/>
</Typography>
<CenteredBoxBottomButtons
Expand Down
Loading