From a4ee0f6d4c9c60f3b6e3b5de69cb4addb7697378 Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Tue, 30 Jul 2024 12:59:18 +0300
Subject: [PATCH] refactoring

---
 .../modbus-basic-config/modbus-basic-config.component.ts   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
index bfd085a4c4..61e5677e9f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
@@ -21,6 +21,7 @@ import {
   FormGroup,
   NG_VALIDATORS,
   NG_VALUE_ACCESSOR,
+  UntypedFormControl,
   ValidationErrors,
   Validator,
 } from '@angular/forms';
@@ -108,9 +109,9 @@ export class ModbusBasicConfigComponent implements ControlValueAccessor, Validat
     this.basicFormGroup.setValue(editedBase, {emitEvent: false});
   }
 
-  validate(): ValidationErrors | null {
-    const masterHasSlaves = !!this.basicFormGroup.get('master').value.slaves?.length;
-    const slaveEnabled = this.basicFormGroup.get('slave').value.sendDataToThingsBoard;
+  validate(basicConfigControl: UntypedFormControl): ValidationErrors | null {
+    const masterHasSlaves = !!basicConfigControl.value.master?.slaves?.length;
+    const slaveEnabled = basicConfigControl.value.slave?.sendDataToThingsBoard;
     const slaveIsValid = this.basicFormGroup.get('slave').valid;
 
     if ((slaveEnabled && slaveIsValid) || (masterHasSlaves && !slaveEnabled)) {