diff --git a/assets/styles/forms.css b/assets/styles/forms.css index ce91e24..6734d6a 100644 --- a/assets/styles/forms.css +++ b/assets/styles/forms.css @@ -21,4 +21,16 @@ .sendWrapper input { color: #aaa; +} + +#tableTransactionsForAll .fa-arrow-right { + color: #8B0000; +} + +#tableTransactionsForAll .fa-arrow-left { + color: #228B22; +} + +#tableTransactionsForAll .fa-arrows-alt-h { + color: #DCDCDC; } \ No newline at end of file diff --git a/assets/templates/transactions.html b/assets/templates/transactions.html index ac4441b..a5cfce7 100644 --- a/assets/templates/transactions.html +++ b/assets/templates/transactions.html @@ -2,6 +2,7 @@ + @@ -11,6 +12,7 @@ + diff --git a/renderer/transactions.js b/renderer/transactions.js index 6c6d8a3..03c3e69 100644 --- a/renderer/transactions.js +++ b/renderer/transactions.js @@ -77,27 +77,55 @@ class Transactions { $("#loadingTransactionsOverlay").css("display", "block"); setTimeout(() => { + var dataTransactions = ipcRenderer.sendSync('getTransactions'); + var addressList = EthoWallets.getAddressList(); + + dataTransactions.forEach(function(element) { + var isFromValid = (addressList.indexOf(element[2].toLowerCase()) > -1); + var isToValid = (addressList.indexOf(element[3].toLowerCase()) > -1); + + if ((isToValid) && (!isFromValid)) { + element.unshift(0); + } else if ((!isToValid) && (isFromValid)) { + element.unshift(1); + } else { + element.unshift(2); + } + }); + // render the transactions $('#tableTransactionsForAll').DataTable({ "paging": false, "scrollY": "calc(100vh - 115px)", "responsive": true, "processing": true, - "order": [[ 0, "desc" ]], - "data": ipcRenderer.sendSync('getTransactions'), + "order": [[ 1, "desc" ]], + "data": dataTransactions, "columnDefs": [ + { + "targets": 0, + "render": function ( data, type, row ) { + if (data == 0) { + return ''; + } else if (data == 1) { + return ''; + } else { + return ''; + } + } + }, { "className": "transactionsBlockNum", - "targets": 0 + "targets": 1 }, { - "targets": 1, + "targets": 2, "render": function ( data, type, row ) { return moment(data).format("MMM Do YYYY"); } }, { - "targets": 4, + "targets": 5, "render": function ( data, type, row ) { return parseFloat(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(data)).toString(), 'ether')).toFixed(2); }
Block Timestamp From
Block Timestamp From