diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-09-15 06:14:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 06:14:42 +0800 |
| commit | d3bd6236a872aa2cebe310a862631be48ca3c82c (patch) | |
| tree | 6ee896c9923f549c584d8f7d84c7bb7414e88276 /ui | |
| parent | b2103cbec7d7c3cd1cf43b0baf76d2c9b559873d (diff) | |
| parent | a0bfdfe40920c606fc09f9637ee6cef18537e3c5 (diff) | |
| download | tangerine-wallet-browser-d3bd6236a872aa2cebe310a862631be48ca3c82c.tar.gz tangerine-wallet-browser-d3bd6236a872aa2cebe310a862631be48ca3c82c.tar.zst tangerine-wallet-browser-d3bd6236a872aa2cebe310a862631be48ca3c82c.zip | |
Merge pull request #666 from MetaMask/i#626
Dont generate a popup notification for transactions from within metmask-extension
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/conf-tx.js | 4 |
1 files changed, 3 insertions, 1 deletions
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) } } |