0 fee transaction feature added.
This commit is contained in:
parent
49a6711970
commit
898b7d03fe
5 changed files with 173 additions and 85 deletions
|
|
@ -517,7 +517,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
if (!lodash.isEmpty(warningMsg))
|
||||
msg += '\n' + warningMsg;
|
||||
|
||||
popupService.showAlert(null, msg, function() {});
|
||||
popupService.showAlert(null, msg, function() {});
|
||||
|
||||
};
|
||||
|
||||
$scope.onWalletSelect = function(wallet) {
|
||||
|
|
|
|||
|
|
@ -718,14 +718,23 @@ angular
|
|||
if (tx.paypro)
|
||||
startExpirationTimer(tx.paypro.expires);
|
||||
|
||||
updateTx(tx, vm.originWallet, {
|
||||
dryRun: true
|
||||
}, function(err) {
|
||||
$timeout(function() {
|
||||
$scope.$apply();
|
||||
}, 10);
|
||||
popupService.showConfirm(null, 'Do you want this transaction to be sent without a fee?', 'Yes', 'No', function(ok) {
|
||||
if(ok){
|
||||
tx.feeRate = 0;
|
||||
// tx.feeLevel = 'free';
|
||||
usingCustomFee = true;
|
||||
}
|
||||
updateTx(tx, vm.originWallet, {
|
||||
dryRun: true
|
||||
}, function(err) {
|
||||
$timeout(function() {
|
||||
$scope.$apply();
|
||||
}, 10);
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
// setWalletSelector(tx.coin, tx.network, tx.amount, function(err) {
|
||||
// if (err) {
|
||||
|
|
@ -778,6 +787,7 @@ angular
|
|||
msg += '\n' + warningMsg;
|
||||
|
||||
popupService.showAlert(null, msg, function() {});
|
||||
//popupService.showConfirm(null, msg, null, null, function() {});
|
||||
};
|
||||
|
||||
function statusChangeHandler(processName, showName, isOn) {
|
||||
|
|
@ -855,7 +865,11 @@ angular
|
|||
}
|
||||
|
||||
var msg;
|
||||
if (usingCustomFee) {
|
||||
// if (tx.feeLevel == 'free'){
|
||||
// tx.feeRate = 0;
|
||||
// }
|
||||
// else
|
||||
if (usingCustomFee) {
|
||||
msg = gettextCatalog.getString('Custom');
|
||||
tx.feeLevelName = msg;
|
||||
} else if (usingMerchantFee) {
|
||||
|
|
@ -865,7 +879,9 @@ angular
|
|||
} else {
|
||||
tx.feeLevelName = feeService.feeOpts[tx.feeLevel];
|
||||
tx.feeRate = feeRate;
|
||||
|
||||
}
|
||||
|
||||
|
||||
getSendMaxInfo(lodash.clone(tx), wallet, function(err, sendMaxInfo) {
|
||||
if (err) {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
|
|||
normal: gettext('Normal'),
|
||||
economy: gettext('Economy'),
|
||||
superEconomy: gettext('Super Economy'),
|
||||
// free: gettext('No fee (works only for BCH)'),
|
||||
custom: gettext('Custom')
|
||||
};
|
||||
|
||||
|
|
@ -31,6 +32,7 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
|
|||
root.getFeeRate = function(coin, network, feeLevel, cb) {
|
||||
|
||||
if (feeLevel == 'custom') return cb();
|
||||
if (feeLevel == 'free') return cb(null, 0);
|
||||
|
||||
network = network || 'livenet';
|
||||
|
||||
|
|
@ -48,9 +50,9 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou
|
|||
})
|
||||
});
|
||||
}
|
||||
|
||||
var feeRate = feeLevelRate.feePerKb;
|
||||
|
||||
|
||||
if (!fromCache) $log.debug('Dynamic fee: ' + feeLevel + '/' + network + ' ' + (feeLevelRate.feePerKb / 1000).toFixed() + ' SAT/B');
|
||||
|
||||
return cb(null, feeRate);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue