Merge b3e8918612 into ad9a1d526b

apps/api/src/app/import/import.service.ts

@@ -1076,8 +1076,9 @@ export class ImportService {
 
         const isDuplicate = existingActivities.some((activity) => {
   return (
+    (!accountId || activity.accountId === accountId) &&
     (activity.comment || null) === (comment || null) &&
-            (activity.currency === currency ||
+    ((activity.currency || null) === (currency || null) ||
       activity.assetProfile.currency === currency) &&
     activity.assetProfile.dataSource === dataSource &&
     isSameSecond(activity.date, date) &&
@@ -1087,7 +1088,7 @@ export class ImportService {
     activity.type === type &&
     activity.unitPrice === unitPrice
   );
-        });
+});
 
         const error: ActivityError = isDuplicate
           ? { code: 'IS_DUPLICATE' }