From f2eda6d192c0037e93a77ab8727eafbc9a11c085 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Tue, 17 Nov 2020 19:56:58 +0300
Subject: [PATCH] Pull request: - client: 2326 Fix dhcp bug interfaces bug

Merge in DNS/adguard-home from fix/2326 to master

Closes #2326.

Squashed commit of the following:

commit 31f24d733eda747e161ddd44055591dbbc0752d7
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Tue Nov 17 18:16:19 2020 +0300

    - client: 2326 Fix dhcp bug interfaces bug
---
 client/src/components/Settings/Dhcp/Interfaces.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Settings/Dhcp/Interfaces.js b/client/src/components/Settings/Dhcp/Interfaces.js
index 987a84a9..d2760e3d 100644
--- a/client/src/components/Settings/Dhcp/Interfaces.js
+++ b/client/src/components/Settings/Dhcp/Interfaces.js
@@ -72,12 +72,12 @@ const Interfaces = () => {
         (store) => store.form[FORM_NAME.DHCP_INTERFACES]?.values?.interface_name,
     );
 
-    const interfaceValue = interface_name && interfaces[interface_name];
-
     if (processingInterfaces || !interfaces) {
         return null;
     }
 
+    const interfaceValue = interface_name && interfaces[interface_name];
+
     return <div className="row dhcp__interfaces">
         <div className="col col__dhcp">
             <Field