aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorBruno Barbieri <bruno.barbieri@consensys.net>2018-11-22 03:45:55 +0800
committerGitHub <noreply@github.com>2018-11-22 03:45:55 +0800
commitae8626eceb255618d5cdeb5aba7ce2dd377d2c0c (patch)
tree082e495f1b6e303ca5fca54e9a186ca9ef6292ca /app/scripts
parent7229f0f9fcd6c2579c3c5a5146a3b144929b6d2e (diff)
parentb4d48ea3fc15541c674868a1249f4526cb4ae53c (diff)
downloadtangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.gz
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.bz2
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.lz
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.xz
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.zst
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.zip
Merge pull request #5797 from MetaMask/trezor-v6
Add Firefox and Brave support for Trezor
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/background.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index a6fc5ed78..d577ead41 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -332,6 +332,10 @@ function setupController (initState, initLangCode) {
[ENVIRONMENT_TYPE_FULLSCREEN]: true,
}
+ const metamaskBlacklistedPorts = [
+ 'trezor-connect',
+ ]
+
const isClientOpenStatus = () => {
return popupIsOpen || Boolean(Object.keys(openMetamaskTabsIDs).length) || notificationIsOpen
}
@@ -352,6 +356,10 @@ function setupController (initState, initLangCode) {
const processName = remotePort.name
const isMetaMaskInternalProcess = metamaskInternalProcessHash[processName]
+ if (metamaskBlacklistedPorts.includes(remotePort.name)) {
+ return false
+ }
+
if (isMetaMaskInternalProcess) {
const portStream = new PortStream(remotePort)
// communication with popup