fix: preserve multiple token transfers per tx hash in transaction history

When a swap produces multiple ERC-20 token transfers with the same tx
hash (e.g. send WETH + receive USDC), only the last transfer was kept
because txsByHash was keyed by bare tx hash. This caused the
address-token view to show no transactions for tokens obtained via swap.

Use a composite key (hash:contractAddress) so all token transfers are
preserved. The bare-hash normal-tx entry is removed when token transfers
replace it to avoid duplication.

Closes #72

src/popup/index.html

@@ -56,34 +56,9 @@
                     < Back
                 </button>
                 <h2 class="font-bold mb-2">Add Wallet</h2>
-
-                <!-- Mode selector tabs -->
-                <div class="flex gap-1 mb-3">
-                    <button
-                        id="btn-mode-mnemonic"
-                        class="border border-border px-2 py-1 cursor-pointer text-xs bg-fg text-bg"
-                    >
-                        Recovery Phrase
-                    </button>
-                    <button
-                        id="btn-mode-key"
-                        class="border border-border px-2 py-1 cursor-pointer text-xs hover:bg-fg hover:text-bg"
-                    >
-                        Private Key
-                    </button>
-                    <button
-                        id="btn-mode-xprv"
-                        class="border border-border px-2 py-1 cursor-pointer text-xs hover:bg-fg hover:text-bg"
-                    >
-                        xprv
-                    </button>
-                </div>
-
-                <!-- ---- Mnemonic mode ---- -->
-                <div id="add-wallet-mode-mnemonic">
                 <p class="mb-2">
-                        Enter your 12 or 24 word recovery phrase below, or click
-                        the button to roll the die for a new one.
+                    Enter your 12 or 24 word recovery phrase below, or click the
+                    button to roll the die for a new one.
                 </p>
                 <div class="mb-1 flex justify-end">
                     <button
@@ -106,53 +81,14 @@
                     id="add-wallet-phrase-warning"
                     class="text-xs mb-2 border border-border border-dashed p-2 hidden"
                 >
-                        Write these words down and keep them safe. Anyone with
-                        them can take your funds; if you lose them, your wallet
-                        is gone.
+                    Write these words down and keep them safe. Anyone with them
+                    can take your funds; if you lose them, your wallet is gone.
                 </div>
-                </div>
-
-                <!-- ---- Private key mode ---- -->
-                <div id="add-wallet-mode-key" 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>
-
-                <!-- ---- xprv mode ---- -->
-                <div id="add-wallet-mode-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
-                        id="add-wallet-password-hint"
-                        class="text-xs text-muted mb-1"
-                    >
-                        This password encrypts your secret on this device. You
-                        will need it to send funds.
+                    <p class="text-xs text-muted mb-1">
+                        This password encrypts your recovery phrase on this
+                        device. You will need it to send funds.
                     </p>
                     <input
                         type="password"
@@ -174,6 +110,64 @@
                 >
                     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>
             </div>
 
             <!-- ============ MAIN VIEW: ALL WALLETS & ADDRESSES ============ -->
@@ -311,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 -->
@@ -344,60 +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 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

src/popup/index.js

@@ -10,6 +10,7 @@ const { $, showView } = require("./views/helpers");
 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");
@@ -53,6 +54,7 @@ const ctx = {
     renderWalletList,
     doRefreshAndRender,
     showAddWalletView: () => addWallet.show(),
+    showImportKeyView: () => importKey.show(),
     showAddressDetail: () => addressDetail.show(),
     showAddressToken: () => addressToken.show(),
     showAddTokenView: () => addToken.show(),
@@ -207,6 +209,7 @@ async function init() {
 
     welcome.init(ctx);
     addWallet.init(ctx);
+    importKey.init(ctx);
     home.init(ctx);
     addressDetail.init(ctx);
     addressToken.init(ctx);

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;
 }
 

src/popup/views/addWallet.js

@@ -1,100 +1,33 @@
-const { $, showView, showFlash, goBack } = require("./helpers");
+const { $, showView, showFlash } = require("./helpers");
 const {
     generateMnemonic,
     hdWalletFromMnemonic,
-    hdWalletFromXprv,
     isValidMnemonic,
-    isValidXprv,
-    addressFromPrivateKey,
 } = require("../../shared/wallet");
 const { encryptWithPassword } = require("../../shared/vault");
 const { state, saveState } = require("../../shared/state");
 const { scanForAddresses } = require("../../shared/balances");
 
-let currentMode = "mnemonic"; // "mnemonic" | "key" | "xprv"
-
-const MODES = ["mnemonic", "key", "xprv"];
-
-function setMode(mode) {
-    currentMode = mode;
-    for (const m of MODES) {
-        const section = $("add-wallet-mode-" + m);
-        if (section) section.classList.toggle("hidden", m !== mode);
-        const btn = $("btn-mode-" + m);
-        if (btn) {
-            if (m === mode) {
-                btn.classList.add("bg-fg", "text-bg");
-                btn.classList.remove("hover:bg-fg", "hover:text-bg");
-            } else {
-                btn.classList.remove("bg-fg", "text-bg");
-                btn.classList.add("hover:bg-fg", "hover:text-bg");
-            }
-        }
-    }
-}
-
 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").classList.add("hidden");
-    setMode("mnemonic");
     showView("add-wallet");
 }
 
 function init(ctx) {
-    // Mode switching
-    $("btn-mode-mnemonic").addEventListener("click", () => setMode("mnemonic"));
-    $("btn-mode-key").addEventListener("click", () => setMode("key"));
-    $("btn-mode-xprv").addEventListener("click", () => setMode("xprv"));
-
     $("btn-generate-phrase").addEventListener("click", () => {
         $("wallet-mnemonic").value = generateMnemonic();
         $("add-wallet-phrase-warning").classList.remove("hidden");
     });
 
     $("btn-add-wallet-confirm").addEventListener("click", async () => {
-        // Shared password validation
-        const pw = $("add-wallet-password").value;
-        const pw2 = $("add-wallet-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;
-        }
-
-        if (currentMode === "mnemonic") {
-            await handleMnemonic(ctx, pw);
-        } else if (currentMode === "key") {
-            await handlePrivateKey(ctx, pw);
-        } else if (currentMode === "xprv") {
-            await handleXprv(ctx, pw);
-        }
-    });
-
-    $("btn-add-wallet-back").addEventListener("click", () => {
-        if (!state.hasWallet) {
-            goBack("welcome");
-        } else {
-            ctx.renderWalletList();
-            goBack("main");
-        }
-    });
-}
-
-async function handleMnemonic(ctx, pw) {
         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+/);
@@ -110,16 +43,33 @@ async function handleMnemonic(ctx, pw) {
             showFlash("Invalid recovery phrase. Check for typos.");
             return;
         }
+        const pw = $("add-wallet-password").value;
+        const pw2 = $("add-wallet-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 { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
         const duplicate = state.wallets.find(
             (w) =>
                 w.type === "hd" &&
                 w.addresses[0] &&
-            w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
+                w.addresses[0].address.toLowerCase() ===
+                    firstAddress.toLowerCase(),
         );
         if (duplicate) {
             showFlash(
-            "This recovery phrase is already added (" + duplicate.name + ").",
+                "This recovery phrase is already added (" +
+                    duplicate.name +
+                    ").",
             );
             return;
         }
@@ -141,6 +91,7 @@ async function handleMnemonic(ctx, pw) {
         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) {
@@ -158,100 +109,21 @@ async function handleMnemonic(ctx, pw) {
         }
 
         ctx.doRefreshAndRender();
-}
-
-async function handlePrivateKey(ctx, pw) {
-    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 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 handleXprv(ctx, pw) {
-    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 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");
-
-    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.");
+    $("btn-add-wallet-back").addEventListener("click", () => {
+        if (!state.hasWallet) {
+            showView("welcome");
         } else {
-        showFlash("Ready.", 1000);
+            ctx.renderWalletList();
+            showView("main");
         }
+    });
 
-    ctx.doRefreshAndRender();
+    $("btn-add-wallet-import-key").addEventListener(
+        "click",
+        ctx.showImportKeyView,
+    );
 }
 
 module.exports = { init, show };

src/popup/views/addressDetail.js

@@ -18,8 +18,6 @@ const { resolveEnsNames } = require("../../shared/ens");
 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;
 
@@ -267,102 +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 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");
-        }
-    });
-
-    $("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 };

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,12 +31,8 @@ const VIEWS = [
     "approve-site",
     "approve-tx",
     "approve-sign",
-    "export-privkey",
 ];
 
-// Simple view history stack for back-button navigation.
-const viewStack = [];
-
 function $(id) {
     return document.getElementById(id);
 }
@@ -50,13 +47,7 @@ function hideError(id) {
     $(id).classList.add("hidden");
 }
 
-function showView(name, opts) {
-    const skipPush = opts && opts.skipPush;
-    if (!skipPush && state.currentView && state.currentView !== name) {
-        viewStack.push(state.currentView);
-        // Keep the stack bounded to avoid unbounded growth.
-        if (viewStack.length > 20) viewStack.splice(0, viewStack.length - 20);
-    }
+function showView(name) {
     for (const v of VIEWS) {
         const el = document.getElementById(`view-${v}`);
         if (el) {
@@ -74,17 +65,6 @@ function showView(name, opts) {
     }
 }
 
-// Navigate to the previous view in the stack. Falls back to fallbackView
-// (default "main") when the stack is empty.
-function goBack(fallbackView) {
-    const prev = viewStack.pop();
-    if (prev) {
-        showView(prev, { skipPush: true });
-    } else {
-        showView(fallbackView || "main", { skipPush: true });
-    }
-}
-
 let flashTimer = null;
 
 function clearFlash() {
@@ -283,7 +263,6 @@ module.exports = {
     showError,
     hideError,
     showView,
-    goBack,
     showFlash,
     balanceLine,
     balanceLinesForAddress,

src/popup/views/home.js

@@ -235,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" || 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>`;

src/popup/views/importXprv.js

@@ -1,106 +0,0 @@
-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 };

src/shared/transactions.js

@@ -153,9 +153,14 @@ 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. Replace the normal tx with the token transfer,
-    // but preserve contract call metadata (direction, label, method) so
-    // swaps and other contract interactions display correctly.
+    // amount and symbol. Preserve contract call metadata (direction, label,
+    // method) so swaps and other contract interactions display correctly.
+    //
+    // A single tx hash can produce multiple token transfers (e.g. a swap
+    // sends token A and receives token B). Use a composite key
+    // (hash:contractAddress) so every transfer is preserved. The original
+    // normal-tx entry (keyed by bare hash) is removed when at least one
+    // token transfer replaces it.
     for (const tt of ttJson.items || []) {
         const parsed = parseTokenTransfer(tt, addrLower);
         const existing = txsByHash.get(parsed.hash);
@@ -164,8 +169,12 @@ 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 isn't duplicated
+            txsByHash.delete(parsed.hash);
         }
-        txsByHash.set(parsed.hash, parsed);
+        // Use composite key so multiple token transfers per tx are kept
+        const compositeKey = parsed.hash + ":" + (parsed.contractAddress || "");
+        txsByHash.set(compositeKey, parsed);
     }
 
     const txs = [...txsByHash.values()];

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,