mirror of https://github.com/BTCPrivate/copay.git
scan is working!
This commit is contained in:
parent
e760dae2bd
commit
c1564ae015
|
@ -119,7 +119,7 @@ angular.module('copayApp.controllers').controller('JoinController',
|
|||
walletFactory.network.on('badSecret', function() {});
|
||||
|
||||
Passphrase.getBase64Async($scope.joinPassword, function(passphrase) {
|
||||
walletFactory.joinCreateSession($scope.connectionId, $scope.nickname, passphrase, $scope.enterPrivate ? $scope.private : 'null', function(err, w) {
|
||||
walletFactory.joinCreateSession($scope.connectionId, $scope.nickname, passphrase, $scope.enterPrivate ? $scope.private : null, function(err, w) {
|
||||
$scope.loading = false;
|
||||
if (err || !w) {
|
||||
if (err === 'joinError')
|
||||
|
|
|
@ -216,6 +216,7 @@ WalletFactory.prototype.decodeSecret = function(secret) {
|
|||
|
||||
|
||||
WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphrase, privateHex, cb) {
|
||||
console.log('[WalletFactory.js.218:privateHex:]',privateHex); //TODO
|
||||
var self = this;
|
||||
var s = self.decodeSecret(secret);
|
||||
if (!s) return cb('badSecret');
|
||||
|
@ -228,6 +229,7 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
|
|||
privOpts.extendedPrivateKeyString = privateHex;
|
||||
}
|
||||
|
||||
console.log('[WalletFactory.js.229:privOpts:]',privOpts); //TODO
|
||||
//Create our PrivateK
|
||||
var privateKey = new PrivateKey(privOpts);
|
||||
this.log('\t### PrivateKey Initialized');
|
||||
|
|
Loading…
Reference in New Issue