anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Feature/list pending transactions
This commit is contained in:
Gustavo Maximiliano Cortez 2014-04-14 18:12:52 -03:00
commit 5e30bf9baf
2 changed files with 9 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

29
index.html
View file

@ -158,13 +158,15 @@
<div class="transactions" data-ng-controller="TransactionsController"> <div class="transactions" data-ng-controller="TransactionsController">
<div class="row"> <div class="row">
<div class="large-6 columns"> <div class="large-12 columns">
<h2>Output</h2> <h2>Pending Transactions <small>({{txsoutput.length}})</small></h2>
<div class="panel pending"> <div class="panel pending" ng-repeat="txp in txsoutput ">
{{txp}}
<div class="row"> <div class="row">
<p class="large-5 columns"> Address 1</p> <p class="large-5 columns"> Address 1</p>
<i class="large-2 columns fi-arrow-right size-16 text-center"></i> <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="large-12 columns m0">
<div class="line"></div> <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> <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>
</div> <!-- end of row --> </div> <!-- end of row -->
</div> <!-- end of pending --> </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>
<div class="large-6 columns"> <div class="large-12 columns">
<h2>Input</h2> <h2>Last Transactions</h2>
<div class="panel"> <div class="panel">
<div class="row"> <div class="row">
<p class="large-5 columns"> Address 1</p> <p class="large-5 columns"> Address 1</p>

13
js/controllers/transactions.js
View file

@ -23,16 +23,5 @@ angular.module('copay.transactions').controller('TransactionsController',
} }
]; ];
$scope.txsoutput = [ $scope.txsoutput = $rootScope.txProposals.txps;
{
fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
amount: 23.9982
},
{
fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
amount: 2.22
}
];
}); });