From e29f97eddf4564322d912ab0a964049394aec84c Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Tue, 7 Aug 2018 11:07:19 +1200
Subject: [PATCH] Payment request expiration.

---
 src/js/controllers/review.controller.js | 1 +
 www/views/review.html                   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index 5785ee831..fe1eac2cd 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -510,6 +510,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
     function setExpiredValues() {
       vm.paymentExpired = true;
       vm.remainingTimeStr = gettextCatalog.getString('Expired');
+      vm.readyToSend = false;
       if (countDown) $interval.cancel(countDown);
       $timeout(function() {
         $scope.$apply();
diff --git a/www/views/review.html b/www/views/review.html
index c401b8c34..c6631fd19 100644
--- a/www/views/review.html
+++ b/www/views/review.html
@@ -51,7 +51,8 @@
           ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70' && vm.thirdParty.name === 'bitpay'">
             <img src="img/icon-bitpay.svg" class="bg">
             <h2>BitPay</h2>
-            <p translate>Payment expires: {{vm.remainingTimeStr}}</p>
+            <p translate ng-if="!vm.paymentExpired">Payment expires: {{vm.remainingTimeStr}}</p>
+            <p class="warning" translate ng-if="vm.paymentExpired">Payment request has expired</p>
           </div>
           <div class="item-content item-content-compact" ng-init="addressExpanded = false" ng-if="vm.destination.kind === 'address' && !vm.thirdParty">
             <div class="address-frame" ng-class="{ 'expanded': addressExpanded }" ng-click="addressExpanded = !addressExpanded">