diff --git a/index.html b/index.html index 15af8e066..a88a9fb03 100644 --- a/index.html +++ b/index.html @@ -249,11 +249,13 @@
{{out.value}} | ++ | {{out.address}} |
diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js index 6f29bdd40..7cc47598e 100644 --- a/js/controllers/transactions.js +++ b/js/controllers/transactions.js @@ -5,8 +5,9 @@ angular.module('copay.transactions').controller('TransactionsController', function($scope, $rootScope, $location) { $scope.title = 'Transactions'; var _updateTxs = function() { -console.log('[transactions.js.10:_updateTxs:]'); //TODO var w =$rootScope.wallet; + if (!w) return; + var inT = w.getTxProposals(); var txs = []; @@ -25,11 +26,10 @@ console.log('[transactions.js.10:_updateTxs:]'); //TODO }); // extra fields i.outs = outs; - i.fee = i.feeSat/bitcore.util.COIN; + i.fee = i.builder.feeSat/bitcore.util.COIN; i.missingSignatures = tx.countInputMissingSignatures(0); txs.push(i); }); -console.log('[transactions.js.35:txs:]',txs); //TODO $scope.txs = txs; w.removeListener('txProposalsUpdated',_updateTxs) w.once('txProposalsUpdated',_updateTxs); @@ -38,7 +38,7 @@ console.log('[transactions.js.35:txs:]',txs); //TODO $scope.send = function (ntxid) { var w = $rootScope.wallet; w.sendTx(ntxid, function(txid) { -console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO + console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO $rootScope.flashMessage = txid ? {type:'success', message: 'Transactions SENT! txid:' + txid} : {type:'error', message: 'There was an error sending the Transaction'} |