diff --git a/index.html b/index.html index bf40be301..069cf57e9 100644 --- a/index.html +++ b/index.html @@ -158,13 +158,15 @@
Address 1
-Adress 2
+Address 2
+Transaction description
Address 1
- -Adress 2
-Address 1
- -Adress 2
-Address 1
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 + // } + // ]; });