misc improvements

Author: bitrequest

assets_js_bitrequest_polling.js

@@ -33,8 +33,9 @@ function route_transaction_monitor(tx_data, api_dat, retry) {
             if (request) {
                 const tx_hash = tx_data.txhash;
                 if (tx_hash) {
-                    if (!tx_data.setconfirmations) {
-                        validate_confirmations(tx_data, true);
+                    const zero_conf = (tx_data.setconfirmations) ? false : true,
+                        status = validate_confirmations(tx_data, zero_conf);
+                    if (status === "paid") {
                         return
                     }
                     const is_layer2 = tx_data.eth_layer2;
@@ -330,8 +331,7 @@ function validate_confirmations(tx_data, direct, ln) {
                 is_instant = required_confirms === false || tx_data.instant_lock; // Dashpay instant_lock
 
             status_panel.find("span#confnumber").text(confirm_text);
-            new_status = tx_confirms;
-            if (tx_confirms > current_confirms || is_instant === true || direct === true) {
+            if (tx_confirms >= current_confirms || is_instant === true || direct === true) {
                 clear_recent_requests();
                 br_remove_session("txstatus"); // remove cached historical exchange rates
                 confirm_box.removeClass("blob");
@@ -376,7 +376,6 @@ function validate_confirmations(tx_data, direct, ln) {
 
                 const exact_match = helper.exact,
                     is_valid = crypto_symbol === "xmr" ? (received_formatted > (crypto_amount * 0.97) && received_formatted < (crypto_amount * 1.03)) : true; // error margin for xmr integrated addresses
-
                 if (is_valid) {
                     const amount_valid = exact_match ? received_formatted === crypto_amount : received_formatted >= (crypto_amount * 0.97);
                     if (amount_valid) {