latest conflicts fix with my local repo updates

assets/scripts/dashboard.js

@@ -1101,53 +1101,64 @@ function getDEXGetBalance(coin) {
 
 
 function getDEXGetBalance_cache(coin) {
-	NProgress.done(true);
+  NProgress.done(true);
-	NProgress.configure({
+  NProgress.configure({
-			template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
+      template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
-								'<div class="spinner" role="spinner">' +
+  });
-									'<div class="spinner-icon"></div>' +
+  NProgress.start();
-								'</div>'
+  return new Promise((resolve) =>{
-	});
+    Shepherd_GetBasiliskCache().then(function(result){
-	NProgress.start();
+    var _data = JSON.parse(result)
-
+    var query = _data.result.basilisk
-	return new Promise((resolve) => {
+    //console.log(query[coin].addresses)
-		Shepherd_GetBasiliskCache().then(function(result) {
+
-			var _data = JSON.parse(result),
+    var total_balance = 0
-					query = _data.result.basilisk,
+    var total_interest = 0
-					total_balance = 0,
+    Promise.all(query[coin].addresses.map((coinaddr_value,coinaddr_index) => {
-					total_interest = 0;
+        return new Promise((resolve, reject) => {
-
+            //console.log(coinaddr_index)
-			Promise.all(query[coin].addresses.map((coinaddr_value,coinaddr_index) => {
+            //console.log(coinaddr_value)
-				return new Promise((resolve, reject) => {
+            if ( query[coin][coinaddr_value].getbalance !== undefined ) {
-					if ( query[coin][coinaddr_value].getbalance !== undefined ) {
+              var data = query[coin][coinaddr_value].getbalance
-						var data = query[coin][coinaddr_value].getbalance;
+              //console.log(data)
-						total_balance = parseFloat(total_balance) + parseFloat(data.balance);
+              total_balance = parseFloat(total_balance) + parseFloat(data.balance)
-
+              if (data.interest !== undefined) {
-						if (data.interest !== undefined) {
+                  //console.log('interest is found')
-							total_interest = parseFloat(total_interest) + parseFloat(data.interest);
+                  //console.log(data)
-							total_final = parseFloat(total_balance) + parseFloat(total_interest);
+                  total_interest = parseFloat(total_interest) + parseFloat(data.interest)
-							pass_data = {
+                  total_final = parseFloat(total_balance) + parseFloat(total_interest)
-								'total': total_balance.toFixed(8),
+                  pass_data = {"total":total_balance.toFixed(8),"interest":total_interest.toFixed(8),"totalbalance":total_final.toFixed(8)}
-								'interest': total_interest.toFixed(8),
+              }
-								'totalbalance': total_final.toFixed(8)
+              if (data.interest == undefined) {
-							}
+                  //console.log('interest NOT found')
-						}
+                  //console.log(data)
-
+                  //console.log(total_balance)
-						if (data.interest == undefined) {
+                  if(isNaN(total_balance)) {
-							pass_data = { 'total': total_balance.toFixed(8) };
+                    total_balance = parseFloat(0)
-						}
+                  }
-					} else {
+                  pass_data = {"total":total_balance.toFixed(8)}
-						pass_data = { 'total': 0.00000000 };
+              }
-					}
+            } else {
-
+              //console.log('Balance NOT found')
-					resolve(pass_data);
+              //console.log(data)
-				});
+              pass_data = {"total":0.00000000}
-			})).then(result => {
+            }
-				resolve(result[result.length-1]);
+            //console.log(pass_data)
-				NProgress.done();
+            //return pass_data
-			});
+            resolve(pass_data)
-		});
+            })
-	});
+        })).then(result => {
+          //console.log(result)
+          //console.log(result[result.length-1])
+          if ( result[result.length-1].total == 0 ) {
+            resolve(result[result.length-2])
+          } else {
+            resolve(result[result.length-1])
+          }
+          NProgress.done();
+      })
+    })
+  })
 }
 
 function getDEXGetBalance2(coin) {

assets/scripts/iguana_api.js

@@ -1228,8 +1228,9 @@ function EDEXimportprivkey(params_data) {
     })
 }
 
+
 function Iguana_SetRPCAuth() {
-    var tmpPass = 1234; //md5(PassPhraseGenerator.generatePassPhrase(128));
+    var tmpPass = md5(PassPhraseGenerator.generatePassPhrase(128));
     sessionStorage.setItem('IguanaRPCAuth', tmpPass);
 }
 

assets/scripts/login.js

@@ -99,10 +99,11 @@ var Login = function() {
                             $('body').removeClass( "page-login layout-full page-dark" ).addClass( "" );
                             $('link[id=loginStyle]')[0].disabled=true;
                             //refreshEDEXCoinWalletList()
-                            Shepherd_FetchBasiliskData().then(function(result){
+                            /*Shepherd_FetchBasiliskData().then(function(result){
                                 console.log(result)
                                 location.reload();
-                            })
+                            })*/
+                            location.reload();
                         }
                         else {
                             // If something goes wrong, alert the error message that our service returned