From f6f7c100c6dcb4dda012b489c83490a4a0e7ddf0 Mon Sep 17 00:00:00 2001
From: KenTandrian <kenricktan11@gmail.com>
Date: Sun, 12 Jul 2026 23:41:30 +0700
Subject: [PATCH] resolve comments

---
 .../pages/portfolio/activities/activities-page.component.ts   | 2 +-
 .../create-or-update-activity-dialog.component.ts             | 2 ++
 .../create-or-update-activity-dialog/interfaces/interfaces.ts | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
index 309d0c595..397fdce57 100644
--- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
@@ -92,7 +92,7 @@ export class GfActivitiesPageComponent implements OnInit {
               .pipe(map((activity) => ({ activity, params })));
           }
 
-          return of({ activity: undefined, params });
+          return of({ params, activity: undefined });
         })
       )
       .subscribe(({ activity, params }) => {
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 836d84b80..022a8f2a2 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
@@ -537,9 +537,11 @@ export class GfCreateOrUpdateActivityDialogComponent {
         this.dialogRef.close(activity);
       } else {
         const activityId = this.data.activity?.id;
+
         if (!activityId) {
           throw new Error('Activity ID is required for update');
         }
+
         (activity as UpdateOrderDto).id = activityId;
 
         await validateObjectForForm({
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 c493b5a5f..37faff91f 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
@@ -4,10 +4,10 @@ import { Account } from '@prisma/client';
 
 export interface CreateOrUpdateActivityDialogParams {
   accounts: Account[];
-  activity: Partial<Omit<Activity, 'SymbolProfile' | 'id' | 'unitPrice'>> & {
+  activity: Partial<Omit<Activity, 'id' | 'SymbolProfile' | 'unitPrice'>> & {
     id: string | null;
-    unitPrice: number | null;
     SymbolProfile: Activity['SymbolProfile'] | null;
+    unitPrice: number | null;
   };
   user: User;
 }