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

send working. SendMax / PayPro: todo

Browse source
This commit is contained in:
Matias Alejo Garcia 2017-06-21 13:03:48 -03:00
commit 442e64c20c
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
3 changed files with 108 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/services/feeService.js
View file

@ -26,7 +26,7 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
root.getFeeRate = function(network, feeLevel, cb) {
network = network || 'livenet';
root.getFeeLevels(function(err, levels) {
root.getFeeLevels(function(err, levels, fromCache) {
if (err) return cb(err);
var feeLevelRate = lodash.find(levels[network], {
@ -42,7 +42,8 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
}
var feeRate = feeLevelRate.feePerKB;
$log.debug('Dynamic fee: ' + feeLevel + ' ' + feeRate + ' SAT');
if (!fromCache) $log.debug('Dynamic fee: ' + feeLevel + '/' + network +' ' + (feeLevelRate.feePerKB / 1000).toFixed() + ' SAT/B');
return cb(null, feeRate);
});
@ -55,9 +56,8 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
root.getFeeLevels = function(cb) {
if (cache.updateTs > Date.now() - CACHE_TIME_TS * 1000 ) {
$log.debug('Fee cache hit');
$timeout( function() {
return cb(null, cache.data);
return cb(null, cache.data, true);
}, 1);
}