fix: only the user switches the wallet's network (closes #408)

A connected site's wallet_switchEthereumChain request for the other
supported network now opens a prompt in its own window, through the
existing approval machinery, naming the site and both networks. The
network, endpoints, balances and caches change, and chainChanged is
sent, only when the user approves it; rejecting or closing the prompt
answers 4001. One such prompt per site at a time; a request for the
active network needs none. The approval window no longer shows the
connection prompt while it waits for the approval's description,
since both prompts answer on the same port.

Model: opus-5-5

README.md

@@ -422,12 +422,11 @@ captured at `eth_sendRawTransaction` rather than against anything the extension
 reported, rejecting each prompt is required to return a rejection to the page
 rather than hang or resolve, a network switch request is required to leave the
 stored network unchanged and send no `chainChanged` until it is approved, a
-network switch in Settings is required to send the page `chainChanged` with the
-new chain id, a prompt raised while another approval window has focus is
-required to open a window of its own, and the password is required to be absent
-from every message the approval window sends to the background — with the
-message that would carry it required to be present, so that check cannot pass by
-observing nothing. That last one is the standing floor under
+prompt raised while another approval window has focus is required to open a
+window of its own, and the password is required to be absent from every message
+the approval window sends to the background — with the message that would carry
+it required to be present, so that check cannot pass by observing nothing. That
+last one is the standing floor under
 [#157](https://git.eeqj.de/sneak/AutistMask/issues/157).
 
 The limits of that coverage and of the rest of the Chrome suite, none of them
@@ -1786,12 +1785,10 @@ view would leave a wallet one click from deletion.
       plus a "+ Add token" button
     - Display: "Show tracked tokens with zero balance" checkbox, "UTC
       Timestamps" checkbox, and a Theme selector (System / Light / Dark)
-    - Network: network selector (Ethereum Mainnet / Sepolia Testnet). The
+    - Network: network selector (Ethereum Mainnet / Sepolia Testnet); switching
+      resets the RPC and Blockscout endpoints to that network's defaults. The
       network changes only here, or when the user approves a site's request on
-      **NetworkApproval**; either way, switching restores the RPC and Blockscout
-      endpoints last used on that network, or that network's defaults if it has
-      none, and sends `chainChanged` with the new chain id to every open tab.
-      Choosing the network already active changes nothing and sends nothing
+      **NetworkApproval**
     - Ethereum RPC: endpoint URL input + "Save" button (validated against
       `eth_chainId` before being saved)
     - Blockscout API: endpoint URL input + "Save" button (validated against
@@ -2200,9 +2197,8 @@ view would leave a wallet one click from deletion.
     - "Switch" / "Reject" buttons
 - **Transitions**:
     - "Switch" → closes popup; the background switches the network as
-      **Settings** does, restoring the RPC and Blockscout endpoints last used on
-      that network (or that network's defaults if it has none), sends
-      `chainChanged` to every open tab, and answers the site with success
+      **Settings** does, sends `chainChanged` to every open tab, and answers the
+      site with success
     - "Reject" → closes popup; the site is answered with EIP-1193 code 4001 and
       nothing changes
     - Popup window closed without answering → the same as "Reject"
@@ -2678,11 +2674,7 @@ Currently supported:
   or recipient, and amount.
 - **Uniswap Universal Router**: `execute()` calls — shows swap direction (e.g.
   "Swap USDT → ETH"), token addresses, amounts, execution steps, and deadline.
-  Decodes Permit2, V2/V3/V4 swaps, wrap/unwrap, and balance checks. A V4 swap
-  action is read only in the parameter shape deployed on mainnet and Sepolia,
-  not in the newer one on `v4-periphery` `main`, which adds a `minHopPriceX36`
-  field. An action in any other shape is not read, and its step is listed as
-  `V4 Swap (could not be decoded)`.
+  Decodes Permit2, V2/V3/V4 swaps, wrap/unwrap, and balance checks.
 
 ### Non-Goals Forever
 
@@ -2699,7 +2691,7 @@ Currently supported:
 
 ### Non-Goals for 1.0
 
-- Chains other than Ethereum mainnet and the Sepolia testnet
+- Multi-chain support (Ethereum mainnet only)
 - Hardware wallet support
 
 ## TODO
@@ -2733,10 +2725,7 @@ Currently supported:
 ## Policies
 
 - We don't mention "the other wallet" by name in code or documentation. We're
-  our own thing. Written exception: the injected provider in
-  `src/content/inpage.js` sets the flag named after the other wallet to `true`.
-  It is an interface-compatibility flag many dApps check, and without it the
-  wallet stops working on their sites.
+  our own thing.
 - The README is the complete authoritative technical documentation. It's ok if
   it gets big.
 

RULES.md

@@ -118,7 +118,4 @@ contradicts either, the originals govern.
 - [ ] "Address" not "account" or "derived key"
 - [ ] "Password" not "encryption key" or "vault passphrase"
 - [ ] Error messages are full sentences
-- [ ] No competitor mentioned by name in code or documentation. Written
-      exception: the injected provider in `src/content/inpage.js` sets the flag
-      named after the other wallet to `true`, an interface-compatibility flag
-      many dApps check (README.md, Policies)
+- [ ] No competitor mentioned by name in code or documentation

TODO.md

@@ -2,9 +2,10 @@
 
 - `git pull` `next` and cut a branch from it — one branch per issue, named
   `issue-<N>-<slug>`. Never branch from `main`.
-- Do the work as one commit whose title ends with ` (closes #N)`.
-- Add no entry to Completed Steps. What landed is recorded on the tracker and in
-  `git log`, where each commit title names the issue it closes.
+- Do the work as one commit whose title ends with ` (closes #N)`, with the
+  `TODO.md` update in that same commit.
+- Move Next Step to the top of Completed Steps; move the top item of Future
+  Steps into Next Step.
 - Run `make fmt`, then `make check`. A feature branch may be red; `next` and
   `main` may not.
 - Rebase onto current `next` immediately before pushing — other branches land on
@@ -43,25 +44,6 @@ then continue tagging as milestones land.
 
 # Completed Steps
 
-- 2026-10-08: The browser suites no longer read a screen before the page has
-  shown it ([#502](https://git.eeqj.de/sneak/AutistMask/issues/502)). Their wait
-  for a screen used to pass as soon as the element laid out, which every view
-  does until the page's stylesheet has applied, so an approval test could read
-  the prompt's fields before the page's script had filled them. `visible()` in
-  `tests/e2e/harness.js` and `waitVisible()` in `tests/e2e/firefox/driver.js`
-  now also wait for the page to finish loading and for neither the element nor
-  anything around it to carry the `hidden` class that `showView()` puts on every
-  view but the current one. No caller changed.
-
-- 2026-10-08: Switching the network in Settings now tells open pages
-  ([#500](https://git.eeqj.de/sneak/AutistMask/issues/500)). Once the switch is
-  saved, Settings asks the background to send `chainChanged` with the new chain
-  id to every open tab, through the same function an approved site request uses.
-  Choosing the network already active changes nothing and sends nothing. Only
-  the extension's own pages can ask for this. `tests/chainSwitchGate.test.js`
-  drives the real Settings view against the background, and the Chrome suite
-  checks that the test page hears both switches.
-
 - 2026-10-07: A site can no longer switch the wallet's network by itself
   ([#408](https://git.eeqj.de/sneak/AutistMask/issues/408)). A connected site's
   `wallet_switchEthereumChain` request for the other supported network opens a
@@ -72,20 +54,9 @@ then continue tagging as milestones land.
   or closing the prompt answers 4001. One such prompt per site at a time. The
   approval window no longer shows the connection prompt while it waits for the
   background to describe the approval, because that prompt's "Allow" answers on
-  the same port as the new one; `tests/approvalWindow.test.js` checks that it
-  shows no screen until then. `tests/chainSwitchGate.test.js` and both browser
+  the same port as the new one. `tests/chainSwitchGate.test.js` and both browser
   suites drive the prompt.
 
-- 2026-10-07: Two contradictions between the documents and the code are resolved
-  as ruled on [#165](https://git.eeqj.de/sneak/AutistMask/issues/165). The
-  README's 1.0 non-goal now puts Ethereum mainnet and the Sepolia testnet in
-  scope and other chains out of it. The injected provider's flag named after the
-  other wallet stays, as an interface-compatibility flag many dApps check, and
-  is written down as an exception to the rule against naming competitors in the
-  README's Policies section, in `RULES.md` and in a comment beside it in
-  `src/content/inpage.js`. `script/check-censored` already allows that flag only
-  in that file and its built copies, so it is unchanged.
-
 - 2026-10-07: Two holes in what `tests/persistedFieldContract.test.js` checks
   are closed ([#379](https://git.eeqj.de/sneak/AutistMask/issues/379)). The
   check that every swept field is driven both truthy and falsy counts only

src/background/index.js

@@ -1471,7 +1471,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
         "AUTISTMASK_ADDRESSES_REMOVED",
         "AUTISTMASK_GET_CONNECTED_SITES",
         "AUTISTMASK_REMOVE_SITE",
-        "AUTISTMASK_NETWORK_CHANGED",
     ];
     if (POPUP_ONLY_TYPES.includes(msg.type) && !isExtensionSender(sender)) {
         sendResponse({ error: "Unauthorized sender" });
@@ -1855,13 +1854,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
         broadcastSiteRemoved(msg.origin);
         return false;
     }
-
-    // Settings switched the network and has saved it. Open tabs are told the
-    // new chain id the same way as after a site's approved switch request.
-    if (msg.type === "AUTISTMASK_NETWORK_CHANGED") {
-        broadcastChainChanged(msg.chainId);
-        return false;
-    }
 });
 
 module.exports = { PROXY_METHODS };

src/content/inpage.js

@@ -99,10 +99,7 @@
 
     const provider = {
         isAutistMask: true,
-        // An interface-compatibility flag many dApps check. Kept as a written
-        // exception to the rule that no competitor is named in code: see
-        // Policies in README.md, and RULES.md.
-        isMetaMask: true,
+        isMetaMask: true, // compatibility — many dApps check this
         chainId: currentChainId,
         networkVersion: currentNetworkVersion,
         selectedAddress: null,

src/popup/views/approval.js

@@ -329,9 +329,9 @@ function showTxApproval(details) {
     const ethUsd = ethPrice ? parseFloat(ethValueFormatted) * ethPrice : null;
     const usdStr = formatUsd(ethUsd);
     // In the native currency of the network the transaction is for, which the
-    // Network line names, not the active network's: the active network can
-    // change, in Settings or when the user approves a site's request, after
-    // this transaction is prepared and change back before it is signed.
+    // Network line names, not the active network's: a site can switch the
+    // active network after this transaction is prepared and back before it is
+    // signed.
     $("approve-tx-value").textContent =
         ethValueFormatted +
         " " +

src/popup/views/settings.js

@@ -316,11 +316,7 @@ function init(ctx) {
     const networkSelect = $("settings-network");
     networkSelect.addEventListener("change", async () => {
         const newId = networkSelect.value;
-        if (newId === state.networkId) return;
         const net = await onChainSwitch(newId);
-        // Open pages are told by the background, as after a site's approved
-        // switch request.
-        notify({ type: "AUTISTMASK_NETWORK_CHANGED", chainId: net.chainId });
         $("settings-rpc").value = state.rpcUrl;
         $("settings-blockscout").value = state.blockscoutUrl;
         showFlash("Switched to " + net.name + ".");

src/popup/views/transactionDetail.js

@@ -84,9 +84,8 @@ function show(tx) {
             contractAddress: tx.contractAddress || null,
             // The network the history entry was read from. The type line and
             // the fee are in its native currency, not the active network's:
-            // the active network can change, in Settings or when the user
-            // approves a site's request, before a later popup shows this
-            // screen again.
+            // a site can switch the active network before a later popup
+            // shows this screen again.
             chainId: tx.chainId,
         },
     };

src/popup/views/txStatus.js

@@ -89,9 +89,8 @@ function startWait(txInfo, txHash, broadcastTime, pollNow) {
 
     // A native amount, here and on the success and error screens, is in the
     // native currency of txInfo.chainId, the network the transaction was sent
-    // on, not the active network's: the active network can change, in
-    // Settings or when the user approves a site's request, while this screen
-    // is open or before a later popup resumes it.
+    // on, not the active network's: a site can switch the active network
+    // while this screen is open or before a later popup resumes it.
     const symbol =
         txInfo.token === "ETH"
             ? nativeCurrencyByChainId(txInfo.chainId)

src/shared/uniswap.js

@@ -295,24 +295,6 @@ function v4ExactInAmount(raw) {
     return raw === 0n ? OPEN_DELTA : raw;
 }
 
-// The V4 swap actions are read only in the parameter structs V4Router has
-// deployed on mainnet and Sepolia. v4-periphery `main` has since added a
-// `minHopPriceX36` field to all four (`src/interfaces/IV4Router.sol`), and
-// reading a shape nobody has deployed would be guessing. ethers alone would
-// read the newer structs anyway: it takes whatever word sits where a
-// deployed field would be, ignores bytes left over, and holds back an error
-// in a field until that field is used. The newer multi-hop exact-in struct
-// then yields the offset of its hop-price array as `amountIn`. So a decode
-// counts only when encoding the result again gives back the same bytes;
-// otherwise this throws, and decodeV4Swap() marks the step as not decoded.
-function decodeExactly(types, data) {
-    const decoded = coder.decode(types, data);
-    if (coder.encode(types, decoded) !== data) {
-        throw new Error("Not in the deployed V4 parameter shape.");
-    }
-    return decoded;
-}
-
 // Decode V4_SWAP (command 0x10) input bytes.
 // The input is ABI-encoded as (bytes actions, bytes[] params).
 // We extract token addresses from SETTLE (input) and TAKE (output) sub-actions,
@@ -327,10 +309,6 @@ function decodeV4Swap(input) {
         let takeToken = null;
         let amountIn = null;
         let amountOutMin = null;
-        // Set when a swap action's parameters are not in the deployed shape
-        // (see decodeExactly()), so nothing was read from that action. SETTLE
-        // and TAKE may still name both currencies.
-        let swapUndecoded = false;
 
         for (let i = 0; i < actions.length; i++) {
             const actionId = actions[i];
@@ -359,7 +337,7 @@ function decodeV4Swap(input) {
                         //   tuple(address,uint24,int24,address,bytes)[] path,
                         //   uint128 amountIn, uint128 amountOutMin)
                         try {
-                            const s = decodeExactly(
+                            const s = coder.decode(
                                 [
                                     "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
                                 ],
@@ -377,13 +355,13 @@ function decodeV4Swap(input) {
                                 amountOutMin = s[0][3];
                             }
                         } catch {
-                            swapUndecoded = true;
+                            // Fall through — SETTLE/TAKE will provide tokens
                         }
                     } else {
                         // ExactInputSingleParams: (tuple(address,address,uint24,int24,address) poolKey,
                         //   bool zeroForOne, uint128 amountIn, uint128 amountOutMin, bytes hookData)
                         try {
-                            const s = decodeExactly(
+                            const s = coder.decode(
                                 [
                                     "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
                                 ],
@@ -406,7 +384,7 @@ function decodeV4Swap(input) {
                                 amountOutMin = s[0][3];
                             }
                         } catch {
-                            swapUndecoded = true;
+                            // Fall through
                         }
                     }
                 } else if (
@@ -415,7 +393,7 @@ function decodeV4Swap(input) {
                 ) {
                     if (actionId === V4_SWAP_EXACT_OUT) {
                         try {
-                            const s = decodeExactly(
+                            const s = coder.decode(
                                 [
                                     "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
                                 ],
@@ -427,11 +405,11 @@ function decodeV4Swap(input) {
                                 settleToken = path[path.length - 1][0];
                             }
                         } catch {
-                            swapUndecoded = true;
+                            // Fall through
                         }
                     } else {
                         try {
-                            const s = decodeExactly(
+                            const s = coder.decode(
                                 [
                                     "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
                                 ],
@@ -448,7 +426,7 @@ function decodeV4Swap(input) {
                                     ? poolKey[1]
                                     : poolKey[0];
                         } catch {
-                            swapUndecoded = true;
+                            // Fall through
                         }
                     }
                 }
@@ -462,7 +440,6 @@ function decodeV4Swap(input) {
             tokenOut: takeToken,
             amountIn,
             amountOutMin,
-            swapUndecoded,
         };
     } catch {
         return null;
@@ -591,11 +568,6 @@ function decode(data, toAddress, sources) {
                 if (cmdId === 0x10) {
                     const v4 = decodeV4Swap(inputs[i]);
                     if (v4) {
-                        // Without this, a swap action that went unread would
-                        // look like one that had nothing to show.
-                        if (v4.swapUndecoded) {
-                            commandNames[i] += " (could not be decoded)";
-                        }
                         setInputOnce(v4.tokenIn, v4.amountIn);
                         // Always update output: last swap step wins. A step
                         // that carries the Min. received figure but decoded no

tests/approvalWindow.test.js

@@ -1,47 +0,0 @@
-// The approval window shows no screen until the background has described the
-// approval it answers (https://git.eeqj.de/sneak/AutistMask/issues/408). The
-// connection prompt's "Allow" and the network switch prompt's "Switch" answer
-// on the same port, so a window that showed the connection prompt while it
-// waited could approve a network switch.
-//
-// Booted through the real popup entry point, which is where the connection
-// prompt used to be put up before the background had answered.
-
-const {
-    bootPopup,
-    cleanupPopup,
-    settle,
-    unversionedValidProfile,
-} = require("./support/popupBoot");
-
-afterEach(cleanupPopup);
-
-test("the approval window shows no screen until the background describes the approval", async () => {
-    // The background's answer, held until the test gives it.
-    let answer = null;
-    const env = await bootPopup(unversionedValidProfile(), {
-        search: "?approval=approval-1",
-        runtime: {
-            connect: () => ({ postMessage: () => {} }),
-            sendMessage: (msg, reply) => {
-                if (msg.type === "AUTISTMASK_GET_APPROVAL") answer = reply;
-            },
-        },
-    });
-
-    expect(answer).not.toBeNull();
-    // No screen at all, the connection prompt included.
-    expect(env.visibleViews()).toEqual([]);
-
-    answer({
-        type: "network",
-        origin: "https://dapp.example",
-        currentNetworkId: "mainnet",
-        requestedNetworkId: "sepolia",
-        isPhishingDomain: false,
-    });
-    await settle();
-
-    expect(env.visibleViews()).toEqual(["approve-network"]);
-    expect(env.pageErrors).toEqual([]);
-});

tests/chainSwitchGate.test.js

@@ -16,9 +16,7 @@
 //
 // The endpoint half of #308 lives in tests/networkEndpoints.test.js, which
 // covers the popup's chain switch; this file covers the background's, which
-// goes through storage rather than the shared state singleton. The last block
-// covers what the background tells open tabs when the user switches the
-// network in Settings.
+// goes through storage rather than the shared state singleton.
 
 const { networkById } = require("../src/shared/networks");
 const { makeStorageStub } = require("./support/storageStub");
@@ -227,14 +225,6 @@ function loadBackground() {
         answerPrompt,
         closePrompt,
         opened,
-        // A message to the background from `sender`, and its answer.
-        send: (msg, sender) => {
-            let reply = null;
-            messageListener(msg, sender, (r) => {
-                reply = r;
-            });
-            return reply;
-        },
         walletState: () => storage.read("autistmask"),
         chainChangedEvents: () =>
             toTabs.filter((m) => m.eventName === "chainChanged"),
@@ -400,109 +390,3 @@ describe("only the user switches the network", () => {
         expect(bg.walletState().rpcUrl).toBe(CUSTOM_RPC);
     });
 });
-
-// Switching the network in Settings tells open pages, as an approved site
-// request does (https://git.eeqj.de/sneak/AutistMask/issues/500). These drive
-// the real Settings view over the background's storage, with what it sends
-// delivered to the background from the extension's own page.
-describe("switching the network in Settings tells every open tab", () => {
-    const POPUP = { url: EXT_URL + "src/popup/index.html" };
-
-    // A stand-in for one DOM node: enough of an element for init() to set
-    // properties on it and hang listeners off it.
-    function fakeElement() {
-        return {
-            value: "",
-            checked: false,
-            textContent: "",
-            style: {},
-            dataset: {},
-            classList: { add() {}, remove() {} },
-            listeners: {},
-            addEventListener(event, handler) {
-                this.listeners[event] = handler;
-            },
-            querySelectorAll: () => [],
-        };
-    }
-
-    // Settings, opened the way the popup opens it. Returns its network
-    // selector.
-    async function openSettings(bg) {
-        const elements = {};
-        const element = (id) => (elements[id] ||= fakeElement());
-        jest.doMock("../src/popup/views/helpers", () => ({
-            $: element,
-            showView: () => {},
-            updateDebugBanner: () => {},
-            showFlash: () => {},
-            escapeHtml: (s) => s,
-            flashCopyFeedback: () => {},
-            goBack: () => {},
-            pushCurrentView: () => {},
-            onViewLeave: () => {},
-            VIEWS: [],
-        }));
-        global.chrome.runtime.sendMessage = (msg) => {
-            bg.send(msg, POPUP);
-        };
-        await require("../src/shared/state").loadState();
-        require("../src/popup/views/settings").init({
-            pageClosed: new AbortController().signal,
-        });
-        const select = element("settings-network");
-        select.value = "mainnet";
-        return select;
-    }
-
-    // The user picks `networkId` in the selector.
-    async function choose(select, networkId) {
-        select.value = networkId;
-        await select.listeners.change();
-        await settle();
-    }
-
-    afterEach(() => {
-        jest.dontMock("../src/popup/views/helpers");
-    });
-
-    test("switching to the other network sends chainChanged once, with its chain id", async () => {
-        const bg = loadBackground();
-        const select = await openSettings(bg);
-
-        await choose(select, "sepolia");
-
-        expect(bg.walletState().networkId).toBe("sepolia");
-        expect(bg.chainChangedEvents()).toEqual([
-            {
-                type: "AUTISTMASK_EVENT",
-                eventName: "chainChanged",
-                data: SEPOLIA.chainId,
-            },
-        ]);
-    });
-
-    test("choosing the network already active changes nothing and sends nothing", async () => {
-        const bg = loadBackground();
-        const select = await openSettings(bg);
-        const before = bg.walletState();
-
-        await choose(select, "mainnet");
-
-        expect(bg.walletState()).toEqual(before);
-        expect(bg.chainChangedEvents()).toEqual([]);
-    });
-
-    test("a page cannot make the background send chainChanged", async () => {
-        const bg = loadBackground();
-
-        const reply = bg.send(
-            { type: "AUTISTMASK_NETWORK_CHANGED", chainId: SEPOLIA.chainId },
-            { url: CONNECTED_ORIGIN + "/" },
-        );
-        await settle();
-
-        expect(reply).toEqual({ error: "Unauthorized sender" });
-        expect(bg.chainChangedEvents()).toEqual([]);
-    });
-});

tests/e2e/firefox/driver.js

@@ -279,18 +279,12 @@ class Driver {
 
     // Shown means shown: in the popup a view is switched by toggling a
     // "hidden" class, and an element that is present but collapsed is not
-    // the thing a test means by visible. Until the page's stylesheet has
-    // applied that class hides nothing and every view lays out, so the page
-    // must also have finished loading, which it does only after its
-    // stylesheet, and neither the element nor anything enclosing it may
-    // carry the class (https://git.eeqj.de/sneak/AutistMask/issues/502).
+    // the thing a test means by visible.
     async waitVisible(selector, timeout = DEFAULT_WAIT_MS) {
         return this.waitFor(
             "selector " + selector + " to be visible",
             `const el = document.querySelector(arguments[0]);
-             if (document.readyState !== "complete" || !el) return false;
-             if (el.closest(".hidden")) return false;
-             if (getComputedStyle(el).visibility !== "visible") return false;
+             if (!el) return false;
              const r = el.getBoundingClientRect();
              return r.width > 0 && r.height > 0;`,
             [selector],

tests/e2e/harness.js

@@ -333,33 +333,8 @@ async function launch(routeOpts) {
 
 const PASSWORD = "e2e-harness-password";
 
-// Waits until the page shows `selector`, not only until it lays out. Until the
-// page's stylesheet has applied, the `hidden` class that showView() keeps on
-// every view but the current one hides nothing and every view lays out, so a
-// test could read a screen before the page's script had filled it
-// (https://git.eeqj.de/sneak/AutistMask/issues/502). So the page must also
-// have finished loading, which it does only after its stylesheet, and neither
-// the element nor anything enclosing it may carry `hidden`. Polled on a timer:
-// animation frames are not guaranteed to a window that is not in front.
 async function visible(page, selector, timeout = 15000) {
-    await page
-        .waitForFunction(
-            (sel) => {
-                const el = document.querySelector(sel);
-                if (document.readyState !== "complete" || !el) return false;
-                if (el.closest(".hidden")) return false;
-                if (getComputedStyle(el).visibility !== "visible") return false;
-                const r = el.getBoundingClientRect();
-                return r.width > 0 && r.height > 0;
-            },
-            selector,
-            { polling: 50, timeout },
-        )
-        .catch((e) => {
-            throw new Error(
-                "the page did not show " + selector + ": " + e.message,
-            );
-        });
+    await page.waitForSelector(selector, { state: "visible", timeout });
 }
 
 // An empty WebAssembly module: magic number and version header, no

tests/e2e/run.js

@@ -4538,42 +4538,6 @@ test("a site's network switch changes nothing until the user approves it (#408)"
     );
 });
 
-// Switching the network in Settings tells the page too, as an approved site
-// request does (https://git.eeqj.de/sneak/AutistMask/issues/500). The wallet
-// goes back to mainnet the same way at the end.
-test("a network switch in Settings tells the page (#500)", async (env) => {
-    const { mainnet, sepolia } = NETWORKS;
-    const before = await storedNetwork(env.page);
-    assert(
-        before.networkId === "mainnet",
-        "this test starts on mainnet, not on " + before.networkId,
-    );
-    const eventsBefore = (await chainChangedEvents(env.dapp)).length;
-    await openSettings(env.page);
-
-    await env.page.selectOption("#settings-network", "sepolia");
-    let events = await chainChangedEvents(env.dapp, eventsBefore + 1);
-    assert(
-        events.length === eventsBefore + 1 &&
-            events[events.length - 1].data === sepolia.chainId,
-        "the page was not told of the switch to Sepolia: " +
-            JSON.stringify(events),
-    );
-
-    await env.page.selectOption("#settings-network", "mainnet");
-    events = await chainChangedEvents(env.dapp, eventsBefore + 2);
-    assert(
-        events.length === eventsBefore + 2 &&
-            events[events.length - 1].data === mainnet.chainId,
-        "the page was not told of the switch back to mainnet: " +
-            JSON.stringify(events),
-    );
-    assert(
-        isDeepStrictEqual(await storedNetwork(env.page), before),
-        "switching back did not restore the mainnet network and endpoints",
-    );
-});
-
 // The closing pass over both boundaries at once. Every message the section
 // put on either channel is re-read here and required to be free of the
 // password — and required to be there at all, method by method, so the

tests/nativeCurrency.test.js

@@ -345,10 +345,10 @@ describe.each([
 });
 
 // A transaction's value and fee are in the native currency of the network the
-// transaction is on, which need not be the active one. The active network can
-// change, in Settings or when the user approves a site's request, after a
-// transaction is prepared and change back before it is signed, and a popup
-// opened after a switch shows a sent or listed transaction again. The wallet's balances follow the active network; these do not.
+// transaction is on, which need not be the active one. A site can switch the
+// active network after its transaction is prepared and back before it is
+// signed, and a popup opened after a switch shows a sent or listed transaction
+// again. The wallet's balances follow the active network; these do not.
 describe.each([
     ["mainnet", "sepolia", "ETH"],
     ["sepolia", "mainnet", "SepoliaETH"],

tests/support/popupBoot.js

@@ -238,10 +238,6 @@ async function settle() {
  * @param {object} [options]
  * @param {object} [options.storage] a storage stub from makeStorageStub(), for
  *     a test that needs to make writes fail or to watch the round trips.
- * @param {string} [options.search] the page URL's query string, such as
- *     "?approval=" and an id for the popup opened as an approval window.
- * @param {object} [options.runtime] members of chrome.runtime that replace the
- *     stub's own, for a test that has to answer the background's messages.
  * @returns {Promise<object>} handles onto the booted page.
  */
 async function bootPopup(stored, options) {
@@ -285,13 +281,12 @@ async function bootPopup(stored, options) {
             sendMessage: jest.fn(async () => ({})),
             getURL: (p) => "chrome-extension://autistmask/" + p,
             onMessage: { addListener: () => {} },
-            ...(options && options.runtime),
         },
     };
     globalThis.document = document;
     globalThis.window = {
         location: {
-            search: (options && options.search) || "",
+            search: "",
             href: "chrome-extension://autistmask/src/popup/index.html",
             reload: () => reloads.push(Date.now()),
         },

tests/uniswap.test.js

@@ -163,110 +163,6 @@ function encodeV4ExactInSingle(currency0, currency1, amountIn, amountOutMin) {
     );
 }
 
-// Each V4 swap action's parameters in two shapes: the struct V4Router has
-// deployed on mainnet and Sepolia, and the one v4-periphery `main` has since
-// moved to, which adds a `minHopPriceX36` field. Each swaps WETH for USDC.
-const POOL_KEY = "tuple(address,address,uint24,int24,address)";
-const PATH_KEY = "tuple(address,uint24,int24,address,bytes)";
-const WETH_USDC_POOL = [WETH_ADDR, USDC_ADDR, 100, 1, ZERO_ADDR];
-const ONE_WETH = 1000000000000000000n;
-const V4_SWAP_ACTION_SHAPES = [
-    {
-        action: "SWAP_EXACT_IN_SINGLE",
-        id: 0x06,
-        deployed: coder.encode(
-            [`tuple(${POOL_KEY},bool,uint128,uint128,bytes)`],
-            [[WETH_USDC_POOL, true, ONE_WETH, 990000n, "0x"]],
-        ),
-        newer: coder.encode(
-            [`tuple(${POOL_KEY},bool,uint128,uint128,uint256,bytes)`],
-            [[WETH_USDC_POOL, true, ONE_WETH, 990000n, 0n, "0x"]],
-        ),
-    },
-    {
-        action: "SWAP_EXACT_IN",
-        id: 0x07,
-        deployed: coder.encode(
-            [`tuple(address,${PATH_KEY}[],uint128,uint128)`],
-            [
-                [
-                    WETH_ADDR,
-                    [[USDC_ADDR, 100, 1, ZERO_ADDR, "0x"]],
-                    ONE_WETH,
-                    990000n,
-                ],
-            ],
-        ),
-        newer: coder.encode(
-            [`tuple(address,${PATH_KEY}[],uint256[],uint128,uint128)`],
-            [
-                [
-                    WETH_ADDR,
-                    [[USDC_ADDR, 100, 1, ZERO_ADDR, "0x"]],
-                    [],
-                    ONE_WETH,
-                    990000n,
-                ],
-            ],
-        ),
-    },
-    {
-        action: "SWAP_EXACT_OUT_SINGLE",
-        id: 0x08,
-        deployed: coder.encode(
-            [`tuple(${POOL_KEY},bool,uint128,uint128,bytes)`],
-            [[WETH_USDC_POOL, true, 990000n, ONE_WETH, "0x"]],
-        ),
-        newer: coder.encode(
-            [`tuple(${POOL_KEY},bool,uint128,uint128,uint256,bytes)`],
-            [[WETH_USDC_POOL, true, 990000n, ONE_WETH, 0n, "0x"]],
-        ),
-    },
-    {
-        action: "SWAP_EXACT_OUT",
-        id: 0x09,
-        deployed: coder.encode(
-            [`tuple(address,${PATH_KEY}[],uint128,uint128)`],
-            [
-                [
-                    USDC_ADDR,
-                    [[WETH_ADDR, 100, 1, ZERO_ADDR, "0x"]],
-                    990000n,
-                    ONE_WETH,
-                ],
-            ],
-        ),
-        newer: coder.encode(
-            [`tuple(address,${PATH_KEY}[],uint256[],uint128,uint128)`],
-            [
-                [
-                    USDC_ADDR,
-                    [[WETH_ADDR, 100, 1, ZERO_ADDR, "0x"]],
-                    [],
-                    990000n,
-                    ONE_WETH,
-                ],
-            ],
-        ),
-    },
-];
-
-// Helper: execute() with one V4_SWAP step holding the swap action, then
-// SETTLE of WETH and TAKE of USDC.
-function v4SwapCalldata(actionId, swapParams) {
-    return buildExecute(
-        "0x10",
-        [
-            encodeV4Swap(new Uint8Array([actionId, V4_SETTLE_ID, V4_TAKE_ID]), [
-                swapParams,
-                encodeV4Settle(WETH_ADDR),
-                encodeV4Take(USDC_ADDR),
-            ]),
-        ],
-        9999999999n,
-    );
-}
-
 function detail(result, label) {
     return result.details.find((d) => d.label === label);
 }
@@ -307,45 +203,11 @@ describe("uniswap decoder", () => {
             result.details.find((d) => d.label === "Min. received").value,
         ).toBe("0.0002 ETH");
 
-        // Real mainnet calldata is in the deployed shape, so its V4 step is
-        // not said to be undecoded.
         const steps = result.details.find((d) => d.label === "Steps");
-        expect(steps.value).toBe("Permit2 Permit → V4 Swap");
+        expect(steps.value).toContain("Permit2 Permit");
+        expect(steps.value).toContain("V4 Swap");
     });
 
-    test.each(V4_SWAP_ACTION_SHAPES)(
-        "a V4 $action in the deployed shape is read",
-        ({ id, deployed }) => {
-            const result = uniswap.decode(
-                v4SwapCalldata(id, deployed),
-                ROUTER_ADDR,
-            );
-            expect(detail(result, "Steps").value).toBe("V4 Swap");
-        },
-    );
-
-    // https://git.eeqj.de/sneak/AutistMask/issues/358 — before it, all four
-    // newer structs decoded as the deployed ones without an error, and the
-    // newer SWAP_EXACT_IN showed the offset of its hop-price array as Amount
-    // ("0.0000000000000004 WETH") and its amountIn as Min. received.
-    test.each(V4_SWAP_ACTION_SHAPES)(
-        "a V4 $action in the newer periphery shape is shown as not decoded",
-        ({ id, newer }) => {
-            const result = uniswap.decode(
-                v4SwapCalldata(id, newer),
-                ROUTER_ADDR,
-            );
-            expect(detail(result, "Amount")).toBeUndefined();
-            expect(detail(result, "Min. received")).toBeUndefined();
-            expect(detail(result, "Steps").value).toBe(
-                "V4 Swap (could not be decoded)",
-            );
-            // SETTLE and TAKE keep their own shape and still name both sides.
-            expect(detail(result, "Token In").address).toBe(WETH_ADDR);
-            expect(detail(result, "Token Out").address).toBe(USDC_ADDR);
-        },
-    );
-
     test("decodes V2_SWAP_EXACT_IN with known tokens", () => {
         const data = buildExecute(
             "0x08", // V2_SWAP_EXACT_IN
@@ -686,11 +548,9 @@ describe("uniswap decoder", () => {
         const result = uniswap.decode(data, ROUTER_ADDR);
         expect(result).not.toBeNull();
 
-        // The V4 swap action's parameters are empty, so that step is said to
-        // be undecoded.
         const steps = result.details.find((d) => d.label === "Steps");
         expect(steps.value).toBe(
-            "Permit2 Permit \u2192 V4 Swap (could not be decoded) \u2192 Unwrap WETH",
+            "Permit2 Permit \u2192 V4 Swap \u2192 Unwrap WETH",
         );
     });