From 7bda16494eb7fb03b1aafb4bb7c8b8188f0ec6e6 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 18 Sep 2015 12:07:51 -0300
Subject: [PATCH 1/2] better paypro diplay

---
 public/views/modals/paypro.html  | 19 +++++++++++++++----
 public/views/walletHome.html     |  4 ++--
 src/js/controllers/walletHome.js | 13 +++++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

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 @@
     </li>
     <li class="line-b p10 oh">
     <span class="text-gray" translate>Certified by</span>:
-    <span class="right">
-      <span ng-show="paypro.verified && paypro.chainVerified"><i class="fi-lock color-greeni"></i> 
-        {{paypro.verifyData.caName || paypro.verifyData}}</span>
-      <span ng-show="!paypro.verified || !paypro.chainVerified"><i class="fi-unlock color-yellowi"></i> <span translate>Unknown Root or Selfsigned Certificate</span></span>
+    <span class="right text-right">
+      <span ng-show="paypro.caTrusted">
+        <i class="fi-lock color-greeni"></i> 
+        {{paypro.caName}}<br>
+        <span translate>(Trusted)<span>
+      </span>
+      <span ng-show="!paypro.caTrusted">
+        <span ng-show="paypro.selfSigned">
+          <i class="fi-unlock color-yellowi"></i> <span translate>Self-signed Certificate</span>
+        </span>
+        <span ng-show="!paypro.selfSigned">
+          <i class="fi-unlock color-yellowi"></i> <span translate>{{paypro.caName}}</span><br>
+          <span translate>WARNING: UNTRUSTED CERTIFICATE<span>
+        </span>
+      </span>
     </span>
     </li>
     <li class="line-b p10 oh" ng-if="paypro.memo">
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 @@
 
                 <div class="input block">
                   <input class="p45li" type="text" id="domain" name="domain" ng-model="home._paypro.domain" ng-disabled="1">
-                  <i ng-show="home._paypro.verified && home._paypro.chainVerified" class="fi-lock color-greeni"></i>
-                  <i ng-show="!home._paypro.verified || !home._paypro.chainVerified" class="fi-unlock color-yellowi"></i>
+                  <i ng-show="home._paypro.verified && home._paypro.caTrusted" class="fi-lock color-greeni"></i>
+                  <i ng-show="!home._paypro.caTrusted" class="fi-unlock color-yellowi"></i>
                 </div>
               </div>
             </div>
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);
         }
 

From e028efb62c3ce44cc09db7e0f73a65afd1121d86 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 18 Sep 2015 12:10:01 -0300
Subject: [PATCH 2/2] rm translate

---
 public/views/modals/paypro.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html
index 803a5e6f2..663965258 100644
--- a/public/views/modals/paypro.html
+++ b/public/views/modals/paypro.html
@@ -44,7 +44,7 @@
           <i class="fi-unlock color-yellowi"></i> <span translate>Self-signed Certificate</span>
         </span>
         <span ng-show="!paypro.selfSigned">
-          <i class="fi-unlock color-yellowi"></i> <span translate>{{paypro.caName}}</span><br>
+          <i class="fi-unlock color-yellowi"></i>{{paypro.caName}}<br>
           <span translate>WARNING: UNTRUSTED CERTIFICATE<span>
         </span>
       </span>