Disable token price polling when no client is active

1 files changed, 3 insertions, 0 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 5878cd2e8..3f0e289c9 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -200,6 +200,7 @@ function setupController (initState, initLangCode) {
     if (isMetaMaskInternalProcess) {
       // communication with popup
       popupIsOpen = popupIsOpen || (remotePort.name === 'popup')
+      controller.isClientOpen = true
       controller.setupTrustedCommunication(portStream, 'MetaMask')
       // record popup as closed
       if (remotePort.sender.url.match(/home.html$/)) {
@@ -211,6 +212,8 @@ function setupController (initState, initLangCode) {
           if (remotePort.sender.url.match(/home.html$/)) {
             openMetamaskTabsIDs[remotePort.sender.tab.id] = false
           }
+          controller.isClientOpen = popupIsOpen ||
+            Object.keys(openMetamaskTabsIDs).some(key => openMetamaskTabsIDs[key])
         })
       }
       if (remotePort.name === 'notification') {