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

add secret to adv options in #more

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-10-04 11:30:08 -03:00
commit ffe90f2ecc
5 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/controllers/more.js
View file

@ -64,8 +64,11 @@ angular.module('copayApp.controllers').controller('MoreController',
$scope.hideAdv = true;
$scope.hidePriv = true;
if (w)
$scope.hideSecret = true;
if (w) {
$scope.priv = w.privateKey.toObj().extendedPrivateKeyString;
$scope.secret = w.getSecret();
}
$scope.downloadBackup = function() {
backupService.download(w);

1
js/models/Wallet.js
View file

@ -524,6 +524,7 @@ Wallet.prototype._onData = function(senderId, data, ts) {
log.debug('RECV', senderId, data);
if (data.type !== 'walletId' && this.id !== data.walletId) {
log.debug('Received corrupt message:', data)
this.emit('corrupt', senderId);
this.updateTimestamp(ts);
return;

2
js/models/WalletFactory.js
View file

@ -451,7 +451,7 @@ WalletFactory.prototype.joinCreateSession = function(opts, cb) {
};
if (opts.privateHex && opts.privateHex.length > 1) {
privOpts.extendedPrivateKeyString = privateHex;
privOpts.extendedPrivateKeyString = opts.privateHex;
}
//Create our PrivateK