From dbd3fa60df9b92f9c76a7a83d88850b2cffe9f72 Mon Sep 17 00:00:00 2001
From: visrut <visrutnavadiya111@gmail.com>
Date: Sat, 27 May 2023 22:30:37 +0530
Subject: [PATCH] fix: angular UI issue with selecting checkbox

---
 .../import-activities-dialog.component.ts                    | 4 ++++
 .../import-activities-dialog/import-activities-dialog.html   | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 65c2964db..55e9ccc7e 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
@@ -101,6 +101,10 @@ export class ImportActivitiesDialog implements OnDestroy {
     this.dialogRef.close();
   }
 
+  public onImportCancel(aStepper: MatStepper) {
+    aStepper.previous();
+  }
+
   public async onImportActivities() {
     try {
       this.snackBar.open('⏳ ' + $localize`Importing data...`);
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 cc2cce9bb..1ec947f3d 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
@@ -81,6 +81,7 @@
       <ng-template i18n matStepLabel>Select Activities</ng-template>
       <ng-container *ngIf="errorMessages.length === 0; else errorMessage">
         <gf-activities-table
+          *ngIf="importStep === 1"
           [activities]="activities"
           [baseCurrency]="data?.user?.settings?.baseCurrency"
           [deviceType]="data?.deviceType"
@@ -97,7 +98,9 @@
           (selectedActivities)="updateSelection($event)"
         ></gf-activities-table>
         <div class="d-flex justify-content-end mt-3">
-          <button i18n mat-button (click)="onCancel()">Cancel</button>
+          <button i18n mat-button (click)="onImportCancel(stepper)">
+            Cancel
+          </button>
           <button
             class="ml-1"
             color="primary"