fix: show user's own address for swap transactions in tx list

For swap/contract interactions, display the user's own (labelled) address instead of the contract address, so users can see which of their addresses initiated the swap. Fixes #55
2026-02-28 08:57:08 -08:00
29 changed files with 1074 additions and 2086 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,3 @@ dist/
 # Yarn
 .yarn-integrity
 package-lock.json
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -56,37 +56,9 @@
                    &lt; Back
                </button>
                <h2 class="font-bold mb-2">Add Wallet</h2>
                <!-- Mode selector tabs -->
                <div
                    class="flex border-b border-border mb-3"
                    id="add-wallet-tabs"
                >
                    <button
                        id="tab-mnemonic"
                        class="px-3 py-1.5 cursor-pointer text-xs font-bold border border-border border-b-bg bg-bg -mb-px"
                    >
                        From Phrase
                    </button>
                    <button
                        id="tab-privkey"
                        class="px-3 py-1.5 cursor-pointer text-xs text-muted border border-dashed border-border-light border-b-transparent -mb-px hover:bg-fg hover:text-bg"
                    >
                        From Key
                    </button>
                    <button
                        id="tab-xprv"
                        class="px-3 py-1.5 cursor-pointer text-xs text-muted border border-dashed border-border-light border-b-transparent -mb-px hover:bg-fg hover:text-bg"
                    >
                        From xprv
                    </button>
                </div>
                <!-- Mnemonic form section -->
                <div id="add-wallet-section-mnemonic">
                <p class="mb-2">
-                        Enter your 12 or 24 word recovery phrase below, or click
+                    Enter your 12 or 24 word recovery phrase below, or click the
-                        the button to roll the die for a new one.
+                    button to roll the die for a new one.
                </p>
                <div class="mb-1 flex justify-end">
                    <button
@@ -107,54 +79,14 @@
                </div>
                <div
                    id="add-wallet-phrase-warning"
-                        class="text-xs mb-2 border border-border border-dashed p-2"
+                    class="text-xs mb-2 border border-border border-dashed p-2 hidden"
                        style="visibility: hidden"
                >
-                        Write these words down and keep them safe. Anyone with
+                    Write these words down and keep them safe. Anyone with them
-                        them can take your funds; if you lose them, your wallet
+                    can take your funds; if you lose them, your wallet is gone.
                        is gone.
                </div>
                </div>
                <!-- Private key form section -->
                <div id="add-wallet-section-privkey" class="hidden">
                    <p class="mb-2">
                        Paste your private key below. This wallet will have a
                        single address.
                    </p>
                    <div class="mb-2">
                        <input
                            type="password"
                            id="import-private-key"
                            class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                            placeholder="0x..."
                        />
                    </div>
                </div>
                <!-- Extended key (xprv) form section -->
                <div id="add-wallet-section-xprv" class="hidden">
                    <p class="mb-2">
                        Paste your extended private key (xprv) below. This will
                        import the HD wallet and scan for used addresses.
                    </p>
                    <div class="mb-2">
                        <input
                            type="password"
                            id="import-xprv-key"
                            class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                            placeholder="xprv..."
                        />
                    </div>
                </div>
                <!-- Shared password fields -->
                <div class="mb-2" id="add-wallet-password-section">
                    <label class="block mb-1">Choose a password</label>
-                    <p
+                    <p class="text-xs text-muted mb-1">
                        class="text-xs text-muted mb-1"
                        id="add-wallet-password-hint"
                    >
                        This password encrypts your recovery phrase on this
                        device. You will need it to send funds.
                    </p>
@@ -175,6 +107,64 @@
                <button
                    id="btn-add-wallet-confirm"
                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                >
                    Add
                </button>
                <div class="mt-3 text-xs text-muted">
                    Have a private key instead?
                    <button
                        id="btn-add-wallet-import-key"
                        class="underline cursor-pointer bg-transparent border-none text-fg text-xs font-mono p-0"
                    >
                        Import private key
                    </button>
                </div>
            </div>
            <!-- ============ IMPORT PRIVATE KEY ============ -->
            <div id="view-import-key" class="view hidden">
                <button
                    id="btn-import-key-back"
                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mb-2"
                >
                    &lt; Back
                </button>
                <h2 class="font-bold mb-2">Import Private Key</h2>
                <p class="mb-2">
                    Paste your private key below. This wallet will have a single
                    address.
                </p>
                <div class="mb-2">
                    <input
                        type="password"
                        id="import-private-key"
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                        placeholder="0x..."
                    />
                </div>
                <div class="mb-2" id="import-key-password-section">
                    <label class="block mb-1">Choose a password</label>
                    <p class="text-xs text-muted mb-1">
                        This password encrypts your private key on this device.
                        You will need it to send funds.
                    </p>
                    <input
                        type="password"
                        id="import-key-password"
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
                <div class="mb-2" id="import-key-password-confirm-section">
                    <label class="block mb-1">Confirm password</label>
                    <input
                        type="password"
                        id="import-key-password-confirm"
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
                <button
                    id="btn-import-key-confirm"
                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                >
                    Import
                </button>
@@ -185,7 +175,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"
@@ -315,26 +305,6 @@
                    >
                        + Token
                    </button>
                    <div class="relative">
                        <button
                            id="btn-more-menu"
                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                            aria-label="More actions"
                        >
                            &middot;&middot;&middot;
                        </button>
                        <div
                            id="more-menu-dropdown"
                            class="hidden absolute right-0 top-full mt-1 border border-border bg-bg z-50 whitespace-nowrap py-1"
                        >
                            <button
                                id="btn-export-privkey"
                                class="block w-full text-left px-4 py-1.5 text-xs font-light text-muted hover:bg-hover hover:text-fg cursor-pointer"
                            >
                                Export Private Key
                            </button>
                        </div>
                    </div>
                </div>
                <!-- transactions -->
@@ -348,61 +318,6 @@
                </div>
            </div>
            <!-- ============ EXPORT PRIVATE KEY VIEW ============ -->
            <div id="view-export-privkey" class="view hidden">
                <button
                    id="btn-export-privkey-back"
                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mb-2"
                >
                    &lt; Back
                </button>
                <div
                    id="export-privkey-jazzicon"
                    class="flex justify-center mt-1 mb-3"
                ></div>
                <h2 class="font-bold mb-1">Export Private Key</h2>
                <p class="text-xs mb-1" id="export-privkey-title"></p>
                <p class="text-xs mb-3">
                    <span id="export-privkey-dot"></span>
                    <span
                        id="export-privkey-address"
                        class="cursor-pointer"
                        title="Click to copy"
                    ></span>
                </p>
                <p class="text-xs mb-3 text-muted">
                    Warning: anyone with this private key can access and
                    transfer all funds from this address. Never share it.
                </p>
                <div
                    id="export-privkey-flash"
                    class="text-xs mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <div id="export-privkey-password-section" class="mb-2">
                    <label class="block mb-1">Password</label>
                    <input
                        type="password"
                        id="export-privkey-password"
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                        placeholder="Enter your password to continue"
                    />
                    <button
                        id="btn-export-privkey-confirm"
                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mt-2"
                    >
                        Reveal
                    </button>
                </div>
                <div id="export-privkey-result" class="hidden">
                    <div
                        id="export-privkey-value"
                        class="bg-danger-well rounded p-2 font-mono text-xs break-all cursor-pointer mb-1"
                        title="Click to copy"
                    ></div>
                </div>
            </div>
            <!-- ============ ADDRESS-TOKEN DETAIL VIEW ============ -->
            <div id="view-address-token" class="view hidden">
                <button
@@ -507,11 +422,6 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                        placeholder="Address (0x...) or ENS name"
                    />
                    <div
                        id="send-to-error"
                        class="text-xs"
                        style="min-height: 1.25rem; color: #cc0000"
                    ></div>
                </div>
                <div class="mb-2">
                    <div class="flex justify-between mb-1">
@@ -581,53 +491,22 @@
                    <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
+                <div id="confirm-warnings" class="mb-2 hidden"></div>
                    id="confirm-warnings"
                    class="mb-2"
                    style="visibility: hidden"
                ></div>
                <div
                    id="confirm-recipient-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 address has ZERO transaction
                        history. This may indicate a fresh or unused address.
                        Double-check the address before sending.
                    </div>
                </div>
                <div
                    id="confirm-errors"
-                    class="mb-2 border border-border border-dashed p-2"
+                    class="mb-2 border border-border border-dashed p-2 hidden"
                    style="visibility: hidden; min-height: 1.25rem"
                ></div>
                <div class="mb-2">
                    <label class="block mb-1 text-xs">Password</label>
                    <input
                        type="password"
                        id="confirm-tx-password"
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
                <div
                    id="confirm-tx-password-error"
                    class="text-xs mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <button
                    id="btn-confirm-send"
                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                >
-                    Sign &amp; Send
+                    Send
                </button>
            </div>
@@ -652,7 +531,6 @@
            <!-- ============ TX SUCCESS ============ -->
            <div id="view-success-tx" class="view hidden">
                <h2 class="font-bold mb-2">Transaction Confirmed</h2>
                <div id="success-tx-decoded" class="mb-3 hidden text-xs"></div>
                <div class="mb-3">
                    <div class="text-xs text-muted mb-1">Amount</div>
                    <div id="success-tx-summary" class="font-bold"></div>
@@ -706,6 +584,42 @@
                </button>
            </div>
            <!-- ============ PASSWORD MODAL ============ -->
            <div
                id="password-modal"
                class="hidden fixed inset-0 bg-bg flex items-center justify-center z-50"
            >
                <div class="border border-border p-4 bg-bg w-80">
                    <h2 class="font-bold mb-2">Enter Password</h2>
                    <p class="text-xs text-muted mb-2">
                        Your password is needed to authorize this transaction.
                    </p>
                    <input
                        type="password"
                        id="modal-password"
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg mb-2"
                    />
                    <div
                        id="modal-password-error"
                        class="text-xs mb-2 border border-border border-dashed p-1 hidden"
                    ></div>
                    <div class="flex gap-2">
                        <button
                            id="btn-modal-confirm"
                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                        >
                            Confirm
                        </button>
                        <button
                            id="btn-modal-cancel"
                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                        >
                            Cancel
                        </button>
                    </div>
                </div>
            </div>
            <!-- ============ RECEIVE ============ -->
            <div id="view-receive" class="view hidden">
                <button
@@ -722,10 +636,9 @@
                <div class="flex justify-center mb-3">
                    <canvas id="receive-qr"></canvas>
                </div>
-                <div
+                <div class="border border-border p-2 break-all mb-3 text-xs">
-                    class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
+                    <span id="receive-dot"></span>
-                >
+                    <span id="receive-address" class="select-all"></span>
                    <span id="receive-address-block" class="select-all"></span>
                    <span id="receive-etherscan-link"></span>
                </div>
                <button
@@ -736,8 +649,7 @@
                </button>
                <div
                    id="receive-erc20-warning"
-                    class="text-xs border border-border border-dashed p-2 mt-3"
+                    class="text-xs border border-border border-dashed p-2 mt-3 hidden"
                    style="visibility: hidden"
                ></div>
            </div>
@@ -765,8 +677,7 @@
                </div>
                <div
                    id="add-token-info"
-                    class="text-xs text-muted mb-2 min-h-[1.25rem]"
+                    class="text-xs text-muted mb-2 hidden"
                    style="visibility: hidden"
                ></div>
                <div class="mb-2">
                    <label class="block mb-1 text-xs text-muted"
@@ -824,7 +735,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"
@@ -832,17 +743,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">
@@ -924,12 +824,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">
@@ -965,8 +859,7 @@
                </p>
                <div
                    id="delete-wallet-flash"
-                    class="text-xs text-red-500 mb-2 min-h-[1.25rem]"
+                    class="text-xs text-red-500 mb-2 hidden"
                    style="visibility: hidden"
                ></div>
                <div class="mb-2">
                    <label class="block mb-1">Password</label>
@@ -1041,8 +934,7 @@
                    />
                    <div
                        id="settings-addtoken-info"
-                        class="text-xs text-muted mt-1 min-h-[1.25rem]"
+                        class="text-xs text-muted mt-1 hidden"
                        style="visibility: hidden"
                    ></div>
                    <button
                        id="btn-settings-addtoken-manual"
@@ -1107,12 +999,7 @@
                            class="text-xs"
                        ></div>
                    </div>
-                </div>
+                    <div id="tx-detail-rawdata-section" class="hidden">
                <div class="mb-4">
                    <div class="text-xs text-muted mb-1">Transaction hash</div>
                    <div id="tx-detail-hash" class="text-xs break-all"></div>
                </div>
                <div id="tx-detail-rawdata-section" class="mb-4 hidden">
                        <div class="text-xs text-muted mb-1">Raw data</div>
                        <div
                            id="tx-detail-rawdata"
@@ -1120,6 +1007,11 @@
                        ></div>
                    </div>
                </div>
                <div class="mb-4">
                    <div class="text-xs text-muted mb-1">Transaction hash</div>
                    <div id="tx-detail-hash" class="text-xs break-all"></div>
                </div>
            </div>
            <!-- ============ TRANSACTION APPROVAL ============ -->
            <div id="view-approve-tx" class="view hidden">
@@ -1166,11 +1058,7 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
-                <div
+                <div id="approve-tx-error" class="text-xs hidden mb-2"></div>
                    id="approve-tx-error"
                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <div class="flex justify-between">
                    <button
                        id="btn-approve-tx"
@@ -1197,10 +1085,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;
@@ -1235,11 +1121,7 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
-                <div
+                <div id="approve-sign-error" class="text-xs hidden mb-2"></div>
                    id="approve-sign-error"
                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <div class="flex justify-between">
                    <button
                        id="btn-approve-sign"
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -6,11 +6,11 @@ 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");
 const addWallet = require("./views/addWallet");
 const importKey = require("./views/importKey");
 const addressDetail = require("./views/addressDetail");
 const addressToken = require("./views/addressToken");
 const send = require("./views/send");
@@ -54,6 +54,7 @@ const ctx = {
    renderWalletList,
    doRefreshAndRender,
    showAddWalletView: () => addWallet.show(),
    showImportKeyView: () => importKey.show(),
    showAddressDetail: () => addressDetail.show(),
    showAddressToken: () => addressToken.show(),
    showAddTokenView: () => addToken.show(),
@@ -73,7 +74,6 @@ const RESTORABLE_VIEWS = new Set([
    "receive",
    "settings",
    "settings-addtoken",
    "confirm-tx",
    "transaction",
    "success-tx",
    "error-tx",
@@ -127,13 +127,6 @@ function restoreView() {
        case "settings-addtoken":
            settingsAddToken.show();
            break;
        case "confirm-tx":
            if (state.viewData && state.viewData.pendingTx) {
                confirmTx.restore();
            } else {
                fallbackView();
            }
            break;
        case "transaction":
            if (state.viewData && state.viewData.tx) {
                transactionDetail.render();
@@ -177,7 +170,6 @@ async function init() {
    }
    await loadState();
    applyTheme(state.theme);
    // Auto-default active address
    if (
@@ -217,6 +209,7 @@ async function init() {
    welcome.init(ctx);
    addWallet.init(ctx);
    importKey.init(ctx);
    home.init(ctx);
    addressDetail.init(ctx);
    addressToken.init(ctx);
--- a/src/popup/styles/main.css
+++ b/src/popup/styles/main.css
@@ -11,36 +11,10 @@
    --color-border-light: #cccccc;
    --color-hover: #eeeeee;
    --color-well: #f5f5f5;
    --color-danger-well: #fef2f2;
    --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").classList.add("hidden");
    $("add-token-info").style.visibility = "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.classList.add("hidden");
            infoEl.style.visibility = "hidden";
        }
    });
--- a/src/popup/views/addWallet.js
+++ b/src/popup/views/addWallet.js
@@ -3,101 +3,31 @@ const {
    generateMnemonic,
    hdWalletFromMnemonic,
    isValidMnemonic,
    addressFromPrivateKey,
    hdWalletFromXprv,
    isValidXprv,
 } = require("../../shared/wallet");
 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"];
 const PASSWORD_HINTS = {
    mnemonic:
        "This password encrypts your recovery phrase on this device. You will need it to send funds.",
    privkey:
        "This password encrypts your private key on this device. You will need it to send funds.",
    xprv: "This password encrypts your key on this device. You will need it to send funds.",
 };
 function switchMode(mode) {
    currentMode = mode;
    for (const m of MODES) {
        $("add-wallet-section-" + m).classList.toggle("hidden", m !== mode);
        const tab = $("tab-" + m);
        const isActive = m === mode;
        // Active: bold, solid border on top/sides, no bottom border (connects to content)
        tab.classList.toggle("font-bold", isActive);
        tab.classList.toggle("border-solid", isActive);
        tab.classList.toggle("border-border", isActive);
        tab.classList.toggle("border-b-bg", isActive);
        tab.classList.toggle("bg-bg", isActive);
        // Inactive: muted text, dashed border on top/sides, transparent bottom, hover invert
        tab.classList.toggle("text-muted", !isActive);
        tab.classList.toggle("border-dashed", !isActive);
        tab.classList.toggle("border-border-light", !isActive);
        tab.classList.toggle("border-b-transparent", !isActive);
        tab.classList.toggle("hover:bg-fg", !isActive);
        tab.classList.toggle("hover:text-bg", !isActive);
    }
    $("add-wallet-password-hint").textContent = PASSWORD_HINTS[mode];
 }
 function show() {
    $("wallet-mnemonic").value = "";
    $("import-private-key").value = "";
    $("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");
 }
-function validatePassword() {
+function init(ctx) {
-    const pw = $("add-wallet-password").value;
+    $("btn-generate-phrase").addEventListener("click", () => {
-    const pw2 = $("add-wallet-password-confirm").value;
+        $("wallet-mnemonic").value = generateMnemonic();
-    if (!pw) {
+        $("add-wallet-phrase-warning").classList.remove("hidden");
-        showFlash("Please choose a password.");
+    });
        return null;
    }
    if (pw.length < 12) {
        showFlash("Password must be at least 12 characters.");
        return null;
    }
    if (pw !== pw2) {
        showFlash("Passwords do not match.");
        return null;
    }
    return pw;
 }
-async function importMnemonic(ctx) {
+    $("btn-add-wallet-confirm").addEventListener("click", async () => {
        const mnemonic = $("wallet-mnemonic").value.trim();
        if (!mnemonic) {
-        showFlash("Enter a recovery phrase or press the die to generate one.");
+            showFlash(
                "Enter a recovery phrase or press the die to generate one.",
            );
            return;
        }
        const words = mnemonic.split(/\s+/);
@@ -113,19 +43,34 @@ async function importMnemonic(ctx) {
            showFlash("Invalid recovery phrase. Check for typos.");
            return;
        }
-    const pw = validatePassword();
+        const pw = $("add-wallet-password").value;
-    if (!pw) return;
+        const pw2 = $("add-wallet-password-confirm").value;
-    const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
+        if (!pw) {
-    const xpubDup = findWalletByXpub(xpub);
+            showFlash("Please choose a password.");
    if (xpubDup) {
        showFlash(
            "This recovery phrase is already added (" + xpubDup.name + ").",
        );
            return;
        }
-    const addrDup = findWalletByAddress(firstAddress);
+        if (pw.length < 12) {
-    if (addrDup) {
+            showFlash("Password must be at least 12 characters.");
-        showFlash("Address already exists in wallet (" + addrDup.name + ").");
+            return;
        }
        if (pw !== pw2) {
            showFlash("Passwords do not match.");
            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) {
            showFlash(
                "This recovery phrase is already added (" +
                    duplicate.name +
                    ").",
            );
            return;
        }
        const encrypted = await encryptWithPassword(mnemonic, pw);
@@ -164,138 +109,8 @@ async function importMnemonic(ctx) {
        }
        ctx.doRefreshAndRender();
 }
 async function importPrivateKey(ctx) {
    const key = $("import-private-key").value.trim();
    if (!key) {
        showFlash("Please enter your private key.");
        return;
    }
    let addr;
    try {
        addr = addressFromPrivateKey(key);
    } catch (e) {
        showFlash("Invalid private key.");
        return;
    }
    const pw = validatePassword();
    if (!pw) return;
    const duplicate = findWalletByAddress(addr);
    if (duplicate) {
        showFlash(
            "This address already exists in wallet (" + duplicate.name + ").",
        );
        return;
    }
    const encrypted = await encryptWithPassword(key, pw);
    const walletNum = state.wallets.length + 1;
    state.wallets.push({
        type: "key",
        name: "Wallet " + walletNum,
        encryptedSecret: encrypted,
        addresses: [{ address: addr, balance: "0.0000", tokenBalances: [] }],
    });
    state.hasWallet = true;
    await saveState();
    ctx.renderWalletList();
    showView("main");
    ctx.doRefreshAndRender();
 }
 async function importXprvKey(ctx) {
    const xprv = $("import-xprv-key").value.trim();
    if (!xprv) {
        showFlash("Please enter your extended private key.");
        return;
    }
    if (!isValidXprv(xprv)) {
        showFlash("Invalid extended private key.");
        return;
    }
    let result;
    try {
        result = hdWalletFromXprv(xprv);
    } catch (e) {
        showFlash("Invalid extended private key.");
        return;
    }
    const { xpub, firstAddress } = result;
    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();
    if (!pw) return;
    const encrypted = await encryptWithPassword(xprv, pw);
    const walletNum = state.wallets.length + 1;
    const wallet = {
        type: "xprv",
        name: "Wallet " + walletNum,
        xpub: xpub,
        encryptedSecret: encrypted,
        nextIndex: 1,
        addresses: [
            { address: firstAddress, balance: "0.0000", tokenBalances: [] },
        ],
    };
    state.wallets.push(wallet);
    state.hasWallet = true;
    await saveState();
    ctx.renderWalletList();
    showView("main");
    // Scan for used HD addresses beyond index 0.
    showFlash("Scanning for addresses...", 30000);
    const scan = await scanForAddresses(xpub, state.rpcUrl);
    if (scan.addresses.length > 1) {
        wallet.addresses = scan.addresses.map((a) => ({
            address: a.address,
            balance: "0.0000",
            tokenBalances: [],
        }));
        wallet.nextIndex = scan.nextIndex;
        await saveState();
        ctx.renderWalletList();
        showFlash("Found " + scan.addresses.length + " addresses.");
    } else {
        showFlash("Ready.", 1000);
    }
    ctx.doRefreshAndRender();
 }
 function init(ctx) {
    // Tab click handlers
    $("tab-mnemonic").addEventListener("click", () => switchMode("mnemonic"));
    $("tab-privkey").addEventListener("click", () => switchMode("privkey"));
    $("tab-xprv").addEventListener("click", () => switchMode("xprv"));
    // Generate mnemonic
    $("btn-generate-phrase").addEventListener("click", () => {
        $("wallet-mnemonic").value = generateMnemonic();
        $("add-wallet-phrase-warning").style.visibility = "visible";
    });
    // Import / confirm
    $("btn-add-wallet-confirm").addEventListener("click", async () => {
        if (currentMode === "mnemonic") {
            await importMnemonic(ctx);
        } else if (currentMode === "privkey") {
            await importPrivateKey(ctx);
        } else if (currentMode === "xprv") {
            await importXprvKey(ctx);
        }
    });
    // Back button
    $("btn-add-wallet-back").addEventListener("click", () => {
        if (!state.hasWallet) {
            showView("welcome");
@@ -304,6 +119,11 @@ function init(ctx) {
            showView("main");
        }
    });
    $("btn-add-wallet-import-key").addEventListener(
        "click",
        ctx.showImportKeyView,
    );
 }
 module.exports = { init, show };
--- a/src/popup/views/addressDetail.js
+++ b/src/popup/views/addressDetail.js
@@ -2,14 +2,11 @@ const {
    $,
    showView,
    showFlash,
    flashCopyFeedback,
    balanceLinesForAddress,
    addressDotHtml,
    addressTitle,
    escapeHtml,
    truncateMiddle,
    renderAddressHtml,
    attachCopyHandlers,
 } = require("./helpers");
 const { state, currentAddress, saveState } = require("../../shared/state");
 const { formatUsd, getAddressValueUsd } = require("../../shared/prices");
@@ -18,18 +15,23 @@ const {
    filterTransactions,
 } = require("../../shared/transactions");
 const { resolveEnsNames } = require("../../shared/ens");
-const {
+const { updateSendBalance, renderSendTokenSelect } = require("./send");
    updateSendBalance,
    renderSendTokenSelect,
    resetSendValidation,
 } = require("./send");
 const { log } = require("../../shared/log");
 const makeBlockie = require("ethereum-blockies-base64");
 const { decryptWithPassword } = require("../../shared/vault");
 const { getSignerForAddress } = require("../../shared/wallet");
 let ctx;
 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 function etherscanAddressLink(address) {
    return `https://etherscan.io/address/${address}`;
 }
 function show() {
    state.selectedToken = null;
    const wallet = state.wallets[state.selectedWallet];
@@ -47,18 +49,22 @@ function show() {
    img.style.imageRendering = "pixelated";
    img.style.borderRadius = "50%";
    blockieEl.appendChild(img);
-    const addrTitle = addressTitle(addr.address, state.wallets);
+    $("address-dot").innerHTML = addressDotHtml(addr.address);
-    $("address-line").innerHTML = renderAddressHtml(addr.address, {
+    $("address-full").dataset.full = addr.address;
-        title: addrTitle,
+    $("address-full").textContent = addr.address;
-        ensName: addr.ensName,
+    const addrLink = etherscanAddressLink(addr.address);
-    });
+    $("address-etherscan-link").innerHTML =
-    $("address-line").dataset.full = addr.address;
+        `<a href="${addrLink}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    attachCopyHandlers($("address-line"));
    const usdTotal = formatUsd(getAddressValueUsd(addr));
    $("address-usd-total").innerHTML = usdTotal || "&nbsp;";
    const ensEl = $("address-ens");
-    // ENS is now shown inside renderAddressHtml, hide the separate element
+    if (addr.ensName) {
        ensEl.innerHTML =
            addressDotHtml(addr.address) + escapeHtml(addr.ensName);
        ensEl.classList.remove("hidden");
    } else {
        ensEl.classList.add("hidden");
    }
    $("address-balances").innerHTML = balanceLinesForAddress(
        addr,
        state.trackedTokens,
@@ -82,39 +88,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()) +
+        pad(d.getSeconds())
        tzStr
    );
 }
@@ -201,12 +186,10 @@ function renderTransactions(txs) {
    let html = "";
    let i = 0;
    for (const tx of txs) {
        // For swap transactions, show the user's own labelled wallet
        // address instead of the contract address (see issue #55).
        const counterparty =
-            tx.direction === "contract" && tx.directionLabel === "Swap"
+            tx.direction === "contract"
                ? tx.from
-                : tx.direction === "sent" || tx.direction === "contract"
+                : tx.direction === "sent"
                  ? tx.to
                  : tx.from;
        const ensName = ensNameMap.get(counterparty) || null;
@@ -245,6 +228,13 @@ function renderTransactions(txs) {
 function init(_ctx) {
    ctx = _ctx;
    $("address-full").addEventListener("click", () => {
        const addr = $("address-full").dataset.full;
        if (addr) {
            navigator.clipboard.writeText(addr);
            showFlash("Copied!");
        }
    });
    $("btn-address-back").addEventListener("click", () => {
        ctx.renderWalletList();
@@ -265,7 +255,6 @@ function init(_ctx) {
        $("send-token").classList.remove("hidden");
        $("send-token-static").classList.add("hidden");
        updateSendBalance();
        resetSendValidation();
        showView("send");
    });
@@ -274,101 +263,6 @@ function init(_ctx) {
    });
    $("btn-add-token").addEventListener("click", ctx.showAddTokenView);
    // More menu dropdown
    const moreBtn = $("btn-more-menu");
    const moreDropdown = $("more-menu-dropdown");
    moreBtn.addEventListener("click", (e) => {
        e.stopPropagation();
        const isOpen = !moreDropdown.classList.toggle("hidden");
        moreBtn.classList.toggle("bg-fg", isOpen);
        moreBtn.classList.toggle("text-bg", isOpen);
    });
    document.addEventListener("click", () => {
        moreDropdown.classList.add("hidden");
        moreBtn.classList.remove("bg-fg", "text-bg");
    });
    moreDropdown.addEventListener("click", (e) => {
        e.stopPropagation();
    });
    $("btn-export-privkey").addEventListener("click", () => {
        moreDropdown.classList.add("hidden");
        moreBtn.classList.remove("bg-fg", "text-bg");
        const wallet = state.wallets[state.selectedWallet];
        const addr = wallet.addresses[state.selectedAddress];
        const blockieEl = $("export-privkey-jazzicon");
        blockieEl.innerHTML = "";
        const bImg = document.createElement("img");
        bImg.src = makeBlockie(addr.address);
        bImg.width = 48;
        bImg.height = 48;
        bImg.style.imageRendering = "pixelated";
        bImg.style.borderRadius = "50%";
        blockieEl.appendChild(bImg);
        $("export-privkey-title").textContent =
            wallet.name + " \u2014 Address " + (state.selectedAddress + 1);
        const exportAddrContainer = $("export-privkey-dot").parentElement;
        exportAddrContainer.innerHTML = renderAddressHtml(addr.address);
        attachCopyHandlers(exportAddrContainer);
        $("export-privkey-password").value = "";
        $("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 = "";
        showView("export-privkey");
    });
    $("btn-export-privkey-confirm").addEventListener("click", async () => {
        const password = $("export-privkey-password").value;
        if (!password) {
            $("export-privkey-flash").textContent = "Password is required.";
            $("export-privkey-flash").style.visibility = "visible";
            return;
        }
        const btn = $("btn-export-privkey-confirm");
        btn.disabled = true;
        btn.classList.add("text-muted");
        const wallet = state.wallets[state.selectedWallet];
        try {
            const secret = await decryptWithPassword(
                wallet.encryptedSecret,
                password,
            );
            const signer = getSignerForAddress(
                wallet,
                state.selectedAddress,
                secret,
            );
            const privateKey = signer.privateKey;
            $("export-privkey-password-section").classList.add("hidden");
            $("export-privkey-value").textContent = privateKey;
            $("export-privkey-result").classList.remove("hidden");
            $("export-privkey-flash").style.visibility = "hidden";
        } catch {
            $("export-privkey-flash").textContent = "Wrong password.";
            $("export-privkey-flash").style.visibility = "visible";
        } finally {
            btn.disabled = false;
            btn.classList.remove("text-muted");
        }
    });
    $("export-privkey-value").addEventListener("click", () => {
        const key = $("export-privkey-value").textContent;
        if (key) {
            navigator.clipboard.writeText(key);
            showFlash("Copied!");
            flashCopyFeedback($("export-privkey-value"));
        }
    });
    $("btn-export-privkey-back").addEventListener("click", () => {
        $("export-privkey-value").textContent = "";
        $("export-privkey-password").value = "";
        show();
    });
 }
 module.exports = { init, show };
--- a/src/popup/views/addressToken.js
+++ b/src/popup/views/addressToken.js
@@ -5,17 +5,14 @@ const {
    $,
    showView,
    showFlash,
    flashCopyFeedback,
    addressDotHtml,
    addressTitle,
    escapeHtml,
    truncateMiddle,
    balanceLine,
    renderAddressHtml,
    attachCopyHandlers,
 } = require("./helpers");
 const { state, currentAddress, saveState } = require("../../shared/state");
-const { TOKEN_BY_ADDRESS, resolveSymbol } = require("../../shared/tokenList");
+const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
 const {
    formatUsd,
    getPrice,
@@ -26,52 +23,38 @@ const {
    filterTransactions,
 } = require("../../shared/transactions");
 const { resolveEnsNames } = require("../../shared/ens");
-const {
+const { updateSendBalance, renderSendTokenSelect } = require("./send");
    updateSendBalance,
    renderSendTokenSelect,
    resetSendValidation,
 } = require("./send");
 const { log } = require("../../shared/log");
 const makeBlockie = require("ethereum-blockies-base64");
 let ctx;
 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 function etherscanAddressLink(address) {
    return `https://etherscan.io/address/${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()) +
+        pad(d.getSeconds())
        tzStr
    );
 }
@@ -104,7 +87,6 @@ function show() {
    // Determine token symbol and balance
    let symbol, amount, price;
    const knownToken = TOKEN_BY_ADDRESS.get(tokenId.toLowerCase());
    if (tokenId === "ETH") {
        symbol = "ETH";
        amount = parseFloat(addr.balance || "0");
@@ -113,11 +95,7 @@ function show() {
        const tb = (addr.tokenBalances || []).find(
            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
        );
-        symbol = resolveSymbol(
+        symbol = tb ? tb.symbol : "?";
            tokenId,
            addr.tokenBalances,
            state.trackedTokens,
        );
        amount = tb ? parseFloat(tb.balance || "0") : 0;
        price = getPrice(symbol);
    }
@@ -139,13 +117,12 @@ function show() {
    blockieEl.appendChild(img);
    // Address line
-    const addrTitle = addressTitle(addr.address, state.wallets);
+    $("address-token-dot").innerHTML = addressDotHtml(addr.address);
-    $("address-token-line").innerHTML = renderAddressHtml(addr.address, {
+    $("address-token-full").dataset.full = addr.address;
-        title: addrTitle,
+    $("address-token-full").textContent = addr.address;
-        ensName: addr.ensName,
+    const addrLink = etherscanAddressLink(addr.address);
-    });
+    $("address-token-etherscan-link").innerHTML =
-    $("address-token-line").dataset.full = addr.address;
+        `<a href="${addrLink}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    attachCopyHandlers($("address-token-line"));
    // USD total for this token only
    const usdVal = price ? amount * price : 0;
@@ -161,33 +138,20 @@ function show() {
        const tb = (addr.tokenBalances || []).find(
            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
        );
-        const tracked = (state.trackedTokens || []).find(
+        const tokenName = tb && tb.name ? escapeHtml(tb.name) : null;
-            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
+        const tokenSymbol = tb && tb.symbol ? escapeHtml(tb.symbol) : null;
-        );
+        const tokenDecimals = tb && tb.decimals != null ? tb.decimals : null;
        const rawName =
            (tb && tb.name) ||
            (tracked && tracked.name) ||
            (knownToken && knownToken.name) ||
            null;
        const rawSymbol =
            (tb && tb.symbol) ||
            (tracked && tracked.symbol) ||
            (knownToken && knownToken.symbol) ||
            null;
        const tokenName = rawName ? escapeHtml(rawName) : null;
        const tokenSymbol = rawSymbol ? escapeHtml(rawSymbol) : null;
        const tokenDecimals =
            tb && tb.decimals != null
                ? tb.decimals
                : tracked && tracked.decimals != null
                  ? tracked.decimals
                  : knownToken && knownToken.decimals != null
                    ? knownToken.decimals
                    : null;
        const tokenHolders = tb && tb.holders != null ? tb.holders : null;
        const dot = addressDotHtml(tokenId);
        const tokenLink = `https://etherscan.io/token/${escapeHtml(tokenId)}`;
        const knownToken = TOKEN_BY_ADDRESS.get(tokenId.toLowerCase());
        const projectUrl = knownToken && knownToken.url ? knownToken.url : null;
        let infoHtml = `<div class="font-bold mb-2">Contract Address</div>`;
-        infoHtml += `<div class="mb-2">${renderAddressHtml(tokenId)}</div>`;
+        infoHtml +=
            `<div class="flex items-center mb-2">${dot}` +
            `<span class="break-all underline decoration-dashed cursor-pointer" id="address-token-contract-copy" data-copy="${escapeHtml(tokenId)}">${escapeHtml(tokenId)}</span>` +
            `<a href="${tokenLink}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>` +
            `</div>`;
        if (tokenName)
            infoHtml += `<div class="mb-1"><span class="text-muted">Name:</span> ${tokenName}</div>`;
        if (tokenSymbol)
@@ -199,7 +163,6 @@ function show() {
        if (projectUrl)
            infoHtml += `<div class="mb-1"><span class="text-muted">Website:</span> <a href="${escapeHtml(projectUrl)}" target="_blank" rel="noopener" class="underline decoration-dashed">${escapeHtml(projectUrl)}</a></div>`;
        contractInfo.innerHTML = infoHtml;
        attachCopyHandlers(contractInfo);
        contractInfo.classList.remove("hidden");
    } else {
        contractInfo.innerHTML = "";
@@ -321,12 +284,19 @@ function renderTransactions(txs) {
 function init(_ctx) {
    ctx = _ctx;
    $("address-token-full").addEventListener("click", () => {
        const addr = $("address-token-full").dataset.full;
        if (addr) {
            navigator.clipboard.writeText(addr);
            showFlash("Copied!");
        }
    });
    $("address-token-contract-info").addEventListener("click", (e) => {
        const copyEl = e.target.closest("[data-copy]");
        if (copyEl) {
            navigator.clipboard.writeText(copyEl.dataset.copy);
            showFlash("Copied!");
            flashCopyFeedback(copyEl);
        }
    });
@@ -358,13 +328,26 @@ function init(_ctx) {
        $("send-token").classList.add("hidden");
        let staticHtml = `<div class="font-bold">${escapeHtml(currentSymbol)}</div>`;
        if (tokenId !== "ETH") {
-            staticHtml += `<div class="text-xs">${renderAddressHtml(tokenId)}</div>`;
+            const dot = addressDotHtml(tokenId);
            const link = `https://etherscan.io/token/${tokenId}`;
            const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
            staticHtml +=
                `<div class="flex items-center text-xs">${dot}` +
                `<span class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(tokenId)}">${escapeHtml(tokenId)}</span>` +
                extLink +
                `</div>`;
        }
        $("send-token-static").innerHTML = staticHtml;
        $("send-token-static").classList.remove("hidden");
-        attachCopyHandlers($("send-token-static"));
+        // Attach copy handler for the contract address
        const copyEl = $("send-token-static").querySelector("[data-copy]");
        if (copyEl) {
            copyEl.addEventListener("click", () => {
                navigator.clipboard.writeText(copyEl.dataset.copy);
                showFlash("Copied!");
            });
        }
        updateSendBalance();
        resetSendValidation();
        showView("send");
    });
--- a/src/popup/views/approval.js
+++ b/src/popup/views/approval.js
@@ -1,12 +1,9 @@
 const {
    $,
    addressDotHtml,
    addressTitle,
    escapeHtml,
    showView,
    showError,
    hideError,
    renderAddressHtml,
    attachCopyHandlers,
 } = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 const { formatEther, formatUnits, Interface, toUtf8String } = require("ethers");
@@ -18,11 +15,28 @@ const uniswap = require("../../shared/uniswap");
 const runtime =
    typeof browser !== "undefined" ? browser.runtime : chrome.runtime;
 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 const erc20Iface = new Interface(ERC20_ABI);
 function approvalAddressHtml(address) {
    const dot = addressDotHtml(address);
    const link = `https://etherscan.io/address/${address}`;
    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    const title = addressTitle(address, state.wallets);
-    return renderAddressHtml(address, { title });
+    let html = "";
    if (title) {
        html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
        html += `<div class="break-all">${escapeHtml(address)}${extLink}</div>`;
    } else {
        html += `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(address)}</span>${extLink}</div>`;
    }
    return html;
 }
 function formatTxValue(val) {
@@ -37,6 +51,10 @@ function tokenLabel(address) {
    return t ? t.symbol : null;
 }
 function etherscanTokenLink(address) {
    return `https://etherscan.io/token/${address}`;
 }
 // Try to decode calldata using known ABIs.
 // Returns { name, description, details } or null.
 function decodeCalldata(data, toAddress) {
@@ -60,12 +78,10 @@ function decodeCalldata(data, toAddress) {
                    "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                );
                const isUnlimited = rawAmount === maxUint;
                const amountRaw = isUnlimited
                    ? "Unlimited"
                    : formatTxValue(formatUnits(rawAmount, tokenDecimals));
                const amountStr = isUnlimited
                    ? "Unlimited"
-                    : amountRaw + (tokenSymbol ? " " + tokenSymbol : "");
+                    : formatTxValue(formatUnits(rawAmount, tokenDecimals)) +
                      (tokenSymbol ? " " + tokenSymbol : "");
                return {
                    name: "Token Approval",
@@ -84,11 +100,7 @@ function decodeCalldata(data, toAddress) {
                            value: spender,
                            address: spender,
                        },
-                        {
+                        { label: "Amount", value: amountStr },
                            label: "Amount",
                            value: amountStr,
                            rawValue: amountRaw,
                        },
                    ],
                };
            }
@@ -96,11 +108,9 @@ function decodeCalldata(data, toAddress) {
            if (parsed.name === "transfer") {
                const to = parsed.args[0];
                const rawAmount = parsed.args[1];
                const amountRaw = formatTxValue(
                    formatUnits(rawAmount, tokenDecimals),
                );
                const amountStr =
-                    amountRaw + (tokenSymbol ? " " + tokenSymbol : "");
+                    formatTxValue(formatUnits(rawAmount, tokenDecimals)) +
                    (tokenSymbol ? " " + tokenSymbol : "");
                return {
                    name: "Token Transfer",
@@ -115,11 +125,7 @@ function decodeCalldata(data, toAddress) {
                            isToken: true,
                        },
                        { label: "Recipient", value: to, address: to },
-                        {
+                        { label: "Amount", value: amountStr },
                            label: "Amount",
                            value: amountStr,
                            rawValue: amountRaw,
                        },
                    ],
                };
            }
@@ -152,41 +158,20 @@ function showTxApproval(details) {
    // If this is an ERC-20 call, try to extract the real recipient and amount
    const decoded = decodeCalldata(details.txParams.data, toAddr || "");
    if (decoded && decoded.details) {
        let decodedTokenAddr = null;
        let decodedTokenSymbol = null;
        for (const d of decoded.details) {
            if (d.label === "Recipient" && d.address) {
                pendingTxDetails.to = d.address;
            }
            if (d.label === "Amount") {
-                pendingTxDetails.amount = d.rawValue || d.value;
+                pendingTxDetails.amount = d.value;
            }
            if (d.label === "Token In" && d.isToken && d.address) {
                const t = TOKEN_BY_ADDRESS.get(d.address.toLowerCase());
                if (t) {
                    decodedTokenAddr = d.address;
                    decodedTokenSymbol = t.symbol;
                }
            }
        }
        if (token) {
            pendingTxDetails.token = toAddr;
            pendingTxDetails.tokenSymbol = token.symbol;
        } else if (decodedTokenAddr) {
            pendingTxDetails.token = decodedTokenAddr;
            pendingTxDetails.tokenSymbol = decodedTokenSymbol;
        }
    }
    // Carry decoded calldata info through to success/error views
    if (decoded) {
        pendingTxDetails.decoded = {
            name: decoded.name,
            description: decoded.description,
            details: decoded.details,
        };
    }
    $("approve-tx-hostname").textContent = details.hostname;
    $("approve-tx-from").innerHTML = approvalAddressHtml(state.activeAddress);
@@ -198,6 +183,10 @@ function showTxApproval(details) {
            toHtml += `<div class="font-bold mb-1">${escapeHtml(symbol)}</div>`;
        }
        toHtml += approvalAddressHtml(toAddr);
        if (symbol) {
            const link = etherscanTokenLink(toAddr);
            toHtml = toHtml.replace("</div>", "") + ""; // approvalAddressHtml already has etherscan link
        }
        $("approve-tx-to").innerHTML = toHtml;
    } else {
        $("approve-tx-to").innerHTML = escapeHtml("(contract creation)");
@@ -219,9 +208,12 @@ function showTxApproval(details) {
            detailsHtml += `<div class="text-muted">${escapeHtml(d.label)}</div>`;
            if (d.address) {
                if (d.isToken) {
                    const tLink = etherscanTokenLink(d.address);
                    detailsHtml += `<div class="font-bold">${escapeHtml(tokenLabel(d.address) || "Unknown token")}</div>`;
                }
                    detailsHtml += approvalAddressHtml(d.address);
                } else {
                    detailsHtml += approvalAddressHtml(d.address);
                }
            } else {
                detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
            }
@@ -241,11 +233,7 @@ function showTxApproval(details) {
        $("approve-tx-data-section").classList.add("hidden");
    }
    $("approve-tx-password").value = "";
    hideError("approve-tx-error");
    showView("approve-tx");
    attachCopyHandlers("view-approve-tx");
 }
 function decodeHexMessage(hex) {
@@ -325,20 +313,19 @@ 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");
        }
    }
    $("approve-sign-password").value = "";
-    hideError("approve-sign-error");
+    $("approve-sign-error").classList.add("hidden");
    $("btn-approve-sign").disabled = false;
    $("btn-approve-sign").classList.remove("text-muted");
    showView("approve-sign");
    attachCopyHandlers("view-approve-sign");
 }
 function show(id) {
@@ -361,7 +348,6 @@ function show(id) {
        $("approve-address").innerHTML = approvalAddressHtml(
            state.activeAddress,
        );
        attachCopyHandlers("view-approve-site");
        $("approve-remember").checked = state.rememberSiteChoice;
    });
 }
@@ -400,10 +386,11 @@ function init(ctx) {
    $("btn-approve-tx").addEventListener("click", () => {
        const password = $("approve-tx-password").value;
        if (!password) {
-            showError("approve-tx-error", "Please enter your password.");
+            $("approve-tx-error").textContent = "Please enter your password.";
            $("approve-tx-error").classList.remove("hidden");
            return;
        }
-        hideError("approve-tx-error");
+        $("approve-tx-error").classList.add("hidden");
        $("btn-approve-tx").disabled = true;
        $("btn-approve-tx").classList.add("text-muted");
@@ -439,10 +426,11 @@ function init(ctx) {
    $("btn-approve-sign").addEventListener("click", () => {
        const password = $("approve-sign-password").value;
        if (!password) {
-            showError("approve-sign-error", "Please enter your password.");
+            $("approve-sign-error").textContent = "Please enter your password.";
            $("approve-sign-error").classList.remove("hidden");
            return;
        }
-        hideError("approve-sign-error");
+        $("approve-sign-error").classList.add("hidden");
        $("btn-approve-sign").disabled = true;
        $("btn-approve-sign").classList.add("text-muted");
@@ -460,7 +448,8 @@ function init(ctx) {
                } else {
                    const msg =
                        (response && response.error) || "Signing failed.";
-                    showError("approve-sign-error", msg);
+                    $("approve-sign-error").textContent = msg;
                    $("approve-sign-error").classList.remove("hidden");
                    $("btn-approve-sign").disabled = false;
                    $("btn-approve-sign").classList.remove("text-muted");
                }
--- a/src/popup/views/confirmTx.js
+++ b/src/popup/views/confirmTx.js
@@ -1,6 +1,6 @@
-// Transaction confirmation view with inline password.
+// Transaction confirmation view + password modal.
-// Shows transaction details, warnings, errors. On Sign & Send,
+// Shows transaction details, warnings, errors. On proceed, opens
-// reads inline password, decrypts secret, signs and broadcasts.
+// password modal, decrypts secret, signs and broadcasts.
 const {
    parseEther,
@@ -14,12 +14,9 @@ const {
    showError,
    hideError,
    showView,
    showFlash,
    flashCopyFeedback,
    addressTitle,
    addressDotHtml,
    escapeHtml,
    renderAddressHtml,
    attachCopyHandlers,
 } = require("./helpers");
 const { state } = require("../../shared/state");
 const { getSignerForAddress } = require("../../shared/wallet");
@@ -32,13 +29,21 @@ const { log } = require("../../shared/log");
 const makeBlockie = require("ethereum-blockies-base64");
 const txStatus = require("./txStatus");
 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 let pendingTx = null;
-function restore() {
+function etherscanTokenLink(address) {
-    const d = state.viewData;
+    return `https://etherscan.io/token/${address}`;
-    if (d && d.pendingTx) {
+}
-        show(d.pendingTx);
+
-    }
+function etherscanAddressLink(address) {
    return `https://etherscan.io/address/${address}`;
 }
 function blockieHtml(address) {
@@ -48,10 +53,22 @@ function blockieHtml(address) {
 function confirmAddressHtml(address, ensName, title) {
    const blockie = blockieHtml(address);
-    return (
+    const dot = addressDotHtml(address);
-        `<div class="mb-1">${blockie}</div>` +
+    const link = etherscanAddressLink(address);
-        renderAddressHtml(address, { title, ensName })
+    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
-    );
+    let html = `<div class="mb-1">${blockie}</div>`;
    if (title) {
        html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
    }
    if (ensName) {
        html += `<div class="flex items-center font-bold">${title ? "" : dot}${escapeHtml(ensName)}</div>`;
    }
    html +=
        `<div class="flex items-center">${title || ensName ? "" : dot}` +
        `<span class="break-all">${escapeHtml(address)}</span>` +
        extLink +
        `</div>`;
    return html;
 }
 function valueWithUsd(text, usdAmount) {
@@ -78,12 +95,11 @@ function show(txInfo) {
    // Token contract section (ERC-20 only)
    const tokenSection = $("confirm-token-section");
    if (isErc20) {
-        $("confirm-token-contract").innerHTML = renderAddressHtml(
+        const link = etherscanTokenLink(txInfo.token);
-            txInfo.token,
+        $("confirm-token-contract").innerHTML =
-            {},
+            escapeHtml(txInfo.token) +
-        );
+            ` <a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
        tokenSection.classList.remove("hidden");
        attachCopyHandlers(tokenSection);
    } else {
        tokenSection.classList.add("hidden");
    }
@@ -149,10 +165,9 @@ function show(txInfo) {
                    `<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.classList.add("hidden");
        warningsEl.style.visibility = "hidden";
    }
    // Check for errors
@@ -190,32 +205,21 @@ 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.classList.add("hidden");
        errorsEl.style.visibility = "hidden";
        sendBtn.disabled = false;
        sendBtn.classList.remove("text-muted");
    }
    // Reset password field and error
    $("confirm-tx-password").value = "";
    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");
    attachCopyHandlers("view-confirm-tx");
    // Reset recipient warning to hidden (space always reserved, no layout shift)
    $("confirm-recipient-warning").style.visibility = "hidden";
    estimateGas(txInfo);
    checkRecipientHistory(txInfo);
 }
 async function estimateGas(txInfo) {
@@ -258,40 +262,39 @@ async function estimateGas(txInfo) {
    }
 }
-async function checkRecipientHistory(txInfo) {
+function showPasswordModal() {
-    const el = $("confirm-recipient-warning");
+    $("modal-password").value = "";
-    try {
+    hideError("modal-password-error");
-        const provider = getProvider(state.rpcUrl);
+    $("password-modal").classList.remove("hidden");
-        // Skip warning for contract addresses — they may legitimately
+}
-        // have zero outgoing transactions (getTransactionCount returns
+
-        // the nonce, i.e. sent-tx count only).
+function hidePasswordModal() {
-        const code = await provider.getCode(txInfo.to);
+    $("password-modal").classList.add("hidden");
        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);
    }
 }
 function init(ctx) {
-    $("btn-confirm-send").addEventListener("click", async () => {
+    $("btn-confirm-send").addEventListener("click", () => {
-        const password = $("confirm-tx-password").value;
+        showPasswordModal();
    });
    $("btn-confirm-back").addEventListener("click", () => {
        showView("send");
    });
    $("btn-modal-cancel").addEventListener("click", () => {
        hidePasswordModal();
    });
    $("btn-modal-confirm").addEventListener("click", async () => {
        const password = $("modal-password").value;
        if (!password) {
-            showError(
+            showError("modal-password-error", "Please enter your password.");
                "confirm-tx-password-error",
                "Please enter your password.",
            );
            return;
        }
        const wallet = state.wallets[state.selectedWallet];
        let decryptedSecret;
-        hideError("confirm-tx-password-error");
+        hideError("modal-password-error");
        try {
            decryptedSecret = await decryptWithPassword(
@@ -299,12 +302,11 @@ function init(ctx) {
                password,
            );
        } catch (e) {
-            showError("confirm-tx-password-error", "Wrong password.");
+            showError("modal-password-error", "Wrong password.");
            return;
        }
-        $("btn-confirm-send").disabled = true;
+        hidePasswordModal();
        $("btn-confirm-send").classList.add("text-muted");
        let tx;
        try {
@@ -341,15 +343,8 @@ function init(ctx) {
            decryptedSecret = null;
            const hash = tx ? tx.hash : null;
            txStatus.showError(pendingTx, hash, e.shortMessage || e.message);
        } finally {
            $("btn-confirm-send").disabled = false;
            $("btn-confirm-send").classList.remove("text-muted");
        }
    });
    $("btn-confirm-back").addEventListener("click", () => {
        showView("send");
    });
 }
-module.exports = { init, show, restore };
+module.exports = { init, show };
--- 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,21 +29,17 @@ 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;
        }
        const btn = $("btn-delete-wallet-confirm");
        btn.disabled = true;
        btn.classList.add("text-muted");
        const walletIdx = deleteWalletIndex;
        const wallet = state.wallets[walletIdx];
@@ -52,9 +48,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
@@ -13,6 +13,7 @@ const { state, saveState } = require("../../shared/state");
 const VIEWS = [
    "welcome",
    "add-wallet",
    "import-key",
    "main",
    "address",
    "address-token",
@@ -30,7 +31,6 @@ const VIEWS = [
    "approve-site",
    "approve-tx",
    "approve-sign",
    "export-privkey",
 ];
 function $(id) {
@@ -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);
+    $(id).classList.add("hidden");
    el.textContent = "";
    el.style.visibility = "hidden";
 }
 function showView(name) {
@@ -208,47 +206,38 @@ function addressTitle(address, wallets) {
 // Render an address with color dot, optional ENS name, optional title,
 // and optional truncation. Title and ENS are shown as bold labels above
 // the full address.
 // Delegates to renderAddressHtml for consistent output.
 function formatAddressHtml(address, ensName, maxLen, title) {
-    return renderAddressHtml(address, { title, ensName, maxLen });
+    const dot = addressDotHtml(address);
    const displayAddr = maxLen ? truncateMiddle(address, maxLen) : address;
    if (title || ensName) {
        let html = "";
        if (title) {
            html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
        }
        if (ensName) {
            html += `<div class="flex items-center font-bold">${title ? "" : dot}${escapeHtml(ensName)}</div>`;
        }
        html += `<div class="break-all">${escapeHtml(displayAddr)}</div>`;
        return html;
    }
    return `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(displayAddr)}</span></div>`;
 }
 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()) +
+        pad(d.getSeconds())
        tzStr
    );
 }
@@ -269,111 +258,12 @@ function timeAgo(timestamp) {
    return years + " year" + (years !== 1 ? "s" : "") + " ago";
 }
 // Shared external-link icon SVG used across all views.
 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 function etherscanAddressUrl(address) {
    return `https://etherscan.io/address/${address}`;
 }
 function etherscanLinkHtml(url) {
    return (
        `<a href="${url}" target="_blank" rel="noopener" ` +
        `class="inline-flex items-center">${EXT_ICON}</a>`
    );
 }
 // Render a copyable text span with dashed underline affordance.
 // The caller must attach click handlers via attachCopyHandlers() or
 // manually wire up [data-copy] elements after inserting the HTML.
 function copyableHtml(text, extraClass) {
    const cls =
        "underline decoration-dashed cursor-pointer" +
        (extraClass ? " " + extraClass : "");
    return `<span class="${cls}" data-copy="${escapeHtml(text)}">${escapeHtml(text)}</span>`;
 }
 // Attach click-to-copy handlers to all [data-copy] elements within
 // a container.  Safe to call multiple times on the same container.
 function attachCopyHandlers(container) {
    const root =
        typeof container === "string"
            ? document.getElementById(container)
            : container;
    if (!root) return;
    root.querySelectorAll("[data-copy]").forEach((el) => {
        el.onclick = () => {
            navigator.clipboard.writeText(el.dataset.copy);
            showFlash("Copied!");
            flashCopyFeedback(el);
        };
    });
 }
 // Unified address rendering.
 //
 // Produces consistent HTML for any Ethereum address:
 //   • Color dot
 //   • Optional title (e.g. "Wallet 1 — Address 2") shown bold above address
 //   • Optional ENS name shown bold above address
 //   • Full address (or truncated via maxLen) with dashed-underline click-to-copy
 //   • Etherscan external link icon
 //
 // Options object:
 //   title    — wallet title string (from addressTitle)
 //   ensName  — ENS name string
 //   maxLen   — if set, truncate address display (min 32 chars enforced)
 //   noLink   — if true, omit etherscan link
 //
 // After inserting the returned HTML into the DOM, call
 // attachCopyHandlers() on the parent to wire up click-to-copy.
 function renderAddressHtml(address, opts) {
    const { title, ensName, maxLen, noLink } = opts || {};
    const dot = addressDotHtml(address);
    const displayAddr = maxLen ? truncateMiddle(address, maxLen) : address;
    const link = etherscanAddressUrl(address);
    const extLink = noLink ? "" : etherscanLinkHtml(link);
    let html = "";
    if (title) {
        html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
    }
    if (ensName) {
        html += `<div class="flex items-center font-bold">${title ? "" : dot}${escapeHtml(ensName)}</div>`;
    }
    if (title || ensName) {
        html += `<div class="flex items-center">${copyableHtml(displayAddr, "break-all")}${extLink}</div>`;
    } else {
        html += `<div class="flex items-center">${dot}${copyableHtml(displayAddr, "break-all")}${extLink}</div>`;
    }
    return html;
 }
 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,
@@ -381,12 +271,6 @@ module.exports = {
    escapeHtml,
    addressTitle,
    formatAddressHtml,
    renderAddressHtml,
    copyableHtml,
    attachCopyHandlers,
    etherscanAddressUrl,
    etherscanLinkHtml,
    EXT_ICON,
    truncateMiddle,
    isoDate,
    timeAgo,
--- a/src/popup/views/home.js
+++ b/src/popup/views/home.js
@@ -2,7 +2,6 @@ const {
    $,
    showView,
    showFlash,
    flashCopyFeedback,
    balanceLinesForAddress,
    isoDate,
    timeAgo,
@@ -10,15 +9,9 @@ const {
    addressTitle,
    escapeHtml,
    truncateMiddle,
    renderAddressHtml,
    attachCopyHandlers,
 } = require("./helpers");
 const { state, saveState, currentAddress } = require("../../shared/state");
-const {
+const { updateSendBalance, renderSendTokenSelect } = require("./send");
    updateSendBalance,
    renderSendTokenSelect,
    resetSendValidation,
 } = require("./send");
 const { deriveAddressFromXpub } = require("../../shared/wallet");
 const {
    formatUsd,
@@ -71,12 +64,27 @@ function renderTotalValue() {
    }
 }
 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 function renderActiveAddress() {
    const el = $("active-address-display");
    if (!el) return;
    if (state.activeAddress) {
-        el.innerHTML = renderAddressHtml(state.activeAddress);
+        const addr = state.activeAddress;
-        attachCopyHandlers(el);
+        const dot = addressDotHtml(addr);
        const link = `https://etherscan.io/address/${addr}`;
        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", () => {
            navigator.clipboard.writeText(addr);
            showFlash("Copied!");
        });
    } else {
        el.textContent = "";
    }
@@ -95,13 +103,8 @@ function renderHomeTxList(ctx) {
    let html = "";
    let i = 0;
    for (const tx of homeTxs) {
        // For swap transactions, show the user's own labelled wallet
        // address (the one that initiated the swap) instead of the
        // contract address which is not useful in the list view.
        const counterparty =
-            tx.direction === "contract" && tx.directionLabel === "Swap"
+            tx.direction === "sent" || tx.direction === "contract"
                ? tx.from
                : tx.direction === "sent" || tx.direction === "contract"
                ? tx.to
                : tx.from;
        const dirLabel = tx.directionLabel;
@@ -227,7 +230,7 @@ function render(ctx) {
        html += `<div>`;
        html += `<div class="flex justify-between items-center bg-section py-1 px-2" style="margin:0 -0.5rem">`;
        html += `<span class="font-bold cursor-pointer wallet-name underline decoration-dashed" data-wallet="${wi}">${wallet.name}</span>`;
-        if (wallet.type === "hd" || wallet.type === "xprv") {
+        if (wallet.type === "hd") {
            html += `<button class="btn-add-address border border-border px-1 hover:bg-fg hover:text-bg cursor-pointer text-xs" data-wallet="${wi}" title="Add another address to this wallet">+</button>`;
        }
        html += `</div>`;
@@ -380,7 +383,6 @@ function init(ctx) {
        $("send-token-static").classList.add("hidden");
        renderSendTokenSelect(addr);
        updateSendBalance();
        resetSendValidation();
        showView("send");
    });
--- a/src/popup/views/importKey.js
+++ b/src/popup/views/importKey.js
@@ -0,0 +1,69 @@
 const { $, showView, showFlash } = require("./helpers");
 const { addressFromPrivateKey } = require("../../shared/wallet");
 const { encryptWithPassword } = require("../../shared/vault");
 const { state, saveState } = require("../../shared/state");
 function show() {
    $("import-private-key").value = "";
    $("import-key-password").value = "";
    $("import-key-password-confirm").value = "";
    showView("import-key");
 }
 function init(ctx) {
    $("btn-import-key-confirm").addEventListener("click", async () => {
        const key = $("import-private-key").value.trim();
        if (!key) {
            showFlash("Please enter your private key.");
            return;
        }
        let addr;
        try {
            addr = addressFromPrivateKey(key);
        } catch (e) {
            showFlash("Invalid private key.");
            return;
        }
        const pw = $("import-key-password").value;
        const pw2 = $("import-key-password-confirm").value;
        if (!pw) {
            showFlash("Please choose a password.");
            return;
        }
        if (pw.length < 12) {
            showFlash("Password must be at least 12 characters.");
            return;
        }
        if (pw !== pw2) {
            showFlash("Passwords do not match.");
            return;
        }
        const encrypted = await encryptWithPassword(key, pw);
        const walletNum = state.wallets.length + 1;
        state.wallets.push({
            type: "key",
            name: "Wallet " + walletNum,
            encryptedSecret: encrypted,
            addresses: [
                { address: addr, balance: "0.0000", tokenBalances: [] },
            ],
        });
        state.hasWallet = true;
        await saveState();
        ctx.renderWalletList();
        showView("main");
        ctx.doRefreshAndRender();
    });
    $("btn-import-key-back").addEventListener("click", () => {
        if (!state.hasWallet) {
            showView("welcome");
        } else {
            ctx.renderWalletList();
            showView("main");
        }
    });
 }
 module.exports = { init, show };
--- a/src/popup/views/receive.js
+++ b/src/popup/views/receive.js
@@ -1,26 +1,23 @@
-const {
+const { $, showView, showFlash, addressDotHtml } = require("./helpers");
    $,
    showView,
    showFlash,
    flashCopyFeedback,
    formatAddressHtml,
    addressTitle,
    attachCopyHandlers,
 } = require("./helpers");
 const { state, currentAddress } = require("../../shared/state");
 const QRCode = require("qrcode");
 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 function show() {
    const addr = currentAddress();
    const address = addr ? addr.address : "";
-    const title = address ? addressTitle(address, state.wallets) : null;
+    $("receive-dot").innerHTML = address ? addressDotHtml(address) : "";
-    const ensName = addr ? addr.ensName || null : null;
+    $("receive-address").textContent = address;
-    $("receive-address-block").innerHTML = address
+    const link = address ? `https://etherscan.io/address/${address}` : "";
-        ? formatAddressHtml(address, ensName, null, title)
+    $("receive-etherscan-link").innerHTML = link
        ? `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`
        : "";
    $("receive-address-block").dataset.full = address;
    // Etherscan link is now included in formatAddressHtml via renderAddressHtml
    $("receive-etherscan-link").innerHTML = "";
    if (address) {
        QRCode.toCanvas($("receive-qr"), address, {
            width: 200,
@@ -45,22 +42,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.classList.add("hidden");
        warningEl.style.visibility = "hidden";
    }
    showView("receive");
    attachCopyHandlers("view-receive");
 }
 function init(ctx) {
    $("btn-receive-copy").addEventListener("click", () => {
-        const addr = $("receive-address-block").dataset.full;
+        const addr = $("receive-address").textContent;
        if (addr) {
            navigator.clipboard.writeText(addr);
            showFlash("Copied!");
            flashCopyFeedback($("receive-address-block"));
        }
    });
--- a/src/popup/views/send.js
+++ b/src/popup/views/send.js
@@ -3,116 +3,21 @@
 const {
    $,
    showFlash,
    addressDotHtml,
    addressTitle,
    escapeHtml,
    renderAddressHtml,
    attachCopyHandlers,
 } = require("./helpers");
 const { state, currentAddress } = require("../../shared/state");
 let ctx;
 const { getProvider } = require("../../shared/balances");
-const { KNOWN_SYMBOLS, resolveSymbol } = require("../../shared/tokenList");
+const { KNOWN_SYMBOLS } = require("../../shared/tokenList");
 const { getAddress } = require("ethers");
-const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
+const EXT_ICON =
-
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
-/**
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
- * Validate a destination address string.
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
- * Returns { valid: true } or { valid: false, error: "..." }.
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
- */
+    `</svg></span>`;
 function validateToAddress(value) {
    const v = value.trim();
    if (!v) return { valid: false, error: "" };
    // ENS names: contains a dot and doesn't start with 0x
    if (v.includes(".") && !v.startsWith("0x")) {
        // Basic ENS format check: at least one label before and after dot
        if (/^[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/.test(v)) {
            return { valid: true };
        }
        return {
            valid: false,
            error: "Please enter a valid ENS name.",
        };
    }
    // Must look like an Ethereum address
    if (!/^0x[0-9a-fA-F]{40}$/.test(v)) {
        return {
            valid: false,
            error: "Please enter a valid Ethereum address.",
        };
    }
    // Reject zero address
    if (v.toLowerCase() === ZERO_ADDRESS) {
        return {
            valid: false,
            error: "Sending to the zero address is not allowed.",
        };
    }
    // EIP-55 checksum validation: all-lowercase is ok, otherwise must match checksum
    if (v !== v.toLowerCase()) {
        try {
            const checksummed = getAddress(v);
            if (checksummed !== v) {
                return {
                    valid: false,
                    error: "Address checksum is invalid. Please double-check the address.",
                };
            }
        } catch {
            return {
                valid: false,
                error: "Address checksum is invalid. Please double-check the address.",
            };
        }
    }
    // Warn if sending to own address
    const addr = currentAddress();
    if (addr && v.toLowerCase() === addr.address.toLowerCase()) {
        // Allow but will warn — we return valid with a warning
        return {
            valid: true,
            warning: "This is your own address. Are you sure?",
        };
    }
    return { valid: true };
 }
 function updateToValidation() {
    const input = $("send-to");
    const errorEl = $("send-to-error");
    const btn = $("btn-send-review");
    const value = input.value.trim();
    if (!value) {
        errorEl.textContent = "";
        btn.disabled = true;
        btn.classList.add("opacity-50");
        return;
    }
    const result = validateToAddress(value);
    if (!result.valid) {
        errorEl.textContent = result.error;
        errorEl.style.color = "#cc0000";
        btn.disabled = true;
        btn.classList.add("opacity-50");
    } else if (result.warning) {
        errorEl.textContent = result.warning;
        errorEl.style.color = "#b8860b";
        btn.disabled = false;
        btn.classList.remove("opacity-50");
    } else {
        errorEl.textContent = "";
        btn.disabled = false;
        btn.classList.remove("opacity-50");
    }
 }
 function isSpoofedToken(t) {
    const upper = (t.symbol || "").toUpperCase();
@@ -142,12 +47,24 @@ function renderSendTokenSelect(addr) {
 function updateSendBalance() {
    const addr = currentAddress();
    if (!addr) return;
    const dot = addressDotHtml(addr.address);
    const link = `https://etherscan.io/address/${addr.address}`;
    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    const title = addressTitle(addr.address, state.wallets);
-    $("send-from").innerHTML = renderAddressHtml(addr.address, {
+    let fromHtml = "";
-        title,
+    if (title) {
-        ensName: addr.ensName,
+        fromHtml += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
-    });
+        if (addr.ensName) {
-    attachCopyHandlers($("send-from"));
+            fromHtml += `<div>${escapeHtml(addr.ensName)}</div>`;
        }
        fromHtml += `<div class="break-all">${escapeHtml(addr.address)}${extLink}</div>`;
    } else if (addr.ensName) {
        fromHtml += `<div class="flex items-center font-bold">${dot}${escapeHtml(addr.ensName)}</div>`;
        fromHtml += `<div class="break-all">${escapeHtml(addr.address)}${extLink}</div>`;
    } else {
        fromHtml += `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(addr.address)}</span>${extLink}</div>`;
    }
    $("send-from").innerHTML = fromHtml;
    const token = state.selectedToken || $("send-token").value;
    if (token === "ETH") {
        $("send-balance").textContent =
@@ -156,11 +73,7 @@ function updateSendBalance() {
        const tb = (addr.tokenBalances || []).find(
            (t) => t.address.toLowerCase() === token.toLowerCase(),
        );
-        const symbol = resolveSymbol(
+        const symbol = tb ? tb.symbol : "?";
            token,
            addr.tokenBalances,
            state.trackedTokens,
        );
        const bal = tb ? tb.balance || "0" : "0";
        $("send-balance").textContent =
            "Current balance: " + bal + " " + symbol;
@@ -171,13 +84,6 @@ function init(_ctx) {
    ctx = _ctx;
    $("send-token").addEventListener("change", updateSendBalance);
    // Initial state: disable review button until address is entered
    $("btn-send-review").disabled = true;
    $("btn-send-review").classList.add("opacity-50");
    // Validate address on input
    $("send-to").addEventListener("input", updateToValidation);
    $("btn-send-review").addEventListener("click", async () => {
        const to = $("send-to").value.trim();
        const amount = $("send-amount").value.trim();
@@ -185,15 +91,6 @@ function init(_ctx) {
            showFlash("Please enter a recipient address.");
            return;
        }
        // Re-validate before proceeding
        const validation = validateToAddress(to);
        if (!validation.valid) {
            showFlash(
                validation.error || "Please enter a valid Ethereum address.",
            );
            return;
        }
        if (!amount || isNaN(parseFloat(amount)) || parseFloat(amount) <= 0) {
            showFlash("Please enter a valid amount.");
            return;
@@ -227,11 +124,7 @@ function init(_ctx) {
            const tb = (addr.tokenBalances || []).find(
                (t) => t.address.toLowerCase() === token.toLowerCase(),
            );
-            tokenSymbol = resolveSymbol(
+            tokenSymbol = tb ? tb.symbol : "?";
                token,
                addr.tokenBalances,
                state.trackedTokens,
            );
            tokenBalance = tb ? tb.balance || "0" : "0";
        }
@@ -258,19 +151,4 @@ function init(_ctx) {
    });
 }
-function resetSendValidation() {
+module.exports = { init, updateSendBalance, renderSendTokenSelect };
    const errorEl = $("send-to-error");
    const btn = $("btn-send-review");
    if (errorEl) errorEl.textContent = "";
    if (btn) {
        btn.disabled = true;
        btn.classList.add("opacity-50");
    }
 }
 module.exports = {
    init,
    updateSendBalance,
    renderSendTokenSelect,
    resetSendValidation,
 };
--- 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").classList.add("hidden");
    $("settings-addtoken-info").style.visibility = "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.classList.add("hidden");
            infoEl.style.visibility = "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.classList.add("hidden");
            infoEl.style.visibility = "hidden";
        }
    });
 }
--- a/src/popup/views/transactionDetail.js
+++ b/src/popup/views/transactionDetail.js
@@ -5,23 +5,33 @@ const {
    $,
    showView,
    showFlash,
-    flashCopyFeedback,
+    addressDotHtml,
    addressTitle,
    escapeHtml,
    isoDate,
    timeAgo,
    renderAddressHtml,
    attachCopyHandlers,
    copyableHtml,
    etherscanLinkHtml,
 } = require("./helpers");
 const { state } = require("../../shared/state");
 const makeBlockie = require("ethereum-blockies-base64");
 const { log, debugFetch } = require("../../shared/log");
 const { decodeCalldata } = require("./approval");
 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 let ctx;
 function copyableHtml(text, extraClass) {
    const cls =
        "underline decoration-dashed cursor-pointer" +
        (extraClass ? " " + extraClass : "");
    return `<span class="${cls}" data-copy="${escapeHtml(text)}">${escapeHtml(text)}</span>`;
 }
 function blockieHtml(address) {
    const src = makeBlockie(address);
    return `<img src="${src}" width="48" height="48" style="image-rendering:pixelated;border-radius:50%;display:inline-block">`;
@@ -29,15 +39,35 @@ function blockieHtml(address) {
 function txAddressHtml(address, ensName, title) {
    const blockie = blockieHtml(address);
-    return (
+    const dot = addressDotHtml(address);
-        `<div class="mb-1">${blockie}</div>` +
+    const link = `https://etherscan.io/address/${address}`;
-        renderAddressHtml(address, { title, ensName })
+    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
-    );
+    let html = `<div class="mb-1">${blockie}</div>`;
    if (title) {
        html += `<div class="font-bold">${escapeHtml(title)}</div>`;
    }
    if (ensName) {
        html +=
            `<div class="flex items-center">${dot}` +
            copyableHtml(ensName, "") +
            extLink +
            `</div>` +
            `<div class="break-all">` +
            copyableHtml(address, "break-all") +
            `</div>`;
    } else {
        html +=
            `<div class="flex items-center">${dot}` +
            copyableHtml(address, "break-all") +
            extLink +
            `</div>`;
    }
    return html;
 }
 function txHashHtml(hash) {
    const link = `https://etherscan.io/tx/${hash}`;
-    const extLink = etherscanLinkHtml(link);
+    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    return copyableHtml(hash, "break-all") + extLink;
 }
@@ -63,6 +93,9 @@ function show(tx) {
        },
    };
    render();
    if (tx.isContractCall || tx.direction === "contract") {
        loadCalldata(tx.hash, tx.to);
    }
 }
 function render() {
@@ -105,27 +138,30 @@ function render() {
            typeEl.textContent = tx.directionLabel;
            typeSection.classList.remove("hidden");
        }
        if (headingEl) headingEl.textContent = tx.directionLabel;
    } else {
        if (typeSection) typeSection.classList.add("hidden");
    }
        if (headingEl) headingEl.textContent = "Transaction";
    }
-    // Hide calldata and raw data sections; re-fetch if this is a contract call
+    // Hide calldata section by default; loadCalldata will show it if needed
    const calldataSection = $("tx-detail-calldata-section");
    if (calldataSection) calldataSection.classList.add("hidden");
    const rawDataSection = $("tx-detail-rawdata-section");
    if (rawDataSection) rawDataSection.classList.add("hidden");
-    if (tx.isContractCall || tx.direction === "contract") {
+    $("tx-detail-time").textContent =
-        loadCalldata(tx.hash, tx.to);
+        isoDate(tx.timestamp) + " (" + timeAgo(tx.timestamp) + ")";
    }
    const isoStr = isoDate(tx.timestamp);
    $("tx-detail-time").innerHTML =
        copyableHtml(isoStr) + " (" + escapeHtml(timeAgo(tx.timestamp)) + ")";
    $("tx-detail-status").textContent = tx.isError ? "Failed" : "Success";
    showView("transaction");
-    attachCopyHandlers("view-transaction");
+
    document
        .getElementById("view-transaction")
        .querySelectorAll("[data-copy]")
        .forEach((el) => {
            el.onclick = () => {
                navigator.clipboard.writeText(el.dataset.copy);
                showFlash("Copied!");
            };
        });
 }
 async function loadCalldata(txHash, toAddress) {
@@ -157,15 +193,9 @@ async function loadCalldata(txHash, toAddress) {
            for (const d of decoded.details || []) {
                detailsHtml += `<div class="mb-2">`;
                detailsHtml += `<div class="text-muted">${escapeHtml(d.label)}</div>`;
-                if (d.address && d.isToken) {
+                if (d.address) {
-                    // Token entry: show symbol on its own line, then address via shared renderer
+                    const dot = addressDotHtml(d.address);
-                    const tokenSymbol = d.value.match(/^(\S+)\s*\(/)?.[1];
+                    detailsHtml += `<div>${dot}${copyableHtml(d.value, "break-all")}</div>`;
                    if (tokenSymbol) {
                        detailsHtml += `<div class="font-bold">${escapeHtml(tokenSymbol)}</div>`;
                    }
                    detailsHtml += renderAddressHtml(d.address);
                } else if (d.address) {
                    detailsHtml += renderAddressHtml(d.address);
                } else {
                    detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
                }
@@ -189,11 +219,13 @@ async function loadCalldata(txHash, toAddress) {
        section.classList.remove("hidden");
-        // Bind copy handlers for new elements (including raw data now outside section)
+        // Bind copy handlers for new elements
-        const copyTargets = [section, rawSection].filter(Boolean);
+        section.querySelectorAll("[data-copy]").forEach((el) => {
-        for (const container of copyTargets) {
+            el.onclick = () => {
-            attachCopyHandlers(container);
+                navigator.clipboard.writeText(el.dataset.copy);
-        }
+                showFlash("Copied!");
            };
        });
    } catch (e) {
        log.errorf("loadCalldata failed:", e.message);
    }
--- a/src/popup/views/txStatus.js
+++ b/src/popup/views/txStatus.js
@@ -3,18 +3,22 @@
 const {
    $,
    showView,
    showFlash,
    addressDotHtml,
    addressTitle,
    escapeHtml,
    renderAddressHtml,
    attachCopyHandlers,
    copyableHtml,
    etherscanLinkHtml,
 } = require("./helpers");
 const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
 const { state, saveState } = require("../../shared/state");
 const { getProvider } = require("../../shared/balances");
 const { log } = require("../../shared/log");
 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 let ctx;
 let elapsedTimer = null;
 let pollTimer = null;
@@ -31,19 +35,38 @@ function clearTimers() {
 }
 function toAddressHtml(address) {
    const dot = addressDotHtml(address);
    const link = `https://etherscan.io/address/${address}`;
    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    const title = addressTitle(address, state.wallets);
-    return renderAddressHtml(address, { title });
+    if (title) {
        return (
            `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>` +
            `<div class="break-all">${escapeHtml(address)}${extLink}</div>`
        );
    }
    return `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(address)}</span>${extLink}</div>`;
 }
 function txHashHtml(hash) {
    const link = `https://etherscan.io/tx/${hash}`;
-    return copyableHtml(hash, "break-all") + etherscanLinkHtml(link);
+    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    return (
        `<span class="underline decoration-dashed cursor-pointer break-all" data-copy="${escapeHtml(hash)}">${escapeHtml(hash)}</span>` +
        extLink
    );
 }
-function blockNumberHtml(blockNumber) {
+function attachCopyHandlers(viewId) {
-    const num = String(blockNumber);
+    document
-    const link = `https://etherscan.io/block/${num}`;
+        .getElementById(viewId)
-    return copyableHtml(num) + etherscanLinkHtml(link);
+        .querySelectorAll("[data-copy]")
        .forEach((el) => {
            el.onclick = () => {
                navigator.clipboard.writeText(el.dataset.copy);
                showFlash("Copied!");
            };
        });
 }
 function showWait(txInfo, txHash) {
@@ -98,84 +121,18 @@ function showSuccess(txInfo, txHash, blockNumber) {
        to: txInfo.to,
        hash: txHash,
        blockNumber: blockNumber,
        decoded: txInfo.decoded || null,
    };
    renderSuccess();
    ctx.doRefreshAndRender();
 }
 function tokenLabel(address) {
    const t = TOKEN_BY_ADDRESS.get(address.toLowerCase());
    return t ? t.symbol : null;
 }
 function etherscanTokenLink(address) {
    return `https://etherscan.io/token/${address}`;
 }
 function decodedDetailsHtml(decoded) {
    if (!decoded || !decoded.details) return "";
    let html = `<div class="border border-border border-dashed p-2 mb-3">`;
    if (decoded.name) {
        html += `<div class="mb-2"><div class="text-xs text-muted mb-1">Action</div>`;
        html += `<div class="font-bold">${escapeHtml(decoded.name)}</div></div>`;
    }
    if (decoded.description) {
        html += `<div class="mb-2"><div class="text-xs text-muted mb-1">Description</div>`;
        html += `<div>${escapeHtml(decoded.description)}</div></div>`;
    }
    for (const d of decoded.details) {
        html += `<div class="mb-2">`;
        html += `<div class="text-xs text-muted mb-1">${escapeHtml(d.label)}</div>`;
        if (d.address) {
            if (d.isToken) {
                const sym = tokenLabel(d.address) || "Unknown token";
                html += `<div class="font-bold">${escapeHtml(sym)}</div>`;
                html += toAddressHtml(d.address);
            } else {
                html += toAddressHtml(d.address);
            }
        } else {
            html += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
        }
        html += `</div>`;
    }
    html += `</div>`;
    return html;
 }
 function renderSuccess() {
    const d = state.viewData;
    if (!d || !d.hash) return;
    const hasDecoded = d.decoded && d.decoded.details;
    // When decoded details are present, the Amount and To are already
    // shown inside the decoded well — hide the top-level duplicates.
    const summarySection = $("success-tx-summary").parentElement;
    const toSection = $("success-tx-to").parentElement;
    if (hasDecoded) {
        summarySection.classList.add("hidden");
        toSection.classList.add("hidden");
    } else {
        summarySection.classList.remove("hidden");
        toSection.classList.remove("hidden");
    $("success-tx-summary").textContent = d.amount + " " + d.symbol;
    $("success-tx-to").innerHTML = toAddressHtml(d.to);
-    }
+    $("success-tx-block").textContent = String(d.blockNumber);
    $("success-tx-block").innerHTML = blockNumberHtml(d.blockNumber);
    $("success-tx-hash").innerHTML = txHashHtml(d.hash);
    // Show decoded calldata details if present
    const decodedEl = $("success-tx-decoded");
    if (decodedEl && hasDecoded) {
        decodedEl.innerHTML = decodedDetailsHtml(d.decoded);
        decodedEl.classList.remove("hidden");
    } else if (decodedEl) {
        decodedEl.classList.add("hidden");
    }
    attachCopyHandlers("view-success-tx");
    showView("success-tx");
 }
--- a/src/shared/balances.js
+++ b/src/shared/balances.js
@@ -85,7 +85,6 @@ async function fetchTokenBalances(address, blockscoutUrl, trackedTokens) {
            balances.push({
                address: item.token.address_hash,
                name: item.token.name || "",
                symbol: item.token.symbol || "???",
                decimals: decimals,
                balance: bal,
--- 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/src/shared/tokenList.js
+++ b/src/shared/tokenList.js
@@ -3645,27 +3645,10 @@ async function getTopTokenPrices(n) {
    return prices;
 }
 // Resolve a token symbol from multiple sources, never returning "?".
 function resolveSymbol(tokenAddress, tokenBalances, trackedTokens) {
    const lower = (tokenAddress || "").toLowerCase();
    const tb = (tokenBalances || []).find(
        (t) => t.address.toLowerCase() === lower,
    );
    if (tb && tb.symbol) return tb.symbol;
    const known = TOKEN_BY_ADDRESS.get(lower);
    if (known && known.symbol) return known.symbol;
    const tracked = (trackedTokens || []).find(
        (t) => t.address.toLowerCase() === lower,
    );
    if (tracked && tracked.symbol) return tracked.symbol;
    return lower.slice(0, 10) + "\u2026";
 }
 module.exports = {
    TOKENS,
    TOKEN_BY_ADDRESS,
    KNOWN_SYMBOLS,
    getTopTokens,
    getTopTokenPrices,
    resolveSymbol,
 };
--- a/src/shared/transactions.js
+++ b/src/shared/transactions.js
@@ -153,11 +153,9 @@ async function fetchRecentTransactions(address, blockscoutUrl, count = 25) {
    // When a token transfer shares a hash with a normal tx, the normal tx
    // is the contract call (0 ETH) and the token transfer has the real
-    // amount and symbol.  A single transaction (e.g. a swap) can produce
+    // amount and symbol. Replace the normal tx with the token transfer,
-    // multiple token transfers (one per token involved), so we key token
+    // but preserve contract call metadata (direction, label, method) so
-    // transfers by hash + contract address to keep all of them.  We also
+    // swaps and other contract interactions display correctly.
    // preserve contract-call metadata (direction, label, method) from the
    // matching normal tx so swaps display correctly.
    for (const tt of ttJson.items || []) {
        const parsed = parseTokenTransfer(tt, addrLower);
        const existing = txsByHash.get(parsed.hash);
@@ -166,13 +164,8 @@ async function fetchRecentTransactions(address, blockscoutUrl, count = 25) {
            parsed.directionLabel = existing.directionLabel;
            parsed.isContractCall = true;
            parsed.method = existing.method;
            // Remove the bare-hash normal tx so it doesn't appear as a
            // duplicate with empty value; token transfers replace it.
            txsByHash.delete(parsed.hash);
        }
-        // Use composite key so multiple token transfers per tx are kept.
+        txsByHash.set(parsed.hash, parsed);
        const ttKey = parsed.hash + ":" + (parsed.contractAddress || "");
        txsByHash.set(ttKey, parsed);
    }
    const txs = [...txsByHash.values()];
--- a/src/shared/uniswap.js
+++ b/src/shared/uniswap.js
@@ -161,157 +161,6 @@ function decodeWrapEth(input) {
    }
 }
 // V4 inner action IDs
 const V4_SWAP_EXACT_IN_SINGLE = 0x06;
 const V4_SWAP_EXACT_IN = 0x07;
 const V4_SWAP_EXACT_OUT_SINGLE = 0x08;
 const V4_SWAP_EXACT_OUT = 0x09;
 const V4_SETTLE = 0x0b;
 const V4_TAKE = 0x0e;
 // Decode V4_SWAP (command 0x10) input bytes.
 // The input is ABI-encoded as (bytes actions, bytes[] params).
 // We extract token addresses from SETTLE (input) and TAKE (output) sub-actions,
 // and swap amounts from the swap sub-actions.
 function decodeV4Swap(input) {
    try {
        const d = coder.decode(["bytes", "bytes[]"], input);
        const actions = getBytes(d[0]);
        const params = d[1];
        let settleToken = null;
        let takeToken = null;
        let amountIn = null;
        let amountOutMin = null;
        for (let i = 0; i < actions.length; i++) {
            const actionId = actions[i];
            try {
                if (actionId === V4_SETTLE) {
                    // SETTLE: (address currency, uint256 maxAmount, bool payerIsUser)
                    const s = coder.decode(
                        ["address", "uint256", "bool"],
                        params[i],
                    );
                    settleToken = s[0];
                } else if (actionId === V4_TAKE) {
                    // TAKE: (address currency, address recipient, uint256 amount)
                    const t = coder.decode(
                        ["address", "address", "uint256"],
                        params[i],
                    );
                    takeToken = t[0];
                } else if (
                    actionId === V4_SWAP_EXACT_IN ||
                    actionId === V4_SWAP_EXACT_IN_SINGLE
                ) {
                    // Extract amounts from exact-in swap actions
                    if (actionId === V4_SWAP_EXACT_IN) {
                        // ExactInputParams: (address currencyIn,
                        //   tuple(address,uint24,int24,address,bytes)[] path,
                        //   uint128 amountIn, uint128 amountOutMin)
                        try {
                            const s = coder.decode(
                                [
                                    "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
                                ],
                                params[i],
                            );
                            if (!settleToken) settleToken = s[0][0];
                            const path = s[0][1];
                            if (path.length > 0 && !takeToken) {
                                takeToken = path[path.length - 1][0];
                            }
                            if (!amountIn) amountIn = s[0][2];
                            if (!amountOutMin) amountOutMin = s[0][3];
                        } catch {
                            // Fall through — SETTLE/TAKE will provide tokens
                        }
                    } else {
                        // ExactInputSingleParams: (tuple(address,address,uint24,int24,address) poolKey,
                        //   bool zeroForOne, uint128 amountIn, uint128 amountOutMin, bytes hookData)
                        try {
                            const s = coder.decode(
                                [
                                    "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
                                ],
                                params[i],
                            );
                            const poolKey = s[0][0];
                            const zeroForOne = s[0][1];
                            if (!settleToken)
                                settleToken = zeroForOne
                                    ? poolKey[0]
                                    : poolKey[1];
                            if (!takeToken)
                                takeToken = zeroForOne
                                    ? poolKey[1]
                                    : poolKey[0];
                            if (!amountIn) amountIn = s[0][2];
                            if (!amountOutMin) amountOutMin = s[0][3];
                        } catch {
                            // Fall through
                        }
                    }
                } else if (
                    actionId === V4_SWAP_EXACT_OUT ||
                    actionId === V4_SWAP_EXACT_OUT_SINGLE
                ) {
                    if (actionId === V4_SWAP_EXACT_OUT) {
                        try {
                            const s = coder.decode(
                                [
                                    "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
                                ],
                                params[i],
                            );
                            if (!takeToken) takeToken = s[0][0];
                            const path = s[0][1];
                            if (path.length > 0 && !settleToken) {
                                settleToken = path[path.length - 1][0];
                            }
                        } catch {
                            // Fall through
                        }
                    } else {
                        try {
                            const s = coder.decode(
                                [
                                    "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
                                ],
                                params[i],
                            );
                            const poolKey = s[0][0];
                            const zeroForOne = s[0][1];
                            if (!settleToken)
                                settleToken = zeroForOne
                                    ? poolKey[0]
                                    : poolKey[1];
                            if (!takeToken)
                                takeToken = zeroForOne
                                    ? poolKey[1]
                                    : poolKey[0];
                        } catch {
                            // Fall through
                        }
                    }
                }
            } catch {
                // Skip sub-actions we can't decode
            }
        }
        return {
            tokenIn: settleToken,
            tokenOut: takeToken,
            amountIn,
            amountOutMin,
        };
    } catch {
        return null;
    }
 }
 // Try to decode a Universal Router execute() call.
 // Returns { name, description, details } matching the format used by
 // the approval UI, or null if the calldata is not a recognised execute().
@@ -384,19 +233,6 @@ function decode(data, toAddress) {
                    }
                }
                if (cmdId === 0x10) {
                    const v4 = decodeV4Swap(inputs[i]);
                    if (v4) {
                        if (!inputToken && v4.tokenIn) inputToken = v4.tokenIn;
                        if (!outputToken && v4.tokenOut)
                            outputToken = v4.tokenOut;
                        if (!inputAmount && v4.amountIn)
                            inputAmount = v4.amountIn;
                        if (!minOutput && v4.amountOutMin)
                            minOutput = v4.amountOutMin;
                    }
                }
                if (cmdId === 0x0c) {
                    hasUnwrapWeth = true;
                }
@@ -445,18 +281,12 @@ function decode(data, toAddress) {
            const maxUint160 = BigInt(
                "0xffffffffffffffffffffffffffffffffffffffff",
            );
-            const isUnlimited = inputAmount >= maxUint160;
+            const amountStr =
-            const amountRaw = isUnlimited
+                inputAmount >= maxUint160
                    ? "Unlimited"
-                : formatAmount(inputAmount, inInfo.decimals);
+                    : formatAmount(inputAmount, inInfo.decimals) +
-            const amountStr = isUnlimited
+                      (inSymbol ? " " + inSymbol : "");
-                ? "Unlimited"
+            details.push({ label: "Amount", value: amountStr });
                : amountRaw + (inSymbol ? " " + inSymbol : "");
            details.push({
                label: "Amount",
                value: amountStr,
                rawValue: amountRaw,
            });
        }
        if (outSymbol) {
--- a/src/shared/wallet.js
+++ b/src/shared/wallet.js
@@ -24,26 +24,6 @@ function hdWalletFromMnemonic(mnemonic) {
    return { xpub, firstAddress };
 }
 function hdWalletFromXprv(xprv) {
    const root = HDNodeWallet.fromExtendedKey(xprv);
    if (!root.privateKey) {
        throw new Error("Not an extended private key (xprv).");
    }
    const node = root.derivePath("44'/60'/0'/0");
    const xpub = node.neuter().extendedKey;
    const firstAddress = node.deriveChild(0).address;
    return { xpub, firstAddress };
 }
 function isValidXprv(key) {
    try {
        const node = HDNodeWallet.fromExtendedKey(key);
        return !!node.privateKey;
    } catch {
        return false;
    }
 }
 function addressFromPrivateKey(key) {
    const w = new Wallet(key);
    return w.address;
@@ -58,11 +38,6 @@ function getSignerForAddress(walletData, addrIndex, decryptedSecret) {
        );
        return node.deriveChild(addrIndex);
    }
    if (walletData.type === "xprv") {
        const root = HDNodeWallet.fromExtendedKey(decryptedSecret);
        const node = root.derivePath("44'/60'/0'/0");
        return node.deriveChild(addrIndex);
    }
    return new Wallet(decryptedSecret);
 }
@@ -74,8 +49,6 @@ module.exports = {
    generateMnemonic,
    deriveAddressFromXpub,
    hdWalletFromMnemonic,
    hdWalletFromXprv,
    isValidXprv,
    addressFromPrivateKey,
    getSignerForAddress,
    isValidMnemonic,
--- a/tests/uniswap.test.js
+++ b/tests/uniswap.test.js
@@ -1,10 +1,9 @@
-const { AbiCoder, Interface, solidityPacked, getBytes } = require("ethers");
+const { AbiCoder, Interface, solidityPacked } = require("ethers");
 const uniswap = require("../src/shared/uniswap");
 const ROUTER_ADDR = "0x66a9893cc07d91d95644aedd05d03f95e1dba8af";
 const USDT_ADDR = "0xdAC17F958D2ee523a2206206994597C13D831ec7";
 const WETH_ADDR = "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2";
 const USDC_ADDR = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
 const USER_ADDR = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
 // AutistMask's first-ever swap, 2026-02-27.
@@ -257,87 +256,6 @@ describe("uniswap decoder", () => {
        expect(amount.value).toBe("5.0000 USDT");
    });
    // This test validates the decodeV4Swap() fix: a V4 ERC20→ERC20 swap
    // (USDT→USDC) where the token addresses are ONLY discoverable inside
    // the V4_SWAP sub-actions (SETTLE/TAKE). Before decodeV4Swap() was added,
    // command 0x10 was opaque and this would decode as "Uniswap Swap" with
    // no token info (or "ETH → ETH"). Now it correctly shows "USDT → USDC".
    test("decodes V4_SWAP ERC20→ERC20 tokens via SETTLE/TAKE (regression: #59)", () => {
        // Build a V4_SWAP input with SETTLE(USDT) + SWAP_EXACT_IN_SINGLE + TAKE(USDC)
        const V4_SETTLE = 0x0b;
        const V4_SWAP_EXACT_IN_SINGLE = 0x06;
        const V4_TAKE = 0x0e;
        // actions: SETTLE, SWAP_EXACT_IN_SINGLE, TAKE
        const actions = new Uint8Array([
            V4_SETTLE,
            V4_SWAP_EXACT_IN_SINGLE,
            V4_TAKE,
        ]);
        // SETTLE params: (address currency, uint256 maxAmount, bool payerIsUser)
        const settleParam = coder.encode(
            ["address", "uint256", "bool"],
            [USDT_ADDR, 5000000n, true],
        );
        // SWAP_EXACT_IN_SINGLE params:
        // (tuple(address,address,uint24,int24,address) poolKey, bool zeroForOne, uint128 amountIn, uint128 amountOutMin, bytes hookData)
        const swapParam = coder.encode(
            [
                "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
            ],
            [
                [
                    [
                        USDT_ADDR,
                        USDC_ADDR,
                        100, // fee
                        1, // tickSpacing
                        "0x0000000000000000000000000000000000000000", // hooks
                    ],
                    true, // zeroForOne
                    5000000n, // amountIn (5 USDT)
                    4900000n, // amountOutMin (4.9 USDC)
                    "0x", // hookData
                ],
            ],
        );
        // TAKE params: (address currency, address recipient, uint256 amount)
        const takeParam = coder.encode(
            ["address", "address", "uint256"],
            [USDC_ADDR, USER_ADDR, 0n],
        );
        // Encode the V4_SWAP input: (bytes actions, bytes[] params)
        const v4Input = coder.encode(
            ["bytes", "bytes[]"],
            [actions, [settleParam, swapParam, takeParam]],
        );
        // Build execute() with PERMIT2_PERMIT (0x0a) + V4_SWAP (0x10)
        // The permit provides the input token, but V4_SWAP must provide
        // the OUTPUT token — without decodeV4Swap, output would be unknown.
        const data = buildExecute(
            solidityPacked(["uint8", "uint8"], [0x0a, 0x10]),
            [encodePermit2(USDT_ADDR, 5000000n, ROUTER_ADDR), v4Input],
            9999999999n,
        );
        const result = uniswap.decode(data, ROUTER_ADDR);
        expect(result).not.toBeNull();
        // Before decodeV4Swap fix: name would be "Swap USDT → ETH" or "Uniswap Swap"
        // After fix: correctly identifies both tokens from V4 sub-actions
        expect(result.name).toBe("Swap USDT \u2192 USDC");
        const tokenIn = result.details.find((d) => d.label === "Token In");
        expect(tokenIn.value).toContain("USDT");
        const steps = result.details.find((d) => d.label === "Steps");
        expect(steps.value).toContain("V4 Swap");
    });
    test("handles unknown tokens gracefully", () => {
        const fakeToken = "0x1111111111111111111111111111111111111111";
        const data = buildExecute(
--- a/yarn.lock
+++ b/yarn.lock