diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html
index e168cf46a..803a5e6f2 100644
--- a/public/views/modals/paypro.html
+++ b/public/views/modals/paypro.html
@@ -33,10 +33,21 @@
Certified by:
-
-
- {{paypro.verifyData.caName || paypro.verifyData}}
- Unknown Root or Selfsigned Certificate
+
+
+
+ {{paypro.caName}}
+ (Trusted)
+
+
+
+ Self-signed Certificate
+
+
+ {{paypro.caName}}
+ WARNING: UNTRUSTED CERTIFICATE
+
+
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index d9994cfe0..2042dfb9e 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -335,8 +335,8 @@
-
-
+
+
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index b77de1450..34066bd49 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -982,6 +982,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
msg = gettext('Could not fetch payment information');
}
self.error = msg;
+ $timeout(function() {
+ $rootScope.$digest();
+ }, 1);
+ return cb(true);
+ }
+
+ if (!paypro.verified) {
+ self.resetForm();
+ $log.warn('Failed to verified payment protocol signatured');
+ self.error = gettext('Payment Protocol Invalid');
+ $timeout(function() {
+ $rootScope.$digest();
+ }, 1);
return cb(true);
}