diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index ecbf9651e..9f839a600 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService) { +angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; @@ -184,6 +184,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.wallet = profileService.getWallet(data.stateParams.walletId); $scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1; + addressbookService.list(function(err, ab) { + if (err) $log.error(err); + $scope.addressbook = ab || {}; + }); + $scope.updateAll(); listeners = [ diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index 5334924f5..ecf849b10 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -113,13 +113,10 @@ angular.module('copayApp.directives') } } }) - .directive('contact', ['addressbookService', 'lodash', 'gettextCatalog', - function(addressbookService, lodash, gettextCatalog) { + .directive('contact', ['addressbookService', 'lodash', + function(addressbookService, lodash) { return { restrict: 'E', - scope: { - label: '=' - }, link: function(scope, element, attrs) { var addr = attrs.address; addressbookService.get(addr, function(err, ab) { @@ -127,11 +124,7 @@ angular.module('copayApp.directives') var name = lodash.isObject(ab) ? ab.name : ab; element.append(name); } else { - if (scope.label && scope.label == 'Sent') { - element.append(gettextCatalog.getString('Sent')); - } else { - element.append(addr); - } + element.append(addr); } }); } diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index bbf10cb9a..53c6c8890 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -150,26 +150,23 @@ sync
-
- -
{{btx.note.body}}
-
Received
-
+
+
{{btx.note.body}}
+
Received
-
- -
{{btx.message}}
-
{{btx.note.body}}
- -
+
+
{{btx.message}}
+
{{btx.note.body}}
+
+ {{addressbook[btx.addressTo].name}} +
+
Sent
-
- -
{{btx.note.body}}
-
Moved
-
+
+
{{btx.note.body}}
+
Moved
Invalid