prevent deriving new btc address for lightning request

Author: bitrequest

assets_js_bitrequest_bip39.js

@@ -86,9 +86,6 @@ $(document).ready(function() {
     //finish_seed
     //seed_callback
     //deactivate_xpubs
-
-    // Test triggers
-    //derive_addone_trigger();
     //derive_addone
     //get_latest_index
     //key_cc
@@ -1091,13 +1088,6 @@ function get_latest_index(alist) {
     return Math.max.apply(Math, index);
 }
 
-// Sets up event listener for adding a new address
-function derive_addone_trigger() {
-    $(document).on("click", ".addonexx", function() {
-        derive_addone($(this).attr("data-currency"), true);
-    })
-}
-
 // Derives and adds a new address for a given currency
 function derive_addone(currency, extra) {
     const dd = derive_data(currency, extra);
@@ -1282,7 +1272,15 @@ function derive_obj(source, keycc, coindat, bip32, add) {
 
 // Checks if there's a pending request for the given address data
 function ch_pending(dat) {
-    return $("#requestlist li[data-address='" + dat.address + "'][data-pending='scanning'][data-cmcid='" + dat.cmcid + "']").length > 0;
+    const rqli = $("#requestlist li.rqli[data-address='" + dat.address + "'][data-pending='scanning'][data-cmcid='" + dat.cmcid + "']");
+    if (rqli.length) {
+        const ln_dat = rqli.data("lightning");
+        if (ln_dat && ln_dat.hybrid === false) {
+            return false;
+        }
+        return true;
+    }
+    return false;
 }
 
 // Counts the number of unique elements in an array

assets_js_bitrequest_payments.js

@@ -2369,7 +2369,7 @@ function sharebutton() {
     $(document).on("click", "#sharebutton", function() {
         const thisbttn = $(this);
         if (request.payment === "bitcoin" && helper.lnd_status) {
-            const lnd_only = glob_paymentdialogbox.attr("data-lswitch") === "lnd_ao" ? $("#fallback_address").is(":visible") ? !$("#fallback_address .switchpanel").hasClass("true") : true : false;
+            const lnd_only = is_ln_only();
             validaterequestdata(lnd_only);
             setTimeout(function() { // wait for url to change
                 share(thisbttn);
@@ -2841,7 +2841,8 @@ function saverequest(direct) {
         requesttimestamp = thispaymenttimestamp || (dataobject && dataobject.ts) || (thisrequesttype === "incoming" ? null : timestamp), // null is unknown timestamp
         unhashed = thispayment + thiscurrency + amount_string + thisaddress + request.requestname + request.requesttitle + sc_string + ln_id,
         savedtxhash = request.txhash,
-        requestid = thisrequesttype === "local" && savedtxhash ? hashcode(savedtxhash) : hashcode(unhashed),
+        is_local = thisrequesttype === "local",
+        requestid = is_local && savedtxhash ? hashcode(savedtxhash) : hashcode(unhashed),
         requestcache = br_get_local("requests", true),
         requestid_param = gets.requestid,
         checkout = direct !== "init" && thisrequesttype === "checkout",
@@ -2960,13 +2961,13 @@ function saverequest(direct) {
             if (coinsettings) {
                 const reuse = coinsettings["Reuse address"];
                 if (reuse) {
-                    const addressli = filter_addressli(thispayment, "address", thisaddress);
-                    addressli.addClass("used").data("used", true);
                     if (reuse.selected === false) {
                         // Derive new address
-                        if (hybrid === false) {
+                        if (hybrid === false || is_ln_only()) {
                             // Do nothing
                         } else {
+                            const addressli = filter_addressli(thispayment, "address", thisaddress);
+                            addressli.addClass("used").data("used", true);
                             saveaddresses(thispayment, false);
                             derive_addone(thispayment);
                         }

assets_js_br_query.js

@@ -23,6 +23,7 @@
 //tofixedspecial
 //get_search
 //renderlnconnect
+//is_ln_only
 //cleanb64
 //b64urldecode
 //geturlparameters
@@ -334,6 +335,11 @@ function renderlnconnect(str) {
     return search;
 }
 
+// Checks if request is hybrid or lightning only
+function is_ln_only() {
+    return glob_paymentdialogbox.attr("data-lswitch") === "lnd_ao" ? $("#fallback_address").is(":visible") ? !$("#fallback_address .switchpanel").hasClass("true") : true : false;
+}
+
 // Cleans base64 encoded string for URL use
 function cleanb64(str) {
     return str.replace(/\+/g, "-").replace(/\//g, "_");