fix: cross-wallet duplicate address detection on import

Previously each import method (mnemonic, private key, xprv) only checked for duplicates among wallets of the same type. Now all three check the derived address against ALL existing wallet addresses regardless of type, and mnemonic/xprv imports also compare xpubs against existing HD/xprv wallets. Closes #111
2026-02-28 16:01:40 -08:00
27 changed files with 122 additions and 3491 deletions
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -12,10 +12,6 @@ const { refreshBalances, getProvider } = require("../shared/balances");
 const { debugFetch } = require("../shared/log");
 const { decryptWithPassword } = require("../shared/vault");
 const { getSignerForAddress } = require("../shared/wallet");
-const {
-    isPhishingDomain,
-    updatePhishingList,
-} = require("../shared/phishingDomains");

 const storageApi =
    typeof browser !== "undefined"
@@ -575,10 +571,6 @@ async function backgroundRefresh() {

 setInterval(backgroundRefresh, BACKGROUND_REFRESH_INTERVAL);

-// Fetch the MetaMask eth-phishing-detect domain blocklist on startup.
-// Refreshes every 24 hours automatically.
-updatePhishingList();
-
 // When approval window is closed without a response, treat as rejection
 if (windowsApi && windowsApi.onRemoved) {
    windowsApi.onRemoved.addListener((windowId) => {
@@ -651,8 +643,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                resp.type = "sign";
                resp.signParams = approval.signParams;
            }
-            // Flag if the requesting domain is on the phishing blocklist.
-            resp.isPhishingDomain = isPhishingDomain(approval.hostname);
            sendResponse(resp);
        } else {
            sendResponse(null);
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -107,8 +107,7 @@
                    </div>
                    <div
                        id="add-wallet-phrase-warning"
-                        class="text-xs mb-2 border border-border border-dashed p-2"
-                        style="visibility: hidden"
+                        class="text-xs mb-2 border border-border border-dashed p-2 hidden"
                    >
                        Write these words down and keep them safe. Anyone with
                        them can take your funds; if you lose them, your wallet
@@ -185,7 +184,7 @@
                <!-- active address headline -->
                <div
                    id="total-value"
-                    class="text-2xl font-bold min-h-[2rem] text-fg"
+                    class="text-2xl font-bold min-h-[2rem]"
                ></div>
                <div
                    id="total-value-sub"
@@ -376,8 +375,7 @@
                </p>
                <div
                    id="export-privkey-flash"
-                    class="text-xs mb-2 min-h-[1.25rem]"
-                    style="visibility: hidden"
+                    class="text-xs mb-2 hidden"
                ></div>
                <div id="export-privkey-password-section" class="mb-2">
                    <label class="block mb-1">Password</label>
@@ -581,17 +579,13 @@
                    <div class="text-xs text-muted mb-1">Your balance</div>
                    <div id="confirm-balance" class="text-xs"></div>
                </div>
-                <div id="confirm-fee" class="mb-3" style="visibility: hidden">
+                <div id="confirm-fee" class="mb-3 hidden">
                    <div class="text-xs text-muted mb-1">
                        Estimated network fee
                    </div>
                    <div id="confirm-fee-amount" class="text-xs"></div>
                </div>
-                <div
-                    id="confirm-warnings"
-                    class="mb-2"
-                    style="visibility: hidden"
-                ></div>
+                <div id="confirm-warnings" class="mb-2 hidden"></div>
                <div
                    id="confirm-recipient-warning"
                    class="mb-2"
@@ -605,35 +599,9 @@
                        Double-check the address before sending.
                    </div>
                </div>
-                <div
-                    id="confirm-contract-warning"
-                    class="mb-2"
-                    style="visibility: hidden"
-                >
-                    <div
-                        class="border border-red-500 border-dashed p-2 text-xs font-bold text-red-500"
-                    >
-                        WARNING: The recipient is a smart contract. Sending ETH
-                        or tokens directly to a contract may result in permanent
-                        loss of funds.
-                    </div>
-                </div>
-                <div
-                    id="confirm-burn-warning"
-                    class="mb-2"
-                    style="visibility: hidden"
-                >
-                    <div
-                        class="border border-red-500 border-dashed p-2 text-xs font-bold text-red-500"
-                    >
-                        WARNING: This is a known null/burn address. Funds sent
-                        here are permanently destroyed and cannot be recovered.
-                    </div>
-                </div>
                <div
                    id="confirm-errors"
-                    class="mb-2 border border-border border-dashed p-2"
-                    style="visibility: hidden; min-height: 1.25rem"
+                    class="mb-2 border border-border border-dashed p-2 hidden"
                ></div>
                <div class="mb-2">
                    <label class="block mb-1 text-xs">Password</label>
@@ -646,7 +614,6 @@
                <div
                    id="confirm-tx-password-error"
                    class="text-xs mb-2 min-h-[1.25rem]"
-                    style="visibility: hidden"
                ></div>
                <button
                    id="btn-confirm-send"
@@ -761,8 +728,7 @@
                </button>
                <div
                    id="receive-erc20-warning"
-                    class="text-xs border border-border border-dashed p-2 mt-3"
-                    style="visibility: hidden"
+                    class="text-xs border border-border border-dashed p-2 mt-3 hidden"
                ></div>
            </div>

@@ -790,8 +756,7 @@
                </div>
                <div
                    id="add-token-info"
-                    class="text-xs text-muted mb-2 min-h-[1.25rem]"
-                    style="visibility: hidden"
+                    class="text-xs text-muted mb-2 hidden"
                ></div>
                <div class="mb-2">
                    <label class="block mb-1 text-xs text-muted"
@@ -849,7 +814,7 @@
                <div class="bg-well p-3 mx-1 mb-3">
                    <h3 class="font-bold mb-1">Display</h3>
                    <label
-                        class="text-xs flex items-center gap-1 cursor-pointer mb-2"
+                        class="text-xs flex items-center gap-1 cursor-pointer"
                    >
                        <input
                            type="checkbox"
@@ -857,17 +822,6 @@
                        />
                        Show tracked tokens with zero balance
                    </label>
-                    <div class="text-xs flex items-center gap-1">
-                        <label for="settings-theme">Theme:</label>
-                        <select
-                            id="settings-theme"
-                            class="border border-border p-1 bg-bg text-fg text-xs cursor-pointer"
-                        >
-                            <option value="system">System</option>
-                            <option value="light">Light</option>
-                            <option value="dark">Dark</option>
-                        </select>
-                    </div>
                </div>

                <div class="bg-well p-3 mx-1 mb-3">
@@ -949,12 +903,6 @@
                        />
                        <span class="text-xs text-muted">gwei</span>
                    </div>
-                    <label
-                        class="text-xs flex items-center gap-1 cursor-pointer mb-1"
-                    >
-                        <input type="checkbox" id="settings-utc-timestamps" />
-                        UTC Timestamps
-                    </label>
                </div>

                <div class="bg-well p-3 mx-1 mb-3">
@@ -990,8 +938,7 @@
                </p>
                <div
                    id="delete-wallet-flash"
-                    class="text-xs text-red-500 mb-2 min-h-[1.25rem]"
-                    style="visibility: hidden"
+                    class="text-xs text-red-500 mb-2 hidden"
                ></div>
                <div class="mb-2">
                    <label class="block mb-1">Password</label>
@@ -1066,8 +1013,7 @@
                    />
                    <div
                        id="settings-addtoken-info"
-                        class="text-xs text-muted mt-1 min-h-[1.25rem]"
-                        style="visibility: hidden"
+                        class="text-xs text-muted mt-1 hidden"
                    ></div>
                    <button
                        id="btn-settings-addtoken-manual"
@@ -1149,20 +1095,6 @@
            <!-- ============ TRANSACTION APPROVAL ============ -->
            <div id="view-approve-tx" class="view hidden">
                <h2 class="font-bold mb-2">Transaction Request</h2>
-                <div
-                    id="approve-tx-phishing-warning"
-                    class="mb-3 p-2 text-xs font-bold hidden"
-                    style="
-                        background: #fee2e2;
-                        color: #991b1b;
-                        border: 2px solid #dc2626;
-                        border-radius: 6px;
-                    "
-                >
-                    ⚠️ PHISHING WARNING: This site is on MetaMask's phishing
-                    blocklist. This transaction may steal your funds. Proceed
-                    with extreme caution.
-                </div>
                <p class="mb-2">
                    <span id="approve-tx-hostname" class="font-bold"></span>
                    wants to send a transaction.
@@ -1207,8 +1139,7 @@
                </div>
                <div
                    id="approve-tx-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem]"
-                    style="visibility: hidden"
+                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
                ></div>
                <div class="flex justify-between">
                    <button
@@ -1229,20 +1160,6 @@
            <!-- ============ SIGNATURE APPROVAL ============ -->
            <div id="view-approve-sign" class="view hidden">
                <h2 class="font-bold mb-2">Signature Request</h2>
-                <div
-                    id="approve-sign-phishing-warning"
-                    class="mb-3 p-2 text-xs font-bold hidden"
-                    style="
-                        background: #fee2e2;
-                        color: #991b1b;
-                        border: 2px solid #dc2626;
-                        border-radius: 6px;
-                    "
-                >
-                    ⚠️ PHISHING WARNING: This site is on MetaMask's phishing
-                    blocklist. Signing this message may authorize theft of your
-                    funds. Proceed with extreme caution.
-                </div>
                <p class="mb-2">
                    <span id="approve-sign-hostname" class="font-bold"></span>
                    wants you to sign a message.
@@ -1250,10 +1167,8 @@

                <div
                    id="approve-sign-danger-warning"
-                    class="mb-3 p-2 text-xs font-bold"
+                    class="hidden mb-3 p-2 text-xs font-bold"
                    style="
-                        visibility: hidden;
-                        min-height: 1.25rem;
                        background: #fee2e2;
                        color: #991b1b;
                        border: 2px solid #dc2626;
@@ -1290,8 +1205,7 @@
                </div>
                <div
                    id="approve-sign-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem]"
-                    style="visibility: hidden"
+                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
                ></div>
                <div class="flex justify-between">
                    <button
@@ -1312,20 +1226,6 @@
            <!-- ============ SITE APPROVAL ============ -->
            <div id="view-approve-site" class="view hidden">
                <h2 class="font-bold mb-2">Connection Request</h2>
-                <div
-                    id="approve-site-phishing-warning"
-                    class="mb-3 p-2 text-xs font-bold hidden"
-                    style="
-                        background: #fee2e2;
-                        color: #991b1b;
-                        border: 2px solid #dc2626;
-                        border-radius: 6px;
-                    "
-                >
-                    ⚠️ PHISHING WARNING: This site is on MetaMask's phishing
-                    blocklist. Connecting your wallet may result in loss of
-                    funds. Proceed with extreme caution.
-                </div>
                <div class="mb-3">
                    <p class="mb-2">
                        <span id="approve-hostname" class="font-bold"></span>
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -6,7 +6,6 @@ const { state, saveState, loadState } = require("../shared/state");
 const { refreshPrices } = require("../shared/prices");
 const { refreshBalances } = require("../shared/balances");
 const { $, showView } = require("./views/helpers");
-const { applyTheme } = require("./theme");

 const home = require("./views/home");
 const welcome = require("./views/welcome");
@@ -177,7 +176,6 @@ async function init() {
    }

    await loadState();
-    applyTheme(state.theme);

    // Auto-default active address
    if (
--- a/src/popup/styles/main.css
+++ b/src/popup/styles/main.css
@@ -15,32 +15,7 @@
    --color-section: #dddddd;
 }

-html.dark {
-    --color-bg: #000000;
-    --color-fg: #ffffff;
-    --color-muted: #aaaaaa;
-    --color-border: #ffffff;
-    --color-border-light: #444444;
-    --color-hover: #222222;
-    --color-well: #1a1a1a;
-    --color-danger-well: #2a0a0a;
-    --color-section: #2a2a2a;
-}
-
 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/theme.js
+++ b/src/popup/theme.js
@@ -1,33 +0,0 @@
-// Theme management: applies light/dark class to <html> based on preference.
-
-let mediaQuery = null;
-let mediaHandler = null;
-
-function applyTheme(theme) {
-    // Clean up previous system listener
-    if (mediaQuery && mediaHandler) {
-        mediaQuery.removeEventListener("change", mediaHandler);
-        mediaHandler = null;
-    }
-
-    if (theme === "dark") {
-        document.documentElement.classList.add("dark");
-    } else if (theme === "light") {
-        document.documentElement.classList.remove("dark");
-    } else {
-        // system
-        mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
-        const update = () => {
-            if (mediaQuery.matches) {
-                document.documentElement.classList.add("dark");
-            } else {
-                document.documentElement.classList.remove("dark");
-            }
-        };
-        mediaHandler = update;
-        mediaQuery.addEventListener("change", update);
-        update();
-    }
-}
-
-module.exports = { applyTheme };
--- a/src/popup/views/addToken.js
+++ b/src/popup/views/addToken.js
@@ -7,8 +7,7 @@ const { log } = require("../../shared/log");

 function show() {
    $("add-token-address").value = "";
-    $("add-token-info").textContent = "";
-    $("add-token-info").style.visibility = "hidden";
+    $("add-token-info").classList.add("hidden");
    const list = $("common-token-list");
    list.innerHTML = getTopTokens(25)
        .map(
@@ -46,7 +45,7 @@ function init(ctx) {
        }
        const infoEl = $("add-token-info");
        infoEl.textContent = "Looking up token...";
-        infoEl.style.visibility = "visible";
+        infoEl.classList.remove("hidden");
        log.debugf("Looking up token contract", contractAddr);
        try {
            const info = await lookupTokenInfo(contractAddr, state.rpcUrl);
@@ -64,8 +63,7 @@ function init(ctx) {
            const detail = e.shortMessage || e.message || String(e);
            log.errorf("Token lookup failed for", contractAddr, detail);
            showFlash(detail);
-            infoEl.textContent = "";
-            infoEl.style.visibility = "hidden";
+            infoEl.classList.add("hidden");
        }
    });

--- a/src/popup/views/addWallet.js
+++ b/src/popup/views/addWallet.js
@@ -11,25 +11,6 @@ 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"];
@@ -71,7 +52,7 @@ function show() {
    $("import-xprv-key").value = "";
    $("add-wallet-password").value = "";
    $("add-wallet-password-confirm").value = "";
-    $("add-wallet-phrase-warning").style.visibility = "hidden";
+    $("add-wallet-phrase-warning").classList.add("hidden");
    switchMode("mnemonic");
    showView("add-wallet");
 }
@@ -116,16 +97,24 @@ async function importMnemonic(ctx) {
    const pw = validatePassword();
    if (!pw) return;
    const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
-    const xpubDup = findWalletByXpub(xpub);
-    if (xpubDup) {
+    const addrDup = state.wallets.find((w) =>
+        w.addresses.some(
+            (a) => a.address.toLowerCase() === firstAddress.toLowerCase(),
+        ),
+    );
+    if (addrDup) {
        showFlash(
-            "This recovery phrase is already added (" + xpubDup.name + ").",
+            "An address from this phrase already exists in " +
+                addrDup.name +
+                ".",
        );
        return;
    }
-    const addrDup = findWalletByAddress(firstAddress);
-    if (addrDup) {
-        showFlash("Address already exists in wallet (" + addrDup.name + ").");
+    const xpubDup = state.wallets.find(
+        (w) => (w.type === "hd" || w.type === "xprv") && w.xpub === xpub,
+    );
+    if (xpubDup) {
+        showFlash("This recovery phrase matches " + xpubDup.name + ".");
        return;
    }
    const encrypted = await encryptWithPassword(mnemonic, pw);
@@ -181,11 +170,11 @@ async function importPrivateKey(ctx) {
    }
    const pw = validatePassword();
    if (!pw) return;
-    const duplicate = findWalletByAddress(addr);
+    const duplicate = state.wallets.find((w) =>
+        w.addresses.some((a) => a.address.toLowerCase() === addr.toLowerCase()),
+    );
    if (duplicate) {
-        showFlash(
-            "This address already exists in wallet (" + duplicate.name + ").",
-        );
+        showFlash("This address already exists in " + duplicate.name + ".");
        return;
    }
    const encrypted = await encryptWithPassword(key, pw);
@@ -222,14 +211,22 @@ async function importXprvKey(ctx) {
        return;
    }
    const { xpub, firstAddress } = result;
-    const xpubDup = findWalletByXpub(xpub);
-    if (xpubDup) {
-        showFlash("This key is already added (" + xpubDup.name + ").");
+    const addrDup = state.wallets.find((w) =>
+        w.addresses.some(
+            (a) => a.address.toLowerCase() === firstAddress.toLowerCase(),
+        ),
+    );
+    if (addrDup) {
+        showFlash(
+            "An address from this key already exists in " + addrDup.name + ".",
+        );
        return;
    }
-    const addrDup = findWalletByAddress(firstAddress);
-    if (addrDup) {
-        showFlash("Address already exists in wallet (" + addrDup.name + ").");
+    const xpubDup = state.wallets.find(
+        (w) => (w.type === "hd" || w.type === "xprv") && w.xpub === xpub,
+    );
+    if (xpubDup) {
+        showFlash("This key matches " + xpubDup.name + ".");
        return;
    }
    const pw = validatePassword();
@@ -281,7 +278,7 @@ function init(ctx) {
    // Generate mnemonic
    $("btn-generate-phrase").addEventListener("click", () => {
        $("wallet-mnemonic").value = generateMnemonic();
-        $("add-wallet-phrase-warning").style.visibility = "visible";
+        $("add-wallet-phrase-warning").classList.remove("hidden");
    });

    // Import / confirm
--- a/src/popup/views/addressDetail.js
+++ b/src/popup/views/addressDetail.js
@@ -2,7 +2,6 @@ const {
    $,
    showView,
    showFlash,
-    flashCopyFeedback,
    balanceLinesForAddress,
    addressDotHtml,
    addressTitle,
@@ -95,39 +94,18 @@ function show() {
 function isoDate(timestamp) {
    const d = new Date(timestamp * 1000);
    const pad = (n) => String(n).padStart(2, "0");
-    if (state.utcTimestamps) {
-        return (
-            d.getUTCFullYear() +
-            "-" +
-            pad(d.getUTCMonth() + 1) +
-            "-" +
-            pad(d.getUTCDate()) +
-            "T" +
-            pad(d.getUTCHours()) +
-            ":" +
-            pad(d.getUTCMinutes()) +
-            ":" +
-            pad(d.getUTCSeconds()) +
-            "Z"
-        );
-    }
-    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()) +
-        tzStr
+        pad(d.getSeconds())
    );
 }

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

@@ -333,8 +310,8 @@ function init(_ctx) {
        $("export-privkey-address").textContent = addr.address;
        $("export-privkey-address").dataset.full = addr.address;
        $("export-privkey-password").value = "";
+        $("export-privkey-flash").classList.add("hidden");
        $("export-privkey-flash").textContent = "";
-        $("export-privkey-flash").style.visibility = "hidden";
        $("export-privkey-password-section").classList.remove("hidden");
        $("export-privkey-result").classList.add("hidden");
        $("export-privkey-value").textContent = "";
@@ -345,7 +322,7 @@ function init(_ctx) {
        const password = $("export-privkey-password").value;
        if (!password) {
            $("export-privkey-flash").textContent = "Password is required.";
-            $("export-privkey-flash").style.visibility = "visible";
+            $("export-privkey-flash").classList.remove("hidden");
            return;
        }
        const btn = $("btn-export-privkey-confirm");
@@ -366,10 +343,10 @@ function init(_ctx) {
            $("export-privkey-password-section").classList.add("hidden");
            $("export-privkey-value").textContent = privateKey;
            $("export-privkey-result").classList.remove("hidden");
-            $("export-privkey-flash").style.visibility = "hidden";
+            $("export-privkey-flash").classList.add("hidden");
        } catch {
            $("export-privkey-flash").textContent = "Wrong password.";
-            $("export-privkey-flash").style.visibility = "visible";
+            $("export-privkey-flash").classList.remove("hidden");
        } finally {
            btn.disabled = false;
            btn.classList.remove("text-muted");
@@ -381,7 +358,6 @@ function init(_ctx) {
        if (key) {
            navigator.clipboard.writeText(key);
            showFlash("Copied!");
-            flashCopyFeedback($("export-privkey-value"));
        }
    });

@@ -390,7 +366,6 @@ 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,7 +5,6 @@ const {
    $,
    showView,
    showFlash,
-    flashCopyFeedback,
    addressDotHtml,
    addressTitle,
    escapeHtml,
@@ -48,39 +47,18 @@ function etherscanAddressLink(address) {
 function isoDate(timestamp) {
    const d = new Date(timestamp * 1000);
    const pad = (n) => String(n).padStart(2, "0");
-    if (state.utcTimestamps) {
-        return (
-            d.getUTCFullYear() +
-            "-" +
-            pad(d.getUTCMonth() + 1) +
-            "-" +
-            pad(d.getUTCDate()) +
-            "T" +
-            pad(d.getUTCHours()) +
-            ":" +
-            pad(d.getUTCMinutes()) +
-            ":" +
-            pad(d.getUTCSeconds()) +
-            "Z"
-        );
-    }
-    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()) +
-        tzStr
+        pad(d.getSeconds())
    );
 }

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

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

@@ -397,7 +373,6 @@ function init(_ctx) {
            copyEl.addEventListener("click", () => {
                navigator.clipboard.writeText(copyEl.dataset.copy);
                showFlash("Copied!");
-                flashCopyFeedback(copyEl);
            });
        }
        updateSendBalance();
--- a/src/popup/views/approval.js
+++ b/src/popup/views/approval.js
@@ -13,7 +13,6 @@ const { ERC20_ABI } = require("../../shared/constants");
 const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
 const txStatus = require("./txStatus");
 const uniswap = require("../../shared/uniswap");
-const { isPhishingDomain } = require("../../shared/phishingDomains");

 const runtime =
    typeof browser !== "undefined" ? browser.runtime : chrome.runtime;
@@ -156,24 +155,7 @@ function decodeCalldata(data, toAddress) {
    return null;
 }

-function showPhishingWarning(elementId, hostname, isPhishing) {
-    const el = $(elementId);
-    if (!el) return;
-    // Check both the flag from background and a local re-check
-    if (isPhishing || isPhishingDomain(hostname)) {
-        el.classList.remove("hidden");
-    } else {
-        el.classList.add("hidden");
-    }
-}
-
 function showTxApproval(details) {
-    showPhishingWarning(
-        "approve-tx-phishing-warning",
-        details.hostname,
-        details.isPhishingDomain,
-    );
-
    const toAddr = details.txParams.to;
    const token = toAddr ? TOKEN_BY_ADDRESS.get(toAddr.toLowerCase()) : null;
    const ethValue = formatEther(details.txParams.value || "0");
@@ -287,7 +269,7 @@ function showTxApproval(details) {
    }

    $("approve-tx-password").value = "";
-    hideError("approve-tx-error");
+    $("approve-tx-error").classList.add("hidden");

    showView("approve-tx");
 }
@@ -341,12 +323,6 @@ function formatTypedDataHtml(jsonStr) {
 }

 function showSignApproval(details) {
-    showPhishingWarning(
-        "approve-sign-phishing-warning",
-        details.hostname,
-        details.isPhishingDomain,
-    );
-
    const sp = details.signParams;

    $("approve-sign-hostname").textContent = details.hostname;
@@ -375,10 +351,10 @@ function showSignApproval(details) {
    if (warningEl) {
        if (sp.dangerWarning) {
            warningEl.textContent = sp.dangerWarning;
-            warningEl.style.visibility = "visible";
+            warningEl.classList.remove("hidden");
        } else {
            warningEl.textContent = "";
-            warningEl.style.visibility = "hidden";
+            warningEl.classList.add("hidden");
        }
    }

@@ -406,12 +382,6 @@ function show(id) {
            showSignApproval(details);
            return;
        }
-        // Site connection approval
-        showPhishingWarning(
-            "approve-site-phishing-warning",
-            details.hostname,
-            details.isPhishingDomain,
-        );
        $("approve-hostname").textContent = details.hostname;
        $("approve-address").innerHTML = approvalAddressHtml(
            state.activeAddress,
--- a/src/popup/views/confirmTx.js
+++ b/src/popup/views/confirmTx.js
@@ -15,7 +15,6 @@ const {
    hideError,
    showView,
    showFlash,
-    flashCopyFeedback,
    addressTitle,
    addressDotHtml,
    escapeHtml,
@@ -25,11 +24,8 @@ const { getSignerForAddress } = require("../../shared/wallet");
 const { decryptWithPassword } = require("../../shared/vault");
 const { formatUsd, getPrice } = require("../../shared/prices");
 const { getProvider } = require("../../shared/balances");
-const {
-    getLocalWarnings,
-    getFullWarnings,
-} = require("../../shared/addressWarnings");
-const { ERC20_ABI, isBurnAddress } = require("../../shared/constants");
+const { isScamAddress } = require("../../shared/scamlist");
+const { ERC20_ABI } = require("../../shared/constants");
 const { log } = require("../../shared/log");
 const makeBlockie = require("ethereum-blockies-base64");
 const txStatus = require("./txStatus");
@@ -121,7 +117,6 @@ function show(txInfo) {
            copyEl.onclick = () => {
                navigator.clipboard.writeText(copyEl.dataset.copy);
                showFlash("Copied!");
-                flashCopyFeedback(copyEl);
            };
        }
    } else {
@@ -170,23 +165,28 @@ function show(txInfo) {
        $("confirm-balance").textContent = valueWithUsd(bal + " ETH", balUsd);
    }

-    // Check for warnings (synchronous local checks)
-    const localWarnings = getLocalWarnings(txInfo.to, {
-        fromAddress: txInfo.from,
-    });
+    // Check for warnings
+    const warnings = [];
+    if (isScamAddress(txInfo.to)) {
+        warnings.push(
+            "This address is on a known scam/fraud list. Do not send funds to this address.",
+        );
+    }
+    if (txInfo.to.toLowerCase() === txInfo.from.toLowerCase()) {
+        warnings.push("You are sending to your own address.");
+    }

    const warningsEl = $("confirm-warnings");
-    if (localWarnings.length > 0) {
-        warningsEl.innerHTML = localWarnings
+    if (warnings.length > 0) {
+        warningsEl.innerHTML = warnings
            .map(
                (w) =>
-                    `<div class="border border-border border-dashed p-2 mb-1 text-xs font-bold">WARNING: ${w.message}</div>`,
+                    `<div class="border border-border border-dashed p-2 mb-1 text-xs font-bold">WARNING: ${w}</div>`,
            )
            .join("");
-        warningsEl.style.visibility = "visible";
+        warningsEl.classList.remove("hidden");
    } else {
-        warningsEl.innerHTML = "";
-        warningsEl.style.visibility = "hidden";
+        warningsEl.classList.add("hidden");
    }

    // Check for errors
@@ -224,12 +224,11 @@ function show(txInfo) {
        errorsEl.innerHTML = errors
            .map((e) => `<div class="text-xs">${e}</div>`)
            .join("");
-        errorsEl.style.visibility = "visible";
+        errorsEl.classList.remove("hidden");
        sendBtn.disabled = true;
        sendBtn.classList.add("text-muted");
    } else {
-        errorsEl.innerHTML = "";
-        errorsEl.style.visibility = "hidden";
+        errorsEl.classList.add("hidden");
        sendBtn.disabled = false;
        sendBtn.classList.remove("text-muted");
    }
@@ -239,20 +238,13 @@ function show(txInfo) {
    hideError("confirm-tx-password-error");

    // Gas estimate — show placeholder then fetch async
-    $("confirm-fee").style.visibility = "visible";
+    $("confirm-fee").classList.remove("hidden");
    $("confirm-fee-amount").textContent = "Estimating...";
    state.viewData = { pendingTx: txInfo };
    showView("confirm-tx");

-    // Reset async warnings to hidden (space always reserved, no layout shift)
+    // Reset recipient warning to hidden (space always reserved, no layout shift)
    $("confirm-recipient-warning").style.visibility = "hidden";
-    $("confirm-contract-warning").style.visibility = "hidden";
-    $("confirm-burn-warning").style.visibility = "hidden";
-
-    // Show burn warning via reserved element (in addition to inline warning)
-    if (isBurnAddress(txInfo.to)) {
-        $("confirm-burn-warning").style.visibility = "visible";
-    }

    estimateGas(txInfo);
    checkRecipientHistory(txInfo);
@@ -299,18 +291,19 @@ async function estimateGas(txInfo) {
 }

 async function checkRecipientHistory(txInfo) {
+    const el = $("confirm-recipient-warning");
    try {
        const provider = getProvider(state.rpcUrl);
-        const asyncWarnings = await getFullWarnings(txInfo.to, provider, {
-            fromAddress: txInfo.from,
-        });
-        for (const w of asyncWarnings) {
-            if (w.type === "contract") {
-                $("confirm-contract-warning").style.visibility = "visible";
-            }
-            if (w.type === "new-address") {
-                $("confirm-recipient-warning").style.visibility = "visible";
-            }
+        // Skip warning for contract addresses — they may legitimately
+        // have zero outgoing transactions (getTransactionCount returns
+        // the nonce, i.e. sent-tx count only).
+        const code = await provider.getCode(txInfo.to);
+        if (code && code !== "0x") {
+            return;
+        }
+        const txCount = await provider.getTransactionCount(txInfo.to);
+        if (txCount === 0) {
+            el.style.visibility = "visible";
        }
    } catch (e) {
        log.errorf("recipient history check failed:", e.message);
--- a/src/popup/views/deleteWallet.js
+++ b/src/popup/views/deleteWallet.js
@@ -12,7 +12,7 @@ function show(walletIdx) {
        wallet.name || "Wallet " + (walletIdx + 1);
    $("delete-wallet-password").value = "";
    $("delete-wallet-flash").textContent = "";
-    $("delete-wallet-flash").style.visibility = "hidden";
+    $("delete-wallet-flash").classList.add("hidden");
    showView("delete-wallet-confirm");
 }

@@ -29,14 +29,14 @@ function init(_ctx) {
        if (!pw) {
            $("delete-wallet-flash").textContent =
                "Please enter your password.";
-            $("delete-wallet-flash").style.visibility = "visible";
+            $("delete-wallet-flash").classList.remove("hidden");
            return;
        }

        if (deleteWalletIndex === null) {
            $("delete-wallet-flash").textContent =
                "No wallet selected for deletion.";
-            $("delete-wallet-flash").style.visibility = "visible";
+            $("delete-wallet-flash").classList.remove("hidden");
            return;
        }

@@ -52,7 +52,7 @@ function init(_ctx) {
            await decryptWithPassword(wallet.encryptedSecret, pw);
        } catch (_e) {
            $("delete-wallet-flash").textContent = "Wrong password.";
-            $("delete-wallet-flash").style.visibility = "visible";
+            $("delete-wallet-flash").classList.remove("hidden");
            btn.disabled = false;
            btn.classList.remove("text-muted");
            return;
--- a/src/popup/views/helpers.js
+++ b/src/popup/views/helpers.js
@@ -40,13 +40,11 @@ function $(id) {
 function showError(id, msg) {
    const el = $(id);
    el.textContent = msg;
-    el.style.visibility = "visible";
+    el.classList.remove("hidden");
 }

 function hideError(id) {
-    const el = $(id);
-    el.textContent = "";
-    el.style.visibility = "hidden";
+    $(id).classList.add("hidden");
 }

 function showView(name) {
@@ -228,39 +226,18 @@ function formatAddressHtml(address, ensName, maxLen, title) {
 function isoDate(timestamp) {
    const d = new Date(timestamp * 1000);
    const pad = (n) => String(n).padStart(2, "0");
-    if (state.utcTimestamps) {
-        return (
-            d.getUTCFullYear() +
-            "-" +
-            pad(d.getUTCMonth() + 1) +
-            "-" +
-            pad(d.getUTCDate()) +
-            "T" +
-            pad(d.getUTCHours()) +
-            ":" +
-            pad(d.getUTCMinutes()) +
-            ":" +
-            pad(d.getUTCSeconds()) +
-            "Z"
-        );
-    }
-    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()) +
-        tzStr
+        pad(d.getSeconds())
    );
 }

@@ -281,26 +258,12 @@ 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,7 +2,6 @@ const {
    $,
    showView,
    showFlash,
-    flashCopyFeedback,
    balanceLinesForAddress,
    isoDate,
    timeAgo,
@@ -86,10 +85,9 @@ 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", (e) => {
+        $("active-addr-copy").addEventListener("click", () => {
            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,7 +2,6 @@ const {
    $,
    showView,
    showFlash,
-    flashCopyFeedback,
    formatAddressHtml,
    addressTitle,
 } = require("./helpers");
@@ -53,21 +52,19 @@ function show() {
            "This is an ERC-20 token. Only send " +
            symbol +
            " on the Ethereum network to this address. Sending tokens on other networks will result in permanent loss.";
-        warningEl.style.visibility = "visible";
+        warningEl.classList.remove("hidden");
    } else {
-        warningEl.textContent = "";
-        warningEl.style.visibility = "hidden";
+        warningEl.classList.add("hidden");
    }
    showView("receive");
 }

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

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

--- a/src/popup/views/settings.js
+++ b/src/popup/views/settings.js
@@ -1,5 +1,4 @@
 const { $, showView, showFlash, escapeHtml } = require("./helpers");
-const { applyTheme } = require("../theme");
 const { state, saveState } = require("../../shared/state");
 const { ETHEREUM_MAINNET_CHAIN_ID } = require("../../shared/constants");
 const { log, debugFetch } = require("../../shared/log");
@@ -215,13 +214,6 @@ function init(ctx) {
        await saveState();
    });

-    $("settings-theme").value = state.theme;
-    $("settings-theme").addEventListener("change", async () => {
-        state.theme = $("settings-theme").value;
-        await saveState();
-        applyTheme(state.theme);
-    });
-
    $("settings-hide-low-holders").checked = state.hideLowHolderTokens;
    $("settings-hide-low-holders").addEventListener("change", async () => {
        state.hideLowHolderTokens = $("settings-hide-low-holders").checked;
@@ -249,12 +241,6 @@ function init(ctx) {
        }
    });

-    $("settings-utc-timestamps").checked = state.utcTimestamps;
-    $("settings-utc-timestamps").addEventListener("change", async () => {
-        state.utcTimestamps = $("settings-utc-timestamps").checked;
-        await saveState();
-    });
-
    $("btn-main-add-wallet").addEventListener("click", ctx.showAddWalletView);

    $("btn-settings-add-token").addEventListener(
--- a/src/popup/views/settingsAddToken.js
+++ b/src/popup/views/settingsAddToken.js
@@ -73,8 +73,7 @@ function renderDropdown() {

 function show() {
    $("settings-addtoken-address").value = "";
-    $("settings-addtoken-info").textContent = "";
-    $("settings-addtoken-info").style.visibility = "hidden";
+    $("settings-addtoken-info").classList.add("hidden");
    renderTop10();
    renderDropdown();
    showView("settings-addtoken");
@@ -130,7 +129,7 @@ function init(_ctx) {
        }
        const infoEl = $("settings-addtoken-info");
        infoEl.textContent = "Looking up token...";
-        infoEl.style.visibility = "visible";
+        infoEl.classList.remove("hidden");
        log.debugf("Looking up token contract", addr);
        try {
            const info = await lookupTokenInfo(addr, state.rpcUrl);
@@ -144,8 +143,7 @@ function init(_ctx) {
            await saveState();
            showFlash("Added " + info.symbol);
            $("settings-addtoken-address").value = "";
-            infoEl.textContent = "";
-            infoEl.style.visibility = "hidden";
+            infoEl.classList.add("hidden");
            renderTop10();
            renderDropdown();
            ctx.doRefreshAndRender();
@@ -153,8 +151,7 @@ function init(_ctx) {
            const detail = e.shortMessage || e.message || String(e);
            log.errorf("Token lookup failed for", addr, detail);
            showFlash(detail);
-            infoEl.textContent = "";
-            infoEl.style.visibility = "hidden";
+            infoEl.classList.add("hidden");
        }
    });
 }
--- a/src/popup/views/transactionDetail.js
+++ b/src/popup/views/transactionDetail.js
@@ -5,7 +5,6 @@ const {
    $,
    showView,
    showFlash,
-    flashCopyFeedback,
    addressDotHtml,
    addressTitle,
    escapeHtml,
@@ -172,7 +171,6 @@ function render() {
            el.onclick = () => {
                navigator.clipboard.writeText(el.dataset.copy);
                showFlash("Copied!");
-                flashCopyFeedback(el);
            };
        });
 }
@@ -250,7 +248,6 @@ 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,7 +4,6 @@ const {
    $,
    showView,
    showFlash,
-    flashCopyFeedback,
    addressDotHtml,
    addressTitle,
    escapeHtml,
@@ -78,7 +77,6 @@ function attachCopyHandlers(viewId) {
            el.onclick = () => {
                navigator.clipboard.writeText(el.dataset.copy);
                showFlash("Copied!");
-                flashCopyFeedback(el);
            };
        });
 }
--- a/src/shared/addressWarnings.js
+++ b/src/shared/addressWarnings.js
@@ -1,109 +0,0 @@
-// Address warning module.
-// Provides local and async (RPC-based) warning checks for Ethereum addresses.
-// Returns arrays of {type, message, severity} objects.
-
-const { isScamAddress } = require("./scamlist");
-const { isBurnAddress } = require("./constants");
-const { checkEtherscanLabel } = require("./etherscanLabels");
-const { log } = require("./log");
-
-/**
- * Check an address against local-only lists (scam, burn, self-send).
- * Synchronous — no network calls.
- *
- * @param {string} address - The target address to check.
- * @param {object} [options] - Optional context.
- * @param {string} [options.fromAddress] - Sender address (for self-send check).
- * @returns {Array<{type: string, message: string, severity: string}>}
- */
-function getLocalWarnings(address, options = {}) {
-    const warnings = [];
-    const addr = address.toLowerCase();
-
-    if (isScamAddress(addr)) {
-        warnings.push({
-            type: "scam",
-            message:
-                "This address is on a known scam/fraud list. Do not send funds to this address.",
-            severity: "critical",
-        });
-    }
-
-    if (isBurnAddress(addr)) {
-        warnings.push({
-            type: "burn",
-            message:
-                "This is a known null/burn address. Funds sent here are permanently destroyed and cannot be recovered.",
-            severity: "critical",
-        });
-    }
-
-    if (options.fromAddress && addr === options.fromAddress.toLowerCase()) {
-        warnings.push({
-            type: "self-send",
-            message: "You are sending to your own address.",
-            severity: "warning",
-        });
-    }
-
-    return warnings;
-}
-
-/**
- * Check an address against local lists AND via RPC queries.
- * Async — performs network calls to check contract status and tx history.
- *
- * @param {string} address - The target address to check.
- * @param {object} provider - An ethers.js provider instance.
- * @param {object} [options] - Optional context.
- * @param {string} [options.fromAddress] - Sender address (for self-send check).
- * @returns {Promise<Array<{type: string, message: string, severity: string}>>}
- */
-async function getFullWarnings(address, provider, options = {}) {
-    const warnings = getLocalWarnings(address, options);
-
-    try {
-        const code = await provider.getCode(address);
-        if (code && code !== "0x") {
-            warnings.push({
-                type: "contract",
-                message:
-                    "This address is a smart contract, not a regular wallet.",
-                severity: "warning",
-            });
-            // If it's a contract, skip the tx count check — contracts
-            // may legitimately have zero inbound EOA transactions.
-            return warnings;
-        }
-    } catch (e) {
-        log.errorf("contract check failed:", e.message);
-    }
-
-    try {
-        const txCount = await provider.getTransactionCount(address);
-        if (txCount === 0) {
-            warnings.push({
-                type: "new-address",
-                message:
-                    "This address has never sent a transaction. Double-check it is correct.",
-                severity: "info",
-            });
-        }
-    } catch (e) {
-        log.errorf("tx count check failed:", e.message);
-    }
-
-    // Etherscan label check (best-effort async — network failures are silent).
-    try {
-        const etherscanWarning = await checkEtherscanLabel(address);
-        if (etherscanWarning) {
-            warnings.push(etherscanWarning);
-        }
-    } catch (e) {
-        log.errorf("etherscan label check failed:", e.message);
-    }
-
-    return warnings;
-}
-
-module.exports = { getLocalWarnings, getFullWarnings };
--- a/src/shared/constants.js
+++ b/src/shared/constants.js
@@ -20,19 +20,6 @@ const ERC20_ABI = [
    "function approve(address spender, uint256 amount) returns (bool)",
 ];

-// Known null/burn addresses that permanently destroy funds.
-const BURN_ADDRESSES = new Set([
-    "0x0000000000000000000000000000000000000000",
-    "0x0000000000000000000000000000000000000001",
-    "0x000000000000000000000000000000000000dead",
-    "0xdead000000000000000000000000000000000000",
-    "0x00000000000000000000000000000000deadbeef",
-]);
-
-function isBurnAddress(address) {
-    return BURN_ADDRESSES.has(address.toLowerCase());
-}
-
 module.exports = {
    DEBUG,
    DEBUG_MNEMONIC,
@@ -41,6 +28,4 @@ module.exports = {
    DEFAULT_BLOCKSCOUT_URL,
    BIP44_ETH_PATH,
    ERC20_ABI,
-    BURN_ADDRESSES,
-    isBurnAddress,
 };
--- a/src/shared/etherscanLabels.js
+++ b/src/shared/etherscanLabels.js
@@ -1,102 +0,0 @@
-// Etherscan address label lookup via page scraping.
-// Extension users make the requests directly to Etherscan — no proxy needed.
-// This is a best-effort enrichment: network failures return null silently.
-
-const ETHERSCAN_BASE = "https://etherscan.io/address/";
-
-// Patterns in the page title that indicate a flagged address.
-// Title format: "Fake_Phishing184810 | Address: 0x... | Etherscan"
-const PHISHING_LABEL_PATTERNS = [/^Fake_Phishing/i, /^Phish:/i, /^Exploiter/i];
-
-// Patterns in the page body that indicate a scam/phishing warning.
-const SCAM_BODY_PATTERNS = [
-    /used in a\s+(?:\w+\s+)?phishing scam/i,
-    /used in a\s+(?:\w+\s+)?scam/i,
-    /wallet\s+drainer/i,
-];
-
-/**
- * Parse the Etherscan address page HTML to extract label info.
- * Exported for unit testing (no fetch needed).
- *
- * @param {string} html - Raw HTML of the Etherscan address page.
- * @returns {{ label: string|null, isPhishing: boolean, warning: string|null }}
- */
-function parseEtherscanPage(html) {
-    // Extract <title> content
-    const titleMatch = html.match(/<title[^>]*>([^<]+)<\/title>/i);
-    let label = null;
-    let isPhishing = false;
-    let warning = null;
-
-    if (titleMatch) {
-        const title = titleMatch[1].trim();
-        // Title: "LABEL | Address: 0x... | Etherscan" or "Address: 0x... | Etherscan"
-        const labelMatch = title.match(/^(.+?)\s*\|\s*Address:/);
-        if (labelMatch) {
-            const candidate = labelMatch[1].trim();
-            // Only treat as a label if it's not just "Address" (unlabeled addresses)
-            if (candidate.toLowerCase() !== "address") {
-                label = candidate;
-            }
-        }
-    }
-
-    // Check label against phishing patterns
-    if (label) {
-        for (const pat of PHISHING_LABEL_PATTERNS) {
-            if (pat.test(label)) {
-                isPhishing = true;
-                warning = `Etherscan labels this address as "${label}" (Phish/Hack).`;
-                break;
-            }
-        }
-    }
-
-    // Check page body for scam warning banners
-    if (!isPhishing) {
-        for (const pat of SCAM_BODY_PATTERNS) {
-            if (pat.test(html)) {
-                isPhishing = true;
-                warning = label
-                    ? `Etherscan labels this address as "${label}" and reports it was used in a scam.`
-                    : "Etherscan reports this address was flagged for phishing/scam activity.";
-                break;
-            }
-        }
-    }
-
-    return { label, isPhishing, warning };
-}
-
-/**
- * Fetch an address page from Etherscan and check for scam/phishing labels.
- * Returns a warning object if the address is flagged, or null.
- * Network failures return null silently (best-effort check).
- *
- * @param {string} address - Ethereum address to check.
- * @returns {Promise<{type: string, message: string, severity: string}|null>}
- */
-async function checkEtherscanLabel(address) {
-    try {
-        const resp = await fetch(ETHERSCAN_BASE + address, {
-            headers: { Accept: "text/html" },
-        });
-        if (!resp.ok) return null;
-        const html = await resp.text();
-        const result = parseEtherscanPage(html);
-        if (result.isPhishing) {
-            return {
-                type: "etherscan-phishing",
-                message: result.warning,
-                severity: "critical",
-            };
-        }
-        return null;
-    } catch {
-        // Network errors are expected — Etherscan may rate-limit or block.
-        return null;
-    }
-}
-
-module.exports = { parseEtherscanPage, checkEtherscanLabel };
--- a/src/shared/phishingDomains.js
+++ b/src/shared/phishingDomains.js
@@ -1,133 +0,0 @@
-// Domain-based phishing detection using MetaMask's eth-phishing-detect blocklist.
-// Fetches the blocklist at runtime, caches it in memory, and checks hostnames.
-//
-// The blocklist source:
-// https://github.com/MetaMask/eth-phishing-detect  (src/config.json)
-//
-// The config uses { blacklist: [...], whitelist: [...], fuzzylist: [...] }.
-// We check exact hostname and parent-domain matches against the blacklist,
-// with whitelist overrides.
-
-const BLOCKLIST_URL =
-    "https://raw.githubusercontent.com/MetaMask/eth-phishing-detect/main/src/config.json";
-
-const CACHE_TTL_MS = 24 * 60 * 60 * 1000; // 24 hours
-
-let blacklistSet = new Set();
-let whitelistSet = new Set();
-let lastFetchTime = 0;
-let fetchPromise = null;
-
-/**
- * Load a pre-parsed config into the in-memory sets.
- * Used for testing and for loading from cache.
- *
- * @param {{ blacklist?: string[], whitelist?: string[] }} config
- */
-function loadConfig(config) {
-    blacklistSet = new Set(
-        (config.blacklist || []).map((d) => d.toLowerCase()),
-    );
-    whitelistSet = new Set(
-        (config.whitelist || []).map((d) => d.toLowerCase()),
-    );
-    lastFetchTime = Date.now();
-}
-
-/**
- * Generate hostname variants for subdomain matching.
- * "sub.evil.com" yields ["sub.evil.com", "evil.com"].
- *
- * @param {string} hostname
- * @returns {string[]}
- */
-function hostnameVariants(hostname) {
-    const h = hostname.toLowerCase();
-    const variants = [h];
-    const parts = h.split(".");
-    // Parent domains: a.b.c.d -> b.c.d, c.d
-    for (let i = 1; i < parts.length - 1; i++) {
-        variants.push(parts.slice(i).join("."));
-    }
-    return variants;
-}
-
-/**
- * Check if a hostname is on the phishing blocklist.
- * Checks exact hostname and all parent domains.
- * Whitelisted domains are never flagged.
- *
- * @param {string} hostname - The hostname to check.
- * @returns {boolean}
- */
-function isPhishingDomain(hostname) {
-    if (!hostname) return false;
-    const variants = hostnameVariants(hostname);
-    // Whitelist takes priority
-    for (const v of variants) {
-        if (whitelistSet.has(v)) return false;
-    }
-    for (const v of variants) {
-        if (blacklistSet.has(v)) return true;
-    }
-    return false;
-}
-
-/**
- * Fetch the latest blocklist from the MetaMask repo.
- * De-duplicates concurrent fetches. Results are cached for CACHE_TTL_MS.
- *
- * @returns {Promise<void>}
- */
-async function updatePhishingList() {
-    // Skip if recently fetched
-    if (Date.now() - lastFetchTime < CACHE_TTL_MS && blacklistSet.size > 0) {
-        return;
-    }
-
-    // De-duplicate concurrent calls
-    if (fetchPromise) return fetchPromise;
-
-    fetchPromise = (async () => {
-        try {
-            const resp = await fetch(BLOCKLIST_URL);
-            if (!resp.ok) throw new Error("HTTP " + resp.status);
-            const config = await resp.json();
-            loadConfig(config);
-        } catch {
-            // Silently fail — we'll retry next time.
-        } finally {
-            fetchPromise = null;
-        }
-    })();
-
-    return fetchPromise;
-}
-
-/**
- * Return the current blocklist size (for diagnostics).
- *
- * @returns {number}
- */
-function getBlocklistSize() {
-    return blacklistSet.size;
-}
-
-/**
- * Reset internal state (for testing).
- */
-function _reset() {
-    blacklistSet = new Set();
-    whitelistSet = new Set();
-    lastFetchTime = 0;
-    fetchPromise = null;
-}
-
-module.exports = {
-    isPhishingDomain,
-    updatePhishingList,
-    loadConfig,
-    getBlocklistSize,
-    hostnameVariants,
-    _reset,
-};
--- a/src/shared/scamlist.js
+++ b/src/shared/scamlist.js
--- a/src/shared/state.js
+++ b/src/shared/state.js
@@ -23,10 +23,8 @@ const DEFAULT_STATE = {
    hideFraudContracts: true,
    hideDustTransactions: true,
    dustThresholdGwei: 100000,
-    utcTimestamps: false,
    fraudContracts: [],
    tokenHolderCache: {},
-    theme: "system",
 };

 const state = {
@@ -55,10 +53,8 @@ async function saveState() {
        hideFraudContracts: state.hideFraudContracts,
        hideDustTransactions: state.hideDustTransactions,
        dustThresholdGwei: state.dustThresholdGwei,
-        utcTimestamps: state.utcTimestamps,
        fraudContracts: state.fraudContracts,
        tokenHolderCache: state.tokenHolderCache,
-        theme: state.theme,
        currentView: state.currentView,
        selectedWallet: state.selectedWallet,
        selectedAddress: state.selectedAddress,
@@ -112,11 +108,8 @@ async function loadState() {
            saved.dustThresholdGwei !== undefined
                ? saved.dustThresholdGwei
                : 100000;
-        state.utcTimestamps =
-            saved.utcTimestamps !== undefined ? saved.utcTimestamps : false;
        state.fraudContracts = saved.fraudContracts || [];
        state.tokenHolderCache = saved.tokenHolderCache || {};
-        state.theme = saved.theme || "system";
        state.currentView = saved.currentView || null;
        state.selectedWallet =
            saved.selectedWallet !== undefined ? saved.selectedWallet : null;
--- a/tests/etherscanLabels.test.js
+++ b/tests/etherscanLabels.test.js
@@ -1,100 +0,0 @@
-const { parseEtherscanPage } = require("../src/shared/etherscanLabels");
-
-describe("etherscanLabels", () => {
-    describe("parseEtherscanPage", () => {
-        test("detects Fake_Phishing label in title", () => {
-            const html = `<html><head><title>Fake_Phishing184810 | Address: 0x00000c07...3ea470000 | Etherscan</title></head><body></body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBe("Fake_Phishing184810");
-            expect(result.isPhishing).toBe(true);
-            expect(result.warning).toContain("Fake_Phishing184810");
-            expect(result.warning).toContain("Phish/Hack");
-        });
-
-        test("detects Fake_Phishing with different number", () => {
-            const html = `<html><head><title>Fake_Phishing5169 | Address: 0x3e0defb8...99a7a8a74 | Etherscan</title></head><body></body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBe("Fake_Phishing5169");
-            expect(result.isPhishing).toBe(true);
-        });
-
-        test("detects Exploiter label", () => {
-            const html = `<html><head><title>Exploiter 42 | Address: 0xabcdef...1234 | Etherscan</title></head><body></body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBe("Exploiter 42");
-            expect(result.isPhishing).toBe(true);
-        });
-
-        test("detects scam warning in body text", () => {
-            const html =
-                `<html><head><title>Address: 0xabcdef...1234 | Etherscan</title></head>` +
-                `<body>There are reports that this address was used in a Phishing scam.</body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBeNull();
-            expect(result.isPhishing).toBe(true);
-            expect(result.warning).toContain("phishing/scam");
-        });
-
-        test("detects scam warning with label in body", () => {
-            const html =
-                `<html><head><title>SomeScammer | Address: 0xabcdef...1234 | Etherscan</title></head>` +
-                `<body>There are reports that this address was used in a scam.</body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBe("SomeScammer");
-            expect(result.isPhishing).toBe(true);
-            expect(result.warning).toContain("SomeScammer");
-        });
-
-        test("returns clean result for legitimate address", () => {
-            const html = `<html><head><title>vitalik.eth | Address: 0xd8dA6BF2...37aA96045 | Etherscan</title></head><body>Overview</body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBe("vitalik.eth");
-            expect(result.isPhishing).toBe(false);
-            expect(result.warning).toBeNull();
-        });
-
-        test("returns clean result for unlabeled address", () => {
-            const html = `<html><head><title>Address: 0x1234567890...abcdef | Etherscan</title></head><body>Overview</body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBeNull();
-            expect(result.isPhishing).toBe(false);
-            expect(result.warning).toBeNull();
-        });
-
-        test("handles exchange labels correctly (not phishing)", () => {
-            const html = `<html><head><title>Coinbase 10 | Address: 0xa9d1e08c...b81d3e43 | Etherscan</title></head><body>Overview</body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBe("Coinbase 10");
-            expect(result.isPhishing).toBe(false);
-        });
-
-        test("handles contract names correctly (not phishing)", () => {
-            const html = `<html><head><title>Beacon Deposit Contract | Address: 0x00000000...03d7705Fa | Etherscan</title></head><body>Overview</body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBe("Beacon Deposit Contract");
-            expect(result.isPhishing).toBe(false);
-        });
-
-        test("handles empty HTML gracefully", () => {
-            const result = parseEtherscanPage("");
-            expect(result.label).toBeNull();
-            expect(result.isPhishing).toBe(false);
-            expect(result.warning).toBeNull();
-        });
-
-        test("handles malformed title tag", () => {
-            const html = `<html><head><title></title></head><body></body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.label).toBeNull();
-            expect(result.isPhishing).toBe(false);
-        });
-
-        test("detects wallet drainer warning", () => {
-            const html =
-                `<html><head><title>Address: 0xabc...def | Etherscan</title></head>` +
-                `<body>This is a known wallet drainer contract.</body></html>`;
-            const result = parseEtherscanPage(html);
-            expect(result.isPhishing).toBe(true);
-        });
-    });
-});
--- a/tests/phishingDomains.test.js
+++ b/tests/phishingDomains.test.js
@@ -1,166 +0,0 @@
-const {
-    isPhishingDomain,
-    loadConfig,
-    getBlocklistSize,
-    hostnameVariants,
-    _reset,
-} = require("../src/shared/phishingDomains");
-
-// Reset state before each test to avoid cross-test contamination.
-beforeEach(() => {
-    _reset();
-});
-
-describe("phishingDomains", () => {
-    describe("hostnameVariants", () => {
-        test("returns exact hostname plus parent domains", () => {
-            const variants = hostnameVariants("sub.evil.com");
-            expect(variants).toEqual(["sub.evil.com", "evil.com"]);
-        });
-
-        test("returns just the hostname for a bare domain", () => {
-            const variants = hostnameVariants("example.com");
-            expect(variants).toEqual(["example.com"]);
-        });
-
-        test("handles deep subdomain chains", () => {
-            const variants = hostnameVariants("a.b.c.d.com");
-            expect(variants).toEqual([
-                "a.b.c.d.com",
-                "b.c.d.com",
-                "c.d.com",
-                "d.com",
-            ]);
-        });
-
-        test("lowercases hostnames", () => {
-            const variants = hostnameVariants("Evil.COM");
-            expect(variants).toEqual(["evil.com"]);
-        });
-    });
-
-    describe("loadConfig + isPhishingDomain", () => {
-        test("detects exact blacklisted domain", () => {
-            loadConfig({
-                blacklist: ["evil-phishing.com", "scam-swap.xyz"],
-                whitelist: [],
-            });
-            expect(isPhishingDomain("evil-phishing.com")).toBe(true);
-            expect(isPhishingDomain("scam-swap.xyz")).toBe(true);
-        });
-
-        test("returns false for clean domains", () => {
-            loadConfig({
-                blacklist: ["evil-phishing.com"],
-                whitelist: [],
-            });
-            expect(isPhishingDomain("etherscan.io")).toBe(false);
-            expect(isPhishingDomain("uniswap.org")).toBe(false);
-        });
-
-        test("detects subdomain of blacklisted domain", () => {
-            loadConfig({
-                blacklist: ["evil-phishing.com"],
-                whitelist: [],
-            });
-            expect(isPhishingDomain("app.evil-phishing.com")).toBe(true);
-            expect(isPhishingDomain("sub.app.evil-phishing.com")).toBe(true);
-        });
-
-        test("whitelist overrides blacklist", () => {
-            loadConfig({
-                blacklist: ["metamask.io"],
-                whitelist: ["metamask.io"],
-            });
-            expect(isPhishingDomain("metamask.io")).toBe(false);
-        });
-
-        test("whitelist on parent domain overrides blacklist", () => {
-            loadConfig({
-                blacklist: ["sub.legit.com"],
-                whitelist: ["legit.com"],
-            });
-            expect(isPhishingDomain("sub.legit.com")).toBe(false);
-        });
-
-        test("case-insensitive matching", () => {
-            loadConfig({
-                blacklist: ["Evil-Phishing.COM"],
-                whitelist: [],
-            });
-            expect(isPhishingDomain("evil-phishing.com")).toBe(true);
-            expect(isPhishingDomain("EVIL-PHISHING.COM")).toBe(true);
-        });
-
-        test("returns false for empty/null hostname", () => {
-            loadConfig({
-                blacklist: ["evil.com"],
-                whitelist: [],
-            });
-            expect(isPhishingDomain("")).toBe(false);
-            expect(isPhishingDomain(null)).toBe(false);
-        });
-
-        test("getBlocklistSize reflects loaded config", () => {
-            loadConfig({
-                blacklist: ["a.com", "b.com", "c.com"],
-                whitelist: ["d.com"],
-            });
-            expect(getBlocklistSize()).toBe(3);
-        });
-
-        test("handles config with no blacklist/whitelist keys", () => {
-            loadConfig({});
-            expect(isPhishingDomain("anything.com")).toBe(false);
-            expect(getBlocklistSize()).toBe(0);
-        });
-
-        test("re-loading config replaces previous data", () => {
-            loadConfig({
-                blacklist: ["old-scam.com"],
-                whitelist: [],
-            });
-            expect(isPhishingDomain("old-scam.com")).toBe(true);
-
-            loadConfig({
-                blacklist: ["new-scam.com"],
-                whitelist: [],
-            });
-            expect(isPhishingDomain("old-scam.com")).toBe(false);
-            expect(isPhishingDomain("new-scam.com")).toBe(true);
-        });
-    });
-
-    describe("real-world MetaMask blocklist patterns", () => {
-        test("detects known phishing domains from MetaMask list", () => {
-            loadConfig({
-                blacklist: [
-                    "uniswap-trade.web.app",
-                    "hopprotocol.pro",
-                    "blast-pools.pages.dev",
-                ],
-                whitelist: [],
-            });
-            expect(isPhishingDomain("uniswap-trade.web.app")).toBe(true);
-            expect(isPhishingDomain("hopprotocol.pro")).toBe(true);
-            expect(isPhishingDomain("blast-pools.pages.dev")).toBe(true);
-        });
-
-        test("does not flag legitimate domains whitelisted by MetaMask", () => {
-            loadConfig({
-                blacklist: ["opensea.pro"],
-                whitelist: [
-                    "opensea.io",
-                    "metamask.io",
-                    "etherscan.io",
-                    "opensea.pro",
-                ],
-            });
-            expect(isPhishingDomain("opensea.io")).toBe(false);
-            expect(isPhishingDomain("metamask.io")).toBe(false);
-            expect(isPhishingDomain("etherscan.io")).toBe(false);
-            // opensea.pro is both blacklisted and whitelisted — whitelist wins
-            expect(isPhishingDomain("opensea.pro")).toBe(false);
-        });
-    });
-});