From c24cee303de6ab26fe1ca4a929468efcb585ce88 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 13 May 2015 10:56:08 -0300
Subject: [PATCH] Fix modals, copayer list

---
 public/views/modals/tx-details.html  |  4 ++--
 public/views/modals/txp-details.html |  2 +-
 public/views/preferencesAbout.html   |  2 +-
 public/views/preferencesLogs.html    |  2 +-
 public/views/walletHome.html         | 24 ++++++++++++++++--------
 src/js/controllers/walletHome.js     |  3 +++
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 059896384..6b578f101 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -67,7 +67,7 @@
     </li>
   </ul>
 
-  <div ng-if="btx.actions[0]">
+  <div ng-if="btx.actions[0] && isShared">
     <h4 class="title m0" translate>Signatures</h4>
     <ul class="no-bullet size-14 m0">
       <li class="line-b p10 text-gray" ng-repeat="c in btx.actions">
@@ -75,7 +75,7 @@
         <i ng-if="c.type == 'reject'" class="fi-x icon-sign x db"></i>
         <i ng-if="c.type == 'accept'" class="fi-check icon-sign check db"></i>
       </span>
-      <span>{{c.copayerName}}</span>
+      {{c.copayerName}} <span ng-if="c.copayerId == copayerId">({{'Me'|translate}})</span>
       </li>
     </ul>
   </div>
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 45e19263c..774e8834c 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -70,7 +70,7 @@
     <ul class="no-bullet size-14 m0">
       <li class="line-b p10 text-gray" ng-repeat="ac in tx.actions">
         <i class="icon-contact size-24"></i>
-        <span>{{ac.copayerName}}</span>
+        {{ac.copayerName}} <span ng-if="ac.copayerId == copayerId">({{'Me'|translate}})</span>
         <span class="right">
           <i ng-if="ac.type == 'reject'" class="fi-x icon-sign x db"></i>
           <i ng-if="ac.type == 'accept'" class="fi-check icon-sign check db"></i>
diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html
index d5b415dcc..5df5745d0 100644
--- a/public/views/preferencesAbout.html
+++ b/public/views/preferencesAbout.html
@@ -28,7 +28,7 @@
  
     <h4 class="title m0">&nbsp;</h4>
     <li class="line-b p20" ng-conf ng-click="$root.go('logs')">
-      <span translate>View session logs</span>
+      <span translate>Session logs</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       </span>      
diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html
index 192a6837c..f1e49249d 100644
--- a/public/views/preferencesLogs.html
+++ b/public/views/preferencesLogs.html
@@ -1,7 +1,7 @@
 <div 
   class="topbar-container" 
   ng-include="'views/includes/topbar.html'"
-  ng-init="titleSection='Logs'; goBackToState = 'about'">
+  ng-init="titleSection='Session logs'; goBackToState = 'about'">
 </div>
 
 
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index a06c86496..d3317b872 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -106,14 +106,22 @@
               <span class="show-for-medium-up" translate>Preferences</span>
             </a>
           </div>
-          <div class="wallet-info" ng-click="openCopayersModal(index.copayers, index.copayerId)">
-            <p class="m0">
-            {{index.m}} <span translate>of</span>  {{index.n}}
-            </p>
-            <div class="size-12 text-gray">
-              <span ng-if="index.n > 1" translate>Multisignature wallet </span>
-              <span ng-if="index.n == 1" translate>Personal Wallet</span>
-              <span ng-if="index.network != 'livenet'"> - Testnet</span>
+          <div class="wallet-info">
+            <div ng-show="index.isShared" ng-click="openCopayersModal(index.copayers, index.copayerId)">
+              <p class="m0">
+              {{index.m}} <span translate>of</span>  {{index.n}}
+              </p>
+              <div class="size-12 text-gray">
+                <span translate>Multisignature wallet</span> <span ng-if="index.network != 'livenet'">- Testnet</span>
+              </div>
+            </div>
+            <div ng-show="!index.isShared">
+              <p class="m0">
+              {{index.m}} <span translate>of</span>  {{index.n}}
+              </p>
+              <div class="size-12 text-gray">
+                <span translate>Personal Wallet</span> <span ng-if="index.network != 'livenet'">- Testnet</span>
+              </div>
             </div>
           </div>
         </div>
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index cf35c0bb3..c6508da75 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -131,6 +131,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       $scope.amountStr = tx.amountStr;
       $scope.alternativeAmountStr = tx.alternativeAmountStr;
       $scope.copayers = copayers
+      $scope.copayerId = fc.credentials.copayerId;
       $scope.loading = null;
       $scope.color = fc.backgroundColor;
 
@@ -840,6 +841,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       $scope.btx = btx;
       $scope.settings = config;
       $scope.color = fc.backgroundColor;
+      $scope.copayerId = fc.credentials.copayerId;
+      $scope.isShared = fc.credentials.n > 1;
 
       $scope.getAmount = function(amount) {
         return self.getAmount(amount);