unify strings to "payment". Add retry on balance update
This commit is contained in:
parent
876ae63a25
commit
17deda9000
8 changed files with 92 additions and 55 deletions
|
|
@ -7,12 +7,12 @@
|
|||
</section>
|
||||
<section class="middle tab-bar-section">
|
||||
<h1 class="title ellipsis" ng-style="{'color':color}" translate>
|
||||
Transaction proposal
|
||||
Payment Proposal
|
||||
</h1>
|
||||
</section>
|
||||
</nav>
|
||||
<div class="p45t" ng-init="updateCopayerList()">
|
||||
<h4 class="title m0" translate>Information</h4>
|
||||
<h4 class="title m0" translate>Details</h4>
|
||||
<ul class="no-bullet size-14 m0">
|
||||
<li class="line-b p10 oh" ng-click="copyAddress(tx.toAddress)">
|
||||
<span class="text-gray" translate>To</span>:
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
</div>
|
||||
|
||||
<div ng-if="tx.actions[0] && !txRejected && !txBroadcasted">
|
||||
<h4 class="title m0" translate>Signatures</h4>
|
||||
<h4 class="title m0" translate>Participants</h4>
|
||||
<ul class="no-bullet size-14 m0">
|
||||
<li class="line-b p10 text-gray" ng-repeat="ac in tx.actions">
|
||||
<i class="icon-contact size-24"></i>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
|
||||
|
||||
<div class="row column m20t text-center text-warning" ng-if="tx.removed" translate>
|
||||
The transaction was removed by creator
|
||||
The payment was removed by creator
|
||||
</div>
|
||||
|
||||
<div class="row m20t" ng-if="tx.pendingForUs">
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
ng-style="{'background-color':color}"
|
||||
ng-disabled="loading">
|
||||
<i class="fi-check"></i>
|
||||
<span translate>Sign</span>
|
||||
<span translate>Accept</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
<div class="text-center text-gray" ng-show="tx.status != 'pending'">
|
||||
<div class="m10t"
|
||||
ng-show="tx.status=='accepted'" translate>
|
||||
Transaction accepted...
|
||||
Payment accepted...
|
||||
</div>
|
||||
<div class="m10t"
|
||||
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
|
||||
|
|
@ -119,27 +119,27 @@
|
|||
<button class="primary round"
|
||||
ng-click="broadcast(tx)"
|
||||
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
|
||||
<span translate>Broadcast Transaction</span>
|
||||
<span translate>Broadcast Payment</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="text-success m10t"
|
||||
ng-show="tx.status=='broadcasted'" translate>
|
||||
Transaction sent!
|
||||
Payment sent!
|
||||
</div>
|
||||
<div class="text-center text-warning"
|
||||
ng-show="tx.status=='rejected'" translate>
|
||||
Transaction finally rejected
|
||||
Payment finally rejected
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row column m20t" ng-if="tx.couldRemove">
|
||||
<div class="text-gray size-12 text-center m20b" show="tx.couldRemove" translate>
|
||||
* Only transactions created by yourself with no peer signatures can be removed
|
||||
* Only payment proposals created by yourself with no peer actions can be removed
|
||||
</div>
|
||||
<button class="tiny expand round outline dark-gray" ng-click="remove(tx)"
|
||||
ng-disabled="loading" ng-show="tx.couldRemove">
|
||||
<i class="fi-trash size-14 m5r"></i>
|
||||
<span translate>Remove transaction</span>
|
||||
<span translate>Delete Payment Proposal</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue