BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix messages in txp modal

This commit is contained in:
Gustavo Maximiliano Cortez 2015-09-03 17:34:42 -03:00
parent 8d2ec0bd7c
commit 3a4df0c6c9
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/views/modals/txp-details.html
View File

@ -104,13 +104,12 @@
</li>
</ul>
</div>
<div class="box-notification" ng-show="error">
<div class="box-notification m20t" ng-show="error">
<span class="text-warning size-14">
{{error|translate}}
</span>
</div>
<div class="row column m20t text-center text-warning" ng-if="tx.removed" translate>
The payment was removed by creator
</div>
@ -133,14 +132,14 @@
</div>
</div>
<div class="text-center text-gray m20b" ng-show="tx.status != 'pending'">
<div class="m10t"
<div class="text-center text-gray m20t" ng-show="tx.status != 'pending'">
<div class="m10t size-12"
ng-show="tx.status=='accepted'" translate>
Payment accepted...
</div>
<div class="m10t"
<div
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
<div translate>But not broadcasted. Try to send manually</div>
<div class="m10b size-12" translate>But not broadcasted. Try to send manually</div>
<button class="primary round"
ng-click="broadcast(tx)"
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
@ -157,11 +156,11 @@
</div>
</div>
<div class="row column m20t" ng-if="tx.canBeRemoved">
<div class="text-gray size-12 text-center m20b" show="tx.canBeRemoved" translate>
<div class="row columns text-center m20t" ng-if="tx.canBeRemoved">
<div class="text-gray size-12 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)"
<button class="tiny round outline dark-gray warning" ng-click="remove(tx)"
ng-disabled="loading" ng-show="tx.canBeRemoved">
<i class="fi-trash size-14 m5r"></i>
<span translate>Delete Payment Proposal</span>

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

@ -187,7 +187,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
fc.getTx($scope.tx.id, function(err, tx) {
if (err) {
if (err.code && err.code == 'BADREQUEST' &&
if (err.code && err.code == 'TX_NOT_FOUND' &&
(eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) {
$scope.tx.removed = true;
$scope.tx.canBeRemoved = false;