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

Merge pull request #6265 from JDonadio/ref/fee-txp-details

Browse source 
Display fee values - txp details
This commit is contained in:
Gabriel Edgardo Bazán 2017-06-22 10:44:04 -03:00 • committed by GitHub
commit 71f7d76599
5 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
www/views/modals/txp-details.html
View file

@ -97,10 +97,11 @@
{{tx.message}}
</span>
</div>
<div class="item single-line">
<span class="label" translate>Fee</span>
<span class="item-note">
{{tx.feeStr}}
<div class="item">
<span class="label">{{'Fee:' | translate}} {{tx.feeLevelStr | translate}}</span>
<span class="m10l">{{tx.feeStr || '...'}}</span>
<span class="item-note m10l">
<span>{{tx.feeFiatStr || '...'}}&nbsp;<span class="fee-rate" ng-if="tx.feeRateStr" translate>- {{tx.feeRateStr}} of the transaction</span></span>
</span>
</div>

10
www/views/tx-details.html
View file

@ -77,11 +77,11 @@
</div>
<i class="icon bp-arrow-right"></i>
</a>
<div class="item single-line" ng-click="toggleFeeFiat = !toggleFeeFiat" ng-if="btx.action != 'received'">
<div class="item" ng-if="btx.action != 'received'">
<span class="label" translate>Fee</span>
<span class="item-note">
<span ng-if="!toggleFeeFiat">{{btx.feeStr}}</span>
<span ng-if="toggleFeeFiat">{{feeFiatStr}}</span>
<span class="m10l">{{btx.feeStr || '...'}}</span>
<span class="item-note m10l">
<span>{{btx.feeFiatStr || '...'}}&nbsp;<span class="fee-rate" ng-if="btx.feeRateStr" translate>- {{btx.feeRateStr}} of the transaction</span></span>
</span>
</div>
<div class="item low-fees" ng-if="btx.action == 'received' && btx.lowFees">
@ -104,7 +104,7 @@
</div>
<ion-toggle ng-show="!btx.confirmations || btx.confirmations == 0"
class="toggle-unconfirmed"
ng-model="txNotification.value"
ng-model="txNotification.value"
toggle-class="toggle-balanced"
ng-change="txConfirmNotificationChange()">
<span class="toggle-label" translate>Notify me if confirmed</span>