From e7ec91ca94151a42d71bb8bfde432496e7bfe583 Mon Sep 17 00:00:00 2001
From: kurilova <kurilova@google.com>
Date: Wed, 5 Feb 2025 13:31:45 +0000
Subject: [PATCH] Fix error when discard acts like cancel

---
 .../device-qualification-from.component.ts        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.ts b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.ts
index 71b9299dd..49e655492 100644
--- a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.ts
+++ b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.ts
@@ -132,12 +132,7 @@ export class DeviceQualificationFromComponent implements OnInit, AfterViewInit {
     } else if (this.device != this.initialDevice()) {
       // prevent select new device before user confirmation
       this.devicesStore.selectDevice(this.device);
-      this.openCloseDialog().subscribe(close => {
-        if (close) {
-          this.changeDevice = true;
-          this.devicesStore.selectDevice(this.initialDevice());
-        }
-      });
+      this.openCloseDialogToChangeDevice(this.initialDevice());
     }
   });
 
@@ -462,6 +457,14 @@ export class DeviceQualificationFromComponent implements OnInit, AfterViewInit {
     });
   }
 
+  private openCloseDialogToChangeDevice(device: Device | null) {
+    this.openCloseDialog().subscribe(close => {
+      if (close) {
+        this.changeDevice = true;
+        this.devicesStore.selectDevice(device);
+      }
+    });
+  }
   private openCloseDialog() {
     const dialogRef = this.dialog.open(SimpleDialogComponent, {
       ariaLabel: 'Discard the Device changes',