From 5bf4bca0d3c0ca63a83a5a723c57af59e77cd7fc Mon Sep 17 00:00:00 2001
From: Mario Colque <colquemario@gmail.com>
Date: Mon, 14 Apr 2014 17:58:12 -0300
Subject: [PATCH 1/2] added list of pending transactions

---
 index.html                     | 29 ++++++++---------------------
 js/controllers/transactions.js | 29 +++++++++++++++++------------
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/index.html b/index.html
index bf40be301..069cf57e9 100644
--- a/index.html
+++ b/index.html
@@ -158,13 +158,15 @@
       <div class="transactions" data-ng-controller="TransactionsController">
       
         <div class="row">
-          <div class="large-6 columns">
-            <h2>Output</h2>
-            <div class="panel pending">
+          <div class="large-12 columns">
+            <h2>Pending Transactions <small>({{txsoutput.length}})</small></h2>
+            <div class="panel pending" ng-repeat="txp in txsoutput ">
+              {{txp}}
               <div class="row">
                 <p class="large-5 columns"> Address 1</p>
                 <i class="large-2 columns fi-arrow-right size-16 text-center"></i>
-                <p class="large-5 columns"> Adress 2</p>
+                <p class="large-5 columns"> Address 2</p>
+                <p>Transaction description</p>
                 <div class="large-12 columns m0">
                   <div class="line"></div>
                   <button class="primary round large-4 columns"><i class="large-2 columns fi-x size-16 text-center"></i> Ignore</button>
@@ -173,24 +175,9 @@
                 </div>
               </div> <!-- end of row -->
             </div> <!-- end of pending -->
-            <div class="line"></div>
-            <div class="panel">
-              <div class="row">
-                <p class="large-5 columns"> Address 1</p>
-                <i class="large-2 columns fi-arrow-right size-16 text-center"></i>
-                <p class="large-5 columns"> Adress 2</p>
-              </div>
-            </div>
-            <div class="panel">
-              <div class="row">
-                <p class="large-5 columns"> Address 1</p>
-                <i class="large-2 columns fi-arrow-right size-16 text-center"></i>
-                <p class="large-5 columns"> Adress 2</p>
-              </div>
-            </div>
           </div>
-          <div class="large-6 columns">
-            <h2>Input</h2>
+          <div class="large-12 columns">
+            <h2>Last Transactions</h2>
             <div class="panel">
               <div class="row">
                 <p class="large-5 columns"> Address 1</p>
diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js
index 1af4cf9a6..80a54dca5 100644
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@@ -10,6 +10,9 @@ angular.module('copay.transactions').controller('TransactionsController',
       $location.path('signin');
     }
 
+    console.log('########################');
+    console.log($rootScope);
+
     $scope.txsinput = [
     {
       fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
@@ -23,16 +26,18 @@ angular.module('copay.transactions').controller('TransactionsController',
     }
     ];
 
-    $scope.txsoutput = [
-    {
-      fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
-      toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
-      amount: 23.9982
-    },
-    {
-      fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
-      toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
-      amount: 2.22
-    }
-    ];
+    $scope.txsoutput = $rootScope.txProposals.txps;
+
+    // $scope.txsoutput = [
+    // {
+    //   fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
+    //   toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
+    //   amount: 23.9982
+    // },
+    // {
+    //   fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
+    //   toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
+    //   amount: 2.22
+    // }
+    // ];
   });

From 52a4ae522e982f0482ccad76690174040e9ebf59 Mon Sep 17 00:00:00 2001
From: Mario Colque <colquemario@gmail.com>
Date: Mon, 14 Apr 2014 18:03:40 -0300
Subject: [PATCH 2/2] removed comments and logs

---
 js/controllers/transactions.js | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js
index 80a54dca5..e6ddbde29 100644
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@@ -10,9 +10,6 @@ angular.module('copay.transactions').controller('TransactionsController',
       $location.path('signin');
     }
 
-    console.log('########################');
-    console.log($rootScope);
-
     $scope.txsinput = [
     {
       fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
@@ -27,17 +24,4 @@ angular.module('copay.transactions').controller('TransactionsController',
     ];
 
     $scope.txsoutput = $rootScope.txProposals.txps;
-
-    // $scope.txsoutput = [
-    // {
-    //   fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
-    //   toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
-    //   amount: 23.9982
-    // },
-    // {
-    //   fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
-    //   toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
-    //   amount: 2.22
-    // }
-    // ];
   });