From 2d3945147679fb3a69e3c928da109b84aa3514db Mon Sep 17 00:00:00 2001
From: KenTandrian <kenricktan11@gmail.com>
Date: Sat, 25 Oct 2025 23:37:40 +0700
Subject: [PATCH] fix(client): update on close holding

---
 .../holding-detail-dialog.component.ts          | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
index a42be5257..0d6cd8747 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
@@ -562,7 +562,7 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
     const today = new Date();
 
     const activity: CreateOrderDto = {
-      accountId: null,
+      accountId: this.accounts.length === 1 ? this.accounts[0].id : null,
       comment: null,
       currency: this.SymbolProfile.currency,
       dataSource: this.SymbolProfile.dataSource,
@@ -575,13 +575,16 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
       unitPrice: this.marketPrice
     };
 
-    this.dataService.postOrder(activity).subscribe(() => {
-      this.router.navigate(
-        internalRoutes.portfolio.subRoutes.activities.routerLink
-      );
+    this.dataService
+      .postOrder(activity)
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        this.router.navigate(
+          internalRoutes.portfolio.subRoutes.activities.routerLink
+        );
 
-      this.dialogRef.close();
-    });
+        this.dialogRef.close();
+      });
   }
 
   public onExport() {