Merge pull request #2643 from input-output-hk/release-with-master

nikolaglumac · web-flow · commit f02b4d994156 · 2021-08-12T14:37:14.000+02:00
Merge release/4.2.0 into master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+## 4.2.1
+
+### Chores
+
+- Updated Catalyst Fund6 and Fund7 voting registration dates ([PR 2640](https://github.com/input-output-hk/daedalus/pull/2640))
+
 ## 4.2.0
 
 ### Features
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
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 Fund5',
+    defaultMessage: '!!!Register to vote on Fund6',
     description: 'Headline for voting registration steps',
   },
   headingForEndedRegistration: {
     id: 'voting.info.headingForEndedRegistration',
-    defaultMessage: '!!!Fund5 Voting Registration Ended',
+    defaultMessage: '!!!Fund6 Voting Registration Ended',
     description: 'Headline for ended voting registration',
   },
   descriptionForEndedRegistration: {
     id: 'voting.info.descriptionForEndedRegistration',
     defaultMessage:
-      '!!!<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>',
+      '!!!<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>',
     description: 'Description for ended voting registration',
   },
   stepTitle1: {
@@ -46,7 +46,7 @@ const messages = defineMessages({
   stepTitle2: {
     id: 'voting.info.stepTitle2',
     defaultMessage:
-      '!!!$425.000 worth of ada rewards will be distributed between ada holders who register their vote.',
+      '!!!$520.000 worth of ada rewards will be distributed between ada holders who register their vote.',
     description: 'Info step title 2 for voting registration steps',
   },
   learnMorePreviousLabel: {
@@ -66,7 +66,7 @@ const messages = defineMessages({
   },
   learnMoreLinkLabelForEndedRegistration: {
     id: 'voting.info.learnMoreLinkLabelForEndedRegistration',
-    defaultMessage: '!!!Fund5 FAQs',
+    defaultMessage: '!!!Fund6 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 Fund5 you first need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
+      '!!!To register to vote for Catalyst Fund6 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 Fund5 proposals, you need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.',
+      '!!!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.',
     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 Fund5 is not available as you currently do not have any Shelley-compatible wallets.',
+      '!!!Voting registration for Fund6 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/source/renderer/app/components/voting/VotingUnavailable.js b/source/renderer/app/components/voting/VotingUnavailable.js
@@ -22,7 +22,7 @@ const messages = defineMessages({
   paragraph1: {
     id: 'voting.unavailable.paragraph1',
     defaultMessage:
-      '!!!Project Catalyst Fund4 has now ended. Fund5 is currently in preparation, voting registration is not available yet.',
+      '!!!Project Catalyst Fund5 has now ended. Fund6 is currently in preparation, voting registration is not available yet.',
     description: 'First paragraph on the "Voting unavailable" screen',
   },
   paragraph2: {
diff --git a/source/renderer/app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsEnterPinCode.js b/source/renderer/app/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 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.',
+      '!!!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.',
     description:
       'Description on the voting registration "enter pin code" step.',
   },
diff --git a/source/renderer/app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsQrCode.js b/source/renderer/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 Fund5.',
+      '!!!I acknowledge that I must have the downloaded PDF with the QR code, to vote with Fund6.',
     description:
       'Second checkbox label on the voting registration "qr code" step.',
   },
diff --git a/source/renderer/app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsRegister.js b/source/renderer/app/components/voting/voting-registration-wizard-steps/VotingRegistrationStepsRegister.js
@@ -27,7 +27,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 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.',
+      '!!!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.',
     description: 'Description on the voting registration "sign" step.',
   },
   continueButtonLabel: {
diff --git a/source/renderer/app/components/voting/voting-registration-wizard-steps/widgets/ConfirmationDialog.js b/source/renderer/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 Fund5 voting registration?',
+    defaultMessage: '!!!Cancel Fund6 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 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.',
+      '!!!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.',
     description:
       'Content for the voting registration cancellation confirmation dialog.',
   },
diff --git a/source/renderer/app/components/voting/voting-registration-wizard-steps/widgets/VotingRegistrationDialog.js b/source/renderer/app/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 Fund5 voting',
+    defaultMessage: '!!!Register for Fund6 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
@@ -2,20 +2,20 @@
 const { isDev } = global.environment;
 
 export const IS_VOTING_REGISTRATION_AVAILABLE = true;
-export const VOTING_FUND_NUMBER = 5;
+export const VOTING_FUND_NUMBER = 6;
 export const VOTING_REGISTRATION_MIN_WALLET_FUNDS = 500; // 500 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('Jul 19, 2021, 11:00 UTC');
+export const VOTING_REGISTRATION_END_DATE = new Date('Sep 30, 2021, 11:00 UTC');
 export const VOTING_REGISTRATION_END_CHECK_INTERVAL = 3000; // 3 seconds | unit: milliseconds
 export const VOTING_REGISTRATION_CAST_START_DATE = new Date(
-  'Jul 22, 2021, 11:00 UTC'
+  'Oct 7, 2021, 11:00 UTC'
 );
 export const VOTING_REGISTRATION_CAST_END_DATE = new Date(
-  'Aug 2, 2021, 11:00 UTC'
+  'Oct 21, 2021, 11:00 UTC'
 );
 export const VOTING_REGISTRATION_NEW_START_DATE = new Date(
-  'Aug 12, 2021, 11:00 UTC'
+  'Nov 11, 2021, 11:00 UTC'
 );
diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json
@@ -7923,7 +7923,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!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.",
+        "defaultMessage": "!!!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.",
         "description": "Description on the voting registration \"enter pin code\" step.",
         "end": {
           "column": 3,
@@ -8082,7 +8082,7 @@
         }
       },
       {
-        "defaultMessage": "!!!I acknowledge that I must have the downloaded PDF with the QR code, to vote with Fund5.",
+        "defaultMessage": "!!!I acknowledge that I must have the downloaded PDF with the QR code, to vote with Fund6.",
         "description": "Second checkbox label on the voting registration \"qr code\" step.",
         "end": {
           "column": 3,
@@ -8129,7 +8129,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!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.",
+        "defaultMessage": "!!!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.",
         "description": "Description on the voting registration \"sign\" step.",
         "end": {
           "column": 3,
@@ -8246,7 +8246,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Cancel Fund5 voting registration?",
+        "defaultMessage": "!!!Cancel Fund6 voting registration?",
         "description": "Headline for the voting registration cancellation confirmation dialog.",
         "end": {
           "column": 3,
@@ -8260,7 +8260,7 @@
         }
       },
       {
-        "defaultMessage": "!!!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.",
+        "defaultMessage": "!!!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.",
         "description": "Content for the voting registration cancellation confirmation dialog.",
         "end": {
           "column": 3,
@@ -8307,7 +8307,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Register for Fund5 voting",
+        "defaultMessage": "!!!Register for Fund6 voting",
         "description": "Tile \"Register to vote\" for voting registration",
         "end": {
           "column": 3,
@@ -8340,7 +8340,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Register to vote on Fund5",
+        "defaultMessage": "!!!Register to vote on Fund6",
         "description": "Headline for voting registration steps",
         "end": {
           "column": 3,
@@ -8354,7 +8354,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Fund5 Voting Registration Ended",
+        "defaultMessage": "!!!Fund6 Voting Registration Ended",
         "description": "Headline for ended voting registration",
         "end": {
           "column": 3,
@@ -8368,7 +8368,7 @@
         }
       },
       {
-        "defaultMessage": "!!!<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>",
+        "defaultMessage": "!!!<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>",
         "description": "Description for ended voting registration",
         "end": {
           "column": 3,
@@ -8396,7 +8396,7 @@
         }
       },
       {
-        "defaultMessage": "!!!$425.000 worth of ada rewards will be distributed between ada holders who register their vote.",
+        "defaultMessage": "!!!$520.000 worth of ada rewards will be distributed between ada holders who register their vote.",
         "description": "Info step title 2 for voting registration steps",
         "end": {
           "column": 3,
@@ -8452,7 +8452,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Fund5 FAQs",
+        "defaultMessage": "!!!Fund6 FAQs",
         "description": "Learn more link label for ended registration",
         "end": {
           "column": 3,
@@ -8508,7 +8508,7 @@
         }
       },
       {
-        "defaultMessage": "!!!To register to vote for Catalyst Fund5 you first need to download the <b>Catalyst Voting</b> app on your Android or iOS smartphone.",
+        "defaultMessage": "!!!To register to vote for Catalyst Fund6 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,
@@ -8522,7 +8522,7 @@
         }
       },
       {
-        "defaultMessage": "!!!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.",
+        "defaultMessage": "!!!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.",
         "description": "bottomContentDescription for ended registration",
         "end": {
           "column": 3,
@@ -8597,7 +8597,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Voting registration for Fund5 is not available as you currently do not have any Shelley-compatible wallets.",
+        "defaultMessage": "!!!Voting registration for Fund6 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,
@@ -8658,7 +8658,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Project Catalyst Fund4 has now ended. Fund5 is currently in preparation, voting registration is not available yet.",
+        "defaultMessage": "!!!Project Catalyst Fund5 has now ended. Fund6 is currently in preparation, voting registration is not available yet.",
         "description": "First paragraph on the \"Voting unavailable\" screen",
         "end": {
           "column": 3,
diff --git a/source/renderer/app/i18n/locales/en-US.json b/source/renderer/app/i18n/locales/en-US.json
diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "daedalus",`
`3`	`3`	`"productName": "Daedalus",`
`4`		`- "version": "4.2.0",`
	`4`	`+ "version": "4.2.1",`
`5`	`5`	`"description": "Cryptocurrency Wallet",`
`6`	`6`	`"main": "./dist/main/index.js",`
`7`	`7`	`"scripts": {`