Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
fix update activity, hide update cash balance on edit (#1959)
Francisco Silva8e000baef2ea
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex a753aab6ac..fed801e1de 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0- Improved the market price on the first buy date in the chart of the position detail dialog- Restructured the admin control panel with a new settings tab+### Fixed++- Fixed an error that occurred while editing an activity caused by the cash balance update+## 1.268.0 - 2023-05-08### Addeddiff --git a/apps/api/src/app/order/create-order.dto.ts b/apps/api/src/app/order/create-order.dto.tsindex e43d1dad44..49b193ca51 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.tsindex 6802c13575..a8c33c40ed 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.tsindex 4336e94173..4f7b8aa92c 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.htmlindex 9ad56c907f..5bbf30ac3c 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@@ -18,8 +18,12 @@</mat-select></mat-form-field></div>- <div>- <mat-form-field appearance="outline" class="mb-1 without-hint w-100">+ <div [ngClass]="{'mb-3': data.activity.id}">+ <mat-form-field+ appearance="outline"+ class="w-100"+ [ngClass]="{'mb-1 without-hint': !data.activity.id}"+ ><mat-label i18n>Account</mat-label><mat-select formControlName="accountId"><mat-option@@ -32,7 +36,7 @@</mat-select></mat-form-field></div>- <div class="mb-3">+ <div class="mb-3" [ngClass]="{'d-none': data.activity.id}"><mat-checkbox color="primary" formControlName="updateAccountBalance" i18n>Update Cash Balance</mat-checkbox>