Merge branch 'main' into fix/issue-78-inline-password

fix: replace confirm-tx password modal with inline field (closes #78 )
Replace the modal overlay password dialog in the confirm-tx view with an inline password field, matching the pattern used by approve-tx and approve-sign views for consistency. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-28 21:38:46 +01:00 · 2026-02-28 12:28:53 -08:00
8 changed files with 25 additions and 106 deletions
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -1115,10 +1115,7 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
-                <div
-                    id="approve-tx-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
-                ></div>
+                <div id="approve-tx-error" class="text-xs hidden mb-2"></div>
                <div class="flex justify-between">
                    <button
                        id="btn-approve-tx"
@@ -1181,10 +1178,7 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
-                <div
-                    id="approve-sign-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
-                ></div>
+                <div id="approve-sign-error" class="text-xs hidden mb-2"></div>
                <div class="flex justify-between">
                    <button
                        id="btn-approve-sign"
--- a/src/popup/index.js
+++ b/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();
--- a/src/popup/views/addressDetail.js
+++ b/src/popup/views/addressDetail.js
@@ -325,9 +325,6 @@ function init(_ctx) {
            $("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(
@@ -347,9 +344,6 @@ function init(_ctx) {
        } catch {
            $("export-privkey-flash").textContent = "Wrong password.";
            $("export-privkey-flash").classList.remove("hidden");
-        } finally {
-            btn.disabled = false;
-            btn.classList.remove("text-muted");
        }
    });

--- a/src/popup/views/approval.js
+++ b/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");
@@ -172,8 +170,6 @@ function showTxApproval(details) {
    // If this is an ERC-20 call, try to extract the real recipient and amount
    const decoded = decodeCalldata(details.txParams.data, toAddr || "");
    if (decoded && decoded.details) {
-        let decodedTokenAddr = null;
-        let decodedTokenSymbol = null;
        for (const d of decoded.details) {
            if (d.label === "Recipient" && d.address) {
                pendingTxDetails.to = d.address;
@@ -181,20 +177,10 @@ function showTxApproval(details) {
            if (d.label === "Amount") {
                pendingTxDetails.amount = d.rawValue || d.value;
            }
-            if (d.label === "Token In" && d.isToken && d.address) {
-                const t = TOKEN_BY_ADDRESS.get(d.address.toLowerCase());
-                if (t) {
-                    decodedTokenAddr = d.address;
-                    decodedTokenSymbol = t.symbol;
-                }
-            }
        }
        if (token) {
            pendingTxDetails.token = toAddr;
            pendingTxDetails.tokenSymbol = token.symbol;
-        } else if (decodedTokenAddr) {
-            pendingTxDetails.token = decodedTokenAddr;
-            pendingTxDetails.tokenSymbol = decodedTokenSymbol;
        }
    }

@@ -268,9 +254,6 @@ function showTxApproval(details) {
        $("approve-tx-data-section").classList.add("hidden");
    }

-    $("approve-tx-password").value = "";
-    $("approve-tx-error").classList.add("hidden");
-
    showView("approve-tx");
 }

@@ -359,7 +342,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");

@@ -424,10 +407,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");

@@ -463,10 +447,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");

@@ -484,7 +469,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");
                }
--- a/src/popup/views/confirmTx.js
+++ b/src/popup/views/confirmTx.js
@@ -39,13 +39,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}`;
 }
@@ -240,7 +233,6 @@ function show(txInfo) {
    // 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);
@@ -360,4 +352,4 @@ function init(ctx) {
    });
 }

-module.exports = { init, show, restore };
+module.exports = { init, show };
--- a/src/popup/views/deleteWallet.js
+++ b/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;
        }

--- a/src/popup/views/txStatus.js
+++ b/src/popup/views/txStatus.js
@@ -43,11 +43,10 @@ function toAddressHtml(address) {
    if (title) {
        return (
            `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>` +
-            `<div class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(address)}">${escapeHtml(address)}</div>` +
-            extLink
+            `<div class="break-all">${escapeHtml(address)}${extLink}</div>`
        );
    }
-    return `<div class="flex items-center">${dot}<span class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(address)}">${escapeHtml(address)}</span>${extLink}</div>`;
+    return `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(address)}</span>${extLink}</div>`;
 }

 function txHashHtml(hash) {
@@ -59,16 +58,6 @@ function txHashHtml(hash) {
    );
 }

-function blockNumberHtml(blockNumber) {
-    const num = String(blockNumber);
-    const link = `https://etherscan.io/block/${num}`;
-    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
-    return (
-        `<span class="underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(num)}">${escapeHtml(num)}</span>` +
-        extLink
-    );
-}
-
 function attachCopyHandlers(viewId) {
    document
        .getElementById(viewId)
@@ -150,7 +139,7 @@ function etherscanTokenLink(address) {

 function decodedDetailsHtml(decoded) {
    if (!decoded || !decoded.details) return "";
-    let html = `<div class="border border-border border-dashed p-2 mb-3">`;
+    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>`;
@@ -175,36 +164,20 @@ function decodedDetailsHtml(decoded) {
        }
        html += `</div>`;
    }
-    html += `</div>`;
    return html;
 }

 function renderSuccess() {
    const d = state.viewData;
    if (!d || !d.hash) return;
-
-    const hasDecoded = d.decoded && d.decoded.details;
-
-    // When decoded details are present, the Amount and To are already
-    // shown inside the decoded well — hide the top-level duplicates.
-    const summarySection = $("success-tx-summary").parentElement;
-    const toSection = $("success-tx-to").parentElement;
-    if (hasDecoded) {
-        summarySection.classList.add("hidden");
-        toSection.classList.add("hidden");
-    } else {
-        summarySection.classList.remove("hidden");
-        toSection.classList.remove("hidden");
    $("success-tx-summary").textContent = d.amount + " " + d.symbol;
    $("success-tx-to").innerHTML = toAddressHtml(d.to);
-    }
-
-    $("success-tx-block").innerHTML = blockNumberHtml(d.blockNumber);
+    $("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 && hasDecoded) {
+    if (decodedEl && d.decoded) {
        decodedEl.innerHTML = decodedDetailsHtml(d.decoded);
        decodedEl.classList.remove("hidden");
    } else if (decodedEl) {
--- a/src/shared/uniswap.js
+++ b/src/shared/uniswap.js
@@ -445,18 +445,12 @@ function decode(data, toAddress) {
            const maxUint160 = BigInt(
                "0xffffffffffffffffffffffffffffffffffffffff",
            );
-            const isUnlimited = inputAmount >= maxUint160;
-            const amountRaw = isUnlimited
+            const amountStr =
+                inputAmount >= maxUint160
                    ? "Unlimited"
-                : formatAmount(inputAmount, inInfo.decimals);
-            const amountStr = isUnlimited
-                ? "Unlimited"
-                : amountRaw + (inSymbol ? " " + inSymbol : "");
-            details.push({
-                label: "Amount",
-                value: amountStr,
-                rawValue: amountRaw,
-            });
+                    : formatAmount(inputAmount, inInfo.decimals) +
+                      (inSymbol ? " " + inSymbol : "");
+            details.push({ label: "Amount", value: amountStr });
        }

        if (outSymbol) {
Author	SHA1	Message	Date
Jeffrey Paul	0873c64c46	Merge branch 'main' into fix/issue-78-inline-password All checks were successful check / check (push) Successful in 22s Details	2026-02-28 21:38:46 +01:00
user	73fa536ba2	fix: replace confirm-tx password modal with inline field (closes #78 ) All checks were successful check / check (push) Successful in 22s Details Replace the modal overlay password dialog in the confirm-tx view with an inline password field, matching the pattern used by approve-tx and approve-sign views for consistency. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-28 12:28:53 -08:00