From 73c0c88bbd6ed03827499f04f95687e442a484b4 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Thu, 11 May 2023 08:34:35 +0200
Subject: [PATCH] Minor improvements

---
 apps/api/src/app/order/create-order.dto.ts                 | 2 +-
 apps/api/src/app/order/update-order.dto.ts                 | 4 ----
 .../create-or-update-activity-dialog.component.ts          | 7 ++++---
 .../create-or-update-activity-dialog.html                  | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/apps/api/src/app/order/create-order.dto.ts b/apps/api/src/app/order/create-order.dto.ts
index e43d1dad4..49b193ca5 100644
--- a/apps/api/src/app/order/create-order.dto.ts
+++ b/apps/api/src/app/order/create-order.dto.ts
@@ -68,5 +68,5 @@ export class CreateOrderDto {
 
   @IsBoolean()
   @IsOptional()
-  updateAccountBalance: boolean;
+  updateAccountBalance?: boolean;
 }
diff --git a/apps/api/src/app/order/update-order.dto.ts b/apps/api/src/app/order/update-order.dto.ts
index 6802c1357..a8c33c40e 100644
--- a/apps/api/src/app/order/update-order.dto.ts
+++ b/apps/api/src/app/order/update-order.dto.ts
@@ -67,8 +67,4 @@ export class UpdateOrderDto {
 
   @IsNumber()
   unitPrice: number;
-
-  @IsBoolean()
-  @IsOptional()
-  updateAccountBalance: boolean;
 }
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 4336e9417..4f7b8aa92 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
@@ -415,13 +415,14 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
           : this.activityForm.controls['searchSymbol'].value.symbol,
       tags: this.activityForm.controls['tags'].value,
       type: this.activityForm.controls['type'].value,
-      unitPrice: this.activityForm.controls['unitPrice'].value,
-      updateAccountBalance:
-        this.activityForm.controls['updateAccountBalance'].value
+      unitPrice: this.activityForm.controls['unitPrice'].value
     };
 
     if (this.data.activity.id) {
       (activity as UpdateOrderDto).id = this.data.activity.id;
+    } else {
+      (activity as CreateOrderDto).updateAccountBalance =
+        this.activityForm.controls['updateAccountBalance'].value;
     }
 
     this.dialogRef.close({ activity });
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 dc18b6d84..a95c3f720 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
@@ -22,7 +22,7 @@
       <mat-form-field
         appearance="outline"
         class="w-100"
-        [ngClass]="{'without-hint': !data.activity.id}"
+        [ngClass]="{'mb-1 without-hint': !data.activity.id}"
       >
         <mat-label i18n>Account</mat-label>
         <mat-select formControlName="accountId">