mirror of https://github.com/BTCPrivate/copay.git
fix refresh/fee
This commit is contained in:
parent
20812dd508
commit
5bcc0b072d
|
@ -567,16 +567,16 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
};
|
||||
|
||||
scope.hideModal = function(customFeeLevel) {
|
||||
scope.chooseFeeLevelModal.hide();
|
||||
$log.debug('Custom fee level choosen:' + customFeeLevel + ' was:' + tx.feeLevel);
|
||||
if (tx.feeLevel == customFeeLevel)
|
||||
scope.chooseFeeLevelModal.hide();
|
||||
return;
|
||||
|
||||
tx.feeLevel = customFeeLevel;
|
||||
updateTx(tx, wallet, {
|
||||
clearCache: true,
|
||||
dryRun: true,
|
||||
}, function() {
|
||||
scope.chooseFeeLevelModal.hide();
|
||||
});
|
||||
};
|
||||
};
|
||||
|
|
|
@ -46,7 +46,9 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu
|
|||
}
|
||||
$scope.feeLevels = levels;
|
||||
updateCurrentValues();
|
||||
$scope.$apply();
|
||||
$timeout(function() {
|
||||
$scope.$apply();
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -56,9 +56,7 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
|
|||
root.getFeeLevels = function(cb) {
|
||||
|
||||
if (cache.updateTs > Date.now() - CACHE_TIME_TS * 1000) {
|
||||
$timeout(function() {
|
||||
return cb(null, cache.data, true);
|
||||
}, 1);
|
||||
return cb(null, cache.data, true);
|
||||
}
|
||||
|
||||
var walletClient = bwcService.getClient();
|
||||
|
|
Loading…
Reference in New Issue