calculate amounts

bitrequest · bitrequest · commit ee51214ac4ed · 2025-04-17T21:13:48.000+02:00
diff --git a/assets_js_bitrequest_core.js b/assets_js_bitrequest_core.js
@@ -5283,6 +5283,7 @@ function append_request(rd) {
                 </div>\
                 <p class='rq_date' title='" + date_full + "'>" + time_display + "</p><br/>\
                 <div class='pmetastatus' data-count='0'>+ 0</div>\
+                <div class='tx_loader'>" + loading_dots("scanning transactions") + "</div>\
                 <div data-rel='" + payment_url + "' class='payrequest button" + crypto_class + "'>\
                     <span class='icon-qrcode'>" + tl("pay") + "</span>\
                 </div>\
diff --git a/assets_js_bitrequest_fetchblocks.js b/assets_js_bitrequest_fetchblocks.js
diff --git a/assets_js_bitrequest_monitors.js b/assets_js_bitrequest_monitors.js
@@ -182,9 +182,9 @@ function process_transaction_data(rd, dl) {
             br_set_session("monitor_timer", now());
         }
         const api_info = check_api(rd.payment),
-            api_data = api_info.data;
-        rdo.thislist.removeClass("pmstatloaded");
-        update_transaction_count(rdo.statuspanel, "reset");
+            api_data = api_info.data,
+            current_list = rdo.thislist
+        current_list.addClass("loading").removeClass("pmstatloaded");
         route_network_request(rd, api_data, rdo);
         return
     }
@@ -206,7 +206,7 @@ function finalize_request_state(rdo) {
     // src === "requests"
     const current_list = rdo.thislist;
     if (current_list && current_list.hasClass("scan")) {
-        current_list.removeClass("scan open").addClass("pmstatloaded");
+        current_list.removeClass("scan open loading").addClass("pmstatloaded");
         const request_id = rdo.requestid,
             transaction_list = rdo.transactionlist,
             transaction_items = transaction_list.children("li");
@@ -348,15 +348,12 @@ function route_blockchain_rpc(rd, api_data, rdo) {
 }
 
 // Processes transaction scan results and handles Ethereum L2, confirmations, and UI updates based on match type
-function process_scan_results(rd, api_data, rdo, counter, tx_details, l2) {
+function process_scan_results(rd, api_data, rdo, tx_details, l2) {
     glob_let.apikey_fails = false;
     const src = rdo.source,
         pending = rdo.pending
     tx_hash = tx_details.txhash || rd.txhash;
     if (src === "requests") {
-        if (counter) {
-            update_transaction_count(rdo.statuspanel, counter);
-        }
         const current_list = rdo.thislist;
         if (current_list) {
             current_list.removeClass("no_network");
@@ -722,7 +719,7 @@ function create_transaction_item(tx_details, request_type) {
         unconfirmed_text = tl("unconfirmedtx"),
         checked_span = "<span class='icon-checkmark' title='" + confirmation_title + "'></span>",
         confirmation_span = is_confirmed ? checked_span : confirmations ? "<div class='txli_conf' title='" + confirmation_title + "'><div class='confbar'></div><span>" + confirmation_title + "</span></div>" :
-        "<div class='txli_conf' title='" + unconfirmed_text + "'><div class='confbar'></div><span>" + unconfirmed_text + "</span></div>",
+        "<div class='txli_conf unconfirmed' title='" + unconfirmed_text + "'><div class='confbar'></div><span>" + unconfirmed_text + "</span></div>",
         tx_list_item = $("<li><div class='txli_content'>" + formatted_date + confirmation_span + "<div class='txli_conf txl_canceled'><span class='icon-blocked'></span>" + tl("canceled") + "</div><span class='tx_val'> + " + value_string + " <span class='icon-eye show_tx' title='view on blockexplorer'></span></span></div></li>");
     if (glob_let.tx_list.includes(tx_hash)) { // check for indexed transaction id's
         return request_type === "outgoing" ? null : tx_list_item;
@@ -787,11 +784,12 @@ function validate_payment_amounts(rd, rdo) {
                 no_conf = rd.no_conf || first_confirmations === false,
                 conf = no_conf ? 0 : first_confirmations,
                 latest_transaction_time = first_transaction.data("transactiontime"),
-                time_offset = Math.abs(now() - (first_transaction_time - glob_const.timezone)),
-                single_transaction = transaction_count === 1,
-                is_recent = time_offset < 300000 && single_transaction,
+                timezone = glob_const.timezone,
+                first_time_offset = parseInt(now() - (first_transaction_time - timezone)),
+                last_time_offset = parseInt(now() - (latest_transaction_time - timezone)),
+                is_recent = (first_time_offset < 300000 && last_time_offset < 300000),
                 crypto_amount = parseFloat(rd.cc_amount),
-                amount_margin = 0.95;
+                amount_margin = 0.97;
             let recent_data = false,
                 transaction_counter = 0,
                 crypto_status = "pending",
@@ -813,16 +811,19 @@ function validate_payment_amounts(rd, rdo) {
                         crypto_payment_timestamp = transaction_data.transactiontime,
                         crypto_transaction_hash = transaction_data.txhash,
                         total_crypto_amount += parseFloat(transaction_data.ccval) || 0; // sum of outputs
-                    if (crypto_confirmations >= correction_confirmations || no_conf || transaction_data.setconfirmations === false) { // check all confirmations + whitelist for currencies unable to fetch confirmations
-                        is_crypto_confirmed = true;
-                        if (total_crypto_amount >= crypto_amount * amount_margin) { // compensation for small fluctuations in rounding amount
-                            current_transaction.addClass("exceed").nextAll().addClass("exceed");
-                            return false;
+                    if (total_crypto_amount >= crypto_amount * amount_margin) { // compensation for small fluctuations in rounding amount
+                        current_transaction.prevAll().remove();
+                        if (crypto_confirmations >= correction_confirmations || no_conf || transaction_data.setconfirmations === false) { // check all confirmations + whitelist for currencies unable to fetch confirmations
+                            is_crypto_confirmed = true;
+                        } else {
+                            is_crypto_confirmed = false;
                         }
-                    } else {
-                        is_crypto_confirmed = false;
+                        return false;
                     }
                 });
+                if (transaction_counter) {
+                    update_transaction_count(rdo.statuspanel, transaction_counter);
+                }
                 const conf_bar = transaction_items.find(".confbar");
                 if (conf_bar.length) {
                     conf_bar.each(function(i) {
@@ -832,7 +833,7 @@ function validate_payment_amounts(rd, rdo) {
                 if (total_crypto_amount >= crypto_amount * amount_margin) { // compensation for small fluctuations in rounding amount
                     if (is_crypto_confirmed === false) { // check confirmations outside the loop
                         crypto_status = "pending",
-                            crypto_pending = single_transaction && crypto_transaction_hash ? "polling" : pending_status; // switch to tx polling if there's only one transaction and txhash is known
+                            crypto_pending = transaction_count === 1 && crypto_transaction_hash ? "polling" : pending_status; // switch to tx polling if there's only one transaction and txhash is known
                     } else {
                         crypto_status = "paid",
                             crypto_pending = "no";
@@ -851,7 +852,7 @@ function validate_payment_amounts(rd, rdo) {
                         local_exchange_rate = fiat_exchange_rates ? fiat_exchange_rates[rd.fiatcurrency] : null,
                         usd_eur_exchange_rate = fiat_exchange_rates ? fiat_exchange_rates.usd : null;
                     if (local_exchange_rate && usd_eur_exchange_rate) {
-                        const usd_rate = crypto_exchange_rates ? crypto_exchange_rates.ccrate : null;
+                        const usd_rate = crypto_exchange_rates.ccrate || null;
                         if (usd_rate) {
                             const usd_value = total_crypto_amount * usd_rate,
                                 eur_value = usd_value / usd_eur_exchange_rate;
@@ -892,11 +893,9 @@ function update_transaction_count(status_panel, count) {
         status_panel.attr("data-count", 0).text("+ " + 0);
         return
     }
-    const current_count = parseInt(status_panel.attr("data-count")),
-        new_count = current_count + count;
-    if (!new_count) return
-    status_panel.attr("data-count", new_count).text("+ " + new_count);
-    if (new_count > 1) {
+    if (!count) return
+    status_panel.attr("data-count", count).text("+ " + count);
+    if (count > 1) {
         status_panel.closest(".rqli").find(".metalist .show_tx").hide();
     }
 }
@@ -935,7 +934,8 @@ function fetch_fiat_rates(rd, rdo, api_list, fiat_api) {
     const fiat_currency = rd.fiatcurrency;
     if (fiat_currency) {
         const currency_symbol = fiat_currency.toUpperCase(),
-            payload = get_historic_fiatprice_api_payload(fiat_api, currency_symbol, rd.latestinput);
+            payload = get_historic_fiatprice_api_payload(fiat_api, currency_symbol, rd.latestinput),
+            current_list = rdo.thislist;
         api_proxy({
             "api": fiat_api,
             "search": payload,
@@ -1076,16 +1076,14 @@ function fetch_crypto_rates(rd, rdo, fiat_api, api_list, api, currency_rate, usd
             api_result;
         if (data && !data.error) {
             const request_list = rdo.thislist,
-                tx_list = request_list.find(".transactionlist li"),
-                tx_list_length = tx_list.length,
-                tx_reverse = tx_list_length > 1 ? tx_list.get().reverse() : tx_list,
+                transaction_items = request_list.find(".transactionlist li"),
+                transaction_reverse = transaction_items.length > 1 ? transaction_items.get().reverse() : transaction_items,
                 latest_confirm = rd.latestconf,
                 total_amount = rd.amount,
-                set_confirmations = rd.set_confirmations || 1; // Default to 1
-            is_erc20 = rd.erc20,
+                set_confirmations = rd.set_confirmations || 1, // Default to 1
                 historic_usd_value = (total_amount / currency_rate) * usd_rate,
-                margin = historic_usd_value < 2 ? 0.60 : 0.95; // be flexible with small amounts
-            let tx_counter = 0,
+                margin = historic_usd_value < 2 ? 0.60 : 0.97; // be flexible with small amounts
+            let transaction_counter = 0,
                 confirmations = 0,
                 paymenttimestamp,
                 txhash,
@@ -1094,12 +1092,13 @@ function fetch_crypto_rates(rd, rdo, fiat_api, api_list, api, currency_rate, usd
                 confirmed = false,
                 status = "pending",
                 pending = rd.pending;
-            $(tx_reverse).each(function(i) {
-                tx_counter++;
-                const current_node = $(this),
-                    node_data = current_node.data(),
-                    transaction_timestamp = node_data.transactiontime,
-                    transaction_value = node_data.ccval,
+            $(transaction_reverse).each(function(i) {
+                transaction_counter++;
+                const current_transaction = $(this),
+                    transaction_data = current_transaction.data(),
+                    correction_confirmations = transaction_data.instant_lock ? 0 : set_confirmations; // correction if dash instant_lock
+                transaction_timestamp = transaction_data.transactiontime,
+                    transaction_value = transaction_data.ccval,
                     values = {
                         "fiatapisrc": fiat_api,
                         "apisrc": api,
@@ -1110,24 +1109,27 @@ function fetch_crypto_rates(rd, rdo, fiat_api, api_list, api, currency_rate, usd
                     },
                     historic_object = match_price_timestamps(api, values, data, transaction_timestamp),
                     historic_price = historic_object.price,
-                    conf_correct = node_data.instant_lock ? 0 : set_confirmations; // correction if dash instant_lock
-                current_node.data("historic", historic_object);
-                confirmations = node_data.confirmations, // check confirmations
+                    conf_correct = transaction_data.instant_lock ? 0 : set_confirmations; // correction if dash instant_lock
+                current_transaction.data("historic", historic_object);
+                confirmations = transaction_data.confirmations, // check confirmations
                     paymenttimestamp = transaction_timestamp,
-                    txhash = node_data.txhash,
+                    txhash = transaction_data.txhash,
                     receivedamount += parseFloat(transaction_value) || 0; // sum of outputs CC
-                if ((historic_price && confirmations >= conf_correct) || rd.no_conf === true || node_data.setconfirmations === false) { // check all confirmations + whitelist for currencies unable to fetch confirmations
-                    confirmed = true;
-                } else {
-                    confirmed = false;
-                }
                 let current_usd_sum = received_usd += parseFloat(historic_price * transaction_value) || 0;
                 if (current_usd_sum >= historic_usd_value * margin) { //minus 5% dollar for volatility compensation
-                    current_node.addClass("exceed").nextAll().addClass("exceed");
+                    current_transaction.prevAll().remove();
+                    if ((historic_price && confirmations >= conf_correct) || rd.no_conf === true || transaction_data.setconfirmations === false) { // check all confirmations + whitelist for currencies unable to fetch confirmations
+                        confirmed = true;
+                    } else {
+                        confirmed = false;
+                    }
                     return false;
                 }
             });
-            const conf_bar = tx_list.find(".confbar");
+            if (transaction_counter) {
+                update_transaction_count(rdo.statuspanel, transaction_counter);
+            }
+            const conf_bar = transaction_items.find(".confbar");
             if (conf_bar.length) {
                 conf_bar.each(function(i) {
                     animate_confbar($(this), i);
@@ -1137,7 +1139,7 @@ function fetch_crypto_rates(rd, rdo, fiat_api, api_list, api, currency_rate, usd
                 if (received_usd >= historic_usd_value * margin) { // check total incoming amount // minus 5% dollar for volatility compensation
                     if (confirmed === false) { // check confirmations outside the loop
                         status = "pending",
-                            pending = tx_counter === 1 && txhash ? "polling" : pending; // switch to tx polling if there's only one transaction and txhash is known
+                            pending = transaction_counter === 1 && txhash ? "polling" : pending; // switch to tx polling if there's only one transaction and txhash is known
                     } else {
                         status = "paid",
                             pending = "no";
diff --git a/assets_js_bitrequest_payments.js b/assets_js_bitrequest_payments.js
@@ -3349,15 +3349,14 @@ function update_request(update_args, should_save) {
                     request_element.addClass("shownotification");
                 }
                 const transaction_list = request_element.find(".transactionlist"),
-                    valid_transactions = current_status === "archive_pending" ? transaction_list.find("li") : transaction_list.find("li.exceed"); // save all when archiving
+                    valid_transactions = transaction_list.find("li");
                 if (valid_transactions.length > 0) {
                     const transaction_data = [];
                     valid_transactions.each(function() {
                         transaction_data.push($(this).data());
                     });
                     update_args.txhistory = transaction_data;
                 }
-                transaction_list.find("li").not(valid_transactions).slideUp(300);
                 setTimeout(function() {
                     request_element.removeClass("shownotification");
                 }, 3000);
diff --git a/assets_js_lib_global_queries.js b/assets_js_lib_global_queries.js
@@ -366,6 +366,9 @@ let request = null,
 //sanitize_url
 //is_valid_url_or_ip
 
+// ** Animations: **
+// loading_dots();
+
 // ** Core Storage Functions: **
 
 // Tests browser's localStorage API availability through write and remove operations
@@ -1619,4 +1622,11 @@ function is_valid_url_or_ip(input) {
         is_valid_ipv6(clean_url) ||
         is_valid_localhost(clean_url) ||
         is_valid_onion(clean_url);
+}
+
+// ** Animations: **
+
+// loading_dots;
+function loading_dots(text) {
+    return "<div class='loading-container'>	<div class='loading-text'>" + text + "</div><div class='loading-dots'><div class='dot'></div><div class='dot'></div><div class='dot'></div></div></div>";
 }
diff --git a/assets_styles_payments.css b/assets_styles_payments.css
@@ -283,6 +283,58 @@ html.inframe #paymentdialogbox #view_tx,
 	padding: 0 0 0 0.5em;
 }
 
+.loading-container {
+	display: flex;
+	align-items: center;
+}
+
+.loading-text {
+	margin-right: 0.25em;
+}
+
+.loading-dots {
+	position: relative;
+	padding-top: 0.2em;
+}
+
+.dot {
+	position: absolute;
+	top: 0.25em;
+	transform: translateY(-50%);
+	width: 0.35em;
+	height: 0.35em;
+	border-radius: 50%;
+	background-color: #aaa;
+	opacity: 0;
+}
+
+.dot:nth-child(1) {
+	left: 0;
+	animation: showdot 2s infinite;
+}
+
+.dot:nth-child(2) {
+	left: 0.5em;
+	animation: showdot 2s infinite 0.5s;
+}
+
+.dot:nth-child(3) {
+	left: 1em;
+	animation: showdot 2s infinite 1s;
+}
+
+@keyframes showdot {
+
+	0%,
+	100% {
+		opacity: 0;
+	}
+
+	50% {
+		opacity: 1;
+	}
+}
+
 
 /* structure */
 
diff --git a/assets_styles_styles.css b/assets_styles_styles.css
