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

Merge pull request #188 from matiu/feature/peer-checking

Browse source 
Feature/peer checking
This commit is contained in:
Mario Colque 2014-04-25 10:27:06 -03:00
commit 6cb1b5a851
13 changed files with 206 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/setup.js
View file

@ -34,7 +34,7 @@ angular.module('copay.setup').controller('SetupController',
name: walletName,
};
var w = walletFactory.create(opts);
controllerUtils.setupUxHandlers(w);
controllerUtils.startNetwork(w);
};
});

11
js/controllers/signin.js
View file

@ -14,7 +14,7 @@ angular.module('copay.signin').controller('SigninController',
$scope.open = function(walletId, opts) {
$scope.loading = true;
var w = walletFactory.open(walletId, opts);
controllerUtils.setupUxHandlers(w);
controllerUtils.startNetwork(w);
};
$scope.join = function(secret) {
@ -29,8 +29,13 @@ angular.module('copay.signin').controller('SigninController',
});
walletFactory.joinCreateSession(secret, function(w) {
console.log('[signin.js.33] joinCreateSession RETURN', w); //TODO
controllerUtils.setupUxHandlers(w);
if (w) {
controllerUtils.startNetwork(w);
}
else {
$scope.loading = false;
controllerUtils.onErrorDigest();
}
});
};
});

14
js/controllers/transactions.js
View file

@ -77,13 +77,15 @@ angular.module('copay.transactions').controller('TransactionsController',
$scope.getTransactions = function() {
var w =$rootScope.wallet;
var addresses = w.getAddressesStr();
if (w) {
var addresses = w.getAddressesStr();
if (addresses.length > 0) {
w.blockchain.getTransactions(addresses, function(txs) {
$scope.blockchain_txs = txs;
$rootScope.$digest();
});
if (addresses.length > 0) {
w.blockchain.getTransactions(addresses, function(txs) {
$scope.blockchain_txs = txs;
$rootScope.$digest();
});
}
}
};