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

fix locked balance places

Browse source
This commit is contained in:
bechi 2015-01-30 16:36:55 -03:00
commit 3ce975c0c2
3 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
views/send.html
View file

@ -1,4 +1,16 @@
<div class="send" ng-controller="SendController" ng-init="init()">
<div class="columns" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
<div class="panel">
<div class="left">
<i class="fi-info size-42 m10r"></i>
</div>
<div>
<p class="m0 size-14 text-bold">Available Balance: {{$root.wallet.balanceInfo.availableBalance}} {{$root.wallet.settings.unitName}}</p>
<span class="size-12 text-gray">{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} in pending transactions</span>
</div>
</div>
</div>
<div class="row show-for-large-up">
<div class="large-8 large-centered columns">
<h1>{{$root.title}}</h1>
@ -37,9 +49,8 @@
<div class="row" ng-show="!fetchingURL && !creatingTX">
<div class="large-8 large-centered columns">
<div class="large-8 small-11 small-centered large-centered columns">
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
<div class="panel">
<div class="box-notification" ng-show="error && !hideForWP ">
<div class="box-icon error">
<i class="fi-x size-24"></i>
@ -162,9 +173,8 @@
<a ng-click="resetForm()" class="button expand warning m0" ng-show="_merchantData || lockAddress" ng-disabled="loading">Cancel</a>
</div>
</div>
</div>
</form>
<div class="locked m10b" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
<!-- <div class="locked m10b" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
<i class="fi-lock"></i>
<span>
{{'Locked'|translate}} &nbsp;
@ -174,7 +184,7 @@
<b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b>
- {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}
</span>
</div>
</div> -->
</div>
</div>
<!-- end of row -->