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 1/4] 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;

From 0fbba35105c4c59b2931abf6df5a924c271bba97 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 17 Jun 2015 16:31:07 -0300
Subject: [PATCH 2/4] add signature

---
 src/js/controllers/walletHome.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 4816a5e6f..5bff08a28 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -545,6 +545,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     var errMessage =
       fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment');
 
+    //This are abnormal situations, but still err message will not be translated
+    //(the should) we should switch using err.code and use proper gettext messages
     errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check you connection and try again'));
 
     this.error = errMessage;

From 123250726e86f94ca60427ce017f3164536974b2 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 17 Jun 2015 16:54:14 -0300
Subject: [PATCH 3/4] update message

Signed-off-by: Matias Alejo Garcia <ematiu@gmail.com>
---
 public/views/modals/txp-details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index e1c4a831b..dce57bf26 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>
-      * Payment proposals can be deleted: (1) after 24hr of been created or (2) by the creator as long as it has no other signatures.
+      * 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.
     </div>
     <button class="tiny expand round outline dark-gray" ng-click="remove(tx)"
       ng-disabled="loading" ng-show="tx.couldRemove">

From bcd7510ad768396b1d6d4b9ef98b796b75e72e76 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 18 Jun 2015 11:17:35 -0300
Subject: [PATCH 4/4] rm onelined

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

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 @@
     </div>
   </div>
 
-  <div class="row column m20t" ng-if="tx.couldRemove">
-    <div class="text-gray size-12 text-center m20b" show="tx.couldRemove" translate>
+  <div class="row column m20t" ng-if="tx.canBeRemoved">
+    <div class="text-gray size-12 text-center m20b" show="tx.canBeRemoved" translate>
       * 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.
     </div>
     <button class="tiny expand round outline dark-gray" ng-click="remove(tx)"
-      ng-disabled="loading" ng-show="tx.couldRemove">
+      ng-disabled="loading" ng-show="tx.canBeRemoved">
       <i class="fi-trash size-14 m5r"></i>
       <span translate>Delete Payment Proposal</span>
     </button>
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;