diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js index ceec6414d..019a93616 100644 --- a/js/controllers/transactions.js +++ b/js/controllers/transactions.js @@ -64,6 +64,9 @@ angular.module('copayApp.controllers').controller('TransactionsController', $scope.blockchain_txs = w.cached_txs = res; $scope.loading = false; + setTimeout(function() { + $scope.$digest(); + }, 1); }); }; diff --git a/js/models/Wallet.js b/js/models/Wallet.js index 608dbea3d..3f9e10418 100644 --- a/js/models/Wallet.js +++ b/js/models/Wallet.js @@ -977,13 +977,13 @@ Wallet.prototype.toObj = function() { Wallet.fromUntrustedObj = function(obj, readOpts) { - obj = _.clone(obj); + obj = _.clone(obj); var o = {}; _.each(Wallet.PERSISTED_PROPERTIES, function(p) { o[p] = obj[p]; }); - return Wallet.fromObj(o,readOpts); + return Wallet.fromObj(o, readOpts); }; /** @@ -2518,10 +2518,10 @@ Wallet.prototype.close = function(cb) { this.blockchain.destroy(); log.debug('## CLOSING Wallet: ' + this.id); -// TODO -// this.lock.release(function() { - if (cb) return cb(); -// }); + // TODO + // this.lock.release(function() { + if (cb) return cb(); + // }); }; /** @@ -2906,6 +2906,8 @@ Wallet.prototype.getTransactionHistory = function(cb) { tx.labelTo = firstOut ? firstOut.label : undefined; tx.amountSat = Math.abs(amount); tx.amount = tx.amountSat * satToUnit; + tx.sentTs = proposal ? proposal.sentTs : undefined; + tx.minedTs = tx.time * 1000; }; if (addresses.length > 0) { diff --git a/views/transactions.html b/views/transactions.html index 9f9c02b5b..817ce39e3 100644 --- a/views/transactions.html +++ b/views/transactions.html @@ -40,13 +40,13 @@