From a34f88e3754b39e57a41d0891a656962bfe28731 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 8 Dec 2021 13:55:27 -0330
Subject: [PATCH] Dispose the trezor connect iframe upon lock (#13018)

* Dispose the trezor connect iframe upon lock

* Use KEYRING_TYPES.TREZOR

* Update eth-trezor-keyring version
---
 app/scripts/metamask-controller.js | 6 ++++++
 package.json                       | 2 +-
 yarn.lock                          | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a6d39262c..092d115be 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3349,6 +3349,12 @@ export default class MetamaskController extends EventEmitter {
    * Locks MetaMask
    */
   setLocked() {
+    const [trezorKeyring] = this.keyringController.getKeyringsByType(
+      KEYRING_TYPES.TREZOR,
+    );
+    if (trezorKeyring) {
+      trezorKeyring.dispose();
+    }
     return this.keyringController.setLocked();
   }
 }
diff --git a/package.json b/package.json
index 83ed9eabe..44427cd2e 100644
--- a/package.json
+++ b/package.json
@@ -152,7 +152,7 @@
     "eth-query": "^2.1.2",
     "eth-rpc-errors": "^4.0.2",
     "eth-sig-util": "^3.0.0",
-    "eth-trezor-keyring": "^0.8.0",
+    "eth-trezor-keyring": "^0.9.0",
     "ethereum-ens-network-map": "^1.0.2",
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-util": "^7.0.10",
diff --git a/yarn.lock b/yarn.lock
index 87ae5e61d..4eff583cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11460,10 +11460,10 @@ eth-simple-keyring@^4.2.0:
     ethereumjs-wallet "^1.0.1"
     events "^1.1.1"
 
-eth-trezor-keyring@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/eth-trezor-keyring/-/eth-trezor-keyring-0.8.0.tgz#e0a40ab24954ba637946ce3848b15df6dd7a8bde"
-  integrity sha512-++u/9/OkQ+NkFcGDwhabpJkcYlCWQYcVLejWvDoKCNHNSjBUxa99tI9kg2wdf/ZoFKMOekbK6/WYlXJYCHMnrQ==
+eth-trezor-keyring@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/eth-trezor-keyring/-/eth-trezor-keyring-0.9.0.tgz#06b0f2f4c072651c0944a0dfbfa7b2b0c9987433"
+  integrity sha512-Rg9XUiYIOs7Ulz0ODc/udouM7276fCQhTnYhJC9OJTWrz6U5tAkdqnmTsZNMS2sdMWzuFhGz0+pQz9yTIryGQA==
   dependencies:
     "@ethereumjs/tx" "^3.2.1"
     ethereumjs-util "^7.0.9"