From 3bc8584ee79012d835f2d4f0f99dd74326e0d72e Mon Sep 17 00:00:00 2001 From: Lucas Araujo Date: Mon, 4 Apr 2022 10:08:57 -0300 Subject: [PATCH 1/2] [DDW-1068] Get fund number from fund name --- source/renderer/app/api/api.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/renderer/app/api/api.ts b/source/renderer/app/api/api.ts index b2ea3d97b3..f1c7dbd24a 100644 --- a/source/renderer/app/api/api.ts +++ b/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 From 51900f4c2f95c8f34f9bbe7eaaadf975cc04943c Mon Sep 17 00:00:00 2001 From: Lucas Araujo Date: Mon, 4 Apr 2022 10:21:54 -0300 Subject: [PATCH 2/2] [DDW-1068] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0506bc7b8..4c4c705c9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ### Fixes +- 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))