From aac85367e6d8d4f44e5330f739c092ae85cdeb85 Mon Sep 17 00:00:00 2001
From: Volha Mardvilka <mardvilka@google.com>
Date: Fri, 26 Jan 2024 16:05:56 +0000
Subject: [PATCH] 322476587: (fix) change to set default selected value on
 close panel

---
 .../general-settings/general-settings.component.ts          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.ts b/modules/ui/src/app/components/general-settings/general-settings.component.ts
index c26c535da..5f34ff98c 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.ts
@@ -64,11 +64,11 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
   private destroy$: Subject<boolean> = new Subject<boolean>();
 
   get deviceControl(): FormControl {
-    return this.settingForm.get('device_intf') as FormControl;
+    return this.settingForm?.get('device_intf') as FormControl;
   }
 
   get internetControl(): FormControl {
-    return this.settingForm.get('internet_intf') as FormControl;
+    return this.settingForm?.get('internet_intf') as FormControl;
   }
 
   get isFormValues(): boolean {
@@ -217,6 +217,8 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
         if (config?.network) {
           const { device_intf, internet_intf } = config.network;
           this.setDefaultFormValues(device_intf, internet_intf);
+        } else {
+          this.internetControl?.setValue(this.defaultInternetOption);
         }
       });
   }