Merge pull request #759 from cmgustavo/bug/01-amount-input

Bug/01 amount input
This commit is contained in:
Matias Alejo Garcia 2014-06-26 22:47:56 -03:00
commit 4467ae270f
7 changed files with 136 additions and 44 deletions

View file

@ -696,7 +696,6 @@
<div class="row collapse">
<label for="amount">Amount
<small ng-hide="!sendForm.amount.$pristine">required</small>
<i class="fi-arrow-up" title="Send all funds" ng-click="topAmount()"></i>
<small class="is-valid" ng-show="!sendForm.amount.$invalid && !sendForm.amount.$pristine">Valid</small>
<small class="has-error" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine && !notEnoughAmount">
Not valid
@ -706,9 +705,14 @@
<div class="small-9 columns">
<input type="number" id="amount" ng-disabled="loading"
name="amount" placeholder="Amount" ng-model="amount"
min="1" max="10000000000" enough-amount required
min="0.0001" max="10000000000" enough-amount required
autocomplete="off"
>
<a class="small input-note" title="Send all funds"
ng-show="$root.availableBalance > 0"
ng-click="topAmount(sendForm)">
Use all funds ({{getAvailableAmount()}} {{$root.unitName}})
</a>
</div>
<div class="small-3 columns">
<span class="postfix">{{$root.unitName}}</span>
@ -720,13 +724,13 @@
Total amount for this transaction:
</small>
<div class="totalAmount">
<b>{{amount + defaultFee |number}}</b> {{$root.unitName}}
<b>{{amount + defaultFee |number:4}}</b> {{$root.unitName}}
<small>
{{ ((amount + defaultFee) * unitToBtc) |number}} BTC
{{ ((amount + defaultFee) * unitToBtc) |number:4}} BTC
</small>
</div>
<small>
Including fee of {{defaultFee|number}} {{$root.unitName}}
Including fee of {{defaultFee |number:4}} {{$root.unitName}}
</small>
</div>
</div>