aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-06-29 02:57:33 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-06-29 02:57:33 +0800
commit4f4c5048bf386c7d8e93592644bcda99e0fc38ea (patch)
tree85198d2366375cdf75be8ad7b3d44e4388ea3efc
parent3d9bedaeea9b0485b7cfbe3255d72cfe470bcaa2 (diff)
downloadtangerine-wallet-browser-4f4c5048bf386c7d8e93592644bcda99e0fc38ea.tar
tangerine-wallet-browser-4f4c5048bf386c7d8e93592644bcda99e0fc38ea.tar.gz
tangerine-wallet-browser-4f4c5048bf386c7d8e93592644bcda99e0fc38ea.tar.bz2
tangerine-wallet-browser-4f4c5048bf386c7d8e93592644bcda99e0fc38ea.tar.lz
tangerine-wallet-browser-4f4c5048bf386c7d8e93592644bcda99e0fc38ea.tar.xz
tangerine-wallet-browser-4f4c5048bf386c7d8e93592644bcda99e0fc38ea.tar.zst
tangerine-wallet-browser-4f4c5048bf386c7d8e93592644bcda99e0fc38ea.zip
fix #341 close notifications when oppening pop up
-rw-r--r--app/scripts/lib/notifications.js4
-rw-r--r--ui/app/app.js8
2 files changed, 10 insertions, 2 deletions
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index a5746ae6e..a31949108 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -176,7 +176,7 @@ function renderNotificationSVG(content, cb){
}
function svgWrapper(content){
- var wrapperSource = `
+ var wrapperSource = `
<svg xmlns="http://www.w3.org/2000/svg" width="450" height="300">
<foreignObject x="0" y="0" width="100%" height="100%">
<body xmlns="http://www.w3.org/1999/xhtml" height="100%">{{content}}</body>
@@ -188,4 +188,4 @@ function svgWrapper(content){
function toSvgUri(content){
return 'data:image/svg+xml;utf8,' + encodeURIComponent(content)
-} \ No newline at end of file
+}
diff --git a/ui/app/app.js b/ui/app/app.js
index a07118ddb..f505c89c0 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -324,6 +324,7 @@ App.prototype.renderPrimary = function () {
return h(SendTransactionScreen, {key: 'send-transaction'})
case 'confTx':
+ this.clearNotifications()
return h(ConfirmTxScreen, {key: 'confirm-tx'})
case 'config':
@@ -355,3 +356,10 @@ App.prototype.toggleMetamaskActive = function () {
}
}
+App.prototype.clearNotifications = function () {
+ chrome.notifications.getAll( function (object) {
+ for (let notification in object){
+ chrome.notifications.clear(notification)
+ }
+ })
+};