fix: prevent double symbol display on swap tx broadcast/status views

For Uniswap swaps, the decoded Amount value includes the token symbol
(e.g. '2.0000 USDT'). The tx status view then appended 'ETH' because
pendingTxDetails.token remained 'ETH' (router address is not a token).

Fix:
- Add rawValue (numeric-only) to uniswap decoder's Amount detail
- Extract Token In address from decoded details in approval.js to set
  the correct token/tokenSymbol on pendingTxDetails for swaps
- The existing d.rawValue || d.value pattern now picks up the clean
  numeric value, and symbol comes from tokenSymbol

src/popup/index.html

@@ -305,26 +305,6 @@
                     >
                         + Token
                     </button>
-                    <div class="relative">
-                        <button
-                            id="btn-more-menu"
-                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
-                            aria-label="More actions"
-                        >
-                            &middot;&middot;&middot;
-                        </button>
-                        <div
-                            id="more-menu-dropdown"
-                            class="hidden absolute right-0 top-full mt-1 border border-border bg-bg z-50 whitespace-nowrap py-1"
-                        >
-                            <button
-                                id="btn-export-privkey"
-                                class="block w-full text-left px-4 py-1.5 text-xs font-light text-muted hover:bg-hover hover:text-fg cursor-pointer"
-                            >
-                                Export Private Key
-                            </button>
-                        </div>
-                    </div>
                 </div>
 
                 <!-- transactions -->
@@ -338,60 +318,6 @@
                 </div>
             </div>
 
-            <!-- ============ EXPORT PRIVATE KEY VIEW ============ -->
-            <div id="view-export-privkey" class="view hidden">
-                <button
-                    id="btn-export-privkey-back"
-                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mb-2"
-                >
-                    &lt; Back
-                </button>
-                <div
-                    id="export-privkey-jazzicon"
-                    class="flex justify-center mt-1 mb-3"
-                ></div>
-                <h2 class="font-bold mb-1">Export Private Key</h2>
-                <p class="text-xs mb-1" id="export-privkey-title"></p>
-                <p class="text-xs mb-3">
-                    <span id="export-privkey-dot"></span>
-                    <span
-                        id="export-privkey-address"
-                        class="cursor-pointer"
-                        title="Click to copy"
-                    ></span>
-                </p>
-                <p class="text-xs mb-3 text-muted">
-                    Warning: anyone with this private key can access and
-                    transfer all funds from this address. Never share it.
-                </p>
-                <div
-                    id="export-privkey-flash"
-                    class="text-xs mb-2 hidden"
-                ></div>
-                <div id="export-privkey-password-section" class="mb-2">
-                    <label class="block mb-1">Password</label>
-                    <input
-                        type="password"
-                        id="export-privkey-password"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                        placeholder="Enter your password to continue"
-                    />
-                    <button
-                        id="btn-export-privkey-confirm"
-                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mt-2"
-                    >
-                        Reveal
-                    </button>
-                </div>
-                <div id="export-privkey-result" class="hidden">
-                    <div
-                        id="export-privkey-value"
-                        class="bg-danger-well rounded p-2 font-mono text-xs break-all cursor-pointer mb-1"
-                        title="Click to copy"
-                    ></div>
-                </div>
-            </div>
-
             <!-- ============ ADDRESS-TOKEN DETAIL VIEW ============ -->
             <div id="view-address-token" class="view hidden">
                 <button
@@ -496,11 +422,6 @@
                         class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                         placeholder="Address (0x...) or ENS name"
                     />
-                    <div
-                        id="send-to-error"
-                        class="text-xs"
-                        style="min-height: 1.25rem; color: #cc0000"
-                    ></div>
                 </div>
                 <div class="mb-2">
                     <div class="flex justify-between mb-1">
@@ -581,23 +502,11 @@
                     id="confirm-errors"
                     class="mb-2 border border-border border-dashed p-2 hidden"
                 ></div>
-                <div class="mb-2">
-                    <label class="block mb-1 text-xs">Password</label>
-                    <input
-                        type="password"
-                        id="confirm-tx-password"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                    />
-                </div>
-                <div
-                    id="confirm-tx-password-error"
-                    class="text-xs mb-2 min-h-[1.25rem]"
-                ></div>
                 <button
                     id="btn-confirm-send"
                     class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                 >
-                    Sign &amp; Send
+                    Send
                 </button>
             </div>
 
@@ -622,7 +531,6 @@
             <!-- ============ TX SUCCESS ============ -->
             <div id="view-success-tx" class="view hidden">
                 <h2 class="font-bold mb-2">Transaction Confirmed</h2>
-                <div id="success-tx-decoded" class="mb-3 hidden text-xs"></div>
                 <div class="mb-3">
                     <div class="text-xs text-muted mb-1">Amount</div>
                     <div id="success-tx-summary" class="font-bold"></div>
@@ -676,6 +584,42 @@
                 </button>
             </div>
 
+            <!-- ============ PASSWORD MODAL ============ -->
+            <div
+                id="password-modal"
+                class="hidden fixed inset-0 bg-bg flex items-center justify-center z-50"
+            >
+                <div class="border border-border p-4 bg-bg w-80">
+                    <h2 class="font-bold mb-2">Enter Password</h2>
+                    <p class="text-xs text-muted mb-2">
+                        Your password is needed to authorize this transaction.
+                    </p>
+                    <input
+                        type="password"
+                        id="modal-password"
+                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg mb-2"
+                    />
+                    <div
+                        id="modal-password-error"
+                        class="text-xs mb-2 border border-border border-dashed p-1 hidden"
+                    ></div>
+                    <div class="flex gap-2">
+                        <button
+                            id="btn-modal-confirm"
+                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
+                        >
+                            Confirm
+                        </button>
+                        <button
+                            id="btn-modal-cancel"
+                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
+                        >
+                            Cancel
+                        </button>
+                    </div>
+                </div>
+            </div>
+
             <!-- ============ RECEIVE ============ -->
             <div id="view-receive" class="view hidden">
                 <button
@@ -692,10 +636,9 @@
                 <div class="flex justify-center mb-3">
                     <canvas id="receive-qr"></canvas>
                 </div>
-                <div
+                <div class="border border-border p-2 break-all mb-3 text-xs">
-                    class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
+                    <span id="receive-dot"></span>
-                >
+                    <span id="receive-address" class="select-all"></span>
-                    <span id="receive-address-block" class="select-all"></span>
                     <span id="receive-etherscan-link"></span>
                 </div>
                 <button
@@ -1115,10 +1058,7 @@
                         class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                     />
                 </div>
-                <div
+                <div id="approve-tx-error" class="text-xs hidden mb-2"></div>
-                    id="approve-tx-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
-                ></div>
                 <div class="flex justify-between">
                     <button
                         id="btn-approve-tx"
@@ -1181,10 +1121,7 @@
                         class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                     />
                 </div>
-                <div
+                <div id="approve-sign-error" class="text-xs hidden mb-2"></div>
-                    id="approve-sign-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
-                ></div>
                 <div class="flex justify-between">
                     <button
                         id="btn-approve-sign"

src/popup/index.js

@@ -74,7 +74,6 @@ const RESTORABLE_VIEWS = new Set([
     "receive",
     "settings",
     "settings-addtoken",
-    "confirm-tx",
     "transaction",
     "success-tx",
     "error-tx",
@@ -128,13 +127,6 @@ function restoreView() {
         case "settings-addtoken":
             settingsAddToken.show();
             break;
-        case "confirm-tx":
-            if (state.viewData && state.viewData.pendingTx) {
-                confirmTx.restore();
-            } else {
-                fallbackView();
-            }
-            break;
         case "transaction":
             if (state.viewData && state.viewData.tx) {
                 transactionDetail.render();

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/addressDetail.js

@@ -15,15 +15,9 @@ const {
     filterTransactions,
 } = require("../../shared/transactions");
 const { resolveEnsNames } = require("../../shared/ens");
-const {
+const { updateSendBalance, renderSendTokenSelect } = require("./send");
-    updateSendBalance,
-    renderSendTokenSelect,
-    resetSendValidation,
-} = require("./send");
 const { log } = require("../../shared/log");
 const makeBlockie = require("ethereum-blockies-base64");
-const { decryptWithPassword } = require("../../shared/vault");
-const { getSignerForAddress } = require("../../shared/wallet");
 
 let ctx;
 
@@ -263,7 +257,6 @@ function init(_ctx) {
         $("send-token").classList.remove("hidden");
         $("send-token-static").classList.add("hidden");
         updateSendBalance();
-        resetSendValidation();
         showView("send");
     });
 
@@ -272,108 +265,6 @@ function init(_ctx) {
     });
 
     $("btn-add-token").addEventListener("click", ctx.showAddTokenView);
-
-    // More menu dropdown
-    const moreBtn = $("btn-more-menu");
-    const moreDropdown = $("more-menu-dropdown");
-    moreBtn.addEventListener("click", (e) => {
-        e.stopPropagation();
-        const isOpen = !moreDropdown.classList.toggle("hidden");
-        moreBtn.classList.toggle("bg-fg", isOpen);
-        moreBtn.classList.toggle("text-bg", isOpen);
-    });
-    document.addEventListener("click", () => {
-        moreDropdown.classList.add("hidden");
-        moreBtn.classList.remove("bg-fg", "text-bg");
-    });
-    moreDropdown.addEventListener("click", (e) => {
-        e.stopPropagation();
-    });
-
-    $("btn-export-privkey").addEventListener("click", () => {
-        moreDropdown.classList.add("hidden");
-        moreBtn.classList.remove("bg-fg", "text-bg");
-        const wallet = state.wallets[state.selectedWallet];
-        const addr = wallet.addresses[state.selectedAddress];
-        const blockieEl = $("export-privkey-jazzicon");
-        blockieEl.innerHTML = "";
-        const bImg = document.createElement("img");
-        bImg.src = makeBlockie(addr.address);
-        bImg.width = 48;
-        bImg.height = 48;
-        bImg.style.imageRendering = "pixelated";
-        bImg.style.borderRadius = "50%";
-        blockieEl.appendChild(bImg);
-        $("export-privkey-title").textContent =
-            wallet.name + " \u2014 Address " + (state.selectedAddress + 1);
-        $("export-privkey-dot").innerHTML = addressDotHtml(addr.address);
-        $("export-privkey-address").textContent = addr.address;
-        $("export-privkey-address").dataset.full = addr.address;
-        $("export-privkey-password").value = "";
-        $("export-privkey-flash").classList.add("hidden");
-        $("export-privkey-flash").textContent = "";
-        $("export-privkey-password-section").classList.remove("hidden");
-        $("export-privkey-result").classList.add("hidden");
-        $("export-privkey-value").textContent = "";
-        showView("export-privkey");
-    });
-
-    $("btn-export-privkey-confirm").addEventListener("click", async () => {
-        const password = $("export-privkey-password").value;
-        if (!password) {
-            $("export-privkey-flash").textContent = "Password is required.";
-            $("export-privkey-flash").classList.remove("hidden");
-            return;
-        }
-        const btn = $("btn-export-privkey-confirm");
-        btn.disabled = true;
-        btn.classList.add("text-muted");
-        const wallet = state.wallets[state.selectedWallet];
-        try {
-            const secret = await decryptWithPassword(
-                wallet.encryptedSecret,
-                password,
-            );
-            const signer = getSignerForAddress(
-                wallet,
-                state.selectedAddress,
-                secret,
-            );
-            const privateKey = signer.privateKey;
-            $("export-privkey-password-section").classList.add("hidden");
-            $("export-privkey-value").textContent = privateKey;
-            $("export-privkey-result").classList.remove("hidden");
-            $("export-privkey-flash").classList.add("hidden");
-        } catch {
-            $("export-privkey-flash").textContent = "Wrong password.";
-            $("export-privkey-flash").classList.remove("hidden");
-        } finally {
-            btn.disabled = false;
-            btn.classList.remove("text-muted");
-        }
-    });
-
-    $("export-privkey-value").addEventListener("click", () => {
-        const key = $("export-privkey-value").textContent;
-        if (key) {
-            navigator.clipboard.writeText(key);
-            showFlash("Copied!");
-        }
-    });
-
-    $("export-privkey-address").addEventListener("click", () => {
-        const full = $("export-privkey-address").dataset.full;
-        if (full) {
-            navigator.clipboard.writeText(full);
-            showFlash("Copied!");
-        }
-    });
-
-    $("btn-export-privkey-back").addEventListener("click", () => {
-        $("export-privkey-value").textContent = "";
-        $("export-privkey-password").value = "";
-        show();
-    });
 }
 
 module.exports = { init, show };

src/popup/views/addressToken.js

@@ -12,7 +12,7 @@ const {
     balanceLine,
 } = require("./helpers");
 const { state, currentAddress, saveState } = require("../../shared/state");
-const { TOKEN_BY_ADDRESS, resolveSymbol } = require("../../shared/tokenList");
+const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
 const {
     formatUsd,
     getPrice,
@@ -23,11 +23,7 @@ const {
     filterTransactions,
 } = require("../../shared/transactions");
 const { resolveEnsNames } = require("../../shared/ens");
-const {
+const { updateSendBalance, renderSendTokenSelect } = require("./send");
-    updateSendBalance,
-    renderSendTokenSelect,
-    resetSendValidation,
-} = require("./send");
 const { log } = require("../../shared/log");
 const makeBlockie = require("ethereum-blockies-base64");
 
@@ -100,11 +96,14 @@ function show() {
         const tb = (addr.tokenBalances || []).find(
             (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
         );
-        symbol = resolveSymbol(
+        const tracked = (state.trackedTokens || []).find(
-            tokenId,
+            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
-            addr.tokenBalances,
-            state.trackedTokens,
         );
+        symbol =
+            (tb && tb.symbol) ||
+            (tracked && tracked.symbol) ||
+            (knownToken && knownToken.symbol) ||
+            "?";
         amount = tb ? parseFloat(tb.balance || "0") : 0;
         price = getPrice(symbol);
     }
@@ -376,7 +375,6 @@ function init(_ctx) {
             });
         }
         updateSendBalance();
-        resetSendValidation();
         showView("send");
     });
 

src/popup/views/approval.js

@@ -4,8 +4,6 @@ const {
     addressTitle,
     escapeHtml,
     showView,
-    showError,
-    hideError,
 } = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 const { formatEther, formatUnits, Interface, toUtf8String } = require("ethers");
@@ -169,9 +167,11 @@ function showTxApproval(details) {
         tokenSymbol: token ? token.symbol : null,
     };
 
-    // If this is an ERC-20 call, try to extract the real recipient and amount
+    // If this is an ERC-20 call or a swap, extract the real recipient, amount, and token info
     const decoded = decodeCalldata(details.txParams.data, toAddr || "");
     if (decoded && decoded.details) {
+        let decodedTokenSymbol = null;
+        let decodedTokenAddress = null;
         for (const d of decoded.details) {
             if (d.label === "Recipient" && d.address) {
                 pendingTxDetails.to = d.address;
@@ -179,22 +179,22 @@ function showTxApproval(details) {
             if (d.label === "Amount") {
                 pendingTxDetails.amount = d.rawValue || d.value;
             }
+            if (d.label === "Token In" && !decodedTokenSymbol) {
+                // Extract token symbol and address from decoded details
+                decodedTokenSymbol = d.value;
+                if (d.address) decodedTokenAddress = d.address;
+            }
         }
         if (token) {
             pendingTxDetails.token = toAddr;
             pendingTxDetails.tokenSymbol = token.symbol;
+        } else if (decodedTokenAddress) {
+            // For swaps through routers: use the input token info
+            pendingTxDetails.token = decodedTokenAddress;
+            pendingTxDetails.tokenSymbol = decodedTokenSymbol;
         }
     }
 
-    // Carry decoded calldata info through to success/error views
-    if (decoded) {
-        pendingTxDetails.decoded = {
-            name: decoded.name,
-            description: decoded.description,
-            details: decoded.details,
-        };
-    }
-
     $("approve-tx-hostname").textContent = details.hostname;
     $("approve-tx-from").innerHTML = approvalAddressHtml(state.activeAddress);
 
@@ -256,9 +256,6 @@ function showTxApproval(details) {
         $("approve-tx-data-section").classList.add("hidden");
     }
 
-    $("approve-tx-password").value = "";
-    $("approve-tx-error").classList.add("hidden");
-
     showView("approve-tx");
 }
 
@@ -347,7 +344,7 @@ function showSignApproval(details) {
     }
 
     $("approve-sign-password").value = "";
-    hideError("approve-sign-error");
+    $("approve-sign-error").classList.add("hidden");
     $("btn-approve-sign").disabled = false;
     $("btn-approve-sign").classList.remove("text-muted");
 
@@ -412,10 +409,11 @@ function init(ctx) {
     $("btn-approve-tx").addEventListener("click", () => {
         const password = $("approve-tx-password").value;
         if (!password) {
-            showError("approve-tx-error", "Please enter your password.");
+            $("approve-tx-error").textContent = "Please enter your password.";
+            $("approve-tx-error").classList.remove("hidden");
             return;
         }
-        hideError("approve-tx-error");
+        $("approve-tx-error").classList.add("hidden");
         $("btn-approve-tx").disabled = true;
         $("btn-approve-tx").classList.add("text-muted");
 
@@ -451,10 +449,11 @@ function init(ctx) {
     $("btn-approve-sign").addEventListener("click", () => {
         const password = $("approve-sign-password").value;
         if (!password) {
-            showError("approve-sign-error", "Please enter your password.");
+            $("approve-sign-error").textContent = "Please enter your password.";
+            $("approve-sign-error").classList.remove("hidden");
             return;
         }
-        hideError("approve-sign-error");
+        $("approve-sign-error").classList.add("hidden");
         $("btn-approve-sign").disabled = true;
         $("btn-approve-sign").classList.add("text-muted");
 
@@ -472,7 +471,8 @@ function init(ctx) {
                 } else {
                     const msg =
                         (response && response.error) || "Signing failed.";
-                    showError("approve-sign-error", msg);
+                    $("approve-sign-error").textContent = msg;
+                    $("approve-sign-error").classList.remove("hidden");
                     $("btn-approve-sign").disabled = false;
                     $("btn-approve-sign").classList.remove("text-muted");
                 }

src/popup/views/confirmTx.js

@@ -1,6 +1,6 @@
-// Transaction confirmation view with inline password.
+// Transaction confirmation view + password modal.
-// Shows transaction details, warnings, errors. On Sign & Send,
+// Shows transaction details, warnings, errors. On proceed, opens
-// reads inline password, decrypts secret, signs and broadcasts.
+// password modal, decrypts secret, signs and broadcasts.
 
 const {
     parseEther,
@@ -14,7 +14,6 @@ const {
     showError,
     hideError,
     showView,
-    showFlash,
     addressTitle,
     addressDotHtml,
     escapeHtml,
@@ -39,13 +38,6 @@ const EXT_ICON =
 
 let pendingTx = null;
 
-function restore() {
-    const d = state.viewData;
-    if (d && d.pendingTx) {
-        show(d.pendingTx);
-    }
-}
-
 function etherscanTokenLink(address) {
     return `https://etherscan.io/token/${address}`;
 }
@@ -103,22 +95,11 @@ function show(txInfo) {
     // Token contract section (ERC-20 only)
     const tokenSection = $("confirm-token-section");
     if (isErc20) {
-        const dot = addressDotHtml(txInfo.token);
         const link = etherscanTokenLink(txInfo.token);
         $("confirm-token-contract").innerHTML =
-            `<div class="flex items-center">${dot}` +
+            escapeHtml(txInfo.token) +
-            `<span class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(txInfo.token)}">${escapeHtml(txInfo.token)}</span>` +
+            ` <a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
-            `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>` +
-            `</div>`;
         tokenSection.classList.remove("hidden");
-        // Attach click-to-copy on the contract address
-        const copyEl = tokenSection.querySelector("[data-copy]");
-        if (copyEl) {
-            copyEl.onclick = () => {
-                navigator.clipboard.writeText(copyEl.dataset.copy);
-                showFlash("Copied!");
-            };
-        }
     } else {
         tokenSection.classList.add("hidden");
     }
@@ -233,18 +214,12 @@ function show(txInfo) {
         sendBtn.classList.remove("text-muted");
     }
 
-    // Reset password field and error
-    $("confirm-tx-password").value = "";
-    hideError("confirm-tx-password-error");
-
     // Gas estimate — show placeholder then fetch async
     $("confirm-fee").classList.remove("hidden");
     $("confirm-fee-amount").textContent = "Estimating...";
-    state.viewData = { pendingTx: txInfo };
     showView("confirm-tx");
 
     estimateGas(txInfo);
-    checkRecipientHistory(txInfo);
 }
 
 async function estimateGas(txInfo) {
@@ -287,42 +262,39 @@ async function estimateGas(txInfo) {
     }
 }
 
-async function checkRecipientHistory(txInfo) {
+function showPasswordModal() {
-    try {
+    $("modal-password").value = "";
-        const provider = getProvider(state.rpcUrl);
+    hideError("modal-password-error");
-        const txCount = await provider.getTransactionCount(txInfo.to);
+    $("password-modal").classList.remove("hidden");
-        if (txCount === 0) {
-            const warningsEl = $("confirm-warnings");
-            const warning =
-                `<div class="border border-red-500 border-dashed p-2 mb-1 text-xs font-bold text-red-500">` +
-                `WARNING: The recipient address has ZERO transaction history. ` +
-                `This may indicate a fresh or unused address. Double-check the address before sending.</div>`;
-            if (warningsEl.classList.contains("hidden")) {
-                warningsEl.innerHTML = warning;
-                warningsEl.classList.remove("hidden");
-            } else {
-                warningsEl.innerHTML += warning;
-            }
-        }
-    } catch (e) {
-        log.errorf("recipient history check failed:", e.message);
 }
+
+function hidePasswordModal() {
+    $("password-modal").classList.add("hidden");
 }
 
 function init(ctx) {
-    $("btn-confirm-send").addEventListener("click", async () => {
+    $("btn-confirm-send").addEventListener("click", () => {
-        const password = $("confirm-tx-password").value;
+        showPasswordModal();
+    });
+
+    $("btn-confirm-back").addEventListener("click", () => {
+        showView("send");
+    });
+
+    $("btn-modal-cancel").addEventListener("click", () => {
+        hidePasswordModal();
+    });
+
+    $("btn-modal-confirm").addEventListener("click", async () => {
+        const password = $("modal-password").value;
         if (!password) {
-            showError(
+            showError("modal-password-error", "Please enter your password.");
-                "confirm-tx-password-error",
-                "Please enter your password.",
-            );
             return;
         }
 
         const wallet = state.wallets[state.selectedWallet];
         let decryptedSecret;
-        hideError("confirm-tx-password-error");
+        hideError("modal-password-error");
 
         try {
             decryptedSecret = await decryptWithPassword(
@@ -330,12 +302,11 @@ function init(ctx) {
                 password,
             );
         } catch (e) {
-            showError("confirm-tx-password-error", "Wrong password.");
+            showError("modal-password-error", "Wrong password.");
             return;
         }
 
-        $("btn-confirm-send").disabled = true;
+        hidePasswordModal();
-        $("btn-confirm-send").classList.add("text-muted");
 
         let tx;
         try {
@@ -372,15 +343,8 @@ function init(ctx) {
             decryptedSecret = null;
             const hash = tx ? tx.hash : null;
             txStatus.showError(pendingTx, hash, e.shortMessage || e.message);
-        } finally {
-            $("btn-confirm-send").disabled = false;
-            $("btn-confirm-send").classList.remove("text-muted");
         }
     });
-
-    $("btn-confirm-back").addEventListener("click", () => {
-        showView("send");
-    });
 }
 
-module.exports = { init, show, restore };
+module.exports = { init, show };

src/popup/views/deleteWallet.js

@@ -40,10 +40,6 @@ function init(_ctx) {
             return;
         }
 
-        const btn = $("btn-delete-wallet-confirm");
-        btn.disabled = true;
-        btn.classList.add("text-muted");
-
         const walletIdx = deleteWalletIndex;
         const wallet = state.wallets[walletIdx];
 
@@ -53,8 +49,6 @@ function init(_ctx) {
         } catch (_e) {
             $("delete-wallet-flash").textContent = "Wrong password.";
             $("delete-wallet-flash").classList.remove("hidden");
-            btn.disabled = false;
-            btn.classList.remove("text-muted");
             return;
         }
 

src/popup/views/helpers.js

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

src/popup/views/home.js

@@ -11,11 +11,7 @@ const {
     truncateMiddle,
 } = require("./helpers");
 const { state, saveState, currentAddress } = require("../../shared/state");
-const {
+const { updateSendBalance, renderSendTokenSelect } = require("./send");
-    updateSendBalance,
-    renderSendTokenSelect,
-    resetSendValidation,
-} = require("./send");
 const { deriveAddressFromXpub } = require("../../shared/wallet");
 const {
     formatUsd,
@@ -392,7 +388,6 @@ function init(ctx) {
         $("send-token-static").classList.add("hidden");
         renderSendTokenSelect(addr);
         updateSendBalance();
-        resetSendValidation();
         showView("send");
     });
 

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,108 +10,7 @@ const {
 const { state, currentAddress } = require("../../shared/state");
 let ctx;
 const { getProvider } = require("../../shared/balances");
-const { KNOWN_SYMBOLS, resolveSymbol } = require("../../shared/tokenList");
+const { KNOWN_SYMBOLS, TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
-const { getAddress } = require("ethers");
-
-const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
-
-/**
- * Validate a destination address string.
- * Returns { valid: true } or { valid: false, error: "..." }.
- */
-function validateToAddress(value) {
-    const v = value.trim();
-    if (!v) return { valid: false, error: "" };
-
-    // ENS names: contains a dot and doesn't start with 0x
-    if (v.includes(".") && !v.startsWith("0x")) {
-        // Basic ENS format check: at least one label before and after dot
-        if (/^[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/.test(v)) {
-            return { valid: true };
-        }
-        return {
-            valid: false,
-            error: "Please enter a valid ENS name.",
-        };
-    }
-
-    // Must look like an Ethereum address
-    if (!/^0x[0-9a-fA-F]{40}$/.test(v)) {
-        return {
-            valid: false,
-            error: "Please enter a valid Ethereum address.",
-        };
-    }
-
-    // Reject zero address
-    if (v.toLowerCase() === ZERO_ADDRESS) {
-        return {
-            valid: false,
-            error: "Sending to the zero address is not allowed.",
-        };
-    }
-
-    // EIP-55 checksum validation: all-lowercase is ok, otherwise must match checksum
-    if (v !== v.toLowerCase()) {
-        try {
-            const checksummed = getAddress(v);
-            if (checksummed !== v) {
-                return {
-                    valid: false,
-                    error: "Address checksum is invalid. Please double-check the address.",
-                };
-            }
-        } catch {
-            return {
-                valid: false,
-                error: "Address checksum is invalid. Please double-check the address.",
-            };
-        }
-    }
-
-    // Warn if sending to own address
-    const addr = currentAddress();
-    if (addr && v.toLowerCase() === addr.address.toLowerCase()) {
-        // Allow but will warn — we return valid with a warning
-        return {
-            valid: true,
-            warning: "This is your own address. Are you sure?",
-        };
-    }
-
-    return { valid: true };
-}
-
-function updateToValidation() {
-    const input = $("send-to");
-    const errorEl = $("send-to-error");
-    const btn = $("btn-send-review");
-    const value = input.value.trim();
-
-    if (!value) {
-        errorEl.textContent = "";
-        btn.disabled = true;
-        btn.classList.add("opacity-50");
-        return;
-    }
-
-    const result = validateToAddress(value);
-    if (!result.valid) {
-        errorEl.textContent = result.error;
-        errorEl.style.color = "#cc0000";
-        btn.disabled = true;
-        btn.classList.add("opacity-50");
-    } else if (result.warning) {
-        errorEl.textContent = result.warning;
-        errorEl.style.color = "#b8860b";
-        btn.disabled = false;
-        btn.classList.remove("opacity-50");
-    } else {
-        errorEl.textContent = "";
-        btn.disabled = false;
-        btn.classList.remove("opacity-50");
-    }
-}
 
 const EXT_ICON =
     `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
@@ -174,11 +73,15 @@ function updateSendBalance() {
         const tb = (addr.tokenBalances || []).find(
             (t) => t.address.toLowerCase() === token.toLowerCase(),
         );
-        const symbol = resolveSymbol(
+        const knownToken = TOKEN_BY_ADDRESS.get(token.toLowerCase());
-            token,
+        const tracked = (state.trackedTokens || []).find(
-            addr.tokenBalances,
+            (t) => t.address.toLowerCase() === token.toLowerCase(),
-            state.trackedTokens,
         );
+        const symbol =
+            (tb && tb.symbol) ||
+            (tracked && tracked.symbol) ||
+            (knownToken && knownToken.symbol) ||
+            "?";
         const bal = tb ? tb.balance || "0" : "0";
         $("send-balance").textContent =
             "Current balance: " + bal + " " + symbol;
@@ -189,13 +92,6 @@ function init(_ctx) {
     ctx = _ctx;
     $("send-token").addEventListener("change", updateSendBalance);
 
-    // Initial state: disable review button until address is entered
-    $("btn-send-review").disabled = true;
-    $("btn-send-review").classList.add("opacity-50");
-
-    // Validate address on input
-    $("send-to").addEventListener("input", updateToValidation);
-
     $("btn-send-review").addEventListener("click", async () => {
         const to = $("send-to").value.trim();
         const amount = $("send-amount").value.trim();
@@ -203,15 +99,6 @@ function init(_ctx) {
             showFlash("Please enter a recipient address.");
             return;
         }
-
-        // Re-validate before proceeding
-        const validation = validateToAddress(to);
-        if (!validation.valid) {
-            showFlash(
-                validation.error || "Please enter a valid Ethereum address.",
-            );
-            return;
-        }
         if (!amount || isNaN(parseFloat(amount)) || parseFloat(amount) <= 0) {
             showFlash("Please enter a valid amount.");
             return;
@@ -245,11 +132,15 @@ function init(_ctx) {
             const tb = (addr.tokenBalances || []).find(
                 (t) => t.address.toLowerCase() === token.toLowerCase(),
             );
-            tokenSymbol = resolveSymbol(
+            const knownTk = TOKEN_BY_ADDRESS.get(token.toLowerCase());
-                token,
+            const trackedTk = (state.trackedTokens || []).find(
-                addr.tokenBalances,
+                (t) => t.address.toLowerCase() === token.toLowerCase(),
-                state.trackedTokens,
             );
+            tokenSymbol =
+                (tb && tb.symbol) ||
+                (trackedTk && trackedTk.symbol) ||
+                (knownTk && knownTk.symbol) ||
+                "?";
             tokenBalance = tb ? tb.balance || "0" : "0";
         }
 
@@ -276,19 +167,4 @@ function init(_ctx) {
     });
 }
 
-function resetSendValidation() {
+module.exports = { init, updateSendBalance, renderSendTokenSelect };
-    const errorEl = $("send-to-error");
-    const btn = $("btn-send-review");
-    if (errorEl) errorEl.textContent = "";
-    if (btn) {
-        btn.disabled = true;
-        btn.classList.add("opacity-50");
-    }
-}
-
-module.exports = {
-    init,
-    updateSendBalance,
-    renderSendTokenSelect,
-    resetSendValidation,
-};

src/popup/views/transactionDetail.js

@@ -143,10 +143,11 @@ function render() {
             typeEl.textContent = tx.directionLabel;
             typeSection.classList.remove("hidden");
         }
+        if (headingEl) headingEl.textContent = tx.directionLabel;
     } else {
         if (typeSection) typeSection.classList.add("hidden");
-    }
         if (headingEl) headingEl.textContent = "Transaction";
+    }
 
     // Hide calldata and raw data sections; re-fetch if this is a contract call
     const calldataSection = $("tx-detail-calldata-section");

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/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/transactions.js

@@ -153,11 +153,9 @@ async function fetchRecentTransactions(address, blockscoutUrl, count = 25) {
 
     // When a token transfer shares a hash with a normal tx, the normal tx
     // is the contract call (0 ETH) and the token transfer has the real
-    // amount and symbol.  A single transaction (e.g. a swap) can produce
+    // amount and symbol. Replace the normal tx with the token transfer,
-    // multiple token transfers (one per token involved), so we key token
+    // but preserve contract call metadata (direction, label, method) so
-    // transfers by hash + contract address to keep all of them.  We also
+    // swaps and other contract interactions display correctly.
-    // preserve contract-call metadata (direction, label, method) from the
-    // matching normal tx so swaps display correctly.
     for (const tt of ttJson.items || []) {
         const parsed = parseTokenTransfer(tt, addrLower);
         const existing = txsByHash.get(parsed.hash);
@@ -166,13 +164,8 @@ async function fetchRecentTransactions(address, blockscoutUrl, count = 25) {
             parsed.directionLabel = existing.directionLabel;
             parsed.isContractCall = true;
             parsed.method = existing.method;
-            // Remove the bare-hash normal tx so it doesn't appear as a
-            // duplicate with empty value; token transfers replace it.
-            txsByHash.delete(parsed.hash);
         }
-        // Use composite key so multiple token transfers per tx are kept.
+        txsByHash.set(parsed.hash, parsed);
-        const ttKey = parsed.hash + ":" + (parsed.contractAddress || "");
-        txsByHash.set(ttKey, parsed);
     }
 
     const txs = [...txsByHash.values()];

src/shared/uniswap.js

@@ -445,12 +445,19 @@ function decode(data, toAddress) {
             const maxUint160 = BigInt(
                 "0xffffffffffffffffffffffffffffffffffffffff",
             );
+            const rawAmount =
+                inputAmount >= maxUint160
+                    ? "Unlimited"
+                    : formatAmount(inputAmount, inInfo.decimals);
             const amountStr =
                 inputAmount >= maxUint160
                     ? "Unlimited"
-                    : formatAmount(inputAmount, inInfo.decimals) +
+                    : rawAmount + (inSymbol ? " " + inSymbol : "");
-                      (inSymbol ? " " + inSymbol : "");
+            details.push({
-            details.push({ label: "Amount", value: amountStr });
+                label: "Amount",
+                value: amountStr,
+                rawValue: rawAmount,
+            });
         }
 
         if (outSymbol) {