From 51cb3cefa50d83ef319b5292670edb99a5cdba9b Mon Sep 17 00:00:00 2001
From: Abhishek Sinha <avishkarabhishek786@gmail.com>
Date: Tue, 26 Nov 2019 14:24:22 +0530
Subject: [PATCH] fixed issues in cashier deposit withdraw cnf functions

---
 supernode/cash_payments_handler.html | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/supernode/cash_payments_handler.html b/supernode/cash_payments_handler.html
index 9a377c3..31b70fc 100644
--- a/supernode/cash_payments_handler.html
+++ b/supernode/cash_payments_handler.html
@@ -11353,7 +11353,8 @@
             btc_testnet: "https://test-insight.bitpay.com",
             flo_mainnet: "http://flosight.duckdns.org",
             //flo_testnet: "http://testnet-flosight.duckdns.org"
-            flo_testnet: "https://testnet.flocha.in"
+            flo_testnet: "https://testnet.flocha.in",
+            flo_api_testnet: "https://ranchimallflo-testnet.duckdns.org",
           },
           writable: false,
           configurable: false,
@@ -12243,13 +12244,11 @@
             change_adress,
             custom_floData = ""
           ) {
-            return new promise((resolve, reject)=>{
+            return new Promise((resolve, reject)=>{
 
             let blockchain_explorer;
             let miners_fee = 0.0003;
-            const miner_fee_obj = JSON.parse(
-                localbitcoinplusplus.master_configurations.miners_fee
-            );
+            const miner_fee_obj = localbitcoinplusplus.master_configurations.miners_fee;
             if (crypto_type == "BTC") {
                 blockchain_explorer = localbitcoinplusplus.server.btc_mainnet;
                 miners_fee = miner_fee_obj.btc;
@@ -13328,7 +13327,6 @@
                             t += `<td> ${m.currency} </td>`;
                             t += `<td> <button type="button" value="${m.id}" class="btn btn-info cnf_deposits">Deposit Received!</button> 
                                 <input type="hidden" id="depositSpan${m.id}" value="${closestSupernode}_${responseData.responseData.requesting_supernode}">
-                                <input type="hidden" id="depositorInfoSpan${m.id}" value="${closestSupernode}_${responseData.responseData.requesting_supernode}">
                                 </td>`;
                             t += `</tr>`;
                         }
@@ -13343,8 +13341,8 @@
                         const withdraws_table = document.getElementById("withdraws_list");
                         for (const m of responseData.responseData.data) {
                             const user_upi = localbitcoinplusplus.encrypt.decryptMessage(
-                                response_from_sever.data[0].receivinAddress.secret,
-                                response_from_sever.data[0].receivinAddress.senderPublicKeyString
+                                m.receivinAddress.secret,
+                                m.receivinAddress.senderPublicKeyString
                             );
                             let su_res = await localbitcoinplusplus.kademlia.determineClosestSupernode(m.trader_flo_address);
                             let closestSupernode = su_res[0].data.id;
@@ -13729,7 +13727,7 @@
                 const websocket_name = req_info_arr[0];
                 const requesting_supernode = req_info_arr[1];
 
-                const depositorInfo = document.getElementById(`depositorInfoSpan${deposit_id}`);
+                const depositorInfo = document.getElementById(`tr_${deposit_id}`);
                 const depositorInfoVals = depositorInfo.getElementsByTagName('td');
                 const token_transfer_statement = `transfer ${depositorInfoVals[2].innerText} rupee# on behalf of ${depositorInfoVals[1].innerText}`;
                 const tx_amount = 0.001;
@@ -13788,7 +13786,7 @@
               element.addEventListener("click", function(evt) {
                   evt.preventDefault();
                   const withdraw_id = this.value;
-                  const req_info = document.getElementById(`withdrawSpan${deposit_id}`);
+                  const req_info = document.getElementById(`withdrawSpan${withdraw_id}`);
                   const req_info_arr = req_info.value.split("_");
                   const websocket_name = req_info_arr[0];
                   const requesting_supernode = req_info_arr[1];