aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/_locales/en/messages.json3
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/background.js2
3 files changed, 5 insertions, 2 deletions
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index b6d27b7ea..ee6437116 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1364,6 +1364,9 @@
"tokenBalance": {
"message": "Your Token Balance is:"
},
+ "tokenContractAddress": {
+ "message": "Token Contract Address"
+ },
"tokenSelection": {
"message": "Search for tokens or select from our list of popular tokens."
},
diff --git a/app/manifest.json b/app/manifest.json
index 77dcc1412..53dbcf88e 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
- "version": "6.0.1",
+ "version": "6.1.0",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "__MSG_appDescription__",
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 8cc60be80..026823712 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 && !notificationIsOpen) {
+ if ((!popupIsOpen || !notificationIsOpen) && !currentlyActiveMetamaskTab) {
notificationManager.showPopup()
notificationIsOpen = true
}