diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts index a014f608d..7f35ad994 100644 --- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts @@ -195,17 +195,6 @@ export class ImportActivitiesDialog implements OnDestroy { private handleImportSuccess() { this.importComplete = true; - - //Needed to trigger onPush change detection strategy this.changeDetectorRef.markForCheck(); - // this.snackBar.open( - // '✅ ' + $localize`Import has been completed`, - // undefined, - // { - // duration: 3000 - // } - // ); - - // this.dialogRef.close(); } } diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts index b30bc078a..0ab404ce0 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -101,7 +101,6 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { } public ngOnChanges() { - console.log('INSIDE LIIB', this.activities); this.displayedColumns = [ 'select', 'count', @@ -244,18 +243,13 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { }; } - if (activity.SymbolProfile?.currency) { - fieldValueMap[activity.SymbolProfile.currency] = { - id: activity.SymbolProfile.currency, - label: activity.SymbolProfile.currency, - type: 'TAG' - }; - } + fieldValueMap[activity.SymbolProfile.currency] = { + id: activity.SymbolProfile.currency, + label: activity.SymbolProfile.currency, + type: 'TAG' + }; - if ( - activity.SymbolProfile?.symbol && - !isUUID(activity.SymbolProfile.symbol) - ) { + if (!isUUID(activity.SymbolProfile.symbol)) { fieldValueMap[activity.SymbolProfile.symbol] = { id: activity.SymbolProfile.symbol, label: activity.SymbolProfile.symbol, @@ -263,21 +257,17 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { }; } - if (activity?.type) { - fieldValueMap[activity.type] = { - id: activity.type, - label: activity.type, - type: 'TAG' - }; - } - - // if (typeof activity?.date) { - // fieldValueMap[format(activity.date, 'yyyy')] = { - // id: format(activity.date, 'yyyy'), - // label: format(activity.date, 'yyyy'), - // type: 'TAG' - // }; - // } + fieldValueMap[activity.type] = { + id: activity.type, + label: activity.type, + type: 'TAG' + }; + + fieldValueMap[format(new Date(activity.date), 'yyyy')] = { + id: format(new Date(activity.date), 'yyyy'), + label: format(new Date(activity.date), 'yyyy'), + type: 'TAG' + }; return Object.values(fieldValueMap); }