Resolve comments

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

@@ -45,6 +45,8 @@ export class ImportActivitiesDialog implements OnDestroy {
 
   public async onImportActivities() {
     try {
+      this.snackBar.open('⏳ ' + $localize`Importing data...`);
+
       await this.importActivitiesService.importSelectedActivities(
         this.selectedActivities
       );
@@ -81,7 +83,7 @@ export class ImportActivitiesDialog implements OnDestroy {
     input.type = 'file';
 
     input.onchange = (event) => {
-      this.snackBar.open('⏳ ' + $localize`Importing data...`);
+      this.snackBar.open('⏳ ' + $localize`Validating data...`);
 
       // Getting the file reference
       const file = (event.target as HTMLInputElement).files[0];
@@ -129,9 +131,9 @@ export class ImportActivitiesDialog implements OnDestroy {
           } else if (file.name.endsWith('.csv')) {
             try {
               this.activities = await this.importActivitiesService.importCsv({
+                dryRun: true,
                 fileContent,
-                userAccounts: this.data.user.accounts,
+                userAccounts: this.data.user.accounts
-                dryRun: true
               });
             } catch (error) {
               console.error(error);

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

@@ -26,13 +26,13 @@ export class ImportActivitiesService {
   public constructor(private http: HttpClient) {}
 
   public async importCsv({
+    dryRun = false,
     fileContent,
-    userAccounts,
+    userAccounts
-    dryRun = false
   }: {
+    dryRun?: boolean;
     fileContent: string;
     userAccounts: Account[];
-    dryRun?: boolean;
   }): Promise<Activity[]> {
     const content = csvToJson(fileContent, {
       dynamicTyping: true,
@@ -91,20 +91,23 @@ export class ImportActivitiesService {
   ): Promise<Activity[]> {
     const importData: CreateOrderDto[] = [];
     for (const activity of selectedActivities) {
-      importData.push({
+      importData.push(this.convertToCreateOrderDto(activity));
-        currency: activity.SymbolProfile.currency,
-        date: activity.date.toString(),
-        fee: activity.fee,
-        quantity: activity.quantity,
-        symbol: activity.SymbolProfile.symbol,
-        type: activity.type,
-        unitPrice: activity.unitPrice
-      });
     }
-
     return this.importJson({ content: importData });
   }
 
+  private convertToCreateOrderDto(aActivity: Activity): CreateOrderDto {
+    return {
+      currency: aActivity.SymbolProfile.currency,
+      date: aActivity.date.toString(),
+      fee: aActivity.fee,
+      quantity: aActivity.quantity,
+      symbol: aActivity.SymbolProfile.symbol,
+      type: aActivity.type,
+      unitPrice: aActivity.unitPrice
+    };
+  }
+
   private lowercaseKeys(aObject: any) {
     return Object.keys(aObject).reduce((acc, key) => {
       acc[key.toLowerCase()] = aObject[key];

libs/ui/src/lib/activities-table/activities-table.component.html

@@ -18,6 +18,7 @@
     <ng-container matColumnDef="select">
       <th *matHeaderCellDef class="px-1" mat-header-cell>
         <mat-checkbox
+          class="mt-2"
           [checked]="selectedRows.hasValue() && areAllRowsSelected()"
           [indeterminate]="selectedRows.hasValue() && !areAllRowsSelected()"
           (change)="$event ? toggleAllRows() : null"
@@ -25,6 +26,7 @@
       </th>
       <td *matCellDef="let element" class="px-1" mat-cell>
         <mat-checkbox
+          class="mt-2"
           [checked]="selectedRows.isSelected(element)"
           (change)="$event ? selectedRows.toggle(element) : null"
           (click)="$event.stopPropagation()"

libs/ui/src/lib/activities-table/activities-table.component.scss

@@ -25,10 +25,6 @@
         }
       }
 
-      .mat-checkbox {
-        margin-top: 8px;
-      }
-
       .mat-row {
         .type-badge {
           background-color: rgba(var(--palette-foreground-text), 0.05);