From ad9c840ac7462c21f5bdda287aa78adf0abca474 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Sun, 23 Oct 2016 19:15:08 -0300
Subject: [PATCH] Fix show contacts from tx proposals and tx views

---
 src/js/controllers/tab-home.js   | 7 ++++++-
 www/views/bitpayCard.html        | 2 +-
 www/views/includes/txp.html      | 6 ++----
 www/views/modals/tx-details.html | 2 +-
 www/views/walletDetails.html     | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 8d1f3963a..200de8b76 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('tabHomeController',
-  function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window, bitpayCardService, startupService) {
+  function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window, bitpayCardService, startupService, addressbookService) {
     var wallet;
     var listeners = [];
     var notifications = [];
@@ -230,6 +230,11 @@ angular.module('copayApp.controllers').controller('tabHomeController',
       nextStep();
       updateAllWallets();
 
+      addressbookService.list(function(err, ab) {
+        if (err) $log.error(err);
+        $scope.addressbook = ab || {};
+      });
+
       listeners = [
         $rootScope.$on('bwsEvent', function(e, walletId, type, n) {
           var wallet = profileService.getWallet(walletId);
diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html
index 21c3aa39a..8f1464bc5 100644
--- a/www/views/bitpayCard.html
+++ b/www/views/bitpayCard.html
@@ -4,7 +4,7 @@
     </ion-nav-back-button>
     <ion-nav-title>BitPay Visa<sup>&reg;</sup> Card</ion-nav-title>
     <ion-nav-buttons side="secondary">
-      <button class="button no-border" ng-show="!error" ui-sref="tabs.bitpayCard.preferences">
+      <button class="button no-border" ui-sref="tabs.bitpayCard.preferences">
         <i class="icon ion-ios-settings"></i>
       </button>
     </ion-nav-buttons>
diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html
index 584216ba1..c37274878 100644
--- a/www/views/includes/txp.html
+++ b/www/views/includes/txp.html
@@ -4,8 +4,8 @@
     {{tx.amountStr}}
   </div>
   <span ng-show="!tx.merchant">
-    <span ng-show="addressbook[tx.toAddress] && !tx.message">
-      {{addressbook[tx.toAddress]}}
+    <span ng-show="addressbook[tx.toAddress] && addressbook[tx.toAddress].name && !tx.message">
+      {{addressbook[tx.toAddress].name}}
     </span>
     <span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
       {{tx.message}}
@@ -18,8 +18,6 @@
     <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
     <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
   </span>
-  <span>
-  </span>
 
   <p class="wallet-activity-note">
     <i class="icon ion-record wallet-activity-note-child" ng-style="{'color':tx.wallet.color}"></i>
diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html
index 208943149..39f802c9c 100644
--- a/www/views/modals/tx-details.html
+++ b/www/views/modals/tx-details.html
@@ -25,7 +25,7 @@
           <span class="payment-proposal-to">
             <img ng-if="!cardId" src="img/icon-bitcoin-small.svg">
             <img ng-if="cardId" src="img/icon-card.svg" width="34">
-            <div copy-to-clipboard="toAddress" class="ellipsis">
+            <div copy-to-clipboard="btx.addressTo" class="ellipsis">
               <contact ng-if="!toName" address="{{btx.addressTo}}" class="ellipsis" style="display: block;"></contact>
               <span class="m15l size-14" ng-if="toName">{{toName}}</span>
             </div>
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 53c6c8890..315f43901 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -158,10 +158,10 @@
             <div ng-show="btx.action == 'sent'" class="ellipsis">
               <div ng-if="btx.message">{{btx.message}}</div>
               <div ng-if="!btx.message && btx.note.body">{{btx.note.body}}</div>
-              <div ng-if="!btx.message && !btx.note.body && addressbook[btx.addressTo]">
+              <div ng-if="!btx.message && !btx.note.body && addressbook[btx.addressTo] && addressbook[btx.addressTo].name">
                 {{addressbook[btx.addressTo].name}}
               </div>
-              <div ng-if="!btx.message && !btx.note.body && !addressbook[btx.addressTo]" translate>Sent</div>
+              <div ng-if="!btx.message && !btx.note.body && !(addressbook[btx.addressTo] && addressbook[btx.addressTo].name)" translate>Sent</div>
             </div>
 
             <div ng-show="btx.action == 'moved'" class="ellipsis">