a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of extra toast when static IP is not set

This commit is contained in:
Andrey Meshkov 2020-08-20 14:37:57 +03:00 committed by Simon Zolin
parent 1806816d9c
commit 888c9d5714
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/actions/index.js
View File

@ -383,6 +383,7 @@ export const findActiveDhcp = (name) => async (dispatch, getState) => {
const v6 = check?.v6 ?? { other_server: {} }; const v6 = check?.v6 ?? { other_server: {} };
let isError = false; let isError = false;
let isStaticIPError = false;
const hasV4Interface = !!interfaces[selectedInterface]?.ipv4_addresses; const hasV4Interface = !!interfaces[selectedInterface]?.ipv4_addresses;
const hasV6Interface = !!interfaces[selectedInterface]?.ipv6_addresses; const hasV6Interface = !!interfaces[selectedInterface]?.ipv6_addresses;
@ -402,12 +403,17 @@ export const findActiveDhcp = (name) => async (dispatch, getState) => {
} }
if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.ERROR) { if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.ERROR) {
isError = true; isStaticIPError = true;
dispatch(addErrorToast({ error: 'dhcp_static_ip_error' })); dispatch(addErrorToast({ error: 'dhcp_static_ip_error' }));
} }
if (isError) { if (isError) {
dispatch(addErrorToast({ error: 'dhcp_error' })); dispatch(addErrorToast({ error: 'dhcp_error' }));
}
if (isStaticIPError || isError) {
// No need to proceed if there was an error discovering DHCP server
return; return;
} }