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

Merge pull request #1621 from cmgustavo/feature/history

Browse source 
Removed transaction proposals from history. List of transactions sent
This commit is contained in:
Matias Alejo Garcia 2014-10-30 22:52:49 -03:00
commit 263e3fe84d
5 changed files with 75 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/controllers/history.js
View file

@ -61,6 +61,9 @@ angular.module('copayApp.controllers').controller('HistoryController',
_.each(res, function (r) {
r.ts = r.minedTs || r.sentTs;
if (r.action === 'sent') {
r.actionList = controllerUtils.getActionList(r.peerActions);
}
});
$scope.blockchain_txs = w.cached_txs = res;
$scope.loading = false;

2
js/controllers/send.js
View file

@ -79,7 +79,7 @@ angular.module('copayApp.controllers').controller('SendController',
setTimeout(function() {
$scope.loading = false;
$rootScope.$digest();
}, 0);
}, 1);
}
$scope.showAddressBook = function() {