From fc0535a69fc27cc7f3ee497903c495b675868043 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Mon, 27 Oct 2014 11:10:32 -0300 Subject: [PATCH] handling profile with no wallets --- js/models/Identity.js | 1 + js/services/identityService.js | 79 +++++++++++++++++----------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/js/models/Identity.js b/js/models/Identity.js index a87cdcfce..1c6191899 100644 --- a/js/models/Identity.js +++ b/js/models/Identity.js @@ -519,6 +519,7 @@ Identity.prototype.decodeSecret = function(secret) { }; Identity.prototype.getLastFocusedWallet = function() { + if (_.keys(this.wallets).length == 0) return; return _.max(this.wallets, function(wallet) { return wallet.lastTimestamp || 0; }); diff --git a/js/services/identityService.js b/js/services/identityService.js index dd94448c0..117a3d078 100644 --- a/js/services/identityService.js +++ b/js/services/identityService.js @@ -1,48 +1,47 @@ 'use strict'; angular.module('copayApp.services') -.factory('identityService', function($rootScope, $location, pluginManager, controllerUtils) { - var root = {}; + .factory('identityService', function($rootScope, $location, pluginManager, controllerUtils) { + var root = {}; - root.create = function (scope, form) { - copay.Identity.create({ - email: form.email.$modelValue, - password: form.password.$modelValue, - pluginManager: pluginManager, - network: config.network, - networkName: config.networkName, - walletDefaults: config.wallet, - passphraseConfig: config.passphraseConfig, - }, function(err, iden) { - var firstWallet = iden.getLastFocusedWallet(); - controllerUtils.bindProfile(scope, iden, firstWallet); - scope.loading = false; - }); - }; - - - root.open = function (scope, form) { - copay.Identity.open({ - email: form.email.$modelValue, - password: form.password.$modelValue, - pluginManager: pluginManager, - network: config.network, - networkName: config.networkName, - walletDefaults: config.wallet, - passphraseConfig: config.passphraseConfig, - }, function(err, iden) { - if (err && !iden) { - console.log('Error:' + err) - controllerUtils.onErrorDigest( - scope, (err.toString() || '').match('PNOTFOUND') ? 'Profile not found' : 'Unknown error'); - } else { + root.create = function(scope, form) { + copay.Identity.create({ + email: form.email.$modelValue, + password: form.password.$modelValue, + pluginManager: pluginManager, + network: config.network, + networkName: config.networkName, + walletDefaults: config.wallet, + passphraseConfig: config.passphraseConfig, + }, function(err, iden) { var firstWallet = iden.getLastFocusedWallet(); controllerUtils.bindProfile(scope, iden, firstWallet); - } - scope.loading = false; - }); - } + scope.loading = false; + }); + }; - return root; -}); + root.open = function(scope, form) { + copay.Identity.open({ + email: form.email.$modelValue, + password: form.password.$modelValue, + pluginManager: pluginManager, + network: config.network, + networkName: config.networkName, + walletDefaults: config.wallet, + passphraseConfig: config.passphraseConfig, + }, function(err, iden) { + if (err && !iden) { + console.log('Error:' + err) + controllerUtils.onErrorDigest( + scope, (err.toString() || '').match('PNOTFOUND') ? 'Profile not found' : 'Unknown error'); + } else { + var firstWallet = iden.getLastFocusedWallet(); + controllerUtils.bindProfile(scope, iden, firstWallet); + } + scope.loading = false; + }); + } + + return root; + });