Merge pull request #3716 from cmgustavo/bug/send_all_fee

Bug/send all fee
This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-05 17:21:45 -03:00
commit c70c8947ec
6 changed files with 153 additions and 112 deletions

View file

@ -106,7 +106,7 @@
Please, enter the code below
</p>
<form name="sellForm"
ng-submit="sell.createTx(index.glideraToken, index.glideraPermissions, twoFaCode, index.feeRateToSendMax)" novalidate>
ng-submit="sell.createTx(index.glideraToken, index.glideraPermissions, twoFaCode)" novalidate>
<input type="number" ng-model="twoFaCode" required>
<input class="button black expand round"
ng-style="{'background-color':index.backgroundColor}"

View file

@ -387,8 +387,8 @@
<h4 class="title m0">
<available-balance></available-balance>
<a
ng-if="index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr)"
ng-show="!home.lockedCurrentFeePerKb && index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
ng-click="home.sendAll()"
translate> Send All
</a>
</h4>
@ -403,7 +403,7 @@
</div>
<div class="row m20t">
<div class="large-12 large-centered columns">
<form name="sendForm" ng-submit="home.submitForm(index.feeRateToSendMax)" ng-disabled="home.blockUx || home.onGoingProcess" novalidate>
<form name="sendForm" ng-submit="home.submitForm()" ng-disabled="home.blockUx || home.onGoingProcess" novalidate>
<div ng-hide="home._paypro || home.hideAddress">
<div class="row collapse">