Merge pull request #2960 from matiu/bug/refreshtx

fix tx history refresh
This commit is contained in:
Gustavo Maximiliano Cortez 2015-07-10 16:13:56 -03:00
commit d448cf4086
1 changed files with 15 additions and 9 deletions

View File

@ -279,6 +279,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
return w.id != self.walletId;
});;
$rootScope.$apply();
if (opts.triggerTxUpdate) {
$timeout(function() {
self.updateTxHistory();
}, 1);
}
});
});
};
@ -862,16 +868,18 @@ angular.module('copayApp.controllers').controller('indexController', function($r
});
$rootScope.$on('NewIncomingTx', function() {
self.updateBalance();
$timeout(function() {
self.updateTxHistory();
}, 5000);
self.updateAll({
walletStatus: null,
untilItChanges: true,
triggerTxUpdate: true,
});
});
$rootScope.$on('NewOutgoingTx', function() {
self.updateAll({
walletStatus: null,
untilItChanges: true
untilItChanges: true,
triggerTxUpdate: true,
});
});
@ -881,11 +889,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$on(eventName, function(event, untilItChanges) {
self.updateAll({
walletStatus: null,
untilItChanges: untilItChanges
untilItChanges: untilItChanges,
triggerTxUpdate: true,
});
$timeout(function() {
self.updateTxHistory();
}, 3000);
});
});