diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js index 6ae2a51c0..60a47dd3e 100644 --- a/src/js/controllers/review.controller.js +++ b/src/js/controllers/review.controller.js @@ -450,6 +450,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit vm.sendingTitle = gettextCatalog.getString('You are paying'); vm.memo = vm.thirdParty.memo; vm.memoExpanded = !!vm.memo; + vm.destination.name = vm.thirdParty.name; txPayproData = { caTrusted: vm.thirdParty.caTrusted, diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index e42661115..1a2601fda 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -400,7 +400,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat var toAddr = payProData.toAddress; var amount = payProData.amount; var paymentUrl = payProData.url; - var expires = payProData.expires + var expires = payProData.expires; + var time = payProData.time; if (coin === 'bch') { var displayAddr = payProData.outputs[0].address; @@ -408,11 +409,12 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat amount = payProData.outputs[0].amount; paymentUrl = payProData.paymentUrl; expires = Math.floor(new Date(expires).getTime() / 1000) + time = Math.ceil(new Date(time).getTime() / 1000) } var name = payProData.domain; if (paymentUrl.indexOf('https://bitpay.com') > -1) { - name = 'bitpay'; + name = 'BitPay'; } var thirdPartyData = { @@ -426,7 +428,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat network: 'livenet', requiredFeeRate: payProData.requiredFeeRate, selfSigned: 0, - time: Math.ceil(new Date(payProData.time).getTime() / 1000), + time: time, displayAddress: displayAddr, toAddress: toAddr, url: paymentUrl, diff --git a/www/views/review.html b/www/views/review.html index 9edd672ec..69c0c31f0 100644 --- a/www/views/review.html +++ b/www/views/review.html @@ -48,9 +48,9 @@

{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}

+ ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70' && vm.thirdParty.name === 'BitPay'"> -

BitPay

+

{{vm.destination.name}}

Payment expires: {{vm.remainingTimeStr}}

Payment request has expired