From a06872b657027c8ae73bf87d48af7bbed7e76639 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 20 May 2025 22:53:32 +0100
Subject: [PATCH] Bugfix/improve show condition of button to fetch current
 market price (#4700)

* Improve show condition of button to fetch current market price

* Update changelog
---
 CHANGELOG.md                                         |  1 +
 .../create-or-update-activity-dialog.component.ts    | 12 ++++++++----
 .../create-or-update-activity-dialog.html            |  4 +++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaa3db02..a3db392d 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-06
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 dce045a4..5f651195 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.html
index b0521530..08e1b516 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 &&
           currentMarketPrice &&
-          (data.activity.type === 'BUY' || data.activity.type === 'SELL') &&
+          ['BUY', 'SELL'].includes(data.activity.type) &&
           isToday(activityForm.get('date')?.value)
         ) {
           <button