From e98c7e68cc229e94682ee2e22db602bcfb602c59 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Tue, 28 Oct 2014 11:12:46 -0300 Subject: [PATCH 1/2] retrieving email directly from identity instance --- js/controllers/head.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/js/controllers/head.js b/js/controllers/head.js index 47b922c95..cf40580f9 100644 --- a/js/controllers/head.js +++ b/js/controllers/head.js @@ -1,15 +1,14 @@ 'use strict'; angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, notification, controllerUtils) { - - $scope.username = $rootScope.iden ? $rootScope.iden.fullName || $rootScope.iden.email : 'undefined'; + $scope.username = $rootScope.iden.getName(); $scope.hoverMenu = false; - $scope.hoverIn = function(){ + $scope.hoverIn = function() { this.hoverMenu = true; }; - $scope.hoverOut = function(){ + $scope.hoverOut = function() { this.hoverMenu = false; }; @@ -53,4 +52,3 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc }); } }); - From 960a37e85d14bf22143aa67c3a0aa500a2f74b71 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Tue, 28 Oct 2014 11:34:19 -0300 Subject: [PATCH 2/2] fixed add new address --- js/controllers/addresses.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js index 9c4117204..1c34f6d0a 100644 --- a/js/controllers/addresses.js +++ b/js/controllers/addresses.js @@ -8,9 +8,9 @@ angular.module('copayApp.controllers').controller('AddressesController', $scope.loading = false; $scope.showAll = false; - var w = $rootScope.wallet; $scope.newAddr = function() { + var w = $rootScope.wallet; $scope.loading = true; w.generateAddress(null, function() { $timeout(function() {