From 9b90c6ab41bb414997be648ba13a2e6b2842efd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:18:23 +0000
Subject: [PATCH 01/18] Bump hosted-git-info from 2.6.0 to 2.8.9

Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.6.0 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.6.0...v2.8.9)

---
updated-dependencies:
- dependency-name: hosted-git-info
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index de1451c..cab0d49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3398,8 +3398,9 @@ hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.2:
     react-is "^16.7.0"
 
 hosted-git-info@^2.1.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hosted-git-info@^4.0.1:
   version "4.1.0"

From db7cabab1e689656326f56eb40276bf79c3cc8b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:21:59 +0000
Subject: [PATCH 02/18] Bump css-loader from 6.0.0 to 6.7.1

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.0.0 to 6.7.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.0.0...v6.7.1)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 31 ++++++++++---------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 37be375..38c285a 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "@typescript-eslint/parser": "^5.37.0",
     "autoprefixer": "^9.8.8",
     "copy-webpack-plugin": "^5.1.2",
-    "css-loader": "6.0.0",
+    "css-loader": "6.7.1",
     "eslint": "^8.23.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
diff --git a/yarn.lock b/yarn.lock
index de1451c..393133f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1939,18 +1939,18 @@ crypto-browserify@^3.12.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-css-loader@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.0.0.tgz#e3f9131229df43e081876f434dc2f4605be9d5ae"
-  integrity sha512-xi3iTbHekvk5dWWdqfQKNsEm2g3Vr20uRwHzfXF+pHsaFGMuxTrqR1y8PY+st5G7wqid4/pBSiaqZsO6iaGN5g==
+css-loader@6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e"
+  integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.2.15"
+    postcss "^8.4.7"
     postcss-modules-extract-imports "^3.0.0"
     postcss-modules-local-by-default "^4.0.0"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.2.0"
     semver "^7.3.5"
 
 css-modules-loader-core@^1.1.0:
@@ -5474,7 +5474,7 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
@@ -5503,7 +5503,7 @@ postcss@^7.0.32:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.2.15:
+postcss@^8.4.7:
   version "8.4.16"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
   integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
@@ -6153,23 +6153,12 @@ secp256k1@^4.0.2, secp256k1@^4.0.3:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
-"semver@2 || 3 || 4 || 5":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-
-semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^7.3.4:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.5, semver@^7.3.7:
+semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==

From 12847cab2a861e11cc7e73be55a23d6c9280e462 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:22:18 +0000
Subject: [PATCH 03/18] Bump sass-loader from 7.0.3 to 13.0.2

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.0.3 to 13.0.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.0.3...v13.0.2)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 58 ++++++++--------------------------------------------
 2 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/package.json b/package.json
index 37be375..c8149cf 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "postcss-loader": "5.0.0",
     "postcss-modules": "4.3.1",
     "react-router-dom": "6",
-    "sass-loader": "^7.0.3",
+    "sass-loader": "^13.0.2",
     "style-loader": "3.0.0",
     "ts-loader": "9.0.0",
     "typescript": "4.2",
diff --git a/yarn.lock b/yarn.lock
index de1451c..d4c9bde 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1686,15 +1686,6 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
-clone-deep@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
-  dependencies:
-    for-own "^1.0.0"
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.0"
-    shallow-clone "^1.0.0"
-
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -2919,20 +2910,10 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-for-in@^0.1.3:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-
-for-in@^1.0.1, for-in@^1.0.2:
+for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  dependencies:
-    for-in "^1.0.1"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -4224,7 +4205,7 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-loader-utils@^1.0.1, loader-utils@^1.2.3:
+loader-utils@^1.2.3:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
   integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -4285,10 +4266,6 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.tail@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
-
 lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.15, lodash@~4.17.10:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -4686,13 +4663,6 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mixin-object@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
-  dependencies:
-    for-in "^0.1.3"
-    is-extendable "^0.1.1"
-
 mkdirp@^0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -4804,7 +4774,7 @@ negotiator@^0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-neo-async@^2.5.0, neo-async@^2.6.2:
+neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -6064,15 +6034,13 @@ sass-graph@4.0.0:
     scss-tokenizer "^0.3.0"
     yargs "^17.2.1"
 
-sass-loader@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.0.3.tgz#6ca10871a1cc7549f8143db5a9958242c4e4ca2a"
+sass-loader@^13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.0.2.tgz#e81a909048e06520e9f2ff25113a801065adb3fe"
+  integrity sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==
   dependencies:
-    clone-deep "^2.0.1"
-    loader-utils "^1.0.1"
-    lodash.tail "^4.1.1"
-    neo-async "^2.5.0"
-    pify "^3.0.0"
+    klona "^2.0.4"
+    neo-async "^2.6.2"
 
 scheduler@^0.21.0:
   version "0.21.0"
@@ -6228,14 +6196,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
-  dependencies:
-    is-extendable "^0.1.1"
-    kind-of "^5.0.0"
-    mixin-object "^2.0.1"
-
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"

From 1671e1bfbfac83711290586a1f1e79c4b3e54fb1 Mon Sep 17 00:00:00 2001
From: nibbles83 <hardke01@yahoo.co.uk>
Date: Thu, 29 Sep 2022 17:12:38 +0100
Subject: [PATCH 04/18] Migrate to manifest v3

---
 .eslintignore                                 |  1 +
 package.json                                  |  2 +
 .../controllers/accountController.ts          |  6 +-
 .../controllers/cryptoController.ts           | 76 ++++++++++++++-----
 .../controllers/externalController.ts         | 10 +--
 .../controllers/mrc721Controller.ts           |  2 +-
 .../controllers/onInstallController.ts        | 17 +++--
 .../controllers/sessionController.ts          |  2 +-
 src/background/controllers/tokenController.ts |  2 +-
 .../controllers/transactionController.ts      |  2 +-
 src/background/index.ts                       |  2 +-
 src/background/workers/scryptworker.js        |  2 +-
 src/popup/MainContainer.tsx                   |  9 ++-
 src/popup/components/Loading/index.tsx        |  5 +-
 static/manifest.json                          | 74 +++++++++---------
 static/service_worker.js                      |  7 ++
 yarn.lock                                     | 30 ++++++++
 17 files changed, 170 insertions(+), 79 deletions(-)
 create mode 100644 static/service_worker.js

diff --git a/.eslintignore b/.eslintignore
index 9602471..8d739b4 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,6 @@
 .eslintrc.js
 scryptworker.js
+service_worker.js
 global.css
 en_US.json
 logo.svg
diff --git a/package.json b/package.json
index 37be375..ebbfced 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
     "chrome-call": "^3.0.0",
     "classnames": "^2.2.6",
     "deep-equal": "^2.0.5",
+    "fetch-absolute": "^1.0.0",
     "follow-redirects": "1.14.8",
     "metrixjs-wallet": "^0.2.20",
     "mobx": "^5.15.7",
@@ -75,6 +76,7 @@
     "mobx-react-router": "^4.1.0",
     "moment": "^2.29.4",
     "mweb3": "^1.0.0",
+    "node-fetch": "2",
     "qrcode.react": "^3.1.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
diff --git a/src/background/controllers/accountController.ts b/src/background/controllers/accountController.ts
index 0883737..1c2e1b9 100644
--- a/src/background/controllers/accountController.ts
+++ b/src/background/controllers/accountController.ts
@@ -410,7 +410,7 @@ export default class AccountController extends IController {
   */
   private startPolling = async () => {
     if (!this.getInfoInterval) {
-      this.getInfoInterval = window.setInterval(() => {
+      this.getInfoInterval = self.setInterval(() => {
         this.getWalletInfo();
       }, AccountController.GET_INFO_INTERVAL_MS);
     }
@@ -433,8 +433,8 @@ export default class AccountController extends IController {
     */
     try {
       const rates = {
-        [TRANSACTION_SPEED.FAST]: 225000000,
-        [TRANSACTION_SPEED.NORMAL]: 225000000,
+        [TRANSACTION_SPEED.FAST]: 1000000000,
+        [TRANSACTION_SPEED.NORMAL]: 500000000,
         [TRANSACTION_SPEED.SLOW]: 225000000,
       };
       const feeRate = rates[transactionSpeed]; // satoshi/byte; 1000000 satoshi/byte == 10 MRX/KB
diff --git a/src/background/controllers/cryptoController.ts b/src/background/controllers/cryptoController.ts
index c88665e..1a18953 100644
--- a/src/background/controllers/cryptoController.ts
+++ b/src/background/controllers/cryptoController.ts
@@ -1,5 +1,5 @@
 import { isEmpty, split } from 'lodash';
-
+import scrypt from 'scryptsy';
 import MetriMaskController from '.';
 import IController from './iController';
 import { STORAGE } from '../../constants';
@@ -49,7 +49,7 @@ export default class CryptoController extends IController {
   public generateAppSaltIfNecessary = () => {
     try {
       if (!this.appSalt) {
-        const appSalt: Uint8Array = window.crypto.getRandomValues(new Uint8Array(16)) ;
+        const appSalt: Uint8Array = self.crypto.getRandomValues(new Uint8Array(16)) ;
         this.appSalt = appSalt;
         chrome.storage.local.set(
           { [STORAGE.APP_SALT]: appSalt.toString() },
@@ -69,28 +69,64 @@ export default class CryptoController extends IController {
       throw Error('appSalt should not be empty');
     }
 
+
+    // FIXME this causes the loading screen to "freeze"
+    try {
+      const saltBuffer = Buffer.from(this.appSalt);
+      const { N, r, p } = CryptoController.SCRYPT_PARAMS_PW;
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      const derivedKey = scrypt(password, saltBuffer, N, r, p, 64);
+      this.passwordHash = derivedKey.toString('hex');
+      finish();
+    } catch (err) {
+      console.log({ err });
+    }
+
+
     /*
     * Create a web worker for the scrypt key derivation, so that it doesn't freeze the loading screen ui.
     * File path relative to post bundling of webpack. worker-loader node module did not work for me,
     * possibly a compatibility issue with chrome.
     */
-    let sww;
-    if (typeof(sww) === 'undefined') {
-      sww = new Worker('./scryptworker.js');
-
-      sww.postMessage({
-        password,
-        salt: this.appSalt,
-        scryptParams: CryptoController.SCRYPT_PARAMS_PW,
-      });
-
-      sww.onmessage = (e) => {
-        if (e.data.err) {
-          throw Error('scrypt failed to calculate derivedKey');
-        }
-        this.passwordHash = e.data.passwordHash;
-        finish();
-      };
-    }
+    //  let sww;
+    //  if (typeof(sww) === 'undefined') {
+    //     sww = new self.Worker(
+    //     // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+    //     self.URL.createObjectURL(new Blob(['('+this.worker_function.toString()+')()'], {type: 'text/javascript'})));
+    //     // sww = new Worker('./scryptworker.js');
+
+    //     sww.postMessage({
+    //      password,
+    //      salt: this.appSalt,
+    //      scryptParams: CryptoController.SCRYPT_PARAMS_PW,
+    //    });
+
+    //    sww.onmessage = (e) => {
+    //      if (e.data.err) {
+    //        throw Error('scrypt failed to calculate derivedKey');
+    //      }
+    //      this.passwordHash = e.data.passwordHash;
+    //      finish();
+    //    };
+    // }
   };
+
+  // public worker_function = () => {
+  //   onmessage = (e) => {
+  //     const ctx: Worker = self as any;
+  //     try {
+  //       const password = e.data.password;
+  //       const salt = e.data.salt;
+  //       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+  //       const saltBuffer = Buffer.from(salt);
+  //       const { N, r, p } = e.data.scryptParams;
+  //       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+  //       const derivedKey = scrypt(password, saltBuffer, N, r, p, 64);
+  //       const passwordHash = derivedKey.toString('hex');
+  //       ctx.postMessage({ passwordHash });
+  //     } catch (err) {
+  //       ctx.postMessage({ err });
+  //     }
+  //   };
+  // };
 }
diff --git a/src/background/controllers/externalController.ts b/src/background/controllers/externalController.ts
index dcbacee..e145137 100644
--- a/src/background/controllers/externalController.ts
+++ b/src/background/controllers/externalController.ts
@@ -1,4 +1,4 @@
-import axios from 'axios';
+const fetch = require('node-fetch');
 
 import MetriMaskController from '.';
 import IController from './iController';
@@ -30,7 +30,7 @@ export default class ExternalController extends IController {
   public startPolling = async () => {
     await this.getMetrixPrice();
     if (!this.getPriceInterval) {
-      this.getPriceInterval = window.setInterval(() => {
+      this.getPriceInterval = self.setInterval(() => {
         this.getMetrixPrice();
       }, ExternalController.GET_PRICE_INTERVAL_MS);
     }
@@ -51,9 +51,9 @@ export default class ExternalController extends IController {
   */
   private getMetrixPrice = async () => {
     try {
-      // const jsonObj = await axios.get('https://api.coinmarketcap.com/v2/ticker/1684/');
-      const jsonObj = await axios.get('https://api.coingecko.com/api/v3/simple/price?ids=linda&vs_currencies=USD');
-      this.metrixPriceUSD = jsonObj.data.linda.usd;
+      const resjsonObj = await fetch('https://api.coingecko.com/api/v3/simple/price?ids=linda&vs_currencies=USD');
+      const jsonObj = await resjsonObj.json();
+      this.metrixPriceUSD = jsonObj.linda.usd;
 
       if (this.main.account.loggedInAccount
         && this.main.account.loggedInAccount.wallet
diff --git a/src/background/controllers/mrc721Controller.ts b/src/background/controllers/mrc721Controller.ts
index 1ca9725..d447122 100644
--- a/src/background/controllers/mrc721Controller.ts
+++ b/src/background/controllers/mrc721Controller.ts
@@ -67,7 +67,7 @@ export default class Mrc721Controller extends IController {
   public startPolling = async () => {
     this.getBalances();
     if (!this.getBalancesInterval) {
-      this.getBalancesInterval = window.setInterval(() => {
+      this.getBalancesInterval = self.setInterval(() => {
         this.getBalances();
       }, Mrc721Controller.GET_BALANCES_INTERVAL_MS);
     }
diff --git a/src/background/controllers/onInstallController.ts b/src/background/controllers/onInstallController.ts
index 582445c..6ee7c9b 100644
--- a/src/background/controllers/onInstallController.ts
+++ b/src/background/controllers/onInstallController.ts
@@ -44,13 +44,16 @@ export default class OnInstallController extends IController {
   private refreshTab(tab: chrome.tabs.Tab) {
      // Tells the content script to post a msg to the inpage window letting it know that MetriMask
      // was installed or updated.
-     chrome.tabs.executeScript(tab.id!, {code:
-      `window.postMessage(
-        {
-          message: { type: 'METRIMASK_INSTALLED_OR_UPDATED' }
-        },
-        '*'
-      )`,
+     chrome.scripting.executeScript({
+      target: {tabId: tab.id!, allFrames: true},
+      func: () => {
+        window.postMessage(
+          {
+            message: { type: 'METRIMASK_INSTALLED_OR_UPDATED' }
+          },
+          '*'
+        );
+      },
     });
   }
 }
diff --git a/src/background/controllers/sessionController.ts b/src/background/controllers/sessionController.ts
index 0263422..792ba0d 100644
--- a/src/background/controllers/sessionController.ts
+++ b/src/background/controllers/sessionController.ts
@@ -69,7 +69,7 @@ export default class SessionController extends IController {
     // Check if session logout is enabled
     if (this.sessionLogoutInterval > 0) {
       // Logout from bgp after interval
-      this.sessionTimeout = window.setTimeout(() => {
+      this.sessionTimeout = self.setTimeout(() => {
         this.clearSession();
         this.main.crypto.resetPasswordHash();
         console.log('Session cleared');
diff --git a/src/background/controllers/tokenController.ts b/src/background/controllers/tokenController.ts
index d282b5f..01e8e31 100644
--- a/src/background/controllers/tokenController.ts
+++ b/src/background/controllers/tokenController.ts
@@ -67,7 +67,7 @@ export default class TokenController extends IController {
   public startPolling = async () => {
     this.getBalances();
     if (!this.getBalancesInterval) {
-      this.getBalancesInterval = window.setInterval(() => {
+      this.getBalancesInterval = self.setInterval(() => {
         this.getBalances();
       }, TokenController.GET_BALANCES_INTERVAL_MS);
     }
diff --git a/src/background/controllers/transactionController.ts b/src/background/controllers/transactionController.ts
index 78e6ee0..22de563 100644
--- a/src/background/controllers/transactionController.ts
+++ b/src/background/controllers/transactionController.ts
@@ -73,7 +73,7 @@ export default class TransactionController extends IController {
   private startPolling = async () => {
     await this.fetchFirst();
     if (!this.getTransactionsInterval) {
-      this.getTransactionsInterval = window.setInterval(() => {
+      this.getTransactionsInterval = self.setInterval(() => {
         this.refreshTransactions();
       }, TransactionController.GET_TX_INTERVAL_MS);
     }
diff --git a/src/background/index.ts b/src/background/index.ts
index 96c44bc..404f2dc 100644
--- a/src/background/index.ts
+++ b/src/background/index.ts
@@ -2,4 +2,4 @@ import MetriMaskController from './controllers';
 
 // Add instance to window for debugging
 const controller = new MetriMaskController();
-Object.assign(window, { controller });
+Object.assign(chrome.windows.getCurrent, { controller });
diff --git a/src/background/workers/scryptworker.js b/src/background/workers/scryptworker.js
index 09f0952..379b3c5 100644
--- a/src/background/workers/scryptworker.js
+++ b/src/background/workers/scryptworker.js
@@ -12,4 +12,4 @@ onmessage = (e) => {
   } catch (err) {
     postMessage({ err });
   }
-}
+}
\ No newline at end of file
diff --git a/src/popup/MainContainer.tsx b/src/popup/MainContainer.tsx
index 9429f14..96eca7b 100644
--- a/src/popup/MainContainer.tsx
+++ b/src/popup/MainContainer.tsx
@@ -2,7 +2,14 @@ import React, { Component } from 'react';
 import { inject, observer } from 'mobx-react';
 import { unstable_HistoryRouter as HistoryRouter, Route, Routes } from 'react-router-dom';
 import { SynchronizedHistory } from 'mobx-react-router';
-import { Button, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions } from '@material-ui/core';
+import { 
+  Button,
+   Dialog,
+   DialogTitle,
+   DialogContent,
+   DialogContentText,
+   DialogActions
+  } from '@material-ui/core';
 
 import Loading from './components/Loading';
 import Login from './pages/Login';
diff --git a/src/popup/components/Loading/index.tsx b/src/popup/components/Loading/index.tsx
index 8af2dbe..ecc9708 100644
--- a/src/popup/components/Loading/index.tsx
+++ b/src/popup/components/Loading/index.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 import React from 'react';
-import { Typography, withStyles } from '@material-ui/core';
+import { Typography, withStyles, CircularProgress } from '@material-ui/core';
 import cx from 'classnames';
 
 import styles from './styles';
@@ -9,7 +9,8 @@ const Loading: React.FC<any> = ({ classes }: any) => (
   <div className={cx(classes.root, 'loading')}>
     <div className={classes.container}>
       <Typography className={classes.text}>Loading...</Typography>
-      <div className={classes.anim9}></div>
+      {/* <div className={classes.anim9}></div> */}
+      <CircularProgress disableShrink={true} />
     </div>
   </div>
 );
diff --git a/static/manifest.json b/static/manifest.json
index 5b101c6..316f30e 100644
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -1,8 +1,8 @@
 {
   "name": "MetriMask",
   "description": "Metrix light wallet and transaction signing client.",
-  "version": "1.0.5",
-  "manifest_version": 2,
+  "version": "1.0.6",
+  "manifest_version": 3,
   "icons": {
     "16": "images/logo-main-16.png",
     "32": "images/logo-main-32.png",
@@ -10,27 +10,12 @@
     "64": "images/logo-main-64.png",
     "128": "images/logo-main-128.png"
   },
-  "browser_action": {
-    "default_title": "MetriMask",
-    "default_icon": "images/logo-main-128.png",
-    "default_popup": "popup.html"
-  },
   "permissions": [
-    "storage", 
-    "*://*/*"
+    "storage",
+	  "scripting"
   ],
   "background": {
-    "scripts": [
-      "hot-reload.js",
-      "commons.all.js",
-      "commons.exclude-contentscript.js",
-      "commons.exclude-popup.js",
-      "commons.exclude-inpage.js",
-      "commons.background-contentscript.js",
-      "commons.background-popup.js",
-      "commons.background-inpage.js",
-      "background.js"
-    ]
+    "service_worker": "service_worker.js"
   },
   "content_scripts": [
     {
@@ -52,28 +37,47 @@
       "run_at": "document_start"
     }
   ],
-  "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
+  "content_security_policy": {
+    "extension_pages": "script-src 'self'; object-src 'self'"
+  },
   "web_accessible_resources": [
-    "commons.all.js",
-    "commons.exclude-background.js",
-    "commons.exclude-contentscript.js",
-    "commons.exclude-popup.js",
-    "commons.background-inpage.js",
-    "commons.contentscript-inpage.js",
-    "commons.popup-inpage.js",
-    "inpage.js",
-    "sign-tx.html",
-    "sign-message.html",
-    "images/logo.png",
-    "css/modal.css"
+    {
+      "resources": [
+        "commons.all.js",
+        "commons.exclude-background.js",
+        "commons.exclude-contentscript.js",
+        "commons.exclude-popup.js",
+        "commons.background-inpage.js",
+        "commons.contentscript-inpage.js",
+        "commons.popup-inpage.js",
+        "inpage.js",
+        "sign-tx.html",
+        "sign-message.html",
+        "images/logo.png",
+        "css/modal.css"
+      ],
+      "matches": [
+        "<all_urls>"
+      ]
+    }
   ],
   "externally_connectable": {
-    "ids": ["*"]
+    "ids": [
+      "*"
+    ]
   },
   "author": [
     {
       "name": "Metrix Coin Ltd",
       "website": "https://metrixcoin.com"
     }
+  ],
+  "action": {
+    "default_title": "MetriMask",
+    "default_icon": "images/logo-main-128.png",
+    "default_popup": "popup.html"
+  },
+  "host_permissions": [
+    "*://*/*"
   ]
-}
+}
\ No newline at end of file
diff --git a/static/service_worker.js b/static/service_worker.js
new file mode 100644
index 0000000..b91c104
--- /dev/null
+++ b/static/service_worker.js
@@ -0,0 +1,7 @@
+try {
+    // This is the file produced by webpack
+    importScripts('background.js', 'scryptworker.js');
+} catch (e) {
+    // This will allow you to see error logs during registration/execution
+    console.error(e);
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index de1451c..9ad4c49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2790,6 +2790,11 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
+fetch-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fetch-absolute/-/fetch-absolute-1.0.0.tgz#a41127e8f93e10903b968f2ad4be7877059c6213"
+  integrity sha512-PWn6U3P7nDpAtHU+Kb7h2AWuPj7JKsXVVyGG/58/KL+0uunyYiMDy9ue63wz4IDS/8eL+qkhS2iTgjS/oETMug==
+
 figgy-pudding@^3.5.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
@@ -4814,6 +4819,13 @@ node-addon-api@^2.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32"
   integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==
 
+node-fetch@2:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-gyp-build@^4.2.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739"
@@ -6833,6 +6845,11 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -7171,6 +7188,11 @@ web3-utils@^1.0.0-beta.36:
     underscore "1.12.1"
     utf8 "3.0.0"
 
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
 webpack-cli@^4.10.0:
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
@@ -7255,6 +7277,14 @@ webpack@^5.74.0:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"

From 77f81b12ceb6ce2b8adc458d084aa253cfdd9d17 Mon Sep 17 00:00:00 2001
From: nibbles83 <hardke01@yahoo.co.uk>
Date: Fri, 30 Sep 2022 09:41:56 +0100
Subject: [PATCH 05/18] Update to metrixjs-wallet to 0.3.0

---
 package.json                |  2 +-
 src/popup/MainContainer.tsx |  2 +-
 yarn.lock                   | 20 +++++++-------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index ebbfced..f56d264 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "deep-equal": "^2.0.5",
     "fetch-absolute": "^1.0.0",
     "follow-redirects": "1.14.8",
-    "metrixjs-wallet": "^0.2.20",
+    "metrixjs-wallet": "^0.3.0",
     "mobx": "^5.15.7",
     "mobx-react": "^5.2.3",
     "mobx-react-router": "^4.1.0",
diff --git a/src/popup/MainContainer.tsx b/src/popup/MainContainer.tsx
index 96eca7b..813394c 100644
--- a/src/popup/MainContainer.tsx
+++ b/src/popup/MainContainer.tsx
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { inject, observer } from 'mobx-react';
 import { unstable_HistoryRouter as HistoryRouter, Route, Routes } from 'react-router-dom';
 import { SynchronizedHistory } from 'mobx-react-router';
-import { 
+import {
   Button,
    Dialog,
    DialogTitle,
diff --git a/yarn.lock b/yarn.lock
index 9ad4c49..65b997e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1032,13 +1032,6 @@ axios@^0.18.0:
     follow-redirects "^1.3.0"
     is-buffer "^1.1.5"
 
-axios@^0.21.1:
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
-  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
-  dependencies:
-    follow-redirects "^1.10.0"
-
 axios@^0.27.2:
   version "0.27.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
@@ -2912,7 +2905,7 @@ follow-redirects@1.14.8:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
   integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
-follow-redirects@^1.10.0, follow-redirects@^1.14.9, follow-redirects@^1.3.0:
+follow-redirects@^1.14.9, follow-redirects@^1.3.0:
   version "1.15.1"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
   integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
@@ -4444,14 +4437,13 @@ merkle-lib@^2.0.10:
   resolved "https://registry.yarnpkg.com/merkle-lib/-/merkle-lib-2.0.10.tgz#82b8dbae75e27a7785388b73f9d7725d0f6f3326"
   integrity sha1-grjbrnXieneFOItz+ddyXQ9vMyY=
 
-metrixjs-wallet@^0.2.20:
-  version "0.2.20"
-  resolved "https://registry.yarnpkg.com/metrixjs-wallet/-/metrixjs-wallet-0.2.20.tgz#6f589e48c10df012537082bfd5284e81c62c9448"
-  integrity sha512-bCfzP1PaAHjdub96g1zX+p6iWad15YnREWBk9r/af9gGmSfY7zncZziU5ADqVvPptaHxaVh8M6ih3P/WFr/Buw==
+metrixjs-wallet@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/metrixjs-wallet/-/metrixjs-wallet-0.3.0.tgz#bbd61450c90e2af52e1fd8a726de25de9db83b06"
+  integrity sha512-s9oiaaFe+OGjV5JUG/nb5p2UT0/as0N3hc0fOGIwK95ndwpnDpo1lEPIHrgcV7Rbz8866N/R5yzAIZwIwSecDw==
   dependencies:
     "@types/bip38" "^2.0.1"
     "@types/secp256k1" "^4.0.2"
-    axios "^0.21.1"
     big.js "^6.1.1"
     bignumber.js "^9.0.1"
     bip38 "^3.1.1"
@@ -4461,7 +4453,9 @@ metrixjs-wallet@^0.2.20:
     buffer "^6.0.3"
     coinselect "^3.1.11"
     elliptic "^6.5.4"
+    fetch-absolute "^1.0.0"
     hash.js "^1.1.7"
+    node-fetch "2"
     scryptsy "^2.1.0"
     secp256k1 "^4.0.2"
 

From 9b7a98fa949c4b4d23b40a9a2fcbdef8f987e483 Mon Sep 17 00:00:00 2001
From: nibbles83 <hardke01@yahoo.co.uk>
Date: Fri, 30 Sep 2022 09:58:34 +0100
Subject: [PATCH 06/18] Remove scriptworker, can no longer launch in seperate
 worker

---
 src/background/workers/scryptworker.js | 15 ---------------
 static/service_worker.js               |  2 +-
 webpack.base.config.js                 |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 src/background/workers/scryptworker.js

diff --git a/src/background/workers/scryptworker.js b/src/background/workers/scryptworker.js
deleted file mode 100644
index 379b3c5..0000000
--- a/src/background/workers/scryptworker.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import scrypt from 'scryptsy';
-
-onmessage = (e) => {
-  try {
-    const password = e.data.password
-    const salt = e.data.salt
-    const saltBuffer = Buffer.from(salt);
-    const { N, r, p } = e.data.scryptParams;
-    const derivedKey = scrypt(password, saltBuffer, N, r, p, 64);
-    const passwordHash = derivedKey.toString('hex');
-    postMessage({ passwordHash });
-  } catch (err) {
-    postMessage({ err });
-  }
-}
\ No newline at end of file
diff --git a/static/service_worker.js b/static/service_worker.js
index b91c104..6530f42 100644
--- a/static/service_worker.js
+++ b/static/service_worker.js
@@ -1,6 +1,6 @@
 try {
     // This is the file produced by webpack
-    importScripts('background.js', 'scryptworker.js');
+    importScripts('background.js');
 } catch (e) {
     // This will allow you to see error logs during registration/execution
     console.error(e);
diff --git a/webpack.base.config.js b/webpack.base.config.js
index 6400208..d55a29f 100644
--- a/webpack.base.config.js
+++ b/webpack.base.config.js
@@ -16,7 +16,6 @@ module.exports = {
     contentscript: './src/contentscript/index.ts',
     inpage: './src/inpage/index.ts',
     popup: './src/popup/index.tsx',
-    scryptworker: './src/background/workers/scryptworker.js',
   },
   output: {
     path: path.join(__dirname, 'dist'),

From 3d3ad9c2db064046dc87aad8b451e15c5f05cd2f Mon Sep 17 00:00:00 2001
From: nibbles83 <hardke01@yahoo.co.uk>
Date: Fri, 30 Sep 2022 10:12:51 +0100
Subject: [PATCH 07/18] Cleanup and version increment

---
 .travis.yml  | 22 ----------------------
 CHANGELOG.md |  9 +++++++++
 package.json |  1 +
 tslint.json  | 35 -----------------------------------
 4 files changed, 10 insertions(+), 57 deletions(-)
 delete mode 100644 .travis.yml
 create mode 100644 CHANGELOG.md
 delete mode 100644 tslint.json

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d216fe9..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: node_js
-
-node_js:
-  - "10.9.0"
-
-env:
-  - CXX=g++-4.8
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-4.8
-      - g++-4.8
-
-cache:
-  directories:
-    - "node_modules"
-
-script:
-  - npm run linter
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..537abbd
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+# Changelog
+
+## 1.0.6
+
+- Migrate to metrixjs-wallet 0.3.0
+- Upgrade webpack to 5.74
+- Move to Extension manifest v3 and rework to service_worker
+- Upgrade whole host of dependancies
+- Change loading screen to rotating circle, the scrolling bar was freezing due to thread lock.
\ No newline at end of file
diff --git a/package.json b/package.json
index f56d264..6de41f5 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "metrimask",
+  "version": "1.0.6",
   "private": true,
   "scripts": {
     "clean": "rm -rf dist",
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index 6b2df91..0000000
--- a/tslint.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "defaultSeverity": "error",
-  "extends": ["tslint:recommended"],
-  "linterOptions": {
-    "exclude": [
-      "dist",
-      "node_modules",
-      "scripts",
-      "static"
-    ]
-  },
-  "rules": {
-    "no-var-requires": false,
-    "semicolon": [true, "always"],
-    "object-literal-key-quotes": false,
-    "object-literal-sort-keys": false,
-    "ordered-imports": false,
-    "no-console": false,
-    "quotemark": [true, "single", "jsx-double"],
-    "variable-name": [
-      true,
-      "ban-keywords",
-      "check-format",
-      "allow-leading-underscore",
-      "allow-pascal-case"
-    ],
-    "no-empty-interface": false,
-    "max-line-length": [true, {
-      "limit": 120,
-      "ignore-pattern": "^import |^export {(.*?)}|class [a-zA-Z]+ implements |//"
-    }]
-  },
-  "jsRules": {},
-  "rulesDirectory": []
-}

From 6b89b0d0e9128b1febcdad94f36ccde4d479d46f Mon Sep 17 00:00:00 2001
From: nibbles83 <hardke01@yahoo.co.uk>
Date: Fri, 30 Sep 2022 10:31:48 +0100
Subject: [PATCH 08/18] replace deprecated extension with runtime

---
 src/contentscript/inject.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/contentscript/inject.ts b/src/contentscript/inject.ts
index 0861883..9ec3b57 100644
--- a/src/contentscript/inject.ts
+++ b/src/contentscript/inject.ts
@@ -25,29 +25,29 @@ const injectStylesheet = (src: string) => {
 };
 
 export const injectAllScripts = async () => {
-  await injectScript(chrome.extension.getURL('commons.all.js')).then(async () => {
-    await injectScript(chrome.extension.getURL('commons.exclude-background.js'));
-    await injectScript(chrome.extension.getURL('commons.exclude-contentscript.js'));
-    await injectScript(chrome.extension.getURL('commons.exclude-popup.js'));
-    await injectScript(chrome.extension.getURL('commons.background-inpage.js'));
-    await injectScript(chrome.extension.getURL('commons.contentscript-inpage.js'));
-    await injectScript(chrome.extension.getURL('commons.popup-inpage.js'));
-    await injectScript(chrome.extension.getURL('inpage.js'));
+  await injectScript(chrome.runtime.getURL('commons.all.js')).then(async () => {
+    await injectScript(chrome.runtime.getURL('commons.exclude-background.js'));
+    await injectScript(chrome.runtime.getURL('commons.exclude-contentscript.js'));
+    await injectScript(chrome.runtime.getURL('commons.exclude-popup.js'));
+    await injectScript(chrome.runtime.getURL('commons.background-inpage.js'));
+    await injectScript(chrome.runtime.getURL('commons.contentscript-inpage.js'));
+    await injectScript(chrome.runtime.getURL('commons.popup-inpage.js'));
+    await injectScript(chrome.runtime.getURL('inpage.js'));
 
     // Pass the Chrome extension absolute URL of the Sign Transaction dialog to the Inpage
-    const signTxUrl = chrome.extension.getURL('sign-tx.html');
+    const signTxUrl = chrome.runtime.getURL('sign-tx.html');
     postWindowMessage(TARGET_NAME.INPAGE, {
       type: API_TYPE.SIGN_TX_URL_RESOLVED,
       payload: { url: signTxUrl },
     });
 
     // Pass the Chrome extension absolute URL of the Sign Message dialog to the Inpage
-    const signMessageUrl = chrome.extension.getURL('sign-message.html');
+    const signMessageUrl = chrome.runtime.getURL('sign-message.html');
     postWindowMessage(TARGET_NAME.INPAGE, {
       type: API_TYPE.SIGN_MESSAGE_URL_RESOLVED,
       payload: { url: signMessageUrl },
     });
   });
 
-  injectStylesheet(chrome.extension.getURL('css/modal.css'));
+  injectStylesheet(chrome.runtime.getURL('css/modal.css'));
 };

From 820e28b88b165fd5fced08f6fbac250a4c29e90f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Sep 2022 16:41:08 +0000
Subject: [PATCH 09/18] Bump y18n from 3.2.1 to 3.2.2

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

---
updated-dependencies:
- dependency-name: y18n
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4dc0a95..3bf3761 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7431,8 +7431,9 @@ xtend@^4.0.2:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 y18n@^4.0.0:
   version "4.0.0"

From 5a6dd13acc0f03f58639e797b9574af000542b82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 10:14:59 +0000
Subject: [PATCH 10/18] Bump minimist from 1.2.0 to 1.2.6

Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/commits)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ce9b440..70d37e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4550,16 +4550,7 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

From e6e4dc5b803e2021fa84ffd7b2ac7b2f85016f97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 10:23:58 +0000
Subject: [PATCH 11/18] Bump postcss-flexbugs-fixes from 3.3.1 to 5.0.1

Bumps [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes) from 3.3.1 to 5.0.1.
- [Release notes](https://github.com/luisrudge/postcss-flexbugs-fixes/releases)
- [Changelog](https://github.com/luisrudge/postcss-flexbugs-fixes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/luisrudge/postcss-flexbugs-fixes/commits)

---
updated-dependencies:
- dependency-name: postcss-flexbugs-fixes
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index cd28268..aa87142 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "mini-css-extract-plugin": "^2.6.1",
     "node-polyfill-webpack-plugin": "^2.0.1",
     "node-sass": "^7.0.1",
-    "postcss-flexbugs-fixes": "^3.3.0",
+    "postcss-flexbugs-fixes": "^5.0.1",
     "postcss-loader": "5.0.0",
     "postcss-modules": "4.3.1",
     "react-router-dom": "6",
diff --git a/yarn.lock b/yarn.lock
index 33f92ba..687beab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5359,11 +5359,12 @@ posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
 
-postcss-flexbugs-fixes@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.3.1.tgz#0783cc7212850ef707f97f8bc8b6fb624e00c75d"
+postcss-flexbugs-fixes@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.1.tgz#8a4b84937e94e7c100e48e019eaad33850bc7b33"
+  integrity sha512-CBEfCMk5hcqGlgRb9SDzQ3bIExJlfz89heRsAYNuNRiCJOETlVOL1KfBV1AGKFww8olEpOOSAgGiWeaGTPCkeg==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^8.1.4"
 
 postcss-loader@5.0.0:
   version "5.0.0"
@@ -5480,10 +5481,10 @@ postcss@^7.0.32:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.4.7:
-  version "8.4.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
-  integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
+postcss@^8.1.4, postcss@^8.4.7:
+  version "8.4.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.17.tgz#f87863ec7cd353f81f7ab2dec5d67d861bbb1be5"
+  integrity sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==
   dependencies:
     nanoid "^3.3.4"
     picocolors "^1.0.0"

From c4c833706861bdb66c9e93b0549cce56c9ed0cec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 11:02:06 +0000
Subject: [PATCH 12/18] Bump ts-loader from 9.0.0 to 9.4.1

Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 9.0.0 to 9.4.1.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/ts-loader/compare/v9.0.0...9.4.1)

---
updated-dependencies:
- dependency-name: ts-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index aa87142..3526bef 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "react-router-dom": "6",
     "sass-loader": "^13.0.2",
     "style-loader": "3.0.0",
-    "ts-loader": "9.0.0",
+    "ts-loader": "9.4.1",
     "typescript": "4.2",
     "uglifyjs-webpack-plugin": "^1.2.7",
     "url-loader": "^4.1.1",
diff --git a/yarn.lock b/yarn.lock
index 58d0855..43024b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6797,14 +6797,13 @@ trim-newlines@^3.0.0:
   dependencies:
     glob "^6.0.4"
 
-ts-loader@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.0.0.tgz#0cf4bbd708e4a8e8b25671ea2f7e33af3950fdc1"
-  integrity sha512-okLMCTkzp1lCldwJ+/+mEY66qilDpwAs5Xs8REG9IwjfbG9fRQmt4a6XCFeFU6XaVI2C0qOEEEu+jIcWAUgc4w==
+ts-loader@9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.1.tgz#b6f3d82db0eac5a8295994f8cb5e4940ff6b1060"
+  integrity sha512-384TYAqGs70rn9F0VBnh6BPTfhga7yFNdC5gXbQpDrBj9/KsT4iRkGqKXhziofHOlE2j6YEaiTYVGKKvPhGWvw==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.0.0"
-    loader-utils "^2.0.0"
     micromatch "^4.0.0"
     semver "^7.3.4"
 

From af5c9ba991bed5dd551a8747cdba643404ee0428 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 12:29:34 +0000
Subject: [PATCH 13/18] Bump @types/chrome from 0.0.196 to 0.0.197

Bumps [@types/chrome](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chrome) from 0.0.196 to 0.0.197.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chrome)

---
updated-dependencies:
- dependency-name: "@types/chrome"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3526bef..75f935f 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   "devDependencies": {
     "@ceoimon/typed-css-modules": "^0.1.0",
     "@material-ui/core": "4.0.2",
-    "@types/chrome": "^0.0.196",
+    "@types/chrome": "^0.0.197",
     "@types/classnames": "^2.2.4",
     "@types/prop-types": "^15.5.3",
     "@types/react": "18.0.0",
diff --git a/yarn.lock b/yarn.lock
index 43024b2..167e416 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -288,10 +288,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/chrome@^0.0.196":
-  version "0.0.196"
-  resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.196.tgz#9e0196a6fcdf3c0e12cfbcd086cd28feb5206990"
-  integrity sha512-LAjGIQYC0wyiYu6lVT03dBrHBfYTMsM8EmNfQ+UdZipGZe8OUiir6weoa9oQoBw3T3RLzBCp9m904T+rFtpPAg==
+"@types/chrome@^0.0.197":
+  version "0.0.197"
+  resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.197.tgz#c1b50cdb72ee40f9bc1411506031a9f8a925ab35"
+  integrity sha512-m1NfS5bOjaypyqQfaX6CxmJodZVcvj5+Mt/K94EBHkflYjPNmXHAzbxfifdLMa0YM3PDyOxohoTS5ug/e6p5jA==
   dependencies:
     "@types/filesystem" "*"
     "@types/har-format" "*"

From 556201e918d3d505f7131cdf009eb6bfcc8df3db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 12:30:10 +0000
Subject: [PATCH 14/18] Bump @types/lodash from 4.14.185 to 4.14.186

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.14.185 to 4.14.186.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3526bef..ebe892e 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "@material-ui/icons": "4.0.1",
     "@types/deep-equal": "^1.0.1",
     "@types/history": "^5.0.0",
-    "@types/lodash": "^4.14.185",
+    "@types/lodash": "^4.14.186",
     "@types/qrcode.react": "^1.0.2",
     "@types/scryptsy": "^2.0.0",
     "@types/secp256k1": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 43024b2..d455b18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -368,10 +368,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.14.185":
-  version "4.14.185"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.185.tgz#c9843f5a40703a8f5edfd53358a58ae729816908"
-  integrity sha512-evMDG1bC4rgQg4ku9tKpuMh5iBNEwNa3tf9zRHdP1qlv+1WUg44xat4IxCE14gIpZRGUUWAx2VhItCZc25NfMA==
+"@types/lodash@^4.14.186":
+  version "4.14.186"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.186.tgz#862e5514dd7bd66ada6c70ee5fce844b06c8ee97"
+  integrity sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==
 
 "@types/minimist@^1.2.0":
   version "1.2.2"

From 2bc0cd94e6c4ae97b0be934de71651d0dff138ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 12:39:28 +0000
Subject: [PATCH 15/18] Bump classnames and @types/classnames

Bumps [classnames](https://github.com/JedWatson/classnames) and [@types/classnames](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/classnames). These dependencies needed to be updated together.

Updates `classnames` from 2.2.6 to 2.3.2
- [Release notes](https://github.com/JedWatson/classnames/releases)
- [Changelog](https://github.com/JedWatson/classnames/blob/main/HISTORY.md)
- [Commits](https://github.com/JedWatson/classnames/compare/v2.2.6...v2.3.2)

Updates `@types/classnames` from 2.2.4 to 2.3.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/classnames)

---
updated-dependencies:
- dependency-name: classnames
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: "@types/classnames"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  4 ++--
 yarn.lock    | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 294e35e..f803527 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@ceoimon/typed-css-modules": "^0.1.0",
     "@material-ui/core": "4.0.2",
     "@types/chrome": "^0.0.197",
-    "@types/classnames": "^2.2.4",
+    "@types/classnames": "^2.3.1",
     "@types/prop-types": "^15.5.3",
     "@types/react": "18.0.0",
     "@types/react-dom": "18.0.0",
@@ -67,7 +67,7 @@
     "bitcoinjs-lib": "4.0.5",
     "bitcoinjs-message": "^2.2.0",
     "chrome-call": "^3.0.0",
-    "classnames": "^2.2.6",
+    "classnames": "^2.3.2",
     "deep-equal": "^2.0.5",
     "fetch-absolute": "^1.0.0",
     "follow-redirects": "1.14.8",
diff --git a/yarn.lock b/yarn.lock
index 2c81741..8a5e086 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -296,9 +296,12 @@
     "@types/filesystem" "*"
     "@types/har-format" "*"
 
-"@types/classnames@^2.2.4":
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.4.tgz#d3ee9ebf714aa34006707b8f4a58fd46b642305a"
+"@types/classnames@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd"
+  integrity sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==
+  dependencies:
+    classnames "*"
 
 "@types/deep-equal@^1.0.1":
   version "1.0.1"
@@ -1630,9 +1633,10 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
+classnames@*, classnames@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
+  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
 clean-stack@^2.0.0:
   version "2.2.0"

From 4eb284e229048a91219b3f7a11c96a4467c0b46b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 13:08:22 +0000
Subject: [PATCH 16/18] Bump postcss-loader from 5.0.0 to 7.0.1

Bumps [postcss-loader](https://github.com/webpack-contrib/postcss-loader) from 5.0.0 to 7.0.1.
- [Release notes](https://github.com/webpack-contrib/postcss-loader/releases)
- [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/postcss-loader/compare/v5.0.0...v7.0.1)

---
updated-dependencies:
- dependency-name: postcss-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index f803527..457f891 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "node-polyfill-webpack-plugin": "^2.0.1",
     "node-sass": "^7.0.1",
     "postcss-flexbugs-fixes": "^5.0.1",
-    "postcss-loader": "5.0.0",
+    "postcss-loader": "7.0.1",
     "postcss-modules": "4.3.1",
     "react-router-dom": "6",
     "sass-loader": "^13.0.2",
diff --git a/yarn.lock b/yarn.lock
index 8a5e086..324cacf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4132,7 +4132,7 @@ kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klona@^2.0.4:
+klona@^2.0.4, klona@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
@@ -5361,14 +5361,14 @@ postcss-flexbugs-fixes@^5.0.1:
   dependencies:
     postcss "^8.1.4"
 
-postcss-loader@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-5.0.0.tgz#bea95363dcb550d72ceb612ce44663356b7782d7"
-  integrity sha512-bOvyWP5VHCJbThbv7wrBwCBc3DsVpyCfd+k/wHOL3wTAMMHmSSfNts90EADf8bHa6I810ird1JBEKmBRgJu3cg==
+postcss-loader@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.1.tgz#4c883cc0a1b2bfe2074377b7a74c1cd805684395"
+  integrity sha512-VRviFEyYlLjctSM93gAZtcJJ/iSkPZ79zWbN/1fSH+NisBByEiVLqpdVDrPLVSi8DX0oJo12kL/GppTBdKVXiQ==
   dependencies:
     cosmiconfig "^7.0.0"
-    klona "^2.0.4"
-    semver "^7.3.4"
+    klona "^2.0.5"
+    semver "^7.3.7"
 
 postcss-modules-extract-imports@1.1.0:
   version "1.1.0"

From 0ba942f056c3f2e8340233d28f248b5248b0bb2b Mon Sep 17 00:00:00 2001
From: nibbles83 <hardke01@yahoo.co.uk>
Date: Mon, 3 Oct 2022 14:45:41 +0100
Subject: [PATCH 17/18] Remove unused chrome-call

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 457f891..7147e3f 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,6 @@
     "bip39": "^3.0.4",
     "bitcoinjs-lib": "4.0.5",
     "bitcoinjs-message": "^2.2.0",
-    "chrome-call": "^3.0.0",
     "classnames": "^2.3.2",
     "deep-equal": "^2.0.5",
     "fetch-absolute": "^1.0.0",

From 139342e299000c77e645f4634a3f9000e205029b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 08:05:31 +0000
Subject: [PATCH 18/18] Bump react-router-dom from 6.3.0 to 6.6.1

Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.3.0 to 6.6.1.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.6.1/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 324cacf..3ad8c5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -276,6 +276,11 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
+"@remix-run/router@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.2.1.tgz#812edd4104a15a493dda1ccac0b352270d7a188c"
+  integrity sha512-XiY0IsyHR+DXYS5vBxpoBe/8veTeoRpMHP+vDosLZxL5bnpetzI0igkxkLZS235ldLzyfkxF+2divEwWHP3vMQ==
+
 "@tootallnate/once@1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
@@ -1608,10 +1613,6 @@ chownr@^2.0.0:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
-chrome-call@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chrome-call/-/chrome-call-3.0.0.tgz#6939a857d3ebc20c9cb0aee0d678ad0d4974dddb"
-
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -3353,7 +3354,7 @@ hash.js@^1.1.7:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-history@*, history@^5.2.0:
+history@*:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
   integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
@@ -5677,19 +5678,19 @@ react-lifecycles-compat@^3.0.2:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
 
 react-router-dom@6:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d"
-  integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.6.1.tgz#1b96ec0b2cefa7319f1251383ea5b41295ee260d"
+  integrity sha512-u+8BKUtelStKbZD5UcY0NY90WOzktrkJJhyhNg7L0APn9t1qJNLowzrM9CHdpB6+rcPt6qQrlkIXsTvhuXP68g==
   dependencies:
-    history "^5.2.0"
-    react-router "6.3.0"
+    "@remix-run/router" "1.2.1"
+    react-router "6.6.1"
 
-react-router@6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
-  integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
+react-router@6.6.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.6.1.tgz#17de6cf285f2d1c9721a3afca999c984e5558854"
+  integrity sha512-YkvlYRusnI/IN0kDtosUCgxqHeulN5je+ew8W+iA1VvFhf86kA+JEI/X/8NqYcr11hCDDp906S+SGMpBheNeYQ==
   dependencies:
-    history "^5.2.0"
+    "@remix-run/router" "1.2.1"
 
 react-transition-group@^4.0.0:
   version "4.4.5"