Reverts Fund4 text copy change, Updates CHANGELOG

input-output-hk · Mar 31, 2021 · bad666e · bad666e
1 parent 518cd25
commit bad666e
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,12 @@ Changelog
 
 ### Features
 
+- Added wallet rewards address display on the "Rewards" screen ([PR 2475](https://github.com/input-output-hk/daedalus/pull/2475))
+
 ## 4.0.3
 
 ### Features
 
-- Added rewards address in Rewards Delegation Screen ([PR 2475](https://github.com/input-output-hk/daedalus/pull/2475))
 - Added absolute slot number to Catalyst voting registration transaction metadata ([PR 2476](https://github.com/input-output-hk/daedalus/pull/2476))
 - Improved the transactions and rewards CSV export contents ([PR 2451](https://github.com/input-output-hk/daedalus/pull/2451))
 - Implement Trezor passphrase handling ([PR 2284](https://github.com/input-output-hk/daedalus/pull/2284))

diff --git a/source/renderer/app/components/voting/VotingInfo.js b/source/renderer/app/components/voting/VotingInfo.js
@@ -23,18 +23,18 @@ import downloadPlayStoreIcon from '../../assets/images/voting/download-play-stor
 const messages = defineMessages({
   heading: {
     id: 'voting.info.heading',
-    defaultMessage: '!!!Register to vote on Fund4',
+    defaultMessage: '!!!Register to vote on Fund3',
     description: 'Headline for voting registration steps',
   },
   headingForEndedRegistration: {
     id: 'voting.info.headingForEndedRegistration',
-    defaultMessage: '!!!Fund4 Voting Registration Ended',
+    defaultMessage: '!!!Fund3 Voting Registration Ended',
     description: 'Headline for ended voting registration',
   },
   descriptionForEndedRegistration: {
     id: 'voting.info.descriptionForEndedRegistration',
     defaultMessage:
-      '!!!<p>Voting registration for Project Catalyst Fund4 has been completed. The voting snapshot took place on <b>{snapshotDate}</b>.</p><p>If you have registered to vote on Fund4, you can cast your vote using the Catalyst Voting mobile app between <b>{castStartDate}</b> and <b>{castEndDate}</b>.</p><p>Fund4 registration will start on <b>{newRegistrationStartDate}</b>.</p>',
+      '!!!<p>Voting registration for Project Catalyst Fund3 has been completed. The voting snapshot took place on <b>{snapshotDate}</b>.</p><p>If you have registered to vote on Fund3, you can cast your vote using the Catalyst Voting mobile app between <b>{castStartDate}</b> and <b>{castEndDate}</b>.</p><p>Fund3 registration will start on <b>{newRegistrationStartDate}</b>.</p>',
     description: 'Description for ended voting registration',
   },
   stepTitle1: {
@@ -66,7 +66,7 @@ const messages = defineMessages({
   },
   learnMoreLinkLabelForEndedRegistration: {
     id: 'voting.info.learnMoreLinkLabelForEndedRegistration',
-    defaultMessage: '!!!Fund4 FAQs',
+    defaultMessage: '!!!Fund3 FAQs',
     description: 'Learn more link label for ended registration',
   },
   learnMoreLinkUrl: {
@@ -88,13 +88,13 @@ const messages = defineMessages({
   bottomContentDescription: {
     id: 'voting.info.bottomContentDescription',
     defaultMessage:
-      '!!!To register to vote for Catalyst Fund4 you first need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
+      '!!!To register to vote for Catalyst Fund3 you first need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
     description: 'bottomContentDescription for voting registration steps',
   },
   bottomContentDescriptionForEndedRegistration: {
     id: 'voting.info.bottomContentDescriptionForEndedRegistration',
     defaultMessage:
-      '!!!To cast your vote on Project Catalyst Fund4 proposals, you need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
+      '!!!To cast your vote on Project Catalyst Fund3 proposals, you need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
     description: 'bottomContentDescription for ended registration',
   },
   checkboxLabel: {

diff --git a/source/renderer/app/components/voting/VotingNoWallets.js b/source/renderer/app/components/voting/VotingNoWallets.js
@@ -12,7 +12,7 @@ const messages = defineMessages({
   headLine: {
     id: 'voting.info.noWallets.headLine',
     defaultMessage:
-      '!!!Voting registration for Fund4 is not available as you currently do not have any Shelley-compatible wallets.',
+      '!!!Voting registration for Fund3 is not available as you currently do not have any Shelley-compatible wallets.',
     description: '"No wallets" headLine on the voting info page.',
   },
   instructions: {

diff --git a/...components/voting/voting-registration-wizard-steps/VotingRegistrationStepsEnterPinCode.js b/...components/voting/voting-registration-wizard-steps/VotingRegistrationStepsEnterPinCode.js
@@ -18,7 +18,7 @@ const messages = defineMessages({
   description: {
     id: 'voting.votingRegistration.enterPinCode.step.description',
     defaultMessage:
-      '!!!Please enter a PIN for your Fund4 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.',
+      '!!!Please enter a PIN for your Fund3 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.',
     description:
       'Description on the voting registration "enter pin code" step.',
   },

diff --git a/...r/app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsQrCode.js b/...r/app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsQrCode.js
@@ -37,7 +37,7 @@ const messages = defineMessages({
   checkbox2Label: {
     id: 'voting.votingRegistration.qrCode.step.checkbox2Label',
     defaultMessage:
-      '!!!I acknowledge that I must have the downloaded PDF with the QR code, to vote with Fund4.',
+      '!!!I acknowledge that I must have the downloaded PDF with the QR code, to vote with Fund3.',
     description:
       'Second checkbox label on the voting registration "qr code" step.',
   },

diff --git a/...app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsRegister.js b/...app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsRegister.js
@@ -22,7 +22,7 @@ const messages = defineMessages({
   description: {
     id: 'voting.votingRegistration.register.step.description',
     defaultMessage:
-      '!!!Please sign the voting registration transaction. This transaction links your wallet balance with your Fund4 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.',
+      '!!!Please sign the voting registration transaction. This transaction links your wallet balance with your Fund3 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.',
     description: 'Description on the voting registration "sign" step.',
   },
   continueButtonLabel: {

diff --git a/...erer/app/components/voting/voting-registration-wizard-steps/widgets/ConfirmationDialog.js b/...erer/app/components/voting/voting-registration-wizard-steps/widgets/ConfirmationDialog.js
@@ -9,14 +9,14 @@ import styles from './ConfirmationDialog.scss';
 const messages = defineMessages({
   headline: {
     id: 'voting.votingRegistration.dialog.confirmation.headline',
-    defaultMessage: '!!!Cancel Fund4 voting registration?',
+    defaultMessage: '!!!Cancel Fund3 voting registration?',
     description:
       'Headline for the voting registration cancellation confirmation dialog.',
   },
   content: {
     id: 'voting.votingRegistration.dialog.confirmation.content',
     defaultMessage:
-      '!!!Are you sure that you want to cancel Fund4 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.',
+      '!!!Are you sure that you want to cancel Fund3 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.',
     description:
       'Content for the voting registration cancellation confirmation dialog.',
   },

diff --git a/...pp/components/voting/voting-registration-wizard-steps/widgets/VotingRegistrationDialog.js b/...pp/components/voting/voting-registration-wizard-steps/widgets/VotingRegistrationDialog.js
@@ -15,7 +15,7 @@ import type { DialogActions } from '../../../widgets/Dialog';
 const messages = defineMessages({
   dialogTitle: {
     id: 'voting.votingRegistration.dialog.dialogTitle',
-    defaultMessage: '!!!Register for Fund4 voting',
+    defaultMessage: '!!!Register for Fund3 voting',
     description: 'Tile "Register to vote" for voting registration',
   },
   subtitle: {

diff --git a/source/renderer/app/config/votingConfig.js b/source/renderer/app/config/votingConfig.js
@@ -1,20 +1,20 @@
 // @flow
 const { isDev } = global.environment;
 
-export const VOTING_FUND_NUMBER = 4;
-export const VOTING_REGISTRATION_MIN_WALLET_FUNDS = 500; // 500 ADA | unit: ADA
+export const VOTING_FUND_NUMBER = 3;
+export const VOTING_REGISTRATION_MIN_WALLET_FUNDS = 2950; // 2950 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;
-export const VOTING_REGISTRATION_TRANSACTION_POLLING_INTERVAL = 1000; // 1 second | unit: milliseconds
-export const VOTING_REGISTRATION_END_DATE = new Date('Apr 13, 2021, 19:00 UTC');
+export const VOTING_REGISTRATION_TRANSACTION_POLLING_INTERVAL = 5000; // 5 seconds | unit: milliseconds
+export const VOTING_REGISTRATION_END_DATE = new Date('Mar 3, 2021, 19:00 UTC');
 export const VOTING_REGISTRATION_END_CHECK_INTERVAL = 3000; // 3 seconds | unit: milliseconds
 export const VOTING_REGISTRATION_CAST_START_DATE = new Date(
-  'Apr 15, 2021, 19:00 UTC'
+  'Mar 5, 2021, 19:00 UTC'
 );
 export const VOTING_REGISTRATION_CAST_END_DATE = new Date(
-  'May 5, 2021, 19:00 UTC'
+  'Mar 24, 2021, 19:00 UTC'
 );
 export const VOTING_REGISTRATION_NEW_START_DATE = new Date(
-  'May 18, 2021, 19:00 UTC'
+  'Apr 7, 2021, 19:00 UTC'
 );
diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json
@@ -7970,7 +7970,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Please enter a PIN for your Fund4 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.",
+        "defaultMessage": "!!!Please enter a PIN for your Fund3 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.",
         "description": "Description on the voting registration \"enter pin code\" step.",
         "end": {
           "column": 3,
@@ -8129,7 +8129,7 @@
         }
       },
       {
-        "defaultMessage": "!!!I acknowledge that I must have the downloaded PDF with the QR code, to vote with Fund4.",
+        "defaultMessage": "!!!I acknowledge that I must have the downloaded PDF with the QR code, to vote with Fund3.",
         "description": "Second checkbox label on the voting registration \"qr code\" step.",
         "end": {
           "column": 3,
@@ -8176,7 +8176,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Please sign the voting registration transaction. This transaction links your wallet balance with your Fund4 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.",
+        "defaultMessage": "!!!Please sign the voting registration transaction. This transaction links your wallet balance with your Fund3 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.",
         "description": "Description on the voting registration \"sign\" step.",
         "end": {
           "column": 3,
@@ -8293,7 +8293,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Cancel Fund4 voting registration?",
+        "defaultMessage": "!!!Cancel Fund3 voting registration?",
         "description": "Headline for the voting registration cancellation confirmation dialog.",
         "end": {
           "column": 3,
@@ -8307,7 +8307,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Are you sure that you want to cancel Fund4 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.",
+        "defaultMessage": "!!!Are you sure that you want to cancel Fund3 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.",
         "description": "Content for the voting registration cancellation confirmation dialog.",
         "end": {
           "column": 3,
@@ -8354,7 +8354,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Register for Fund4 voting",
+        "defaultMessage": "!!!Register for Fund3 voting",
         "description": "Tile \"Register to vote\" for voting registration",
         "end": {
           "column": 3,
@@ -8387,7 +8387,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Register to vote on Fund4",
+        "defaultMessage": "!!!Register to vote on Fund3",
         "description": "Headline for voting registration steps",
         "end": {
           "column": 3,
@@ -8401,7 +8401,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Fund4 Voting Registration Ended",
+        "defaultMessage": "!!!Fund3 Voting Registration Ended",
         "description": "Headline for ended voting registration",
         "end": {
           "column": 3,
@@ -8415,7 +8415,7 @@
         }
       },
       {
-        "defaultMessage": "!!!<p>Voting registration for Project Catalyst Fund4 has been completed. The voting snapshot took place on <b>{snapshotDate}</b>.</p><p>If you have registered to vote on Fund4, you can cast your vote using the Catalyst Voting mobile app between <b>{castStartDate}</b> and <b>{castEndDate}</b>.</p><p>Fund4 registration will start on <b>{newRegistrationStartDate}</b>.</p>",
+        "defaultMessage": "!!!<p>Voting registration for Project Catalyst Fund3 has been completed. The voting snapshot took place on <b>{snapshotDate}</b>.</p><p>If you have registered to vote on Fund3, you can cast your vote using the Catalyst Voting mobile app between <b>{castStartDate}</b> and <b>{castEndDate}</b>.</p><p>Fund3 registration will start on <b>{newRegistrationStartDate}</b>.</p>",
         "description": "Description for ended voting registration",
         "end": {
           "column": 3,
@@ -8499,7 +8499,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Fund4 FAQs",
+        "defaultMessage": "!!!Fund3 FAQs",
         "description": "Learn more link label for ended registration",
         "end": {
           "column": 3,
@@ -8555,7 +8555,7 @@
         }
       },
       {
-        "defaultMessage": "!!!To register to vote for Catalyst Fund4 you first need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.",
+        "defaultMessage": "!!!To register to vote for Catalyst Fund3 you first need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.",
         "description": "bottomContentDescription for voting registration steps",
         "end": {
           "column": 3,
@@ -8569,7 +8569,7 @@
         }
       },
       {
-        "defaultMessage": "!!!To cast your vote on Project Catalyst Fund4 proposals, you need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.",
+        "defaultMessage": "!!!To cast your vote on Project Catalyst Fund3 proposals, you need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.",
         "description": "bottomContentDescription for ended registration",
         "end": {
           "column": 3,
@@ -8644,7 +8644,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Voting registration for Fund4 is not available as you currently do not have any Shelley-compatible wallets.",
+        "defaultMessage": "!!!Voting registration for Fund3 is not available as you currently do not have any Shelley-compatible wallets.",
         "description": "\"No wallets\" headLine on the voting info page.",
         "end": {
           "column": 3,