+ client: handle EDNS Client Subnet setting

client/src/containers/Dns.js

@@ -7,17 +7,19 @@ import {
     deleteRewrite,
     toggleRewritesModal,
 } from '../actions/rewrites';
+import { getDnsConfig, setDnsConfig } from '../actions/dnsConfig';
 import Dns from '../components/Settings/Dns';
 
 const mapStateToProps = (state) => {
     const {
-        dashboard, settings, access, rewrites,
+        dashboard, settings, access, rewrites, dnsConfig,
     } = state;
     const props = {
         dashboard,
         settings,
         access,
         rewrites,
+        dnsConfig,
     };
     return props;
 };
@@ -33,6 +35,8 @@ const mapDispatchToProps = {
     deleteRewrite,
     toggleRewritesModal,
     getDnsSettings,
+    getDnsConfig,
+    setDnsConfig,
 };
 
 export default connect(

client/src/containers/Settings.js

@@ -4,12 +4,11 @@ import { getBlockedServices, setBlockedServices } from '../actions/services';
 import { getStatsConfig, setStatsConfig, resetStats } from '../actions/stats';
 import { clearLogs, getLogsConfig, setLogsConfig } from '../actions/queryLogs';
 import { getFilteringStatus, setFiltersConfig } from '../actions/filtering';
-import { getDnsConfig, setDnsConfig } from '../actions/dnsConfig';
 import Settings from '../components/Settings';
 
 const mapStateToProps = (state) => {
     const {
-        settings, services, stats, queryLogs, filtering, dnsConfig,
+        settings, services, stats, queryLogs, filtering,
     } = state;
     const props = {
         settings,
@@ -17,7 +16,6 @@ const mapStateToProps = (state) => {
         stats,
         queryLogs,
         filtering,
-        dnsConfig,
     };
     return props;
 };
@@ -35,8 +33,6 @@ const mapDispatchToProps = {
     setLogsConfig,
     getFilteringStatus,
     setFiltersConfig,
-    getDnsConfig,
-    setDnsConfig,
 };
 
 export default connect(