From be734817c231c94271229180f92b0e44d4cd274d Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 10 Aug 2024 08:49:12 +0200
Subject: [PATCH] Improve color assignment

---
 apps/api/src/app/portfolio/calculator/portfolio-calculator.ts | 2 +-
 libs/ui/src/lib/treemap-chart/treemap-chart.component.ts      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
index 5bbef1a98..697496a1c 100644
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
@@ -301,7 +301,7 @@ export abstract class PortfolioCalculator {
       const feeInBaseCurrency = item.fee.mul(
         exchangeRatesByCurrency[`${item.currency}${this.currency}`]?.[
           lastTransactionPoint.date
-        ]
+        ] ?? 1
       );
 
       const marketPriceInBaseCurrency = (
diff --git a/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts b/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts
index 0d9084442..8915707fa 100644
--- a/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts
+++ b/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts
@@ -80,7 +80,7 @@ export class GfTreemapChartComponent
   private initialize() {
     this.isLoading = true;
 
-    const { startDate } = getIntervalFromDateRange(this.dateRange);
+    const { endDate, startDate } = getIntervalFromDateRange(this.dateRange);
 
     const data: ChartConfiguration['data'] = <any>{
       datasets: [
@@ -89,7 +89,7 @@ export class GfTreemapChartComponent
             const annualizedNetPerformancePercentWithCurrencyEffect =
               getAnnualizedPerformancePercent({
                 daysInMarket: differenceInDays(
-                  new Date(),
+                  endDate,
                   max([
                     ctx.raw._data.dateOfFirstActivity ?? new Date(0),
                     startDate