code review changes

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

@@ -155,17 +155,17 @@ export class ImportService {
     accountsWithBalancesDto,
     activitiesDto,
     assetProfilesWithMarketDataDto,
-    tagsDto,
     isDryRun = false,
     maxActivitiesToImport,
+    tagsDto,
     user
   }: {
     accountsWithBalancesDto: ImportDataDto['accounts'];
     activitiesDto: ImportDataDto['activities'];
     assetProfilesWithMarketDataDto: ImportDataDto['assetProfiles'];
-    tagsDto: ImportDataDto['tags'];
     isDryRun?: boolean;
     maxActivitiesToImport: number;
+    tagsDto: ImportDataDto['tags'];
     user: UserWithSettings;
   }): Promise<Activity[]> {
     const accountIdMapping: { [oldAccountId: string]: string } = {};

apps/api/src/app/order/interfaces/activities.interface.ts

@@ -14,8 +14,8 @@ export interface Activity extends Order {
   feeInAssetProfileCurrency: number;
   feeInBaseCurrency: number;
   SymbolProfile?: EnhancedSymbolProfile;
-  tags?: Tag[];
   tagIds?: string[];
+  tags?: Tag[];
   unitPriceInAssetProfileCurrency: number;
   updateAccountBalance?: boolean;
   value: number;

apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts

@@ -81,7 +81,6 @@ export class GfImportActivitiesDialog implements OnDestroy {
   public activities: Activity[] = [];
   public assetProfileForm: FormGroup;
   public assetProfiles: CreateAssetProfileWithMarketDataDto[] = [];
-  public tags: CreateTagDto[] = [];
   public dataSource: MatTableDataSource<Activity>;
   public details: any[] = [];
   public deviceType: string;
@@ -96,6 +95,7 @@ export class GfImportActivitiesDialog implements OnDestroy {
   public sortColumn = 'date';
   public sortDirection: SortDirection = 'desc';
   public stepperOrientation: StepperOrientation;
+  public tags: CreateTagDto[] = [];
   public totalItems: number;
 
   private unsubscribeSubject = new Subject<void>();
@@ -332,8 +332,8 @@ export class GfImportActivitiesDialog implements OnDestroy {
                 accounts: content.accounts,
                 activities: content.activities,
                 assetProfiles: content.assetProfiles,
-                tags: content.tags,
-                isDryRun: true
+                isDryRun: true,
+                tags: content.tags
               });
             this.activities = activities;
             this.dataSource = new MatTableDataSource(activities.reverse());

apps/client/src/app/services/import-activities.service.ts

@@ -76,14 +76,14 @@ export class ImportActivitiesService {
     accounts,
     activities,
     assetProfiles,
-    tags,
-    isDryRun = false
+    isDryRun = false,
+    tags
   }: {
     activities: CreateOrderDto[];
     accounts?: CreateAccountWithBalancesDto[];
     assetProfiles?: CreateAssetProfileWithMarketDataDto[];
-    tags?: CreateTagDto[];
     isDryRun?: boolean;
+    tags?: CreateTagDto[];
   }): Promise<{
     activities: Activity[];
   }> {