diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 0e4902538..fe98906c6 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -435,6 +435,10 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); }; + $scope.cancel = function() { + $scope.payproModal.hide(); + }; + $scope.approve = function(onSendStatusChange) { var wallet = $scope.wallet; diff --git a/src/js/controllers/modals/paypro.js b/src/js/controllers/modals/paypro.js deleted file mode 100644 index 752a6e55e..000000000 --- a/src/js/controllers/modals/paypro.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('payproController', function($scope) { - var self = $scope.self; - - $scope.cancel = function() { - $scope.payproModal.hide(); - }; -}); diff --git a/www/views/modals/paypro.html b/www/views/modals/paypro.html index f643f63bd..78dd4380a 100644 --- a/www/views/modals/paypro.html +++ b/www/views/modals/paypro.html @@ -1,56 +1,61 @@ - - - -
- Payment request -
+

Payment request

- -
- {{amountStr}} -
-
-
- Details +
+
+
{{displayAmount || '...'}} {{displayUnit}}
+
{{alternativeAmountStr || '...'}}
+
-
- {{'Pay To'|translate}} - {{paypro.domain}} -
-
- {{'Address'|translate}} - {{paypro.toAddress}} -
-
- {{'Certified by'|translate}} - - - - {{paypro.caName}}
- (Trusted) +
+
+ {{'Pay To'|translate}} + + {{paypro.domain}} - - - Self-signed Certificate +
+
+ {{'Address'|translate}} + + {{paypro.toAddress}} + +
+
+ {{'Certified by'|translate}} + + + + {{paypro.caName}} {{'(Trusted)' | translate}} - - {{paypro.caName}}
- WARNING: UNTRUSTED CERTIFICATE + + + Self-signed Certificate + + + {{paypro.caName}}
+ WARNING: UNTRUSTED CERTIFICATE +
- -
-
- {{'Memo'|translate}} - {{paypro.memo}} -
-
- {{'Expires'|translate}} - {{paypro.expires * 1000 | amTimeAgo }} +
+
+ {{'Memo'|translate}} + + {{paypro.memo}} + +
+
+ {{'Expires'|translate}} + + {{paypro.expires * 1000 | amTimeAgo }} + +