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

rm onelined

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-06-18 11:17:35 -03:00
commit bcd7510ad7
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -357,7 +357,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
tx.statusForUs = 'pending'; tx.statusForUs = 'pending';
} }
tx.couldRemove =!tx.deleteLockTime; if (!tx.deleteLockTime)
tx.canBeRemoved = true;
if (tx.creatorId != self.copayerId) { if (tx.creatorId != self.copayerId) {
self.pendingTxProposalsCountForUs = self.pendingTxProposalsCountForUs + 1; self.pendingTxProposalsCountForUs = self.pendingTxProposalsCountForUs + 1;

2
src/js/controllers/walletHome.js
View file

@ -150,7 +150,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (err.code && err.code == 'BADREQUEST' && if (err.code && err.code == 'BADREQUEST' &&
(eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) { (eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) {
$scope.tx.removed = true; $scope.tx.removed = true;
$scope.tx.couldRemove = false; $scope.tx.canBeRemoved = false;
$scope.tx.pendingForUs = false; $scope.tx.pendingForUs = false;
$scope.$apply(); $scope.$apply();
return; return;