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

add warning for old wallets

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-10-11 14:33:45 -03:00
commit 29bbfa184c
9 changed files with 8 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/controllers/createProfile.js
View file

@ -13,9 +13,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
}, function(anyWallet) {
$scope.retreiving = false;
$scope.anyProfile = anyProfile;
console.log('[createProfile.js.15:anyProfile:]',anyProfile); //TODO
$scope.anyWallet = anyWallet;
console.log('[createProfile.js.17:anyWallet:]',anyWallet); //TODO
});
});
@ -32,7 +30,7 @@ console.log('[createProfile.js.17:anyWallet:]',anyWallet); //TODO
network: config.network,
networkName: config.networkName,
walletDefaults: config.wallet,
passphrase: config.passphrase,
passphraseConfig: config.passphraseConfig,
}, function(err, iden, firstWallet) {
controllerUtils.bindProfile($scope, iden, firstWallet);
});

2
js/controllers/home.js
View file

@ -24,7 +24,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
network: config.network,
networkName: config.networkName,
walletDefaults: config.wallet,
passphrase: config.passphrase,
passphraseConfig: config.passphraseConfig,
}, function(err, iden, firstWallet) {
if (err && !iden) {
console.log('Error:' + err)

4
js/models/Profile.js
View file

@ -45,8 +45,8 @@ Profile.create = function(email, password, storage, cb) {
Profile.any = function(storage, cb) {
storage.getFirst(Profile.key(''), function(err, val) {
return cb(val ? true : false);
storage.getFirst(Profile.key(''), function(err, v, k) {
return cb(k ? true : false);
});
};

2
js/models/Storage.js
View file

@ -163,7 +163,7 @@ Storage.prototype.getFirst = function(prefix, cb) {
});
if (keys.length === 0) return cb(new Error('not found'));
self._read(keys[0], function(v) {
if (_.isNull(v)) return cb(new Error('Could not decrypt data'));
if (_.isNull(v)) return cb(new Error('Could not decrypt data'), null, keys[0]);
return cb(null, v, keys[0]);
})
});

4
js/models/Wallet.js
View file

@ -174,8 +174,8 @@ Wallet.key = function(str) {
Wallet.any = function(storage, cb) {
storage.getFirst(Wallet.key(''), function(err, val) {
return cb(val ? true : false);
storage.getFirst(Wallet.key(''), function(err, v, k) {
return cb(k ? true : false);
});
};

4
js/routes.js
View file

@ -14,10 +14,6 @@ angular
templateUrl: 'views/createProfile.html',
validate: false
})
.when('/open', {
templateUrl: 'views/open.html',
validate: false
})
.when('/join', {
templateUrl: 'views/join.html',
validate: true