From ee93d7fe7ed6ae8c7c6576909c498754c5dafd44 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Fri, 27 Sep 2024 11:13:43 +0200 Subject: [PATCH 1/2] [LW-11591] Decrease Catalyst voting power threshold from 500 to 25 ADA --- CHANGELOG.md | 4 ++++ source/renderer/app/config/votingConfig.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34a0d222e9..9865442fa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - Un-brick auto-update on devices where it failed in the past ([PR 3223](https://github.com/input-output-hk/daedalus/pull/3223)) +### Chores + +- Decrease Catalyst voting power threshold from 500 to 25 ADA ([PR 3230](https://github.com/input-output-hk/daedalus/pull/3230)) + ## 6.0.1 ### Fixes diff --git a/source/renderer/app/config/votingConfig.ts b/source/renderer/app/config/votingConfig.ts index 44d3dea8ba..df0ba90c76 100644 --- a/source/renderer/app/config/votingConfig.ts +++ b/source/renderer/app/config/votingConfig.ts @@ -1,5 +1,5 @@ const { isDev } = global.environment; -export const VOTING_REGISTRATION_MIN_WALLET_FUNDS = 500; // 500 ADA | unit: ADA +export const VOTING_REGISTRATION_MIN_WALLET_FUNDS = 25; // 25 ADA | unit: ADA export const VOTING_REGISTRATION_FEE_CALCULATION_AMOUNT = 1; // 1 ADA | unit: ADA export const VOTING_REGISTRATION_PIN_CODE_LENGTH = 4; export const VOTING_REGISTRATION_MIN_TRANSACTION_CONFIRMATIONS = isDev ? 2 : 10; From ad60dc052868cf909cf7b9d53577c4c09289d8f2 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Tue, 1 Oct 2024 15:52:57 +0200 Subject: [PATCH 2/2] [LW-11591] Parametrize the old 500 ADA in copy, too --- .../voting/voting-info/RegisterToVote.messages.ts | 2 +- .../app/components/voting/voting-info/RegisterToVote.tsx | 8 +++++++- source/renderer/app/i18n/locales/defaultMessages.json | 2 +- source/renderer/app/i18n/locales/en-US.json | 2 +- source/renderer/app/i18n/locales/ja-JP.json | 2 +- translations/messages.json | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/source/renderer/app/components/voting/voting-info/RegisterToVote.messages.ts b/source/renderer/app/components/voting/voting-info/RegisterToVote.messages.ts index 78de2ca679..da3ee502d2 100644 --- a/source/renderer/app/components/voting/voting-info/RegisterToVote.messages.ts +++ b/source/renderer/app/components/voting/voting-info/RegisterToVote.messages.ts @@ -20,7 +20,7 @@ export const messages = defineMessages({ step2CheckBoxLabel: { id: 'voting.registerToVote.step2CheckBoxLabel', defaultMessage: - '!!!Ensure that you register and hold the necessary 500 ADA at the time of the snapshot.', + '!!!Ensure that you register and hold the necessary {minVotingFunds} ADA at the time of the snapshot.', description: 'Second step to follow in order to vote', }, buttonLabel: { diff --git a/source/renderer/app/components/voting/voting-info/RegisterToVote.tsx b/source/renderer/app/components/voting/voting-info/RegisterToVote.tsx index 743cf439a7..bdb2cd7d30 100644 --- a/source/renderer/app/components/voting/voting-info/RegisterToVote.tsx +++ b/source/renderer/app/components/voting/voting-info/RegisterToVote.tsx @@ -1,4 +1,5 @@ import React, { useState } from 'react'; +import BigNumber from 'bignumber.js'; import { injectIntl } from 'react-intl'; import { Button } from 'react-polymorph/lib/components/Button'; import { Checkbox } from 'react-polymorph/lib/components/Checkbox'; @@ -6,6 +7,7 @@ import type { Intl } from '../../../types/i18nTypes'; import { messages } from './RegisterToVote.messages'; import { messages as votingMessages } from './VotingInfo.messages'; import styles from './RegisterToVote.scss'; +import { VOTING_REGISTRATION_MIN_WALLET_FUNDS } from '../../../config/votingConfig'; type Props = { intl: Intl; @@ -38,7 +40,11 @@ function RegisterToVote({ intl, onRegisterToVoteClick }: Props) {
diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json index 44db125cdd..0307a1fb28 100644 --- a/source/renderer/app/i18n/locales/defaultMessages.json +++ b/source/renderer/app/i18n/locales/defaultMessages.json @@ -4467,7 +4467,7 @@ "id": "voting.registerToVote.step1CheckBoxLabel" }, { - "defaultMessage": "!!!Ensure that you register and hold the necessary 500 ADA at the time of the snapshot.", + "defaultMessage": "!!!Ensure that you register and hold the necessary {minVotingFunds} ADA at the time of the snapshot.", "description": "Second step to follow in order to vote", "id": "voting.registerToVote.step2CheckBoxLabel" }, diff --git a/source/renderer/app/i18n/locales/en-US.json b/source/renderer/app/i18n/locales/en-US.json index 9fa22718af..0086307637 100755 --- a/source/renderer/app/i18n/locales/en-US.json +++ b/source/renderer/app/i18n/locales/en-US.json @@ -728,7 +728,7 @@ "voting.registerToVote.header": "Register to vote", "voting.registerToVote.registerToVoteButtonLabel": "Register to vote", "voting.registerToVote.step1CheckBoxLabel": "Download the Catalyst Voting app on your smartphone", - "voting.registerToVote.step2CheckBoxLabel": "Ensure that you register and hold the necessary 500 ADA at the time of the snapshot.", + "voting.registerToVote.step2CheckBoxLabel": "Ensure that you register and hold the necessary {minVotingFunds} ADA at the time of the snapshot.", "voting.registerToVote.stepsTitle": "Follow these steps to vote:", "voting.registerToVote.votingInstructions": "If you are not registered yet, make sure to register to vote in the current fund before the snapshot date.", "voting.resultsPhase.endDateLabel": "End of voting:", diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json index a0f505a221..49612f7a3f 100755 --- a/source/renderer/app/i18n/locales/ja-JP.json +++ b/source/renderer/app/i18n/locales/ja-JP.json @@ -728,7 +728,7 @@ "voting.registerToVote.header": "有権者登録をする", "voting.registerToVote.registerToVoteButtonLabel": "有権者登録をする", "voting.registerToVote.step1CheckBoxLabel": "スマートフォンにCatalyst Votingアプリをダウンロードします", - "voting.registerToVote.step2CheckBoxLabel": "スナップショット実施の時点で、登録を済ませ、500ADAを保有していてください", + "voting.registerToVote.step2CheckBoxLabel": "スナップショット実施の時点で、登録を済ませ、{minVotingFunds}ADAを保有していてください", "voting.registerToVote.stepsTitle": "投票方法:", "voting.registerToVote.votingInstructions": "登録を済ませていない場合は、スナップショットの実施日前に現行のファンドの有権者登録を行ってください。", "voting.resultsPhase.endDateLabel": "投票締め切り:", diff --git a/translations/messages.json b/translations/messages.json index bd81838465..148e633f75 100644 --- a/translations/messages.json +++ b/translations/messages.json @@ -4467,7 +4467,7 @@ "id": "voting.registerToVote.step1CheckBoxLabel" }, { - "defaultMessage": "!!!Ensure that you register and hold the necessary 500 ADA at the time of the snapshot.", + "defaultMessage": "!!!Ensure that you register and hold the necessary {minVotingFunds} ADA at the time of the snapshot.", "description": "Second step to follow in order to vote", "id": "voting.registerToVote.step2CheckBoxLabel" },