diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-09-16 01:26:02 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-09-16 01:26:02 +0800 |
| commit | 8ea086290b6aa78c35a502dc6e81e4efab904430 (patch) | |
| tree | 06258d6566cc6377a8c87d62108e2c208c7a15f6 /ui | |
| parent | ef0b535d94d97827b4bfc471e4d950d90d637fa3 (diff) | |
| parent | 06b9adf172010600c7ac1127ff2ee76a7433e97b (diff) | |
| download | tangerine-wallet-browser-8ea086290b6aa78c35a502dc6e81e4efab904430.tar tangerine-wallet-browser-8ea086290b6aa78c35a502dc6e81e4efab904430.tar.gz tangerine-wallet-browser-8ea086290b6aa78c35a502dc6e81e4efab904430.tar.bz2 tangerine-wallet-browser-8ea086290b6aa78c35a502dc6e81e4efab904430.tar.lz tangerine-wallet-browser-8ea086290b6aa78c35a502dc6e81e4efab904430.tar.xz tangerine-wallet-browser-8ea086290b6aa78c35a502dc6e81e4efab904430.tar.zst tangerine-wallet-browser-8ea086290b6aa78c35a502dc6e81e4efab904430.zip | |
Merge branch 'master' into i#519buyButtonTxConf
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 0c3e32cea..8cbb1f44f 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -160,7 +160,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) } } |