Skip to content

Commit 1d24248

Browse files
Public Beta 1.0.2
Clean up for beta release
1 parent b8028ca commit 1d24248

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

src/js/controllers/confirmPrivate.js

-19
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
7272
$scope.$on("$ionicView.beforeEnter", function(event, data) {
7373

7474
$scope.setWalletSelector = function(network, minAmount, cb) {
75-
console.log('setWalletSelector');
7675
// no min amount? (sendMax) => look for no empty wallets
7776
minAmount = minAmount || 1;
7877

@@ -176,15 +175,13 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
176175
});
177176
}); //updateTx
178177
} else {
179-
console.log('else maxAmount');
180178
$scope.tx = tx;
181179
ongoingProcess.set('Finding NavTech Server', true);
182180
navTechService.findNode(amount, address, $scope.foundNode);
183181
}
184182
});
185183

186184
$scope.foundNode = function(success, data, serverInfo) {
187-
console.log('foundNode');
188185
var tx = $scope.tx;
189186
ongoingProcess.set('Finding NavTech Server', false);
190187
if (!success) {
@@ -257,23 +254,19 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
257254

258255
$scope.calculateTotal = function(tx) {
259256
if(!$scope.wallet || !tx || !tx.txp || !tx.txp[$scope.wallet.id]) return false;
260-
console.log(tx.txp[$scope.wallet.id].fee);
261257
var txTotal = tx.toAmount + tx.txp[$scope.wallet.id].fee;
262258
var txTotalDisplay = txTotal * satToUnit + ' ' + walletConfig.settings.unitName;
263259
return txTotalDisplay;
264260
}
265261

266262
function getFees() {
267-
console.log('getFees');
268263
var tx = $scope.tx;
269264
var wallet = $scope.wallet;
270265
feeService.getFeeRate(tx.network, tx.feeLevel, function(err, feeRate) {
271-
console.log('getFeeRate', err, feeRate);
272266
if (err) return setSendError(err);
273267

274268
if (!usingCustomFee) tx.feeRate = feeRate;
275269
tx.feeLevelName = feeService.feeOpts[tx.feeLevel];
276-
console.log('wallet', wallet);
277270
if (!wallet) return setSendError(err);
278271
getSendMaxInfo(lodash.clone(tx), wallet, function(err, sendMaxInfo) {
279272
if (err) {
@@ -284,9 +277,6 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
284277

285278
if (sendMaxInfo) {
286279

287-
console.log('Send max info', sendMaxInfo);
288-
console.log('tx.sendMax', tx.sendMax);
289-
290280
if (tx.sendMax && sendMaxInfo.amount == 0) {
291281
setNoWallet('Insufficent funds');
292282
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee'));
@@ -298,7 +288,6 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
298288
updateAmount();
299289
showSendMaxWarning(sendMaxInfo);
300290
}
301-
console.log('tx', tx);
302291
$scope.formattedAnonTxes = [];
303292
$scope.navtechTxFeeSatoshi = 0;
304293
getEachFee(0, function(err){
@@ -309,15 +298,12 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
309298
}
310299
$scope.navtechFee = $scope.navtechFeeTemp;
311300
$scope.navtechTxFee = $scope.navtechTxFeeSatoshi * satToUnit + ' ' + walletConfig.settings.unitName;
312-
console.log('$scope.formattedAnonTxes', $scope.formattedAnonTxes);
313301
});
314302
});
315303
});
316304
}
317305

318306
function getEachFee(i, cb) {
319-
console.log('getEachFee', i, $scope.anonTxes[i]);
320-
console.log('tx', $scope.tx);
321307
var tx = $scope.anonTxes[i];
322308
var wallet = $scope.wallet;
323309
getTxp(lodash.clone(tx), wallet, true, function(err, txp) {
@@ -337,7 +323,6 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
337323
refresh();
338324
$scope.navtechTxFeeSatoshi += tx.txp[wallet.id].fee;
339325
$scope.formattedAnonTxes[i] = tx;
340-
console.log('recursive condition', i, $scope.anonTxes.length);
341326
if (i < $scope.anonTxes.length - 1) {
342327
getEachFee(++i, cb);
343328
} else {
@@ -387,7 +372,6 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
387372

388373
if (tx.sendMaxInfo) {
389374
txp.inputs = tx.sendMaxInfo.inputs;
390-
console.log($scope.feeNavtech);
391375
txp.fee = tx.sendMaxInfo.fee;
392376
} else {
393377
if (usingCustomFee) {
@@ -403,7 +387,6 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
403387
}
404388
txp.excludeUnconfirmedUtxos = !tx.spendUnconfirmed;
405389
txp.dryRun = dryRun;
406-
console.log("Creating txp:", txp);
407390
walletService.createTx(wallet, txp, function(err, ctxp) {
408391
if (err) {
409392
setSendError(err);
@@ -424,8 +407,6 @@ angular.module('copayApp.controllers').controller('confirmPrivateController', fu
424407
function updateAmount() {
425408
if (!tx.toAmount) return;
426409

427-
console.log(tx);
428-
429410
// Amount
430411
tx.amountStr = txFormatService.formatAmountStr(tx.toAmount);
431412
tx.amountValueStr = tx.amountStr.split(' ')[0];

0 commit comments

Comments
 (0)