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

Merge pull request #4411 from matiu/bug/join2

Browse source 
Bug/join2
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-15 13:26:54 -03:00 • committed by GitHub
commit 284d01db0b
4 changed files with 114 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/create.js
View file

@ -204,5 +204,5 @@ angular.module('copayApp.controllers').controller('createController',
});
updateSeedSourceSelect(1);
self.setSeedSource('new');
self.setSeedSource();
});

6
src/js/controllers/join.js
View file

@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('joinController',
}
};
this.setSeedSource = function(src) {
this.setSeedSource = function() {
self.seedSourceId = $scope.seedSource.id;
$timeout(function() {
@ -86,6 +86,8 @@ angular.module('copayApp.controllers').controller('joinController',
opts.passphrase = form.createPassphrase.$modelValue;
}
opts.walletPrivKey = $scope._walletPrivKey; // Only for testing
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
@ -139,5 +141,5 @@ angular.module('copayApp.controllers').controller('joinController',
};
updateSeedSourceSelect();
self.setSeedSource('new');
self.setSeedSource();
});