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

Bugs/ui 07
2014-10-30 17:48:44 -03:00 · 2014-10-30 17:48:44 -03:00 · 4afcad4601
commit 4afcad4601
parent 6edaf9f1a4 dfc2745293
7 changed files with 97 additions and 63 deletions
--- a/js/controllers/history.js
+++ b/js/controllers/history.js
@ -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() {