console: Fix condition

TheThingsNetwork · Apr 29, 2024 · 2d0c9e0 · 2d0c9e0
1 parent 8feb431
commit 2d0c9e0
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/index.js b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
@@ -247,20 +247,19 @@ const NetworkServerForm = React.memo(props => {
             ...defaultValues.mac_settings,
             ...macSettings,
             ...device.mac_settings,
-            adr:
-              'dynamic' in device.mac_settings?.adr
-                ? {
-                    dynamic: {
-                      ...device.mac_settings?.adr?.dynamic,
-                      min_nb_trans: device.mac_settings?.adr?.dynamic?.min_nb_trans ?? null,
-                      max_nb_trans: device.mac_settings?.adr?.dynamic?.max_nb_trans ?? null,
-                    },
-                  }
-                : {
-                    ...defaultValues.mac_settings.adr,
-                    ...macSettings.adr,
-                    ...device.mac_settings.adr,
+            adr: Boolean(device.mac_settings?.adr?.dynamic)
+              ? {
+                  dynamic: {
+                    ...device.mac_settings?.adr?.dynamic,
+                    min_nb_trans: device.mac_settings?.adr?.dynamic?.min_nb_trans ?? null,
+                    max_nb_trans: device.mac_settings?.adr?.dynamic?.max_nb_trans ?? null,
                   },
+                }
+              : {
+                  ...defaultValues.mac_settings.adr,
+                  ...macSettings.adr,
+                  ...device.mac_settings?.adr,
+                },
           },
         },
         { context: validationContext, stripUnknown: true },