feat: add private key viewing for addresses

Add a 'Show private key' button on the address detail view that opens
a dedicated password-prompt screen with a clear warning about key
sensitivity. After correct password entry, the derived private key is
displayed in a read-only well with a copy button.

- Add getPrivateKeyForAddress() to wallet.js
- Add showPrivateKey view with password verification
- Add clipboard policy section to README explaining why we never
  auto-clear the clipboard
- Register new view in helpers.js VIEWS array and wire up in index.js

Closes #19

.gitignore

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

README.md

@@ -213,6 +213,22 @@ create an address with the same visible characters and trick the user into
 sending funds to it. Showing the complete identifier defeats this class of
 attack.
 
+#### Clipboard Policy
+
+AutistMask never clears or overwrites the user's clipboard. When sensitive data
+such as a private key is copied, it is the user's responsibility to manage their
+clipboard afterwards. We deliberately avoid auto-clearing the clipboard for two
+reasons:
+
+1. **User expectations**: silently modifying the clipboard violates the
+   principle of least surprise. The user initiated the copy and knows the
+   content is sensitive.
+2. **Data safety**: the user may have copied something else important in the
+   intervening time. A timed clipboard clear would destroy that unrelated data.
+
+The warning shown before revealing a private key makes it clear that the key is
+sensitive and that clipboard management is the user's responsibility.
+
 #### Data Model
 
 The core hierarchy is **Wallets → Addresses**:
@@ -316,15 +332,34 @@ transitions.
     - Balance list: ETH + tracked ERC-20 tokens (4 decimal places, USD inline).
       Each balance row is clickable → **AddressToken**
     - Send / Receive / + Token buttons
+    - "Show private key" button
     - Transaction list (with ENS resolution for counterparties)
 - **Transitions**:
     - Tap balance row → **AddressToken** (for that token)
     - "Send" → **Send**
     - "Receive" → **Receive**
     - "+ Token" → **AddToken**
+    - "Show private key" → **ShowPrivateKey**
     - Tap transaction row → **TransactionDetail**
     - "Back" → **Home**
 
+#### ShowPrivateKey
+
+- **When**: User clicked "Show private key" on AddressDetail.
+- **Elements**:
+    - "Back" button
+    - Title: "Display Private Key"
+    - Warning box (lock + money icons) explaining the key controls funds and
+      that the user is responsible for clipboard management
+    - Password input
+    - "Display Private Key" button (with lock + money icons)
+    - After reveal: private key in a read-only well (monospace, select-all),
+      Copy button, Done button
+- **Transitions**:
+    - "Display Private Key" (correct password) → reveals key in-place
+    - "Copy" → copies key to clipboard
+    - "Done" / "Back" → **AddressDetail** (key cleared from DOM)
+
 #### AddressToken
 
 - **When**: User clicked a specific token balance on AddressDetail.

src/popup/index.html

@@ -56,103 +56,39 @@
                     < Back
                 </button>
                 <h2 class="font-bold mb-2">Add Wallet</h2>
-
+                <p class="mb-2">
-                <!-- Mode selector tabs -->
+                    Enter your 12 or 24 word recovery phrase below, or click the
-                <div class="flex gap-1 mb-3">
+                    button to roll the die for a new one.
+                </p>
+                <div class="mb-1 flex justify-end">
                     <button
-                        id="btn-mode-mnemonic"
+                        id="btn-generate-phrase"
-                        class="border border-border px-2 py-1 cursor-pointer text-xs bg-fg text-bg"
+                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
+                        title="Generate a random recovery phrase"
                     >
-                        Recovery Phrase
+                        [&#9856;]
-                    </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>
-
+                <div class="mb-2">
-                <!-- ---- Mnemonic mode ---- -->
+                    <textarea
-                <div id="add-wallet-mode-mnemonic">
+                        id="wallet-mnemonic"
-                    <p class="mb-2">
+                        rows="3"
-                        Enter your 12 or 24 word recovery phrase below, or click
+                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg resize-y"
-                        the button to roll the die for a new one.
+                        placeholder="word word word ..."
-                    </p>
+                    ></textarea>
-                    <div class="mb-1 flex justify-end">
-                        <button
-                            id="btn-generate-phrase"
-                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
-                            title="Generate a random recovery phrase"
-                        >
-                            [&#9856;]
-                        </button>
-                    </div>
-                    <div class="mb-2">
-                        <textarea
-                            id="wallet-mnemonic"
-                            rows="3"
-                            class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg resize-y"
-                            placeholder="word word word ..."
-                        ></textarea>
-                    </div>
-                    <div
-                        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.
-                    </div>
                 </div>
-
+                <div
-                <!-- ---- Private key mode ---- -->
+                    id="add-wallet-phrase-warning"
-                <div id="add-wallet-mode-key" class="hidden">
+                    class="text-xs mb-2 border border-border border-dashed p-2 hidden"
-                    <p class="mb-2">
+                >
-                        Paste your private key below. This wallet will have a
+                    Write these words down and keep them safe. Anyone with them
-                        single address.
+                    can take your funds; if you lose them, your wallet is gone.
-                    </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
+                    <p class="text-xs text-muted mb-1">
-                        id="add-wallet-password-hint"
+                        This password encrypts your recovery phrase on this
-                        class="text-xs text-muted mb-1"
+                        device. You will need it to send funds.
-                    >
-                        This password encrypts your secret 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,15 @@
                     >
                         + Token
                     </button>
-                    <div class="relative">
+                </div>
-                        <button
+
-                            id="btn-more-menu"
+                <div class="mb-3">
-                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
+                    <button
-                            aria-label="More actions"
+                        id="btn-show-private-key"
-                        >
+                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
-                            &middot;&middot;&middot;
+                    >
-                        </button>
+                        &#128274; Show private key
-                        <div
+                    </button>
-                            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,57 +327,74 @@
                 </div>
             </div>
 
-            <!-- ============ EXPORT PRIVATE KEY VIEW ============ -->
+            <!-- ============ SHOW PRIVATE KEY ============ -->
-            <div id="view-export-privkey" class="view hidden">
+            <div id="view-show-private-key" class="view hidden">
                 <button
-                    id="btn-export-privkey-back"
+                    id="btn-show-pk-back"
                     class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mb-2"
                 >
                     &lt; Back
                 </button>
-                <div
+                <h2 class="font-bold mb-2">Display Private Key</h2>
-                    id="export-privkey-jazzicon"
+
-                    class="flex justify-center mt-1 mb-3"
+                <!-- password prompt section -->
-                ></div>
+                <div id="show-pk-prompt">
-                <h2 class="font-bold mb-1">Export Private Key</h2>
+                    <div
-                <p class="text-xs mb-1" id="export-privkey-title"></p>
+                        class="border border-border border-dashed p-3 mb-3 text-xs"
-                <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
+                        <p class="mb-1">
+                            &#128274;&#128176; Your private key controls this
+                            address and all its funds. Anyone who has it can
+                            spend your tokens.
+                        </p>
+                        <p>
+                            Do not share it. Do not paste it into websites. If
+                            you copy it, you are responsible for clearing your
+                            clipboard when you are done.
+                        </p>
+                    </div>
+                    <div class="mb-2">
+                        <label class="block mb-1">Password</label>
+                        <input
+                            type="password"
+                            id="show-pk-password"
+                            class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
+                            placeholder="Enter your password"
+                        />
+                    </div>
+                    <div
+                        id="show-pk-error"
+                        class="text-xs mb-2 border border-border border-dashed p-1 hidden"
+                    ></div>
+                    <button
+                        id="btn-show-pk-reveal"
+                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
+                    >
+                        &#128274;&#128176; Display Private Key
                     </button>
                 </div>
-                <div id="export-privkey-result" class="hidden">
+
+                <!-- revealed key section -->
+                <div id="show-pk-key-well" class="hidden">
                     <div
-                        id="export-privkey-value"
+                        class="bg-well p-3 mx-1 mb-3 break-all font-mono text-xs select-all"
-                        class="bg-danger-well rounded p-2 font-mono text-xs break-all cursor-pointer mb-1"
+                    >
-                        title="Click to copy"
+                        <span id="show-pk-key-value"></span>
-                    ></div>
+                    </div>
+                    <div class="flex gap-2">
+                        <button
+                            id="btn-show-pk-copy"
+                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
+                        >
+                            Copy
+                        </button>
+                        <button
+                            id="btn-show-pk-done"
+                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
+                        >
+                            Done
+                        </button>
+                    </div>
                 </div>
             </div>
 
@@ -611,7 +611,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>
@@ -717,10 +716,9 @@
                 <div class="flex justify-center mb-3">
                     <canvas id="receive-qr"></canvas>
                 </div>
-                <div
+                <div class="border border-border p-2 break-all mb-3 text-xs">
-                    class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
+                    <span id="receive-dot"></span>
-                >
+                    <span id="receive-address" class="select-all"></span>
-                    <span id="receive-address-block" class="select-all"></span>
                     <span id="receive-etherscan-link"></span>
                 </div>
                 <button
@@ -1081,18 +1079,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

@@ -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");
@@ -18,6 +19,7 @@ const txStatus = require("./views/txStatus");
 const transactionDetail = require("./views/transactionDetail");
 const receive = require("./views/receive");
 const addToken = require("./views/addToken");
+const showPrivateKey = require("./views/showPrivateKey");
 const settings = require("./views/settings");
 const settingsAddToken = require("./views/settingsAddToken");
 const approval = require("./views/approval");
@@ -53,7 +55,9 @@ const ctx = {
     renderWalletList,
     doRefreshAndRender,
     showAddWalletView: () => addWallet.show(),
+    showImportKeyView: () => importKey.show(),
     showAddressDetail: () => addressDetail.show(),
+    showPrivateKey: () => showPrivateKey.show(),
     showAddressToken: () => addressToken.show(),
     showAddTokenView: () => addToken.show(),
     showConfirmTx: (txInfo) => confirmTx.show(txInfo),
@@ -207,8 +211,10 @@ async function init() {
 
     welcome.init(ctx);
     addWallet.init(ctx);
+    importKey.init(ctx);
     home.init(ctx);
     addressDetail.init(ctx);
+    showPrivateKey.init(ctx);
     addressToken.init(ctx);
     send.init(ctx);
     confirmTx.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,62 +1,48 @@
-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 mnemonic = $("wallet-mnemonic").value.trim();
+        if (!mnemonic) {
+            showFlash(
+                "Enter a recovery phrase or press the die to generate one.",
+            );
+            return;
+        }
+        const words = mnemonic.split(/\s+/);
+        if (words.length !== 12 && words.length !== 24) {
+            showFlash(
+                "Recovery phrase must be 12 or 24 words. You entered " +
+                    words.length +
+                    ".",
+            );
+            return;
+        }
+        if (!isValidMnemonic(mnemonic)) {
+            showFlash("Invalid recovery phrase. Check for typos.");
+            return;
+        }
         const pw = $("add-wallet-password").value;
         const pw2 = $("add-wallet-password-confirm").value;
         if (!pw) {
@@ -71,187 +57,73 @@ function init(ctx) {
             showFlash("Passwords do not match.");
             return;
         }
-
+        const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
-        if (currentMode === "mnemonic") {
+        const duplicate = state.wallets.find(
-            await handleMnemonic(ctx, pw);
+            (w) =>
-        } else if (currentMode === "key") {
+                w.type === "hd" &&
-            await handlePrivateKey(ctx, pw);
+                w.addresses[0] &&
-        } else if (currentMode === "xprv") {
+                w.addresses[0].address.toLowerCase() ===
-            await handleXprv(ctx, pw);
+                    firstAddress.toLowerCase(),
+        );
+        if (duplicate) {
+            showFlash(
+                "This recovery phrase is already added (" +
+                    duplicate.name +
+                    ").",
+            );
+            return;
         }
+        const encrypted = await encryptWithPassword(mnemonic, pw);
+        const walletNum = state.wallets.length + 1;
+        const wallet = {
+            type: "hd",
+            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-add-wallet-back").addEventListener("click", () => {
         if (!state.hasWallet) {
-            goBack("welcome");
+            showView("welcome");
         } else {
             ctx.renderWalletList();
-            goBack("main");
+            showView("main");
         }
     });
-}
 
-async function handleMnemonic(ctx, pw) {
+    $("btn-add-wallet-import-key").addEventListener(
-    const mnemonic = $("wallet-mnemonic").value.trim();
+        "click",
-    if (!mnemonic) {
+        ctx.showImportKeyView,
-        showFlash("Enter a recovery phrase or press the die to generate one.");
-        return;
-    }
-    const words = mnemonic.split(/\s+/);
-    if (words.length !== 12 && words.length !== 24) {
-        showFlash(
-            "Recovery phrase must be 12 or 24 words. You entered " +
-                words.length +
-                ".",
-        );
-        return;
-    }
-    if (!isValidMnemonic(mnemonic)) {
-        showFlash("Invalid recovery phrase. Check for typos.");
-        return;
-    }
-    const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
-    const duplicate = state.wallets.find(
-        (w) =>
-            w.type === "hd" &&
-            w.addresses[0] &&
-            w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
     );
-    if (duplicate) {
-        showFlash(
-            "This recovery phrase is already added (" + duplicate.name + ").",
-        );
-        return;
-    }
-    const encrypted = await encryptWithPassword(mnemonic, pw);
-    const walletNum = state.wallets.length + 1;
-    const wallet = {
-        type: "hd",
-        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.");
-    } else {
-        showFlash("Ready.", 1000);
-    }
-
-    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.");
-    } else {
-        showFlash("Ready.", 1000);
-    }
-
-    ctx.doRefreshAndRender();
 }
 
 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;
 
@@ -188,14 +186,10 @@ function renderTransactions(txs) {
     let html = "";
     let i = 0;
     for (const tx of txs) {
-        // For swap transactions, show the user's own labelled wallet
-        // address instead of the contract address (see issue #55).
         const counterparty =
-            tx.direction === "contract" && tx.directionLabel === "Swap"
+            tx.direction === "sent" || tx.direction === "contract"
-                ? tx.from
+                ? tx.to
-                : tx.direction === "sent" || tx.direction === "contract"
+                : tx.from;
-                  ? tx.to
-                  : tx.from;
         const ensName = ensNameMap.get(counterparty) || null;
         const title = addressTitle(counterparty, state.wallets);
         const dirLabel = tx.directionLabel;
@@ -268,100 +262,8 @@ function init(_ctx) {
 
     $("btn-add-token").addEventListener("click", ctx.showAddTokenView);
 
-    // More menu dropdown
+    $("btn-show-private-key").addEventListener("click", () => {
-    const moreBtn = $("btn-more-menu");
+        ctx.showPrivateKey();
-    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();
     });
 }
 

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

src/popup/views/approval.js

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

@@ -13,8 +13,10 @@ const { state, saveState } = require("../../shared/state");
 const VIEWS = [
     "welcome",
     "add-wallet",
+    "import-key",
     "main",
     "address",
+    "show-private-key",
     "address-token",
     "send",
     "confirm-tx",
@@ -30,12 +32,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 +48,7 @@ function hideError(id) {
     $(id).classList.add("hidden");
 }
 
-function showView(name, opts) {
+function showView(name) {
-    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);
-    }
     for (const v of VIEWS) {
         const el = document.getElementById(`view-${v}`);
         if (el) {
@@ -74,17 +66,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 +264,6 @@ module.exports = {
     showError,
     hideError,
     showView,
-    goBack,
     showFlash,
     balanceLine,
     balanceLinesForAddress,

src/popup/views/home.js

@@ -103,15 +103,10 @@ function renderHomeTxList(ctx) {
     let html = "";
     let i = 0;
     for (const tx of homeTxs) {
-        // For swap transactions, show the user's own labelled wallet
-        // address (the one that initiated the swap) instead of the
-        // contract address which is not useful in the list view.
         const counterparty =
-            tx.direction === "contract" && tx.directionLabel === "Swap"
+            tx.direction === "sent" || tx.direction === "contract"
-                ? tx.from
+                ? tx.to
-                : tx.direction === "sent" || tx.direction === "contract"
+                : tx.from;
-                  ? tx.to
-                  : tx.from;
         const dirLabel = tx.directionLabel;
         const amountStr = tx.value
             ? escapeHtml(tx.value + " " + tx.symbol)
@@ -235,7 +230,7 @@ function render(ctx) {
         html += `<div>`;
         html += `<div class="flex justify-between items-center bg-section py-1 px-2" style="margin:0 -0.5rem">`;
         html += `<span class="font-bold cursor-pointer wallet-name underline decoration-dashed" data-wallet="${wi}">${wallet.name}</span>`;
-        if (wallet.type === "hd" || wallet.type === "xprv") {
+        if (wallet.type === "hd") {
             html += `<button class="btn-add-address border border-border px-1 hover:bg-fg hover:text-bg cursor-pointer text-xs" data-wallet="${wi}" title="Add another address to this wallet">+</button>`;
         }
         html += `</div>`;

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/popup/views/receive.js

@@ -1,10 +1,4 @@
-const {
+const { $, showView, showFlash, addressDotHtml } = require("./helpers");
-    $,
-    showView,
-    showFlash,
-    formatAddressHtml,
-    addressTitle,
-} = 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;
+    $("receive-dot").innerHTML = address ? addressDotHtml(address) : "";
-    const ensName = addr ? addr.ensName || null : null;
+    $("receive-address").textContent = address;
-    $("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>`
@@ -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!");

src/popup/views/send.js

@@ -10,7 +10,7 @@ const {
 const { state, currentAddress } = require("../../shared/state");
 let ctx;
 const { getProvider } = require("../../shared/balances");
-const { KNOWN_SYMBOLS, resolveSymbol } = require("../../shared/tokenList");
+const { KNOWN_SYMBOLS } = require("../../shared/tokenList");
 
 const EXT_ICON =
     `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
@@ -73,11 +73,7 @@ function updateSendBalance() {
         const tb = (addr.tokenBalances || []).find(
             (t) => t.address.toLowerCase() === token.toLowerCase(),
         );
-        const symbol = resolveSymbol(
+        const symbol = tb ? tb.symbol : "?";
-            token,
-            addr.tokenBalances,
-            state.trackedTokens,
-        );
         const bal = tb ? tb.balance || "0" : "0";
         $("send-balance").textContent =
             "Current balance: " + bal + " " + symbol;
@@ -128,11 +124,7 @@ function init(_ctx) {
             const tb = (addr.tokenBalances || []).find(
                 (t) => t.address.toLowerCase() === token.toLowerCase(),
             );
-            tokenSymbol = resolveSymbol(
+            tokenSymbol = tb ? tb.symbol : "?";
-                token,
-                addr.tokenBalances,
-                state.trackedTokens,
-            );
             tokenBalance = tb ? tb.balance || "0" : "0";
         }
 

src/popup/views/showPrivateKey.js

@@ -0,0 +1,79 @@
+const { $, showView, showFlash, showError, hideError } = require("./helpers");
+const { state } = require("../../shared/state");
+const { decryptWithPassword } = require("../../shared/vault");
+const { getPrivateKeyForAddress } = require("../../shared/wallet");
+
+let ctx;
+let revealed = false;
+
+function show() {
+    revealed = false;
+    $("show-pk-password").value = "";
+    $("show-pk-key-well").classList.add("hidden");
+    $("show-pk-key-value").textContent = "";
+    $("show-pk-prompt").classList.remove("hidden");
+    hideError("show-pk-error");
+    showView("show-private-key");
+}
+
+function init(_ctx) {
+    ctx = _ctx;
+
+    $("btn-show-pk-back").addEventListener("click", () => {
+        clearKey();
+        ctx.showAddressDetail();
+    });
+
+    $("btn-show-pk-reveal").addEventListener("click", async () => {
+        const pw = $("show-pk-password").value;
+        if (!pw) {
+            showError("show-pk-error", "Please enter your password.");
+            return;
+        }
+
+        const wallet = state.wallets[state.selectedWallet];
+        let decryptedSecret;
+        try {
+            decryptedSecret = await decryptWithPassword(
+                wallet.encryptedSecret,
+                pw,
+            );
+        } catch (_e) {
+            showError("show-pk-error", "Wrong password.");
+            return;
+        }
+
+        const privateKey = getPrivateKeyForAddress(
+            wallet,
+            state.selectedAddress,
+            decryptedSecret,
+        );
+
+        revealed = true;
+        $("show-pk-prompt").classList.add("hidden");
+        $("show-pk-key-well").classList.remove("hidden");
+        $("show-pk-key-value").textContent = privateKey;
+        hideError("show-pk-error");
+    });
+
+    $("btn-show-pk-copy").addEventListener("click", () => {
+        const key = $("show-pk-key-value").textContent;
+        if (key) {
+            navigator.clipboard.writeText(key);
+            showFlash("Copied!");
+        }
+    });
+
+    $("btn-show-pk-done").addEventListener("click", () => {
+        clearKey();
+        ctx.showAddressDetail();
+    });
+}
+
+function clearKey() {
+    revealed = false;
+    $("show-pk-key-value").textContent = "";
+    $("show-pk-password").value = "";
+}
+
+module.exports = { init, show };

src/popup/views/transactionDetail.js

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

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");
@@ -122,51 +121,11 @@ 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;
@@ -174,16 +133,6 @@ 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,7 +85,6 @@ async function fetchTokenBalances(address, blockscoutUrl, trackedTokens) {
 
             balances.push({
                 address: item.token.address_hash,
-                name: item.token.name || "",
                 symbol: item.token.symbol || "???",
                 decimals: decimals,
                 balance: bal,

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

src/shared/uniswap.js

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

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,14 +38,21 @@ 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);
 }
 
+function getPrivateKeyForAddress(walletData, addrIndex, decryptedSecret) {
+    if (walletData.type === "hd") {
+        const node = HDNodeWallet.fromPhrase(
+            decryptedSecret,
+            "",
+            BIP44_ETH_PATH,
+        );
+        return node.deriveChild(addrIndex).privateKey;
+    }
+    return decryptedSecret;
+}
+
 function isValidMnemonic(mnemonic) {
     return Mnemonic.isValidMnemonic(mnemonic);
 }
@@ -74,9 +61,8 @@ module.exports = {
     generateMnemonic,
     deriveAddressFromXpub,
     hdWalletFromMnemonic,
-    hdWalletFromXprv,
-    isValidXprv,
     addressFromPrivateKey,
     getSignerForAddress,
+    getPrivateKeyForAddress,
     isValidMnemonic,
 };

tests/uniswap.test.js

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