From 7135af64f5b3d37609cbd9accbe8a662378f9a04 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 31 May 2026 08:39:26 +0200
Subject: [PATCH] Fix base currency in impersonation mode

---
 apps/api/src/app/account/account.controller.ts     | 11 ++++++++---
 apps/api/src/app/account/account.module.ts         |  4 +++-
 apps/api/src/app/portfolio/portfolio.controller.ts | 11 ++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/apps/api/src/app/account/account.controller.ts b/apps/api/src/app/account/account.controller.ts
index 052720176..d44b716c0 100644
--- a/apps/api/src/app/account/account.controller.ts
+++ b/apps/api/src/app/account/account.controller.ts
@@ -1,5 +1,6 @@
 import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';
 import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
+import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.interceptor';
@@ -50,7 +51,8 @@ export class AccountController {
     private readonly apiService: ApiService,
     private readonly impersonationService: ImpersonationService,
     private readonly portfolioService: PortfolioService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
+    @Inject(REQUEST) private readonly request: RequestWithUser,
+    private readonly userService: UserService
   ) {}
 
   @Delete(':id')
@@ -137,11 +139,14 @@ export class AccountController {
   ): Promise<AccountBalancesResponse> {
     const impersonationUserId =
       await this.impersonationService.validateImpersonationId(impersonationId);
+    const userId = impersonationUserId || this.request.user.id;
+
+    const { settings } = await this.userService.user({ id: userId });
 
     return this.accountBalanceService.getAccountBalances({
+      userId,
       filters: [{ id, type: 'ACCOUNT' }],
-      userCurrency: this.request.user.settings.settings.baseCurrency,
-      userId: impersonationUserId || this.request.user.id
+      userCurrency: settings.settings.baseCurrency
     });
   }
 
diff --git a/apps/api/src/app/account/account.module.ts b/apps/api/src/app/account/account.module.ts
index fb89bb2b6..253c7fb1d 100644
--- a/apps/api/src/app/account/account.module.ts
+++ b/apps/api/src/app/account/account.module.ts
@@ -1,5 +1,6 @@
 import { AccountBalanceModule } from '@ghostfolio/api/app/account-balance/account-balance.module';
 import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';
+import { UserModule } from '@ghostfolio/api/app/user/user.module';
 import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.module';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
@@ -23,7 +24,8 @@ import { AccountService } from './account.service';
     ImpersonationModule,
     PortfolioModule,
     PrismaModule,
-    RedactValuesInResponseModule
+    RedactValuesInResponseModule,
+    UserModule
   ],
   providers: [AccountService]
 })
diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts
index 9515c7a21..ca94605f9 100644
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@@ -1,4 +1,5 @@
 import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service';
+import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import {
@@ -70,7 +71,8 @@ export class PortfolioController {
     private readonly configurationService: ConfigurationService,
     private readonly impersonationService: ImpersonationService,
     private readonly portfolioService: PortfolioService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
+    @Inject(REQUEST) private readonly request: RequestWithUser,
+    private readonly userService: UserService
   ) {}
 
   @Get('details')
@@ -340,7 +342,10 @@ export class PortfolioController {
 
     const impersonationUserId =
       await this.impersonationService.validateImpersonationId(impersonationId);
-    const userCurrency = this.request.user.settings.settings.baseCurrency;
+    const userId = impersonationUserId || this.request.user.id;
+
+    const { settings } = await this.userService.user({ id: userId });
+    const userCurrency = settings.settings.baseCurrency;
 
     const { endDate, startDate } = getIntervalFromDateRange({ dateRange });
 
@@ -349,7 +354,7 @@ export class PortfolioController {
       filters,
       startDate,
       userCurrency,
-      userId: impersonationUserId || this.request.user.id,
+      userId,
       types: ['DIVIDEND']
     });