From dece5f357b18395cc83575522fc256b7e5ecb9f7 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 15 Oct 2021 12:15:18 +0200 Subject: [PATCH] fix --- .../graphql/resolver/TransactionResolver.ts | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 827b21d2c..7430ee99b 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -73,7 +73,7 @@ async function calculateAndAddDecayTransactions( finalTransaction.totalBalance = roundFloorFrom4(userTransaction.balance) const prev = i > 0 ? userTransactions[i - 1] : null - if (prev && prev.balance > 0) { + if (prev) { const current = userTransaction const decay = await calculateDecayWithInterval( prev.balance, @@ -82,7 +82,7 @@ async function calculateAndAddDecayTransactions( ) const balance = prev.balance - decay.balance - if (balance > 99) { + if (decayStartTransaction.received >= prev.balanceDate) { finalTransaction.decay = decay finalTransaction.decay.balance = roundFloorFrom4(balance) if ( @@ -144,15 +144,14 @@ async function calculateAndAddDecayTransactions( now.getTime(), ) const balance = userTransaction.balance - decay.balance - if (balance > 99) { - const decayTransaction = new Transaction() - decayTransaction.type = 'decay' - decayTransaction.balance = roundFloorFrom4(balance) - decayTransaction.decayDuration = decay.decayDuration - decayTransaction.decayStart = decay.decayStart - decayTransaction.decayEnd = decay.decayEnd - finalTransactions.push(decayTransaction) - } + + const decayTransaction = new Transaction() + decayTransaction.type = 'decay' + decayTransaction.balance = roundFloorFrom4(balance) + decayTransaction.decayDuration = decay.decayDuration + decayTransaction.decayStart = decay.decayStart + decayTransaction.decayEnd = decay.decayEnd + finalTransactions.push(decayTransaction) } }