implement send all support
This commit is contained in:
parent
d10057c745
commit
206fe41db5
4 changed files with 35 additions and 3 deletions
|
|
@ -278,6 +278,11 @@
|
||||||
<div>
|
<div>
|
||||||
<h4 class="title m0">
|
<h4 class="title m0">
|
||||||
|
|
||||||
|
<button class="outline light-gray round tiny right m0 lh"
|
||||||
|
ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr)"
|
||||||
|
ng-if="index.availableBalance > 0 && !home.blockUx && !home.lockAmount" translate> Send All
|
||||||
|
</button>
|
||||||
|
|
||||||
<div ng-show="!index.lockedBalance && index.availableBalanceStr">
|
<div ng-show="!index.lockedBalance && index.availableBalanceStr">
|
||||||
<div class="size-12">
|
<div class="size-12">
|
||||||
<span class="db text-bold">
|
<span class="db text-bold">
|
||||||
|
|
@ -397,10 +402,10 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row" ng-show="!home.onGoingProcess">
|
<div class="row" ng-show="!home.onGoingProcess">
|
||||||
<div class="large-6 medium-6 small-6 columns" ng-show="!home.blockUx && (home._paypro || home.lockAddress)">
|
<div class="large-6 medium-6 small-6 columns" ng-show="!home.blockUx && (home._paypro || home.lockAddress || home.lockAmount)">
|
||||||
<a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
|
<a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress)}">
|
<div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress || home.lockAmount)}">
|
||||||
<button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline"
|
<button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline"
|
||||||
ng-style="{'background-color':index.backgroundColor}" translate>
|
ng-style="{'background-color':index.backgroundColor}" translate>
|
||||||
Send
|
Send
|
||||||
|
|
|
||||||
|
|
@ -436,6 +436,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
self.lockedBalanceBTC = strip(self.lockedBalanceSat / COIN);
|
self.lockedBalanceBTC = strip(self.lockedBalanceSat / COIN);
|
||||||
self.availableBalanceBTC = strip(self.availableBalanceBTC / COIN);
|
self.availableBalanceBTC = strip(self.availableBalanceBTC / COIN);
|
||||||
|
|
||||||
|
// KB to send max
|
||||||
|
self.feePerKbSat = config.feePerKbSat || 10000;
|
||||||
|
var feeToSendMaxSat = balance.totalKbToSendMax * self.feePerKbSat;
|
||||||
|
|
||||||
|
self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit);
|
||||||
|
self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName;
|
||||||
|
|
||||||
//STR
|
//STR
|
||||||
self.totalBalanceStr = profileService.formatAmount(self.totalBalanceSat) + ' ' + self.unitName;
|
self.totalBalanceStr = profileService.formatAmount(self.totalBalanceSat) + ' ' + self.unitName;
|
||||||
|
|
|
||||||
|
|
@ -917,6 +917,27 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
return actions.hasOwnProperty('create');
|
return actions.hasOwnProperty('create');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this._doSendAll = function(amount) {
|
||||||
|
this.setForm(null, amount);
|
||||||
|
};
|
||||||
|
|
||||||
|
this.sendAll = function(amount, feeStr) {
|
||||||
|
var msg = gettextCatalog.getString("{{fee}} will be discounted for bitcoin networking fees", {
|
||||||
|
fee: feeStr
|
||||||
|
});
|
||||||
|
if (isCordova) {
|
||||||
|
navigator.notification.confirm(
|
||||||
|
msg,
|
||||||
|
this._doSendAll(amount),
|
||||||
|
'OK', 'Cancel'
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
if (confirm(msg))
|
||||||
|
this._doSendAll(amount);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
this.bindTouchDown();
|
this.bindTouchDown();
|
||||||
this.setAddress();
|
this.setAddress();
|
||||||
this.setSendFormInputs();
|
this.setSendFormInputs();
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ angular
|
||||||
historicLog.add(level, args.join(' '));
|
historicLog.add(level, args.join(' '));
|
||||||
orig.apply(null, args);
|
orig.apply(null, args);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error at log decorator:', e);
|
console.log('ERROR (at log decorator):', e, args[0]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue