From 3be31da35fc1423f0c3902e2a64b71a8b900464e Mon Sep 17 00:00:00 2001
From: Dan <dan@ddev.ch>
Date: Thu, 9 May 2024 11:52:05 +0200
Subject: [PATCH] Fix Calculation

---
 .../src/app/portfolio/calculator/twr/portfolio-calculator.ts  | 4 ++--
 apps/api/src/app/portfolio/portfolio.service.ts               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
index 3406d1b8a..c5ed98543 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
@@ -339,7 +339,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
       const datesWithOrders = {};
 
       for (const { date, type } of orders) {
-        if (['BUY', 'SELL'].includes(type)) {
+        if (['BUY', 'SELL', 'STAKE'].includes(type)) {
           datesWithOrders[date] = true;
         }
       }
@@ -459,7 +459,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
       }
 
       if (order.type === 'STAKE') {
-        order.unitPrice = marketSymbolMap[order.date]?.[symbol];
+        order.unitPrice = marketSymbolMap[order.date]?.[symbol] ?? new Big(0);
       }
 
       if (order.unitPrice) {
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 82b775c40..feea4c67e 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1817,7 +1817,7 @@ export class PortfolioService {
       cashDetailsWithExcludedAccounts.balanceInBaseCurrency
     ).minus(balanceInBaseCurrency);
 
-    excludedAccountsAndActivities = excludedBalanceInBaseCurrency
+    let excludedAccountsAndActivities = excludedBalanceInBaseCurrency
       .plus(totalOfExcludedActivities)
       .toNumber();