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

Merge pull request #42 from isocolsky/fix/identity

Browse source 
Fix/identity
This commit is contained in:
Matias Alejo Garcia 2014-10-28 15:04:50 -03:00
commit 0853632827
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/addresses.js
View file

@ -8,9 +8,9 @@ angular.module('copayApp.controllers').controller('AddressesController',
$scope.loading = false; $scope.loading = false;
$scope.showAll = false; $scope.showAll = false;
var w = $rootScope.wallet;
$scope.newAddr = function() { $scope.newAddr = function() {
var w = $rootScope.wallet;
$scope.loading = true; $scope.loading = true;
w.generateAddress(null, function() { w.generateAddress(null, function() {
$timeout(function() { $timeout(function() {

4
js/controllers/head.js
View file

@ -1,8 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, notification, controllerUtils) { angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, notification, controllerUtils) {
$scope.username = $rootScope.iden.getName();
$scope.username = $rootScope.iden ? $rootScope.iden.fullName || $rootScope.iden.email : 'undefined';
$scope.hoverMenu = false; $scope.hoverMenu = false;
$scope.hoverIn = function() { $scope.hoverIn = function() {
@ -53,4 +52,3 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc
}); });
} }
}); });