BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix wording and function name

This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-22 17:20:55 -03:00
parent b799ed43b1
commit 4d23ae62c5
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/js/services/coinbaseService.js
View File

@ -107,23 +107,12 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $
}; };
}; };
root.getReductedAmountByFee = function(amount, cb) {
// Fee Normal for a single transaction (450 bytes)
var txNormalFeeKB = 450 / 1000;
feeService.getFeeRate(null, 'normal', function(err, feePerKB) {
if (err) return cb(err);
var feeBTC = (feePerKB * txNormalFeeKB / 100000000).toFixed(8);
return cb(null, amount - feeBTC, feeBTC);
});
};
root.checkEnoughFundsForFee = function(amount, cb) { root.checkEnoughFundsForFee = function(amount, cb) {
root.getReductedAmountByFee(amount, function(err, reductedAmount) { _getNetAmount(amount, function(err, reducedAmount) {
if (err) return cb(err); if (err) return cb(err);
// Check if transaction has enough funds to transfer bitcoin from Coinbase to Copay // Check if transaction has enough funds to transfer bitcoin from Coinbase to Copay
if (reductedAmount < 0) { if (reducedAmount < 0) {
return cb('Not enough funds for fee'); return cb('Not enough funds for fee');
} }
@ -177,6 +166,17 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $
}); });
}; };
var _getNetAmount = function(amount, cb) {
// Fee Normal for a single transaction (450 bytes)
var txNormalFeeKB = 450 / 1000;
feeService.getFeeRate(null, 'normal', function(err, feePerKB) {
if (err) return cb(err);
var feeBTC = (feePerKB * txNormalFeeKB / 100000000).toFixed(8);
return cb(null, amount - feeBTC, feeBTC);
});
};
var _refreshToken = function(refreshToken, cb) { var _refreshToken = function(refreshToken, cb) {
var req = { var req = {
method: 'POST', method: 'POST',
@ -681,7 +681,7 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $
var _sendToWallet = function(tx, accessToken, accountId, coinbasePendingTransactions) { var _sendToWallet = function(tx, accessToken, accountId, coinbasePendingTransactions) {
if (!tx) return; if (!tx) return;
var desc = appConfigService.nameCase + ' Wallet'; var desc = appConfigService.nameCase + ' Wallet';
root.getReductedAmountByFee(tx.amount.amount, function(err, amountBTC, feeBTC) { _getNetAmount(tx.amount.amount, function(err, amountBTC, feeBTC) {
if (err) { if (err) {
_savePendingTransaction(tx, { _savePendingTransaction(tx, {
status: 'error', status: 'error',