Merge branch 'develop' into fix/ddw-1040-bug-tooltips-on-dialogs-hidden-on-hover

Author: shawnbusuttil

CHANGELOG.md

@@ -13,6 +13,7 @@
 ### Fixes
 
 - Fixed tooltip being hidden in several places ([PR-2934](https://github.com/input-output-hk/daedalus/pull/2934))
+- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
 - Fixed position of popup on syncing screen ([PR 2921](https://github.com/input-output-hk/daedalus/pull/2921))
 - Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
 - Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))

source/renderer/app/api/api.ts

@@ -2952,9 +2952,13 @@ export default class AdaApi {
         catalystFund,
       });
 
+      const fundNumber =
+        Number(catalystFund.fund_name?.match(/\d+/)?.[0]) ||
+        catalystFund.id + 1;
+
       return {
         current: {
-          number: catalystFund.id + 1,
+          number: fundNumber,
           startTime: new Date(catalystFund.fund_start_time),
           endTime: new Date(catalystFund.fund_end_time),
           resultsTime: new Date(
@@ -2965,7 +2969,7 @@ export default class AdaApi {
           ),
         },
         next: {
-          number: catalystFund.id + 2,
+          number: fundNumber + 1,
           startTime: new Date(catalystFund.next_fund_start_time),
           registrationSnapshotTime: new Date(
             catalystFund.next_registration_snapshot_time