BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6294 from matiu/bug/low2 

fix low
This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-23 15:45:39 -03:00 committed by GitHub
parent 24503ed784 4599ed16f6
commit 69d481e329
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/services/walletService.js
View File

@ -946,12 +946,14 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
wallet.getUtxos({}, function(err, resp) { wallet.getUtxos({}, function(err, resp) {
if (err || !resp || !resp.length) return cb(); if (err || !resp || !resp.length) return cb();
var lowAmountN = root.getLowAmount(wallet, levels, resp.length + 1); var minFee = root.getMinFee(wallet, levels, resp.length);
var total = lodash.sum(resp, 'satoshis');
var lowAmount1 = root.getLowAmount(wallet, levels); var balance = lodash.sum(resp, 'satoshis');
// for 2 outputs
var lowAmount = root.getLowAmount(wallet, levels);
var lowUtxos = lodash.filter(resp, function(x) { var lowUtxos = lodash.filter(resp, function(x) {
return x.satoshis < lowAmount1; return x.satoshis < lowAmount;
}); });
var totalLow = lodash.sum(lowUtxos, 'satoshis'); var totalLow = lodash.sum(lowUtxos, 'satoshis');
@ -959,8 +961,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
return cb(err, { return cb(err, {
allUtxos: resp || [], allUtxos: resp || [],
lowUtxos: lowUtxos || [], lowUtxos: lowUtxos || [],
warning: lowAmountN / total > TOTAL_LOW_WARNING_RATIO, warning: minFee / balance > TOTAL_LOW_WARNING_RATIO,
minFee: root.getMinFee(wallet, levels, resp.length), minFee: minFee,
}); });
}); });
}; };