Merge branch 'develop' into chore-upgrade-cardano-wallet-and-cardano-node

Author: michalrus

CHANGELOG.md

@@ -1,22 +1,12 @@
 # Changelog
 
-## 7.1.2
+## vNext
 
 ### Chores
 
 - Update `cardano-node` to 10.2.1 and `cardano-wallet` to v2025-03-31 ([PR 3288](https://github.com/input-output-hk/daedalus/pull/3288))
 
-## 7.1.0
-
-### Chores
-
-- Introduced a potential fix for dynamic libraries on earlier macOS versions ([PR 3268](https://github.com/input-output-hk/daedalus/pull/3268))
-
-- Added support of CIP-129 for DRep IDs ([PR 3271](https://github.com/input-output-hk/daedalus/pull/3271))
-
-- Update `cardano-node` to 10.1.4, and `cardano-wallet` to v2025-01-09 ([PR 3270](https://github.com/input-output-hk/daedalus/pull/3270))
-
-
+- Added the links to app.projectcatalyst.io ([PR 3286](https://github.com/input-output-hk/daedalus/pull/3286))
 
 ## 7.1.0
 

netlify.toml

@@ -4,5 +4,7 @@ command = "yarn && yarn storybook:build"
 [build.environment]
 YARN_VERSION = "1.22.19"
 NODE_VERSION = "18.12.1"
-CXXFLAGS = "-I/home/linuxbrew/.linuxbrew/include"
-LDFLAGS = "-L/home/linuxbrew/.linuxbrew/lib"
+CPPFLAGS = "-I/home/linuxbrew/.linuxbrew/opt/systemd/include -I/home/linuxbrew/.linuxbrew/include"
+CXXFLAGS = "-I/home/linuxbrew/.linuxbrew/opt/systemd/include -I/home/linuxbrew/.linuxbrew/include"
+LDFLAGS  = "-L/home/linuxbrew/.linuxbrew/opt/systemd/lib -L/home/linuxbrew/.linuxbrew/lib"
+PKG_CONFIG_PATH = "/home/linuxbrew/.linuxbrew/opt/systemd/lib/pkgconfig:/home/linuxbrew/.linuxbrew/lib/pkgconfig"

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

@@ -50,7 +50,7 @@ export const VotingFooterLinks = injectIntl(
         label: intl.formatMessage(messages.community),
       },
       {
-        url: 'https://cardano.ideascale.com/',
+        url: 'https://app.projectcatalyst.io/',
         label: intl.formatMessage(messages.projects),
       },
     ];

source/renderer/app/components/voting/voting-info/Headline.messages.ts

@@ -25,7 +25,7 @@ export const messages = defineMessages({
   },
   learnMoreLinkUrl: {
     id: 'voting.info.learnMoreLinkUrl',
-    defaultMessage: '!!!https://cardano.ideascale.com/a/index',
+    defaultMessage: '!!!https://app.projectcatalyst.io',
     description: 'Learn more link url for registration steps',
   },
 });

source/renderer/app/components/voting/voting-info/ResultsPhase.messages.ts

@@ -13,7 +13,7 @@ export const messages = defineMessages({
   },
   viewResultsLinkURL: {
     id: 'voting.resultsPhase.viewResultsLinkURL',
-    defaultMessage: 'https://cardano.ideascale.com/a/pages/results',
+    defaultMessage: 'https://projectcatalyst.io/funds',
     description: 'View results link',
   },
 });

source/renderer/app/i18n/locales/defaultMessages.json

@@ -4617,7 +4617,7 @@
         "id": "voting.info.learnMoreLinkLabel"
       },
       {
-        "defaultMessage": "!!!https://cardano.ideascale.com/a/index",
+        "defaultMessage": "!!!https://app.projectcatalyst.io",
         "description": "Learn more link url for registration steps",
         "id": "voting.info.learnMoreLinkUrl"
       }
@@ -4667,7 +4667,7 @@
         "id": "voting.resultsPhase.viewResultsLinkLabel"
       },
       {
-        "defaultMessage": "https://cardano.ideascale.com/a/pages/results",
+        "defaultMessage": "https://projectcatalyst.io/funds",
         "description": "View results link",
         "id": "voting.resultsPhase.viewResultsLinkURL"
       }

translations/messages.json

@@ -4617,7 +4617,7 @@
         "id": "voting.info.learnMoreLinkLabel"
       },
       {
-        "defaultMessage": "!!!https://cardano.ideascale.com/a/index",
+        "defaultMessage": "!!!https://app.projectcatalyst.io",
         "description": "Learn more link url for registration steps",
         "id": "voting.info.learnMoreLinkUrl"
       }
@@ -4667,7 +4667,7 @@
         "id": "voting.resultsPhase.viewResultsLinkLabel"
       },
       {
-        "defaultMessage": "https://cardano.ideascale.com/a/pages/results",
+        "defaultMessage": "https://projectcatalyst.io/funds",
         "description": "View results link",
         "id": "voting.resultsPhase.viewResultsLinkURL"
       }