From b543494fe53766cfa51419ced2659c472556598e Mon Sep 17 00:00:00 2001
From: satindergrewal <grewal@lavabit.com>
Date: Sun, 31 Dec 2017 04:10:33 +1300
Subject: [PATCH] [bugfix] logout and login back was breaking BarterDEX
 functioning properly

---
 gui/index.html        | 2 +-
 gui/js/ipc-actions.js | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gui/index.html b/gui/index.html
index d95a664..97ac35b 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -472,7 +472,7 @@
                         <div class="input-group col-sm-12 buy_sell_button_div">
                           <!--<span class="input-group-addon coin_ticker" id="trading_pair_coin_ticker" style="font-size: 20px;"></span>-->
                           <select class="selectpicker trading_pair_coin2" data-live-search="true" data-hide-disabled="true" data-width="30%"></select>
-                          <input type="number" class="form-control trading_pair_coin_volume" data-langstr="exchange_trading_pair_coin_volume_input_placeholder" placeholder="Amount e.g. 12.5" style="height: 44px; font-size: 20px;">
+                          <input type="number" class="form-control trading_pair_coin_volume" data-langstr="exchange_trading_pair_coin_volume_input_placeholder" placeholder="" style="height: 44px; font-size: 20px;">
                           <span class="input-group-btn">
                             <button class="btn btn-primary btn-bot_action language" data-action="buy" style="height: 44px; font-size: 20px;" data-langstr="exchange_btn_buy_caps"></button>
                           </span>
diff --git a/gui/js/ipc-actions.js b/gui/js/ipc-actions.js
index 60bca22..1d05fd4 100644
--- a/gui/js/ipc-actions.js
+++ b/gui/js/ipc-actions.js
@@ -602,7 +602,14 @@ CheckDefaultLogin = function(sig) {
 LoginWithPassphrase = function(login_passphrase,action_mode) {
 	console.log('Login using passphrase from Login form input');
 
-	var userpass = '1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f';
+
+	var userpass = '';
+	if (sessionStorage.getItem('mm_loginstate') == 'loggedin') {
+		var userpass = sessionStorage.getItem('mm_userpass');
+	} else {
+		var userpass = '1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f';
+	}
+	
 	var ajax_data = {"userpass":userpass,"method":"passphrase","passphrase":login_passphrase,"gui":"simplegui"};
 	//console.log(ajax_data)
 	var url = "http://127.0.0.1:7783";