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

fix address event subscription

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-25 11:12:38 -03:00
commit 792f48b2ea
4 changed files with 101 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/models/core/Wallet.js
View file

@ -1,5 +1,4 @@
'use strict';
var imports = require('soop').imports();
var http = require('http');

7
js/services/controllerUtils.js
View file

@ -130,7 +130,6 @@ angular.module('copayApp.services')
});
w.on('publicKeyRingUpdated', function(dontDigest) {
root.updateAddressList();
root.setSocketHandlers();
if (!dontDigest) {
$rootScope.$digest();
@ -184,7 +183,8 @@ angular.module('copayApp.services')
root.updateAddressList = function() {
var w = $rootScope.wallet;
$rootScope.addrInfos = w.getAddressesInfo();
if (w)
$rootScope.addrInfos = w.getAddressesInfo();
};
root.updateBalance = function(cb) {
@ -289,6 +289,7 @@ angular.module('copayApp.services')
};
root.setSocketHandlers = function() {
root.updateAddressList();
if (!Socket.sysEventsSet) {
Socket.sysOn('error', root._setCommError);
Socket.sysOn('reconnect_error', root._setCommError);
@ -315,7 +316,7 @@ angular.module('copayApp.services')
Socket.on(a.addressStr, function(txid) {
if (!a.isChange)
notification.funds('Received fund', a.addressStr);
notification.funds('Funds received!', a.addressStr);
root.updateBalance(function() {
$rootScope.$digest();