From 24ea10c36cd51f3cf41e8d0b45d32fe6ae81e48b Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Thu, 30 Oct 2014 16:46:39 -0300
Subject: [PATCH] history section

---
 css/src/main.css               | 11 +++---
 css/src/mobile.css             |  5 +++
 js/controllers/transactions.js |  3 ++
 js/models/Wallet.js            |  3 +-
 views/includes/sidebar.html    |  2 +-
 views/transactions.html        | 61 ++++++++++++++++------------------
 6 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index d9725935f..68afbaa55 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -170,7 +170,8 @@ header .alt-currency {
 }
 
 .head .menu ul {
-  border: none;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
   position: absolute;
   right: 14px;
   width: 100px;
@@ -182,7 +183,6 @@ header .alt-currency {
   background: #FFFFFF;
   -moz-box-shadow:    0px 1px 2px 0px rgba(0,0,0,0.25);
   box-shadow:         0px 1px 2px 0px rgba(0,0,0,0.25);
-  border: none;
 }
 
 .head .menu ul li a {
@@ -808,10 +808,13 @@ input[type=number]::-webkit-outer-spin-button {
   background-color: #1ABC9C;
 }
 
+.label {
+  font-weight: 700;
+  padding: 0.3rem 0.4rem;
+}
+
 .label.alert {
   background-color: #C0392A;
-  padding: 0.3rem 0.4rem;
-  font-weight: 700;
 }
 
 .bg-alert {
diff --git a/css/src/mobile.css b/css/src/mobile.css
index 68765adde..89c1513e9 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -195,5 +195,10 @@
     height: auto;
   }
 
+  .label {
+    font-size: 80%;
+    padding: 0.15rem 0.2rem;
+  }
+
 }
 
diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js
index 019a93616..e15aac4f2 100644
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@@ -62,6 +62,9 @@ angular.module('copayApp.controllers').controller('TransactionsController',
           return;
         }
 
+        _.each(res, function (r) {
+          r.ts = r.minedTs || r.sentTs;
+        });
         $scope.blockchain_txs = w.cached_txs = res;
         $scope.loading = false;
         setTimeout(function() {
diff --git a/js/models/Wallet.js b/js/models/Wallet.js
index 0b6fe5b1f..609698d0a 100644
--- a/js/models/Wallet.js
+++ b/js/models/Wallet.js
@@ -2854,7 +2854,7 @@ Wallet.prototype.getTransactionHistory = function(cb) {
     tx.amountSat = Math.abs(amount);
     tx.amount = tx.amountSat * satToUnit;
     tx.sentTs = proposal ? proposal.sentTs : undefined;
-    tx.minedTs = tx.time * 1000;
+    tx.minedTs = !_.isNaN(tx.time) ? tx.time * 1000 : undefined;
   };
 
   if (addresses.length > 0) {
@@ -2864,6 +2864,7 @@ Wallet.prototype.getTransactionHistory = function(cb) {
 
       var history = _.map(txs, function(tx) {
         decorateTx(tx);
+        console.log(tx);
         return tx;
       });
       return cb(null, history);
diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html
index 571e9bf14..cc473b2d0 100644
--- a/views/includes/sidebar.html
+++ b/views/includes/sidebar.html
@@ -77,7 +77,7 @@
         </div>
       </li>
     </ul>
-      <a ui-route="{{create}}" href="#!/manage" class="button-setup add-wallet db p20h" title="Create"><i class="m5r fi-plus"></i> {{'Add Wallet' | translate }} </a>
+      <!-- <a ui-route="{{create}}" href="#!/manage" class="button-setup add-wallet db p20h" title="Create"><i class="m5r fi-plus"></i> {{'Add Wallet' | translate }} </a> -->
   </div>
 
   <ul class="side-nav" ng-if="!walletSelection && $root.wallet.isReady()">
diff --git a/views/transactions.html b/views/transactions.html
index 817ce39e3..bd01be246 100644
--- a/views/transactions.html
+++ b/views/transactions.html
@@ -30,43 +30,40 @@
       <div class="btransactions" ng-if="lastShowed">
         <div ng-if="!blockchain_txs[0].txid && !loading">
         <em><strong translate>No transactions yet.</strong></em></div>
-        <div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
-          <div class="last-transactions-header size-14">
-            <div class="row collapse">
-              <div class="large-8 medium-7 small-4 columns ellipsis">
+        <div class="panel large-12 columns" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
+          <div class="row collapse size-12">
+              <div class="large-2 medium-2 small-4 columns">
+                <span ng-hide="btx.ts">&nbsp;</span>
+                <time>{{btx.ts | amCalendar}}</time>
+              </div>
+
+              <div class="large-3 medium-3 small-5 columns">
+                {{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}
+                {{btx.action}} 
+              </div>
+
+              <div class="large-2 medium-2 columns hide-for-small-only">
+                <span ng-hide="btx.labelTo">&nbsp;</span>
+                <span ng-show="btx.labelTo">{{ (btx.action == 'received' ? 'on' : 'to') | translate }} {{btx.labelTo}}</span>
+              </div>
+
+              <div class="large-3 medium-3 small-4 columns hide-for-small-only">
+                <span ng-show="btx.comment">{{btx.comment}}</span>
+              </div>
+
+              <div class="large-1 medium-1 small-3 columns">
+                <span class="label alert" ng-show="!btx.confirmations || btx.confirmations == 0"><span translate>Unconfirmed</span></span>
+                <span class="label" ng-show="btx.confirmations > 0 && btx.confirmations <= 6">{{btx.confirmations || 0}} <span translate>Confirmations</span></span>
+                <span class="label success" ng-show="btx.confirmations > 6"><span translate>Confirmed</span></span>
+              </div>
+
+              <div class="large-1 medium-1 small-4 columns size-10 text-right hide-for-small-only">
                 <a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank" translate>
                   Show more
                 </a> 
-                <span class="btn-copy" clip-copy="btx.txid"></span>
               </div>
-              <div class="large-4 medium-5 small-8 columns text-right">
-                <div data-ng-show="btx.sentTs">
-                  <span translate>broadcasted</span>
-                  <time>{{btx.sentTs | amCalendar}}</time>
-                </div>
-                <div data-ng-show="btx.minedTs">
-                  <span translate>mined</span>
-                  <time>{{btx.minedTs | amCalendar}}</time>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="last-transactions-content">
-          {{btx.action}} <span ng-show="btx.labelTo">{{ (btx.action == 'received' ? 'on' : 'to') | translate }} {{btx.labelTo}}</span>
-          <span ng-show="btx.comment">{{btx.comment}}</span>
-          </div>
-          <div class="last-transactions-footer">
-            <div class="row collapse">
-              <div class="large-6 medium-6 small-6 columns">
-                <div class="size-12" ng-show="!btx.confirmations || btx.confirmations == 0"><span translate>Unconfirmed</span></div>
-                <div class="size-12" ng-show="btx.confirmations > 0 && btx.confirmations <= 6">{{btx.confirmations || 0}} <span translate>Confirmations</span></div>
-                <div class="size-12" ng-show="btx.confirmations > 6"><span translate>Confirmed</span></div>
-              </div>
-              <div class="large-6 medium-6 small-6 columns text-right">
-                <p class="label size-14"><span translate>Amount</span>: {{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
-              </div>
-            </div>
           </div>
+              
         </div>
       </div>
     </div>