From eea77b828fdaecb07fdc704edbcac0f42c771d27 Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 14 Sep 2016 10:59:31 -0700 Subject: [PATCH 1/5] Dont generate a popup notification when submiting a transaction from with in MetaMask --- app/scripts/background.js | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 58228a41a..18a112dd1 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -10,31 +10,22 @@ const MetamaskController = require('./metamask-controller') const extension = require('./lib/extension') const STORAGE_KEY = 'metamask-config' - +var popupIsOpen = false const controller = new MetamaskController({ // User confirmation callbacks: - showUnconfirmedMessage, - unlockAccountMessage, - showUnconfirmedTx, + showUnconfirmedMessage: triggerUi, + unlockAccountMessage: triggerUi, + showUnconfirmedTx: triggerUi, // Persistence Methods: setData, loadData, }) const idStore = controller.idStore -function unlockAccountMessage () { - notification.show() -} - -function showUnconfirmedMessage (msgParams, msgId) { - notification.show() +function triggerUi () { + if (!popupIsOpen) notification.show() } - -function showUnconfirmedTx (txParams, txData, onTxDoneCb) { - notification.show() -} - // On first install, open a window to MetaMask website to how-it-works. extension.runtime.onInstalled.addListener(function (details) { @@ -53,7 +44,8 @@ function connectRemote (remotePort) { var portStream = new PortStream(remotePort) if (isMetaMaskInternalProcess) { // communication with popup - setupTrustedCommunication(portStream, 'MetaMask') + remotePort.name === 'popup' ? popupIsOpen = true : popupIsOpen = false + setupTrustedCommunication(portStream, 'MetaMask', remotePort.name) } else { // communication with page var originDomain = urlUtil.parse(remotePort.sender.url).hostname @@ -69,12 +61,13 @@ function setupUntrustedCommunication (connectionStream, originDomain) { controller.setupPublicConfig(mx.createStream('publicConfig')) } -function setupTrustedCommunication (connectionStream, originDomain) { +function setupTrustedCommunication (connectionStream, originDomain, metamaskContext) { // setup multiplexing var mx = setupMultiplex(connectionStream) // connect features setupControllerConnection(mx.createStream('controller')) controller.setupProviderConnection(mx.createStream('provider'), originDomain) + if (metamaskContext === 'popup') popupIsOpen = true } // @@ -95,6 +88,7 @@ function setupControllerConnection (stream) { // teardown on disconnect eos(stream, () => { controller.ethStore.removeListener('update', controller.sendUpdate.bind(controller)) + popupIsOpen = false }) }) } From 17481ff61a63effaaa9bef7dc9d8f8ccf6d432bf Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 14 Sep 2016 11:36:56 -0700 Subject: [PATCH 2/5] Add to CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 862bf3d7e..cd96ee0a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Current Master +- Fixed bug where if you send a transaction from within MetaMask extension the +popup notification opens up. + - Fixed bug where opening MetaMask could close a non-metamask popup. - Fixed memory leak that caused occasional crashes. From b7e6ec5ceae4510013c644bac7bc4d138aa6f0a1 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 14 Sep 2016 11:57:41 -0700 Subject: [PATCH 3/5] Fix popup flag assignment --- app/scripts/background.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 18a112dd1..b2268425a 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -44,7 +44,7 @@ function connectRemote (remotePort) { var portStream = new PortStream(remotePort) if (isMetaMaskInternalProcess) { // communication with popup - remotePort.name === 'popup' ? popupIsOpen = true : popupIsOpen = false + popupIsOpen = remotePort.name === 'popup' setupTrustedCommunication(portStream, 'MetaMask', remotePort.name) } else { // communication with page @@ -67,7 +67,6 @@ function setupTrustedCommunication (connectionStream, originDomain, metamaskCont // connect features setupControllerConnection(mx.createStream('controller')) controller.setupProviderConnection(mx.createStream('provider'), originDomain) - if (metamaskContext === 'popup') popupIsOpen = true } // From 8e7a9c470943b4cfe1e19f1682ee8521033ed2db Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 14 Sep 2016 12:22:39 -0700 Subject: [PATCH 4/5] Remove unused argument --- app/scripts/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index b2268425a..652acc113 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -61,7 +61,7 @@ function setupUntrustedCommunication (connectionStream, originDomain) { controller.setupPublicConfig(mx.createStream('publicConfig')) } -function setupTrustedCommunication (connectionStream, originDomain, metamaskContext) { +function setupTrustedCommunication (connectionStream, originDomain) { // setup multiplexing var mx = setupMultiplex(connectionStream) // connect features From a0bfdfe40920c606fc09f9637ee6cef18537e3c5 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 14 Sep 2016 14:34:54 -0700 Subject: [PATCH 5/5] Do not show user rejection errors within our UI. --- ui/app/conf-tx.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 99b4bc9f1..f02b6be78 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -140,7 +140,9 @@ ConfirmTxScreen.prototype.goHome = function (event) { } function warningIfExists (warning) { - if (warning) { + if (warning && + // Do not display user rejections on this screen: + warning.indexOf('User denied transaction signature') === -1) { return h('span.error', { style: { margin: 'auto' } }, warning) } }