From 9bcf014694ba7918c7f83d2bc0ebb0c6505b7a76 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 20 Oct 2015 18:08:02 -0300
Subject: [PATCH] Fix wallet information. Fix Spending restriction options

---
 public/views/preferences.html                | 22 +++++++++++---------
 public/views/preferencesAdvanced.html        |  1 -
 src/js/controllers/preferencesInformation.js |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/views/preferences.html b/public/views/preferences.html
index cc1c6baab..f2c36d8f4 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -62,19 +62,21 @@
       <div translate>Advanced</div>
     </li>
   </ul>
+  <div ng-show="!index.noFocusedWallet && (!index.isPrivKeyExternal || preferences.touchidAvailable)">
     <h4 translate>
       Spending Restrictions
     </h4>
-  <ul class="no-bullet m0 ">
-    <li  ng-hide="index.isPrivKeyExternal">
-      <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
-      <div translate>Request Password</div>
-    </li>
-    <li  ng-show="preferences.touchidAvailable">
-      <switch id="touchid" name="touchid" ng-model="touchid" class="green right"></switch>
-      <div translate>Scan Fingerprint</div>
-    </li>
-  </ul>
+    <ul class="no-bullet m0 ">
+      <li ng-show="!index.isPrivKeyExternal">
+        <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
+        <div translate>Request Password</div>
+      </li>
+      <li  ng-show="preferences.touchidAvailable">
+        <switch id="touchid" name="touchid" ng-model="touchid" class="green right"></switch>
+        <div translate>Scan Fingerprint</div>
+      </li>
+    </ul>
+  </div>
   <ul class="no-bullet m0 ">
 
     <h4 translate>Global settings</h4>
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html
index 5a191d9f6..802af0c82 100644
--- a/public/views/preferencesAdvanced.html
+++ b/public/views/preferencesAdvanced.html
@@ -9,7 +9,6 @@
   <h4></h4>
   <ul class="no-bullet m0">
 
-
     <li  ng-click="$root.go('information')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <div translate>Wallet Information</div>
diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js
index 487852a2c..e1412a2b2 100644
--- a/src/js/controllers/preferencesInformation.js
+++ b/src/js/controllers/preferencesInformation.js
@@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
     this.init = function() {
     var fc = profileService.focusedClient;
     var c = fc.credentials;
-    var basePath = profileService.getUtils().PATHS.BASE_ADDRESS_DERIVATION[c.derivationStrategy][c.network];
+    var basePath = profileService.getUtils().getBaseAddressDerivationPath(c.derivationStrategy, c.network, 0);
 
     $scope.walletName = c.walletName;
     $scope.walletId = c.walletId;