diff --git a/CHANGELOG.md b/CHANGELOG.md index fe1494c19b..54efe28f72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Improved the labels of the client of the last request in the users section of the admin control panel - Upgraded `bootstrap` from version `4.6.2` to `5.3.8` +### Fixed + +- Fixed the missing platform icon in the preview step of the activities import +- Fixed the link of the _Manage Asset Profile_ button in the holding detail dialog before the holding has loaded + ## 3.85.0 - 2026-10-12 ### Added diff --git a/apps/api/src/app/import/import.service.spec.ts b/apps/api/src/app/import/import.service.spec.ts index 992ed353f3..d6d41134a5 100644 --- a/apps/api/src/app/import/import.service.spec.ts +++ b/apps/api/src/app/import/import.service.spec.ts @@ -69,7 +69,7 @@ describe('ImportService', () => { importService = new ImportService( { - getAccounts: jest.fn().mockResolvedValue([]) + accounts: jest.fn().mockResolvedValue([]) } as unknown as AccountService, { createActivity, diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.ts index 7616cd927b..1dbba4e137 100644 --- a/apps/api/src/app/import/import.service.ts +++ b/apps/api/src/app/import/import.service.ts @@ -38,6 +38,7 @@ import { } from '@ghostfolio/common/interfaces'; import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { + AccountWithPlatform, AccountWithValue, OrderWithAccount, UserWithSettings @@ -769,11 +770,14 @@ export class ImportService { userId: user.id }); - const accounts = (await this.accountService.getAccounts(user.id)).map( - ({ id, name }) => { - return { id, name }; - } - ); + const accounts: Pick[] = ( + await this.accountService.accounts({ + include: { platform: true }, + where: { userId: user.id } + }) + ).map(({ id, name, platform }) => { + return { id, name, platform }; + }); if (isDryRun) { accountsWithBalancesDto @@ -888,7 +892,7 @@ export class ImportService { let order: | OrderWithAccount | (Omit & { - account?: { id: string; name: string }; + account?: Pick; tags?: { id: string; name: string }[]; }); diff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.ts index 04d5daa907..8e459b4a40 100644 --- a/apps/client/src/app/components/admin-users/admin-users.component.ts +++ b/apps/client/src/app/components/admin-users/admin-users.component.ts @@ -22,6 +22,7 @@ import { import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { internalRoutes } from '@ghostfolio/common/routes/routes'; import { RequestClient } from '@ghostfolio/prisma/enums'; +import { translate } from '@ghostfolio/ui/i18n'; import { NotificationService } from '@ghostfolio/ui/notifications'; import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator'; import { AdminService, DataService } from '@ghostfolio/ui/services'; @@ -114,6 +115,7 @@ export class GfAdminUsersComponent implements OnInit { internalRoutes.adminControl.subRoutes.users.routerLink; protected totalItems = 0; + protected readonly translate = translate; protected user: User; private readonly deviceType = computed( diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html index 3b8b09235b..f61006e0cc 100644 --- a/apps/client/src/app/components/admin-users/admin-users.html +++ b/apps/client/src/app/components/admin-users/admin-users.html @@ -197,7 +197,7 @@ } @else {