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

Merge pull request #1613 from bechi/bugs/ui-07

Browse source 
Bugs/ui 07
This commit is contained in:
Matias Alejo Garcia 2014-10-30 17:48:44 -03:00
commit 4afcad4601
7 changed files with 97 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/controllers/history.js
View file

@ -58,6 +58,9 @@ angular.module('copayApp.controllers').controller('HistoryController',
return;
}
_.each(res, function (r) {
r.ts = r.minedTs || r.sentTs;
});
$scope.blockchain_txs = w.cached_txs = res;
$scope.loading = false;
setTimeout(function() {

3
js/models/Wallet.js
View file

@ -2840,7 +2840,7 @@ Wallet.prototype.getTransactionHistory = function(cb) {
tx.amountSat = Math.abs(amount);
tx.amount = tx.amountSat * satToUnit;
tx.sentTs = proposal ? proposal.sentTs : undefined;
tx.minedTs = tx.time * 1000;
tx.minedTs = !_.isNaN(tx.time) ? tx.time * 1000 : undefined;
};
if (addresses.length > 0) {
@ -2850,6 +2850,7 @@ Wallet.prototype.getTransactionHistory = function(cb) {
var history = _.map(txs, function(tx) {
decorateTx(tx);
console.log(tx);
return tx;
});
return cb(null, history);