Merge pull request #1040 from yemel/feature/improve-1-of-1

Remove Name field and copayer list on 1-of-1 wallets

views/includes/sidebar.html

@@ -64,7 +64,7 @@
     </li>
   </ul>
 
-  <div ng-include="'views/includes/peer-list.html'"></div>
+  <div ng-show="$root.wallet.isShared()" ng-include="'views/includes/peer-list.html'"></div>
 
 </div>
 

views/send.html

@@ -77,7 +77,7 @@
           </div>
         </div>
 
-        <div class="row" ng-show="wallet.totalCopayers > 1">
+        <div class="row" ng-show="wallet.isShared()">
           <div class="large-12 columns">
             <div class="row collapse">
               <label for="comment">Note
@@ -116,7 +116,7 @@
           Including fee of {{defaultFee|noFractionNumber}} {{$root.unitName}}
         </small>
         </p>
-        <div ng-show="wallet.totalCopayers > 1">
+        <div ng-show="wallet.isShared()">
         <h6>Note</h6>
         <p ng-class="{'hidden': !commentText}">{{commentText}}</p>
       </div>

views/setup.html

@@ -16,7 +16,7 @@
               <input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
             </label>
             <div class="row" ng-show="isSetupWalletPage">
-              <div>
+              <div ng-if="totalCopayers > 1">
                 <label for="Name">Your name</label>
                   <input id="Name" type="text" placeholder="Name" class="form-control" ng-model="myNickname">
               </div>

views/transactions.html

@@ -1,7 +1,7 @@
 <div class="transactions" data-ng-controller="TransactionsController">
   <div ng-show='$root.wallet.isReady()'>
-    <h1 ng-show="wallet.totalCopayers > 1"> Transaction proposals <small>({{txs.length}})</small></h1>
-    <div class="large-12" ng-show="wallet.totalCopayers > 1">
+    <h1 ng-show="wallet.isShared()"> Transaction proposals <small>({{txs.length}})</small></h1>
+    <div class="large-12" ng-show="wallet.isShared()">
       <ul class="inline-list">
         <li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
         <li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
@@ -135,9 +135,9 @@
       <pagination ng-show="!onlyPending && txs.length > txpItemsPerPage" total-items="txs.length" items-per-page="txpItemsPerPage" page="txpCurrentPage" on-select-page="show()" class="pagination-small primary"></pagination>
     </div>
 
-    <h1 ng-class="{'line-dashed': wallet.totalCopayers > 1}">
+    <h1 ng-class="{'line-dashed': wallet.isShared()}">
       Last transactions 
-      <small ng-hide="wallet.totalCopayers > 1 || !loading">
+      <small ng-hide="wallet.isShared() || !loading">
         <i class="fi-bitcoin-circle icon-rotate spinner"></i>
       </small>   
     </h1>