anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix send max opts (#4152)

Browse source 
* fix send max opts

* improve setForm call
This commit is contained in:
Javier Donadío 2016-04-29 11:25:30 -03:00 • committed by Gustavo Maximiliano Cortez
commit 8ffb01a355
3 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/js/services/txService.js
View file

@ -91,7 +91,7 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr
});
});
};
};
root.removeTx = function(txp, opts, cb) {
opts = opts || {};
@ -106,7 +106,7 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr
opts = opts || {};
var fc = opts.selectedClient || profileService.focusedClient;
var currentSpendUnconfirmed = configService.getSync().wallet.spendUnconfirmed;
var getFee = function(cb) {
if (opts.lockedCurrentFeePerKb) {
cb(null, opts.lockedCurrentFeePerKb);
@ -115,16 +115,23 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr
}
};
getFee(function(err, feePerKb) {
if (err) return cb(err);
opts.feePerKb = feePerKb;
opts.excludeUnconfirmedUtxos = currentSpendUnconfirmed ? false : true;
if (opts.sendMax) {
fc.createTxProposal(opts, function(err, txp) {
if (err) return cb(err);
else return cb(null, txp);
});
});
}else {
getFee(function(err, feePerKb) {
if (err) return cb(err);
opts.feePerKb = feePerKb;
opts.excludeUnconfirmedUtxos = currentSpendUnconfirmed ? false : true;
fc.createTxProposal(opts, function(err, txp) {
if (err) return cb(err);
else return cb(null, txp);
});
});
}
};
root.publishTx = function(txp, opts, cb) {