historical data

Author: bitrequest

assets_js_bitrequest_core.js

@@ -3589,6 +3589,7 @@ function animate_confbar(confbox, index) {
 // Shows transaction metadata on double click
 function show_transaction_meta() {
     $(document).on("dblclick", ".requestlist li .transactionlist li", function() {
+        if (!glob_supportsTouch) return;
         const thisli = $(this),
             txmeta = thisli.children(".historic_meta");
         if (txmeta.is(":visible")) {
@@ -4365,7 +4366,7 @@ function appendrequest(rd) {
         amount_rounded = trimdecimals(amount, Math.min(deter, 8)),
         receivedamount_rounded = trimdecimals(receivedamount, 6),
         fiatvalue_rounded = trimdecimals(fiatvalue, 2),
-        requestlist = archive === true ? $("#archivelist") : $("#requestlist"),
+        requestlist = archive ? $("#archivelist") : $("#requestlist"),
         utc = timestamp - glob_timezone,
         localtime = requestdate ? requestdate - glob_timezone : utc,
         incoming = requesttype === "incoming",
@@ -4421,7 +4422,7 @@ function appendrequest(rd) {
         src_html = source ? "<span class='src_txt'>" + translate("source") + ": " + source + "</span><span class='icon-wifi-off'></span><span class='icon-connection'></span>" : "",
         iscryptoclass = iscrypto ? "" : " isfiat",
         archivebutton = showarchive || isexpired ? "<div class='icon-folder-open' title='archive request'></div>" : "",
-        render_archive = txhistory && (pending == "no" || archive === true),
+        render_archive = txhistory && (pending === "no" || archive),
         tl_text = render_archive ? translate("transactions") : "",
         edit_request = local ? "<div class='editrequest icon-pencil' title='edit request' data-requestid='" + requestid + "'></div>" : "",
         pid_li = payment_id ? "<li><strong>" + translate("paymentid") + ":</strong> <span class='select' data-type='payment ID'>" + payment_id + "</span></li>" : "",
@@ -4482,7 +4483,7 @@ function appendrequest(rd) {
             <div class='expired_panel'><h2>" + translate("expired") + "</h2></div>\
         </li>");
     new_requestli.data(rd).prependTo(requestlist);
-    if (render_archive === true) {
+    if (render_archive) {
         const transactionlist = requestlist.find("#" + requestid).find(".transactionlist");
         add_historical_data(transactionlist, txhistory);
     }
@@ -4492,7 +4493,7 @@ function appendrequest(rd) {
 function add_historical_data(transactionlist, txhistory) {
     let tx_listitem = false;
     $.each(txhistory, function(data, value) {
-        tx_listitem = append_tx_li(value, false);
+        tx_listitem = append_tx_li(value);
         if (tx_listitem) {
             const h_string = data_title(value);
             if (h_string) {

assets_js_bitrequest_monitors.js

@@ -424,7 +424,7 @@ function tx_api_scan_fail(rd, api_data, rdo, error_data, all_proxys, l2) {
             tx_api_fail(thislist, rdo.statuspanel);
         }
     }
-    if (src === "addr_polling" && rdo.socket === true) {
+    if (src === "addr_polling" && rdo.socket) {
         handle_socket_fails(api_data, rd.address);
         return
     }
@@ -607,8 +607,7 @@ function get_api_error_data(error) {
 
 // Sets the API source for a given request
 function set_api_src(rdo, api_data) {
-    const src = rdo.source;
-    if (src === "list") {
+    if (rdo.source === "list") {
         api_src(rdo.thislist, api_data);
     }
 }
@@ -846,40 +845,35 @@ function get_next_rpc(this_payment, api_data, requestid) {
 
 // Appends a transaction list item with given transaction data
 function append_tx_li(txd, rqtype) {
-    const txhash = txd.txhash,
+    const txhash = txd.txhash;
+    if (!txhash) return null;
+    const ccval = txd.ccval,
+        ccval_rounded = trimdecimals(ccval, 6),
+        transactiontime = txd.transactiontime,
+        conf = txd.confirmations,
+        setconfirmations = txd.setconfirmations,
+        ccsymbol = txd.ccsymbol,
+        set_ccsymbol = ccsymbol ? ccsymbol.toUpperCase() : "",
         ln = txhash && txhash.slice(0, 9) === "lightning";
-    if (txhash) {
-        const ccval = txd.ccval,
-            ccval_rounded = trimdecimals(ccval, 6),
-            transactiontime = txd.transactiontime,
-            conf = txd.confirmations,
-            setconfirmations = txd.setconfirmations,
-            ccsymbol = txd.ccsymbol,
-            set_ccsymbol = ccsymbol ? ccsymbol.toUpperCase() : "",
-            lnstr = ln ? " <span class='icon-power'></span>" : "",
-            valstr = (ln && !conf) ? "" : ccval_rounded + " " + set_ccsymbol + lnstr,
-            date_format = transactiontime ? short_date(transactiontime) : "",
-            no_conf = setconfirmations === false,
-            instant_lock = txd.instant_lock,
-            confirmed = instant_lock || no_conf || (conf && conf >= setconfirmations),
-            conf_count = no_conf ? "" : conf + " / " + setconfirmations + " " + translate("confirmations"),
-            instant_lock_text = instant_lock ? " (instant_lock)" : "",
-            conf_title = instant_lock ? "instant_lock" : conf_count,
-            unconf_text = translate("unconfirmedtx"),
-            checked_span = "<span class='icon-checkmark' title='" + conf_title + "'></span>",
-            confspan = confirmed ? checked_span : conf ? "<div class='txli_conf' title='" + conf_title + "'><div class='confbar'></div><span>" + conf_title + "</span></div>" :
-            "<div class='txli_conf' title='" + unconf_text + "'><div class='confbar'></div><span>" + unconf_text + "</span></div>",
-            tx_listitem = $("<li><div class='txli_content'>" + date_format + confspan + "<div class='txli_conf txl_canceled'><span class='icon-blocked'></span>Canceled</div><span class='tx_val'> + " + valstr + " <span class='icon-eye show_tx' title='view on blockexplorer'></span></span></div></li>");
-        if (rqtype === false) {
-            return tx_listitem;
-        }
-        if (glob_tx_list.includes(txhash)) { // check for indexed transaction id's
-            return rqtype === "outgoing" ? null : tx_listitem;
-        }
-        glob_tx_list.push(txhash);
-        return tx_listitem;
-    }
-    return null;
+    lnstr = ln ? " <span class='icon-power'></span>" : "",
+        valstr = (ln && !conf) ? "" : ccval_rounded + " " + set_ccsymbol + lnstr,
+        date_format = transactiontime ? short_date(transactiontime) : "",
+        no_conf = setconfirmations === false,
+        instant_lock = txd.instant_lock,
+        confirmed = instant_lock || no_conf || (conf && conf >= setconfirmations),
+        conf_count = no_conf ? "" : conf + " / " + setconfirmations + " " + translate("confirmations"),
+        instant_lock_text = instant_lock ? " (instant_lock)" : "",
+        conf_title = instant_lock ? "instant_lock" : conf_count,
+        unconf_text = translate("unconfirmedtx"),
+        checked_span = "<span class='icon-checkmark' title='" + conf_title + "'></span>",
+        confspan = confirmed ? checked_span : conf ? "<div class='txli_conf' title='" + conf_title + "'><div class='confbar'></div><span>" + conf_title + "</span></div>" :
+        "<div class='txli_conf' title='" + unconf_text + "'><div class='confbar'></div><span>" + unconf_text + "</span></div>",
+        tx_listitem = $("<li><div class='txli_content'>" + date_format + confspan + "<div class='txli_conf txl_canceled'><span class='icon-blocked'></span>Canceled</div><span class='tx_val'> + " + valstr + " <span class='icon-eye show_tx' title='view on blockexplorer'></span></span></div></li>");
+    if (glob_tx_list.includes(txhash)) { // check for indexed transaction id's
+        return rqtype === "outgoing" ? null : tx_listitem;
+    }
+    glob_tx_list.push(txhash);
+    return tx_listitem;
 }
 
 // Creates HTML for historic data

assets_styles_styles.css

@@ -1401,7 +1401,7 @@ html.dragmode .currentpage .applist li.dragging {
 	margin: 10px 0 0 0;
 	border-radius: 5px;
 	padding: 10px;
-	font-size: 12px;
+	font-size: 70%;
 	line-height: 1.4em;
 	font-family: monospace;
 	display: none;