From 632e3187f54a14e9ea1ffdbdfb26bc80ca723134 Mon Sep 17 00:00:00 2001
From: Satinder Grewal <grewal.satinder@gmail.com>
Date: Wed, 30 Nov 2016 15:20:46 +1300
Subject: [PATCH] some code clean, iguana_api.js updated

iguana_api.js updated with get new address and list addresses of
selected coin
---
 assets/scripts/dashboard.js  | 140 -----------------------------------
 assets/scripts/iguana_api.js |  78 +++++++++++++++----
 index.html                   |   2 +-
 3 files changed, 64 insertions(+), 156 deletions(-)

diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js
index bfb07d9..171defb 100644
--- a/assets/scripts/dashboard.js
+++ b/assets/scripts/dashboard.js
@@ -248,152 +248,12 @@ var Dashboard = function() {
                         walletDivContent += '</div>';
                         walletDivContent += '<!-- End Wallet Widget '+AllcoinsDataOutput[value][index]+' -->';
 
-                        /*walletDivContent += '<!-- Begin' + AllcoinsDataOutput[value][index] + 'wallet widget -->';
-                        walletDivContent += '<div class="col-md-6 col-xs-12 masonry-item">';
-                          walletDivContent += '<div class="widget widget-shadow">';
-                            walletDivContent += '<div class="widget-header wallet-widget-header padding-15 clearfix">';
-                              walletDivContent += '<div class="row no-space">';
-                                  walletDivContent += '<div class="col-xs-7">';
-                                    walletDivContent += '<a class="avatar avatar-lg pull-left margin-right-20 img-bordered" href="javascript:void(0)" data-currency="' + AllcoinsDataOutput[value][index] + '" data-modecode="' + modecode + '" id="currency-logo" onclick="SwitchBasicliskFull($(this).data())">';
-                                      walletDivContent += '<img src="assets/images/cryptologo/' + coinlogo + '.png" alt="">';
-                                      walletDivContent += '<span class="badge up badge-' + modecolor + '" id="basfull" data-currency="' + AllcoinsDataOutput[value][index] + '" data-toggle="tooltip" data-placement="top" data-original-title="' + modetip + '">' + modecode + '</span>';
-                                    walletDivContent += '</a>';
-                                    walletDivContent += '<div>';
-                                      walletDivContent += '<div class="font-size-20 hidden-xs" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-name">' + coinname + '</div>';
-                                      walletDivContent += '<div class="form-material hidden-md hidden-xs">';*/
-                                        
-                                        /*walletDivContent += '<select class="form-control font-size-12" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-addr" style="width: 235px;">';
-                                        walletDivContent += '</select>';*/
-                                        
-                                        /*walletDivContent += '<div class="font-size-12" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-addr"></div>';
-                                      walletDivContent += '</div>';
-                                      walletDivContent += '<div class="font-size-12 hidden-xs"></div>';
-                                    walletDivContent += '</div>';
-                                  walletDivContent += '</div>';
-                                  walletDivContent += '<div class="col-xs-5">';
-                                    walletDivContent += '<div class="row no-space text-center">';
-                                      walletDivContent += '<div class="col-md-6 col-xs-12">';
-                                        walletDivContent += '<div class="counter" data-toggle="tooltip" data-placement="top" data-original-title="Balance">';
-                                          walletDivContent += '<div class="counter-icon"><i class="icon">' + AllcoinsDataOutput[value][index] + '</i></div>';
-                                          walletDivContent += '<span class="counter-number" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-balance">0</span>';
-                                        walletDivContent += '</div>';
-                                      walletDivContent += '</div>';*/
-
-                                      /*walletDivContent += '<div class="col-md-4 col-xs-6">';
-                                        walletDivContent += '<div class="counter" data-toggle="tooltip" data-placement="top" data-original-title="Unconfirmed">';
-                                          walletDivContent += '<div class="counter-icon"><i class="icon fa-spinner"></i></div>';
-                                          walletDivContent += '<span class="counter-number" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-unconfirmed">0</span>';
-                                        walletDivContent += '</div>';
-                                      walletDivContent += '</div>';*/
-
-                                      /*walletDivContent += '<div class="col-md-6 hidden-xs hidden-sm">';
-                                        walletDivContent += '<div class="counter" data-toggle="tooltip" data-placement="top" data-original-title="No. of Transactions">';
-                                          walletDivContent += '<div class="counter-icon"><i class="icon fa-book"></i></div>';
-                                          walletDivContent += '<span class="counter-number" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-nooftransactions">0</span>';
-                                        walletDivContent += '</div>';
-                                      walletDivContent += '</div>';
-                                    walletDivContent += '</div>';
-                                  walletDivContent += '</div>';
-                                walletDivContent += '</div>';
-                            walletDivContent += '</div>';
-                            walletDivContent += '<div class="widget-content history-body hidden-sm hidden-xs">';
-                              walletDivContent += '<div class="height-200 scrollbar-dynamic" id="tblscroll">';
-                                walletDivContent += '<div data-role="container">';
-                                  walletDivContent += '<div data-role="content">';
-                                    walletDivContent += '<table class="table font-size-12" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-tbl">';
-                                      walletDivContent += '<tbody>';
-                                      walletDivContent += '</tbody>';
-                                    walletDivContent += '</table>';
-                                  walletDivContent += '</div>';
-                                walletDivContent += '</div>';
-                              walletDivContent += '</div>';
-                            walletDivContent += '</div>';
-                            walletDivContent += '<div class="widget-footer text-center">';
-                              walletDivContent += '<div class="row no-space ">';
-                                walletDivContent += '<div data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-progressbars" style="display: none;">';
-                                  walletDivContent += '<div class="progress progress-sm">';
-                                  walletDivContent += '<div class="progress-bar progress-bar-info progress-bar-striped active" style="width: 0%; font-size: 80%;" role="progressbar" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-bundles">Bundles <span data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-bundles-percent">0%</span></div>';
-                                  walletDivContent += '</div>';
-                                  walletDivContent += '<div data-currency="' + AllcoinsDataOutput[value][index] + '" id="additional-progress-bars">';
-                                  walletDivContent += '<div class="progress progress-sm">';
-                                  walletDivContent += '<div class="progress-bar progress-bar-warning progress-bar-striped active" style="width: 0%; font-size: 80%;" role="progressbar" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-utxo">utxo <span data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-utxo-percent">0%</span></div>';
-                                  walletDivContent += '</div>';
-                                  walletDivContent += '<div class="progress progress-sm">';
-                                  walletDivContent += '<div class="progress-bar progress-bar-danger progress-bar-striped active" style="width: 0%; font-size: 80%;" role="progressbar" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-balances">Balances <span data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-balances-percent">0%</span></div>';
-                                  walletDivContent += '</div>';
-                                  walletDivContent += '<div class="progress progress-sm">';
-                                  walletDivContent += '<div class="progress-bar progress-bar-success progress-bar-striped active" style="width: 0%; font-size: 80%;" role="progressbar" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-validated">Validated <span data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-validated-percent">0%</span></div>';
-                                  walletDivContent += '</div>';
-                                  walletDivContent += '</div><!-- END additional-progress-bars -->';
-                                walletDivContent += '</div>';
-                              walletDivContent += '</div>';
-                                walletDivContent += '<div class="btn-group btn-group-justified">';
-                                    walletDivContent += '<div class="btn-group" role="group">';
-                                      walletDivContent += '<button type="button" class="btn btn-xs bg-blue-grey-200 grey-800 waves-effect waves-light" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-send" onclick="sendCurrency($(this).data())" data-target="#SendCoinModelStep1" data-toggle="modal">';
-                                        walletDivContent += '<i class="icon wb-upload" aria-hidden="true"></i>';
-                                        walletDivContent += '<br>';
-                                        walletDivContent += '<span class="text-uppercase hidden-xs">Send</span>';
-                                      walletDivContent += '</button>';
-                                    walletDivContent += '</div>';
-                                    walletDivContent += '<div class="btn-group" role="group">';
-                                      walletDivContent += '<button type="button" class="btn btn-xs bg-blue-grey-100 grey-800 waves-effect waves-light" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-receive" onclick="ReceiveCurrency($(this).data())" data-target="#ReceiveCoinModel" data-toggle="modal">';
-                                        walletDivContent += '<i class="icon wb-download " aria-hidden="true"></i>';
-                                        walletDivContent += '<br>';
-                                        walletDivContent += '<span class="text-uppercase hidden-xs">Receive</span>';
-                                      walletDivContent += '</button>';
-                                    walletDivContent += '</div>';
-                                    walletDivContent += '<div class="btn-group" role="group">';
-                                      walletDivContent += '<button type="button" class="btn btn-xs bg-blue-grey-300 grey-800 waves-effect waves-light" data-currency="' + AllcoinsDataOutput[value][index] + '" id="currency-trade">';
-                                        walletDivContent += '<i class="icon wb-graph-up" aria-hidden="true"></i>';
-                                        walletDivContent += '<br>';
-                                        walletDivContent += '<span class="text-uppercase hidden-xs">Trade</span>';
-                                      walletDivContent += '</button>';
-                                    walletDivContent += '</div>';
-                                  walletDivContent += '</div>';
-                              walletDivContent += '</div>';
-                            walletDivContent += '</div>';
-                          walletDivContent += '</div>';
-                        walletDivContent += '</div>';
-                        walletDivContent += '<!-- End' + AllcoinsDataOutput[value][index] + 'wallet widget -->';*/
-
                         $('.wallet-widgets-row').html(walletDivContent);
                         getCoinBalance(AllcoinsDataOutput[value][index]);
                         $('.scrollbar-dynamic').scrollbar(); //Make sure widget-body has scrollbar for transactions history
                         $('[data-toggle="tooltip"]').tooltip(); //Make sure tooltips are working for wallet widgets and anywhere else in wallet.
                         //console.log(walletDivContent);
                         edexCoinBtnAction();
-                        
-                        //console.log('http://127.0.0.1:7778/api/bitcoinrpc/getaddressesbyaccount?coin=' + AllcoinsDataOutput[value][index] + '&account=*');
-                        //List coin addresses as drop down menu
-                        /*var getaddrlist = {"agent":"SuperNET","method":"activehandle"};
-                        $.ajax({
-                            type: 'POST',
-                            data: JSON.stringify(getaddrlist),
-                            url: 'http://127.0.0.1:7778',
-                            //dataType: 'text',
-                            success: function(data, textStatus, jqXHR) {
-                                var addrlistData = JSON.parse(data);
-                                //console.log('== Address List Data OutPut ==');
-                                //console.log(addrlistData);
-                                $('div[data-currency="' + AllcoinsDataOutput[value][index] + '"][id="currency-addr"]').text(addrlistData[AllcoinsDataOutput[value][index]])
-                                
-                                //console.log(data);
-                                //console.log(data[0]);
-                            },
-                            error: function(xhr, textStatus, error) {
-                                console.log('failed getting Coin History.');
-                                console.log(xhr.statusText);
-                                if ( xhr.readyState == 0 ) {
-                                    Iguana_ServiceUnavailable();
-                                }
-                                console.log(textStatus);
-                                console.log(error);
-                            }
-                        });*/
-
-
-                        
-                       
                     });
                 },
                 error: function(xhr, textStatus, error) {
diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js
index 360bbc3..1c2f098 100644
--- a/assets/scripts/iguana_api.js
+++ b/assets/scripts/iguana_api.js
@@ -35,7 +35,6 @@ function Iguana_dumpwallet() {
             //return AjaxOutputData;
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             console.log(textStatus);
             console.log(error);
@@ -65,7 +64,6 @@ function Iguana_rmd160conv(rmd160conv_data) {
             return AjaxOutputData;
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -95,7 +93,6 @@ function Iguana_activehandle() {
             return true;
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -127,7 +124,6 @@ function Iguana_Setactivehandle() {
             
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -184,7 +180,6 @@ function Iguana_addcoinLogin(addcoin_data) {
             }
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -348,7 +343,6 @@ function Iguana_addcoin(addcoin_data) {
             }
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -402,7 +396,6 @@ function Iguana_HashHex(data) {
             result = AjaxOutputData.hex;
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -456,7 +449,6 @@ function EDEXlistunspent(coin) {
             });
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -500,7 +492,6 @@ function EDEXMainAddr(coin) {
             result.push(AjaxOutputData[coin]);
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -536,7 +527,6 @@ function EDEXgetBalance(coin) {
             result.push(AjaxOutputData['result']);
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -571,7 +561,6 @@ function EDEXSendToAddr(data) {
             result.push(SendToAddrData);
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
@@ -588,12 +577,12 @@ function EDEXgetinfo(coin) {
     var result = [];
 
     //Get parameters values from confirm dialog and send currency
-    var getinfoValues = {"coin":coin,"agent":"bitcoinrpc","method":"getinfo","immediate":100,"timeout":4000};
-    console.log(getinfoValues);
+    var ajax_data = {"coin":coin,"agent":"bitcoinrpc","method":"getinfo","immediate":100,"timeout":4000};
+    console.log(ajax_data);
     $.ajax({
         async: false,
         type: 'POST',
-        data: JSON.stringify(getinfoValues),
+        data: JSON.stringify(ajax_data),
         url: 'http://127.0.0.1:7778',
         //dataType: 'text',
         success: function(data, textStatus, jqXHR) {
@@ -603,7 +592,66 @@ function EDEXgetinfo(coin) {
             result.push(AjaxOutputData);
         },
         error: function(xhr, textStatus, error) {
-            console.log('failed getting Coin History.');
+            console.log(xhr.statusText);
+            if ( xhr.readyState == 0 ) {
+                Iguana_ServiceUnavailable();
+            }
+            console.log(textStatus);
+            console.log(error);
+        }
+    });
+    return result;
+}
+
+function EDEXgetaddrbyaccount(coin) {
+    var result = [];
+
+    //Get parameters values from confirm dialog and send currency
+    var ajax_data = {"coin":coin,"agent":"bitcoinrpc","method":"getaddressesbyaccount","account":"*"}
+    console.log(ajax_data);
+    $.ajax({
+        async: false,
+        type: 'POST',
+        data: JSON.stringify(ajax_data),
+        url: 'http://127.0.0.1:7778',
+        //dataType: 'text',
+        success: function(data, textStatus, jqXHR) {
+            var AjaxOutputData = JSON.parse(data);
+            //console.log('== Data OutPut ==');
+            //console.log(AjaxOutputData);
+            result.push(AjaxOutputData.result);
+        },
+        error: function(xhr, textStatus, error) {
+            console.log(xhr.statusText);
+            if ( xhr.readyState == 0 ) {
+                Iguana_ServiceUnavailable();
+            }
+            console.log(textStatus);
+            console.log(error);
+        }
+    });
+    return result;
+}
+
+function EDEXgetnewaddress(coin) {
+    var result = [];
+
+    //Get parameters values from confirm dialog and send currency
+    var ajax_data = {"coin":coin,"agent":"bitcoinrpc","method":"getnewaddress","account":""}
+    console.log(ajax_data);
+    $.ajax({
+        async: false,
+        type: 'POST',
+        data: JSON.stringify(ajax_data),
+        url: 'http://127.0.0.1:7778',
+        //dataType: 'text',
+        success: function(data, textStatus, jqXHR) {
+            var AjaxOutputData = JSON.parse(data);
+            //console.log('== Data OutPut ==');
+            //console.log(AjaxOutputData);
+            result.push(AjaxOutputData.result);
+        },
+        error: function(xhr, textStatus, error) {
             console.log(xhr.statusText);
             if ( xhr.readyState == 0 ) {
                 Iguana_ServiceUnavailable();
diff --git a/index.html b/index.html
index c6fad2b..5cd28dc 100755
--- a/index.html
+++ b/index.html
@@ -467,7 +467,7 @@
           <button type="button" class="close" data-dismiss="alert" aria-label="Close">
             <span aria-hidden="true">×</span>
           </button>
-          <span style="font-size:24px; text-align: center;"><i class="icon fa-paw" aria-hidden="true"></i> NO WALLET SELECTED</span></a>.
+          <span style="font-size:24px; text-align: center;"><i class="icon fa-paw" aria-hidden="true"></i> NO WALLET SELECTED</span><br>Please select a wallet from active coins list on left</a>.
         </div>
       </div>