Merge branch 'dev'

KomodoPlatform · Oct 1, 2018 · 3a8a6fc · 3a8a6fc
2 parents ba7b145 + 1dca30a
commit 3a8a6fc
Show file tree

Hide file tree

Showing 11 changed files with 604 additions and 541 deletions.
diff --git a/assets/bin/linux64/marketmaker b/assets/bin/linux64/marketmaker
diff --git a/assets/bin/osx/marketmaker b/assets/bin/osx/marketmaker
diff --git a/assets/bin/win64/libcurl.dll b/assets/bin/win64/libcurl.dll
diff --git a/assets/bin/win64/marketmaker.exe b/assets/bin/win64/marketmaker.exe
diff --git a/assets/bin/win64/nanomsg.dll b/assets/bin/win64/nanomsg.dll
diff --git a/assets/languages/en_US.json b/assets/languages/en_US.json
@@ -139,7 +139,7 @@
     "inventory_td_address": "Address",
     "inventory_td_amount": "Amount",
     "inventory_td_confirmations": "Confirmations",
-    "inventory_td_interest": "Interest",
+    "inventory_td_interest": "Rewards",
     "inventory_td_scriptpubkey": "scriptPubKey",
     "inventory_td_txid": "TxID"
   },
@@ -383,7 +383,7 @@
     "zeroconf_deposit_security_deposit_sent": "InstantDEX security deposit sent",
     "zeroconf_claim_deposit_claim": "InstantDEX Deposit Claim",
     "zeroconf_claim_list_of_claimable": "List of Claimable Deposits",
-    "zeroconf_claim_td_interest": "Interest",
+    "zeroconf_claim_td_interest": "Rewards",
     "zeroconf_claim_td_wait_time": "Wait Time",
     "zeroconf_info_dialog_title": "What is \"Speed Mode\"?",
     "zeroconf_info_dialog_p_01": "Use of this feature requires a security deposit, equal to or greater than the amount you wish to actively trade. This deposit is placed in a special multisig address for safe keeping. The following conditions apply",
@@ -392,7 +392,7 @@
     "zeroconf_info_dialog_li_03": "The expiration date is permanently set and recorded within your blockchain transaction at the time of sending the deposit.",
     "zeroconf_info_dialog_li_04": "Choose your time period appropriately, as you can only reclaim your deposit after the expiration date.",
     "zeroconf_info_dialog_li_05": "Your KMD security deposit will continue to accrue the 5% APR throughout the time period, as usual.",
-    "zeroconf_info_dialog_li_06": "Upon conclusion, you will receive your deposit and interest, less a security fee of 0.1%.",
+    "zeroconf_info_dialog_li_06": "Upon conclusion, you will receive your deposit and reward, less a security fee of 0.1%.",
     "zeroconf_info_dialog_p_02": "IMPORTANT: If you attempt to cheat while using Speed Mode, both the amount of your offense and an additional penalty fee can be deducted from your deposit and forfeited to the affected parties. The remaining amount in your deposit will be claimable at the normal time of expiration."
   },
   "Settings": {

diff --git a/gui/index.html b/gui/index.html
@@ -745,12 +745,12 @@ <h3 class="panel-title">
                                                             <div class="row">
                                                                 <div class="col-sm-6">
                                                                     <label class="checkbox-inline">
-                                                                        <input class="toggle_checkbox toggle_font_lg" id="buy_sell_fill_option" type="checkbox" data-size="small" data-width="100%" checked data-toggle="toggle"> Fill
+                                                                        <input class="toggle_checkbox toggle_font_lg" id="buy_sell_fill_option" type="checkbox" data-size="small" data-width="100%" data-toggle="toggle"> Fill Order
                                                                     </label>
                                                                 </div>
                                                                 <div class="col-sm-6">
                                                                     <label class="checkbox-inline">
-                                                                        <input class="toggle_checkbox toggle_font_lg" id="buy_sell_gtc_option" type="checkbox" data-size="small" checked data-toggle="toggle"> Good Till Cancel
+                                                                        <input class="toggle_checkbox toggle_font_lg" id="buy_sell_gtc_option" type="checkbox" data-size="small" data-toggle="toggle"> Good Till Cancel
                                                                     </label>
                                                                 </div>
                                                                 <div class="col-sm-12">

diff --git a/gui/js/dex_ManipulateHTML.js b/gui/js/dex_ManipulateHTML.js
@@ -598,8 +598,8 @@ $('.porfolio_coins_list tbody').on('click', '.btn-portfoliogo', function() {
 	bot_screen_sellcoin_balance_Interval = setInterval(bot_screen_sellcoin_balance, 30000);
 	bot_screen_sellcoin_balance();
 
-	$('#buy_sell_fill_option').bootstrapToggle('on');
-	$('#buy_sell_gtc_option').bootstrapToggle('on');
+	$('#buy_sell_fill_option').bootstrapToggle('off');
+	$('#buy_sell_gtc_option').bootstrapToggle('off');
 	Check_fill_gtc_state();
 
 	//getZeroConfDepositHistory();

diff --git a/gui/js/dex_SimpleActions.js b/gui/js/dex_SimpleActions.js
@@ -803,8 +803,8 @@ function enable_disable_coin(enable_disable_coin_data) {
 		//var rand_electrum_srv = get_random_electrum_server(data.coin);
 
 		if (CoinsDB_GetCoinDetails(enable_disable_coin_data.coin).electrum == undefined || CoinsDB_GetCoinDetails(enable_disable_coin_data.coin).electrum == "") {
-			console.log('no electrum servers found for: ' + enable_disable_coin_data.coin);
-			toastr.warning('No Electrum Servers found for ' + enable_disable_coin_data.coin + '<br> Please use Native Mode for ' + enable_disable_coin_data.coin, 'Coin Status');
+			console.log(`no electrum servers found for: ${CoinsDB_GetCoinDetails(enable_disable_coin_data.coin).fname} (${enable_disable_coin_data.coin})`);
+			toastr.warning(`No Electrum Servers found for<br> ${CoinsDB_GetCoinDetails(enable_disable_coin_data.coin).fname} (${enable_disable_coin_data.coin})<br> Please use Native Mode for <br> ${CoinsDB_GetCoinDetails(enable_disable_coin_data.coin).fname} (${enable_disable_coin_data.coin})`, 'Coin Status');
 		}
 
 		$.each(CoinsDB_GetCoinDetails(enable_disable_coin_data.coin).electrum, function (index, val) {
@@ -860,7 +860,8 @@ function enable_disable_coin(enable_disable_coin_data) {
 				if (!enable_electrum_coin_output_data.error === false) {
 					//console.log(data.error);
 					var default_lang = JSON.parse(sessionStorage.getItem('mm_default_lang'));
-					toastr.info(enable_electrum_coin_output_data.error, default_lang.CoinControl.coincontrol_toastr_title_coin_status);
+					console.log(`${CoinsDB_GetCoinDetails(enable_disable_coin_data.coin).fname} (${enable_disable_coin_data.coin})<br>${enable_electrum_coin_output_data.error}`);
+					toastr.info(`${CoinsDB_GetCoinDetails(enable_disable_coin_data.coin).fname} (${enable_disable_coin_data.coin})<br>${enable_electrum_coin_output_data.error}`, default_lang.CoinControl.coincontrol_toastr_title_coin_status);
 					if (enable_electrum_coin_output_data.error == 'couldnt find coin locally installed') { //{error: "couldnt find coin locally installed", coin: "BTC"}
 						var default_lang = JSON.parse(sessionStorage.getItem('mm_default_lang'));
 						bootbox.alert({