upstream merge fix

assets/scripts/iguana_api/IguanaEDEX.js

@@ -959,10 +959,11 @@ function EDEX_GetTxIDList(gettxdata) {
 	})
 }
 
+
+
 function EDEX_RemoveTXID(_obj, txidArray) {
   var txidToStr = txidArray.join(':');
       console.log(txidToStr);
-
   if (_obj, _obj.basilisk) {
     if (Object.keys(_obj.basilisk).length === 0) {
       console.log('no coin nodes to parse');
@@ -975,7 +976,7 @@ function EDEX_RemoveTXID(_obj, txidArray) {
                 _obj.basilisk[key][coinAddr].refresh.data.length > 0) {
               for (var i = 0; i < _obj.basilisk[key][coinAddr].refresh.data.length; i++) {
                 if (txidToStr.indexOf(_obj.basilisk[key][coinAddr].refresh.data[i].txid) > -1) {
-                  delete _obj.basilisk[key][coinAddr].refresh.data[i];
+                  _obj.basilisk[key][coinAddr].refresh.data.splice(i, 1);
                 }
               }
             }
@@ -986,6 +987,5 @@ function EDEX_RemoveTXID(_obj, txidArray) {
   } else {
     console.log('basilisk node is missing');
   }
-
   return _obj;
 }

assets/scripts/iguana_api/IguanaShepherd.js

@@ -179,7 +179,7 @@ function Shepherd_GroomData_Post(req_data) {
       url: req_url,
       dataType: 'json'
     }).done(function(data) {
-      var res_data = JSON.parse(data);
+      var res_data = data;
       resolve(res_data);
     });
   });

assets/scripts/kmd_wallet/KMDTransaction.js

@@ -38,16 +38,16 @@ function KMDGetPublicTransactions() {
 				var tmp_secondsToString = secondsToString(AjaxOutputData[index].time);
 
 				if ( AjaxOutputData[index].category == 'send' ) {
-					tmp_category = '<i class="icon fa-arrow-circle-left"></i> ' + _lang[defaultLang].TOASTR.OUT;
+					tmp_category = '<i class="icon fa-arrow-circle-left"></i> ' +_lang[defaultLang].DASHBOARD.OUT;
 				}
 				if ( AjaxOutputData[index].category == 'receive' ) {
-					tmp_category = '<i class="icon fa-arrow-circle-right"></i> ' + _lang[defaultLang].TOASTR.IN;
+					tmp_category = '<i class="icon fa-arrow-circle-right"></i> ' + _lang[defaultLang].DASHBOARD.IN;
 				}
 				if ( AjaxOutputData[index].category == 'generate' ) {
-					tmp_category = '<i class="icon fa-cogs"></i> ' + _lang[defaultLang].TOASTR.MINED;
+					tmp_category = '<i class="icon fa-cogs"></i> ' + _lang[defaultLang].DASHBOARD.MINED;
 				}
 				if ( AjaxOutputData[index].category == 'immature' ) {
-					tmp_category = '<i class="icon fa-clock-o"></i> ' + _lang[defaultLang].TOASTR.IMMATURE;
+					tmp_category = '<i class="icon fa-clock-o"></i> ' + _lang[defaultLang].DASHBOARD.IMMATURE;
 				}
 
 				tmplisttransactions = [

assets/scripts/lang/en.js

@@ -337,7 +337,7 @@ const _lang = {
     },
     'SIDEBAR': {
       'EDEX_MOTTO': 'Most Secure, Easy and Native Decentralised Exchange',
-      'JUMBLR_MOTTO': 'Secure, Native and Decentralised Coin Shuffling'
+      'JUMBLR_MOTTO': 'Secure, Native and Decentralised Coin Anonymizer'
     },
     'SETTINGS': {
       'PASSPHRASE_REQ': 'Passphrase is required.'

index.html

@@ -313,9 +313,9 @@
                 <li role="presentation">
                   <a href="javascript:void(0)" role="menuitem" data-extcoin-menu="KMD" id="btn_kmd_wallet_recieve" data-lang="INDEX.RECEIVE"></a>
                 </li>
-                <li role="presentation">
+                <!--<li role="presentation">
                   <a href="javascript:void(0)" role="menuitem" data-extcoin-menu="KMD" id="btn_kmd_wallet_transactions" data-lang="INDEX.TRANSACTIONS"></a>
-                </li>
+                </li>-->
                 <li class="divider" role="presentation"></li>
                 <li role="presentation">
                   <a href="javascript:void(0)" role="menuitem" data-extcoin-menu="KMD" id="btn_kmd_wallet_settings" data-lang="INDEX.SETTINGS"></a>
@@ -338,9 +338,9 @@
                 <li role="presentation">
                   <a href="javascript:void(0)" role="menuitem" data-extcoin-menu="ZEC" id="btn_zec_wallet_recieve" data-lang="INDEX.RECEIVE"></a>
                 </li>
-                <li role="presentation">
+                <!--<li role="presentation">
                   <a href="javascript:void(0)" role="menuitem" data-extcoin-menu="ZEC" id="btn_zec_wallet_transactions" data-lang="INDEX.TRANSACTIONS"></a>
-                </li>
+                </li>-->
                 <li class="divider" role="presentation"></li>
                 <li role="presentation">
                   <a href="javascript:void(0)" role="menuitem" data-extcoin-menu="ZEC" id="btn_zec_wallet_settings" data-lang="INDEX.SETTINGS"></a>