Skip to content

Commit

Permalink
Merge pull request #3233 from input-output-hk/chore/LW-11591-catalyst…
Browse files Browse the repository at this point in the history
…-min-funds

[LW-11591] Decrease Catalyst voting power threshold from 500 to 25 ADA
  • Loading branch information
michalrus authored Oct 4, 2024
2 parents 5983643 + ad60dc0 commit 8b0aa38
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
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';
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;
Expand Down Expand Up @@ -38,7 +40,11 @@ function RegisterToVote({ intl, onRegisterToVoteClick }: Props) {
<div className={styles.step}>
<Checkbox
checked={step2}
label={intl.formatMessage(messages.step2CheckBoxLabel)}
label={intl.formatMessage(messages.step2CheckBoxLabel, {
minVotingFunds: new BigNumber(
VOTING_REGISTRATION_MIN_WALLET_FUNDS
).toFormat(0),
})}
onChange={setStep2}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/config/votingConfig.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/i18n/locales/defaultMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/i18n/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:",
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/i18n/locales/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "投票締め切り:",
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit 8b0aa38

Please sign in to comment.