diff --git a/CHANGELOG.md b/CHANGELOG.md index 28831ec4f..3bac1d543 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Fixed + +- Fixed an issue with the currency conversion (duplicate) in the account calculations + ## 1.129.0 - 26.03.2022 ### Added diff --git a/apps/api/src/app/portfolio/portfolio.service-new.ts b/apps/api/src/app/portfolio/portfolio.service-new.ts index 63b8544a8..c01f30242 100644 --- a/apps/api/src/app/portfolio/portfolio.service-new.ts +++ b/apps/api/src/app/portfolio/portfolio.service-new.ts @@ -111,21 +111,21 @@ export class PortfolioServiceNew { } } - const value = details.accounts[account.id]?.current ?? 0; + const valueInBaseCurrency = details.accounts[account.id]?.current ?? 0; const result = { ...account, transactionCount, - value, + valueInBaseCurrency, balanceInBaseCurrency: this.exchangeRateDataService.toCurrency( account.balance, account.currency, userCurrency ), - valueInBaseCurrency: this.exchangeRateDataService.toCurrency( - value, - account.currency, - userCurrency + value: this.exchangeRateDataService.toCurrency( + valueInBaseCurrency, + userCurrency, + account.currency ) }; diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index a00b0cabd..f8e617432 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -106,21 +106,21 @@ export class PortfolioService { } } - const value = details.accounts[account.id]?.current ?? 0; + const valueInBaseCurrency = details.accounts[account.id]?.current ?? 0; const result = { ...account, transactionCount, - value, + valueInBaseCurrency, balanceInBaseCurrency: this.exchangeRateDataService.toCurrency( account.balance, account.currency, userCurrency ), - valueInBaseCurrency: this.exchangeRateDataService.toCurrency( - value, - account.currency, - userCurrency + value: this.exchangeRateDataService.toCurrency( + valueInBaseCurrency, + userCurrency, + account.currency ) };