Merge branch 'main' into feature/import-xprv

fix: derive xprv addresses from correct BIP44 path (m/44'/60'/0'/0)
hdWalletFromXprv() and getSignerForAddress() for xprv type were deriving addresses directly from the root key (m/N) instead of the standard BIP44 Ethereum path (m/44'/60'/0'/0/N). This caused imported xprv wallets to generate completely wrong addresses. Navigate to the BIP44 Ethereum derivation path before deriving child addresses, matching the behavior of mnemonic-based wallet imports.
2026-02-28 20:30:53 +01:00 · 2026-02-28 10:36:28 -08:00 · 2026-02-28 10:35:39 -08:00
20 changed files with 333 additions and 663 deletions
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -119,6 +119,15 @@
                        Import private key
                    </button>
                </div>
+                <div class="mt-1 text-xs text-muted">
+                    Have an extended private key (xprv)?
+                    <button
+                        id="btn-add-wallet-import-xprv"
+                        class="underline cursor-pointer bg-transparent border-none text-fg text-xs font-mono p-0"
+                    >
+                        Import xprv
+                    </button>
+                </div>
            </div>

            <!-- ============ IMPORT PRIVATE KEY ============ -->
@@ -170,6 +179,55 @@
                </button>
            </div>

+            <!-- ============ IMPORT XPRV ============ -->
+            <div id="view-import-xprv" class="view hidden">
+                <button
+                    id="btn-import-xprv-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 Extended Private Key</h2>
+                <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 class="mb-2" id="import-xprv-password-section">
+                    <label class="block mb-1">Choose a password</label>
+                    <p class="text-xs text-muted mb-1">
+                        This password encrypts your key on this device. You will
+                        need it to send funds.
+                    </p>
+                    <input
+                        type="password"
+                        id="import-xprv-password"
+                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
+                    />
+                </div>
+                <div class="mb-2" id="import-xprv-password-confirm-section">
+                    <label class="block mb-1">Confirm password</label>
+                    <input
+                        type="password"
+                        id="import-xprv-password-confirm"
+                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
+                    />
+                </div>
+                <button
+                    id="btn-import-xprv-confirm"
+                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
+                >
+                    Import
+                </button>
+            </div>
+
            <!-- ============ MAIN VIEW: ALL WALLETS & ADDRESSES ============ -->
            <div id="view-main" class="view hidden">
                <!-- active address headline -->
@@ -305,26 +363,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 -->
@@ -338,60 +376,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 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
@@ -496,11 +480,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,23 +560,11 @@
                    id="confirm-errors"
                    class="mb-2 border border-border border-dashed p-2 hidden"
                ></div>
-                <div class="mb-2">
-                    <label class="block mb-1 text-xs">Password</label>
-                    <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]"
-                ></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>

@@ -622,7 +589,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>
@@ -676,6 +642,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
@@ -692,10 +694,9 @@
                <div class="flex justify-center mb-3">
                    <canvas id="receive-qr"></canvas>
                </div>
-                <div
-                    class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
-                >
-                    <span id="receive-address-block" class="select-all"></span>
+                <div class="border border-border p-2 break-all mb-3 text-xs">
+                    <span id="receive-dot"></span>
+                    <span id="receive-address" class="select-all"></span>
                    <span id="receive-etherscan-link"></span>
                </div>
                <button
@@ -1115,10 +1116,7 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
-                <div
-                    id="approve-tx-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
-                ></div>
+                <div id="approve-tx-error" class="text-xs hidden mb-2"></div>
                <div class="flex justify-between">
                    <button
                        id="btn-approve-tx"
@@ -1181,10 +1179,7 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
-                <div
-                    id="approve-sign-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
-                ></div>
+                <div id="approve-sign-error" class="text-xs hidden mb-2"></div>
                <div class="flex justify-between">
                    <button
                        id="btn-approve-sign"
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -11,6 +11,7 @@ const home = require("./views/home");
 const welcome = require("./views/welcome");
 const addWallet = require("./views/addWallet");
 const importKey = require("./views/importKey");
+const importXprv = require("./views/importXprv");
 const addressDetail = require("./views/addressDetail");
 const addressToken = require("./views/addressToken");
 const send = require("./views/send");
@@ -55,6 +56,7 @@ const ctx = {
    doRefreshAndRender,
    showAddWalletView: () => addWallet.show(),
    showImportKeyView: () => importKey.show(),
+    showImportXprvView: () => importXprv.show(),
    showAddressDetail: () => addressDetail.show(),
    showAddressToken: () => addressToken.show(),
    showAddTokenView: () => addToken.show(),
@@ -74,7 +76,6 @@ const RESTORABLE_VIEWS = new Set([
    "receive",
    "settings",
    "settings-addtoken",
-    "confirm-tx",
    "transaction",
    "success-tx",
    "error-tx",
@@ -128,13 +129,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();
@@ -218,6 +212,7 @@ async function init() {
    welcome.init(ctx);
    addWallet.init(ctx);
    importKey.init(ctx);
+    importXprv.init(ctx);
    home.init(ctx);
    addressDetail.init(ctx);
    addressToken.init(ctx);
--- a/src/popup/styles/main.css
+++ b/src/popup/styles/main.css
@@ -11,7 +11,6 @@
    --color-border-light: #cccccc;
    --color-hover: #eeeeee;
    --color-well: #f5f5f5;
-    --color-danger-well: #fef2f2;
    --color-section: #dddddd;
 }

--- a/src/popup/views/addWallet.js
+++ b/src/popup/views/addWallet.js
@@ -124,6 +124,11 @@ function init(ctx) {
        "click",
        ctx.showImportKeyView,
    );
+
+    $("btn-add-wallet-import-xprv").addEventListener(
+        "click",
+        ctx.showImportXprvView,
+    );
 }

 module.exports = { init, show };
--- a/src/popup/views/addressDetail.js
+++ b/src/popup/views/addressDetail.js
@@ -15,15 +15,9 @@ const {
    filterTransactions,
 } = require("../../shared/transactions");
 const { resolveEnsNames } = require("../../shared/ens");
-const {
-    updateSendBalance,
-    renderSendTokenSelect,
-    resetSendValidation,
-} = require("./send");
+const { updateSendBalance, renderSendTokenSelect } = 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;

@@ -263,7 +257,6 @@ function init(_ctx) {
        $("send-token").classList.remove("hidden");
        $("send-token-static").classList.add("hidden");
        updateSendBalance();
-        resetSendValidation();
        showView("send");
    });

@@ -272,108 +265,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);
-        $("export-privkey-dot").innerHTML = addressDotHtml(addr.address);
-        $("export-privkey-address").textContent = addr.address;
-        $("export-privkey-address").dataset.full = addr.address;
-        $("export-privkey-password").value = "";
-        $("export-privkey-flash").classList.add("hidden");
-        $("export-privkey-flash").textContent = "";
-        $("export-privkey-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").classList.remove("hidden");
-            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").classList.add("hidden");
-        } catch {
-            $("export-privkey-flash").textContent = "Wrong password.";
-            $("export-privkey-flash").classList.remove("hidden");
-        } 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!");
-        }
-    });
-
-    $("export-privkey-address").addEventListener("click", () => {
-        const full = $("export-privkey-address").dataset.full;
-        if (full) {
-            navigator.clipboard.writeText(full);
-            showFlash("Copied!");
-        }
-    });
-
-    $("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
@@ -12,7 +12,7 @@ const {
    balanceLine,
 } = 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,
@@ -23,11 +23,7 @@ const {
    filterTransactions,
 } = require("../../shared/transactions");
 const { resolveEnsNames } = require("../../shared/ens");
-const {
-    updateSendBalance,
-    renderSendTokenSelect,
-    resetSendValidation,
-} = require("./send");
+const { updateSendBalance, renderSendTokenSelect } = require("./send");
 const { log } = require("../../shared/log");
 const makeBlockie = require("ethereum-blockies-base64");

@@ -100,11 +96,14 @@ function show() {
        const tb = (addr.tokenBalances || []).find(
            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
        );
-        symbol = resolveSymbol(
-            tokenId,
-            addr.tokenBalances,
-            state.trackedTokens,
+        const tracked = (state.trackedTokens || []).find(
+            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
        );
+        symbol =
+            (tb && tb.symbol) ||
+            (tracked && tracked.symbol) ||
+            (knownToken && knownToken.symbol) ||
+            "?";
        amount = tb ? parseFloat(tb.balance || "0") : 0;
        price = getPrice(symbol);
    }
@@ -376,7 +375,6 @@ function init(_ctx) {
            });
        }
        updateSendBalance();
-        resetSendValidation();
        showView("send");
    });

--- a/src/popup/views/approval.js
+++ b/src/popup/views/approval.js
@@ -4,8 +4,6 @@ const {
    addressTitle,
    escapeHtml,
    showView,
-    showError,
-    hideError,
 } = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 const { formatEther, formatUnits, Interface, toUtf8String } = require("ethers");
@@ -172,8 +170,6 @@ 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;
@@ -181,32 +177,13 @@ function showTxApproval(details) {
            if (d.label === "Amount") {
                pendingTxDetails.amount = d.rawValue || 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);

@@ -268,9 +245,6 @@ function showTxApproval(details) {
        $("approve-tx-data-section").classList.add("hidden");
    }

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

@@ -359,7 +333,7 @@ function showSignApproval(details) {
    }

    $("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");

@@ -424,10 +398,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");

@@ -463,10 +438,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");

@@ -484,7 +460,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.
-// Shows transaction details, warnings, errors. On Sign & Send,
-// reads inline password, decrypts secret, signs and broadcasts.
+// Transaction confirmation view + password modal.
+// Shows transaction details, warnings, errors. On proceed, opens
+// password modal, decrypts secret, signs and broadcasts.

 const {
    parseEther,
@@ -14,7 +14,6 @@ const {
    showError,
    hideError,
    showView,
-    showFlash,
    addressTitle,
    addressDotHtml,
    escapeHtml,
@@ -25,7 +24,6 @@ const { decryptWithPassword } = require("../../shared/vault");
 const { formatUsd, getPrice } = require("../../shared/prices");
 const { getProvider } = require("../../shared/balances");
 const { isScamAddress } = require("../../shared/scamlist");
-const { hasTransactionHistory } = require("../../shared/transactions");
 const { ERC20_ABI } = require("../../shared/constants");
 const { log } = require("../../shared/log");
 const makeBlockie = require("ethereum-blockies-base64");
@@ -40,13 +38,6 @@ const EXT_ICON =

 let pendingTx = null;

-function restore() {
-    const d = state.viewData;
-    if (d && d.pendingTx) {
-        show(d.pendingTx);
-    }
-}
-
 function etherscanTokenLink(address) {
    return `https://etherscan.io/token/${address}`;
 }
@@ -104,22 +95,11 @@ function show(txInfo) {
    // Token contract section (ERC-20 only)
    const tokenSection = $("confirm-token-section");
    if (isErc20) {
-        const dot = addressDotHtml(txInfo.token);
        const link = etherscanTokenLink(txInfo.token);
        $("confirm-token-contract").innerHTML =
-            `<div class="flex items-center">${dot}` +
-            `<span class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(txInfo.token)}">${escapeHtml(txInfo.token)}</span>` +
-            `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>` +
-            `</div>`;
+            escapeHtml(txInfo.token) +
+            ` <a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
        tokenSection.classList.remove("hidden");
-        // Attach click-to-copy on the contract address
-        const copyEl = tokenSection.querySelector("[data-copy]");
-        if (copyEl) {
-            copyEl.onclick = () => {
-                navigator.clipboard.writeText(copyEl.dataset.copy);
-                showFlash("Copied!");
-            };
-        }
    } else {
        tokenSection.classList.add("hidden");
    }
@@ -234,18 +214,12 @@ function show(txInfo) {
        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").classList.remove("hidden");
    $("confirm-fee-amount").textContent = "Estimating...";
-    state.viewData = { pendingTx: txInfo };
    showView("confirm-tx");

    estimateGas(txInfo);
-    checkRecipientHistory(txInfo);
 }

 async function estimateGas(txInfo) {
@@ -288,45 +262,39 @@ async function estimateGas(txInfo) {
    }
 }

-async function checkRecipientHistory(txInfo) {
-    try {
-        const hasHistory = await hasTransactionHistory(
-            txInfo.to,
-            state.blockscoutUrl,
-        );
-        if (hasHistory === false) {
-            const warningsEl = $("confirm-warnings");
-            const warningDiv = document.createElement("div");
-            warningDiv.className =
-                "border border-dashed p-2 mb-1 text-xs font-bold";
-            warningDiv.style.color = "#dc2626";
-            warningDiv.style.borderColor = "#dc2626";
-            warningDiv.textContent =
-                "WARNING: This address has ZERO transaction history on-chain. " +
-                "It has never sent or received any transactions. " +
-                "Double-check the address before sending.";
-            warningsEl.appendChild(warningDiv);
-            warningsEl.classList.remove("hidden");
-        }
-    } catch (e) {
-        log.errorf("recipient history check failed:", e.message);
-    }
+function showPasswordModal() {
+    $("modal-password").value = "";
+    hideError("modal-password-error");
+    $("password-modal").classList.remove("hidden");
+}
+
+function hidePasswordModal() {
+    $("password-modal").classList.add("hidden");
 }

 function init(ctx) {
-    $("btn-confirm-send").addEventListener("click", async () => {
-        const password = $("confirm-tx-password").value;
+    $("btn-confirm-send").addEventListener("click", () => {
+        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(
-                "confirm-tx-password-error",
-                "Please enter your password.",
-            );
+            showError("modal-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(
@@ -334,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;
-        $("btn-confirm-send").classList.add("text-muted");
+        hidePasswordModal();

        let tx;
        try {
@@ -376,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
@@ -40,10 +40,6 @@ function init(_ctx) {
            return;
        }

-        const btn = $("btn-delete-wallet-confirm");
-        btn.disabled = true;
-        btn.classList.add("text-muted");
-
        const walletIdx = deleteWalletIndex;
        const wallet = state.wallets[walletIdx];

@@ -53,8 +49,6 @@ function init(_ctx) {
        } catch (_e) {
            $("delete-wallet-flash").textContent = "Wrong password.";
            $("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
@@ -31,7 +31,6 @@ const VIEWS = [
    "approve-site",
    "approve-tx",
    "approve-sign",
-    "export-privkey",
 ];

 function $(id) {
--- a/src/popup/views/home.js
+++ b/src/popup/views/home.js
@@ -11,11 +11,7 @@ const {
    truncateMiddle,
 } = require("./helpers");
 const { state, saveState, currentAddress } = require("../../shared/state");
-const {
-    updateSendBalance,
-    renderSendTokenSelect,
-    resetSendValidation,
-} = require("./send");
+const { updateSendBalance, renderSendTokenSelect } = require("./send");
 const { deriveAddressFromXpub } = require("../../shared/wallet");
 const {
    formatUsd,
@@ -239,7 +235,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") {
+        if (wallet.type === "hd" || wallet.type === "xprv") {
            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>`;
@@ -392,7 +388,6 @@ function init(ctx) {
        $("send-token-static").classList.add("hidden");
        renderSendTokenSelect(addr);
        updateSendBalance();
-        resetSendValidation();
        showView("send");
    });

--- a/src/popup/views/importXprv.js
+++ b/src/popup/views/importXprv.js
@@ -0,0 +1,106 @@
+const { $, showView, showFlash } = require("./helpers");
+const { hdWalletFromXprv, isValidXprv } = require("../../shared/wallet");
+const { encryptWithPassword } = require("../../shared/vault");
+const { state, saveState } = require("../../shared/state");
+const { scanForAddresses } = require("../../shared/balances");
+
+function show() {
+    $("import-xprv-key").value = "";
+    $("import-xprv-password").value = "";
+    $("import-xprv-password-confirm").value = "";
+    showView("import-xprv");
+}
+
+function init(ctx) {
+    $("btn-import-xprv-confirm").addEventListener("click", async () => {
+        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 duplicate = state.wallets.find(
+            (w) =>
+                (w.type === "hd" || w.type === "xprv") &&
+                w.addresses[0] &&
+                w.addresses[0].address.toLowerCase() ===
+                    firstAddress.toLowerCase(),
+        );
+        if (duplicate) {
+            showFlash("This key is already added (" + duplicate.name + ").");
+            return;
+        }
+        const pw = $("import-xprv-password").value;
+        const pw2 = $("import-xprv-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(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();
+    });
+
+    $("btn-import-xprv-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,10 +1,4 @@
-const {
-    $,
-    showView,
-    showFlash,
-    formatAddressHtml,
-    addressTitle,
-} = require("./helpers");
+const { $, showView, showFlash, addressDotHtml } = require("./helpers");
 const { state, currentAddress } = require("../../shared/state");
 const QRCode = require("qrcode");

@@ -18,12 +12,8 @@ const EXT_ICON =
 function show() {
    const addr = currentAddress();
    const address = addr ? addr.address : "";
-    const title = address ? addressTitle(address, state.wallets) : null;
-    const ensName = addr ? addr.ensName || null : null;
-    $("receive-address-block").innerHTML = address
-        ? formatAddressHtml(address, ensName, null, title)
-        : "";
-    $("receive-address-block").dataset.full = address;
+    $("receive-dot").innerHTML = address ? addressDotHtml(address) : "";
+    $("receive-address").textContent = address;
    const link = address ? `https://etherscan.io/address/${address}` : "";
    $("receive-etherscan-link").innerHTML = link
        ? `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`
@@ -60,16 +50,8 @@ function show() {
 }

 function init(ctx) {
-    $("receive-address-block").addEventListener("click", () => {
-        const addr = $("receive-address-block").dataset.full;
-        if (addr) {
-            navigator.clipboard.writeText(addr);
-            showFlash("Copied!");
-        }
-    });
-
    $("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!");
--- a/src/popup/views/send.js
+++ b/src/popup/views/send.js
@@ -10,108 +10,7 @@ const {
 const { state, currentAddress } = require("../../shared/state");
 let ctx;
 const { getProvider } = require("../../shared/balances");
-const { KNOWN_SYMBOLS, resolveSymbol } = require("../../shared/tokenList");
-const { getAddress } = require("ethers");
-
-const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
-
-/**
- * Validate a destination address string.
- * Returns { valid: true } or { valid: false, error: "..." }.
- */
-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");
-    }
-}
+const { KNOWN_SYMBOLS, TOKEN_BY_ADDRESS } = require("../../shared/tokenList");

 const EXT_ICON =
    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
@@ -174,11 +73,15 @@ function updateSendBalance() {
        const tb = (addr.tokenBalances || []).find(
            (t) => t.address.toLowerCase() === token.toLowerCase(),
        );
-        const symbol = resolveSymbol(
-            token,
-            addr.tokenBalances,
-            state.trackedTokens,
+        const knownToken = TOKEN_BY_ADDRESS.get(token.toLowerCase());
+        const tracked = (state.trackedTokens || []).find(
+            (t) => t.address.toLowerCase() === token.toLowerCase(),
        );
+        const symbol =
+            (tb && tb.symbol) ||
+            (tracked && tracked.symbol) ||
+            (knownToken && knownToken.symbol) ||
+            "?";
        const bal = tb ? tb.balance || "0" : "0";
        $("send-balance").textContent =
            "Current balance: " + bal + " " + symbol;
@@ -189,13 +92,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();
@@ -203,15 +99,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;
@@ -245,11 +132,15 @@ function init(_ctx) {
            const tb = (addr.tokenBalances || []).find(
                (t) => t.address.toLowerCase() === token.toLowerCase(),
            );
-            tokenSymbol = resolveSymbol(
-                token,
-                addr.tokenBalances,
-                state.trackedTokens,
+            const knownTk = TOKEN_BY_ADDRESS.get(token.toLowerCase());
+            const trackedTk = (state.trackedTokens || []).find(
+                (t) => t.address.toLowerCase() === token.toLowerCase(),
            );
+            tokenSymbol =
+                (tb && tb.symbol) ||
+                (trackedTk && trackedTk.symbol) ||
+                (knownTk && knownTk.symbol) ||
+                "?";
            tokenBalance = tb ? tb.balance || "0" : "0";
        }

@@ -276,19 +167,4 @@ function init(_ctx) {
    });
 }

-function resetSendValidation() {
-    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,
-};
+module.exports = { init, updateSendBalance, renderSendTokenSelect };
--- a/src/popup/views/transactionDetail.js
+++ b/src/popup/views/transactionDetail.js
@@ -143,10 +143,11 @@ 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";
    }
-    if (headingEl) headingEl.textContent = "Transaction";

    // Hide calldata and raw data sections; re-fetch if this is a contract call
    const calldataSection = $("tx-detail-calldata-section");
--- a/src/popup/views/txStatus.js
+++ b/src/popup/views/txStatus.js
@@ -8,7 +8,6 @@ const {
    addressTitle,
    escapeHtml,
 } = 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");
@@ -43,11 +42,10 @@ function toAddressHtml(address) {
    if (title) {
        return (
            `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>` +
-            `<div class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(address)}">${escapeHtml(address)}</div>` +
-            extLink
+            `<div class="break-all">${escapeHtml(address)}${extLink}</div>`
        );
    }
-    return `<div class="flex items-center">${dot}<span class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(address)}">${escapeHtml(address)}</span>${extLink}</div>`;
+    return `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(address)}</span>${extLink}</div>`;
 }

 function txHashHtml(hash) {
@@ -123,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-summary").textContent = d.amount + " " + d.symbol;
+    $("success-tx-to").innerHTML = toAddressHtml(d.to);
    $("success-tx-block").textContent = String(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/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
-    // multiple token transfers (one per token involved), so we key token
-    // transfers by hash + contract address to keep all of them.  We also
-    // preserve contract-call metadata (direction, label, method) from the
-    // matching normal tx so swaps display correctly.
+    // amount and symbol. Replace the normal tx with the token transfer,
+    // but preserve contract call metadata (direction, label, method) so
+    // swaps and other contract interactions 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.
-        const ttKey = parsed.hash + ":" + (parsed.contractAddress || "");
-        txsByHash.set(ttKey, parsed);
+        txsByHash.set(parsed.hash, parsed);
    }

    const txs = [...txsByHash.values()];
@@ -251,36 +244,4 @@ function filterTransactions(txs, filters = {}) {
    return { transactions: filtered, newFraudContracts: newFraud };
 }

-async function hasTransactionHistory(address, blockscoutUrl) {
-    try {
-        const resp = await debugFetch(blockscoutUrl + "/addresses/" + address);
-        if (!resp.ok) {
-            // If Blockscout returns 404, the address has never been seen on-chain.
-            if (resp.status === 404) return false;
-            log.errorf(
-                "blockscout address check:",
-                resp.status,
-                resp.statusText,
-            );
-            return null; // unknown
-        }
-        const data = await resp.json();
-        // Blockscout v2 address endpoint returns tx counts.
-        // An address with no history may still exist (e.g. received ETH once
-        // but shows 0 outgoing). We check both transactions_count and
-        // token_transfers_count to be thorough.
-        const txCount =
-            (parseInt(data.transactions_count, 10) || 0) +
-            (parseInt(data.token_transfers_count, 10) || 0);
-        return txCount > 0;
-    } catch (e) {
-        log.errorf("hasTransactionHistory error:", e.message);
-        return null; // unknown, don't block the user
-    }
-}
-
-module.exports = {
-    fetchRecentTransactions,
-    filterTransactions,
-    hasTransactionHistory,
-};
+module.exports = { fetchRecentTransactions, filterTransactions };
--- a/src/shared/uniswap.js
+++ b/src/shared/uniswap.js
@@ -445,18 +445,12 @@ function decode(data, toAddress) {
            const maxUint160 = BigInt(
                "0xffffffffffffffffffffffffffffffffffffffff",
            );
-            const isUnlimited = inputAmount >= maxUint160;
-            const amountRaw = isUnlimited
-                ? "Unlimited"
-                : formatAmount(inputAmount, inInfo.decimals);
-            const amountStr = isUnlimited
-                ? "Unlimited"
-                : amountRaw + (inSymbol ? " " + inSymbol : "");
-            details.push({
-                label: "Amount",
-                value: amountStr,
-                rawValue: amountRaw,
-            });
+            const amountStr =
+                inputAmount >= maxUint160
+                    ? "Unlimited"
+                    : formatAmount(inputAmount, inInfo.decimals) +
+                      (inSymbol ? " " + inSymbol : "");
+            details.push({ label: "Amount", value: amountStr });
        }

        if (outSymbol) {
--- a/src/shared/wallet.js
+++ b/src/shared/wallet.js
@@ -24,6 +24,26 @@ 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;
@@ -38,6 +58,11 @@ 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);
 }

@@ -49,6 +74,8 @@ module.exports = {
    generateMnemonic,
    deriveAddressFromXpub,
    hdWalletFromMnemonic,
+    hdWalletFromXprv,
+    isValidXprv,
    addressFromPrivateKey,
    getSignerForAddress,
    isValidMnemonic,