Merge branch 'main' into fix/issue-116-timestamp-timezone

Merge pull request 'feat: speed up copy-flash timing by ~25% — follow-up to #113 ' (#121 ) from fix/issue-100-faster-copy-flash into main
Reviewed-on: #121
2026-03-01 01:21:39 +01:00 · 2026-03-01 01:21:24 +01:00 · 2026-02-28 16:17:07 -08:00 · 2026-02-28 16:14:56 -08:00 · 2026-03-01 01:13:15 +01:00 · 2026-03-01 01:13:06 +01:00
10 changed files with 100 additions and 29 deletions
--- a/src/popup/styles/main.css
+++ b/src/popup/styles/main.css
@@ -19,3 +19,16 @@ body {
    width: 396px;
    overflow-x: hidden;
 }
+
+/* Copy-flash feedback: inverts colors then fades back */
+.copy-flash-active {
+    background-color: var(--color-fg) !important;
+    color: var(--color-bg) !important;
+    transition: none;
+}
+
+.copy-flash-fade {
+    transition:
+        background-color 225ms ease-out,
+        color 225ms ease-out;
+}
--- a/src/popup/views/addWallet.js
+++ b/src/popup/views/addWallet.js
@@ -11,6 +11,25 @@ const { encryptWithPassword } = require("../../shared/vault");
 const { state, saveState } = require("../../shared/state");
 const { scanForAddresses } = require("../../shared/balances");

+/**
+ * Check if an address already exists in ANY wallet (hd, xprv, or key).
+ * Returns the wallet object if found, or undefined.
+ */
+function findWalletByAddress(addr) {
+    const lower = addr.toLowerCase();
+    return state.wallets.find((w) =>
+        w.addresses.some((a) => a.address.toLowerCase() === lower),
+    );
+}
+
+/**
+ * Check if an xpub already exists in any HD-type wallet (hd or xprv).
+ * Returns the wallet object if found, or undefined.
+ */
+function findWalletByXpub(xpub) {
+    return state.wallets.find((w) => w.xpub && w.xpub === xpub);
+}
+
 let currentMode = "mnemonic";

 const MODES = ["mnemonic", "privkey", "xprv"];
@@ -97,18 +116,18 @@ async function importMnemonic(ctx) {
    const pw = validatePassword();
    if (!pw) return;
    const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
-    const duplicate = state.wallets.find(
-        (w) =>
-            w.type === "hd" &&
-            w.addresses[0] &&
-            w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
-    );
-    if (duplicate) {
+    const xpubDup = findWalletByXpub(xpub);
+    if (xpubDup) {
        showFlash(
-            "This recovery phrase is already added (" + duplicate.name + ").",
+            "This recovery phrase is already added (" + xpubDup.name + ").",
        );
        return;
    }
+    const addrDup = findWalletByAddress(firstAddress);
+    if (addrDup) {
+        showFlash("Address already exists in wallet (" + addrDup.name + ").");
+        return;
+    }
    const encrypted = await encryptWithPassword(mnemonic, pw);
    const walletNum = state.wallets.length + 1;
    const wallet = {
@@ -162,15 +181,10 @@ async function importPrivateKey(ctx) {
    }
    const pw = validatePassword();
    if (!pw) return;
-    const duplicate = state.wallets.find(
-        (w) =>
-            w.type === "key" &&
-            w.addresses[0] &&
-            w.addresses[0].address.toLowerCase() === addr.toLowerCase(),
-    );
+    const duplicate = findWalletByAddress(addr);
    if (duplicate) {
        showFlash(
-            "This private key is already added (" + duplicate.name + ").",
+            "This address already exists in wallet (" + duplicate.name + ").",
        );
        return;
    }
@@ -208,14 +222,14 @@ async function importXprvKey(ctx) {
        return;
    }
    const { xpub, firstAddress } = result;
-    const duplicate = state.wallets.find(
-        (w) =>
-            (w.type === "hd" || w.type === "xprv") &&
-            w.addresses[0] &&
-            w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
-    );
-    if (duplicate) {
-        showFlash("This key is already added (" + duplicate.name + ").");
+    const xpubDup = findWalletByXpub(xpub);
+    if (xpubDup) {
+        showFlash("This key is already added (" + xpubDup.name + ").");
+        return;
+    }
+    const addrDup = findWalletByAddress(firstAddress);
+    if (addrDup) {
+        showFlash("Address already exists in wallet (" + addrDup.name + ").");
        return;
    }
    const pw = validatePassword();
--- a/src/popup/views/addressDetail.js
+++ b/src/popup/views/addressDetail.js
@@ -2,6 +2,7 @@ const {
    $,
    showView,
    showFlash,
+    flashCopyFeedback,
    balanceLinesForAddress,
    addressDotHtml,
    addressTitle,
@@ -94,18 +95,23 @@ function show() {
 function isoDate(timestamp) {
    const d = new Date(timestamp * 1000);
    const pad = (n) => String(n).padStart(2, "0");
+    const offsetMin = -d.getTimezoneOffset();
+    const sign = offsetMin >= 0 ? "+" : "-";
+    const absOff = Math.abs(offsetMin);
+    const tzStr = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
    return (
        d.getFullYear() +
        "-" +
        pad(d.getMonth() + 1) +
        "-" +
        pad(d.getDate()) +
-        " " +
+        "T" +
        pad(d.getHours()) +
        ":" +
        pad(d.getMinutes()) +
        ":" +
-        pad(d.getSeconds())
+        pad(d.getSeconds()) +
+        tzStr
    );
 }

@@ -241,6 +247,7 @@ function init(_ctx) {
        if (addr) {
            navigator.clipboard.writeText(addr);
            showFlash("Copied!");
+            flashCopyFeedback($("address-full"));
        }
    });

@@ -358,6 +365,7 @@ function init(_ctx) {
        if (key) {
            navigator.clipboard.writeText(key);
            showFlash("Copied!");
+            flashCopyFeedback($("export-privkey-value"));
        }
    });

@@ -366,6 +374,7 @@ function init(_ctx) {
        if (full) {
            navigator.clipboard.writeText(full);
            showFlash("Copied!");
+            flashCopyFeedback($("export-privkey-address"));
        }
    });

--- a/src/popup/views/addressToken.js
+++ b/src/popup/views/addressToken.js
@@ -5,6 +5,7 @@ const {
    $,
    showView,
    showFlash,
+    flashCopyFeedback,
    addressDotHtml,
    addressTitle,
    escapeHtml,
@@ -317,6 +318,7 @@ function init(_ctx) {
        if (addr) {
            navigator.clipboard.writeText(addr);
            showFlash("Copied!");
+            flashCopyFeedback($("address-token-full"));
        }
    });

@@ -325,6 +327,7 @@ function init(_ctx) {
        if (copyEl) {
            navigator.clipboard.writeText(copyEl.dataset.copy);
            showFlash("Copied!");
+            flashCopyFeedback(copyEl);
        }
    });

@@ -373,6 +376,7 @@ function init(_ctx) {
            copyEl.addEventListener("click", () => {
                navigator.clipboard.writeText(copyEl.dataset.copy);
                showFlash("Copied!");
+                flashCopyFeedback(copyEl);
            });
        }
        updateSendBalance();
--- a/src/popup/views/confirmTx.js
+++ b/src/popup/views/confirmTx.js
@@ -15,6 +15,7 @@ const {
    hideError,
    showView,
    showFlash,
+    flashCopyFeedback,
    addressTitle,
    addressDotHtml,
    escapeHtml,
@@ -117,6 +118,7 @@ function show(txInfo) {
            copyEl.onclick = () => {
                navigator.clipboard.writeText(copyEl.dataset.copy);
                showFlash("Copied!");
+                flashCopyFeedback(copyEl);
            };
        }
    } else {
--- a/src/popup/views/helpers.js
+++ b/src/popup/views/helpers.js
@@ -226,18 +226,23 @@ function formatAddressHtml(address, ensName, maxLen, title) {
 function isoDate(timestamp) {
    const d = new Date(timestamp * 1000);
    const pad = (n) => String(n).padStart(2, "0");
+    const offsetMin = -d.getTimezoneOffset();
+    const sign = offsetMin >= 0 ? "+" : "-";
+    const absOff = Math.abs(offsetMin);
+    const tzStr = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
    return (
        d.getFullYear() +
        "-" +
        pad(d.getMonth() + 1) +
        "-" +
        pad(d.getDate()) +
-        " " +
+        "T" +
        pad(d.getHours()) +
        ":" +
        pad(d.getMinutes()) +
        ":" +
-        pad(d.getSeconds())
+        pad(d.getSeconds()) +
+        tzStr
    );
 }

@@ -258,12 +263,26 @@ function timeAgo(timestamp) {
    return years + " year" + (years !== 1 ? "s" : "") + " ago";
 }

+function flashCopyFeedback(el) {
+    if (!el) return;
+    el.classList.remove("copy-flash-fade");
+    el.classList.add("copy-flash-active");
+    setTimeout(() => {
+        el.classList.remove("copy-flash-active");
+        el.classList.add("copy-flash-fade");
+        setTimeout(() => {
+            el.classList.remove("copy-flash-fade");
+        }, 275);
+    }, 75);
+}
+
 module.exports = {
    $,
    showError,
    hideError,
    showView,
    showFlash,
+    flashCopyFeedback,
    balanceLine,
    balanceLinesForAddress,
    addressColor,
--- a/src/popup/views/home.js
+++ b/src/popup/views/home.js
@@ -2,6 +2,7 @@ const {
    $,
    showView,
    showFlash,
+    flashCopyFeedback,
    balanceLinesForAddress,
    isoDate,
    timeAgo,
@@ -85,9 +86,10 @@ function renderActiveAddress() {
        el.innerHTML =
            `<span class="underline decoration-dashed cursor-pointer" id="active-addr-copy">${dot}${escapeHtml(addr)}</span>` +
            `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
-        $("active-addr-copy").addEventListener("click", () => {
+        $("active-addr-copy").addEventListener("click", (e) => {
            navigator.clipboard.writeText(addr);
            showFlash("Copied!");
+            flashCopyFeedback(e.currentTarget);
        });
    } else {
        el.textContent = "";
--- a/src/popup/views/receive.js
+++ b/src/popup/views/receive.js
@@ -2,6 +2,7 @@ const {
    $,
    showView,
    showFlash,
+    flashCopyFeedback,
    formatAddressHtml,
    addressTitle,
 } = require("./helpers");
@@ -60,11 +61,12 @@ function show() {
 }

 function init(ctx) {
-    $("receive-address-block").addEventListener("click", () => {
+    $("receive-address-block").addEventListener("click", (e) => {
        const addr = $("receive-address-block").dataset.full;
        if (addr) {
            navigator.clipboard.writeText(addr);
            showFlash("Copied!");
+            flashCopyFeedback(e.currentTarget);
        }
    });

@@ -73,6 +75,7 @@ function init(ctx) {
        if (addr) {
            navigator.clipboard.writeText(addr);
            showFlash("Copied!");
+            flashCopyFeedback($("receive-address-block"));
        }
    });

--- a/src/popup/views/transactionDetail.js
+++ b/src/popup/views/transactionDetail.js
@@ -5,6 +5,7 @@ const {
    $,
    showView,
    showFlash,
+    flashCopyFeedback,
    addressDotHtml,
    addressTitle,
    escapeHtml,
@@ -171,6 +172,7 @@ function render() {
            el.onclick = () => {
                navigator.clipboard.writeText(el.dataset.copy);
                showFlash("Copied!");
+                flashCopyFeedback(el);
            };
        });
 }
@@ -248,6 +250,7 @@ async function loadCalldata(txHash, toAddress) {
                el.onclick = () => {
                    navigator.clipboard.writeText(el.dataset.copy);
                    showFlash("Copied!");
+                    flashCopyFeedback(el);
                };
            });
        }
--- a/src/popup/views/txStatus.js
+++ b/src/popup/views/txStatus.js
@@ -4,6 +4,7 @@ const {
    $,
    showView,
    showFlash,
+    flashCopyFeedback,
    addressDotHtml,
    addressTitle,
    escapeHtml,
@@ -77,6 +78,7 @@ function attachCopyHandlers(viewId) {
            el.onclick = () => {
                navigator.clipboard.writeText(el.dataset.copy);
                showFlash("Copied!");
+                flashCopyFeedback(el);
            };
        });
 }
Author	SHA1	Message	Date
Jeffrey Paul	b755eb4899	Merge branch 'main' into fix/issue-116-timestamp-timezone All checks were successful check / check (push) Successful in 8s Details	2026-03-01 01:21:39 +01:00
Jeffrey Paul	5f01d9f111	Merge pull request 'feat: speed up copy-flash timing by ~25% — follow-up to #113 ' (#121 ) from fix/issue-100-faster-copy-flash into main All checks were successful check / check (push) Successful in 11s Details Reviewed-on: #121	2026-03-01 01:21:24 +01:00
user	d78af3ec80	feat: speed up copy-flash timing by ~25% All checks were successful check / check (push) Successful in 20s Details Reduce active phase from 100ms to 75ms, fade transition from 300ms to 225ms, and cleanup delay from 350ms to 275ms for snappier feedback. Refs #100	2026-02-28 16:17:07 -08:00
user	0616b62f63	fix: include timezone offset in all displayed timestamps All checks were successful check / check (push) Successful in 21s Details All isoDate() functions now output proper ISO 8601 format with timezone offset (e.g. 2026-02-28T15:30:00-08:00) instead of bare datetime strings. Also uses 'T' separator per ISO 8601. closes #116	2026-02-28 16:14:56 -08:00
Jeffrey Paul	753fb5658a	Merge pull request 'fix: cross-wallet-type duplicate detection — closes #111 ' (#115 ) from fix/issue-111-cross-wallet-dedup into main All checks were successful check / check (push) Successful in 9s Details Reviewed-on: #115	2026-03-01 01:13:15 +01:00
Jeffrey Paul	bdb2031d46	Merge branch 'main' into fix/issue-111-cross-wallet-dedup All checks were successful check / check (push) Successful in 21s Details	2026-03-01 01:13:06 +01:00
Jeffrey Paul	25ecaee128	Merge pull request 'feat: add copy-flash visual feedback — closes #100 ' (#113 ) from fix/issue-100-copy-flash-feedback into main All checks were successful check / check (push) Successful in 21s Details Reviewed-on: #113	2026-03-01 01:12:40 +01:00
user	ff4b5ee24d	feat: add copy-flash visual feedback on click-to-copy All checks were successful check / check (push) Successful in 9s Details When a user clicks to copy text (addresses, tx hashes, etc.), the copied element now briefly flashes with inverted colors (bg/fg swap) and fades back over ~300ms. This provides localized visual feedback in addition to the existing flash message. Applied to all click-to-copy elements across all views. closes #100	2026-03-01 01:01:34 +01:00
user	ca6e9054f9	fix: cross-wallet-type duplicate detection for all import methods All checks were successful check / check (push) Successful in 22s Details - Private key import now checks ALL wallets (hd, xprv, key) for address conflicts - xprv import now checks xpub against existing xpubs and addresses across all wallet types - Mnemonic import now checks xpub against xprv wallets and addresses across all types - Extract findWalletByAddress() and findWalletByXpub() helpers for consistent dedup closes #111	2026-02-28 15:58:47 -08:00