From 3b2086f5538e44b1a2e475c90096a67144cacab7 Mon Sep 17 00:00:00 2001
From: csehatt741 <att741@gmail.com>
Date: Mon, 7 Apr 2025 09:14:30 +0200
Subject: [PATCH] PR review changes

---
 apps/api/src/app/import/import.service.ts                   | 6 ------
 .../create-or-update-activity-dialog.component.ts           | 6 +++++-
 .../lib/activities-table/activities-table.component.html    | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.ts
index 9e0bf1d53..4ed5749a7 100644
--- a/apps/api/src/app/import/import.service.ts
+++ b/apps/api/src/app/import/import.service.ts
@@ -640,12 +640,6 @@ export class ImportService {
               `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
             );
           }
-
-          if (assetProfile.currency !== currency) {
-            throw new Error(
-              `activities.${index}.currency ("${currency}") does not match with currency of ${assetProfile.symbol} ("${assetProfile.currency}")`
-            );
-          }
         }
 
         assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })] =
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 81cfec651..f6ce2a81d 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
@@ -101,7 +101,11 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
         this.data.activity?.SymbolProfile?.currency,
         Validators.required
       ],
-      currencyOfUnitPrice: [this.data.activity?.currency, Validators.required],
+      currencyOfUnitPrice: [
+        this.data.activity?.currency ??
+          this.data.activity?.SymbolProfile?.currency,
+        Validators.required
+      ],
       dataSource: [
         this.data.activity?.SymbolProfile?.dataSource,
         Validators.required
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 76aeea0fe..79a7d3417 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -280,7 +280,7 @@
         class="d-none d-lg-table-cell px-1"
         mat-cell
       >
-        {{ element.currency }}
+        {{ element.currency ?? element.SymbolProfile?.currency }}
       </td>
     </ng-container>