fix subheader & camera on send

This commit is contained in:
bechi 2015-12-02 10:29:44 -03:00
commit c7573b6e2f
4 changed files with 27 additions and 28 deletions

View file

@ -1,15 +1,10 @@
<div>
<div class="left" ng-show="index.lockedBalanceSat">
<i class="fi-info size-24 m10r"></i>
</div>
<div class="size-10">
<span class="db text-bold">
<span translate>Available Balance</span>:
{{index.availableBalanceStr }}
</span>
<span class="text-gray" ng-show="index.lockedBalanceSat">
{{index.lockedBalanceStr}}
<span translate>locked by pending payments</span>
</span>
</div>
<span class="db text-bold">
<span translate>Available Balance</span>:
{{index.availableBalanceStr }}
</span>
<span class="text-gray" ng-show="index.lockedBalanceSat">
{{index.lockedBalanceStr}}
<span translate>locked by pending payments</span>
</span>
</div>

View file

@ -265,20 +265,21 @@
-->
<div id="send" class="send tab-view">
<div>
<div class="pr">
<h4 class="title m0">
<a class="right lh"
<available-balance></available-balance>
<a class="db"
ng-if="index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr, index.feeRateToSendMax, index.currentFeeLevel)"
translate> Send All
</a>
<available-balance></available-balance>
</h4>
<div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner>
</div>
</div>
<div class="row m20t">
<div class="large-12 large-centered columns">
<div class="large-12 large-centered columns m20t">
<form name="sendForm" ng-submit="home.submitForm()" ng-disabled="home.blockUx || home.onGoingProcess" novalidate>
<div class="box-notification" ng-show="home.error" ng-click="home.resetError()">
<span class="text-warning">