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

scan is working!

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-08-20 21:05:44 -04:00
commit c1564ae015
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/join.js
View file

@ -119,7 +119,7 @@ angular.module('copayApp.controllers').controller('JoinController',
walletFactory.network.on('badSecret', function() {}); walletFactory.network.on('badSecret', function() {});
Passphrase.getBase64Async($scope.joinPassword, function(passphrase) { 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; $scope.loading = false;
if (err || !w) { if (err || !w) {
if (err === 'joinError') if (err === 'joinError')

2
js/models/core/WalletFactory.js
View file

@ -216,6 +216,7 @@ WalletFactory.prototype.decodeSecret = function(secret) {
WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphrase, privateHex, cb) { WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphrase, privateHex, cb) {
console.log('[WalletFactory.js.218:privateHex:]',privateHex); //TODO
var self = this; var self = this;
var s = self.decodeSecret(secret); var s = self.decodeSecret(secret);
if (!s) return cb('badSecret'); if (!s) return cb('badSecret');
@ -228,6 +229,7 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
privOpts.extendedPrivateKeyString = privateHex; privOpts.extendedPrivateKeyString = privateHex;
} }
console.log('[WalletFactory.js.229:privOpts:]',privOpts); //TODO
//Create our PrivateK //Create our PrivateK
var privateKey = new PrivateKey(privOpts); var privateKey = new PrivateKey(privOpts);
this.log('\t### PrivateKey Initialized'); this.log('\t### PrivateKey Initialized');