From ce197d4b2950425c07d0e1a563039a2f26fea07a Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 7 Nov 2015 11:40:35 -0300
Subject: [PATCH] better wallet info

---
 public/views/includes/walletInfo.html        |  3 +--
 public/views/preferencesInformation.html     | 23 ++++++++++++++++++++
 src/js/controllers/preferencesInformation.js |  2 +-
 src/js/services/profileService.js            |  2 --
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/public/views/includes/walletInfo.html b/public/views/includes/walletInfo.html
index c7bd73967..920537b6f 100644
--- a/public/views/includes/walletInfo.html
+++ b/public/views/includes/walletInfo.html
@@ -1,9 +1,8 @@
 
 <span ng-show="index.isShared"><span translate>{{index.m}}-of-{{index.n}}</span></span>
-<img style="height:1em" ng-show="index.isShared" src="img/icon-users.svg">
 <img style="height:1em"  ng-show="index.network != 'livenet'" src="img/icon-testnet.svg">
 <img style="height:1em"  ng-show="!index.canSign && !index.isPrivKeyExternal" src="img/icon-view.svg">
 <img style="height:1em"  ng-show="index.isPrivKeyEncrypted" src="img/icon-lock.svg">
 
 <img style="height:1em"  ng-show="index.externalSource == 'trezor'" src="img/icon-trezor.svg">
-<span style="height:1em" ng-show="index.account"><span translate>Account</span>: #{{index.account || 0}} </span>
+<span style="height:1em" ng-show="index.account">#{{index.account || 0}} </span>
diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html
index bd67a0fc2..eb510141c 100644
--- a/public/views/preferencesInformation.html
+++ b/public/views/preferencesInformation.html
@@ -55,6 +55,29 @@
         </span>
       </li>
 
+      <li class="line-b p20 oh" ng-show="index.externalSource">
+        <span translate>Hardware Wallet</span>
+        <span class="right text-gray capitalize">
+          {{index.externalSource}}
+        </span>
+      </li>
+
+      <li class="line-b p20 oh" ng-show="!index.externalSource && !index.canSign">
+        <span translate></span>
+        <span class="right text-gray capitalize">
+          No private key
+        </span>
+      </li>
+ 
+      <li class="line-b p20 oh" ng-show="index.account">
+        <span translate>Account ({{derivationStrategy}})</span>
+        <span class="right text-gray">
+          #{{index.account}}
+        </span>
+      </li>
+
+
+
     <h4 class="title m0" translate>Copayers</h4>
       <li ng-repeat="copayer in index.copayers">
         <span class="size-12" ng-show="copayer.id == index.copayerId">
diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js
index 3969f26b5..8f04e8077 100644
--- a/src/js/controllers/preferencesInformation.js
+++ b/src/js/controllers/preferencesInformation.js
@@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
     var c = fc.credentials;
 
     this.init = function() {
-      var basePath = profileService.getUtils().getBaseAddressDerivationPath(c.derivationStrategy, c.network, 0);
+      var basePath = profileService.getUtils().getBaseAddressDerivationPath(c.derivationStrategy, c.network, c.account); 
 
       $scope.walletName = c.walletName;
       $scope.walletId = c.walletId;
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 2def22e4b..8ac0ead58 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -46,8 +46,6 @@ angular.module('copayApp.services')
           client.setNotificationsInterval(BACKGROUND_UPDATE_PERIOD);
         });
         root.focusedClient.setNotificationsInterval(FOREGROUND_UPDATE_PERIOD);
-
-        console.log('[profileService.js.49] SETTING...'); //TODO
       }
 
       return cb();