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 129bf1958..2936f5b34 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 @@ -36,7 +36,6 @@ export class ImportActivitiesDialog implements OnDestroy { public mode: 'DIVIDEND'; public selectedActivities: Activity[] = []; public uniqueAssetForm: FormGroup; - public isAnyActivityDuplicate: boolean = false; private unsubscribeSubject = new Subject(); @@ -229,12 +228,6 @@ export class ImportActivitiesDialog implements OnDestroy { this.isFileSelected = true; this.snackBar.dismiss(); this.changeDetectorRef.markForCheck(); - this.activities.some((activity) => { - if (activity.isDuplicate) { - this.isAnyActivityDuplicate = true; - return; - } - }); } }; }; diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html index e1926e923..3e47b966f 100644 --- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html +++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html @@ -71,7 +71,6 @@ [hasPermissionToExportActivities]="false" [hasPermissionToFilter]="false" [hasPermissionToOpenDetails]="false" - [isAnyActivityDuplicate]="isAnyActivityDuplicate" [locale]="data?.user?.settings?.locale" [pageSize]="maxSafeInteger" [showActions]="false" 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 d66b8b5c3..b3767edfd 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -45,7 +45,6 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit { @Input() showCheckbox = false; @Input() showFooter = true; @Input() showNameColumn = true; - @Input() isAnyActivityDuplicate = false; @Output() activityDeleted = new EventEmitter(); @Output() activityToClone = new EventEmitter(); @@ -77,6 +76,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit { public selectedRows = new SelectionModel(true, []); public totalFees: number; public totalValue: number; + public isAnyActivityDuplicate: boolean = false; private readonly SEARCH_STRING_SEPARATOR = ','; private unsubscribeSubject = new Subject(); @@ -98,6 +98,13 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit { this.selectedActivities.emit(selectedRows.source.selected); }); } + + this.activities.some(({ isDuplicate }) => { + if (isDuplicate) { + this.isAnyActivityDuplicate = true; + return; + } + }); } public areAllRowsSelected() {