Merge pull request #36 from colkito/feature/list-pending-transactions

Feature/list pending transactions
2014-04-14 18:12:52 -03:00 · 2014-04-14 18:12:52 -03:00 · 5e30bf9baf
commit 5e30bf9baf
parent b42ab80128 52a4ae522e
2 changed files with 9 additions and 33 deletions
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@ -23,16 +23,5 @@ 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;
  });