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

Address needed change to transaction resume, fix tests

Browse source
This commit is contained in:
Esteban Ordano 2014-08-29 13:36:38 -03:00
commit 22b92aca61
3 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
views/send.html
View file

@ -1,4 +1,4 @@
<div class="send" data-ng-controller="SendController as ctrl" data-ng-init="loadTxs()">
<div class="send" data-ng-controller="SendController" data-ng-init="loadTxs()">
<div ng-show='$root.wallet.isReady()'>
<h1 ng-show="txs.length != 0">Send Proposals</h1>
@ -85,17 +85,17 @@
</div>
<div class="large-6 medium-6 columns">
<div class="row collapse">
<label for="alternative">Amount in {{ ctrl.alternativeName }} </label>
<label for="alternative">Amount in {{ alternativeName }} </label>
<div class="small-9 columns">
<input type="number" id="alternative_amount"
ng-disabled="loading || !ctrl.rateService.isAvailable "
ng-disabled="loading || !isRateAvailable "
name="alternative" placeholder="Amount" ng-model="alternative"
enough-amount required
autocomplete="off"
>
</div>
<div class="small-3 columns">
<span class="postfix">{{ctrl.alternativeIsoCode}}</span>
<span class="postfix">{{alternativeIsoCode}}</span>
</div>
</div>
</div>
@ -135,6 +135,9 @@
<h6>Total amount for this transaction:</h6>
<p class="text-gray" ng-class="{'hidden': sendForm.amount.$invalid || !amount > 0}">
<b>{{amount + defaultFee |noFractionNumber}}</b> {{$root.unitName}}
<small ng-if="isRateAvailable">
{{ rateService.toFiat((amount + defaultFee) * unitToSatoshi, alternativeIsoCode) | noFractionNumber: 2 }} {{ alternativeIsoCode }}
</small>
<small>
{{ ((amount + defaultFee) * unitToBtc)|noFractionNumber:8}} BTC <br/>
Including fee of {{defaultFee|noFractionNumber}} {{$root.unitName}}