Merge branch 'master' of https://github.com/SuperNETorg/EasyDEX-GUI

assets/scripts/dashboard.js

@@ -907,7 +907,6 @@ function EdexfillTxHistory(coin) {
           select: true,
           retrieve: true
       });
-      NProgress.done();
     });
 }
 
@@ -1580,6 +1579,7 @@ function EdexGetTxList(coin) {
         type: 'POST',
         dataType: 'json',
     }).then(data => {
+      //console.log(data)
         var total_utxos = []
         let params = ''
         Promise.all(data.result.map((coinaddr_value,coinaddr_index) => {
@@ -1613,6 +1613,9 @@ function EdexGetTxList(coin) {
                         type: 'POST',
                         dataType: 'json',
                     }).then(data => {
+                        if ( active_edexcoinmodecode == 'Full' ) {
+                          data = data.result;
+                        }
                         //console.log(data)
                         total_utxos = $.merge(total_utxos, data)
                         resolve(total_utxos)

assets/scripts/iguana_api.js

@@ -821,7 +821,7 @@ function EDEXlistunspent(coin) {
                 });
                 //console.log(tmpcalcnum);
                 var tmp_addr_total_balance_output = {"addr": unique_addr_tmp_array[0].address, "total": tmpcalcnum};*/
-                console.log(tmp_addr_total_balance_output);
+                //console.log(tmp_addr_total_balance_output);
                 result.push(tmp_addr_total_balance_output);
             });
             //console.log(result)