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

fix conflics

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-05-01 09:41:18 -03:00
commit 1e8895f4b8
10 changed files with 144 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/controllers/signin.js
View file

@ -18,15 +18,14 @@ angular.module('copay.signin').controller('SigninController',
controllerUtils.startNetwork(w);
};
$scope.join = function(secret) {
$scope.join = function(secret, nickname ) {
$scope.loading = true;
walletFactory.network.on('badSecret', function() {
});
walletFactory.joinCreateSession(secret, function(err,w) {
walletFactory.joinCreateSession(secret, nickname, function(err,w) {
$scope.loading = false;
console.log('[signin.js.27:err:]',err,w); //TODO
if (err || !w) {
if (err === 'joinError')