From bc4e78c466292f60f5265067e6d311f3e8656671 Mon Sep 17 00:00:00 2001
From: clawbot <clawbot@noreply.git.eeqj.de>
Date: Sat, 28 Feb 2026 12:06:25 -0800
Subject: [PATCH] fix: consistent token contract display on confirm-tx page

The confirm-tx page displayed token contract addresses as plain text,
while addressToken used a styled container (bg-hover rounded-md) with
color dot, copy-on-click, etherscan link, and token metadata.

Changes:
- confirm-tx HTML: use bg-hover rounded-md container matching addressToken
- confirm-tx JS: render contract with addressDotHtml, copy-on-click span,
  etherscan link, and optional token name/symbol metadata
- send.js: pass tokenName to confirmTx for richer contract display
- Add click-to-copy handler for contract address on confirm-tx

Closes #70
---
 src/popup/index.html         | 12 ++++++------
 src/popup/views/confirmTx.js | 23 +++++++++++++++++++++--
 src/popup/views/send.js      | 19 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/popup/index.html b/src/popup/index.html
index daf0d77..2a07be9 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -463,12 +463,12 @@
                 </div>
 
                 <!-- ERC-20 token contract (hidden for ETH) -->
-                <div id="confirm-token-section" class="mb-3 hidden">
-                    <div class="text-xs text-muted mb-1">Token contract</div>
-                    <div
-                        id="confirm-token-contract"
-                        class="text-xs break-all"
-                    ></div>
+                <div
+                    id="confirm-token-section"
+                    class="bg-hover rounded-md mx-1 p-3 mb-3 text-xs hidden"
+                >
+                    <div class="font-bold mb-2">Token Contract</div>
+                    <div id="confirm-token-contract" class="break-all"></div>
                 </div>
 
                 <div class="mb-3">
diff --git a/src/popup/views/confirmTx.js b/src/popup/views/confirmTx.js
index f11cf68..5e8ff1e 100644
--- a/src/popup/views/confirmTx.js
+++ b/src/popup/views/confirmTx.js
@@ -95,10 +95,22 @@ 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 =
-            escapeHtml(txInfo.token) +
-            ` <a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
+            `<div class="flex items-center">` +
+            dot +
+            `<span class="break-all underline decoration-dashed cursor-pointer" id="confirm-token-contract-copy" data-copy="${escapeHtml(txInfo.token)}">${escapeHtml(txInfo.token)}</span>` +
+            `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>` +
+            `</div>`;
+        if (txInfo.tokenName) {
+            $("confirm-token-contract").innerHTML +=
+                `<div class="mt-1"><span class="text-muted">Name:</span> ${escapeHtml(txInfo.tokenName)}</div>`;
+        }
+        if (txInfo.tokenSymbol) {
+            $("confirm-token-contract").innerHTML +=
+                `<div class="mt-1"><span class="text-muted">Symbol:</span> ${escapeHtml(txInfo.tokenSymbol)}</div>`;
+        }
         tokenSection.classList.remove("hidden");
     } else {
         tokenSection.classList.add("hidden");
@@ -273,6 +285,13 @@ function hidePasswordModal() {
 }
 
 function init(ctx) {
+    $("confirm-token-section").addEventListener("click", (e) => {
+        const copyEl = e.target.closest("[data-copy]");
+        if (copyEl) {
+            navigator.clipboard.writeText(copyEl.dataset.copy);
+        }
+    });
+
     $("btn-confirm-send").addEventListener("click", () => {
         showPasswordModal();
     });
diff --git a/src/popup/views/send.js b/src/popup/views/send.js
index fda8a66..0fc2e01 100644
--- a/src/popup/views/send.js
+++ b/src/popup/views/send.js
@@ -10,7 +10,11 @@ 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,
+    resolveSymbol,
+} = require("../../shared/tokenList");
 
 const EXT_ICON =
     `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
@@ -124,6 +128,7 @@ function init(_ctx) {
 
         let tokenSymbol = null;
         let tokenBalance = null;
+        let tokenName = null;
         if (token !== "ETH") {
             const tb = (addr.tokenBalances || []).find(
                 (t) => t.address.toLowerCase() === token.toLowerCase(),
@@ -134,6 +139,17 @@ function init(_ctx) {
                 state.trackedTokens,
             );
             tokenBalance = tb ? tb.balance || "0" : "0";
+            // Resolve token name from balances, tracked tokens, or known list
+            const lower = token.toLowerCase();
+            tokenName =
+                (tb && tb.name) ||
+                (
+                    (state.trackedTokens || []).find(
+                        (t) => t.address.toLowerCase() === lower,
+                    ) || {}
+                ).name ||
+                (TOKEN_BY_ADDRESS.get(lower) || {}).name ||
+                null;
         }
 
         ctx.showConfirmTx({
@@ -145,6 +161,7 @@ function init(_ctx) {
             balance: addr.balance,
             tokenSymbol: tokenSymbol,
             tokenBalance: tokenBalance,
+            tokenName: tokenName,
         });
     });