Skip to content

Commit 44942bd

Browse files
author
Marcin Mazurek
committed
Merge remote-tracking branch 'origin/develop' into release/5.3.0
2 parents 85c5df5 + 2772978 commit 44942bd

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- Apply Catalyst API improvements ([PR 3136](https://github.com/input-output-hk/daedalus/pull/3136))
88
- Switched to the new Catalyst API ([PR 3129](https://github.com/input-output-hk/daedalus/pull/3129))
9+
- Updated Catalyst links ([PR 3137](https://github.com/input-output-hk/daedalus/pull/3137))
910

1011
### Fixes
1112

source/renderer/app/components/voting/VotingFooterLinks.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const VotingFooterLinks = injectIntl(
3838
observer(({ onClickExternalLink, intl }: Props) => {
3939
const links: FooterLink[] = [
4040
{
41-
url: 'https://bit.ly/3dSZJvx',
41+
url: 'https://bit.ly/ProjCatNews',
4242
label: intl.formatMessage(messages.newsletter),
4343
},
4444
{

source/renderer/app/i18n/locales/en-US.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@
721721
"voting.info.androidAppButtonUrl": "https://play.google.com/store/apps/details?id=io.iohk.vitvoting",
722722
"voting.info.appleAppButtonUrl": "https://apps.apple.com/in/app/catalyst-voting/id1517473397",
723723
"voting.info.learnMoreLinkLabel": "Learn more",
724-
"voting.info.learnMoreLinkUrl": "https://cardano.ideascale.com/a/index",
724+
"voting.info.learnMoreLinkUrl": "https://projectcatalyst.io/",
725725
"voting.info.noWallets.createWalletButtonLabel": "Create wallet",
726726
"voting.info.noWallets.headLine": "Voting registration is not available as you currently do not have any Shelley-compatible wallets.",
727727
"voting.info.noWallets.instructions": "Create a new wallet and transfer a minimum of {minVotingFunds} ADA (or restore an existing wallet with funds), then return here to register for voting.",
@@ -733,7 +733,7 @@
733733
"voting.registerToVote.votingInstructions": "If you are not registered yet, make sure to register to vote in the current fund before the snapshot date.",
734734
"voting.resultsPhase.endDateLabel": "End of voting:",
735735
"voting.resultsPhase.viewResultsLinkLabel": "View results",
736-
"voting.resultsPhase.viewResultsLinkURL": "https://cardano.ideascale.com/a/pages/results",
736+
"voting.resultsPhase.viewResultsLinkURL": "https://projectcatalyst.io/funds",
737737
"voting.snapshotPhase.snapshotDateLabel": "Snapshot date:",
738738
"voting.snapshotPhase.votingDateLabel": "Next voting period:",
739739
"voting.tallyingPhase.endDateLabel": "Voting ended:",

source/renderer/app/i18n/locales/ja-JP.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@
721721
"voting.info.androidAppButtonUrl": "https://play.google.com/store/apps/details?id=io.iohk.vitvoting",
722722
"voting.info.appleAppButtonUrl": "https://apps.apple.com/in/app/catalyst-voting/id1517473397",
723723
"voting.info.learnMoreLinkLabel": "もっと知る",
724-
"voting.info.learnMoreLinkUrl": "https://cardano.ideascale.com/a/index",
724+
"voting.info.learnMoreLinkUrl": "https://projectcatalyst.io/",
725725
"voting.info.noWallets.createWalletButtonLabel": "ウォレットを作成する",
726726
"voting.info.noWallets.headLine": "現在Shelley対応のウォレットがないため、有権者登録はできません。",
727727
"voting.info.noWallets.instructions": "ウォレットを作成し、そこに{minVotingFunds} ADA以上を移してから(または既存の資金入りウォレットを復元してから)、改めてここで有権者登録を行ってください。",
@@ -733,7 +733,7 @@
733733
"voting.registerToVote.votingInstructions": "登録を済ませていない場合は、スナップショットの実施日前に現行のファンドの有権者登録を行ってください。",
734734
"voting.resultsPhase.endDateLabel": "投票締め切り:",
735735
"voting.resultsPhase.viewResultsLinkLabel": "結果を見る",
736-
"voting.resultsPhase.viewResultsLinkURL": "https://cardano.ideascale.com/a/pages/results",
736+
"voting.resultsPhase.viewResultsLinkURL": "https://projectcatalyst.io/funds",
737737
"voting.snapshotPhase.snapshotDateLabel": "スナップショット日:",
738738
"voting.snapshotPhase.votingDateLabel": "次回投票期間:",
739739
"voting.tallyingPhase.endDateLabel": "投票締め切り:",

0 commit comments

Comments
 (0)