From eb815532295396f79dba55a3e82d96a6efe41e31 Mon Sep 17 00:00:00 2001
From: svetlagasheva <svetulka_24@mail.bg>
Date: Tue, 10 Dec 2019 18:55:48 +0200
Subject: [PATCH 01/28] eslint added

---
 .eslintrc.js |  85 +++++++++++++
 package.json |   5 +-
 yarn.lock    | 350 +++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 426 insertions(+), 14 deletions(-)
 create mode 100644 .eslintrc.js

diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..f7747c8ab
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,85 @@
+module.exports = {
+    "extends": [
+        "eslint:recommended",
+        "plugin:react/recommended"
+    ],
+    "rules": {
+        "arrow-parens": "error",
+        "arrow-spacing": "error",
+        "block-spacing": "error",
+        "comma-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "eol-last": [
+            "error",
+            "always"
+        ],
+        "eqeqeq": [
+            "error",
+            "always"
+        ],
+        "func-call-spacing": [
+            "error",
+            "never"
+        ],
+        "indent": [
+            "error",
+            4,
+            {
+                "SwitchCase": 1
+            }
+        ],
+        "no-console": [
+            "error",
+            {
+                allow: ["error"]
+            }
+        ],
+        "no-extra-semi": "error",
+        "no-eq-null": "error",
+        "no-multi-spaces": "error",
+        "no-multiple-empty-lines": [
+            "error",
+            {
+                "max": 2
+            }
+        ],
+        "no-template-curly-in-string": "error",
+        "no-trailing-spaces": "error",
+        "no-useless-concat": "error",
+        "no-unreachable": "error",
+        "prefer-const": "error",
+        "quotes": [
+            "warn",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "semi-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "space-before-blocks": "error",
+        "valid-typeof": "error"
+    },
+    "env": {
+        "node": true,
+        "browser": true,
+        "es6": true
+    },
+    "parserOptions": {
+        "ecmaVersion": 9,
+        "ecmaFeatures": {
+            "experimentalObjectRestSpread": true
+        }
+    }
+}
diff --git a/package.json b/package.json
index da4427714..85d2ae48a 100755
--- a/package.json
+++ b/package.json
@@ -10,11 +10,14 @@
         "start": "webpack-dev-server --mode development",
         "build": "webpack --mode production",
         "storybook": "start-storybook --ci --config-dir ./storybook --static-dir ./ --port 6060",
-        "test": "jest"
+        "test": "jest",
+        "lint": "eslint src"
     },
     "dependencies": {
         "a-color-picker": "1.2.1",
         "classnames": "2.2.6",
+        "eslint": "^6.7.2",
+        "eslint-plugin-react": "^7.17.0",
         "events": "1.1.1",
         "hat": "0.0.3",
         "lodash.debounce": "4.0.8",
diff --git a/yarn.lock b/yarn.lock
index 31faaf37c..07e5dd3cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2046,6 +2046,11 @@ acorn-globals@^4.1.0:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
+acorn-jsx@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
+  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
+
 acorn-walk@^6.0.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
@@ -2061,6 +2066,11 @@ acorn@^6.0.1, acorn@^6.2.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
   integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
 
+acorn@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
+  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+
 address@1.1.2, address@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
@@ -2107,7 +2117,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
   version "6.10.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
   integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
@@ -2139,6 +2149,13 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
+ansi-escapes@^4.2.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d"
+  integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==
+  dependencies:
+    type-fest "^0.8.1"
+
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -2159,6 +2176,11 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -3167,7 +3189,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3298,6 +3320,13 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
 cli-table3@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
@@ -3711,7 +3740,7 @@ create-react-context@^0.3.0:
     gud "^1.0.0"
     warning "^4.0.3"
 
-cross-spawn@6.0.5, cross-spawn@^6.0.0:
+cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -3976,7 +4005,7 @@ debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -4188,6 +4217,13 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
+  dependencies:
+    esutils "^2.0.2"
+
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -4369,6 +4405,11 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -4501,6 +4542,27 @@ escodegen@^1.9.1:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-plugin-eslint-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"
+  integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==
+
+eslint-plugin-react@^7.17.0:
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7"
+  integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==
+  dependencies:
+    array-includes "^3.0.3"
+    doctrine "^2.1.0"
+    eslint-plugin-eslint-plugin "^2.1.0"
+    has "^1.0.3"
+    jsx-ast-utils "^2.2.3"
+    object.entries "^1.1.0"
+    object.fromentries "^2.0.1"
+    object.values "^1.1.0"
+    prop-types "^15.7.2"
+    resolve "^1.13.1"
+
 eslint-scope@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@@ -4509,6 +4571,78 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-scope@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
+  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-visitor-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+
+eslint@^6.7.2:
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"
+  integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.10.0"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^1.4.3"
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.1.2"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.0.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    inquirer "^7.0.0"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.14"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.3"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^6.1.2"
+    strip-ansi "^5.2.0"
+    strip-json-comments "^3.0.1"
+    table "^5.2.3"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+espree@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
+  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
+  dependencies:
+    acorn "^7.1.0"
+    acorn-jsx "^5.1.0"
+    eslint-visitor-keys "^1.1.0"
+
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -4519,6 +4653,13 @@ esprima@^4.0.0, esprima@~4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
+esquery@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
+  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  dependencies:
+    estraverse "^4.0.0"
+
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -4526,7 +4667,7 @@ esrecurse@^4.1.0:
   dependencies:
     estraverse "^4.1.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -4808,6 +4949,20 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+figures@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec"
+  integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  dependencies:
+    flat-cache "^2.0.1"
+
 file-loader@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
@@ -4908,6 +5063,20 @@ findup-sync@3.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  dependencies:
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
+
+flatted@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
+  integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+
 flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
@@ -5075,6 +5244,11 @@ function.prototype.name@^1.1.0:
     functions-have-names "^1.1.1"
     is-callable "^1.1.4"
 
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
 functions-have-names@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.0.tgz#83da7583e4ea0c9ac5ff530f73394b033e0bf77d"
@@ -5141,6 +5315,13 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-parent@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
+  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -5207,6 +5388,13 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^12.1.0:
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13"
+  integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==
+  dependencies:
+    type-fest "^0.8.1"
+
 globalthis@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.0.tgz#c5fb98213a9b4595f59cf3e7074f141b4169daae"
@@ -5661,6 +5849,11 @@ ignore@^3.3.5:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
   integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
+ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
@@ -5686,7 +5879,7 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-fresh@^3.1.0:
+import-fresh@^3.0.0, import-fresh@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
   integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
@@ -5795,6 +5988,25 @@ inquirer@^6.2.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
+inquirer@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a"
+  integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^2.4.2"
+    cli-cursor "^3.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^4.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
 internal-ip@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -6012,6 +6224,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-function@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
@@ -6692,6 +6909,11 @@ json-schema@0.2.3:
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
   integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -6745,6 +6967,14 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jsx-ast-utils@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"
+  integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==
+  dependencies:
+    array-includes "^3.0.3"
+    object.assign "^4.1.0"
+
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -6856,7 +7086,7 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levn@~0.3.0:
+levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
   integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
@@ -7199,7 +7429,7 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.0.0:
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -7390,6 +7620,11 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 nan@^2.12.1:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
@@ -7709,7 +7944,7 @@ object.entries@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-"object.fromentries@^2.0.0 || ^1.0.0":
+"object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
   integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==
@@ -7775,6 +8010,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
 open@^6.1.0, open@^6.3.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
@@ -7797,7 +8039,7 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optionator@^0.8.1:
+optionator@^0.8.1, optionator@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -8638,6 +8880,11 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -9219,6 +9466,11 @@ regexp.prototype.flags@^1.2.0:
   dependencies:
     define-properties "^1.1.2"
 
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
 regexpu-core@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
@@ -9381,7 +9633,7 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.8.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
   integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
@@ -9396,6 +9648,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -9416,6 +9676,13 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
+rimraf@2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -9551,7 +9818,7 @@ selfsigned@^1.10.7:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -9755,6 +10022,15 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+  dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.0.0"
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -10077,6 +10353,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
 "string.prototype.matchall@^4.0.0 || ^3.0.1":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.0.tgz#47191e37b67dca43131706bc9c4550df31b2c471"
@@ -10157,6 +10442,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -10167,6 +10459,11 @@ strip-eof@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
+strip-json-comments@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
+  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -10245,6 +10542,16 @@ symbol.prototype.description@^1.0.0:
     es-abstract "^1.16.0"
     has-symbols "^1.0.0"
 
+table@^5.2.3:
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+  dependencies:
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
+
 tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
@@ -10332,7 +10639,7 @@ test-exclude@^5.2.3:
     read-pkg-up "^4.0.0"
     require-main-filename "^2.0.0"
 
-text-table@0.2.0:
+text-table@0.2.0, text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
@@ -10506,6 +10813,11 @@ type-fest@^0.3.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
   integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
 
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -10742,6 +11054,11 @@ v8-compile-cache@2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
   integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
 
+v8-compile-cache@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
+  integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -11080,6 +11397,13 @@ write-file-atomic@2.4.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
 ws@^5.2.0:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"

From 78f7d614e4154c83585b73b8bc6a1fe8f157a136 Mon Sep 17 00:00:00 2001
From: svetlagasheva <svetulka_24@mail.bg>
Date: Wed, 11 Dec 2019 11:10:51 +0200
Subject: [PATCH 02/28] disable react/prop-types rule

---
 .eslintrc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index f7747c8ab..1fd52540f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -52,11 +52,13 @@ module.exports = {
         "no-trailing-spaces": "error",
         "no-useless-concat": "error",
         "no-unreachable": "error",
+        "no-unused-vars": "error",
         "prefer-const": "error",
         "quotes": [
             "warn",
             "single"
         ],
+        "react/prop-types": 0,
         "semi": [
             "error",
             "always"

From d5de64fc05743332351f933650397246fad256fa Mon Sep 17 00:00:00 2001
From: svetlagasheva <svetulka_24@mail.bg>
Date: Thu, 12 Dec 2019 11:41:24 +0200
Subject: [PATCH 03/28] linter overrides added

---
 .eslintrc.js | 61 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 1fd52540f..cf07f3159 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,6 +3,11 @@ module.exports = {
         "eslint:recommended",
         "plugin:react/recommended"
     ],
+    "globals": {
+        "YT": "readonly",
+        "FB": "readonly"
+    },
+    "ignorePatterns": ["src/routes/Settings/**", "src/routes/Player/**", "src/video/**"],
     "rules": {
         "arrow-parens": "error",
         "arrow-spacing": "error",
@@ -58,7 +63,6 @@ module.exports = {
             "warn",
             "single"
         ],
-        "react/prop-types": 0,
         "semi": [
             "error",
             "always"
@@ -71,7 +75,8 @@ module.exports = {
             }
         ],
         "space-before-blocks": "error",
-        "valid-typeof": "error"
+        "valid-typeof": "error",
+        "react/no-unescaped-entities": 0
     },
     "env": {
         "node": true,
@@ -83,5 +88,55 @@ module.exports = {
         "ecmaFeatures": {
             "experimentalObjectRestSpread": true
         }
-    }
+    },
+    "overrides": [
+        {
+            "files": [
+                "src/common/Button/Button.js",
+                "src/common/Checkbox/Checkbox.js",
+                "src/common/ColorInput/ColorInput.js",
+                "src/common/Image/Image.js",
+                "src/common/MetaItem/MetaItem.js",
+                "src/common/Multiselect/Multiselect.js",
+                "src/common/TextInput/TextInput.js",
+                "src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js",
+                "src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js",
+                "src/common/PaginationInput/PaginationInput.js"
+            ],
+            "rules": {
+                "react/prop-types": 0,
+            }
+        },
+        {
+            "files": [
+                "src/routes/Intro/Intro.js",
+                "src/routes/Addons/useAddons.js",
+                "src/routes/Board/useItemOptions.js",
+                "src/common/NavBar/NavMenu/NavMenu.js",
+                "src/routes/Library/useItemOptions.js",
+                "src/common/Multiselect/Multiselect.js",
+                "src/common/NavBar/NotificationsMenu/NotificationsMenu.js"
+            ],
+            "rules": {
+                "no-unused-vars": "off"
+            }
+        },
+        {
+            "files": [
+                "src/common/NavBar/NavMenu/NavMenu.js"
+            ],
+            "rules": {
+                "quotes": "off"
+            }
+        },
+        {
+            "files": [
+                "src/services/Shell/Shell.js",
+                "src/services/Core/Core.js"
+            ],
+            "rules": {
+                "prefer-const": "off"
+            }
+        }
+    ]
 }

From 41415f895dc0ecadf31955c8770258a310b9bb7d Mon Sep 17 00:00:00 2001
From: svetlagasheva <svetulka_24@mail.bg>
Date: Thu, 12 Dec 2019 11:43:32 +0200
Subject: [PATCH 04/28] fix files according to linter rules

---
 src/common/MainNavBar/MainNavBar.js                  |  2 ++
 src/common/ModalDialog/index.js                      |  2 +-
 .../NotificationsList/Notification/Notification.js   |  2 +-
 .../NotificationPlaceholder.js                       |  3 +--
 .../NotificationsList/NotificationsList.js           |  2 +-
 src/common/PaginationInput/index.js                  |  2 +-
 src/common/Popup/Popup.js                            |  2 +-
 src/common/routesRegexp.js                           | 10 +++++-----
 src/router/Router/Router.js                          |  2 +-
 src/routes/Addons/Addon/Addon.js                     |  3 +--
 src/routes/Addons/Addons.js                          |  6 ++++++
 src/routes/Board/Board.js                            |  9 ++++++---
 src/routes/Discover/Discover.js                      |  6 ++++++
 src/routes/Intro/Intro.js                            | 12 ++++++++++--
 src/routes/Library/Library.js                        |  8 +++++++-
 src/routes/Library/useItemOptions.js                 |  2 +-
 src/routes/Library/useLibrary.js                     |  2 +-
 src/routes/MetaDetails/MetaDetails.js                |  5 +++++
 src/routes/MetaDetails/StreamsList/StreamsList.js    |  2 +-
 src/routes/Search/Search.js                          |  7 ++++++-
 src/services/Core/Core.js                            |  2 +-
 .../KeyboardNavigation/KeyboardNavigation.js         |  2 +-
 src/services/ServicesContext/index.js                |  2 +-
 src/services/Shell/Shell.js                          |  2 +-
 24 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/src/common/MainNavBar/MainNavBar.js b/src/common/MainNavBar/MainNavBar.js
index c6920ce42..507f8d229 100644
--- a/src/common/MainNavBar/MainNavBar.js
+++ b/src/common/MainNavBar/MainNavBar.js
@@ -23,6 +23,8 @@ const MainNavBar = React.memo(({ className }) => {
     );
 });
 
+MainNavBar.displayName = 'MainNavBar';
+
 MainNavBar.propTypes = {
     className: PropTypes.string
 };
diff --git a/src/common/ModalDialog/index.js b/src/common/ModalDialog/index.js
index 7dadbbd9e..6717dbe87 100644
--- a/src/common/ModalDialog/index.js
+++ b/src/common/ModalDialog/index.js
@@ -1,3 +1,3 @@
 const ModalDialog = require('./ModalDialog');
 
-module.exports = ModalDialog;
\ No newline at end of file
+module.exports = ModalDialog;
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/Notification/Notification.js b/src/common/NavBar/NotificationsMenu/NotificationsList/Notification/Notification.js
index 53c7b0e81..8bba1d435 100644
--- a/src/common/NavBar/NotificationsMenu/NotificationsList/Notification/Notification.js
+++ b/src/common/NavBar/NotificationsMenu/NotificationsList/Notification/Notification.js
@@ -80,7 +80,7 @@ const Notification = ({ className, id, type, name, poster, thumbnail, season, ep
             }
         </Button>
     );
-}
+};
 
 Notification.propTypes = {
     className: PropTypes.string,
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/NotificationPlaceholder.js b/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/NotificationPlaceholder.js
index 3bbac1538..0ee602b64 100644
--- a/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/NotificationPlaceholder.js
+++ b/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/NotificationPlaceholder.js
@@ -1,7 +1,6 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
-const Icon = require('stremio-icons/dom');
 const styles = require('./styles');
 
 const NotificationPlaceholder = ({ className }) => {
@@ -20,6 +19,6 @@ const NotificationPlaceholder = ({ className }) => {
 
 NotificationPlaceholder.propTypes = {
     className: PropTypes.string
-}
+};
 
 module.exports = NotificationPlaceholder;
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationsList.js b/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationsList.js
index e54bacb68..3fca82728 100644
--- a/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationsList.js
+++ b/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationsList.js
@@ -57,7 +57,7 @@ const NotificationsList = ({ className, metaItems }) => {
             }
         </div>
     );
-}
+};
 
 NotificationsList.propTypes = {
     className: PropTypes.string,
diff --git a/src/common/PaginationInput/index.js b/src/common/PaginationInput/index.js
index 99f9edf62..4500ec5a6 100644
--- a/src/common/PaginationInput/index.js
+++ b/src/common/PaginationInput/index.js
@@ -1,3 +1,3 @@
 const PaginationInput = require('./PaginationInput');
 
-module.exports = PaginationInput;
\ No newline at end of file
+module.exports = PaginationInput;
diff --git a/src/common/Popup/Popup.js b/src/common/Popup/Popup.js
index d0b26fa03..b956f764f 100644
--- a/src/common/Popup/Popup.js
+++ b/src/common/Popup/Popup.js
@@ -96,7 +96,7 @@ const Popup = ({ open, direction, renderLabel, renderMenu, dataset, onCloseReque
             :
             null
     });
-}
+};
 
 Popup.propTypes = {
     open: PropTypes.bool,
diff --git a/src/common/routesRegexp.js b/src/common/routesRegexp.js
index df7f4e069..113497ec5 100644
--- a/src/common/routesRegexp.js
+++ b/src/common/routesRegexp.js
@@ -8,11 +8,11 @@ const routesRegexp = {
         urlParamsNames: []
     },
     discover: {
-        regexp: /^\/discover(?:\/([^\/]*)\/([^\/]*)\/([^\/]*))?$/,
+        regexp: /^\/discover(?:\/([^/]*)\/([^/]*)\/([^/]*))?$/,
         urlParamsNames: ['addonTransportUrl', 'type', 'catalogId']
     },
     library: {
-        regexp: /^\/library(?:\/([^\/]*))?$/,
+        regexp: /^\/library(?:\/([^/]*))?$/,
         urlParamsNames: ['type']
     },
     search: {
@@ -20,11 +20,11 @@ const routesRegexp = {
         urlParamsNames: []
     },
     metadetails: {
-        regexp: /^\/metadetails\/([^\/]*)\/([^\/]*)(?:\/([^\/]*))?$/,
+        regexp: /^\/metadetails\/([^/]*)\/([^/]*)(?:\/([^/]*))?$/,
         urlParamsNames: ['type', 'id', 'videoId']
     },
     addons: {
-        regexp: /^\/addons(?:\/([^\/]*)\/([^\/]*)\/([^\/]*))?$/,
+        regexp: /^\/addons(?:\/([^/]*)\/([^/]*)\/([^/]*))?$/,
         urlParamsNames: ['addonTransportUrl', 'catalogId', 'type']
     },
     settings: {
@@ -32,7 +32,7 @@ const routesRegexp = {
         urlParamsNames: []
     },
     player: {
-        regexp: /^\/player\/([^\/]*)\/([^\/]*)\/([^\/]*)\/([^\/]*)$/,
+        regexp: /^\/player\/([^/]*)\/([^/]*)\/([^/]*)\/([^/]*)$/,
         urlParamsNames: ['type', 'id', 'videoId', 'stream']
     }
 };
diff --git a/src/router/Router/Router.js b/src/router/Router/Router.js
index dd8321e70..60fc0334b 100644
--- a/src/router/Router/Router.js
+++ b/src/router/Router/Router.js
@@ -95,7 +95,7 @@ const Router = ({ className, onPathNotMatch, ...props }) => {
         <div className={classnames(className, 'routes-container')}>
             {
                 views
-                    .filter(view => view !== null)
+                    .filter((view) => view !== null)
                     .map(({ key, component, urlParams, queryParams }, index, views) => (
                         <RouteFocusedProvider key={key} value={index === views.length - 1}>
                             <Route>
diff --git a/src/routes/Addons/Addon/Addon.js b/src/routes/Addons/Addon/Addon.js
index 023c17732..f26dbcf3b 100644
--- a/src/routes/Addons/Addon/Addon.js
+++ b/src/routes/Addons/Addon/Addon.js
@@ -5,7 +5,7 @@ const Icon = require('stremio-icons/dom');
 const { Button } = require('stremio/common');
 const styles = require('./styles');
 
-const Addon = ({ className, id, name, logo, description, types, version, transportUrl, installed, toggle, onShareButtonClicked }) => {
+const Addon = ({ className, id, name, logo, description, types, version, installed, toggle, onShareButtonClicked }) => {
     const onKeyUp = React.useCallback((event) => {
         if (event.key === 'Enter' && typeof toggle === 'function') {
             toggle(event);
@@ -72,7 +72,6 @@ Addon.propTypes = {
     description: PropTypes.string,
     types: PropTypes.arrayOf(PropTypes.string),
     version: PropTypes.string,
-    transportUrl: PropTypes.string,
     installed: PropTypes.bool,
     toggle: PropTypes.func,
     onShareButtonClicked: PropTypes.func
diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js
index 0a8152a17..cd68402df 100644
--- a/src/routes/Addons/Addons.js
+++ b/src/routes/Addons/Addons.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const Icon = require('stremio-icons/dom');
 const { Button, Multiselect, NavBar, TextInput, SharePrompt, ModalDialog } = require('stremio/common');
 const Addon = require('./Addon');
@@ -163,4 +164,9 @@ const Addons = ({ urlParams, queryParams }) => {
     );
 };
 
+Addons.propTypes = {
+    urlParams: PropTypes.instanceOf(URLSearchParams),
+    queryParams: PropTypes.instanceOf(URLSearchParams)
+};
+
 module.exports = Addons;
diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index 33b6638ae..47f293f45 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -32,7 +32,7 @@ const Board = () => {
                 {board.catalog_resources.map((catalog_resource, index) => {
                     const title = `${catalog_resource.addon_name} - ${catalog_resource.request.path.id} ${catalog_resource.request.path.type_name}`;
                     switch (catalog_resource.content.type) {
-                        case 'Ready':
+                        case 'Ready': {
                             return (
                                 <MetaRow
                                     key={index}
@@ -43,7 +43,8 @@ const Board = () => {
                                     limit={10}
                                 />
                             );
-                        case 'Err':
+                        }
+                        case 'Err': {
                             const message = `Error(${catalog_resource.content.content.type})${typeof catalog_resource.content.content.content === 'string' ? ` - ${catalog_resource.content.content.content}` : ''}`;
                             return (
                                 <MetaRow
@@ -54,7 +55,8 @@ const Board = () => {
                                     limit={10}
                                 />
                             );
-                        case 'Loading':
+                        }
+                        case 'Loading': {
                             return (
                                 <MetaRow.Placeholder
                                     key={index}
@@ -63,6 +65,7 @@ const Board = () => {
                                     limit={10}
                                 />
                             );
+                        }
                     }
                 })}
             </div>
diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js
index 0db14b05e..72baa410b 100644
--- a/src/routes/Discover/Discover.js
+++ b/src/routes/Discover/Discover.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Icon = require('stremio-icons/dom');
 const { Button, MainNavBar, MetaItem, MetaPreview, Multiselect, ModalDialog, PaginationInput, useBinaryState } = require('stremio/common');
@@ -135,4 +136,9 @@ const Discover = ({ urlParams, queryParams }) => {
     );
 };
 
+Discover.propTypes = {
+    urlParams: PropTypes.instanceOf(URLSearchParams),
+    queryParams: PropTypes.instanceOf(URLSearchParams)
+};
+
 module.exports = Discover;
diff --git a/src/routes/Intro/Intro.js b/src/routes/Intro/Intro.js
index 6b05700ab..8f4959499 100644
--- a/src/routes/Intro/Intro.js
+++ b/src/routes/Intro/Intro.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Icon = require('stremio-icons/dom');
 const { useRouteFocused } = require('stremio-router');
@@ -73,14 +74,17 @@ const Intro = ({ queryParams }) => {
     React.useEffect(() => {
         const onEvent = ({ event, args }) => {
             switch (event) {
-                case 'CtxActionErr':
+                case 'CtxActionErr': {
                     const [_action, error] = args;
                     dispatch({ type: 'error', error: error.args.message });
-                case 'CtxChanged':
+                    break;
+                }
+                case 'CtxChanged': {
                     const state = core.getState();
                     if (state.ctx.content.auth !== null) {
                         window.location.replace('#/');
                     }
+                }
             }
         };
         if (routeFocused) {
@@ -343,4 +347,8 @@ const Intro = ({ queryParams }) => {
     );
 };
 
+Intro.propTypes = {
+    queryParams: PropTypes.instanceOf(URLSearchParams)
+};
+
 module.exports = Intro;
diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index 0f3013cfb..3de671136 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const { Button, Multiselect, MainNavBar, MetaItem } = require('stremio/common');
 const useLibrary = require('./useLibrary');
@@ -67,6 +68,11 @@ const Library = ({ urlParams, queryParams }) => {
             </div>
         </div>
     );
-}
+};
+
+Library.propTypes = {
+    urlParams: PropTypes.instanceOf(URLSearchParams),
+    queryParams: PropTypes.instanceOf(URLSearchParams)
+};
 
 module.exports = Library;
diff --git a/src/routes/Library/useItemOptions.js b/src/routes/Library/useItemOptions.js
index 870c14936..37edcd1a1 100644
--- a/src/routes/Library/useItemOptions.js
+++ b/src/routes/Library/useItemOptions.js
@@ -10,7 +10,7 @@ const DISMISS_OPTION = {
     value: 'dismiss'
 };
 
-const onSelect = (event) => {
+const onSelect = (_event) => {
     // TODO {{event.value}} {{event.dataset}}
 };
 
diff --git a/src/routes/Library/useLibrary.js b/src/routes/Library/useLibrary.js
index 4acaa6e78..b2426e055 100644
--- a/src/routes/Library/useLibrary.js
+++ b/src/routes/Library/useLibrary.js
@@ -90,6 +90,6 @@ const useLibrary = (urlParams, queryParams) => {
         init: initLibraryState,
         onNewState: onNewLibraryState
     });
-}
+};
 
 module.exports = useLibrary;
diff --git a/src/routes/MetaDetails/MetaDetails.js b/src/routes/MetaDetails/MetaDetails.js
index a19227a6c..16417e77a 100644
--- a/src/routes/MetaDetails/MetaDetails.js
+++ b/src/routes/MetaDetails/MetaDetails.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const { NavBar, MetaPreview, useInLibrary } = require('stremio/common');
 const VideosList = require('./VideosList');
 const StreamsList = require('./StreamsList');
@@ -98,4 +99,8 @@ const MetaDetails = ({ urlParams }) => {
     );
 };
 
+MetaDetails.propTypes = {
+    urlParams: PropTypes.instanceOf(URLSearchParams)
+};
+
 module.exports = MetaDetails;
diff --git a/src/routes/MetaDetails/StreamsList/StreamsList.js b/src/routes/MetaDetails/StreamsList/StreamsList.js
index 01163b29a..2e0f8de86 100644
--- a/src/routes/MetaDetails/StreamsList/StreamsList.js
+++ b/src/routes/MetaDetails/StreamsList/StreamsList.js
@@ -44,7 +44,7 @@ const StreamsList = ({ className, streamsResources }) => {
             </Button>
         </div>
     );
-}
+};
 
 StreamsList.propTypes = {
     className: PropTypes.string,
diff --git a/src/routes/Search/Search.js b/src/routes/Search/Search.js
index f76ea5c05..a860bce47 100644
--- a/src/routes/Search/Search.js
+++ b/src/routes/Search/Search.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const Icon = require('stremio-icons/dom');
 const { MainNavBar, MetaRow } = require('stremio/common');
 const useSearch = require('./useSearch');
@@ -68,6 +69,10 @@ const Search = ({ queryParams }) => {
             </div>
         </div>
     );
-}
+};
+
+Search.propTypes = {
+    queryParams: PropTypes.instanceOf(URLSearchParams)
+};
 
 module.exports = Search;
diff --git a/src/services/Core/Core.js b/src/services/Core/Core.js
index dc0c48894..cbb741f3c 100644
--- a/src/services/Core/Core.js
+++ b/src/services/Core/Core.js
@@ -96,6 +96,6 @@ function Core() {
     this.getState = getState;
 
     Object.freeze(this);
-};
+}
 
 module.exports = Core;
diff --git a/src/services/KeyboardNavigation/KeyboardNavigation.js b/src/services/KeyboardNavigation/KeyboardNavigation.js
index 4dc1586f5..bd46169d2 100644
--- a/src/services/KeyboardNavigation/KeyboardNavigation.js
+++ b/src/services/KeyboardNavigation/KeyboardNavigation.js
@@ -41,6 +41,6 @@ function KeyboardNavigation() {
     this.stop = stop;
 
     Object.freeze(this);
-};
+}
 
 module.exports = KeyboardNavigation;
diff --git a/src/services/ServicesContext/index.js b/src/services/ServicesContext/index.js
index 95c276ac2..d61874550 100644
--- a/src/services/ServicesContext/index.js
+++ b/src/services/ServicesContext/index.js
@@ -4,4 +4,4 @@ const useServices = require('./useServices');
 module.exports = {
     ServicesProvider,
     useServices
-};
\ No newline at end of file
+};
diff --git a/src/services/Shell/Shell.js b/src/services/Shell/Shell.js
index efc3613ff..f1ae8bbb4 100644
--- a/src/services/Shell/Shell.js
+++ b/src/services/Shell/Shell.js
@@ -66,6 +66,6 @@ function Shell() {
     this.dispatch = dispatch;
 
     Object.freeze(this);
-};
+}
 
 module.exports = Shell;

From b2bfcee2f82b5b879a7267236faebf405d66998b Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Thu, 12 Dec 2019 18:34:25 +0200
Subject: [PATCH 05/28] useInLibrary hook linked with the core

---
 src/common/useInLibrary.js            | 64 +++++++++++++++++++++++----
 src/routes/MetaDetails/MetaDetails.js | 15 ++++++-
 2 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/src/common/useInLibrary.js b/src/common/useInLibrary.js
index 2f595ed15..f9de835c0 100644
--- a/src/common/useInLibrary.js
+++ b/src/common/useInLibrary.js
@@ -1,12 +1,60 @@
-const useBinaryState = require('stremio/common/useBinaryState');
+const React = require('react');
+const { useServices } = require('stremio/services');
+const useModelState = require('stremio/common/useModelState');
 
-const useInLibrary = (id) => {
-    const [inLibrary, addToLibrary, removeFromLibrary, toggleInLibrary] = useBinaryState(false);
-    if (typeof id === 'string') {
-        return [inLibrary, addToLibrary, removeFromLibrary, toggleInLibrary];
-    } else {
-        return [false, null, null, null];
-    }
+const useInLibrary = (metaItem) => {
+    const { core } = useServices();
+    const initLibraryItemsState = React.useCallback(() => {
+        return core.getState('library_items');
+    }, []);
+    const libraryItems = useModelState({
+        model: 'library_items',
+        init: initLibraryItemsState
+    });
+    const addToLibrary = React.useCallback((metaItem) => {
+        core.dispatch({
+            action: 'UserOp',
+            args: {
+                userOp: 'AddToLibrary',
+                args: {
+                    meta_item: metaItem,
+                    now: new Date()
+                }
+            }
+        });
+    }, []);
+    const removeFromLibrary = React.useCallback((id) => {
+        core.dispatch({
+            action: 'UserOp',
+            args: {
+                userOp: 'RemoveFromLibrary',
+                args: {
+                    id,
+                    now: new Date()
+                }
+            }
+        });
+    }, []);
+    const inLibrary = React.useMemo(() => {
+        return typeof metaItem === 'object' && metaItem !== null ?
+            libraryItems.ids.includes(metaItem.id)
+            :
+            false;
+    }, [metaItem, libraryItems]);
+    const toggleInLibrary = React.useMemo(() => {
+        if (typeof metaItem !== 'object' || metaItem === null) {
+            return null;
+        }
+
+        return () => {
+            if (inLibrary) {
+                removeFromLibrary(metaItem.id);
+            } else {
+                addToLibrary(metaItem);
+            }
+        };
+    }, [metaItem, inLibrary]);
+    return [inLibrary, toggleInLibrary];
 };
 
 module.exports = useInLibrary;
diff --git a/src/routes/MetaDetails/MetaDetails.js b/src/routes/MetaDetails/MetaDetails.js
index a19227a6c..a800ea1a7 100644
--- a/src/routes/MetaDetails/MetaDetails.js
+++ b/src/routes/MetaDetails/MetaDetails.js
@@ -11,7 +11,20 @@ const MetaDetails = ({ urlParams }) => {
     const [metaResourceRef, metaResources, selectedMetaResource] = useSelectableResource(metaDetails.selected.meta_resource_ref, metaDetails.meta_resources);
     const streamsResourceRef = metaDetails.selected.streams_resource_ref;
     const streamsResources = metaDetails.streams_resources;
-    const [inLibrary, , , toggleInLibrary] = useInLibrary(metaResourceRef !== null ? metaResourceRef.id : null);
+    const metaItem = React.useMemo(() => {
+        return selectedMetaResource !== null ?
+            selectedMetaResource.content.content
+            :
+            metaResourceRef !== null ?
+                {
+                    id: metaResourceRef.id,
+                    type: metaResourceRef.type_name,
+                    name: ''
+                }
+                :
+                null;
+    }, [metaResourceRef, selectedMetaResource]);
+    const [inLibrary, toggleInLibrary] = useInLibrary(metaItem);
     return (
         <div className={styles['metadetails-container']}>
             <NavBar

From ef1aa994d88f90812a67e36807abe4f1864bb016 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Fri, 13 Dec 2019 13:34:28 +0200
Subject: [PATCH 06/28] Addons screen ui adapted to changes in core

---
 src/routes/Addons/Addons.js              | 254 +++++++++++------------
 src/routes/Addons/styles.less            |  65 +++---
 src/routes/Addons/useAddons.js           |  25 ++-
 src/routes/Addons/useSelectableInputs.js |  18 +-
 4 files changed, 188 insertions(+), 174 deletions(-)

diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js
index 0a8152a17..6e47ee363 100644
--- a/src/routes/Addons/Addons.js
+++ b/src/routes/Addons/Addons.js
@@ -1,49 +1,69 @@
 const React = require('react');
 const Icon = require('stremio-icons/dom');
-const { Button, Multiselect, NavBar, TextInput, SharePrompt, ModalDialog } = require('stremio/common');
+const { Button, Multiselect, NavBar, TextInput, SharePrompt, ModalDialog, useBinaryState } = require('stremio/common');
 const Addon = require('./Addon');
-const AddonPrompt = require('./AddonPrompt');
 const useAddons = require('./useAddons');
-const useSelectedAddon = require('./useSelectedAddon');
+const useSelectableInputs = require('./useSelectableInputs');
 const styles = require('./styles');
 
 const Addons = ({ urlParams, queryParams }) => {
-    const inputRef = React.useRef(null);
-    const [query, setQuery] = React.useState('');
-    const queryOnChange = React.useCallback((event) => {
-        setQuery(event.currentTarget.value);
-    }, []);
-    const [[addons, dropdowns, setSelectedAddon, installedAddons, error], installSelectedAddon, uninstallSelectedAddon] = useAddons(urlParams, queryParams);
-    const [addAddonModalOpened, setAddAddonModalOpened] = React.useState(false);
-    const [selectedAddon, clearSelectedAddon] = useSelectedAddon(queryParams.get('addon'));
-    const [sharedAddon, setSharedAddon] = React.useState(null);
-    const onAddAddonButtonClicked = React.useCallback(() => {
-        setAddAddonModalOpened(true);
-    }, []);
-    const onAddButtonClicked = React.useCallback(() => {
-        if (inputRef.current.value.length > 0) {
-            setSelectedAddon(inputRef.current.value);
-            setAddAddonModalOpened(false);
+    const addons = useAddons(urlParams);
+    const selectInputs = useSelectableInputs(addons);
+    const [addAddonModalOpen, openAddAddonModal, closeAddAddonModal] = useBinaryState(false);
+    const addAddonUrlInputRef = React.useRef(null);
+    const addAddonOnSubmit = React.useCallback(() => {
+        if (addAddonUrlInputRef.current !== null) {
+            // TODO install addon
         }
-    }, [setSelectedAddon]);
-    const installedAddon = React.useCallback((currentAddon) => {
-        return installedAddons.some((installedAddon) => installedAddon.transportUrl === currentAddon.transportUrl);
-    }, [installedAddons]);
-    const toggleAddon = React.useCallback(() => {
-        installedAddon(selectedAddon) ? uninstallSelectedAddon(selectedAddon) : installSelectedAddon(selectedAddon);
-        clearSelectedAddon();
-    }, [selectedAddon]);
+    }, []);
+    const addAddonModalButtons = React.useMemo(() => {
+        return [
+            {
+                className: styles['cancel-button'],
+                label: 'Cancel',
+                props: {
+                    onClick: closeAddAddonModal
+                }
+            },
+            {
+                label: 'Add',
+                props: {
+                    onClick: addAddonOnSubmit
+                }
+            }
+        ];
+    }, []);
+    const [search, setSearch] = React.useState('');
+    const searchInputOnChange = React.useCallback((event) => {
+        setSearch(event.currentTarget.value);
+    }, []);
+    const [sharedTransportUrl, setSharedTransportUrl] = React.useState(null);
+    const shareModalOnClose = React.useCallback(() => {
+        setSharedTransportUrl(null);
+    }, []);
+    const onAddonShare = React.useCallback((event) => {
+        setSharedTransportUrl(event.dataset.transportUrl);
+    }, []);
+    React.useLayoutEffect(() => {
+        closeAddAddonModal(null);
+        setSearch('');
+        setSharedTransportUrl(null);
+    }, [urlParams, queryParams]);
     return (
         <div className={styles['addons-container']}>
             <NavBar className={styles['nav-bar']} backButton={true} title={'Addons'} />
             <div className={styles['addons-content']}>
-                <div className={styles['top-bar-container']}>
-                    <Button className={styles['add-button-container']} title={'Add addon'} onClick={onAddAddonButtonClicked}>
+                <div className={styles['selectable-inputs-container']}>
+                    <Button className={styles['add-button-container']} title={'Add addon'} onClick={openAddAddonModal}>
                         <Icon className={styles['icon']} icon={'ic_plus'} />
                         <div className={styles['add-button-label']}>Add addon</div>
                     </Button>
-                    {dropdowns.map((dropdown, index) => (
-                        <Multiselect {...dropdown} key={index} className={styles['dropdown']} />
+                    {selectInputs.map((selectInput, index) => (
+                        <Multiselect
+                            {...selectInput}
+                            key={index}
+                            className={styles['select-input-container']}
+                        />
                     ))}
                     <label className={styles['search-bar-container']}>
                         <Icon className={styles['icon']} icon={'ic_search'} />
@@ -51,114 +71,90 @@ const Addons = ({ urlParams, queryParams }) => {
                             className={styles['search-input']}
                             type={'text'}
                             placeholder={'Search addons...'}
-                            value={query}
-                            onChange={queryOnChange}
+                            value={search}
+                            onChange={searchInputOnChange}
                         />
                     </label>
                 </div>
-                <div className={styles['addons-list-container']}>
-                    {
-                        error !== null ?
+                {
+                    addons.selectable.catalogs.length === 0 && addons.catalog_resource === null ?
+                        <div className={styles['message-container']}>
+                            No addons
+                        </div>
+                        :
+                        addons.catalog_resource === null ?
                             <div className={styles['message-container']}>
-                                {error.type}{error.type === 'Other' ? ` - ${error.content}` : null}
+                                No select
                             </div>
                             :
-                            Array.isArray(addons) ?
-                                addons.filter((addon) => query.length === 0 ||
-                                    ((typeof addon.manifest.name === 'string' && addon.manifest.name.toLowerCase().includes(query.toLowerCase())) ||
-                                        (typeof addon.manifest.description === 'string' && addon.manifest.description.toLowerCase().includes(query.toLowerCase()))
-                                    ))
-                                    .map((addon, index) => (
-                                        <Addon
-                                            {...addon.manifest}
-                                            key={index}
-                                            installed={installedAddon(addon)}
-                                            className={styles['addon']}
-                                            toggle={() => setSelectedAddon(addon.transportUrl)}
-                                            onShareButtonClicked={() => setSharedAddon(addon)}
-                                        />
-                                    ))
-                                :
+                            addons.catalog_resource.content.type === 'Err' ?
                                 <div className={styles['message-container']}>
-                                    Loading
+                                    Addons could not be loaded
                                 </div>
-                    }
-                </div>
-                {
-                    addAddonModalOpened ?
-                        <ModalDialog
-                            className={styles['add-addon-prompt-container']}
-                            title={'Add addon'}
-                            buttons={[
-                                {
-                                    label: 'Cancel',
-                                    className: styles['cancel-button'],
-                                    props: {
-                                        title: 'Cancel',
-                                        onClick: () => setAddAddonModalOpened(false)
-                                    }
-                                },
-                                {
-                                    label: 'Add',
-                                    props: {
-                                        title: 'Add',
-                                        onClick: onAddButtonClicked
-                                    }
-                                }
-                            ]}
-                            onCloseRequest={() => setAddAddonModalOpened(false)}
-                        >
-                            <TextInput ref={inputRef} className={styles['url-content']} type={'text'} tabIndex={'-1'} placeholder={'Paste url...'} />
-                        </ModalDialog>
-                        :
-                        null
-                }
-                {
-                    selectedAddon !== null ?
-                        <ModalDialog
-                            className={styles['addon-prompt-container']}
-                            buttons={[
-                                {
-                                    label: 'Cancel',
-                                    className: styles['cancel-button'],
-                                    props: {
-                                        title: 'Cancel',
-                                        onClick: clearSelectedAddon
-                                    }
-                                },
-                                {
-                                    label: installedAddon(selectedAddon) ? 'Uninstall' : 'Install',
-                                    props: {
-                                        title: installedAddon(selectedAddon) ? 'Uninstall' : 'Install',
-                                        onClick: toggleAddon
-                                    }
-                                }
-                            ]}
-                            onCloseRequest={clearSelectedAddon}
-                        >
-                            <AddonPrompt
-                                {...selectedAddon.manifest}
-                                transportUrl={selectedAddon.transportUrl}
-                                installed={installedAddon(selectedAddon)}
-                                official={selectedAddon.flags.official}
-                                cancel={clearSelectedAddon}
-                            />
-                        </ModalDialog>
-                        :
-                        null
-                }
-                {
-                    sharedAddon !== null ?
-                        <ModalDialog className={styles['share-prompt-container']} title={'Share addon'} onCloseRequest={() => setSharedAddon(null)}>
-                            <SharePrompt
-                                url={sharedAddon.transportUrl}
-                                close={() => setSharedAddon(null)}
-                            />
-                        </ModalDialog>
-                        :
-                        null
+                                :
+                                addons.catalog_resource.content.type === 'Loading' ?
+                                    <div className={styles['message-container']}>
+                                        Loading
+                                    </div>
+                                    :
+                                    <div className={styles['addons-container']}>
+                                        {
+                                            addons.catalog_resource.content.content
+                                                .filter((addon) => {
+                                                    return search.length === 0 ||
+                                                        (
+                                                            (typeof addon.manifest.name === 'string' && addon.manifest.name.toLowerCase().includes(search.toLowerCase())) ||
+                                                            (typeof addon.manifest.description === 'string' && addon.manifest.description.toLowerCase().includes(search.toLowerCase()))
+                                                        );
+                                                })
+                                                .map((addon, index) => (
+                                                    <Addon
+                                                        key={index}
+                                                        className={styles['addon']}
+                                                        id={addon.manifest.id}
+                                                        name={addon.manifest.name}
+                                                        logo={addon.manifest.logo}
+                                                        description={addon.manifest.description}
+                                                        types={addon.manifest.types}
+                                                        version={addon.manifest.version}
+                                                        transportUrl={addon.transportUrl}
+                                                        onShare={onAddonShare}
+                                                        dataset={{ transportUrl: addon.transportUrl }}
+                                                    />
+                                                ))
+                                        }
+                                    </div>
                 }
             </div>
+            {
+                addAddonModalOpen ?
+                    <ModalDialog
+                        className={styles['add-addon-modal-container']}
+                        title={'Add addon'}
+                        buttons={addAddonModalButtons}
+                        onCloseRequest={closeAddAddonModal}>
+                        <TextInput
+                            ref={addAddonUrlInputRef}
+                            className={styles['addon-url-input']}
+                            type={'text'}
+                            placeholder={'Paste url...'}
+                            onSubmit={addAddonOnSubmit}
+                        />
+                    </ModalDialog>
+                    :
+                    null
+            }
+            {
+                typeof sharedTransportUrl === 'string' ?
+                    <ModalDialog
+                        className={styles['share-modal-container']}
+                        title={'Share addon'}
+                        onCloseRequest={shareModalOnClose}>
+                        <SharePrompt className={styles['share-prompt-container']} url={sharedTransportUrl} />
+                    </ModalDialog>
+                    :
+                    null
+            }
         </div>
     );
 };
diff --git a/src/routes/Addons/styles.less b/src/routes/Addons/styles.less
index ff3b7f2c1..b17fbfd46 100644
--- a/src/routes/Addons/styles.less
+++ b/src/routes/Addons/styles.less
@@ -1,3 +1,7 @@
+:import('~stremio/common/Multiselect/styles.less') {
+    multiselect-menu-container: menu-container;
+}
+
 .addons-container {
     display: flex;
     flex-direction: column;
@@ -16,11 +20,12 @@
         display: flex;
         flex-direction: column;
 
-        .top-bar-container {
+        .selectable-inputs-container {
             flex: none;
+            align-self: stretch;
             display: flex;
             flex-direction: row;
-            margin: 2rem;
+            padding: 1.5rem;
             overflow: visible;
 
             .add-button-container {
@@ -30,7 +35,7 @@
                 align-items: center;
                 height: 3rem;
                 max-width: 15rem;
-                margin-right: 1rem;
+                margin-right: 1.5rem;
                 padding: 0 1rem;
                 background-color: var(--color-signal5);
 
@@ -40,8 +45,8 @@
 
                 .icon {
                     flex: none;
-                    width: 1.5rem;
-                    height: 1.5rem;
+                    width: 1.2rem;
+                    height: 1.2rem;
                     margin-right: 1rem;
                     fill: var(--color-surfacelighter);
                 }
@@ -56,12 +61,17 @@
                 }
             }
 
-            .dropdown {
+            .select-input-container {
                 flex-grow: 0;
                 flex-shrink: 1;
                 flex-basis: 15rem;
                 height: 3rem;
-                margin-right: 1rem;
+                margin-right: 1.5rem;
+
+                .multiselect-menu-container {
+                    max-height: calc(3.2rem * 7);
+                    overflow: auto;
+                }
             }
 
             .search-bar-container {
@@ -72,7 +82,6 @@
                 flex-direction: row;
                 align-items: center;
                 height: 3rem;
-                margin-right: 1rem;
                 padding: 0 1rem;
                 background-color: var(--color-backgroundlighter);
                 cursor: text;
@@ -82,7 +91,7 @@
                 }
 
                 .icon {
-                    display: block;
+                    flex: none;
                     width: 1.2rem;
                     height: 1.2rem;
                     margin-right: 1rem;
@@ -91,7 +100,6 @@
 
                 .search-input {
                     flex: 1;
-                    align-self: stretch;
                     color: var(--color-surfacelighter);
 
                     &::placeholder {
@@ -103,32 +111,31 @@
             }
         }
 
-        .addons-list-container {
+        .message-container {
             flex: 1;
             align-self: stretch;
-            padding: 0 2rem;
+            padding: 0 1.5rem;
+            font-size: 2rem;
+            color: var(--color-surfacelighter);
+        }
+
+        .addons-container {
+            flex: 1;
+            align-self: stretch;
+            padding: 0 1.5rem;
             overflow-y: auto;
 
             .addon {
-                width: 100%;
-                margin-bottom: 2rem;
-            }
-
-            .message-container {
-                padding: 0 2rem;
-                font-size: 2rem;
-                color: var(--color-surfacelighter);
+                margin-bottom: 1.5rem;
             }
         }
     }
 }
 
-.add-addon-prompt-container {
-    .url-content {
-        flex: 1;
-        width: 100%;
-        padding: 0.5rem;
-        font-size: 0.9rem;
+.add-addon-modal-container {
+    .addon-url-input {
+        width: 25rem;
+        padding: 0.5rem 1rem;
         color: var(--color-surfacedark);
         border: thin solid var(--color-surface);
     }
@@ -138,8 +145,8 @@
     }
 }
 
-.addon-prompt-container {
-    .cancel-button {
-        background-color: var(--color-surfacedark);
+.share-modal-container {
+    .share-prompt-container {
+        width: 25rem;
     }
 }
\ No newline at end of file
diff --git a/src/routes/Addons/useAddons.js b/src/routes/Addons/useAddons.js
index b29b23cd4..aad7086bc 100644
--- a/src/routes/Addons/useAddons.js
+++ b/src/routes/Addons/useAddons.js
@@ -15,8 +15,29 @@ const initAddonsState = () => ({
 
 const mapAddonsStateWithCtx = (addons, ctx) => {
     const selectable = addons.selectable;
-    const catalog_resource = addons.catalog_resource;
-    // TODO add MY catalogId replace catalog content if resource catalog id is MY
+    // TODO replace catalog content if resource catalog id is MY
+    const catalog_resource = addons.catalog_resource !== null && addons.catalog_resource.content.type === 'Ready' ?
+        {
+            ...addons.catalog_resource,
+            content: {
+                ...addons.catalog_resource.content,
+                content: addons.catalog_resource.content.content.map((descriptor) => ({
+                    transportUrl: descriptor.transportUrl,
+                    installed: ctx.content.addons.some((addon) => addon.transportUrl === descriptor.transportUrl),
+                    manifest: {
+                        id: descriptor.manifest.id,
+                        name: descriptor.manifest.name,
+                        version: descriptor.manifest.version,
+                        logo: descriptor.manifest.logo,
+                        description: descriptor.manifest.description,
+                        types: descriptor.manifest.types,
+                        catalogs: descriptor.manifest.catalogs,
+                    }
+                }))
+            }
+        }
+        :
+        addons.catalog_resource;
     return { selectable, catalog_resource };
 };
 
diff --git a/src/routes/Addons/useSelectableInputs.js b/src/routes/Addons/useSelectableInputs.js
index 8376fa846..1b1c4dd15 100644
--- a/src/routes/Addons/useSelectableInputs.js
+++ b/src/routes/Addons/useSelectableInputs.js
@@ -15,18 +15,6 @@ const equalWithouExtra = (request1, request2) => {
 };
 
 const mapSelectableInputs = (addons) => {
-    const selectedCatalogRequest = addons.catalog_resource !== null ?
-        addons.catalog_resource.request
-        :
-        {
-            base: null,
-            path: {
-                resource: 'addon_catalog',
-                id: null,
-                type_name: null,
-                extra: []
-            }
-        };
     const catalogSelect = {
         title: 'Select catalog',
         options: addons.selectable.catalogs
@@ -36,7 +24,8 @@ const mapSelectableInputs = (addons) => {
             })),
         selected: addons.selectable.catalogs
             .filter(({ load_request: { path: { id } } }) => {
-                return id === selectedCatalogRequest.path.id;
+                return addons.catalog_resource !== null &&
+                    addons.catalog_resource.request.path.id === id;
             })
             .map(({ load_request }) => JSON.stringify(load_request)),
         onSelect: (event) => {
@@ -52,7 +41,8 @@ const mapSelectableInputs = (addons) => {
             })),
         selected: addons.selectable.types
             .filter(({ load_request }) => {
-                return equalWithouExtra(load_request, selectedCatalogRequest);
+                return addons.catalog_resource !== null &&
+                    equalWithouExtra(addons.catalog_resource.request, load_request);
             })
             .map(({ load_request }) => JSON.stringify(load_request)),
         onSelect: (event) => {

From 5939a98bc633ae062e9cc3f4ac8be4045531f03b Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Fri, 13 Dec 2019 18:12:00 +0200
Subject: [PATCH 07/28] redirect to addon details on submit

---
 src/routes/Addons/Addons.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js
index 6e47ee363..504145fcf 100644
--- a/src/routes/Addons/Addons.js
+++ b/src/routes/Addons/Addons.js
@@ -13,9 +13,17 @@ const Addons = ({ urlParams, queryParams }) => {
     const addAddonUrlInputRef = React.useRef(null);
     const addAddonOnSubmit = React.useCallback(() => {
         if (addAddonUrlInputRef.current !== null) {
-            // TODO install addon
+            const queryParams = new URLSearchParams([['addon', addAddonUrlInputRef.current.value]]);
+            if (typeof urlParams.addonTransportUrl === 'string' && typeof urlParams.catalogId === 'string' && typeof urlParams.type === 'string') {
+                const addonTransportUrl = encodeURIComponent(urlParams.addonTransportUrl);
+                const catalogId = encodeURIComponent(urlParams.catalogId);
+                const type = encodeURIComponent(urlParams.type);
+                window.location.replace(`#/addons/${addonTransportUrl}/${catalogId}/${type}?${queryParams}`);
+            } else {
+                window.location.replace(`#/addons?${queryParams}`);
+            }
         }
-    }, []);
+    }, [urlParams]);
     const addAddonModalButtons = React.useMemo(() => {
         return [
             {
@@ -32,7 +40,7 @@ const Addons = ({ urlParams, queryParams }) => {
                 }
             }
         ];
-    }, []);
+    }, [addAddonOnSubmit]);
     const [search, setSearch] = React.useState('');
     const searchInputOnChange = React.useCallback((event) => {
         setSearch(event.currentTarget.value);

From bd03788c3d96aaed9f3f78bc676893095c1b5e42 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Fri, 13 Dec 2019 18:14:30 +0200
Subject: [PATCH 08/28] navigate to addon details moved in a separate function

---
 src/routes/Addons/Addons.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js
index 504145fcf..054fd5b57 100644
--- a/src/routes/Addons/Addons.js
+++ b/src/routes/Addons/Addons.js
@@ -7,23 +7,26 @@ const useSelectableInputs = require('./useSelectableInputs');
 const styles = require('./styles');
 
 const Addons = ({ urlParams, queryParams }) => {
+    const navigateToAddonDetails = React.useCallback((transportUrl) => {
+        const queryParams = new URLSearchParams([['addon', transportUrl]]);
+        if (typeof urlParams.addonTransportUrl === 'string' && typeof urlParams.catalogId === 'string' && typeof urlParams.type === 'string') {
+            const addonTransportUrl = encodeURIComponent(urlParams.addonTransportUrl);
+            const catalogId = encodeURIComponent(urlParams.catalogId);
+            const type = encodeURIComponent(urlParams.type);
+            window.location.replace(`#/addons/${addonTransportUrl}/${catalogId}/${type}?${queryParams}`);
+        } else {
+            window.location.replace(`#/addons?${queryParams}`);
+        }
+    }, [urlParams]);
     const addons = useAddons(urlParams);
     const selectInputs = useSelectableInputs(addons);
     const [addAddonModalOpen, openAddAddonModal, closeAddAddonModal] = useBinaryState(false);
     const addAddonUrlInputRef = React.useRef(null);
     const addAddonOnSubmit = React.useCallback(() => {
         if (addAddonUrlInputRef.current !== null) {
-            const queryParams = new URLSearchParams([['addon', addAddonUrlInputRef.current.value]]);
-            if (typeof urlParams.addonTransportUrl === 'string' && typeof urlParams.catalogId === 'string' && typeof urlParams.type === 'string') {
-                const addonTransportUrl = encodeURIComponent(urlParams.addonTransportUrl);
-                const catalogId = encodeURIComponent(urlParams.catalogId);
-                const type = encodeURIComponent(urlParams.type);
-                window.location.replace(`#/addons/${addonTransportUrl}/${catalogId}/${type}?${queryParams}`);
-            } else {
-                window.location.replace(`#/addons?${queryParams}`);
-            }
+            navigateToAddonDetails(addAddonUrlInputRef.current.value);
         }
-    }, [urlParams]);
+    }, [navigateToAddonDetails]);
     const addAddonModalButtons = React.useMemo(() => {
         return [
             {

From 160b8b4a5b1f9c0a5e511126015d48a8ce83a010 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Fri, 13 Dec 2019 18:16:41 +0200
Subject: [PATCH 09/28] onToggle cb added to Addon

---
 src/routes/Addons/Addons.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js
index 054fd5b57..4dfaff765 100644
--- a/src/routes/Addons/Addons.js
+++ b/src/routes/Addons/Addons.js
@@ -55,6 +55,9 @@ const Addons = ({ urlParams, queryParams }) => {
     const onAddonShare = React.useCallback((event) => {
         setSharedTransportUrl(event.dataset.transportUrl);
     }, []);
+    const onAddonToggle = React.useCallback((event) => {
+        navigateToAddonDetails(event.dataset.transportUrl);
+    }, []);
     React.useLayoutEffect(() => {
         closeAddAddonModal(null);
         setSearch('');
@@ -128,8 +131,8 @@ const Addons = ({ urlParams, queryParams }) => {
                                                         description={addon.manifest.description}
                                                         types={addon.manifest.types}
                                                         version={addon.manifest.version}
-                                                        transportUrl={addon.transportUrl}
                                                         onShare={onAddonShare}
+                                                        onToggle={onAddonToggle}
                                                         dataset={{ transportUrl: addon.transportUrl }}
                                                     />
                                                 ))

From 5282ad936799bc45aff763f2a0e1a720c42e3b03 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Fri, 13 Dec 2019 18:19:17 +0200
Subject: [PATCH 10/28] addons list ui fixed

---
 src/routes/Addons/Addons.js   | 2 +-
 src/routes/Addons/styles.less | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js
index 4dfaff765..c99f7bc30 100644
--- a/src/routes/Addons/Addons.js
+++ b/src/routes/Addons/Addons.js
@@ -111,7 +111,7 @@ const Addons = ({ urlParams, queryParams }) => {
                                         Loading
                                     </div>
                                     :
-                                    <div className={styles['addons-container']}>
+                                    <div className={styles['addons-list-container']}>
                                         {
                                             addons.catalog_resource.content.content
                                                 .filter((addon) => {
diff --git a/src/routes/Addons/styles.less b/src/routes/Addons/styles.less
index b17fbfd46..f7ef52dcd 100644
--- a/src/routes/Addons/styles.less
+++ b/src/routes/Addons/styles.less
@@ -119,7 +119,7 @@
             color: var(--color-surfacelighter);
         }
 
-        .addons-container {
+        .addons-list-container {
             flex: 1;
             align-self: stretch;
             padding: 0 1.5rem;

From 91c692a0c46e0eae0afa8633ce9555f5da863ed5 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Fri, 13 Dec 2019 18:20:03 +0200
Subject: [PATCH 11/28] useSelectedAddon dropped

---
 src/routes/Addons/useSelectedAddon.js | 35 ---------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 src/routes/Addons/useSelectedAddon.js

diff --git a/src/routes/Addons/useSelectedAddon.js b/src/routes/Addons/useSelectedAddon.js
deleted file mode 100644
index 5bffaec37..000000000
--- a/src/routes/Addons/useSelectedAddon.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const React = require('react');
-const UrlUtils = require('url');
-const { routesRegexp, useLocationHash, useRouteActive } = require('stremio/common');
-
-const useSelectedAddon = (transportUrl) => {
-    const [addon, setAddon] = React.useState(null);
-    const locationHash = useLocationHash();
-    const active = useRouteActive(routesRegexp.addons.regexp);
-    React.useEffect(() => {
-        if (typeof transportUrl !== 'string') {
-            setAddon(null);
-            return;
-        }
-
-        fetch(transportUrl) // TODO
-            .then((resp) => resp.json())
-            .then((manifest) => setAddon({ manifest, transportUrl, flags: {} }));
-    }, [transportUrl]);
-    const clear = React.useCallback(() => {
-        if (active) {
-            const { pathname, search } = UrlUtils.parse(locationHash.slice(1));
-            const queryParams = new URLSearchParams(search || '');
-            queryParams.delete('addon');
-            if ([...queryParams].length !== 0) {
-                window.location.replace(`#${pathname}?${queryParams.toString()}`);
-            } else {
-                window.location.replace(`#${pathname}`);
-            }
-            setAddon(null);
-        }
-    }, [active, locationHash]);
-    return [addon, clear, setAddon];
-};
-
-module.exports = useSelectedAddon;

From 3e1ab699f54b5d415932018af3afa07a1dcd9d9c Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Sun, 15 Dec 2019 01:38:16 +0200
Subject: [PATCH 12/28] Addon layout changed

---
 src/routes/Addons/Addon/Addon.js    | 72 ++++++++++++++++++++---------
 src/routes/Addons/Addon/styles.less | 25 +++-------
 src/routes/Addons/Addons.js         | 57 ++++++++++++++---------
 src/routes/Addons/useAddons.js      |  3 +-
 4 files changed, 93 insertions(+), 64 deletions(-)

diff --git a/src/routes/Addons/Addon/Addon.js b/src/routes/Addons/Addon/Addon.js
index 023c17732..d646ed2b9 100644
--- a/src/routes/Addons/Addon/Addon.js
+++ b/src/routes/Addons/Addon/Addon.js
@@ -2,24 +2,54 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Icon = require('stremio-icons/dom');
-const { Button } = require('stremio/common');
+const { Button, Image } = require('stremio/common');
 const styles = require('./styles');
 
-const Addon = ({ className, id, name, logo, description, types, version, transportUrl, installed, toggle, onShareButtonClicked }) => {
-    const onKeyUp = React.useCallback((event) => {
-        if (event.key === 'Enter' && typeof toggle === 'function') {
-            toggle(event);
+const Addon = ({ className, id, name, version, logo, description, types, installed, onToggle, onShare, dataset }) => {
+    const toggleButtonOnClick = React.useCallback((event) => {
+        if (typeof onToggle === 'function') {
+            onToggle({
+                type: 'toggle',
+                nativeEvent: event.nativeEvent,
+                reactEvent: event,
+                dataset: dataset
+            });
         }
-    }, [toggle]);
+    }, [onToggle, dataset]);
+    const shareButtonOnClick = React.useCallback((event) => {
+        if (typeof onShare === 'function') {
+            onShare({
+                type: 'share',
+                nativeEvent: event.nativeEvent,
+                reactEvent: event,
+                dataset: dataset
+            });
+        }
+    }, [onShare, dataset]);
+    const onKeyDown = React.useCallback((event) => {
+        if (event.key === 'Enter' && typeof onToggle === 'function') {
+            onToggle({
+                type: 'toggle',
+                nativeEvent: event.nativeEvent,
+                reactEvent: event,
+                dataset: dataset
+            });
+        }
+    }, [onToggle, dataset]);
+    const renderLogoFallback = React.useMemo(() => () => {
+        return (
+            <Icon className={styles['icon']} icon={'ic_addons'} />
+        );
+    }, []);
     return (
-        <Button className={classnames(styles['addon-container'], className)} data-id={id} onKeyUp={onKeyUp}>
+        <Button className={classnames(className, styles['addon-container'])} onKeyDown={onKeyDown}>
             <div className={styles['logo-container']}>
-                {
-                    typeof logo === 'string' && logo.length > 0 ?
-                        <img className={styles['logo']} src={logo} alt={' '} />
-                        :
-                        <Icon className={styles['icon']} icon={'ic_addons'} />
-                }
+                <Image
+                    className={styles['logo']}
+                    src={logo}
+                    alt={' '}
+                    renderFallback={renderLogoFallback}
+                />
             </div>
             <div className={styles['info-container']}>
                 <div className={styles['name-container']} title={typeof name === 'string' && name.length > 0 ? name : id}>
@@ -32,10 +62,10 @@ const Addon = ({ className, id, name, logo, description, types, version, transpo
                         null
                 }
                 {
-                    Array.isArray(types) ?
+                    Array.isArray(types) && types.length > 0 ?
                         <div className={styles['types-container']}>
                             {
-                                types.length <= 1 ?
+                                types.length === 1 ?
                                     types.join('')
                                     :
                                     types.slice(0, -1).join(', ') + ' & ' + types[types.length - 1]
@@ -52,10 +82,10 @@ const Addon = ({ className, id, name, logo, description, types, version, transpo
                 }
             </div>
             <div className={styles['buttons-container']}>
-                <Button className={installed ? styles['uninstall-button-container'] : styles['install-button-container']} title={installed ? 'Uninstall' : 'Install'} tabIndex={-1} data-id={id} onClick={toggle}>
+                <Button className={installed ? styles['uninstall-button-container'] : styles['install-button-container']} title={installed ? 'Uninstall' : 'Install'} tabIndex={-1} onClick={toggleButtonOnClick}>
                     <div className={styles['label']}>{installed ? 'Uninstall' : 'Install'}</div>
                 </Button>
-                <Button className={styles['share-button-container']} title={'Share addon'} tabIndex={-1} onClick={onShareButtonClicked}>
+                <Button className={styles['share-button-container']} title={'Share addon'} tabIndex={-1} onClick={shareButtonOnClick}>
                     <Icon className={styles['icon']} icon={'ic_share'} />
                     <div className={styles['label']}>Share addon</div>
                 </Button>
@@ -68,14 +98,14 @@ Addon.propTypes = {
     className: PropTypes.string,
     id: PropTypes.string,
     name: PropTypes.string,
+    version: PropTypes.string,
     logo: PropTypes.string,
     description: PropTypes.string,
     types: PropTypes.arrayOf(PropTypes.string),
-    version: PropTypes.string,
-    transportUrl: PropTypes.string,
     installed: PropTypes.bool,
-    toggle: PropTypes.func,
-    onShareButtonClicked: PropTypes.func
+    onToggle: PropTypes.func,
+    onShare: PropTypes.func,
+    dataset: PropTypes.objectOf(PropTypes.string)
 };
 
 module.exports = Addon;
diff --git a/src/routes/Addons/Addon/styles.less b/src/routes/Addons/Addon/styles.less
index 2ae172544..e57eea428 100644
--- a/src/routes/Addons/Addon/styles.less
+++ b/src/routes/Addons/Addon/styles.less
@@ -1,7 +1,6 @@
 .addon-container {
     display: flex;
     flex-direction: row;
-    flex-wrap: wrap;
     align-items: flex-start;
     padding: 1rem;
     background-color: var(--color-backgroundlighter);
@@ -17,6 +16,7 @@
             display: block;
             width: 100%;
             height: 100%;
+            padding: 0.5rem;
             object-fit: contain;
             object-position: center;
         }
@@ -31,14 +31,13 @@
     }
 
     .info-container {
-        flex-grow: 1000;
+        flex-grow: 1;
         flex-shrink: 1;
         flex-basis: 0;
         display: flex;
         flex-direction: row;
         flex-wrap: wrap;
         align-items: baseline;
-        min-width: 40rem;
         padding: 0 0.5rem;
 
         .name-container {
@@ -47,7 +46,7 @@
             flex-basis: auto;
             padding: 0 0.5rem;
             max-height: 3.6em;
-            font-size: 1.5rem;
+            font-size: 1.6rem;
             color: var(--color-surfacelighter);
         }
 
@@ -55,6 +54,7 @@
             flex-grow: 1;
             flex-shrink: 1;
             flex-basis: auto;
+            margin-top: 0.5rem;
             padding: 0 0.5rem;
             max-height: 2.4em;
             color: var(--color-surfacelight);
@@ -83,22 +83,14 @@
     }
 
     .buttons-container {
-        flex-grow: 1;
-        flex-shrink: 0;
-        flex-basis: 0;
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        align-items: flex-end;
-        min-width: 17rem;
+        flex: none;
+        width: 17rem;
 
         .install-button-container, .uninstall-button-container, .share-button-container {
-            flex: none;
             display: flex;
             flex-direction: row;
             align-items: center;
             justify-content: center;
-            width: 17rem;
             height: 3.5rem;
             padding: 0 1rem;
 
@@ -106,13 +98,8 @@
                 margin-top: 1rem;
             }
 
-            &:not(:last-child) {
-                margin-right: 1rem;
-            }
-
             .icon {
                 flex: none;
-                display: block;
                 width: 1.5rem;
                 height: 1.5rem;
                 margin-right: 1rem;
diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js
index c99f7bc30..083c16747 100644
--- a/src/routes/Addons/Addons.js
+++ b/src/routes/Addons/Addons.js
@@ -6,27 +6,32 @@ const useAddons = require('./useAddons');
 const useSelectableInputs = require('./useSelectableInputs');
 const styles = require('./styles');
 
+const navigateToAddonDetails = (addonsCatalogRequest, transportUrl) => {
+    const queryParams = new URLSearchParams([['addon', transportUrl]]);
+    if (addonsCatalogRequest !== null) {
+        const addonTransportUrl = encodeURIComponent(addonsCatalogRequest.base);
+        const catalogId = encodeURIComponent(addonsCatalogRequest.path.id);
+        const type = encodeURIComponent(addonsCatalogRequest.path.type_name);
+        window.location.replace(`#/addons/${addonTransportUrl}/${catalogId}/${type}?${queryParams}`);
+    } else {
+        window.location.replace(`#/addons?${queryParams}`);
+    }
+};
+
 const Addons = ({ urlParams, queryParams }) => {
-    const navigateToAddonDetails = React.useCallback((transportUrl) => {
-        const queryParams = new URLSearchParams([['addon', transportUrl]]);
-        if (typeof urlParams.addonTransportUrl === 'string' && typeof urlParams.catalogId === 'string' && typeof urlParams.type === 'string') {
-            const addonTransportUrl = encodeURIComponent(urlParams.addonTransportUrl);
-            const catalogId = encodeURIComponent(urlParams.catalogId);
-            const type = encodeURIComponent(urlParams.type);
-            window.location.replace(`#/addons/${addonTransportUrl}/${catalogId}/${type}?${queryParams}`);
-        } else {
-            window.location.replace(`#/addons?${queryParams}`);
-        }
-    }, [urlParams]);
     const addons = useAddons(urlParams);
     const selectInputs = useSelectableInputs(addons);
     const [addAddonModalOpen, openAddAddonModal, closeAddAddonModal] = useBinaryState(false);
     const addAddonUrlInputRef = React.useRef(null);
     const addAddonOnSubmit = React.useCallback(() => {
         if (addAddonUrlInputRef.current !== null) {
-            navigateToAddonDetails(addAddonUrlInputRef.current.value);
+            const addonsCatalogRequest = addons.catalog_resource !== null ?
+                addons.catalog_resource.request
+                :
+                null;
+            navigateToAddonDetails(addonsCatalogRequest, addAddonUrlInputRef.current.value);
         }
-    }, [navigateToAddonDetails]);
+    }, [addons]);
     const addAddonModalButtons = React.useMemo(() => {
         return [
             {
@@ -49,19 +54,23 @@ const Addons = ({ urlParams, queryParams }) => {
         setSearch(event.currentTarget.value);
     }, []);
     const [sharedTransportUrl, setSharedTransportUrl] = React.useState(null);
-    const shareModalOnClose = React.useCallback(() => {
+    const clearSharedTransportUrl = React.useCallback(() => {
         setSharedTransportUrl(null);
     }, []);
     const onAddonShare = React.useCallback((event) => {
         setSharedTransportUrl(event.dataset.transportUrl);
     }, []);
     const onAddonToggle = React.useCallback((event) => {
-        navigateToAddonDetails(event.dataset.transportUrl);
-    }, []);
+        const addonsCatalogRequest = addons.catalog_resource !== null ?
+            addons.catalog_resource.request
+            :
+            null;
+        navigateToAddonDetails(addonsCatalogRequest, event.dataset.transportUrl);
+    }, [addons]);
     React.useLayoutEffect(() => {
-        closeAddAddonModal(null);
+        closeAddAddonModal();
         setSearch('');
-        setSharedTransportUrl(null);
+        clearSharedTransportUrl();
     }, [urlParams, queryParams]);
     return (
         <div className={styles['addons-container']}>
@@ -127,12 +136,13 @@ const Addons = ({ urlParams, queryParams }) => {
                                                         className={styles['addon']}
                                                         id={addon.manifest.id}
                                                         name={addon.manifest.name}
+                                                        version={addon.manifest.version}
                                                         logo={addon.manifest.logo}
                                                         description={addon.manifest.description}
                                                         types={addon.manifest.types}
-                                                        version={addon.manifest.version}
-                                                        onShare={onAddonShare}
+                                                        installed={addon.installed}
                                                         onToggle={onAddonToggle}
+                                                        onShare={onAddonShare}
                                                         dataset={{ transportUrl: addon.transportUrl }}
                                                     />
                                                 ))
@@ -163,8 +173,11 @@ const Addons = ({ urlParams, queryParams }) => {
                     <ModalDialog
                         className={styles['share-modal-container']}
                         title={'Share addon'}
-                        onCloseRequest={shareModalOnClose}>
-                        <SharePrompt className={styles['share-prompt-container']} url={sharedTransportUrl} />
+                        onCloseRequest={clearSharedTransportUrl}>
+                        <SharePrompt
+                            className={styles['share-prompt-container']}
+                            url={sharedTransportUrl}
+                        />
                     </ModalDialog>
                     :
                     null
diff --git a/src/routes/Addons/useAddons.js b/src/routes/Addons/useAddons.js
index aad7086bc..57be65b45 100644
--- a/src/routes/Addons/useAddons.js
+++ b/src/routes/Addons/useAddons.js
@@ -30,8 +30,7 @@ const mapAddonsStateWithCtx = (addons, ctx) => {
                         version: descriptor.manifest.version,
                         logo: descriptor.manifest.logo,
                         description: descriptor.manifest.description,
-                        types: descriptor.manifest.types,
-                        catalogs: descriptor.manifest.catalogs,
+                        types: descriptor.manifest.types
                     }
                 }))
             }

From d78f2f66964780cfdb83afdc3baaf1d5c8b3ccba Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 11:22:55 +0200
Subject: [PATCH 13/28] useAddonDetails hook implemented

---
 src/routes/Addons/useAddonDetails.js | 48 ++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 src/routes/Addons/useAddonDetails.js

diff --git a/src/routes/Addons/useAddonDetails.js b/src/routes/Addons/useAddonDetails.js
new file mode 100644
index 000000000..afa45eceb
--- /dev/null
+++ b/src/routes/Addons/useAddonDetails.js
@@ -0,0 +1,48 @@
+const React = require('react');
+const { useModelState } = require('stremio/common');
+
+const initAddonDetailsState = () => ({
+    descriptor: null
+});
+
+const mapAddonDetailsStateWithCtx = (addonDetails, ctx) => {
+    const descriptor = addonDetails.descriptor !== null && addonDetails.descriptor.content.type === 'Ready' ?
+        {
+            ...addonDetails.descriptor,
+            content: {
+                ...addonDetails.descriptor.content,
+                installed: ctx.content.addons.some((addon) => addon.transportUrl === addonDetails.descriptor.transport_url),
+            }
+        }
+        :
+        addonDetails.descriptor;
+    return { descriptor };
+};
+
+const useAddonDetails = (queryParams) => {
+    const loadAddonDetailsAction = React.useMemo(() => {
+        if (queryParams.has('addon')) {
+            return {
+                action: 'Load',
+                args: {
+                    load: 'AddonDetails',
+                    args: {
+                        transport_url: queryParams.get('addon')
+                    }
+                }
+            };
+        } else {
+            return {
+                action: 'Unload'
+            };
+        }
+    }, [queryParams]);
+    return useModelState({
+        model: 'addon_details',
+        action: loadAddonDetailsAction,
+        mapWithCtx: mapAddonDetailsStateWithCtx,
+        init: initAddonDetailsState,
+    });
+};
+
+module.exports = useAddonDetails;

From 7eccd100ab3f069eec89febcba590be0e04d8d2b Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 11:40:27 +0200
Subject: [PATCH 14/28] urlParams proptypes fixed

---
 src/routes/Addons/Addons.js           | 6 +++++-
 src/routes/Discover/Discover.js       | 6 +++++-
 src/routes/Library/Library.js         | 4 +++-
 src/routes/MetaDetails/MetaDetails.js | 6 +++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js
index 5362c92e3..3f7874666 100644
--- a/src/routes/Addons/Addons.js
+++ b/src/routes/Addons/Addons.js
@@ -188,7 +188,11 @@ const Addons = ({ urlParams, queryParams }) => {
 };
 
 Addons.propTypes = {
-    urlParams: PropTypes.instanceOf(URLSearchParams),
+    urlParams: PropTypes.exact({
+        addonTransportUrl: PropTypes.string,
+        catalogId: PropTypes.string,
+        type: PropTypes.string
+    }),
     queryParams: PropTypes.instanceOf(URLSearchParams)
 };
 
diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js
index 72baa410b..4f8358b32 100644
--- a/src/routes/Discover/Discover.js
+++ b/src/routes/Discover/Discover.js
@@ -137,7 +137,11 @@ const Discover = ({ urlParams, queryParams }) => {
 };
 
 Discover.propTypes = {
-    urlParams: PropTypes.instanceOf(URLSearchParams),
+    urlParams: PropTypes.exact({
+        addonTransportUrl: PropTypes.string,
+        type: PropTypes.string,
+        catalogId: PropTypes.string
+    }),
     queryParams: PropTypes.instanceOf(URLSearchParams)
 };
 
diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index 3de671136..d3c081646 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -71,7 +71,9 @@ const Library = ({ urlParams, queryParams }) => {
 };
 
 Library.propTypes = {
-    urlParams: PropTypes.instanceOf(URLSearchParams),
+    urlParams: PropTypes.exact({
+        type: PropTypes.string,
+    }),
     queryParams: PropTypes.instanceOf(URLSearchParams)
 };
 
diff --git a/src/routes/MetaDetails/MetaDetails.js b/src/routes/MetaDetails/MetaDetails.js
index 42221f5a8..3cd804345 100644
--- a/src/routes/MetaDetails/MetaDetails.js
+++ b/src/routes/MetaDetails/MetaDetails.js
@@ -113,7 +113,11 @@ const MetaDetails = ({ urlParams }) => {
 };
 
 MetaDetails.propTypes = {
-    urlParams: PropTypes.instanceOf(URLSearchParams)
+    urlParams: PropTypes.exact({
+        type: PropTypes.string,
+        id: PropTypes.string,
+        videoId: PropTypes.string
+    })
 };
 
 module.exports = MetaDetails;

From 6a07be3504959cbcbe67a1f8b189f04d22832b14 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 12:01:19 +0200
Subject: [PATCH 15/28] eslint moved to dev deps

---
 package.json | 4 ++--
 yarn.lock    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 85d2ae48a..9c26d2763 100755
--- a/package.json
+++ b/package.json
@@ -16,8 +16,6 @@
     "dependencies": {
         "a-color-picker": "1.2.1",
         "classnames": "2.2.6",
-        "eslint": "^6.7.2",
-        "eslint-plugin-react": "^7.17.0",
         "events": "1.1.1",
         "hat": "0.0.3",
         "lodash.debounce": "4.0.8",
@@ -50,6 +48,8 @@
         "css-loader": "3.2.1",
         "cssnano": "4.1.10",
         "cssnano-preset-advanced": "4.0.7",
+        "eslint": "6.7.2",
+        "eslint-plugin-react": "7.17.0",
         "html-webpack-plugin": "3.2.0",
         "jest": "24.9.0",
         "less": "3.10.3",
diff --git a/yarn.lock b/yarn.lock
index 07e5dd3cf..11542419f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4547,7 +4547,7 @@ eslint-plugin-eslint-plugin@^2.1.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"
   integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==
 
-eslint-plugin-react@^7.17.0:
+eslint-plugin-react@7.17.0:
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7"
   integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==
@@ -4591,7 +4591,7 @@ eslint-visitor-keys@^1.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
-eslint@^6.7.2:
+eslint@6.7.2:
   version "6.7.2"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"
   integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==

From 1b5eb1244240bea171d553d03d915ddad7c7a4cf Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 12:07:42 +0200
Subject: [PATCH 16/28] use eslintrc file

---
 .eslintrc.js => .eslintrc | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
 rename .eslintrc.js => .eslintrc (93%)

diff --git a/.eslintrc.js b/.eslintrc
similarity index 93%
rename from .eslintrc.js
rename to .eslintrc
index cf07f3159..97c755374 100644
--- a/.eslintrc.js
+++ b/.eslintrc
@@ -1,4 +1,4 @@
-module.exports = {
+{
     "extends": [
         "eslint:recommended",
         "plugin:react/recommended"
@@ -7,7 +7,11 @@ module.exports = {
         "YT": "readonly",
         "FB": "readonly"
     },
-    "ignorePatterns": ["src/routes/Settings/**", "src/routes/Player/**", "src/video/**"],
+    "ignorePatterns": [
+        "src/routes/Settings/**",
+        "src/routes/Player/**",
+        "src/video/**"
+    ],
     "rules": {
         "arrow-parens": "error",
         "arrow-spacing": "error",
@@ -41,7 +45,9 @@ module.exports = {
         "no-console": [
             "error",
             {
-                allow: ["error"]
+                "allow": [
+                    "error"
+                ]
             }
         ],
         "no-extra-semi": "error",
@@ -104,7 +110,7 @@ module.exports = {
                 "src/common/PaginationInput/PaginationInput.js"
             ],
             "rules": {
-                "react/prop-types": 0,
+                "react/prop-types": 0
             }
         },
         {
@@ -139,4 +145,4 @@ module.exports = {
             }
         }
     ]
-}
+}
\ No newline at end of file

From 8917c88f1cb141129706416d80abcf0bf8ed63d5 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 12:09:00 +0200
Subject: [PATCH 17/28] eslint detect react version

---
 .eslintrc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.eslintrc b/.eslintrc
index 97c755374..60e232c22 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,6 +3,11 @@
         "eslint:recommended",
         "plugin:react/recommended"
     ],
+    "settings": {
+        "react": {
+            "version": "detect"
+        }
+    },
     "globals": {
         "YT": "readonly",
         "FB": "readonly"

From fba4e9f18faef08eda24edde9efb1240ca1e5703 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 13:06:43 +0200
Subject: [PATCH 18/28] eslint config updated

---
 .eslintrc | 78 +++++++++++++++++++++----------------------------------
 1 file changed, 29 insertions(+), 49 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 60e232c22..a9ac04609 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -12,6 +12,17 @@
         "YT": "readonly",
         "FB": "readonly"
     },
+    "env": {
+        "commonjs": true,
+        "browser": true,
+        "es6": true
+    },
+    "parserOptions": {
+        "ecmaVersion": 9,
+        "ecmaFeatures": {
+            "jsx": true
+        }
+    },
     "ignorePatterns": [
         "src/routes/Settings/**",
         "src/routes/Player/**",
@@ -21,25 +32,10 @@
         "arrow-parens": "error",
         "arrow-spacing": "error",
         "block-spacing": "error",
-        "comma-spacing": [
-            "error",
-            {
-                "before": false,
-                "after": true
-            }
-        ],
-        "eol-last": [
-            "error",
-            "always"
-        ],
-        "eqeqeq": [
-            "error",
-            "always"
-        ],
-        "func-call-spacing": [
-            "error",
-            "never"
-        ],
+        "comma-spacing": "error",
+        "eol-last": "error",
+        "eqeqeq": "error",
+        "func-call-spacing": "error",
         "indent": [
             "error",
             4,
@@ -47,21 +43,14 @@
                 "SwitchCase": 1
             }
         ],
-        "no-console": [
-            "error",
-            {
-                "allow": [
-                    "error"
-                ]
-            }
-        ],
+        "no-console": "error",
         "no-extra-semi": "error",
         "no-eq-null": "error",
         "no-multi-spaces": "error",
         "no-multiple-empty-lines": [
             "error",
             {
-                "max": 2
+                "max": 1
             }
         ],
         "no-template-curly-in-string": "error",
@@ -71,34 +60,25 @@
         "no-unused-vars": "error",
         "prefer-const": "error",
         "quotes": [
-            "warn",
+            "error",
             "single"
         ],
-        "semi": [
-            "error",
-            "always"
-        ],
-        "semi-spacing": [
+        "quote-props": [
             "error",
+            "as-needed",
             {
-                "before": false,
-                "after": true
+                "unnecessary": false
             }
         ],
+        "semi": "error",
+        "semi-spacing": "error",
         "space-before-blocks": "error",
-        "valid-typeof": "error",
-        "react/no-unescaped-entities": 0
-    },
-    "env": {
-        "node": true,
-        "browser": true,
-        "es6": true
-    },
-    "parserOptions": {
-        "ecmaVersion": 9,
-        "ecmaFeatures": {
-            "experimentalObjectRestSpread": true
-        }
+        "valid-typeof": [
+            "error",
+            {
+                "requireStringLiterals": true
+            }
+        ]
     },
     "overrides": [
         {

From 5a84605c1522b5b2b7bd31befc1286c924b9a06a Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 13:07:11 +0200
Subject: [PATCH 19/28] console.error removed from intro

---
 src/routes/Intro/Intro.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/routes/Intro/Intro.js b/src/routes/Intro/Intro.js
index 8f4959499..984b29369 100644
--- a/src/routes/Intro/Intro.js
+++ b/src/routes/Intro/Intro.js
@@ -117,9 +117,7 @@ const Intro = ({ queryParams }) => {
                             }
                         });
                     })
-                    .catch((err) => {
-                        console.error(err);
-                    });
+                    .catch((err) => { });
             }
         });
     }, [state.email, state.password]);
@@ -260,7 +258,7 @@ const Intro = ({ queryParams }) => {
                     <Icon className={styles['icon']} icon={'ic_facebook'} />
                     <div className={styles['label']}>Continue with Facebook</div>
                 </Button>
-                <div className={styles['facebook-statement']}>We won't post anything on your behalf</div>
+                <div className={styles['facebook-statement']}>We won&#39;t post anything on your behalf</div>
                 <CredentialsTextInput
                     ref={emailRef}
                     className={styles['credentials-text-input']}

From 787211dc8bff6c8dadbfa079e8d64fb03e1cc074 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 14:59:18 +0200
Subject: [PATCH 20/28] eslint react/prop-types enabled for all

---
 .eslintrc                                       | 17 -----------------
 src/common/Button/Button.js                     | 10 ++++++++++
 src/common/Checkbox/Checkbox.js                 |  7 +++++++
 src/common/ColorInput/ColorInput.js             |  9 +++++----
 src/common/Image/Image.js                       |  3 ++-
 src/common/MetaItem/MetaItem.js                 |  5 +++--
 src/common/MetaPreview/MetaPreview.js           |  4 ++--
 src/common/ModalDialog/ModalDialog.js           |  2 +-
 src/common/Multiselect/Multiselect.js           |  5 +++--
 src/common/PaginationInput/PaginationInput.js   |  1 +
 src/common/Popup/Popup.js                       |  2 +-
 src/common/TextInput/TextInput.js               |  8 ++++++++
 .../Intro/ConsentCheckbox/ConsentCheckbox.js    | 15 ++++++++++-----
 .../CredentialsTextInput.js                     |  5 +++++
 src/routes/Intro/Intro.js                       |  6 +++---
 .../VideosList/SeasonsBar/SeasonsBar.js         |  8 +++-----
 .../MetaDetails/VideosList/Video/Video.js       |  3 ++-
 17 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index a9ac04609..81b685301 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -81,23 +81,6 @@
         ]
     },
     "overrides": [
-        {
-            "files": [
-                "src/common/Button/Button.js",
-                "src/common/Checkbox/Checkbox.js",
-                "src/common/ColorInput/ColorInput.js",
-                "src/common/Image/Image.js",
-                "src/common/MetaItem/MetaItem.js",
-                "src/common/Multiselect/Multiselect.js",
-                "src/common/TextInput/TextInput.js",
-                "src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js",
-                "src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js",
-                "src/common/PaginationInput/PaginationInput.js"
-            ],
-            "rules": {
-                "react/prop-types": 0
-            }
-        },
         {
             "files": [
                 "src/routes/Intro/Intro.js",
diff --git a/src/common/Button/Button.js b/src/common/Button/Button.js
index 21512b041..89d7d342d 100644
--- a/src/common/Button/Button.js
+++ b/src/common/Button/Button.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const styles = require('./styles');
 
@@ -41,4 +42,13 @@ const Button = React.forwardRef(({ className, href, disabled, children, ...props
 
 Button.displayName = 'Button';
 
+Button.propTypes = {
+    className: PropTypes.string,
+    href: PropTypes.string,
+    disabled: PropTypes.bool,
+    children: PropTypes.node,
+    onKeyDown: PropTypes.func,
+    onMouseDown: PropTypes.func
+};
+
 module.exports = Button;
diff --git a/src/common/Checkbox/Checkbox.js b/src/common/Checkbox/Checkbox.js
index 96c29f334..6fd3f3a72 100644
--- a/src/common/Checkbox/Checkbox.js
+++ b/src/common/Checkbox/Checkbox.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Icon = require('stremio-icons/dom');
 const Button = require('stremio/common/Button');
@@ -22,4 +23,10 @@ const Checkbox = React.forwardRef(({ className, checked, children, ...props }, r
 
 Checkbox.displayName = 'Checkbox';
 
+Checkbox.propTypes = {
+    className: PropTypes.string,
+    checked: PropTypes.bool,
+    children: PropTypes.node
+};
+
 module.exports = Checkbox;
diff --git a/src/common/ColorInput/ColorInput.js b/src/common/ColorInput/ColorInput.js
index f493a11f1..7e846a4a8 100644
--- a/src/common/ColorInput/ColorInput.js
+++ b/src/common/ColorInput/ColorInput.js
@@ -16,9 +16,8 @@ const ColorInput = ({ className, value, dataset, onChange, ...props }) => {
         return parseColor(value);
     });
     const labelButtonStyle = React.useMemo(() => ({
-        ...props.style,
         backgroundColor: value
-    }), [props.style, value]);
+    }), [value]);
     const labelButtonOnClick = React.useCallback((event) => {
         if (typeof props.onClick === 'function') {
             props.onClick(event);
@@ -76,9 +75,11 @@ const ColorInput = ({ className, value, dataset, onChange, ...props }) => {
 };
 
 ColorInput.propTypes = {
+    className: PropTypes.string,
     value: PropTypes.string,
-    dataset: PropTypes.objectOf(String),
-    onChange: PropTypes.func
+    dataset: PropTypes.objectOf(PropTypes.string),
+    onChange: PropTypes.func,
+    onClick: PropTypes.func
 };
 
 module.exports = ColorInput;
diff --git a/src/common/Image/Image.js b/src/common/Image/Image.js
index 520fade03..8091c2615 100644
--- a/src/common/Image/Image.js
+++ b/src/common/Image/Image.js
@@ -27,7 +27,8 @@ Image.propTypes = {
     src: PropTypes.string,
     alt: PropTypes.string,
     fallbackSrc: PropTypes.string,
-    renderFallback: PropTypes.func
+    renderFallback: PropTypes.func,
+    onError: PropTypes.func
 };
 
 module.exports = Image;
diff --git a/src/common/MetaItem/MetaItem.js b/src/common/MetaItem/MetaItem.js
index 5c130933a..4d4f6cb1f 100644
--- a/src/common/MetaItem/MetaItem.js
+++ b/src/common/MetaItem/MetaItem.js
@@ -121,8 +121,9 @@ MetaItem.propTypes = {
     playIcon: PropTypes.bool,
     progress: PropTypes.number,
     options: PropTypes.array,
-    dataset: PropTypes.objectOf(String),
-    optionOnSelect: PropTypes.func
+    dataset: PropTypes.objectOf(PropTypes.string),
+    optionOnSelect: PropTypes.func,
+    onClick: PropTypes.func
 };
 
 module.exports = MetaItem;
diff --git a/src/common/MetaPreview/MetaPreview.js b/src/common/MetaPreview/MetaPreview.js
index 9cd1b7d8e..0aca83e9a 100644
--- a/src/common/MetaPreview/MetaPreview.js
+++ b/src/common/MetaPreview/MetaPreview.js
@@ -179,7 +179,7 @@ const MetaPreview = ({ className, compact, name, logo, background, runtime, rele
                         null
                 }
                 {
-                    linksGroups.hasOwnProperty(IMDB_LINK_CATEGORY) ?
+                    typeof linksGroups[IMDB_LINK_CATEGORY] === 'object' ?
                         <ActionButton
                             {...linksGroups[IMDB_LINK_CATEGORY]}
                             className={styles['action-button']}
@@ -191,7 +191,7 @@ const MetaPreview = ({ className, compact, name, logo, background, runtime, rele
                         null
                 }
                 {
-                    !compact && linksGroups.hasOwnProperty(SHARE_LINK_CATEGORY) ?
+                    !compact && typeof linksGroups[SHARE_LINK_CATEGORY] === 'object' ?
                         <React.Fragment>
                             <ActionButton
                                 className={styles['action-button']}
diff --git a/src/common/ModalDialog/ModalDialog.js b/src/common/ModalDialog/ModalDialog.js
index b21a92ef1..abb594c09 100644
--- a/src/common/ModalDialog/ModalDialog.js
+++ b/src/common/ModalDialog/ModalDialog.js
@@ -112,7 +112,7 @@ ModalDialog.propTypes = {
         PropTypes.arrayOf(PropTypes.node),
         PropTypes.node
     ]),
-    dataset: PropTypes.objectOf(String),
+    dataset: PropTypes.objectOf(PropTypes.string),
     onCloseRequest: PropTypes.func
 };
 
diff --git a/src/common/Multiselect/Multiselect.js b/src/common/Multiselect/Multiselect.js
index 8ae0622e7..7df4b7aff 100644
--- a/src/common/Multiselect/Multiselect.js
+++ b/src/common/Multiselect/Multiselect.js
@@ -143,12 +143,13 @@ Multiselect.propTypes = {
     })),
     selected: PropTypes.arrayOf(PropTypes.string),
     disabled: PropTypes.bool,
-    dataset: PropTypes.objectOf(String),
+    dataset: PropTypes.objectOf(PropTypes.string),
     renderLabelContent: PropTypes.func,
     renderLabelText: PropTypes.func,
     onOpen: PropTypes.func,
     onClose: PropTypes.func,
-    onSelect: PropTypes.func
+    onSelect: PropTypes.func,
+    onClick: PropTypes.func
 };
 
 module.exports = Multiselect;
diff --git a/src/common/PaginationInput/PaginationInput.js b/src/common/PaginationInput/PaginationInput.js
index 77bb38f5c..7358c55c7 100644
--- a/src/common/PaginationInput/PaginationInput.js
+++ b/src/common/PaginationInput/PaginationInput.js
@@ -35,6 +35,7 @@ const PaginationInput = ({ className, label, dataset, onSelect, ...props }) => {
 PaginationInput.propTypes = {
     className: PropTypes.string,
     label: PropTypes.string,
+    dataset: PropTypes.objectOf(PropTypes.string),
     onSelect: PropTypes.func
 };
 
diff --git a/src/common/Popup/Popup.js b/src/common/Popup/Popup.js
index b956f764f..59b89f26e 100644
--- a/src/common/Popup/Popup.js
+++ b/src/common/Popup/Popup.js
@@ -103,7 +103,7 @@ Popup.propTypes = {
     direction: PropTypes.oneOf(['top-left', 'bottom-left', 'top-right', 'bottom-right']),
     renderLabel: PropTypes.func.isRequired,
     renderMenu: PropTypes.func.isRequired,
-    dataset: PropTypes.objectOf(String),
+    dataset: PropTypes.objectOf(PropTypes.string),
     onCloseRequest: PropTypes.func
 };
 
diff --git a/src/common/TextInput/TextInput.js b/src/common/TextInput/TextInput.js
index 4f7db50f1..8b9606d6f 100644
--- a/src/common/TextInput/TextInput.js
+++ b/src/common/TextInput/TextInput.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const styles = require('./styles');
 
@@ -30,4 +31,11 @@ const TextInput = React.forwardRef((props, ref) => {
 
 TextInput.displayName = 'TextInput';
 
+TextInput.propTypes = {
+    className: PropTypes.string,
+    disabled: PropTypes.bool,
+    onKeyDown: PropTypes.func,
+    onSubmit: PropTypes.func
+};
+
 module.exports = TextInput;
diff --git a/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js b/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js
index fe1898b4e..df05b7e60 100644
--- a/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js
+++ b/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js
@@ -4,16 +4,20 @@ const classnames = require('classnames');
 const { Button, Checkbox } = require('stremio/common');
 const styles = require('./styles');
 
-const ConsentCheckbox = React.forwardRef(({ className, checked, label, link, href, toggle, ...props }, ref) => {
+const ConsentCheckbox = React.forwardRef(({ className, checked, label, link, href, onToggle, ...props }, ref) => {
     const checkboxOnClick = React.useCallback((event) => {
         if (typeof props.onClick === 'function') {
             props.onClick(event);
         }
 
-        if (!event.nativeEvent.togglePrevented && typeof toggle === 'function') {
-            toggle(event);
+        if (!event.nativeEvent.togglePrevented && typeof onToggle === 'function') {
+            onToggle({
+                type: 'toggle',
+                reactEvent: event,
+                nativeEvent: event.nativeEvent
+            });
         }
-    }, [toggle]);
+    }, [onToggle]);
     const linkOnClick = React.useCallback((event) => {
         event.nativeEvent.togglePrevented = true;
     }, []);
@@ -42,7 +46,8 @@ ConsentCheckbox.propTypes = {
     label: PropTypes.string,
     link: PropTypes.string,
     href: PropTypes.string,
-    toggle: PropTypes.func
+    onToggle: PropTypes.func,
+    onClick: PropTypes.func
 };
 
 module.exports = ConsentCheckbox;
diff --git a/src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js b/src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js
index d3c7696cf..43a2bb087 100644
--- a/src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js
+++ b/src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js
@@ -1,4 +1,5 @@
 const React = require('react');
+const PropTypes = require('prop-types');
 const { TextInput } = require('stremio/common');
 
 const CredentialsTextInput = React.forwardRef((props, ref) => {
@@ -23,4 +24,8 @@ const CredentialsTextInput = React.forwardRef((props, ref) => {
 
 CredentialsTextInput.displayName = 'CredentialsTextInput';
 
+CredentialsTextInput.propTypes = {
+    onKeyDown: PropTypes.func
+};
+
 module.exports = CredentialsTextInput;
diff --git a/src/routes/Intro/Intro.js b/src/routes/Intro/Intro.js
index 984b29369..dc26b97e7 100644
--- a/src/routes/Intro/Intro.js
+++ b/src/routes/Intro/Intro.js
@@ -296,7 +296,7 @@ const Intro = ({ queryParams }) => {
                                 link={'Terms and conditions'}
                                 href={'https://www.stremio.com/tos'}
                                 checked={state.termsAccepted}
-                                toggle={toggleTermsAccepted}
+                                onToggle={toggleTermsAccepted}
                             />
                             <ConsentCheckbox
                                 ref={privacyPolicyRef}
@@ -305,14 +305,14 @@ const Intro = ({ queryParams }) => {
                                 link={'Privacy Policy'}
                                 href={'https://www.stremio.com/privacy'}
                                 checked={state.privacyPolicyAccepted}
-                                toggle={togglePrivacyPolicyAccepted}
+                                onToggle={togglePrivacyPolicyAccepted}
                             />
                             <ConsentCheckbox
                                 ref={marketingRef}
                                 className={styles['consent-checkbox']}
                                 label={'I agree to receive marketing communications from Stremio'}
                                 checked={state.marketingAccepted}
-                                toggle={toggleMarketingAccepted}
+                                onToggle={toggleMarketingAccepted}
                             />
                         </React.Fragment>
                         :
diff --git a/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js
index cfe24abe3..d830d710d 100644
--- a/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js
+++ b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js
@@ -16,11 +16,9 @@ const SeasonsBar = ({ className, seasons, season, onSelect }) => {
     const selected = React.useMemo(() => {
         return [String(season)];
     }, [season]);
-    const renderMultiselectLabelContent = React.useMemo(() => {
-        return () => (
-            <div className={styles['season-label']}>Season {season}</div>
-        );
-    }, [season]);
+    const renderMultiselectLabelContent = React.useMemo(() => () => (
+        <div className={styles['season-label']}>Season {season}</div>
+    ), [season]);
     const prevNextButtonOnClick = React.useCallback((event) => {
         if (typeof onSelect === 'function') {
             const seasonIndex = seasons.indexOf(season);
diff --git a/src/routes/MetaDetails/VideosList/Video/Video.js b/src/routes/MetaDetails/VideosList/Video/Video.js
index 2bcd22f27..4b13e30e6 100644
--- a/src/routes/MetaDetails/VideosList/Video/Video.js
+++ b/src/routes/MetaDetails/VideosList/Video/Video.js
@@ -6,7 +6,7 @@ const Icon = require('stremio-icons/dom');
 const VideoPlaceholder = require('./VideoPlaceholder');
 const styles = require('./styles');
 
-const Video = ({ className, title, thumbnail, episode, released, upcoming, watched, progress, ...props }) => {
+const Video = ({ className, id, title, thumbnail, episode, released, upcoming, watched, progress, ...props }) => {
     return (
         <Button {...props} className={classnames(className, styles['video-container'])} title={title}>
             {
@@ -76,6 +76,7 @@ Video.Placeholder = VideoPlaceholder;
 
 Video.propTypes = {
     className: PropTypes.string,
+    id: PropTypes.string,
     title: PropTypes.string,
     thumbnail: PropTypes.string,
     episode: PropTypes.number,

From aa7d0543270a4bd4d641ba687918127181fab6f3 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 15:01:02 +0200
Subject: [PATCH 21/28] allow console error in core service

---
 src/services/Core/Core.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/services/Core/Core.js b/src/services/Core/Core.js
index cbb741f3c..496ff64c1 100644
--- a/src/services/Core/Core.js
+++ b/src/services/Core/Core.js
@@ -26,6 +26,7 @@ function Core() {
                             try {
                                 events.emit(name, args);
                             } catch (e) {
+                                /* eslint-disable-next-line no-console */
                                 console.error(e);
                             }
                         }

From 25e2069b22684402778bf2b52591f611045c3bfc Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 15:22:31 +0200
Subject: [PATCH 22/28] eslint ignorePatterns fixed

---
 .eslintrc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 81b685301..5fcffb716 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -24,9 +24,11 @@
         }
     },
     "ignorePatterns": [
-        "src/routes/Settings/**",
-        "src/routes/Player/**",
-        "src/video/**"
+        "/*",
+        "!/src",
+        "src/routes/Settings",
+        "src/routes/Player",
+        "src/video"
     ],
     "rules": {
         "arrow-parens": "error",

From 62e233f8da44cf5842d1337d44a82b166958d000 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 15:24:05 +0200
Subject: [PATCH 23/28] eslint fix NavMenu

---
 .eslintrc                            | 8 --------
 src/common/NavBar/NavMenu/NavMenu.js | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 5fcffb716..3ab5d64e1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -97,14 +97,6 @@
                 "no-unused-vars": "off"
             }
         },
-        {
-            "files": [
-                "src/common/NavBar/NavMenu/NavMenu.js"
-            ],
-            "rules": {
-                "quotes": "off"
-            }
-        },
         {
             "files": [
                 "src/services/Shell/Shell.js",
diff --git a/src/common/NavBar/NavMenu/NavMenu.js b/src/common/NavBar/NavMenu/NavMenu.js
index 60871a0a2..0efa4f092 100644
--- a/src/common/NavBar/NavMenu/NavMenu.js
+++ b/src/common/NavBar/NavMenu/NavMenu.js
@@ -41,7 +41,7 @@ const NavMenu = ({ className }) => {
                             className={styles['avatar-container']}
                             style={{
                                 backgroundImage: user === null ?
-                                    `url('/images/anonymous.png')`
+                                    'url(\'/images/anonymous.png\')'
                                     :
                                     `url('${user.avatar}'), url('/images/default_avatar.png')`
                             }}

From 611f18ea5dff019aed0a36796095d1be1ede19d8 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 15:25:06 +0200
Subject: [PATCH 24/28] eslint const declarations fixed

---
 .eslintrc                   | 9 ---------
 src/services/Core/Core.js   | 2 +-
 src/services/Shell/Shell.js | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 3ab5d64e1..45de76d8a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -96,15 +96,6 @@
             "rules": {
                 "no-unused-vars": "off"
             }
-        },
-        {
-            "files": [
-                "src/services/Shell/Shell.js",
-                "src/services/Core/Core.js"
-            ],
-            "rules": {
-                "prefer-const": "off"
-            }
         }
     ]
 }
\ No newline at end of file
diff --git a/src/services/Core/Core.js b/src/services/Core/Core.js
index 496ff64c1..fc27e01cf 100644
--- a/src/services/Core/Core.js
+++ b/src/services/Core/Core.js
@@ -6,7 +6,7 @@ function Core() {
     let error = null;
     let starting = false;
     let stremio_core = null;
-    let events = new EventEmitter();
+    const events = new EventEmitter();
     events.on('error', () => { });
 
     function onStateChanged() {
diff --git a/src/services/Shell/Shell.js b/src/services/Shell/Shell.js
index f1ae8bbb4..4f74e5428 100644
--- a/src/services/Shell/Shell.js
+++ b/src/services/Shell/Shell.js
@@ -4,7 +4,7 @@ function Shell() {
     let active = false;
     let error = null;
     let starting = false;
-    let events = new EventEmitter();
+    const events = new EventEmitter();
     events.on('error', () => { });
 
     function onStateChanged() {

From 573989c0a44860aa3ab58ef4aa84ecad1ab3d9f5 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 15:27:28 +0200
Subject: [PATCH 25/28] eslint fix unused vars

---
 .eslintrc                                      | 18 +-----------------
 src/common/Multiselect/Multiselect.js          |  2 +-
 src/common/NavBar/NavMenu/NavMenu.js           |  2 +-
 .../NotificationsMenu/NotificationsMenu.js     |  4 ++--
 src/routes/Board/useItemOptions.js             |  2 +-
 src/routes/Intro/Intro.js                      |  4 ++--
 src/routes/Library/useItemOptions.js           |  2 +-
 7 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 45de76d8a..0c513bad1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -81,21 +81,5 @@
                 "requireStringLiterals": true
             }
         ]
-    },
-    "overrides": [
-        {
-            "files": [
-                "src/routes/Intro/Intro.js",
-                "src/routes/Addons/useAddons.js",
-                "src/routes/Board/useItemOptions.js",
-                "src/common/NavBar/NavMenu/NavMenu.js",
-                "src/routes/Library/useItemOptions.js",
-                "src/common/Multiselect/Multiselect.js",
-                "src/common/NavBar/NotificationsMenu/NotificationsMenu.js"
-            ],
-            "rules": {
-                "no-unused-vars": "off"
-            }
-        }
-    ]
+    }
 }
\ No newline at end of file
diff --git a/src/common/Multiselect/Multiselect.js b/src/common/Multiselect/Multiselect.js
index 7df4b7aff..ff7b11eda 100644
--- a/src/common/Multiselect/Multiselect.js
+++ b/src/common/Multiselect/Multiselect.js
@@ -8,7 +8,7 @@ const useBinaryState = require('stremio/common/useBinaryState');
 const styles = require('./styles');
 
 const Multiselect = ({ className, direction, title, disabled, dataset, renderLabelContent, renderLabelText, onOpen, onClose, onSelect, ...props }) => {
-    const [menuOpen, openMenu, closeMenu, toggleMenu] = useBinaryState(false);
+    const [menuOpen, , closeMenu, toggleMenu] = useBinaryState(false);
     const options = React.useMemo(() => {
         return Array.isArray(props.options) ?
             props.options.filter((option) => {
diff --git a/src/common/NavBar/NavMenu/NavMenu.js b/src/common/NavBar/NavMenu/NavMenu.js
index 0efa4f092..2509185a2 100644
--- a/src/common/NavBar/NavMenu/NavMenu.js
+++ b/src/common/NavBar/NavMenu/NavMenu.js
@@ -10,7 +10,7 @@ const useUser = require('stremio/common/useUser');
 const styles = require('./styles');
 
 const NavMenu = ({ className }) => {
-    const [menuOpen, openMenu, closeMenu, toggleMenu] = useBinaryState(false);
+    const [menuOpen, , closeMenu, toggleMenu] = useBinaryState(false);
     const [fullscreen, requestFullscreen, exitFullscreen] = useFullscreen();
     const [user, logout] = useUser();
     const popupLabelOnClick = React.useCallback((event) => {
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsMenu.js b/src/common/NavBar/NotificationsMenu/NotificationsMenu.js
index b0ea6d6d8..7e1a1d6e7 100644
--- a/src/common/NavBar/NotificationsMenu/NotificationsMenu.js
+++ b/src/common/NavBar/NotificationsMenu/NotificationsMenu.js
@@ -5,13 +5,13 @@ const Icon = require('stremio-icons/dom');
 const Button = require('stremio/common/Button');
 const Popup = require('stremio/common/Popup');
 const NotificationsList = require('./NotificationsList');
-const useNotifications = require('./useNotifications');
+// const useNotifications = require('./useNotifications');
 // const useCatalogs = require('stremio/routes/Board/useCatalogs');
 const useBinaryState = require('stremio/common/useBinaryState');
 const styles = require('./styles');
 
 const NotificationsMenu = ({ className, onClearButtonClicked }) => {
-    const [menuOpen, openMenu, closeMenu, toggleMenu] = useBinaryState(false);
+    const [menuOpen, , closeMenu, toggleMenu] = useBinaryState(false);
     //TODO use useNotifications hook instead of useCatalogs
     const metaItems = []; //useCatalogs();
 
diff --git a/src/routes/Board/useItemOptions.js b/src/routes/Board/useItemOptions.js
index 870c14936..b4da90921 100644
--- a/src/routes/Board/useItemOptions.js
+++ b/src/routes/Board/useItemOptions.js
@@ -10,7 +10,7 @@ const DISMISS_OPTION = {
     value: 'dismiss'
 };
 
-const onSelect = (event) => {
+const onSelect = () => {
     // TODO {{event.value}} {{event.dataset}}
 };
 
diff --git a/src/routes/Intro/Intro.js b/src/routes/Intro/Intro.js
index dc26b97e7..3e8347db0 100644
--- a/src/routes/Intro/Intro.js
+++ b/src/routes/Intro/Intro.js
@@ -75,7 +75,7 @@ const Intro = ({ queryParams }) => {
         const onEvent = ({ event, args }) => {
             switch (event) {
                 case 'CtxActionErr': {
-                    const [_action, error] = args;
+                    const [, error] = args;
                     dispatch({ type: 'error', error: error.args.message });
                     break;
                 }
@@ -117,7 +117,7 @@ const Intro = ({ queryParams }) => {
                             }
                         });
                     })
-                    .catch((err) => { });
+                    .catch(() => { });
             }
         });
     }, [state.email, state.password]);
diff --git a/src/routes/Library/useItemOptions.js b/src/routes/Library/useItemOptions.js
index 37edcd1a1..b4da90921 100644
--- a/src/routes/Library/useItemOptions.js
+++ b/src/routes/Library/useItemOptions.js
@@ -10,7 +10,7 @@ const DISMISS_OPTION = {
     value: 'dismiss'
 };
 
-const onSelect = (_event) => {
+const onSelect = () => {
     // TODO {{event.value}} {{event.dataset}}
 };
 

From 4a07aaac61b5b81f007ac5059e140dd03f173ea3 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 16:03:41 +0200
Subject: [PATCH 26/28] dependencies updated

---
 package.json |  14 +-
 yarn.lock    | 446 +++++++++++++++++++++++++++++++--------------------
 2 files changed, 275 insertions(+), 185 deletions(-)

diff --git a/package.json b/package.json
index 9c26d2763..31b1f7884 100755
--- a/package.json
+++ b/package.json
@@ -32,20 +32,20 @@
         "vtt.js": "0.13.0"
     },
     "devDependencies": {
-        "@babel/core": "7.7.4",
+        "@babel/core": "7.7.5",
         "@babel/plugin-proposal-class-properties": "7.7.4",
         "@babel/plugin-proposal-object-rest-spread": "7.7.4",
-        "@babel/preset-env": "7.7.4",
+        "@babel/preset-env": "7.7.6",
         "@babel/preset-react": "7.7.4",
-        "@babel/runtime": "7.7.4",
+        "@babel/runtime": "7.7.6",
         "@storybook/addon-actions": "5.2.8",
         "@storybook/addon-console": "1.2.1",
         "@storybook/addons": "5.2.8",
         "@storybook/react": "5.2.8",
         "babel-loader": "8.0.6",
         "clean-webpack-plugin": "3.0.0",
-        "copy-webpack-plugin": "5.0.5",
-        "css-loader": "3.2.1",
+        "copy-webpack-plugin": "5.1.1",
+        "css-loader": "3.3.2",
         "cssnano": "4.1.10",
         "cssnano-preset-advanced": "4.0.7",
         "eslint": "6.7.2",
@@ -57,8 +57,8 @@
         "mini-css-extract-plugin": "0.8.0",
         "postcss-loader": "3.0.0",
         "storybook-addon-jsx": "7.1.13",
-        "terser-webpack-plugin": "2.2.1",
-        "webpack": "4.41.2",
+        "terser-webpack-plugin": "2.3.0",
+        "webpack": "4.41.3",
         "webpack-cli": "3.3.10",
         "webpack-dev-server": "3.9.0"
     }
diff --git a/yarn.lock b/yarn.lock
index 11542419f..c90390989 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -29,7 +29,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.5":
+"@babel/core@7.7.5", "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e"
   integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw==
@@ -814,7 +814,7 @@
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
-"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.7.1":
+"@babel/preset-env@7.7.6", "@babel/preset-env@^7.4.5", "@babel/preset-env@^7.7.1":
   version "7.7.6"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2"
   integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ==
@@ -905,7 +905,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4":
+"@babel/runtime@7.7.6", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4":
   version "7.7.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
   integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
@@ -1677,9 +1677,9 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.0.tgz#f1ec1c104d1bb463556ecb724018ab788d0c172a"
-  integrity sha512-c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw==
+  version "7.6.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
+  integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==
   dependencies:
     "@babel/types" "^7.0.0"
 
@@ -1748,9 +1748,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "12.12.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
-  integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
+  version "12.12.18"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.18.tgz#8d16634797d63c2af5bc647ce879f8de20b56469"
+  integrity sha512-DBkZuIMFuAfjJHiunyRc+aNvmXYNwV1IPMgGKGlwCp6zh6MKrVtmvjSWK/axWcD25KJffkXgkfvFra8ndenXAw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1790,9 +1790,9 @@
     "@types/react" "*"
 
 "@types/react@*":
-  version "16.9.15"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.15.tgz#aeabb7a50f96c9e31a16079ada20ede9ed602977"
-  integrity sha512-WsmM1b6xQn1tG3X2Hx4F3bZwc2E82pJXt5OPs2YJgg71IzvUoKOSSSYOvLXYCg1ttipM+UuA4Lj3sfvqjVxyZw==
+  version "16.9.16"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.16.tgz#4f12515707148b1f53a8eaa4341dae5dfefb066d"
+  integrity sha512-dQ3wlehuBbYlfvRXfF5G+5TbZF3xqgkikK7DWAsQXe2KnzV+kjD4W2ea+ThCrKASZn9h98bjjPzoTYzfRqyBkw==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -2264,12 +2264,12 @@ array-flatten@^2.1.0:
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
 array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.0.tgz#48a929ef4c6bb1fa6dc4a92c9b023a261b0ca404"
+  integrity sha512-ONOEQoKrvXPKk7Su92Co0YMqYO32FfqJTzkKU9u2UpIXyYZIzLSvpdg4AwvSw4mSUW0czu6inK+zby6Oj6gDjQ==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.0"
 
 array-union@^1.0.1:
   version "1.0.2"
@@ -2289,23 +2289,32 @@ array-unique@^0.3.2:
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 array.prototype.flat@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.2.tgz#8f3c71d245ba349b6b64b4078f76f5576f1fd723"
-  integrity sha512-VXjh7lAL4KXKF2hY4FnEW9eRW6IhdvFW1sN/JwLbmECbCgACCnBHNyP3lFiYuttr0jxRN9Bsc5+G27dMseSWqQ==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
+  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.15.0"
-    function-bind "^1.1.1"
+    es-abstract "^1.17.0-next.1"
 
 array.prototype.flatmap@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.2.tgz#28d621d351c19a62b84331b01669395ef6cef4c4"
-  integrity sha512-ZZtPLE74KNE+0XcPv/vQmcivxN+8FhwOLvt2udHauO0aDEpsXDQrmd5HuJGpgPVyaV8HvkDPWnJ2iaem0oCKtA==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443"
+  integrity sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.15.0"
+    es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
 
+array.prototype.map@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.1.tgz#481519dd51f7658ddf2fbdbc1d0e986e2777f96c"
+  integrity sha512-qWw0c1MYCp8Ta2N5l5S1xdNPT5NE2KGzmPe6ZeuLFEwhtNTQGzQkT37r3RoDwZwc7nEPSQyp0ohWbwDTdIwvQg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.16.0"
+    es-array-method-boxes-properly "^1.0.0"
+    is-string "^1.0.4"
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -2829,6 +2838,13 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
 bluebird@^3.3.5, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -3168,9 +3184,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001015:
-  version "1.0.30001015"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0"
-  integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==
+  version "1.0.30001016"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz#16ea48d7d6e8caf3cad3295c2d746fe38c4e7f66"
+  integrity sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3613,10 +3629,10 @@ copy-to-clipboard@^3.0.8:
   dependencies:
     toggle-selection "^1.0.6"
 
-copy-webpack-plugin@5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.5.tgz#731df6a837a2ef0f8f8e2345bdfe9b7c62a2da68"
-  integrity sha512-7N68eIoQTyudAuxkfPT7HzGoQ+TsmArN/I3HFwG+lVE3FNzqvZKIiaxtYh4o3BIznioxUvx9j26+Rtsc9htQUQ==
+copy-webpack-plugin@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88"
+  integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==
   dependencies:
     cacache "^12.0.3"
     find-cache-dir "^2.1.0"
@@ -3628,21 +3644,21 @@ copy-webpack-plugin@5.0.5:
     normalize-path "^3.0.0"
     p-limit "^2.2.1"
     schema-utils "^1.0.0"
-    serialize-javascript "^2.1.0"
+    serialize-javascript "^2.1.2"
     webpack-log "^2.0.0"
 
 core-js-compat@^3.1.1, core-js-compat@^3.4.7:
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.8.tgz#f72e6a4ed76437ea710928f44615f926a81607d5"
-  integrity sha512-l3WTmnXHV2Sfu5VuD7EHE2w7y+K68+kULKt5RJg8ZJk3YhHF1qLD4O8v8AmNq+8vbOwnPFFDvds25/AoEvMqlQ==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.5.0.tgz#5a11a619a9e9dd2dcf1c742b2060bc4a2143e5b6"
+  integrity sha512-E7iJB72svRjJTnm9HDvujzNVMCm3ZcDYEedkJ/sDTNsy/0yooCd9Cg7GSzE7b4e0LfIkjijdB1tqg0pGwxWeWg==
   dependencies:
     browserslist "^4.8.2"
     semver "^6.3.0"
 
 core-js-pure@^3.0.1:
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.4.8.tgz#a4415834383784e81974cd34321daf36a6d2366e"
-  integrity sha512-K9iPNbLDZ0Epojwd8J3lhodmrLHYvxb07H3DaFme1ne4TIlFq/ufiyPC40rc3OX6NCaVa0zaSu+VV6BVDR2wiA==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.5.0.tgz#f63c7f2b245e7d678e73f87ad28505480554d70e"
+  integrity sha512-wB0QtKAofWigiISuT1Tej3hKgq932fB//Lf1VoPbiLpTYlHY0nIDhgF+q1na0DAKFHH5wGCirkAknOmDN8ijXA==
 
 core-js@^1.0.0:
   version "1.2.7"
@@ -3655,9 +3671,9 @@ core-js@^2.4.0:
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
 core-js@^3.0.1, core-js@^3.0.4:
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.8.tgz#e0fc0c61f2ef90cbc10c531dbffaa46dfb7152dd"
-  integrity sha512-b+BBmCZmVgho8KnBUOXpvlqEMguko+0P+kXCwD4vIprsXC6ht1qgPxtb1OK6XgSlrySF71wkwBQ0Hv695bk9gQ==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.5.0.tgz#66df8e49be4bd775e6f952a9d083b756ad41c1ed"
+  integrity sha512-Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -3790,10 +3806,10 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-loader@3.2.1, css-loader@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.2.1.tgz#62849b45a414b7bde0bfba17325a026471040eae"
-  integrity sha512-q40kYdcBNzMvkIImCL2O+wk8dh+RGwPPV9Dfz3n7XtOYPXqe2Z6VgtvoxjkLHz02gmhepG9sOAJOUlx+3hHsBg==
+css-loader@3.3.2, css-loader@^3.0.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.3.2.tgz#41b2086528aa4fbf8c0692e874bc14f081129b21"
+  integrity sha512-4XSiURS+YEK2fQhmSaM1onnUm0VKWNf6WWBYjkp9YbSDGCBTVZ5XOM6Gkxo8tLgQlzkZOBJvk9trHlDk4gjEYg==
   dependencies:
     camelcase "^5.3.1"
     cssesc "^3.0.0"
@@ -3966,9 +3982,9 @@ cssstyle@^1.0.0:
     cssom "0.3.x"
 
 csstype@^2.2.0, csstype@^2.5.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.7.tgz#20b0024c20b6718f4eda3853a1f5a1cce7f5e4a5"
-  integrity sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ==
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.8.tgz#0fb6fc2417ffd2816a418c9336da74d7f07db431"
+  integrity sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA==
 
 cyclist@^1.0.1:
   version "1.0.1"
@@ -4022,7 +4038,7 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-deep-equal@^1.0.1:
+deep-equal@^1.0.1, deep-equal@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
   integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
@@ -4485,7 +4501,7 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.12.0, es-abstract@^1.13.0, es-abstract@^1.15.0, es-abstract@^1.16.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.7.0:
+es-abstract@^1.16.0, es-abstract@^1.16.2:
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161"
   integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw==
@@ -4501,6 +4517,41 @@ es-abstract@^1.12.0, es-abstract@^1.13.0, es-abstract@^1.15.0, es-abstract@^1.16
     string.prototype.trimleft "^2.1.0"
     string.prototype.trimright "^2.1.0"
 
+es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1:
+  version "1.17.0-next.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172"
+  integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.0"
+    string.prototype.trimright "^2.1.0"
+
+es-array-method-boxes-properly@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+
+es-get-iterator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.0.1.tgz#ebc4d3bbc2d59dd95a0ecef441ca2dbce7d9e2cd"
+  integrity sha512-pswpctxWRElQDcP0RJy0qmNrpf6nH9SeQl8dra5fFHBPHKfpVIST27Kv4j5enE8JhIssRBI4QPMrNvcyIPhapQ==
+  dependencies:
+    es-abstract "^1.16.2"
+    has-symbols "^1.0.1"
+    is-arguments "^1.0.4"
+    is-map "^2.0.0"
+    is-set "^2.0.0"
+    is-string "^1.0.4"
+    isarray "^2.0.5"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -4887,9 +4938,9 @@ fast-glob@^2.0.2:
     micromatch "^3.1.10"
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@~2.0.6:
   version "2.0.6"
@@ -4980,6 +5031,11 @@ file-system-cache@^1.0.5:
     fs-extra "^0.30.0"
     ramda "^0.21.0"
 
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 filesize@3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
@@ -5017,10 +5073,10 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-cache-dir@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.1.0.tgz#9935894999debef4cf9f677fdf646d002c4cdecb"
-  integrity sha512-zw+EFiNBNPgI2NTrKkDd1xd7q0cs6wr/iWnr/oUkI0yF9K9GqQ+riIt4aiyFaaqpaWbxPrJXHI+QvmNUQbX+0Q==
+find-cache-dir@^3.0.0, find-cache-dir@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz#e7fe44c1abc1299f516146e563108fd1006c1874"
+  integrity sha512-1JKclkYYsf1q9WIJKLZa9S9muC+08RIjzAlLrK4QcYLJMS6mk9yombQ9qf+zJ7H9LS800k0s44L4sDq9VYzqyg==
   dependencies:
     commondir "^1.0.1"
     make-dir "^3.0.0"
@@ -5222,34 +5278,33 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
-  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
+  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
   dependencies:
+    bindings "^1.5.0"
     nan "^2.12.1"
-    node-pre-gyp "^0.12.0"
 
-function-bind@^1.0.2, function-bind@^1.1.1:
+function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 function.prototype.name@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.1.tgz#6d252350803085abc2ad423d4fe3be2f9cbda392"
-  integrity sha512-e1NzkiJuw6xqVH7YSdiW/qDHebcmMhPNe6w+4ZYYEg0VA+LaLzx37RimbPLuonHhYGFGPx1ME2nSi74JiaCr/Q==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz#5cdf79d7c05db401591dfde83e3b70c5123e9a45"
+  integrity sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==
   dependencies:
     define-properties "^1.1.3"
-    function-bind "^1.1.1"
-    functions-have-names "^1.1.1"
-    is-callable "^1.1.4"
+    es-abstract "^1.17.0-next.1"
+    functions-have-names "^1.2.0"
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-functions-have-names@^1.1.1:
+functions-have-names@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.0.tgz#83da7583e4ea0c9ac5ff530f73394b033e0bf77d"
   integrity sha512-zKXyzksTeaCSw5wIX79iCA40YAa6CJMJgNg9wdkU/ERBrIdPSimPICYiLp65lRbSBqtiHql/HZfS2DyI/AH6tQ==
@@ -5552,7 +5607,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.0, has@^1.0.1, has@^1.0.3:
+has@^1.0.0, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -5989,9 +6044,9 @@ inquirer@^6.2.0:
     through "^2.3.6"
 
 inquirer@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a"
-  integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.1.tgz#13f7980eedc73c689feff3994b109c4e799c6ebb"
+  integrity sha512-V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw==
   dependencies:
     ansi-escapes "^4.2.1"
     chalk "^2.4.2"
@@ -6002,7 +6057,7 @@ inquirer@^7.0.0:
     lodash "^4.17.15"
     mute-stream "0.0.8"
     run-async "^2.2.0"
-    rxjs "^6.4.0"
+    rxjs "^6.5.3"
     string-width "^4.1.0"
     strip-ansi "^5.1.0"
     through "^2.3.6"
@@ -6258,6 +6313,11 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz#e8a426a69b6d31470d3a33a47bb825cda02506ee"
   integrity sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA==
 
+is-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.0.tgz#1d223ada48a1f5fdb7b3c5c21a45b6a4d48aec3c"
+  integrity sha512-ptj+FffEGJN9hLuakga2S3mYQt5PVN+w7+fL3SAgxKhlCePSt24Q3fiSozhvphbwCQ0+QPA1rJnLSoS2LnbCVw==
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -6319,11 +6379,11 @@ is-promise@^2.1.0:
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
   dependencies:
-    has "^1.0.1"
+    has "^1.0.3"
 
 is-resolvable@^1.0.0:
   version "1.1.0"
@@ -6335,11 +6395,21 @@ is-root@2.1.0:
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
   integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==
 
+is-set@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.0.tgz#ae93342b1de5560c720b4b71599abc799d183cf4"
+  integrity sha512-So5/xwRDzU3X7kOt2vpvrsj/Asx5E7Q5IyX6itksB96FJgyydSe9tFwfCq7IZ8URDS4h45FhNgfENToTgBfmgw==
+
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-string@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
+  integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=
+
 is-svg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
@@ -6379,6 +6449,11 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -6459,6 +6534,13 @@ istanbul-reports@^2.2.6:
   dependencies:
     handlebars "^4.1.2"
 
+iterate-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/iterate-value/-/iterate-value-1.0.1.tgz#d2003239b4a06c91a3f8092e379f6062b03c268c"
+  integrity sha512-xc6jTbwPOWEdD26y41BpJBqh/w3kuEcsQxTypXD+xYQA2+OZIfemmkm725cnRbm1cHj4SMLUO1+7oIA97e88gg==
+  dependencies:
+    es-get-iterator "^1.0.1"
+
 jest-changed-files@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
@@ -7758,10 +7840,10 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
-  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -7772,7 +7854,7 @@ node-pre-gyp@^0.12.0:
     rc "^1.2.7"
     rimraf "^2.6.1"
     semver "^5.3.0"
-    tar "^4"
+    tar "^4.4.2"
 
 node-releases@^1.1.29, node-releases@^1.1.42:
   version "1.1.42"
@@ -7832,14 +7914,21 @@ normalize-url@^3.0.0:
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
 npm-bundled@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.0.tgz#2e8fdb7e69eff2df963937b696243316537c284b"
-  integrity sha512-ez6dcKBFNo4FvlMqscBEFUum6M2FTLW5grqm3DyBKB5XOyKVCeeWvAuoZtbmW/5Cv8EM2bQUOA6ufxa/TKVN0g==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
 npm-packlist@^1.1.6:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz#53ba3ed11f8523079f1457376dd379ee4ea42ff4"
-  integrity sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848"
+  integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -7908,9 +7997,9 @@ object-inspect@^1.7.0:
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
 object-is@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
-  integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
+  integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==
 
 object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
@@ -7935,32 +8024,32 @@ object.assign@^4.1.0:
     object-keys "^1.0.11"
 
 object.entries@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"
-  integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b"
+  integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.12.0"
+    es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
     has "^1.0.3"
 
 "object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
-  integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
+  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.15.0"
+    es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
     has "^1.0.3"
 
 object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -7970,12 +8059,12 @@ object.pick@^1.3.0:
     isobject "^3.0.1"
 
 object.values@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
-  integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
+  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.12.0"
+    es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
     has "^1.0.3"
 
@@ -8891,21 +8980,23 @@ promise-inflight@^1.0.1:
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise.allsettled@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.1.tgz#afe4bfcc13b26e2263a97a7fbbb19b8ca6eb619c"
-  integrity sha512-3ST7RS7TY3TYLOIe+OACZFvcWVe1osbgz2x07nTb446pa3t4GUZWidMDzQ4zf9jC2l6mRa1/3X81icFYbi+D/g==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.2.tgz#d66f78fbb600e83e863d893e98b3d4376a9c47c9"
+  integrity sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==
   dependencies:
+    array.prototype.map "^1.0.1"
     define-properties "^1.1.3"
-    es-abstract "^1.13.0"
+    es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
+    iterate-value "^1.0.0"
 
 promise.prototype.finally@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.1.tgz#cb279d3a5020ca6403b3d92357f8e22d50ed92aa"
-  integrity sha512-gnt8tThx0heJoI3Ms8a/JdkYBVhYP/wv+T7yQimR+kdOEJL21xTFbiJhMRqnSPcr54UVvMbsscDk2w+ivyaLPw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz#b8af89160c9c673cefe3b4c4435b53cfd0287067"
+  integrity sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.13.0"
+    es-abstract "^1.17.0-next.0"
     function-bind "^1.1.1"
 
 promise@^7.1.1:
@@ -9270,12 +9361,13 @@ react-popper-tooltip@^2.8.3:
     react-popper "^1.3.6"
 
 react-popper@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.6.tgz#32122f83af8fda01bdd4f86625ddacaf64fdd06d"
-  integrity sha512-kLTfa9z8n+0jJvRVal9+vIuirg41rObg4Bbrvv/ZfsGPQDN9reyVVSxqnHF1ZNgXgV7x11PeUfd5ItF8DZnqhg==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz#f6a3471362ef1f0d10a4963673789de1baca2324"
+  integrity sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==
   dependencies:
     "@babel/runtime" "^7.1.2"
     create-react-context "^0.3.0"
+    deep-equal "^1.1.1"
     popper.js "^1.14.4"
     prop-types "^15.6.1"
     typed-styles "^0.0.7"
@@ -9460,11 +9552,12 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     safe-regex "^1.1.0"
 
 regexp.prototype.flags@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
-  integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
+  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
   dependencies:
-    define-properties "^1.1.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
 
 regexpp@^2.0.1:
   version "2.0.1"
@@ -9489,9 +9582,9 @@ regjsgen@^0.5.0:
   integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
 regjsparser@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
-  integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.1.tgz#5b6b28c418f312ef42898dc6865ae2d4b9f0f7a2"
+  integrity sha512-7LutE94sz/NKSYegK+/4E77+8DipxF+Qn2Tmu362AcmsF2NYq/wx3+ObvU90TKEhjf7hQoFXo23ajjrXP7eUgg==
   dependencies:
     jsesc "~0.5.0"
 
@@ -9717,7 +9810,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.4.0:
+rxjs@^6.4.0, rxjs@^6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
   integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
@@ -9788,7 +9881,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.5.0, schema-utils@^2.6.0:
+schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f"
   integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==
@@ -9842,7 +9935,7 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
-serialize-javascript@^2.1.0, serialize-javascript@^2.1.1:
+serialize-javascript@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
@@ -10298,9 +10391,9 @@ stream-http@^2.7.2:
     xtend "^4.0.0"
 
 stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
 "stremio-colors@git+ssh://git@github.com/Stremio/stremio-colors.git#v2.0.4":
   version "2.0.4"
@@ -10363,33 +10456,30 @@ string-width@^4.1.0:
     strip-ansi "^6.0.0"
 
 "string.prototype.matchall@^4.0.0 || ^3.0.1":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.0.tgz#47191e37b67dca43131706bc9c4550df31b2c471"
-  integrity sha512-/cSuf1qsUaPicdvXcVZJ98fM9FmvkXvw7PKSM5pTtlj4R9VLQc7B51fOZBMsGfv9UXhUhdpxSrEsGe2ObsR2cw==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.1.tgz#f10fdfa8d1fee12e149fddda14f211b6bb3527da"
+  integrity sha512-vIObm+BWuKKJovfh2/PPCAmePTDdubrgCkhQnbP0oAwD7Jj8IyIM57Hu7Ma7oDdg4oVdh5S1Rd8RviBIPZ8Pfg==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.15.0"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
+    es-abstract "^1.17.0-next.1"
+    has-symbols "^1.0.1"
     regexp.prototype.flags "^1.2.0"
 
 string.prototype.padend@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
-  integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz#dc08f57a8010dc5c153550318f67e13adbb72ac3"
+  integrity sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.4.3"
-    function-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
 
 string.prototype.padstart@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.0.0.tgz#5bcfad39f4649bb2d031292e19bcf0b510d4b242"
-  integrity sha1-W8+tOfRkm7LQMSkuGbzwtRDUskI=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.1.0.tgz#b47c087540d0710be5a49375751a0a627bd4ff90"
+  integrity sha512-envqZvUp2JItI+OeQ5UAh1ihbAV5G/2bixTojvlIa090GGqF+NQRxbWb2nv9fTGrZABv6+pE6jXoAZhhS2k4Hw==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.4.3"
-    function-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
 
 string.prototype.trimleft@^2.1.0:
   version "2.1.0"
@@ -10535,12 +10625,12 @@ symbol-tree@^3.2.2:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 symbol.prototype.description@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/symbol.prototype.description/-/symbol.prototype.description-1.0.1.tgz#e44e5db04d977932d1a261570bf65312773406d0"
-  integrity sha512-smeS1BCkN6lcz1XveFK+cfvfBmNJ6dcPi6lgOnLUU8Po8SmV+rtmYGObbNOisW9RHWMyUfsgMA+eTQg+b3v9Vg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/symbol.prototype.description/-/symbol.prototype.description-1.0.2.tgz#f325e1e6ad534b3b29c9c3ca73c136c9ce03c5e2"
+  integrity sha512-2CW5SU4/Ki1cYOOHcL2cXK4rxSg5hCU1TwZ7X4euKhV9VnfqKslh7T6/UyKkubA8cq2tOmsOv7m3ZUmQslBRuw==
   dependencies:
-    es-abstract "^1.16.0"
-    has-symbols "^1.0.0"
+    es-abstract "^1.17.0-next.1"
+    has-symbols "^1.0.1"
 
 table@^5.2.3:
   version "5.4.6"
@@ -10557,7 +10647,7 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4:
+tar@^4.4.2:
   version "4.4.13"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
   integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
@@ -10591,36 +10681,36 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.1.tgz#5569e6c7d8be79e5e43d6da23acc3b6ba77d22bd"
-  integrity sha512-jwdauV5Al7zopR6OAYvIIRcxXCSvLjZjr7uZE8l2tIWb/ryrGN48sJftqGf5k9z09tWhajx53ldp0XPI080YnA==
+terser-webpack-plugin@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.0.tgz#00fd8f792a330dc572e2e2b468fd7cb5ffd7ea51"
+  integrity sha512-yez0HdpDf/iQVYGf+e/o8ZYWLb1g9d1nRRi5FIOZ4KfXbfSPT259UoqxPiSLhCnr0mlDoh+bucpYQSFbU0cEsQ==
   dependencies:
     cacache "^13.0.1"
-    find-cache-dir "^3.0.0"
+    find-cache-dir "^3.1.0"
     jest-worker "^24.9.0"
-    schema-utils "^2.5.0"
-    serialize-javascript "^2.1.0"
+    schema-utils "^2.6.1"
+    serialize-javascript "^2.1.2"
     source-map "^0.6.1"
-    terser "^4.3.9"
+    terser "^4.4.2"
     webpack-sources "^1.4.3"
 
-terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.2.tgz#e23c0d554587d1f473bd0cf68627720e733890a4"
-  integrity sha512-fdEb91kR2l+BVgES77N/NTXWZlpX6vX+pYPjnX5grcDYBF2CMnzJiXX4NNlna4l04lvCW39lZ+O/jSvUhHH/ew==
+terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
+  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
   dependencies:
     cacache "^12.0.2"
     find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^2.1.1"
+    serialize-javascript "^2.1.2"
     source-map "^0.6.1"
     terser "^4.1.2"
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^4.1.2, terser@^4.3.9:
+terser@^4.1.2, terser@^4.3.9, terser@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8"
   integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ==
@@ -11238,10 +11328,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@4.41.2, webpack@^4.33.0, webpack@^4.38.0:
-  version "4.41.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
-  integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
+webpack@4.41.3, webpack@^4.33.0, webpack@^4.38.0:
+  version "4.41.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.3.tgz#cb7592c43080337dbc9be9e98fc6478eb3981026"
+  integrity sha512-EcNzP9jGoxpQAXq1VOoTet0ik7/VVU1MovIfcUSAjLowc7GhcQku/sOXALvq5nPpSei2HF6VRhibeJSC3i/Law==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
@@ -11263,7 +11353,7 @@ webpack@4.41.2, webpack@^4.33.0, webpack@^4.38.0:
     node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
     tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.1"
+    terser-webpack-plugin "^1.4.3"
     watchpack "^1.6.0"
     webpack-sources "^1.4.1"
 

From 1096d62dec31760d124273aeb51a1851522e3e4f Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 17:06:20 +0200
Subject: [PATCH 27/28] spatial-navigation-polyfill used from stremio origin

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 31b1f7884..3f9499a5d 100755
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
         "react": "16.12.0",
         "react-dom": "16.12.0",
         "react-focus-lock": "2.2.1",
-        "spatial-navigation-polyfill": "git+ssh://git@github.com/NikolaBorislavovHristov/spatial-navigation.git#964d09bf2b0853e27af6c25924b595d6621a019d",
+        "spatial-navigation-polyfill": "git+ssh://git@github.com/Stremio/spatial-navigation.git#381b4f37d138e66ae8ea025e240af3704245e5dc",
         "stremio-colors": "git+ssh://git@github.com/Stremio/stremio-colors.git#v2.0.4",
         "stremio-core-web": "git+ssh://git@github.com/stremio/stremio-core-web.git#da5b37865004d0ae140518c4f276d1ed1a1483d9",
         "stremio-icons": "git+ssh://git@github.com/Stremio/stremio-icons.git#v1.0.11",
diff --git a/yarn.lock b/yarn.lock
index c90390989..afe14e5f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10225,9 +10225,9 @@ space-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz#27910835ae00d0adfcdbd0ad7e611fb9544351fa"
   integrity sha512-UyhMSmeIqZrQn2UdjYpxEkwY9JUrn8pP+7L4f91zRzOQuI8MF1FGLfYU9DKCYeLdo7LXMxwrX5zKFy7eeeVHuA==
 
-"spatial-navigation-polyfill@git+ssh://git@github.com/NikolaBorislavovHristov/spatial-navigation.git#964d09bf2b0853e27af6c25924b595d6621a019d":
+"spatial-navigation-polyfill@git+ssh://git@github.com/Stremio/spatial-navigation.git#381b4f37d138e66ae8ea025e240af3704245e5dc":
   version "1.2.0"
-  resolved "git+ssh://git@github.com/NikolaBorislavovHristov/spatial-navigation.git#964d09bf2b0853e27af6c25924b595d6621a019d"
+  resolved "git+ssh://git@github.com/Stremio/spatial-navigation.git#381b4f37d138e66ae8ea025e240af3704245e5dc"
 
 spdx-correct@^3.0.0:
   version "3.1.0"

From 8a9dae6ddc35d2ee035a31471bd3641b6e233c66 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Mon, 16 Dec 2019 17:21:09 +0200
Subject: [PATCH 28/28] Library sort param moved from query params to url
 params

---
 src/common/routesRegexp.js                |  4 ++--
 src/routes/Library/Library.js             |  8 ++++----
 src/routes/Library/useLibrary.js          | 11 ++++-------
 src/routes/Library/useSelectableInputs.js | 11 ++---------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/common/routesRegexp.js b/src/common/routesRegexp.js
index 113497ec5..f4128765b 100644
--- a/src/common/routesRegexp.js
+++ b/src/common/routesRegexp.js
@@ -12,8 +12,8 @@ const routesRegexp = {
         urlParamsNames: ['addonTransportUrl', 'type', 'catalogId']
     },
     library: {
-        regexp: /^\/library(?:\/([^/]*))?$/,
-        urlParamsNames: ['type']
+        regexp: /^\/library(?:\/([^/]*)\/([^/]*))?$/,
+        urlParamsNames: ['type', 'sort']
     },
     search: {
         regexp: /^\/search$/,
diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index d3c081646..378612678 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -7,8 +7,8 @@ const useSelectableInputs = require('./useSelectableInputs');
 const useItemOptions = require('./useItemOptions');
 const styles = require('./styles');
 
-const Library = ({ urlParams, queryParams }) => {
-    const library = useLibrary(urlParams, queryParams);
+const Library = ({ urlParams }) => {
+    const library = useLibrary(urlParams);
     const [typeSelect, sortPropSelect] = useSelectableInputs(library);
     const [options, optionOnSelect] = useItemOptions();
     return (
@@ -73,8 +73,8 @@ const Library = ({ urlParams, queryParams }) => {
 Library.propTypes = {
     urlParams: PropTypes.exact({
         type: PropTypes.string,
-    }),
-    queryParams: PropTypes.instanceOf(URLSearchParams)
+        sort: PropTypes.string
+    })
 };
 
 module.exports = Library;
diff --git a/src/routes/Library/useLibrary.js b/src/routes/Library/useLibrary.js
index b2426e055..69c63f56e 100644
--- a/src/routes/Library/useLibrary.js
+++ b/src/routes/Library/useLibrary.js
@@ -46,20 +46,17 @@ const onNewLibraryState = (library) => {
     }
 };
 
-const useLibrary = (urlParams, queryParams) => {
+const useLibrary = (urlParams) => {
     const { core } = useServices();
     const loadLibraryAction = React.useMemo(() => {
-        if (typeof urlParams.type === 'string') {
+        if (typeof urlParams.type === 'string' && typeof urlParams.sort === 'string') {
             return {
                 action: 'Load',
                 args: {
                     load: 'LibraryFiltered',
                     args: {
                         type_name: urlParams.type,
-                        sort_prop: queryParams.has('sort_prop') ?
-                            queryParams.get('sort_prop')
-                            :
-                            null
+                        sort_prop: urlParams.sort
                     }
                 }
             };
@@ -82,7 +79,7 @@ const useLibrary = (urlParams, queryParams) => {
                 };
             }
         }
-    }, [urlParams, queryParams]);
+    }, [urlParams]);
     return useModelState({
         model: 'library',
         action: loadLibraryAction,
diff --git a/src/routes/Library/useSelectableInputs.js b/src/routes/Library/useSelectableInputs.js
index 601ce9731..645db1457 100644
--- a/src/routes/Library/useSelectableInputs.js
+++ b/src/routes/Library/useSelectableInputs.js
@@ -16,13 +16,7 @@ const mapSelectableInputs = (library) => {
         options: library.type_names
             .map((type) => ({ label: type, value: type })),
         onSelect: (event) => {
-            const queryParams = new URLSearchParams(
-                library.selected !== null ?
-                    [['sort_prop', library.selected.sort_prop]]
-                    :
-                    []
-            );
-            window.location.replace(`#/library/${encodeURIComponent(event.value)}?${queryParams.toString()}`);
+            window.location.replace(`#/library/${encodeURIComponent(event.value)}/${encodeURIComponent(library.selected.sort_prop)}`);
         }
     };
     const sortPropSelect = {
@@ -33,9 +27,8 @@ const mapSelectableInputs = (library) => {
             [],
         options: SORT_PROP_OPTIONS,
         onSelect: (event) => {
-            const queryParams = new URLSearchParams([['sort_prop', event.value]]);
             if (library.selected !== null) {
-                window.location.replace(`#/library/${encodeURIComponent(library.selected.type_name)}?${queryParams.toString()}`);
+                window.location.replace(`#/library/${encodeURIComponent(library.selected.type_name)}/${encodeURIComponent(event.value)}`);
             }
         }
     };