From 3346d0bb5327eb7d23e6b0f7334f3c2550f88144 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 7 Nov 2015 11:06:12 -0300
Subject: [PATCH] better wallet info, fix bug on export for r-o wallets

---
 public/views/export.html              |  4 ++--
 public/views/includes/walletInfo.html | 18 +++++++++---------
 public/views/preferences.html         |  8 ++++----
 public/views/walletHome.html          |  2 --
 src/js/controllers/index.js           |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/public/views/export.html b/public/views/export.html
index cf2880e81..756ea1e0a 100644
--- a/public/views/export.html
+++ b/public/views/export.html
@@ -45,7 +45,7 @@
       </form>
 
       <h4></h4>
-      <ul class="no-bullet m0" ng-hide="index.isPrivKeyExternal">
+      <ul class="no-bullet m0" ng-show="index.canSign">
         <li>
         <switch id="no-sign" name="noSign" ng-model="noSign" class="green right"></switch>
         <span translate>Do not include private key</span>
@@ -53,7 +53,7 @@
       </ul>
 
 
-      <div class="box-notification"  ng-show="index.isPrivKeyExternal">
+      <div class="box-notification"  ng-show="!index.canSign">
         <span class="text-warning size-14">
           <i class="fi-alert"></i>
           <span translate>
diff --git a/public/views/includes/walletInfo.html b/public/views/includes/walletInfo.html
index 5303ccc6e..c7bd73967 100644
--- a/public/views/includes/walletInfo.html
+++ b/public/views/includes/walletInfo.html
@@ -1,9 +1,9 @@
-<span ng-show="index.network != 'livenet'"> Testnet </span>
-<img  ng-show="!index.canSign && !index.isPrivKeyExternal" src="img/">
-<div ng-show="index.isPrivKeyExternal" style="text-transform: capitalize">
-  <span translate>External Private Key:</span>
-  {{index.externalSource}}
-  <span>(<span translate>Account</span>:
-    #{{index.account || 0}})
-  </span>
-</div>
+
+<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>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index f2c36d8f4..48cc5e9d4 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -62,12 +62,12 @@
       <div translate>Advanced</div>
     </li>
   </ul>
-  <div ng-show="!index.noFocusedWallet && (!index.isPrivKeyExternal || preferences.touchidAvailable)">
-    <h4 translate>
+  <div ng-show="!index.noFocusedWallet && index.canSign">
+    <h4 translate  ng-show="index.canSign">
       Spending Restrictions
     </h4>
-    <ul class="no-bullet m0 ">
-      <li ng-show="!index.isPrivKeyExternal">
+    <ul class="no-bullet m0">
+      <li>
         <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
         <div translate>Request Password</div>
       </li>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 60ec07f89..0c48b107b 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -123,8 +123,6 @@
               {{(index.alias || index.walletName)}}
               </p>
               <div class="size-12 text-gray">
-                <span translate>Multisignature wallet</span>
-                (<span translate>{{index.m}}-of-{{index.n}}</span>)
                 <span ng-include="'views/includes/walletInfo.html'"></span>
               </div>
             </div>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index b9a8f8ae7..ca78dc132 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -108,6 +108,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.isComplete = fc.isComplete();
       self.canSign = fc.canSign();
       self.isPrivKeyExternal = fc.isPrivKeyExternal();
+      self.isPrivKeyEncrypted = fc.isPrivKeyEncrypted();
       self.externalSource = fc.getPrivKeyExternalSourceName();
       self.account = fc.credentials.account;
 
@@ -781,7 +782,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.getConfirmedTxs(function(err, txsFromLocal) {
       if (err) return cb(err);
       var endingTxid = txsFromLocal[0] ? txsFromLocal[0].txid : null;
-      console.log('[index.js.791:endingTxid:]', endingTxid); //TODO
 
       function getNewTxs(newTxs, skip, i_cb) {