From e95956e5a8c7c4035396885a8072d2df91491d3f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 17 Jun 2015 16:25:05 -0300
Subject: [PATCH] handles new deletion rules

---
 public/views/modals/txp-details.html | 2 +-
 src/js/controllers/index.js          | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 4f9ad9c68..e1c4a831b 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -134,7 +134,7 @@
 
   <div class="row column m20t" ng-if="tx.couldRemove">
     <div class="text-gray size-12 text-center m20b" show="tx.couldRemove" translate>
-      * Only payment proposals created by yourself with no peer actions can be removed
+      * Payment proposals can be deleted: (1) after 24hr of been created or (2) by the creator as long as it has no other signatures.
     </div>
     <button class="tiny expand round outline dark-gray" ng-click="remove(tx)"
       ng-disabled="loading" ng-show="tx.couldRemove">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 710cdb6d8..b4f1ee645 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -357,9 +357,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         tx.statusForUs = 'pending';
       }
 
-      if (tx.creatorId == self.copayerId && tx.actions.length == 1) {
-        tx.couldRemove = true;
-      };
+      tx.couldRemove =!tx.deleteLockTime;
 
       if (tx.creatorId != self.copayerId) {
         self.pendingTxProposalsCountForUs = self.pendingTxProposalsCountForUs + 1;