anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

handles new deletion rules

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-06-17 16:25:05 -03:00
commit e95956e5a8
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/modals/txp-details.html
View file

@ -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">

4
src/js/controllers/index.js
View file

@ -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;