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

Merge pull request #3762 from cmgustavo/feat/2-step-balance

Browse source 
Adds support for 2-step balance
This commit is contained in:
Matias Alejo Garcia 2016-01-14 10:12:17 -03:00
commit dd47185402
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/controllers/index.js
View file

@ -300,7 +300,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
return cb(null, opts.walletStatus);
else {
self.updateError = false;
return fc.getStatus({}, function(err, ret) {
return fc.getStatus({ twoStep : true }, function(err, ret) {
if (err) {
self.updateError = bwsError.msg(err, gettext('Could not update Wallet'));
} else {
@ -1342,6 +1342,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}
});
$rootScope.$on('BalanceUpdated', function(e, n) {
self.setBalance(n.data);
});
$rootScope.$on('NewOutgoingTx', function() {
self.newTx = true;