diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index 5d60c571d..d566760db 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -136,6 +136,7 @@ export class UserService { where: { granteeUserId: id } }), this.prismaService.account.findMany({ + include: { platform: true }, orderBy: { name: 'asc' }, diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts index 3b80d2825..07f596711 100644 --- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts @@ -121,6 +121,12 @@ export class GfCreateOrUpdateActivityDialogComponent { addIcons({ calendarClearOutline, refreshOutline }); } + protected get selectedAccount() { + return this.data.accounts.find(({ id }) => { + return id === this.activityForm.get('accountId')?.value; + }); + } + public ngOnInit() { this.currencyOfAssetProfile = this.data.activity?.assetProfile?.currency; this.hasPermissionToCreateOwnTag = hasPermission( diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html index b5dbf4669..b3c708167 100644 --- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html +++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html @@ -85,6 +85,19 @@ > Account + +
+ @if (selectedAccount?.platform?.url) { + + } + {{ selectedAccount?.name }} +
+
+ @for (account of data.accounts; track account) { diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts index a3d58f8eb..7faed5312 100644 --- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts +++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts @@ -1,9 +1,8 @@ import { Activity, User } from '@ghostfolio/common/interfaces'; - -import { Account } from '@prisma/client'; +import { AccountWithPlatform } from '@ghostfolio/common/types'; export interface CreateOrUpdateActivityDialogParams { - accounts: Account[]; + accounts: AccountWithPlatform[]; activity: Partial> & { assetProfile: Activity['assetProfile'] | null; id: string | null;