fix: etherscan link on address-token page goes to token-specific URL

When viewing the address-token page for our own address with an ERC-20 token, the etherscan link now navigates to the token-specific page (etherscan.io/token/<contract>?a=<address>) instead of the plain address page.
2026-03-01 10:51:23 -08:00
32 changed files with 488 additions and 957 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+.git
 node_modules
 .DS_Store
 dist
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 # node:22-slim (22.x LTS), 2026-02-24
 FROM node@sha256:5373f1906319b3a1f291da5d102f4ce5c77ccbe29eb637f072b6c7b70443fc36

-RUN apt-get update && apt-get install -y --no-install-recommends make git && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends make && rm -rf /var/lib/apt/lists/*
 RUN corepack enable && corepack prepare yarn@1.22.22 --activate

 WORKDIR /app
--- a/build.js
+++ b/build.js
@@ -11,51 +11,9 @@ function ensureDir(dir) {
    fs.mkdirSync(dir, { recursive: true });
 }

-function getBuildInfo() {
-    const pkg = JSON.parse(
-        fs.readFileSync(path.join(__dirname, "package.json"), "utf8"),
-    );
-    let commitHash = "unknown";
-    try {
-        commitHash = execSync("git rev-parse --short HEAD", {
-            encoding: "utf8",
-        }).trim();
-    } catch (_) {
-        // not a git repo or git not available
-    }
-    let commitHashFull = "unknown";
-    try {
-        commitHashFull = execSync("git rev-parse HEAD", {
-            encoding: "utf8",
-        }).trim();
-    } catch (_) {
-        // not a git repo or git not available
-    }
-    return {
-        version: pkg.version,
-        license: pkg.license,
-        author: pkg.author,
-        commitHash,
-        commitHashFull,
-        buildDate: new Date().toISOString().slice(0, 10),
-    };
-}
-
 async function build() {
    console.log("Building AutistMask extension...");

-    const buildInfo = getBuildInfo();
-    console.log("Build info:", buildInfo);
-
-    const define = {
-        __BUILD_VERSION__: JSON.stringify(buildInfo.version),
-        __BUILD_LICENSE__: JSON.stringify(buildInfo.license),
-        __BUILD_AUTHOR__: JSON.stringify(buildInfo.author),
-        __BUILD_COMMIT__: JSON.stringify(buildInfo.commitHash),
-        __BUILD_COMMIT_FULL__: JSON.stringify(buildInfo.commitHashFull),
-        __BUILD_DATE__: JSON.stringify(buildInfo.buildDate),
-    };
-
    // compile tailwind CSS
    console.log("Compiling Tailwind CSS...");
    const tailwindInput = path.join(SRC, "popup", "styles", "main.css");
@@ -80,7 +38,6 @@ async function build() {
            platform: "browser",
            target: ["chrome110", "firefox110"],
            minify: true,
-            define,
        });

        // bundle background script
@@ -92,7 +49,6 @@ async function build() {
            platform: "browser",
            target: ["chrome110", "firefox110"],
            minify: true,
-            define,
        });

        // bundle content script
@@ -104,7 +60,6 @@ async function build() {
            platform: "browser",
            target: ["chrome110", "firefox110"],
            minify: true,
-            define,
        });

        // bundle inpage script (injected into page context, separate file)
@@ -116,7 +71,6 @@ async function build() {
            platform: "browser",
            target: ["chrome110", "firefox110"],
            minify: true,
-            define,
        });

        // copy popup HTML
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -2,16 +2,12 @@
 // Handles EIP-1193 RPC requests from content scripts and proxies
 // non-sensitive calls to the configured Ethereum JSON-RPC endpoint.

-const { DEFAULT_RPC_URL } = require("../shared/constants");
-const { SUPPORTED_CHAIN_IDS, networkByChainId } = require("../shared/networks");
-const { onChainSwitch } = require("../shared/chainSwitch");
-const { getBytes } = require("ethers");
 const {
-    state,
-    loadState,
-    saveState,
-    currentNetwork,
-} = require("../shared/state");
+    ETHEREUM_MAINNET_CHAIN_ID,
+    DEFAULT_RPC_URL,
+} = require("../shared/constants");
+const { getBytes } = require("ethers");
+const { state, loadState, saveState } = require("../shared/state");
 const { refreshBalances, getProvider } = require("../shared/balances");
 const { debugFetch } = require("../shared/log");
 const { decryptWithPassword } = require("../shared/vault");
@@ -333,43 +329,31 @@ async function handleRpc(method, params, origin) {
    }

    if (method === "eth_chainId") {
-        return { result: currentNetwork().chainId };
+        return { result: ETHEREUM_MAINNET_CHAIN_ID };
    }

    if (method === "net_version") {
-        return { result: currentNetwork().networkVersion };
+        return { result: "1" };
    }

    if (method === "wallet_switchEthereumChain") {
        const chainId = params?.[0]?.chainId;
-        if (chainId === currentNetwork().chainId) {
-            return { result: null };
-        }
-        if (SUPPORTED_CHAIN_IDS.has(chainId)) {
-            const target = networkByChainId(chainId);
-            await onChainSwitch(target.id);
-            broadcastChainChanged(target.chainId);
+        if (chainId === ETHEREUM_MAINNET_CHAIN_ID) {
            return { result: null };
        }
        return {
            error: {
                code: 4902,
-                message:
-                    "AutistMask supports Ethereum Mainnet and Sepolia Testnet only.",
+                message: "AutistMask only supports Ethereum mainnet.",
            },
        };
    }

    if (method === "wallet_addEthereumChain") {
-        const chainId = params?.[0]?.chainId;
-        if (SUPPORTED_CHAIN_IDS.has(chainId)) {
-            return { result: null };
-        }
        return {
            error: {
                code: 4902,
-                message:
-                    "AutistMask supports Ethereum Mainnet and Sepolia Testnet only.",
+                message: "AutistMask only supports Ethereum mainnet.",
            },
        };
    }
@@ -515,27 +499,6 @@ async function handleRpc(method, params, origin) {
    return { error: { message: "Unsupported method: " + method } };
 }

-// Broadcast chainChanged to all tabs when the network is switched.
-function broadcastChainChanged(chainId) {
-    tabsApi.query({}, (tabs) => {
-        for (const tab of tabs) {
-            tabsApi.sendMessage(
-                tab.id,
-                {
-                    type: "AUTISTMASK_EVENT",
-                    eventName: "chainChanged",
-                    data: chainId,
-                },
-                () => {
-                    if (runtime.lastError) {
-                        // expected for tabs without our content script
-                    }
-                },
-            );
-        }
-    });
-}
-
 // Broadcast accountsChanged to all tabs, respecting per-address permissions
 async function broadcastAccountsChanged() {
    // Clear non-remembered approvals on address switch
--- a/src/content/inpage.js
+++ b/src/content/inpage.js
@@ -2,10 +2,7 @@
 // Creates window.ethereum (EIP-1193 provider) and announces via EIP-6963.

 (function () {
-    // Defaults to mainnet; updated dynamically via eth_chainId on init and
-    // chainChanged events from the extension.
-    let currentChainId = "0x1";
-    let currentNetworkVersion = "1";
+    const CHAIN_ID = "0x1"; // Ethereum mainnet

    const listeners = {};
    let nextId = 1;
@@ -31,12 +28,6 @@
        if (event.source !== window) return;
        if (event.data?.type !== "AUTISTMASK_EVENT") return;
        const { eventName, data } = event.data;
-        if (eventName === "chainChanged") {
-            currentChainId = data;
-            currentNetworkVersion = String(parseInt(data, 16));
-            provider.chainId = currentChainId;
-            provider.networkVersion = currentNetworkVersion;
-        }
        emit(eventName, data);
    });

@@ -66,8 +57,8 @@
    const provider = {
        isAutistMask: true,
        isMetaMask: true, // compatibility — many dApps check this
-        chainId: currentChainId,
-        networkVersion: currentNetworkVersion,
+        chainId: CHAIN_ID,
+        networkVersion: "1",
        selectedAddress: null,

        async request(args) {
@@ -84,12 +75,6 @@
                        ? result[0]
                        : null;
            }
-            if (args.method === "eth_chainId" && result) {
-                currentChainId = result;
-                currentNetworkVersion = String(parseInt(result, 16));
-                provider.chainId = currentChainId;
-                provider.networkVersion = currentNetworkVersion;
-            }
            return result;
        },

@@ -204,19 +189,4 @@

    window.addEventListener("eip6963:requestProvider", announceProvider);
    announceProvider();
-
-    // Fetch the current chain ID from the extension on load so the provider
-    // reflects the selected network immediately (covers Sepolia etc.).
-    sendRequest({ method: "eth_chainId", params: [] })
-        .then((chainId) => {
-            if (chainId) {
-                currentChainId = chainId;
-                currentNetworkVersion = String(parseInt(chainId, 16));
-                provider.chainId = currentChainId;
-                provider.networkVersion = currentNetworkVersion;
-            }
-        })
-        .catch(() => {
-            // Best-effort — keep defaults.
-        });
 })();
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -882,24 +882,6 @@
                    </div>
                </div>

-                <div class="bg-well p-3 mx-1 mb-3">
-                    <h3 class="font-bold mb-1">Network</h3>
-                    <p class="text-xs text-muted mb-1">
-                        Select the Ethereum network. Switching networks will
-                        update the RPC and Blockscout endpoints to their
-                        defaults.
-                    </p>
-                    <div class="text-xs flex items-center gap-1">
-                        <select
-                            id="settings-network"
-                            class="border border-border p-1 bg-bg text-fg text-xs cursor-pointer"
-                        >
-                            <option value="mainnet">Ethereum Mainnet</option>
-                            <option value="sepolia">Sepolia Testnet</option>
-                        </select>
-                    </div>
-                </div>
-
                <div class="bg-well p-3 mx-1 mb-3">
                    <h3 class="font-bold mb-1">Ethereum RPC</h3>
                    <p class="text-xs text-muted mb-1">
@@ -1002,64 +984,6 @@
                    </p>
                    <div id="settings-denied-sites"></div>
                </div>
-
-                <div class="bg-well p-3 mx-1 mb-3">
-                    <h3 class="font-bold mb-1">About</h3>
-                    <p class="text-xs mb-2">
-                        <a
-                            href="https://git.eeqj.de/sneak/AutistMask"
-                            class="underline decoration-dashed"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            >AutistMask</a
-                        >
-                        — Minimal Ethereum wallet browser extension.
-                    </p>
-                    <div class="text-xs">
-                        <div class="mb-1">
-                            <span class="text-muted">License:</span>
-                            <span id="about-license"></span>
-                        </div>
-                        <div class="mb-1">
-                            <span class="text-muted">Author:</span>
-                            <span id="about-author"></span>
-                        </div>
-                        <div class="mb-1">
-                            <span class="text-muted">Version:</span>
-                            <span
-                                id="about-version"
-                                class="cursor-pointer select-none"
-                            ></span>
-                        </div>
-                        <div class="mb-1">
-                            <span class="text-muted">Release date:</span>
-                            <span id="about-release-date"></span>
-                        </div>
-                        <div>
-                            <span class="text-muted">Commit:</span>
-                            <a
-                                id="about-commit-link"
-                                class="underline decoration-dashed"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                            ></a>
-                        </div>
-                    </div>
-                </div>
-
-                <div
-                    id="settings-debug-well"
-                    class="bg-well p-3 mx-1 mb-3"
-                    style="display: none"
-                >
-                    <h3 class="font-bold mb-1">Debug</h3>
-                    <label
-                        class="text-xs flex items-center gap-1 cursor-pointer"
-                    >
-                        <input type="checkbox" id="settings-debug-mode" />
-                        Enable debug mode
-                    </label>
-                </div>
            </div>

            <!-- ============ DELETE WALLET CONFIRM ============ -->
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -1,24 +1,11 @@
 // AutistMask popup entry point.
 // Loads state, initializes views, triggers first render.

-const {
-    state,
-    saveState,
-    loadState,
-    currentNetwork,
-} = require("../shared/state");
-const { isDebug, setRuntimeDebug } = require("../shared/log");
+const { DEBUG } = require("../shared/constants");
+const { state, saveState, loadState } = require("../shared/state");
 const { refreshPrices } = require("../shared/prices");
 const { refreshBalances } = require("../shared/balances");
-const {
-    $,
-    showView,
-    updateDebugBanner,
-    setRenderMain,
-    pushCurrentView,
-    goBack,
-    clearViewStack,
-} = require("./views/helpers");
+const { $, showView } = require("./views/helpers");
 const { applyTheme } = require("./theme");

 const home = require("./views/home");
@@ -66,42 +53,15 @@ async function doRefreshAndRender() {
 const ctx = {
    renderWalletList,
    doRefreshAndRender,
-    showAddWalletView: () => {
-        pushCurrentView();
-        addWallet.show();
-    },
-    showAddressDetail: () => {
-        pushCurrentView();
-        addressDetail.show();
-    },
-    showAddressToken: () => {
-        pushCurrentView();
-        addressToken.show();
-    },
-    showAddTokenView: () => {
-        pushCurrentView();
-        addToken.show();
-    },
-    showConfirmTx: (txInfo) => {
-        pushCurrentView();
-        confirmTx.show(txInfo);
-    },
-    showReceive: () => {
-        pushCurrentView();
-        receive.show();
-    },
-    showTransactionDetail: (tx) => {
-        pushCurrentView();
-        transactionDetail.show(tx);
-    },
-    showSettingsView: () => {
-        pushCurrentView();
-        settings.show();
-    },
-    showSettingsAddTokenView: () => {
-        pushCurrentView();
-        settingsAddToken.show();
-    },
+    showAddWalletView: () => addWallet.show(),
+    showAddressDetail: () => addressDetail.show(),
+    showAddressToken: () => addressToken.show(),
+    showAddTokenView: () => addToken.show(),
+    showConfirmTx: (txInfo) => confirmTx.show(txInfo),
+    showReceive: () => receive.show(),
+    showTransactionDetail: (tx) => transactionDetail.show(tx),
+    showSettingsView: () => settings.show(),
+    showSettingsAddTokenView: () => settingsAddToken.show(),
 };

 // Views that can be fully re-rendered from persisted state.
@@ -207,15 +167,18 @@ function fallbackView() {
 }

 async function init() {
+    if (DEBUG) {
+        const banner = document.createElement("div");
+        banner.id = "debug-banner";
+        banner.textContent = "DEBUG / INSECURE";
+        banner.style.cssText =
+            "background:#c00;color:#fff;text-align:center;font-size:10px;padding:1px 0;font-family:monospace;position:sticky;top:0;z-index:9999;";
+        document.body.prepend(banner);
+    }
+
    await loadState();
    applyTheme(state.theme);

-    // Sync runtime debug flag from persisted state before first render
-    setRuntimeDebug(state.debugMode);
-
-    // Create the debug/testnet banner if needed (uses runtime debug state)
-    updateDebugBanner();
-
    // Auto-default active address
    if (
        state.activeAddress === null &&
@@ -245,15 +208,13 @@ async function init() {
                .getElementById("view-settings")
                .classList.contains("hidden")
        ) {
-            goBack();
+            renderWalletList();
+            showView("main");
            return;
        }
-        pushCurrentView();
        settings.show();
    });

-    setRenderMain(renderWalletList);
-
    welcome.init(ctx);
    addWallet.init(ctx);
    home.init(ctx);
--- a/src/popup/styles/main.css
+++ b/src/popup/styles/main.css
@@ -10,7 +10,7 @@
    --color-border: #000000;
    --color-border-light: #cccccc;
    --color-hover: #eeeeee;
-    --color-well: #e8e8e8;
+    --color-well: #f5f5f5;
    --color-danger-well: #fef2f2;
    --color-section: #dddddd;
 }
--- a/src/popup/views/addToken.js
+++ b/src/popup/views/addToken.js
@@ -1,4 +1,4 @@
-const { $, showFlash, goBack } = require("./helpers");
+const { $, showView, showFlash } = require("./helpers");
 const { getTopTokens } = require("../../shared/tokenList");
 const { state, saveState } = require("../../shared/state");
 const { lookupTokenInfo } = require("../../shared/balances");
@@ -59,12 +59,7 @@ function init(ctx) {
            });
            await saveState();
            ctx.doRefreshAndRender();
-            // Pop the stack (back to address detail) and re-render it
-            // so the newly added token is visible immediately.
-            if (state.viewStack.length > 0) {
-                state.viewStack.pop();
-            }
-            require("./addressDetail").show();
+            ctx.showAddressDetail();
        } catch (e) {
            const detail = e.shortMessage || e.message || String(e);
            log.errorf("Token lookup failed for", contractAddr, detail);
@@ -74,9 +69,7 @@ function init(ctx) {
        }
    });

-    $("btn-add-token-back").addEventListener("click", () => {
-        goBack();
-    });
+    $("btn-add-token-back").addEventListener("click", ctx.showAddressDetail);
 }

 module.exports = { init, show };
--- a/src/popup/views/addWallet.js
+++ b/src/popup/views/addWallet.js
@@ -1,4 +1,4 @@
-const { $, showView, showFlash, goBack, clearViewStack } = require("./helpers");
+const { $, showView, showFlash } = require("./helpers");
 const {
    generateMnemonic,
    hdWalletFromMnemonic,
@@ -143,7 +143,6 @@ async function importMnemonic(ctx) {
    state.wallets.push(wallet);
    state.hasWallet = true;
    await saveState();
-    clearViewStack();
    ctx.renderWalletList();
    showView("main");

@@ -199,7 +198,6 @@ async function importPrivateKey(ctx) {
    });
    state.hasWallet = true;
    await saveState();
-    clearViewStack();
    ctx.renderWalletList();
    showView("main");

@@ -251,7 +249,6 @@ async function importXprvKey(ctx) {
    state.wallets.push(wallet);
    state.hasWallet = true;
    await saveState();
-    clearViewStack();
    ctx.renderWalletList();
    showView("main");

@@ -300,7 +297,12 @@ function init(ctx) {

    // Back button
    $("btn-add-wallet-back").addEventListener("click", () => {
-        goBack();
+        if (!state.hasWallet) {
+            showView("welcome");
+        } else {
+            ctx.renderWalletList();
+            showView("main");
+        }
    });
 }

--- a/src/popup/views/addressDetail.js
+++ b/src/popup/views/addressDetail.js
@@ -8,10 +8,6 @@ const {
    addressTitle,
    escapeHtml,
    truncateMiddle,
-    renderAddressHtml,
-    attachCopyHandlers,
-    goBack,
-    pushCurrentView,
 } = require("./helpers");
 const { state, currentAddress, saveState } = require("../../shared/state");
 const { formatUsd, getAddressValueUsd } = require("../../shared/prices");
@@ -32,6 +28,17 @@ const { getSignerForAddress } = require("../../shared/wallet");

 let ctx;

+const EXT_ICON =
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
+    `</svg></span>`;
+
+function etherscanAddressLink(address) {
+    return `https://etherscan.io/address/${address}`;
+}
+
 function show() {
    state.selectedToken = null;
    const wallet = state.wallets[state.selectedWallet];
@@ -49,18 +56,22 @@ function show() {
    img.style.imageRendering = "pixelated";
    img.style.borderRadius = "50%";
    blockieEl.appendChild(img);
-    const addrTitle = addressTitle(addr.address, state.wallets);
-    $("address-line").innerHTML = renderAddressHtml(addr.address, {
-        title: addrTitle,
-        ensName: addr.ensName,
-    });
-    $("address-line").dataset.full = addr.address;
-    attachCopyHandlers($("address-line"));
+    $("address-dot").innerHTML = addressDotHtml(addr.address);
+    $("address-full").dataset.full = addr.address;
+    $("address-full").textContent = addr.address;
+    const addrLink = etherscanAddressLink(addr.address);
+    $("address-etherscan-link").innerHTML =
+        `<a href="${addrLink}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    const usdTotal = formatUsd(getAddressValueUsd(addr));
    $("address-usd-total").innerHTML = usdTotal || "&nbsp;";
    const ensEl = $("address-ens");
-    // ENS is now shown inside renderAddressHtml, hide the separate element
-    ensEl.classList.add("hidden");
+    if (addr.ensName) {
+        ensEl.innerHTML =
+            addressDotHtml(addr.address) + escapeHtml(addr.ensName);
+        ensEl.classList.remove("hidden");
+    } else {
+        ensEl.classList.add("hidden");
+    }
    $("address-balances").innerHTML = balanceLinesForAddress(
        addr,
        state.trackedTokens,
@@ -247,9 +258,18 @@ function renderTransactions(txs) {

 function init(_ctx) {
    ctx = _ctx;
+    $("address-full").addEventListener("click", () => {
+        const addr = $("address-full").dataset.full;
+        if (addr) {
+            navigator.clipboard.writeText(addr);
+            showFlash("Copied!");
+            flashCopyFeedback($("address-full"));
+        }
+    });

    $("btn-address-back").addEventListener("click", () => {
-        goBack();
+        ctx.renderWalletList();
+        showView("main");
    });

    $("btn-send").addEventListener("click", () => {
@@ -267,7 +287,6 @@ function init(_ctx) {
        $("send-token-static").classList.add("hidden");
        updateSendBalance();
        resetSendValidation();
-        pushCurrentView();
        showView("send");
    });

@@ -297,7 +316,6 @@ function init(_ctx) {
    $("btn-export-privkey").addEventListener("click", () => {
        moreDropdown.classList.add("hidden");
        moreBtn.classList.remove("bg-fg", "text-bg");
-        pushCurrentView();
        const wallet = state.wallets[state.selectedWallet];
        const addr = wallet.addresses[state.selectedAddress];
        const blockieEl = $("export-privkey-jazzicon");
@@ -311,9 +329,9 @@ function init(_ctx) {
        blockieEl.appendChild(bImg);
        $("export-privkey-title").textContent =
            wallet.name + " \u2014 Address " + (state.selectedAddress + 1);
-        const exportAddrContainer = $("export-privkey-dot").parentElement;
-        exportAddrContainer.innerHTML = renderAddressHtml(addr.address);
-        attachCopyHandlers(exportAddrContainer);
+        $("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").textContent = "";
        $("export-privkey-flash").style.visibility = "hidden";
@@ -367,10 +385,19 @@ function init(_ctx) {
        }
    });

+    $("export-privkey-address").addEventListener("click", () => {
+        const full = $("export-privkey-address").dataset.full;
+        if (full) {
+            navigator.clipboard.writeText(full);
+            showFlash("Copied!");
+            flashCopyFeedback($("export-privkey-address"));
+        }
+    });
+
    $("btn-export-privkey-back").addEventListener("click", () => {
        $("export-privkey-value").textContent = "";
        $("export-privkey-password").value = "";
-        goBack();
+        show();
    });
 }

--- a/src/popup/views/addressToken.js
+++ b/src/popup/views/addressToken.js
@@ -11,10 +11,6 @@ const {
    escapeHtml,
    truncateMiddle,
    balanceLine,
-    renderAddressHtml,
-    attachCopyHandlers,
-    goBack,
-    pushCurrentView,
 } = require("./helpers");
 const { state, currentAddress, saveState } = require("../../shared/state");
 const { TOKEN_BY_ADDRESS, resolveSymbol } = require("../../shared/tokenList");
@@ -38,6 +34,21 @@ const makeBlockie = require("ethereum-blockies-base64");

 let ctx;

+const EXT_ICON =
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
+    `</svg></span>`;
+
+function etherscanAddressLink(address) {
+    return `https://etherscan.io/address/${address}`;
+}
+
+function etherscanTokenLink(tokenContract, holderAddress) {
+    return `https://etherscan.io/token/${tokenContract}?a=${holderAddress}`;
+}
+
 function isoDate(timestamp) {
    const d = new Date(timestamp * 1000);
    const pad = (n) => String(n).padStart(2, "0");
@@ -141,16 +152,18 @@ function show() {
    blockieEl.appendChild(img);

    // Address line
-    const addrTitle = addressTitle(addr.address, state.wallets);
-    $("address-token-line").innerHTML = renderAddressHtml(addr.address, {
-        title: addrTitle,
-        ensName: addr.ensName,
-    });
-    $("address-token-line").dataset.full = addr.address;
-    attachCopyHandlers($("address-token-line"));
+    $("address-token-dot").innerHTML = addressDotHtml(addr.address);
+    $("address-token-full").dataset.full = addr.address;
+    $("address-token-full").textContent = addr.address;
+    const addrLink =
+        tokenId !== "ETH"
+            ? etherscanTokenLink(tokenId, addr.address)
+            : etherscanAddressLink(addr.address);
+    $("address-token-etherscan-link").innerHTML =
+        `<a href="${addrLink}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;

    // USD total for this token only
-    const usdVal = price ? amount * price : null;
+    const usdVal = price ? amount * price : 0;
    const usdStr = formatUsd(usdVal);
    $("address-token-usd-total").innerHTML = usdStr || "&nbsp;";

@@ -187,9 +200,15 @@ function show() {
                    ? 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 projectUrl = knownToken && knownToken.url ? knownToken.url : null;
        let infoHtml = `<div class="font-bold mb-2">Contract Address</div>`;
-        infoHtml += `<div class="mb-2">${renderAddressHtml(tokenId)}</div>`;
+        infoHtml +=
+            `<div class="flex items-center mb-2">${dot}` +
+            `<span class="break-all underline decoration-dashed cursor-pointer" id="address-token-contract-copy" data-copy="${escapeHtml(tokenId)}">${escapeHtml(tokenId)}</span>` +
+            `<a href="${tokenLink}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>` +
+            `</div>`;
        if (tokenName)
            infoHtml += `<div class="mb-1"><span class="text-muted">Name:</span> ${tokenName}</div>`;
        if (tokenSymbol)
@@ -201,7 +220,6 @@ function show() {
        if (projectUrl)
            infoHtml += `<div class="mb-1"><span class="text-muted">Website:</span> <a href="${escapeHtml(projectUrl)}" target="_blank" rel="noopener" class="underline decoration-dashed">${escapeHtml(projectUrl)}</a></div>`;
        contractInfo.innerHTML = infoHtml;
-        attachCopyHandlers(contractInfo);
        contractInfo.classList.remove("hidden");
    } else {
        contractInfo.innerHTML = "";
@@ -323,6 +341,15 @@ function renderTransactions(txs) {

 function init(_ctx) {
    ctx = _ctx;
+    $("address-token-full").addEventListener("click", () => {
+        const addr = $("address-token-full").dataset.full;
+        if (addr) {
+            navigator.clipboard.writeText(addr);
+            showFlash("Copied!");
+            flashCopyFeedback($("address-token-full"));
+        }
+    });
+
    $("address-token-contract-info").addEventListener("click", (e) => {
        const copyEl = e.target.closest("[data-copy]");
        if (copyEl) {
@@ -333,7 +360,7 @@ function init(_ctx) {
    });

    $("btn-address-token-back").addEventListener("click", () => {
-        goBack();
+        ctx.showAddressDetail();
    });

    $("btn-address-token-send").addEventListener("click", () => {
@@ -360,14 +387,28 @@ function init(_ctx) {
        $("send-token").classList.add("hidden");
        let staticHtml = `<div class="font-bold">${escapeHtml(currentSymbol)}</div>`;
        if (tokenId !== "ETH") {
-            staticHtml += `<div class="text-xs">${renderAddressHtml(tokenId)}</div>`;
+            const dot = addressDotHtml(tokenId);
+            const link = `https://etherscan.io/token/${tokenId}`;
+            const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
+            staticHtml +=
+                `<div class="flex items-center text-xs">${dot}` +
+                `<span class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(tokenId)}">${escapeHtml(tokenId)}</span>` +
+                extLink +
+                `</div>`;
        }
        $("send-token-static").innerHTML = staticHtml;
        $("send-token-static").classList.remove("hidden");
-        attachCopyHandlers($("send-token-static"));
+        // Attach copy handler for the contract address
+        const copyEl = $("send-token-static").querySelector("[data-copy]");
+        if (copyEl) {
+            copyEl.addEventListener("click", () => {
+                navigator.clipboard.writeText(copyEl.dataset.copy);
+                showFlash("Copied!");
+                flashCopyFeedback(copyEl);
+            });
+        }
        updateSendBalance();
        resetSendValidation();
-        pushCurrentView();
        showView("send");
    });

--- a/src/popup/views/approval.js
+++ b/src/popup/views/approval.js
@@ -1,16 +1,14 @@
 const {
    $,
+    addressDotHtml,
    addressTitle,
    escapeHtml,
    showView,
    showError,
    hideError,
-    renderAddressHtml,
-    attachCopyHandlers,
 } = require("./helpers");
-const { state, saveState, currentNetwork } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const { formatEther, formatUnits, Interface, toUtf8String } = require("ethers");
-const { getPrice, formatUsd } = require("../../shared/prices");
 const { ERC20_ABI } = require("../../shared/constants");
 const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
 const txStatus = require("./txStatus");
@@ -18,11 +16,28 @@ const uniswap = require("../../shared/uniswap");
 const runtime =
    typeof browser !== "undefined" ? browser.runtime : chrome.runtime;

+const EXT_ICON =
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
+    `</svg></span>`;
+
 const erc20Iface = new Interface(ERC20_ABI);

 function approvalAddressHtml(address) {
+    const dot = addressDotHtml(address);
+    const link = `https://etherscan.io/address/${address}`;
+    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    const title = addressTitle(address, state.wallets);
-    return renderAddressHtml(address, { title });
+    let html = "";
+    if (title) {
+        html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
+        html += `<div class="break-all">${escapeHtml(address)}${extLink}</div>`;
+    } else {
+        html += `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(address)}</span>${extLink}</div>`;
+    }
+    return html;
 }

 function formatTxValue(val) {
@@ -37,6 +52,10 @@ function tokenLabel(address) {
    return t ? t.symbol : null;
 }

+function etherscanTokenLink(address) {
+    return `https://etherscan.io/token/${address}`;
+}
+
 // Try to decode calldata using known ABIs.
 // Returns { name, description, details } or null.
 function decodeCalldata(data, toAddress) {
@@ -215,19 +234,17 @@ function showTxApproval(details) {
            toHtml += `<div class="font-bold mb-1">${escapeHtml(symbol)}</div>`;
        }
        toHtml += approvalAddressHtml(toAddr);
+        if (symbol) {
+            const link = etherscanTokenLink(toAddr);
+            toHtml = toHtml.replace("</div>", "") + ""; // approvalAddressHtml already has etherscan link
+        }
        $("approve-tx-to").innerHTML = toHtml;
    } else {
        $("approve-tx-to").innerHTML = escapeHtml("(contract creation)");
    }

-    const ethValueFormatted = formatTxValue(
-        formatEther(details.txParams.value || "0"),
-    );
-    const ethPrice = getPrice("ETH");
-    const ethUsd = ethPrice ? parseFloat(ethValueFormatted) * ethPrice : null;
-    const usdStr = formatUsd(ethUsd);
    $("approve-tx-value").textContent =
-        ethValueFormatted + " ETH" + (usdStr ? " (" + usdStr + ")" : "");
+        formatTxValue(formatEther(details.txParams.value || "0")) + " ETH";

    // Decode calldata (reuse decoded from above)
    const decodedEl = $("approve-tx-decoded");
@@ -242,9 +259,12 @@ function showTxApproval(details) {
            detailsHtml += `<div class="text-muted">${escapeHtml(d.label)}</div>`;
            if (d.address) {
                if (d.isToken) {
+                    const tLink = etherscanTokenLink(d.address);
                    detailsHtml += `<div class="font-bold">${escapeHtml(tokenLabel(d.address) || "Unknown token")}</div>`;
+                    detailsHtml += approvalAddressHtml(d.address);
+                } else {
+                    detailsHtml += approvalAddressHtml(d.address);
                }
-                detailsHtml += approvalAddressHtml(d.address);
            } else {
                detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
            }
@@ -268,7 +288,6 @@ function showTxApproval(details) {
    hideError("approve-tx-error");

    showView("approve-tx");
-    attachCopyHandlers("view-approve-tx");
 }

 function decodeHexMessage(hex) {
@@ -366,7 +385,6 @@ function showSignApproval(details) {
    $("btn-approve-sign").classList.remove("text-muted");

    showView("approve-sign");
-    attachCopyHandlers("view-approve-sign");
 }

 function show(id) {
@@ -394,7 +412,6 @@ function show(id) {
        $("approve-address").innerHTML = approvalAddressHtml(
            state.activeAddress,
        );
-        attachCopyHandlers("view-approve-site");
        $("approve-remember").checked = state.rememberSiteChoice;
    });
 }
--- a/src/popup/views/confirmTx.js
+++ b/src/popup/views/confirmTx.js
@@ -17,12 +17,10 @@ const {
    showFlash,
    flashCopyFeedback,
    addressTitle,
+    addressDotHtml,
    escapeHtml,
-    renderAddressHtml,
-    attachCopyHandlers,
-    goBack,
 } = require("./helpers");
-const { state, currentNetwork } = require("../../shared/state");
+const { state } = require("../../shared/state");
 const { getSignerForAddress } = require("../../shared/wallet");
 const { decryptWithPassword } = require("../../shared/vault");
 const { formatUsd, getPrice } = require("../../shared/prices");
@@ -36,6 +34,13 @@ const { log } = require("../../shared/log");
 const makeBlockie = require("ethereum-blockies-base64");
 const txStatus = require("./txStatus");

+const EXT_ICON =
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
+    `</svg></span>`;
+
 let pendingTx = null;

 function restore() {
@@ -45,6 +50,14 @@ function restore() {
    }
 }

+function etherscanTokenLink(address) {
+    return `https://etherscan.io/token/${address}`;
+}
+
+function etherscanAddressLink(address) {
+    return `https://etherscan.io/address/${address}`;
+}
+
 function blockieHtml(address) {
    const src = makeBlockie(address);
    return `<img src="${src}" width="48" height="48" style="image-rendering:pixelated;border-radius:50%;display:inline-block">`;
@@ -52,10 +65,22 @@ function blockieHtml(address) {

 function confirmAddressHtml(address, ensName, title) {
    const blockie = blockieHtml(address);
-    return (
-        `<div class="mb-1">${blockie}</div>` +
-        renderAddressHtml(address, { title, ensName })
-    );
+    const dot = addressDotHtml(address);
+    const link = etherscanAddressLink(address);
+    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="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
+    }
+    if (ensName) {
+        html += `<div class="flex items-center font-bold">${title ? "" : dot}${escapeHtml(ensName)}</div>`;
+    }
+    html +=
+        `<div class="flex items-center">${title || ensName ? "" : dot}` +
+        `<span class="break-all">${escapeHtml(address)}</span>` +
+        extLink +
+        `</div>`;
+    return html;
 }

 function valueWithUsd(text, usdAmount) {
@@ -82,12 +107,23 @@ function show(txInfo) {
    // Token contract section (ERC-20 only)
    const tokenSection = $("confirm-token-section");
    if (isErc20) {
-        $("confirm-token-contract").innerHTML = renderAddressHtml(
-            txInfo.token,
-            {},
-        );
+        const dot = addressDotHtml(txInfo.token);
+        const link = etherscanTokenLink(txInfo.token);
+        $("confirm-token-contract").innerHTML =
+            `<div class="flex items-center">${dot}` +
+            `<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>` +
+            `</div>`;
        tokenSection.classList.remove("hidden");
-        attachCopyHandlers(tokenSection);
+        // 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!");
+                flashCopyFeedback(copyEl);
+            };
+        }
    } else {
        tokenSection.classList.add("hidden");
    }
@@ -207,7 +243,6 @@ function show(txInfo) {
    $("confirm-fee-amount").textContent = "Estimating...";
    state.viewData = { pendingTx: txInfo };
    showView("confirm-tx");
-    attachCopyHandlers("view-confirm-tx");

    // Reset async warnings to hidden (space always reserved, no layout shift)
    $("confirm-recipient-warning").style.visibility = "hidden";
@@ -356,7 +391,7 @@ function init(ctx) {
    });

    $("btn-confirm-back").addEventListener("click", () => {
-        goBack();
+        showView("send");
    });
 }

--- a/src/popup/views/deleteWallet.js
+++ b/src/popup/views/deleteWallet.js
@@ -1,4 +1,4 @@
-const { $, showView, showFlash, goBack, clearViewStack } = require("./helpers");
+const { $, showView, showFlash } = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 const { decryptWithPassword } = require("../../shared/vault");

@@ -21,7 +21,7 @@ function init(_ctx) {

    $("btn-delete-wallet-back").addEventListener("click", () => {
        deleteWalletIndex = null;
-        goBack();
+        ctx.showSettingsView();
    });

    $("btn-delete-wallet-confirm").addEventListener("click", async () => {
@@ -77,7 +77,6 @@ function init(_ctx) {
            state.selectedWallet = null;
            state.selectedAddress = null;
            state.activeAddress = null;
-            clearViewStack();
            await saveState();
            showView("welcome");
        } else {
@@ -87,14 +86,8 @@ function init(_ctx) {
            state.activeAddress =
                state.wallets[0].addresses[0]?.address || null;
            await saveState();
-            // Reset stack to [main] so Settings back goes home.
-            // Use require() lazily to avoid circular dependency
-            // (settings.js requires deleteWallet.js).
-            clearViewStack();
-            state.viewStack.push("main");
            ctx.renderWalletList();
-            const settings = require("./settings");
-            settings.show();
+            ctx.showSettingsView();
            showFlash("Wallet deleted.");
        }
    });
--- a/src/popup/views/helpers.js
+++ b/src/popup/views/helpers.js
@@ -1,13 +1,12 @@
 // Shared DOM helpers used by all views.

 const { DEBUG } = require("../../shared/constants");
-const { isDebug } = require("../../shared/log");
 const {
    formatUsd,
    getPrice,
    getAddressValueUsd,
 } = require("../../shared/prices");
-const { state, saveState, currentNetwork } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");

 // When views are added, removed, or transitions between them change,
 // update the view-navigation documentation in README.md to match.
@@ -60,77 +59,14 @@ function showView(name) {
    clearFlash();
    state.currentView = name;
    saveState();
-    updateDebugBanner(name);
-}
-
-// Create or update the debug/insecure warning banner.
-// Called on every view switch and after the settings debug toggle changes.
-// The banner is shown when the compile-time DEBUG constant is true OR when
-// the user has enabled runtime debug mode via the settings easter egg, OR
-// when the active network is a testnet.
-function updateDebugBanner(viewName) {
-    const debug = isDebug();
-    const net = currentNetwork();
-    const show = debug || net.isTestnet;
-    let banner = document.getElementById("debug-banner");
-    if (show) {
-        if (!banner) {
-            banner = document.createElement("div");
-            banner.id = "debug-banner";
-            banner.style.cssText =
-                "background:#c00;color:#fff;text-align:center;font-size:10px;padding:1px 0;font-family:monospace;position:sticky;top:0;z-index:9999;";
-            document.body.prepend(banner);
+    if (DEBUG) {
+        const banner = document.getElementById("debug-banner");
+        if (banner) {
+            banner.textContent = "DEBUG / INSECURE (" + name + ")";
        }
-        const suffix = viewName ? " (" + viewName + ")" : "";
-        if (debug && net.isTestnet) {
-            banner.textContent = "DEBUG / INSECURE [TESTNET]" + suffix;
-        } else if (net.isTestnet) {
-            banner.textContent = "[TESTNET]" + suffix;
-        } else {
-            banner.textContent = "DEBUG / INSECURE" + suffix;
-        }
-    } else if (banner) {
-        banner.remove();
    }
 }

-// Callback to re-render the main/home view when navigating back to it.
-// Set once by index.js via setRenderMain().
-let _renderMain = null;
-
-function setRenderMain(fn) {
-    _renderMain = fn;
-}
-
-// Push the current view onto the navigation stack so goBack() can
-// return to it.  Call this before any forward navigation.
-function pushCurrentView() {
-    if (state.currentView) {
-        state.viewStack.push(state.currentView);
-    }
-}
-
-// Pop the navigation stack and show the previous view.  If the stack
-// is empty, fall back to the main (home) view.
-function goBack() {
-    let target;
-    if (state.viewStack.length > 0) {
-        target = state.viewStack.pop();
-    } else {
-        target = "main";
-    }
-    if (target === "main" && _renderMain) {
-        _renderMain();
-    }
-    showView(target);
-}
-
-// Clear the entire navigation stack (used when resetting to root,
-// e.g. after adding or deleting a wallet).
-function clearViewStack() {
-    state.viewStack = [];
-}
-
 let flashTimer = null;

 function clearFlash() {
@@ -272,9 +208,21 @@ function addressTitle(address, wallets) {
 // Render an address with color dot, optional ENS name, optional title,
 // and optional truncation. Title and ENS are shown as bold labels above
 // the full address.
-// Delegates to renderAddressHtml for consistent output.
 function formatAddressHtml(address, ensName, maxLen, title) {
-    return renderAddressHtml(address, { title, ensName, maxLen });
+    const dot = addressDotHtml(address);
+    const displayAddr = maxLen ? truncateMiddle(address, maxLen) : address;
+    if (title || ensName) {
+        let html = "";
+        if (title) {
+            html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
+        }
+        if (ensName) {
+            html += `<div class="flex items-center font-bold">${title ? "" : dot}${escapeHtml(ensName)}</div>`;
+        }
+        html += `<div class="break-all">${escapeHtml(displayAddr)}</div>`;
+        return html;
+    }
+    return `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(displayAddr)}</span></div>`;
 }

 function isoDate(timestamp) {
@@ -333,91 +281,6 @@ function timeAgo(timestamp) {
    return years + " year" + (years !== 1 ? "s" : "") + " ago";
 }

-// Shared external-link icon SVG used across all views.
-const EXT_ICON =
-    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
-    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
-    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
-    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
-    `</svg></span>`;
-
-function etherscanAddressUrl(address) {
-    return `${currentNetwork().explorerUrl}/address/${address}`;
-}
-
-function etherscanLinkHtml(url) {
-    return (
-        `<a href="${url}" target="_blank" rel="noopener" ` +
-        `class="inline-flex items-center">${EXT_ICON}</a>`
-    );
-}
-
-// Render a copyable text span with dashed underline affordance.
-// The caller must attach click handlers via attachCopyHandlers() or
-// manually wire up [data-copy] elements after inserting the HTML.
-function copyableHtml(text, extraClass) {
-    const cls =
-        "underline decoration-dashed cursor-pointer" +
-        (extraClass ? " " + extraClass : "");
-    return `<span class="${cls}" data-copy="${escapeHtml(text)}">${escapeHtml(text)}</span>`;
-}
-
-// Attach click-to-copy handlers to all [data-copy] elements within
-// a container.  Safe to call multiple times on the same container.
-function attachCopyHandlers(container) {
-    const root =
-        typeof container === "string"
-            ? document.getElementById(container)
-            : container;
-    if (!root) return;
-    root.querySelectorAll("[data-copy]").forEach((el) => {
-        el.onclick = () => {
-            navigator.clipboard.writeText(el.dataset.copy);
-            showFlash("Copied!");
-            flashCopyFeedback(el);
-        };
-    });
-}
-
-// Unified address rendering.
-//
-// Produces consistent HTML for any Ethereum address:
-//   • Color dot
-//   • Optional title (e.g. "Wallet 1 — Address 2") shown bold above address
-//   • Optional ENS name shown bold above address
-//   • Full address (or truncated via maxLen) with dashed-underline click-to-copy
-//   • Etherscan external link icon
-//
-// Options object:
-//   title    — wallet title string (from addressTitle)
-//   ensName  — ENS name string
-//   maxLen   — if set, truncate address display (min 32 chars enforced)
-//   noLink   — if true, omit etherscan link
-//
-// After inserting the returned HTML into the DOM, call
-// attachCopyHandlers() on the parent to wire up click-to-copy.
-function renderAddressHtml(address, opts) {
-    const { title, ensName, maxLen, noLink } = opts || {};
-    const dot = addressDotHtml(address);
-    const displayAddr = maxLen ? truncateMiddle(address, maxLen) : address;
-    const link = etherscanAddressUrl(address);
-    const extLink = noLink ? "" : etherscanLinkHtml(link);
-
-    let html = "";
-    if (title) {
-        html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
-    }
-    if (ensName) {
-        html += `<div class="flex items-center font-bold">${title ? "" : dot}${escapeHtml(ensName)}</div>`;
-    }
-    if (title || ensName) {
-        html += `<div class="flex items-center">${copyableHtml(displayAddr, "break-all")}${extLink}</div>`;
-    } else {
-        html += `<div class="flex items-center">${dot}${copyableHtml(displayAddr, "break-all")}${extLink}</div>`;
-    }
-    return html;
-}
-
 function flashCopyFeedback(el) {
    if (!el) return;
    el.classList.remove("copy-flash-fade");
@@ -436,11 +299,6 @@ module.exports = {
    showError,
    hideError,
    showView,
-    updateDebugBanner,
-    setRenderMain,
-    pushCurrentView,
-    goBack,
-    clearViewStack,
    showFlash,
    flashCopyFeedback,
    balanceLine,
@@ -450,12 +308,6 @@ module.exports = {
    escapeHtml,
    addressTitle,
    formatAddressHtml,
-    renderAddressHtml,
-    copyableHtml,
-    attachCopyHandlers,
-    etherscanAddressUrl,
-    etherscanLinkHtml,
-    EXT_ICON,
    truncateMiddle,
    isoDate,
    timeAgo,
--- a/src/popup/views/home.js
+++ b/src/popup/views/home.js
@@ -10,9 +10,6 @@ const {
    addressTitle,
    escapeHtml,
    truncateMiddle,
-    renderAddressHtml,
-    attachCopyHandlers,
-    pushCurrentView,
 } = require("./helpers");
 const { state, saveState, currentAddress } = require("../../shared/state");
 const {
@@ -72,12 +69,28 @@ function renderTotalValue() {
    }
 }

+const EXT_ICON =
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
+    `</svg></span>`;
+
 function renderActiveAddress() {
    const el = $("active-address-display");
    if (!el) return;
    if (state.activeAddress) {
-        el.innerHTML = renderAddressHtml(state.activeAddress);
-        attachCopyHandlers(el);
+        const addr = state.activeAddress;
+        const dot = addressDotHtml(addr);
+        const link = `https://etherscan.io/address/${addr}`;
+        el.innerHTML =
+            `<span class="underline decoration-dashed cursor-pointer" id="active-addr-copy">${dot}${escapeHtml(addr)}</span>` +
+            `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
+        $("active-addr-copy").addEventListener("click", (e) => {
+            navigator.clipboard.writeText(addr);
+            showFlash("Copied!");
+            flashCopyFeedback(e.currentTarget);
+        });
    } else {
        el.textContent = "";
    }
@@ -382,7 +395,6 @@ function init(ctx) {
        renderSendTokenSelect(addr);
        updateSendBalance();
        resetSendValidation();
-        pushCurrentView();
        showView("send");
    });

--- a/src/popup/views/receive.js
+++ b/src/popup/views/receive.js
@@ -5,12 +5,17 @@ const {
    flashCopyFeedback,
    formatAddressHtml,
    addressTitle,
-    attachCopyHandlers,
-    goBack,
 } = require("./helpers");
-const { state, currentAddress, currentNetwork } = require("../../shared/state");
+const { state, currentAddress } = require("../../shared/state");
 const QRCode = require("qrcode");

+const EXT_ICON =
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
+    `</svg></span>`;
+
 function show() {
    const addr = currentAddress();
    const address = addr ? addr.address : "";
@@ -20,8 +25,10 @@ function show() {
        ? formatAddressHtml(address, ensName, null, title)
        : "";
    $("receive-address-block").dataset.full = address;
-    // Etherscan link is now included in formatAddressHtml via renderAddressHtml
-    $("receive-etherscan-link").innerHTML = "";
+    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>`
+        : "";
    if (address) {
        QRCode.toCanvas($("receive-qr"), address, {
            width: 200,
@@ -45,19 +52,25 @@ function show() {
        warningEl.textContent =
            "This is an ERC-20 token. Only send " +
            symbol +
-            " on " +
-            currentNetwork().name +
-            " to this address. Sending tokens on other networks will result in permanent loss.";
+            " on the Ethereum network to this address. Sending tokens on other networks will result in permanent loss.";
        warningEl.style.visibility = "visible";
    } else {
        warningEl.textContent = "";
        warningEl.style.visibility = "hidden";
    }
    showView("receive");
-    attachCopyHandlers("view-receive");
 }

 function init(ctx) {
+    $("receive-address-block").addEventListener("click", (e) => {
+        const addr = $("receive-address-block").dataset.full;
+        if (addr) {
+            navigator.clipboard.writeText(addr);
+            showFlash("Copied!");
+            flashCopyFeedback(e.currentTarget);
+        }
+    });
+
    $("btn-receive-copy").addEventListener("click", () => {
        const addr = $("receive-address-block").dataset.full;
        if (addr) {
@@ -68,7 +81,11 @@ function init(ctx) {
    });

    $("btn-receive-back").addEventListener("click", () => {
-        goBack();
+        if (state.selectedToken) {
+            ctx.showAddressToken();
+        } else {
+            ctx.showAddressDetail();
+        }
    });
 }

--- a/src/popup/views/send.js
+++ b/src/popup/views/send.js
@@ -3,11 +3,9 @@
 const {
    $,
    showFlash,
+    addressDotHtml,
    addressTitle,
    escapeHtml,
-    renderAddressHtml,
-    attachCopyHandlers,
-    goBack,
 } = require("./helpers");
 const { state, currentAddress } = require("../../shared/state");
 let ctx;
@@ -115,6 +113,13 @@ function updateToValidation() {
    }
 }

+const EXT_ICON =
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
+    `</svg></span>`;
+
 function isSpoofedToken(t) {
    const upper = (t.symbol || "").toUpperCase();
    if (!KNOWN_SYMBOLS.has(upper)) return false;
@@ -143,12 +148,24 @@ function renderSendTokenSelect(addr) {
 function updateSendBalance() {
    const addr = currentAddress();
    if (!addr) return;
+    const dot = addressDotHtml(addr.address);
+    const link = `https://etherscan.io/address/${addr.address}`;
+    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    const title = addressTitle(addr.address, state.wallets);
-    $("send-from").innerHTML = renderAddressHtml(addr.address, {
-        title,
-        ensName: addr.ensName,
-    });
-    attachCopyHandlers($("send-from"));
+    let fromHtml = "";
+    if (title) {
+        fromHtml += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
+        if (addr.ensName) {
+            fromHtml += `<div>${escapeHtml(addr.ensName)}</div>`;
+        }
+        fromHtml += `<div class="break-all">${escapeHtml(addr.address)}${extLink}</div>`;
+    } else if (addr.ensName) {
+        fromHtml += `<div class="flex items-center font-bold">${dot}${escapeHtml(addr.ensName)}</div>`;
+        fromHtml += `<div class="break-all">${escapeHtml(addr.address)}${extLink}</div>`;
+    } else {
+        fromHtml += `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(addr.address)}</span>${extLink}</div>`;
+    }
+    $("send-from").innerHTML = fromHtml;
    const token = state.selectedToken || $("send-token").value;
    if (token === "ETH") {
        $("send-balance").textContent =
@@ -251,7 +268,11 @@ function init(_ctx) {
    $("btn-send-back").addEventListener("click", () => {
        $("send-token").classList.remove("hidden");
        $("send-token-static").classList.add("hidden");
-        goBack();
+        if (state.selectedToken) {
+            ctx.showAddressToken();
+        } else {
+            ctx.showAddressDetail();
+        }
    });
 }

--- a/src/popup/views/settings.js
+++ b/src/popup/views/settings.js
@@ -1,34 +1,13 @@
-const {
-    $,
-    showView,
-    updateDebugBanner,
-    showFlash,
-    escapeHtml,
-    flashCopyFeedback,
-    goBack,
-    pushCurrentView,
-} = require("./helpers");
+const { $, showView, showFlash, escapeHtml } = require("./helpers");
 const { applyTheme } = require("../theme");
-const { state, saveState, currentNetwork } = require("../../shared/state");
-const { NETWORKS, SUPPORTED_CHAIN_IDS } = require("../../shared/networks");
-const { onChainSwitch } = require("../../shared/chainSwitch");
-const { log, debugFetch, setRuntimeDebug } = require("../../shared/log");
+const { state, saveState } = require("../../shared/state");
+const { ETHEREUM_MAINNET_CHAIN_ID } = require("../../shared/constants");
+const { log, debugFetch } = require("../../shared/log");
 const deleteWallet = require("./deleteWallet");
-const {
-    BUILD_VERSION,
-    BUILD_LICENSE,
-    BUILD_AUTHOR,
-    BUILD_COMMIT,
-    BUILD_DATE,
-    GITEA_COMMIT_URL,
-} = require("../../shared/buildInfo");

 const runtime =
    typeof browser !== "undefined" ? browser.runtime : chrome.runtime;

-let versionClickCount = 0;
-let versionClickTimer = null;
-
 function renderSiteList(containerId, siteMap, stateKey) {
    const container = $(containerId);
    const hostnames = [...new Set(Object.values(siteMap).flat())];
@@ -106,7 +85,6 @@ function renderWalletListSettings() {
    container.querySelectorAll(".btn-delete-wallet").forEach((btn) => {
        btn.addEventListener("click", () => {
            const idx = parseInt(btn.dataset.idx, 10);
-            pushCurrentView();
            deleteWallet.show(idx);
        });
    });
@@ -147,36 +125,10 @@ function renderWalletListSettings() {
 function show() {
    $("settings-rpc").value = state.rpcUrl;
    $("settings-blockscout").value = state.blockscoutUrl;
-    const networkSelect = $("settings-network");
-    if (networkSelect) {
-        networkSelect.value = state.networkId;
-    }
    renderTrackedTokens();
    renderSiteLists();
    renderWalletListSettings();

-    // Populate About well
-    $("about-license").textContent = BUILD_LICENSE;
-    // Show only the name part of the author field (strip email)
-    const authorName = BUILD_AUTHOR.replace(/\s*<[^>]+>/, "");
-    $("about-author").textContent = authorName;
-    $("about-version").textContent = BUILD_VERSION;
-    $("about-release-date").textContent = BUILD_DATE;
-    $("about-commit-link").textContent = BUILD_COMMIT;
-    $("about-commit-link").href = GITEA_COMMIT_URL;
-
-    // Reset version click counter each time settings opens
-    versionClickCount = 0;
-
-    // Show debug well if debug mode is already enabled
-    const debugWell = $("settings-debug-well");
-    if (state.debugMode) {
-        debugWell.style.display = "";
-    } else {
-        debugWell.style.display = "none";
-    }
-    $("settings-debug-mode").checked = state.debugMode;
-
    showView("settings");
 }

@@ -216,12 +168,9 @@ function init(ctx) {
                showFlash("Endpoint returned error: " + json.error.message);
                return;
            }
-            const net = currentNetwork();
-            if (json.result !== net.chainId) {
+            if (json.result !== ETHEREUM_MAINNET_CHAIN_ID) {
                showFlash(
-                    "Wrong network (expected " +
-                        net.name +
-                        ", got chain " +
+                    "Wrong network (expected mainnet, got chain " +
                        json.result +
                        ").",
                );
@@ -260,17 +209,6 @@ function init(ctx) {
        showFlash("Saved.");
    });

-    const networkSelect = $("settings-network");
-    if (networkSelect) {
-        networkSelect.addEventListener("change", async () => {
-            const newId = networkSelect.value;
-            const net = await onChainSwitch(newId);
-            $("settings-rpc").value = state.rpcUrl;
-            $("settings-blockscout").value = state.blockscoutUrl;
-            showFlash("Switched to " + net.name + ".");
-        });
-    }
-
    $("settings-show-zero-balances").checked = state.showZeroBalanceTokens;
    $("settings-show-zero-balances").addEventListener("change", async () => {
        state.showZeroBalanceTokens = $("settings-show-zero-balances").checked;
@@ -324,68 +262,9 @@ function init(ctx) {
        ctx.showSettingsAddTokenView,
    );

-    // Bright saturated colors for easter egg flashes (clicks 6–10)
-    const easterEggColors = [
-        "#ff0055", // hot pink
-        "#00cc44", // vivid green
-        "#3366ff", // electric blue
-        "#ff9900", // bright orange
-        "#aa00ff", // vivid purple
-    ];
-
-    // Easter egg: click version 10 times to reveal the debug well.
-    // Each click does a copy-flash animation. After 5 clicks, each
-    // additional click flashes a different bright saturated color.
-    $("about-version").addEventListener("click", () => {
-        versionClickCount++;
-        clearTimeout(versionClickTimer);
-        // Reset counter if user stops clicking for 3 seconds
-        versionClickTimer = setTimeout(() => {
-            versionClickCount = 0;
-        }, 3000);
-
-        const el = $("about-version");
-
-        if (versionClickCount > 5) {
-            // Colored flash for clicks 6–10
-            const colorIdx = versionClickCount - 6;
-            const color = easterEggColors[colorIdx % easterEggColors.length];
-            el.classList.remove("copy-flash-fade");
-            el.style.backgroundColor = color;
-            el.style.color = "#ffffff";
-            setTimeout(() => {
-                el.style.backgroundColor = "";
-                el.style.color = "";
-                el.classList.add("copy-flash-fade");
-                setTimeout(() => {
-                    el.classList.remove("copy-flash-fade");
-                }, 275);
-            }, 75);
-        } else {
-            // Standard copy-flash for clicks 1–5
-            flashCopyFeedback(el);
-        }
-
-        if (versionClickCount >= 10) {
-            versionClickCount = 0;
-            clearTimeout(versionClickTimer);
-            $("settings-debug-well").style.display = "";
-        }
-    });
-
-    // Debug mode toggle — update runtime flag, persist, and re-render banner
-    $("settings-debug-mode").addEventListener("change", async () => {
-        state.debugMode = $("settings-debug-mode").checked;
-        setRuntimeDebug(state.debugMode);
-        await saveState();
-        updateDebugBanner(state.currentView);
-    });
-
-    // Sync runtime debug flag on init
-    setRuntimeDebug(state.debugMode);
-
    $("btn-settings-back").addEventListener("click", () => {
-        goBack();
+        ctx.renderWalletList();
+        showView("main");
    });
 }

--- a/src/popup/views/settingsAddToken.js
+++ b/src/popup/views/settingsAddToken.js
@@ -1,4 +1,4 @@
-const { $, showView, showFlash, goBack } = require("./helpers");
+const { $, showView, showFlash } = require("./helpers");
 const { getTopTokens } = require("../../shared/tokenList");
 const { state, saveState } = require("../../shared/state");
 const { lookupTokenInfo } = require("../../shared/balances");
@@ -84,7 +84,7 @@ function init(_ctx) {
    ctx = _ctx;

    $("btn-settings-addtoken-back").addEventListener("click", () => {
-        goBack();
+        ctx.showSettingsView();
    });

    $("btn-settings-addtoken-select").addEventListener("click", async () => {
--- a/src/popup/views/transactionDetail.js
+++ b/src/popup/views/transactionDetail.js
@@ -6,22 +6,25 @@ const {
    showView,
    showFlash,
    flashCopyFeedback,
+    addressDotHtml,
    addressTitle,
    escapeHtml,
    isoDate,
    timeAgo,
-    renderAddressHtml,
-    attachCopyHandlers,
-    copyableHtml,
-    etherscanLinkHtml,
-    goBack,
 } = require("./helpers");
-const { state, currentNetwork } = require("../../shared/state");
+const { state } = require("../../shared/state");
 const { formatEther, formatUnits } = require("ethers");
 const makeBlockie = require("ethereum-blockies-base64");
 const { log, debugFetch } = require("../../shared/log");
 const { decodeCalldata } = require("./approval");

+const EXT_ICON =
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
+    `</svg></span>`;
+
 let ctx;

 /**
@@ -43,21 +46,56 @@ function getTransactionType(tx) {
    return "Native ETH Transfer";
 }

+function copyableHtml(text, extraClass) {
+    const cls =
+        "underline decoration-dashed cursor-pointer" +
+        (extraClass ? " " + extraClass : "");
+    return `<span class="${cls}" data-copy="${escapeHtml(text)}">${escapeHtml(text)}</span>`;
+}
+
 function blockieHtml(address) {
    const src = makeBlockie(address);
    return `<img src="${src}" width="48" height="48" style="image-rendering:pixelated;border-radius:50%;display:inline-block">`;
 }

-function txAddressHtml(address, ensName, title) {
-    const blockie = blockieHtml(address);
+function etherscanLinkHtml(url) {
    return (
-        `<div class="mb-1">${blockie}</div>` +
-        renderAddressHtml(address, { title, ensName })
+        `<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);
+    let html = `<div class="mb-1">${blockie}</div>`;
+    if (title) {
+        html += `<div class="font-bold">${escapeHtml(title)}</div>`;
+    }
+    if (ensName) {
+        html +=
+            `<div class="flex items-center">${dot}` +
+            copyableHtml(ensName, "") +
+            `</div>` +
+            `<div class="flex items-center">${dot}` +
+            copyableHtml(address, "break-all") +
+            extLink +
+            `</div>`;
+    } else {
+        html +=
+            `<div class="flex items-center">${dot}` +
+            copyableHtml(address, "break-all") +
+            extLink +
+            `</div>`;
+    }
+    return html;
+}
+
 function txHashHtml(hash) {
-    const link = `${currentNetwork().explorerUrl}/tx/${hash}`;
+    const link = `https://etherscan.io/tx/${hash}`;
    const extLink = etherscanLinkHtml(link);
    return copyableHtml(hash, "break-all") + extLink;
 }
@@ -134,7 +172,7 @@ function render() {
    if (tokenContractSection && tokenContractEl) {
        if (tx.contractAddress) {
            const dot = addressDotHtml(tx.contractAddress);
-            const link = `${currentNetwork().explorerUrl}/token/${tx.contractAddress}`;
+            const link = `https://etherscan.io/token/${tx.contractAddress}`;
            tokenContractEl.innerHTML =
                `<div class="flex items-center">${dot}` +
                copyableHtml(tx.contractAddress, "break-all") +
@@ -172,7 +210,17 @@ function render() {
        copyableHtml(isoStr) + " (" + escapeHtml(timeAgo(tx.timestamp)) + ")";
    $("tx-detail-status").textContent = tx.isError ? "Failed" : "Success";
    showView("transaction");
-    attachCopyHandlers("view-transaction");
+
+    document
+        .getElementById("view-transaction")
+        .querySelectorAll("[data-copy]")
+        .forEach((el) => {
+            el.onclick = () => {
+                navigator.clipboard.writeText(el.dataset.copy);
+                showFlash("Copied!");
+                flashCopyFeedback(el);
+            };
+        });
 }

 function showDetailField(sectionId, contentId, value) {
@@ -186,7 +234,7 @@ function showDetailField(sectionId, contentId, value) {
 function populateOnChainDetails(txData) {
    // Block number
    if (txData.block_number != null) {
-        const blockLink = `${currentNetwork().explorerUrl}/block/${txData.block_number}`;
+        const blockLink = `https://etherscan.io/block/${txData.block_number}`;
        const blockSection = $("tx-detail-block-section");
        const blockEl = $("tx-detail-block");
        if (blockSection && blockEl) {
@@ -307,14 +355,19 @@ async function loadFullTxDetails(txHash, toAddress, isContractCall) {
                detailsHtml += `<div class="mb-2">`;
                detailsHtml += `<div class="text-muted">${escapeHtml(d.label)}</div>`;
                if (d.address && d.isToken) {
-                    // Token entry: show symbol on its own line, then address via shared renderer
+                    // 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];
                    if (tokenSymbol) {
                        detailsHtml += `<div class="font-bold">${escapeHtml(tokenSymbol)}</div>`;
                    }
-                    detailsHtml += renderAddressHtml(d.address);
+                    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) {
-                    detailsHtml += renderAddressHtml(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>`;
                }
@@ -341,7 +394,13 @@ async function loadFullTxDetails(txHash, toAddress, isContractCall) {
        // Bind copy handlers for new elements (including raw data now outside section)
        const copyTargets = [section, rawSection].filter(Boolean);
        for (const container of copyTargets) {
-            attachCopyHandlers(container);
+            container.querySelectorAll("[data-copy]").forEach((el) => {
+                el.onclick = () => {
+                    navigator.clipboard.writeText(el.dataset.copy);
+                    showFlash("Copied!");
+                    flashCopyFeedback(el);
+                };
+            });
        }
    } catch (e) {
        log.errorf("loadCalldata failed:", e.message);
@@ -351,7 +410,11 @@ async function loadFullTxDetails(txHash, toAddress, isContractCall) {
 function init(_ctx) {
    ctx = _ctx;
    $("btn-tx-back").addEventListener("click", () => {
-        goBack();
+        if (state.selectedToken) {
+            ctx.showAddressToken();
+        } else {
+            ctx.showAddressDetail();
+        }
    });
 }

--- a/src/popup/views/txStatus.js
+++ b/src/popup/views/txStatus.js
@@ -3,19 +3,24 @@
 const {
    $,
    showView,
+    showFlash,
+    flashCopyFeedback,
+    addressDotHtml,
    addressTitle,
    escapeHtml,
-    renderAddressHtml,
-    attachCopyHandlers,
-    copyableHtml,
-    etherscanLinkHtml,
-    clearViewStack,
 } = require("./helpers");
 const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
-const { state, saveState, currentNetwork } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const { getProvider } = require("../../shared/balances");
 const { log } = require("../../shared/log");

+const EXT_ICON =
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
+    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
+    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
+    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
+    `</svg></span>`;
+
 let ctx;
 let elapsedTimer = null;
 let pollTimer = null;
@@ -32,19 +37,50 @@ function clearTimers() {
 }

 function toAddressHtml(address) {
+    const dot = addressDotHtml(address);
+    const link = `https://etherscan.io/address/${address}`;
+    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
    const title = addressTitle(address, state.wallets);
-    return renderAddressHtml(address, { title });
+    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
+        );
+    }
+    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>`;
 }

 function txHashHtml(hash) {
-    const link = `${currentNetwork().explorerUrl}/tx/${hash}`;
-    return copyableHtml(hash, "break-all") + etherscanLinkHtml(link);
+    const link = `https://etherscan.io/tx/${hash}`;
+    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 break-all" data-copy="${escapeHtml(hash)}">${escapeHtml(hash)}</span>` +
+        extLink
+    );
 }

 function blockNumberHtml(blockNumber) {
    const num = String(blockNumber);
-    const link = `${currentNetwork().explorerUrl}/block/${num}`;
-    return copyableHtml(num) + etherscanLinkHtml(link);
+    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)
+        .querySelectorAll("[data-copy]")
+        .forEach((el) => {
+            el.onclick = () => {
+                navigator.clipboard.writeText(el.dataset.copy);
+                showFlash("Copied!");
+                flashCopyFeedback(el);
+            };
+        });
 }

 function showWait(txInfo, txHash) {
@@ -111,7 +147,7 @@ function tokenLabel(address) {
 }

 function etherscanTokenLink(address) {
-    return `${currentNetwork().explorerUrl}/token/${address}`;
+    return `https://etherscan.io/token/${address}`;
 }

 function decodedDetailsHtml(decoded) {
@@ -222,16 +258,10 @@ function navigateBack() {
        window.close();
        return;
    }
-    // After a completed transaction, reset the navigation stack
-    // and go directly to the address view (token or detail).
-    // Use require() lazily to call show() without the ctx push wrapper.
-    clearViewStack();
-    state.viewStack.push("main");
    if (state.selectedToken) {
-        state.viewStack.push("address");
-        require("./addressToken").show();
+        ctx.showAddressToken();
    } else {
-        require("./addressDetail").show();
+        ctx.showAddressDetail();
    }
 }

--- a/src/shared/balances.js
+++ b/src/shared/balances.js
@@ -15,15 +15,10 @@ const { KNOWN_SYMBOLS, TOKEN_BY_ADDRESS } = require("./tokenList");

 // Use a static network to skip auto-detection (which can fail and cause
 // "could not coalesce error" on some RPC endpoints like Cloudflare).
-// Accepts an optional networkName ("mainnet" or "sepolia") for the static
-// network hint so ethers picks the right chain parameters.  When omitted,
-// reads the currently selected network from extension state.
-function getProvider(rpcUrl, networkName) {
-    // Lazy require to avoid circular dependency issues at module scope.
-    const { currentNetwork } = require("./state");
-    const name = networkName || currentNetwork().id;
-    const net = Network.from(name);
-    return new JsonRpcProvider(rpcUrl, net, { staticNetwork: net });
+const mainnet = Network.from("mainnet");
+
+function getProvider(rpcUrl) {
+    return new JsonRpcProvider(rpcUrl, mainnet, { staticNetwork: mainnet });
 }

 function formatBalance(wei) {
--- a/src/shared/buildInfo.js
+++ b/src/shared/buildInfo.js
@@ -1,35 +0,0 @@
-// Build-time constants injected by esbuild define in build.js.
-// These globals are replaced at bundle time with string literals.
-
-/* global __BUILD_VERSION__, __BUILD_LICENSE__, __BUILD_AUTHOR__,
-          __BUILD_COMMIT__, __BUILD_COMMIT_FULL__, __BUILD_DATE__ */
-
-const BUILD_VERSION =
-    typeof __BUILD_VERSION__ !== "undefined" ? __BUILD_VERSION__ : "dev";
-const BUILD_LICENSE =
-    typeof __BUILD_LICENSE__ !== "undefined" ? __BUILD_LICENSE__ : "GPL-3.0";
-const BUILD_AUTHOR =
-    typeof __BUILD_AUTHOR__ !== "undefined"
-        ? __BUILD_AUTHOR__
-        : "sneak <sneak@sneak.berlin>";
-const BUILD_COMMIT =
-    typeof __BUILD_COMMIT__ !== "undefined" ? __BUILD_COMMIT__ : "unknown";
-const BUILD_COMMIT_FULL =
-    typeof __BUILD_COMMIT_FULL__ !== "undefined"
-        ? __BUILD_COMMIT_FULL__
-        : "unknown";
-const BUILD_DATE =
-    typeof __BUILD_DATE__ !== "undefined" ? __BUILD_DATE__ : "unknown";
-
-const GITEA_COMMIT_URL =
-    "https://git.eeqj.de/sneak/AutistMask/commit/" + BUILD_COMMIT_FULL;
-
-module.exports = {
-    BUILD_VERSION,
-    BUILD_LICENSE,
-    BUILD_AUTHOR,
-    BUILD_COMMIT,
-    BUILD_COMMIT_FULL,
-    BUILD_DATE,
-    GITEA_COMMIT_URL,
-};
--- a/src/shared/chainSwitch.js
+++ b/src/shared/chainSwitch.js
@@ -1,57 +0,0 @@
-// Consolidated chain-switch handler.
-//
-// Every state change required when the active network changes is
-// performed here so that callers (settings UI, background
-// wallet_switchEthereumChain, future chain additions) all go
-// through a single code path.
-//
-// Adding a new chain (e.g. ETC) requires only a new entry in
-// networks.js — no per-caller wiring is needed.
-
-const { networkById } = require("./networks");
-const { clearPrices } = require("./prices");
-
-// Switch the active chain and reset all chain-specific cached state.
-// Returns the network configuration object for the new chain.
-async function onChainSwitch(newNetworkId) {
-    const { state, saveState } = require("./state");
-
-    const net = networkById(newNetworkId);
-
-    // --- core identity ---
-    state.networkId = net.id;
-    state.rpcUrl = net.defaultRpcUrl;
-    state.blockscoutUrl = net.defaultBlockscoutUrl;
-
-    // --- price cache ---
-    // Prices are chain-specific (testnet tokens are worthless,
-    // ETC has different pricing, etc.).
-    clearPrices();
-
-    // --- balance / refresh state ---
-    // Reset last-refresh timestamp so the next polling cycle
-    // triggers an immediate balance refresh on the new chain.
-    state.lastBalanceRefresh = 0;
-
-    // Clear per-address balances and token balances so stale data
-    // from the previous chain is never displayed while the first
-    // refresh on the new chain is in flight.
-    for (const wallet of state.wallets) {
-        for (const addr of wallet.addresses) {
-            addr.balance = "0";
-            addr.tokenBalances = [];
-        }
-    }
-
-    // --- chain-specific caches ---
-    // Token holder counts and fraud contract lists are
-    // chain-specific and must not carry over.
-    state.tokenHolderCache = {};
-    state.fraudContracts = [];
-
-    await saveState();
-
-    return net;
-}
-
-module.exports = { onChainSwitch };
--- a/src/shared/constants.js
+++ b/src/shared/constants.js
@@ -3,7 +3,6 @@ const DEBUG_MNEMONIC =
    "cube evolve unfold result inch risk jealous skill hotel bulb night wreck";

 const ETHEREUM_MAINNET_CHAIN_ID = "0x1";
-const ETHEREUM_SEPOLIA_CHAIN_ID = "0xaa36a7";

 const DEFAULT_RPC_URL = "https://ethereum-rpc.publicnode.com";

@@ -38,7 +37,6 @@ module.exports = {
    DEBUG,
    DEBUG_MNEMONIC,
    ETHEREUM_MAINNET_CHAIN_ID,
-    ETHEREUM_SEPOLIA_CHAIN_ID,
    DEFAULT_RPC_URL,
    DEFAULT_BLOCKSCOUT_URL,
    BIP44_ETH_PATH,
--- a/src/shared/etherscanLabels.js
+++ b/src/shared/etherscanLabels.js
@@ -2,6 +2,8 @@
 // Extension users make the requests directly to Etherscan — no proxy needed.
 // This is a best-effort enrichment: network failures return null silently.

+const ETHERSCAN_BASE = "https://etherscan.io/address/";
+
 // Patterns in the page title that indicate a flagged address.
 // Title format: "Fake_Phishing184810 | Address: 0x... | Etherscan"
 const PHISHING_LABEL_PATTERNS = [/^Fake_Phishing/i, /^Phish:/i, /^Exploiter/i];
@@ -72,19 +74,12 @@ function parseEtherscanPage(html) {
 * Returns a warning object if the address is flagged, or null.
 * Network failures return null silently (best-effort check).
 *
- * Uses the current network's explorer URL so the lookup works on both
- * mainnet (etherscan.io) and Sepolia (sepolia.etherscan.io).
- *
 * @param {string} address - Ethereum address to check.
 * @returns {Promise<{type: string, message: string, severity: string}|null>}
 */
 async function checkEtherscanLabel(address) {
    try {
-        // Lazy require to avoid pulling in chrome.storage at module scope
-        // (which breaks unit tests that only exercise parseEtherscanPage).
-        const { currentNetwork } = require("./state");
-        const etherscanBase = currentNetwork().explorerUrl + "/address/";
-        const resp = await fetch(etherscanBase + address, {
+        const resp = await fetch(ETHERSCAN_BASE + address, {
            headers: { Accept: "text/html" },
        });
        if (!resp.ok) return null;
--- a/src/shared/log.js
+++ b/src/shared/log.js
@@ -1,27 +1,12 @@
 // Leveled logger. Outputs to console with [AutistMask] prefix.
-// Level is DEBUG when the compile-time DEBUG constant is true or the runtime
-// debugMode state flag is enabled.  The runtime flag is checked lazily so it
-// responds immediately when toggled in settings.
+// Level is DEBUG when the DEBUG constant is true, INFO otherwise.

 const { DEBUG } = require("./constants");

 const LEVELS = { debug: 0, info: 1, warn: 2, error: 3 };
-
-// Runtime debug mode flag — set by settings.js when the user toggles debug
-// mode via the easter egg.  Kept here as a simple mutable reference so it can
-// be updated without circular dependency issues with state.js.
-let _runtimeDebug = false;
-
-function setRuntimeDebug(enabled) {
-    _runtimeDebug = enabled;
-}
-
-function isDebug() {
-    return DEBUG || _runtimeDebug;
-}
+const threshold = DEBUG ? LEVELS.debug : LEVELS.info;

 function emit(level, method, args) {
-    const threshold = isDebug() ? LEVELS.debug : LEVELS.info;
    if (LEVELS[level] >= threshold) {
        console[method]("[AutistMask]", ...args);
    }
@@ -52,4 +37,4 @@ async function debugFetch(url, opts) {
    return resp;
 }

-module.exports = { log, debugFetch, setRuntimeDebug, isDebug };
+module.exports = { log, debugFetch };
--- a/src/shared/networks.js
+++ b/src/shared/networks.js
@@ -1,57 +0,0 @@
-// Network definitions for supported Ethereum networks.
-// Each network specifies its chain ID, default RPC and Blockscout endpoints,
-// and the block explorer base URL used for address/tx/token/block links.
-
-const NETWORKS = {
-    mainnet: {
-        id: "mainnet",
-        name: "Ethereum Mainnet",
-        chainId: "0x1",
-        networkVersion: "1",
-        nativeCurrency: "ETH",
-        defaultRpcUrl: "https://ethereum-rpc.publicnode.com",
-        defaultBlockscoutUrl: "https://eth.blockscout.com/api/v2",
-        explorerUrl: "https://etherscan.io",
-        isTestnet: false,
-    },
-    sepolia: {
-        id: "sepolia",
-        name: "Sepolia Testnet",
-        chainId: "0xaa36a7",
-        networkVersion: "11155111",
-        nativeCurrency: "SepoliaETH",
-        defaultRpcUrl: "https://ethereum-sepolia-rpc.publicnode.com",
-        defaultBlockscoutUrl: "https://eth-sepolia.blockscout.com/api/v2",
-        explorerUrl: "https://sepolia.etherscan.io",
-        isTestnet: true,
-    },
-};
-
-const SUPPORTED_CHAIN_IDS = new Set(
-    Object.values(NETWORKS).map((n) => n.chainId),
-);
-
-function networkById(id) {
-    return NETWORKS[id] || NETWORKS.mainnet;
-}
-
-function networkByChainId(chainId) {
-    for (const net of Object.values(NETWORKS)) {
-        if (net.chainId === chainId) return net;
-    }
-    return null;
-}
-
-// Build a block explorer link for the given path type and value.
-// type: "address" | "tx" | "token" | "block"
-function explorerLink(network, type, value) {
-    return `${network.explorerUrl}/${type}/${value}`;
-}
-
-module.exports = {
-    NETWORKS,
-    SUPPORTED_CHAIN_IDS,
-    networkById,
-    networkByChainId,
-    explorerLink,
-};
--- a/src/shared/prices.js
+++ b/src/shared/prices.js
@@ -8,13 +8,6 @@ const prices = {};
 let lastFetchedAt = 0;

 async function refreshPrices() {
-    // Testnet tokens have no real market value — skip price fetching
-    // and clear any stale mainnet prices so the UI shows no USD values.
-    const { currentNetwork } = require("./state");
-    if (currentNetwork().isTestnet) {
-        clearPrices();
-        return;
-    }
    const now = Date.now();
    if (now - lastFetchedAt < PRICE_CACHE_TTL) return;
    try {
@@ -26,19 +19,7 @@ async function refreshPrices() {
    }
 }

-// Clear all cached prices and reset the fetch timestamp so the
-// next refreshPrices() call will fetch fresh data.
-function clearPrices() {
-    for (const key of Object.keys(prices)) {
-        delete prices[key];
-    }
-    lastFetchedAt = 0;
-}
-
-// Return the USD price for a symbol, or null on testnet / unknown.
 function getPrice(symbol) {
-    const { currentNetwork } = require("./state");
-    if (currentNetwork().isTestnet) return null;
    return prices[symbol] || null;
 }

@@ -56,8 +37,6 @@ function formatUsd(amount) {
 }

 function getAddressValueUsd(addr) {
-    const { currentNetwork } = require("./state");
-    if (currentNetwork().isTestnet) return null;
    if (!prices.ETH) return null;
    let total = 0;
    const ethBal = parseFloat(addr.balance || "0");
@@ -72,8 +51,6 @@ function getAddressValueUsd(addr) {
 }

 function getWalletValueUsd(wallet) {
-    const { currentNetwork } = require("./state");
-    if (currentNetwork().isTestnet) return null;
    if (!prices.ETH) return null;
    let total = 0;
    for (const addr of wallet.addresses) {
@@ -83,8 +60,6 @@ function getWalletValueUsd(wallet) {
 }

 function getTotalValueUsd(wallets) {
-    const { currentNetwork } = require("./state");
-    if (currentNetwork().isTestnet) return null;
    if (!prices.ETH) return null;
    let total = 0;
    for (const wallet of wallets) {
@@ -96,7 +71,6 @@ function getTotalValueUsd(wallets) {
 module.exports = {
    prices,
    refreshPrices,
-    clearPrices,
    getPrice,
    formatUsd,
    getAddressValueUsd,
--- a/src/shared/state.js
+++ b/src/shared/state.js
@@ -1,7 +1,6 @@
 // State management and extension storage persistence.

 const { DEFAULT_RPC_URL, DEFAULT_BLOCKSCOUT_URL } = require("./constants");
-const { networkById } = require("./networks");

 const storageApi =
    typeof browser !== "undefined"
@@ -12,7 +11,6 @@ const DEFAULT_STATE = {
    hasWallet: false,
    wallets: [],
    trackedTokens: [],
-    networkId: "mainnet",
    rpcUrl: DEFAULT_RPC_URL,
    blockscoutUrl: DEFAULT_BLOCKSCOUT_URL,
    lastBalanceRefresh: 0,
@@ -29,7 +27,6 @@ const DEFAULT_STATE = {
    fraudContracts: [],
    tokenHolderCache: {},
    theme: "system",
-    debugMode: false,
 };

 const state = {
@@ -39,20 +36,13 @@ const state = {
    selectedAddress: null,
    selectedToken: null,
    viewData: {},
-    viewStack: [],
 };

-// Return the network configuration for the currently selected network.
-function currentNetwork() {
-    return networkById(state.networkId);
-}
-
 async function saveState() {
    const persisted = {
        hasWallet: state.hasWallet,
        wallets: state.wallets,
        trackedTokens: state.trackedTokens,
-        networkId: state.networkId,
        rpcUrl: state.rpcUrl,
        blockscoutUrl: state.blockscoutUrl,
        lastBalanceRefresh: state.lastBalanceRefresh,
@@ -69,13 +59,11 @@ async function saveState() {
        fraudContracts: state.fraudContracts,
        tokenHolderCache: state.tokenHolderCache,
        theme: state.theme,
-        debugMode: state.debugMode,
        currentView: state.currentView,
        selectedWallet: state.selectedWallet,
        selectedAddress: state.selectedAddress,
        selectedToken: state.selectedToken,
        viewData: state.viewData,
-        viewStack: state.viewStack,
    };
    await storageApi.set({ autistmask: persisted });
 }
@@ -87,7 +75,6 @@ async function loadState() {
        state.hasWallet = saved.hasWallet;
        state.wallets = saved.wallets || [];
        state.trackedTokens = saved.trackedTokens || [];
-        state.networkId = saved.networkId || DEFAULT_STATE.networkId;
        state.rpcUrl = saved.rpcUrl || DEFAULT_STATE.rpcUrl;
        state.blockscoutUrl =
            saved.blockscoutUrl || DEFAULT_STATE.blockscoutUrl;
@@ -130,8 +117,6 @@ async function loadState() {
        state.fraudContracts = saved.fraudContracts || [];
        state.tokenHolderCache = saved.tokenHolderCache || {};
        state.theme = saved.theme || "system";
-        state.debugMode =
-            saved.debugMode !== undefined ? saved.debugMode : false;
        state.currentView = saved.currentView || null;
        state.selectedWallet =
            saved.selectedWallet !== undefined ? saved.selectedWallet : null;
@@ -139,7 +124,6 @@ async function loadState() {
            saved.selectedAddress !== undefined ? saved.selectedAddress : null;
        state.selectedToken = saved.selectedToken || null;
        state.viewData = saved.viewData || {};
-        state.viewStack = Array.isArray(saved.viewStack) ? saved.viewStack : [];
    }
 }

@@ -150,10 +134,4 @@ function currentAddress() {
    return state.wallets[state.selectedWallet].addresses[state.selectedAddress];
 }

-module.exports = {
-    state,
-    saveState,
-    loadState,
-    currentAddress,
-    currentNetwork,
-};
+module.exports = { state, saveState, loadState, currentAddress };