Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Bugfix/improve show condition of button to fetch current market price (#4700)
Thomas Kaula06872b65702
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex aaa3db02ea..a3db392da7 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Fixed+- Displayed the button to fetch the current market price only if the activity is not in a custom currency- Fixed an issue in the watchlist endpoint (`POST`) related to the `HasPermissionGuard`## 2.161.0 - 2025-05-06diff --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 dce045a4ac..5f651195ae 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@@ -39,6 +39,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {return { id: assetSubClass, label: translate(assetSubClass) };});public currencies: string[] = [];+ public currencyOfAssetProfile: string;public currentMarketPrice = null;public defaultDateFormat: string;public isLoading = false;@@ -63,8 +64,10 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {) {}public ngOnInit() {- this.mode = this.data.activity.id ? 'update' : 'create';+ this.currencyOfAssetProfile = this.data.activity?.SymbolProfile?.currency;this.locale = this.data.user?.settings?.locale;+ this.mode = this.data.activity?.id ? 'update' : 'create';+this.dateAdapter.setLocale(this.locale);const { currencies, platforms } = this.dataService.fetchInfo();@@ -210,7 +213,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {this.activityForm.get('type').value)) {- this.updateSymbol();+ this.updateAssetProfile();}this.changeDetectorRef.markForCheck();@@ -397,7 +400,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {this.dialogRef.close(activity);} else {- (activity as UpdateOrderDto).id = this.data.activity.id;+ (activity as UpdateOrderDto).id = this.data.activity?.id;await validateObjectForForm({classDto: UpdateOrderDto,@@ -422,7 +425,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {this.unsubscribeSubject.complete();}- private updateSymbol() {+ private updateAssetProfile() {this.isLoading = true;this.changeDetectorRef.markForCheck();@@ -450,6 +453,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {this.activityForm.get('dataSource').setValue(dataSource);}+ this.currencyOfAssetProfile = currency;this.currentMarketPrice = marketPrice;this.isLoading = false;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 b0521530f8..08e1b51627 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@@ -230,8 +230,10 @@</div></mat-form-field>@if (+ currencyOfAssetProfile ===+ activityForm.get('currencyOfUnitPrice').value &¤tMarketPrice &&- (data.activity.type === 'BUY' || data.activity.type === 'SELL') &&+ ['BUY', 'SELL'].includes(data.activity.type) &&isToday(activityForm.get('date')?.value)) {<button