better paypro diplay

This commit is contained in:
Matias Alejo Garcia 2015-09-18 12:07:51 -03:00
parent 96dba0de7c
commit 7bda16494e
3 changed files with 30 additions and 6 deletions

View File

@ -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">

View File

@ -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>

View File

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