Merge branch 'main' into bugfix/missing-loading-indicator-in-benchmarks-table-on-markets-page

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed the missing currency conversion of the dividends on the analysis page
 - Fixed the missing error state in the watchlist
 - Fixed the missing loading indicator in the benchmarks of the markets overview
 

apps/api/src/app/portfolio/portfolio.controller.ts

@@ -352,8 +352,7 @@ export class PortfolioController {
 
     let dividends = this.portfolioService.getDividends({
       activities,
-      groupBy,
+      groupBy
-      userCurrency
     });
 
     if (

apps/api/src/app/portfolio/portfolio.service.ts

@@ -358,21 +358,15 @@ export class PortfolioService {
 
   public getDividends({
     activities,
-    groupBy,
+    groupBy
-    userCurrency
   }: {
     activities: Activity[];
     groupBy?: GroupBy;
-    userCurrency: string;
   }): InvestmentItem[] {
-    let dividends = activities.map(({ currency, date, value }) => {
+    let dividends = activities.map(({ date, valueInBaseCurrency }) => {
       return {
         date: format(date, DATE_FORMAT),
-        investment: this.exchangeRateDataService.toCurrency(
+        investment: valueInBaseCurrency
-          value,
-          currency,
-          userCurrency
-        )
       };
     });