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

Fix fee levels for btc and bch

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-08-29 15:47:39 -03:00
commit 70fa50177c
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
12 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/addresses.js
View file

@ -70,7 +70,7 @@ angular.module('copayApp.controllers').controller('addressesController', functio
feeService.getFeeLevels(function(err, levels){
feeService.getFeeLevels($scope.wallet.coin, function(err, levels){
walletService.getLowUtxos($scope.wallet, levels, function(err, resp) {
if (err) return;

4
src/js/controllers/confirm.js
View file

@ -74,7 +74,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
// no min amount? (sendMax) => look for no empty wallets
minAmount = minAmount || 1;
console.log('[confirm.js.76]', network, coin); //TODO
$scope.wallets = profileService.getWallets({
onlyComplete: true,
network: network,
@ -256,7 +255,7 @@ console.log('[confirm.js.76]', network, coin); //TODO
// End of quick refresh, before wallet is selected.
if (!wallet) return cb();
feeService.getFeeRate(tx.network, tx.feeLevel, function(err, feeRate) {
feeService.getFeeRate(wallet.coin, tx.network, tx.feeLevel, function(err, feeRate) {
if (err) return cb(err);
if (!usingCustomFee) tx.feeRate = feeRate;
@ -573,6 +572,7 @@ console.log('[confirm.js.76]', network, coin); //TODO
scope.network = tx.network;
scope.feeLevel = tx.feeLevel;
scope.noSave = true;
scope.coin = wallet.coin;
if (usingCustomFee) {
scope.customFeePerKB = tx.feeRate;

2
src/js/controllers/modals/feeLevels.js
View file

@ -102,7 +102,7 @@ angular.module('copayApp.controllers').controller('feeLevelsController', functio
$scope.feeOpts = feeService.feeOpts;
$scope.loadingFee = true;
feeService.getFeeLevels(function(err, levels) {
feeService.getFeeLevels($scope.coin, function(err, levels) {
$scope.loadingFee = false;
if (err || lodash.isEmpty(levels)) {
showErrorAndClose(null, err);

2
src/js/controllers/paperWallet.js
View file

@ -59,7 +59,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
$scope.wallet.buildTxFromPrivateKey($scope.privateKey, destinationAddress, null, function(err, testTx) {
if (err) return cb(err);
var rawTxLength = testTx.serialize().length;
feeService.getCurrentFeeRate('livenet', function(err, feePerKb) {
feeService.getCurrentFeeRate('btc', 'livenet', function(err, feePerKb) {
var opts = {};
opts.fee = Math.round((feePerKb * rawTxLength) / 2000);
$scope.wallet.buildTxFromPrivateKey($scope.privateKey, destinationAddress, opts, function(err, tx) {

3
src/js/controllers/preferencesFee.js
View file

@ -32,11 +32,12 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu
});
$scope.init = function() {
var coin = 'btc'; // TODO: only BTC in preferences
$scope.network = $scope.network || 'livenet';
$scope.feeOpts = feeService.feeOpts;
$scope.currentFeeLevel = $scope.feeLevel || feeService.getCurrentFeeLevel();
$scope.loadingFee = true;
feeService.getFeeLevels(function(err, levels) {
feeService.getFeeLevels(coin, function(err, levels) {
$scope.loadingFee = false;
if (err) {
//Error is already formatted

2
src/js/controllers/tx-details.js
View file

@ -131,7 +131,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
$scope.$digest();
});
feeService.getFeeLevels(function(err, levels) {
feeService.getFeeLevels($scope.wallet.coin, function(err, levels) {
if (err) return;
walletService.getLowAmount($scope.wallet, levels, function(err, amount) {
if (err) return;

4
src/js/controllers/walletDetails.js
View file

@ -52,7 +52,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
var analyzeUtxos = function() {
if (analyzeUtxosDone) return;
feeService.getFeeLevels(function(err, levels) {
feeService.getFeeLevels($scope.wallet.coin, function(err, levels) {
if (err) return;
walletService.getLowUtxos($scope.wallet, levels, function(err, resp) {
if (err || !resp) return;
@ -169,7 +169,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
});
};
feeService.getFeeLevels(function(err, levels) {
feeService.getFeeLevels($scope.wallet.coin, function(err, levels) {
walletService.getTxHistory($scope.wallet, {
progressFn: progressFn,
feeLevels: levels,