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

Fixed join wallet from remote peer

Browse source
This commit is contained in:
Gustavo Cortez 2014-05-01 18:34:30 -03:00
commit c98323e9d3
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/controllers/signin.js
View file

@ -31,22 +31,19 @@ angular.module('copay.signin').controller('SigninController',
walletFactory.network.on('badSecret', function() {
});
walletFactory.joinCreateSession($scope.connectionId, $scope.nickname, function(err,w) {
var passphrase = Passphrase.getBase64($scope.joinPassword);
walletFactory.joinCreateSession($scope.connectionId, $scope.nickname, passphrase, function(err,w) {
$scope.loading = false;
if (err || !w || !$scope.joinPassword) {
if (err || !w) {
if (err === 'joinError')
$rootScope.flashMessage = { message: 'Can not find peer'};
else if (err === 'badSecret')
$rootScope.flashMessage = { message: 'Bad secret secret string', type: 'error'};
else if (!$scope.joinPassword)
$rootScope.flashMessage = { message: 'Enter your wallet password', type: 'error' };
else
$rootScope.flashMessage = { message: 'Unknown error', type: 'error'};
controllerUtils.onErrorDigest();
} else {
var passphrase = Passphrase.getBase64($scope.joinPassword);
w.storage._setPassphrase(passphrase);
controllerUtils.startNetwork(w);
}
});