fix: persist confirm-tx view across popup close/reopen

The confirm-tx view was not in RESTORABLE_VIEWS, so closing and
reopening the popup would fall back to the main view, losing the
pending transaction confirmation.

Save pendingTx data to state.viewData when showing confirm-tx and
add confirm-tx to the set of restorable views with proper restore
logic.

Closes #77

.gitignore

@@ -25,3 +25,4 @@ dist/
 
 # Yarn
 .yarn-integrity
+package-lock.json

src/popup/index.html

@@ -305,6 +305,26 @@
                     >
                         + 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 -->
@@ -318,6 +338,60 @@
                 </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
@@ -531,6 +605,7 @@
             <!-- ============ 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>
@@ -636,9 +711,10 @@
                 <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">
-                    <span id="receive-dot"></span>
-                    <span id="receive-address" class="select-all"></span>
+                <div
+                    class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
+                >
+                    <span id="receive-address-block" class="select-all"></span>
                     <span id="receive-etherscan-link"></span>
                 </div>
                 <button
@@ -999,18 +1075,18 @@
                             class="text-xs"
                         ></div>
                     </div>
-                    <div id="tx-detail-rawdata-section" class="hidden">
-                        <div class="text-xs text-muted mb-1">Raw data</div>
-                        <div
-                            id="tx-detail-rawdata"
-                            class="text-xs break-all font-mono border border-border border-dashed p-2"
-                        ></div>
-                    </div>
                 </div>
                 <div class="mb-4">
                     <div class="text-xs text-muted mb-1">Transaction hash</div>
                     <div id="tx-detail-hash" class="text-xs break-all"></div>
                 </div>
+                <div id="tx-detail-rawdata-section" class="mb-4 hidden">
+                    <div class="text-xs text-muted mb-1">Raw data</div>
+                    <div
+                        id="tx-detail-rawdata"
+                        class="text-xs break-all font-mono border border-border border-dashed p-2"
+                    ></div>
+                </div>
             </div>
 
             <!-- ============ TRANSACTION APPROVAL ============ -->

src/popup/index.js

@@ -75,6 +75,7 @@ const RESTORABLE_VIEWS = new Set([
     "settings",
     "settings-addtoken",
     "transaction",
+    "confirm-tx",
     "success-tx",
     "error-tx",
 ]);
@@ -134,6 +135,13 @@ function restoreView() {
                 fallbackView();
             }
             break;
+        case "confirm-tx":
+            if (state.viewData && state.viewData.pendingTx) {
+                confirmTx.show(state.viewData.pendingTx);
+            } else {
+                fallbackView();
+            }
+            break;
         case "success-tx":
             if (state.viewData && state.viewData.hash) {
                 txStatus.renderSuccess();

src/popup/styles/main.css

@@ -11,6 +11,7 @@
     --color-border-light: #cccccc;
     --color-hover: #eeeeee;
     --color-well: #f5f5f5;
+    --color-danger-well: #fef2f2;
     --color-section: #dddddd;
 }
 

src/popup/views/addressDetail.js

@@ -18,6 +18,8 @@ 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;
 
@@ -186,10 +188,14 @@ function renderTransactions(txs) {
     let html = "";
     let i = 0;
     for (const tx of txs) {
+        // For swap transactions, show the user's own labelled wallet
+        // address instead of the contract address (see issue #55).
         const counterparty =
-            tx.direction === "sent" || tx.direction === "contract"
-                ? tx.to
-                : tx.from;
+            tx.direction === "contract" && tx.directionLabel === "Swap"
+                ? tx.from
+                : tx.direction === "sent" || tx.direction === "contract"
+                  ? tx.to
+                  : tx.from;
         const ensName = ensNameMap.get(counterparty) || null;
         const title = addressTitle(counterparty, state.wallets);
         const dirLabel = tx.directionLabel;
@@ -261,6 +267,102 @@ 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/addressToken.js

@@ -87,6 +87,7 @@ function show() {
 
     // Determine token symbol and balance
     let symbol, amount, price;
+    const knownToken = TOKEN_BY_ADDRESS.get(tokenId.toLowerCase());
     if (tokenId === "ETH") {
         symbol = "ETH";
         amount = parseFloat(addr.balance || "0");
@@ -142,13 +143,32 @@ function show() {
         const tb = (addr.tokenBalances || []).find(
             (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
         );
-        const tokenName = tb && tb.name ? escapeHtml(tb.name) : null;
-        const tokenSymbol = tb && tb.symbol ? escapeHtml(tb.symbol) : null;
-        const tokenDecimals = tb && tb.decimals != null ? tb.decimals : null;
+        const tracked = (state.trackedTokens || []).find(
+            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
+        );
+        const rawName =
+            (tb && tb.name) ||
+            (tracked && tracked.name) ||
+            (knownToken && knownToken.name) ||
+            null;
+        const rawSymbol =
+            (tb && tb.symbol) ||
+            (tracked && tracked.symbol) ||
+            (knownToken && knownToken.symbol) ||
+            null;
+        const tokenName = rawName ? escapeHtml(rawName) : null;
+        const tokenSymbol = rawSymbol ? escapeHtml(rawSymbol) : null;
+        const tokenDecimals =
+            tb && tb.decimals != null
+                ? tb.decimals
+                : tracked && tracked.decimals != null
+                  ? tracked.decimals
+                  : knownToken && knownToken.decimals != null
+                    ? knownToken.decimals
+                    : null;
         const tokenHolders = tb && tb.holders != null ? tb.holders : null;
         const dot = addressDotHtml(tokenId);
         const tokenLink = `https://etherscan.io/token/${escapeHtml(tokenId)}`;
-        const knownToken = TOKEN_BY_ADDRESS.get(tokenId.toLowerCase());
         const projectUrl = knownToken && knownToken.url ? knownToken.url : null;
         let infoHtml = `<div class="font-bold mb-2">Contract Address</div>`;
         infoHtml +=

src/popup/views/approval.js

@@ -78,10 +78,12 @@ function decodeCalldata(data, toAddress) {
                     "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 );
                 const isUnlimited = rawAmount === maxUint;
+                const amountRaw = isUnlimited
+                    ? "Unlimited"
+                    : formatTxValue(formatUnits(rawAmount, tokenDecimals));
                 const amountStr = isUnlimited
                     ? "Unlimited"
-                    : formatTxValue(formatUnits(rawAmount, tokenDecimals)) +
-                      (tokenSymbol ? " " + tokenSymbol : "");
+                    : amountRaw + (tokenSymbol ? " " + tokenSymbol : "");
 
                 return {
                     name: "Token Approval",
@@ -100,7 +102,11 @@ function decodeCalldata(data, toAddress) {
                             value: spender,
                             address: spender,
                         },
-                        { label: "Amount", value: amountStr },
+                        {
+                            label: "Amount",
+                            value: amountStr,
+                            rawValue: amountRaw,
+                        },
                     ],
                 };
             }
@@ -108,9 +114,11 @@ function decodeCalldata(data, toAddress) {
             if (parsed.name === "transfer") {
                 const to = parsed.args[0];
                 const rawAmount = parsed.args[1];
+                const amountRaw = formatTxValue(
+                    formatUnits(rawAmount, tokenDecimals),
+                );
                 const amountStr =
-                    formatTxValue(formatUnits(rawAmount, tokenDecimals)) +
-                    (tokenSymbol ? " " + tokenSymbol : "");
+                    amountRaw + (tokenSymbol ? " " + tokenSymbol : "");
 
                 return {
                     name: "Token Transfer",
@@ -125,7 +133,11 @@ function decodeCalldata(data, toAddress) {
                             isToken: true,
                         },
                         { label: "Recipient", value: to, address: to },
-                        { label: "Amount", value: amountStr },
+                        {
+                            label: "Amount",
+                            value: amountStr,
+                            rawValue: amountRaw,
+                        },
                     ],
                 };
             }
@@ -163,7 +175,7 @@ function showTxApproval(details) {
                 pendingTxDetails.to = d.address;
             }
             if (d.label === "Amount") {
-                pendingTxDetails.amount = d.value;
+                pendingTxDetails.amount = d.rawValue || d.value;
             }
         }
         if (token) {
@@ -172,6 +184,15 @@ function showTxApproval(details) {
         }
     }
 
+    // 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);
 

src/popup/views/confirmTx.js

@@ -18,7 +18,7 @@ const {
     addressDotHtml,
     escapeHtml,
 } = require("./helpers");
-const { state } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const { getSignerForAddress } = require("../../shared/wallet");
 const { decryptWithPassword } = require("../../shared/vault");
 const { formatUsd, getPrice } = require("../../shared/prices");
@@ -219,6 +219,10 @@ function show(txInfo) {
     $("confirm-fee-amount").textContent = "Estimating...";
     showView("confirm-tx");
 
+    // Persist txInfo so the view survives popup close/reopen
+    state.viewData = { pendingTx: txInfo };
+    saveState();
+
     estimateGas(txInfo);
 }
 

src/popup/views/helpers.js

@@ -31,6 +31,7 @@ const VIEWS = [
     "approve-site",
     "approve-tx",
     "approve-sign",
+    "export-privkey",
 ];
 
 function $(id) {

src/popup/views/home.js

@@ -103,10 +103,15 @@ function renderHomeTxList(ctx) {
     let html = "";
     let i = 0;
     for (const tx of homeTxs) {
+        // For swap transactions, show the user's own labelled wallet
+        // address (the one that initiated the swap) instead of the
+        // contract address which is not useful in the list view.
         const counterparty =
-            tx.direction === "sent" || tx.direction === "contract"
-                ? tx.to
-                : tx.from;
+            tx.direction === "contract" && tx.directionLabel === "Swap"
+                ? tx.from
+                : tx.direction === "sent" || tx.direction === "contract"
+                  ? tx.to
+                  : tx.from;
         const dirLabel = tx.directionLabel;
         const amountStr = tx.value
             ? escapeHtml(tx.value + " " + tx.symbol)

src/popup/views/receive.js

@@ -1,4 +1,10 @@
-const { $, showView, showFlash, addressDotHtml } = require("./helpers");
+const {
+    $,
+    showView,
+    showFlash,
+    formatAddressHtml,
+    addressTitle,
+} = require("./helpers");
 const { state, currentAddress } = require("../../shared/state");
 const QRCode = require("qrcode");
 
@@ -12,8 +18,12 @@ const EXT_ICON =
 function show() {
     const addr = currentAddress();
     const address = addr ? addr.address : "";
-    $("receive-dot").innerHTML = address ? addressDotHtml(address) : "";
-    $("receive-address").textContent = 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;
     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>`
@@ -50,8 +60,16 @@ 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").textContent;
+        const addr = $("receive-address-block").dataset.full;
         if (addr) {
             navigator.clipboard.writeText(addr);
             showFlash("Copied!");

src/popup/views/send.js

@@ -10,11 +10,7 @@ const {
 const { state, currentAddress } = require("../../shared/state");
 let ctx;
 const { getProvider } = require("../../shared/balances");
-const {
-    KNOWN_SYMBOLS,
-    TOKEN_BY_ADDRESS,
-    resolveSymbol,
-} = require("../../shared/tokenList");
+const { KNOWN_SYMBOLS, resolveSymbol } = require("../../shared/tokenList");
 
 const EXT_ICON =
     `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +

src/popup/views/transactionDetail.js

@@ -37,11 +37,19 @@ function blockieHtml(address) {
     return `<img src="${src}" width="48" height="48" style="image-rendering:pixelated;border-radius:50%;display:inline-block">`;
 }
 
+function etherscanLinkHtml(url) {
+    return (
+        `<a href="${url}" target="_blank" rel="noopener" ` +
+        `class="inline-flex items-center"` +
+        `>${EXT_ICON}</a>`
+    );
+}
+
 function txAddressHtml(address, ensName, title) {
     const blockie = blockieHtml(address);
     const dot = addressDotHtml(address);
     const link = `https://etherscan.io/address/${address}`;
-    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
+    const extLink = etherscanLinkHtml(link);
     let html = `<div class="mb-1">${blockie}</div>`;
     if (title) {
         html += `<div class="font-bold">${escapeHtml(title)}</div>`;
@@ -50,10 +58,10 @@ function txAddressHtml(address, ensName, title) {
         html +=
             `<div class="flex items-center">${dot}` +
             copyableHtml(ensName, "") +
-            extLink +
             `</div>` +
-            `<div class="break-all">` +
+            `<div class="flex items-center">${dot}` +
             copyableHtml(address, "break-all") +
+            extLink +
             `</div>`;
     } else {
         html +=
@@ -67,7 +75,7 @@ function txAddressHtml(address, ensName, title) {
 
 function txHashHtml(hash) {
     const link = `https://etherscan.io/tx/${hash}`;
-    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
+    const extLink = etherscanLinkHtml(link);
     return copyableHtml(hash, "break-all") + extLink;
 }
 
@@ -93,9 +101,6 @@ function show(tx) {
         },
     };
     render();
-    if (tx.isContractCall || tx.direction === "contract") {
-        loadCalldata(tx.hash, tx.to);
-    }
 }
 
 function render() {
@@ -138,15 +143,20 @@ 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 section by default; loadCalldata will show it if needed
+    // Hide calldata and raw data sections; re-fetch if this is a contract call
     const calldataSection = $("tx-detail-calldata-section");
     if (calldataSection) calldataSection.classList.add("hidden");
+    const rawDataSection = $("tx-detail-rawdata-section");
+    if (rawDataSection) rawDataSection.classList.add("hidden");
+
+    if (tx.isContractCall || tx.direction === "contract") {
+        loadCalldata(tx.hash, tx.to);
+    }
 
     $("tx-detail-time").textContent =
         isoDate(tx.timestamp) + " (" + timeAgo(tx.timestamp) + ")";
@@ -193,9 +203,20 @@ async function loadCalldata(txHash, toAddress) {
             for (const d of decoded.details || []) {
                 detailsHtml += `<div class="mb-2">`;
                 detailsHtml += `<div class="text-muted">${escapeHtml(d.label)}</div>`;
-                if (d.address) {
+                if (d.address && d.isToken) {
+                    // Token entry: show symbol on its own line, then dot + address + Etherscan link
                     const dot = addressDotHtml(d.address);
-                    detailsHtml += `<div>${dot}${copyableHtml(d.value, "break-all")}</div>`;
+                    const tokenSymbol = d.value.match(/^(\S+)\s*\(/)?.[1];
+                    if (tokenSymbol) {
+                        detailsHtml += `<div class="font-bold">${escapeHtml(tokenSymbol)}</div>`;
+                    }
+                    const etherscanUrl = `https://etherscan.io/token/${d.address}`;
+                    detailsHtml += `<div class="flex items-center">${dot}${copyableHtml(d.address, "break-all")}${etherscanLinkHtml(etherscanUrl)}</div>`;
+                } else if (d.address) {
+                    // Protocol/contract entry: show name + Etherscan link
+                    const dot = addressDotHtml(d.address);
+                    const etherscanUrl = `https://etherscan.io/address/${d.address}`;
+                    detailsHtml += `<div class="flex items-center">${dot}${copyableHtml(d.value, "break-all")}${etherscanLinkHtml(etherscanUrl)}</div>`;
                 } else {
                     detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
                 }
@@ -219,13 +240,16 @@ async function loadCalldata(txHash, toAddress) {
 
         section.classList.remove("hidden");
 
-        // Bind copy handlers for new elements
-        section.querySelectorAll("[data-copy]").forEach((el) => {
-            el.onclick = () => {
-                navigator.clipboard.writeText(el.dataset.copy);
-                showFlash("Copied!");
-            };
-        });
+        // Bind copy handlers for new elements (including raw data now outside section)
+        const copyTargets = [section, rawSection].filter(Boolean);
+        for (const container of copyTargets) {
+            container.querySelectorAll("[data-copy]").forEach((el) => {
+                el.onclick = () => {
+                    navigator.clipboard.writeText(el.dataset.copy);
+                    showFlash("Copied!");
+                };
+            });
+        }
     } catch (e) {
         log.errorf("loadCalldata failed:", e.message);
     }

src/popup/views/txStatus.js

@@ -8,6 +8,7 @@ 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");
@@ -121,11 +122,51 @@ 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 = "";
+    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>`;
+    }
+    return html;
+}
+
 function renderSuccess() {
     const d = state.viewData;
     if (!d || !d.hash) return;
@@ -133,6 +174,16 @@ function renderSuccess() {
     $("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 && d.decoded) {
+        decodedEl.innerHTML = decodedDetailsHtml(d.decoded);
+        decodedEl.classList.remove("hidden");
+    } else if (decodedEl) {
+        decodedEl.classList.add("hidden");
+    }
+
     attachCopyHandlers("view-success-tx");
     showView("success-tx");
 }

src/shared/balances.js

@@ -85,6 +85,7 @@ async function fetchTokenBalances(address, blockscoutUrl, trackedTokens) {
 
             balances.push({
                 address: item.token.address_hash,
+                name: item.token.name || "",
                 symbol: item.token.symbol || "???",
                 decimals: decimals,
                 balance: bal,

src/shared/transactions.js

@@ -153,9 +153,11 @@ 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.  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.
     for (const tt of ttJson.items || []) {
         const parsed = parseTokenTransfer(tt, addrLower);
         const existing = txsByHash.get(parsed.hash);
@@ -164,8 +166,13 @@ 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);
         }
-        txsByHash.set(parsed.hash, parsed);
+        // Use composite key so multiple token transfers per tx are kept.
+        const ttKey = parsed.hash + ":" + (parsed.contractAddress || "");
+        txsByHash.set(ttKey, parsed);
     }
 
     const txs = [...txsByHash.values()];

src/shared/uniswap.js

@@ -161,6 +161,157 @@ function decodeWrapEth(input) {
     }
 }
 
+// V4 inner action IDs
+const V4_SWAP_EXACT_IN_SINGLE = 0x06;
+const V4_SWAP_EXACT_IN = 0x07;
+const V4_SWAP_EXACT_OUT_SINGLE = 0x08;
+const V4_SWAP_EXACT_OUT = 0x09;
+const V4_SETTLE = 0x0b;
+const V4_TAKE = 0x0e;
+
+// Decode V4_SWAP (command 0x10) input bytes.
+// The input is ABI-encoded as (bytes actions, bytes[] params).
+// We extract token addresses from SETTLE (input) and TAKE (output) sub-actions,
+// and swap amounts from the swap sub-actions.
+function decodeV4Swap(input) {
+    try {
+        const d = coder.decode(["bytes", "bytes[]"], input);
+        const actions = getBytes(d[0]);
+        const params = d[1];
+
+        let settleToken = null;
+        let takeToken = null;
+        let amountIn = null;
+        let amountOutMin = null;
+
+        for (let i = 0; i < actions.length; i++) {
+            const actionId = actions[i];
+            try {
+                if (actionId === V4_SETTLE) {
+                    // SETTLE: (address currency, uint256 maxAmount, bool payerIsUser)
+                    const s = coder.decode(
+                        ["address", "uint256", "bool"],
+                        params[i],
+                    );
+                    settleToken = s[0];
+                } else if (actionId === V4_TAKE) {
+                    // TAKE: (address currency, address recipient, uint256 amount)
+                    const t = coder.decode(
+                        ["address", "address", "uint256"],
+                        params[i],
+                    );
+                    takeToken = t[0];
+                } else if (
+                    actionId === V4_SWAP_EXACT_IN ||
+                    actionId === V4_SWAP_EXACT_IN_SINGLE
+                ) {
+                    // Extract amounts from exact-in swap actions
+                    if (actionId === V4_SWAP_EXACT_IN) {
+                        // ExactInputParams: (address currencyIn,
+                        //   tuple(address,uint24,int24,address,bytes)[] path,
+                        //   uint128 amountIn, uint128 amountOutMin)
+                        try {
+                            const s = coder.decode(
+                                [
+                                    "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
+                                ],
+                                params[i],
+                            );
+                            if (!settleToken) settleToken = s[0][0];
+                            const path = s[0][1];
+                            if (path.length > 0 && !takeToken) {
+                                takeToken = path[path.length - 1][0];
+                            }
+                            if (!amountIn) amountIn = s[0][2];
+                            if (!amountOutMin) amountOutMin = s[0][3];
+                        } catch {
+                            // Fall through — SETTLE/TAKE will provide tokens
+                        }
+                    } else {
+                        // ExactInputSingleParams: (tuple(address,address,uint24,int24,address) poolKey,
+                        //   bool zeroForOne, uint128 amountIn, uint128 amountOutMin, bytes hookData)
+                        try {
+                            const s = coder.decode(
+                                [
+                                    "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
+                                ],
+                                params[i],
+                            );
+                            const poolKey = s[0][0];
+                            const zeroForOne = s[0][1];
+                            if (!settleToken)
+                                settleToken = zeroForOne
+                                    ? poolKey[0]
+                                    : poolKey[1];
+                            if (!takeToken)
+                                takeToken = zeroForOne
+                                    ? poolKey[1]
+                                    : poolKey[0];
+                            if (!amountIn) amountIn = s[0][2];
+                            if (!amountOutMin) amountOutMin = s[0][3];
+                        } catch {
+                            // Fall through
+                        }
+                    }
+                } else if (
+                    actionId === V4_SWAP_EXACT_OUT ||
+                    actionId === V4_SWAP_EXACT_OUT_SINGLE
+                ) {
+                    if (actionId === V4_SWAP_EXACT_OUT) {
+                        try {
+                            const s = coder.decode(
+                                [
+                                    "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
+                                ],
+                                params[i],
+                            );
+                            if (!takeToken) takeToken = s[0][0];
+                            const path = s[0][1];
+                            if (path.length > 0 && !settleToken) {
+                                settleToken = path[path.length - 1][0];
+                            }
+                        } catch {
+                            // Fall through
+                        }
+                    } else {
+                        try {
+                            const s = coder.decode(
+                                [
+                                    "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
+                                ],
+                                params[i],
+                            );
+                            const poolKey = s[0][0];
+                            const zeroForOne = s[0][1];
+                            if (!settleToken)
+                                settleToken = zeroForOne
+                                    ? poolKey[0]
+                                    : poolKey[1];
+                            if (!takeToken)
+                                takeToken = zeroForOne
+                                    ? poolKey[1]
+                                    : poolKey[0];
+                        } catch {
+                            // Fall through
+                        }
+                    }
+                }
+            } catch {
+                // Skip sub-actions we can't decode
+            }
+        }
+
+        return {
+            tokenIn: settleToken,
+            tokenOut: takeToken,
+            amountIn,
+            amountOutMin,
+        };
+    } catch {
+        return null;
+    }
+}
+
 // Try to decode a Universal Router execute() call.
 // Returns { name, description, details } matching the format used by
 // the approval UI, or null if the calldata is not a recognised execute().
@@ -233,6 +384,19 @@ function decode(data, toAddress) {
                     }
                 }
 
+                if (cmdId === 0x10) {
+                    const v4 = decodeV4Swap(inputs[i]);
+                    if (v4) {
+                        if (!inputToken && v4.tokenIn) inputToken = v4.tokenIn;
+                        if (!outputToken && v4.tokenOut)
+                            outputToken = v4.tokenOut;
+                        if (!inputAmount && v4.amountIn)
+                            inputAmount = v4.amountIn;
+                        if (!minOutput && v4.amountOutMin)
+                            minOutput = v4.amountOutMin;
+                    }
+                }
+
                 if (cmdId === 0x0c) {
                     hasUnwrapWeth = true;
                 }

tests/uniswap.test.js

@@ -1,9 +1,10 @@
-const { AbiCoder, Interface, solidityPacked } = require("ethers");
+const { AbiCoder, Interface, solidityPacked, getBytes } = require("ethers");
 const uniswap = require("../src/shared/uniswap");
 
 const ROUTER_ADDR = "0x66a9893cc07d91d95644aedd05d03f95e1dba8af";
 const USDT_ADDR = "0xdAC17F958D2ee523a2206206994597C13D831ec7";
 const WETH_ADDR = "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2";
+const USDC_ADDR = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
 const USER_ADDR = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
 
 // AutistMask's first-ever swap, 2026-02-27.
@@ -256,6 +257,87 @@ describe("uniswap decoder", () => {
         expect(amount.value).toBe("5.0000 USDT");
     });
 
+    // This test validates the decodeV4Swap() fix: a V4 ERC20→ERC20 swap
+    // (USDT→USDC) where the token addresses are ONLY discoverable inside
+    // the V4_SWAP sub-actions (SETTLE/TAKE). Before decodeV4Swap() was added,
+    // command 0x10 was opaque and this would decode as "Uniswap Swap" with
+    // no token info (or "ETH → ETH"). Now it correctly shows "USDT → USDC".
+    test("decodes V4_SWAP ERC20→ERC20 tokens via SETTLE/TAKE (regression: #59)", () => {
+        // Build a V4_SWAP input with SETTLE(USDT) + SWAP_EXACT_IN_SINGLE + TAKE(USDC)
+        const V4_SETTLE = 0x0b;
+        const V4_SWAP_EXACT_IN_SINGLE = 0x06;
+        const V4_TAKE = 0x0e;
+
+        // actions: SETTLE, SWAP_EXACT_IN_SINGLE, TAKE
+        const actions = new Uint8Array([
+            V4_SETTLE,
+            V4_SWAP_EXACT_IN_SINGLE,
+            V4_TAKE,
+        ]);
+
+        // SETTLE params: (address currency, uint256 maxAmount, bool payerIsUser)
+        const settleParam = coder.encode(
+            ["address", "uint256", "bool"],
+            [USDT_ADDR, 5000000n, true],
+        );
+
+        // SWAP_EXACT_IN_SINGLE params:
+        // (tuple(address,address,uint24,int24,address) poolKey, bool zeroForOne, uint128 amountIn, uint128 amountOutMin, bytes hookData)
+        const swapParam = coder.encode(
+            [
+                "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
+            ],
+            [
+                [
+                    [
+                        USDT_ADDR,
+                        USDC_ADDR,
+                        100, // fee
+                        1, // tickSpacing
+                        "0x0000000000000000000000000000000000000000", // hooks
+                    ],
+                    true, // zeroForOne
+                    5000000n, // amountIn (5 USDT)
+                    4900000n, // amountOutMin (4.9 USDC)
+                    "0x", // hookData
+                ],
+            ],
+        );
+
+        // TAKE params: (address currency, address recipient, uint256 amount)
+        const takeParam = coder.encode(
+            ["address", "address", "uint256"],
+            [USDC_ADDR, USER_ADDR, 0n],
+        );
+
+        // Encode the V4_SWAP input: (bytes actions, bytes[] params)
+        const v4Input = coder.encode(
+            ["bytes", "bytes[]"],
+            [actions, [settleParam, swapParam, takeParam]],
+        );
+
+        // Build execute() with PERMIT2_PERMIT (0x0a) + V4_SWAP (0x10)
+        // The permit provides the input token, but V4_SWAP must provide
+        // the OUTPUT token — without decodeV4Swap, output would be unknown.
+        const data = buildExecute(
+            solidityPacked(["uint8", "uint8"], [0x0a, 0x10]),
+            [encodePermit2(USDT_ADDR, 5000000n, ROUTER_ADDR), v4Input],
+            9999999999n,
+        );
+
+        const result = uniswap.decode(data, ROUTER_ADDR);
+        expect(result).not.toBeNull();
+        // Before decodeV4Swap fix: name would be "Swap USDT → ETH" or "Uniswap Swap"
+        // After fix: correctly identifies both tokens from V4 sub-actions
+        expect(result.name).toBe("Swap USDT \u2192 USDC");
+
+        const tokenIn = result.details.find((d) => d.label === "Token In");
+        expect(tokenIn.value).toContain("USDT");
+
+        const steps = result.details.find((d) => d.label === "Steps");
+        expect(steps.value).toContain("V4 Swap");
+    });
+
     test("handles unknown tokens gracefully", () => {
         const fakeToken = "0x1111111111111111111111111111111111111111";
         const data = buildExecute(