Ensure interval is cleared when transport is cleared up

MetaMask · Jun 9, 2022 · 917aa33 · 917aa33
1 parent 62bae55
commit 917aa33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bundle.js b/bundle.js
@@ -262,6 +262,9 @@ var LedgerBridge = function () {
                 await this.transport.close();
                 this.transport = null;
             }
+            if (this.pollingInterval) {
+                clearInterval(this.pollingInterval);
+            }
             if (replyAction) {
                 this.sendMessageToExtension({
                     action: replyAction,
@@ -380,9 +383,6 @@ var LedgerBridge = function () {
         key: 'onDisconnect',
         value: function onDisconnect() {
             this.cleanUp();
-            if (this.pollingInterval) {
-                clearInterval(this.pollingInterval);
-            }
             this.sendConnectionMessage(false);
         }
     }, {

diff --git a/ledger-bridge.js b/ledger-bridge.js
@@ -214,6 +214,9 @@ export default class LedgerBridge {
             await this.transport.close()
             this.transport = null
         }
+        if (this.pollingInterval) {
+            clearInterval(this.pollingInterval)
+        }
         if (replyAction) {
             this.sendMessageToExtension({
                 action: replyAction,
@@ -331,9 +334,6 @@ export default class LedgerBridge {
 
     onDisconnect() {
         this.cleanUp()
-        if (this.pollingInterval) {
-            clearInterval(this.pollingInterval)
-        }
         this.sendConnectionMessage(false)
     }