diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index dce57bf26..2b24ff00d 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -132,12 +132,12 @@ -
-
+
+
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index b4f1ee645..4bdcda89d 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -357,7 +357,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r tx.statusForUs = 'pending'; } - tx.couldRemove =!tx.deleteLockTime; + if (!tx.deleteLockTime) + tx.canBeRemoved = true; if (tx.creatorId != self.copayerId) { self.pendingTxProposalsCountForUs = self.pendingTxProposalsCountForUs + 1; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 5bff08a28..e0f5859bc 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -150,7 +150,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (err.code && err.code == 'BADREQUEST' && (eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) { $scope.tx.removed = true; - $scope.tx.couldRemove = false; + $scope.tx.canBeRemoved = false; $scope.tx.pendingForUs = false; $scope.$apply(); return;