adding unconfirmed to history

wavesplatform · Jun 19, 2016 · b2e6134 · b2e6134
1 parent 8121f16
commit b2e6134
Showing 1 changed file with 73 additions and 27 deletions.
diff --git a/js/waves.ui.js b/js/waves.ui.js
@@ -161,40 +161,86 @@ var Waves = (function(Waves, $, undefined) {
             //Auto Updating Voting Page Items
         },
         'mBB-history': function updateHistory() {
+
+            Waves.apiRequest(Waves.api.transactions.unconfirmed, function(unconfirmedTransactions) {
 
-            Waves.getAddressHistory(Waves.address, function(history) {
-                var transactionHistory = history[0];
-                var appContainer = '';
-
-                transactionHistory.sort(function(x, y){
-                    return y.timestamp - x.timestamp;
-                });
+                Waves.getAddressHistory(Waves.address, function(history) {
+                    var transactionHistory = history[0];
+                    var appContainer = '';
+
+                    var signatureKeys = []; //Prevent double-entry with unconfirmed transactions
+
+                    if(unconfirmedTransactions.length > 0) {
+
+                        $.each(unconfirmedTransactions, function(keyunc, dataunc) {
+
+                            if(dataunc.sender === Waves.address.getRawAddress() || dataunc.recipient === Waves.address.getRawAddress()) {
+
+                                var senderClass = 'class="unconfirmed wavesTable-txIn"';
+                                var paymentType = 'Incoming ';
+                                if(dataunc.sender === Waves.address.getRawAddress()) {
+
+                                    senderClass = 'class="unconfirmed wavesTable-txOut"';
+                                    paymentType = 'Outgoing ';
+                                }
+
+                                var sender = dataunc.sender !== undefined ?
+                                    Waves.Addressing.fromRawAddress(dataunc.sender).getDisplayAddress() :
+                                    "none";
 
-                $.each(transactionHistory, function(historyKey, historyValue) {
+                                signatureKeys.push(dataunc.signature);
+
+                                appContainer += '<tr '+senderClass+'>';
+                                appContainer += '<td>'+Waves.formatTimestamp(dataunc.timestamp)+'</td>';
+                                appContainer += '<td>' +paymentType + Waves.transactionType(dataunc.type)+'</td>';
+                                appContainer += '<td>'+ sender +'</td>';
+                                appContainer += '<td>'+ Waves.Addressing.fromRawAddress(dataunc.recipient).getDisplayAddress()+'</td>';
+                                appContainer += '<td>'+dataunc.fee+' WVL</td>';
+                                appContainer += '<td>'+Waves.formatAmount(dataunc.amount)+' WAVE</td>';
+                                appContainer += '</tr>';
+
+                            }
+
+                        });
 
-                    var senderClass = 'class="wavesTable-txIn"';
-                    var paymentType = 'Incoming ';
-                    if(historyValue.sender === Waves.address.getRawAddress()) {
-
-                        senderClass = 'class="wavesTable-txOut"';
-                        paymentType = 'Outgoing ';
                     }
+
+                    transactionHistory.sort(function(x, y){
+                        return y.timestamp - x.timestamp;
+                    });
+
+                    $.each(transactionHistory, function(historyKey, historyValue) {
+
+                        var senderClass = 'class="wavesTable-txIn"';
+                        var paymentType = 'Incoming ';
+                        if(historyValue.sender === Waves.address.getRawAddress()) {
+
+                            senderClass = 'class="wavesTable-txOut"';
+                            paymentType = 'Outgoing ';
+                        }
+
+                        var sender = historyValue.sender !== undefined ?
+                            Waves.Addressing.fromRawAddress(historyValue.sender).getDisplayAddress() :
+                            "none";
+
+                        if(signatureKeys.indexOf(historyValue.signature) === -1) {
+
+                            appContainer += '<tr '+senderClass+'>';
+                            appContainer += '<td>'+Waves.formatTimestamp(historyValue.timestamp)+'</td>';
+                            appContainer += '<td>'+paymentType + Waves.transactionType(historyValue.type)+'</td>';
+                            appContainer += '<td>'+ sender +'</td>';
+                            appContainer += '<td>'+ Waves.Addressing.fromRawAddress(historyValue.recipient).getDisplayAddress()+'</td>';
+                            appContainer += '<td>'+historyValue.fee+' WVL</td>';
+                            appContainer += '<td>'+Waves.formatAmount(historyValue.amount)+' WAVE</td>';
+                            appContainer += '</tr>';
+
+                        }
+
+                    });
 
-                    var sender = historyValue.sender !== undefined ?
-                        Waves.Addressing.fromRawAddress(historyValue.sender).getDisplayAddress() :
-                        "none";
-
-                    appContainer += '<tr '+senderClass+'>';
-                    appContainer += '<td>'+Waves.formatTimestamp(historyValue.timestamp)+'</td>';
-                    appContainer += '<td>'+paymentType + Waves.transactionType(historyValue.type)+'</td>';
-                    appContainer += '<td>'+ sender +'</td>';
-                    appContainer += '<td>'+ Waves.Addressing.fromRawAddress(historyValue.recipient).getDisplayAddress()+'</td>';
-                    appContainer += '<td>'+historyValue.fee+' WVL</td>';
-                    appContainer += '<td>'+Waves.formatAmount(historyValue.amount)+' WAVE</td>';
-                    appContainer += '</tr>';
+                    $("#transactionhistory").html(appContainer);
                 });
 
-                $("#transactionhistory").html(appContainer);
             });
 
         },