Merge branch 'master' into tos

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)
   }
 }