From 574fd11062a1edebf5977b21018aedfa836d09ec Mon Sep 17 00:00:00 2001
From: Satinder Grewal <grewal.satinder@gmail.com>
Date: Sun, 26 Feb 2017 05:36:36 +1300
Subject: [PATCH] latest conflicts fix with my local repo updates

---
 assets/scripts/dashboard.js  | 105 +++++++++++++++++++----------------
 assets/scripts/iguana_api.js |   5 +-
 assets/scripts/login.js      |   5 +-
 3 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js
index a9c5afa..a74e9ae 100644
--- a/assets/scripts/dashboard.js
+++ b/assets/scripts/dashboard.js
@@ -1101,53 +1101,64 @@ function getDEXGetBalance(coin) {
 
 
 function getDEXGetBalance_cache(coin) {
-	NProgress.done(true);
-	NProgress.configure({
-			template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
-								'<div class="spinner" role="spinner">' +
-									'<div class="spinner-icon"></div>' +
-								'</div>'
-	});
-	NProgress.start();
-
-	return new Promise((resolve) => {
-		Shepherd_GetBasiliskCache().then(function(result) {
-			var _data = JSON.parse(result),
-					query = _data.result.basilisk,
-					total_balance = 0,
-					total_interest = 0;
-
-			Promise.all(query[coin].addresses.map((coinaddr_value,coinaddr_index) => {
-				return new Promise((resolve, reject) => {
-					if ( query[coin][coinaddr_value].getbalance !== undefined ) {
-						var data = query[coin][coinaddr_value].getbalance;
-						total_balance = parseFloat(total_balance) + parseFloat(data.balance);
-
-						if (data.interest !== undefined) {
-							total_interest = parseFloat(total_interest) + parseFloat(data.interest);
-							total_final = parseFloat(total_balance) + parseFloat(total_interest);
-							pass_data = {
-								'total': total_balance.toFixed(8),
-								'interest': total_interest.toFixed(8),
-								'totalbalance': total_final.toFixed(8)
-							}
-						}
-
-						if (data.interest == undefined) {
-							pass_data = { 'total': total_balance.toFixed(8) };
-						}
-					} else {
-						pass_data = { 'total': 0.00000000 };
-					}
-
-					resolve(pass_data);
-				});
-			})).then(result => {
-				resolve(result[result.length-1]);
-				NProgress.done();
-			});
-		});
-	});
+  NProgress.done(true);
+  NProgress.configure({
+      template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
+  });
+  NProgress.start();
+  return new Promise((resolve) =>{
+    Shepherd_GetBasiliskCache().then(function(result){
+    var _data = JSON.parse(result)
+    var query = _data.result.basilisk
+    //console.log(query[coin].addresses)
+
+    var total_balance = 0
+    var total_interest = 0
+    Promise.all(query[coin].addresses.map((coinaddr_value,coinaddr_index) => {
+        return new Promise((resolve, reject) => {
+            //console.log(coinaddr_index)
+            //console.log(coinaddr_value)
+            if ( query[coin][coinaddr_value].getbalance !== undefined ) {
+              var data = query[coin][coinaddr_value].getbalance
+              //console.log(data)
+              total_balance = parseFloat(total_balance) + parseFloat(data.balance)
+              if (data.interest !== undefined) {
+                  //console.log('interest is found')
+                  //console.log(data)
+                  total_interest = parseFloat(total_interest) + parseFloat(data.interest)
+                  total_final = parseFloat(total_balance) + parseFloat(total_interest)
+                  pass_data = {"total":total_balance.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(isNaN(total_balance)) {
+                    total_balance = parseFloat(0)
+                  }
+                  pass_data = {"total":total_balance.toFixed(8)}
+              }
+            } else {
+              //console.log('Balance NOT found')
+              //console.log(data)
+              pass_data = {"total":0.00000000}
+            }
+            //console.log(pass_data)
+            //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) {
diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js
index e216200..5e1b350 100644
--- a/assets/scripts/iguana_api.js
+++ b/assets/scripts/iguana_api.js
@@ -1228,8 +1228,9 @@ function EDEXimportprivkey(params_data) {
     })
 }
 
-function Iguana_SetRPCAuth() {    
-    var tmpPass = 1234; //md5(PassPhraseGenerator.generatePassPhrase(128));
+
+function Iguana_SetRPCAuth() {
+    var tmpPass = md5(PassPhraseGenerator.generatePassPhrase(128));
     sessionStorage.setItem('IguanaRPCAuth', tmpPass);
 }
 
diff --git a/assets/scripts/login.js b/assets/scripts/login.js
index cb66be4..a7927a0 100644
--- a/assets/scripts/login.js
+++ b/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