From ae75e687a1091f0a8e4af6ddacc86c4396f167bf Mon Sep 17 00:00:00 2001 From: Jaco Date: Wed, 23 Jun 2021 13:21:21 +0300 Subject: [PATCH] Don't include isWinner in active cap (#5668) --- packages/page-parachains/src/useFunds.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/page-parachains/src/useFunds.ts b/packages/page-parachains/src/useFunds.ts index ed2356c8fa..3501008ab6 100644 --- a/packages/page-parachains/src/useFunds.ts +++ b/packages/page-parachains/src/useFunds.ts @@ -84,9 +84,9 @@ function sortCampaigns (a: Campaign, b: Campaign): number { // compare the current campaigns against the previous, manually adding ending and calculating the new totals function createResult (bestNumber: BlockNumber, minContribution: BN, funds: Campaign[], leased: ParaId[], prev: Campaigns): Campaigns { - const [activeRaised, activeCap, totalRaised, totalCap] = funds.reduce(([ar, ac, tr, tc], { info: { cap, end, raised } }) => [ - bestNumber.gt(end) ? ar : ar.iadd(raised), - bestNumber.gt(end) ? ac : ac.iadd(cap), + const [activeRaised, activeCap, totalRaised, totalCap] = funds.reduce(([ar, ac, tr, tc], { info: { cap, end, raised }, isWinner }) => [ + (bestNumber.gt(end) || isWinner) ? ar : ar.iadd(raised), + (bestNumber.gt(end) || isWinner) ? ac : ac.iadd(cap), tr.iadd(raised), tc.iadd(cap) ], [new BN(0), new BN(0), new BN(0), new BN(0)]);