*: merge with master

client/src/helpers/constants.js

@@ -31,117 +31,6 @@ export const REPOSITORY = {
 
 export const PRIVACY_POLICY_LINK = 'https://adguard.com/privacy/home.html';
 
-export const LANGUAGES = [
-    {
-        key: 'da',
-        name: 'Dansk',
-    },
-    {
-        key: 'de',
-        name: 'Deutsch',
-    },
-    {
-        key: 'nl',
-        name: 'Dutch',
-    },
-    {
-        key: 'en',
-        name: 'English',
-    },
-    {
-        key: 'es',
-        name: 'Español',
-    },
-    {
-        key: 'fr',
-        name: 'Français',
-    },
-    {
-        key: 'id',
-        name: 'Indonesian',
-    },
-    {
-        key: 'it',
-        name: 'Italiano',
-    },
-    {
-        key: 'pl',
-        name: 'Polski',
-    },
-    {
-        key: 'pt-br',
-        name: 'Portuguese (BR)',
-    },
-    {
-        key: 'pt-pt',
-        name: 'Portuguese (PT)',
-    },
-    {
-        key: 'sk',
-        name: 'Slovenčina',
-    },
-    {
-        key: 'sl',
-        name: 'Slovenščina',
-    },
-    {
-        key: 'sv',
-        name: 'Svenska',
-    },
-    {
-        key: 'vi',
-        name: 'Tiếng Việt',
-    },
-    {
-        key: 'tr',
-        name: 'Türkçe',
-    },
-    {
-        key: 'cs',
-        name: 'Český',
-    },
-    {
-        key: 'bg',
-        name: 'Български',
-    },
-    {
-        key: 'ru',
-        name: 'Русский',
-    },
-    {
-        key: 'ja',
-        name: '日本語',
-    },
-    {
-        key: 'zh-tw',
-        name: '正體中文',
-    },
-    {
-        key: 'zh-cn',
-        name: '简体中文',
-    },
-    {
-        key: 'no',
-        name: 'Norsk',
-    },
-    {
-        key: 'sr-cs',
-        name: 'Srpski',
-    },
-    {
-        key: 'hr',
-        name: 'Hrvatski',
-    },
-    {
-        key: 'fa',
-        name: 'فارسی',
-    },
-    {
-        key: 'ko',
-        name: '한국어',
-    },
-];
-
 export const INSTALL_FIRST_STEP = 1;
 export const INSTALL_TOTAL_STEPS = 5;
 

client/src/helpers/helpers.js

@@ -122,17 +122,6 @@ export const addClientInfo = (data, clients, param) => (
     })
 );
 
-export const addClientStatus = (data, disallowedClients, param) => (
-    data.map((row) => {
-        const clientIp = row[param];
-        const blocked = !!(disallowedClients && disallowedClients.includes(clientIp));
-        return {
-            ...row,
-            blocked,
-        };
-    })
-);
-
 export const normalizeFilteringStatus = (filteringStatus) => {
     const {
         enabled, filters, user_rules: userRules, interval,

client/src/helpers/trackers/adguard.json

@@ -96,6 +96,11 @@
             "name": "Microsoft Azure",
             "categoryId": 10,
             "url": "https://azure.microsoft.com/"
+        },
+        "button": {
+            "name": "Button",
+            "categoryId": 4,
+            "url": "https://www.usebutton.com/"
         }
     },
     "trackerDomains": {
@@ -119,6 +124,7 @@
         "edgecastcdn.net": "markmonitor",
         "appcenter.ms": "appcenter",
         "unityads.unity3d.com": "unity_ads",
-        "azure.com": "azure"
+        "azure.com": "azure",
+        "bttn.io": "button"
     }
 }

client/src/helpers/trackers/whotracksme.json

@@ -696,11 +696,6 @@
             "categoryId": 4,
             "url": "http://adgoto.com/"
         },
-        "adguard": {
-            "name": "Adguard",
-            "categoryId": 12,
-            "url": "https://adguard.com/"
-        },
         "adhands": {
             "name": "AdHands",
             "categoryId": 4,
@@ -16201,7 +16196,6 @@
         "smartredirect.de": "adgoal",
         "adgorithms.com": "adgorithms",
         "adgoto.com": "adgoto",
-        "adguard.com": "adguard",
         "adhands.ru": "adhands",
         "adhese.be": "adhese",
         "adhese.com": "adhese",

client/src/helpers/twosky.js

@@ -0,0 +1,6 @@
+import twosky from 'MainRoot/.twosky.json';
+
+export const {
+    languages: LANGUAGES,
+    base_locale: BASE_LOCALE,
+} = twosky[0];