From 6abb730f510b82e8625b3af46085d7149302830c Mon Sep 17 00:00:00 2001
From: yksolanki9 <yashsolanki1709@gmail.com>
Date: Sat, 24 Dec 2022 16:33:59 +0530
Subject: [PATCH] Fix condition to show checkbox

---
 .../import-activities-dialog.html                    |  1 +
 .../activities-table/activities-table.component.scss |  4 ++++
 .../activities-table/activities-table.component.ts   | 12 +++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

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 4e07fd0c4..802487c3f 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
@@ -18,6 +18,7 @@
       [hasPermissionToOpenDetails]="false"
       [locale]="data?.user?.settings?.locale"
       [showActions]="false"
+      [showCheckbox]="true"
       [showSymbolColumn]="false"
       (selectedActivities)="importActivities($event)"
     ></gf-activities-table>
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.scss b/libs/ui/src/lib/activities-table/activities-table.component.scss
index 42af383e4..e341abc4b 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.scss
+++ b/libs/ui/src/lib/activities-table/activities-table.component.scss
@@ -25,6 +25,10 @@
         }
       }
 
+      .mat-checkbox {
+        margin-top: 8px;
+      }
+
       .mat-row {
         .type-badge {
           background-color: rgba(var(--palette-foreground-text), 0.05);
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 0ab404ce0..2518ba1be 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -41,9 +41,9 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
   @Input() hasPermissionToImportActivities: boolean;
   @Input() hasPermissionToOpenDetails = true;
   @Input() locale: string;
-  @Input() multiselect = false;
   @Input() pageSize = DEFAULT_PAGE_SIZE;
   @Input() showActions: boolean;
+  @Input() showCheckbox = false;
   @Input() showNameColumn = true;
 
   @Output() activityDeleted = new EventEmitter<string>();
@@ -118,6 +118,16 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
       'actions'
     ];
 
+    if (this.showCheckbox) {
+      this.displayedColumns = this.displayedColumns.filter((column) => {
+        return column !== 'count';
+      });
+    } else {
+      this.displayedColumns = this.displayedColumns.filter((column) => {
+        return column !== 'select';
+      });
+    }
+
     if (!this.showNameColumn) {
       this.displayedColumns = this.displayedColumns.filter((column) => {
         return column !== 'nameWithSymbol';