diff --git a/supernode/index.html b/supernode/index.html
index 4b60da4..52058de 100644
--- a/supernode/index.html
+++ b/supernode/index.html
@@ -10406,7 +10406,8 @@
                             if (localbitcoinplusplus.wallets.my_local_flo_address==wd.trader_flo_address) {
                                 action_req += `<p>Please click the button below only if you received the cash.</p>`;
                                 action_req += `<button onclick="localbitcoinplusplus.actions.claim_deposit_withdraw('${claim_id}')">I received the money.</button>`;
-                            } else if(localbitcoinplusplus.wallets.my_local_flo_address==wd.depositor_flo_id) {
+                            } else if(localbitcoinplusplus.wallets.my_local_flo_address==wd.depositor_flo_id
+                                   && wdf.status!==3) {
                                 action_req += `<p>Please click the button below only if you actually deposited the money. 
                                                     Any fake claim can cause a heavy penalty.</p>`;
                                 action_req += `<button onclick="localbitcoinplusplus.actions.claim_deposit_withdraw('${claim_id}')" >I deposited the money.</button>`;
@@ -16203,8 +16204,8 @@
                                         readDB("localbitcoinUser", "00-01").then(function (user) {
                                             if (typeof user == "object" && user.myLocalFLOAddress == resp.data.trader_flo_address) {
                                                 let counterTraderAccountAddress =
-                                                    `<p><strong>Please pay the amount to following address:</strong></p>
-                                                    <p>${resp.msg}</p>`;
+                                                    `Please pay the amount to following address: 
+                                                    ${resp.msg}`;
                                                     showMessage(counterTraderAccountAddress);
                                                     modalWindow(counterTraderAccountAddress);
                                             }
@@ -16606,7 +16607,8 @@
                                 if (typeof res_obj.params == "object" && typeof res_obj.params[0] == "object") {
                                     let withdraw_success_response = res_obj.params[0];
                                     let update_cash_balance_obj_res = {
-                                        depositor_cash_data: withdraw_success_response.depositor_cash_data
+                                        depositor_cash_data: withdraw_success_response.depositor_cash_data,
+                                        withdrawer_cash_data: withdraw_success_response.withdrawer_cash_data
                                     }
                                     let update_cash_balance_obj_res_str = JSON.stringify(update_cash_balance_obj_res);
                                     let update_cash_balance_obj_res_hash = Crypto.SHA256(
@@ -18023,7 +18025,8 @@
                                     if(res_obj.params[0].trader_flo_address !== localbitcoinplusplus.wallets.my_local_flo_address) return;
 
                                     let update_cash_balance_obj_res = {
-                                        depositor_cash_data: withdraw_success_response.depositor_cash_data
+                                        depositor_cash_data: withdraw_success_response.depositor_cash_data,
+                                        withdrawer_cash_data: withdraw_success_response.withdrawer_cash_data
                                     }
                                     let update_cash_balance_obj_res_str = JSON.stringify(update_cash_balance_obj_res);
                                     let update_cash_balance_obj_res_hash = Crypto.SHA256(
@@ -19166,7 +19169,8 @@
                                         if (typeof res_obj.params == "object" && typeof res_obj.params[0] == "object") {
                                         let withdraw_success_response = res_obj.params[0];
                                         let update_cash_balance_obj_res = {
-                                            depositor_cash_data: withdraw_success_response.depositor_cash_data
+                                            depositor_cash_data: withdraw_success_response.depositor_cash_data,
+                                            withdrawer_cash_data: withdraw_success_response.withdrawer_cash_data
                                         }
                                         let update_cash_balance_obj_res_str = JSON.stringify(update_cash_balance_obj_res);
                                         let update_cash_balance_obj_res_hash = Crypto.SHA256(
@@ -21625,8 +21629,8 @@
                     throw new Error(err_msg);
                 }
                 if (localbitcoinplusplus.master_configurations.tradableAsset2.includes(asset_type)) {
-                    if (typeof localbitcoinplusplus.master_configurations.validTradingAmount !== 'undefined' &&
-                    localbitcoinplusplus.master_configurations.validTradingAmount.includes(tradeAmount)) {
+                    if (typeof localbitcoinplusplus.master_configurations.validTradingAmount !== 'undefined' 
+                    && !localbitcoinplusplus.master_configurations.validTradingAmount.includes(tradeAmount)) {
                         err_msg = "Invalid Fiat Value.";
                         showMessage(err_msg);
                         throw new Error(err_msg);