From 22d68e7ac16ad043e3492cd5dbdce01e7a0ad1f7 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Thu, 16 Jul 2026 18:25:02 +0200
Subject: [PATCH] Bugfix/remove linked account from BUY / SELL / DIVIDEND
 activity (#7346)

* Fix removing a linked account from a buy, sell or dividend activity

* Update changelog
---
 CHANGELOG.md                                         |  1 +
 apps/api/src/app/activities/activities.controller.ts | 12 +++++++-----
 apps/api/src/app/activities/activities.service.ts    |  4 ----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da9855a75..b645fb0e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed an issue where the tags of an activity were lost if updating the activity failed
 - Fixed an issue where the dividends, the interest and the liabilities of asset profiles without market data have been valued at zero in the portfolio calculation
 - Fixed an issue where an error has been reported for asset profiles without market data which do not hold any units
+- Fixed an issue with removing a linked account from a buy, sell or dividend activity
 
 ## 3.27.0 - 2026-07-15
 
diff --git a/apps/api/src/app/activities/activities.controller.ts b/apps/api/src/app/activities/activities.controller.ts
index f0f3a2acd..21dabc639 100644
--- a/apps/api/src/app/activities/activities.controller.ts
+++ b/apps/api/src/app/activities/activities.controller.ts
@@ -315,11 +315,13 @@ export class ActivitiesController {
       data: {
         ...data,
         date,
-        account: {
-          connect: {
-            id_userId: { id: accountId, userId: this.request.user.id }
-          }
-        },
+        account: accountId
+          ? {
+              connect: {
+                id_userId: { id: accountId, userId: this.request.user.id }
+              }
+            }
+          : { disconnect: true },
         SymbolProfile: {
           connect: {
             dataSource_symbol: {
diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/app/activities/activities.service.ts
index 539c05c66..df616a5dd 100644
--- a/apps/api/src/app/activities/activities.service.ts
+++ b/apps/api/src/app/activities/activities.service.ts
@@ -983,10 +983,6 @@ export class ActivitiesService {
       (data.SymbolProfile.connect.dataSource_symbol.dataSource === 'MANUAL' &&
         data.type === 'BUY')
     ) {
-      if (data.account?.connect?.id_userId?.id === null) {
-        data.account = { disconnect: true };
-      }
-
       delete data.SymbolProfile.connect;
       delete data.SymbolProfile.update.name;
     } else {