mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #6149 from gabrielbazan7/fix/setFee
fix send max custom fee on confirm
This commit is contained in:
commit
4a92665e3a
|
@ -47,10 +47,10 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
});
|
});
|
||||||
|
|
||||||
function setFee(customFeeLevel, cb) {
|
function setFee(customFeeLevel, cb) {
|
||||||
feeService.getCurrentFeeValue($scope.network, customFeeLevel, function(err, feePerKb) {
|
feeService.getCurrentFeeValue($scope.network, customFeeLevel, function(err, currentFeePerKb) {
|
||||||
var config = configService.getSync().wallet;
|
var config = configService.getSync().wallet;
|
||||||
var configFeeLevel = (config.settings && config.settings.feeLevel) ? config.settings.feeLevel : 'normal';
|
var configFeeLevel = (config.settings && config.settings.feeLevel) ? config.settings.feeLevel : 'normal';
|
||||||
feePerKb = feePerKb;
|
feePerKb = currentFeePerKb;
|
||||||
feeLevel = customFeeLevel ? customFeeLevel : configFeeLevel;
|
feeLevel = customFeeLevel ? customFeeLevel : configFeeLevel;
|
||||||
$scope.feeLevel = feeService.feeOpts[feeLevel];
|
$scope.feeLevel = feeService.feeOpts[feeLevel];
|
||||||
if (cb) return cb();
|
if (cb) return cb();
|
||||||
|
@ -596,6 +596,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
$scope.hideModal = function(customFeeLevel) {
|
$scope.hideModal = function(customFeeLevel) {
|
||||||
if (customFeeLevel) {
|
if (customFeeLevel) {
|
||||||
cachedTxp = {};
|
cachedTxp = {};
|
||||||
|
cachedSendMax = {};
|
||||||
ongoingProcess.set('gettingFeeLevels', true);
|
ongoingProcess.set('gettingFeeLevels', true);
|
||||||
setFee(customFeeLevel, function() {
|
setFee(customFeeLevel, function() {
|
||||||
ongoingProcess.set('gettingFeeLevels', false);
|
ongoingProcess.set('gettingFeeLevels', false);
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span translate>Current fee rate for this policy</span>:
|
<span translate>Current fee rate for this policy</span>:
|
||||||
<span class="fee-rate" ng-if="feePerSatByte">{{feePerSatByte}} sat/byte</span>
|
<span class="fee-rate" ng-if="feePerSatByte">{{feePerSatByte}} satoshis/byte</span>
|
||||||
<span ng-if="loadingFee">...</span>
|
<span ng-if="loadingFee">...</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span translate>Current fee rate for this policy</span>:
|
<span translate>Current fee rate for this policy</span>:
|
||||||
<span class="fee-rate" ng-if="feePerSatByte">{{feePerSatByte}} sat/byte</span>
|
<span class="fee-rate" ng-if="feePerSatByte">{{feePerSatByte}} satoshis/byte</span>
|
||||||
<span ng-if="loadingFee">...</span>
|
<span ng-if="loadingFee">...</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue