aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2019-03-12 05:54:00 +0800
committerGitHub <noreply@github.com>2019-03-12 05:54:00 +0800
commit59dbb9babb6f59dbb6bae0aded161408ab5f2c89 (patch)
treeec02c6cce3a8fc800cc571c2beafad9c1f6c76e6 /app/scripts
parentc44f7857a8a404114c8ffd09ebefd9970125d0de (diff)
parent43f5fd07163bce1e4e15f41aeaf528b032a6a079 (diff)
downloadtangerine-wallet-browser-59dbb9babb6f59dbb6bae0aded161408ab5f2c89.tar
tangerine-wallet-browser-59dbb9babb6f59dbb6bae0aded161408ab5f2c89.tar.gz
tangerine-wallet-browser-59dbb9babb6f59dbb6bae0aded161408ab5f2c89.tar.bz2
tangerine-wallet-browser-59dbb9babb6f59dbb6bae0aded161408ab5f2c89.tar.lz
tangerine-wallet-browser-59dbb9babb6f59dbb6bae0aded161408ab5f2c89.tar.xz
tangerine-wallet-browser-59dbb9babb6f59dbb6bae0aded161408ab5f2c89.tar.zst
tangerine-wallet-browser-59dbb9babb6f59dbb6bae0aded161408ab5f2c89.zip
Merge pull request #6279 from MetaMask/notification-window
Nonmultiple notifications for batch txs
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/background.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 189858a1d..8cc60be80 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -448,7 +448,7 @@ function setupController (initState, initLangCode) {
function triggerUi () {
extension.tabs.query({ active: true }, tabs => {
const currentlyActiveMetamaskTab = Boolean(tabs.find(tab => openMetamaskTabsIDs[tab.id]))
- if (!popupIsOpen && !currentlyActiveMetamaskTab) {
+ if (!popupIsOpen && !currentlyActiveMetamaskTab && !notificationIsOpen) {
notificationManager.showPopup()
notificationIsOpen = true
}