From 567363a8b8bf88524c268d7becf28d5ef1318647 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 28 Oct 2014 09:40:35 -0300 Subject: [PATCH] fix top-bar. no test when grunt watch --- Gruntfile.js | 4 ---- js/controllers/head.js | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 421548ece..807fc88a0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -83,10 +83,6 @@ module.exports = function(grunt) { config: { files: ['config.js'], tasks: ['shell:dev', 'concat:main'] - }, - test: { - files: ['test/**/*.js', 'js/**/*.js'], - tasks: ['mochaTest'] } }, mochaTest: { diff --git a/js/controllers/head.js b/js/controllers/head.js index ac18238c6..32d9e906d 100644 --- a/js/controllers/head.js +++ b/js/controllers/head.js @@ -2,7 +2,7 @@ angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, notification, controllerUtils) { - $scope.username = $rootScope.iden.profile.email; + $scope.username = $rootScope.iden ? $rootScope.iden.fullName || $rootScope.iden.email : 'undefined'; $scope.hoverMenu = false; $scope.hoverIn = function(){