xmr vk

Author: bitrequest

assets_js_bitrequest_core.js

@@ -3278,10 +3278,11 @@ function show_vk() {
 
 // Callback function for showing view key
 function show_vk_cb(kd) {
-    const stat = kd.stat,
-        ststr = (stat) ? "" : "<br/><strong style='color:#8d8d8d'>" + translate("secretviewkey") + "</strong> <span class='adbox adboxl select' data-type='Viewkey'>" + kd.svk + "</span><br/>";
+    const svk_string = kd.svk ? "<br/><strong style='color:#8d8d8d'>" + translate("secretviewkey") + "</strong> <span class='adbox adboxl select' data-type='Viewkey'>" + kd.svk + "</span><br/>" : "",
+        ssk_string = kd.ssk ? "<br/><strong style='color:#8d8d8d'>" + translate("secretspendkey") + "</strong> <span class='adbox adboxl select' data-type='Spendkey'>" + kd.ssk + "</span>" : ""
+        
     $("#show_vk").text(translate("hide"));
-    $("#pk_span").html(ststr + "<br/><strong style='color:#8d8d8d'>" + translate("secretspendkey") + "</strong> <span class='adbox adboxl select' data-type='Spendkey'>" + kd.ssk + "</span>").addClass("shwpk").slideDown(200);
+    $("#pk_span").html(svk_string + ssk_string).addClass("shwpk").slideDown(200);
 }
 
 // Opens a block explorer URL

assets_js_bitrequest_payments.js

@@ -1963,7 +1963,7 @@ function switchaddress() {
             const newaddress = nextaddress.data("address"),
                 selected_socket = helper.selected_socket;
             closesocket(currentaddress);
-            init_socket(selected_socket, newaddress, true);
+            init_socket(selected_socket, newaddress);
             const dp = gets.d,
                 has_dat = dp && dp.length > 5,
                 new_dp = has_dat ? "&d=" + dp : "",
@@ -2285,7 +2285,7 @@ function pickaddressfromdialog() {
                 amount = gets.amount,
                 currentaddress = gets.address;
             closesocket(currentaddress);
-            init_socket(helper.selected_socket, picked_address, true);
+            init_socket(helper.selected_socket, picked_address);
             const dp = gets.d,
                 has_dat = dp && dp.length > 5,
                 new_dp = has_dat ? "&d=" + dp : "",

assets_js_bitrequest_sockets.js

@@ -29,7 +29,7 @@ $(document).ready(function() {
 // Websockets / Pollfunctions
 
 // Initializes a socket connection based on the payment type and node configuration
-function init_socket(socket_node, address, swtch, retry) {
+function init_socket(socket_node, address, retry) {
     if (glob_let.offline) {
         notify(translate("youareoffline") + ". " + translate("notmonitored"));
         return
@@ -149,15 +149,13 @@ function init_socket(socket_node, address, swtch, retry) {
         return
     }
     if (payment === "monero") {
-        const vk = swtch ? get_vk(address) : request.viewkey;
+        const vk = request.viewkey || get_vk(address);
         if (vk) {
             trigger_requeststates(); // update outgoing
             const account = vk.account || address,
                 viewkey = vk.vk;
             request.monitored = true;
-            if (swtch) {
-                request.viewkey = vk;
-            }
+            request.viewkey = vk;
             closenotify();
             init_xmr_node(9, account, viewkey, request_ts);
             return