Skip to content

Commit 81c92d7

Browse files
authored
[DDW-731] Prepare Catalyst Fund6 voting registration (#2640)
* [DDW-731] Updates Fund6 dates * [DDW-731] Update voting rewards amount * [DDW-731] Enable voting registartion on Testnet * [DDW-731] Removes voting registration from Testnet builds
1 parent ba70e94 commit 81c92d7

File tree

13 files changed

+69
-65
lines changed

13 files changed

+69
-65
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ Changelog
33

44
## 4.2.1
55

6+
### Chores
7+
8+
- Updated Catalyst Fund6 and Fund7 voting registration dates ([PR 2640](https://github.com/input-output-hk/daedalus/pull/2640))
9+
610
## 4.2.0
711

812
### Features

source/renderer/app/components/voting/VotingInfo.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ import downloadPlayStoreIcon from '../../assets/images/voting/download-play-stor
2323
const messages = defineMessages({
2424
heading: {
2525
id: 'voting.info.heading',
26-
defaultMessage: '!!!Register to vote on Fund5',
26+
defaultMessage: '!!!Register to vote on Fund6',
2727
description: 'Headline for voting registration steps',
2828
},
2929
headingForEndedRegistration: {
3030
id: 'voting.info.headingForEndedRegistration',
31-
defaultMessage: '!!!Fund5 Voting Registration Ended',
31+
defaultMessage: '!!!Fund6 Voting Registration Ended',
3232
description: 'Headline for ended voting registration',
3333
},
3434
descriptionForEndedRegistration: {
3535
id: 'voting.info.descriptionForEndedRegistration',
3636
defaultMessage:
37-
'!!!<p>Voting registration for Project Catalyst Fund5 has been completed. The voting snapshot took place on <b>{snapshotDate}</b>.</p><p>If you have registered to vote on Fund5, you can cast your vote using the Catalyst Voting mobile app between <b>{castStartDate}</b> and <b>{castEndDate}</b>.</p><p>Fund5 registration will start on <b>{newRegistrationStartDate}</b>.</p>',
37+
'!!!<p>Voting registration for Project Catalyst Fund6 has been completed. The voting snapshot took place on <b>{snapshotDate}</b>.</p><p>If you have registered to vote on Fund6, you can cast your vote using the Catalyst Voting mobile app between <b>{castStartDate}</b> and <b>{castEndDate}</b>.</p><p>Fund6 registration will start on <b>{newRegistrationStartDate}</b>.</p>',
3838
description: 'Description for ended voting registration',
3939
},
4040
stepTitle1: {
@@ -46,7 +46,7 @@ const messages = defineMessages({
4646
stepTitle2: {
4747
id: 'voting.info.stepTitle2',
4848
defaultMessage:
49-
'!!!$425.000 worth of ada rewards will be distributed between ada holders who register their vote.',
49+
'!!!$560.000 worth of ada rewards will be distributed between ada holders who register their vote.',
5050
description: 'Info step title 2 for voting registration steps',
5151
},
5252
learnMorePreviousLabel: {
@@ -66,7 +66,7 @@ const messages = defineMessages({
6666
},
6767
learnMoreLinkLabelForEndedRegistration: {
6868
id: 'voting.info.learnMoreLinkLabelForEndedRegistration',
69-
defaultMessage: '!!!Fund5 FAQs',
69+
defaultMessage: '!!!Fund6 FAQs',
7070
description: 'Learn more link label for ended registration',
7171
},
7272
learnMoreLinkUrl: {
@@ -88,13 +88,13 @@ const messages = defineMessages({
8888
bottomContentDescription: {
8989
id: 'voting.info.bottomContentDescription',
9090
defaultMessage:
91-
'!!!To register to vote for Catalyst Fund5 you first need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
91+
'!!!To register to vote for Catalyst Fund6 you first need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
9292
description: 'bottomContentDescription for voting registration steps',
9393
},
9494
bottomContentDescriptionForEndedRegistration: {
9595
id: 'voting.info.bottomContentDescriptionForEndedRegistration',
9696
defaultMessage:
97-
'!!!To cast your vote on Project Catalyst Fund5 proposals, you need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
97+
'!!!To cast your vote on Project Catalyst Fund6 proposals, you need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
9898
description: 'bottomContentDescription for ended registration',
9999
},
100100
checkboxLabel: {

source/renderer/app/components/voting/VotingNoWallets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const messages = defineMessages({
1212
headLine: {
1313
id: 'voting.info.noWallets.headLine',
1414
defaultMessage:
15-
'!!!Voting registration for Fund5 is not available as you currently do not have any Shelley-compatible wallets.',
15+
'!!!Voting registration for Fund6 is not available as you currently do not have any Shelley-compatible wallets.',
1616
description: '"No wallets" headLine on the voting info page.',
1717
},
1818
instructions: {

source/renderer/app/components/voting/VotingUnavailable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const messages = defineMessages({
2222
paragraph1: {
2323
id: 'voting.unavailable.paragraph1',
2424
defaultMessage:
25-
'!!!Project Catalyst Fund4 has now ended. Fund5 is currently in preparation, voting registration is not available yet.',
25+
'!!!Project Catalyst Fund5 has now ended. Fund6 is currently in preparation, voting registration is not available yet.',
2626
description: 'First paragraph on the "Voting unavailable" screen',
2727
},
2828
paragraph2: {

source/renderer/app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsEnterPinCode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const messages = defineMessages({
1818
description: {
1919
id: 'voting.votingRegistration.enterPinCode.step.description',
2020
defaultMessage:
21-
'!!!Please enter a PIN for your Fund5 voting registration. The PIN you set here, and the QR code which you will get in the next step, will be required for you to vote using the Catalyst Voting app on your smartphone.',
21+
'!!!Please enter a PIN for your Fund6 voting registration. The PIN you set here, and the QR code which you will get in the next step, will be required for you to vote using the Catalyst Voting app on your smartphone.',
2222
description:
2323
'Description on the voting registration "enter pin code" step.',
2424
},

source/renderer/app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsQrCode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const messages = defineMessages({
3737
checkbox2Label: {
3838
id: 'voting.votingRegistration.qrCode.step.checkbox2Label',
3939
defaultMessage:
40-
'!!!I acknowledge that I must have the downloaded PDF with the QR code, to vote with Fund5.',
40+
'!!!I acknowledge that I must have the downloaded PDF with the QR code, to vote with Fund6.',
4141
description:
4242
'Second checkbox label on the voting registration "qr code" step.',
4343
},

source/renderer/app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsRegister.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const messages = defineMessages({
2727
description: {
2828
id: 'voting.votingRegistration.register.step.description',
2929
defaultMessage:
30-
'!!!Please sign the voting registration transaction. This transaction links your wallet balance with your Fund5 voting registration, as a proof of your voting power. Funds will not leave your wallet, but registration requires paying transaction fees, as displayed on-screen.',
30+
'!!!Please sign the voting registration transaction. This transaction links your wallet balance with your Fund6 voting registration, as a proof of your voting power. Funds will not leave your wallet, but registration requires paying transaction fees, as displayed on-screen.',
3131
description: 'Description on the voting registration "sign" step.',
3232
},
3333
continueButtonLabel: {

source/renderer/app/components/voting/voting-registration-wizard-steps/widgets/ConfirmationDialog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import styles from './ConfirmationDialog.scss';
99
const messages = defineMessages({
1010
headline: {
1111
id: 'voting.votingRegistration.dialog.confirmation.headline',
12-
defaultMessage: '!!!Cancel Fund5 voting registration?',
12+
defaultMessage: '!!!Cancel Fund6 voting registration?',
1313
description:
1414
'Headline for the voting registration cancellation confirmation dialog.',
1515
},
1616
content: {
1717
id: 'voting.votingRegistration.dialog.confirmation.content',
1818
defaultMessage:
19-
'!!!Are you sure that you want to cancel Fund5 voting registration? The transaction fee you paid for the voting registration transaction will be lost and you will need to repeat the registration from the beginning.',
19+
'!!!Are you sure that you want to cancel Fund6 voting registration? The transaction fee you paid for the voting registration transaction will be lost and you will need to repeat the registration from the beginning.',
2020
description:
2121
'Content for the voting registration cancellation confirmation dialog.',
2222
},

source/renderer/app/components/voting/voting-registration-wizard-steps/widgets/VotingRegistrationDialog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import type { DialogActions } from '../../../widgets/Dialog';
1515
const messages = defineMessages({
1616
dialogTitle: {
1717
id: 'voting.votingRegistration.dialog.dialogTitle',
18-
defaultMessage: '!!!Register for Fund5 voting',
18+
defaultMessage: '!!!Register for Fund6 voting',
1919
description: 'Tile "Register to vote" for voting registration',
2020
},
2121
subtitle: {

source/renderer/app/config/votingConfig.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
const { isDev } = global.environment;
33

44
export const IS_VOTING_REGISTRATION_AVAILABLE = true;
5-
export const VOTING_FUND_NUMBER = 5;
5+
export const VOTING_FUND_NUMBER = 6;
66
export const VOTING_REGISTRATION_MIN_WALLET_FUNDS = 500; // 500 ADA | unit: ADA
77
export const VOTING_REGISTRATION_FEE_CALCULATION_AMOUNT = 1; // 1 ADA | unit: ADA
88
export const VOTING_REGISTRATION_PIN_CODE_LENGTH = 4;
99
export const VOTING_REGISTRATION_MIN_TRANSACTION_CONFIRMATIONS = isDev ? 2 : 10;
1010
export const VOTING_REGISTRATION_TRANSACTION_POLLING_INTERVAL = 1000; // 1 second | unit: milliseconds
11-
export const VOTING_REGISTRATION_END_DATE = new Date('Jul 19, 2021, 11:00 UTC');
11+
export const VOTING_REGISTRATION_END_DATE = new Date('Sep 30, 2021, 11:00 UTC');
1212
export const VOTING_REGISTRATION_END_CHECK_INTERVAL = 3000; // 3 seconds | unit: milliseconds
1313
export const VOTING_REGISTRATION_CAST_START_DATE = new Date(
14-
'Jul 22, 2021, 11:00 UTC'
14+
'Oct 7, 2021, 11:00 UTC'
1515
);
1616
export const VOTING_REGISTRATION_CAST_END_DATE = new Date(
17-
'Aug 2, 2021, 11:00 UTC'
17+
'Oct 21, 2021, 11:00 UTC'
1818
);
1919
export const VOTING_REGISTRATION_NEW_START_DATE = new Date(
20-
'Aug 12, 2021, 11:00 UTC'
20+
'Nov 11, 2021, 11:00 UTC'
2121
);

0 commit comments

Comments
 (0)