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

Remove filter noFractionNumber from views. Fix conversionRate from send.

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-30 18:28:55 -03:00 • committed by Matias Alejo Garcia
commit c215b3c15e
5 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
views/history.html
View file

@ -45,8 +45,8 @@
'text-primary' : btx.action == 'received',
'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}">
<b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<b ng-show="btx.alternativeAmount != null">{{btx.alternativeAmount| noFractionNumber}} {{$root.wallet.settings.alternativeIsoCode}}</b>
<b>{{btx.amount}} {{$root.wallet.settings.unitName}}</b>
<b ng-show="btx.alternativeAmount != null">{{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}}</b>
</div>
</div>

6
views/includes/transaction.html
View file

@ -9,9 +9,9 @@
<div class="row" ng-repeat="out in tx.outs">
<div class="large-3 medium-3 small-4 columns">
<div class="size-12">
<span>{{out.value |noFractionNumber}} {{$root.wallet.settings.unitName}}</span>
<span>{{out.value}} {{$root.wallet.settings.unitName}}</span>
<span class="label secondary round">
{{out.alternativeAmount|noFractionNumber}} {{out.alternativeIsoCode}}
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
</span>
</div>
</div>
@ -106,7 +106,7 @@
{{tx.missingSignatures}} signatures missing
</div>
<div class="ellipsis small text-gray show-for-large-up m5t">
<strong translate>Fee</strong>: {{tx.fee|noFractionNumber}} {{$root.wallet.settings.unitName}}
<strong translate>Fee</strong>: {{tx.fee}} {{$root.wallet.settings.unitName}}
<strong translate>Proposal ID</strong>: {{tx.ntxid}}
</div>
</div>

10
views/send.html
View file

@ -136,13 +136,13 @@
</p>
<p>
<i>{{amount + defaultFee |noFractionNumber}} {{$root.wallet.settings.unitName}}</i>
<i>{{amount + defaultFee}} {{$root.wallet.settings.unitName}}</i>
<span class="text-gray" ng-if="isRateAvailable">
{{ rateService.toFiat((amount + defaultFee) * unitToSatoshi, alternativeIsoCode) | noFractionNumber: 2 }} {{ alternativeIsoCode }}
{{ alternativeAmountPayPro }} {{ alternativeIsoCode }}
</span>
<span class="text-gray" >
(<span translate>Including fee of</span>
{{defaultFee|noFractionNumber}}
{{defaultFee}}
{{$root.wallet.settings.unitName}})
</span>
<p>
@ -185,10 +185,10 @@
</div>
</div><!-- end of row -->
<div class="row m20b" ng-show="$root.alternativeConversionRate > 0">
<div class="row m20b" ng-show="$root.wallet.balanceInfo.alternativeConversionRate > 0">
<div class="large-12 columns size-12">
<i class="fi-bitcoin-circle"></i>
1 BTC = {{alternativeConversionRate|noFractionNumber:2}} {{alternativeIsoCode}}
1 BTC = {{$root.wallet.balanceInfo.alternativeConversionRate}} {{alternativeIsoCode}}
</div>
</div>