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

Fix TXP modal events

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-17 18:10:22 -03:00
commit 30511f9d7a
4 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,7 @@
<div class="row column m20t" ng-if="tx.couldRemove">
<button class="button expand outline dark-gray m0 expand" ng-click="hideTxInfo = true; remove(tx);"
<button class="button expand outline dark-gray m0 expand" ng-click="remove(tx);"
ng-disabled="loading" ng-show="tx.couldRemove">
<i class="fi-x icon-sign x"></i>
<span translate>Remove</span>
@ -106,14 +106,14 @@
<div class="row m20t" ng-if="tx.pendingForUs">
<div class="large-5 medium-5 small-6 columns">
<button class="button outline dark-gray m0 expand" ng-click="hideTxInfo = true; reject(tx);"
<button class="button outline dark-gray m0 expand" ng-click="reject(tx);"
ng-disabled="loading">
<i class="fi-x"></i>
<span translate>Reject</span>
</button>
</div>
<div class="large-5 medium-5 small-6 columns text-right">
<button class="button primary m0 expand" ng-click="hideTxInfo = true; sign(tx)"
<button class="button primary m0 expand" ng-click="sign(tx)"
ng-style="{'background-color':color}"
ng-disabled="loading">
<i class="fi-check"></i>
@ -122,9 +122,22 @@
</div>
</div>
<div class="text-center" ng-show="tx.status != 'pending'">
<div class="text-success m10t"
<div class="text-center text-gray" ng-show="tx.status != 'pending'">
<div class="m10t"
ng-show="tx.status=='accepted'" translate>
Transaction accepted...
</div>
<div class="m10t"
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
<div translate>But not broadcasted. Try to send manually</div>
<button class="primary"
ng-click="broadcast(tx)"
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
<span translate>Broadcast Transaction</span>
</button>
</div>
<div class="text-success m10t"
ng-show="tx.status=='broadcasted'" translate>
Transaction sent!
</div>
<div class="text-center text-warning"