fix: implement proper view navigation stack (#146 )

## Summary Fixes the view stack pop bug where pressing Back in Settings (or any view) always returned to Main instead of the previous view. Closes [issue #134](#134) ## Problem The popup UI had no navigation stack. Every back button was hardcoded to a specific destination (usually Main). The reported path: > Main → Address → Transaction → Settings (gear icon) → Back ...would go to Main instead of returning to the Transaction view. ## Solution Implemented a proper view navigation stack (like iOS) as already described in the README: - **`viewStack`** array added to persisted state — survives popup close/reopen - **`pushCurrentView()`** — pushes the current view name onto the stack before any forward navigation - **`goBack()`** — pops the stack and shows the previous view; falls back to Main if the stack is empty; re-renders the wallet list when returning to Main - **`clearViewStack()`** — resets the stack for root transitions (e.g., after adding/deleting a wallet) ### What Changed 1. **helpers.js** — Added navigation stack functions (`pushCurrentView`, `goBack`, `clearViewStack`, `setRenderMain`) 2. **state.js** — Added `viewStack` to persisted state 3. **index.js** — All `ctx.show*()` wrappers now push before navigating forward; gear button uses stack for toggle behavior 4. **All view back buttons** — Replaced hardcoded destinations with `goBack()` (settings, addressDetail, addressToken, transactionDetail, send, receive, addToken, confirmTx, addWallet, settingsAddToken, deleteWallet, export-privkey) 5. **Direct `showView()` forward navigations** — Added `pushCurrentView()` calls before `showView("send")` in addressDetail, addressToken, and home; before `showView("export-privkey")` in addressDetail; before `deleteWallet.show()` in settings 6. **Reset-to-root transitions** — `clearViewStack()` called after adding a wallet (all 3 import types), after deleting the last wallet, and after transaction completion (Done button) ### Navigation Paths Verified - **Main → Settings → Back** → returns to Main ✓ - **Main → Address → Settings → Back** → returns to Address ✓ - **Main → Address → Transaction → Settings → Back** → returns to Transaction ✓ (the reported bug) - **Main → Address → Token → Send → ConfirmTx → Back → Back → Back → Back** → unwinds correctly through each view back to Main ✓ - **Main → Address → Token → Transaction → Settings → Back** → returns to Transaction ✓ - **Settings → Add Wallet → (add) → Main** → stack cleared, fresh root ✓ - **Settings → Delete Wallet → Back** → returns to Settings ✓ - **Settings → Delete Wallet → (confirm)** → stack reset to [main], settings shown ✓ - **Address → Send → ConfirmTx → (broadcast) → SuccessTx → Done** → stack reset, returns to address context ✓ - **Popup close/reopen** → viewStack persisted, back navigation still works ✓ Co-authored-by: user <user@Mac.lan guest wan> Reviewed-on: #146 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
feat: show debug banner on testnet or debug mode, add TESTNET tag (#143 )
2026-03-02 00:15:01 +01:00 · 2026-03-01 21:55:36 +01:00 · 2026-03-01 21:54:38 +01:00 · 2026-03-01 20:31:45 +01:00 · 2026-03-01 20:16:00 +01:00 · 2026-03-01 20:13:55 +01:00
29 changed files with 841 additions and 638 deletions
--- a/README.md
+++ b/README.md
@@ -437,25 +437,29 @@ transitions.
 #### TransactionDetail

 - **When**: User tapped a transaction row from AddressDetail or AddressToken.
- **Elements**:
+- **Elements** (grouped into logical blocks using light well containers; field
+  labels are self-explanatory so groups have no headings):
    - "Transaction" heading, "Back" button
+    - Transaction hash: full hash (tap to copy) + etherscan link
    - Type: transaction classification — one of: Native ETH Transfer, ERC-20
      Token Transfer, Swap, Token Approval, Contract Call, Contract Creation
+    - Status: "Success" or "Failed"
+    - From: blockie + color dot + full address (tap to copy) + etherscan link;
+      ENS name if available
+    - To: blockie + color dot + full address (tap to copy) + etherscan link; ENS
+      name if available
+    - Time: ISO datetime + relative age in parentheses
+    - Block: block number (tap to copy) + etherscan block link
+    - Amount: value + symbol (bold)
+    - Native quantity: raw integer + unit (shown when available)
    - Token contract: shown for ERC-20 transfers — color dot + full contract
      address (tap to copy) + etherscan token link
-    - Status: "Success" or "Failed"
-    - Time: ISO datetime + relative age in parentheses
-    - Amount: value + symbol (bold)
-    - From: blockie + color dot + full address (tap to copy) + etherscan link
-        - ENS name if available
-    - To: blockie + color dot + full address (tap to copy) + etherscan link
-        - ENS name if available
-    - Transaction hash: full hash (tap to copy) + etherscan link
-    - Block: block number (tap to copy) + etherscan block link
-    - Nonce: transaction nonce (tap to copy)
-    - Transaction fee: ETH amount (tap to copy)
-    - Gas price: value in Gwei (tap to copy)
-    - Gas used: integer (tap to copy)
+    - Decoded details (shown for contract calls): action name, decoded
+      parameters, token details, swap steps
+    - Network details (shown when on-chain data is available): nonce, gas price,
+      gas used, transaction fee (all tap to copy)
+    - Raw data (shown when calldata is present): full calldata in monospace
+      dashed border
 - **Transitions**:
    - "Back" → **AddressToken** (if `selectedToken` set) or **AddressDetail**

@@ -799,8 +803,7 @@ small while ensuring fresh coverage of new phishing domains.
 When a dApp on a blocklisted domain requests a wallet connection, transaction
 approval, or signature, the approval popup displays a prominent red warning
 banner alerting the user. The domain checker matches exact hostnames and all
-parent domains (subdomain matching), with whitelist overrides for legitimate
-sites that share a parent domain with a blocklisted entry.
+parent domains (subdomain matching).

 #### Transaction Decoding

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

-const {
-    ETHEREUM_MAINNET_CHAIN_ID,
-    DEFAULT_RPC_URL,
-} = require("../shared/constants");
+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 } = require("../shared/state");
+const {
+    state,
+    loadState,
+    saveState,
+    currentNetwork,
+} = require("../shared/state");
 const { refreshBalances, getProvider } = require("../shared/balances");
 const { debugFetch } = require("../shared/log");
 const { decryptWithPassword } = require("../shared/vault");
@@ -329,31 +333,43 @@ async function handleRpc(method, params, origin) {
    }

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

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

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

    if (method === "wallet_addEthereumChain") {
+        const chainId = params?.[0]?.chainId;
+        if (SUPPORTED_CHAIN_IDS.has(chainId)) {
+            return { result: null };
+        }
        return {
            error: {
                code: 4902,
-                message: "AutistMask only supports Ethereum mainnet.",
+                message:
+                    "AutistMask supports Ethereum Mainnet and Sepolia Testnet only.",
            },
        };
    }
@@ -499,6 +515,27 @@ 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,7 +2,10 @@
 // Creates window.ethereum (EIP-1193 provider) and announces via EIP-6963.

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

    const listeners = {};
    let nextId = 1;
@@ -28,6 +31,12 @@
        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);
    });

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

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

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

    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,6 +882,24 @@
                    </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">
@@ -1101,87 +1119,135 @@
                <h2 id="tx-detail-heading" class="font-bold mb-2">
                    Transaction
                </h2>
-                <div id="tx-detail-type-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Type</div>
-                    <div id="tx-detail-type" class="text-xs font-bold"></div>
-                </div>
-                <div class="mb-4">
-                    <div class="text-xs text-muted mb-1">Status</div>
-                    <div id="tx-detail-status" class="text-xs"></div>
-                </div>
-                <div class="mb-4">
-                    <div class="text-xs text-muted mb-1">Time</div>
-                    <div id="tx-detail-time" class="text-xs"></div>
-                </div>
-                <div class="mb-4">
-                    <div class="text-xs text-muted mb-1">Amount</div>
-                    <div id="tx-detail-value" class="text-xs"></div>
-                </div>
-                <div class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Native quantity</div>
-                    <div id="tx-detail-native" class="text-xs"></div>
-                </div>
-                <div class="mb-4">
-                    <div class="text-xs text-muted mb-1">From</div>
-                    <div id="tx-detail-from" class="text-xs break-all"></div>
-                </div>
-                <div class="mb-4">
-                    <div class="text-xs text-muted mb-1">To</div>
-                    <div id="tx-detail-to" class="text-xs break-all"></div>
-                </div>
-                <div id="tx-detail-token-contract-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Token contract</div>
-                    <div
-                        id="tx-detail-token-contract"
-                        class="text-xs break-all"
-                    ></div>
-                </div>
-                <div id="tx-detail-calldata-section" class="mb-4 hidden">
-                    <div
-                        id="tx-detail-calldata-well"
-                        class="mb-3 border border-border border-dashed p-2"
-                    >
-                        <div class="text-xs text-muted mb-1">Action</div>
+
+                <!-- ── Identity ── -->
+                <div class="bg-well p-3 mx-1 mb-3">
+                    <div class="mb-2">
+                        <div class="text-xs text-muted mb-1">
+                            Transaction hash
+                        </div>
                        <div
-                            id="tx-detail-calldata-action"
-                            class="text-xs font-bold mb-2"
+                            id="tx-detail-hash"
+                            class="text-xs break-all"
                        ></div>
+                    </div>
+                    <div id="tx-detail-type-section" class="mb-2 hidden">
+                        <div class="text-xs text-muted mb-1">Type</div>
                        <div
-                            id="tx-detail-calldata-details"
-                            class="text-xs"
+                            id="tx-detail-type"
+                            class="text-xs font-bold"
+                        ></div>
+                    </div>
+                    <div class="mb-2">
+                        <div class="text-xs text-muted mb-1">Status</div>
+                        <div id="tx-detail-status" class="text-xs"></div>
+                    </div>
+                    <div class="mb-2">
+                        <div class="text-xs text-muted mb-1">From</div>
+                        <div
+                            id="tx-detail-from"
+                            class="text-xs break-all"
+                        ></div>
+                    </div>
+                    <div class="mb-2">
+                        <div class="text-xs text-muted mb-1">To</div>
+                        <div id="tx-detail-to" class="text-xs break-all"></div>
+                    </div>
+                </div>
+
+                <!-- ── Timing ── -->
+                <div class="bg-well p-3 mx-1 mb-3">
+                    <div class="mb-2">
+                        <div class="text-xs text-muted mb-1">Time</div>
+                        <div id="tx-detail-time" class="text-xs"></div>
+                    </div>
+                    <div id="tx-detail-block-section" class="mb-2 hidden">
+                        <div class="text-xs text-muted mb-1">Block</div>
+                        <div id="tx-detail-block" class="text-xs"></div>
+                    </div>
+                </div>
+
+                <!-- ── Value ── -->
+                <div class="bg-well p-3 mx-1 mb-3">
+                    <div class="mb-2">
+                        <div class="text-xs text-muted mb-1">Amount</div>
+                        <div id="tx-detail-value" class="text-xs"></div>
+                    </div>
+                    <div class="mb-2 hidden">
+                        <div class="text-xs text-muted mb-1">
+                            Native quantity
+                        </div>
+                        <div id="tx-detail-native" class="text-xs"></div>
+                    </div>
+                    <div
+                        id="tx-detail-token-contract-section"
+                        class="mb-2 hidden"
+                    >
+                        <div class="text-xs text-muted mb-1">
+                            Token contract
+                        </div>
+                        <div
+                            id="tx-detail-token-contract"
+                            class="text-xs break-all"
                        ></div>
                    </div>
                </div>
-                <div class="mb-4">
-                    <div class="text-xs text-muted mb-1">Transaction hash</div>
-                    <div id="tx-detail-hash" class="text-xs break-all"></div>
+
+                <!-- ── Decoded details ── -->
+                <div id="tx-detail-calldata-section" class="hidden">
+                    <div class="bg-well p-3 mx-1 mb-3">
+                        <div id="tx-detail-calldata-well" class="mb-2">
+                            <div class="text-xs text-muted mb-1">Action</div>
+                            <div
+                                id="tx-detail-calldata-action"
+                                class="text-xs font-bold mb-2"
+                            ></div>
+                            <div
+                                id="tx-detail-calldata-details"
+                                class="text-xs"
+                            ></div>
+                        </div>
+                    </div>
                </div>
-                <div id="tx-detail-block-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Block</div>
-                    <div id="tx-detail-block" class="text-xs"></div>
+
+                <!-- ── Network details ── -->
+                <div id="tx-detail-network-section" class="hidden">
+                    <div class="bg-well p-3 mx-1 mb-3">
+                        <div id="tx-detail-nonce-section" class="mb-2 hidden">
+                            <div class="text-xs text-muted mb-1">Nonce</div>
+                            <div id="tx-detail-nonce" class="text-xs"></div>
+                        </div>
+                        <div
+                            id="tx-detail-gasprice-section"
+                            class="mb-2 hidden"
+                        >
+                            <div class="text-xs text-muted mb-1">Gas price</div>
+                            <div id="tx-detail-gasprice" class="text-xs"></div>
+                        </div>
+                        <div id="tx-detail-gasused-section" class="mb-2 hidden">
+                            <div class="text-xs text-muted mb-1">Gas used</div>
+                            <div id="tx-detail-gasused" class="text-xs"></div>
+                        </div>
+                        <div id="tx-detail-fee-section" class="mb-2 hidden">
+                            <div class="text-xs text-muted mb-1">
+                                Transaction fee
+                            </div>
+                            <div id="tx-detail-fee" class="text-xs"></div>
+                        </div>
+                    </div>
                </div>
-                <div id="tx-detail-nonce-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Nonce</div>
-                    <div id="tx-detail-nonce" class="text-xs"></div>
-                </div>
-                <div id="tx-detail-fee-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Transaction fee</div>
-                    <div id="tx-detail-fee" class="text-xs"></div>
-                </div>
-                <div id="tx-detail-gasprice-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Gas price</div>
-                    <div id="tx-detail-gasprice" class="text-xs"></div>
-                </div>
-                <div id="tx-detail-gasused-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Gas used</div>
-                    <div id="tx-detail-gasused" class="text-xs"></div>
-                </div>
-                <div id="tx-detail-rawdata-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Raw data</div>
-                    <div
-                        id="tx-detail-rawdata"
-                        class="text-xs break-all font-mono border border-border border-dashed p-2"
-                    ></div>
+
+                <!-- ── Raw data ── -->
+                <div id="tx-detail-rawdata-section" class="hidden">
+                    <div class="bg-well p-3 mx-1 mb-3">
+                        <div class="mb-2">
+                            <div class="text-xs text-muted mb-1">Raw data</div>
+                            <div
+                                id="tx-detail-rawdata"
+                                class="text-xs break-all font-mono border border-border border-dashed p-2"
+                            ></div>
+                        </div>
+                    </div>
                </div>
            </div>

--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -2,10 +2,22 @@
 // Loads state, initializes views, triggers first render.

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

 const home = require("./views/home");
@@ -53,15 +65,42 @@ async function doRefreshAndRender() {
 const ctx = {
    renderWalletList,
    doRefreshAndRender,
-    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(),
+    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();
+    },
 };

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

 async function init() {
-    if (DEBUG) {
+    await loadState();
+    applyTheme(state.theme);
+
+    const net = currentNetwork();
+    if (DEBUG || net.isTestnet) {
        const banner = document.createElement("div");
        banner.id = "debug-banner";
-        banner.textContent = "DEBUG / INSECURE";
+        if (DEBUG && net.isTestnet) {
+            banner.textContent = "DEBUG / INSECURE [TESTNET]";
+        } else if (net.isTestnet) {
+            banner.textContent = "[TESTNET]";
+        } else {
+            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);
-
    // Auto-default active address
    if (
        state.activeAddress === null &&
@@ -208,13 +254,15 @@ async function init() {
                .getElementById("view-settings")
                .classList.contains("hidden")
        ) {
-            renderWalletList();
-            showView("main");
+            goBack();
            return;
        }
+        pushCurrentView();
        settings.show();
    });

+    setRenderMain(renderWalletList);
+
    welcome.init(ctx);
    addWallet.init(ctx);
    home.init(ctx);
--- a/src/popup/views/addToken.js
+++ b/src/popup/views/addToken.js
@@ -1,4 +1,4 @@
-const { $, showView, showFlash } = require("./helpers");
+const { $, showFlash, goBack } = require("./helpers");
 const { getTopTokens } = require("../../shared/tokenList");
 const { state, saveState } = require("../../shared/state");
 const { lookupTokenInfo } = require("../../shared/balances");
@@ -59,7 +59,12 @@ function init(ctx) {
            });
            await saveState();
            ctx.doRefreshAndRender();
-            ctx.showAddressDetail();
+            // 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();
        } catch (e) {
            const detail = e.shortMessage || e.message || String(e);
            log.errorf("Token lookup failed for", contractAddr, detail);
@@ -69,7 +74,9 @@ function init(ctx) {
        }
    });

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

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

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

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

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

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

--- a/src/popup/views/addressDetail.js
+++ b/src/popup/views/addressDetail.js
@@ -8,6 +8,10 @@ const {
    addressTitle,
    escapeHtml,
    truncateMiddle,
+    renderAddressHtml,
+    attachCopyHandlers,
+    goBack,
+    pushCurrentView,
 } = require("./helpers");
 const { state, currentAddress, saveState } = require("../../shared/state");
 const { formatUsd, getAddressValueUsd } = require("../../shared/prices");
@@ -28,17 +32,6 @@ 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];
@@ -56,22 +49,18 @@ function show() {
    img.style.imageRendering = "pixelated";
    img.style.borderRadius = "50%";
    blockieEl.appendChild(img);
-    $("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 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"));
    const usdTotal = formatUsd(getAddressValueUsd(addr));
    $("address-usd-total").innerHTML = usdTotal || "&nbsp;";
    const ensEl = $("address-ens");
-    if (addr.ensName) {
-        ensEl.innerHTML =
-            addressDotHtml(addr.address) + escapeHtml(addr.ensName);
-        ensEl.classList.remove("hidden");
-    } else {
-        ensEl.classList.add("hidden");
-    }
+    // ENS is now shown inside renderAddressHtml, hide the separate element
+    ensEl.classList.add("hidden");
    $("address-balances").innerHTML = balanceLinesForAddress(
        addr,
        state.trackedTokens,
@@ -258,18 +247,9 @@ 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", () => {
-        ctx.renderWalletList();
-        showView("main");
+        goBack();
    });

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

@@ -316,6 +297,7 @@ 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");
@@ -329,9 +311,9 @@ function init(_ctx) {
        blockieEl.appendChild(bImg);
        $("export-privkey-title").textContent =
            wallet.name + " \u2014 Address " + (state.selectedAddress + 1);
-        $("export-privkey-dot").innerHTML = addressDotHtml(addr.address);
-        $("export-privkey-address").textContent = addr.address;
-        $("export-privkey-address").dataset.full = addr.address;
+        const exportAddrContainer = $("export-privkey-dot").parentElement;
+        exportAddrContainer.innerHTML = renderAddressHtml(addr.address);
+        attachCopyHandlers(exportAddrContainer);
        $("export-privkey-password").value = "";
        $("export-privkey-flash").textContent = "";
        $("export-privkey-flash").style.visibility = "hidden";
@@ -385,19 +367,10 @@ 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 = "";
-        show();
+        goBack();
    });
 }

--- a/src/popup/views/addressToken.js
+++ b/src/popup/views/addressToken.js
@@ -11,6 +11,10 @@ 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");
@@ -34,17 +38,6 @@ 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 isoDate(timestamp) {
    const d = new Date(timestamp * 1000);
    const pad = (n) => String(n).padStart(2, "0");
@@ -148,15 +141,16 @@ function show() {
    blockieEl.appendChild(img);

    // Address line
-    $("address-token-dot").innerHTML = addressDotHtml(addr.address);
-    $("address-token-full").dataset.full = addr.address;
-    $("address-token-full").textContent = addr.address;
-    const addrLink = etherscanAddressLink(addr.address);
-    $("address-token-etherscan-link").innerHTML =
-        `<a href="${addrLink}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
+    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"));

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

@@ -193,15 +187,9 @@ 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="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>`;
+        infoHtml += `<div class="mb-2">${renderAddressHtml(tokenId)}</div>`;
        if (tokenName)
            infoHtml += `<div class="mb-1"><span class="text-muted">Name:</span> ${tokenName}</div>`;
        if (tokenSymbol)
@@ -213,6 +201,7 @@ 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 = "";
@@ -334,15 +323,6 @@ 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) {
@@ -353,7 +333,7 @@ function init(_ctx) {
    });

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

    $("btn-address-token-send").addEventListener("click", () => {
@@ -380,28 +360,14 @@ function init(_ctx) {
        $("send-token").classList.add("hidden");
        let staticHtml = `<div class="font-bold">${escapeHtml(currentSymbol)}</div>`;
        if (tokenId !== "ETH") {
-            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>`;
+            staticHtml += `<div class="text-xs">${renderAddressHtml(tokenId)}</div>`;
        }
        $("send-token-static").innerHTML = staticHtml;
        $("send-token-static").classList.remove("hidden");
-        // 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);
-            });
-        }
+        attachCopyHandlers($("send-token-static"));
        updateSendBalance();
        resetSendValidation();
+        pushCurrentView();
        showView("send");
    });

--- a/src/popup/views/approval.js
+++ b/src/popup/views/approval.js
@@ -1,14 +1,16 @@
 const {
    $,
-    addressDotHtml,
    addressTitle,
    escapeHtml,
    showView,
    showError,
    hideError,
+    renderAddressHtml,
+    attachCopyHandlers,
 } = require("./helpers");
-const { state, saveState } = require("../../shared/state");
+const { state, saveState, currentNetwork } = 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");
@@ -16,28 +18,11 @@ 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);
-    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;
+    return renderAddressHtml(address, { title });
 }

 function formatTxValue(val) {
@@ -52,10 +37,6 @@ 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) {
@@ -234,17 +215,19 @@ 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 =
-        formatTxValue(formatEther(details.txParams.value || "0")) + " ETH";
+        ethValueFormatted + " ETH" + (usdStr ? " (" + usdStr + ")" : "");

    // Decode calldata (reuse decoded from above)
    const decodedEl = $("approve-tx-decoded");
@@ -259,12 +242,9 @@ 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>`;
            }
@@ -288,6 +268,7 @@ function showTxApproval(details) {
    hideError("approve-tx-error");

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

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

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

 function show(id) {
@@ -412,6 +394,7 @@ 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,10 +17,12 @@ const {
    showFlash,
    flashCopyFeedback,
    addressTitle,
-    addressDotHtml,
    escapeHtml,
+    renderAddressHtml,
+    attachCopyHandlers,
+    goBack,
 } = require("./helpers");
-const { state } = require("../../shared/state");
+const { state, currentNetwork } = require("../../shared/state");
 const { getSignerForAddress } = require("../../shared/wallet");
 const { decryptWithPassword } = require("../../shared/vault");
 const { formatUsd, getPrice } = require("../../shared/prices");
@@ -34,13 +36,6 @@ 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() {
@@ -50,14 +45,6 @@ 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">`;
@@ -65,22 +52,10 @@ function blockieHtml(address) {

 function confirmAddressHtml(address, ensName, title) {
    const blockie = blockieHtml(address);
-    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;
+    return (
+        `<div class="mb-1">${blockie}</div>` +
+        renderAddressHtml(address, { title, ensName })
+    );
 }

 function valueWithUsd(text, usdAmount) {
@@ -107,23 +82,12 @@ function show(txInfo) {
    // Token contract section (ERC-20 only)
    const tokenSection = $("confirm-token-section");
    if (isErc20) {
-        const dot = addressDotHtml(txInfo.token);
-        const link = etherscanTokenLink(txInfo.token);
-        $("confirm-token-contract").innerHTML =
-            `<div class="flex items-center">${dot}` +
-            `<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>`;
+        $("confirm-token-contract").innerHTML = renderAddressHtml(
+            txInfo.token,
+            {},
+        );
        tokenSection.classList.remove("hidden");
-        // Attach click-to-copy on the contract address
-        const copyEl = tokenSection.querySelector("[data-copy]");
-        if (copyEl) {
-            copyEl.onclick = () => {
-                navigator.clipboard.writeText(copyEl.dataset.copy);
-                showFlash("Copied!");
-                flashCopyFeedback(copyEl);
-            };
-        }
+        attachCopyHandlers(tokenSection);
    } else {
        tokenSection.classList.add("hidden");
    }
@@ -243,6 +207,7 @@ 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";
@@ -391,7 +356,7 @@ function init(ctx) {
    });

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

--- a/src/popup/views/deleteWallet.js
+++ b/src/popup/views/deleteWallet.js
@@ -1,4 +1,4 @@
-const { $, showView, showFlash } = require("./helpers");
+const { $, showView, showFlash, goBack, clearViewStack } = 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;
-        ctx.showSettingsView();
+        goBack();
    });

    $("btn-delete-wallet-confirm").addEventListener("click", async () => {
@@ -77,6 +77,7 @@ function init(_ctx) {
            state.selectedWallet = null;
            state.selectedAddress = null;
            state.activeAddress = null;
+            clearViewStack();
            await saveState();
            showView("welcome");
        } else {
@@ -86,8 +87,14 @@ 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();
-            ctx.showSettingsView();
+            const settings = require("./settings");
+            settings.show();
            showFlash("Wallet deleted.");
        }
    });
--- a/src/popup/views/helpers.js
+++ b/src/popup/views/helpers.js
@@ -6,7 +6,7 @@ const {
    getPrice,
    getAddressValueUsd,
 } = require("../../shared/prices");
-const { state, saveState } = require("../../shared/state");
+const { state, saveState, currentNetwork } = require("../../shared/state");

 // When views are added, removed, or transitions between them change,
 // update the view-navigation documentation in README.md to match.
@@ -59,14 +59,59 @@ function showView(name) {
    clearFlash();
    state.currentView = name;
    saveState();
-    if (DEBUG) {
+    const net = currentNetwork();
+    if (DEBUG || net.isTestnet) {
        const banner = document.getElementById("debug-banner");
        if (banner) {
-            banner.textContent = "DEBUG / INSECURE (" + name + ")";
+            if (DEBUG && net.isTestnet) {
+                banner.textContent =
+                    "DEBUG / INSECURE [TESTNET] (" + name + ")";
+            } else if (net.isTestnet) {
+                banner.textContent = "[TESTNET]";
+            } else {
+                banner.textContent = "DEBUG / INSECURE (" + name + ")";
+            }
        }
    }
 }

+// 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() {
@@ -208,21 +253,9 @@ 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) {
-    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>`;
+    return renderAddressHtml(address, { title, ensName, maxLen });
 }

 function isoDate(timestamp) {
@@ -281,6 +314,91 @@ 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");
@@ -299,6 +417,10 @@ module.exports = {
    showError,
    hideError,
    showView,
+    setRenderMain,
+    pushCurrentView,
+    goBack,
+    clearViewStack,
    showFlash,
    flashCopyFeedback,
    balanceLine,
@@ -308,6 +430,12 @@ 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,6 +10,9 @@ const {
    addressTitle,
    escapeHtml,
    truncateMiddle,
+    renderAddressHtml,
+    attachCopyHandlers,
+    pushCurrentView,
 } = require("./helpers");
 const { state, saveState, currentAddress } = require("../../shared/state");
 const {
@@ -69,28 +72,12 @@ 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) {
-        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);
-        });
+        el.innerHTML = renderAddressHtml(state.activeAddress);
+        attachCopyHandlers(el);
    } else {
        el.textContent = "";
    }
@@ -395,6 +382,7 @@ function init(ctx) {
        renderSendTokenSelect(addr);
        updateSendBalance();
        resetSendValidation();
+        pushCurrentView();
        showView("send");
    });

--- a/src/popup/views/receive.js
+++ b/src/popup/views/receive.js
@@ -5,17 +5,12 @@ const {
    flashCopyFeedback,
    formatAddressHtml,
    addressTitle,
+    attachCopyHandlers,
+    goBack,
 } = require("./helpers");
-const { state, currentAddress } = require("../../shared/state");
+const { state, currentAddress, currentNetwork } = 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 : "";
@@ -25,10 +20,8 @@ function show() {
        ? formatAddressHtml(address, ensName, null, title)
        : "";
    $("receive-address-block").dataset.full = address;
-    const link = address ? `https://etherscan.io/address/${address}` : "";
-    $("receive-etherscan-link").innerHTML = link
-        ? `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`
-        : "";
+    // Etherscan link is now included in formatAddressHtml via renderAddressHtml
+    $("receive-etherscan-link").innerHTML = "";
    if (address) {
        QRCode.toCanvas($("receive-qr"), address, {
            width: 200,
@@ -52,25 +45,19 @@ function show() {
        warningEl.textContent =
            "This is an ERC-20 token. Only send " +
            symbol +
-            " on the Ethereum network to this address. Sending tokens on other networks will result in permanent loss.";
+            " on " +
+            currentNetwork().name +
+            " 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) {
@@ -81,11 +68,7 @@ function init(ctx) {
    });

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

--- a/src/popup/views/send.js
+++ b/src/popup/views/send.js
@@ -3,9 +3,11 @@
 const {
    $,
    showFlash,
-    addressDotHtml,
    addressTitle,
    escapeHtml,
+    renderAddressHtml,
+    attachCopyHandlers,
+    goBack,
 } = require("./helpers");
 const { state, currentAddress } = require("../../shared/state");
 let ctx;
@@ -113,13 +115,6 @@ 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;
@@ -148,24 +143,12 @@ 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);
-    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;
+    $("send-from").innerHTML = renderAddressHtml(addr.address, {
+        title,
+        ensName: addr.ensName,
+    });
+    attachCopyHandlers($("send-from"));
    const token = state.selectedToken || $("send-token").value;
    if (token === "ETH") {
        $("send-balance").textContent =
@@ -268,11 +251,7 @@ function init(_ctx) {
    $("btn-send-back").addEventListener("click", () => {
        $("send-token").classList.remove("hidden");
        $("send-token-static").classList.add("hidden");
-        if (state.selectedToken) {
-            ctx.showAddressToken();
-        } else {
-            ctx.showAddressDetail();
-        }
+        goBack();
    });
 }

--- a/src/popup/views/settings.js
+++ b/src/popup/views/settings.js
@@ -1,7 +1,15 @@
-const { $, showView, showFlash, escapeHtml } = require("./helpers");
+const {
+    $,
+    showView,
+    showFlash,
+    escapeHtml,
+    goBack,
+    pushCurrentView,
+} = require("./helpers");
 const { applyTheme } = require("../theme");
-const { state, saveState } = require("../../shared/state");
-const { ETHEREUM_MAINNET_CHAIN_ID } = require("../../shared/constants");
+const { state, saveState, currentNetwork } = require("../../shared/state");
+const { NETWORKS, SUPPORTED_CHAIN_IDS } = require("../../shared/networks");
+const { onChainSwitch } = require("../../shared/chainSwitch");
 const { log, debugFetch } = require("../../shared/log");
 const deleteWallet = require("./deleteWallet");

@@ -85,6 +93,7 @@ function renderWalletListSettings() {
    container.querySelectorAll(".btn-delete-wallet").forEach((btn) => {
        btn.addEventListener("click", () => {
            const idx = parseInt(btn.dataset.idx, 10);
+            pushCurrentView();
            deleteWallet.show(idx);
        });
    });
@@ -125,6 +134,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();
@@ -168,9 +181,12 @@ function init(ctx) {
                showFlash("Endpoint returned error: " + json.error.message);
                return;
            }
-            if (json.result !== ETHEREUM_MAINNET_CHAIN_ID) {
+            const net = currentNetwork();
+            if (json.result !== net.chainId) {
                showFlash(
-                    "Wrong network (expected mainnet, got chain " +
+                    "Wrong network (expected " +
+                        net.name +
+                        ", got chain " +
                        json.result +
                        ").",
                );
@@ -209,6 +225,17 @@ 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;
@@ -263,8 +290,7 @@ function init(ctx) {
    );

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

--- a/src/popup/views/settingsAddToken.js
+++ b/src/popup/views/settingsAddToken.js
@@ -1,4 +1,4 @@
-const { $, showView, showFlash } = require("./helpers");
+const { $, showView, showFlash, goBack } = 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", () => {
-        ctx.showSettingsView();
+        goBack();
    });

    $("btn-settings-addtoken-select").addEventListener("click", async () => {
--- a/src/popup/views/transactionDetail.js
+++ b/src/popup/views/transactionDetail.js
@@ -6,25 +6,22 @@ const {
    showView,
    showFlash,
    flashCopyFeedback,
-    addressDotHtml,
    addressTitle,
    escapeHtml,
    isoDate,
    timeAgo,
+    renderAddressHtml,
+    attachCopyHandlers,
+    copyableHtml,
+    etherscanLinkHtml,
+    goBack,
 } = require("./helpers");
-const { state } = require("../../shared/state");
+const { state, currentNetwork } = 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;

 /**
@@ -46,56 +43,21 @@ 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 etherscanLinkHtml(url) {
+function txAddressHtml(address, ensName, title) {
+    const blockie = blockieHtml(address);
    return (
-        `<a href="${url}" target="_blank" rel="noopener" ` +
-        `class="inline-flex items-center"` +
-        `>${EXT_ICON}</a>`
+        `<div class="mb-1">${blockie}</div>` +
+        renderAddressHtml(address, { title, ensName })
    );
 }

-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 = `https://etherscan.io/tx/${hash}`;
+    const link = `${currentNetwork().explorerUrl}/tx/${hash}`;
    const extLink = etherscanLinkHtml(link);
    return copyableHtml(hash, "break-all") + extLink;
 }
@@ -172,7 +134,7 @@ function render() {
    if (tokenContractSection && tokenContractEl) {
        if (tx.contractAddress) {
            const dot = addressDotHtml(tx.contractAddress);
-            const link = `https://etherscan.io/token/${tx.contractAddress}`;
+            const link = `${currentNetwork().explorerUrl}/token/${tx.contractAddress}`;
            tokenContractEl.innerHTML =
                `<div class="flex items-center">${dot}` +
                copyableHtml(tx.contractAddress, "break-all") +
@@ -197,6 +159,7 @@ function render() {
        "tx-detail-fee-section",
        "tx-detail-gasprice-section",
        "tx-detail-gasused-section",
+        "tx-detail-network-section",
    ]) {
        const el = $(id);
        if (el) el.classList.add("hidden");
@@ -209,17 +172,7 @@ function render() {
        copyableHtml(isoStr) + " (" + escapeHtml(timeAgo(tx.timestamp)) + ")";
    $("tx-detail-status").textContent = tx.isError ? "Failed" : "Success";
    showView("transaction");
-
-    document
-        .getElementById("view-transaction")
-        .querySelectorAll("[data-copy]")
-        .forEach((el) => {
-            el.onclick = () => {
-                navigator.clipboard.writeText(el.dataset.copy);
-                showFlash("Copied!");
-                flashCopyFeedback(el);
-            };
-        });
+    attachCopyHandlers("view-transaction");
 }

 function showDetailField(sectionId, contentId, value) {
@@ -233,7 +186,7 @@ function showDetailField(sectionId, contentId, value) {
 function populateOnChainDetails(txData) {
    // Block number
    if (txData.block_number != null) {
-        const blockLink = `https://etherscan.io/block/${txData.block_number}`;
+        const blockLink = `${currentNetwork().explorerUrl}/block/${txData.block_number}`;
        const blockSection = $("tx-detail-block-section");
        const blockEl = $("tx-detail-block");
        if (blockSection && blockEl) {
@@ -285,6 +238,21 @@ function populateOnChainDetails(txData) {
        );
    }

+    // Show the network details wrapper if any child section is visible
+    const networkWrapper = $("tx-detail-network-section");
+    if (networkWrapper) {
+        const hasVisible = [
+            "tx-detail-nonce-section",
+            "tx-detail-fee-section",
+            "tx-detail-gasprice-section",
+            "tx-detail-gasused-section",
+        ].some((id) => {
+            const el = $(id);
+            return el && !el.classList.contains("hidden");
+        });
+        if (hasVisible) networkWrapper.classList.remove("hidden");
+    }
+
    // Bind copy handlers for newly added elements
    for (const id of [
        "tx-detail-block-section",
@@ -339,19 +307,14 @@ 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 dot + address + Etherscan link
-                    const dot = addressDotHtml(d.address);
+                    // Token entry: show symbol on its own line, then address via shared renderer
                    const tokenSymbol = d.value.match(/^(\S+)\s*\(/)?.[1];
                    if (tokenSymbol) {
                        detailsHtml += `<div class="font-bold">${escapeHtml(tokenSymbol)}</div>`;
                    }
-                    const etherscanUrl = `https://etherscan.io/token/${d.address}`;
-                    detailsHtml += `<div class="flex items-center">${dot}${copyableHtml(d.address, "break-all")}${etherscanLinkHtml(etherscanUrl)}</div>`;
+                    detailsHtml += renderAddressHtml(d.address);
                } else if (d.address) {
-                    // Protocol/contract entry: show name + Etherscan link
-                    const dot = addressDotHtml(d.address);
-                    const etherscanUrl = `https://etherscan.io/address/${d.address}`;
-                    detailsHtml += `<div class="flex items-center">${dot}${copyableHtml(d.value, "break-all")}${etherscanLinkHtml(etherscanUrl)}</div>`;
+                    detailsHtml += renderAddressHtml(d.address);
                } else {
                    detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
                }
@@ -378,13 +341,7 @@ 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) {
-            container.querySelectorAll("[data-copy]").forEach((el) => {
-                el.onclick = () => {
-                    navigator.clipboard.writeText(el.dataset.copy);
-                    showFlash("Copied!");
-                    flashCopyFeedback(el);
-                };
-            });
+            attachCopyHandlers(container);
        }
    } catch (e) {
        log.errorf("loadCalldata failed:", e.message);
@@ -394,11 +351,7 @@ async function loadFullTxDetails(txHash, toAddress, isContractCall) {
 function init(_ctx) {
    ctx = _ctx;
    $("btn-tx-back").addEventListener("click", () => {
-        if (state.selectedToken) {
-            ctx.showAddressToken();
-        } else {
-            ctx.showAddressDetail();
-        }
+        goBack();
    });
 }

--- a/src/popup/views/txStatus.js
+++ b/src/popup/views/txStatus.js
@@ -3,24 +3,19 @@
 const {
    $,
    showView,
-    showFlash,
-    flashCopyFeedback,
-    addressDotHtml,
    addressTitle,
    escapeHtml,
+    renderAddressHtml,
+    attachCopyHandlers,
+    copyableHtml,
+    etherscanLinkHtml,
+    clearViewStack,
 } = require("./helpers");
 const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
-const { state, saveState } = require("../../shared/state");
+const { state, saveState, currentNetwork } = 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;
@@ -37,50 +32,19 @@ 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);
-    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>`;
+    return renderAddressHtml(address, { title });
 }

 function txHashHtml(hash) {
-    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
-    );
+    const link = `${currentNetwork().explorerUrl}/tx/${hash}`;
+    return copyableHtml(hash, "break-all") + etherscanLinkHtml(link);
 }

 function blockNumberHtml(blockNumber) {
    const num = String(blockNumber);
-    const link = `https://etherscan.io/block/${num}`;
-    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
-    return (
-        `<span class="underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(num)}">${escapeHtml(num)}</span>` +
-        extLink
-    );
-}
-
-function attachCopyHandlers(viewId) {
-    document
-        .getElementById(viewId)
-        .querySelectorAll("[data-copy]")
-        .forEach((el) => {
-            el.onclick = () => {
-                navigator.clipboard.writeText(el.dataset.copy);
-                showFlash("Copied!");
-                flashCopyFeedback(el);
-            };
-        });
+    const link = `${currentNetwork().explorerUrl}/block/${num}`;
+    return copyableHtml(num) + etherscanLinkHtml(link);
 }

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

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

 function decodedDetailsHtml(decoded) {
@@ -258,10 +222,16 @@ 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) {
-        ctx.showAddressToken();
+        state.viewStack.push("address");
+        require("./addressToken").show();
    } else {
-        ctx.showAddressDetail();
+        require("./addressDetail").show();
    }
 }

--- a/src/shared/balances.js
+++ b/src/shared/balances.js
@@ -15,10 +15,15 @@ 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).
-const mainnet = Network.from("mainnet");
-
-function getProvider(rpcUrl) {
-    return new JsonRpcProvider(rpcUrl, mainnet, { staticNetwork: mainnet });
+// 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 });
 }

 function formatBalance(wei) {
--- a/src/shared/chainSwitch.js
+++ b/src/shared/chainSwitch.js
@@ -0,0 +1,57 @@
+// 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,6 +3,7 @@ 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";

@@ -37,6 +38,7 @@ 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,8 +2,6 @@
 // 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];
@@ -74,12 +72,19 @@ 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 {
-        const resp = await fetch(ETHERSCAN_BASE + address, {
+        // 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, {
            headers: { Accept: "text/html" },
        });
        if (!resp.ok) return null;
--- a/src/shared/networks.js
+++ b/src/shared/networks.js
@@ -0,0 +1,57 @@
+// 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/phishingDomains.js
+++ b/src/shared/phishingDomains.js
@@ -21,17 +21,13 @@ const REFRESH_INTERVAL_MS = 24 * 60 * 60 * 1000; // 24 hours
 const DELTA_STORAGE_KEY = "phishing-delta";
 const MAX_DELTA_BYTES = 256 * 1024; // 256 KiB

-// Vendored sets — built once from the bundled JSON.
+// Vendored set — built once from the bundled JSON.
 const vendoredBlacklist = new Set(
    (vendoredConfig.blacklist || []).map((d) => d.toLowerCase()),
 );
-const vendoredWhitelist = new Set(
-    (vendoredConfig.whitelist || []).map((d) => d.toLowerCase()),
-);

-// Delta sets — only entries from live list that are NOT in vendored.
+// Delta set — only entries from live list that are NOT in vendored.
 let deltaBlacklist = new Set();
-let deltaWhitelist = new Set();
 let lastFetchTime = 0;
 let fetchPromise = null;
 let refreshTimer = null;
@@ -50,11 +46,6 @@ function loadDeltaFromStorage() {
                data.blacklist.map((d) => d.toLowerCase()),
            );
        }
-        if (data.whitelist && Array.isArray(data.whitelist)) {
-            deltaWhitelist = new Set(
-                data.whitelist.map((d) => d.toLowerCase()),
-            );
-        }
    } catch {
        // localStorage unavailable or corrupt — start empty
    }
@@ -67,7 +58,6 @@ function saveDeltaToStorage() {
    try {
        const data = {
            blacklist: Array.from(deltaBlacklist),
-            whitelist: Array.from(deltaWhitelist),
        };
        const json = JSON.stringify(data);
        if (json.length < MAX_DELTA_BYTES) {
@@ -85,19 +75,15 @@ function saveDeltaToStorage() {
 * Load a pre-parsed config and compute the delta against the vendored list.
 * Used for both live fetches and testing.
 *
- * @param {{ blacklist?: string[], whitelist?: string[] }} config
+ * @param {{ blacklist?: string[] }} config
 */
 function loadConfig(config) {
    const liveBlacklist = (config.blacklist || []).map((d) => d.toLowerCase());
-    const liveWhitelist = (config.whitelist || []).map((d) => d.toLowerCase());

    // Delta = entries in the live list that are NOT in the vendored list
    deltaBlacklist = new Set(
        liveBlacklist.filter((d) => !vendoredBlacklist.has(d)),
    );
-    deltaWhitelist = new Set(
-        liveWhitelist.filter((d) => !vendoredWhitelist.has(d)),
-    );

    lastFetchTime = Date.now();
    saveDeltaToStorage();
@@ -124,7 +110,6 @@ function hostnameVariants(hostname) {
 /**
 * Check if a hostname is on the phishing blocklist.
 * Checks delta first (fresh/recent scam sites), then vendored list.
- * Whitelisted domains (delta + vendored) are never flagged.
 *
 * @param {string} hostname - The hostname to check.
 * @returns {boolean}
@@ -133,11 +118,6 @@ function isPhishingDomain(hostname) {
    if (!hostname) return false;
    const variants = hostnameVariants(hostname);

-    // Whitelist takes priority — check delta whitelist first, then vendored
-    for (const v of variants) {
-        if (deltaWhitelist.has(v) || vendoredWhitelist.has(v)) return false;
-    }
-
    // Check delta blacklist first (fresh/recent scam sites), then vendored
    for (const v of variants) {
        if (deltaBlacklist.has(v) || vendoredBlacklist.has(v)) return true;
@@ -209,7 +189,6 @@ function getDeltaSize() {
 */
 function _reset() {
    deltaBlacklist = new Set();
-    deltaWhitelist = new Set();
    lastFetchTime = 0;
    fetchPromise = null;
    if (refreshTimer) {
@@ -232,7 +211,5 @@ module.exports = {
    _reset,
    // Exposed for testing only
    _getVendoredBlacklistSize: () => vendoredBlacklist.size,
-    _getVendoredWhitelistSize: () => vendoredWhitelist.size,
    _getDeltaBlacklist: () => deltaBlacklist,
-    _getDeltaWhitelist: () => deltaWhitelist,
 };
--- a/src/shared/prices.js
+++ b/src/shared/prices.js
@@ -8,6 +8,13 @@ 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 {
@@ -19,7 +26,19 @@ 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;
 }

@@ -37,6 +56,8 @@ 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");
@@ -51,6 +72,8 @@ 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) {
@@ -60,6 +83,8 @@ 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) {
@@ -71,6 +96,7 @@ function getTotalValueUsd(wallets) {
 module.exports = {
    prices,
    refreshPrices,
+    clearPrices,
    getPrice,
    formatUsd,
    getAddressValueUsd,
--- a/src/shared/state.js
+++ b/src/shared/state.js
@@ -1,6 +1,7 @@
 // State management and extension storage persistence.

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

 const storageApi =
    typeof browser !== "undefined"
@@ -11,6 +12,7 @@ const DEFAULT_STATE = {
    hasWallet: false,
    wallets: [],
    trackedTokens: [],
+    networkId: "mainnet",
    rpcUrl: DEFAULT_RPC_URL,
    blockscoutUrl: DEFAULT_BLOCKSCOUT_URL,
    lastBalanceRefresh: 0,
@@ -36,13 +38,20 @@ 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,
@@ -64,6 +73,7 @@ async function saveState() {
        selectedAddress: state.selectedAddress,
        selectedToken: state.selectedToken,
        viewData: state.viewData,
+        viewStack: state.viewStack,
    };
    await storageApi.set({ autistmask: persisted });
 }
@@ -75,6 +85,7 @@ 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;
@@ -124,6 +135,7 @@ 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 : [];
    }
 }

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

-module.exports = { state, saveState, loadState, currentAddress };
+module.exports = {
+    state,
+    saveState,
+    loadState,
+    currentAddress,
+    currentNetwork,
+};
--- a/tests/phishingDomains.test.js
+++ b/tests/phishingDomains.test.js
@@ -23,9 +23,7 @@ const {
    hostnameVariants,
    _reset,
    _getVendoredBlacklistSize,
-    _getVendoredWhitelistSize,
    _getDeltaBlacklist,
-    _getDeltaWhitelist,
 } = require("../src/shared/phishingDomains");

 // Reset delta state before each test to avoid cross-test contamination.
@@ -45,21 +43,12 @@ describe("phishingDomains", () => {
            expect(_getVendoredBlacklistSize()).toBeGreaterThan(100000);
        });

-        test("vendored whitelist is loaded from bundled JSON", () => {
-            expect(_getVendoredWhitelistSize()).toBeGreaterThan(0);
-        });
-
        test("detects domains from vendored blacklist", () => {
            // These are well-known phishing domains in the vendored list
            expect(isPhishingDomain("hopprotocol.pro")).toBe(true);
            expect(isPhishingDomain("blast-pools.pages.dev")).toBe(true);
        });

-        test("vendored whitelist overrides vendored blacklist", () => {
-            // opensea.pro is whitelisted in the vendored config
-            expect(isPhishingDomain("opensea.pro")).toBe(false);
-        });
-
        test("getBlocklistSize includes vendored entries", () => {
            expect(getBlocklistSize()).toBeGreaterThan(100000);
        });
@@ -99,7 +88,6 @@ describe("phishingDomains", () => {
                    "brand-new-scam-site-xyz123.com",
                    "hopprotocol.pro", // already in vendored
                ],
-                whitelist: [],
            });
            // Only the new domain should be in the delta
            expect(
@@ -109,30 +97,14 @@ describe("phishingDomains", () => {
            expect(getDeltaSize()).toBe(1);
        });

-        test("delta whitelist entries are computed correctly", () => {
-            loadConfig({
-                blacklist: [],
-                whitelist: [
-                    "new-safe-site-xyz789.com",
-                    "opensea.pro", // already in vendored whitelist
-                ],
-            });
-            expect(_getDeltaWhitelist().has("new-safe-site-xyz789.com")).toBe(
-                true,
-            );
-            expect(_getDeltaWhitelist().has("opensea.pro")).toBe(false);
-        });
-
        test("re-loading config replaces previous delta", () => {
            loadConfig({
                blacklist: ["first-scam-xyz.com"],
-                whitelist: [],
            });
            expect(isPhishingDomain("first-scam-xyz.com")).toBe(true);

            loadConfig({
                blacklist: ["second-scam-xyz.com"],
-                whitelist: [],
            });
            expect(isPhishingDomain("first-scam-xyz.com")).toBe(false);
            expect(isPhishingDomain("second-scam-xyz.com")).toBe(true);
@@ -142,7 +114,6 @@ describe("phishingDomains", () => {
            const baseSize = getBlocklistSize();
            loadConfig({
                blacklist: ["delta-only-scam-xyz.com"],
-                whitelist: [],
            });
            expect(getBlocklistSize()).toBe(baseSize + 1);
        });
@@ -152,7 +123,6 @@ describe("phishingDomains", () => {
        test("detects domain from delta blacklist", () => {
            loadConfig({
                blacklist: ["fresh-scam-xyz.com"],
-                whitelist: [],
            });
            expect(isPhishingDomain("fresh-scam-xyz.com")).toBe(true);
        });
@@ -174,34 +144,13 @@ describe("phishingDomains", () => {
        test("detects subdomain of blacklisted domain (delta)", () => {
            loadConfig({
                blacklist: ["delta-phish-xyz.com"],
-                whitelist: [],
            });
            expect(isPhishingDomain("sub.delta-phish-xyz.com")).toBe(true);
        });

-        test("delta whitelist overrides vendored blacklist", () => {
-            // hopprotocol.pro is in the vendored blacklist
-            expect(isPhishingDomain("hopprotocol.pro")).toBe(true);
-            loadConfig({
-                blacklist: [],
-                whitelist: ["hopprotocol.pro"],
-            });
-            // Now whitelisted via delta — should not be flagged
-            expect(isPhishingDomain("hopprotocol.pro")).toBe(false);
-        });
-
-        test("vendored whitelist overrides delta blacklist", () => {
-            loadConfig({
-                blacklist: ["opensea.pro"], // opensea.pro is vendored-whitelisted
-                whitelist: [],
-            });
-            expect(isPhishingDomain("opensea.pro")).toBe(false);
-        });
-
        test("case-insensitive matching", () => {
            loadConfig({
                blacklist: ["Delta-Scam-XYZ.COM"],
-                whitelist: [],
            });
            expect(isPhishingDomain("delta-scam-xyz.com")).toBe(true);
            expect(isPhishingDomain("DELTA-SCAM-XYZ.COM")).toBe(true);
@@ -212,7 +161,7 @@ describe("phishingDomains", () => {
            expect(isPhishingDomain(null)).toBe(false);
        });

-        test("handles config with no blacklist/whitelist keys", () => {
+        test("handles config with no blacklist key", () => {
            loadConfig({});
            expect(getDeltaSize()).toBe(0);
            // Vendored list still works
@@ -224,19 +173,16 @@ describe("phishingDomains", () => {
        test("saveDeltaToStorage persists delta under 256KiB", () => {
            loadConfig({
                blacklist: ["persisted-scam-xyz.com"],
-                whitelist: ["persisted-safe-xyz.com"],
            });
            const stored = localStorage.getItem("phishing-delta");
            expect(stored).not.toBeNull();
            const data = JSON.parse(stored);
            expect(data.blacklist).toContain("persisted-scam-xyz.com");
-            expect(data.whitelist).toContain("persisted-safe-xyz.com");
        });

        test("delta is cleared on _reset", () => {
            loadConfig({
                blacklist: ["temp-scam-xyz.com"],
-                whitelist: [],
            });
            expect(getDeltaSize()).toBe(1);
            _reset();
@@ -251,7 +197,7 @@ describe("phishingDomains", () => {
            expect(isPhishingDomain("blast-pools.pages.dev")).toBe(true);
        });

-        test("does not flag legitimate whitelisted domains", () => {
+        test("does not flag legitimate domains", () => {
            expect(isPhishingDomain("opensea.io")).toBe(false);
            expect(isPhishingDomain("etherscan.io")).toBe(false);
        });
Author	SHA1	Message	Date
clawbot	a22f33d511	fix: implement proper view navigation stack (#146 ) All checks were successful check / check (push) Successful in 25s Details ## Summary Fixes the view stack pop bug where pressing Back in Settings (or any view) always returned to Main instead of the previous view. Closes [issue #134](#134) ## Problem The popup UI had no navigation stack. Every back button was hardcoded to a specific destination (usually Main). The reported path: > Main → Address → Transaction → Settings (gear icon) → Back ...would go to Main instead of returning to the Transaction view. ## Solution Implemented a proper view navigation stack (like iOS) as already described in the README: - `viewStack` array added to persisted state — survives popup close/reopen - `pushCurrentView()` — pushes the current view name onto the stack before any forward navigation - `goBack()` — pops the stack and shows the previous view; falls back to Main if the stack is empty; re-renders the wallet list when returning to Main - `clearViewStack()` — resets the stack for root transitions (e.g., after adding/deleting a wallet) ### What Changed 1. helpers.js — Added navigation stack functions (`pushCurrentView`, `goBack`, `clearViewStack`, `setRenderMain`) 2. state.js — Added `viewStack` to persisted state 3. index.js — All `ctx.show()` wrappers now push before navigating forward; gear button uses stack for toggle behavior 4. All view back buttons* — Replaced hardcoded destinations with `goBack()` (settings, addressDetail, addressToken, transactionDetail, send, receive, addToken, confirmTx, addWallet, settingsAddToken, deleteWallet, export-privkey) 5. Direct `showView()` forward navigations — Added `pushCurrentView()` calls before `showView("send")` in addressDetail, addressToken, and home; before `showView("export-privkey")` in addressDetail; before `deleteWallet.show()` in settings 6. Reset-to-root transitions — `clearViewStack()` called after adding a wallet (all 3 import types), after deleting the last wallet, and after transaction completion (Done button) ### Navigation Paths Verified - Main → Settings → Back → returns to Main ✓ - Main → Address → Settings → Back → returns to Address ✓ - Main → Address → Transaction → Settings → Back → returns to Transaction ✓ (the reported bug) - Main → Address → Token → Send → ConfirmTx → Back → Back → Back → Back → unwinds correctly through each view back to Main ✓ - Main → Address → Token → Transaction → Settings → Back → returns to Transaction ✓ - Settings → Add Wallet → (add) → Main → stack cleared, fresh root ✓ - Settings → Delete Wallet → Back → returns to Settings ✓ - Settings → Delete Wallet → (confirm) → stack reset to [main], settings shown ✓ - Address → Send → ConfirmTx → (broadcast) → SuccessTx → Done → stack reset, returns to address context ✓ - Popup close/reopen → viewStack persisted, back navigation still works ✓ Co-authored-by: user <user@Mac.lan guest wan> Reviewed-on: #146 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>	2026-03-02 00:15:01 +01:00
clawbot	39db06c83d	feat: show debug banner on testnet or debug mode, add TESTNET tag (#143 ) All checks were successful check / check (push) Successful in 12s Details Display the red debug banner when on a testnet OR when DEBUG is enabled. When on a testnet, a "TESTNET" label is shown on the far right side of the banner. The banner label shows the network name when not in debug mode, and "DEBUG / INSECURE" when debug is on. closes #140 Co-authored-by: clawbot <clawbot@noreply.git.eeqj.de> Co-authored-by: Jeffrey Paul <sneak@noreply.example.org> Reviewed-on: #143 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>	2026-03-01 21:55:36 +01:00
clawbot	df031fd07d	fix: unify address display with shared renderAddressHtml utility (#129 ) All checks were successful check / check (push) Successful in 6s Details ## Summary All address rendering now uses a single `renderAddressHtml()` function in helpers.js that produces consistent output everywhere: - Color dot (deterministic from address) - Full address with dashed-underline click-to-copy affordance - Etherscan external link icon ## Changes Refactored all 9 view files that display addresses to use the shared utility: - approval.js (approve-tx, approve-sign, approve-site): addresses now have click-to-copy with dashed underline affordance - confirmTx.js: from/to addresses and token contract address use shared renderer - txStatus.js: wait/success/error transaction addresses - transactionDetail.js: from/to and decoded calldata addresses - home.js: active address display - send.js: from-address display - receive.js: receive address display - addressDetail.js: address line and export-privkey address - addressToken.js: address line and contract info ## Consolidation - `EXT_ICON` SVG constant: removed 6 duplicates, now in helpers.js - `copyableHtml()`: removed duplicate, now in helpers.js - `etherscanLinkHtml()`: removed duplicates, now in helpers.js - `attachCopyHandlers()`: removed duplicate, now in helpers.js - Net: -193 lines (174 added, 367 removed) closes #97 Co-authored-by: user <user@Mac.lan guest wan> Reviewed-on: #129 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>	2026-03-01 21:54:38 +01:00
clawbot	a138a36710	fix: suppress USD display on testnet networks (#142 ) All checks were successful check / check (push) Successful in 24s Details ## Summary Fixes USD prices still showing on the main view when connected to a testnet (e.g. Sepolia). The root cause was stale mainnet prices lingering in the in-memory price cache after switching networks. ### Root Cause PR #137 correctly made `refreshPrices()` skip fetching on testnets, but the cached prices from a prior mainnet session remained in the `prices` object. All display functions (`getPrice()`, `getAddressValueUsd()`, etc.) used whatever was cached without checking which network was active. ### Changes - `src/shared/prices.js` - `refreshPrices()` now clears the price cache when on a testnet instead of silently returning - New `clearPrices()` function empties the cache and resets the fetch timestamp - `getPrice()` returns null on testnets (defense-in-depth) - `getAddressValueUsd()`, `getWalletValueUsd()`, `getTotalValueUsd()` return null on testnets - `src/popup/views/settings.js` - Network switcher immediately clears prices when switching to a testnet, so the UI updates without waiting for the next refresh cycle closes #139 Co-authored-by: clawbot <clawbot@noreply.git.eeqj.de> Reviewed-on: #142 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>	2026-03-01 20:31:45 +01:00
clawbot	6b40fa8836	feat: show estimated USD value for ETH in approve-tx view (#141 ) All checks were successful check / check (push) Successful in 25s Details The approve-tx view (dapp-initiated transaction approval) now shows the estimated USD value next to the ETH amount being transferred, using the existing `getPrice`/`formatUsd` from `shared/prices.js`. This matches the behavior already present in the manual send confirmation view (`confirmTx.js`). When ETH price is available, the value line shows e.g. `0.5000 ETH ($1,650.00)`. When price is unavailable, it falls back gracefully to just the ETH amount. closes #138 Co-authored-by: Jeffrey Paul <sneak@noreply.example.org> Reviewed-on: #141 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>	2026-03-01 20:16:00 +01:00
clawbot	bc2aedaab6	fix: etherscan link on address-token page goes to token-specific URL (#136 ) All checks were successful check / check (push) Successful in 9s Details 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. Closes #135 Co-authored-by: user <user@Mac.lan guest wan> Co-authored-by: Jeffrey Paul <sneak@noreply.example.org> Reviewed-on: #136 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>	2026-03-01 20:13:55 +01:00
clawbot	e53420f2e2	feat: add Sepolia testnet support (#137 ) All checks were successful check / check (push) Successful in 9s Details ## Summary Adds Sepolia testnet support to AutistMask. ### Changes - New `src/shared/networks.js` — centralized network definitions (mainnet + Sepolia) with chain IDs, default RPC/Blockscout endpoints, and block explorer URLs - State management — `networkId` added to persisted state; defaults to mainnet for backward compatibility - Settings UI — network selector dropdown lets users switch between Ethereum Mainnet and Sepolia Testnet - Dynamic explorer links — all hardcoded `etherscan.io` URLs replaced with dynamic links from the current network config (`sepolia.etherscan.io` for Sepolia) - Background service — `wallet_switchEthereumChain` now accepts both mainnet (0x1) and Sepolia (0xaa36a7); broadcasts `chainChanged` to connected dApps - Inpage provider — fetches chain ID on init and updates dynamically via `chainChanged` events (no more hardcoded `0x1`) - Blockscout API — uses `eth-sepolia.blockscout.com/api/v2` for Sepolia - Etherscan labels — phishing/scam checks use the correct explorer per network - Price fetching — skipped on testnets (testnet tokens have no real market value) - RPC validation — checks against the selected network's chain ID, not hardcoded mainnet - ethers provider — `getProvider()` uses the correct ethers `Network` for Sepolia ### API Endpoints Verified \| Service \| Mainnet \| Sepolia \| \|---------\|---------\|--------\| \| Etherscan \| etherscan.io \| sepolia.etherscan.io \| \| Blockscout \| eth.blockscout.com/api/v2 \| eth-sepolia.blockscout.com/api/v2 \| \| RPC \| ethereum-rpc.publicnode.com \| ethereum-sepolia-rpc.publicnode.com \| \| CoinDesk (prices) \| ✅ \| N/A (skipped on testnet) \| closes #110 Reviewed-on: #137 THIS WAS ONESHOTTED USING OPUS 4. WTAF Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>	2026-03-01 20:11:22 +01:00
clawbot	d35bfb7d23	feat: expand confirm-tx warnings — closes #114 (#118 ) All checks were successful check / check (push) Successful in 5s Details Expands the confirm-tx warning system with three new warning types, all using the existing `visibility:hidden/visible` pattern from PR #98 (no animations, no layout shift). ## Changes 1. Scam address list expanded (7 → 652 addresses): Sourced from [MyEtherWallet/ethereum-lists](https://github.com/MyEtherWallet/ethereum-lists) darklist (MIT license). Checked synchronously before sending. 2. Contract address warning: When the recipient is a smart contract (detected via `getCode`), shows a warning that sending directly to a contract may result in permanent loss of funds. 3. Null/burn address warning: Detects known burn addresses (`0x0000...0000`, `0x...dead`, `0x...deadbeef`) and warns that funds are permanently destroyed. 4. No-history warning (existing from #98): Unchanged, still shows for EOAs with zero transaction history. All warnings use reserved-space `visibility:hidden/visible` elements — no layout shift, no animations. closes #114 Co-authored-by: clawbot <clawbot@noreply.git.eeqj.de> Co-authored-by: user <user@Mac.lan guest wan> Co-authored-by: clawbot <clawbot@eeqj.de> Reviewed-on: #118 Co-authored-by: clawbot <sneak+clawbot@sneak.cloud> Co-committed-by: clawbot <sneak+clawbot@sneak.cloud>	2026-03-01 19:34:54 +01:00
clawbot	3bf60ff162	Reorder transaction detail view: txid first, logical grouping (#133 ) All checks were successful check / check (push) Successful in 9s Details Reorganizes the transaction detail view into logical blocks separated by thin horizontal rules for visual clarity. Identity block: Transaction hash (first!), Type, Status Timing block: Time, Block number Value block: Amount, Native quantity, Token contract, From, To Decoded details: Action/protocol/steps (for contract calls) Network details: Nonce, Gas price, Gas used, Transaction fee Raw data: Full calldata README TransactionDetail screen map updated to reflect the new ordering and grouping. closes #131 Co-authored-by: user <user@Mac.lan guest wan> Co-authored-by: clawbot <clawbot@git.eeqj.de> Co-authored-by: clawbot <clawbot@noreply.git.eeqj.de> Reviewed-on: #133 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>	2026-03-01 19:27:23 +01:00