From 24a0c2d1e48cf64b7238d494c9c338bf54981f44 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 11 Mar 2022 10:46:24 +0100 Subject: [PATCH] no calculation in virtual link transaction --- backend/src/graphql/resolver/TransactionResolver.ts | 4 ++-- backend/src/server/plugins.ts | 3 ++- backend/src/util/virtualLinkTransaction.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 314936ff1..2afabd6a7 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -122,11 +122,11 @@ export class TransactionResolver { transactions.push( virtualDecayTransaction(lastTransaction.balance, lastTransaction.balanceDate, now, self), ) - // virtual transaction for pending transaction-links sum + // virtual transaction for pending transaction-links sum if (sumHoldAvailableAmount.greaterThan(0)) { transactions.push( virtualLinkTransaction( - lastTransaction.balance, + lastTransaction.balance.minus(sumHoldAvailableAmount.toString()), sumAmount, sumHoldAvailableAmount, sumHoldAvailableAmount.minus(sumAmount.toString()), diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts index 5902a415f..a407135ea 100644 --- a/backend/src/server/plugins.ts +++ b/backend/src/server/plugins.ts @@ -39,6 +39,7 @@ const apolloLogPlugin = ApolloLogPlugin({ }, }) -const plugins = process.env.NODE_ENV === 'development' ? [setHeadersPlugin] : [setHeadersPlugin] // , apolloLogPlugin +const plugins = + process.env.NODE_ENV === 'development' ? [setHeadersPlugin] : [setHeadersPlugin, apolloLogPlugin] export default plugins diff --git a/backend/src/util/virtualLinkTransaction.ts b/backend/src/util/virtualLinkTransaction.ts index a41b33bbc..648825261 100644 --- a/backend/src/util/virtualLinkTransaction.ts +++ b/backend/src/util/virtualLinkTransaction.ts @@ -21,7 +21,7 @@ const virtualLinkTransaction = ( previous: -1, typeId: TransactionTypeId.TRANSACTION_LINK, amount: amount, - balance: balance.minus(holdAvailableAmount.toString()), + balance: balance, balanceDate: validUntil, decayStart: createdAt, decay: decay,