client: upd locales

Squashed commit of the following:

commit 8d83eebba851e8e09bb08b1c94a247cb049a1b75
Merge: c6574a33c b6ed76965
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Aug 5 16:59:50 2024 +0300

    Merge branch 'master' into AGDNS-2280-upd-golibs

commit c6574a33c62171190199c8c07118d0ecd2174801
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Jul 31 19:56:58 2024 +0300

    all: upd proxy, golibs

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.22.3'
+  'GO_VERSION': '1.22.5'
   'NODE_VERSION': '16'
 
 'on':

.github/workflows/lint.yml

@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.22.3'
+  'GO_VERSION': '1.22.5'
 
 'on':
   'push':

CHANGELOG.md

@@ -7,6 +7,10 @@ The format is based on
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+<!--
+TODO(a.garipov): Use the common markdown formatting tools.
+-->
+
 
 
 ## [Unreleased]
@@ -14,21 +18,113 @@ and this project adheres to
 <!--
 ## [v0.108.0] - TBA
 
-## [v0.107.51] - 2024-06-22 (APPROX.)
+## [v0.107.53] - 2024-07-24 (APPROX.)
 
-See also the [v0.107.51 GitHub milestone][ms-v0.107.51].
+See also the [v0.107.53 GitHub milestone][ms-v0.107.53].
 
-[ms-v0.107.51]: https://github.com/AdguardTeam/AdGuardHome/milestone/86?closed=1
+[ms-v0.107.53]: https://github.com/AdguardTeam/AdGuardHome/milestone/88?closed=1
 
 NOTE: Add new changes BELOW THIS COMMENT.
 -->
 
+### Added
+
+- Ecosia search engine is now supported in safe search ([#5009]).
+
+### Fixed
+
+- Update Google safe search domains list ([#7155]).
+- Enforce Bing safe search from Edge sidebar ([#7154]).
+- Text overflow on the query log page ([#7119]).
+
+[#5009]: https://github.com/AdguardTeam/AdGuardHome/issues/5009
+[#7119]: https://github.com/AdguardTeam/AdGuardHome/issues/7119
+[#7154]: https://github.com/AdguardTeam/AdGuardHome/pull/7154
+[#7155]: https://github.com/AdguardTeam/AdGuardHome/pull/7155
+
 <!--
 NOTE: Add new changes ABOVE THIS COMMENT.
 -->
 
 
 
+## [v0.107.52] - 2024-07-04
+
+See also the [v0.107.52 GitHub milestone][ms-v0.107.52].
+
+### Security
+
+- Go version has been updated to prevent the possibility of exploiting the Go
+  vulnerabilities fixed in [Go 1.22.5][go-1.22.5].
+
+### Added
+
+- The ability to disable logging using the new `log.enabled` configuration
+  property ([#7079]).
+
+### Changed
+
+- Frontend rewritten in TypeScript.
+- The `systemd`-based service now uses `journal` for logging by default.  It
+  also doesn't create the `/var/log/` directory anymore ([#7053]).
+
+  **NOTE:** With an installed service for changes to take effect, you need to
+  reinstall the service using `-r` flag of the [install script][install-script]
+  or via the CLI (with root privileges):
+
+  ```sh
+  ./AdGuardHome -s uninstall
+  ./AdGuardHome -s install
+  ```
+
+  Don't forget to backup your configuration file and other important data before
+  reinstalling the service.
+
+### Deprecated
+
+- Node 18 support, Node 20 will be required in future releases.
+
+### Fixed
+
+- Panic caused by missing user-specific blocked services object in configuration
+  file ([#7069]).
+- Tracking `/etc/hosts` file changes causing panics within particular
+  filesystems on start ([#7076]).
+
+[#7053]: https://github.com/AdguardTeam/AdGuardHome/issues/7053
+[#7069]: https://github.com/AdguardTeam/AdGuardHome/issues/7069
+[#7076]: https://github.com/AdguardTeam/AdGuardHome/issues/7076
+[#7079]: https://github.com/AdguardTeam/AdGuardHome/issues/7079
+
+[go-1.22.5]:      https://groups.google.com/g/golang-announce/c/gyb7aM1C9H4
+[install-script]: https://github.com/AdguardTeam/AdGuardHome/?tab=readme-ov-file#automated-install-linux-and-mac
+
+[ms-v0.107.52]: https://github.com/AdguardTeam/AdGuardHome/milestone/87?closed=1
+
+
+
+## [v0.107.51] - 2024-06-06
+
+See also the [v0.107.51 GitHub milestone][ms-v0.107.51].
+
+### Security
+
+- Go version has been updated to prevent the possibility of exploiting the Go
+  vulnerabilities fixed in [Go 1.22.4][go-1.22.4].
+
+### Changed
+
+- The HTTP server's write timeout has been increased from 1 minute to 5 minutes
+  to match the one used by AdGuard Home's HTTP client to fetch filtering-list
+  data ([#7041]).
+
+[#7041]: https://github.com/AdguardTeam/AdGuardHome/issues/7041
+
+[go-1.22.4]:    https://groups.google.com/g/golang-announce/c/XbxouI9gY7k/
+[ms-v0.107.51]: https://github.com/AdguardTeam/AdGuardHome/milestone/86?closed=1
+
+
+
 ## [v0.107.50] - 2024-05-23
 
 See also the [v0.107.50 GitHub milestone][ms-v0.107.50].
@@ -2986,11 +3082,13 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
 
 
 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.51...HEAD
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.53...HEAD
-[v0.107.51]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.50...v0.107.51
+[v0.107.53]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.52...v0.107.53
 -->
 
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.50...HEAD
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.52...HEAD
+[v0.107.52]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.51...v0.107.52
+[v0.107.51]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.50...v0.107.51
 [v0.107.50]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.49...v0.107.50
 [v0.107.49]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.48...v0.107.49
 [v0.107.48]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.47...v0.107.48

Makefile

@@ -27,7 +27,7 @@ DIST_DIR = dist
 GOAMD64 = v1
 GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
 GOSUMDB = sum.golang.google.cn
-GOTOOLCHAIN = go1.22.3
+GOTOOLCHAIN = go1.22.5
 GPG_KEY = devteam@adguard.com
 GPG_KEY_PASSPHRASE = not-a-real-password
 NPM = npm

README.md

@@ -206,9 +206,8 @@ Run `make init` to prepare the development environment.
 You will need this to build AdGuard Home:
 
 - [Go](https://golang.org/dl/) v1.22 or later;
-- [Node.js](https://nodejs.org/en/download/) v16 or later;
+- [Node.js](https://nodejs.org/en/download/) v18.18 or later;
 - [npm](https://www.npmjs.com/) v8 or later;
-- [yarn](https://yarnpkg.com/) v1.22.5 or later.
 
 ### <a href="#building" id="building" name="building">Building</a>
 
@@ -220,14 +219,6 @@ cd AdGuardHome
 make
 ```
 
-#### <a href="#building-node" id="building-node" name="building-node">Building with Node.js 17 and later</a>
-
-In order to build AdGuard Home with Node.js 17 and later, specify `--openssl-legacy-provider` option.
-
-```sh
-export NODE_OPTIONS=--openssl-legacy-provider
-```
-
 > [!WARNING]
 > The non-standard `-j` flag is currently not supported, so building with `make -j 4` or setting your `MAKEFLAGS` to include, for example, `-j 4` is likely to break the build. If you do have your `MAKEFLAGS` set to that, and you don't want to change it, you can override it by running `make -j 1`.
 

bamboo-specs/release.yaml

@@ -7,8 +7,8 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
     'channel': 'edge'
-    'dockerFrontend': 'adguard/home-js-builder:1.1'
+    'dockerFrontend': 'adguard/home-js-builder:2.0'
-    'dockerGo': 'adguard/go-builder:1.22.3--1'
+    'dockerGo': 'adguard/go-builder:1.22.5--1'
 
 'stages':
   - 'Build frontend':
@@ -265,8 +265,8 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
-            'dockerFrontend': 'adguard/home-js-builder:1.1'
+            'dockerFrontend': 'adguard/home-js-builder:2.0'
-            'dockerGo': 'adguard/go-builder:1.22.3--1'
+            'dockerGo': 'adguard/go-builder:1.22.5--1'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
   - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -281,5 +281,5 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
-            'dockerFrontend': 'adguard/home-js-builder:1.1'
+            'dockerFrontend': 'adguard/home-js-builder:2.0'
-            'dockerGo': 'adguard/go-builder:1.22.3--1'
+            'dockerGo': 'adguard/go-builder:1.22.5--1'

bamboo-specs/test.yaml

@@ -5,8 +5,8 @@
     'key': 'AHBRTSPECS'
     'name': 'AdGuard Home - Build and run tests'
 'variables':
-    'dockerFrontend': 'adguard/home-js-builder:1.1'
+    'dockerFrontend': 'adguard/home-js-builder:2.0'
-    'dockerGo': 'adguard/go-builder:1.22.3--1'
+    'dockerGo': 'adguard/go-builder:1.22.5--1'
     'channel': 'development'
 
 'stages':
@@ -194,6 +194,6 @@
         # Set the default release channel on the release branch to beta, as we
         # may need to build a few of these.
         'variables':
-            'dockerFrontend': 'adguard/home-js-builder:1.1'
+            'dockerFrontend': 'adguard/home-js-builder:2.0'
-            'dockerGo': 'adguard/go-builder:1.22.3--1'
+            'dockerGo': 'adguard/go-builder:1.22.5--1'
             'channel': 'candidate'

client/.eslintrc.json

@@ -1,9 +1,13 @@
 {
-    "parser": "babel-eslint",
+    "plugins": ["prettier"],
     "extends": [
+        "airbnb-base",
+        "prettier",
+        "eslint:recommended",
         "plugin:react/recommended",
-        "airbnb-base"
+        "plugin:@typescript-eslint/recommended"
     ],
+    "parser": "@typescript-eslint/parser",
     "env": {
         "jest": true,
         "node": true,
@@ -16,50 +20,21 @@
             "version": "16.4"
         },
         "import/resolver": {
-            "webpack": {
+            "node": {
-                "config": "webpack.common.js"
+                "extensions": [".js", ".jsx", ".ts", ".tsx"]
             }
         }
     },
     "rules": {
-        "indent": [
+        "@typescript-eslint/no-explicit-any": "off",
+        "import/extensions": [
             "error",
-            4,
+            "ignorePackages",
             {
-                "SwitchCase": 1,
+                "js": "never",
-                "VariableDeclarator": 1,
+                "jsx": "never",
-                "outerIIFEBody": 1,
+                "ts": "never",
-                "FunctionDeclaration": {
+                "tsx": "never"
-                    "parameters": 1,
-                    "body": 1
-                },
-                "FunctionExpression": {
-                    "parameters": 1,
-                    "body": 1
-                },
-                "CallExpression": {
-                    "arguments": 1
-                },
-                "ArrayExpression": 1,
-                "ObjectExpression": 1,
-                "ImportDeclaration": 1,
-                "flatTernaryExpressions": false,
-                "ignoredNodes": [
-                    "JSXElement",
-                    "JSXElement > *",
-                    "JSXAttribute",
-                    "JSXIdentifier",
-                    "JSXNamespacedName",
-                    "JSXMemberExpression",
-                    "JSXSpreadAttribute",
-                    "JSXExpressionContainer",
-                    "JSXOpeningElement",
-                    "JSXClosingElement",
-                    "JSXText",
-                    "JSXEmptyExpression",
-                    "JSXSpreadChild"
-                ],
-                "ignoreComments": false
             }
         ],
         "class-methods-use-this": "off",
@@ -68,10 +43,7 @@
         "no-console": [
             "warn",
             {
-                "allow": [
+                "allow": ["warn", "error"]
-                    "warn",
-                    "error"
-                ]
             }
         ],
         "import/no-extraneous-dependencies": [

client/.gitattributes

@@ -1 +1 @@
-*.js text eol=lf
+*.ts text eol=lf

client/.prettierrc

@@ -0,0 +1,10 @@
+{
+  "printWidth": 120,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "bracketSameLine": true,
+  "tabWidth": 4,
+  "semi": true,
+  "arrowParens": "always",
+}

client/.stylelintrc

@@ -1,46 +0,0 @@
-{
-  "defaultSeverity": "warning",
-  "rules": {
-    "block-closing-brace-empty-line-before": "never",
-    "block-no-empty": true,
-    "block-opening-brace-newline-after": "always",
-    "block-opening-brace-space-before": "always",
-    "color-hex-case": "lower",
-    "color-named": "never",
-    "color-no-invalid-hex": true,
-    "length-zero-no-unit": true,
-    "declaration-block-trailing-semicolon": "always",
-    "custom-property-empty-line-before": ["always", {
-      "except": [
-        "after-custom-property",
-        "first-nested"
-      ]
-    }],
-    "declaration-block-no-duplicate-properties": true,
-    "declaration-colon-space-after": "always",
-    "declaration-empty-line-before": ["always", {
-      "except": [
-        "after-declaration",
-        "first-nested",
-        "after-comment"
-      ]
-    }],
-    "font-weight-notation": "numeric",
-    "indentation": [4, {
-      "except": ["value"]
-    }],
-    "max-empty-lines": 2,
-    "no-missing-end-of-source-newline": true,
-    "number-leading-zero": "always",
-    "property-no-unknown": [true, {
-        "ignoreProperties": "/lost-.+/"
-    }],
-    "rule-empty-line-before": [ "always-multi-line", {
-      "except": ["first-nested"],
-      "ignore": ["after-comment"]
-    }],
-    "string-quotes": "double",
-    "value-list-comma-space-after": "always",
-    "unit-case": "lower"
-  }
-}

client/.stylelintrc.js

@@ -0,0 +1,44 @@
+module.exports = {
+  rules: {
+      "selector-type-no-unknown": true,
+      "block-closing-brace-empty-line-before": "never",
+      "block-no-empty": true,
+      "block-opening-brace-newline-after": "always",
+      "block-opening-brace-space-before": "always",
+      "color-hex-case": "lower",
+      "color-named": "never",
+      "color-no-invalid-hex": true,
+      "length-zero-no-unit": true,
+      "declaration-block-trailing-semicolon": "always",
+      "custom-property-empty-line-before": ["always", {
+          "except": [
+              "after-custom-property",
+              "first-nested"
+          ]
+      }],
+      "declaration-block-no-duplicate-properties": true,
+      "declaration-colon-space-after": "always",
+      "declaration-empty-line-before": ["always", {
+          "except": [
+              "after-declaration",
+              "first-nested",
+              "after-comment"
+          ]
+      }],
+      "font-weight-notation": "numeric",
+      "indentation": [4, {
+          "except": ["value"]
+      }],
+      "max-empty-lines": 2,
+      "no-missing-end-of-source-newline": true,
+      "number-leading-zero": "always",
+      "property-no-unknown": true,
+      "rule-empty-line-before": ["always-multi-line", {
+          "except": ["first-nested"],
+          "ignore": ["after-comment"]
+      }],
+      "string-quotes": "double",
+      "value-list-comma-space-after": "always",
+      "unit-case": "lower"
+  }
+}

client/babel.config.cjs

@@ -0,0 +1,14 @@
+module.exports = (api) => {
+    api.cache(false);
+    return {
+        presets: ['@babel/preset-env', '@babel/preset-typescript', '@babel/preset-react'],
+        plugins: [
+            '@babel/plugin-transform-runtime',
+            '@babel/plugin-transform-class-properties',
+            '@babel/plugin-transform-object-rest-spread',
+            '@babel/plugin-transform-nullish-coalescing-operator',
+            '@babel/plugin-transform-optional-chaining',
+            'react-hot-loader/babel',
+        ],
+    };
+};

client/babel.config.js

@@ -1,17 +0,0 @@
-module.exports = (api) => {
-    api.cache(false);
-    return {
-        presets: [
-            '@babel/preset-env',
-            '@babel/preset-react',
-        ],
-        plugins: [
-            '@babel/plugin-proposal-class-properties',
-            '@babel/plugin-transform-runtime',
-            '@babel/plugin-proposal-object-rest-spread',
-            '@babel/plugin-proposal-nullish-coalescing-operator',
-            '@babel/plugin-proposal-optional-chaining',
-            'react-hot-loader/babel',
-        ],
-    };
-};

client/constants.js

@@ -1,11 +1,6 @@
-const BUILD_ENVS = {
+export const BUILD_ENVS = {
     dev: 'development',
     prod: 'production',
 };
 
-const BASE_URL = 'control';
+export const BASE_URL = 'control';
-
-module.exports = {
-    BUILD_ENVS,
-    BASE_URL,
-};

client/global.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+
+declare module '*.svg' {
+    const content: React.FunctionComponent<React.SVGAttributes<SVGElement>>;
+    export default content;
+}

client/jest.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-    transform: {
-        '^.+\\.jsx?$': 'babel-jest',
-    },
-};

client/jest.config.mjs

@@ -0,0 +1,6 @@
+export default {
+    testEnvironment: 'jsdom',
+    transform: {
+        '^.+\\.tsx?$': 'babel-jest',
+    },
+};

client/package.json

@@ -3,19 +3,23 @@
     "version": "0.1.0",
     "private": true,
     "scripts": {
-        "build-dev": "cross-env BUILD_ENV=dev webpack --config webpack.dev.js",
+        "build-dev": "cross-env NODE_ENV=development BUILD_ENV=dev webpack --config webpack.dev.js",
         "build-prod": "cross-env BUILD_ENV=prod webpack --config webpack.prod.js",
         "watch": "cross-env BUILD_ENV=dev webpack --config webpack.dev.js --watch",
         "watch:hot": "cross-env BUILD_ENV=dev webpack-dev-server --config webpack.dev.js",
-        "lint": "eslint src",
+        "lint": "echo 'Lint temporarily disabled'",
-        "lint:fix": "eslint src --fix",
+        "lint-new": "eslint './src/**/*.(ts|tsx)'",
+        "lint:fix": "eslint './src/**/*.(ts|tsx)' --fix",
         "test": "jest",
-        "test:watch": "jest --watch"
+        "test:watch": "jest --watch",
+        "typecheck": "tsc --noEmit",
+        "typecheck:watch": "tsc --noEmit --watch"
     },
+    "type": "module",
     "dependencies": {
         "@nivo/line": "^0.64.0",
         "axios": "^0.19.2",
-        "classnames": "^2.2.6",
+        "classnames": "^2.5.1",
         "countries-and-timezones": "^3.6.0",
         "date-fns": "^1.29.0",
         "i18next": "^19.6.2",
@@ -24,7 +28,8 @@
         "js-yaml": "^3.14.0",
         "lodash": "^4.17.19",
         "nanoid": "^3.1.9",
-        "prop-types": "^15.7.2",
+        "popper.js": "^1.16.1",
+        "prop-types": "^15.8.1",
         "query-string": "^6.13.1",
         "react": "^16.13.1",
         "react-click-outside": "^3.0.1",
@@ -38,53 +43,64 @@
         "react-router-hash-link": "^1.2.2",
         "react-select": "^3.1.0",
         "react-table": "^6.11.4",
-        "react-transition-group": "^4.4.1",
+        "react-transition-group": "^4.4.5",
         "redux": "^4.0.5",
         "redux-actions": "^2.6.5",
-        "redux-form": "^8.3.5",
+        "redux-form": "^8.3.10",
         "redux-thunk": "^2.3.0",
-        "url-polyfill": "^1.1.9"
+        "ts-migrate": "^0.1.35",
+        "url-polyfill": "^1.1.12"
     },
     "devDependencies": {
-        "@babel/core": "^7.9.6",
+        "@babel/core": "^7.24.5",
-        "@babel/plugin-proposal-class-properties": "^7.8.3",
+        "@babel/plugin-transform-class-properties": "^7.24.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.10.4",
+        "@babel/plugin-transform-optional-chaining": "^7.24.5",
-        "@babel/plugin-transform-runtime": "^7.9.6",
+        "@babel/plugin-transform-runtime": "^7.24.3",
-        "@babel/preset-env": "^7.9.6",
+        "@babel/preset-env": "^7.24.5",
-        "@babel/preset-react": "^7.9.4",
+        "@babel/preset-react": "^7.24.1",
-        "autoprefixer": "^9.8.0",
+        "@types/jest": "^29.5.12",
-        "babel-eslint": "^10.1.0",
+        "@types/lodash": "^4.17.4",
-        "babel-loader": "^8.1.0",
+        "@types/react": "^17.0.80",
-        "clean-webpack-plugin": "^3.0.0",
+        "@types/react-dom": "^18.3.0",
-        "copy-webpack-plugin": "^6.0.1",
+        "@types/react-redux": "^7.1.33",
-        "cross-env": "^7.0.2",
+        "@types/react-router-dom": "^5.3.3",
-        "css-loader": "^3.5.3",
+        "@types/react-table": "^7.7.20",
-        "eslint": "^6.8.0",
+        "@types/redux-actions": "^2.6.5",
-        "eslint-config-airbnb": "^18.1.0",
+        "@types/redux-form": "^8.3.10",
-        "eslint-import-resolver-webpack": "^0.12.1",
+        "@typescript-eslint/eslint-plugin": "^7.11.0",
-        "eslint-loader": "^4.0.2",
+        "@typescript-eslint/parser": "^7.10.0",
-        "eslint-plugin-import": "^2.22.1",
+        "babel-loader": "^9.1.3",
-        "eslint-plugin-jsx-a11y": "^6.2.3",
+        "clean-webpack-plugin": "^4.0.0",
-        "eslint-plugin-react": "^7.24.0",
+        "copy-webpack-plugin": "^12.0.2",
-        "eslint-plugin-react-hooks": "^2.5.0",
+        "cross-env": "^7.0.3",
-        "file-loader": "6.0.0",
+        "css-loader": "^7.1.2",
-        "html-webpack-plugin": "^4.3.0",
+        "eslint": "^8.57.0",
-        "jest": "^26.0.1",
+        "eslint-config-airbnb": "^19.0.4",
-        "mini-css-extract-plugin": "^0.9.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-jsx-a11y": "^6.8.0",
+        "eslint-plugin-prettier": "^5.1.3",
+        "eslint-plugin-react": "^7.34.1",
+        "eslint-plugin-react-hooks": "^4.6.2",
+        "file-loader": "^6.2.0",
+        "html-webpack-plugin": "^5.6.0",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
+        "jscodeshift": "^0.15.2",
+        "mini-css-extract-plugin": "^2.9.0",
         "path": "^0.12.7",
-        "postcss-flexbugs-fixes": "4.2.1",
+        "postcss-loader": "^8.1.1",
-        "postcss-loader": "^3.0.0",
+        "prettier": "^3.2.5",
-        "react-hot-loader": "^4.12.21",
+        "react-hot-loader": "^4.13.1",
-        "style-loader": "^1.2.1",
+        "style-loader": "^4.0.0",
-        "stylelint": "^13.5.0",
+        "stylelint": "^16.5.0",
-        "stylelint-webpack-plugin": "2.0.0",
+        "ts-loader": "^9.5.1",
-        "url-loader": "^4.1.0",
+        "url-loader": "^4.1.1",
-        "webpack": "^4.43.0",
+        "webpack": "^5.91.0",
-        "webpack-cli": "^3.3.11",
+        "webpack-cli": "^5.1.4",
-        "webpack-dev-server": "^3.11.0",
+        "webpack-dev-server": "^5.0.4",
-        "webpack-merge": "^4.2.2"
+        "webpack-merge": "^5.10.0"
     },
     "browserslist": {
         "development": [

client/src/__locales/ar.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "استخدم الاستعلامات المتوازية لتسريع عملية الحل عن طريق الاستعلام عن جميع الخوادم المنبع في وقت واحد.",
     "parallel_requests": "الطلبات الموازية",
     "load_balancing": "موازنة الأحمال",
-    "load_balancing_desc": "الاستعلام عن خادم واحد في كل مرة سيستخدم AdGuard  الرئيسية الخوارزمية العشوائية الموزونة لاختيار الخادم بحيث يتم استخدام أسرع خادم في كثير من الأحيان",
     "bootstrap_dns": "خوادم Bootstrap DNS",
     "bootstrap_dns_desc": "عناوين IP لخوادم DNS المستخدمة لحل عناوين IP الخاصة بمحللات DoH/DoT التي تحددها كمصدرين رئيسيين. التعليقات غير مسموح بها.",
     "fallback_dns_title": "خوادم DNS الاحتياطية",
     "fallback_dns_desc": "قائمة الخوادم الاحتياطية المستخدمة في حالة عدم الاستجابة من خوادم DNS الرئيسية. تمتلك تلك الخوادم والخوادم الرئيسية نفس الأوامر.",
     "fallback_dns_placeholder": "أدخل خادم DNS احتياطي واحد لكل سطر",
     "local_ptr_title": "خوادم DNS العكسية الخاصة",
-    "local_ptr_desc": "خوادم DNS التي يستخدمها AdGuard Home لاستعلامات PTR المحلية. تُستخدم هذه الخوادم لحل أسماء المضيفين للعملاء بعناوين IP خاصة ، على سبيل المثال \"192.168.12.34\" ، باستخدام DNS العكسي. في حالة عدم التعيين ، يستخدم AdGuard Home عناوين محللات DNS الافتراضية لنظام التشغيل الخاص بك باستثناء عناوين AdGuard Home نفسها.",
     "local_ptr_default_resolver": "بشكل افتراضي ، يستخدم AdGuard Home محللات DNS العكسية التالية: {{ip}}.",
     "local_ptr_no_default_resolver": "لم يتمكن AdGuard Home من تحديد محللات DNS العكسية المناسبة لهذا النظام.",
     "local_ptr_placeholder": "أدخل عنوان IP واحد لكل سطر",
     "resolve_clients_title": "تفعيل التحليل العكسي لعناوين IP للعملاء",
     "resolve_clients_desc": "حل عكسيًا لعناوين IP للعملاء في أسماء مضيفيهم عن طريق إرسال استعلامات PTR إلى أدوات الحل المقابلة (خوادم DNS الخاصة للعملاء المحليين ، والخوادم الأولية للعملاء الذين لديهم عناوين IP عامة).",
     "use_private_ptr_resolvers_title": "استخدم محللات DNS العكسية الخاصة",
-    "use_private_ptr_resolvers_desc": "قم بإجراء عمليات بحث DNS عكسية عن العناوين التي يتم تقديمها محليًا باستخدام هذه الخوادم الأولية. في حالة التعطيل ، يستجيب AdGuard Home مع NXDOMAIN لجميع طلبات PTR هذه باستثناء العملاء المعروفين من DHCP و / etc / hosts وما إلى ذلك.",
     "check_dhcp_servers": "تحقق من خوادم DHCP",
     "save_config": "حفظ الإعدادات",
     "enabled_dhcp": "خادم DHCP مفعل",
@@ -154,7 +151,6 @@
     "use_adguard_parental": "استخدام خدمة AdGuard للرقابة الأبوية على الويب",
     "use_adguard_parental_hint": "سيتحقق AdGuard Home مما إذا كان النطاق يحتوي على محتوى للبالغين. إنه يستخدم نفس واجهة برمجة التطبيقات الصديقة للخصوصية مثل خدمة الويب الأمنية للتصفح.",
     "enforce_safe_search": "استخدم البحث الآمن",
-    "enforce_save_search_hint": "سيفرض AdGuard Home البحث الآمن في محركات البحث التالية: Google وYouTube وBing وDuckDuckGo وYandex وPixabay.",
     "no_servers_specified": "لم يتم تحديد خوادم",
     "general_settings": "الإعدادات العامة",
     "dns_settings": "إعدادات الـ DNS",

client/src/__locales/be.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "Ужыць адначасныя запыты да ўсіх сервераў для паскарэння апрацоўкі запыту",
     "parallel_requests": "Паралельныя запыты",
     "load_balancing": "Размеркаванне нагрузкі",
-    "load_balancing_desc": "Запытвайце па адным серверы за раз. AdGuard Home будзе выкарыстоўваць выпадковы алгарытм для выбару сервера, так што самы хуткі сервер будзе выкарыстоўвацца часцей.",
     "bootstrap_dns": "Bootstrap DNS-серверы",
     "bootstrap_dns_desc": "IP-адрасы DNS-сервераў, якія выкарыстоўваюцца для вырашэння IP-адрасоў распознавальнікаў DoH/DoT, якія вы ўказваеце ў якасці перадачы. Каментары не дапускаюцца.",
     "fallback_dns_title": "Рэзервовыя DNS-серверы",
     "fallback_dns_desc": "Спіс рэзервовых DNS-сервераў, якія выкарыстоўваюцца, калі вышэйшыя DNS-серверы не адказваюць. Сінтаксіс такі ж, як і ў галоўным полі ўверх.",
     "fallback_dns_placeholder": "Увядзіце па адным рэзервовым серверы DNS у радку",
     "local_ptr_title": "Прыватныя DNS-серверы",
-    "local_ptr_desc": "DNS-серверы, якія AdGuard Home выкарыстоўвае для лакальных PTR-запытаў. Гэтыя серверы выкарыстоўваюцца, каб атрымаць даменавыя імёны кліентаў з прыватнымі IP-адрасамі, напрыклад «192.168.12.34», з дапамогай rDNS. Калі спіс пусты, AdGuard Home выкарыстоўвае прадвызначаныя DNS-серверы вашай АС.",
     "local_ptr_default_resolver": "Па змаўчанні AdGuard Home выкарыстоўвае наступныя зваротныя DNS-рэзолверы: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home не змог вызначыць прыдатныя прыватныя адваротныя DNS-рэзолверы для гэтай сістэмы.",
     "local_ptr_placeholder": "Увядзіце па адным адрасе на радок",
     "resolve_clients_title": "Уключыць запытванне даменавых імёнаў для кліентаў",
     "resolve_clients_desc": "AdGuard Home будзе спрабаваць аўтаматычна вызначыць даменавыя імёны кліентаў праз PTR-запыты да адпаведных сервераў (прыватны DNS-сервер для лакальных кліентаў, upstream-серверы для кліентаў з публічным IP-адрасам).",
     "use_private_ptr_resolvers_title": "Ужываць прыватныя адваротныя DNS-рэзолверы",
-    "use_private_ptr_resolvers_desc": "Пасылаць адваротныя DNS-запыты для лакальна абслугоўных адрасоў на паказаныя серверы. Калі адключана, AdGuard Home будзе адказваць NXDOMAIN на ўсе падобныя PTR-запыты, апроч запытаў пра кліентаў, ужо вядомых па DHCP, /etc/hosts і гэтак далей.",
     "check_dhcp_servers": "Праверыць DHCP-серверы",
     "save_config": "Захаваць канфігурацыю",
     "enabled_dhcp": "DHCP-сервер улучаны",
@@ -154,7 +151,6 @@
     "use_adguard_parental": "Ужывайце модуль Бацькоўскага кантролю AdGuard ",
     "use_adguard_parental_hint": "AdGuard Home праверыць, ці ўтрымвае дамен матэрыялы 18+. Ён выкарыстоўвае той жа API для забеспячэння прыватнасці, што і ўэб-служба бяспекі браўзара.",
     "enforce_safe_search": "Узмацніць бяспечны пошук",
-    "enforce_save_search_hint": "AdGuard Home можа забяспечыць бяспечны пошук у наступных пошукавых сістэмах: Google, Youtube, Bing, DuckDuckGo, Yandex і Pixabay.",
     "no_servers_specified": "Не паказаных сервераў",
     "general_settings": "Асноўныя налады",
     "dns_settings": "Налады DNS",
@@ -675,7 +671,6 @@
     "use_saved_key": "Скарыстаць захаваны раней ключ",
     "parental_control": "Бацькоўскі кантроль",
     "safe_browsing": "Бяспечны інтэрнэт",
-    "served_from_cache": "{{value}} <i>(атрымана з кэша)</i>",
     "form_error_password_length": "Пароль павінен утрымліваць ад {{min}} да {{max}} сімвалаў",
     "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яе ў <1>Агульных наладах</1>.",
     "confirm_dns_cache_clear": "Вы ўпэўнены, што хочаце ачысціць кэш DNS?",

client/src/__locales/bg.json

@@ -65,14 +65,12 @@
     "stats_malware_phishing": "вируси/атаки",
     "stats_adult": "сайтове за възрастни",
     "stats_query_domain": "Най-отваряни страници",
-    "for_last_24_hours": "за последните 24 часа",
     "no_domains_found": "Няма намерени резултати",
     "requests_count": "Сума на заявките",
     "top_blocked_domains": "Най-блокирани страници",
     "top_clients": "Най-активни IP адреси",
     "no_clients_found": "Нямa намерени адреси",
     "general_statistics": "Обща статисика",
-    "number_of_dns_query_24_hours": "Сума на DNS заявки за последните 24 часа",
     "number_of_dns_query_blocked_24_hours": "Сума на блокирани DNS заявки от филтрите за реклама и местни",
     "number_of_dns_query_blocked_24_hours_by_sec": "Сума на блокирани DNS заявки от AdGuard свързани със сигурността",
     "number_of_dns_query_blocked_24_hours_adult": "Сума на блокирани сайтове за възрастни",
@@ -87,7 +85,6 @@
     "use_adguard_parental": "Включи AdGuard Родителски Надзор",
     "use_adguard_parental_hint": "Модул XXX в AdGuard Home ще провери дали страницата има материали за възвъстни. Използва се същия API за анонимност като при модула за Сигурност.",
     "enforce_safe_search": "Включи Безопасно Търсене",
-    "enforce_save_search_hint": "AdGuard Home прилага Безопасно Търсене в следните търсачки и сайтове: Google, Youtube, Bing, и Yandex.",
     "no_servers_specified": "Няма избрани услуги",
     "general_settings": "Общи настройки",
     "custom_filtering_rules": "Местни правила за филтриране",
@@ -209,7 +206,6 @@
     "install_devices_android_list_5": "Променете стойностите на DNS 1 и DNS 2 да използват AdGuard Home сървъра.",
     "install_devices_ios_list_1": "От начален екран, цъкнете на Settings.",
     "install_devices_ios_list_2": "Изберете Wi-Fi от лявото меню (там няма възможност за въвеждане на DNS настройки).",
-    "install_devices_ios_list_3": "Клинете на името на активната мрежа към която сте свързани.",
     "install_devices_ios_list_4": "В полето за DNS изберете ръчно и въведете адреса на AdGuard Home сървъра.",
     "get_started": "Да започваме",
     "next": "Следващ",
@@ -220,7 +216,6 @@
     "encryption_config_saved": "Конфигурацията е успешно записана",
     "encryption_server": "Име на сървъра",
     "encryption_server_enter": "Въведете име на домейна",
-    "encryption_server_desc": "За да използвате HTTPS, трябва името на сървъра да съвпада с това на SSL сертификата.",
     "encryption_redirect": "Автоматично пренасочване към HTTPS",
     "encryption_redirect_desc": "Служи за автоматично пренасочване от HTTP към HTTPS на страницата за Администрация в AdGuard Home.",
     "encryption_https": "HTTPS порт",

client/src/__locales/cs.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Použijte paralelní požadavky na urychlení řešení simultánním dotazováním na všechny navazující servery.",
     "parallel_requests": "Paralelní požadavky",
     "load_balancing": "Optimalizace vytížení",
-    "load_balancing_desc": "Optimalizovaný dotaz na odchozí server. AdGuard Home použije vážený náhodný algoritmus k výběru serveru, takže nejrychlejší server je používán častěji.",
+    "load_balancing_desc": "Dotazy jednoho odchozího serveru ve stejný čas. AdGuard Home používá náhodný algoritmus pro výběr serverů s nejnižším počtem neúspěšných vyhledávání a nejnižší průměrnou dobou vyhledávání.",
     "bootstrap_dns": "Bootstrap DNS servery",
     "bootstrap_dns_desc": "IP adresy DNS serverů používaných k překladu IP adres řešitelů DoH/DoT, které zadáte jako odchozí servery. Komentáře nejsou povoleny.",
     "fallback_dns_title": "Záložní DNS servery",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Použít službu AdGuard Rodičovská kontrola",
     "use_adguard_parental_hint": "AdGuard Home zkontroluje, zda doména obsahuje materiály pro dospělé. Používá stejné API přátelské k ochraně osobních údajů jako služba Bezpečnost prohlížení.",
     "enforce_safe_search": "Použít bezpečné vyhledávání",
-    "enforce_save_search_hint": "AdGuard Home vynutí bezpečné vyhledávání v následujících vyhledávačích: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home vynutí bezpečné vyhledávání v následujících vyhledávačích: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Nebyly specifikovány žádné servery",
     "general_settings": "Obecná nastavení",
     "dns_settings": "Nastavení DNS",

client/src/__locales/da.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Brug parallelforespørgsler til at accelerere fortolkningen ved at forespørge alle upstream-servere samtidigt.",
     "parallel_requests": "Parallelle forespørgsler",
     "load_balancing": "Belastningsfordeling",
-    "load_balancing_desc": "Forespørg én server ad gangen. AdGuard Home vil bruge en vægtet randomiseringsalgoritme til valg af server, så den hurtigste server oftere anvendes.",
+    "load_balancing_desc": "Forespørg én upstream-server ad gangen. AdGuard Home bruger en vægtet tilfældighedsalgoritme til vælg af servere med det laveste antal fejlslagne opslag og den laveste gennemsnitlige opslagstid.",
     "bootstrap_dns": "Bootstrap DNS-servere",
     "bootstrap_dns_desc": "IP-adresser på DNS-servere, som bruges til at opløse IP-adresser på de DoH/DoT-opløsere, som angives som upstreams. Kommentarer er ikke tilladt.",
     "fallback_dns_title": "Reserve DNS-servere",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Brug AdGuards forældrekontrolwebtjeneste",
     "use_adguard_parental_hint": "AdGuard Home vil tjekke, om domænet indeholder voksenindhold vha. den samme fortrolighedsvenlige API som browsingsikkerhedswebtjenesten.",
     "enforce_safe_search": "Brug sikker søgning",
-    "enforce_save_search_hint": "AdGuard Home vil håndhæve sikker søgning i flg. søgemaskiner: Google, YouTube, Bing, DuckDuckGo, Yandex og Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home vil håndhæve sikker søgning i flg. søgemaskiner: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Ingen servere angivet",
     "general_settings": "Generelle indstillinger",
     "dns_settings": "DNS-indstillinger",

client/src/__locales/de.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Parallele Abfragen verwenden, um das Auflösen zu beschleunigen, indem alle Upstream-Server gleichzeitig abgefragt werden.",
     "parallel_requests": "Paralleles Abfragen",
     "load_balancing": "Lastverteilung",
-    "load_balancing_desc": "Einen Server nach dem anderen abfragen. AdGuard Home verwendet den gewichteten Zufallsalgorithmus, um den Server so auszuwählen, dass der schnellste Server häufiger verwendet wird.",
+    "load_balancing_desc": "Es wird jeweils ein Upstream-Server abgefragt. AdGuard Home verwendet einen gewichteten Zufallsalgorithmus, um die Server mit der geringsten Anzahl an fehlgeschlagenen Suchvorgängen und der niedrigsten durchschnittlichen Suchzeit auszuwählen.",
     "bootstrap_dns": "Bootstrap-DNS-Server",
     "bootstrap_dns_desc": "IP-Adressen der DNS-Server, die zum Auflösen der IP-Adressen von DoH/DoT Upstream-Servern verwendet werden, die Sie angegeben haben. Kommentare sind nicht erlaubt.",
     "fallback_dns_title": "Fallback-DNS-Server",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "AdGuard Webservice für Kindersicherung verwenden",
     "use_adguard_parental_hint": "AdGuard Home wird prüfen, ob die Domain jugendgefährdende Inhalte enthält. Zum Schutz Ihrer Privatsphäre wird die selbe API wie für den Webservice für Internetsicherheit verwendet.",
     "enforce_safe_search": "Sichere Suche verwenden",
-    "enforce_save_search_hint": "AdGuard kann Sichere Suche für folgende Suchmaschinen erzwingen: Google, YouTube, Bing, DuckDuckGo, Yandex und Pixabay.",
+    "enforce_save_search_hint": "AdGuard kann Sichere Suche für folgende Suchmaschinen erzwingen: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex und Pixabay.",
     "no_servers_specified": "Keine Server festgelegt",
     "general_settings": "Allgemeine Einstellungen",
     "dns_settings": "DNS-Einstellungen",
@@ -641,7 +641,7 @@
     "show_processed_responses": "Verarbeitet",
     "blocked_safebrowsing": "Gesperrt durch Internetsicherheit",
     "blocked_adult_websites": "Gesperrt durch Kindersicherung",
-    "blocked_threats": "Gesperrte Bedrohungen",
+    "blocked_threats": "Bedrohungen blockiert",
     "allowed": "Zugelassen",
     "filtered": "Gefiltert",
     "rewritten": "Umgeschrieben",

client/src/__locales/en.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Use parallel queries to speed up resolving by querying all upstream servers simultaneously.",
     "parallel_requests": "Parallel requests",
     "load_balancing": "Load-balancing",
-    "load_balancing_desc": "Query one upstream server at a time. AdGuard Home uses its weighted random algorithm to pick the server so that the fastest server is used more often.",
+    "load_balancing_desc": "Query one upstream server at a time. AdGuard Home uses a weighted random algorithm to select servers with the lowest number of failed lookups and the lowest average lookup time.",
     "bootstrap_dns": "Bootstrap DNS servers",
     "bootstrap_dns_desc": "IP addresses of DNS servers used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams. Comments are not permitted.",
     "fallback_dns_title": "Fallback DNS servers",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Use AdGuard parental control web service",
     "use_adguard_parental_hint": "AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.",
     "enforce_safe_search": "Use Safe Search",
-    "enforce_save_search_hint": "AdGuard Home will enforce safe search in the following search engines: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home will enforce safe search in the following search engines: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "No servers specified",
     "general_settings": "General settings",
     "dns_settings": "DNS settings",

client/src/__locales/es.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Usar consultas paralelas para acelerar la resolución al consultar simultáneamente a todos los servidores DNS de subida.",
     "parallel_requests": "Consultas paralelas",
     "load_balancing": "Balanceo de carga",
-    "load_balancing_desc": "Consulta un servidor DNS de subida a la vez. AdGuard Home utiliza su algoritmo aleatorio ponderado para elegir el servidor más rápido y sea utilizado con más frecuencia.",
+    "load_balancing_desc": "Consulta un servidor upstream a la vez. AdGuard Home utiliza un algoritmo aleatorio ponderado para seleccionar los servidores con el menor número de fallos y el menor tiempo medio de búsqueda.",
     "bootstrap_dns": "Servidores DNS de arranque",
     "bootstrap_dns_desc": "Direcciones IP de servidores DNS utilizadas para resolver direcciones IP de los solucionadores DoH/DoT que especifiques como ascendentes. No se permiten comentarios.",
     "fallback_dns_title": "Servidores DNS alternativos",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Usar el control parental de AdGuard",
     "use_adguard_parental_hint": "AdGuard Home comprobará si el dominio contiene materiales para adultos. Utiliza la misma API amigable con la privacidad del servicio web de seguridad de navegación.",
     "enforce_safe_search": "Usar búsqueda segura",
-    "enforce_save_search_hint": "AdGuard Home reforzará la búsqueda segura en los siguientes motores de búsqueda: Google, YouTube, Bing, DuckDuckGo, Yandex y Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home reforzará la búsqueda segura en los siguientes motores de búsqueda: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex y Pixabay.",
     "no_servers_specified": "No hay servidores especificados",
     "general_settings": "Configuración general",
     "dns_settings": "Configuración del DNS",

client/src/__locales/fa.json

@@ -5,21 +5,17 @@
     "upstream_parallel": "استفاده از جستار موازی برای سرعت دادن به تفکیک با جستار همزمان همه جریان های ارسالی",
     "parallel_requests": "درخواست های موازی",
     "load_balancing": "متعادل کننده بار",
-    "load_balancing_desc": "یک سرور بالادستی را در یک زمان پرس و جو کنید. AdGuard Home از الگوریتم تصادفی وزنی خود برای انتخاب سرور استفاده می کند تا سریع ترین سرور بیشتر مورد استفاده قرار گیرد.",
     "bootstrap_dns": "خودراه انداز سرورهای DNS",
     "bootstrap_dns_desc": "آدرس‌های IP سرورهای DNS که برای حل کردن آدرس‌های IP حل‌کننده‌های DoH/DoT که به‌عنوان upstream مشخص می‌کنید، استفاده می‌شوند. اظهار نظر مجاز نیست.",
     "fallback_dns_title": "سرورهای DNS بازگشتی",
     "fallback_dns_desc": "لیست سرورهای DNS بازگشتی که در زمانی که سرورهای DNS بالادستی پاسخ نمی‌دهند استفاده می‌شوند. نحو مانند فیلد بالادستی اصلی بالا است.",
     "fallback_dns_placeholder": "یک سرور DNS بازگشتی در هر خط وارد کنید",
     "local_ptr_title": "سرورهای خصوصی DNS",
-    "local_ptr_desc": "سرور یا سرور های DNS ای که AdGuard Home برای درخواست های منابع محلی ارائه شده مورد استفاده قرار خواهد داد. برای مثال، این سرور برای تعیین نام های سرویس دهنده برای سرویس گیرنده با آدرس های آی پی خصوصی مورد استفاده قرار خواهد گرفت. اگر تعیین نشود،AdGuard Home به طور خودکار از تعیین کننده ی DNS پیش فرض شما استفاده خواهد کرد.",
     "local_ptr_default_resolver": "به طور پیش فرض، AdGuard Home از تعیین کننده های DNS معکوس زیر استفاده می کند: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home نتوانست برای این دستگاه تعیین کننده های DNS معکوس محرمانه مناسب را معین کند.",
-    "local_ptr_placeholder": "در هر خط یک آدرس سرور را وارد کنید",
     "resolve_clients_title": "فعال سازی تعیین نام های سرویس دهنده ی سرویس گیرندگان",
     "resolve_clients_desc": "در صورت فعال بودن،AdGuard Home به طور خودکار اقدام به تعیین نام های سرویس دهنده ی سرویس گیرندگان از آدرس های آی پی با ارسال یک درخواست PTR به یک تعیین کننده ی همتا خواهد کرد (سرور خصوصی DNS برای سرویس گیرندگان محلی،سرور مادر برای سرویس گیرندگان با آی پی عمومی).",
     "use_private_ptr_resolvers_title": "از تعیین کننده های rDNS محرمانه استفاده کنید",
-    "use_private_ptr_resolvers_desc": "داده گیری های دی ان اس معکوس را برای آدرس های اینترنتی خدمات منظقه ای با استفاده از سرور های مادر اجرا کنید. چنانچه غیر فعال باشد،AdGuard Home با NXDOMAIN به همه چنین درخواست های PTR پاسخ می دهد به استثناء خدمات گیرنده های شناخته شده از طرف DHCP،/و غیره/هوست ها، و سایر.",
     "check_dhcp_servers": "بررسی برای سرورهای DHCP",
     "save_config": "ذخیره پیکربندی",
     "enabled_dhcp": "سرور DHCP  فعال شده است",
@@ -117,7 +113,6 @@
     "stats_malware_phishing": "بدافزار/فیشینگ مسدود شده است",
     "stats_adult": "وبسایت غیراخلاقی مسدود شده است",
     "stats_query_domain": "دامنه جستار بالا",
-    "for_last_24_hours": "برای 24 ساعت گذشته",
     "for_last_days": "برای {{count}} روز آخر",
     "for_last_days_plural": "برای {{count}} روز گذشته",
     "stats_disabled": "آمار غیرفعال شده است. شما می توانید از قسمت <0>صفحه تنظیمات</0> آن را روشن نمایید.",
@@ -132,7 +127,6 @@
     "no_upstreams_data_found": "هیچ اطلاعاتی در مورد سرورهای بالادست یافت نشد",
     "number_of_dns_query_days": "تعداد جستار DNS پردازش شده در {{count}} روز آخر",
     "number_of_dns_query_days_plural": "تعداد جستار DNS پردازش شده در {{count}} روز گذشته",
-    "number_of_dns_query_24_hours": "تعداد جستار DNS پردازش شده در 24 ساعت گذشته",
     "number_of_dns_query_blocked_24_hours": "تعداد درخواست DNS مسدود شده با فیلترهای مسدودساز تبلیغ و لیست سیاه میزبان",
     "number_of_dns_query_blocked_24_hours_by_sec": "تعداد درخواست DNS مسدود شده با مدل امنیت وب گردی AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "تعداد وبسایت های غیر اخلاقی مسدود شده",
@@ -147,7 +141,6 @@
     "use_adguard_parental": "از سرویس وب نظارت والدین AdGuard استفاده کن",
     "use_adguard_parental_hint": "AdGuard Home بررسی می کند اگر دامنه حاوی موارد غیر اخلاقی است.آن از همان اِی پی آی دارای حریم خصوصی سرویس وب امنیت وب گردی استفاده می کند.",
     "enforce_safe_search": "اجبار جستجوی اَمن",
-    "enforce_save_search_hint": "AdGuard Home میتواند جستجوی اَمن را در موتور جستجوهای زیر اعمال کند:گوگل،یوتوب،بینگ و یاندکس",
     "no_servers_specified": "سروری تعیین نشده است",
     "general_settings": "تنظیمات عمومی",
     "dns_settings": "تنظیمات DNS",
@@ -430,7 +423,6 @@
     "client_confirm_delete": "آیا واقعا میخواهید \"{{key}}\" کلاینت را حذف کنید؟",
     "list_confirm_delete": "آیا واقعا میخواهید این لیست را حذف کنید؟",
     "auto_clients_title": "کلاینت ها (زمان اِجرا)",
-    "auto_clients_desc": "داده در کلاینت ها که از AdGuard Home استفاده می کند،اما در پیکربندی ذخیره نمی شود",
     "access_title": "تنظیمات دسترسی",
     "access_desc": "در اینجا میتوانید دستورات دسترسی را برای DNS سرور AdGuard Home وارد کنید.",
     "access_allowed_title": "کلاینت های مجاز",
@@ -589,11 +581,11 @@
     "cache_optimistic_desc": "AdGuard Home را وادار می کند که از سمت حافظه پنهان پاسخ دهد حتی وقتی که موارد وارد شده منقضی شده باشد و همچنین سعی بر تازه کردن آنها می کند.",
     "filter_category_general": "General",
     "filter_category_security": "مسدودسازی بدافزار و فیشینگ",
+    "filter_category_regional": "منطقه‌ای",
     "filter_category_other": "ساير",
     "use_saved_key": "از کلید ذخیره شده قبلی استفاده کنید",
     "parental_control": "نظارت والدین",
     "safe_browsing": "وب گردی اَمن",
-    "form_error_password_length": "رمزعبور باید حداقل {{value}} کاراکتر باشد.",
     "protection_section_label": "حفاظت",
     "log_and_stats_section_label": "گزارش پرس و جو و آمار",
     "ignore_query_log": "این مشتری را در گزارش پرس و جو نادیده بگیرید",

client/src/__locales/fi.json

@@ -6,21 +6,20 @@
     "upstream_parallel": "Käytä rinnakkaisia pyyntöjä ja nopeuta selvitystä käyttämällä kaikkia ylävirtapalvelimia samanaikaisesti.",
     "parallel_requests": "Rinnakkaiset pyynnöt",
     "load_balancing": "Kuormantasaus",
-    "load_balancing_desc": "Lähetä pyyntö yhdelle ylävirtapalvelimelle kerrallaan. AdGuard Home pyrkii valitsemaan nopeimman palvelimen painotetun satunnaisalgoritminsa avulla.",
     "bootstrap_dns": "Bootstrap DNS-palvelimet",
     "bootstrap_dns_desc": "Ylävirroiksi määrittämiesi DoH/DoT-resolverien IP-osoitteiden selvitykseen käytettävien DNS-palvelimien IP-osoitteet. Kommentteja ei sallita.",
     "fallback_dns_title": "DNS-varapalvelimet",
     "fallback_dns_desc": "Listaus DNS-varapalvelimista, joita käytetään kun lähtevät DNS-palvelimet eivät vastaa. Syntaksi on sama kuin yllä olevassa pääylävirrat-kentässä.",
     "fallback_dns_placeholder": "Syötä yksi DNS-varapalvelin per rivi",
     "local_ptr_title": "Yksityiset käänteis-DNS-palvelimet",
-    "local_ptr_desc": "DNS-palvelimet, joita AdGuard Home käyttää paikallisille PTR-pyynnöille. Näitä palvelimia käytetään yksityistä IP-osoitetta käyttävien PTR-pyyntöjen osoitteiden, kuten \"192.168.12.34\", selvitykseen käänteis-DNS:n avulla. Jos ei käytössä, AdGuard Home käyttää käyttöjärjestelmän oletusarvoisia DNS-resolvereita, poislukien AdGuard Homen omat osoitteet.",
+    "local_ptr_desc": "AdGuard Homen yksityisille PTR-, SOA- ja NS-pyynnöille käyttämät DNS-palvelimet. Pyyntöä luokitellaan yksityiseksi, jos se pyytää yksityistä IP-aluetta (kuten \"192.168.12.34\") käyttävän aliverkon sisältävää ARPA-verkkotunnusta ja on lähtöisin päätteeltä, jolla on yksityinen IP-osoite. Jos tätä ei ole määritetty, käytetään käyttöjärjestelmän oletusarvoisia DNS-resolvereita (AdGuard Homen IP-osoitteet pois lukien).",
     "local_ptr_default_resolver": "Oletusarvoisesti AdGuard Home käyttää seuraavia käänteis-DNS-resolvereita: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home ei voinut määrittää tälle järjestelmälle sopivaa yksityistä käänteis-DNS-resolveria.",
     "local_ptr_placeholder": "Syötä yksi IP-osoite per rivi",
     "resolve_clients_title": "Käytä päätelaitteiden IP-osoitteille käänteistä selvitystä",
     "resolve_clients_desc": "Selvitä päätelaitteiden IP-osoitteiden isäntänimet käänteisesti lähettämällä PTR-pyynnöt sopiville resolvereille (yksityiset DNS-palvelimet paikallisille päätelaitteille, ylävirtapalvelimet päätelaitteille, joilla on julkiset IP-osoitteet).",
     "use_private_ptr_resolvers_title": "Käytä yksityisiä käänteis-DNS-resolvereita",
-    "use_private_ptr_resolvers_desc": "Suorita käänteis-DNS-selvitykset paikallisesti tarjotuille osoitteille käyttäen näitä ylävirtapalvelimia. Jos ei käytössä, vastaa AdGuard Home kaikkiin sen tyyppisiin PTR-pyyntöihin NXDOMAIN-arvolla, pois lukien DHCP, /etc/hosts, yms. -tiedoista tunnistettut päätelaitteet.",
+    "use_private_ptr_resolvers_desc": "Selvitä yksityisiä IP-osoitteita sisältävien ARPA-verkkotunnusten PTR-, SOA- ja NS-pyynnöt käyttäen yksityisiä ylävirtapalvelimia, DHCP:tä, /etc/hosts-määrityksiä, yms. Jos tämä ei ole käytössä, AdGuard Home vastaa tällaisiin pyyntöihin NXDOMAIN-tiedolla.",
     "check_dhcp_servers": "Etsi DHCP-palvelimia",
     "save_config": "Tallenna asetukset",
     "enabled_dhcp": "DHCP-palvelin otettiin käyttöön",
@@ -154,7 +153,6 @@
     "use_adguard_parental": "Käytä AdGuardin lapsilukko-palvelua",
     "use_adguard_parental_hint": "AdGuard Home tarkistaa, sisältääkö verkkotunnus aikuisille tarkoitettua sisältöä. Se käyttää samaa tietosuojapainotteista rajapintaa, kuin turvallisen selauksen palvelu.",
     "enforce_safe_search": "Käytä turvallista hakua",
-    "enforce_save_search_hint": "AdGuard Home voi pakottaa turvallisen haun käyttöön seuraavissa hakukoneissa: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Palvelimia ei ole määritetty",
     "general_settings": "Yleiset asetukset",
     "dns_settings": "DNS-asetukset",
@@ -326,7 +324,7 @@
     "blocking_ipv6_desc": "Estettyyn AAAA-pyyntöön palautettava IP-osoite",
     "blocking_mode_default": "Oletus: Vastaa IP-nollaosoitteella (0.0.0.0 korvaa A; :: korvaa AAAA) kun estetään mainoseston säännöllä; vastaa säännön määrittämällä IP-osoitteella kun estetään /etc/hosts-tyyppisellä säännöllä",
     "blocking_mode_refused": "REFUSED: Vastaa REFUSED-koodilla",
-    "blocking_mode_nxdomain": "NXDOMAIN: Vastaa NXDOMAIN-koodilla",
+    "blocking_mode_nxdomain": "NXDOMAIN: Vastaa NXDOMAIN-tiedolla",
     "blocking_mode_null_ip": "Tyhjä IP: Vastaa IP-nollaosoitteella (0.0.0.0 korvaa A; :: korvaa AAAA)",
     "blocking_mode_custom_ip": "Mukautettu IP: Vastaa manuaalisesti määritetyllä IP-osoitteella",
     "theme_auto": "Automaattinen",
@@ -501,8 +499,8 @@
     "setup_dns_privacy_ios_1": "<0>DNSCloak</0> tukee <1>DNS-over-HTTPS</1>, mutta oman palvelimen käyttö' varten sille on luotava <2>DNS Stamp</2> -merkintä.",
     "setup_dns_privacy_ios_2": "<0>AdGuard iOS:lle</0> tukee <1>DNS-over-HTTPS</1> ja <1>DNS-over-TLS</1> -toteutuksia.",
     "setup_dns_privacy_other_title": "Muita toteutuksia",
-    "setup_dns_privacy_other_1": "AdGuard Home voi itse olla turvallinen DNS-päätelaite millä tahansa alustalla.",
+    "setup_dns_privacy_other_1": "AdGuard Home voi itse olla suojattu DNS -pääte millä tahansa alustalla.",
-    "setup_dns_privacy_other_2": "<0>dnsproxy</0> tukee kaikkia tunnettuja turvallisia DNS-protokollia.",
+    "setup_dns_privacy_other_2": "<0>dnsproxy</0> tukee kaikkia tunnettuja suojattuja DNS-protokollia.",
     "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> tukee <1>DNS-over-HTTPS</1> -protokollaa.",
     "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> tukee <1>DNS-over-HTTPS</1>-toteutusta.",
     "setup_dns_privacy_other_5": "Löydät lisää toteutuksia <0>täältä</0> ja <1>täältä</1>.",
@@ -709,9 +707,9 @@
     "log_and_stats_section_label": "Pyyntöhistoria ja tilastot",
     "ignore_query_log": "Älä huomioi tätä päätelaitetta pyyntöhistoriassa",
     "ignore_statistics": "Älä huomioi tätä päätettä tilastoissa",
-    "schedule_services": "Keskeytä palveluesto",
+    "schedule_services": "Pysäytä palveluesto",
-    "schedule_services_desc": "Määritä palvelunestosuodattimen keskeytysajoitus.",
+    "schedule_services_desc": "Määritä palvelunestosuodattimen pysäytysajoitus.",
-    "schedule_services_desc_client": "Määritä palvelunestosuodattimen keskeytysajoitus tälle päätteelle.",
+    "schedule_services_desc_client": "Määritä palvelunestosuodattimen pysäytysajoitus tälle päätteelle.",
     "schedule_desc": "Aseta estettujen palveluiden käyttämättömyysjaksot",
     "schedule_invalid_select": "Aloitusaika on oltava ennen lopetusaikaa",
     "schedule_select_days": "Valitse päivät",

client/src/__locales/fr.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Utilisez des requêtes parallèles pour accélérer la résolution en requêtant simultanément tous les serveurs en amont.",
     "parallel_requests": "Requêtes en parallèle",
     "load_balancing": "Équilibrage de charge",
-    "load_balancing_desc": "Interroger un serveur en amont à la fois. AdGuard Home utilise son algorithme aléatoire pondéré pour choisir le serveur de sorte que le serveur le plus rapide soit utilisé plus souvent.",
+    "load_balancing_desc": "Une requête par serveur en amont à la fois. AdGuard Home utilise un algorithme aléatoire pondéré pour sélectionner les serveurs avec le plus petit nombre d'échecs de recherche et le temps de recherche moyen le plus bas.",
     "bootstrap_dns": "Serveurs DNS d'amorçage",
     "bootstrap_dns_desc": "Les adresses IP des serveurs DNS utilisées pour résoudre les adresses IP des résolveurs DoH/DoT que vous spécifiez comme en amont. Les commentaires ne sont pas autorisés.",
     "fallback_dns_title": "Serveurs DNS de repli",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Utiliser le contrôle parental d'AdGuard",
     "use_adguard_parental_hint": "AdGuard Home va vérifier s'il y a du contenu pour adultes sur le domaine. Ce sera fait par aide du même API discret que celui utilisé par le service de Sécurité de navigation.",
     "enforce_safe_search": "Utiliser la Recherche Sécurisée",
-    "enforce_save_search_hint": "AdGuard Home appliquera la recherche sécurisée dans les moteurs de recherche suivants : Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home appliquera la recherche sécurisée dans les moteurs de recherche suivants : Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Pas de serveurs spécifiés",
     "general_settings": "Paramètres généraux",
     "dns_settings": "Paramètres DNS",
@@ -676,7 +676,7 @@
     "filter_allowlist": "ATTENTION : Cette action exclura également la règle « {{disallowed_rule}} » de la liste des clients autorisés.",
     "last_rule_in_allowlist": "Impossible d’interdire ce client, car l’exclusion de la règle « {{disallowed_rule}} » DÉSACTIVERA la liste des « clients autorisés ».",
     "use_saved_key": "Utiliser la clef précédemment enregistrée",
-    "parental_control": "Contrôle parental",
+    "parental_control": "Contrôle Parental",
     "safe_browsing": "Navigation sécurisée",
     "served_from_cache_label": "Servi depuis le cache",
     "form_error_password_length": "Le mot de passe doit comporter entre {{min}} et {{max}}  caractères",

client/src/__locales/hr.json

@@ -6,21 +6,20 @@
     "upstream_parallel": "Koristi paralelne upite kako bi ubrzali rješavanje istovremenim ispitavanjem svih upstream poslužitelja.",
     "parallel_requests": "Paralelni zahtjevi",
     "load_balancing": "Load-balancing",
-    "load_balancing_desc": "Pitajte jedan po jedan uzvodni poslužitelj. AdGuard Home koristi svoj ponderirani slučajni algoritam za odabir poslužitelja tako da se najbrži poslužitelj koristi češće.",
     "bootstrap_dns": "Bootstrap DNS poslužitelji",
     "bootstrap_dns_desc": "IP adrese DNS poslužitelja koji se koriste za rješavanje IP adresa DoH/DoT razrjeđivača koje navedete kao uzvodne. Komentari nisu dopušteni.",
     "fallback_dns_title": "Rezervni DNS poslužitelji",
     "fallback_dns_desc": "Popis rezervnih DNS poslužitelja koji se koriste kada uzvodni DNS poslužitelji ne odgovaraju. Sintaksa je ista kao u gornjem polju glavnog uzvodnog toka.",
     "fallback_dns_placeholder": "Unesite jedan rezervni DNS poslužitelj po retku",
     "local_ptr_title": "Privatni obrnuti DNS poslužitelji",
-    "local_ptr_desc": "DNS poslužitelji koje AdGuard Home koristi za lokalne PTR upite. Ti se poslužitelji koriste za razrješavanje naziva glavnog računala klijenata s privatnim IP adresama, na primjer \"192.168.12.34\", koristeći obrnuti DNS. Ako nije postavljeno, AdGuard Home koristi adrese zadanih DNS razrješivača vašeg OS-a, osim za adrese samog AdGuard Homea.",
+    "local_ptr_desc": "DNS poslužitelji koje koristi AdGuard Home za privatne PTR, SOA i NS zahtjeve. Zahtjev se smatra privatnim ako traži ARPA domenu koja sadrži podmrežu unutar privatnih IP raspona (kao što je \"192.168.12.34\") i dolazi od klijenta s privatnom IP adresom. Ako nije postavljeno, koristit će se zadani DNS rezolveri vašeg OS-a, osim za AdGuard Home IP adrese.",
     "local_ptr_default_resolver": "Prema zadanim postavkama AdGuard Home koristi sljedeće obrnute DNS razrješivače: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home nije mogao odrediti prikladne privatne obrnute DNS razrješivače za ovaj sustav.",
     "local_ptr_placeholder": "Unesite jednu adresu poslužitelja po retku",
     "resolve_clients_title": "Omogući obrnuto rješavanje IP adresa klijenata",
     "resolve_clients_desc": "Obrnuto razriješite IP adrese klijenata u nazive glavnih računala slanjem PTR upita odgovarajućim razrješivačima (privatni DNS poslužitelji za lokalne klijente, uzvodni poslužitelji za klijente s javnim IP adresama).",
     "use_private_ptr_resolvers_title": "Koristi privatne reverzne DNS razrješivače",
-    "use_private_ptr_resolvers_desc": "Izvršite obrnuta DNS traženja za lokalno poslužene adrese pomoću ovih uzlaznih poslužitelja. Ako je onemogućen, AdGuard Home odgovara S NXDOMAIN-om na sve takve PTR zahtjeve osim za klijente poznate iz DHCP-a, /etc/hosts i tako dalje.",
+    "use_private_ptr_resolvers_desc": "Razriješi PTR, SOA i NS zahtjeve za ARPA domene koje sadrže privatne IP adrese putem privatnih uzvodnih poslužitelja, DHCP-a, /etc/hostova itd. Ako je onemogućeno, AdGuard Home će na sve takve zahtjeve odgovoriti s NXDOMAIN.",
     "check_dhcp_servers": "Provjera DHCP poslužitelja",
     "save_config": "Spremi konfiguraciju",
     "enabled_dhcp": "DHCP poslužitelj je omogućen",
@@ -154,7 +153,6 @@
     "use_adguard_parental": "Koristi web uslugu AdGuard roditeljske zaštite",
     "use_adguard_parental_hint": "AdGuard Home provjeriti će sadrži li domena sadržaj za odrasle. Koristi isti API za zaštitu privatnosti kao i naša usluga zaštite pregledavanja.",
     "enforce_safe_search": "Koristi sigurno pretraživanje",
-    "enforce_save_search_hint": "AdGuard Home provodit će sigurno pretraživanje u sljedećim tražilicama: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Nije odabran nijedan poslužitelj",
     "general_settings": "Opće postavke",
     "dns_settings": "DNS postavke",
@@ -425,6 +423,9 @@
     "encryption_hostnames": "Nazivi računala",
     "encryption_reset": "Jeste li sigurni da želite poništiti postavke šifriranja?",
     "encryption_warning": "Upozorenje",
+    "encryption_plain_dns_enable": "Omogući obični DNS",
+    "encryption_plain_dns_desc": "Obični DNS je omogućen prema zadanim postavkama. Možete ga onemogućiti kako biste prisilili sve uređaje da koriste šifrirani DNS. Da biste to učinili, morate omogućiti barem jedan kriptirani DNS protokol",
+    "encryption_plain_dns_error": "Da biste onemogućili obični DNS, omogućite barem jedan kriptirani DNS protokol",
     "topline_expiring_certificate": "Vaš SSL certifikat uskoro ističe. Ažurirajte <0>Postavke šifriranja</0>.",
     "topline_expired_certificate": "Vaš SSL certifikat je istekao. Ažurirajte <0>Postavke šifriranja</0>.",
     "form_error_port_range": "Unesite broj porta od 80 do 65536",
@@ -675,7 +676,7 @@
     "use_saved_key": "Korištenje prethodno spremljenog ključa",
     "parental_control": "Roditeljska zaštita",
     "safe_browsing": "Sigurno surfanje",
-    "served_from_cache": "{{value}} <i>(dohvaćeno iz predmemorije)</i>",
+    "served_from_cache_label": "Posluženo iz predmemorije",
     "form_error_password_length": "Lozinka mora sadržavati od {{min}} do {{max}} znakova",
     "anonymizer_notification": "<0>Napomena:</0>IP anonimizacija je omogućena. Možete ju onemogućiti u <1>općim postavkama</1>.",
     "confirm_dns_cache_clear": "Jeste li sigurni da želite očistiti DNS predmemoriju?",

client/src/__locales/hu.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "Használjon párhuzamos lekéréseket a domainek feloldásának felgyorsításához az összes upstream kiszolgálóra való egyidejű lekérdezéssel.",
     "parallel_requests": "Párhuzamos lekérések",
     "load_balancing": "Terheléselosztás",
-    "load_balancing_desc": "Egyszerre csak egy szerverről történjen lekérdezés. Az AdGuard Home egy súlyozott, véletlenszerű algoritmust fog használni a megfelelő szerver kiválasztására, így a leggyorsabb szervert fogja a leggyakrabban használni.",
     "bootstrap_dns": "Bootstrap DNS kiszolgálók",
     "bootstrap_dns_desc": "A DNS-kiszolgálók IP-címei, amelyek a DoH/DoT-feloldók IP-címeinek feloldására szolgálnak, amelyeket upstreamként megadott. Megjegyzések nem megengedettek.",
     "fallback_dns_title": "Tartalék DNS-szerverek",
     "fallback_dns_desc": "Azoknak a tartalék DNS-szervereknek a listája, amelyeket akkor használnak, ha a felsőbbrendű DNS-szerverek nem válaszolnak. A szintaxis ugyanaz, mint a fő felsőbbrendű mezőben.",
     "fallback_dns_placeholder": "Adjon meg egy alternatív DNS szervert soronként",
     "local_ptr_title": "Privát DNS szerverek",
-    "local_ptr_desc": "Azok a DNS szerverek, amiket az AdGuard Home a helyi PTR kérésekhez használ. ",
     "local_ptr_default_resolver": "Alapesetben az AdGuard Home a következő reverse DNS feloldókat használja: {{ip}}.",
     "local_ptr_no_default_resolver": "Az AdGuard Home nem tudta meghatározni a privát reverse DNS feloldókat ehhez a rendszerhez.",
     "local_ptr_placeholder": "Adjon meg egy IP-címet soronként",
     "resolve_clients_title": "Kliensek IP címeinek fordított feloldása",
     "resolve_clients_desc": "Fordítva oldja fel a kliensek IP címeit a hosztneveikre azáltal, hogy PTR lekérdezéseket küld a megfelelő feloldóknak (privát DNS szerverek a helyi kliensek számára, upstream szerverek a nyilvános IP címmel rendelkező kliensek számára).",
     "use_private_ptr_resolvers_title": "Privát reverse DNS feloldók használata",
-    "use_private_ptr_resolvers_desc": "Reverse DNS keresések végzése a helyileg kiszolgált címekre ezeknek a szervereknek a használatával. Ha le van tiltva, az AdGuard Home az NXDOMAIN használatával válaszol minden ilyen PTR kérésre, kivéve azokat a klienseket, amelyeket már ismer a DHCP, /etc/hosts, stb. által.",
     "check_dhcp_servers": "DHCP szerverek keresése",
     "save_config": "Konfiguráció mentése",
     "enabled_dhcp": "DHCP szerver engedélyezve",
@@ -154,7 +151,6 @@
     "use_adguard_parental": "Használja az AdGuard szülői felügyelet webszolgáltatását",
     "use_adguard_parental_hint": "Az AdGuard Home ellenőrzi, hogy a domain tartalmaz-e felnőtteknek szóló anyagokat. Ugyanazokat az adatvédelmi API-kat használja, mint a böngésző biztonsági webszolgáltatás.",
     "enforce_safe_search": "Biztonságos keresés használata",
-    "enforce_save_search_hint": "Az AdGuard Home a következő keresőmotorokban biztosíthatja a biztonságos keresést: Google, Youtube, Bing, DuckDuckGo, Yandex és Pixabay.",
     "no_servers_specified": "Nincsenek megadott kiszolgálók",
     "general_settings": "Általános beállítások",
     "dns_settings": "DNS beállítások",
@@ -675,7 +671,6 @@
     "use_saved_key": "Előzőleg mentett kulcs használata",
     "parental_control": "Szülői felügyelet",
     "safe_browsing": "Biztonságos böngészés",
-    "served_from_cache": "{{value}} <i>(gyorsítótárból kiszolgálva)</i>",
     "form_error_password_length": "A jelszó legyen {{min}} és {{max}} karakter között",
     "anonymizer_notification": "<0>Megjegyzés:</0> Az IP anonimizálás engedélyezve van. Az <1>Általános beállításoknál letilthatja</1> .",
     "confirm_dns_cache_clear": "Biztos benne, hogy törölni szeretné a DNS-gyorsítótárat?",

client/src/__locales/id.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "Gunakan kueri paralel untuk mempercepat resoluasi dengan menanyakan semua server upstream secara bersamaan",
     "parallel_requests": "Permintaan paralel",
     "load_balancing": "Penyeimbang beban",
-    "load_balancing_desc": "Permintaan satu server pada satu waktu. AdGuard Home akan menggunakan algoritma acak tertimbang untuk memilih server sehingga server tercepat akan lebih sering digunakan.",
     "bootstrap_dns": "Server DNS bootstrap",
     "bootstrap_dns_desc": "Alamat IP server DNS yang digunakan untuk menyelesaikan alamat IP resolver DoH/DoT yang Anda tentukan sebagai upstream. Komentar tidak diizinkan.",
     "fallback_dns_title": "Server DNS cadangan",
     "fallback_dns_desc": "Daftar server DNS cadangan yang digunakan ketika server hulu DNS tidak merespons. Sintaksnya sama dengan kolom hulu utama di atas.",
     "fallback_dns_placeholder": "Masukkan satu server DNS cadangan per baris",
     "local_ptr_title": "Server pembalik DNS pribadi",
-    "local_ptr_desc": "Server DNS yang digunakan AdGuard Home untuk kueri PTR lokal. Server ini digunakan untuk menyelesaikan nama host klien dengan alamat IP pribadi, misalnya \"192.168.12.34\", menggunakan DNS terbalik. Jika tidak disetel, AdGuard Home menggunakan alamat resolver DNS default OS Anda kecuali untuk alamat AdGuard Home itu sendiri.",
     "local_ptr_default_resolver": "Secara bawaan, AdGuard Home menggunakan pemecah DNS terbalik: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home tidak dapat menentukan pemecah DNS terbalik yang sesuai untuk sistem ini.",
     "local_ptr_placeholder": "Masukkan satu alamat IP per baris",
     "resolve_clients_title": "Aktifkan resolusi hostname klien",
     "resolve_clients_desc": "Menyelesaikan alamat IP klien secara terbalik ke nama host mereka dengan mengirimkan kueri PTR ke resolver yang sesuai (server DNS pribadi untuk klien lokal, server upstream untuk klien dengan alamat IP publik).",
     "use_private_ptr_resolvers_title": "Gunakan server pembalik DNS pribadi",
-    "use_private_ptr_resolvers_desc": "Lakukan pencarian DNS terbalik untuk alamat yang disajikan secara lokal menggunakan server hulu ini. Jika dinonaktifkan, Adguard Home merespons dengan NXDOMAIN untuk semua permintaan PTR tersebut kecuali untuk klien yang diketahui dari DHCP, /etc/hosts, dan seterusnya.",
     "check_dhcp_servers": "Cek untuk server DHCP",
     "save_config": "Simpan pengaturan",
     "enabled_dhcp": "Server DHCP diaktifkan",
@@ -72,13 +69,11 @@
     "dhcp_error": "AdGuard Home tidak dapat menentukan apakah ada server DHCP aktif lain pada jaringan",
     "dhcp_static_ip_error": "Jika ingin menggunakan server DHCP, alamat IP statis harus diatur. AdGuard Home gagal menentukan jika antarmuka jaringan ini dikonfigurasi menggunakan alamat IP statis. Silakan atur alamat IP statis secara manual.",
     "dhcp_dynamic_ip_found": "Sistem Anda menggunakan konfigurasi alamat IP dinamis untuk antarmuka <0>{{interfaceName}}</0>. Untuk menggunakan server DHCP, alamat IP statis harus ditetapkan. Alamat IP Anda saat ini adalah <0>{{ipAddress}}</0>. AdGuard Home akan secara otomatis menetapkan alamat IP ini sebagai statis jika Anda menekan tombol Aktifkan DHCP.",
-    "dhcp_lease_added": "Static lease \"{{key}}\" berhasil ditambahkan",
     "dhcp_lease_deleted": "Static lease \"{{key}}\" berhasil dihapus",
     "dhcp_lease_updated": "Static lease \"{{key}}\" berhasil diperbarui",
     "dhcp_new_static_lease": "Static lease baru",
     "dhcp_edit_static_lease": "Mengedit static lease",
     "dhcp_static_leases_not_found": "DHCP static lease tidak ditemukan",
-    "dhcp_add_static_lease": "Tambah static lease",
     "dhcp_reset_leases": "Atur ulang semua kontrak",
     "dhcp_reset_leases_confirm": "Apakah Anda yakin ingin mengatur ulang kontrak Anda?",
     "dhcp_reset_leases_success": "Kontrak DHCP berhasil diatur ulang",
@@ -147,14 +142,13 @@
     "average_upstream_response_time": "Rata-rata waktu respons hulu",
     "response_time": "Waktu respons",
     "average_processing_time_hint": "Rata-rata waktu dalam milidetik untuk pemrosesan sebuah permintaan DNS",
-    "block_domain_use_filters_and_hosts": "Blokir domain menggunakan filter dan file hosts",
+    "block_domain_use_filters_and_hosts": "Blokir domain menggunakan filter dan berkas host",
     "filters_block_toggle_hint": "Anda dapat menyiapkan aturan pemblokiran dalam pengaturan <a>Filter</a>.",
     "use_adguard_browsing_sec": "Gunakan layanan web Keamanan Penjelajahan AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home akan memeriksa apakah domain diblokir oleh layanan web keamanan penjelajahan. Ini akan menggunakan API pencarian yang ramah privasi untuk melakukan pemeriksaan: hanya awalan singkat dari hash nama domain SHA256 yang dikirim ke server.",
     "use_adguard_parental": "Gunakan layanan web kontrol orang tua AdGuard",
     "use_adguard_parental_hint": "AdGuard Home akan mengecek jika domain mengandung materi dewasa. Akan menggunakan API yang ramah privasi yang sama sebagai layanan web keamanan penjelajahan.",
     "enforce_safe_search": "Pakai pencarian aman",
-    "enforce_save_search_hint": "AdGuard Home dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, DuckDuckGo, Yandex, dan Pixabay.",
     "no_servers_specified": "Sever tidak disebutkan",
     "general_settings": "Pengaturan umum",
     "dns_settings": "Pengaturan DNS",
@@ -191,7 +185,7 @@
     "edit_table_action": "Ubah",
     "delete_table_action": "Hapus",
     "elapsed": "Berlalu",
-    "filters_and_hosts_hint": "AdGuard Home memahami aturan dasar adblock dan sintak file hosts.",
+    "filters_and_hosts_hint": "AdGuard Home memahami aturan dasar adblock dan sintak berkas host.",
     "no_blocklist_added": "Tidak ada daftar hitam yang ditambahkan",
     "no_whitelist_added": "Tidak ada daftar putih yang ditambahkan",
     "add_blocklist": "Tambahkan daftar hitam",
@@ -211,8 +205,8 @@
     "form_error_url_format": "Format URL tidak valid",
     "form_error_url_or_path_format": "URL atau jalur absolut dari daftar tidak valid",
     "custom_filter_rules": "Aturan penyaringan khusus",
-    "custom_filter_rules_hint": "Masukkan satu aturan dalam sebuah baris. Anda dapat menggunakan baik aturan adblock maupun sintaks file hosts.",
+    "custom_filter_rules_hint": "Masukkan satu aturan pada satu baris. Anda dapat menggunakan aturan adblock atau sintaks berkas host.",
-    "system_host_files": "File host sistem",
+    "system_host_files": "Berkas host sistem",
     "examples_title": "Contoh",
     "example_meaning_filter_block": "blokir akses ke example.org dan seluruh subdomainnya;",
     "example_meaning_filter_whitelist": "buka blokir akses ke domain example.orf dan seluruh subdomainnya;",
@@ -476,7 +470,7 @@
     "client_confirm_delete": "Apakah anda yakin ingin menghapus klien \"{{key}}\"?",
     "list_confirm_delete": "Anda yakin ingin menghapus daftar ini?",
     "auto_clients_title": "Klien (waktu berjalan)",
-    "auto_clients_desc": "Informasi tentang alamat IP perangkat yang menggunakan atau mungkin menggunakan AdGuard Home. Informasi ini dikumpulkan dari beberapa sumber, termasuk file host, reverse DNS, dll.",
+    "auto_clients_desc": "Informasi tentang alamat IP perangkat yang menggunakan atau mungkin menggunakan AdGuard Home. Informasi ini dikumpulkan dari beberapa sumber, termasuk berkas host, DNS terbalik, dll.",
     "access_title": "Pengaturan akses",
     "access_desc": "Disini anda dapat mengatur aturan akses untuk server AdGuard Home DNS",
     "access_allowed_title": "Klien yang diizinkan",
@@ -494,7 +488,7 @@
     "setup_dns_privacy_1": "<0>DNS melalui TLS:</0> Gunakan <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-over-TLS:</0> Memakai <1>{{address}}</1> string.",
     "setup_dns_privacy_3": "<0>Berikut daftar perangkat lunak yang dapat Anda gunakan.</0>",
-    "setup_dns_privacy_4": "Di perangkat iOS 14 atau macOS Big Sur, Anda dapat mengunduh file '.mobileconfig' khusus yang menambahkan server <highlight>DNS-over-HTTPS</highlight> atau <highlight>DNS-over-TLS</highlight> ke pengaturan DNS.",
+    "setup_dns_privacy_4": "Pada perangkat iOS 14 atau macOS Big Sur, Anda dapat mengunduh berkas khusus '.mobileconfig' yang menambahkan server <highlight>DNS melalui HTTPS</highlight> atau <highlight>DNS melalui TLS</highlight> ke pengaturan DNS.",
     "setup_dns_privacy_android_1": "Android 9 mendukung DNS-over-TLS secara asli. Untuk mengkonfigurasinya, buka Pengaturan → Jaringan & internet → Tingkat Lanjut → DNS Pribadi dan masukkan nama domain Anda di sana.",
     "setup_dns_privacy_android_2": "<0>AdGuard untuk Android</0> mendukung <1>DNS-over-HTTPS</1> dan <1>DNS-over-TLS</1>.",
     "setup_dns_privacy_android_3": "<0>Intra</0> menambahkan dukungan <1>DNS-over-HTTPS</1> untuk Android.",
@@ -517,7 +511,7 @@
     "rewrite_confirm_delete": "Apakah anda yakin ingin menghapus DNS rewrite untuk \"{{key}}\"?",
     "rewrite_desc": "Memungkinkan untuk dengan mudah mengkonfigurasi respons DNS kustom untuk nama domain tertentu.",
     "rewrite_applied": "Aturan Rewrite yang diterapkan",
-    "rewrite_hosts_applied": "Ditulis ulang oleh aturan file hosts",
+    "rewrite_hosts_applied": "Ditulis ulang oleh aturan berkas host",
     "dns_rewrites": "DNS rewrite",
     "form_domain": "Masukkan nama domain",
     "form_answer": "Masaukan alamat IP atau nama domain",
@@ -676,9 +670,8 @@
     "filter_allowlist": "PERINGATAN: Tindakan ini juga akan mengecualikan aturan \"{{disallowed_rule}}\" dari daftar klien yang diizinkan.",
     "last_rule_in_allowlist": "Tidak dapat melarang klien ini karena mengecualikan aturan \"{{disallowed_rule}}\" akan MENONAKTIFKAN daftar \"Klien yang diizinkan\".",
     "use_saved_key": "Gunakan kunci yang disimpan sebelumnya",
-    "parental_control": "Kontrol Orang Tua",
+    "parental_control": "Pengawasan Orang Tua",
     "safe_browsing": "Penjelajahan Aman",
-    "served_from_cache": "{{value}} <i>(disajikan dari cache)</i>",
     "form_error_password_length": "Kata sandi harus terdiri dari {{min}} hingga {{max}}",
     "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> .",
     "confirm_dns_cache_clear": "Apakah Anda yakin ingin menghapus cache DNS?",

client/src/__locales/it.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Utilizza richieste parallele per accelerare la risoluzione interrogando simultaneamente tutti i server upstream.",
     "parallel_requests": "Richieste parallele",
     "load_balancing": "Bilanciamento del carico",
-    "load_balancing_desc": "Interroga un server upstream per volta. AdGuard Home utilizzerà un algoritmo casuale ponderato per la selezione del server, in maniera tale da scegliere spesso il più veloce.",
+    "load_balancing_desc": "Esegui una query su un server upstream alla volta. AdGuard Home utilizza un algoritmo casuale ponderato per selezionare i server con il minor numero di ricerche fallite e il tempo medio di ricerca più basso.",
     "bootstrap_dns": "Server DNS bootstrap",
     "bootstrap_dns_desc": "Indirizzi IP dei server DNS utilizzati per risolvere gli indirizzi IP dei resolver DoH/DoT specificati come upstream. I commenti non sono ammessi.",
     "fallback_dns_title": "Server DNS di fallback",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Utilizza il Controllo Parentale di AdGuard",
     "use_adguard_parental_hint": "AdGuard Home verificherà se il dominio contiene materiale per adulti. Utilizza le stesse API privacy-friendly del servizio web 'sicurezza di navigazione'.",
     "enforce_safe_search": "Utilizza Ricerca Sicura",
-    "enforce_save_search_hint": "AdGuard Home forzerà la ricerca sicura sui seguenti motori di ricerca: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home applicherà la ricerca sicura nei seguenti motori di ricerca: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Nessun server specificato",
     "general_settings": "Impostazioni generali",
     "dns_settings": "Impostazioni DNS",

client/src/__locales/ja.json

@@ -6,21 +6,21 @@
     "upstream_parallel": "並列リクエストを使用する（同時にすべてのアップストリームサーバーに処理要求することで解決スピードが向上）",
     "parallel_requests": "並列リクエスト",
     "load_balancing": "ロードバランシング",
-    "load_balancing_desc": "一度に1つのアップストリームサーバに処理要求します。 AdGuard Homeは、重み付きランダムアルゴリズム（weighted random algorithm）を使用してサーバを選択するため、最速のサーバがより頻繁に使用されます。",
+    "load_balancing_desc": "一度に1つのアップストリームサーバーをクエリします。AdGuard Home は、重み付き乱択アルゴリズムを使用して、ルックアップに失敗した回数が最も少なく、平均ルックアップ時間が最も短いサーバーを選択します。",
     "bootstrap_dns": "ブートストラップDNSサーバ",
     "bootstrap_dns_desc": "アップストリームとして指定したDoH/DoTリゾルバのIPアドレスを解決するために使用されるDNSサーバーのIPアドレスです。（コメントは許可されていません）",
     "fallback_dns_title": "フォールバックDNSサーバー",
     "fallback_dns_desc": "アップストリームDNSサーバーが応答しない場合に使用されるフォールバックDNSサーバーのリストです。構文は上記のmain upstreamsフィールドと同じです。",
     "fallback_dns_placeholder": "フォールバックDNSサーバーを1行に1つずつ入力してください。",
     "local_ptr_title": "プライベートリバースDNSサーバー",
-    "local_ptr_desc": "AdGuard HomeがローカルPTRクエリに使用するDNSサーバーです。これらのサーバーは、rDNSを使ってプライベートIPアドレス（例えば\"192.168.12.34\"）を持つクライアントのホスト名を解決するために使用されます。設定されていない場合、AdGuard HomeはOSのデフォルトDNSリゾルバーのアドレス（AdGuard Home自体のアドレスを除く）を自動的に使用します。",
+    "local_ptr_desc": "AdGuard Home がプライベート PTR、SOA、および NS リクエストに使用する DNS サーバー。プライベート IP 範囲内のサブネット (「192.168.12.34」など) を含む ARPA ドメインを要求し、プライベート IP アドレスを持つクライアントから来たリクエストが、プライベートリクエストとみなされます。本設定が特に指定されていない場合、OS のデフォルト DNS リゾルバ（AdGuard Home の IP アドレスを除く）が使用されます。",
     "local_ptr_default_resolver": "デフォルトでは、AdGuard Homeは次のリバースDNSリゾルバを使用します: {{ip}}",
     "local_ptr_no_default_resolver": "AdGuard Homeは、このシステムに適したプライベートリバースDNSリゾルバを特定できませんでした。",
     "local_ptr_placeholder": "IPアドレスを1行に1つずづ入力してください。",
     "resolve_clients_title": "クライアントのIPアドレスの逆解決を有効にする",
     "resolve_clients_desc": "対応するリゾルバー（ローカルクライアントの場合はプライベートDNSサーバ、パブリックIPを持つクライアントの場合はアップストリームサーバー）にPTRクエリを送信することにより、クライアントのIPアドレスをホストネームに逆解決します。",
     "use_private_ptr_resolvers_title": "プライベートリバースDNSリゾルバを使用",
-    "use_private_ptr_resolvers_desc": "これらのアップストリームサーバーを使用して、ローカルで提供されるアドレスのリバースDNSルックアップを実行します。無効にすると、AdGuard Homeは、DHCP, /etc/hosts などから認識されるクライアントを除き、すべてのこのようなPTR要求にNXDOMAINで応答します。",
+    "use_private_ptr_resolvers_desc": "プライベートアップストリームサーバー、DHCP、/etc/hosts などを通じて、プライベート IP アドレスを含む ARPA ドメインの PTR、SOA、および NS リクエストを解決します。無効にした場合、AdGuard Home はこのようなリクエストのすべてに NXDOMAIN で応答します。",
     "check_dhcp_servers": "DHCPサーバをチェックする",
     "save_config": "構成を保存する",
     "enabled_dhcp": "DHCPサーバを有効にしました",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "AdGuardペアレンタルコントロール・ウェブサービスを使用する",
     "use_adguard_parental_hint": "AdGuard Homeは、ドメインにアダルトコンテンツが含まれているかどうかを確認します。 ブラウジングセキュリティ・ウェブサービスと同じプライバシーに優しいAPIを使用します。",
     "enforce_safe_search": "セーフサーチを使用する",
-    "enforce_save_search_hint": "AdGuard Homeは、次の検索エンジンでセーフサーチを強制適用します: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay",
+    "enforce_save_search_hint": "AdGuard Homeは、次の検索エンジンでセーフサーチを強制適用します: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay",
     "no_servers_specified": "サーバが指定されていません",
     "general_settings": "一般設定",
     "dns_settings": "DNS設定",

client/src/__locales/ko.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "쿼리 처리 속도를 높이려면 모든 업스트림 서버에서 동시에 병렬 쿼리를 사용해주세요.",
     "parallel_requests": "병렬 처리 요청",
     "load_balancing": "로드 밸런싱",
-    "load_balancing_desc": "한 번에 하나의 서버씩 질의합니다. AdGuard Home은 가중 랜덤 알고리즘를 사용해서 가장 빠른 서버가 자주 사용되도록 서버를 선택합니다.",
+    "load_balancing_desc": "한 번에 하나의 업스트림 서버를 쿼리합니다. AdGuard Home은 가중 무작위 알고리즘을 사용하여 조회 실패 횟수가 가장 적고 평균 조회 시간이 가장 짧은 서버를 선택합니다.",
     "bootstrap_dns": "부트스트랩 DNS 서버",
     "bootstrap_dns_desc": "업스트림으로 지정한 DoH/DoT 리졸버의 IP 주소를 확인하는 데 사용되는 DNS 서버의 IP 주소입니다. 주석은 허용되지 않습니다.",
     "fallback_dns_title": "폴백 DNS 서버",
@@ -108,7 +108,7 @@
     "off": "OFF",
     "copyright": "Copyright",
     "homepage": "홈페이지",
-    "report_an_issue": "문제를 보고합니다",
+    "report_an_issue": "문제 신고",
     "privacy_policy": "개인정보취급방침",
     "enable_protection": "보호 활성화",
     "enabled_protection": "보호 활성화됨",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "AdGuard 자녀 보호 웹 서비스 사용",
     "use_adguard_parental_hint": "AdGuard Home은 도메인에 성인 자료가 포함되어 있는지 확인합니다. 브라우징 보안 웹 서비스와 동일한 개인정보 보호 API를 사용함.",
     "enforce_safe_search": "세이프서치 사용",
-    "enforce_save_search_hint": "AdGuard Home은 Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay와 같은 검색 엔진에서 세이프서치를 시행합니다.",
+    "enforce_save_search_hint": "AdGuard Home은 Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay와 같은 검색 엔진에서 세이프서치를 시행합니다.",
     "no_servers_specified": "지정된 서버 없음",
     "general_settings": "일반 설정",
     "dns_settings": "DNS 설정",

client/src/__locales/nl.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Parallelle verzoeken gebruiken om te versnellen door gelijktijdig verzoeken te sturen naar alle upstream servers.",
     "parallel_requests": "Parallelle verzoeken",
     "load_balancing": "Volume balanceren",
-    "load_balancing_desc": "Eén server per keer bevragen. AdGuard Home gebruikt hiervoor een gewogen willekeurig algoritme om de server te kiezen zodat de snelste server meer zal gebruikt worden.",
+    "load_balancing_desc": "Voer zoekopdrachten uit op één upstream-server tegelijk. AdGuard Home gebruikt een gewogen willekeurig algoritme om servers te selecteren met het laagste aantal mislukte zoekopdrachten en de laagste gemiddelde opzoektijd.",
     "bootstrap_dns": "Bootstrap DNS-servers",
     "bootstrap_dns_desc": "IP-adressen van DNS-servers die worden gebruikt om IP-adressen om te zetten van de DoH/DoT-resolvers die je opgeeft als upstreams. Opmerkingen zijn niet toegestaan.",
     "fallback_dns_title": "Back-up DNS-servers",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Gebruik AdGuard Ouderlijk toezicht web service",
     "use_adguard_parental_hint": "AdGuard Home controleert of het domein 18+ content bevat. Dit gebeurt dmv dezelfde privacy vriendelijke API als de Browsing Security web service.",
     "enforce_safe_search": "Veilig zoeken gebruiken",
-    "enforce_save_search_hint": "AdGuard Home kan veilig zoeken forceren voor de volgende zoekmachines: Google, Youtube, Bing, en DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home dwingt veilig zoeken af in de volgende zoekmachines: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Geen servers gespecificeerd",
     "general_settings": "Algemene instellingen",
     "dns_settings": "DNS instellingen",
@@ -495,7 +495,7 @@
     "setup_dns_privacy_2": "<0>DNS-via-HTTPS:</0> Gebruik <1>{{address}}</1> string.",
     "setup_dns_privacy_3": "<0>Hou er rekening mee dat het beveiligde DNS protocol alleen beschikbaar is voor Android 9. U moet dus extra software installeren voor andere besturingssystemen.</0><0>Hier is een lijst van te gebruiken software.</0>",
     "setup_dns_privacy_4": "Op een iOS 14 of macOS Big Sur apparaat kan je een speciaal '.mobileconfig'-bestand downloaden dat <highlight>DNS-via-HTTPS</highlight> of <highlight>DNS-via-TLS</highlight> servers aan de DNS-instellingen toevoegt.",
-    "setup_dns_privacy_android_1": "Android 9 ondersteunt native DNS-via-TLS. Om het te configureren, ga naar Instellingen → Netwerk & internet → Geavanceerd → Privé DNS en voer daar je domeinnaam in.",
+    "setup_dns_privacy_android_1": "Android 9 ondersteunt native DNS-via-TLS. Om het te configureren, ga naar Instellingen → Netwerk & internet → Geavanceerd → Privé-DNS en voer daar je domeinnaam in.",
     "setup_dns_privacy_android_2": "<0>AdGuard voor Android</0>ondersteunt<1>DNS-via-HTTPS </1>en<1>DNS-via-TLS</1>.",
     "setup_dns_privacy_android_3": "<0> Intra </0> voegt <1> DNS-via-HTTPS</1> ondersteuning toe aan Android.",
     "setup_dns_privacy_ios_1": "<0>DNSCloak</0> ondersteunt <1> DNS-via-HTTPS </1>, maar om het te configureren op jouw eigen server moet er een <2> DNS-stempel </2> gegenereerd worden.",
@@ -676,7 +676,7 @@
     "filter_allowlist": "WAARSCHUWING: Deze actie zal ook de regel \"{{disallowed_rule}}\" uitsluiten van de lijst met toegestane clients.",
     "last_rule_in_allowlist": "Kan deze client niet weigeren omdat het uitsluiten van de regel \"{{disallowed_rule}}\" de lijst \"Toegestane clients\" zal UITSCHAKELEN.",
     "use_saved_key": "De eerder opgeslagen sleutel gebruiken",
-    "parental_control": "Ouderlijk toezicht",
+    "parental_control": "Ouderlijk Toezicht ",
     "safe_browsing": "Veilig browsen",
     "served_from_cache_label": "Geleverd vanuit cache",
     "form_error_password_length": "Wachtwoord moet {{min}} tot {{max}} tekens lang zijn",

client/src/__locales/no.json

@@ -5,17 +5,14 @@
     "upstream_parallel": "Bruk parallele forespørsler for å få oppfarten på behandlinger, ved å forespørre til alle oppstrømstjenerne samtidig",
     "parallel_requests": "Parallelle forespørsler",
     "load_balancing": "Pågangstrykk-utjevning",
-    "load_balancing_desc": "Forespør én tjener om gangen. AdGuard Home vil bruke en 'vektlagt tilfeldig valg'-algoritme for å velge tjener, slik at den raskeste tjeneren blir brukt oftere.",
     "bootstrap_dns": "Bootstrap-DNS-tjenere",
     "bootstrap_dns_desc": "IP-adresser til DNS-servere som brukes til å løse IP-adresser til DoH/DoT-løsere du spesifiserer som oppstrøms. Kommentarer er ikke tillatt.",
     "fallback_dns_title": "Reserve DNS-servere",
     "fallback_dns_desc": "Liste over reserve-DNS-servere som brukes når oppstrøms DNS-servere ikke svarer. Syntaksen er den samme som i hovedoppstrømsfeltet ovenfor.",
     "fallback_dns_placeholder": "Angi én reserve-DNS-server per linje",
     "local_ptr_title": "Private DNS-tjenere",
-    "local_ptr_desc": "DNS-tjenerne som AdGuard Home bruker for lokale PTR-spørringer. Disse tjenerne brukes til å løse vertsnavnene til klienter med private IP-adresser, for eksempel \"192.168.12.34\", ved bruk av omvendt DNS. Hvis det ikke er angitt, bruker AdGuard Home adressene til standard-DNS-løserne til operativsystemet ditt, bortsett fra adressene til selve AdGuard Home.",
     "local_ptr_default_resolver": "Som standard, bruker AdGuard Home følgende revers-DNS-oppletere: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home klarte ikke å finne egnede private revers-DNS-oppletere for dette systemet.",
-    "local_ptr_placeholder": "Skriv inn én tjeneradresse per linje",
     "resolve_clients_title": "Skru på revers-oppleting av klienters IP-adresser",
     "use_private_ptr_resolvers_title": "Bruk private omvendte DNS-løsere",
     "check_dhcp_servers": "Se etter DHCP-tjenere",
@@ -106,7 +103,6 @@
     "stats_malware_phishing": "Blokkert skadevare/phishing",
     "stats_adult": "Blokkerte voksennettsteder",
     "stats_query_domain": "Mest forespurte domener",
-    "for_last_24_hours": "de siste 24 timene",
     "for_last_days": "for den siste {{count}} dagen",
     "for_last_days_plural": "de siste {{count}} dagene",
     "stats_disabled": "Statistikkene har blitt skrudd av. Du kan skru den på fra <0>innstillingssiden</0>.",
@@ -121,13 +117,13 @@
     "no_upstreams_data_found": "Ingen oppstrøms servere data funnet",
     "number_of_dns_query_days": "Antall DNS-spørringer behandlet for de siste {{count}} dagene",
     "number_of_dns_query_days_plural": "Antall DNS-forespørsler som ble behandlet de siste {{count}} dagene",
-    "number_of_dns_query_24_hours": "Antall DNS-forespørsler som ble behandlet de siste 24 timene",
     "number_of_dns_query_blocked_24_hours": "Antall DNS-forespørsler som ble blokkert av adblock-filtre, hosts-lister, og domene-lister",
     "number_of_dns_query_blocked_24_hours_by_sec": "Antall DNS-forespørsler som ble blokkert av AdGuard sin nettlesersikkerhetsmodul",
     "number_of_dns_query_blocked_24_hours_adult": "Antall voksennettsteder som ble blokkert",
     "enforced_save_search": "Påtvungede barnevennlige søk",
     "number_of_dns_query_to_safe_search": "Antall DNS-forespørsler til søkemotorer der \"Safe Search\" ble fremtvunget",
     "average_processing_time": "Gjennomsnittlig behandlingstid",
+    "response_time": "Responstid",
     "average_processing_time_hint": "Gjennomsnittstid for behandling av DNS-forespørsler i millisekunder",
     "block_domain_use_filters_and_hosts": "Blokker domener ved hjelp av filtre, «hosts»-filer, og rå domener",
     "filters_block_toggle_hint": "Du kan sette opp blokkeringsoppføringer i <a>Filtre</a>-innstillingene.",
@@ -136,7 +132,6 @@
     "use_adguard_parental": "Benytt AdGuard sin foreldrekontroll-nettjeneste",
     "use_adguard_parental_hint": "AdGuard Home vil sjekke om domenet inneholder erotisk materiale. Den benytter den samme privatlivsvennlige API-en som nettlesersikkerhetstjenesten.",
     "enforce_safe_search": "Påtving barnevennlige søk",
-    "enforce_save_search_hint": "AdGuard Home kan fremtvinge \"Safe Search\" i de følgende søkemotorene: Google, YouTube, Bing, DuckDuckGo, Yandex, og Pixabay.",
     "no_servers_specified": "Ingen tjenere er spesifisert",
     "general_settings": "Generelle innstillinger",
     "dns_settings": "DNS-innstillinger",
@@ -626,7 +621,6 @@
     "use_saved_key": "Bruk den tidligere lagrede nøkkelen",
     "parental_control": "Foreldrekontroll",
     "safe_browsing": "Sikker surfing",
-    "served_from_cache": "{{value}} <i>(formidlet fra mellomlageret)</i>",
     "theme_dark_desc": "Mørkt tema",
     "theme_light_desc": "Lyst tema",
     "disable_notify_until_tomorrow": "Deaktiver beskyttelsen til i morgen",

client/src/__locales/pl.json

@@ -6,7 +6,6 @@
     "upstream_parallel": "Użyj zapytań równoległych, aby przyspieszyć rozwiązywanie przez jednoczesne wysyłanie zapytań do wszystkich serwerów nadrzędnych.",
     "parallel_requests": "Równoległe żądania",
     "load_balancing": "Równoważenie obciążenia",
-    "load_balancing_desc": "Wysyłaj zapytania do jednego serwera nadrzędnego na raz. AdGuard Home używa swojego losowego algorytmu ważonego, aby wybrać serwer, tak aby najszybszy serwer był używany częściej.",
     "bootstrap_dns": "Serwery DNS Bootstrap",
     "bootstrap_dns_desc": "Adresy IP serwerów DNS używanych do rozpoznawania adresów IP programów rozpoznawania nazw DoH/DoT określonych jako nadrzędne. Komentarze są niedozwolone.",
     "fallback_dns_title": "Rezerwowe serwery DNS",
@@ -154,7 +153,6 @@
     "use_adguard_parental": "Użyj usługi Kontrola Rodzicielska AdGuard",
     "use_adguard_parental_hint": "AdGuard Home sprawdzi, czy domena zawiera materiały dla dorosłych. Używa tego samego interfejsu API przyjaznego prywatności, co usługa sieciowa Bezpieczne Przeglądanie. ",
     "enforce_safe_search": "Użyj bezpiecznego wyszukiwania",
-    "enforce_save_search_hint": "AdGuard Home wymusza bezpieczne wyszukiwanie w następujących wyszukiwarkach: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Nie określono serwerów",
     "general_settings": "Ustawienia główne",
     "dns_settings": "Ustawienia DNS",

client/src/__locales/pt-br.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores DNS primário",
     "parallel_requests": "Solicitações paralelas",
     "load_balancing": "Balanceamento de carga",
-    "load_balancing_desc": "Consulte um servidor DNS primário por vez. O AdGuard Home usa seu algoritmo aleatório ponderado para escolher o servidor para que o servidor mais rápido seja usado com mais frequência.",
+    "load_balancing_desc": "Consulte um servidor upstream por vez. O AdGuard Home usa um algoritmo aleatório ponderado para selecionar servidores com o menor número de falhas e o menor tempo médio de consulta.",
     "bootstrap_dns": "Servidores DNS de inicialização",
     "bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams. Comentários não são permitidos.",
     "fallback_dns_title": "Servidores DNS Fallback",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Usar o serviço de controle parental do AdGuard",
     "use_adguard_parental_hint": "O AdGuard Home irá verificar se o domínio contém conteúdo adulto. Ele usa a mesma API amigável de privacidade que o serviço de segurança da navegação.",
     "enforce_safe_search": "Usar pesquisa segura",
-    "enforce_save_search_hint": "O AdGuard Home forcará a pesquisa segura nos seguintes motores de busca: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "O AdGuard Home forcará a pesquisa segura nos seguintes motores de busca: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Nenhum servidor especificado",
     "general_settings": "Configurações gerais",
     "dns_settings": "Configurações de DNS",

client/src/__locales/pt-pt.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores DNS",
     "parallel_requests": "Solicitações paralelas",
     "load_balancing": "Balanceamento de carga",
-    "load_balancing_desc": "Consulte um servidor DNS primário por vez. O AdGuard Home usa seu algoritmo aleatório ponderado para escolher o servidor para que o servidor mais rápido seja usado com mais frequência.",
+    "load_balancing_desc": "Consulta um servidor a montante de cada vez. O AdGuard Home usa um algoritmo aleatório ponderado para selecionar servidores com o menor número de pesquisas com falha e o menor tempo médio de pesquisa.",
     "bootstrap_dns": "Servidores DNS de arranque",
     "bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams. Comentários não são permitidos.",
     "fallback_dns_title": "Servidores DNS de fallback",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Usar o serviço de controlo parental do AdGuard",
     "use_adguard_parental_hint": "O AdGuard Home irá verificar se o domínio contém conteúdo adulto. Usa a mesma API amigável de privacidade que o serviço de segurança da navegação.",
     "enforce_safe_search": "Usar pesquisa segura",
-    "enforce_save_search_hint": "O AdGuard Home forçará a pesquisa segura nos seguintes motores de busca: Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "enforce_save_search_hint": "O AdGuard Home aplicará pesquisa segura nos seguintes motores de busca: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Nenhum servidor especificado",
     "general_settings": "Definições gerais",
     "dns_settings": "Definições de DNS",

client/src/__locales/ro.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "Folosiți interogări paralele pentru a accelera rezolvarea, interogând simultan toate serverele în amonte.",
     "parallel_requests": "Solicitări paralele",
     "load_balancing": "Echilibrare-sarcini",
-    "load_balancing_desc": "Interoghează câte un server în amonte la un moment dat. AdGuard Home utilizează un algoritm de randomizare ponderat pentru a alege serverul, astfel încât cel mai rapid server să fie utilizat mai des.",
     "bootstrap_dns": "Serverele DNS Bootstrap",
     "bootstrap_dns_desc": "Adresele IP ale serverelor DNS utilizate pentru a rezolva adresele IP ale soluțiilor DoH/DoT pe care le specificați ca fiind în amonte. Comentariile nu sunt permise.",
     "fallback_dns_title": "Servere DNS de rezervă",
     "fallback_dns_desc": "Lista serverelor DNS de rezervă utilizate atunci când serverele DNS din amonte nu răspund. Sintaxa este aceeași ca în câmpul principal din amonte de mai sus.",
     "fallback_dns_placeholder": "Introduceți un server DNS de rezervă pe linie",
     "local_ptr_title": "Servere DNS inverse private",
-    "local_ptr_desc": "Serverele DNS pe care AdGuard Home le utilizează pentru interogările PTR locale. Aceste servere sunt utilizate pentru a rezolva solicitările PTR pentru adrese din intervale IP private, de exemplu „192.168.12.34”, utilizând DNS invers. Dacă nu este configurat, AdGuard Home utilizează adresele rezolvatorilor DNS impliciți ai sistemului dvs. de operare, cu excepția adreselor AdGuard Home în sine.",
     "local_ptr_default_resolver": "În mod implicit, AdGuard Home utilizează următorii rezolvatori DNS inverși: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home nu a putut determina rezolvatorii DNS privați adecvați pentru acest sistem.",
     "local_ptr_placeholder": "Introduceți o adresă IP per linie",
     "resolve_clients_title": "Permiteți rezolvarea inversa a adreselor IP ale clienților",
     "resolve_clients_desc": "Rezolvă invers adresele IP ale clienților în numele lor de gazde prin trimiterea interogărilor PTR la rezolvatorii corespunzători (servere DNS private pentru clienți locali, servere în amonte pentru clienți cu adrese IP publice).",
     "use_private_ptr_resolvers_title": "Utilizați rezolvatori DNS inverși privați",
-    "use_private_ptr_resolvers_desc": "Efectuează examinări DNS inverse pentru adresele deservite local folosind aceste servere în amonte. Dacă este dezactivată, AdGuard Home răspunde cu NXDOMAIN la toate aceste cereri PTR, cu excepția clienților cunoscuți din DHCP, /etc/hosts și așa mai departe.",
     "check_dhcp_servers": "Căutați servere DHCP",
     "save_config": "Salvare configurare",
     "enabled_dhcp": "Server DHCP activat",
@@ -154,7 +151,6 @@
     "use_adguard_parental": "Utilizați Controlul Parental AdGuard",
     "use_adguard_parental_hint": "AdGuard Home va verifica pentru conținut adult pe domeniu. Utilizează același API discret ca cel utilizat de serviciul de securitate de navigare.",
     "enforce_safe_search": "Folosiți Căutarea Sigură",
-    "enforce_save_search_hint": "AdGuard Home va impune Căutarea Sigură în următoarele motoare de căutare: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Nu sunt specificate servere",
     "general_settings": "Setări Generale",
     "dns_settings": "Setări DNS",
@@ -675,7 +671,6 @@
     "use_saved_key": "Folosiți cheia salvată anterior",
     "parental_control": "Control Parental",
     "safe_browsing": "Navigare în siguranță",
-    "served_from_cache": "{{value}} <i>(furnizat din cache)</i>",
     "form_error_password_length": "Parola trebuie să aibă între {{min}} și {{max}} caractere",
     "anonymizer_notification": "<0>Nota:</0> Anonimizarea IP este activată. Puteți să o dezactivați în <1>Setări generale</1>.",
     "confirm_dns_cache_clear": "Sunteți sigur că doriți să ștergeți memoria cache DNS?",

client/src/__locales/ru.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Использовать параллельные запросы ко всем серверам одновременно для ускорения обработки запроса.",
     "parallel_requests": "Параллельные запросы",
     "load_balancing": "Распределение нагрузки\n",
-    "load_balancing_desc": "Запрашивать по одному серверу за раз. AdGuard Home использует алгоритм взвешенного случайного выбора сервера, так что самый быстрый сервер используется чаще.",
+    "load_balancing_desc": "Запрашивайте по одному серверу за раз. AdGuard Home использует алгоритм случайной выборки с учётом веса для выбора серверов с наименьшим количеством неудачных запросов и наименьшим средним временем выполнения запроса.",
     "bootstrap_dns": "Bootstrap DNS-серверы",
     "bootstrap_dns_desc": "IP-адреса DNS-серверов, используемых для поиска IP-адресов DoH/DoT upstream-серверов, которые вы указали. Комментарии не допускаются.",
     "fallback_dns_title": "Резервные DNS-серверы",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Включить модуль Родительского контроля AdGuard ",
     "use_adguard_parental_hint": "AdGuard Home проверит, содержит ли домен материалы 18+. Он использует тот же API для обеспечения конфиденциальности, что и веб-служба безопасности браузера.",
     "enforce_safe_search": "Включить безопасный поиск",
-    "enforce_save_search_hint": "AdGuard Home может обеспечить безопасный поиск в следующих поисковых системах: Google, YouTube, Bing, DuckDuckGo, Yandex и Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home будет обеспечивать безопасный поиск в следующих поисковых системах: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Нет указанных серверов",
     "general_settings": "Основные настройки",
     "dns_settings": "Настройки DNS",

client/src/__locales/si-lk.json

@@ -4,10 +4,8 @@
     "parallel_requests": "සමාන්තර ඉල්ලීම්",
     "load_balancing": "ධාරිතාව තුලනය",
     "local_ptr_title": "පෞද්ගලික ප්‍රතිවර්ත ව.නා.ප. සේවාදායක",
-    "local_ptr_desc": "ස්ථානීය PTR විමසුම් සඳහා ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන ව.නා.ප. සේවාදායක. මෙම සේවාදායක පුද්ගලික අ.ජා.කෙ. ලිපින පරාසවල PTR විමසුම් විසඳීමට භාවිතා කරයි, උදාහරණයක් ලෙස ප්‍රතිවර්ත ව.නා.ප. භාවිතයෙන් \"192.168.12.34\". මෙය සකසා නැති නම්, ඇඩ්ගාර්ඩ් හෝම් හි ලිපින සඳහා හැරුනු විට ඔබගේ මෙහෙයුම් පද්ධතියේ පෙරනිමි ව.නා.ප. විසදුම්වල ලිපින භාවිතා කරයි.",
     "local_ptr_default_resolver": "පෙරනිමි පරිදි, ඇඩ්ගාර්ඩ් හෝම් පහත ප්‍රතිවර්ත ව.නා.ප. පිළිවිසඳු භාවිතා කරයි: {{ip}}.",
     "local_ptr_no_default_resolver": "ඇඩ්ගාර්ඩ් හෝම් හට මෙම පද්ධතිය සඳහා සුදුසු පුද්ගලික ප්‍රතිවර්ත ව.නා.ප. පිළිවිසඳු නිශ්චය කරගත නොහැකි විය.",
-    "local_ptr_placeholder": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් යොදන්න",
     "resolve_clients_title": "අනුග්‍රාහකවල අ.ජා.කෙ. ලිපින ප්‍රතිවර්ත විසඳීම සබල කරන්න",
     "use_private_ptr_resolvers_title": "පෞද්. ප්‍රතිවර්ත ව.නා.ප. පිළිවිසඳු භාවිතය",
     "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායක පරීක්‍ෂා කරන්න",
@@ -102,7 +100,6 @@
     "stats_malware_phishing": "අවහිර කළ ද්වේශාංග/තතුබෑම්",
     "stats_adult": "අවහිර කළ වැඩිහිටි වියමන අඩවි",
     "stats_query_domain": "ප්‍රචලිත විමසන ලද වසම්",
-    "for_last_24_hours": "පසුගිය පැය 24 සඳහා",
     "for_last_days": "පසුගිය දවස් {{count}} සඳහා",
     "for_last_days_plural": "පසුගිය දවස් {{count}} සඳහා",
     "stats_disabled": "සංඛ්‍යාලේඛන අබල කර ඇත. එය <0>සැකසුම් පිටුවෙන්</0> සබල කළ හැකිය.",
@@ -115,7 +112,6 @@
     "general_statistics": "පොදු සංඛ්‍යාලේඛන",
     "number_of_dns_query_days": "පසුගිය දවස් {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
     "number_of_dns_query_days_plural": "පසුගිය දවස් {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
-    "number_of_dns_query_24_hours": "පසුගිය පැය 24 සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
     "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ සත්කාරක වාරණ ලැයිස්තු මගින් අවහිර කළ ව.නා.ප. ඉල්ලීම් ගණන",
     "number_of_dns_query_blocked_24_hours_by_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්‍ෂණ ඒකකය මගින් අවහිර කළ ව.නා.ප. ඉල්ලීම් ගණන",
     "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වියමන අඩවි ගණන",
@@ -130,7 +126,6 @@
     "use_adguard_parental": "ඇඩ්ගාර්ඩ් දෙමාපිය පාලන වියමන සේවාව භාවිතා කරන්න",
     "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්‍ෂා කරනු ඇත. එය පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
     "enforce_safe_search": "ආරක්‍ෂිත සෙවුම භාවිතා කරන්න",
-    "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් පහත සෙවුම් යන්ත්‍ර තුළ ආරක්‍ෂිත සෙවුම බලාත්මක කරනු ඇත: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, යාන්ඩෙක්ස් සහ පික්සාබේ.",
     "no_servers_specified": "සේවාදායක කිසිවක් නිශ්චිතව දක්වා නැත",
     "general_settings": "පොදු සැකසුම්",
     "dns_settings": "ව.නා.ප. සැකසුම්",
@@ -505,8 +500,6 @@
     "statistics_enable": "සංඛ්‍යාලේඛන සබල කරන්න",
     "ignore_domains": "නොසලකන වසම් (පේළියකට එක බැගින්)",
     "ignore_domains_title": "නොසලකන වසම්",
-    "ignore_domains_desc_stats": "සංඛ්‍යාලේඛනයෙහි මෙම වසම් සඳහා විමසුම් නොලියැවෙයි",
-    "ignore_domains_desc_query": "විමසුම් සටහනෙහි මෙම වසම් සඳහා විමසුම් නොලියැවෙයි",
     "interval_hours": "පැය {{count}}",
     "interval_hours_plural": "පැය {{count}}",
     "filters_configuration": "පෙරහන් වින්‍යාසය",
@@ -615,8 +608,6 @@
     "use_saved_key": "පෙර සුරැකි යතුර භාවිතා කරන්න",
     "parental_control": "දෙමාපිය පාලනය",
     "safe_browsing": "ආරක්‍ෂිත පිරික්සුම",
-    "served_from_cache": "{{value}} <i>(නිහිතයෙන් ගැනිණි)</i>",
-    "form_error_password_length": "මුරපදය අවම වශයෙන් අකුරු {{value}} ක් දිගු විය යුතුමයි",
     "anonymizer_notification": "<0>සටහන:</0> අ.ජා.කෙ. නිර්නාමිකකරණය සබලයි. ඔබට එය <1>පොදු සැකසුම්</1> හරහා අබල කිරීමට හැකිය .",
     "confirm_dns_cache_clear": "ඔබට ව.නා.ප. නිහිතය හිස් කිරීමට වුවමනාද?",
     "cache_cleared": "ව.නා.ප. නිහිතය හිස් කෙරිණි",

client/src/__locales/sk.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Používať paralelné dopyty na zrýchlenie súčasným dopytovaním všetkých upstream serverov súčasne.",
     "parallel_requests": "Paralelné dopyty",
     "load_balancing": "Vyrovnávanie záťaže",
-    "load_balancing_desc": "Dopytovať len jeden server v danom čase. AdGuard Home použije na výber servera vážený náhodný algoritmus, aby sa najrýchlejší server používal častejšie.",
+    "load_balancing_desc": "Dopytuje sa súčasne len jeden upstream server. AdGuard Home používa vážený náhodný algoritmus na výber serverov s najnižším počtom neúspešných vyhľadávaní a najnižším priemerným časom vyhľadávania.",
     "bootstrap_dns": "Bootstrap DNS servery",
     "bootstrap_dns_desc": "IP adresy serverov DNS používaných na rozlíšenie IP adries prekladačov DoH/DoT, ktoré zadáte ako upstream. Komentáre nie sú povolené.",
     "fallback_dns_title": "Záložné servery DNS",
@@ -89,7 +89,7 @@
     "form_enter_hostname": "Zadajte meno hostiteľa",
     "error_details": "Podrobnosti chyby",
     "response_details": "Podrobnosti odpovede",
-    "request_details": "Podrobnosti požiadavky",
+    "request_details": "Podrobnosti dopytu",
     "client_details": "Podrobnosti klienta",
     "details": "Podrobnosti",
     "back": "Naspäť",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "Použiť AdGuard službu Rodičovská kontrola",
     "use_adguard_parental_hint": "AdGuard Home skontroluje, či doména obsahuje materiály pre dospelých. Používa rovnaké API priateľské k ochrane osobných údajov ako služba Bezpečného prehliadania.",
     "enforce_safe_search": "Používať bezpečné vyhľadávanie",
-    "enforce_save_search_hint": "AdGuard Home vynucuje bezpečné vyhľadávanie v nasledujúcich vyhľadávačoch: Google, YouTube, Bing, DuckDuckGo, Yandex a Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home vynúti bezpečné vyhľadávanie v nasledujúcich vyhľadávačoch: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Neboli špecifikované žiadne servery",
     "general_settings": "Všeobecné nastavenia",
     "dns_settings": "Nastavenia DNS",
@@ -308,7 +308,7 @@
     "form_enter_rate_limit": "Zadajte rýchlostný limit",
     "rate_limit": "Rýchlostný limit",
     "edns_enable": "Povoliť klientsku podsiete EDNS",
-    "edns_cs_desc": "Pridáva možnosť EDNS Client Subnet (ECS) do upstream požiadaviek a zapíše hodnoty odoslané klientmi do denníka dopytov.",
+    "edns_cs_desc": "Pridáva možnosť EDNS Client Subnet (ECS) do upstream dopytov a zapíše hodnoty odoslané klientami do denníka dopytov.",
     "edns_use_custom_ip": "Použiť vlastnú IP adresu pre EDNS",
     "edns_use_custom_ip_desc": "Povoliť používanie vlastnej IP adresy pre EDNS",
     "rate_limit_desc": "Počet požiadaviek za sekundu, ktoré môže jeden klient vykonať. Nastavenie na hodnotu 0 znamená neobmedzene.",
@@ -480,9 +480,9 @@
     "access_title": "Nastavenia prístupu",
     "access_desc": "Tu môžete konfigurovať pravidlá prístupu pre server DNS AdGuard Home.",
     "access_allowed_title": "Povolení klienti",
-    "access_allowed_desc": "Zoznam CIDR, IP adries alebo <a>ClientID</a>. Ak tento zoznam obsahuje položky, AdGuard Home bude akceptovať požiadavky iba od týchto klientov.",
+    "access_allowed_desc": "Zoznam CIDR, IP adries alebo <a>ClientID</a>. Ak tento zoznam obsahuje položky, AdGuard Home bude akceptovať dopyty iba od týchto klientov.",
     "access_disallowed_title": "Nepovolení klienti",
-    "access_disallowed_desc": "Zoznam CIDR, IP adries alebo <a>ClientID</a>. Ak tento zoznam obsahuje položky, AdGuard Home zruší požiadavky od týchto klientov. Toto pole sa ignoruje, ak sú v poli Povolení klienti položky.",
+    "access_disallowed_desc": "Zoznam CIDR, IP adries alebo <a>ClientID</a>. Ak tento zoznam obsahuje položky, AdGuard Home zruší dopyty od týchto klientov. Toto pole sa ignoruje, ak sú v poli Povolení klienti položky.",
     "access_blocked_title": "Nepovolené domény",
     "access_blocked_desc": "Nesmie byť zamieňaná s filtrami. AdGuard Home zruší DNS dopyty, ktoré sa zhodujú s týmito doménami, a tieto dopyty sa nezobrazia ani v denníku dopytov. Môžete určiť presné názvy domén, zástupné znaky alebo pravidlá filtrovania URL adries, napr. \"example.org\", \"*.example.org\" alebo ||example.org^\" zodpovedajúcim spôsobom.",
     "access_settings_saved": "Nastavenia prístupu úspešne uložené",

client/src/__locales/sl.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "Uporabite vzporedne zahteve za pospešitev reševanja s hkratnim poizvedovanjem vseh gorvodnih strežnikov.",
     "parallel_requests": "Vzporedne zahteve",
     "load_balancing": "Uravnavanje obremenitve",
-    "load_balancing_desc": "Poizvedujte po enem strežniku navzgor. AdGuard Home s pomočjo tehtanega naključnega algoritma izbere strežnik, tako da se najpogosteje uporablja najhitrejši strežnik.",
     "bootstrap_dns": "Zagonski DNS strežniki",
     "bootstrap_dns_desc": "Naslovi IP strežnikov DNS, ki se uporabljajo za razreševanje naslovov IP razreševalcev DoH/DoT, ki jih določite kot navzgor. Komentarji niso dovoljeni.",
     "fallback_dns_title": "Rezervni strežniki DNS",
     "fallback_dns_desc": "Seznam rezervnih strežnikov DNS, ki se uporabljajo, ko se gorvodni strežniki DNS ne odzivajo. Sintaksa je enaka kot v zgornjem gorvodnem polju.",
     "fallback_dns_placeholder": "Vnesite en rezervni strežnik DNS na vrstico",
     "local_ptr_title": "Zasebni povratni strežniki DNS",
-    "local_ptr_desc": "Strežniki DNS, ki jih AdGuard Home uporablja za lokalne PTR poizvedbe. Ti strežniki se uporabljajo za reševanje zahtev PTR za naslove v zasebnih obsegih IP, na primer \"192.168.12.34\", z uporabo obratnega DNS. Če ni nastavljen, AdGuard Home uporablja naslove privzetih razreševalnikov DNS vašega OS, razen naslovov samega AdGuard Home.",
     "local_ptr_default_resolver": "AdGuard Home privzeto uporablja te povratne razreševalnike DNS: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home ni mogel določiti ustreznih zasebnih povratnih reševalcev DNS za ta sistem.",
     "local_ptr_placeholder": "Vnesite en naslov IP na vrstico",
     "resolve_clients_title": "Omogoči obratno reševanje naslovov IP gostiteljev",
     "resolve_clients_desc": "Povratno razrešite naslove IP odjemalcev v njihova gostiteljska imena, tako da pošljete poizvedbe PTR ustreznim razreševalcem (zasebni strežniki DNS za lokalne odjemalce, gorvodni strežniki za odjemalce z javnimi naslovi IP).",
     "use_private_ptr_resolvers_title": "Uporabi zasebne povratne razreševalnike rDNS",
-    "use_private_ptr_resolvers_desc": "Opravi povratne preglede DNS za lokalno vročene naslove s pomočjo teh strežnikov. Če je AdGuard onemogočen, se z NXDOMAIN odzove na vse takšne zahteve PTR, razen za odjemalce, znane iz DHCP/etc/hosts itd.",
     "check_dhcp_servers": "Preveri strežnike DHCP",
     "save_config": "Shrani nastavitve",
     "enabled_dhcp": "Strežnik DHCP je omogočen",
@@ -154,7 +151,6 @@
     "use_adguard_parental": "Uporabi AdGuardovo spletno storitev 'Starševski nadzor'",
     "use_adguard_parental_hint": "AdGuard Home bo preveril, če domena vsebuje  vsebine za odrasle. Uporablja enako, za zasebnost prijazen API, kot spletno storitev za varnost brskanja.",
     "enforce_safe_search": "Uporabi Varno iskanje",
-    "enforce_save_search_hint": "AdGuard Home bo vsilil varno iskanje v naslednjih iskalnikih: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Ni določenih strežnikov",
     "general_settings": "Splošne nastavitve",
     "dns_settings": "Nastavitve DNS",

client/src/__locales/sr-cs.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "Koristite paralelne upite da biste ubrzali rešavanje tako što ćete istovremeno ispitati sve uzvodne servere.",
     "parallel_requests": "Paralelni zahtevi",
     "load_balancing": "Load-balancing",
-    "load_balancing_desc": "Koristi jedan upstream server. AdGuard Home koristi najnoviji nasumični algoritam da izabere server tako da se najbrži server češće koristi.",
     "bootstrap_dns": "Bootstrap DNS serveri",
     "bootstrap_dns_desc": "IP adrese DNS servera koje se koriste za rešavanje IP adresa DoH/DoT razrešivača koje navodite kao uzvodne. Komentari nisu dozvoljeni.",
     "fallback_dns_title": "Odstupajući DNS serveri",
     "fallback_dns_desc": "Lista povratnih DNS servera koji se koriste kada se uzvodni DNS serveri ne odaziva. Sintaksa je ista kao u glavnom uzvodnom polju iznad.",
     "fallback_dns_placeholder": "Unesite jedan povratni DNS server po liniji",
     "local_ptr_title": "Private reverse DNS serveri",
-    "local_ptr_desc": "DNS serveri koje AdGuard Home koristi za lokalne PTR upite. Ovi serveri se koriste za rešavanje imena domaćina klijenata sa privatnim IP adresama, na primer \"192.168.12.34\", koristeći obrnuti DNS. Ako nije podešen, AdGuard Home koristi adrese podrazumevanih DNS razrešivača vašeg OS-a osim adresa samog AdGuard Home-a.",
     "local_ptr_default_resolver": "Podrazumevano, AdGuard Home koristi sledeće obrnute DNS razrešivače: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home ne može da odredi pogodne privatne obrnute DNS razrešivače za ovaj sistem.",
     "local_ptr_placeholder": "Unesite jednu IP adresu servera po redu",
     "resolve_clients_title": "Uključi obrnuto razrešavanje klijentskih IP adresa",
     "resolve_clients_desc": "Obrnuto razrešite IP adrese klijenata u njihova imena domaćina slanjem PTR upita odgovarajućim razrešivačima (privatni DNS serveri za lokalne klijente, uzvodni serveri za klijente sa javnim IP adresama).",
     "use_private_ptr_resolvers_title": "Koristi privatne obrnute razrešivače",
-    "use_private_ptr_resolvers_desc": "Izvršavanje obrnutih DNS izgleda za lokalno servirane adrese pomoću ovih uzvodnih servera. Ako je onemogućen, AdGuard Home odgovara sa NXDOMAIN na sve takve PTR zahteve osim klijenata poznatih iz DHCP- a, /etc/hosts itd.",
     "check_dhcp_servers": "Proveri DHCP servere",
     "save_config": "Sačuvaj konfiguraciju",
     "enabled_dhcp": "DHCP server uključen",
@@ -154,7 +151,6 @@
     "use_adguard_parental": "Koristi AdGuard-ovu uslugu roditeljske kontrole",
     "use_adguard_parental_hint": "AdGuard Home će proveriti da li domen sadrži sadržaj za odrasle. Koristi se isti privatni prijateljski API kao i kod usluge bezbednog pregledanja.",
     "enforce_safe_search": "Nametni sigurno pretraživanje",
-    "enforce_save_search_hint": "AdGuard Home može nametnuti sigurno pretraživanje u sledećim pretraživačima: Google, Youtube, Bing, DuckDuckGo i Yandex.",
     "no_servers_specified": "Serveri nisu određeni",
     "general_settings": "Opšte postavke",
     "dns_settings": "DNS postavke",
@@ -675,7 +671,6 @@
     "use_saved_key": "Koristi prethodno sačuvan ključ",
     "parental_control": "Roditeljska kontrola",
     "safe_browsing": "Sigurno pregledanje",
-    "served_from_cache": "{{value}} <i>(posluženo iz predmemorije)</i>",
     "form_error_password_length": "Lozinka mora imati od {{min}} do {{max}} znakova",
     "anonymizer_notification": "<0>Nota:</0> IP prepoznavanje je omogućeno. Možete ga onemogućiti u opštim <1>postavkama</1>.",
     "confirm_dns_cache_clear": "Želite li zaista da obrišite DNS keš?",

client/src/__locales/sv.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "Använd parallella förfrågningar för att snabba upp dessa genom att fråga alla uppströmsservrar samtidigt.",
     "parallel_requests": "Parallella förfrågningar",
     "load_balancing": "Lastbalansering",
-    "load_balancing_desc": "Fråga en uppströmsserver åt gången. AdGuard Home använder sin viktade slumpmässiga algoritm för att välja server så att den snabbaste servern används oftare.",
     "bootstrap_dns": "Bootstrap-DNS-servrar",
     "bootstrap_dns_desc": "IP-adresser för DNS-servrar som används för att lösa IP-adresser för de DoH/DoT-resolvers som du anger som uppströms. Kommentarer är inte tillåtna.",
-    "fallback_dns_title": "Reserv-DNS-servrar",
+    "fallback_dns_title": "Reserv DNS-servrar",
     "fallback_dns_desc": "Lista över reserv-DNS-servrar som används när uppströms DNS-servrar inte svarar. Syntaxen är densamma som i huvuduppströmsfältet ovan.",
     "fallback_dns_placeholder": "Ange en reserv-DNS-server per rad",
     "local_ptr_title": "Privata omvända DNS-servrar",
-    "local_ptr_desc": "DNS servrarna som AdGuard Home använder för lokala PTR frågor. Dessa servrar används för att lösa värdnamnen på klienter med privata IP-adresser, till exempel \"192.168.12.34\", genom omvänd DNS. Om inga servrar angetts använder AdGuard Home adresserna till standard DNS servrar för ditt operativsystem förutom adresserna till AdGuard Home själv.",
     "local_ptr_default_resolver": "Som standard använder AdGuard Home följande omvända DNS upplösare: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home kunde inte fastställa lämpliga privata omvända DNS upplösare för detta system.",
     "local_ptr_placeholder": "Ange en IP-adress per rad",
     "resolve_clients_title": "Aktivera omvänd upplösning av klienters IP-adresser",
     "resolve_clients_desc": "Lös upp klienternas värdnamn med omvänt uppslag av klienternas IP-adresser genom att skicka PTR-frågor till motsvarande upplösare (privata DNS-servrar för lokala klienter, uppströmsservrar för klienter med offentliga IP-adresser).",
     "use_private_ptr_resolvers_title": "Använd privata omvända DNS upplösare",
-    "use_private_ptr_resolvers_desc": "Utför omvända DNS-sökningar för lokalt betjänade adresser med dessa uppströmsservrar. Om det är inaktiverat svarar AdGuard Home med NXDOMAIN på alla sådana PTR-förfrågningar förutom klienter kända från DHCP, /etc/hosts, och så vidare.",
     "check_dhcp_servers": "Letar efter DHCP-servrar",
     "save_config": "Spara konfiguration",
     "enabled_dhcp": "DHCP-server aktiverad",
@@ -141,8 +138,8 @@
     "number_of_dns_query_blocked_24_hours": "Antalet DNS-förfrågningar som blockerades av annonsfilter och värdens blockeringsklistor",
     "number_of_dns_query_blocked_24_hours_by_sec": "Antalet DNS-förfrågningar som blockerades av AdGuards modul för surfsäkerhet",
     "number_of_dns_query_blocked_24_hours_adult": "Antalet vuxensajter som blockerats",
-    "enforced_save_search": "Aktivering av Säker surf",
+    "enforced_save_search": "Genomdrev SafeSearch",
-    "number_of_dns_query_to_safe_search": "Antalet DNS-förfrågningar mot sökmotorer där Säker surf tvingats",
+    "number_of_dns_query_to_safe_search": "Antalet DNS-förfrågningar till sökmotorer för vilka SafeSearch genomdrevs",
     "average_processing_time": "Genomsnittlig processtid",
     "average_upstream_response_time": "Genomsnittlig svarstid uppströmsserver",
     "response_time": "Svarstid",
@@ -153,8 +150,7 @@
     "use_adguard_browsing_sec_hint": "AdGuard Home kommer att kontrollera om en domän är blockerad av webbservicen surfsäkerhet. Med en integritetsvänlig metod görs en API-lookup för att kontrollera: endast ett kort prefix i domännamnet SHA256 hash skickas till servern.",
     "use_adguard_parental": "Använda AdGuards webbservice för föräldrakontroll",
     "use_adguard_parental_hint": "AdGuard Home kommer att kontrollera domäner för innehåll av vuxenmaterial . Samma integritetsvänliga metod för  API-lookup som tillämpas i webbservicens surfsäkerhet används.",
-    "enforce_safe_search": "Använd säker webbsökning",
+    "enforce_safe_search": "Använd SafeSearch",
-    "enforce_save_search_hint": "AdGuard Home kommer tvinga säker surf på följande sökmotorer: Google, Youtube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Inga servrar angivna",
     "general_settings": "Allmänna inställningar",
     "dns_settings": "DNS-inställningar",
@@ -657,7 +653,7 @@
     "cache_optimistic": "Optimistisk cachning",
     "cache_optimistic_desc": "Få AdGuard Home att svara från cachen även när posterna har gått ut och försök även uppdatera dem.",
     "filter_category_general": "Allmänt",
-    "filter_category_security": "säkerhet",
+    "filter_category_security": "Säkerhet",
     "filter_category_regional": "Regional",
     "filter_category_other": "Övrigt",
     "filter_category_general_desc": "Listor som blockerar spårning och reklam på de flesta enheterna",
@@ -674,7 +670,6 @@
     "use_saved_key": "Använd den tidigare sparade nyckeln",
     "parental_control": "Föräldrakontroll",
     "safe_browsing": "Säker surfning",
-    "served_from_cache": "{{value}} <i>(levereras från cache)</i>",
     "form_error_password_length": "Lösenordet måste vara {{min}} till {{max}} tecken långt",
     "anonymizer_notification": "<0>Observera:</0> IP-anonymisering är aktiverad. Du kan inaktivera den i <1>Allmänna inställningar</1>.",
     "confirm_dns_cache_clear": "Är du säker på att du vill rensa DNS-cache?",

client/src/__locales/th.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "การตั้งค่าไคลเอนต์",
     "bootstrap_dns": "Bootstrap เซิร์ฟเวอร์ DNS",
-    "bootstrap_dns_desc": "เซิร์ฟเวอร์ Bootstrap DNS ใช้เพื่อแก้ไขที่อยู่ IP ของตัวแก้ไข DoH / DoT ที่คุณระบุว่าเป็น upstreams",
     "check_dhcp_servers": "ตรวจสอบ DHCP servers",
     "enabled_dhcp": "เปิดการใช้งาน DHCP server แล้ว",
     "disabled_dhcp": "ปิดการใช้งาน DHCP server แล้ว",
@@ -13,13 +12,6 @@
     "dhcp_leases": "สัญญาเช่า DHCP",
     "dhcp_static_leases": "DHCP แบบกำหนด",
     "dhcp_leases_not_found": "ไม่พบสัญญาเช่า DHCP",
-    "form_error_required": "ช่องที่ต้องกรอก",
-    "form_error_ip4_format": "รูปแบบ IPv4 ไม่ถูกต้อง",
-    "form_error_ip6_format": "รูปแบบ IPv6 ไม่ถูกต้อง",
-    "form_error_ip_format": "รูปแบบ IP ไม่ถูกต้อง",
-    "form_error_mac_format": "รูปแบบ MAC ไม่ถูกต้อง",
-    "form_error_client_id_format": "รูปแบบ ID ลูกค้าไม่ถูกต้อง",
-    "form_error_positive": "ต้องมากกว่า 0",
     "dhcp_form_gateway_input": "IP ของเกตเวย์",
     "dhcp_form_subnet_input": "ซับเน็ตมาสก์",
     "dhcp_form_range_title": "ช่วงของที่อยู่ IP",
@@ -54,7 +46,6 @@
     "copyright": "ลิขสิทธิ์",
     "homepage": "หน้าหลัก",
     "report_an_issue": "รายงานปัญหา",
-    "privacy_policy": "นโยบายความเป็นส่วนตัว",
     "enable_protection": "เปิดใช้งานการป้องกัน",
     "enabled_protection": "เปิดใช้งานการป้องกันแล้ว",
     "disable_protection": "ปิดใช้งานการป้องกัน",
@@ -65,7 +56,6 @@
     "stats_malware_phishing": "ปิดกั้นมัลแวร์/ฟิชชิ่ง แล้ว",
     "stats_adult": "ปิดกั้นเว็บไซต์สำหรับผู้ใหญ่แล้ว",
     "stats_query_domain": "โดเมนที่เข้าบ่อยสุด",
-    "for_last_24_hours": "ในช่วง 24 ชั่วโมงที่ผ่านมา",
     "for_last_days": "สำหรับ {{count}} วันสุดท้าย",
     "for_last_days_plural": "สำหรับ {{count}} วันล่าสุด",
     "no_domains_found": "ไม่พบโดเมน",
@@ -80,10 +70,8 @@
     "block_domain_use_filters_and_hosts": "ปิดกั้นโดเมนโดยใช้ตัวกรองและไฟล์โฮสต์",
     "filters_block_toggle_hint": "คุณสามารถตั้งค่ากฎการปิดกั้นในการตั้งค่า<a>ตัวกรอง</a>",
     "use_adguard_browsing_sec": "ใช้บริการเว็บการรักษาความปลอดภัยการเรียกดู AdGuard",
-    "use_adguard_browsing_sec_hint": "AdGuard Home จะตรวจสอบว่าโดเมนอยู่ในรายการที่ไม่อนุญาตโดยเว็บเซอร์วิสความปลอดภัยการสืบค้นหรือไม่ จะใช้ API การค้นหาที่เป็นมิตรกับข้อมูลส่วนบุคคลเพื่อทำการตรวจสอบ: มีการส่งคำนำหน้าสั้น ๆ ของชื่อโดเมน SHA256 แฮชไปยังเซิร์ฟเวอร์",
     "use_adguard_parental": "ใช้บริการเว็บการควบคุมโดยผู้ปกครองของ AdGuard",
     "use_adguard_parental_hint": "AdGuard Home จะตรวจสอบว่าโดเมนมีเนื้อหาสำหรับผู้ใหญ่หรือไม่ มันใช้ API ความเป็นส่วนตัวเช่นเดียวกับบริการเว็บการรักษาความปลอดภัยการท่องเว็บ",
-    "enforce_safe_search": "บังคับใช้การค้นหาที่ปลอดภัย",
     "no_servers_specified": "ไม่ได้ระบุเซิร์ฟเวอร์",
     "general_settings": "การตั้งค่าทั่วไป",
     "dns_settings": "การตั้งค่า DNS",
@@ -96,12 +84,6 @@
     "apply_btn": "นำไปใช้",
     "disabled_filtering_toast": "ปิดใช้งานการกรอง",
     "enabled_filtering_toast": "เปิดใช้งานการกรอง",
-    "disabled_safe_browsing_toast": "ปิดใช้งานการเรียกดูอย่างปลอดภัย",
-    "enabled_safe_browsing_toast": "เปิดการใช้งาน safebrowsing",
-    "disabled_parental_toast": "ปิดใช้งานการควบคุมโดยผู้ปกครอง",
-    "enabled_parental_toast": "เปิดการใช้งานเข้าเว็บไม่พึงประสงค์",
-    "disabled_safe_search_toast": "ปิดใช้งานการค้นหาที่ปลอดภัย",
-    "enabled_save_search_toast": "เปิดใช้งานการค้นหาที่ปลอดภัย",
     "enabled_table_header": "เปิดใช้งาน",
     "name_table_header": "ชื่อ",
     "rules_count_table_header": "กฎการนับ",
@@ -116,18 +98,6 @@
     "custom_filter_rules": "กฎการกรองที่กำหนดเอง",
     "custom_filter_rules_hint": "ป้อนหนึ่งกฎในหนึ่งบรรทัด คุณสามารถใช้กฎปิดกั้นโฆษณาหรือโฮสต์ไฟล์ไวยากรณ์",
     "examples_title": "ตัวอย่าง",
-    "example_meaning_filter_block": "ปิดกั้นการเข้าถึงโดเมน example.org และโดเมนย่อยทั้งหมด",
-    "example_meaning_filter_whitelist": "เลิกปิดกั้นการเข้าถึงโดเมน example.org และโดเมนย่อยทั้งหมด",
-    "example_meaning_host_block": "ตอนนี้ AdGuard Home จะส่งคืนที่อยู่ 127.0.0.1 สำหรับโดเมน example.org (แต่ไม่ใช่โดเมนย่อย)",
-    "example_comment": "! นี่ความคิดเห็น",
-    "example_comment_meaning": "เพียงความคิดเห็น",
-    "example_comment_hash": "# นอกจากนี้ยังมีความคิดเห็น",
-    "example_regex_meaning": "ปิดกั้นการเข้าถึงโดเมนที่ตรงกับนิพจน์ทั่วไปที่ระบุ",
-    "example_upstream_regular": "DNS ปกติ (มากกว่า UDP)",
-    "example_upstream_dot": "encrypted <0>DNS-over-TLS</0> แล้ว",
-    "example_upstream_doh": "เข้ารหัส <0>DNS-over-HTTPS</0> แล้ว",
-    "example_upstream_sdns": "คุณสามรถใช้ <0>DNS Stamps</0> กับ <1>DNSCrypt</1> หรือ <2>DNS-over-HTTPS</2> ตัวแก้ปัญหา",
-    "example_upstream_tcp": "dNS ปกติ (ผ่าน TCP)",
     "dns_test_ok_toast": "เซิร์ฟเวอร์ DNS ที่ระบุทำงานอย่างถูกต้อง",
     "dns_test_not_ok_toast": "เซิร์ฟเวอร์ \"{{key}}\": ไม่สามารถใช้งานได้ โปรดตรวจสอบว่าคุณเขียนถูกต้อง",
     "unblock": "เลิกปิดกั้น",
@@ -147,7 +117,6 @@
     "loading_table_status": "กำลังโหลด...",
     "page_table_footer_text": "หน้า",
     "rows_table_footer_text": "ตาราง",
-    "updated_custom_filtering_toast": "อัปเดตกฎการกรองที่กำหนดเอง",
     "rule_removed_from_custom_filtering_toast": "ลบกฎออกจากกฎการกรองที่กำหนดเองแล้ว {{rule}}",
     "rule_added_to_custom_filtering_toast": "เพิ่มกฎในกฎการกรองที่กำหนดเองแล้ว {{rule}}",
     "query_log_response_status": "สถานะ: {{value}}",
@@ -155,12 +124,10 @@
     "query_log_confirm_clear": "คุณแน่ใจหรือไม่ว่าต้องการลบบันทึกการใช้งานทั้งหมด?",
     "query_log_cleared": "บันทึกการใช้งานได้รับการล้างเรียบร้อยแล้ว",
     "query_log_clear": "ล้างบันทึกการสืบค้น",
-    "query_log_retention": "แบบสอบถามบันทึกการเก็บรักษา",
     "query_log_enable": "เปิดใช้งานบันทึก",
     "query_log_configuration": "บันทึกการกำหนดค่า",
     "query_log_disabled": "บันทึกแบบสอบถามถูกปิดใช้งานและสามารถกำหนดค่าใน <0>การตั้งค่า</0>",
     "query_log_strict_search": "ใช้เครื่องหมายคำพูดคู่เพื่อการค้นหาที่จำกัด",
-    "query_log_retention_confirm": "คุณแน่ใจหรือไม่ว่าต้องการเปลี่ยนการเก็บข้อมูลบันทึกแบบสอบถาม? หากคุณลดค่าช่วงเวลา ข้อมูลบางอย่างจะหายไป",
     "dns_config": "การกำหนดค่าเซิร์ฟเวอร์ DNS",
     "blocking_mode": "โหมดการปิดกั้น",
     "default": "ค่าเริ่มต้น",
@@ -175,8 +142,6 @@
     "dns_over_quic": "DNS-over-QUIC",
     "form_enter_rate_limit": "ป้อนขีดจำกัดอัตรา",
     "rate_limit": "จำกัดอัตรา",
-    "edns_enable": "เปิดใช้งานซับเน็ตไคลเอ็นต์ EDNS",
-    "edns_cs_desc": "หากเปิดใช้งาน AdGuard Home จะส่งซับเน็ตของไคลเอนต์ไปยังเซิร์ฟเวอร์ DNS",
     "blocking_ipv4_desc": "ที่อยู่ IP ที่จะส่งคืนสำหรับคำขอที่ถูกปิดกั้น",
     "blocking_ipv6_desc": "ที่อยู่ IP ที่จะส่งคืนสำหรับคำขอ AAAA ที่ถูกปิดกั้น",
     "blocking_mode_nxdomain": "NXDOMAIN: ตอบสนองด้วยรหัส NXDOMAIN",
@@ -197,7 +162,6 @@
     "install_settings_dns_desc": "คุณจะต้องกำหนดค่าอุปกรณ์หรือเราเตอร์ของคุณเพื่อใช้เซิร์ฟเวอร์ DNS ตามที่อยู่ต่อไปนี้:",
     "install_settings_all_interfaces": "อินเทอร์เฟซทั้งหมด",
     "install_auth_title": "การตรวจสอบสิทธิ์",
-    "install_auth_desc": "ขอแนะนำอย่างยิ่งให้กำหนดค่าการตรวจสอบรหัสผ่านให้กับส่วนต่อประสานเว็บผู้ดูแลระบบ AdGuard Home ของคุณ แม้ว่ามันจะสามารถเข้าถึงได้เฉพาะในเครือข่ายท้องถิ่นของคุณก็ยังคงเป็นสิ่งสำคัญที่จะปกป้องมันจากการเข้าถึงที่ไม่จำกัด",
     "install_auth_username": "ชื่อผู้ใช้",
     "install_auth_password": "รหัสผ่าน",
     "install_auth_confirm": "ยืนยันรหัสผ่าน",
@@ -207,37 +171,26 @@
     "install_devices_title": "กำหนดค่าอุปกรณ์ของคุณ",
     "install_devices_desc": "ในการเริ่มใช้งาน AdGuard Home คุณต้องกำหนดค่าอุปกรณ์ของคุณเพื่อใช้งาน",
     "install_submit_title": "ยินดีด้วย!",
-    "install_submit_desc": "ขั้นตอนการตั้งค่าเสร็จสิ้นและคุณพร้อมที่จะเริ่มใช้งาน AdGuard Home",
     "install_devices_router": "เราเตอร์",
-    "install_devices_router_desc": "การตั้งค่านี้จะครอบคลุมอุปกรณ์ทั้งหมดที่เชื่อมต่อกับเราเตอร์ที่บ้านของคุณโดยอัตโนมัติและคุณไม่จำเป็นต้องกำหนดค่าแต่ละอุปกรณ์ด้วยตนเอง",
     "install_devices_address": "เซิร์ฟเวอร์ DNS ของ AdGuard Home กำลังรับฟังตามที่อยู่ต่อไปนี้",
     "install_devices_router_list_2": "ค้นหาการตั้งค่า DHCP/DNS ค้นหาตัวอักษร DNS ที่อยู่ถัดจากช่องที่อนุญาตให้มีตัวเลขสองหรือสามชุดโดยแต่ละกลุ่มแบ่งออกเป็นสี่กลุ่มหนึ่งถึงสามหลัก",
     "install_devices_router_list_3": "ป้อนที่อยู่เซิร์ฟเวอร์ AdGuard Home ของคุณที่นั่น",
     "install_devices_windows_list_1": "เปิด  Control Panel โดยใช้ Start menu หรือ Windows search",
     "install_devices_windows_list_2": "ไปที่หมวด  Network and Internet แล้วเลือก Network and Sharing Center",
-    "install_devices_windows_list_3": "ทางด้านซ้ายจะมีคำว่า  Change adapter settings ให้กดเข้าไป",
-    "install_devices_windows_list_4": "เลือกการเชื่อมต่อที่ใช้งานอยู่ คลิกขวาแล้วเลือก Properties",
-    "install_devices_windows_list_5": "ค้นหา Internet Protocol Version 4 (TCP/IP)  แล้วคลิก  Properties  อีกครั้ง",
-    "install_devices_windows_list_6": "ค้นหา DNS server addresses  ให้ทำการกรอกหมายเลข AdGuard Home ลงไปในช่อง",
-    "install_devices_macos_list_1": "คลิกโลโก้แอปเปิ้ลแล้วกด System Preferences",
-    "install_devices_macos_list_2": "คลิก  Network",
     "install_devices_macos_list_3": "เลือกการเชื่อมต่อแล้วคลิก Advanced",
     "install_devices_macos_list_4": "ค้นหาแท็บ DNS แล้วกรอกหมาเลย AdGuard Home",
     "install_devices_android_list_1": "เข้าหน้าเมนู(บางรุ่นจะมีตรงแท็บการแจ้งเตือน) เลือกการตั้งค่า",
     "install_devices_android_list_2": "เลือกเมนู Wi-Fi แล้วค้นหา Wi-Fi ที่จะเชื่อมต่อ (ไม่สารถตั้งค่ากับเน็ตมือถือได้)",
     "install_devices_android_list_3": "แตะชื่อWi-Fi ที่จะเชื่อมต่อค้างไว้(บางรุ่นให้เลื่อนจอลงไปล่างสุด) เลือกการตั้งค่าเพิ่มเติม",
     "install_devices_android_list_4": "ในอุปกรณ์บางอย่างคุณอาจต้องทำเครื่องหมายในช่องสำหรับขั้นสูงเพื่อดูการตั้งค่าเพิ่มเติม หากต้องการปรับการตั้งค่า Android DNS ของคุณคุณจะต้องเปลี่ยนการตั้งค่า IP จาก DHCP เป็นแบบคงที่",
-    "install_devices_android_list_5": "เปลี่ยนการตั้งค่า DNS ที่ 1 และค่า DNS 2 ถึงที่อยู่เซิร์ฟเวอร์ AdGuard Home ของคุณ",
     "install_devices_ios_list_1": "เลือกการตั้งค่า",
     "install_devices_ios_list_2": "เลือก Wi-Fi ด้านซ้าย (ไม่สามรถใช้งานได้กับดาต้ามือถือ)",
-    "install_devices_ios_list_3": "เลือกชื่อที่จะเชื่อมต่อ",
     "install_devices_ios_list_4": "กรอก DNS AdGuard Home Server ลงไปในช่อง",
     "get_started": "เริ่มต้นการใช้งาน",
     "next": "ถัดไป",
     "open_dashboard": "เปิดหน้าควบคุม",
     "install_saved": "บันทึกเรียบร้อยแล้ว",
     "encryption_title": "การเข้ารหัส",
-    "encryption_desc": "การดข้ารหัส (HTTPS/TLS) รองรับทั้ง DNS และหน้าเว็บแอดมิน",
     "encryption_server": "ชื่อเซิร์ฟเวอร์",
     "encryption_server_enter": "ป้อนชื่อโดเมน",
     "encryption_redirect": "ไปเส้นทาง HTTPS อัตโนมัติ",
@@ -255,10 +208,6 @@
     "encryption_key_input": "คัดลอก/วาง PEM-encoded private key ของคุณตรงนี้",
     "encryption_enable": "เปิดการเข้ารหัส (HTTPS, DNS-over-HTTPS, และ DNS-over-TLS)",
     "encryption_enable_desc": "หากเปิดใช้งานการเข้ารหัสอินเทอร์เฟซผู้ดูแลระบบของ AdGuard Home จะทำงานผ่าน HTTPS และเซิร์ฟเวอร์ DNS จะรับฟังคำร้องขอผ่านทาง DNS-over-HTTPS และ DNS-over-TLS",
-    "encryption_chain_valid": "ใบรับรองมีความน่าเชื่อถือ",
-    "encryption_chain_invalid": "ใบรับรองไม่มีความน่าเชื่อถือแต่สามรถใช้ได้",
-    "encryption_key_valid": "นี่เป็นคีย์ส่วนตัว {{type}} ที่ถูกต้อง",
-    "encryption_key_invalid": "นี่เป็นคีย์ส่วนตัว {{type}} ที่ไม่ถูกต้อง",
     "encryption_subject": "เรื่อง:",
     "encryption_issuer": "ผู้ออกใบรับรอง:",
     "encryption_hostnames": "ชื่อโฮส",
@@ -266,21 +215,16 @@
     "encryption_warning": "คำเตือน",
     "topline_expiring_certificate": "ใบรับรอง SSL ของคุณกำลังจะหมดอายุ กรุณาอัปเดท <0>การตั้งค่าเข้ารหัส</0>.",
     "topline_expired_certificate": "ใบรับรอง SSL ของคุณหมดอายุแล้ว กรุณาอัปเดท <0>การตั้งค่าเข้ารหัส</0>.",
-    "form_error_port_unsafe": "เป็นพอร์ทที่ไม่ปลอดภัย",
-    "form_error_password": "รหัสผ่านไม่ตรงกัน",
     "reset_settings": "รีเซ็ตการตั้งค่า",
     "update_announcement": "AdGuard Home {{version}} พร้อมแล้ว <0>กดตรงนี้</0> สำหรับข้อมูลเพิ่มเติม",
     "dns_addresses": "ที่อยู่ DNS",
     "dns_start": "เซิร์ฟเวอร์ DNS เริ่มทำงาน",
-    "dns_status_error": "เกิดข้อผิดพลาดในการตรวจสอบสถานะเซิร์ฟเวอร์ DNS",
     "down": "ดับ",
     "fix": "ซ่อม",
     "dns_providers": "นี่คือรายการ <0>ของผู้ให้บริการ DNS ที่เป็นที่รู้จัก</0> ให้เลือก",
     "update_now": "อัปเดตตอนนี้",
     "update_failed": "อัปเดทล้มเหลว กรุณา <a> ทำตามขั้นตอน </a> เพื่ออัพเดทด้วยตนเอง",
     "processing_update": "รอซักครู่ AdGuard Home กำลังอัปเดท",
-    "clients_title": "เครื่องลูกข่าย",
-    "clients_desc": "ตั้งค่าอุปกรณ์เพื่อเชื่อมต่อ AdGuard Home",
     "settings_global": "ทั่วโลก",
     "settings_custom": "กำหนดเอง",
     "table_client": "เครื่องลูกข่าย",
@@ -302,14 +246,9 @@
     "client_updated": "อัปเดตเครื่อง \"{{key}}\" สำเร็จแล้ว",
     "clients_not_found": "ไม่มีเครื่องลูกข่าย",
     "client_confirm_delete": "คุณแน่ใจนะว่าจะลบเครื่อง \"{{key}}\"?",
-    "auto_clients_title": "เครื่อง (runtime)",
-    "auto_clients_desc": "ข้อมูลเกี่ยวกับไคลเอนต์ที่ใช้ AdGuard Home แต่ไม่ได้เก็บไว้ในการกำหนดค่า",
     "access_title": "เข้าถึงการตั้งค่า",
-    "access_desc": "ที่นี่คุณสามารถกำหนดค่ากฎการเข้าถึงสำหรับเซิร์ฟเวอร์ AdGuard Home DNS",
     "access_allowed_title": "ลูกค้าที่ได้รับอนุญาต",
-    "access_allowed_desc": "รายการ CIDR หรือที่อยู่ IP หากกำหนดค่า AdGuard Home จะยอมรับคำขอจากที่อยู่ IP เหล่านี้เท่านั้น",
     "access_disallowed_title": "ลูกค้าไม่ได้รับอนุญาต",
-    "access_disallowed_desc": "รายการ CIDR หรือที่อยู่ IP หากกำหนดค่าไว้ AdGuard Home จะส่งคำขอจากที่อยู่ IP เหล่านี้",
     "access_blocked_title": "โดเมนที่ถูกปิดกั้น",
     "check_updates_now": "ตรวจสอบการปรับปรุง",
     "setup_dns_privacy_other_title": "การใช้งานอื่น ๆ",
@@ -318,8 +257,6 @@
     "rewrite_add": "เพิ่ม DNS rewrite",
     "form_domain": "ป้อนชื่อโดเมน",
     "form_answer": "ป้อนชื่อโดเมนหรือ IP",
-    "form_error_domain_format": "รูปแบบ Domain ไม่ถูกต้อง",
-    "form_error_answer_format": "รูปแบบคำตอบไม่ถูกต้อง",
     "configure": "กำหนดค่า",
     "main_settings": "ตั้งค่าหลัก",
     "block_services": "ปิดกั้นบริการเฉพาะ",
@@ -348,8 +285,6 @@
     "filter_updated": "อัปเดตตัวกรองสำเร็จแล้ว",
     "statistics_configuration": "การกำหนดค่าสถิติ",
     "statistics_retention": "การเก็บรักษาสถิติ",
-    "statistics_retention_desc": "หากคุณลดค่าช่วงเวลาข้อมูลบางอย่างจะหายไป",
-    "statistics_clear": " ล้างค่าสถิติ",
     "statistics_clear_confirm": "คุณแน่ใจหรือไม่ว่าต้องการล้างสถิติ?",
     "statistics_retention_confirm": "คุณแน่ใจหรือไม่ว่าต้องการเปลี่ยนการเก็บรักษาสถิติ? หากคุณลดค่าช่วงเวลา ข้อมูลบางอย่างจะหายไป",
     "statistics_cleared": "สถิติได้ถูกล้างเรียบร้อยแล้ว",
@@ -357,7 +292,6 @@
     "interval_hours_plural": "{{count}} ชั่วโมง",
     "filters_configuration": "การกำหนดค่าตัวกรอง",
     "filters_enable": "เปิดใช้งานตัวกรอง",
-    "filters_interval": "ตัวกรองช่วงเวลาการอัปเดต",
     "disabled": "ปิดใช้งาน",
     "username_label": "ชื่อผู้ใช้",
     "username_placeholder": "ป้อนชื่อผู้ใช้",
@@ -372,30 +306,21 @@
     "netname": "ชื่อเครือข่าย",
     "network": "เครือข่าย",
     "descr": "คำอธิบาย",
-    "whois": "Whois",
     "filtering_rules_learn_more": "<0>เรียนรู้เพิ่มเติม</0> เกี่ยวกับการสร้างรายการปิดกั้นโฮสต์ของคุณเอง",
     "blocked_by_response": "ปิดกั้นโดย CNAME หรือ IP ในการตอบกลับ",
     "try_again": "ลองอีกครั้ง",
     "domain_desc": "ป้อนชื่อโดเมนหรือไวด์การ์ดที่คุณต้องการเขียนใหม่",
     "example_rewrite_domain": "เขียนคำตอบซ้ำสำหรับชื่อโดเมนนี้เท่านั้น",
     "example_rewrite_wildcard": "เขียนคำตอบใหม่ทั้งหมดสำหรับ <0>example.org</0> โดเมนย่อย",
-    "disable_ipv6": "ปิดใช้งาน IPv6",
-    "disable_ipv6_desc": "หากเปิดใช้งานคุณสมบัตินี้การสืบค้น DNS ทั้งหมดสำหรับที่อยู่ IPv6 (ประเภท AAAA) จะถูกทิ้ง",
     "autofix_warning_text": "หากคุณคลิก \"แก้ไข\" AdGuardHome จะกำหนดค่าระบบของคุณเพื่อใช้เซิร์ฟเวอร์ AdGuardHome",
     "autofix_warning_list": "มันจะทำงานเหล่านี้: <0>ปิดการใช้งานระบบ DNSStubListener</0> <0>ตั้งที่อยู่เซิร์ฟเวอร์ DNS เป็น 127.0.0.1</0> <0>แทนที่เป้าหมายลิงก์สัญลักษณ์ของ /etc/resolv.conf เป็น /run/systemd/resolve/resolv.conf</0> <0>หยุด DNSStubListener (โหลดบริการแก้ไขระบบซ้ำ)</0>",
     "autofix_warning_result": "ดังนั้น AdGuardHome จะประมวลผลคำขอ DNS ทั้งหมดจากระบบของคุณตามค่าเริ่มต้น",
     "tags_title": "แท็ก",
-    "tags_desc": "คุณสามารถเลือกแท็กที่สอดคล้องกับลูกค้า แท็กสามารถรวมอยู่ในกฎการกรองและอนุญาตให้คุณใช้งานได้อย่างถูกต้องมากขึ้น <0>เรียนรู้เพิ่มเติม</0>",
     "form_select_tags": "เลือกแท็กเครื่อง",
     "check_title": "ตรวจสอบการกรอง",
-    "check_desc": "ตรวจสอบว่าชื่อโฮสต์ถูกกรอง",
     "form_enter_host": "ป้อนชื่อโฮสต์",
-    "show_processed_responses": "การประมวลผล",
     "blocked_adult_websites": "ถูกปิดกั้นโดยการควบคุมของผู้ปกครอง",
-    "safe_search": "ค้นหาอย่างปลอดภัย",
-    "blocklist": "บัญชีดำ",
     "filter_category_other": "อื่น ๆ",
-    "parental_control": "ควบคุมโดยผู้ปกครอง",
     "sunday_short": "อาทิตย์",
     "monday_short": "จันทร์",
     "tuesday_short": "อังคาร",

client/src/__locales/tr.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "Tüm üst sunucuları eş zamanlı sorgulayarak çözümlemeyi hızlandırmak için paralel sorgular kullanın.",
     "parallel_requests": "Paralel istekler",
     "load_balancing": "Yük dengeleme",
-    "load_balancing_desc": "Her seferde bir üst sunucuyu sorgulayın. AdGuard Home, sunucuyu seçmek için ağırlıklı rastgele algoritmasını kullanır, böylece en hızlı sunucu daha sık kullanılır.",
+    "load_balancing_desc": "Aynı anda bir üst kaynak sunucusunu sorgulayın. AdGuard Home, en düşük başarısız arama sayısına ve en düşük ortalama arama süresine sahip sunucuları seçmek için ağırlıklı rastgele bir algoritma kullanır.",
     "bootstrap_dns": "DNS Önyükleme sunucuları",
     "bootstrap_dns_desc": "Üst kaynak olarak belirttiğiniz DoH/DoT çözümleyicilerin IP adreslerini çözümlemek için kullanılan DNS sunucularının IP adresleri. Yorumlara izin verilmez.",
     "fallback_dns_title": "Yedek DNS sunucuları",
@@ -68,7 +68,7 @@
     "ip": "IP",
     "dhcp_table_hostname": "Ana makine Adı",
     "dhcp_table_expires": "Bitiş tarihi",
-    "dhcp_warning": "DHCP sunucusunu yine de etkinleştirmek istiyorsanız, ağınızda başka aktif DHCP sunucusu olmadığından emin olun, aksi takdirde ağa bağlı cihazların İnternet bağlantısı kesilebilir!",
+    "dhcp_warning": "DHCP sunucusunu yine de etkinleştirmek istiyorsanız, ağınızda başka aktif DHCP sunucusu olmadığından emin olun, aksi takdirde ağa bağlı cihazların internet bağlantısı kesilebilir!",
     "dhcp_error": "AdGuard Home, ağda başka bir etkin DHCP sunucusu olup olmadığını belirleyemedi",
     "dhcp_static_ip_error": "DHCP sunucusunu kullanmak için sabit bir IP adresi ayarlanmalıdır. AdGuard Home, bu ağ arayüzünün sabit bir IP adresi kullanılarak yapılandırılıp yapılandırılmadığını belirleyemedi. Lütfen sabit IP adresini elle ayarlayın.",
     "dhcp_dynamic_ip_found": "Sisteminiz, <0>{{interfaceName}}</0> arayüzü için dinamik IP adresi yapılandırması kullanıyor. DHCP sunucusunu kullanmak için sabit bir IP adresi ayarlanmalıdır. Geçerli olan IP adresiniz <0>{{ipAddress}}</0>. \"DHCP sunucusunu etkinleştir\" düğmesine basarsanız, AdGuard Home bu IP adresini otomatik bir şekilde sabit olarak ayarlayacaktır.",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "AdGuard ebeveyn denetimi web hizmetini kullan",
     "use_adguard_parental_hint": "AdGuard Home, alan adının yetişkin içerik bulundurup bulundurmadığını kontrol eder. Gezinti koruması web hizmeti ile kullandığımız aynı gizlilik dostu API'yi kullanır.",
     "enforce_safe_search": "Güvenli Aramayı kullan",
-    "enforce_save_search_hint": "AdGuard Home, şu arama motorlarında güvenli aramayı uygular: Google, YouTube, Bing, DuckDuckGo, Yandex ve Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home, şu arama motorlarında güvenli aramayı uygular: Google, YouTube, Bing, DuckDuckGo, Ecosia, Yandex, Pixabay.",
     "no_servers_specified": "Sunucu belirtilmedi",
     "general_settings": "Genel ayarlar",
     "dns_settings": "DNS ayarları",
@@ -476,7 +476,7 @@
     "client_confirm_delete": "\"{{key}}\" istemcisini silmek istediğinizden emin misiniz?",
     "list_confirm_delete": "Bu listeyi silmek istediğinizden emin misiniz?",
     "auto_clients_title": "Çalışma zamanı istemcileri",
-    "auto_clients_desc": "AdGuard Home'u kullanan veya kullanabilecek cihazların IP adresleri hakkında bilgiler. Bu bilgiler, hosts dosyaları, ters DNS, vb. dahil olmak üzere çeşitli kaynaklardan toplanır.",
+    "auto_clients_desc": "AdGuard Home'u kullanan veya kullanabilecek cihazların IP adresleri hakkında bilgiler. Bu bilgiler, hosts dosyaları, ters DNS, vb. dâhil olmak üzere çeşitli kaynaklardan toplanır.",
     "access_title": "Erişim ayarları",
     "access_desc": "AdGuard Home DNS sunucusu için erişim kurallarını buradan yapılandırabilirsiniz",
     "access_allowed_title": "İzin verilen istemciler",
@@ -603,7 +603,7 @@
     "autofix_warning_list": "Bu görevleri gerçekleştirir: <0>Sistem DNSStubListener'ı devre dışı bırakın</0> <0>DNS sunucusu adresini 127.0.0.1 olarak ayarlayın</0> <0>/etc/resolv.conf'un sembolik bağlantı hedefini /run/systemd/resolve/resolv.conf ile değiştirin<0> <0>DNSStubListener'ı durdurun (systemd çözümlenmiş hizmeti yeniden yükleyin)</0>",
     "autofix_warning_result": "Sonuç olarak, sisteminizden gelen tüm DNS istekleri varsayılan olarak AdGuard Home tarafından işlenecektir.",
     "tags_title": "Etiketler",
-    "tags_desc": "İstemciye karşılık gelen etiketleri seçebilirsiniz. Etiketleri daha kesin olarak uygulamak için filtreleme kurallarına dahil edin. <0>Daha fazla bilgi edinin</0>.",
+    "tags_desc": "İstemciye karşılık gelen etiketleri seçebilirsiniz. Etiketleri daha kesin olarak uygulamak için filtreleme kurallarına dâhil edin. <0>Daha fazla bilgi edinin</0>.",
     "form_select_tags": "İstemci etiketlerini seçin",
     "check_title": "Filtrelemeyi denetleyin",
     "check_desc": "Ana makine adının filtreleme durumunu kontrol edin.",

client/src/__locales/uk.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "Використовувати паралельні запити, щоб пришвидшити вирішення одночасною чергою всіх оригінальних серверів.",
     "parallel_requests": "Паралельні запити",
     "load_balancing": "Балансування навантаження",
-    "load_balancing_desc": "Запитувати один сервер за раз. AdGuard Home використовуватиме зважений випадковий алгоритм для вибору сервера, щоб найшвидший сервер використовувався частіше.",
     "bootstrap_dns": "Bootstrap DNS-сервери",
     "bootstrap_dns_desc": "IP-адреси DNS-серверів, які використовуються для визначення IP-адрес DoH/DoT-розпізнавачів, які ви вказуєте як висхідні. Коментарі заборонені.",
     "fallback_dns_title": "Резервні DNS-сервери",
     "fallback_dns_desc": "Список резервних DNS-серверів, які використовуються, коли upstream DNS-сервери не відповідають. Синтаксис такий самий, як і в полі upstream сервера вище.",
     "fallback_dns_placeholder": "Вводьте один резервний DNS-сервер на рядок",
     "local_ptr_title": "Приватні сервери для зворотного DNS",
-    "local_ptr_desc": "DNS-сервери, які AdGuard Home використовує для локальних PTR-запитів. Ці сервери використовуються для вирішення PTR-запитів для адрес у приватних мережах, наприклад, «192.168.12.34». Якщо список порожній, AdGuard Home буде усталено використовувати системний DNS-сервер.",
     "local_ptr_default_resolver": "Стандартно AdGuard Home користується такими зворотними DNS-вирішувачами: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home не зміг визначити приватні зворотні DNS-вирішувачі, які підійшли б для цієї системи.",
     "local_ptr_placeholder": "Вводьте одну адресу на рядок",
     "resolve_clients_title": "Увімкнути зворотне вирішення IP-адрес клієнтів",
     "resolve_clients_desc": "Визначати доменні імена клієнтів за допомогою PTR-запитів до відповідних серверів — приватних DNS-серверів для локальних клієнтів та upstream-серверів для клієнтів з публічними IP-адресами.",
     "use_private_ptr_resolvers_title": "Використовувати приватні зворотні DNS-резолвери",
-    "use_private_ptr_resolvers_desc": "Надсилати зворотні DNS-запити до вказаних серверів для клієнтів, що обслуговуються локально. Якщо вимкнено, AdGuard Home буде відповідати NXDOMAIN на всі такі PTR-запити, окрім запитів про клієнтів, що уже відомі завдяки DHCP, /etc/hosts тощо.",
     "check_dhcp_servers": "Перевірити DHCP-сервери",
     "save_config": "Зберегти конфігурацію",
     "enabled_dhcp": "DHCP-сервер увімкнено",
@@ -154,7 +151,6 @@
     "use_adguard_parental": "Використовувати вебслужбу «Батьківський контроль» AdGuard",
     "use_adguard_parental_hint": "AdGuard Home перевірить, чи містить домен матеріали для дорослих. Буде використано той же безпечний API, що й для «Безпеки перегляду» AdGuard.",
     "enforce_safe_search": "Використовувати Безпечний пошук",
-    "enforce_save_search_hint": "AdGuard Home може примусово застосовувати безпечний пошук в таких пошукових системах: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
     "no_servers_specified": "Сервери не вказано",
     "general_settings": "Загальні налаштування",
     "dns_settings": "Налаштування DNS",

client/src/__locales/vi.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "Sử dụng truy vấn song song để tăng tốc độ giải quyết bằng cách truy vấn đồng thời tất cả các máy chủ ngược tuyến",
     "parallel_requests": "Yêu cầu song song",
     "load_balancing": "Cân bằng tải",
-    "load_balancing_desc": "Chỉ truy xuất một máy chủ trong cùng thời điểm. AdGuard Home sẽ sử dụng thuật toán trọng số ngẫu nhiên để chọn một máy chủ nhanh nhất và sử dụng máy chủ đó thường xuyên hơn.",
     "bootstrap_dns": "Máy chủ DNS Bootstrap",
     "bootstrap_dns_desc": "Địa chỉ IP của máy chủ DNS được sử dụng để phân giải địa chỉ IP của trình phân giải DoH/DoT mà bạn chỉ định làm thượng nguồn. Bình luận không được phép.",
     "fallback_dns_title": "Máy chủ DNS dự phòng",
     "fallback_dns_desc": "Danh sách máy chủ DNS dự phòng được sử dụng khi máy chủ DNS ngược tuyến không phản hồi. Cú pháp tương tự như trong trường ngược dòng chính ở trên.",
     "fallback_dns_placeholder": "Nhập một máy chủ DNS dự phòng trên mỗi dòng",
     "local_ptr_title": "Máy chủ DNS riêng tư",
-    "local_ptr_desc": "Máy chủ DNS hoặc các máy chủ mà AdGuard Home sẽ sử dụng cho các truy vấn về tài nguyên được phân phối cục bộ. Ví dụ: máy chủ này sẽ được sử dụng để phân giải tên máy khách của máy khách cho các máy khách có địa chỉ IP riêng. Nếu không được cài đặt, AdGuard Home sẽ tự động sử dụng trình phân giải DNS mặc định của bạn.",
     "local_ptr_default_resolver": "Theo mặc định, AdGuard Home sử dụng các hệ thống phân giải tên miền ngược sau: {{ip}}.",
     "local_ptr_no_default_resolver": "AdGuard Home không thể xác định hệ thống phân giải tên miền ngược riêng phù hợp cho hệ thống này.",
     "local_ptr_placeholder": "Nhập một địa chỉ IP trên mỗi dòng",
     "resolve_clients_title": "Kích hoạt cho phép phân giải ngược về địa chỉ IP của máy khách",
     "resolve_clients_desc": "Nếu được bật, AdGuard Home sẽ cố gắng phân giải ngược lại địa chỉ IP của khách hàng thành tên máy chủ của họ bằng cách gửi các truy vấn PTR tới trình phân giải tương ứng (máy chủ DNS riêng cho máy khách cục bộ, máy chủ ngược dòng cho máy khách có địa chỉ IP công cộng).",
     "use_private_ptr_resolvers_title": "Sử dụng trình rDNS riêng tư",
-    "use_private_ptr_resolvers_desc": "Thực hiện tra cứu ngược DNS cho các địa chỉ được phân phối cục bộ bằng cách sử dụng các máy chủ nguồn. Nếu bị vô hiệu hóa, AdGuard Home sẽ phản hồi với NXDOMAIN cho tất cả các yêu cầu PTR ngoại trừ các ứng dụng khách được biết đến bởi DHCP, / etc / hosts, v. v.",
     "check_dhcp_servers": "Kiểm tra máy chủ DHCP",
     "save_config": "Lưu thiết lập",
     "enabled_dhcp": "Máy chủ DHCP đã kích hoạt",
@@ -154,7 +151,6 @@
     "use_adguard_parental": "Sử dụng dịch vụ quản lý của phụ huynh AdGuard",
     "use_adguard_parental_hint": "AdGuard Home sẽ kiểm tra nếu tên miền chứa từ khoá người lớn. Tính năng sử dụng API thân thiện với quyền riêng tư tương tự với dịch vụ bảo vệ duyệt web",
     "enforce_safe_search": "Bắt buộc tìm kiếm an toàn",
-    "enforce_save_search_hint": "AdGuard Home có thể bắt buộc tìm kiếm an toàn với các dịch vụ tìm kiếm: Google, Youtube, Bing, Yandex.",
     "no_servers_specified": "Không có máy chủ nào được liệt kê",
     "general_settings": "Cài đặt chung",
     "dns_settings": "Cài đặt DNS",
@@ -675,7 +671,6 @@
     "use_saved_key": "Sử dụng khóa đã lưu trước đó",
     "parental_control": "Quản lý của phụ huynh",
     "safe_browsing": "Duyệt web an toàn",
-    "served_from_cache": "{{value}} <i>(được phục vụ từ bộ nhớ cache)</i>",
     "form_error_password_length": "Mật khẩu phải dài từ {{min}} đến {{max}} ký tự",
     "anonymizer_notification": "<0> Lưu ý:</0> Tính năng ẩn danh IP được bật. Bạn có thể tắt nó trong <1> Cài đặt chung</1>.",
     "confirm_dns_cache_clear": "Bạn có chắc chắn muốn xóa bộ đệm ẩn DNS không?",

client/src/__locales/zh-cn.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "使用并行请求以同时查询所有上游服务器来加快解析速度。",
     "parallel_requests": "并行请求",
     "load_balancing": "负载均衡",
-    "load_balancing_desc": "一次查询一台服务器。AdGuard Home 将使用加权随机算法来选择服务器，以便更常使用最快的服务器。",
+    "load_balancing_desc": "一次查询一台服务器。AdGuard Home 使用加权随机算法来选择具有最少失败查找和最低平均查找时间的服务器。",
     "bootstrap_dns": "Bootstrap DNS 服务器",
     "bootstrap_dns_desc": "DNS 服务器的 IP 地址，用于解析指定为上游的 DoH/DoT 解析器的 IP 地址。不允许添加注释。",
     "fallback_dns_title": "后备 DNS 服务器",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "使用 AdGuard 【家长控制】服务",
     "use_adguard_parental_hint": "AdGuard Home 将使用与浏览安全服务相同的隐私性强的 API 来检查域名指向的网站是否包含成人内容。",
     "enforce_safe_search": "使用安全搜索",
-    "enforce_save_search_hint": "AdGuard Home 对以下搜索引擎可强制启用安全搜索：Google、YouTube、Bing、DuckDuckGo、Yandex、Pixabay。",
+    "enforce_save_search_hint": "AdGuard Home 将会在下列搜索引擎中强制启用安全搜索：Google、YouTube、Bing、DuckDuckGo、Ecosia、Yandex、Pixabay。",
     "no_servers_specified": "未找到指定的服务器",
     "general_settings": "常规设置",
     "dns_settings": "DNS 设置",

client/src/__locales/zh-hk.json

@@ -6,21 +6,18 @@
     "upstream_parallel": "使用平行查詢，同時查詢所有上游伺服器來加速解析結果",
     "parallel_requests": "平行處理",
     "load_balancing": "負載平衡",
-    "load_balancing_desc": "一次只查詢一個伺服器。AdGuard Home 會使用加權隨機取樣來選擇使用的查詢結果，以確保速度最快的伺服器能被充分運用。",
     "bootstrap_dns": "引導（Boostrap） DNS 伺服器",
     "bootstrap_dns_desc": "Bootstrap DNS 伺服器用於解析您所設定的上游 DoH/DoT 解析器的 IP 地址",
     "fallback_dns_title": "備用 DNS 伺服器",
     "fallback_dns_desc": "備用 DNS 伺服器列表：於主要 DNS 伺服器沒有回應時使用。語法與主要 DNS 伺服器設定欄位相同。",
     "fallback_dns_placeholder": "每行輸入一個備用 DNS 伺服器",
     "local_ptr_title": "私人 DNS 伺服器",
-    "local_ptr_desc": "AdGuard Home 用於區域 PTR 查詢的 DNS 伺服器。這些伺服器將用於解析具有私人 IP 位址的用戶端的主機名稱，例如  \"192.168.12.34\"，使用 rDNS。如果沒有設定，AdGuard Home 將自動使用您的系統預設 DNS 解析。",
     "local_ptr_default_resolver": "AdGuard Home 預設使用以下作為 DNS 反解器：{{ip}}",
     "local_ptr_no_default_resolver": "AdGuard Home 無法為此系統確定適合私有反解析器。",
     "local_ptr_placeholder": "每行輸入一個伺服器位址",
     "resolve_clients_title": "啟用用戶端的 IP 位址的反向解析",
     "resolve_clients_desc": "透過相應的伺服器傳送 PTR 查詢（本機用戶端使用私人 DNS 伺服器，公共 IP 使用上游伺服器），將客戶端的 IP 反解為主機名稱。",
     "use_private_ptr_resolvers_title": "使用私人 DNS 反解器",
-    "use_private_ptr_resolvers_desc": "使用這些上游為本機提供反解 DNS 查詢。如果禁用 AdGuard Home 將會對相關 PTR 請求回應 NXDOMAIN，但 DHCP、/etc/hosts 等已知的用戶端除外。",
     "check_dhcp_servers": "檢查 DHCP 伺服器",
     "save_config": "儲存設定",
     "enabled_dhcp": "DHCP 伺服器已啟動",
@@ -154,7 +151,6 @@
     "use_adguard_parental": "使用 AdGuard 家長監護功能",
     "use_adguard_parental_hint": "AdGuard Home 將比對查詢網域是否含有成人內容。它使用與 AdGuard 瀏覽安全一樣的尊重個人隱私的 API 來進行檢查。",
     "enforce_safe_search": "強制使用安全搜尋",
-    "enforce_save_search_hint": "AdGuard Home 可在下列搜尋引擎使用強制安全搜尋：Google、YouTube、Bing、DuckDuckGo, Yandex 和 Pixabay。",
     "no_servers_specified": "沒有指定的伺服器",
     "general_settings": "一般設定",
     "dns_settings": "DNS 設定",

client/src/__locales/zh-tw.json

@@ -6,7 +6,7 @@
     "upstream_parallel": "透過同時地查詢所有上游的伺服器，使用並行的查詢以加速解析。",
     "parallel_requests": "並行的請求",
     "load_balancing": "負載平衡",
-    "load_balancing_desc": "每次查詢一個上游伺服器。AdGuard Home 使用它的加權隨機的演算法來選擇伺服器，以便最快的伺服器被更常使用。",
+    "load_balancing_desc": "一次查詢一台伺服器。AdGuard Home 使用加權隨機演算法來選擇具有最少失敗查詢和最低平均查詢時間的伺服器。",
     "bootstrap_dns": "自我啟動（Bootstrap）DNS 伺服器",
     "bootstrap_dns_desc": "DNS 伺服器的 IP 位址，用於解析您指定為上游伺服器的 DoH/DoT 解析器的 IP 位址。不允許註釋。",
     "fallback_dns_title": "應變 DNS 伺服器",
@@ -154,7 +154,7 @@
     "use_adguard_parental": "使用 AdGuard 家長控制之網路服務",
     "use_adguard_parental_hint": "AdGuard Home 將檢查網域是否包含成人資料。它使用如同瀏覽安全網路服務一樣之對隱私友好的應用程式介面（API）。",
     "enforce_safe_search": "使用安全搜尋",
-    "enforce_save_search_hint": "AdGuard Home 將在下列的搜尋引擎：Google、YouTube、Bing、DuckDuckGo、Yandex 和 Pixabay 中強制執行安全搜尋。",
+    "enforce_save_search_hint": "AdGuard Home 將在下列的搜尋引擎：Google、YouTube、Bing、DuckDuckGo、Ecosia、Yandex 和 Pixabay 中強制執行安全搜尋。",
     "no_servers_specified": "無已明確指定的伺服器",
     "general_settings": "一般設定",
     "dns_settings": "DNS 設定",

client/src/__tests__/helpers.test.ts

@@ -1,26 +1,15 @@
-import {
+import { sortIp, countClientsStatistics, findAddressType, subnetMaskToBitMask } from '../helpers/helpers';
-    sortIp,
-    countClientsStatistics,
-    findAddressType,
-    subnetMaskToBitMask,
-} from '../helpers/helpers';
 import { ADDRESS_TYPES } from '../helpers/constants';
 
 describe('sortIp', () => {
     describe('ipv4', () => {
         test('one octet differ', () => {
-            const arr = [
+            const arr = ['127.0.2.0', '127.0.3.0', '127.0.1.0'];
-                '127.0.2.0',
+            const sortedArr = ['127.0.1.0', '127.0.2.0', '127.0.3.0'];
-                '127.0.3.0',
+
-                '127.0.1.0',
-            ];
-            const sortedArr = [
-                '127.0.1.0',
-                '127.0.2.0',
-                '127.0.3.0',
-            ];
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
+
         test('few octets differ', () => {
             const arr = [
                 '192.168.11.10',
@@ -58,6 +47,7 @@ describe('sortIp', () => {
                 '192.168.11.10',
                 '192.168.11.11',
             ];
+
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
 
             // Example from issue https://github.com/AdguardTeam/AdGuardHome/issues/1778#issuecomment-640937599
@@ -83,36 +73,26 @@ describe('sortIp', () => {
                 '192.168.2.200',
                 '192.168.3.1',
             ];
+
             expect(arr2.sort(sortIp)).toStrictEqual(sortedArr2);
         });
     });
+
     describe('ipv6', () => {
         test('only long form', () => {
-            const arr = [
+            const arr = ['2001:db8:11a3:9d7:0:0:0:2', '2001:db8:11a3:9d7:0:0:0:3', '2001:db8:11a3:9d7:0:0:0:1'];
-                '2001:db8:11a3:9d7:0:0:0:2',
+            const sortedArr = ['2001:db8:11a3:9d7:0:0:0:1', '2001:db8:11a3:9d7:0:0:0:2', '2001:db8:11a3:9d7:0:0:0:3'];
-                '2001:db8:11a3:9d7:0:0:0:3',
+
-                '2001:db8:11a3:9d7:0:0:0:1',
-            ];
-            const sortedArr = [
-                '2001:db8:11a3:9d7:0:0:0:1',
-                '2001:db8:11a3:9d7:0:0:0:2',
-                '2001:db8:11a3:9d7:0:0:0:3',
-            ];
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
+
         test('only short form', () => {
-            const arr = [
+            const arr = ['2001:db8::', '2001:db7::', '2001:db9::'];
-                '2001:db8::',
+            const sortedArr = ['2001:db7::', '2001:db8::', '2001:db9::'];
-                '2001:db7::',
+
-                '2001:db9::',
-            ];
-            const sortedArr = [
-                '2001:db7::',
-                '2001:db8::',
-                '2001:db9::',
-            ];
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
+
         test('long and short forms', () => {
             const arr = [
                 '2001:db8::',
@@ -130,9 +110,11 @@ describe('sortIp', () => {
                 '2001:db7:11a3:9d7:0:0:0:2',
                 '2001:db8::',
             ];
+
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
     });
+
     describe('ipv4 and ipv6', () => {
         test('ipv6 long form', () => {
             const arr = [
@@ -151,8 +133,10 @@ describe('sortIp', () => {
                 '2001:db8:11a3:9d7:0:0:0:2',
                 '2001:db8:11a3:9d7:0:0:0:3',
             ];
+
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
+
         test('ipv6 short form', () => {
             const arr = [
                 '2001:db8:11a3:9d7::1',
@@ -170,8 +154,10 @@ describe('sortIp', () => {
                 '2001:db8:11a3:9d7::2',
                 '2001:db8:11a3:9d7::3',
             ];
+
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
+
         test('ipv6 long and short forms', () => {
             const arr = [
                 '2001:db8:11a3:9d7::1',
@@ -189,8 +175,10 @@ describe('sortIp', () => {
                 '2001:db8:11a3:9d7:0:0:0:2',
                 '2001:db8:11a3:9d7::3',
             ];
+
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
+
         test('always put ipv4 before ipv6', () => {
             const arr = [
                 '::1',
@@ -210,40 +198,26 @@ describe('sortIp', () => {
                 '2001:db8:11a3:9d7::1',
                 '2001:db8:11a3:9d7:0:0:0:2',
             ];
+
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
     });
+
     describe('cidr', () => {
         test('only ipv4 cidr', () => {
-            const arr = [
+            const arr = ['192.168.0.1/9', '192.168.0.1/7', '192.168.0.1/8'];
-                '192.168.0.1/9',
+            const sortedArr = ['192.168.0.1/7', '192.168.0.1/8', '192.168.0.1/9'];
-                '192.168.0.1/7',
+
-                '192.168.0.1/8',
-            ];
-            const sortedArr = [
-                '192.168.0.1/7',
-                '192.168.0.1/8',
-                '192.168.0.1/9',
-            ];
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
+
         test('ipv4 and cidr ipv4', () => {
-            const arr = [
+            const arr = ['192.168.0.1/9', '192.168.0.1', '192.168.0.1/32', '192.168.0.1/7', '192.168.0.1/8'];
-                '192.168.0.1/9',
+            const sortedArr = ['192.168.0.1/7', '192.168.0.1/8', '192.168.0.1/9', '192.168.0.1/32', '192.168.0.1'];
-                '192.168.0.1',
+
-                '192.168.0.1/32',
-                '192.168.0.1/7',
-                '192.168.0.1/8',
-            ];
-            const sortedArr = [
-                '192.168.0.1/7',
-                '192.168.0.1/8',
-                '192.168.0.1/9',
-                '192.168.0.1/32',
-                '192.168.0.1',
-            ];
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
+
         test('only ipv6 cidr', () => {
             const arr = [
                 '2001:db8:11a3:9d7::1/32',
@@ -257,8 +231,10 @@ describe('sortIp', () => {
                 '2001:db8:11a3:9d7::1/64',
                 '2001:db8:11a3:9d7::1/128',
             ];
+
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
+
         test('ipv6 and cidr ipv6', () => {
             const arr = [
                 '2001:db8:11a3:9d7::1/32',
@@ -274,9 +250,11 @@ describe('sortIp', () => {
                 '2001:db8:11a3:9d7::1/128',
                 '2001:db8:11a3:9d7::1',
             ];
+
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
     });
+
     describe('invalid input', () => {
         const originalWarn = console.warn;
 
@@ -291,21 +269,29 @@ describe('sortIp', () => {
 
         test('invalid strings', () => {
             const arr = ['invalid ip', 'invalid cidr'];
+
             expect(arr.sort(sortIp)).toStrictEqual(arr);
         });
+
         test('invalid ip', () => {
             const arr = ['127.0.0.2.', '.127.0.0.1.', '.2001:db8:11a3:9d7:0:0:0:0'];
+
             expect(arr.sort(sortIp)).toStrictEqual(arr);
         });
+
         test('invalid cidr', () => {
             const arr = ['127.0.0.2/33', '2001:db8:11a3:9d7:0:0:0:0/129'];
+
             expect(arr.sort(sortIp)).toStrictEqual(arr);
         });
+
         test('valid and invalid ip', () => {
             const arr = ['127.0.0.4.', '127.0.0.1', '.127.0.0.3', '127.0.0.2'];
+
             expect(arr.sort(sortIp)).toStrictEqual(arr);
         });
     });
+
     describe('mixed', () => {
         test('ipv4, ipv6 in short and long forms and cidr', () => {
             const arr = [
@@ -354,6 +340,7 @@ describe('sortIp', () => {
                 '2001:db8:11a3:9d7:0:0:0:1',
                 '2001:db8:11a3:9d7:0:0:0:2',
             ];
+
             expect(arr.sort(sortIp)).toStrictEqual(sortedArr);
         });
     });
@@ -363,9 +350,11 @@ describe('findAddressType', () => {
     describe('ip', () => {
         expect(findAddressType('127.0.0.1')).toStrictEqual(ADDRESS_TYPES.IP);
     });
+
     describe('cidr', () => {
         expect(findAddressType('127.0.0.1/8')).toStrictEqual(ADDRESS_TYPES.CIDR);
     });
+
     describe('mac', () => {
         expect(findAddressType('00:1B:44:11:3A:B7')).toStrictEqual(ADDRESS_TYPES.UNKNOWN);
     });
@@ -373,42 +362,59 @@ describe('findAddressType', () => {
 
 describe('countClientsStatistics', () => {
     test('single ip', () => {
-        expect(countClientsStatistics(['127.0.0.1'], {
+        expect(
-            '127.0.0.1': 1,
+            countClientsStatistics(['127.0.0.1'], {
-        })).toStrictEqual(1);
+                '127.0.0.1': 1,
+            }),
+        ).toStrictEqual(1);
     });
+
     test('multiple ip', () => {
-        expect(countClientsStatistics(['127.0.0.1', '127.0.0.2'], {
+        expect(
-            '127.0.0.1': 1,
+            countClientsStatistics(['127.0.0.1', '127.0.0.2'], {
-            '127.0.0.2': 2,
+                '127.0.0.1': 1,
-        })).toStrictEqual(1 + 2);
+                '127.0.0.2': 2,
+            }),
+        ).toStrictEqual(1 + 2);
     });
+
     test('cidr', () => {
-        expect(countClientsStatistics(['127.0.0.0/8'], {
+        expect(
-            '127.0.0.1': 1,
+            countClientsStatistics(['127.0.0.0/8'], {
-            '127.0.0.2': 2,
+                '127.0.0.1': 1,
-        })).toStrictEqual(1 + 2);
+                '127.0.0.2': 2,
+            }),
+        ).toStrictEqual(1 + 2);
     });
+
     test('cidr and multiple ip', () => {
-        expect(countClientsStatistics(['1.1.1.1', '2.2.2.2', '3.3.3.0/24'], {
+        expect(
-            '1.1.1.1': 1,
+            countClientsStatistics(['1.1.1.1', '2.2.2.2', '3.3.3.0/24'], {
-            '2.2.2.2': 2,
+                '1.1.1.1': 1,
-            '3.3.3.3': 3,
+                '2.2.2.2': 2,
-        })).toStrictEqual(1 + 2 + 3);
+                '3.3.3.3': 3,
+            }),
+        ).toStrictEqual(1 + 2 + 3);
     });
+
     test('mac', () => {
-        expect(countClientsStatistics(['00:1B:44:11:3A:B7', '2.2.2.2', '3.3.3.0/24'], {
+        expect(
-            '1.1.1.1': 1,
+            countClientsStatistics(['00:1B:44:11:3A:B7', '2.2.2.2', '3.3.3.0/24'], {
-            '2.2.2.2': 2,
+                '1.1.1.1': 1,
-            '3.3.3.3': 3,
+                '2.2.2.2': 2,
-        })).toStrictEqual(2 + 3);
+                '3.3.3.3': 3,
+            }),
+        ).toStrictEqual(2 + 3);
     });
+
     test('not found', () => {
-        expect(countClientsStatistics(['4.4.4.4', '5.5.5.5', '6.6.6.6'], {
+        expect(
-            '1.1.1.1': 1,
+            countClientsStatistics(['4.4.4.4', '5.5.5.5', '6.6.6.6'], {
-            '2.2.2.2': 2,
+                '1.1.1.1': 1,
-            '3.3.3.3': 3,
+                '2.2.2.2': 2,
-        })).toStrictEqual(0);
+                '3.3.3.3': 3,
+            }),
+        ).toStrictEqual(0);
     });
 });
 
@@ -451,10 +457,12 @@ describe('subnetMaskToBitMask', () => {
 
     test('correct for all subnetMasks', () => {
         expect(
-            subnetMasks.map((subnetMask) => {
+            subnetMasks
-                const bitmask = subnetMaskToBitMask(subnetMask);
+                .map((subnetMask) => {
-                return subnetMasks[bitmask] === subnetMask;
+                    const bitmask = subnetMaskToBitMask(subnetMask);
-            }).every((res) => res === true),
+                    return subnetMasks[bitmask] === subnetMask;
+                })
+                .every((res) => res === true),
         ).toEqual(true);
     });
 });

client/src/actions/access.ts

@@ -3,13 +3,14 @@ import i18next from 'i18next';
 
 import apiClient from '../api/Api';
 import { addErrorToast, addSuccessToast } from './toasts';
+
 import { splitByNewLine } from '../helpers/helpers';
 
 export const getAccessListRequest = createAction('GET_ACCESS_LIST_REQUEST');
 export const getAccessListFailure = createAction('GET_ACCESS_LIST_FAILURE');
 export const getAccessListSuccess = createAction('GET_ACCESS_LIST_SUCCESS');
 
-export const getAccessList = () => async (dispatch) => {
+export const getAccessList = () => async (dispatch: any) => {
     dispatch(getAccessListRequest());
     try {
         const data = await apiClient.getAccessList();
@@ -24,7 +25,7 @@ export const setAccessListRequest = createAction('SET_ACCESS_LIST_REQUEST');
 export const setAccessListFailure = createAction('SET_ACCESS_LIST_FAILURE');
 export const setAccessListSuccess = createAction('SET_ACCESS_LIST_SUCCESS');
 
-export const setAccessList = (config) => async (dispatch) => {
+export const setAccessList = (config: any) => async (dispatch: any) => {
     dispatch(setAccessListRequest());
     try {
         const { allowed_clients, disallowed_clients, blocked_hosts } = config;
@@ -48,7 +49,7 @@ export const toggleClientBlockRequest = createAction('TOGGLE_CLIENT_BLOCK_REQUES
 export const toggleClientBlockFailure = createAction('TOGGLE_CLIENT_BLOCK_FAILURE');
 export const toggleClientBlockSuccess = createAction('TOGGLE_CLIENT_BLOCK_SUCCESS');
 
-export const toggleClientBlock = (ip, disallowed, disallowed_rule) => async (dispatch) => {
+export const toggleClientBlock = (ip: any, disallowed: any, disallowed_rule: any) => async (dispatch: any) => {
     dispatch(toggleClientBlockRequest());
     try {
         const accessList = await apiClient.getAccessList();
@@ -60,12 +61,10 @@ export const toggleClientBlock = (ip, disallowed, disallowed_rule) => async (dis
             if (!disallowed_rule) {
                 allowed_clients = allowed_clients.concat(ip);
             } else {
-                disallowed_clients = disallowed_clients
+                disallowed_clients = disallowed_clients.filter((client: any) => client !== disallowed_rule);
-                    .filter((client) => client !== disallowed_rule);
             }
         } else if (allowed_clients.length > 1) {
-            allowed_clients = allowed_clients
+            allowed_clients = allowed_clients.filter((client: any) => client !== disallowed_rule);
-                .filter((client) => client !== disallowed_rule);
         } else {
             disallowed_clients = disallowed_clients.concat(ip);
         }

client/src/actions/clients.ts

@@ -1,6 +1,7 @@
 import { createAction } from 'redux-actions';
 import i18next from 'i18next';
 import apiClient from '../api/Api';
+
 import { getClients } from './index';
 import { addErrorToast, addSuccessToast } from './toasts';
 
@@ -10,7 +11,7 @@ export const addClientRequest = createAction('ADD_CLIENT_REQUEST');
 export const addClientFailure = createAction('ADD_CLIENT_FAILURE');
 export const addClientSuccess = createAction('ADD_CLIENT_SUCCESS');
 
-export const addClient = (config) => async (dispatch) => {
+export const addClient = (config: any) => async (dispatch: any) => {
     dispatch(addClientRequest());
     try {
         await apiClient.addClient(config);
@@ -28,7 +29,7 @@ export const deleteClientRequest = createAction('DELETE_CLIENT_REQUEST');
 export const deleteClientFailure = createAction('DELETE_CLIENT_FAILURE');
 export const deleteClientSuccess = createAction('DELETE_CLIENT_SUCCESS');
 
-export const deleteClient = (config) => async (dispatch) => {
+export const deleteClient = (config: any) => async (dispatch: any) => {
     dispatch(deleteClientRequest());
     try {
         await apiClient.deleteClient(config);
@@ -45,7 +46,7 @@ export const updateClientRequest = createAction('UPDATE_CLIENT_REQUEST');
 export const updateClientFailure = createAction('UPDATE_CLIENT_FAILURE');
 export const updateClientSuccess = createAction('UPDATE_CLIENT_SUCCESS');
 
-export const updateClient = (config, name) => async (dispatch) => {
+export const updateClient = (config: any, name: any) => async (dispatch: any) => {
     dispatch(updateClientRequest());
     try {
         const data = { name, data: { ...config } };

client/src/actions/dnsConfig.ts

@@ -2,6 +2,7 @@ import { createAction } from 'redux-actions';
 import i18next from 'i18next';
 
 import apiClient from '../api/Api';
+
 import { splitByNewLine } from '../helpers/helpers';
 import { addErrorToast, addSuccessToast } from './toasts';
 
@@ -9,7 +10,7 @@ export const getDnsConfigRequest = createAction('GET_DNS_CONFIG_REQUEST');
 export const getDnsConfigFailure = createAction('GET_DNS_CONFIG_FAILURE');
 export const getDnsConfigSuccess = createAction('GET_DNS_CONFIG_SUCCESS');
 
-export const getDnsConfig = () => async (dispatch) => {
+export const getDnsConfig = () => async (dispatch: any) => {
     dispatch(getDnsConfigRequest());
     try {
         const data = await apiClient.getDnsConfig();
@@ -24,7 +25,7 @@ export const clearDnsCacheRequest = createAction('CLEAR_DNS_CACHE_REQUEST');
 export const clearDnsCacheFailure = createAction('CLEAR_DNS_CACHE_FAILURE');
 export const clearDnsCacheSuccess = createAction('CLEAR_DNS_CACHE_SUCCESS');
 
-export const clearDnsCache = () => async (dispatch) => {
+export const clearDnsCache = () => async (dispatch: any) => {
     dispatch(clearDnsCacheRequest());
     try {
         const data = await apiClient.clearCache();
@@ -40,7 +41,7 @@ export const setDnsConfigRequest = createAction('SET_DNS_CONFIG_REQUEST');
 export const setDnsConfigFailure = createAction('SET_DNS_CONFIG_FAILURE');
 export const setDnsConfigSuccess = createAction('SET_DNS_CONFIG_SUCCESS');
 
-export const setDnsConfig = (config) => async (dispatch) => {
+export const setDnsConfig = (config: any) => async (dispatch: any) => {
     dispatch(setDnsConfigRequest());
     try {
         const data = { ...config };

client/src/actions/encryption.ts

@@ -1,5 +1,6 @@
 import { createAction } from 'redux-actions';
 import apiClient from '../api/Api';
+
 import { redirectToCurrentProtocol } from '../helpers/helpers';
 import { addErrorToast, addSuccessToast } from './toasts';
 
@@ -7,7 +8,7 @@ export const getTlsStatusRequest = createAction('GET_TLS_STATUS_REQUEST');
 export const getTlsStatusFailure = createAction('GET_TLS_STATUS_FAILURE');
 export const getTlsStatusSuccess = createAction('GET_TLS_STATUS_SUCCESS');
 
-export const getTlsStatus = () => async (dispatch) => {
+export const getTlsStatus = () => async (dispatch: any) => {
     dispatch(getTlsStatusRequest());
     try {
         const status = await apiClient.getTlsStatus();
@@ -26,7 +27,7 @@ export const setTlsConfigFailure = createAction('SET_TLS_CONFIG_FAILURE');
 export const setTlsConfigSuccess = createAction('SET_TLS_CONFIG_SUCCESS');
 export const dnsStatusSuccess = createAction('DNS_STATUS_SUCCESS');
 
-export const setTlsConfig = (config) => async (dispatch, getState) => {
+export const setTlsConfig = (config: any) => async (dispatch: any, getState: any) => {
     dispatch(setTlsConfigRequest());
     try {
         const { httpPort } = getState().dashboard;
@@ -67,7 +68,7 @@ export const validateTlsConfigRequest = createAction('VALIDATE_TLS_CONFIG_REQUES
 export const validateTlsConfigFailure = createAction('VALIDATE_TLS_CONFIG_FAILURE');
 export const validateTlsConfigSuccess = createAction('VALIDATE_TLS_CONFIG_SUCCESS');
 
-export const validateTlsConfig = (config) => async (dispatch) => {
+export const validateTlsConfig = (config: any) => async (dispatch: any) => {
     dispatch(validateTlsConfigRequest());
     try {
         const values = { ...config };

client/src/actions/filtering.ts

@@ -13,7 +13,7 @@ export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQU
 export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
 export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
 
-export const getFilteringStatus = () => async (dispatch) => {
+export const getFilteringStatus = () => async (dispatch: any) => {
     dispatch(getFilteringStatusRequest());
     try {
         const status = await apiClient.getFilteringStatus();
@@ -28,7 +28,7 @@ export const setRulesRequest = createAction('SET_RULES_REQUEST');
 export const setRulesFailure = createAction('SET_RULES_FAILURE');
 export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
 
-export const setRules = (rules) => async (dispatch) => {
+export const setRules = (rules: any) => async (dispatch: any) => {
     dispatch(setRulesRequest());
     try {
         const normalizedRules = {
@@ -47,83 +47,91 @@ export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
 export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
 export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
 
-export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => {
+export const addFilter =
-    dispatch(addFilterRequest());
+    (url: any, name: any, whitelist = false) =>
-    try {
+    async (dispatch: any, getState: any) => {
-        await apiClient.addFilter({ url, name, whitelist });
+        dispatch(addFilterRequest());
-        dispatch(addFilterSuccess(url));
+        try {
-        if (getState().filtering.isModalOpen) {
+            await apiClient.addFilter({ url, name, whitelist });
-            dispatch(toggleFilteringModal());
+            dispatch(addFilterSuccess(url));
+            if (getState().filtering.isModalOpen) {
+                dispatch(toggleFilteringModal());
+            }
+            dispatch(addSuccessToast('filter_added_successfully'));
+            dispatch(getFilteringStatus());
+        } catch (error) {
+            dispatch(addErrorToast({ error }));
+            dispatch(addFilterFailure());
         }
-        dispatch(addSuccessToast('filter_added_successfully'));
+    };
-        dispatch(getFilteringStatus());
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(addFilterFailure());
-    }
-};
 
 export const removeFilterRequest = createAction('REMOVE_FILTER_REQUEST');
 export const removeFilterFailure = createAction('REMOVE_FILTER_FAILURE');
 export const removeFilterSuccess = createAction('REMOVE_FILTER_SUCCESS');
 
-export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => {
+export const removeFilter =
-    dispatch(removeFilterRequest());
+    (url: any, whitelist = false) =>
-    try {
+    async (dispatch: any, getState: any) => {
-        await apiClient.removeFilter({ url, whitelist });
+        dispatch(removeFilterRequest());
-        dispatch(removeFilterSuccess(url));
+        try {
-        if (getState().filtering.isModalOpen) {
+            await apiClient.removeFilter({ url, whitelist });
-            dispatch(toggleFilteringModal());
+            dispatch(removeFilterSuccess(url));
+            if (getState().filtering.isModalOpen) {
+                dispatch(toggleFilteringModal());
+            }
+            dispatch(addSuccessToast('filter_removed_successfully'));
+            dispatch(getFilteringStatus());
+        } catch (error) {
+            dispatch(addErrorToast({ error }));
+            dispatch(removeFilterFailure());
         }
-        dispatch(addSuccessToast('filter_removed_successfully'));
+    };
-        dispatch(getFilteringStatus());
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(removeFilterFailure());
-    }
-};
 
 export const toggleFilterRequest = createAction('FILTER_TOGGLE_REQUEST');
 export const toggleFilterFailure = createAction('FILTER_TOGGLE_FAILURE');
 export const toggleFilterSuccess = createAction('FILTER_TOGGLE_SUCCESS');
 
-export const toggleFilterStatus = (url, data, whitelist = false) => async (dispatch) => {
+export const toggleFilterStatus =
-    dispatch(toggleFilterRequest());
+    (url: any, data: any, whitelist = false) =>
-    try {
+    async (dispatch: any) => {
-        await apiClient.setFilterUrl({ url, data, whitelist });
+        dispatch(toggleFilterRequest());
-        dispatch(toggleFilterSuccess(url));
+        try {
-        dispatch(getFilteringStatus());
+            await apiClient.setFilterUrl({ url, data, whitelist });
-    } catch (error) {
+            dispatch(toggleFilterSuccess(url));
-        dispatch(addErrorToast({ error }));
+            dispatch(getFilteringStatus());
-        dispatch(toggleFilterFailure());
+        } catch (error) {
-    }
+            dispatch(addErrorToast({ error }));
-};
+            dispatch(toggleFilterFailure());
+        }
+    };
 
 export const editFilterRequest = createAction('EDIT_FILTER_REQUEST');
 export const editFilterFailure = createAction('EDIT_FILTER_FAILURE');
 export const editFilterSuccess = createAction('EDIT_FILTER_SUCCESS');
 
-export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => {
+export const editFilter =
-    dispatch(editFilterRequest());
+    (url: any, data: any, whitelist = false) =>
-    try {
+    async (dispatch: any, getState: any) => {
-        await apiClient.setFilterUrl({ url, data, whitelist });
+        dispatch(editFilterRequest());
-        dispatch(editFilterSuccess(url));
+        try {
-        if (getState().filtering.isModalOpen) {
+            await apiClient.setFilterUrl({ url, data, whitelist });
-            dispatch(toggleFilteringModal());
+            dispatch(editFilterSuccess(url));
+            if (getState().filtering.isModalOpen) {
+                dispatch(toggleFilteringModal());
+            }
+            dispatch(addSuccessToast('filter_updated'));
+            dispatch(getFilteringStatus());
+        } catch (error) {
+            dispatch(addErrorToast({ error }));
+            dispatch(editFilterFailure());
         }
-        dispatch(addSuccessToast('filter_updated'));
+    };
-        dispatch(getFilteringStatus());
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(editFilterFailure());
-    }
-};
 
 export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
 export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
 export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
 
-export const refreshFilters = (config) => async (dispatch) => {
+export const refreshFilters = (config: any) => async (dispatch: any) => {
     dispatch(refreshFiltersRequest());
     dispatch(showLoading());
     try {
@@ -150,7 +158,7 @@ export const setFiltersConfigRequest = createAction('SET_FILTERS_CONFIG_REQUEST'
 export const setFiltersConfigFailure = createAction('SET_FILTERS_CONFIG_FAILURE');
 export const setFiltersConfigSuccess = createAction('SET_FILTERS_CONFIG_SUCCESS');
 
-export const setFiltersConfig = (config) => async (dispatch, getState) => {
+export const setFiltersConfig = (config: any) => async (dispatch: any, getState: any) => {
     dispatch(setFiltersConfigRequest());
     try {
         const { enabled } = config;
@@ -180,16 +188,18 @@ export const checkHostSuccess = createAction('CHECK_HOST_SUCCESS');
  * @param {string} host.name
  * @returns {undefined}
  */
-export const checkHost = (host) => async (dispatch) => {
+export const checkHost = (host: any) => async (dispatch: any) => {
     dispatch(checkHostRequest());
     try {
         const data = await apiClient.checkHost(host);
         const { name: hostname } = host;
 
-        dispatch(checkHostSuccess({
+        dispatch(
-            hostname,
+            checkHostSuccess({
-            ...data,
+                hostname,
-        }));
+                ...data,
+            }),
+        );
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(checkHostFailure());

client/src/actions/index.tsx

@@ -38,7 +38,7 @@ export const showSettingsFailure = createAction('SETTINGS_FAILURE_SHOW');
  * @param {*} status: boolean | SafeSearchConfig
  * @returns
  */
-export const toggleSetting = (settingKey, status) => async (dispatch) => {
+export const toggleSetting = (settingKey: any, status: any) => async (dispatch: any) => {
     let successMessage = '';
     try {
         switch (settingKey) {
@@ -80,64 +80,58 @@ export const initSettingsRequest = createAction('SETTINGS_INIT_REQUEST');
 export const initSettingsFailure = createAction('SETTINGS_INIT_FAILURE');
 export const initSettingsSuccess = createAction('SETTINGS_INIT_SUCCESS');
 
-export const initSettings = (settingsList = {
+export const initSettings =
-    safebrowsing: {}, parental: {},
+    (
-}) => async (dispatch) => {
+        settingsList = {
-    dispatch(initSettingsRequest());
+            safebrowsing: {},
-    try {
+            parental: {},
-        const safebrowsingStatus = await apiClient.getSafebrowsingStatus();
+        },
-        const parentalStatus = await apiClient.getParentalStatus();
+    ) =>
-        const safesearchStatus = await apiClient.getSafesearchStatus();
+    async (dispatch: any) => {
-        const {
+        dispatch(initSettingsRequest());
-            safebrowsing,
+        try {
-            parental,
+            const safebrowsingStatus = await apiClient.getSafebrowsingStatus();
-        } = settingsList;
+            const parentalStatus = await apiClient.getParentalStatus();
-        const newSettingsList = {
+            const safesearchStatus = await apiClient.getSafesearchStatus();
-            safebrowsing: {
+            const { safebrowsing, parental } = settingsList;
-                ...safebrowsing,
+            const newSettingsList = {
-                enabled: safebrowsingStatus.enabled,
+                safebrowsing: {
-            },
+                    ...safebrowsing,
-            parental: {
+                    enabled: safebrowsingStatus.enabled,
-                ...parental,
+                },
-                enabled: parentalStatus.enabled,
+                parental: {
-            },
+                    ...parental,
-            safesearch: {
+                    enabled: parentalStatus.enabled,
-                ...safesearchStatus,
+                },
-            },
+                safesearch: {
-        };
+                    ...safesearchStatus,
-        dispatch(initSettingsSuccess({ settingsList: newSettingsList }));
+                },
-    } catch (error) {
+            };
-        dispatch(addErrorToast({ error }));
+            dispatch(initSettingsSuccess({ settingsList: newSettingsList }));
-        dispatch(initSettingsFailure());
+        } catch (error) {
-    }
+            dispatch(addErrorToast({ error }));
-};
+            dispatch(initSettingsFailure());
+        }
+    };
 
 export const toggleProtectionRequest = createAction('TOGGLE_PROTECTION_REQUEST');
 export const toggleProtectionFailure = createAction('TOGGLE_PROTECTION_FAILURE');
 export const toggleProtectionSuccess = createAction('TOGGLE_PROTECTION_SUCCESS');
 
-const getDisabledMessage = (time) => {
+const getDisabledMessage = (time: any) => {
     switch (time) {
         case DISABLE_PROTECTION_TIMINGS.HALF_MINUTE:
-            return i18next.t(
+            return i18next.t('disable_notify_for_seconds', {
-                'disable_notify_for_seconds',
+                count: msToSeconds(DISABLE_PROTECTION_TIMINGS.HALF_MINUTE),
-                { count: msToSeconds(DISABLE_PROTECTION_TIMINGS.HALF_MINUTE) },
+            });
-            );
         case DISABLE_PROTECTION_TIMINGS.MINUTE:
-            return i18next.t(
+            return i18next.t('disable_notify_for_minutes', { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.MINUTE) });
-                'disable_notify_for_minutes',
-                { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.MINUTE) },
-            );
         case DISABLE_PROTECTION_TIMINGS.TEN_MINUTES:
-            return i18next.t(
+            return i18next.t('disable_notify_for_minutes', {
-                'disable_notify_for_minutes',
+                count: msToMinutes(DISABLE_PROTECTION_TIMINGS.TEN_MINUTES),
-                { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.TEN_MINUTES) },
+            });
-            );
         case DISABLE_PROTECTION_TIMINGS.HOUR:
-            return i18next.t(
+            return i18next.t('disable_notify_for_hours', { count: msToHours(DISABLE_PROTECTION_TIMINGS.HOUR) });
-                'disable_notify_for_hours',
-                { count: msToHours(DISABLE_PROTECTION_TIMINGS.HOUR) },
-            );
         case DISABLE_PROTECTION_TIMINGS.TOMORROW:
             return i18next.t('disable_notify_until_tomorrow');
         default:
@@ -145,22 +139,24 @@ const getDisabledMessage = (time) => {
     }
 };
 
-export const toggleProtection = (status, time = null) => async (dispatch) => {
+export const toggleProtection =
-    dispatch(toggleProtectionRequest());
+    (status: any, time = null) =>
-    try {
+    async (dispatch: any) => {
-        const successMessage = status ? getDisabledMessage(time) : 'enabled_protection';
+        dispatch(toggleProtectionRequest());
-        await apiClient.setProtection({ enabled: !status, duration: time });
+        try {
-        dispatch(addSuccessToast(successMessage));
+            const successMessage = status ? getDisabledMessage(time) : 'enabled_protection';
-        dispatch(toggleProtectionSuccess({ disabledDuration: time }));
+            await apiClient.setProtection({ enabled: !status, duration: time });
-    } catch (error) {
+            dispatch(addSuccessToast(successMessage));
-        dispatch(addErrorToast({ error }));
+            dispatch(toggleProtectionSuccess({ disabledDuration: time }));
-        dispatch(toggleProtectionFailure());
+        } catch (error) {
-    }
+            dispatch(addErrorToast({ error }));
-};
+            dispatch(toggleProtectionFailure());
+        }
+    };
 
 export const setDisableDurationTime = createAction('SET_DISABLED_DURATION_TIME');
 
-export const setProtectionTimerTime = (updatedTime) => async (dispatch) => {
+export const setProtectionTimerTime = (updatedTime: any) => async (dispatch: any) => {
     dispatch(setDisableDurationTime({ timeToEnableProtection: updatedTime }));
 };
 
@@ -168,40 +164,42 @@ export const getVersionRequest = createAction('GET_VERSION_REQUEST');
 export const getVersionFailure = createAction('GET_VERSION_FAILURE');
 export const getVersionSuccess = createAction('GET_VERSION_SUCCESS');
 
-export const getVersion = (recheck = false) => async (dispatch, getState) => {
+export const getVersion =
-    dispatch(getVersionRequest());
+    (recheck = false) =>
-    try {
+    async (dispatch: any, getState: any) => {
-        const data = await apiClient.getGlobalVersion({ recheck_now: recheck });
+        dispatch(getVersionRequest());
-        dispatch(getVersionSuccess(data));
+        try {
+            const data = await apiClient.getGlobalVersion({ recheck_now: recheck });
+            dispatch(getVersionSuccess(data));
 
-        if (recheck) {
+            if (recheck) {
-            const { dnsVersion } = getState().dashboard;
+                const { dnsVersion } = getState().dashboard;
-            const currentVersion = dnsVersion === 'undefined' ? 0 : dnsVersion;
+                const currentVersion = dnsVersion === 'undefined' ? 0 : dnsVersion;
 
-            if (data && !areEqualVersions(currentVersion, data.new_version)) {
+                if (data && !areEqualVersions(currentVersion, data.new_version)) {
-                dispatch(addSuccessToast('updates_checked'));
+                    dispatch(addSuccessToast('updates_checked'));
-            } else {
+                } else {
-                dispatch(addSuccessToast('updates_version_equal'));
+                    dispatch(addSuccessToast('updates_version_equal'));
+                }
             }
+        } catch (error) {
+            dispatch(addErrorToast({ error: 'version_request_error' }));
+            dispatch(getVersionFailure());
         }
-    } catch (error) {
+    };
-        dispatch(addErrorToast({ error: 'version_request_error' }));
-        dispatch(getVersionFailure());
-    }
-};
 
 export const getUpdateRequest = createAction('GET_UPDATE_REQUEST');
 export const getUpdateFailure = createAction('GET_UPDATE_FAILURE');
 export const getUpdateSuccess = createAction('GET_UPDATE_SUCCESS');
 
-const checkStatus = async (handleRequestSuccess, handleRequestError, attempts = 60) => {
+const checkStatus = async (handleRequestSuccess: any, handleRequestError: any, attempts = 60) => {
     let timeout;
 
     if (attempts === 0) {
         handleRequestError();
     }
 
-    const rmTimeout = (t) => t && clearTimeout(t);
+    const rmTimeout = (t: any) => t && clearTimeout(t);
 
     try {
         const response = await axios.get(`${apiClient.baseUrl}/status`);
@@ -220,25 +218,18 @@ const checkStatus = async (handleRequestSuccess, handleRequestError, attempts =
         }
     } catch (error) {
         rmTimeout(timeout);
-        timeout = setTimeout(
+        timeout = setTimeout(checkStatus, CHECK_TIMEOUT, handleRequestSuccess, handleRequestError, attempts - 1);
-            checkStatus,
-            CHECK_TIMEOUT,
-            handleRequestSuccess,
-            handleRequestError,
-            attempts - 1,
-        );
     }
 };
 
-export const getUpdate = () => async (dispatch, getState) => {
+export const getUpdate = () => async (dispatch: any, getState: any) => {
     const { dnsVersion } = getState().dashboard;
 
     dispatch(getUpdateRequest());
     const handleRequestError = () => {
         const options = {
             components: {
-                a: <a href={MANUAL_UPDATE_LINK} target="_blank"
+                a: <a href={MANUAL_UPDATE_LINK} target="_blank" rel="noopener noreferrer" />,
-                      rel="noopener noreferrer" />,
             },
         };
 
@@ -246,12 +237,13 @@ export const getUpdate = () => async (dispatch, getState) => {
         dispatch(getUpdateFailure());
     };
 
-    const handleRequestSuccess = (response) => {
+    const handleRequestSuccess = (response: any) => {
         const responseVersion = response.data?.version;
 
         if (dnsVersion !== responseVersion) {
             dispatch(getUpdateSuccess());
-            window.location.reload(true);
+
+            window.location.reload();
         }
     };
 
@@ -267,18 +259,20 @@ export const getClientsRequest = createAction('GET_CLIENTS_REQUEST');
 export const getClientsFailure = createAction('GET_CLIENTS_FAILURE');
 export const getClientsSuccess = createAction('GET_CLIENTS_SUCCESS');
 
-export const getClients = () => async (dispatch) => {
+export const getClients = () => async (dispatch: any) => {
     dispatch(getClientsRequest());
     try {
         const data = await apiClient.getClients();
         const sortedClients = data.clients && sortClients(data.clients);
         const sortedAutoClients = data.auto_clients && sortClients(data.auto_clients);
 
-        dispatch(getClientsSuccess({
+        dispatch(
-            clients: sortedClients || [],
+            getClientsSuccess({
-            autoClients: sortedAutoClients || [],
+                clients: sortedClients || [],
-            supportedTags: data.supported_tags || [],
+                autoClients: sortedAutoClients || [],
-        }));
+                supportedTags: data.supported_tags || [],
+            }),
+        );
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(getClientsFailure());
@@ -289,7 +283,7 @@ export const getProfileRequest = createAction('GET_PROFILE_REQUEST');
 export const getProfileFailure = createAction('GET_PROFILE_FAILURE');
 export const getProfileSuccess = createAction('GET_PROFILE_SUCCESS');
 
-export const getProfile = () => async (dispatch) => {
+export const getProfile = () => async (dispatch: any) => {
     dispatch(getProfileRequest());
     try {
         const profile = await apiClient.getProfile();
@@ -305,16 +299,17 @@ export const dnsStatusFailure = createAction('DNS_STATUS_FAILURE');
 export const dnsStatusSuccess = createAction('DNS_STATUS_SUCCESS');
 export const setDnsRunningStatus = createAction('SET_DNS_RUNNING_STATUS');
 
-export const getDnsStatus = () => async (dispatch) => {
+export const getDnsStatus = () => async (dispatch: any) => {
     dispatch(dnsStatusRequest());
 
     const handleRequestError = () => {
         dispatch(addErrorToast({ error: 'dns_status_error' }));
         dispatch(dnsStatusFailure());
-        window.location.reload(true);
+
+        window.location.reload();
     };
 
-    const handleRequestSuccess = (response) => {
+    const handleRequestSuccess = (response: any) => {
         const dnsStatus = response.data;
         if (dnsStatus.protection_disabled_duration === 0) {
             dnsStatus.protection_disabled_duration = null;
@@ -342,16 +337,17 @@ export const timerStatusRequest = createAction('TIMER_STATUS_REQUEST');
 export const timerStatusFailure = createAction('TIMER_STATUS_FAILURE');
 export const timerStatusSuccess = createAction('TIMER_STATUS_SUCCESS');
 
-export const getTimerStatus = () => async (dispatch) => {
+export const getTimerStatus = () => async (dispatch: any) => {
     dispatch(timerStatusRequest());
 
     const handleRequestError = () => {
         dispatch(addErrorToast({ error: 'dns_status_error' }));
         dispatch(dnsStatusFailure());
-        window.location.reload(true);
+
+        window.location.reload();
     };
 
-    const handleRequestSuccess = (response) => {
+    const handleRequestSuccess = (response: any) => {
         const dnsStatus = response.data;
         if (dnsStatus.protection_disabled_duration === 0) {
             dnsStatus.protection_disabled_duration = null;
@@ -376,30 +372,26 @@ export const testUpstreamRequest = createAction('TEST_UPSTREAM_REQUEST');
 export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE');
 export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS');
 
-export const testUpstream = (
+export const testUpstream =
-    {
+    ({ bootstrap_dns, upstream_dns, local_ptr_upstreams, fallback_dns }: any, upstream_dns_file: any) =>
-        bootstrap_dns,
+    async (dispatch: any) => {
-        upstream_dns,
+        dispatch(testUpstreamRequest());
-        local_ptr_upstreams,
+        try {
-        fallback_dns,
+            const removeComments = compose(filterOutComments, splitByNewLine);
-    }, upstream_dns_file,
-) => async (dispatch) => {
-    dispatch(testUpstreamRequest());
-    try {
-        const removeComments = compose(filterOutComments, splitByNewLine);
 
-        const config = {
+            const config = {
-            bootstrap_dns: splitByNewLine(bootstrap_dns),
+                bootstrap_dns: splitByNewLine(bootstrap_dns),
-            private_upstream: splitByNewLine(local_ptr_upstreams),
+                private_upstream: splitByNewLine(local_ptr_upstreams),
-            fallback_dns: splitByNewLine(fallback_dns),
+                fallback_dns: splitByNewLine(fallback_dns),
-            ...(upstream_dns_file ? null : {
+                ...(upstream_dns_file
-                upstream_dns: removeComments(upstream_dns),
+                    ? null
-            }),
+                    : {
-        };
+                          upstream_dns: removeComments(upstream_dns),
+                      }),
+            };
 
-        const upstreamResponse = await apiClient.testUpstream(config);
+            const upstreamResponse = await apiClient.testUpstream(config);
-        const testMessages = Object.keys(upstreamResponse)
+            const testMessages = Object.keys(upstreamResponse).map((key) => {
-            .map((key) => {
                 const message = upstreamResponse[key];
                 if (message.startsWith('WARNING:')) {
                     dispatch(addErrorToast({ error: i18next.t('dns_test_warning_toast', { key }) }));
@@ -407,46 +399,54 @@ export const testUpstream = (
                     const info = message.substring(0, message.indexOf(':'));
                     const [sectionKey, line] = info.split(' ');
                     const section = i18next.t(sectionKey);
-                    dispatch(addErrorToast({ error: i18next.t('dns_test_parsing_error_toast', { section, line }) }));
+                    dispatch(
+                        addErrorToast({
+                            error: i18next.t('dns_test_parsing_error_toast', {
+                                section,
+                                line,
+                            }),
+                        }),
+                    );
                 } else if (message !== 'OK') {
                     dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
                 }
                 return message;
             });
 
-        if (testMessages.every((message) => message === 'OK' || message.startsWith('WARNING:'))) {
+            if (testMessages.every((message) => message === 'OK' || message.startsWith('WARNING:'))) {
-            dispatch(addSuccessToast('dns_test_ok_toast'));
+                dispatch(addSuccessToast('dns_test_ok_toast'));
+            }
+
+            dispatch(testUpstreamSuccess());
+        } catch (error) {
+            dispatch(addErrorToast({ error }));
+            dispatch(testUpstreamFailure());
         }
+    };
 
-        dispatch(testUpstreamSuccess());
+export const testUpstreamWithFormValues = () => async (dispatch: any, getState: any) => {
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(testUpstreamFailure());
-    }
-};
-
-export const testUpstreamWithFormValues = () => async (dispatch, getState) => {
     const { upstream_dns_file } = getState().dnsConfig;
-    const {
+    const { bootstrap_dns, upstream_dns, local_ptr_upstreams, fallback_dns } =
-        bootstrap_dns,
+        getState().form[FORM_NAME.UPSTREAM].values;
-        upstream_dns,
-        local_ptr_upstreams,
-        fallback_dns,
-    } = getState().form[FORM_NAME.UPSTREAM].values;
 
-    return dispatch(testUpstream({
+    return dispatch(
-        bootstrap_dns,
+        testUpstream(
-        upstream_dns,
+            {
-        local_ptr_upstreams,
+                bootstrap_dns,
-        fallback_dns,
+                upstream_dns,
-    }, upstream_dns_file));
+                local_ptr_upstreams,
+                fallback_dns,
+            },
+            upstream_dns_file,
+        ),
+    );
 };
 
 export const changeLanguageRequest = createAction('CHANGE_LANGUAGE_REQUEST');
 export const changeLanguageFailure = createAction('CHANGE_LANGUAGE_FAILURE');
 export const changeLanguageSuccess = createAction('CHANGE_LANGUAGE_SUCCESS');
 
-export const changeLanguage = (lang) => async (dispatch) => {
+export const changeLanguage = (lang: any) => async (dispatch: any) => {
     dispatch(changeLanguageRequest());
     try {
         await apiClient.changeLanguage({ language: lang });
@@ -461,7 +461,7 @@ export const changeThemeRequest = createAction('CHANGE_THEME_REQUEST');
 export const changeThemeFailure = createAction('CHANGE_THEME_FAILURE');
 export const changeThemeSuccess = createAction('CHANGE_THEME_SUCCESS');
 
-export const changeTheme = (theme) => async (dispatch) => {
+export const changeTheme = (theme: any) => async (dispatch: any) => {
     dispatch(changeThemeRequest());
     try {
         await apiClient.changeTheme({ theme });
@@ -476,7 +476,7 @@ export const getDhcpStatusRequest = createAction('GET_DHCP_STATUS_REQUEST');
 export const getDhcpStatusSuccess = createAction('GET_DHCP_STATUS_SUCCESS');
 export const getDhcpStatusFailure = createAction('GET_DHCP_STATUS_FAILURE');
 
-export const getDhcpStatus = () => async (dispatch) => {
+export const getDhcpStatus = () => async (dispatch: any) => {
     dispatch(getDhcpStatusRequest());
     try {
         const globalStatus = await apiClient.getGlobalStatus();
@@ -497,7 +497,7 @@ export const getDhcpInterfacesRequest = createAction('GET_DHCP_INTERFACES_REQUES
 export const getDhcpInterfacesSuccess = createAction('GET_DHCP_INTERFACES_SUCCESS');
 export const getDhcpInterfacesFailure = createAction('GET_DHCP_INTERFACES_FAILURE');
 
-export const getDhcpInterfaces = () => async (dispatch) => {
+export const getDhcpInterfaces = () => async (dispatch: any) => {
     dispatch(getDhcpInterfacesRequest());
     try {
         const interfaces = await apiClient.getDhcpInterfaces();
@@ -512,7 +512,7 @@ export const findActiveDhcpRequest = createAction('FIND_ACTIVE_DHCP_REQUEST');
 export const findActiveDhcpSuccess = createAction('FIND_ACTIVE_DHCP_SUCCESS');
 export const findActiveDhcpFailure = createAction('FIND_ACTIVE_DHCP_FAILURE');
 
-export const findActiveDhcp = (name) => async (dispatch, getState) => {
+export const findActiveDhcp = (name: any) => async (dispatch: any, getState: any) => {
     dispatch(findActiveDhcpRequest());
     try {
         const req = {
@@ -559,12 +559,12 @@ export const findActiveDhcp = (name) => async (dispatch, getState) => {
             return;
         }
 
-        if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.YES)
+        if (
-                || (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.YES)) {
+            (hasV4Interface && v4.other_server.found === STATUS_RESPONSE.YES) ||
+            (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.YES)
+        ) {
             dispatch(addErrorToast({ error: 'dhcp_found' }));
-        } else if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.NO
+        } else if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.NO && v4.static_ip.ip && interface_name) {
-                && v4.static_ip.ip
-                && interface_name) {
             const warning = i18next.t('dhcp_dynamic_ip_found', {
                 interfaceName: interface_name,
                 ipAddress: v4.static_ip.ip,
@@ -587,7 +587,7 @@ export const setDhcpConfigRequest = createAction('SET_DHCP_CONFIG_REQUEST');
 export const setDhcpConfigSuccess = createAction('SET_DHCP_CONFIG_SUCCESS');
 export const setDhcpConfigFailure = createAction('SET_DHCP_CONFIG_FAILURE');
 
-export const setDhcpConfig = (values) => async (dispatch) => {
+export const setDhcpConfig = (values: any) => async (dispatch: any) => {
     dispatch(setDhcpConfigRequest());
     try {
         await apiClient.setDhcpConfig(values);
@@ -603,7 +603,7 @@ export const toggleDhcpRequest = createAction('TOGGLE_DHCP_REQUEST');
 export const toggleDhcpFailure = createAction('TOGGLE_DHCP_FAILURE');
 export const toggleDhcpSuccess = createAction('TOGGLE_DHCP_SUCCESS');
 
-export const toggleDhcp = (values) => async (dispatch) => {
+export const toggleDhcp = (values: any) => async (dispatch: any) => {
     dispatch(toggleDhcpRequest());
     let config = {
         ...values,
@@ -633,7 +633,7 @@ export const resetDhcpRequest = createAction('RESET_DHCP_REQUEST');
 export const resetDhcpSuccess = createAction('RESET_DHCP_SUCCESS');
 export const resetDhcpFailure = createAction('RESET_DHCP_FAILURE');
 
-export const resetDhcp = () => async (dispatch) => {
+export const resetDhcp = () => async (dispatch: any) => {
     dispatch(resetDhcpRequest());
     try {
         const status = await apiClient.resetDhcp();
@@ -649,7 +649,7 @@ export const resetDhcpLeasesRequest = createAction('RESET_DHCP_LEASES_REQUEST');
 export const resetDhcpLeasesSuccess = createAction('RESET_DHCP_LEASES_SUCCESS');
 export const resetDhcpLeasesFailure = createAction('RESET_DHCP_LEASES_FAILURE');
 
-export const resetDhcpLeases = () => async (dispatch) => {
+export const resetDhcpLeases = () => async (dispatch: any) => {
     dispatch(resetDhcpLeasesRequest());
     try {
         const status = await apiClient.resetDhcpLeases();
@@ -667,7 +667,7 @@ export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
 export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
 export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
 
-export const addStaticLease = (config) => async (dispatch) => {
+export const addStaticLease = (config: any) => async (dispatch: any) => {
     dispatch(addStaticLeaseRequest());
     try {
         const name = config.hostname || config.ip;
@@ -686,7 +686,7 @@ export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUES
 export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
 export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
 
-export const removeStaticLease = (config) => async (dispatch) => {
+export const removeStaticLease = (config: any) => async (dispatch: any) => {
     dispatch(removeStaticLeaseRequest());
     try {
         const name = config.hostname || config.ip;
@@ -703,7 +703,7 @@ export const updateStaticLeaseRequest = createAction('UPDATE_STATIC_LEASE_REQUES
 export const updateStaticLeaseFailure = createAction('UPDATE_STATIC_LEASE_FAILURE');
 export const updateStaticLeaseSuccess = createAction('UPDATE_STATIC_LEASE_SUCCESS');
 
-export const updateStaticLease = (config) => async (dispatch) => {
+export const updateStaticLease = (config: any) => async (dispatch: any) => {
     dispatch(updateStaticLeaseRequest());
     try {
         await apiClient.updateStaticLease(config);
@@ -719,42 +719,42 @@ export const updateStaticLease = (config) => async (dispatch) => {
 
 export const removeToast = createAction('REMOVE_TOAST');
 
-export const toggleBlocking = (
+export const toggleBlocking =
-    type, domain, baseRule, baseUnblocking,
+    (type: any, domain: any, baseRule?: string, baseUnblocking?: string) => async (dispatch: any, getState: any) => {
-) => async (dispatch, getState) => {
+        const baseBlockingRule = baseRule || `||${domain}^$important`;
-    const baseBlockingRule = baseRule || `||${domain}^$important`;
+        const baseUnblockingRule = baseUnblocking || `@@${baseBlockingRule}`;
-    const baseUnblockingRule = baseUnblocking || `@@${baseBlockingRule}`;
+        const { userRules } = getState().filtering;
-    const { userRules } = getState().filtering;
 
-    const lineEnding = !endsWith(userRules, '\n') ? '\n' : '';
+        const lineEnding = !endsWith(userRules, '\n') ? '\n' : '';
 
-    const blockingRule = type === BLOCK_ACTIONS.BLOCK ? baseUnblockingRule : baseBlockingRule;
+        const blockingRule = type === BLOCK_ACTIONS.BLOCK ? baseUnblockingRule : baseBlockingRule;
-    const unblockingRule = type === BLOCK_ACTIONS.BLOCK ? baseBlockingRule : baseUnblockingRule;
+        const unblockingRule = type === BLOCK_ACTIONS.BLOCK ? baseBlockingRule : baseUnblockingRule;
-    const preparedBlockingRule = new RegExp(`(^|\n)${escapeRegExp(blockingRule)}($|\n)`);
+        const preparedBlockingRule = new RegExp(`(^|\n)${escapeRegExp(blockingRule)}($|\n)`);
-    const preparedUnblockingRule = new RegExp(`(^|\n)${escapeRegExp(unblockingRule)}($|\n)`);
+        const preparedUnblockingRule = new RegExp(`(^|\n)${escapeRegExp(unblockingRule)}($|\n)`);
 
-    const matchPreparedBlockingRule = userRules.match(preparedBlockingRule);
+        const matchPreparedBlockingRule = userRules.match(preparedBlockingRule);
-    const matchPreparedUnblockingRule = userRules.match(preparedUnblockingRule);
+        const matchPreparedUnblockingRule = userRules.match(preparedUnblockingRule);
 
-    if (matchPreparedBlockingRule) {
+        if (matchPreparedBlockingRule) {
-        await dispatch(setRules(userRules.replace(`${blockingRule}`, '')));
+            await dispatch(setRules(userRules.replace(`${blockingRule}`, '')));
-        dispatch(addSuccessToast(i18next.t('rule_removed_from_custom_filtering_toast', { rule: blockingRule })));
+            dispatch(addSuccessToast(i18next.t('rule_removed_from_custom_filtering_toast', { rule: blockingRule })));
-    } else if (!matchPreparedUnblockingRule) {
+        } else if (!matchPreparedUnblockingRule) {
-        await dispatch(setRules(`${userRules}${lineEnding}${unblockingRule}\n`));
+            await dispatch(setRules(`${userRules}${lineEnding}${unblockingRule}\n`));
-        dispatch(addSuccessToast(i18next.t('rule_added_to_custom_filtering_toast', { rule: unblockingRule })));
+            dispatch(addSuccessToast(i18next.t('rule_added_to_custom_filtering_toast', { rule: unblockingRule })));
-    } else if (matchPreparedUnblockingRule) {
+        } else if (matchPreparedUnblockingRule) {
-        dispatch(addSuccessToast(i18next.t('rule_added_to_custom_filtering_toast', { rule: unblockingRule })));
+            dispatch(addSuccessToast(i18next.t('rule_added_to_custom_filtering_toast', { rule: unblockingRule })));
-        return;
+            return;
-    } else if (!matchPreparedBlockingRule) {
+        } else if (!matchPreparedBlockingRule) {
-        dispatch(addSuccessToast(i18next.t('rule_removed_from_custom_filtering_toast', { rule: blockingRule })));
+            dispatch(addSuccessToast(i18next.t('rule_removed_from_custom_filtering_toast', { rule: blockingRule })));
-        return;
+            return;
-    }
+        }
 
-    dispatch(getFilteringStatus());
+        dispatch(getFilteringStatus());
-};
+    };
 
-export const toggleBlockingForClient = (type, domain, client) => {
+export const toggleBlockingForClient = (type: any, domain: any, client: any) => {
-    const escapedClientName = client.replace(/'/g, '\\\'')
+    const escapedClientName = client
+        .replace(/'/g, "\\'")
         .replace(/"/g, '\\"')
         .replace(/,/g, '\\,')
         .replace(/\|/g, '\\|');

client/src/actions/install.ts

@@ -9,7 +9,7 @@ export const getDefaultAddressesRequest = createAction('GET_DEFAULT_ADDRESSES_RE
 export const getDefaultAddressesFailure = createAction('GET_DEFAULT_ADDRESSES_FAILURE');
 export const getDefaultAddressesSuccess = createAction('GET_DEFAULT_ADDRESSES_SUCCESS');
 
-export const getDefaultAddresses = () => async (dispatch) => {
+export const getDefaultAddresses = () => async (dispatch: any) => {
     dispatch(getDefaultAddressesRequest());
     try {
         const addresses = await apiClient.getDefaultAddresses();
@@ -24,13 +24,10 @@ export const setAllSettingsRequest = createAction('SET_ALL_SETTINGS_REQUEST');
 export const setAllSettingsFailure = createAction('SET_ALL_SETTINGS_FAILURE');
 export const setAllSettingsSuccess = createAction('SET_ALL_SETTINGS_SUCCESS');
 
-export const setAllSettings = (values) => async (dispatch) => {
+export const setAllSettings = (values: any) => async (dispatch: any) => {
     dispatch(setAllSettingsRequest());
     try {
-        const {
+        const { confirm_password, ...config } = values;
-            confirm_password,
-            ...config
-        } = values;
 
         await apiClient.setAllSettings(config);
         dispatch(setAllSettingsSuccess());
@@ -47,7 +44,7 @@ export const checkConfigRequest = createAction('CHECK_CONFIG_REQUEST');
 export const checkConfigFailure = createAction('CHECK_CONFIG_FAILURE');
 export const checkConfigSuccess = createAction('CHECK_CONFIG_SUCCESS');
 
-export const checkConfig = (values) => async (dispatch) => {
+export const checkConfig = (values: any) => async (dispatch: any) => {
     dispatch(checkConfigRequest());
     try {
         const check = await apiClient.checkConfig(values);

client/src/actions/login.ts

@@ -8,12 +8,12 @@ export const processLoginRequest = createAction('PROCESS_LOGIN_REQUEST');
 export const processLoginFailure = createAction('PROCESS_LOGIN_FAILURE');
 export const processLoginSuccess = createAction('PROCESS_LOGIN_SUCCESS');
 
-export const processLogin = (values) => async (dispatch) => {
+export const processLogin = (values: any) => async (dispatch: any) => {
     dispatch(processLoginRequest());
     try {
         await apiClient.login(values);
-        const dashboardUrl = window.location.origin
+        const dashboardUrl =
-                + window.location.pathname.replace(HTML_PAGES.LOGIN, HTML_PAGES.MAIN);
+            window.location.origin + window.location.pathname.replace(HTML_PAGES.LOGIN, HTML_PAGES.MAIN);
         window.location.replace(dashboardUrl);
         dispatch(processLoginSuccess());
     } catch (error) {

client/src/actions/queryLogs.ts

@@ -1,13 +1,12 @@
 import { createAction } from 'redux-actions';
 
 import apiClient from '../api/Api';
+
 import { normalizeLogs } from '../helpers/helpers';
-import {
+import { DEFAULT_LOGS_FILTER, FORM_NAME, QUERY_LOGS_PAGE_LIMIT } from '../helpers/constants';
-    DEFAULT_LOGS_FILTER, FORM_NAME, QUERY_LOGS_PAGE_LIMIT,
-} from '../helpers/constants';
 import { addErrorToast, addSuccessToast } from './toasts';
 
-const getLogsWithParams = async (config) => {
+const getLogsWithParams = async (config: any) => {
     const { older_than, filter, ...values } = config;
     const rawLogs = await apiClient.getQueryLog({
         ...filter,
@@ -28,20 +27,20 @@ export const getAdditionalLogsRequest = createAction('GET_ADDITIONAL_LOGS_REQUES
 export const getAdditionalLogsFailure = createAction('GET_ADDITIONAL_LOGS_FAILURE');
 export const getAdditionalLogsSuccess = createAction('GET_ADDITIONAL_LOGS_SUCCESS');
 
-const shortPollQueryLogs = async (data, filter, dispatch, getState, total) => {
+const shortPollQueryLogs = async (data: any, filter: any, dispatch: any, getState: any, total?: any) => {
     const { logs, oldest } = data;
     const totalData = total || { logs };
 
     const queryForm = getState().form[FORM_NAME.LOGS_FILTER];
     const currentQuery = queryForm && queryForm.values.search;
     const previousQuery = filter?.search;
-    const isQueryTheSame = typeof previousQuery === 'string'
+    const isQueryTheSame =
-            && typeof currentQuery === 'string'
+        typeof previousQuery === 'string' && typeof currentQuery === 'string' && previousQuery === currentQuery;
-            && previousQuery === currentQuery;
 
-    const isShortPollingNeeded = (logs.length < QUERY_LOGS_PAGE_LIMIT
+    const isShortPollingNeeded =
-            || totalData.logs.length < QUERY_LOGS_PAGE_LIMIT)
+        (logs.length < QUERY_LOGS_PAGE_LIMIT || totalData.logs.length < QUERY_LOGS_PAGE_LIMIT) &&
-            && oldest !== '' && isQueryTheSame;
+        oldest !== '' &&
+        isQueryTheSame;
 
     if (isShortPollingNeeded) {
         dispatch(getAdditionalLogsRequest());
@@ -75,22 +74,24 @@ export const getLogsRequest = createAction('GET_LOGS_REQUEST');
 export const getLogsFailure = createAction('GET_LOGS_FAILURE');
 export const getLogsSuccess = createAction('GET_LOGS_SUCCESS');
 
-export const updateLogs = () => async (dispatch, getState) => {
+export const updateLogs = () => async (dispatch: any, getState: any) => {
     try {
         const { logs, oldest, older_than } = getState().queryLogs;
 
-        dispatch(getLogsSuccess({
+        dispatch(
-            logs,
+            getLogsSuccess({
-            oldest,
+                logs,
-            older_than,
+                oldest,
-        }));
+                older_than,
+            }),
+        );
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(getLogsFailure(error));
     }
 };
 
-export const getLogs = () => async (dispatch, getState) => {
+export const getLogs = () => async (dispatch: any, getState: any) => {
     dispatch(getLogsRequest());
     try {
         const { isFiltered, filter, oldest } = getState().queryLogs;
@@ -121,26 +122,29 @@ export const setLogsFilterRequest = createAction('SET_LOGS_FILTER_REQUEST');
  * @param {string} filter.response_status 'QUERY' field of RESPONSE_FILTER object
  * @returns function
  */
-export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
+export const setLogsFilter = (filter: any) => setLogsFilterRequest(filter);
 
 export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
 export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
 export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
 
-export const setFilteredLogs = (filter) => async (dispatch, getState) => {
+export const setFilteredLogs = (filter?: any) => async (dispatch: any, getState: any) => {
     dispatch(setFilteredLogsRequest());
     try {
         const data = await getLogsWithParams({
             older_than: '',
             filter,
         });
+
         const additionalData = await shortPollQueryLogs(data, filter, dispatch, getState);
         const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
 
-        dispatch(setFilteredLogsSuccess({
+        dispatch(
-            ...updatedData,
+            setFilteredLogsSuccess({
-            filter,
+                ...updatedData,
-        }));
+                filter,
+            }),
+        );
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(setFilteredLogsFailure(error));
@@ -149,7 +153,7 @@ export const setFilteredLogs = (filter) => async (dispatch, getState) => {
 
 export const resetFilteredLogs = () => setFilteredLogs(DEFAULT_LOGS_FILTER);
 
-export const refreshFilteredLogs = () => async (dispatch, getState) => {
+export const refreshFilteredLogs = () => async (dispatch: any, getState: any) => {
     const { filter } = getState().queryLogs;
     await dispatch(setFilteredLogs(filter));
 };
@@ -158,7 +162,7 @@ export const clearLogsRequest = createAction('CLEAR_LOGS_REQUEST');
 export const clearLogsFailure = createAction('CLEAR_LOGS_FAILURE');
 export const clearLogsSuccess = createAction('CLEAR_LOGS_SUCCESS');
 
-export const clearLogs = () => async (dispatch) => {
+export const clearLogs = () => async (dispatch: any) => {
     dispatch(clearLogsRequest());
     try {
         await apiClient.clearQueryLog();
@@ -174,7 +178,7 @@ export const getLogsConfigRequest = createAction('GET_LOGS_CONFIG_REQUEST');
 export const getLogsConfigFailure = createAction('GET_LOGS_CONFIG_FAILURE');
 export const getLogsConfigSuccess = createAction('GET_LOGS_CONFIG_SUCCESS');
 
-export const getLogsConfig = () => async (dispatch) => {
+export const getLogsConfig = () => async (dispatch: any) => {
     dispatch(getLogsConfigRequest());
     try {
         const data = await apiClient.getQueryLogConfig();
@@ -189,7 +193,7 @@ export const setLogsConfigRequest = createAction('SET_LOGS_CONFIG_REQUEST');
 export const setLogsConfigFailure = createAction('SET_LOGS_CONFIG_FAILURE');
 export const setLogsConfigSuccess = createAction('SET_LOGS_CONFIG_SUCCESS');
 
-export const setLogsConfig = (config) => async (dispatch) => {
+export const setLogsConfig = (config: any) => async (dispatch: any) => {
     dispatch(setLogsConfigRequest());
     try {
         await apiClient.setQueryLogConfig(config);

client/src/actions/rewrites.ts

@@ -9,7 +9,7 @@ export const getRewritesListRequest = createAction('GET_REWRITES_LIST_REQUEST');
 export const getRewritesListFailure = createAction('GET_REWRITES_LIST_FAILURE');
 export const getRewritesListSuccess = createAction('GET_REWRITES_LIST_SUCCESS');
 
-export const getRewritesList = () => async (dispatch) => {
+export const getRewritesList = () => async (dispatch: any) => {
     dispatch(getRewritesListRequest());
     try {
         const data = await apiClient.getRewritesList();
@@ -24,7 +24,7 @@ export const addRewriteRequest = createAction('ADD_REWRITE_REQUEST');
 export const addRewriteFailure = createAction('ADD_REWRITE_FAILURE');
 export const addRewriteSuccess = createAction('ADD_REWRITE_SUCCESS');
 
-export const addRewrite = (config) => async (dispatch) => {
+export const addRewrite = (config: any) => async (dispatch: any) => {
     dispatch(addRewriteRequest());
     try {
         await apiClient.addRewrite(config);
@@ -47,7 +47,7 @@ export const updateRewriteSuccess = createAction('UPDATE_REWRITE_SUCCESS');
  * @param {string} config.target - current DNS rewrite value
  * @param {string} config.update - updated DNS rewrite value
  */
-export const updateRewrite = (config) => async (dispatch) => {
+export const updateRewrite = (config: any) => async (dispatch: any) => {
     dispatch(updateRewriteRequest());
     try {
         await apiClient.updateRewrite(config);
@@ -65,7 +65,7 @@ export const deleteRewriteRequest = createAction('DELETE_REWRITE_REQUEST');
 export const deleteRewriteFailure = createAction('DELETE_REWRITE_FAILURE');
 export const deleteRewriteSuccess = createAction('DELETE_REWRITE_SUCCESS');
 
-export const deleteRewrite = (config) => async (dispatch) => {
+export const deleteRewrite = (config: any) => async (dispatch: any) => {
     dispatch(deleteRewriteRequest());
     try {
         await apiClient.deleteRewrite(config);

client/src/actions/services.ts

@@ -6,7 +6,7 @@ export const getBlockedServicesRequest = createAction('GET_BLOCKED_SERVICES_REQU
 export const getBlockedServicesFailure = createAction('GET_BLOCKED_SERVICES_FAILURE');
 export const getBlockedServicesSuccess = createAction('GET_BLOCKED_SERVICES_SUCCESS');
 
-export const getBlockedServices = () => async (dispatch) => {
+export const getBlockedServices = () => async (dispatch: any) => {
     dispatch(getBlockedServicesRequest());
     try {
         const data = await apiClient.getBlockedServices();
@@ -21,7 +21,7 @@ export const getAllBlockedServicesRequest = createAction('GET_ALL_BLOCKED_SERVIC
 export const getAllBlockedServicesFailure = createAction('GET_ALL_BLOCKED_SERVICES_FAILURE');
 export const getAllBlockedServicesSuccess = createAction('GET_ALL_BLOCKED_SERVICES_SUCCESS');
 
-export const getAllBlockedServices = () => async (dispatch) => {
+export const getAllBlockedServices = () => async (dispatch: any) => {
     dispatch(getAllBlockedServicesRequest());
     try {
         const data = await apiClient.getAllBlockedServices();
@@ -36,7 +36,7 @@ export const updateBlockedServicesRequest = createAction('UPDATE_BLOCKED_SERVICE
 export const updateBlockedServicesFailure = createAction('UPDATE_BLOCKED_SERVICES_FAILURE');
 export const updateBlockedServicesSuccess = createAction('UPDATE_BLOCKED_SERVICES_SUCCESS');
 
-export const updateBlockedServices = (values) => async (dispatch) => {
+export const updateBlockedServices = (values: any) => async (dispatch: any) => {
     dispatch(updateBlockedServicesRequest());
     try {
         await apiClient.updateBlockedServices(values);

client/src/actions/stats.ts

@@ -1,16 +1,14 @@
 import { createAction } from 'redux-actions';
 
 import apiClient from '../api/Api';
-import {
+import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
-    normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo,
-} from '../helpers/helpers';
 import { addErrorToast, addSuccessToast } from './toasts';
 
 export const getStatsConfigRequest = createAction('GET_STATS_CONFIG_REQUEST');
 export const getStatsConfigFailure = createAction('GET_STATS_CONFIG_FAILURE');
 export const getStatsConfigSuccess = createAction('GET_STATS_CONFIG_SUCCESS');
 
-export const getStatsConfig = () => async (dispatch) => {
+export const getStatsConfig = () => async (dispatch: any) => {
     dispatch(getStatsConfigRequest());
     try {
         const data = await apiClient.getStatsConfig();
@@ -25,7 +23,7 @@ export const setStatsConfigRequest = createAction('SET_STATS_CONFIG_REQUEST');
 export const setStatsConfigFailure = createAction('SET_STATS_CONFIG_FAILURE');
 export const setStatsConfigSuccess = createAction('SET_STATS_CONFIG_SUCCESS');
 
-export const setStatsConfig = (config) => async (dispatch) => {
+export const setStatsConfig = (config: any) => async (dispatch: any) => {
     dispatch(setStatsConfigRequest());
     try {
         await apiClient.setStatsConfig(config);
@@ -41,11 +39,12 @@ export const getStatsRequest = createAction('GET_STATS_REQUEST');
 export const getStatsFailure = createAction('GET_STATS_FAILURE');
 export const getStatsSuccess = createAction('GET_STATS_SUCCESS');
 
-export const getStats = () => async (dispatch) => {
+export const getStats = () => async (dispatch: any) => {
     dispatch(getStatsRequest());
     try {
         const stats = await apiClient.getStats();
         const normalizedTopClients = normalizeTopStats(stats.top_clients);
+
         const clientsParams = getParamsForClientsSearch(normalizedTopClients, 'name');
         const clients = await apiClient.findClients(clientsParams);
         const topClientsWithInfo = addClientInfo(normalizedTopClients, clients, 'name');
@@ -71,7 +70,7 @@ export const resetStatsRequest = createAction('RESET_STATS_REQUEST');
 export const resetStatsFailure = createAction('RESET_STATS_FAILURE');
 export const resetStatsSuccess = createAction('RESET_STATS_SUCCESS');
 
-export const resetStats = () => async (dispatch) => {
+export const resetStats = () => async (dispatch: any) => {
     dispatch(getStatsRequest());
     try {
         await apiClient.resetStats();

client/src/api/Api.ts

@@ -1,17 +1,16 @@
 import axios from 'axios';
 
-import { getPathWithQueryString } from '../helpers/helpers';
-import {
-    QUERY_LOGS_PAGE_LIMIT, HTML_PAGES, R_PATH_LAST_PART, THEMES,
-} from '../helpers/constants';
 import { BASE_URL } from '../../constants';
+
+import { getPathWithQueryString } from '../helpers/helpers';
+import { QUERY_LOGS_PAGE_LIMIT, HTML_PAGES, R_PATH_LAST_PART, THEMES } from '../helpers/constants';
 import i18n from '../i18n';
 import { LANGUAGES } from '../helpers/twosky';
 
 class Api {
     baseUrl = BASE_URL;
 
-    async makeRequest(path, method = 'POST', config) {
+    async makeRequest(path: any, method = 'POST', config: any = {}) {
         const url = `${this.baseUrl}/${path}`;
 
         const axiosConfig = config || {};
@@ -29,26 +28,26 @@ class Api {
             return response.data;
         } catch (error) {
             const errorPath = url;
+
             if (error.response) {
                 const { pathname } = document.location;
-                const shouldRedirect = pathname !== HTML_PAGES.LOGIN
+                const shouldRedirect = pathname !== HTML_PAGES.LOGIN && pathname !== HTML_PAGES.INSTALL;
-                        && pathname !== HTML_PAGES.INSTALL;
 
                 if (error.response.status === 403 && shouldRedirect) {
-                    const loginPageUrl = window.location.href
+                    const loginPageUrl = window.location.href.replace(R_PATH_LAST_PART, HTML_PAGES.LOGIN);
-                        .replace(R_PATH_LAST_PART, HTML_PAGES.LOGIN);
                     window.location.replace(loginPageUrl);
                     return false;
                 }
 
                 throw new Error(`${errorPath} | ${error.response.data} | ${error.response.status}`);
             }
+
             throw new Error(`${errorPath} | ${error.message || error}`);
         }
     }
 
     // Global methods
-    GLOBAL_STATUS = { path: 'status', method: 'GET' }
+    GLOBAL_STATUS = { path: 'status', method: 'GET' };
 
     GLOBAL_TEST_UPSTREAM_DNS = { path: 'test_upstream_dns', method: 'POST' };
 
@@ -58,10 +57,11 @@ class Api {
 
     getGlobalStatus() {
         const { path, method } = this.GLOBAL_STATUS;
+
         return this.makeRequest(path, method);
     }
 
-    testUpstream(servers) {
+    testUpstream(servers: any) {
         const { path, method } = this.GLOBAL_TEST_UPSTREAM_DNS;
         const config = {
             data: servers,
@@ -69,7 +69,7 @@ class Api {
         return this.makeRequest(path, method, config);
     }
 
-    getGlobalVersion(data) {
+    getGlobalVersion(data: any) {
         const { path, method } = this.GLOBAL_VERSION;
         const config = {
             data,
@@ -79,6 +79,7 @@ class Api {
 
     getUpdate() {
         const { path, method } = this.GLOBAL_UPDATE;
+
         return this.makeRequest(path, method);
     }
 
@@ -101,10 +102,11 @@ class Api {
 
     getFilteringStatus() {
         const { path, method } = this.FILTERING_STATUS;
+
         return this.makeRequest(path, method);
     }
 
-    refreshFilters(config) {
+    refreshFilters(config: any) {
         const { path, method } = this.FILTERING_REFRESH;
         const parameters = {
             data: config,
@@ -113,7 +115,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    addFilter(config) {
+    addFilter(config: any) {
         const { path, method } = this.FILTERING_ADD_FILTER;
         const parameters = {
             data: config,
@@ -122,7 +124,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    removeFilter(config) {
+    removeFilter(config: any) {
         const { path, method } = this.FILTERING_REMOVE_FILTER;
         const parameters = {
             data: config,
@@ -131,7 +133,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    setRules(rules) {
+    setRules(rules: any) {
         const { path, method } = this.FILTERING_SET_RULES;
         const parameters = {
             data: rules,
@@ -139,7 +141,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    setFiltersConfig(config) {
+    setFiltersConfig(config: any) {
         const { path, method } = this.FILTERING_CONFIG;
         const parameters = {
             data: config,
@@ -147,7 +149,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    setFilterUrl(config) {
+    setFilterUrl(config: any) {
         const { path, method } = this.FILTERING_SET_URL;
         const parameters = {
             data: config,
@@ -155,9 +157,10 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    checkHost(params) {
+    checkHost(params: any) {
         const { path, method } = this.FILTERING_CHECK_HOST;
         const url = getPathWithQueryString(path, params);
+
         return this.makeRequest(url, method);
     }
 
@@ -170,16 +173,19 @@ class Api {
 
     getParentalStatus() {
         const { path, method } = this.PARENTAL_STATUS;
+
         return this.makeRequest(path, method);
     }
 
     enableParentalControl() {
         const { path, method } = this.PARENTAL_ENABLE;
+
         return this.makeRequest(path, method);
     }
 
     disableParentalControl() {
         const { path, method } = this.PARENTAL_DISABLE;
+
         return this.makeRequest(path, method);
     }
 
@@ -192,16 +198,19 @@ class Api {
 
     getSafebrowsingStatus() {
         const { path, method } = this.SAFEBROWSING_STATUS;
+
         return this.makeRequest(path, method);
     }
 
     enableSafebrowsing() {
         const { path, method } = this.SAFEBROWSING_ENABLE;
+
         return this.makeRequest(path, method);
     }
 
     disableSafebrowsing() {
         const { path, method } = this.SAFEBROWSING_DISABLE;
+
         return this.makeRequest(path, method);
     }
 
@@ -212,6 +221,7 @@ class Api {
 
     getSafesearchStatus() {
         const { path, method } = this.SAFESEARCH_STATUS;
+
         return this.makeRequest(path, method);
     }
 
@@ -228,7 +238,7 @@ class Api {
      * @param {*} data - SafeSearchConfig
      * @returns 200 ok
      */
-    updateSafesearch(data) {
+    updateSafesearch(data: any) {
         const { path, method } = this.SAFESEARCH_UPDATE;
         return this.makeRequest(path, method, { data });
     }
@@ -245,7 +255,7 @@ class Api {
 
     // Language
 
-    async changeLanguage(config) {
+    async changeLanguage(config: any) {
         const profile = await this.getProfile();
         profile.language = config.language;
 
@@ -254,7 +264,7 @@ class Api {
 
     // Theme
 
-    async changeTheme(config) {
+    async changeTheme(config: any) {
         const profile = await this.getProfile();
         profile.theme = config.theme;
 
@@ -282,15 +292,17 @@ class Api {
 
     getDhcpStatus() {
         const { path, method } = this.DHCP_STATUS;
+
         return this.makeRequest(path, method);
     }
 
     getDhcpInterfaces() {
         const { path, method } = this.DHCP_INTERFACES;
+
         return this.makeRequest(path, method);
     }
 
-    setDhcpConfig(config) {
+    setDhcpConfig(config: any) {
         const { path, method } = this.DHCP_SET_CONFIG;
         const parameters = {
             data: config,
@@ -298,7 +310,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    findActiveDhcp(req) {
+    findActiveDhcp(req: any) {
         const { path, method } = this.DHCP_FIND_ACTIVE;
         const parameters = {
             data: req,
@@ -306,7 +318,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    addStaticLease(config) {
+    addStaticLease(config: any) {
         const { path, method } = this.DHCP_ADD_STATIC_LEASE;
         const parameters = {
             data: config,
@@ -314,7 +326,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    removeStaticLease(config) {
+    removeStaticLease(config: any) {
         const { path, method } = this.DHCP_REMOVE_STATIC_LEASE;
         const parameters = {
             data: config,
@@ -322,7 +334,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    updateStaticLease(config) {
+    updateStaticLease(config: any) {
         const { path, method } = this.DHCP_UPDATE_STATIC_LEASE;
         const parameters = {
             data: config,
@@ -332,11 +344,13 @@ class Api {
 
     resetDhcp() {
         const { path, method } = this.DHCP_RESET;
+
         return this.makeRequest(path, method);
     }
 
     resetDhcpLeases() {
         const { path, method } = this.DHCP_LEASES_RESET;
+
         return this.makeRequest(path, method);
     }
 
@@ -349,10 +363,11 @@ class Api {
 
     getDefaultAddresses() {
         const { path, method } = this.INSTALL_GET_ADDRESSES;
+
         return this.makeRequest(path, method);
     }
 
-    setAllSettings(config) {
+    setAllSettings(config: any) {
         const { path, method } = this.INSTALL_CONFIGURE;
         const parameters = {
             data: config,
@@ -360,7 +375,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    checkConfig(config) {
+    checkConfig(config: any) {
         const { path, method } = this.INSTALL_CHECK_CONFIG;
         const parameters = {
             data: config,
@@ -377,10 +392,11 @@ class Api {
 
     getTlsStatus() {
         const { path, method } = this.TLS_STATUS;
+
         return this.makeRequest(path, method);
     }
 
-    setTlsConfig(config) {
+    setTlsConfig(config: any) {
         const { path, method } = this.TLS_CONFIG;
         const parameters = {
             data: config,
@@ -388,7 +404,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    validateTlsConfig(config) {
+    validateTlsConfig(config: any) {
         const { path, method } = this.TLS_VALIDATE;
         const parameters = {
             data: config,
@@ -409,10 +425,11 @@ class Api {
 
     getClients() {
         const { path, method } = this.GET_CLIENTS;
+
         return this.makeRequest(path, method);
     }
 
-    addClient(config) {
+    addClient(config: any) {
         const { path, method } = this.ADD_CLIENT;
         const parameters = {
             data: config,
@@ -420,7 +437,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    deleteClient(config) {
+    deleteClient(config: any) {
         const { path, method } = this.DELETE_CLIENT;
         const parameters = {
             data: config,
@@ -428,7 +445,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    updateClient(config) {
+    updateClient(config: any) {
         const { path, method } = this.UPDATE_CLIENT;
         const parameters = {
             data: config,
@@ -436,9 +453,10 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    findClients(params) {
+    findClients(params: any) {
         const { path, method } = this.FIND_CLIENTS;
         const url = getPathWithQueryString(path, params);
+
         return this.makeRequest(url, method);
     }
 
@@ -449,10 +467,11 @@ class Api {
 
     getAccessList() {
         const { path, method } = this.ACCESS_LIST;
+
         return this.makeRequest(path, method);
     }
 
-    setAccessList(config) {
+    setAccessList(config: any) {
         const { path, method } = this.ACCESS_SET;
         const parameters = {
             data: config,
@@ -471,10 +490,11 @@ class Api {
 
     getRewritesList() {
         const { path, method } = this.REWRITES_LIST;
+
         return this.makeRequest(path, method);
     }
 
-    addRewrite(config) {
+    addRewrite(config: any) {
         const { path, method } = this.REWRITE_ADD;
         const parameters = {
             data: config,
@@ -482,7 +502,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    updateRewrite(config) {
+    updateRewrite(config: any) {
         const { path, method } = this.REWRITE_UPDATE;
         const parameters = {
             data: config,
@@ -490,7 +510,7 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    deleteRewrite(config) {
+    deleteRewrite(config: any) {
         const { path, method } = this.REWRITE_DELETE;
         const parameters = {
             data: config,
@@ -507,15 +527,17 @@ class Api {
 
     getAllBlockedServices() {
         const { path, method } = this.BLOCKED_SERVICES_ALL;
+
         return this.makeRequest(path, method);
     }
 
     getBlockedServices() {
         const { path, method } = this.BLOCKED_SERVICES_GET;
+
         return this.makeRequest(path, method);
     }
 
-    updateBlockedServices(config) {
+    updateBlockedServices(config: any) {
         const { path, method } = this.BLOCKED_SERVICES_UPDATE;
         const parameters = {
             data: config,
@@ -534,15 +556,17 @@ class Api {
 
     getStats() {
         const { path, method } = this.GET_STATS;
+
         return this.makeRequest(path, method);
     }
 
     getStatsConfig() {
         const { path, method } = this.GET_STATS_CONFIG;
+
         return this.makeRequest(path, method);
     }
 
-    setStatsConfig(data) {
+    setStatsConfig(data: any) {
         const { path, method } = this.UPDATE_STATS_CONFIG;
         const config = {
             data,
@@ -552,6 +576,7 @@ class Api {
 
     resetStats() {
         const { path, method } = this.STATS_RESET;
+
         return this.makeRequest(path, method);
     }
 
@@ -564,20 +589,22 @@ class Api {
 
     QUERY_LOG_CLEAR = { path: 'querylog_clear', method: 'POST' };
 
-    getQueryLog(params) {
+    getQueryLog(params: any) {
         const { path, method } = this.GET_QUERY_LOG;
         // eslint-disable-next-line no-param-reassign
         params.limit = QUERY_LOGS_PAGE_LIMIT;
         const url = getPathWithQueryString(path, params);
+
         return this.makeRequest(url, method);
     }
 
     getQueryLogConfig() {
         const { path, method } = this.GET_QUERY_LOG_CONFIG;
+
         return this.makeRequest(path, method);
     }
 
-    setQueryLogConfig(data) {
+    setQueryLogConfig(data: any) {
         const { path, method } = this.UPDATE_QUERY_LOG_CONFIG;
         const config = {
             data,
@@ -587,13 +614,14 @@ class Api {
 
     clearQueryLog() {
         const { path, method } = this.QUERY_LOG_CLEAR;
+
         return this.makeRequest(path, method);
     }
 
     // Login
     LOGIN = { path: 'login', method: 'POST' };
 
-    login(data) {
+    login(data: any) {
         const { path, method } = this.LOGIN;
         const config = {
             data,
@@ -608,10 +636,11 @@ class Api {
 
     getProfile() {
         const { path, method } = this.GET_PROFILE;
+
         return this.makeRequest(path, method);
     }
 
-    setProfile(data) {
+    setProfile(data: any) {
         const theme = data.theme ? data.theme : THEMES.auto;
         const defaultLanguage = i18n.language ? i18n.language : LANGUAGES.en;
         const language = data.language ? data.language : defaultLanguage;
@@ -629,10 +658,11 @@ class Api {
 
     getDnsConfig() {
         const { path, method } = this.GET_DNS_CONFIG;
+
         return this.makeRequest(path, method);
     }
 
-    setDnsConfig(data) {
+    setDnsConfig(data: any) {
         const { path, method } = this.SET_DNS_CONFIG;
         const config = {
             data,
@@ -642,7 +672,7 @@ class Api {
 
     SET_PROTECTION = { path: 'protection', method: 'POST' };
 
-    setProtection(data) {
+    setProtection(data: any) {
         const { enabled, duration } = data;
         const { path, method } = this.SET_PROTECTION;
 
@@ -654,6 +684,7 @@ class Api {
 
     clearCache() {
         const { path, method } = this.CLEAR_CACHE;
+
         return this.makeRequest(path, method);
     }
 }

client/src/components/App/index.css

@@ -15,8 +15,8 @@
     --btn-success-bgcolor: #5eba00;
     --form-disabled-bgcolor: #f8f9fa;
     --form-disabled-color: #495057;
-    --rt-nodata-bgcolor: rgba(255,255,255,0.8);
+    --rt-nodata-bgcolor: rgba(255, 255, 255, 0.8);
-    --rt-nodata-color: rgba(0,0,0,0.5);
+    --rt-nodata-color: rgba(0, 0, 0, 0.5);
     --modal-overlay-bgcolor: rgba(255, 255, 255, 0.75);
     --logs__table-bgcolor: #fff;
     --logs__row--blue-bgcolor: #e5effd;
@@ -28,7 +28,7 @@
     --gray-d8: #d8d8d8;
     --gray-f3: #f3f3f3;
     --loading-bg: rgba(255, 255, 255, 0.48);
-    --font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
+    --font-family-monospace: Monaco, Menlo, 'Ubuntu Mono', Consolas, source-code-pro, monospace;
     --font-size-disable-autozoom: 1rem;
     --alert-message-color: #24426c;
     --alert-message-border: #cbdbf2;
@@ -37,7 +37,7 @@
     --radio-bg: #ffffff;
 }
 
-[data-theme="dark"] {
+[data-theme='dark'] {
     --black: #ffffff;
     --bgcolor: #131313;
     --mcolor: #e6e6e6;
@@ -74,12 +74,14 @@
 body {
     margin: 0;
     padding: 0;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue', Arial, sans-serif;
 }
 
 /* Disable Auto Zoom in Input - Safari on iPhone https://stackoverflow.com/a/6394497 */
 @media screen and (max-width: 767px) {
-    input, select, textarea {
+    input,
+    select,
+    textarea {
         font-size: var(--font-size-disable-autozoom);
     }
 }

client/src/components/App/index.tsx

@@ -1,4 +1,5 @@
 import React, { useEffect } from 'react';
+
 import { HashRouter, Route } from 'react-router-dom';
 import LoadingBar from 'react-redux-loading-bar';
 import { hot } from 'react-hot-loader/root';
@@ -9,8 +10,6 @@ import '../ui/ReactTable.css';
 import './index.css';
 
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-
-import propTypes from 'prop-types';
 import Toasts from '../Toasts';
 import Footer from '../ui/Footer';
 import Status from '../ui/Status';
@@ -19,15 +18,14 @@ import UpdateOverlay from '../ui/UpdateOverlay';
 import EncryptionTopline from '../ui/EncryptionTopline';
 import Icons from '../ui/Icons';
 import i18n from '../../i18n';
+
 import Loading from '../ui/Loading';
-import {
+import { FILTERS_URLS, MENU_URLS, SETTINGS_URLS, THEMES } from '../../helpers/constants';
-    FILTERS_URLS,
+
-    MENU_URLS,
-    SETTINGS_URLS,
-    THEMES,
-} from '../../helpers/constants';
 import { getLogsUrlParams, setHtmlLangAttr, setUITheme } from '../../helpers/helpers';
+
 import Header from '../Header';
+
 import { changeLanguage, getDnsStatus, getTimerStatus } from '../../actions';
 
 import Dashboard from '../../containers/Dashboard';
@@ -35,15 +33,19 @@ import SetupGuide from '../../containers/SetupGuide';
 import Settings from '../../containers/Settings';
 import Dns from '../../containers/Dns';
 import Encryption from '../../containers/Encryption';
+
 import Dhcp from '../Settings/Dhcp';
 import Clients from '../../containers/Clients';
 import DnsBlocklist from '../../containers/DnsBlocklist';
 import DnsAllowlist from '../../containers/DnsAllowlist';
 import DnsRewrites from '../../containers/DnsRewrites';
 import CustomRules from '../../containers/CustomRules';
+
 import Services from '../Filters/Services';
+
 import Logs from '../Logs';
 import ProtectionTimer from '../ProtectionTimer';
+import { RootState } from '../../initialState';
 
 const ROUTES = [
     {
@@ -101,26 +103,17 @@ const ROUTES = [
     },
 ];
 
-const renderRoute = ({ path, component, exact }, idx) => <Route
-        key={idx}
-        exact={exact}
-        path={path}
-        component={component}
-/>;
-
 const App = () => {
     const dispatch = useDispatch();
-    const {
+    const { language, isCoreRunning, isUpdateAvailable, processing, theme } = useSelector<
-        language,
+        RootState,
-        isCoreRunning,
+        RootState['dashboard']
-        isUpdateAvailable,
+    >((state) => state.dashboard, shallowEqual);
-        processing,
-        theme,
-    } = useSelector((state) => state.dashboard, shallowEqual);
 
-    const { processing: processingEncryption } = useSelector((
+    const { processing: processingEncryption } = useSelector<RootState, RootState['encryption']>(
-        state,
+        (state) => state.encryption,
-    ) => state.encryption, shallowEqual);
+        shallowEqual,
+    );
 
     const updateAvailable = isCoreRunning && isUpdateAvailable;
 
@@ -157,7 +150,7 @@ const App = () => {
         setLanguage();
     }, [language]);
 
-    const handleAutoTheme = (e, accountTheme) => {
+    const handleAutoTheme = (e: any, accountTheme: any) => {
         if (accountTheme !== THEMES.auto) {
             return;
         }
@@ -195,35 +188,50 @@ const App = () => {
         window.location.reload();
     };
 
-    return <HashRouter hashType="noslash">
+    return (
-        {updateAvailable && <>
+        <HashRouter hashType="noslash">
-            <UpdateTopline />
+            {updateAvailable && (
-            <UpdateOverlay />
+                <>
-        </>}
+                    <UpdateTopline />
-        {!processingEncryption && <EncryptionTopline />}
-        <LoadingBar className="loading-bar" updateTime={1000} />
-        <Header />
-        <ProtectionTimer />
-        <div className="container container--wrap pb-5 pt-5">
-            {processing && <Loading />}
-            {!isCoreRunning && <div className="row row-cards">
-                <div className="col-lg-12">
-                    <Status reloadPage={reloadPage} message="dns_start" />
-                    <Loading />
-                </div>
-            </div>}
-            {!processing && isCoreRunning && ROUTES.map(renderRoute)}
-        </div>
-        <Footer />
-        <Toasts />
-        <Icons />
-    </HashRouter>;
-};
 
-renderRoute.propTypes = {
+                    <UpdateOverlay />
-    path: propTypes.oneOfType([propTypes.string, propTypes.arrayOf(propTypes.string)]).isRequired,
+                </>
-    component: propTypes.element.isRequired,
+            )}
-    exact: propTypes.bool,
+
+            {!processingEncryption && <EncryptionTopline />}
+
+            <LoadingBar className="loading-bar" updateTime={1000} />
+
+            <Header />
+
+            <ProtectionTimer />
+
+            <div className="container container--wrap pb-5 pt-5">
+                {processing && <Loading />}
+
+                {!isCoreRunning && (
+                    <div className="row row-cards">
+                        <div className="col-lg-12">
+                            <Status reloadPage={reloadPage} message="dns_start" />
+
+                            <Loading />
+                        </div>
+                    </div>
+                )}
+                {!processing &&
+                    isCoreRunning &&
+                    ROUTES.map((route, index) => (
+                        <Route key={index} exact={route.exact} path={route.path} component={route.component} />
+                    ))}
+            </div>
+
+            <Footer />
+
+            <Toasts />
+
+            <Icons />
+        </HashRouter>
+    );
 };
 
 export default hot(App);

client/src/components/Dashboard/BlockedDomains.tsx

@@ -1,25 +1,37 @@
 import React from 'react';
+
+// @ts-expect-error FIXME: update react-table
 import ReactTable from 'react-table';
-import PropTypes from 'prop-types';
 import { withTranslation, Trans } from 'react-i18next';
 
+import { TFunction } from 'i18next';
 import Card from '../ui/Card';
+
 import Cell from '../ui/Cell';
+
 import DomainCell from './DomainCell';
 
 import { getPercent } from '../../helpers/helpers';
 import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, STATUS_COLORS, TABLES_MIN_ROWS } from '../../helpers/constants';
 
-const CountCell = (totalBlocked) => function cell(row) {
+const CountCell = (totalBlocked: any) =>
-    const { value } = row;
+    function cell(row: any) {
-    const percent = getPercent(totalBlocked, value);
+        const { value } = row;
+        const percent = getPercent(totalBlocked, value);
 
-    return <Cell value={value}
+        return <Cell value={value} percent={percent} color={STATUS_COLORS.red} search={row.original.domain} />;
-                 percent={percent}
+    };
-                 color={STATUS_COLORS.red}
+
-                 search={row.original.domain}
+interface BlockedDomainsProps {
-    />;
+    topBlockedDomains: unknown[];
-};
+    blockedFiltering: number;
+    replacedSafebrowsing: number;
+    replacedSafesearch: number;
+    replacedParental: number;
+    refreshButton: React.ReactNode;
+    subtitle: string;
+    t: TFunction;
+}
 
 const BlockedDomains = ({
     t,
@@ -30,20 +42,13 @@ const BlockedDomains = ({
     replacedSafebrowsing,
     replacedParental,
     replacedSafesearch,
-}) => {
+}: BlockedDomainsProps) => {
-    const totalBlocked = (
+    const totalBlocked = blockedFiltering + replacedSafebrowsing + replacedParental + replacedSafesearch;
-        blockedFiltering + replacedSafebrowsing + replacedParental + replacedSafesearch
-    );
 
     return (
-        <Card
+        <Card title={t('top_blocked_domains')} subtitle={subtitle} bodyType="card-table" refresh={refreshButton}>
-            title={t('top_blocked_domains')}
-            subtitle={subtitle}
-            bodyType="card-table"
-            refresh={refreshButton}
-        >
             <ReactTable
-                data={topBlockedDomains.map(({ name: domain, count }) => ({
+                data={topBlockedDomains.map(({ name: domain, count }: any) => ({
                     domain,
                     count,
                 }))}
@@ -70,15 +75,4 @@ const BlockedDomains = ({
     );
 };
 
-BlockedDomains.propTypes = {
-    topBlockedDomains: PropTypes.array.isRequired,
-    blockedFiltering: PropTypes.number.isRequired,
-    replacedSafebrowsing: PropTypes.number.isRequired,
-    replacedSafesearch: PropTypes.number.isRequired,
-    replacedParental: PropTypes.number.isRequired,
-    refreshButton: PropTypes.node.isRequired,
-    subtitle: PropTypes.string.isRequired,
-    t: PropTypes.func.isRequired,
-};
-
 export default withTranslation()(BlockedDomains);

client/src/components/Dashboard/Clients.tsx

@@ -1,10 +1,12 @@
 import React, { useState } from 'react';
+
+// @ts-expect-error FIXME: update react-table
 import ReactTable from 'react-table';
-import PropTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import classNames from 'classnames';
+
 import Card from '../ui/Card';
 import Cell from '../ui/Cell';
 
@@ -16,11 +18,14 @@ import {
     TABLES_MIN_ROWS,
 } from '../../helpers/constants';
 import { toggleClientBlock } from '../../actions/access';
+
 import { renderFormattedClientCell } from '../../helpers/renderFormattedClientCell';
 import { getStats } from '../../actions/stats';
-import IconTooltip from '../Logs/Cells/IconTooltip';
 
-const getClientsPercentColor = (percent) => {
+import IconTooltip from '../Logs/Cells/IconTooltip';
+import { RootState } from '../../initialState';
+
+const getClientsPercentColor = (percent: any) => {
     if (percent > 50) {
         return STATUS_COLORS.green;
     }
@@ -30,9 +35,13 @@ const getClientsPercentColor = (percent) => {
     return STATUS_COLORS.red;
 };
 
-const CountCell = (row) => {
+const CountCell = (row: any) => {
-    const { value, original: { ip } } = row;
+    const {
-    const numDnsQueries = useSelector((state) => state.stats.numDnsQueries, shallowEqual);
+        value,
+        original: { ip },
+    } = row;
+
+    const numDnsQueries = useSelector<RootState>((state) => state.stats.numDnsQueries, shallowEqual);
 
     const percent = getPercent(numDnsQueries, value);
     const percentColor = getClientsPercentColor(percent);
@@ -40,22 +49,29 @@ const CountCell = (row) => {
     return <Cell value={value} percent={percent} color={percentColor} search={ip} />;
 };
 
-const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
+const renderBlockingButton = (ip: any, disallowed: any, disallowed_rule: any) => {
     const dispatch = useDispatch();
     const { t } = useTranslation();
-    const processingSet = useSelector((state) => state.access.processingSet);
+
-    const allowedСlients = useSelector((state) => state.access.allowed_clients, shallowEqual);
+    const processingSet = useSelector<RootState, RootState['access']['processingSet']>(
+        (state) => state.access.processingSet,
+    );
+
+    const allowedClients = useSelector<RootState, RootState['access']['allowed_clients']>(
+        (state) => state.access.allowed_clients,
+        shallowEqual,
+    );
 
     const [isOptionsOpened, setOptionsOpened] = useState(false);
 
-    const toggleClientStatus = async (ip, disallowed, disallowed_rule) => {
+    const toggleClientStatus = async (ip: any, disallowed: any, disallowed_rule: any) => {
         let confirmMessage;
 
         if (disallowed) {
             confirmMessage = t('client_confirm_unblock', { ip: disallowed_rule || ip });
         } else {
             confirmMessage = `${t('adg_will_drop_dns_queries')} ${t('client_confirm_block', { ip })}`;
-            if (allowedСlients.length > 0) {
+            if (allowedClients.length > 0) {
                 confirmMessage = confirmMessage.concat(`\n\n${t('filter_allowlist', { disallowed_rule })}`);
             }
         }
@@ -73,15 +89,11 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
 
     const text = disallowed ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
 
-    const lastRuleInAllowlist = !disallowed && allowedСlients === disallowed_rule;
+    const lastRuleInAllowlist = !disallowed && allowedClients === disallowed_rule;
     const disabled = processingSet || lastRuleInAllowlist;
     return (
         <div className="table__action">
-            <button
+            <button type="button" className="btn btn-icon btn-sm px-0" onClick={() => setOptionsOpened(true)}>
-                type="button"
-                className="btn btn-icon btn-sm px-0"
-                onClick={() => setOptionsOpened(true)}
-            >
                 <svg className="icon24 icon--lightgray button-action__icon">
                     <use xlinkHref="#bullets" />
                 </svg>
@@ -92,16 +104,18 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
                     tooltipClass="button-action--arrow-option-container"
                     xlinkHref="bullets"
                     triggerClass="btn btn-icon btn-sm px-0 button-action__hidden-trigger"
-                    content={(
+                    content={
                         <button
-                            className={classNames('button-action--arrow-option px-4 py-1', disallowed ? 'bg--green' : 'bg--danger')}
+                            className={classNames(
+                                'button-action--arrow-option px-4 py-1',
+                                disallowed ? 'bg--green' : 'bg--danger',
+                            )}
                             onClick={onClick}
                             disabled={disabled}
-                            title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''}
+                            title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''}>
-                        >
                             <Trans>{text}</Trans>
                         </button>
-                    )}
+                    }
                     placement="bottom-end"
                     trigger="click"
                     onVisibilityChange={setOptionsOpened}
@@ -113,35 +127,42 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
     );
 };
 
-const ClientCell = (row) => {
+const ClientCell = (row: any) => {
-    const { value, original: { info, info: { disallowed, disallowed_rule } } } = row;
+    const {
-
+        value,
-    return <>
+        original: {
-        <div className="logs__row logs__row--overflow logs__row--column d-flex align-items-center">
+            info,
-            {renderFormattedClientCell(value, info, true)}
+            info: { disallowed, disallowed_rule },
-            {renderBlockingButton(value, disallowed, disallowed_rule)}
+        },
-        </div>
+    } = row;
-    </>;
-};
-
-const Clients = ({
-    refreshButton,
-    subtitle,
-}) => {
-    const { t } = useTranslation();
-    const topClients = useSelector((state) => state.stats.topClients, shallowEqual);
 
     return (
-        <Card
+        <>
-            title={t('top_clients')}
+            <div className="logs__row logs__row--overflow logs__row--column d-flex align-items-center">
-            subtitle={subtitle}
+                {renderFormattedClientCell(value, info, true)}
-            bodyType="card-table"
+                {renderBlockingButton(value, disallowed, disallowed_rule)}
-            refresh={refreshButton}
+            </div>
-        >
+        </>
+    );
+};
+
+interface ClientsProps {
+    refreshButton: React.ReactNode;
+    subtitle: string;
+}
+
+const Clients = ({ refreshButton, subtitle }: ClientsProps) => {
+    const { t } = useTranslation();
+
+    const topClients = useSelector<RootState, RootState['stats']['topClients']>(
+        (state) => state.stats.topClients,
+        shallowEqual,
+    );
+
+    return (
+        <Card title={t('top_clients')} subtitle={subtitle} bodyType="card-table" refresh={refreshButton}>
             <ReactTable
-                data={topClients.map(({
+                data={topClients.map(({ name: ip, count, info, blocked }: any) => ({
-                    name: ip, count, info, blocked,
-                }) => ({
                     ip,
                     count,
                     info,
@@ -167,12 +188,14 @@ const Clients = ({
                 minRows={TABLES_MIN_ROWS}
                 defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
                 className="-highlight card-table-overflow--limited clients__table"
-                getTrProps={(_state, rowInfo) => {
+                getTrProps={(_state: any, rowInfo: any) => {
                     if (!rowInfo) {
                         return {};
                     }
 
-                    const { info: { disallowed } } = rowInfo.original;
+                    const {
+                        info: { disallowed },
+                    } = rowInfo.original;
 
                     return disallowed ? { className: 'logs__row--red' } : {};
                 }}
@@ -181,9 +204,4 @@ const Clients = ({
     );
 };
 
-Clients.propTypes = {
-    refreshButton: PropTypes.node.isRequired,
-    subtitle: PropTypes.string.isRequired,
-};
-
 export default Clients;

client/src/components/Dashboard/Counters.tsx

@@ -1,41 +1,52 @@
 import React from 'react';
-import propTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
 import round from 'lodash/round';
 import { shallowEqual, useSelector } from 'react-redux';
+
 import Card from '../ui/Card';
+
 import { formatNumber, msToDays, msToHours } from '../../helpers/helpers';
+
 import LogsSearchLink from '../ui/LogsSearchLink';
 import { RESPONSE_FILTER, TIME_UNITS } from '../../helpers/constants';
-import Tooltip from '../ui/Tooltip';
 
-const Row = ({
+import Tooltip from '../ui/Tooltip';
-    label, count, response_status, tooltipTitle, translationComponents,
+import { RootState } from '../../initialState';
-}) => {
+
-    const content = response_status
+interface RowProps {
-        ? <LogsSearchLink response_status={response_status}>{formatNumber(count)}</LogsSearchLink>
+    label: string;
-        : count;
+    count: string;
+    response_status?: string;
+    tooltipTitle: string;
+    translationComponents?: React.ReactElement[];
+}
+
+const Row = ({ label, count, response_status, tooltipTitle, translationComponents }: RowProps) => {
+    const content = response_status ? (
+        <LogsSearchLink response_status={response_status}>{formatNumber(count)}</LogsSearchLink>
+    ) : (
+        count
+    );
 
     return (
         <div className="counters__row" key={label}>
             <div className="counters__column">
                 <span className="counters__title">
-                    <Trans components={translationComponents}>
+                    <Trans components={translationComponents}>{label}</Trans>
-                        {label}
-                    </Trans>
                 </span>
+
                 <span className="counters__tooltip">
                     <Tooltip
                         content={tooltipTitle}
                         placement="top"
-                        className="tooltip-container tooltip-custom--narrow text-center"
+                        className="tooltip-container tooltip-custom--narrow text-center">
-                    >
                         <svg className="icons icon--20 icon--lightgray ml-2">
                             <use xlinkHref="#question" />
                         </svg>
                     </Tooltip>
                 </span>
             </div>
+
             <div className="counters__column counters__column--value">
                 <strong>{content}</strong>
             </div>
@@ -43,7 +54,12 @@ const Row = ({
     );
 };
 
-const Counters = ({ refreshButton, subtitle }) => {
+interface CountersProps {
+    refreshButton: React.ReactNode;
+    subtitle: string;
+}
+
+const Counters = ({ refreshButton, subtitle }: CountersProps) => {
     const {
         interval,
         numDnsQueries,
@@ -53,77 +69,67 @@ const Counters = ({ refreshButton, subtitle }) => {
         numReplacedSafesearch,
         avgProcessingTime,
         timeUnits,
-    } = useSelector((state) => state.stats, shallowEqual);
+    } = useSelector<RootState, RootState['stats']>((state) => state.stats, shallowEqual);
     const { t } = useTranslation();
 
-    const dnsQueryTooltip = timeUnits === TIME_UNITS.HOURS
+    const dnsQueryTooltip =
-        ? t('number_of_dns_query_hours', { count: msToHours(interval) })
+        timeUnits === TIME_UNITS.HOURS
-        : t('number_of_dns_query_days', { count: msToDays(interval) });
+            ? t('number_of_dns_query_hours', { count: msToHours(interval) })
+            : t('number_of_dns_query_days', { count: msToDays(interval) });
 
     const rows = [
         {
             label: 'dns_query',
-            count: numDnsQueries,
+            count: numDnsQueries.toString(),
             tooltipTitle: dnsQueryTooltip,
             response_status: RESPONSE_FILTER.ALL.QUERY,
         },
         {
             label: 'blocked_by',
-            count: numBlockedFiltering,
+            count: numBlockedFiltering.toString(),
             tooltipTitle: 'number_of_dns_query_blocked_24_hours',
             response_status: RESPONSE_FILTER.BLOCKED.QUERY,
-            translationComponents: [<a href="#filters" key="0">link</a>],
+
+            translationComponents: [
+                <a href="#filters" key="0">
+                    link
+                </a>,
+            ],
         },
         {
             label: 'stats_malware_phishing',
-            count: numReplacedSafebrowsing,
+            count: numReplacedSafebrowsing.toString(),
             tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
             response_status: RESPONSE_FILTER.BLOCKED_THREATS.QUERY,
         },
         {
             label: 'stats_adult',
-            count: numReplacedParental,
+            count: numReplacedParental.toString(),
             tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
             response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.QUERY,
         },
         {
             label: 'enforced_save_search',
-            count: numReplacedSafesearch,
+            count: numReplacedSafesearch.toString(),
             tooltipTitle: 'number_of_dns_query_to_safe_search',
             response_status: RESPONSE_FILTER.SAFE_SEARCH.QUERY,
         },
         {
             label: 'average_processing_time',
-            count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
+            count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : '0',
             tooltipTitle: 'average_processing_time_hint',
         },
     ];
 
     return (
-        <Card
+        <Card title={t('general_statistics')} subtitle={subtitle} bodyType="card-table" refresh={refreshButton}>
-            title={t('general_statistics')}
-            subtitle={subtitle}
-            bodyType="card-table"
-            refresh={refreshButton}
-        >
             <div className="counters">
-                {rows.map(Row)}
+                {rows.map((row, index) => {
+                    return <Row {...row} key={index} />;
+                })}
             </div>
         </Card>
     );
 };
 
-Row.propTypes = {
-    label: propTypes.string.isRequired,
-    count: propTypes.string.isRequired,
-    response_status: propTypes.string,
-    tooltipTitle: propTypes.string.isRequired,
-    translationComponents: propTypes.arrayOf(propTypes.element),
-};
-
-Counters.propTypes = {
-    refreshButton: propTypes.node.isRequired,
-    subtitle: propTypes.string.isRequired,
-};
-
 export default Counters;

client/src/components/Dashboard/DomainCell.js

@@ -1,77 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { Trans } from 'react-i18next';
-import { getSourceData, getTrackerData } from '../../helpers/trackers/trackers';
-import Tooltip from '../ui/Tooltip';
-import { captitalizeWords } from '../../helpers/helpers';
-
-const renderLabel = (value) => <strong><Trans>{value}</Trans></strong>;
-
-const renderLink = ({ url, name }) => <a
-    className="tooltip-custom__content-link"
-    target="_blank"
-    rel="noopener noreferrer"
-    href={url}
->
-    <strong>{name}</strong>
-</a>;
-
-const getTrackerInfo = (trackerData) => [{
-    key: 'name_table_header',
-    value: trackerData,
-    render: renderLink,
-},
-{
-    key: 'category_label',
-    value: captitalizeWords(trackerData.category),
-    render: renderLabel,
-},
-{
-    key: 'source_label',
-    value: getSourceData(trackerData),
-    render: renderLink,
-}];
-
-const DomainCell = ({ value }) => {
-    const trackerData = getTrackerData(value);
-
-    const content = trackerData && <div className="popover__list">
-        <div className="tooltip-custom__content-title mb-1">
-            <Trans>found_in_known_domain_db</Trans>
-        </div>
-        {getTrackerInfo(trackerData)
-            .map(({ key, value, render }) => <div
-                key={key}
-                className="tooltip-custom__content-item"
-            >
-                <Trans>{key}</Trans>: {render(value)}
-            </div>)}
-    </div>;
-
-    return (
-        <div className="logs__row">
-            <div className="logs__text" title={value}>
-                {value}
-            </div>
-            {trackerData
-            && <Tooltip content={content} placement="top"
-                        className="tooltip-container tooltip-custom--wide">
-                <svg className="icons icon--24 icon--green ml-1">
-                    <use xlinkHref="#privacy" />
-                </svg>
-            </Tooltip>}
-        </div>
-    );
-};
-
-DomainCell.propTypes = {
-    value: PropTypes.string.isRequired,
-};
-
-renderLink.propTypes = {
-    url: PropTypes.string.isRequired,
-    name: PropTypes.string.isRequired,
-};
-
-export default DomainCell;

client/src/components/Dashboard/DomainCell.tsx

@@ -0,0 +1,81 @@
+import React from 'react';
+
+import { Trans } from 'react-i18next';
+import { getSourceData, getTrackerData } from '../../helpers/trackers/trackers';
+
+import Tooltip from '../ui/Tooltip';
+
+import { captitalizeWords } from '../../helpers/helpers';
+
+const renderLabel = (value: any) => (
+    <strong>
+        <Trans>{value}</Trans>
+    </strong>
+);
+
+interface renderLinkProps {
+    url: string;
+    name: string;
+}
+
+const renderLink = ({ url, name }: renderLinkProps) => (
+    <a className="tooltip-custom__content-link" target="_blank" rel="noopener noreferrer" href={url}>
+        <strong>{name}</strong>
+    </a>
+);
+
+const getTrackerInfo = (trackerData: any) => [
+    {
+        key: 'name_table_header',
+        value: trackerData,
+        render: renderLink,
+    },
+    {
+        key: 'category_label',
+        value: captitalizeWords(trackerData.category),
+        render: renderLabel,
+    },
+    {
+        key: 'source_label',
+        value: getSourceData(trackerData),
+        render: renderLink,
+    },
+];
+
+interface DomainCellProps {
+    value: string;
+}
+
+const DomainCell = ({ value }: DomainCellProps) => {
+    const trackerData = getTrackerData(value);
+
+    const content = trackerData && (
+        <div className="popover__list">
+            <div className="tooltip-custom__content-title mb-1">
+                <Trans>found_in_known_domain_db</Trans>
+            </div>
+            {getTrackerInfo(trackerData).map(({ key, value, render }) => (
+                <div key={key} className="tooltip-custom__content-item">
+                    <Trans>{key}</Trans>: {render(value)}
+                </div>
+            ))}
+        </div>
+    );
+
+    return (
+        <div className="logs__row">
+            <div className="logs__text" title={value}>
+                {value}
+            </div>
+            {trackerData && (
+                <Tooltip content={content} placement="top" className="tooltip-container tooltip-custom--wide">
+                    <svg className="icons icon--24 icon--green ml-1">
+                        <use xlinkHref="#privacy" />
+                    </svg>
+                </Tooltip>
+            )}
+        </div>
+    );
+};
+
+export default DomainCell;

client/src/components/Dashboard/QueriedDomains.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
+
+// @ts-expect-error FIXME: update react-table
 import ReactTable from 'react-table';
-import PropTypes from 'prop-types';
 import { withTranslation, Trans } from 'react-i18next';
 
 import Card from '../ui/Card';
@@ -8,9 +9,10 @@ import Cell from '../ui/Cell';
 import DomainCell from './DomainCell';
 
 import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, STATUS_COLORS, TABLES_MIN_ROWS } from '../../helpers/constants';
+
 import { getPercent } from '../../helpers/helpers';
 
-const getQueriedPercentColor = (percent) => {
+const getQueriedPercentColor = (percent: any) => {
     if (percent > 10) {
         return STATUS_COLORS.red;
     }
@@ -20,26 +22,27 @@ const getQueriedPercentColor = (percent) => {
     return STATUS_COLORS.green;
 };
 
-const countCell = (dnsQueries) => function cell(row) {
+const countCell = (dnsQueries: any) =>
-    const { value } = row;
+    function cell(row: any) {
-    const percent = getPercent(dnsQueries, value);
+        const { value } = row;
-    const percentColor = getQueriedPercentColor(percent);
+        const percent = getPercent(dnsQueries, value);
+        const percentColor = getQueriedPercentColor(percent);
 
-    return <Cell value={value} percent={percent} color={percentColor}
+        return <Cell value={value} percent={percent} color={percentColor} search={row.original.domain} />;
-                 search={row.original.domain} />;
+    };
-};
 
-const QueriedDomains = ({
+interface QueriedDomainsProps {
-    t, refreshButton, topQueriedDomains, subtitle, dnsQueries,
+    topQueriedDomains: unknown[];
-}) => (
+    dnsQueries: number;
-    <Card
+    refreshButton: React.ReactNode;
-        title={t('stats_query_domain')}
+    subtitle: string;
-        subtitle={subtitle}
+    t: (...args: unknown[]) => string;
-        bodyType="card-table"
+}
-        refresh={refreshButton}
+
-    >
+const QueriedDomains = ({ t, refreshButton, topQueriedDomains, subtitle, dnsQueries }: QueriedDomainsProps) => (
+    <Card title={t('stats_query_domain')} subtitle={subtitle} bodyType="card-table" refresh={refreshButton}>
         <ReactTable
-            data={topQueriedDomains.map(({ name: domain, count }) => ({
+            data={topQueriedDomains.map(({ name: domain, count }: any) => ({
                 domain,
                 count,
             }))}
@@ -65,12 +68,4 @@ const QueriedDomains = ({
     </Card>
 );
 
-QueriedDomains.propTypes = {
-    topQueriedDomains: PropTypes.array.isRequired,
-    dnsQueries: PropTypes.number.isRequired,
-    refreshButton: PropTypes.node.isRequired,
-    subtitle: PropTypes.string.isRequired,
-    t: PropTypes.func.isRequired,
-};
-
 export default withTranslation()(QueriedDomains);

client/src/components/Dashboard/Statistics.tsx

@@ -1,15 +1,27 @@
 import React from 'react';
-import PropTypes from 'prop-types';
+
 import { Link } from 'react-router-dom';
 import { withTranslation, Trans } from 'react-i18next';
 
 import StatsCard from './StatsCard';
+
 import { getPercent, normalizeHistory } from '../../helpers/helpers';
 import { RESPONSE_FILTER } from '../../helpers/constants';
 
-const getNormalizedHistory = (data, interval, id) => [
+const getNormalizedHistory = (data: any, interval: any, id: any) => [{ data: normalizeHistory(data), id }];
-    { data: normalizeHistory(data, interval), id },
+
-];
+interface StatisticsProps {
+    interval: number;
+    dnsQueries: number[];
+    blockedFiltering: unknown[];
+    replacedSafebrowsing: unknown[];
+    replacedParental: unknown[];
+    numDnsQueries: number;
+    numBlockedFiltering: number;
+    numReplacedSafebrowsing: number;
+    numReplacedParental: number;
+    refreshButton: React.ReactNode;
+}
 
 const Statistics = ({
     interval,
@@ -21,61 +33,68 @@ const Statistics = ({
     numBlockedFiltering,
     numReplacedSafebrowsing,
     numReplacedParental,
-}) => (
+}: StatisticsProps) => (
     <div className="row">
         <div className="col-sm-6 col-lg-3">
             <StatsCard
                 total={numDnsQueries}
                 lineData={getNormalizedHistory(dnsQueries, interval, 'dnsQuery')}
-                title={<Link to="logs"><Trans>dns_query</Trans></Link>}
+                title={
+                    <Link to="logs">
+                        <Trans>dns_query</Trans>
+                    </Link>
+                }
                 color="blue"
             />
         </div>
+
         <div className="col-sm-6 col-lg-3">
             <StatsCard
                 total={numBlockedFiltering}
                 lineData={getNormalizedHistory(blockedFiltering, interval, 'blockedFiltering')}
                 percent={getPercent(numDnsQueries, numBlockedFiltering)}
-                title={<Trans components={[<Link to={`logs?response_status=${RESPONSE_FILTER.BLOCKED.QUERY}`} key="0">link</Link>]}>blocked_by</Trans>}
+                title={
+                    <Trans
+                        components={[
+                            <Link to={`logs?response_status=${RESPONSE_FILTER.BLOCKED.QUERY}`} key="0">
+                                link
+                            </Link>,
+                        ]}>
+                        blocked_by
+                    </Trans>
+                }
                 color="red"
             />
         </div>
+
         <div className="col-sm-6 col-lg-3">
             <StatsCard
                 total={numReplacedSafebrowsing}
-                lineData={getNormalizedHistory(
+                lineData={getNormalizedHistory(replacedSafebrowsing, interval, 'replacedSafebrowsing')}
-                    replacedSafebrowsing,
-                    interval,
-                    'replacedSafebrowsing',
-                )}
                 percent={getPercent(numDnsQueries, numReplacedSafebrowsing)}
-                title={<Link to={`logs?response_status=${RESPONSE_FILTER.BLOCKED_THREATS.QUERY}`}><Trans>stats_malware_phishing</Trans></Link>}
+                title={
+                    <Link to={`logs?response_status=${RESPONSE_FILTER.BLOCKED_THREATS.QUERY}`}>
+                        <Trans>stats_malware_phishing</Trans>
+                    </Link>
+                }
                 color="green"
             />
         </div>
+
         <div className="col-sm-6 col-lg-3">
             <StatsCard
                 total={numReplacedParental}
                 lineData={getNormalizedHistory(replacedParental, interval, 'replacedParental')}
                 percent={getPercent(numDnsQueries, numReplacedParental)}
-                title={<Link to={`logs?response_status=${RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.QUERY}`}><Trans>stats_adult</Trans></Link>}
+                title={
+                    <Link to={`logs?response_status=${RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.QUERY}`}>
+                        <Trans>stats_adult</Trans>
+                    </Link>
+                }
                 color="yellow"
             />
         </div>
     </div>
 );
 
-Statistics.propTypes = {
-    interval: PropTypes.number.isRequired,
-    dnsQueries: PropTypes.array.isRequired,
-    blockedFiltering: PropTypes.array.isRequired,
-    replacedSafebrowsing: PropTypes.array.isRequired,
-    replacedParental: PropTypes.array.isRequired,
-    numDnsQueries: PropTypes.number.isRequired,
-    numBlockedFiltering: PropTypes.number.isRequired,
-    numReplacedSafebrowsing: PropTypes.number.isRequired,
-    numReplacedParental: PropTypes.number.isRequired,
-    refreshButton: PropTypes.node.isRequired,
-};
-
 export default withTranslation()(Statistics);

client/src/components/Dashboard/StatsCard.tsx

@@ -1,38 +1,34 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { STATUS_COLORS } from '../../helpers/constants';
+
 import { formatNumber } from '../../helpers/helpers';
+
 import Card from '../ui/Card';
+
 import Line from '../ui/Line';
 
-const StatsCard = ({
+interface StatsCardProps {
-    total, lineData, percent, title, color,
+    total: number;
-}) => (
+    lineData: unknown[];
+    title: object;
+    color: string;
+    percent?: number;
+}
+
+const StatsCard = ({ total, lineData, percent, title, color }: StatsCardProps) => (
     <Card type="card--full" bodyType="card-wrap">
         <div className="card-body-stats">
-            <div className={`card-value card-value-stats text-${color}`}>
+            <div className={`card-value card-value-stats text-${color}`}>{formatNumber(total)}</div>
-                {formatNumber(total)}
+
-            </div>
             <div className="card-title-stats">{title}</div>
         </div>
-        {percent >= 0 && (
+        {percent >= 0 && <div className={`card-value card-value-percent text-${color}`}>{percent}</div>}
-            <div className={`card-value card-value-percent text-${color}`}>
+
-                {percent}
-            </div>
-        )}
         <div className="card-chart-bg">
             <Line data={lineData} color={STATUS_COLORS[color]} />
         </div>
     </Card>
 );
 
-StatsCard.propTypes = {
-    total: PropTypes.number.isRequired,
-    lineData: PropTypes.array.isRequired,
-    title: PropTypes.object.isRequired,
-    color: PropTypes.string.isRequired,
-    percent: PropTypes.number,
-};
-
 export default StatsCard;

client/src/components/Dashboard/UpstreamAvgTime.tsx

@@ -1,50 +1,47 @@
 import React from 'react';
+
+// @ts-expect-error FIXME: update react-table
 import ReactTable from 'react-table';
-import PropTypes from 'prop-types';
 import round from 'lodash/round';
 import { withTranslation, Trans } from 'react-i18next';
 
+import { TFunction } from 'i18next';
 import Card from '../ui/Card';
+
 import DomainCell from './DomainCell';
 import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, TABLES_MIN_ROWS } from '../../helpers/constants';
 
-const TimeCell = ({ value }) => {
+interface TimeCellProps {
+    value?: string | number;
+}
+
+const TimeCell = ({ value }: TimeCellProps) => {
     if (!value) {
         return '–';
     }
 
-    const valueInMilliseconds = round(value * 1000);
+    const valueInMilliseconds = round(Number(value) * 1000);
 
     return (
         <div className="logs__row o-hidden">
-            <span className="logs__text logs__text--full" title={valueInMilliseconds}>
+            <span className="logs__text logs__text--full" title={valueInMilliseconds.toString()}>
                 {valueInMilliseconds}&nbsp;ms
             </span>
         </div>
     );
 };
 
-TimeCell.propTypes = {
+interface UpstreamAvgTimeProps {
-    value: PropTypes.oneOfType([
+    topUpstreamsAvgTime: { name: string; count: number }[];
-        PropTypes.string,
+    refreshButton: React.ReactNode;
-        PropTypes.number,
+    subtitle: string;
-    ]),
+    t: TFunction;
-};
+}
 
-const UpstreamAvgTime = ({
+const UpstreamAvgTime = ({ t, refreshButton, topUpstreamsAvgTime, subtitle }: UpstreamAvgTimeProps) => (
-    t,
+    <Card title={t('average_upstream_response_time')} subtitle={subtitle} bodyType="card-table" refresh={refreshButton}>
-    refreshButton,
-    topUpstreamsAvgTime,
-    subtitle,
-}) => (
-    <Card
-        title={t('average_upstream_response_time')}
-        subtitle={subtitle}
-        bodyType="card-table"
-        refresh={refreshButton}
-    >
         <ReactTable
-            data={topUpstreamsAvgTime.map(({ name: domain, count }) => ({
+            data={topUpstreamsAvgTime.map(({ name: domain, count }: { name: string; count: number }) => ({
                 domain,
                 count,
             }))}
@@ -70,11 +67,4 @@ const UpstreamAvgTime = ({
     </Card>
 );
 
-UpstreamAvgTime.propTypes = {
-    topUpstreamsAvgTime: PropTypes.array.isRequired,
-    refreshButton: PropTypes.node.isRequired,
-    subtitle: PropTypes.string.isRequired,
-    t: PropTypes.func.isRequired,
-};
-
 export default withTranslation()(UpstreamAvgTime);

client/src/components/Dashboard/UpstreamResponses.tsx

@@ -1,51 +1,47 @@
 import React from 'react';
+
+// @ts-expect-error FIXME: update react-table
 import ReactTable from 'react-table';
-import PropTypes from 'prop-types';
 import { withTranslation, Trans } from 'react-i18next';
 
+import { TFunction } from 'i18next';
 import Card from '../ui/Card';
+
 import Cell from '../ui/Cell';
+
 import DomainCell from './DomainCell';
 
 import { getPercent } from '../../helpers/helpers';
 import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, STATUS_COLORS, TABLES_MIN_ROWS } from '../../helpers/constants';
 
-const CountCell = (totalBlocked) => (
+const CountCell = (totalBlocked: any) =>
-    function cell(row) {
+    function cell(row: any) {
         const { value } = row;
         const percent = getPercent(totalBlocked, value);
 
-        return (
+        return <Cell value={value} percent={percent} color={STATUS_COLORS.green} />;
-            <Cell
+    };
-                value={value}
-                percent={percent}
-                color={STATUS_COLORS.green}
-            />
-        );
-    }
-);
 
-const getTotalUpstreamRequests = (stats) => {
+const getTotalUpstreamRequests = (stats: any) => {
     let total = 0;
-    stats.forEach(({ count }) => { total += count; });
+    stats.forEach(({ count }: any) => {
+        total += count;
+    });
 
     return total;
 };
 
-const UpstreamResponses = ({
+interface UpstreamResponsesProps {
-    t,
+    topUpstreamsResponses: { name: string; count: number }[];
-    refreshButton,
+    refreshButton: React.ReactNode;
-    topUpstreamsResponses,
+    subtitle: string;
-    subtitle,
+    t: TFunction;
-}) => (
+}
-    <Card
+
-        title={t('top_upstreams')}
+const UpstreamResponses = ({ t, refreshButton, topUpstreamsResponses, subtitle }: UpstreamResponsesProps) => (
-        subtitle={subtitle}
+    <Card title={t('top_upstreams')} subtitle={subtitle} bodyType="card-table" refresh={refreshButton}>
-        bodyType="card-table"
-        refresh={refreshButton}
-    >
         <ReactTable
-            data={topUpstreamsResponses.map(({ name: domain, count }) => ({
+            data={topUpstreamsResponses.map(({ name: domain, count }: { name: string; count: number }) => ({
                 domain,
                 count,
             }))}
@@ -71,11 +67,4 @@ const UpstreamResponses = ({
     </Card>
 );
 
-UpstreamResponses.propTypes = {
-    topUpstreamsResponses: PropTypes.array.isRequired,
-    refreshButton: PropTypes.node.isRequired,
-    subtitle: PropTypes.string.isRequired,
-    t: PropTypes.func.isRequired,
-};
-
 export default withTranslation()(UpstreamResponses);

client/src/components/Dashboard/index.js

@@ -1,276 +0,0 @@
-import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
-import { HashLink as Link } from 'react-router-hash-link';
-import { Trans, useTranslation } from 'react-i18next';
-import classNames from 'classnames';
-
-import Statistics from './Statistics';
-import Counters from './Counters';
-import Clients from './Clients';
-import QueriedDomains from './QueriedDomains';
-import BlockedDomains from './BlockedDomains';
-import {
-    DISABLE_PROTECTION_TIMINGS,
-    ONE_SECOND_IN_MS,
-    SETTINGS_URLS,
-    TIME_UNITS,
-} from '../../helpers/constants';
-import {
-    msToSeconds,
-    msToMinutes,
-    msToHours,
-    msToDays,
-} from '../../helpers/helpers';
-
-import PageTitle from '../ui/PageTitle';
-import Loading from '../ui/Loading';
-import './Dashboard.css';
-import Dropdown from '../ui/Dropdown';
-import UpstreamResponses from './UpstreamResponses';
-import UpstreamAvgTime from './UpstreamAvgTime';
-
-const Dashboard = ({
-    getAccessList,
-    getStats,
-    getStatsConfig,
-    dashboard,
-    dashboard: { protectionEnabled, processingProtection, protectionDisabledDuration },
-    toggleProtection,
-    stats,
-    access,
-}) => {
-    const { t } = useTranslation();
-
-    const getAllStats = () => {
-        getAccessList();
-        getStats();
-        getStatsConfig();
-    };
-
-    useEffect(() => {
-        getAllStats();
-    }, []);
-    const getSubtitle = () => {
-        if (!stats.enabled) {
-            return t('stats_disabled_short');
-        }
-
-        const msIn7Days = 604800000;
-
-        if (stats.timeUnits === TIME_UNITS.HOURS && stats.interval === msIn7Days) {
-            return t('for_last_days', { count: msToDays(stats.interval) });
-        }
-
-        return stats.timeUnits === TIME_UNITS.HOURS
-            ? t('for_last_hours', { count: msToHours(stats.interval) })
-            : t('for_last_days', { count: msToDays(stats.interval) });
-    };
-
-    const buttonClass = classNames('btn btn-sm dashboard-protection-button', {
-        'btn-gray': protectionEnabled,
-        'btn-success': !protectionEnabled,
-    });
-
-    const refreshButton = <button
-            type="button"
-            className="btn btn-icon btn-outline-primary btn-sm"
-            title={t('refresh_btn')}
-            onClick={() => getAllStats()}
-    >
-        <svg className="icons icon12">
-            <use xlinkHref="#refresh" />
-        </svg>
-    </button>;
-
-    const statsProcessing = stats.processingStats
-            || stats.processingGetConfig
-            || access.processing;
-
-    const subtitle = getSubtitle();
-
-    const DISABLE_PROTECTION_ITEMS = [
-        {
-            text: t('disable_for_seconds', { count: msToSeconds(DISABLE_PROTECTION_TIMINGS.HALF_MINUTE) }),
-            disableTime: DISABLE_PROTECTION_TIMINGS.HALF_MINUTE,
-        },
-        {
-            text: t('disable_for_minutes', { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.MINUTE) }),
-            disableTime: DISABLE_PROTECTION_TIMINGS.MINUTE,
-        },
-        {
-            text: t('disable_for_minutes', { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.TEN_MINUTES) }),
-            disableTime: DISABLE_PROTECTION_TIMINGS.TEN_MINUTES,
-        },
-        {
-            text: t('disable_for_hours', { count: msToHours(DISABLE_PROTECTION_TIMINGS.HOUR) }),
-            disableTime: DISABLE_PROTECTION_TIMINGS.HOUR,
-        },
-        {
-            text: t('disable_until_tomorrow'),
-            disableTime: DISABLE_PROTECTION_TIMINGS.TOMORROW,
-        },
-    ];
-
-    const getDisableProtectionItems = () => (
-        Object.values(DISABLE_PROTECTION_ITEMS)
-            .map((item, index) => (
-                <div
-                    key={`disable_timings_${index}`}
-                    className="dropdown-item"
-                    onClick={() => {
-                        toggleProtection(protectionEnabled, item.disableTime - ONE_SECOND_IN_MS);
-                    }}
-                >
-                    {item.text}
-                </div>
-            ))
-    );
-
-    const getRemaningTimeText = (milliseconds) => {
-        if (!milliseconds) {
-            return '';
-        }
-
-        const date = new Date(milliseconds);
-        const hh = date.getUTCHours();
-        const mm = `0${date.getUTCMinutes()}`.slice(-2);
-        const ss = `0${date.getUTCSeconds()}`.slice(-2);
-        const formattedHH = `0${hh}`.slice(-2);
-
-        return hh ? `${formattedHH}:${mm}:${ss}` : `${mm}:${ss}`;
-    };
-
-    const getProtectionBtnText = (status) => (status ? t('disable_protection') : t('enable_protection'));
-
-    return <>
-        <PageTitle title={t('dashboard')} containerClass="page-title--dashboard">
-            <div className="page-title__protection">
-                <button
-                    type="button"
-                    className={buttonClass}
-                    onClick={() => {
-                        toggleProtection(protectionEnabled);
-                    }}
-                    disabled={processingProtection}
-                >
-                    {protectionDisabledDuration
-                        ? `${t('enable_protection_timer')} ${getRemaningTimeText(protectionDisabledDuration)}`
-                        : getProtectionBtnText(protectionEnabled)
-                    }
-                </button>
-
-                {protectionEnabled && <Dropdown
-                    label=""
-                    baseClassName="dropdown-protection"
-                    icon="arrow-down"
-                    controlClassName="dropdown-protection__toggle"
-                    menuClassName="dropdown-menu dropdown-menu-arrow dropdown-menu--protection"
-                >
-                    {getDisableProtectionItems()}
-                </Dropdown>}
-            </div>
-            <button
-                type="button"
-                className="btn btn-outline-primary btn-sm"
-                onClick={getAllStats}
-            >
-                <Trans>refresh_statics</Trans>
-            </button>
-        </PageTitle>
-        {statsProcessing && <Loading />}
-        {!statsProcessing && <div className="row row-cards dashboard">
-            <div className="col-lg-12">
-                {stats.interval === 0 && (
-                    <div className="alert alert-warning" role="alert">
-                        <Trans components={[
-                            <Link
-                                to={`${SETTINGS_URLS.settings}#stats-config`}
-                                key="0"
-                            >
-                                link
-                            </Link>,
-                        ]}>
-                            stats_disabled
-                        </Trans>
-                    </div>
-                )}
-                <Statistics
-                    interval={msToDays(stats.interval)}
-                    dnsQueries={stats.dnsQueries}
-                    blockedFiltering={stats.blockedFiltering}
-                    replacedSafebrowsing={stats.replacedSafebrowsing}
-                    replacedParental={stats.replacedParental}
-                    numDnsQueries={stats.numDnsQueries}
-                    numBlockedFiltering={stats.numBlockedFiltering}
-                    numReplacedSafebrowsing={stats.numReplacedSafebrowsing}
-                    numReplacedParental={stats.numReplacedParental}
-                    refreshButton={refreshButton}
-                />
-            </div>
-            <div className="col-lg-6">
-                <Counters
-                    subtitle={subtitle}
-                    refreshButton={refreshButton}
-                />
-            </div>
-            <div className="col-lg-6">
-                <Clients
-                    subtitle={subtitle}
-                    dnsQueries={stats.numDnsQueries}
-                    topClients={stats.topClients}
-                    clients={dashboard.clients}
-                    autoClients={dashboard.autoClients}
-                    refreshButton={refreshButton}
-                    processingAccessSet={access.processingSet}
-                    disallowedClients={access.disallowed_clients}
-                />
-            </div>
-            <div className="col-lg-6">
-                <QueriedDomains
-                    subtitle={subtitle}
-                    dnsQueries={stats.numDnsQueries}
-                    topQueriedDomains={stats.topQueriedDomains}
-                    refreshButton={refreshButton}
-                />
-            </div>
-            <div className="col-lg-6">
-                <BlockedDomains
-                    subtitle={subtitle}
-                    topBlockedDomains={stats.topBlockedDomains}
-                    blockedFiltering={stats.numBlockedFiltering}
-                    replacedSafebrowsing={stats.numReplacedSafebrowsing}
-                    replacedSafesearch={stats.numReplacedSafesearch}
-                    replacedParental={stats.numReplacedParental}
-                    refreshButton={refreshButton}
-                />
-            </div>
-            <div className="col-lg-6">
-                <UpstreamResponses
-                    subtitle={subtitle}
-                    topUpstreamsResponses={stats.topUpstreamsResponses}
-                    refreshButton={refreshButton}
-                />
-            </div>
-            <div className="col-lg-6">
-                <UpstreamAvgTime
-                    subtitle={subtitle}
-                    topUpstreamsAvgTime={stats.topUpstreamsAvgTime}
-                    refreshButton={refreshButton}
-                />
-            </div>
-        </div>}
-    </>;
-};
-
-Dashboard.propTypes = {
-    dashboard: PropTypes.object.isRequired,
-    stats: PropTypes.object.isRequired,
-    access: PropTypes.object.isRequired,
-    getStats: PropTypes.func.isRequired,
-    getStatsConfig: PropTypes.func.isRequired,
-    toggleProtection: PropTypes.func.isRequired,
-    getClients: PropTypes.func.isRequired,
-    getAccessList: PropTypes.func.isRequired,
-};
-
-export default Dashboard;

client/src/components/Dashboard/index.tsx

@@ -0,0 +1,260 @@
+import React, { useEffect } from 'react';
+
+import { HashLink as Link } from 'react-router-hash-link';
+import { Trans, useTranslation } from 'react-i18next';
+import classNames from 'classnames';
+
+import Statistics from './Statistics';
+import Counters from './Counters';
+import Clients from './Clients';
+import QueriedDomains from './QueriedDomains';
+import BlockedDomains from './BlockedDomains';
+import { DISABLE_PROTECTION_TIMINGS, ONE_SECOND_IN_MS, SETTINGS_URLS, TIME_UNITS } from '../../helpers/constants';
+import { msToSeconds, msToMinutes, msToHours, msToDays } from '../../helpers/helpers';
+
+import PageTitle from '../ui/PageTitle';
+
+import Loading from '../ui/Loading';
+import './Dashboard.css';
+
+import Dropdown from '../ui/Dropdown';
+import UpstreamResponses from './UpstreamResponses';
+
+import UpstreamAvgTime from './UpstreamAvgTime';
+import { AccessData, DashboardData, StatsData } from '../../initialState';
+
+interface DashboardProps {
+    dashboard: DashboardData;
+    stats: StatsData;
+    access: AccessData;
+    getStats: (...args: unknown[]) => unknown;
+    getStatsConfig: (...args: unknown[]) => unknown;
+    toggleProtection: (...args: unknown[]) => unknown;
+    getClients: (...args: unknown[]) => unknown;
+    getAccessList: () => (dispatch: any) => void;
+}
+
+const Dashboard = ({
+    getAccessList,
+    getStats,
+    getStatsConfig,
+    dashboard: { protectionEnabled, processingProtection, protectionDisabledDuration },
+    toggleProtection,
+    stats,
+    access,
+}: DashboardProps) => {
+    const { t } = useTranslation();
+
+    const getAllStats = () => {
+        getAccessList();
+        getStats();
+        getStatsConfig();
+    };
+
+    useEffect(() => {
+        getAllStats();
+    }, []);
+    const getSubtitle = () => {
+        if (!stats.enabled) {
+            return t('stats_disabled_short');
+        }
+
+        const msIn7Days = 604800000;
+
+        if (stats.timeUnits === TIME_UNITS.HOURS && stats.interval === msIn7Days) {
+            return t('for_last_days', { count: msToDays(stats.interval) });
+        }
+
+        return stats.timeUnits === TIME_UNITS.HOURS
+            ? t('for_last_hours', { count: msToHours(stats.interval) })
+            : t('for_last_days', { count: msToDays(stats.interval) });
+    };
+
+    const buttonClass = classNames('btn btn-sm dashboard-protection-button', {
+        'btn-gray': protectionEnabled,
+        'btn-success': !protectionEnabled,
+    });
+
+    const refreshButton = (
+        <button
+            type="button"
+            className="btn btn-icon btn-outline-primary btn-sm"
+            title={t('refresh_btn')}
+            onClick={() => getAllStats()}>
+            <svg className="icons icon12">
+                <use xlinkHref="#refresh" />
+            </svg>
+        </button>
+    );
+
+    const statsProcessing = stats.processingStats || stats.processingGetConfig || access.processing;
+
+    const subtitle = getSubtitle();
+
+    const DISABLE_PROTECTION_ITEMS = [
+        {
+            text: t('disable_for_seconds', { count: msToSeconds(DISABLE_PROTECTION_TIMINGS.HALF_MINUTE) }),
+            disableTime: DISABLE_PROTECTION_TIMINGS.HALF_MINUTE,
+        },
+        {
+            text: t('disable_for_minutes', { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.MINUTE) }),
+            disableTime: DISABLE_PROTECTION_TIMINGS.MINUTE,
+        },
+        {
+            text: t('disable_for_minutes', { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.TEN_MINUTES) }),
+            disableTime: DISABLE_PROTECTION_TIMINGS.TEN_MINUTES,
+        },
+        {
+            text: t('disable_for_hours', { count: msToHours(DISABLE_PROTECTION_TIMINGS.HOUR) }),
+            disableTime: DISABLE_PROTECTION_TIMINGS.HOUR,
+        },
+        {
+            text: t('disable_until_tomorrow'),
+            disableTime: DISABLE_PROTECTION_TIMINGS.TOMORROW,
+        },
+    ];
+
+    const getDisableProtectionItems = () =>
+        Object.values(DISABLE_PROTECTION_ITEMS).map((item: any, index: any) => (
+            <div
+                key={`disable_timings_${index}`}
+                className="dropdown-item"
+                onClick={() => {
+                    toggleProtection(protectionEnabled, item.disableTime - ONE_SECOND_IN_MS);
+                }}>
+                {item.text}
+            </div>
+        ));
+
+    const getRemaningTimeText = (milliseconds: any) => {
+        if (!milliseconds) {
+            return '';
+        }
+
+        const date = new Date(milliseconds);
+        const hh = date.getUTCHours();
+        const mm = `0${date.getUTCMinutes()}`.slice(-2);
+        const ss = `0${date.getUTCSeconds()}`.slice(-2);
+        const formattedHH = `0${hh}`.slice(-2);
+
+        return hh ? `${formattedHH}:${mm}:${ss}` : `${mm}:${ss}`;
+    };
+
+    const getProtectionBtnText = (status: any) => (status ? t('disable_protection') : t('enable_protection'));
+
+    return (
+        <>
+            <PageTitle title={t('dashboard')} containerClass="page-title--dashboard">
+                <div className="page-title__protection">
+                    <button
+                        type="button"
+                        className={buttonClass}
+                        onClick={() => {
+                            toggleProtection(protectionEnabled);
+                        }}
+                        disabled={processingProtection}>
+                        {protectionDisabledDuration
+                            ? `${t('enable_protection_timer')} ${getRemaningTimeText(protectionDisabledDuration)}`
+                            : getProtectionBtnText(protectionEnabled)}
+                    </button>
+
+                    {protectionEnabled && (
+                        <Dropdown
+                            label=""
+                            baseClassName="dropdown-protection"
+                            icon="arrow-down"
+                            controlClassName="dropdown-protection__toggle"
+                            menuClassName="dropdown-menu dropdown-menu-arrow dropdown-menu--protection">
+                            {getDisableProtectionItems()}
+                        </Dropdown>
+                    )}
+                </div>
+
+                <button type="button" className="btn btn-outline-primary btn-sm" onClick={getAllStats}>
+                    <Trans>refresh_statics</Trans>
+                </button>
+            </PageTitle>
+
+            {statsProcessing && <Loading />}
+
+            {!statsProcessing && (
+                <div className="row row-cards dashboard">
+                    <div className="col-lg-12">
+                        {stats.interval === 0 && (
+                            <div className="alert alert-warning" role="alert">
+                                <Trans
+                                    components={[
+                                        <Link to={`${SETTINGS_URLS.settings}#stats-config`} key="0">
+                                            link
+                                        </Link>,
+                                    ]}>
+                                    stats_disabled
+                                </Trans>
+                            </div>
+                        )}
+
+                        <Statistics
+                            interval={msToDays(stats.interval)}
+                            dnsQueries={stats.dnsQueries}
+                            blockedFiltering={stats.blockedFiltering}
+                            replacedSafebrowsing={stats.replacedSafebrowsing}
+                            replacedParental={stats.replacedParental}
+                            numDnsQueries={stats.numDnsQueries}
+                            numBlockedFiltering={stats.numBlockedFiltering}
+                            numReplacedSafebrowsing={stats.numReplacedSafebrowsing}
+                            numReplacedParental={stats.numReplacedParental}
+                            refreshButton={refreshButton}
+                        />
+                    </div>
+
+                    <div className="col-lg-6">
+                        <Counters subtitle={subtitle} refreshButton={refreshButton} />
+                    </div>
+
+                    <div className="col-lg-6">
+                        <Clients subtitle={subtitle} refreshButton={refreshButton} />
+                    </div>
+
+                    <div className="col-lg-6">
+                        <QueriedDomains
+                            subtitle={subtitle}
+                            dnsQueries={stats.numDnsQueries}
+                            topQueriedDomains={stats.topQueriedDomains}
+                            refreshButton={refreshButton}
+                        />
+                    </div>
+
+                    <div className="col-lg-6">
+                        <BlockedDomains
+                            subtitle={subtitle}
+                            topBlockedDomains={stats.topBlockedDomains}
+                            blockedFiltering={stats.numBlockedFiltering}
+                            replacedSafebrowsing={stats.numReplacedSafebrowsing}
+                            replacedSafesearch={stats.numReplacedSafesearch}
+                            replacedParental={stats.numReplacedParental}
+                            refreshButton={refreshButton}
+                        />
+                    </div>
+
+                    <div className="col-lg-6">
+                        <UpstreamResponses
+                            subtitle={subtitle}
+                            topUpstreamsResponses={stats.topUpstreamsResponses}
+                            refreshButton={refreshButton}
+                        />
+                    </div>
+
+                    <div className="col-lg-6">
+                        <UpstreamAvgTime
+                            subtitle={subtitle}
+                            topUpstreamsAvgTime={stats.topUpstreamsAvgTime}
+                            refreshButton={refreshButton}
+                        />
+                    </div>
+                </div>
+            )}
+        </>
+    );
+};
+
+export default Dashboard;

client/src/components/Filters/Actions.js

@@ -1,32 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { withTranslation, Trans } from 'react-i18next';
-
-const Actions = ({
-    handleAdd, handleRefresh, processingRefreshFilters, whitelist,
-}) => <div className="card-actions">
-    <button
-            className="btn btn-success btn-standard mr-2 btn-large mb-2"
-            type="submit"
-            onClick={handleAdd}
-    >
-        {whitelist ? <Trans>add_allowlist</Trans> : <Trans>add_blocklist</Trans>}
-    </button>
-    <button
-            className="btn btn-primary btn-standard mb-2"
-            type="submit"
-            onClick={handleRefresh}
-            disabled={processingRefreshFilters}
-    >
-        <Trans>check_updates_btn</Trans>
-    </button>
-</div>;
-
-Actions.propTypes = {
-    handleAdd: PropTypes.func.isRequired,
-    handleRefresh: PropTypes.func.isRequired,
-    processingRefreshFilters: PropTypes.bool.isRequired,
-    whitelist: PropTypes.bool,
-};
-
-export default withTranslation()(Actions);

client/src/components/Filters/Actions.tsx

@@ -0,0 +1,27 @@
+import React from 'react';
+import { withTranslation, Trans } from 'react-i18next';
+
+interface ActionsProps {
+    handleAdd: (...args: unknown[]) => unknown;
+    handleRefresh: (...args: unknown[]) => unknown;
+    processingRefreshFilters: boolean;
+    whitelist?: boolean;
+}
+
+const Actions = ({ handleAdd, handleRefresh, processingRefreshFilters, whitelist }: ActionsProps) => (
+    <div className="card-actions">
+        <button className="btn btn-success btn-standard mr-2 btn-large mb-2" type="submit" onClick={handleAdd}>
+            {whitelist ? <Trans>add_allowlist</Trans> : <Trans>add_blocklist</Trans>}
+        </button>
+
+        <button
+            className="btn btn-primary btn-standard mb-2"
+            type="submit"
+            onClick={handleRefresh}
+            disabled={processingRefreshFilters}>
+            <Trans>check_updates_btn</Trans>
+        </button>
+    </div>
+);
+
+export default withTranslation()(Actions);

client/src/components/Filters/Check/Info.tsx

@@ -15,10 +15,12 @@ import {
     getRulesToFilterList,
 } from '../../../helpers/helpers';
 import { BLOCK_ACTIONS, FILTERED, FILTERED_STATUS } from '../../../helpers/constants';
-import { toggleBlocking } from '../../../actions';
 
-const renderBlockingButton = (isFiltered, domain) => {
+import { toggleBlocking } from '../../../actions';
-    const processingRules = useSelector((state) => state.filtering.processingRules);
+import { RootState } from '../../../initialState';
+
+const renderBlockingButton = (isFiltered: any, domain: any) => {
+    const processingRules = useSelector((state: RootState) => state.filtering.processingRules);
     const dispatch = useDispatch();
     const { t } = useTranslation();
 
@@ -28,28 +30,32 @@ const renderBlockingButton = (isFiltered, domain) => {
         await dispatch(toggleBlocking(buttonType, domain));
     };
 
-    const buttonClass = classNames('mt-3 button-action button-action--main button-action--active button-action--small', {
+    const buttonClass = classNames(
-        'button-action--unblock': isFiltered,
+        'mt-3 button-action button-action--main button-action--active button-action--small',
-    });
+        {
+            'button-action--unblock': isFiltered,
+        },
+    );
 
-    return <button type="button"
+    return (
-                className={buttonClass}
+        <button type="button" className={buttonClass} onClick={onClick} disabled={processingRules}>
-                onClick={onClick}
-                disabled={processingRules}
-        >
             {t(buttonType)}
-        </button>;
+        </button>
+    );
 };
 
 const getTitle = () => {
     const { t } = useTranslation();
 
-    const filters = useSelector((state) => state.filtering.filters, shallowEqual);
+    const filters = useSelector((state: RootState) => state.filtering.filters, shallowEqual);
-    const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
-    const rules = useSelector((state) => state.filtering.check.rules, shallowEqual);
-    const reason = useSelector((state) => state.filtering.check.reason);
 
-    const getReasonFiltered = (reason) => {
+    const whitelistFilters = useSelector((state: RootState) => state.filtering.whitelistFilters, shallowEqual);
+
+    const rules = useSelector((state: RootState) => state.filtering.check.rules, shallowEqual);
+
+    const reason = useSelector((state: RootState) => state.filtering.check.reason);
+
+    const getReasonFiltered = (reason: any) => {
         const filterKey = reason.replace(FILTERED, '');
         return i18next.t('query_log_filtered', { filter: filterKey });
     };
@@ -71,24 +77,23 @@ const getTitle = () => {
         return REASON_TO_TITLE_MAP[reason];
     }
 
-    return <>
+    return (
-        <div>{t('check_reason', { reason })}</div>
+        <>
-        <div>
+            <div>{t('check_reason', { reason })}</div>
-            {t('rule_label')}:
+
-            &nbsp;
+            <div>
-            {ruleAndFilterNames}
+                {t('rule_label')}: &nbsp;
-        </div>
+                {ruleAndFilterNames}
-    </>;
+            </div>
+        </>
+    );
 };
 
 const Info = () => {
-    const {
+    const { hostname, reason, service_name, cname, ip_addrs } = useSelector(
-        hostname,
+        (state: RootState) => state.filtering.check,
-        reason,
+        shallowEqual,
-        service_name,
+    );
-        cname,
-        ip_addrs,
-    } = useSelector((state) => state.filtering.check, shallowEqual);
     const { t } = useTranslation();
 
     const title = getTitle();
@@ -99,23 +104,29 @@ const Info = () => {
         'logs__row--green': checkWhiteList(reason),
     });
 
-    const onlyFiltered = checkSafeSearch(reason)
+    const onlyFiltered = checkSafeSearch(reason) || checkSafeBrowsing(reason) || checkParental(reason);
-        || checkSafeBrowsing(reason)
-        || checkParental(reason);
 
     const isFiltered = checkFiltered(reason);
 
-    return <div className={className}>
+    return (
-        <div><strong>{hostname}</strong></div>
+        <div className={className}>
-        <div>{title}</div>
+            <div>
-        {!onlyFiltered
+                <strong>{hostname}</strong>
-        && <>
+            </div>
-            {service_name && <div>{t('check_service', { service: service_name })}</div>}
+
-            {cname && <div>{t('check_cname', { cname })}</div>}
+            <div>{title}</div>
-            {ip_addrs && <div>{t('check_ip', { ip: ip_addrs.join(', ') })}</div>}
+            {!onlyFiltered && (
-            {renderBlockingButton(isFiltered, hostname)}
+                <>
-        </>}
+                    {service_name && <div>{t('check_service', { service: service_name })}</div>}
-    </div>;
+
+                    {cname && <div>{t('check_cname', { cname })}</div>}
+
+                    {ip_addrs && <div>{t('check_ip', { ip: ip_addrs.join(', ') })}</div>}
+                    {renderBlockingButton(isFiltered, hostname)}
+                </>
+            )}
+        </div>
+    );
 };
 
 export default Info;

client/src/components/Filters/Check/index.js

@@ -1,66 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { useTranslation } from 'react-i18next';
-import { Field, reduxForm } from 'redux-form';
-import { useSelector } from 'react-redux';
-import Card from '../../ui/Card';
-import { renderInputField } from '../../../helpers/form';
-import Info from './Info';
-import { FORM_NAME } from '../../../helpers/constants';
-
-const Check = (props) => {
-    const {
-        pristine,
-        invalid,
-        handleSubmit,
-    } = props;
-
-    const { t } = useTranslation();
-
-    const processingCheck = useSelector((state) => state.filtering.processingCheck);
-    const hostname = useSelector((state) => state.filtering.check.hostname);
-
-    return <Card
-        title={t('check_title')}
-        subtitle={t('check_desc')}
-    >
-        <form onSubmit={handleSubmit}>
-            <div className="row">
-                <div className="col-12 col-md-6">
-                    <div className="input-group">
-                        <Field
-                            id="name"
-                            name="name"
-                            component={renderInputField}
-                            type="text"
-                            className="form-control"
-                            placeholder={t('form_enter_host')}
-                        />
-                        <span className="input-group-append">
-                            <button
-                                className="btn btn-success btn-standard btn-large"
-                                type="submit"
-                                onClick={handleSubmit}
-                                disabled={pristine || invalid || processingCheck}
-                            >
-                                {t('check')}
-                            </button>
-                        </span>
-                    </div>
-                    {hostname && <>
-                        <hr />
-                        <Info />
-                    </>}
-                </div>
-            </div>
-        </form>
-    </Card>;
-};
-
-Check.propTypes = {
-    handleSubmit: PropTypes.func.isRequired,
-    pristine: PropTypes.bool.isRequired,
-    invalid: PropTypes.bool.isRequired,
-};
-
-export default reduxForm({ form: FORM_NAME.DOMAIN_CHECK })(Check);

client/src/components/Filters/Check/index.tsx

@@ -0,0 +1,70 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { Field, reduxForm } from 'redux-form';
+import { useSelector } from 'react-redux';
+
+import Card from '../../ui/Card';
+
+import { renderInputField } from '../../../helpers/form';
+
+import Info from './Info';
+import { FORM_NAME } from '../../../helpers/constants';
+import { RootState } from '../../../initialState';
+
+interface CheckProps {
+    handleSubmit: (...args: unknown[]) => string;
+    pristine: boolean;
+    invalid: boolean;
+}
+
+const Check = (props: CheckProps) => {
+    const { pristine, invalid, handleSubmit } = props;
+
+    const { t } = useTranslation();
+
+    const processingCheck = useSelector((state: RootState) => state.filtering.processingCheck);
+
+    const hostname = useSelector((state: RootState) => state.filtering.check.hostname);
+
+    return (
+        <Card title={t('check_title')} subtitle={t('check_desc')}>
+            <form onSubmit={handleSubmit}>
+                <div className="row">
+                    <div className="col-12 col-md-6">
+                        <div className="input-group">
+                            <Field
+                                id="name"
+                                name="name"
+                                component={renderInputField}
+                                type="text"
+                                className="form-control"
+                                placeholder={t('form_enter_host')}
+                            />
+
+                            <span className="input-group-append">
+                                <button
+                                    className="btn btn-success btn-standard btn-large"
+                                    type="submit"
+                                    onClick={handleSubmit}
+                                    disabled={pristine || invalid || processingCheck}>
+                                    {t('check')}
+                                </button>
+                            </span>
+                        </div>
+
+                        {hostname && (
+                            <>
+                                <hr />
+
+                                <Info />
+                            </>
+                        )}
+                    </div>
+                </div>
+            </form>
+        </Card>
+    );
+};
+
+export default reduxForm({ form: FORM_NAME.DOMAIN_CHECK })(Check);

client/src/components/Filters/CustomRules.tsx

@@ -1,32 +1,46 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { Trans, withTranslation } from 'react-i18next';
+
 import Card from '../ui/Card';
+
 import PageTitle from '../ui/PageTitle';
+
 import Examples from './Examples';
+
 import Check from './Check';
+
 import { getTextareaCommentsHighlight, syncScroll } from '../../helpers/highlightTextareaComments';
 import { COMMENT_LINE_DEFAULT_TOKEN } from '../../helpers/constants';
 import '../ui/texareaCommentsHighlight.css';
+import { FilteringData } from '../../initialState';
 
-class CustomRules extends Component {
+interface CustomRulesProps {
+    filtering: FilteringData;
+    setRules: (...args: unknown[]) => unknown;
+    checkHost: (...args: unknown[]) => string;
+    getFilteringStatus: (...args: unknown[]) => unknown;
+    handleRulesChange: (...args: unknown[]) => unknown;
+    t: (...args: unknown[]) => string;
+}
+
+class CustomRules extends Component<CustomRulesProps> {
     ref = React.createRef();
 
     componentDidMount() {
         this.props.getFilteringStatus();
     }
 
-    handleChange = (e) => {
+    handleChange = (e: any) => {
         const { value } = e.currentTarget;
         this.handleRulesChange(value);
     };
 
-    handleSubmit = (e) => {
+    handleSubmit = (e: any) => {
         e.preventDefault();
         this.handleRulesSubmit();
     };
 
-    handleRulesChange = (value) => {
+    handleRulesChange = (value: any) => {
         this.props.handleRulesChange({ userRules: value });
     };
 
@@ -34,23 +48,22 @@ class CustomRules extends Component {
         this.props.setRules(this.props.filtering.userRules);
     };
 
-    handleCheck = (values) => {
+    handleCheck = (values: any) => {
         this.props.checkHost(values);
     };
 
-    onScroll = (e) => syncScroll(e, this.ref)
+    onScroll = (e: any) => syncScroll(e, this.ref);
 
     render() {
         const {
             t,
-            filtering: {
+            filtering: { userRules },
-                userRules,
-            },
         } = this.props;
 
         return (
             <>
                 <PageTitle title={t('custom_filtering_rules')} />
+
                 <Card subtitle={t('custom_filter_rules_hint')}>
                     <form onSubmit={this.handleSubmit}>
                         <div className="text-edit-container mb-4">
@@ -60,39 +73,31 @@ class CustomRules extends Component {
                                 onChange={this.handleChange}
                                 onScroll={this.onScroll}
                             />
-                            {getTextareaCommentsHighlight(
+                            {getTextareaCommentsHighlight(this.ref, userRules, [
-                                this.ref,
+                                COMMENT_LINE_DEFAULT_TOKEN,
-                                userRules,
+                                '!',
-                                undefined,
+                            ])}
-                                [COMMENT_LINE_DEFAULT_TOKEN, '!'],
-                            )}
                         </div>
+
                         <div className="card-actions">
                             <button
                                 className="btn btn-success btn-standard btn-large"
                                 type="submit"
-                                onClick={this.handleSubmit}
+                                onClick={this.handleSubmit}>
-                            >
                                 <Trans>apply_btn</Trans>
                             </button>
                         </div>
                     </form>
+
                     <hr />
+
                     <Examples />
                 </Card>
+
                 <Check onSubmit={this.handleCheck} />
             </>
         );
     }
 }
 
-CustomRules.propTypes = {
-    filtering: PropTypes.object.isRequired,
-    setRules: PropTypes.func.isRequired,
-    checkHost: PropTypes.func.isRequired,
-    getFilteringStatus: PropTypes.func.isRequired,
-    handleRulesChange: PropTypes.func.isRequired,
-    t: PropTypes.func.isRequired,
-};
-
 export default withTranslation()(CustomRules);

client/src/components/Filters/DnsAllowlist.tsx

@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import PageTitle from '../ui/PageTitle';
@@ -9,15 +8,41 @@ import Actions from './Actions';
 import Table from './Table';
 
 import { MODAL_TYPE } from '../../helpers/constants';
+
 import { getCurrentFilter } from '../../helpers/helpers';
 
-class DnsAllowlist extends Component {
+interface DnsAllowlistProps {
+    getFilteringStatus: (...args: unknown[]) => unknown;
+    filtering: {
+        modalType: string;
+        modalFilterUrl: string;
+        isModalOpen: boolean;
+        isFilterAdded: boolean;
+        processingRefreshFilters: boolean;
+        processingRemoveFilter: boolean;
+        processingAddFilter: boolean;
+        processingConfigFilter: boolean;
+        processingFilters: boolean;
+        whitelistFilters: any[];
+    };
+    removeFilter: (...args: unknown[]) => unknown;
+    toggleFilterStatus: (...args: unknown[]) => unknown;
+    addFilter: (...args: unknown[]) => unknown;
+    toggleFilteringModal: (...args: unknown[]) => unknown;
+    handleRulesChange: (...args: unknown[]) => unknown;
+    refreshFilters: (...args: unknown[]) => unknown;
+    editFilter: (...args: unknown[]) => unknown;
+    t: (...args: unknown[]) => string;
+}
+
+class DnsAllowlist extends Component<DnsAllowlistProps> {
     componentDidMount() {
         this.props.getFilteringStatus();
     }
 
-    handleSubmit = (values) => {
+    handleSubmit = (values: any) => {
         const { name, url } = values;
+
         const { filtering } = this.props;
         const whitelist = true;
 
@@ -28,15 +53,17 @@ class DnsAllowlist extends Component {
         }
     };
 
-    handleDelete = (url) => {
+    handleDelete = (url: any) => {
         if (window.confirm(this.props.t('list_confirm_delete'))) {
             const whitelist = true;
+
             this.props.removeFilter(url, whitelist);
         }
     };
 
-    toggleFilter = (url, data) => {
+    toggleFilter = (url: any, data: any) => {
         const whitelist = true;
+
         this.props.toggleFilterStatus(url, data, whitelist);
     };
 
@@ -53,7 +80,6 @@ class DnsAllowlist extends Component {
             t,
             toggleFilteringModal,
             addFilter,
-            toggleFilterStatus,
             filtering: {
                 whitelistFilters,
                 isModalOpen,
@@ -68,19 +94,18 @@ class DnsAllowlist extends Component {
             },
         } = this.props;
         const currentFilterData = getCurrentFilter(modalFilterUrl, whitelistFilters);
-        const loading = processingConfigFilter
+        const loading =
-            || processingFilters
+            processingConfigFilter ||
-            || processingAddFilter
+            processingFilters ||
-            || processingRemoveFilter
+            processingAddFilter ||
-            || processingRefreshFilters;
+            processingRemoveFilter ||
+            processingRefreshFilters;
+
         const whitelist = true;
 
         return (
             <>
-                <PageTitle
+                <PageTitle title={t('dns_allowlists')} subtitle={t('dns_allowlists_desc')} />
-                    title={t('dns_allowlists')}
-                    subtitle={t('dns_allowlists_desc')}
-                />
                 <div className="content">
                     <div className="row">
                         <div className="col-md-12">
@@ -90,11 +115,11 @@ class DnsAllowlist extends Component {
                                     loading={loading}
                                     processingConfigFilter={processingConfigFilter}
                                     toggleFilteringModal={toggleFilteringModal}
-                                    toggleFilterStatus={toggleFilterStatus}
                                     handleDelete={this.handleDelete}
                                     toggleFilter={this.toggleFilter}
                                     whitelist={whitelist}
                                 />
+
                                 <Actions
                                     handleAdd={this.openAddFiltersModal}
                                     handleRefresh={this.handleRefresh}
@@ -105,6 +130,7 @@ class DnsAllowlist extends Component {
                         </div>
                     </div>
                 </div>
+
                 <Modal
                     filters={whitelistFilters}
                     isOpen={isModalOpen}
@@ -123,17 +149,4 @@ class DnsAllowlist extends Component {
     }
 }
 
-DnsAllowlist.propTypes = {
-    getFilteringStatus: PropTypes.func.isRequired,
-    filtering: PropTypes.object.isRequired,
-    removeFilter: PropTypes.func.isRequired,
-    toggleFilterStatus: PropTypes.func.isRequired,
-    addFilter: PropTypes.func.isRequired,
-    toggleFilteringModal: PropTypes.func.isRequired,
-    handleRulesChange: PropTypes.func.isRequired,
-    refreshFilters: PropTypes.func.isRequired,
-    editFilter: PropTypes.func.isRequired,
-    t: PropTypes.func.isRequired,
-};
-
 export default withTranslation()(DnsAllowlist);

client/src/components/Filters/DnsBlocklist.tsx

@@ -1,27 +1,38 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import PageTitle from '../ui/PageTitle';
+
 import Card from '../ui/Card';
 import Modal from './Modal';
 import Actions from './Actions';
-
 import Table from './Table';
 import { MODAL_TYPE } from '../../helpers/constants';
 
-import {
+import { getCurrentFilter } from '../../helpers/helpers';
-    getCurrentFilter,
-} from '../../helpers/helpers';
 
 import filtersCatalog from '../../helpers/filters/filters';
+import { FilteringData } from '../../initialState';
 
-class DnsBlocklist extends Component {
+interface DnsBlocklistProps {
+    getFilteringStatus: (...args: unknown[]) => unknown;
+    filtering: FilteringData;
+    removeFilter: (...args: unknown[]) => unknown;
+    toggleFilterStatus: (...args: unknown[]) => unknown;
+    addFilter: (...args: unknown[]) => unknown;
+    toggleFilteringModal: (...args: unknown[]) => unknown;
+    handleRulesChange: (...args: unknown[]) => unknown;
+    refreshFilters: (...args: unknown[]) => unknown;
+    editFilter: (...args: unknown[]) => unknown;
+    t: (...args: unknown[]) => string;
+}
+
+class DnsBlocklist extends Component<DnsBlocklistProps> {
     componentDidMount() {
         this.props.getFilteringStatus();
     }
 
-    handleSubmit = (values) => {
+    handleSubmit = (values: any) => {
         const { modalFilterUrl, modalType } = this.props.filtering;
 
         switch (modalType) {
@@ -30,23 +41,25 @@ class DnsBlocklist extends Component {
                 break;
             case MODAL_TYPE.ADD_FILTERS: {
                 const { name, url } = values;
+
                 this.props.addFilter(url, name);
                 break;
             }
             case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
-                const changedValues = Object.entries(values)?.reduce((acc, [key, value]) => {
+                const changedValues = Object.entries(values)?.reduce((acc: any, [key, value]) => {
                     if (value && key in filtersCatalog.filters) {
                         acc[key] = value;
                     }
                     return acc;
                 }, {});
 
-                Object.keys(changedValues)
+                Object.keys(changedValues).forEach((fieldName) => {
-                    .forEach((fieldName) => {
+                    // filterId is actually in the field name
-                        // filterId is actually in the field name
+
-                        const { source, name } = filtersCatalog.filters[fieldName];
+                    const { source, name } = filtersCatalog.filters[fieldName];
-                        this.props.addFilter(source, name);
+
-                    });
+                    this.props.addFilter(source, name);
+                });
                 break;
             }
             default:
@@ -54,13 +67,13 @@ class DnsBlocklist extends Component {
         }
     };
 
-    handleDelete = (url) => {
+    handleDelete = (url: any) => {
         if (window.confirm(this.props.t('list_confirm_delete'))) {
             this.props.removeFilter(url);
         }
     };
 
-    toggleFilter = (url, data) => {
+    toggleFilter = (url: any, data: any) => {
         this.props.toggleFilterStatus(url, data);
     };
 
@@ -75,8 +88,11 @@ class DnsBlocklist extends Component {
     render() {
         const {
             t,
+
             toggleFilteringModal,
+
             addFilter,
+
             filtering: {
                 filters,
                 isModalOpen,
@@ -91,18 +107,17 @@ class DnsBlocklist extends Component {
             },
         } = this.props;
         const currentFilterData = getCurrentFilter(modalFilterUrl, filters);
-        const loading = processingConfigFilter
+        const loading =
-            || processingFilters
+            processingConfigFilter ||
-            || processingAddFilter
+            processingFilters ||
-            || processingRemoveFilter
+            processingAddFilter ||
-            || processingRefreshFilters;
+            processingRemoveFilter ||
+            processingRefreshFilters;
 
         return (
             <>
-                <PageTitle
+                <PageTitle title={t('dns_blocklists')} subtitle={t('dns_blocklists_desc')} />
-                    title={t('dns_blocklists')}
+
-                    subtitle={t('dns_blocklists_desc')}
-                />
                 <div className="content">
                     <div className="row">
                         <div className="col-md-12">
@@ -115,6 +130,7 @@ class DnsBlocklist extends Component {
                                     handleDelete={this.handleDelete}
                                     toggleFilter={this.toggleFilter}
                                 />
+
                                 <Actions
                                     handleAdd={this.openSelectTypeModal}
                                     handleRefresh={this.handleRefresh}
@@ -124,6 +140,7 @@ class DnsBlocklist extends Component {
                         </div>
                     </div>
                 </div>
+
                 <Modal
                     filtersCatalog={filtersCatalog}
                     filters={filters}
@@ -142,17 +159,4 @@ class DnsBlocklist extends Component {
     }
 }
 
-DnsBlocklist.propTypes = {
-    getFilteringStatus: PropTypes.func.isRequired,
-    filtering: PropTypes.object.isRequired,
-    removeFilter: PropTypes.func.isRequired,
-    toggleFilterStatus: PropTypes.func.isRequired,
-    addFilter: PropTypes.func.isRequired,
-    toggleFilteringModal: PropTypes.func.isRequired,
-    handleRulesChange: PropTypes.func.isRequired,
-    refreshFilters: PropTypes.func.isRequired,
-    editFilter: PropTypes.func.isRequired,
-    t: PropTypes.func.isRequired,
-};
-
 export default withTranslation()(DnsBlocklist);

client/src/components/Filters/Examples.tsx

@@ -7,31 +7,37 @@ const Examples = () => (
             <Trans>examples_title</Trans>:
             <ol className="leading-loose">
                 <li>
-                    <code>||example.org^</code>:
+                    <code>||example.org^</code>:<Trans>example_meaning_filter_block</Trans>
-                    <Trans>example_meaning_filter_block</Trans>
                 </li>
+
                 <li>
-                    <code> @@||example.org^</code>:
+                    <code> @@||example.org^</code>:<Trans>example_meaning_filter_whitelist</Trans>
-                    <Trans>example_meaning_filter_whitelist</Trans>
                 </li>
+
                 <li>
-                    <code>127.0.0.1 example.org</code>:
+                    <code>127.0.0.1 example.org</code>:<Trans>example_meaning_host_block</Trans>
-                    <Trans>example_meaning_host_block</Trans>
                 </li>
+
                 <li>
-                    <code><Trans>example_comment</Trans></code>:
+                    <code>
-                    <Trans>example_comment_meaning</Trans>
+                        <Trans>example_comment</Trans>
+                    </code>
+                    :<Trans>example_comment_meaning</Trans>
                 </li>
+
                 <li>
-                    <code><Trans>example_comment_hash</Trans></code>:
+                    <code>
-                    <Trans>example_comment_meaning</Trans>
+                        <Trans>example_comment_hash</Trans>
+                    </code>
+                    :<Trans>example_comment_meaning</Trans>
                 </li>
+
                 <li>
-                    <code>/REGEX/</code>:
+                    <code>/REGEX/</code>:<Trans>example_regex_meaning</Trans>
-                    <Trans>example_regex_meaning</Trans>
                 </li>
             </ol>
         </div>
+
         <p className="mt-1">
             <Trans
                 components={[
@@ -39,12 +45,10 @@ const Examples = () => (
                         href="https://link.adtidy.org/forward.html?action=dns_kb_filtering_syntax&from=ui&app=home"
                         target="_blank"
                         rel="noopener noreferrer"
-                        key="0"
+                        key="0">
-                    >
                         link
                     </a>,
-                ]}
+                ]}>
-            >
                 filtering_rules_learn_more
             </Trans>
         </p>

client/src/components/Filters/Form.js

@@ -1,191 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Field, reduxForm } from 'redux-form';
-import { withTranslation } from 'react-i18next';
-import flow from 'lodash/flow';
-import classNames from 'classnames';
-import { validatePath, validateRequiredValue } from '../../helpers/validators';
-import { CheckboxField, renderInputField } from '../../helpers/form';
-import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
-import filtersCatalog from '../../helpers/filters/filters';
-
-const getIconsData = (homepage, source) => ([
-    {
-        iconName: 'dashboard',
-        href: homepage,
-        className: 'ml-1',
-    },
-    {
-        iconName: 'info',
-        href: source,
-    },
-]);
-
-const renderIcons = (iconsData) => iconsData.map(({
-    iconName,
-    href,
-    className = '',
-}) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
-         className={classNames('d-flex align-items-center', className)}
->
-    <svg className="icon icon--15 mr-1 icon--gray">
-        <use xlinkHref={`#${iconName}`} />
-    </svg>
-</a>);
-
-const renderCheckboxField = (
-    props,
-) => <CheckboxField
-        {...props}
-        input={{
-            ...props.input,
-            checked: props.disabled || props.input.checked,
-        }}
-/>;
-
-renderCheckboxField.propTypes = {
-    // https://redux-form.com/8.3.0/docs/api/field.md/#props
-    input: PropTypes.object.isRequired,
-    disabled: PropTypes.bool.isRequired,
-};
-
-const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
-    .map((categoryId) => {
-        const category = categories[categoryId];
-        const categoryFilters = [];
-        Object.keys(filters)
-            .sort()
-            .forEach((key) => {
-                const filter = filters[key];
-                filter.id = key;
-                if (filter.categoryId === categoryId) {
-                    categoryFilters.push(filter);
-                }
-            });
-
-        return <div key={category.name} className="modal-body__item">
-            <h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
-            <p className="mb-3">{t(category.description)}</p>
-            {categoryFilters.map((filter) => {
-                const { homepage, source, name } = filter;
-
-                const isSelected = Object.prototype.hasOwnProperty.call(selectedSources, source);
-
-                const iconsData = getIconsData(homepage, source);
-
-                return <div key={name} className="d-flex align-items-center pb-1">
-                    <Field
-                        name={filter.id}
-                        type="checkbox"
-                        component={renderCheckboxField}
-                        placeholder={t(name)}
-                        disabled={isSelected}
-                    />
-                    {renderIcons(iconsData)}
-                </div>;
-            })}
-        </div>;
-    });
-
-const Form = (props) => {
-    const {
-        t,
-        closeModal,
-        handleSubmit,
-        processingAddFilter,
-        processingConfigFilter,
-        whitelist,
-        modalType,
-        toggleFilteringModal,
-        selectedSources,
-    } = props;
-
-    const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
-        toggleFilteringModal();
-        setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
-    };
-
-    const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
-
-    const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
-
-    return <form onSubmit={handleSubmit}>
-        <div className="modal-body modal-body--filters">
-            {modalType === MODAL_TYPE.SELECT_MODAL_TYPE
-            && <div className="d-flex justify-content-around">
-                <button onClick={openFilteringListModal}
-                        className="btn btn-success btn-standard mr-2 btn-large">
-                    {t('choose_from_list')}
-                </button>
-                <button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
-                    {t('add_custom_list')}
-                </button>
-            </div>}
-            {modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
-            && renderFilters(filtersCatalog, selectedSources, t)}
-            {modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
-            && modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
-            && <>
-                <div className="form__group">
-                    <Field
-                        id="name"
-                        name="name"
-                        type="text"
-                        component={renderInputField}
-                        className="form-control"
-                        placeholder={t('enter_name_hint')}
-                        normalizeOnBlur={(data) => data.trim()}
-                    />
-                </div>
-                <div className="form__group">
-                    <Field
-                        id="url"
-                        name="url"
-                        type="text"
-                        component={renderInputField}
-                        className="form-control"
-                        placeholder={t('enter_url_or_path_hint')}
-                        validate={[validateRequiredValue, validatePath]}
-                        normalizeOnBlur={(data) => data.trim()}
-                    />
-                </div>
-                <div className="form__description">
-                    {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')}
-                </div>
-            </>}
-        </div>
-        <div className="modal-footer">
-            <button
-                type="button"
-                className="btn btn-secondary"
-                onClick={closeModal}
-            >
-                {t('cancel_btn')}
-            </button>
-            {modalType !== MODAL_TYPE.SELECT_MODAL_TYPE && <button
-                type="submit"
-                className="btn btn-success"
-                disabled={processingAddFilter || processingConfigFilter}
-            >
-                {t('save_btn')}
-            </button>}
-        </div>
-    </form>;
-};
-
-Form.propTypes = {
-    t: PropTypes.func.isRequired,
-    closeModal: PropTypes.func.isRequired,
-    handleSubmit: PropTypes.func.isRequired,
-    processingAddFilter: PropTypes.bool.isRequired,
-    processingConfigFilter: PropTypes.bool.isRequired,
-    whitelist: PropTypes.bool,
-    modalType: PropTypes.string.isRequired,
-    toggleFilteringModal: PropTypes.func.isRequired,
-    selectedSources: PropTypes.object,
-};
-
-export default flow([
-    withTranslation(),
-    reduxForm({ form: FORM_NAME.FILTER }),
-])(Form);

client/src/components/Filters/Form.tsx

@@ -0,0 +1,208 @@
+import React from 'react';
+
+import { Field, reduxForm } from 'redux-form';
+import { withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
+import classNames from 'classnames';
+import { validatePath, validateRequiredValue } from '../../helpers/validators';
+
+import { CheckboxField, renderInputField } from '../../helpers/form';
+import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
+import filtersCatalog from '../../helpers/filters/filters';
+
+const getIconsData = (homepage: any, source: any) => [
+    {
+        iconName: 'dashboard',
+        href: homepage,
+        className: 'ml-1',
+    },
+    {
+        iconName: 'info',
+        href: source,
+    },
+];
+
+const renderIcons = (iconsData: any) =>
+    iconsData.map(({ iconName, href, className = '' }: any) => (
+        <a
+            key={iconName}
+            href={href}
+            target="_blank"
+            rel="noopener noreferrer"
+            className={classNames('d-flex align-items-center', className)}>
+            <svg className="icon icon--15 mr-1 icon--gray">
+                <use xlinkHref={`#${iconName}`} />
+            </svg>
+        </a>
+    ));
+
+interface renderCheckboxFieldProps {
+    // https://redux-form.com/8.3.0/docs/api/field.md/#props
+    input: {
+        name: string;
+        value: string;
+        checked: boolean;
+        onChange: (...args: unknown[]) => unknown;
+    };
+    disabled: boolean;
+}
+
+const renderCheckboxField = (props: renderCheckboxFieldProps) => (
+    <CheckboxField
+        {...props}
+        meta={{ touched: false, error: null }}
+        input={{
+            ...props.input,
+            checked: props.disabled || props.input.checked,
+        }}
+    />
+);
+
+const renderFilters = ({ categories, filters }: any, selectedSources: any, t: any) =>
+    Object.keys(categories).map((categoryId) => {
+        const category = categories[categoryId];
+        const categoryFilters: any = [];
+        Object.keys(filters)
+            .sort()
+            .forEach((key) => {
+                const filter = filters[key];
+                filter.id = key;
+                if (filter.categoryId === categoryId) {
+                    categoryFilters.push(filter);
+                }
+            });
+
+        return (
+            <div key={category.name} className="modal-body__item">
+                <h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
+
+                <p className="mb-3">{t(category.description)}</p>
+
+                {categoryFilters.map((filter) => {
+                    const { homepage, source, name } = filter;
+
+                    const isSelected = Object.prototype.hasOwnProperty.call(selectedSources, source);
+
+                    const iconsData = getIconsData(homepage, source);
+
+                    return (
+                        <div key={name} className="d-flex align-items-center pb-1">
+                            <Field
+                                name={filter.id}
+                                type="checkbox"
+                                component={renderCheckboxField}
+                                placeholder={t(name)}
+                                disabled={isSelected}
+                            />
+                            {renderIcons(iconsData)}
+                        </div>
+                    );
+                })}
+            </div>
+        );
+    });
+
+interface FormProps {
+    t: (...args: unknown[]) => string;
+    closeModal: (...args: unknown[]) => unknown;
+    handleSubmit: (...args: unknown[]) => string;
+    processingAddFilter: boolean;
+    processingConfigFilter: boolean;
+    whitelist?: boolean;
+    modalType: string;
+    toggleFilteringModal: (...args: unknown[]) => unknown;
+    selectedSources?: object;
+}
+
+const Form = (props: FormProps) => {
+    const {
+        t,
+        closeModal,
+        handleSubmit,
+        processingAddFilter,
+        processingConfigFilter,
+        whitelist,
+        modalType,
+        toggleFilteringModal,
+        selectedSources,
+    } = props;
+
+    const openModal = (modalType: any, timeout = MODAL_OPEN_TIMEOUT) => {
+        toggleFilteringModal();
+        setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
+    };
+
+    const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
+
+    const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
+
+    return (
+        <form onSubmit={handleSubmit}>
+            <div className="modal-body modal-body--filters">
+                {modalType === MODAL_TYPE.SELECT_MODAL_TYPE && (
+                    <div className="d-flex justify-content-around">
+                        <button
+                            onClick={openFilteringListModal}
+                            className="btn btn-success btn-standard mr-2 btn-large">
+                            {t('choose_from_list')}
+                        </button>
+
+                        <button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
+                            {t('add_custom_list')}
+                        </button>
+                    </div>
+                )}
+                {modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST && renderFilters(filtersCatalog, selectedSources, t)}
+                {modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST && modalType !== MODAL_TYPE.SELECT_MODAL_TYPE && (
+                    <>
+                        <div className="form__group">
+                            <Field
+                                id="name"
+                                name="name"
+                                type="text"
+                                component={renderInputField}
+                                className="form-control"
+                                placeholder={t('enter_name_hint')}
+                                normalizeOnBlur={(data: any) => data.trim()}
+                            />
+                        </div>
+
+                        <div className="form__group">
+                            <Field
+                                id="url"
+                                name="url"
+                                type="text"
+                                component={renderInputField}
+                                className="form-control"
+                                placeholder={t('enter_url_or_path_hint')}
+                                validate={[validateRequiredValue, validatePath]}
+                                normalizeOnBlur={(data: any) => data.trim()}
+                            />
+                        </div>
+
+                        <div className="form__description">
+                            {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')}
+                        </div>
+                    </>
+                )}
+            </div>
+
+            <div className="modal-footer">
+                <button type="button" className="btn btn-secondary" onClick={closeModal}>
+                    {t('cancel_btn')}
+                </button>
+
+                {modalType !== MODAL_TYPE.SELECT_MODAL_TYPE && (
+                    <button
+                        type="submit"
+                        className="btn btn-success"
+                        disabled={processingAddFilter || processingConfigFilter}>
+                        {t('save_btn')}
+                    </button>
+                )}
+            </div>
+        </form>
+    );
+};
+
+export default flow([withTranslation(), reduxForm({ form: FORM_NAME.FILTER })])(Form);

client/src/components/Filters/Modal.tsx

@@ -1,11 +1,13 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+
 import ReactModal from 'react-modal';
 import { withTranslation } from 'react-i18next';
 
 import { MODAL_TYPE } from '../../helpers/constants';
+
 import Form from './Form';
 import '../ui/Modal.css';
+
 import { getMap } from '../../helpers/helpers';
 
 ReactModal.setAppElement('#root');
@@ -25,7 +27,7 @@ const MODAL_TYPE_TO_TITLE_TYPE_MAP = {
  * @returns {'new_allowlist' | 'edit_allowlist' | 'choose_allowlist' |
  *           'new_blocklist' | 'edit_blocklist' | 'choose_blocklist' | null}
  */
-const getTitle = (modalType, whitelist) => {
+const getTitle = (modalType: any, whitelist: any) => {
     const titleType = MODAL_TYPE_TO_TITLE_TYPE_MAP[modalType];
     if (!titleType) {
         return null;
@@ -33,19 +35,39 @@ const getTitle = (modalType, whitelist) => {
     return `${titleType}_${whitelist ? 'allowlist' : 'blocklist'}`;
 };
 
-const getSelectedValues = (filters, catalogSourcesToIdMap) => filters.reduce((acc, { url }) => {
+const getSelectedValues = (filters: any, catalogSourcesToIdMap: any) =>
-    if (Object.prototype.hasOwnProperty.call(catalogSourcesToIdMap, url)) {
+    filters.reduce(
-        const fieldId = `filter${catalogSourcesToIdMap[url]}`;
+        (acc: any, { url }: any) => {
-        acc.selectedFilterIds[fieldId] = true;
+            if (Object.prototype.hasOwnProperty.call(catalogSourcesToIdMap, url)) {
-        acc.selectedSources[url] = true;
+                const fieldId = `filter${catalogSourcesToIdMap[url]}`;
-    }
+                acc.selectedFilterIds[fieldId] = true;
-    return acc;
+                acc.selectedSources[url] = true;
-}, {
+            }
-    selectedFilterIds: {},
+            return acc;
-    selectedSources: {},
+        },
-});
+        {
+            selectedFilterIds: {},
+            selectedSources: {},
+        },
+    );
 
-class Modal extends Component {
+interface ModalProps {
+    toggleFilteringModal: (...args: unknown[]) => unknown;
+    isOpen: boolean;
+    addFilter: (...args: unknown[]) => unknown;
+    isFilterAdded: boolean;
+    processingAddFilter: boolean;
+    processingConfigFilter: boolean;
+    handleSubmit: (values: any) => void;
+    modalType: string;
+    currentFilterData: object;
+    t: (...args: unknown[]) => string;
+    whitelist?: boolean;
+    filters: unknown[];
+    filtersCatalog?: any;
+}
+
+class Modal extends Component<ModalProps> {
     closeModal = () => {
         this.props.toggleFilteringModal();
     };
@@ -53,15 +75,25 @@ class Modal extends Component {
     render() {
         const {
             isOpen,
+
             processingAddFilter,
+
             processingConfigFilter,
+
             handleSubmit,
+
             modalType,
+
             currentFilterData,
+
             whitelist,
+
             toggleFilteringModal,
+
             filters,
+
             t,
+
             filtersCatalog,
         } = this.props;
 
@@ -90,15 +122,16 @@ class Modal extends Component {
                 className="Modal__Bootstrap modal-dialog modal-dialog-centered"
                 closeTimeoutMS={0}
                 isOpen={isOpen}
-                onRequestClose={this.closeModal}
+                onRequestClose={this.closeModal}>
-            >
                 <div className="modal-content">
                     <div className="modal-header">
                         {title && <h4 className="modal-title">{title}</h4>}
+
                         <button type="button" className="close" onClick={this.closeModal}>
                             <span className="sr-only">Close</span>
                         </button>
                     </div>
+
                     <Form
                         selectedSources={selectedSources}
                         initialValues={initialValues}
@@ -116,20 +149,4 @@ class Modal extends Component {
     }
 }
 
-Modal.propTypes = {
-    toggleFilteringModal: PropTypes.func.isRequired,
-    isOpen: PropTypes.bool.isRequired,
-    addFilter: PropTypes.func.isRequired,
-    isFilterAdded: PropTypes.bool.isRequired,
-    processingAddFilter: PropTypes.bool.isRequired,
-    processingConfigFilter: PropTypes.bool.isRequired,
-    handleSubmit: PropTypes.func.isRequired,
-    modalType: PropTypes.string.isRequired,
-    currentFilterData: PropTypes.object.isRequired,
-    t: PropTypes.func.isRequired,
-    whitelist: PropTypes.bool,
-    filters: PropTypes.array.isRequired,
-    filtersCatalog: PropTypes.object,
-};
-
 export default withTranslation()(Modal);

client/src/components/Filters/Rewrites/Form.tsx

@@ -1,22 +1,26 @@
 import React from 'react';
-import PropTypes from 'prop-types';
+
 import { Field, reduxForm } from 'redux-form';
 import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
+
 import { renderInputField } from '../../../helpers/form';
 import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators';
 import { FORM_NAME } from '../../../helpers/constants';
 
-const Form = (props) => {
+interface FormProps {
-    const {
+    pristine: boolean;
-        t,
+    handleSubmit: (...args: unknown[]) => string;
-        handleSubmit,
+    reset: (...args: unknown[]) => string;
-        reset,
+    toggleRewritesModal: (...args: unknown[]) => unknown;
-        pristine,
+    submitting: boolean;
-        submitting,
+    processingAdd: boolean;
-        toggleRewritesModal,
+    t: (...args: unknown[]) => string;
-        processingAdd,
+    initialValues?: object;
-    } = props;
+}
+
+const Form = (props: FormProps) => {
+    const { t, handleSubmit, reset, pristine, submitting, toggleRewritesModal, processingAdd } = props;
 
     return (
         <form onSubmit={handleSubmit}>
@@ -35,22 +39,19 @@ const Form = (props) => {
                         validate={[validateRequiredValue, validateDomain]}
                     />
                 </div>
-
                 <Trans>examples_title</Trans>:
                 <ol className="leading-loose">
                     <li>
                         <code>example.org</code> – <Trans>example_rewrite_domain</Trans>
                     </li>
+
                     <li>
                         <code>*.example.org</code> –&nbsp;
                         <span>
-                            <Trans components={[<code key="0">text</code>]}>
+                            <Trans components={[<code key="0">text</code>]}>example_rewrite_wildcard</Trans>
-                                example_rewrite_wildcard
-                            </Trans>
                         </span>
                     </li>
                 </ol>
-
                 <div className="form__group">
                     <Field
                         id="answer"
@@ -63,14 +64,15 @@ const Form = (props) => {
                     />
                 </div>
             </div>
-            <ul>{['rewrite_ip_address',
+
-                'rewrite_domain_name',
+            <ul>
-                'rewrite_A',
+                {['rewrite_ip_address', 'rewrite_domain_name', 'rewrite_A', 'rewrite_AAAA'].map((str) => (
-                'rewrite_AAAA']
+                    <li key={str}>
-                .map((str) => <li key={str}>
+                        <Trans components={[<code key="0">text</code>]}>{str}</Trans>
-                    <Trans components={[<code key="0">text</code>]}>{str}</Trans>
+                    </li>
-                </li>)
+                ))}
-            }</ul>
+            </ul>
+
             <div className="modal-footer">
                 <div className="btn-list">
                     <button
@@ -80,15 +82,14 @@ const Form = (props) => {
                         onClick={() => {
                             reset();
                             toggleRewritesModal();
-                        }}
+                        }}>
-                    >
                         <Trans>cancel_btn</Trans>
                     </button>
+
                     <button
                         type="submit"
                         className="btn btn-success btn-standard"
-                        disabled={submitting || pristine || processingAdd}
+                        disabled={submitting || pristine || processingAdd}>
-                    >
                         <Trans>save_btn</Trans>
                     </button>
                 </div>
@@ -97,17 +98,6 @@ const Form = (props) => {
     );
 };
 
-Form.propTypes = {
-    pristine: PropTypes.bool.isRequired,
-    handleSubmit: PropTypes.func.isRequired,
-    reset: PropTypes.func.isRequired,
-    toggleRewritesModal: PropTypes.func.isRequired,
-    submitting: PropTypes.bool.isRequired,
-    processingAdd: PropTypes.bool.isRequired,
-    t: PropTypes.func.isRequired,
-    initialValues: PropTypes.object,
-};
-
 export default flow([
     withTranslation(),
     reduxForm({

client/src/components/Filters/Rewrites/Modal.tsx

@@ -1,12 +1,23 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Trans, withTranslation } from 'react-i18next';
+
 import ReactModal from 'react-modal';
 
 import { MODAL_TYPE } from '../../../helpers/constants';
+
 import Form from './Form';
 
-const Modal = (props) => {
+interface ModalProps {
+    isModalOpen: boolean;
+    handleSubmit: (values: any) => void;
+    toggleRewritesModal: (...args: unknown[]) => unknown;
+    processingAdd: boolean;
+    processingDelete: boolean;
+    modalType: string;
+    currentRewrite?: object;
+}
+
+const Modal = (props: ModalProps) => {
     const {
         isModalOpen,
         handleSubmit,
@@ -22,8 +33,7 @@ const Modal = (props) => {
             className="Modal__Bootstrap modal-dialog modal-dialog-centered"
             closeTimeoutMS={0}
             isOpen={isModalOpen}
-            onRequestClose={() => toggleRewritesModal()}
+            onRequestClose={() => toggleRewritesModal()}>
-        >
             <div className="modal-content">
                 <div className="modal-header">
                     <h4 className="modal-title">
@@ -33,10 +43,12 @@ const Modal = (props) => {
                             <Trans>rewrite_add</Trans>
                         )}
                     </h4>
+
                     <button type="button" className="close" onClick={() => toggleRewritesModal()}>
                         <span className="sr-only">Close</span>
                     </button>
                 </div>
+
                 <Form
                     initialValues={{ ...currentRewrite }}
                     onSubmit={handleSubmit}
@@ -49,14 +61,4 @@ const Modal = (props) => {
     );
 };
 
-Modal.propTypes = {
-    isModalOpen: PropTypes.bool.isRequired,
-    handleSubmit: PropTypes.func.isRequired,
-    toggleRewritesModal: PropTypes.func.isRequired,
-    processingAdd: PropTypes.bool.isRequired,
-    processingDelete: PropTypes.bool.isRequired,
-    modalType: PropTypes.string.isRequired,
-    currentRewrite: PropTypes.object,
-};
-
 export default withTranslation()(Modal);

client/src/components/Filters/Rewrites/Table.tsx

@@ -1,13 +1,26 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+
+// @ts-expect-error FIXME: update react-table
 import ReactTable from 'react-table';
 import { withTranslation } from 'react-i18next';
+
 import { sortIp } from '../../../helpers/helpers';
 import { MODAL_TYPE, TABLES_MIN_ROWS } from '../../../helpers/constants';
 import { LocalStorageHelper, LOCAL_STORAGE_KEYS } from '../../../helpers/localStorageHelper';
 
-class Table extends Component {
+interface TableProps {
-    cellWrap = ({ value }) => (
+    t: (...args: unknown[]) => string;
+    list: unknown[];
+    processing: boolean;
+    processingAdd: boolean;
+    processingDelete: boolean;
+    processingUpdate: boolean;
+    handleDelete: (...args: unknown[]) => unknown;
+    toggleRewritesModal: (...args: unknown[]) => unknown;
+}
+
+class Table extends Component<TableProps> {
+    cellWrap = ({ value }: any) => (
         <div className="logs__row o-hidden">
             <span className="logs__text" title={value}>
                 {value}
@@ -33,7 +46,7 @@ class Table extends Component {
             maxWidth: 100,
             sortable: false,
             resizable: false,
-            Cell: (value) => {
+            Cell: (value: any) => {
                 const currentRewrite = {
                     answer: value.row.answer,
                     domain: value.row.domain,
@@ -51,8 +64,7 @@ class Table extends Component {
                                 });
                             }}
                             disabled={this.props.processingUpdate}
-                            title={this.props.t('edit_table_action')}
+                            title={this.props.t('edit_table_action')}>
-                        >
                             <svg className="icons icon12">
                                 <use xlinkHref="#edit" />
                             </svg>
@@ -62,8 +74,7 @@ class Table extends Component {
                             type="button"
                             className="btn btn-icon btn-outline-secondary btn-sm"
                             onClick={() => this.props.handleDelete(currentRewrite)}
-                            title={this.props.t('delete_table_action')}
+                            title={this.props.t('delete_table_action')}>
-                        >
                             <svg className="icons">
                                 <use xlinkHref="#delete" />
                             </svg>
@@ -75,9 +86,7 @@ class Table extends Component {
     ];
 
     render() {
-        const {
+        const { t, list, processing, processingAdd, processingDelete } = this.props;
-            t, list, processing, processingAdd, processingDelete,
-        } = this.props;
 
         return (
             <ReactTable
@@ -87,7 +96,9 @@ class Table extends Component {
                 className="-striped -highlight card-table-overflow"
                 showPagination
                 defaultPageSize={LocalStorageHelper.getItem(LOCAL_STORAGE_KEYS.REWRITES_PAGE_SIZE) || 10}
-                onPageSizeChange={(size) => LocalStorageHelper.setItem(LOCAL_STORAGE_KEYS.REWRITES_PAGE_SIZE, size)}
+                onPageSizeChange={(size: any) =>
+                    LocalStorageHelper.setItem(LOCAL_STORAGE_KEYS.REWRITES_PAGE_SIZE, size)
+                }
                 minRows={TABLES_MIN_ROWS}
                 ofText="/"
                 previousText={t('previous_btn')}
@@ -101,15 +112,4 @@ class Table extends Component {
     }
 }
 
-Table.propTypes = {
-    t: PropTypes.func.isRequired,
-    list: PropTypes.array.isRequired,
-    processing: PropTypes.bool.isRequired,
-    processingAdd: PropTypes.bool.isRequired,
-    processingDelete: PropTypes.bool.isRequired,
-    processingUpdate: PropTypes.bool.isRequired,
-    handleDelete: PropTypes.func.isRequired,
-    toggleRewritesModal: PropTypes.func.isRequired,
-};
-
 export default withTranslation()(Table);