build: add ESLint to script/lint and containerize linting (closes #152 )

script/lint ran `prettier --check .`, byte for byte what script/fmt-check runs, so make check checked formatting twice and did no static analysis on a cryptocurrency wallet. Two used-but-not-imported crashes shipped past it. ESLint is pinned in package.json with @eslint/js recommended as the base and a flat config in eslint.config.js. no-undef and no-unused-vars are restated error-level so a future recommended-set change cannot downgrade them. Globals are declared per tree rather than globally, because a too-wide set hides the next unimported identifier: browser for the popup and content scripts, service worker for src/background/ and src/shared/, browser for the one documented POPUP ONLY module in src/shared/, jest for tests/, node for build.js, and both for the e2e harnesses, which carry the callbacks they ship into the page inline. Two rules new to the recommended set are off, and both would have cost something to satisfy. no-useless-assignment flags the `password = null` and `decryptedSecret = null` wipes in approval.js and confirmTx.js: those assignments are dead by construction, which is the point of them, and the rule's fix is to delete the wipe. preserve-caught-error would change what the wallet's error paths throw, which is a decision of its own. Every remaining violation is fixed: 41 unused bindings and 53 undefined identifiers. Unused catch bindings became `catch {`, which the repo already used; the shared init(ctx) view signature keeps its parameter as _ctx in the three views that do not read it. src/shared/uniswap.js keeps its unused V2_SWAP_EXACT_OUT decoder behind a scoped disable, because deleting it would widen the gap it represents rather than close it (#283). Linting is containerized. script/lint builds the Dockerfile's new lint stage so the ESLint deciding whether this repo is green is the pinned one and not whatever the host has; AUTISTMASK_LINT_NATIVE, set only in that image, is what makes make check inside the CI build lint in place instead of recursing into docker. The check stage takes a COPY --from=lint dependency so a lint failure fails the whole build early rather than racing it. No --fix anywhere in the lint path: make check remains non-mutating. The README claim that a used-but-not-imported identifier is invisible to make check, and the same claim in script/test-e2e, are no longer true and are corrected.
fix: render the view "Back" lands on after the popup is reopened (closes #268 )
2026-08-14 04:16:53 +00:00 · 2026-08-14 06:14:09 +02:00
44 changed files with 1645 additions and 1765 deletions
--- a/19
+++ b/19
@@ -1,8 +1,13 @@
 # node:22-slim (22.x LTS), 2026-02-24
-FROM node@sha256:5373f1906319b3a1f291da5d102f4ce5c77ccbe29eb637f072b6c7b70443fc36
+FROM node@sha256:5373f1906319b3a1f291da5d102f4ce5c77ccbe29eb637f072b6c7b70443fc36 AS base

 WORKDIR /app

+# Marks "already inside the lint container" for script/lint, which otherwise
+# shells out to docker to build the lint stage below. Nothing outside this
+# image sets it.
+ENV AUTISTMASK_LINT_NATIVE=1
+
 # script/bootstrap installs all prerequisites (make via apt here; node
 # is already in the base image, yarn comes via corepack) and runs
 # yarn install --frozen-lockfile. Dependency manifests are copied first
@@ -13,5 +18,17 @@ RUN script/bootstrap

 COPY . .

+# Lint stage — fail fast on static analysis and formatting, before the tests
+# and the build. This is also the stage script/lint builds from a host, which
+# is how linting stays on the pinned ESLint rather than the host's.
+FROM base AS lint
+RUN make lint
+
+# Full check and build. The COPY --from is a no-op file copy whose only job is
+# to make BuildKit finish the lint stage before this one starts; without it the
+# stages run in parallel and a lint failure would not fail the build early.
+FROM base AS check
+COPY --from=lint /app/package.json /dev/null
+
 RUN make check
 RUN make build
--- a/README.md
+++ b/README.md
@@ -88,7 +88,13 @@ provide:
 - `script/test-e2e-firefox` — run the Firefox browser end-to-end suite (docker
  required; builds its own pinned image, see
  [End-to-End Tests](#end-to-end-tests))
- `script/lint` — run the linter
+- `script/lint` — run ESLint (`eslint.config.js`) and then `prettier --check`,
+  failing on either. It never writes: `--fix` is not in this path, so
+  `make check` stays non-mutating. Linting runs in the container — the script
+  builds the Dockerfile's `lint` stage — because an ESLint result that depends
+  on whichever ESLint the host happens to have is not a result. Docker is
+  therefore required to lint; inside that image `AUTISTMASK_LINT_NATIVE=1` makes
+  the same script lint in place instead of recursing.
 - `script/fmt` — format all files (writes)
 - `script/fmt-check` — check formatting (read-only)
 - `script/check` — run test, test-verify-build, lint, and fmt-check
@@ -235,26 +241,21 @@ being intercepted, run with `E2E_TRACE_NETWORK=1` and every routed request is
 printed, tagged `[sw]` or `[page]`.

 **Any uncaught page error or `console.error` fails the run.** That is the point:
-a `ReferenceError` from a used-but-not-imported identifier is invisible to
-`make check` (`script/lint` is only `prettier --check`) but fatal in a browser,
-and this suite exists because exactly that class of bug shipped twice.
+this suite exists because a `ReferenceError` from a used-but-not-imported
+identifier shipped twice, fatal in a browser and invisible to a `make check`
+that was `prettier --check` only. ESLint's `no-undef` now catches that exact
+class before a browser is involved, so this suite is no longer the only thing
+standing between it and a release — but a static rule only sees identifiers, and
+the runtime errors this suite catches are broader than one rule.

 ### Firefox (`make test-e2e-firefox`)

 `make test-e2e-firefox` builds `dist/firefox/` and drives the **real popup in a
 real Firefox**, installed as an unpacked MV2 temporary add-on via geckodriver.
-It covers popup load, wallet creation through the UI, the Add Token screen, and
-the four dApp round trips — `eth_requestAccounts`, `personal_sign`,
-`eth_sendTransaction`, and a closed approval window rejecting with EIP-1193 4001
-— driven through the real content script, background page and approval windows.
-
-The suite lives in `tests/e2e/firefox/`. Its WebDriver client (`driver.js`) has
-**no npm dependencies at all**: it is built on global `fetch` and
-`child_process` against geckodriver's HTTP API. The dApp fixture (`dapp.js`) and
-the assertions do use `ethers`, and have to — a signature is recovered in the
-runner rather than believed from the extension, and the stub node has to answer
-`eth_sendRawTransaction` with the hash `ethers` computes for the artifact it
-sent, or `provider.broadcastTransaction()` refuses the answer.
+It covers popup load, wallet creation through the UI, and the Add Token screen.
+The suite lives in `tests/e2e/firefox/` and has **no npm dependencies at all**:
+it is a small WebDriver client built on global `fetch` and `child_process`
+against geckodriver's HTTP API.

 Unlike the Chrome suite it builds its own container image rather than pulling a
 published one, because no published image carries both a pinned Firefox and a
@@ -276,30 +277,20 @@ because BiDi's `browsingContext.navigate` refuses `moz-extension://` outright.
 **Any uncaught error from a `moz-extension://` source fails the run**, including
 errors from the background page, which the suite never navigates to: a `throw`
 at the top of `src/background/index.js` kills the background page and fails
-step 1. Content scripts **are** exercised now — the dApp steps drive a page
-served from loopback, which survives `--network none` — but the _capture_ of a
-content-script error by this route is still unproven: no probe has forced a
-throw inside one and watched it fail the run, so it remains an expectation
-rather than a demonstrated fact. Errors from add-on install and background
-startup are folded into step 1 rather than discarded.
-
-One error is tolerated rather than fatal, listed in `ALLOWED_ERRORS` in
-`tests/e2e/firefox/run.js` with the issue that will delete it, and printed on
-every occurrence so the concession stays visible in the run output. It is
-Firefox reporting the site-approval popup's unawaited `sendMessage` settling
-after `window.close()` unloaded the context — the same teardown ordering as
-[#275](https://git.eeqj.de/sneak/AutistMask/issues/275), and unsuppressable from
-the calling code, because `BaseContext.wrapPromise` reports it whether or not a
-handler is attached. Errors are read from the privileged `nsIConsoleService` in
-Marionette's chrome context and filtered to non-warning entries whose
-`sourceName` is the extension origin. That mechanism is not a stylistic choice.
-WebDriver BiDi's `log.entryAdded` delivers **nothing** for extension pages: on a
-plain `http://` page it reports uncaught errors with stack traces, and on the
-`moz-extension://` popup it reports zero events, because Firefox's remote agent
-excludes extension browsing contexts from BiDi observation. Any harness built on
-Playwright-BiDi or Puppeteer-BiDi would therefore see nothing and report
-success, which is exactly the vacuous check this repo has already shipped twice.
-Do not migrate this suite to BiDi.
+step 1. Content-script errors should arrive by the same route, but this suite
+does not exercise it and does not claim it — with `--network none` there is no
+`http://` page for a content script to be injected into. Errors from add-on
+install and background startup are folded into step 1 rather than discarded.
+Errors are read from the privileged `nsIConsoleService` in Marionette's chrome
+context and filtered to non-warning entries whose `sourceName` is the extension
+origin. That mechanism is not a stylistic choice. WebDriver BiDi's
+`log.entryAdded` delivers **nothing** for extension pages: on a plain `http://`
+page it reports uncaught errors with stack traces, and on the `moz-extension://`
+popup it reports zero events, because Firefox's remote agent excludes extension
+browsing contexts from BiDi observation. Any harness built on Playwright-BiDi or
+Puppeteer-BiDi would therefore see nothing and report success, which is exactly
+the vacuous check this repo has already shipped twice. Do not migrate this suite
+to BiDi.

 Two limits are worth knowing, both real differences from the Chrome suite:

@@ -323,19 +314,17 @@ Two limits are worth knowing, both real differences from the Chrome suite:
  but a step that logs heavily could evict unread errors. What poll-based costs
  is location, not coverage: an error cannot be placed within a step the way the
  Chrome suite's `pageerror` events place it.
- **Almost nothing is stubbed, which inverts the coverage of network-dependent
-  code.** The container still runs with `--network none`, so the run is offline
-  and no request can escape. The one thing it can reach is the loopback fixture
-  in `tests/e2e/firefox/dapp.js`, which serves the dApp page and a JSON-RPC node
-  and which the extension's `rpcUrl` is pointed at for the dApp steps; a
-  JSON-RPC method that fixture does not model fails the run rather than
-  answering `null`. Everything else — Blockscout, the price feed, the phishing
-  blocklist — has no fixture and simply fails, and the extension swallows its
-  own fetch failures, so only the _failure_ branches of that code are ever
-  executed. A `ReferenceError` in the success path of `renderTransactions`, or
-  of price rendering, passes this suite green. The offline run is also weaker
-  than the Chrome suite's interception for those calls: it proves nothing got
-  out, but it cannot report which requests were attempted.
+- **Nothing is stubbed, which inverts the coverage of network-dependent code.**
+  There is no fixture layer; the container runs with `--network none` instead,
+  so the run is offline and deterministic and no request can escape. The
+  extension swallows its own fetch failures, so the flows are unaffected — but
+  every network call fails, so only the _failure_ branches of code that depends
+  on one are ever executed. A `ReferenceError` in the success path of
+  `renderTransactions`, or of price or balance rendering, passes this suite
+  green. The offline run is also weaker than the Chrome suite's interception: it
+  proves nothing got out, but it cannot report which requests were attempted.
+  Closing that gap needs a fixture layer, deliberately out of scope for this
+  harness.

 Neither `make test-e2e` nor `make test-e2e-firefox` is part of `make check` or
 `make test`. `REPO_POLICIES.md` caps `make test` at 20 seconds and a browser
@@ -658,6 +647,21 @@ ExportPrivKey and ShowRecoveryPhrase — are deliberately absent from that list,
 so the popup can never reopen onto one of them with no password prompt in front
 of it.

+A reopened popup renders the wallet list and the one screen it restores onto,
+and nothing else, so every screen on the stack behind that one is still the
+blank template from `index.html`. "Back" therefore renders its target rather
+than only unhiding it, through the same dispatch and data guards as the restore
+(`src/popup/viewRouter.js`), and falls back to Home when the state the target
+would render is gone.
+
+It renders only a screen this page load has not rendered yet. Forward navigation
+renders as it goes, and `viewRouter.js` records every screen that reaches
+`showView()`, so "Back" onto a screen already on the page unhides it and nothing
+more — rendering it a second time would re-fetch and overwrite what it holds,
+such as an edit typed into Settings and not yet saved. Home is the one screen
+"Back" always re-renders, so the wallet list reflects anything that changed
+while the user was away from it.
+
 Every screen that holds secret material in the page registers a cleanup with
 `onViewLeave()` (`src/popup/views/helpers.js`), which `showView()` runs on every
 exit from that screen rather than only on its "Back" button, so nothing secret
--- a/TODO.md
+++ b/TODO.md
@@ -32,32 +32,30 @@ The backlog lives on the
 [Gitea tracker](https://git.eeqj.de/sneak/AutistMask/issues), which is
 authoritative; this file does not duplicate it. Full policy file set present.
 Real-browser end-to-end suites (`make test-e2e` for Chrome,
-`make test-e2e-firefox` for Firefox) now sit alongside `make check`, which
-cannot see a runtime `ReferenceError` in a popup view.
+`make test-e2e-firefox` for Firefox) sit alongside `make check`, which now does
+static analysis as well as formatting.

 # Next Step

-Land [#152](https://git.eeqj.de/sneak/AutistMask/issues/152): add ESLint to
-`script/lint`. `make check` is `prettier --check` only today and cannot catch
-undefined identifiers, which is how
-[#150](https://git.eeqj.de/sneak/AutistMask/issues/150) and
-[#151](https://git.eeqj.de/sneak/AutistMask/issues/151) shipped.
+Pre-1.0 security review of the extension (key handling, DEBUG mode policy, RPC
+input validation) before any 1.0rc tag. Individual filed issues are parts of it,
+but the review is broader than any of them.

 # Completed Steps

- 2026-08-12: One shared extension-API module,
-  [`src/shared/browserApi.js`](src/shared/browserApi.js), is the only place in
-  the tree that names `browser` or `chrome`. Every call site returns a promise;
-  `runtime.lastError` is gone. The same commit gives the Firefox suite the four
-  dApp round trips — `eth_requestAccounts`, `personal_sign`,
-  `eth_sendTransaction` and a closed approval window rejecting with EIP-1193
-  4001 — against a page and a JSON-RPC node served from loopback, which survives
-  `--network none`. **The premise of
-  [#153](https://git.eeqj.de/sneak/AutistMask/issues/153) does not survive that
-  harness**: Firefox's `browser.*` honours a trailing Chrome-style callback and
-  populates `runtime.lastError`, both measured directly on Firefox 153.0.3, and
-  all four flows pass against the unconverted code. What landed is a uniformity
-  and coverage change, not a repair of a broken target.
+- 2026-08-14: `make check` does static analysis. `script/lint` ran
+  `prettier --check .`, byte-identical to `script/fmt-check`, so a wallet with
+  two shipped used-but-not-imported crashes behind it was green. ESLint is now
+  pinned in `package.json` with `@eslint/js` recommended as the base, flat
+  config in `eslint.config.js`, `no-undef` and `no-unused-vars` error-level, and
+  globals declared per tree — browser for the popup and content scripts, service
+  worker for `src/background/` and `src/shared/`, jest for `tests/`, node for
+  `build.js`. It found 41 unused bindings and 53 undefined identifiers; all are
+  fixed, and dropping a call to an unimported `foo()` into any `src/` file fails
+  `make lint`. Linting is also containerized now: `script/lint` builds the
+  Dockerfile's new `lint` stage, so the ESLint that decides whether this repo is
+  green is the pinned one and not the host's
+  ([#152](https://git.eeqj.de/sneak/AutistMask/issues/152)).
 - 2026-08-12: EIP-1193 error codes now reach the page. `src/content/inpage.js`
  rebuilt every failure as `new Error(error.message)`, so the code the
  background produced and the content script relayed intact was dropped in the
@@ -72,6 +70,23 @@ undefined identifiers, which is how
  `tests/inpageErrors.test.js`, and the e2e probe that printed the missing code
  now requires it on the page's Error as well as on the wire, for all four
  rejected flows ([#274](https://git.eeqj.de/sneak/AutistMask/issues/274)).
+- 2026-08-12: "Back" now renders the screen it lands on instead of only unhiding
+  it. A reopened popup renders the wallet list and the one screen it restores
+  onto, so every screen further down the stack was still the blank template from
+  `index.html`, and Back walked straight onto it — an empty address, no
+  balances, no QR code. The Back path now goes through the same per-view
+  dispatch and data guards as the restore (`src/popup/viewRouter.js`, shared
+  with `restoreView()`), falling back to Home when the state the target would
+  render is gone. It renders only a view this page load has not rendered yet:
+  `viewRouter.js` records every view that reaches `showView()`, which is where
+  forward navigation and the restore both end, so Back onto a view already on
+  the page unhides it and nothing more. That is what keeps a second render from
+  re-fetching and overwriting what the view holds — an unsaved edit in Settings,
+  a transaction list already loaded. Home is the exception and is always
+  re-rendered, as it was before. Covered by unit tests on the real `goBack()`
+  and by three end-to-end cases against the real popup, each demonstrated
+  failing on the unfixed build
+  ([#268](https://git.eeqj.de/sneak/AutistMask/issues/268)).
 - 2026-08-12: `KNOWN_SYMBOLS` now maps a symbol to the set of contract addresses
  that bear it, not to one of them. A ticker is not unique: seven of the 512
  bundled tokens — `FRAX`, `REUSD`, `TON`, `EURE`, `MSUSD`, `MUSD` and `JPYC` —
@@ -361,9 +376,6 @@ undefined identifiers, which is how
 Only work that has no issue of its own belongs here; everything else is on the
 tracker.

- Pre-1.0 security review of the extension (key handling, DEBUG mode policy, RPC
-  input validation) before any 1.0rc tag. Individual filed issues are parts of
-  it, but the review is broader than any of them.
 - Decide whether docker-in-docker makes `make test-e2e` and
  `make test-e2e-firefox` runnable in the Gitea workflow. Extending the Chrome
  suite itself is tracked as
--- a/build.js
+++ b/build.js
@@ -63,7 +63,7 @@ function getBuildInfo() {
        commitHash = execSync("git rev-parse --short HEAD", {
            encoding: "utf8",
        }).trim();
-    } catch (_) {
+    } catch {
        // not a git repo or git not available
    }
    let commitHashFull = "unknown";
@@ -71,7 +71,7 @@ function getBuildInfo() {
        commitHashFull = execSync("git rev-parse HEAD", {
            encoding: "utf8",
        }).trim();
-    } catch (_) {
+    } catch {
        // not a git repo or git not available
    }
    return {
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -0,0 +1,144 @@
+// ESLint flat config. Static analysis for make check; formatting stays with
+// prettier (script/fmt-check), so nothing here touches style.
+//
+// The sources are CommonJS and are bundled per entrypoint by build.js, so the
+// globals differ by tree and are declared per tree below. Getting that wrong in
+// either direction defeats the point: too few globals buries a real no-undef in
+// false positives, too many hides the next unimported identifier.
+
+const js = require("@eslint/js");
+const globals = require("globals");
+
+// The extension APIs. MV3 Chrome exposes `chrome`; Firefox exposes both, and
+// the code feature-detects between them.
+const extensionGlobals = {
+    chrome: "readonly",
+    browser: "readonly",
+};
+
+const commonjs = {
+    ecmaVersion: 2024,
+    sourceType: "commonjs",
+};
+
+module.exports = [
+    {
+        ignores: [
+            "dist/",
+            "node_modules/",
+            // Emitted by build.js, not authored here.
+            "src/popup/styles/",
+        ],
+    },
+
+    js.configs.recommended,
+
+    {
+        rules: {
+            // The two rules this config exists for. Both are already
+            // error-level in the recommended set; restated so a future
+            // recommended-set change cannot silently downgrade them.
+            "no-undef": "error",
+            // `_`-prefixed arguments are the deliberate "present for the
+            // interface, unused here" marker: the popup views share one
+            // init(ctx) signature and three of the eight do not read ctx.
+            // An unused catch binding is written `catch {`, which the repo
+            // already does, so caught errors stay checked.
+            "no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
+
+            // Off: it flags `password = null` and `decryptedSecret = null` in
+            // approval.js and confirmTx.js, which are the best-effort wipes of
+            // decrypted key material after use. The assignments are dead by
+            // construction — that is the point of them — and satisfying the
+            // rule would mean deleting the wipes.
+            "no-useless-assignment": "off",
+
+            // Off: it requires every rethrow to carry `{ cause }`. That is a
+            // change to what the wallet's error paths actually throw, which is
+            // not this config's business; adopting it is its own decision.
+            "preserve-caught-error": "off",
+        },
+    },
+
+    // Popup and content scripts: page/window context.
+    {
+        files: ["src/popup/**/*.js", "src/content/**/*.js"],
+        languageOptions: {
+            ...commonjs,
+            globals: { ...globals.browser, ...extensionGlobals },
+        },
+    },
+
+    // MV3 background: a service worker, with no window and no document.
+    {
+        files: ["src/background/**/*.js"],
+        languageOptions: {
+            ...commonjs,
+            globals: { ...globals.serviceworker, ...extensionGlobals },
+        },
+    },
+
+    // src/shared is bundled into both, so it may only use what both provide:
+    // the service worker globals are the intersection, plus the extension APIs.
+    {
+        files: ["src/shared/**/*.js"],
+        languageOptions: {
+            ...commonjs,
+            globals: { ...globals.serviceworker, ...extensionGlobals },
+        },
+    },
+
+    // src/shared/ens.js is the documented exception to the line above: its own
+    // header says POPUP ONLY, it caches in localStorage, and only popup views
+    // require it. Linting it as a service worker would be wrong about the file.
+    {
+        files: ["src/shared/ens.js"],
+        languageOptions: {
+            ...commonjs,
+            globals: { ...globals.browser, ...extensionGlobals },
+        },
+    },
+
+    // Unit tests: jest on node.
+    {
+        files: ["tests/**/*.test.js"],
+        languageOptions: {
+            ...commonjs,
+            globals: { ...globals.node, ...globals.jest },
+        },
+    },
+
+    // The build script is a plain node program.
+    {
+        files: ["build.js"],
+        languageOptions: {
+            ...commonjs,
+            globals: { ...globals.node },
+        },
+    },
+
+    // The e2e harnesses are node programs that also carry, inline, the
+    // callbacks they ship into the browser via page.evaluate — so both
+    // contexts really are present in the same file and both sets of globals
+    // are in scope somewhere in it.
+    {
+        files: ["tests/e2e/**/*.js"],
+        languageOptions: {
+            ...commonjs,
+            globals: {
+                ...globals.node,
+                ...globals.browser,
+                ...extensionGlobals,
+            },
+        },
+    },
+
+    // This config file itself.
+    {
+        files: ["eslint.config.js"],
+        languageOptions: {
+            ...commonjs,
+            globals: { ...globals.node },
+        },
+    },
+];
--- a/package.json
+++ b/package.json
@@ -9,13 +9,16 @@
        "test": "jest --forceExit",
        "test:verbose": "jest --forceExit --verbose",
        "build": "node build.js",
-        "lint": "prettier --check .",
+        "lint": "eslint . && prettier --check .",
        "fmt": "prettier --write .",
        "fmt-check": "prettier --check ."
    },
    "devDependencies": {
+        "@eslint/js": "10.0.1",
        "@tailwindcss/cli": "^4.2.1",
        "esbuild": "^0.27.3",
+        "eslint": "10.8.1",
+        "globals": "17.11.0",
        "jest": "^30.2.0",
        "playwright-core": "1.56.0",
        "prettier": "^3.8.1",
--- a/script/lint
+++ b/script/lint
@@ -1,13 +1,41 @@
 #!/bin/sh
-# script/lint: run the linter.
+# script/lint: run the linter (eslint, then prettier --check).
+#
+# Linting is containerized. ESLint results depend on the ESLint version, and
+# the pinned one is the one in the image; a host's own install must not be
+# able to decide whether this repo is green. From a host this therefore builds
+# the Dockerfile's `lint` stage, which runs this same script inside the image.
+#
+# AUTISTMASK_LINT_NATIVE is set only in that image (see the Dockerfile) and is
+# what stops the recursion, so `make check` inside the CI build lints in place
+# instead of trying to reach a docker daemon it does not have.
 set -eu

 ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"

 main() {
    cd "$ROOT"
+
+    if [ "${AUTISTMASK_LINT_NATIVE:-}" = "1" ]; then
        echo "Linting..."
        yarn run lint 2>&1
+        return 0
+    fi
+
+    if ! command -v docker >/dev/null 2>&1; then
+        echo "lint: docker is required; linting does not run on the host" >&2
+        exit 1
+    fi
+
+    echo "Linting in the pinned container..."
+    # --progress=plain: the default progress renderer collapses the lint
+    # output on success, and a lint run whose output cannot be seen is not
+    # evidence that it ran.
+    #
+    # --output=type=cacheonly: the exit status is the whole result; exporting
+    # an image afterwards costs about ten times the lint itself.
+    docker build --progress=plain --target lint \
+        --output=type=cacheonly . 2>&1
 }

 main "$@"
--- a/script/test-e2e
+++ b/script/test-e2e
@@ -5,8 +5,9 @@
 #
 # Deliberately NOT called by script/check or script/test: REPO_POLICIES.md
 # caps make test at 20 seconds and a browser suite does not fit. Run it
-# yourself before touching popup views; it is the only check that can see
-# a used-but-not-imported identifier blow up at runtime.
+# yourself before touching popup views. ESLint's no-undef now catches a
+# used-but-not-imported identifier in make check, but only this suite sees
+# what a view actually does when it runs.
 set -eu

 ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -39,21 +39,17 @@ const {
    registerAlarmHandlers,
 } = require("../shared/alarms");

-const {
-    actionApi,
-    runtimeApi,
-    storageGet,
-    tabsQuery,
-    tabsSendMessage,
-    windowsApi,
-    windowsCreate,
-    windowsGetLastFocused,
-    windowsRemove,
-} = require("../shared/browserApi");
-
-const runtime = runtimeApi();
-const windowsNs = windowsApi();
-const actionNs = actionApi();
+const storageApi =
+    typeof browser !== "undefined"
+        ? browser.storage.local
+        : chrome.storage.local;
+const runtime =
+    typeof browser !== "undefined" ? browser.runtime : chrome.runtime;
+const windowsApi =
+    typeof browser !== "undefined" ? browser.windows : chrome.windows;
+const tabsApi = typeof browser !== "undefined" ? browser.tabs : chrome.tabs;
+const actionApi =
+    typeof browser !== "undefined" ? browser.browserAction : chrome.action;

 // Connected sites (in-memory, non-persisted): { "origin:address": true }
 const connectedSites = {};
@@ -62,7 +58,7 @@ const connectedSites = {};
 const pendingApprovals = {};

 async function getState() {
-    const result = await storageGet("autistmask");
+    const result = await storageApi.get("autistmask");
    return (
        result.autistmask || {
            wallets: [],
@@ -126,8 +122,8 @@ async function proxyRpc(method, params) {
 }

 function resetPopupUrl() {
-    if (actionNs && typeof actionNs.setPopup === "function") {
-        actionNs.setPopup({ popup: "src/popup/index.html" });
+    if (actionApi && typeof actionApi.setPopup === "function") {
+        actionApi.setPopup({ popup: "src/popup/index.html" });
    }
 }

@@ -183,21 +179,12 @@ function releaseApproval(approval) {
 // Open approval in a separate popup window.
 // This is the primary mechanism for tx/sign approvals (triggered programmatically,
 // not from a user gesture) and the fallback for site-connection approvals.
-// Never rejects. Its callers raise it from inside a Promise executor and drop
-// the result on the floor, so a rejection here would be unhandled.
-async function openApprovalWindow(id) {
+function openApprovalWindow(id) {
    const popupUrl = runtime.getURL("src/popup/index.html?approval=" + id);
    const popupWidth = 360;
    const popupHeight = 600;

-    let currentWin = null;
-    try {
-        currentWin = await windowsGetLastFocused();
-    } catch {
-        // Nothing focused to centre on. The window still opens, at whatever
-        // position the browser picks.
-    }
-
+    windowsApi.getLastFocused((currentWin) => {
        const opts = {
            url: popupUrl,
            type: "popup",
@@ -212,26 +199,12 @@ async function openApprovalWindow(id) {
                currentWin.top + (currentWin.height - popupHeight) / 2,
            );
        }
-
-    let win = null;
-    try {
-        win = await windowsCreate(opts);
-    } catch (e) {
-        // No window means no approval screen and no way for the user to
-        // answer. The request stays pending rather than being settled behind
-        // their back; say so rather than failing silently.
-        log.errorf("could not open the approval window:", e);
-        return;
-    }
-
-    // The id the onRemoved listener matches on to turn a closed window into a
-    // rejection. Guarded because the create() above is a real await now: an
-    // address switch can settle and remove the approval while the window is
-    // opening, and writing the id back would resurrect a bare entry that
-    // nothing would ever resolve.
-    if (win && pendingApprovals[id]) {
+        windowsApi.create(opts, (win) => {
+            if (win) {
                pendingApprovals[id].windowId = win.id;
            }
+        });
+    });
 }

 // Open an approval popup and return a promise that resolves with the user decision.
@@ -241,12 +214,12 @@ function requestApproval(origin, hostname) {
        const id = crypto.randomUUID();
        pendingApprovals[id] = { origin, hostname, resolve };

-        if (actionNs && typeof actionNs.openPopup === "function") {
-            actionNs.setPopup({
+        if (actionApi && typeof actionApi.openPopup === "function") {
+            actionApi.setPopup({
                popup: "src/popup/index.html?approval=" + id,
            });
            try {
-                const result = actionNs.openPopup();
+                const result = actionApi.openPopup();
                if (result && typeof result.catch === "function") {
                    result.catch(() => openApprovalWindow(id));
                }
@@ -308,7 +281,7 @@ function requestSignApproval(origin, hostname, signParams, approvedFrom) {

 // Detect when an approval popup (browser-action) closes without a response.
 // TX and sign approvals now use windows.create() and are handled by the
-// windows.onRemoved listener below, but we still handle site-connection
+// windowsApi.onRemoved listener below, but we still handle site-connection
 // approval disconnects here.
 runtime.onConnect.addListener((port) => {
    if (port.name.startsWith("approval:")) {
@@ -690,26 +663,24 @@ async function handleRpc(method, params, origin) {
 }

 // Broadcast chainChanged to all tabs when the network is switched.
-//
-// Never rejects: its caller is an RPC handler that must answer the page
-// whatever the browser made of the broadcast.
-async function broadcastChainChanged(chainId) {
-    let tabs;
-    try {
-        tabs = await tabsQuery({});
-    } catch {
-        return;
-    }
+function broadcastChainChanged(chainId) {
+    tabsApi.query({}, (tabs) => {
        for (const tab of tabs) {
-        // A tab with no content script has no receiver, and that is the
-        // ordinary case rather than a fault. The rejection it produces is the
-        // promise-shaped form of the runtime.lastError this used to read.
-        tabsSendMessage(tab.id, {
+            tabsApi.sendMessage(
+                tab.id,
+                {
                    type: "AUTISTMASK_EVENT",
                    eventName: "chainChanged",
                    data: chainId,
-        }).catch(() => {});
+                },
+                () => {
+                    if (runtime.lastError) {
+                        // expected for tabs without our content script
                    }
+                },
+            );
+        }
+    });
 }

 // Broadcast accountsChanged to all tabs, respecting per-address permissions
@@ -734,21 +705,18 @@ async function broadcastAccountsChanged() {
                : { approved: false, remember: false };
        if (!settleApproval(id, rejection)) continue;
        if (approval.windowId) {
-            // Rejects when the window has already gone, which is a race the
-            // user wins routinely by closing it themselves.
-            windowsRemove(approval.windowId).catch(() => {});
+            windowsApi.remove(approval.windowId, () => {
+                if (runtime.lastError) {
+                    // window already closed
+                }
+            });
        }
    }
    resetPopupUrl();
    const s = await getState();
    const activeAddress = await getActiveAddress();
    const allowed = activeAddress ? s.allowedSites[activeAddress] || [] : [];
-    let tabs;
-    try {
-        tabs = await tabsQuery({});
-    } catch {
-        return;
-    }
+    tabsApi.query({}, (tabs) => {
        for (const tab of tabs) {
            const origin = tab.url ? new URL(tab.url).origin : "";
            const hostname = extractHostname(origin);
@@ -756,14 +724,22 @@ async function broadcastAccountsChanged() {
                activeAddress &&
                (allowed.includes(hostname) ||
                    connectedSites[origin + ":" + activeAddress]);
-        // Same as chainChanged above: a tab without our content script
-        // rejects, and that is expected rather than a fault.
-        tabsSendMessage(tab.id, {
+            tabsApi.sendMessage(
+                tab.id,
+                {
                    type: "AUTISTMASK_EVENT",
                    eventName: "accountsChanged",
                    data: hasPermission ? [activeAddress] : [],
-        }).catch(() => {});
+                },
+                () => {
+                    // Ignore errors for tabs without content script
+                    if (runtime.lastError) {
+                        // expected for tabs without our content script
                    }
+                },
+            );
+        }
+    });
 }

 // Background balance refresh: every 60 seconds when the popup isn't open.
@@ -856,8 +832,8 @@ startBackgroundJobs();
 // window is an ordinary event with an attempt already in flight behind it.
 // settleApproval() refuses those, which leaves the attempt to report its real
 // outcome to the page.
-if (windowsNs && windowsNs.onRemoved) {
-    windowsNs.onRemoved.addListener((windowId) => {
+if (windowsApi && windowsApi.onRemoved) {
+    windowsApi.onRemoved.addListener((windowId) => {
        for (const [id, approval] of Object.entries(pendingApprovals)) {
            if (approval.windowId !== windowId) continue;
            const rejection =
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -1,20 +1,12 @@
 // AutistMask content script — bridges between inpage (window.ethereum)
 // and the background service worker via extension messaging.

-const {
-    hasBrowserNamespace,
-    runtimeApi,
-    sendMessage,
-    storageGet,
-    storageSet,
-} = require("../shared/browserApi");
-
 // In Chrome (MV3), inpage.js runs as a MAIN-world content script declared
 // in the manifest, so no injection is needed here.  In Firefox (MV2), the
 // "world" key is not supported, so we inject via a <script> tag.
-if (hasBrowserNamespace()) {
+if (typeof browser !== "undefined") {
    const script = document.createElement("script");
-    script.src = runtimeApi().getURL("src/content/inpage.js");
+    script.src = browser.runtime.getURL("src/content/inpage.js");
    script.onload = function () {
        this.remove();
    };
@@ -22,27 +14,23 @@ if (hasBrowserNamespace()) {
 }

 // Send the persisted EIP-6963 provider UUID to the inpage script.
-// Generated once at install time and stored in extension storage.
-(async function sendProviderUuid() {
-    let uuid = null;
-    try {
-        const items = await storageGet("eip6963Uuid");
-        uuid = items?.eip6963Uuid;
+// Generated once at install time and stored in chrome.storage.local.
+(function sendProviderUuid() {
+    const storage =
+        typeof browser !== "undefined"
+            ? browser.storage.local
+            : chrome.storage.local;
+    storage.get("eip6963Uuid", (items) => {
+        let uuid = items?.eip6963Uuid;
        if (!uuid) {
            uuid = crypto.randomUUID();
-            await storageSet({ eip6963Uuid: uuid });
-        }
-    } catch {
-        // Storage was unavailable or refused the write. The announcement
-        // still has to go out — a provider that never announces is invisible
-        // to every EIP-6963 dApp — so it goes under a fresh uuid that this
-        // page load will not outlive.
-        if (!uuid) uuid = crypto.randomUUID();
+            storage.set({ eip6963Uuid: uuid });
        }
        window.postMessage(
            { type: "AUTISTMASK_PROVIDER_UUID", uuid },
            location.origin,
        );
+    });
 })();

 // Relay requests from the page to the background script
@@ -51,31 +39,27 @@ window.addEventListener("message", (event) => {
    if (event.data?.type !== "AUTISTMASK_REQUEST") return;
    const { id, method, params } = event.data;

-    sendMessage({
-        type: "AUTISTMASK_RPC",
-        id,
-        method,
-        params,
-        origin: location.origin,
-    })
-        .then((response) => {
+    const runtime =
+        typeof browser !== "undefined" ? browser.runtime : chrome.runtime;
+
+    runtime.sendMessage(
+        { type: "AUTISTMASK_RPC", id, method, params, origin: location.origin },
+        (response) => {
            if (response) {
                window.postMessage(
                    { type: "AUTISTMASK_RESPONSE", id, ...response },
                    "*",
                );
            }
-        })
-        .catch(() => {
-            // No receiver: the background context is gone. The page's promise
-            // stays pending, which is what it did before this was a promise
-            // at all; turning it into a rejection here is a change to what
-            // dApps see and belongs to its own issue.
-        });
+        },
+    );
 });

 // Listen for events pushed from the background (e.g. accountsChanged)
-runtimeApi().onMessage.addListener((msg) => {
+const runtime =
+    typeof browser !== "undefined" ? browser.runtime : chrome.runtime;
+
+runtime.onMessage.addListener((msg) => {
    if (msg.type === "AUTISTMASK_EVENT") {
        window.postMessage(
            {
--- a/src/content/inpage.js
+++ b/src/content/inpage.js
@@ -79,7 +79,7 @@
        for (const cb of cbs) {
            try {
                cb(data);
-            } catch (e) {
+            } catch {
                // ignore listener errors
            }
        }
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -9,16 +9,16 @@ const {
    $,
    showView,
    updateDebugBanner,
-    setRenderMain,
+    setBackRenderer,
    pushCurrentView,
    goBack,
-    clearViewStack,
 } = require("./views/helpers");
 const { applyTheme } = require("./theme");
-// Views that can be fully re-rendered from persisted state. All others fall
-// back to the nearest restorable parent; see the module for why the
-// secret-bearing views are absent.
-const { RESTORABLE_VIEWS } = require("./restorableViews");
+// Renders a view the popup lands on without having navigated to it forward:
+// on restore here, and on Back. Only the views that can be fully re-rendered
+// from persisted state (RESTORABLE_VIEWS, src/popup/restorableViews.js) go
+// through it; anything else falls back to the nearest restorable parent.
+const { renderView, makeBackRenderer } = require("./viewRouter");

 const home = require("./views/home");
 const welcome = require("./views/welcome");
@@ -108,92 +108,23 @@ const ctx = {
    },
 };

-function needsAddress(view) {
-    return (
-        view === "address" ||
-        view === "address-token" ||
-        view === "receive" ||
-        view === "transaction"
-    );
-}
-
-function hasValidAddress() {
-    return (
-        state.selectedWallet !== null &&
-        state.selectedAddress !== null &&
-        state.wallets[state.selectedWallet] &&
-        state.wallets[state.selectedWallet].addresses[state.selectedAddress]
-    );
-}
+// The view modules the router renders through, keyed as it expects them.
+const viewModules = {
+    main: { show: () => fallbackView() },
+    addressDetail,
+    addressToken,
+    receive,
+    settings,
+    settingsAddToken,
+    confirmTx,
+    transactionDetail,
+    txStatus,
+};

 function restoreView() {
-    const view = state.currentView;
-    if (!view || !RESTORABLE_VIEWS.has(view)) {
-        return fallbackView();
-    }
-
-    if (needsAddress(view) && !hasValidAddress()) {
-        return fallbackView();
-    }
-
-    if (view === "address-token" && !state.selectedToken) {
-        return fallbackView();
-    }
-
-    switch (view) {
-        case "address":
-            addressDetail.show();
-            break;
-        case "address-token":
-            addressToken.show();
-            break;
-        case "receive":
-            receive.show();
-            break;
-        case "settings":
-            settings.show();
-            break;
-        case "settings-addtoken":
-            settingsAddToken.show();
-            break;
-        case "confirm-tx":
-            if (state.viewData && state.viewData.pendingTx) {
-                confirmTx.restore();
-            } else {
+    if (!renderView(state.currentView, state, viewModules)) {
        fallbackView();
    }
-            break;
-        case "transaction":
-            if (state.viewData && state.viewData.tx) {
-                transactionDetail.render();
-            } else {
-                fallbackView();
-            }
-            break;
-        case "wait-tx":
-            // Resumes the receipt poll from the persisted broadcast time.
-            if (!txStatus.restoreWait()) {
-                fallbackView();
-            }
-            break;
-        case "success-tx":
-            if (state.viewData && state.viewData.hash) {
-                txStatus.renderSuccess();
-            } else {
-                fallbackView();
-            }
-            break;
-        case "error-tx":
-            if (state.viewData && state.viewData.message) {
-                txStatus.renderError();
-            } else {
-                fallbackView();
-            }
-            break;
-        default:
-            fallbackView();
-            break;
-    }
 }

 function fallbackView() {
@@ -247,7 +178,7 @@ async function init() {
        settings.show();
    });

-    setRenderMain(renderWalletList);
+    setBackRenderer(makeBackRenderer(state, viewModules));

    welcome.init(ctx);
    addWallet.init(ctx);
--- a/src/popup/viewRouter.js
+++ b/src/popup/viewRouter.js
@@ -0,0 +1,167 @@
+// Rendering a view the popup lands on without having navigated to it
+// forward: on restore, and on Back. In both cases the view may never have
+// been rendered in this page load — a reopened popup renders only the
+// wallet list and the view it restores onto, so every other view is still
+// the blank static template from index.html — so unhiding it is not enough.
+//
+// Forward navigation renders as it goes and must NOT come through here:
+// rendering a second time would re-fetch and clobber whatever the view has
+// in flight.
+//
+// The view modules are injected and nothing here touches the DOM, so the
+// dispatch and its data guards can be tested directly; src/popup/index.js
+// cannot be required outside a browser.
+
+const { RESTORABLE_VIEWS } = require("./restorableViews");
+
+// The views this page load has rendered.
+//
+// The Back path cannot otherwise tell its two cases apart. A view the popup
+// never rendered is still the blank template from index.html and has to be
+// rendered; a view already on the page must NOT be rendered again, because
+// a second render re-fetches and overwrites whatever the user has typed
+// into it and not yet saved.
+//
+// Registration is showView() in views/helpers.js, which is the last thing
+// every render path runs — restoreView()'s, the Back path's, and every
+// forward show(). That is the point of putting it there rather than in the
+// individual views: a view added later registers itself with no one having
+// to remember it, so this cannot decay.
+//
+// Module scope is page-load scope: the popup loads this module once per
+// page load, and a reopened popup gets a fresh, empty set — which is
+// exactly the state that makes the Back path render.
+const renderedViews = new Set();
+
+function markViewRendered(view) {
+    if (view) renderedViews.add(view);
+}
+
+// Begin a fresh page-load scope. The popup gets one by being loaded; the
+// unit tests, which simulate several page loads against one module
+// instance, ask for one.
+function resetRenderedViews() {
+    renderedViews.clear();
+}
+
+// Home is the exception: Back re-renders it every time, which is what the
+// popup did before this router existed (index.js registered
+// renderWalletList() as setRenderMain(), and goBack() called it on every
+// Back onto "main"). It must stay that way — the wallet list has to reflect
+// what changed while the user was away from it, such as a wallet renamed or
+// an address removed in Settings — and Home holds no unsaved input to lose.
+const ALWAYS_RENDER_ON_BACK = new Set(["main"]);
+
+// Views that render an address the user picked and cannot be rendered
+// without one.
+const ADDRESS_VIEWS = new Set([
+    "address",
+    "address-token",
+    "receive",
+    "transaction",
+]);
+
+function needsAddress(view) {
+    return ADDRESS_VIEWS.has(view);
+}
+
+function hasValidAddress(state) {
+    return Boolean(
+        state.selectedWallet !== null &&
+        state.selectedAddress !== null &&
+        state.wallets[state.selectedWallet] &&
+        state.wallets[state.selectedWallet].addresses[state.selectedAddress],
+    );
+}
+
+// Render `view` from persisted state. Each view module shows itself, so a
+// true return means the view is both rendered and on screen.
+//
+// Returns false when the view is not one the popup renders from state, or
+// when the state it would render is gone — a token no longer selected, a
+// transaction no longer persisted. The caller falls back rather than
+// putting an empty template on screen.
+function renderView(view, state, views) {
+    if (!view || !RESTORABLE_VIEWS.has(view)) return false;
+    if (needsAddress(view) && !hasValidAddress(state)) return false;
+    if (view === "address-token" && !state.selectedToken) return false;
+
+    const data = state.viewData || {};
+    switch (view) {
+        case "main":
+            views.main.show();
+            return true;
+        case "address":
+            views.addressDetail.show();
+            return true;
+        case "address-token":
+            views.addressToken.show();
+            return true;
+        case "receive":
+            views.receive.show();
+            return true;
+        case "settings":
+            views.settings.show();
+            return true;
+        case "settings-addtoken":
+            views.settingsAddToken.show();
+            return true;
+        case "confirm-tx":
+            if (!data.pendingTx) return false;
+            views.confirmTx.restore();
+            return true;
+        case "transaction":
+            if (!data.tx) return false;
+            views.transactionDetail.render();
+            return true;
+        case "wait-tx":
+            // Resumes the receipt poll from the persisted broadcast time,
+            // and answers false when there is nothing resumable left.
+            return Boolean(views.txStatus.restoreWait());
+        case "success-tx":
+            if (!data.hash) return false;
+            views.txStatus.renderSuccess();
+            return true;
+        case "error-tx":
+            if (!data.message) return false;
+            views.txStatus.renderError();
+            return true;
+        default:
+            return false;
+    }
+}
+
+// The Back-path renderer, registered with setBackRenderer() in
+// views/helpers.js.
+//
+// Returns false — leaving goBack() to unhide the view, as it always did —
+// in the two cases where the view is known to be on the page already:
+//
+//   - It is not one the popup renders from persisted state. The restored
+//     stack is filtered against RESTORABLE_VIEWS, so such a view can only
+//     be on the stack from this page load, where forward navigation
+//     rendered it on the way in.
+//   - This page load has rendered it. Re-rendering would re-fetch and
+//     clobber what it holds; Home is rendered anyway, see above.
+//
+// What is left is the case the router exists for: a view on the stack that
+// this page load has never rendered, whose template is still blank.
+function makeBackRenderer(state, views) {
+    return function renderBack(view) {
+        if (!RESTORABLE_VIEWS.has(view)) return false;
+        if (renderedViews.has(view) && !ALWAYS_RENDER_ON_BACK.has(view)) {
+            return false;
+        }
+        if (!renderView(view, state, views)) {
+            views.main.show();
+        }
+        return true;
+    };
+}
+
+module.exports = {
+    renderView,
+    makeBackRenderer,
+    markViewRendered,
+    resetRenderedViews,
+};
--- a/src/popup/views/addWallet.js
+++ b/src/popup/views/addWallet.js
@@ -194,7 +194,7 @@ async function importPrivateKey(ctx) {
    let addr;
    try {
        addr = addressFromPrivateKey(key);
-    } catch (e) {
+    } catch {
        showFlash("Invalid private key.");
        return;
    }
@@ -246,7 +246,7 @@ async function importXprvKey(ctx) {
    let result;
    try {
        result = hdWalletFromXprv(xprv);
-    } catch (e) {
+    } catch {
        showFlash(
            "That extended private key is not valid. Please check it and try again.",
        );
--- a/src/popup/views/addressDetail.js
+++ b/src/popup/views/addressDetail.js
@@ -12,7 +12,7 @@ const {
    goBack,
    pushCurrentView,
 } = require("./helpers");
-const { state, currentAddress, saveState } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const { formatUsd, getAddressValueUsd } = require("../../shared/prices");
 const {
    fetchRecentTransactions,
@@ -44,7 +44,6 @@ function show() {
    state.selectedToken = null;
    const wallet = state.wallets[state.selectedWallet];
    const addr = wallet.addresses[state.selectedAddress];
-    const wi = state.selectedWallet;
    const ai = state.selectedAddress;
    $("address-title").textContent =
        wallet.name + " \u2014 Address " + (ai + 1);
@@ -246,7 +245,6 @@ function renderTransactions(txs) {
        row.addEventListener("click", () => {
            const idx = parseInt(row.dataset.tx, 10);
            const tx = loadedTxs[idx];
-            const counterparty = tx.direction === "sent" ? tx.to : tx.from;
            tx.fromEns = ensNameMap.get(tx.from) || null;
            tx.toEns = ensNameMap.get(tx.to) || null;
            ctx.showTransactionDetail(tx);
--- a/src/popup/views/addressToken.js
+++ b/src/popup/views/addressToken.js
@@ -16,13 +16,9 @@ const {
    goBack,
    pushCurrentView,
 } = require("./helpers");
-const { state, currentAddress, saveState } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const { TOKEN_BY_ADDRESS, resolveSymbol } = require("../../shared/tokenList");
-const {
-    formatUsd,
-    getPrice,
-    getAddressValueUsd,
-} = require("../../shared/prices");
+const { formatUsd, getPrice } = require("../../shared/prices");
 const {
    fetchRecentTransactions,
    filterTransactions,
--- a/src/popup/views/approval.js
+++ b/src/popup/views/approval.js
@@ -9,7 +9,7 @@ const {
    attachCopyHandlers,
    onViewLeave,
 } = require("./helpers");
-const { state, saveState, currentNetwork } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const { networkByChainId } = require("../../shared/networks");
 const {
    formatEther,
@@ -27,7 +27,8 @@ const { walletDefect } = require("../../shared/walletDefects");
 const { describeSigningFailure } = require("../../shared/approvalVerify");
 const txStatus = require("./txStatus");
 const uniswap = require("../../shared/uniswap");
-const { notify, runtimeApi, sendMessage } = require("../../shared/browserApi");
+const runtime =
+    typeof browser !== "undefined" ? browser.runtime : chrome.runtime;

 const erc20Iface = new Interface(ERC20_ABI);

@@ -438,20 +439,10 @@ function showSignApproval(details) {
    );
 }

-// Awaited by nobody: the popup entry point calls this and moves on. It
-// therefore has to absorb its own failure, and a background that cannot
-// describe the approval is the same outcome as an approval that is gone.
-async function show(id) {
+function show(id) {
    approvalId = id;
-    runtimeApi().connect({ name: "approval:" + id });
-
-    let details = null;
-    try {
-        details = await sendMessage({ type: "AUTISTMASK_GET_APPROVAL", id });
-    } catch {
-        details = null;
-    }
-
+    runtime.connect({ name: "approval:" + id });
+    runtime.sendMessage({ type: "AUTISTMASK_GET_APPROVAL", id }, (details) => {
        if (!details) {
            window.close();
            return;
@@ -470,9 +461,12 @@ async function show(id) {
            details.isPhishingDomain,
        );
        $("approve-hostname").textContent = details.hostname;
-    $("approve-address").innerHTML = approvalAddressHtml(state.activeAddress);
+        $("approve-address").innerHTML = approvalAddressHtml(
+            state.activeAddress,
+        );
        attachCopyHandlers("view-approve-site");
        $("approve-remember").checked = state.rememberSiteChoice;
+    });
 }

 let approvalId = null;
@@ -543,7 +537,7 @@ function clearSignPassword() {
    hideError("approve-sign-error");
 }

-function init(ctx) {
+function init(_ctx) {
    onViewLeave("approve-tx", clearTxPassword);
    onViewLeave("approve-sign", clearSignPassword);

@@ -554,7 +548,7 @@ function init(ctx) {

    $("btn-approve").addEventListener("click", () => {
        const remember = $("approve-remember").checked;
-        notify({
+        runtime.sendMessage({
            type: "AUTISTMASK_APPROVAL_RESPONSE",
            id: approvalId,
            approved: true,
@@ -565,7 +559,7 @@ function init(ctx) {

    $("btn-reject").addEventListener("click", () => {
        const remember = $("approve-remember").checked;
-        notify({
+        runtime.sendMessage({
            type: "AUTISTMASK_APPROVAL_RESPONSE",
            id: approvalId,
            approved: false,
@@ -654,16 +648,7 @@ function init(ctx) {
            decryptedSecret = null;
        }

-        // A send that never reaches the background is reported to the user
-        // the same way a background that refused it is: describeSigningFailure
-        // turns a null response into the generic message below.
-        let response = null;
-        try {
-            response = await sendMessage(payload);
-        } catch {
-            response = null;
-        }
-
+        runtime.sendMessage(payload, (response) => {
            if (response && response.txHash) {
                txStatus.showWait(pendingTxDetails, response.txHash);
                return;
@@ -682,9 +667,10 @@ function init(ctx) {
                txStatus.showError(pendingTxDetails, null, outcome.message);
            }
        });
+    });

    $("btn-reject-tx").addEventListener("click", () => {
-        notify({
+        runtime.sendMessage({
            type: "AUTISTMASK_TX_RESPONSE",
            id: approvalId,
            approved: false,
@@ -778,13 +764,7 @@ function init(ctx) {
            decryptedSecret = null;
        }

-        let response = null;
-        try {
-            response = await sendMessage(payload);
-        } catch {
-            response = null;
-        }
-
+        runtime.sendMessage(payload, (response) => {
            if (response && response.signature) {
                window.close();
                return;
@@ -800,9 +780,10 @@ function init(ctx) {
            showError("approve-sign-error", outcome.message);
            if (outcome.retryable) setSignButtonBusy(false);
        });
+    });

    $("btn-reject-sign").addEventListener("click", () => {
-        notify({
+        runtime.sendMessage({
            type: "AUTISTMASK_SIGN_RESPONSE",
            id: approvalId,
            approved: false,
--- a/src/popup/views/confirmTx.js
+++ b/src/popup/views/confirmTx.js
@@ -2,20 +2,12 @@
 // Shows transaction details, warnings, errors. On Sign & Send,
 // reads inline password, decrypts secret, signs and broadcasts.

-const {
-    parseEther,
-    parseUnits,
-    formatEther,
-    formatUnits,
-    Contract,
-} = require("ethers");
+const { parseEther, parseUnits, formatEther, Contract } = require("ethers");
 const {
    $,
    showError,
    hideError,
    showView,
-    showFlash,
-    flashCopyFeedback,
    addressTitle,
    escapeHtml,
    renderAddressHtml,
@@ -23,7 +15,7 @@ const {
    goBack,
    onViewLeave,
 } = require("./helpers");
-const { state, currentNetwork } = require("../../shared/state");
+const { state } = require("../../shared/state");
 const { getSignerForAddress } = require("../../shared/wallet");
 const { decryptWithPassword } = require("../../shared/vault");
 const { formatUsd, getPrice } = require("../../shared/prices");
@@ -399,7 +391,7 @@ function clearPassword() {
    hideError("confirm-tx-password-error");
 }

-function init(ctx) {
+function init(_ctx) {
    onViewLeave("confirm-tx", clearPassword);

    $("btn-confirm-send").addEventListener("click", async () => {
@@ -421,7 +413,7 @@ function init(ctx) {
                wallet.encryptedSecret,
                password,
            );
-        } catch (e) {
+        } catch {
            showError(
                "confirm-tx-password-error",
                "That password is incorrect. Please try again.",
--- a/src/popup/views/deleteWallet.js
+++ b/src/popup/views/deleteWallet.js
@@ -73,7 +73,7 @@ function init(_ctx) {
        // Verify password against the wallet's encrypted data
        try {
            await decryptWithPassword(wallet.encryptedSecret, pw);
-        } catch (_e) {
+        } catch {
            $("delete-wallet-flash").textContent =
                "That password is incorrect. Please try again.";
            $("delete-wallet-flash").style.visibility = "visible";
--- a/src/popup/views/helpers.js
+++ b/src/popup/views/helpers.js
@@ -1,12 +1,9 @@
 // Shared DOM helpers used by all views.

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

 // When views are added, removed, or transitions between them change,
 // update the view-navigation documentation in README.md to match.
@@ -76,6 +73,10 @@ function showView(name) {
    }
    clearFlash();
    state.currentView = name;
+    // A view's show() ends here, so this is where the Back path learns the
+    // view is no longer the blank template from index.html and must not be
+    // rendered a second time. See viewRouter.js.
+    markViewRendered(name);
    saveState();
    updateDebugBanner(name);
 }
@@ -111,12 +112,19 @@ function updateDebugBanner(viewName) {
    }
 }

-// Callback to re-render the main/home view when navigating back to it.
-// Set once by index.js via setRenderMain().
-let _renderMain = null;
+// Callback that renders a view being navigated BACK onto. Set once by
+// index.js via setBackRenderer(), which routes the view through the same
+// per-view render and data guards restoreView() uses.
+//
+// It answers true when it took the navigation — the view is rendered and
+// shown, or its backing data was gone and it fell back — and false for a
+// view the popup does not render from persisted state. Those can only be
+// on the stack from this page load, because the stack is filtered on load,
+// so they have already been rendered and only need unhiding.
+let _renderBack = null;

-function setRenderMain(fn) {
-    _renderMain = fn;
+function setBackRenderer(fn) {
+    _renderBack = fn;
 }

 // Push the current view onto the navigation stack so goBack() can
@@ -136,9 +144,11 @@ function goBack() {
    } else {
        target = "main";
    }
-    if (target === "main" && _renderMain) {
-        _renderMain();
-    }
+    // A popped view is landed on, not navigated to. If the popup has been
+    // closed and reopened since the view was pushed, nothing has ever
+    // rendered it in this page load and its template is still blank, so it
+    // has to be rendered here rather than merely unhidden.
+    if (_renderBack && _renderBack(target)) return;
    showView(target);
 }

@@ -470,7 +480,7 @@ module.exports = {
    showView,
    onViewLeave,
    updateDebugBanner,
-    setRenderMain,
+    setBackRenderer,
    pushCurrentView,
    goBack,
    clearViewStack,
--- a/src/popup/views/home.js
+++ b/src/popup/views/home.js
@@ -2,7 +2,6 @@ const {
    $,
    showView,
    showFlash,
-    flashCopyFeedback,
    balanceLinesForAddress,
    isoDate,
    timeAgo,
@@ -15,7 +14,6 @@ const {
    pushCurrentView,
 } = require("./helpers");
 const { state, saveState, currentAddress } = require("../../shared/state");
-const { notify } = require("../../shared/browserApi");
 const {
    updateSendBalance,
    renderSendTokenSelect,
@@ -294,7 +292,11 @@ function render(ctx) {
                state.activeAddress = addr;
                await saveState();
                render(ctx);
-                notify({ type: "AUTISTMASK_ACTIVE_CHANGED" });
+                const runtime =
+                    typeof browser !== "undefined"
+                        ? browser.runtime
+                        : chrome.runtime;
+                runtime.sendMessage({ type: "AUTISTMASK_ACTIVE_CHANGED" });
            }
        });
    });
--- a/src/popup/views/receive.js
+++ b/src/popup/views/receive.js
@@ -57,7 +57,7 @@ function show() {
    attachCopyHandlers("view-receive");
 }

-function init(ctx) {
+function init(_ctx) {
    $("btn-receive-copy").addEventListener("click", () => {
        const addr = $("receive-address-block").dataset.full;
        if (addr) {
--- a/src/popup/views/send.js
+++ b/src/popup/views/send.js
@@ -4,7 +4,6 @@ const {
    $,
    showFlash,
    addressTitle,
-    escapeHtml,
    renderAddressHtml,
    attachCopyHandlers,
    goBack,
@@ -210,7 +209,7 @@ function init(_ctx) {
                }
                resolvedTo = resolved;
                ensName = to;
-            } catch (e) {
+            } catch {
                showFlash("Failed to resolve ENS name.");
                return;
            }
--- a/src/popup/views/settings.js
+++ b/src/popup/views/settings.js
@@ -14,7 +14,6 @@ const {
    parseDustThresholdGwei,
 } = require("../dustThreshold");
 const { state, saveState, currentNetwork } = require("../../shared/state");
-const { NETWORKS, SUPPORTED_CHAIN_IDS } = require("../../shared/networks");
 const { onChainSwitch } = require("../../shared/chainSwitch");
 const { log, debugFetch, setRuntimeDebug } = require("../../shared/log");
 const deleteWallet = require("./deleteWallet");
@@ -29,7 +28,8 @@ const {
    GITEA_COMMIT_URL,
 } = require("../../shared/buildInfo");

-const { notify } = require("../../shared/browserApi");
+const runtime =
+    typeof browser !== "undefined" ? browser.runtime : chrome.runtime;

 let versionClickCount = 0;
 let versionClickTimer = null;
@@ -60,7 +60,7 @@ function renderSiteList(containerId, siteMap, stateKey) {
                }
            }
            await saveState();
-            notify({ type: "AUTISTMASK_REMOVE_SITE" });
+            runtime.sendMessage({ type: "AUTISTMASK_REMOVE_SITE" });
            renderSiteList(containerId, state[key], key);
        });
    });
--- a/src/popup/views/transactionDetail.js
+++ b/src/popup/views/transactionDetail.js
@@ -23,8 +23,6 @@ const makeBlockie = require("ethereum-blockies-base64");
 const { log, debugFetch } = require("../../shared/log");
 const { decodeCalldata } = require("./approval");

-let ctx;
-
 /**
 * Determine a human-readable transaction type string from tx fields.
 */
@@ -166,7 +164,7 @@ function render() {
        if (el) el.classList.add("hidden");
    }

-    loadFullTxDetails(tx.hash, tx.to, tx.isContractCall);
+    loadFullTxDetails(tx.hash, tx.to);

    const isoStr = isoDate(tx.timestamp);
    $("tx-detail-time").innerHTML =
@@ -274,7 +272,7 @@ function populateOnChainDetails(txData) {
    }
 }

-async function loadFullTxDetails(txHash, toAddress, isContractCall) {
+async function loadFullTxDetails(txHash, toAddress) {
    const section = $("tx-detail-calldata-section");
    const actionEl = $("tx-detail-calldata-action");
    const detailsEl = $("tx-detail-calldata-details");
@@ -349,8 +347,9 @@ async function loadFullTxDetails(txHash, toAddress, isContractCall) {
    }
 }

+// The ctx this view is initialized with is unused: this module is the leaf of
+// the navigation, and the other views reach it through their own ctx.
 function init(_ctx) {
-    ctx = _ctx;
    $("btn-tx-back").addEventListener("click", () => {
        goBack();
    });
--- a/src/popup/views/txStatus.js
+++ b/src/popup/views/txStatus.js
@@ -12,7 +12,7 @@ const {
    clearViewStack,
 } = require("./helpers");
 const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
-const { state, saveState, currentNetwork } = require("../../shared/state");
+const { state, currentNetwork } = require("../../shared/state");
 const { getProvider } = require("../../shared/balances");
 const { log } = require("../../shared/log");

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

-function etherscanTokenLink(address) {
-    return `${currentNetwork().explorerUrl}/token/${address}`;
-}
-
 function decodedDetailsHtml(decoded) {
    if (!decoded || !decoded.details) return "";
    let html = `<div class="border border-border border-dashed p-2 mb-3">`;
--- a/src/shared/alarms.js
+++ b/src/shared/alarms.js
@@ -19,8 +19,6 @@
 // be bypassed on the scheduled tick — see backgroundRefresh() in
 // src/background/index.js and updatePhishingList() in shared/phishingDomains.js.

-const { alarmsApi } = require("./browserApi");
-
 const BALANCE_REFRESH_ALARM = "autistmask-balance-refresh";
 const PHISHING_REFRESH_ALARM = "autistmask-phishing-refresh";

@@ -28,10 +26,14 @@ const MIN_ALARM_PERIOD_MINUTES = 1;
 const BALANCE_REFRESH_PERIOD_MINUTES = 1;
 const PHISHING_REFRESH_PERIOD_MINUTES = 24 * 60;

-// alarmsApi() resolves on use rather than at module load: the worker is torn
+// Resolved on use rather than captured at module load: the worker is torn
 // down and re-evaluated repeatedly, and tests install a stub after requiring
-// this module. It returns null where the API is absent, which is why every
-// entry point below degrades instead of throwing.
+// the module.
+function alarmsApi() {
+    if (typeof browser !== "undefined" && browser.alarms) return browser.alarms;
+    if (typeof chrome !== "undefined" && chrome.alarms) return chrome.alarms;
+    return null;
+}

 /**
 * Create an alarm unless one with the requested period already exists.
--- a/src/shared/browserApi.js
+++ b/src/shared/browserApi.js
@@ -1,245 +0,0 @@
-// The one place in this tree that names `browser` or `chrome`.
-//
-// The two targets do not agree on either the namespace or the call shape.
-// Chrome MV3 exposes `chrome.*`, where tabs, windows and messaging take a
-// trailing callback and report failure through the global
-// `chrome.runtime.lastError`. Firefox MV2 exposes `browser.*`, where those
-// same methods return promises and take no callback at all — a function
-// passed where an options argument is expected is simply never invoked, so
-// the call looks like it succeeded and silently never completes. Resolving
-// the namespace with a ternary and then calling it Chrome-style, which is
-// what this codebase used to do, is broken on Firefox in exactly that way:
-// see https://git.eeqj.de/sneak/AutistMask/issues/153.
-//
-// The strategy is promises out, everywhere. Callers `await`; nothing outside
-// this file has to know which browser it is running on.
-//
-// Two deliberate asymmetries, because they are what the browsers actually do
-// rather than what a uniform-looking shim would pretend:
-//
-//  - Storage is called in its PROMISE form on both namespaces.
-//    `chrome.storage.local.get()` returns a promise on MV3 and the popup
-//    already depends on that — src/shared/state.js has always awaited it, and
-//    that is precisely why the Firefox popup flows work today while
-//    everything in the issue above does not. Wrapping it in a callback here
-//    would be a change, not a fix.
-//  - notify() sends without a callback. It is for a message whose answer
-//    nobody reads; appending a callback would only manufacture a
-//    lastError/rejection for a receiver that was never expected to reply.
-//
-// Everything is resolved on use rather than captured at module load. The MV3
-// service worker is torn down and re-evaluated repeatedly, and the unit
-// suite installs its stubs on `global.chrome` around a require().
-
-// The extension API namespace, preferring `browser.*` where it exists.
-//
-// Whole-namespace, never per-method: mixing `browser.tabs` with
-// `chrome.windows` would also mix promise and callback semantics inside a
-// single call path, which is the bug this module exists to remove.
-function extensionApi() {
-    if (typeof browser !== "undefined" && browser) return browser;
-    if (typeof chrome !== "undefined" && chrome) return chrome;
-    return null;
-}
-
-// True when the resolved namespace is the promise-flavoured one.
-//
-// It doubles as "this is the Gecko/MV2 build", which is a second question
-// with the same answer and one real caller: src/content/index.js has to
-// inject the inpage provider itself there, because MV2 has no
-// `"world": "MAIN"` for a manifest-declared content script.
-function hasBrowserNamespace() {
-    return typeof browser !== "undefined" && !!browser;
-}
-
-function namespaceMember(name) {
-    const api = extensionApi();
-    return (api && api[name]) || null;
-}
-
-function runtimeApi() {
-    return namespaceMember("runtime");
-}
-
-function tabsApi() {
-    return namespaceMember("tabs");
-}
-
-function windowsApi() {
-    return namespaceMember("windows");
-}
-
-function alarmsApi() {
-    return namespaceMember("alarms");
-}
-
-// The toolbar button. MV3 calls it `action`, MV2 calls it `browserAction`.
-function actionApi() {
-    const api = extensionApi();
-    if (!api) return null;
-    return api.action || api.browserAction || null;
-}
-
-// `storage.local`, or null in a context that has no storage permission. Null
-// rather than a throw because two callers degrade rather than fail on it.
-function storageLocal() {
-    const storage = namespaceMember("storage");
-    return (storage && storage.local) || null;
-}
-
-// The Chrome-only error channel. Never populated for a `browser.*` call,
-// which is why the checks that used to guard callbacks in the background are
-// gone: on this side it becomes a rejection, and on the other side there was
-// never anything to read.
-function lastError() {
-    const runtime = runtimeApi();
-    return (runtime && runtime.lastError) || null;
-}
-
-// Call `owner[method](...args)` and return a promise for its result.
-//
-// On the promise namespace the method already returns one. On the callback
-// namespace the callback is appended here and lastError becomes a rejection,
-// because a caller holding a promise has nowhere to check a global flag.
-function invoke(owner, method, ...args) {
-    if (!owner || typeof owner[method] !== "function") {
-        return Promise.reject(
-            new Error(
-                "extension API " +
-                    method +
-                    "() is not available in this context",
-            ),
-        );
-    }
-    if (hasBrowserNamespace()) {
-        try {
-            return Promise.resolve(owner[method](...args));
-        } catch (e) {
-            return Promise.reject(e);
-        }
-    }
-    return new Promise((resolve, reject) => {
-        owner[method](...args, (result) => {
-            const err = lastError();
-            if (err) reject(new Error(err.message || String(err)));
-            else resolve(result);
-        });
-    });
-}
-
-/**
- * Send a message to the extension's own contexts and resolve with the reply.
- *
- * Rejects when nothing is listening, on both browsers. A caller that does not
- * care must say so — see notify().
- *
- * @param {Object} message
- * @returns {Promise<*>} the receiver's response.
- */
-function sendMessage(message) {
-    return invoke(runtimeApi(), "sendMessage", message);
-}
-
-/**
- * Send a message nobody is expected to answer, and swallow the fact that
- * nobody did.
- *
- * @param {Object} message
- * @returns {void}
- */
-function notify(message) {
-    const runtime = runtimeApi();
-    if (!runtime || typeof runtime.sendMessage !== "function") return;
-    const result = runtime.sendMessage(message);
-    // MV3 hands back a promise for a one-argument send, and it rejects when
-    // the background is not listening. Unhandled, that surfaces as an error
-    // the e2e suites fail the run on.
-    if (result && typeof result.catch === "function") result.catch(() => {});
-}
-
-/**
- * @param {string|string[]|Object} keys
- * @returns {Promise<Object>} the stored items, or {} where storage is absent.
- */
-function storageGet(keys) {
-    const storage = storageLocal();
-    if (!storage) return Promise.resolve({});
-    return Promise.resolve(storage.get(keys));
-}
-
-/**
- * @param {Object} items
- * @returns {Promise<void>}
- */
-function storageSet(items) {
-    const storage = storageLocal();
-    if (!storage) return Promise.resolve();
-    return Promise.resolve(storage.set(items));
-}
-
-/**
- * @param {Object} queryInfo
- * @returns {Promise<Array>} the matching tabs.
- */
-function tabsQuery(queryInfo) {
-    return invoke(tabsApi(), "query", queryInfo);
-}
-
-/**
- * Send a message to one tab's content script.
- *
- * Rejects for a tab that has no receiver, which is most of them. That
- * rejection is the promise-shaped replacement for the runtime.lastError
- * checks the broadcast helpers used to make, and callers ignore it the same
- * way.
- *
- * @param {number} tabId
- * @param {Object} message
- * @returns {Promise<*>}
- */
-function tabsSendMessage(tabId, message) {
-    return invoke(tabsApi(), "sendMessage", tabId, message);
-}
-
-/**
- * @param {Object} createData
- * @returns {Promise<Object>} the created window.
- */
-function windowsCreate(createData) {
-    return invoke(windowsApi(), "create", createData);
-}
-
-/**
- * @returns {Promise<Object>} the last focused window.
- */
-function windowsGetLastFocused() {
-    return invoke(windowsApi(), "getLastFocused");
-}
-
-/**
- * @param {number} windowId
- * @returns {Promise<void>}
- */
-function windowsRemove(windowId) {
-    return invoke(windowsApi(), "remove", windowId);
-}
-
-module.exports = {
-    actionApi,
-    alarmsApi,
-    extensionApi,
-    hasBrowserNamespace,
-    notify,
-    runtimeApi,
-    sendMessage,
-    storageGet,
-    storageLocal,
-    storageSet,
-    tabsApi,
-    tabsQuery,
-    tabsSendMessage,
-    windowsApi,
-    windowsCreate,
-    windowsGetLastFocused,
-    windowsRemove,
-};
--- a/src/shared/phishingDomains.js
+++ b/src/shared/phishingDomains.js
@@ -18,7 +18,6 @@
 // its own refresh — see updatePhishingList().

 const vendoredConfig = require("./phishingBlocklist.json");
-const { storageLocal } = require("./browserApi");

 const BLOCKLIST_URL =
    "https://raw.githubusercontent.com/MetaMask/eth-phishing-detect/main/src/config.json";
@@ -47,10 +46,18 @@ let lastAttemptTime = 0;
 let fetchPromise = null;
 let loadPromise = null;

-// storageLocal() resolves on use rather than at module load, so a test can
-// install a stub after requiring this module, and it returns null where the
-// API is absent — which is why the popup, with no reason to touch the delta,
-// loads fine without it.
+// Resolved on use rather than captured at module load, so a test can install
+// a stub after requiring the module and so the popup — which has no reason to
+// touch the delta — does not fail to load where the API is absent.
+function storageApi() {
+    if (typeof browser !== "undefined" && browser.storage) {
+        return browser.storage.local;
+    }
+    if (typeof chrome !== "undefined" && chrome.storage) {
+        return chrome.storage.local;
+    }
+    return null;
+}

 /**
 * Sanitise a timestamp read back from storage.
@@ -79,7 +86,7 @@ function sanitizeTimestamp(value) {
 * @returns {Promise<void>}
 */
 async function loadDeltaFromStorage() {
-    const storage = storageLocal();
+    const storage = storageApi();
    if (!storage) return;
    try {
        const result = await storage.get(DELTA_STORAGE_KEY);
@@ -115,7 +122,7 @@ function ensureDeltaLoaded() {
 * @returns {Promise<void>}
 */
 async function saveDeltaToStorage() {
-    const storage = storageLocal();
+    const storage = storageApi();
    if (!storage) return;
    try {
        const data = {
--- a/src/shared/prices.js
+++ b/src/shared/prices.js
@@ -21,7 +21,7 @@ async function refreshPrices() {
        const fetched = await getTopTokenPrices(25);
        Object.assign(prices, fetched);
        lastFetchedAt = now;
-    } catch (e) {
+    } catch {
        // prices stay stale on error
    }
 }
--- a/src/shared/state.js
+++ b/src/shared/state.js
@@ -5,7 +5,10 @@ const { networkById } = require("./networks");
 // Dependency-free constant module; safe to pull into a background bundle.
 const { RESTORABLE_VIEWS } = require("../popup/restorableViews");

-const { storageGet, storageSet } = require("./browserApi");
+const storageApi =
+    typeof browser !== "undefined"
+        ? browser.storage.local
+        : chrome.storage.local;

 const DEFAULT_STATE = {
    hasWallet: false,
@@ -111,11 +114,11 @@ async function saveState() {
        viewData: state.viewData,
        viewStack: state.viewStack,
    };
-    await storageSet({ autistmask: persisted });
+    await storageApi.set({ autistmask: persisted });
 }

 async function loadState() {
-    const result = await storageGet("autistmask");
+    const result = await storageApi.get("autistmask");
    if (result.autistmask) {
        const saved = result.autistmask;
        state.wallets = saved.wallets || [];
--- a/src/shared/txValidation.js
+++ b/src/shared/txValidation.js
@@ -82,7 +82,7 @@ function toFixedPoint(value) {
    if (text === "") return null;
    try {
        return parseUnits(text, SCALE_DECIMALS);
-    } catch (e) {
+    } catch {
        return null;
    }
 }
--- a/src/shared/uniswap.js
+++ b/src/shared/uniswap.js
@@ -102,6 +102,11 @@ function decodeV2SwapExactIn(input) {
 // Decode V2_SWAP_EXACT_OUT (command 0x09) input bytes.
 // ABI: (address recipient, uint256 amountOut, uint256 amountInMax,
 //        address[] path, bool payerIsUser)
+//
+// Nothing calls this: decode() has no 0x09 arm, so a V2 exact-out swap gets
+// its command name and no token or amount detail. Kept for the fix, which is
+// https://git.eeqj.de/sneak/AutistMask/issues/283.
+// eslint-disable-next-line no-unused-vars
 function decodeV2SwapExactOut(input) {
    try {
        const d = coder.decode(
--- a/src/shared/vault.js
+++ b/src/shared/vault.js
@@ -57,7 +57,7 @@ async function cryptoBackend() {
    try {
        await WebAssembly.compile(EMPTY_WASM_MODULE);
        return "wasm";
-    } catch (_) {
+    } catch {
        return "asmjs";
    }
 }
--- a/src/shared/walletDelete.js
+++ b/src/shared/walletDelete.js
@@ -1,8 +1,6 @@
 // Wallet and address deletion state transitions, kept out of the views so the
 // selection and broadcast rules are testable without a DOM.

-const { notify } = require("./browserApi");
-
 // Two records of the same address can be stored in different cases, so
 // address equality is never a literal string comparison.
 function sameAddress(a, b) {
@@ -146,7 +144,9 @@ function removeAddressFromState(state, walletIdx, addrIdx) {
 // accountsChanged to connected sites. Same call shape as the address
 // switch in the home view.
 function broadcastActiveChanged() {
-    notify({ type: "AUTISTMASK_ACTIVE_CHANGED" });
+    const runtime =
+        typeof browser !== "undefined" ? browser.runtime : chrome.runtime;
+    runtime.sendMessage({ type: "AUTISTMASK_ACTIVE_CHANGED" });
 }

 module.exports = {
--- a/tests/backNavigation.test.js
+++ b/tests/backNavigation.test.js
@@ -0,0 +1,329 @@
+// Back after reopening the popup (#268).
+//
+// A reopened popup renders the wallet list and the one view it restores
+// onto; every other view is still the blank static template from
+// index.html. goBack() used to only unhide its target, so Back landed on
+// that blank template for any view the popup had not rendered in this page
+// load. These tests drive the real goBack() with the real router wired to
+// recording view modules, so what is asserted is which view render ran —
+// the thing that was missing.
+//
+// The rendering itself is asserted against the real popup in a real
+// browser by tests/e2e/run.js; here the DOM is a stub, because goBack()
+// only needs showView() to work.
+
+const els = new Map();
+
+function fakeEl() {
+    return {
+        textContent: "",
+        innerHTML: "",
+        classList: {
+            toggle() {},
+            add() {},
+            remove() {},
+            contains: () => false,
+        },
+        remove() {},
+    };
+}
+
+globalThis.document = {
+    getElementById(id) {
+        if (!els.has(id)) els.set(id, fakeEl());
+        return els.get(id);
+    },
+};
+
+// helpers.js pulls in state.js, which reads chrome.storage.local at load.
+globalThis.chrome = {
+    storage: { local: { get: async () => ({}), set: async () => {} } },
+};
+
+const {
+    showView,
+    goBack,
+    setBackRenderer,
+    pushCurrentView,
+} = require("../src/popup/views/helpers");
+const {
+    makeBackRenderer,
+    markViewRendered,
+    resetRenderedViews,
+} = require("../src/popup/viewRouter");
+const { state } = require("../src/shared/state");
+
+const ADDRESS = "0x1111111111111111111111111111111111111111";
+const TOKEN = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48";
+
+let calls;
+
+// Stand-ins for the view modules. Each records itself and then shows its
+// view, which is what every real view render ends with — so the assertions
+// can tell "rendered and shown" apart from "merely unhidden".
+function recorder(name, view) {
+    return () => {
+        calls.push(name);
+        showView(view);
+    };
+}
+
+function makeViews() {
+    return {
+        main: { show: recorder("main", "main") },
+        addressDetail: { show: recorder("addressDetail", "address") },
+        addressToken: { show: recorder("addressToken", "address-token") },
+        receive: { show: recorder("receive", "receive") },
+        settings: { show: recorder("settings", "settings") },
+        settingsAddToken: {
+            show: recorder("settingsAddToken", "settings-addtoken"),
+        },
+        confirmTx: { restore: recorder("confirmTx", "confirm-tx") },
+        transactionDetail: {
+            render: recorder("transactionDetail", "transaction"),
+        },
+        txStatus: {
+            restoreWait: () => {
+                calls.push("waitTx");
+                showView("wait-tx");
+                return true;
+            },
+            renderSuccess: recorder("successTx", "success-tx"),
+            renderError: recorder("errorTx", "error-tx"),
+        },
+    };
+}
+
+// The popup as it stands just after a reopen: one wallet with one address,
+// the view the popup restored onto, and the stack behind it.
+//
+// A reopen is a fresh page load, so the record of what has been rendered
+// starts empty — that emptiness is what makes the Back path render at all.
+// Returns the view modules so a test can drive forward navigation through
+// the same recorders the router renders through.
+function reopenedOn(view, stack, extra) {
+    calls = [];
+    resetRenderedViews();
+    state.wallets = [
+        {
+            name: "Wallet 1",
+            addresses: [{ address: ADDRESS, balance: "0", tokenBalances: [] }],
+        },
+    ];
+    state.selectedWallet = 0;
+    state.selectedAddress = 0;
+    state.selectedToken = null;
+    state.viewData = null;
+    state.currentView = view;
+    state.viewStack = stack.slice();
+    Object.assign(state, extra || {});
+    // Restoring onto a view renders it, so the reopened popup has that one
+    // view on the page and nothing else.
+    markViewRendered(view);
+    const views = makeViews();
+    setBackRenderer(makeBackRenderer(state, views));
+    return views;
+}
+
+// The reproduction from the issue, step for step.
+describe("Back onto a view the reopened popup never rendered", () => {
+    test("Back from settings renders the address detail underneath", () => {
+        reopenedOn("settings", ["main", "address"]);
+        goBack();
+        expect(calls).toEqual(["addressDetail"]);
+        expect(state.currentView).toBe("address");
+        expect(state.viewStack).toEqual(["main"]);
+    });
+
+    test("Back onto the token detail renders it", () => {
+        reopenedOn("settings", ["main", "address", "address-token"], {
+            selectedToken: TOKEN,
+        });
+        goBack();
+        expect(calls).toEqual(["addressToken"]);
+        expect(state.currentView).toBe("address-token");
+    });
+
+    test("Back onto Receive renders it", () => {
+        reopenedOn("settings", ["main", "address", "receive"]);
+        goBack();
+        expect(calls).toEqual(["receive"]);
+        expect(state.currentView).toBe("receive");
+    });
+
+    test("Back onto the transaction detail renders it", () => {
+        reopenedOn("settings", ["main", "transaction"], {
+            viewData: { tx: { hash: "0xdead" } },
+        });
+        goBack();
+        expect(calls).toEqual(["transactionDetail"]);
+        expect(state.currentView).toBe("transaction");
+    });
+
+    test("Back onto the transaction confirmation restores it", () => {
+        reopenedOn("settings", ["main", "confirm-tx"], {
+            viewData: { pendingTx: { to: ADDRESS, amount: "1" } },
+        });
+        goBack();
+        expect(calls).toEqual(["confirmTx"]);
+        expect(state.currentView).toBe("confirm-tx");
+    });
+
+    test("Back onto the success screen renders it", () => {
+        reopenedOn("settings", ["main", "success-tx"], {
+            viewData: { hash: "0xdead" },
+        });
+        goBack();
+        expect(calls).toEqual(["successTx"]);
+        expect(state.currentView).toBe("success-tx");
+    });
+
+    test("Back onto the failure screen renders it", () => {
+        reopenedOn("settings", ["main", "error-tx"], {
+            viewData: { message: "execution reverted" },
+        });
+        goBack();
+        expect(calls).toEqual(["errorTx"]);
+        expect(state.currentView).toBe("error-tx");
+    });
+
+    test("Back onto Home renders the wallet list", () => {
+        reopenedOn("settings", ["main"]);
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+
+    test("Back with an empty stack renders Home", () => {
+        reopenedOn("settings", []);
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+});
+
+// The guards are restoreView()'s, so a popped view whose backing data is
+// gone lands on Home rather than on an empty template.
+describe("Back onto a view whose backing data is gone", () => {
+    test("the token detail with no token selected falls back to Home", () => {
+        reopenedOn("settings", ["main", "address-token"]);
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+
+    test("the transaction detail with no transaction falls back to Home", () => {
+        reopenedOn("settings", ["main", "transaction"]);
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+
+    test("the confirmation with no pending transaction falls back to Home", () => {
+        reopenedOn("settings", ["main", "confirm-tx"]);
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+
+    test("an address view with no address selected falls back to Home", () => {
+        reopenedOn("settings", ["main", "receive"], {
+            selectedAddress: null,
+        });
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+
+    test("the success screen with no transaction hash falls back to Home", () => {
+        reopenedOn("settings", ["main", "success-tx"]);
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+
+    test("the failure screen with no message falls back to Home", () => {
+        reopenedOn("settings", ["main", "error-tx"]);
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+
+    test("a wait that can no longer be resumed falls back to Home", () => {
+        reopenedOn("settings", ["main", "wait-tx"]);
+        const views = makeViews();
+        views.txStatus.restoreWait = () => false;
+        setBackRenderer(makeBackRenderer(state, views));
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+});
+
+// Forward navigation renders as it goes, and a second render would re-fetch
+// and clobber whatever the view holds — an unsaved edit, a request in
+// flight. So the Back path renders only a view this page load has never
+// rendered, and merely unhides every other one: the views it does not
+// render from persisted state, and the views already on the page.
+describe("what the Back path leaves alone", () => {
+    test("forward navigation renders nothing by itself", () => {
+        reopenedOn("address", ["main"]);
+        pushCurrentView();
+        showView("send");
+        expect(calls).toEqual([]);
+        expect(state.viewStack).toEqual(["main", "address"]);
+    });
+
+    test("Back onto a live-session view only unhides it", () => {
+        reopenedOn("confirm-tx", ["main", "address", "send"]);
+        goBack();
+        expect(calls).toEqual([]);
+        expect(state.currentView).toBe("send");
+    });
+
+    test("Back renders its target exactly once", () => {
+        reopenedOn("settings", ["main", "address"]);
+        goBack();
+        expect(calls.filter((c) => c === "addressDetail")).toHaveLength(1);
+    });
+
+    test("Back onto a view this page load already rendered only unhides it", () => {
+        const views = reopenedOn("main", []);
+        pushCurrentView();
+        views.addressDetail.show();
+        pushCurrentView();
+        views.settings.show();
+        calls = [];
+        goBack();
+        expect(calls).toEqual([]);
+        expect(state.currentView).toBe("address");
+    });
+
+    // The unit mirror of the regression the browser suite pins: Settings
+    // reassigns its fields from persisted state on every render, so a
+    // re-render on the way back discards an edit the user has not saved.
+    test("Back onto Settings visited earlier in this page load does not re-render it", () => {
+        const views = reopenedOn("main", []);
+        pushCurrentView();
+        views.settings.show();
+        pushCurrentView();
+        views.settingsAddToken.show();
+        calls = [];
+        goBack();
+        expect(calls).toEqual([]);
+        expect(state.currentView).toBe("settings");
+    });
+
+    // Home is the deliberate exception, unchanged from the popup's
+    // behaviour before the router existed: it re-renders on every Back so
+    // the wallet list reflects what changed while the user was away.
+    test("Back onto Home renders it again even when it is already on the page", () => {
+        const views = reopenedOn("main", []);
+        pushCurrentView();
+        views.addressDetail.show();
+        calls = [];
+        goBack();
+        expect(calls).toEqual(["main"]);
+        expect(state.currentView).toBe("main");
+    });
+});
--- a/tests/e2e/firefox/dapp.js
+++ b/tests/e2e/firefox/dapp.js
@@ -1,238 +0,0 @@
-// A loopback dApp origin and stub Ethereum node for the Firefox suite.
-//
-// The Firefox container runs with --network none, and the harness note in
-// driver.js records the consequence: with no http:// origin in reach, no
-// content script was ever injected, so content-script behaviour was
-// UNVERIFIED and the dApp flows could not be driven at all.
-//
-// --network none removes every interface except loopback, and loopback is
-// enough. This serves the page and the JSON-RPC endpoint from 127.0.0.1
-// inside the same container Firefox runs in, so the dApp round trips execute
-// against a real http:// origin and the run stays as offline as it was: the
-// only reachable peer is this process.
-//
-// The page itself is not written twice. DAPP_HTML comes from the Chrome
-// suite's fixture, so both harnesses drive the same __dapp API and the same
-// message log.
-//
-// Unlike driver.js this file does use ethers, and it has to: the node has to
-// answer eth_sendRawTransaction with the hash ethers computes for the
-// artifact it was handed, or provider.broadcastTransaction() refuses the
-// answer, and the suite recovers signatures itself rather than believing the
-// extension's own verdict.
-
-"use strict";
-
-const http = require("http");
-
-const { Transaction } = require("ethers");
-
-const { DAPP_HTML } = require("../network");
-
-// The same fee shape the Chrome suite uses, for the same reason: it has to
-// pass the ceilings in src/shared/approvalVerify.js and it has to leave the
-// reserve and the estimate distinguishable.
-const GAS_LIMIT = 21000n;
-const BASE_FEE_WEI = 100000000000n; // 100 gwei
-const PRIORITY_FEE_WEI = 1000000000n; // 1 gwei
-const GAS_PRICE_WEI = BASE_FEE_WEI + PRIORITY_FEE_WEI;
-
-const STUB_BLOCK_NUMBER = 21000000;
-
-// A 32-byte zero word, returned for every eth_call. It is what makes ethers'
-// ENS reverse lookup resolve to "no resolver set" instead of throwing, and a
-// throw there reaches the console through src/shared/log.js, which fails the
-// run on its own.
-const ZERO_WORD = "0x" + "0".repeat(64);
-
-// One ETH, so the popup's balance lines render something and the wallet does
-// not look empty on the approval screen.
-const STUB_BALANCE_WEI = 10n ** 18n;
-
-function hex(value) {
-    return "0x" + BigInt(value).toString(16);
-}
-
-function latestBlock() {
-    return {
-        hash: "0x" + "11".repeat(32),
-        parentHash: "0x" + "22".repeat(32),
-        number: hex(STUB_BLOCK_NUMBER),
-        timestamp: hex(1767326645),
-        nonce: "0x0000000000000000",
-        difficulty: "0x0",
-        gasLimit: "0x1c9c380",
-        gasUsed: "0xf4240",
-        miner: "0xc0ffee0000000000000000000000000000c0ffee",
-        extraData: "0x",
-        baseFeePerGas: hex(BASE_FEE_WEI),
-        transactions: [],
-    };
-}
-
-const RPC_RESULTS = {
-    eth_chainId: "0x1",
-    net_version: "1",
-    eth_blockNumber: hex(STUB_BLOCK_NUMBER),
-    eth_getBalance: hex(STUB_BALANCE_WEI),
-    eth_call: ZERO_WORD,
-    eth_getCode: "0x",
-    eth_gasPrice: hex(GAS_PRICE_WEI),
-    eth_estimateGas: hex(GAS_LIMIT),
-    eth_getTransactionCount: "0x0",
-    eth_maxPriorityFeePerGas: hex(PRIORITY_FEE_WEI),
-    // "accepted but not mined", which is what a node says about a transaction
-    // it has only just taken. The wait screen the approval hands off to polls
-    // this for the rest of the run.
-    eth_getTransactionReceipt: null,
-    web3_clientVersion: "autistmask-e2e-firefox/0",
-};
-
-// Answer one JSON-RPC call. `broadcast` collects every raw transaction that
-// reached this node, which is what the transaction assertions are made
-// against — the artifact as the node saw it, never as the extension described
-// it.
-function rpcResult(req, state) {
-    const method = req.method;
-
-    if (method === "eth_sendRawTransaction") {
-        const raw = req.params && req.params[0];
-        state.broadcast.push(raw);
-        // ethers checks the hash it is given against the hash it computes for
-        // the artifact it sent, so this cannot be a fixed string.
-        return Transaction.from(raw).hash;
-    }
-
-    if (method === "eth_getBlockByNumber" || method === "eth_getBlockByHash") {
-        return latestBlock();
-    }
-
-    if (Object.prototype.hasOwnProperty.call(RPC_RESULTS, method)) {
-        return RPC_RESULTS[method];
-    }
-
-    // Never a silent default. An unstubbed method answered with null looks
-    // like a working node returning nothing, and the assertion downstream
-    // fails somewhere unrelated.
-    state.unstubbed.push(method);
-    throw new Error("no fixture for JSON-RPC method " + method);
-}
-
-function readBody(req) {
-    return new Promise((resolve, reject) => {
-        let body = "";
-        req.on("data", (chunk) => {
-            body += chunk;
-        });
-        req.on("end", () => resolve(body));
-        req.on("error", reject);
-    });
-}
-
-function handleRpcBody(body, state) {
-    const parsed = JSON.parse(body);
-    const answer = (req) => {
-        try {
-            return {
-                jsonrpc: "2.0",
-                id: req.id,
-                result: rpcResult(req, state),
-            };
-        } catch (e) {
-            return {
-                jsonrpc: "2.0",
-                id: req.id,
-                error: { code: -32601, message: e.message },
-            };
-        }
-    };
-    return Array.isArray(parsed) ? parsed.map(answer) : answer(parsed);
-}
-
-/**
- * Serve the dApp page and the stub node on loopback.
- *
- * @returns {Promise<Object>} the running fixture: `url` and `origin` of the
- * page, `rpcUrl` for the extension's rpcUrl setting, `broadcast` (the raw
- * transactions the node received, in order), `unstubbed` (JSON-RPC methods
- * nothing answered) and `close()`.
- */
-async function startDappServer() {
-    const state = { broadcast: [], unstubbed: [], requests: [] };
-
-    const server = http.createServer((req, res) => {
-        const url = new URL(req.url, "http://127.0.0.1");
-        state.requests.push(req.method + " " + url.pathname);
-
-        if (url.pathname === "/rpc" && req.method === "POST") {
-            readBody(req)
-                .then((body) => {
-                    const payload = JSON.stringify(handleRpcBody(body, state));
-                    res.writeHead(200, {
-                        "Content-Type": "application/json",
-                        // The extension fetches this from its background
-                        // page, whose origin is moz-extension://. Without CORS
-                        // the fetch fails and every transaction assertion
-                        // fails for a reason that has nothing to do with the
-                        // wallet.
-                        "Access-Control-Allow-Origin": "*",
-                    });
-                    res.end(payload);
-                })
-                .catch((e) => {
-                    res.writeHead(500, { "Content-Type": "text/plain" });
-                    res.end(String(e && e.message));
-                });
-            return;
-        }
-
-        if (url.pathname === "/") {
-            res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-            res.end(DAPP_HTML);
-            return;
-        }
-
-        // An empty favicon rather than a 404: a 404 is a page error in
-        // Firefox's console under some settings, and the suite fails the run
-        // on those.
-        if (url.pathname === "/favicon.ico") {
-            res.writeHead(200, { "Content-Type": "image/x-icon" });
-            res.end("");
-            return;
-        }
-
-        res.writeHead(404, { "Content-Type": "text/plain" });
-        res.end("not found");
-    });
-
-    await new Promise((resolve, reject) => {
-        server.on("error", reject);
-        // Port 0: this host runs many sessions at once, and a fixed port is a
-        // guaranteed collision rather than a possible one.
-        server.listen(0, "127.0.0.1", resolve);
-    });
-
-    const { port } = server.address();
-    const origin = "http://127.0.0.1:" + port;
-
-    return {
-        origin,
-        url: origin + "/",
-        rpcUrl: origin + "/rpc",
-        broadcast: state.broadcast,
-        unstubbed: state.unstubbed,
-        requests: state.requests,
-        close: () =>
-            new Promise((resolve) => {
-                server.closeAllConnections();
-                server.close(() => resolve());
-            }),
-    };
-}
-
-module.exports = {
-    GAS_LIMIT,
-    GAS_PRICE_WEI,
-    STUB_BALANCE_WEI,
-    startDappServer,
-};
--- a/tests/e2e/firefox/driver.js
+++ b/tests/e2e/firefox/driver.js
@@ -88,7 +88,7 @@ class Driver {
        let parsed;
        try {
            parsed = JSON.parse(text);
-        } catch (_) {
+        } catch {
            throw new Error(
                method + " " + path + ": non-JSON response: " + text,
            );
@@ -110,26 +110,6 @@ class Driver {
            "extensions.webextensions.uuids": JSON.stringify({
                [EXTENSION_ID]: EXTENSION_UUID,
            }),
-            // The container has loopback and nothing else. Firefox's own
-            // link-status detection can read that as "offline" and then
-            // refuse every request, including the ones to the loopback dApp
-            // origin the suite serves; this takes the decision away from it.
-            "network.manage-offline-status": false,
-            // Force the site-connection prompt down its windows.create()
-            // fallback.
-            //
-            // src/background/index.js prefers the toolbar-anchored popup for
-            // that one approval and opens a real window only when
-            // openPopup() refuses. A panel is not a top-level browsing
-            // context, so WebDriver cannot see it, list it or click in it —
-            // the same blind spot the Chrome harness documents. Leaving this
-            // at its default would make which path runs depend on whether a
-            // headless Firefox counts as having had a user gesture, which is
-            // not a thing to leave to chance in a suite that has to be able
-            // to fail. The window path is shipped code and the same approval
-            // id, so what is driven is real; what is NOT covered either way
-            // is the panel presentation itself.
-            "extensions.openPopupWithoutUserGesture.enabled": false,
        };

        const value = await this.send("POST", "/session", {
@@ -199,16 +179,6 @@ class Driver {
        return this.session("POST", "/execute/sync", { script, args });
    }

-    // The asynchronous form: the script is handed a resolve callback as its
-    // last argument and the call settles when that is invoked. Everything
-    // interesting about an extension page is promise-shaped — storage reads,
-    // the provider's own request() — and /execute/sync cannot wait for any
-    // of it.
-    async executeAsync(script, args = []) {
-        await this.setContext("content");
-        return this.session("POST", "/execute/async", { script, args });
-    }
-
    // Runs in the privileged chrome scope, where Services and Ci exist.
    async executeChrome(script, args = []) {
        await this.setContext("chrome");
@@ -359,63 +329,6 @@ class Driver {
            [selector],
        );
    }
-
-    // ------------------------------------------------------------ windows
-    //
-    // The approval prompts this suite drives are separate top-level windows
-    // the extension opens itself, so every one of them is a window handle
-    // here and the suite has to move between them explicitly.
-
-    async windowHandles() {
-        return this.session("GET", "/window/handles");
-    }
-
-    async currentWindow() {
-        return this.session("GET", "/window");
-    }
-
-    async switchToWindow(handle) {
-        await this.setContext("content");
-        await this.session("POST", "/window", { handle });
-    }
-
-    async newWindow(type = "window") {
-        await this.setContext("content");
-        const value = await this.session("POST", "/window/new", { type });
-        return value.handle;
-    }
-
-    // Closes the current window and leaves the session on `fallback`, because
-    // a session whose current window is gone fails every subsequent command
-    // with "no such window" rather than with anything diagnosable.
-    async closeWindow(fallback) {
-        await this.setContext("content");
-        await this.session("DELETE", "/window");
-        if (fallback) await this.switchToWindow(fallback);
-    }
-
-    async url() {
-        return this.session("GET", "/url");
-    }
-
-    // The handle of the first window whose URL matches, or null. Restores the
-    // window that was current before the search either way: a probe that
-    // silently relocates the session is a trap for the step after it.
-    async findWindow(predicate) {
-        const origin = await this.currentWindow();
-        try {
-            for (const handle of await this.windowHandles()) {
-                await this.switchToWindow(handle);
-                if (predicate(await this.url())) return handle;
-            }
-            return null;
-        } finally {
-            // Tolerated: the window the search started from may have been the
-            // one that just closed, and a throw in here would replace the
-            // real result with "no such window".
-            await this.switchToWindow(origin).catch(() => {});
-        }
-    }
 }

 // ------------------------------------------------------- error capture
@@ -436,15 +349,10 @@ class Driver {
 // background page, which BiDi would not have covered even if it worked.
 // Background-page capture is verified by probe — a throw at the top of
 // src/background/index.js, which kills the background page outright, fails
-// the run.
-//
-// Content scripts ARE now exercised: tests/e2e/firefox/dapp.js serves a page
-// from loopback, which survives --network none, and the suite drives the
-// EIP-1193 round trips through the content script injected into it. What is
-// still unproven is the CAPTURE, not the execution — no probe has forced a
-// throw from inside a content script and watched it fail the run, so an
-// uncaught content-script error arriving by this route remains an
-// expectation rather than a demonstrated fact. Do not claim otherwise.
+// the run. Content-script errors should arrive by the same route, but that
+// is UNVERIFIED here and must not be claimed: the container runs with
+// --network none, so there is no http:// page for a content script to be
+// injected into and this suite never exercises one.
 //
 // Warnings are excluded so the semantics match Playwright's pageerror:
 // uncaught errors only.
@@ -512,7 +420,7 @@ async function waitForDriverReady(base, timeoutMs) {
                const body = await res.json();
                if (body && body.value && body.value.ready !== false) return;
            }
-        } catch (_) {
+        } catch {
            // not listening yet
        }
        if (Date.now() >= deadline) {
--- a/tests/e2e/firefox/run.js
+++ b/tests/e2e/firefox/run.js
@@ -15,15 +15,8 @@
 // UI steps below are written twice on purpose. Chrome runs on Playwright,
 // which cannot see extension-page errors in Firefox at all (see the BiDi
 // note in driver.js), so the two backends have no common substrate to
-// abstract over. Duplicated steps do not pay for a shim; revisit if this
-// suite grows to where they do. What IS shared is the dApp page fixture
-// itself — DAPP_HTML, served here from loopback by dapp.js — so an assertion
-// about the __dapp API means the same thing on both browsers.
-//
-// The dApp steps need an http:// origin, which --network none was thought to
-// rule out. It does not: loopback survives it, so the page and the stub node
-// are served from 127.0.0.1 inside the container and the run reaches nothing
-// but this process. See tests/e2e/firefox/dapp.js.
+// abstract over. Three duplicated steps do not pay for a shim; revisit if
+// this suite grows to where they do.
 //
 // LIMITATION, and the difference from the Chrome suite worth knowing: error
 // capture here is POLL-BASED, not event-streamed. The console service is
@@ -47,21 +40,7 @@
 const fs = require("fs");
 const path = require("path");

-const {
-    Transaction,
-    formatEther,
-    getAddress,
-    getBytes,
-    hexlify,
-    parseEther,
-    toQuantity,
-    toUtf8Bytes,
-    verifyMessage,
-} = require("ethers");
-
 const { ConsoleErrors, EXTENSION_ORIGIN, start, sleep } = require("./driver");
-const { startDappServer } = require("./dapp");
-const { STUB_COUNTERPARTY } = require("../network");

 const REPO_ROOT = path.resolve(__dirname, "..", "..", "..");
 const POPUP_URL = EXTENSION_ORIGIN + "/src/popup/index.html";
@@ -158,596 +137,8 @@ step("add token screen opens from address detail", async (env) => {
    assert(picks > 0, "no common-token quick-pick buttons rendered");
 });

-// ------------------------------------------------- the dApp round trips
-//
-// Everything above drives the popup on its own. From here the page, the
-// content script, the inpage provider, the background page and the approval
-// window all have to work together, which on Firefox is exactly the seam
-// https://git.eeqj.de/sneak/AutistMask/issues/153 is about: every one of
-// these paths used to hand a Chrome-style callback to the promise-only
-// browser.* namespace and simply never complete.
-//
-// The shape is the Chrome suite's (tests/e2e/run.js, the #183 section) and
-// the assertions mean the same things:
-//
-//  - the signature is recovered here, in the runner, from the artifact the
-//    extension produced, and compared against the address read out of
-//    extension storage. The background verifies too; these assertions do not
-//    lean on that, because a test that trusted the wallet's own verdict would
-//    pass against a wallet that verified nothing.
-//  - the transaction is asserted against the raw signed transaction that
-//    reached the stub node, not against anything the extension reported.
-//
-// What this does NOT cover: a real dApp with real funds against a real
-// network. The node is a fixture on loopback.
-
-const SIGN_TEXT = "AutistMask e2e round trip: personal_sign";
-const SIGN_HEX = hexlify(toUtf8Bytes(SIGN_TEXT));
-
-const TX_VALUE_ETH = "0.0123";
-const TX_VALUE_WEI = parseEther(TX_VALUE_ETH);
-// Call data that decodes as nothing, so the screen assertion compares the
-// calldata itself rather than a decoder's summary of it.
-const TX_DATA = "0xdeadbeef" + "01".repeat(28);
-
-const USER_REJECTION_MESSAGE = "User rejected the request.";
-
-// Read the extension's persisted state, point its rpcUrl at the loopback stub
-// node, and hand back the active address. Runs on the popup page, which is
-// the one moz-extension:// document the suite has open and therefore the only
-// place the storage API is reachable from.
-async function pointAtStubNode(d, rpcUrl) {
-    const outcome = await d.executeAsync(
-        `const done = arguments[arguments.length - 1];
-         const rpcUrl = arguments[0];
-         const api = typeof browser !== "undefined" ? browser : chrome;
-         Promise.resolve(api.storage.local.get("autistmask"))
-             .then((r) => {
-                 const s = r.autistmask;
-                 if (!s) throw new Error("the extension has no persisted state");
-                 s.rpcUrl = rpcUrl;
-                 const w = s.wallets && s.wallets[0];
-                 const first = w && w.addresses && w.addresses[0];
-                 const address = s.activeAddress || (first && first.address);
-                 if (!address) throw new Error("the extension holds no address");
-                 return Promise.resolve(api.storage.local.set({ autistmask: s }))
-                     .then(() => done({ address: address }));
-             })
-             .catch((e) => done({ error: String((e && e.message) || e) }));`,
-        [rpcUrl],
-    );
-    assert(
-        outcome && !outcome.error,
-        "could not point the extension at the stub node: " +
-            (outcome && outcome.error),
-    );
-    return getAddress(outcome.address);
-}
-
-// The approval window the background opened. Approvals are raised from an RPC
-// call rather than from a user gesture, so the extension opens a real window
-// for them, which is an ordinary window handle here.
-async function waitForApprovalWindow(d, timeout = 30000) {
-    const deadline = Date.now() + timeout;
-    for (;;) {
-        const handle = await d.findWindow((u) => u.includes("?approval="));
-        if (handle) return handle;
-        if (Date.now() > deadline) {
-            throw new Error(
-                "the extension opened no approval window within " +
-                    timeout +
-                    "ms",
-            );
-        }
-        await sleep(100);
-    }
-}
-
-function startRequest(d, key, method, params) {
-    return d.execute(
-        "window.__dapp.start(arguments[0], arguments[1], arguments[2]);" +
-            " return true;",
-        [key, method, params],
-    );
-}
-
-// The settled outcome of a parked request, or {settled:"pending"} if it is
-// still outstanding. A bounded wait rather than a bare await: "returns a
-// rejection rather than hanging" is one of the things under test, and an
-// await would report a hang as a step timeout with no indication of which
-// call never settled.
-function settleRequest(d, key, timeout = 45000) {
-    return d.executeAsync(
-        `const done = arguments[arguments.length - 1];
-         const key = arguments[0];
-         const timeout = arguments[1];
-         Promise.race([
-             window.__dapp.settle(key),
-             new Promise((r) => setTimeout(() => r({ settled: "pending" }), timeout)),
-         ]).then(done, (e) => done({ settled: "error", message: String(e) }));`,
-        [key, timeout],
-    );
-}
-
-// Every AUTISTMASK_* message that has crossed between the page and the
-// content script. This is the boundary half of the rejection assertion: the
-// code has to be on the wire as well as on the Error the page catches, so a
-// pass cannot come from the provider inventing one.
-function dappMessages(d, type) {
-    return d.execute(
-        // `want` is bound outside the callback deliberately: inside it,
-        // arguments[0] is the message being tested, not the script argument,
-        // and the filter silently matches nothing.
-        "var want = arguments[0];" +
-            " return window.__dapp.messages.filter(function (m) {" +
-            " return !want || m.type === want; });",
-        [type || null],
-    );
-}
-
-async function lastResponseError(d) {
-    const responses = await dappMessages(d, "AUTISTMASK_RESPONSE");
-    const last = responses[responses.length - 1];
-    assert(last, "the page received no AUTISTMASK_RESPONSE at all");
-    return last.error || null;
-}
-
-// A rejected prompt, asserted at both ends: the page's promise rejected
-// rather than hanging or resolving, and the response that crossed the
-// boundary carried EIP-1193 code 4001.
-async function assertUserRejection(d, key, label) {
-    const outcome = await settleRequest(d, key);
-    assert(
-        outcome.settled !== "pending",
-        label + " never settled: the rejected prompt left the page hanging",
-    );
-    assert(
-        outcome.settled === "rejected",
-        label + " resolved instead of rejecting: " + JSON.stringify(outcome),
-    );
-    assert(
-        outcome.message === USER_REJECTION_MESSAGE,
-        label + " rejected with the wrong message: " + outcome.message,
-    );
-    const error = await lastResponseError(d);
-    assert(
-        error && error.code === 4001,
-        label +
-            " did not carry EIP-1193 code 4001 across the boundary: " +
-            JSON.stringify(error),
-    );
-    assert(
-        outcome.hasCode,
-        label +
-            " reached the page as an error with no code property at all, so a " +
-            "dApp cannot tell the user's refusal from a failure: " +
-            JSON.stringify(outcome),
-    );
-    assert(
-        outcome.code === 4001,
-        label +
-            " reached the page with code " +
-            JSON.stringify(outcome.code) +
-            " rather than EIP-1193 4001",
-    );
-    assert(
-        outcome.name === "ProviderRpcError",
-        label +
-            " reached the page as " +
-            JSON.stringify(outcome.name) +
-            " rather than an EIP-1193 ProviderRpcError",
-    );
-    console.log(
-        "# " +
-            label +
-            ": code 4001 on the wire and on the page's " +
-            outcome.name,
-    );
-}
-
-step("the loopback dApp page gets the real inpage provider", async (env) => {
-    const d = env.driver;
-
-    // The popup is still the current window; point the extension at the stub
-    // node from there, then reload it so its in-memory copy of the state
-    // carries the new rpcUrl and cannot save the old one back over it.
-    env.address = await pointAtStubNode(d, env.server.rpcUrl);
-    await d.navigate(POPUP_URL);
-    await d.waitVisible("#view-main", STEP_TIMEOUT_MS);
-    env.popupWindow = await d.currentWindow();
-
-    env.dappWindow = await d.newWindow("tab");
-    await d.switchToWindow(env.dappWindow);
-    await d.navigate(env.server.url);
-
-    // window.ethereum is not the fixture's doing — it is the shipped content
-    // script, injected into a real http:// origin. Waiting for it is waiting
-    // for the real provider to have installed itself.
-    await d.waitFor(
-        "the injected EIP-1193 provider and the test page API",
-        "return !!window.ethereum && !!window.__dapp;",
-        [],
-        STEP_TIMEOUT_MS,
-    );
-
-    // EIP-6963, asked of the provider itself. The announcement carries the
-    // uuid src/content/index.js reads out of extension storage — call site 1
-    // in the issue — and it has to name this extension and hand back the very
-    // object on window.ethereum.
-    const announced = await d.executeAsync(
-        `const done = arguments[arguments.length - 1];
-         const onAnnounce = (e) => {
-             window.removeEventListener("eip6963:announceProvider", onAnnounce);
-             done({
-                 rdns: e.detail.info.rdns,
-                 uuid: e.detail.info.uuid,
-                 isWindowEthereum: e.detail.provider === window.ethereum,
-             });
-         };
-         window.addEventListener("eip6963:announceProvider", onAnnounce);
-         window.dispatchEvent(new Event("eip6963:requestProvider"));
-         setTimeout(() => done(null), 15000);`,
-    );
-    assert(announced, "the provider announced itself to no EIP-6963 request");
-    assert(
-        announced.rdns === "berlin.sneak.autistmask",
-        "the announced provider is not this extension: " +
-            JSON.stringify(announced),
-    );
-    assert(
-        announced.isWindowEthereum,
-        "the announced provider is not the object on window.ethereum",
-    );
-    assert(
-        typeof announced.uuid === "string" && announced.uuid.length === 36,
-        "the announcement carries no stored provider uuid: " +
-            JSON.stringify(announced.uuid),
-    );
-
-    // A full page -> content script -> background round trip that needs no
-    // approval, so the relay is proven before any prompt is driven. This is
-    // call site 2, the one that used to fail for every window.ethereum
-    // request a dApp made.
-    const chainId = await d.executeAsync(
-        `const done = arguments[arguments.length - 1];
-         window.ethereum.request({ method: "eth_chainId" }).then(
-             (r) => done({ ok: r }),
-             (e) => done({ err: String((e && e.message) || e) }),
-         );`,
-    );
-    assert(
-        chainId && chainId.ok === "0x1",
-        "eth_chainId did not round trip through the extension: " +
-            JSON.stringify(chainId),
-    );
-    console.log(
-        "# dapp origin " + env.server.origin + " active address " + env.address,
-    );
-});
-
-step(
-    "eth_requestAccounts approved returns the selected address",
-    async (env) => {
-        const d = env.driver;
-        await d.switchToWindow(env.dappWindow);
-        await startRequest(d, "accounts", "eth_requestAccounts", []);
-
-        const popup = await waitForApprovalWindow(d);
-        await d.switchToWindow(popup);
-        await d.waitVisible("#view-approve-site");
-
-        const hostname = await d.text("#approve-hostname");
-        assert(
-            hostname === "127.0.0.1",
-            "the site prompt names the wrong origin: " +
-                JSON.stringify(hostname),
-        );
-        const shown = await d.text("#approve-address");
-        assert(
-            shown.toLowerCase().includes(env.address.toLowerCase()),
-            "the site prompt shows the wrong address: " + JSON.stringify(shown),
-        );
-
-        // Remembered, so the origin stays authorized for the sign and transaction
-        // steps below.
-        const checked = await d.execute(
-            'return document.getElementById("approve-remember").checked;',
-        );
-        if (!checked) await d.click("#approve-remember");
-        await d.click("#btn-approve");
-
-        // The approve button closes its own window, so get off it before asking
-        // the page anything.
-        await d.switchToWindow(env.dappWindow);
-        const outcome = await settleRequest(d, "accounts");
-        assert(
-            outcome.settled === "resolved",
-            "eth_requestAccounts did not resolve: " + JSON.stringify(outcome),
-        );
-        assert(
-            Array.isArray(outcome.result) && outcome.result.length === 1,
-            "eth_requestAccounts returned no single account: " +
-                JSON.stringify(outcome.result),
-        );
-        assert(
-            getAddress(outcome.result[0]) === env.address,
-            "eth_requestAccounts returned " +
-                outcome.result[0] +
-                ", not the selected address " +
-                env.address,
-        );
-    },
-);
-
-step(
-    "personal_sign returns a signature that recovers to the address",
-    async (env) => {
-        const d = env.driver;
-        await d.switchToWindow(env.dappWindow);
-        await startRequest(d, "sign", "personal_sign", [SIGN_HEX, env.address]);
-
-        const popup = await waitForApprovalWindow(d);
-        await d.switchToWindow(popup);
-        await d.waitVisible("#view-approve-sign");
-
-        const screen = await d.execute(
-            `return {
-             hostname: document.getElementById("approve-sign-hostname").textContent,
-             type: document.getElementById("approve-sign-type").textContent,
-             message: document.getElementById("approve-sign-message").textContent,
-             from: document.getElementById("approve-sign-from").textContent,
-         };`,
-        );
-        assert(
-            screen.hostname === "127.0.0.1",
-            "the sign prompt names the wrong origin: " +
-                JSON.stringify(screen.hostname),
-        );
-        assert(
-            screen.type === "Personal message",
-            "the sign prompt reports the wrong type: " +
-                JSON.stringify(screen.type),
-        );
-        assert(
-            screen.message === SIGN_TEXT,
-            "the sign prompt shows the wrong message: " +
-                JSON.stringify(screen.message),
-        );
-        assert(
-            screen.from.toLowerCase().includes(env.address.toLowerCase()),
-            "the sign prompt shows the wrong signing address: " +
-                JSON.stringify(screen.from),
-        );
-
-        await d.fill("#approve-sign-password", PASSWORD);
-        await d.click("#btn-approve-sign");
-
-        await d.switchToWindow(env.dappWindow);
-        const outcome = await settleRequest(d, "sign");
-        assert(
-            outcome.settled === "resolved",
-            "personal_sign did not resolve: " + JSON.stringify(outcome),
-        );
-        const recovered = getAddress(
-            verifyMessage(getBytes(SIGN_HEX), outcome.result),
-        );
-        console.log(
-            "# personal_sign: recovered=" +
-                recovered +
-                " expected=" +
-                env.address,
-        );
-        assert(
-            recovered === env.address,
-            "the personal_sign signature recovers to " +
-                recovered +
-                ", not to the approved address " +
-                env.address,
-        );
-    },
-);
-
-step(
-    "eth_sendTransaction shows the transaction and returns its hash",
-    async (env) => {
-        const d = env.driver;
-        const before = env.server.broadcast.length;
-
-        await d.switchToWindow(env.dappWindow);
-        await startRequest(d, "tx", "eth_sendTransaction", [
-            {
-                from: env.address,
-                to: STUB_COUNTERPARTY,
-                value: toQuantity(TX_VALUE_WEI),
-                data: TX_DATA,
-            },
-        ]);
-
-        const popup = await waitForApprovalWindow(d);
-        await d.switchToWindow(popup);
-        await d.waitVisible("#view-approve-tx");
-
-        const screen = await d.execute(
-            `return {
-             hostname: document.getElementById("approve-tx-hostname").textContent,
-             from: document.getElementById("approve-tx-from").textContent,
-             to: document.getElementById("approve-tx-to").textContent,
-             value: document.getElementById("approve-tx-value").textContent,
-             data: document.getElementById("approve-tx-data").textContent,
-             dataShown: !document
-                 .getElementById("approve-tx-data-section")
-                 .classList.contains("hidden"),
-         };`,
-        );
-        assert(
-            screen.hostname === "127.0.0.1",
-            "the transaction prompt names the wrong origin: " +
-                JSON.stringify(screen.hostname),
-        );
-        assert(
-            screen.from.toLowerCase().includes(env.address.toLowerCase()),
-            "the transaction prompt shows the wrong sender: " +
-                JSON.stringify(screen.from),
-        );
-        assert(
-            screen.to.toLowerCase().includes(STUB_COUNTERPARTY.toLowerCase()),
-            "the transaction prompt shows the wrong recipient: " +
-                JSON.stringify(screen.to),
-        );
-        assert(
-            screen.value.startsWith(TX_VALUE_ETH + " ETH"),
-            "the transaction prompt shows the wrong value: " +
-                JSON.stringify(screen.value),
-        );
-        assert(
-            screen.dataShown && screen.data === TX_DATA,
-            "the transaction prompt does not show the approved call data: " +
-                JSON.stringify(screen.data),
-        );
-
-        await d.fill("#approve-tx-password", PASSWORD);
-        await d.click("#btn-approve-tx");
-
-        // The approval window hands off to the wait screen rather than closing,
-        // and the hash it shows is asserted before it is retired: left open it
-        // polls the stub node for a receipt for the rest of the run.
-        await d.waitVisible("#view-wait-tx", STEP_TIMEOUT_MS);
-        const waitHash = await d.text("#wait-tx-hash");
-
-        await d.switchToWindow(env.dappWindow);
-        const outcome = await settleRequest(d, "tx");
-        assert(
-            outcome.settled === "resolved",
-            "eth_sendTransaction did not resolve: " + JSON.stringify(outcome),
-        );
-
-        // The artifact as the node saw it, not as the extension described it.
-        assert(
-            env.server.broadcast.length === before + 1,
-            "expected exactly one raw transaction to reach the node, got " +
-                (env.server.broadcast.length - before),
-        );
-        const signed = Transaction.from(
-            env.server.broadcast[env.server.broadcast.length - 1],
-        );
-        console.log(
-            "# eth_sendTransaction: signer=" +
-                getAddress(signed.from) +
-                " to=" +
-                getAddress(signed.to) +
-                " value=" +
-                formatEther(signed.value) +
-                " chainId=" +
-                signed.chainId,
-        );
-        assert(
-            getAddress(signed.from) === env.address,
-            "the broadcast transaction was signed by " +
-                getAddress(signed.from) +
-                ", not by the approved address " +
-                env.address,
-        );
-        assert(
-            getAddress(signed.to) === getAddress(STUB_COUNTERPARTY),
-            "the broadcast transaction goes to " + signed.to,
-        );
-        assert(
-            signed.value === TX_VALUE_WEI,
-            "the broadcast transaction carries " +
-                formatEther(signed.value) +
-                " ETH, not the approved " +
-                TX_VALUE_ETH,
-        );
-        assert(
-            signed.data === TX_DATA,
-            "the broadcast transaction carries different call data: " +
-                signed.data,
-        );
-        assert(
-            signed.chainId === 1n,
-            "the broadcast transaction is for chain " + signed.chainId,
-        );
-        assert(
-            outcome.result === signed.hash,
-            "the page received " +
-                outcome.result +
-                ", not the hash of the broadcast transaction " +
-                signed.hash,
-        );
-        assert(
-            waitHash.includes(signed.hash),
-            "the wait screen shows a different hash: " +
-                JSON.stringify(waitHash),
-        );
-
-        await d.switchToWindow(popup);
-        await d.closeWindow(env.dappWindow);
-    },
-);
-
-step(
-    "closing an approval window rejects the request with 4001",
-    async (env) => {
-        const d = env.driver;
-        const before = env.server.broadcast.length;
-
-        await d.switchToWindow(env.dappWindow);
-        await startRequest(d, "sign-closed", "personal_sign", [
-            SIGN_HEX,
-            env.address,
-        ]);
-
-        const popup = await waitForApprovalWindow(d);
-        await d.switchToWindow(popup);
-        await d.waitVisible("#view-approve-sign");
-
-        // Closed, not rejected: this is the windows.onRemoved path, which can
-        // only fire if windows.create() handed back a window id for the approval
-        // to be matched against — call site 4 in the issue, where the id used to
-        // be assigned from a callback the browser.* namespace never invoked.
-        await d.closeWindow(env.dappWindow);
-
-        await assertUserRejection(d, "sign-closed", "a closed approval window");
-        assert(
-            env.server.broadcast.length === before,
-            "a closed approval window still put a transaction on the node",
-        );
-    },
-);
-
 // ------------------------------------------------------------- runner

-// Uncaught extension errors that are known, tracked and deliberately
-// tolerated, in the same spirit as ALLOWED_ERRORS in tests/e2e/harness.js:
-// every entry names the issue that will delete it, and every occurrence is
-// still printed, so tolerating one is visible in the log rather than silent.
-// This is the only concession in an otherwise zero-tolerance policy.
-const ALLOWED_ERRORS = [
-    {
-        // The site-connection buttons in src/popup/views/approval.js send
-        // their decision and call window.close() on the next line. Firefox's
-        // BaseContext.wrapPromise reports, through Cu.reportError, any
-        // extension-API promise that settles after its context unloaded —
-        // whether or not the caller attached a handler, so notify()'s catch
-        // cannot suppress it.
-        //
-        // Pre-existing, and not introduced by the promise shim: the send was
-        // already unawaited, and this suite is merely the first thing to
-        // drive that window on Firefox. It is the same teardown ordering as
-        // the issue below, whose fix — making the outcome independent of when
-        // the popup closes — removes this entry with it.
-        pattern: /Promise (?:resolved|rejected) after context unloaded/,
-        source: /\/src\/popup\/index\.js$/,
-        issue: "https://git.eeqj.de/sneak/AutistMask/issues/275",
-    },
-];
-
-function allowedFor(e) {
-    return ALLOWED_ERRORS.find(
-        (a) => a.pattern.test(e.msg) && a.source.test(e.src),
-    );
-}
-
 function formatError(e) {
    return (
        e.msg + " (" + e.src + ":" + e.line + (e.cat ? ", " + e.cat : "") + ")"
@@ -774,21 +165,6 @@ async function main() {
        return;
    }

-    // Loopback survives --network none, so this is the http:// origin the
-    // dApp steps need and the node they talk to. Started before the browser
-    // so its url is available to the first step that asks for it.
-    let server;
-    try {
-        server = await startDappServer();
-    } catch (e) {
-        console.error(
-            "e2e-firefox: cannot serve the dApp fixture: " + e.message,
-        );
-        process.exitCode = 1;
-        return;
-    }
-    console.log("# dapp fixture: " + server.url + " rpc " + server.rpcUrl);
-
    let driver;
    try {
        driver = await start();
@@ -799,20 +175,12 @@ async function main() {
        // absent suite. Never skip and report success.
        console.error("e2e-firefox: cannot run the suite: " + e.message);
        if (driver) await driver.quit().catch(() => {});
-        await server.close();
        process.exitCode = 1;
        return;
    }

    const errors = new ConsoleErrors(driver, EXTENSION_ORIGIN);
-    const env = {
-        driver,
-        server,
-        phrase: null,
-        address: null,
-        dappWindow: null,
-        popupWindow: null,
-    };
+    const env = { driver, phrase: null };

    console.log("# extension origin: " + EXTENSION_ORIGIN);
    console.log("1.." + steps.length);
@@ -864,20 +232,6 @@ async function main() {
                installFailure = null;
            }

-            // Tolerated errors are set aside, never dropped: each one is
-            // printed with the issue that keeps it on the list, so the
-            // concession stays in the run output.
-            const tolerated = found.filter((e) => allowedFor(e));
-            found = found.filter((e) => !allowedFor(e));
-            for (const e of tolerated) {
-                console.log(
-                    "# tolerated (" +
-                        allowedFor(e).issue +
-                        "): " +
-                        formatError(e),
-                );
-            }
-
            // Any uncaught error from an extension source fails the step
            // that provoked it, whether or not its assertions passed.
            if (!failure && found.length > 0) {
@@ -902,13 +256,7 @@ async function main() {
        // blamed on any one step, but they are still reported and they
        // still fail the run.
        await sleep(1000);
-        const trailingAll = await errors.take();
-        for (const e of trailingAll.filter((x) => allowedFor(x))) {
-            console.log(
-                "# tolerated (" + allowedFor(e).issue + "): " + formatError(e),
-            );
-        }
-        const trailing = trailingAll.filter((e) => !allowedFor(e));
+        const trailing = await errors.take();
        console.log(
            "# " +
                (steps.length - failed) +
@@ -925,25 +273,12 @@ async function main() {
            );
            for (const e of trailing) console.log("#   " + formatError(e));
        }
-        // A JSON-RPC method nothing answered means the extension asked the
-        // node something this fixture does not model, and whatever depended
-        // on the answer took the error branch instead. That is a hole in the
-        // fixture, not a pass.
-        if (server.unstubbed.length > 0) {
-            console.log(
-                "# FAILED: no fixture for JSON-RPC method(s) " +
-                    [...new Set(server.unstubbed)].join(", "),
-            );
-            process.exitCode = 1;
-        }
-
        if (failed > 0 || trailing.length > 0) {
            console.log("# FAILED");
            process.exitCode = 1;
        }
    } finally {
        await driver.quit().catch(() => {});
-        await server.close();
    }
 }

--- a/tests/e2e/harness.js
+++ b/tests/e2e/harness.js
@@ -287,7 +287,7 @@ async function pageCompilesWasm(page) {
        try {
            await WebAssembly.compile(new Uint8Array(bytes));
            return true;
-        } catch (_) {
+        } catch {
            return false;
        }
    }, EMPTY_WASM_MODULE);
--- a/tests/e2e/network.js
+++ b/tests/e2e/network.js
@@ -78,13 +78,6 @@ function word(value) {
 // is put there by the shipped manifest's MAIN-world content script, exactly
 // as it is on any http(s) page a user visits, so what these tests speak to
 // is the real inpage provider and not a copy the harness wired up.
-//
-// DAPP_HTML below is exported and served verbatim by the Firefox suite too
-// (tests/e2e/firefox/dapp.js), from a loopback origin rather than through a
-// route handler. The two suites drive different browsers over different
-// protocols, but the page they drive — the __dapp API, the message log — is
-// one fixture, so an assertion written against it means the same thing on
-// both.
 const DAPP_ORIGIN = "https://dapp.e2e.test";
 const DAPP_URL = DAPP_ORIGIN + "/";

@@ -642,7 +635,6 @@ async function installNetworkStubs(ctx, opts) {

 module.exports = {
    installNetworkStubs,
-    DAPP_HTML,
    DAPP_ORIGIN,
    DAPP_URL,
    FEE_ESTIMATE_WEI,
--- a/tests/e2e/run.js
+++ b/tests/e2e/run.js
@@ -66,7 +66,11 @@ function withTimeout(promise, name) {
    const timeout = new Promise((_, reject) => {
        timer = setTimeout(
            () =>
-                reject(new Error("timed out after " + TEST_TIMEOUT_MS + "ms")),
+                reject(
+                    new Error(
+                        name + ": timed out after " + TEST_TIMEOUT_MS + "ms",
+                    ),
+                ),
            TEST_TIMEOUT_MS,
        );
    });
@@ -419,6 +423,172 @@ test("reopening the popup never lands on the phrase screen (#161)", async (env)
    assertWiped(st, env.phrase, "after reopening the popup");
 });

+// ------------------------------- Back after reopening the popup (#268)
+
+// A reopened popup renders the wallet list and the view it restores onto,
+// and nothing else: every other screen is still the blank static template
+// from index.html. Back used to only unhide its target, which is why these
+// have to run against the real popup — the template is present and
+// well-formed, so only its emptiness distinguishes the defect, and only a
+// real reopen produces it.
+
+// Everything the address screen must have on it, read out of the DOM.
+function addressScreenState(page) {
+    return page.evaluate(() => {
+        const line = document.getElementById("address-line");
+        const balances = document.getElementById("address-balances");
+        return {
+            hidden: document
+                .getElementById("view-address")
+                .classList.contains("hidden"),
+            line: line ? line.innerText.trim() : "",
+            balances: balances ? balances.innerText.trim() : "",
+        };
+    });
+}
+
+// Close and reopen the page rather than reload it: that is what the toolbar
+// popup does, and it is the only thing that produces the unrendered views.
+async function reopenPopup(env, restoredView) {
+    await env.page.close();
+    env.page = await openPopup(env.ctx, env.popupUrl);
+    await visible(env.page, restoredView);
+}
+
+// The reproduction from the issue, step for step.
+test("Back after reopening the popup renders the address screen (#268)", async (env) => {
+    await openAddressDetail(env.page);
+    const before = await addressScreenState(env.page);
+    assert(
+        before.line.length > 0,
+        "the address screen was blank to begin with",
+    );
+
+    await env.page.click("#btn-settings");
+    await visible(env.page, "#view-settings");
+
+    await reopenPopup(env, "#view-settings");
+
+    await env.page.click("#btn-settings-back");
+    await visible(env.page, "#view-address");
+
+    const after = await addressScreenState(env.page);
+    assert(
+        after.line === before.line,
+        "the address line reads " +
+            JSON.stringify(after.line) +
+            ", expected " +
+            JSON.stringify(before.line),
+    );
+    assert(
+        after.balances.includes("ETH"),
+        "the balances read " + JSON.stringify(after.balances),
+    );
+});
+
+// The same defect one screen further in. Receive holds the address twice
+// over — as text and as the QR code the sender scans — and a blank one is
+// worse than a missing screen.
+// Everything the Receive screen must have on it. The QR code is read as
+// pixels, not as an element: the blank template carries the canvas too, a
+// default 300x150 one with nothing drawn on it and every pixel fully
+// transparent. A drawn QR paints an opaque background across the whole
+// canvas, so a single opaque pixel is the whole question.
+function receiveScreenState(page) {
+    return page.evaluate(() => {
+        const block = document.getElementById("receive-address-block");
+        const canvas = document.getElementById("receive-qr");
+        const px = canvas
+            .getContext("2d")
+            .getImageData(0, 0, canvas.width, canvas.height).data;
+        let opaque = 0;
+        for (let i = 3; i < px.length; i += 4) {
+            if (px[i] > 0) opaque += 1;
+        }
+        return {
+            address: block.dataset.full || "",
+            text: block.innerText.trim(),
+            qrOpaquePixels: opaque,
+        };
+    });
+}
+
+test("Back after reopening the popup renders the Receive screen (#268)", async (env) => {
+    await openAddressDetail(env.page);
+    await env.page.click("#btn-receive");
+    await visible(env.page, "#view-receive");
+    const before = await receiveScreenState(env.page);
+    assert(
+        /^0x[0-9a-fA-F]{40}$/.test(before.address),
+        "Receive showed no address to begin with: " +
+            JSON.stringify(before.address),
+    );
+
+    await env.page.click("#btn-settings");
+    await visible(env.page, "#view-settings");
+
+    await reopenPopup(env, "#view-settings");
+
+    await env.page.click("#btn-settings-back");
+    await visible(env.page, "#view-receive");
+
+    const shown = await receiveScreenState(env.page);
+    assert(
+        shown.address === before.address,
+        "Receive shows " +
+            JSON.stringify(shown.address) +
+            ", expected " +
+            JSON.stringify(before.address),
+    );
+    assert(
+        shown.text.includes(before.address),
+        "the Receive address is not on screen: " + JSON.stringify(shown.text),
+    );
+    assert(shown.qrOpaquePixels > 0, "Receive shows an unpainted QR code");
+
+    // Leave the suite where it found it.
+    await env.page.click("#btn-receive-back");
+    await visible(env.page, "#view-address");
+    await env.page.click("#btn-address-back");
+    await visible(env.page, "#view-main");
+});
+
+// The other half of the requirement: Back renders a screen this page load
+// never rendered, and must NOT re-render one it already has on screen.
+// settings.show() reassigns #settings-rpc from persisted state, so
+// re-rendering Settings on the way back would silently revert whatever the
+// user typed and had not saved yet — and they could then press Save and
+// store the value they believed they had replaced. No reopen here: this is
+// an ordinary in-session forward-and-back, which is exactly why the render
+// must not happen.
+test("Back onto Settings keeps unsaved input (#268)", async (env) => {
+    await visible(env.page, "#view-main");
+    await env.page.click("#btn-settings");
+    await visible(env.page, "#view-settings");
+
+    const typed = "https://rpc.example.invalid/unsaved";
+    await env.page.fill("#settings-rpc", typed);
+
+    await env.page.click("#btn-settings-add-token");
+    await visible(env.page, "#view-settings-addtoken");
+    await env.page.click("#btn-settings-addtoken-back");
+    await visible(env.page, "#view-settings");
+
+    const kept = await env.page.inputValue("#settings-rpc");
+    assert(
+        kept === typed,
+        "the unsaved RPC URL reads " +
+            JSON.stringify(kept) +
+            ", expected " +
+            JSON.stringify(typed),
+    );
+
+    // Leave the suite where it found it. The typed value was never saved,
+    // and Settings reloads the field from state next time it renders.
+    await env.page.click("#btn-settings-back");
+    await visible(env.page, "#view-main");
+});
+
 // -------------------------------------------- address removal (#162)

 // Number of address rows across every wallet in the list, counted in the DOM
--- a/tests/uniswap.test.js
+++ b/tests/uniswap.test.js
@@ -1,4 +1,4 @@
-const { AbiCoder, Interface, solidityPacked, getBytes } = require("ethers");
+const { AbiCoder, Interface, solidityPacked } = require("ethers");
 const uniswap = require("../src/shared/uniswap");

 const ROUTER_ADDR = "0x66a9893cc07d91d95644aedd05d03f95e1dba8af";
--- a/yarn.lock
+++ b/yarn.lock
@@ -427,6 +427,90 @@
  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz#0eaf705c941a218a43dba8e09f1df1d6cd2f1f17"
  integrity sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==

+"@eslint-community/eslint-utils@^4.8.0":
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz#8911bd72b2c3640a543609e0400b8c4d2e7e7cb6"
+  integrity sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==
+  dependencies:
+    eslint-visitor-keys "^3.4.3"
+
+"@eslint-community/regexpp@^4.12.2":
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
+  integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
+
+"@eslint/config-array@^0.23.5":
+  version "0.23.5"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.23.5.tgz#56e86d243049195d8acc0c06a1b3dfdc3fa3de95"
+  integrity sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==
+  dependencies:
+    "@eslint/object-schema" "^3.0.5"
+    debug "^4.3.1"
+    minimatch "^10.2.4"
+
+"@eslint/config-helpers@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.7.0.tgz#09ee4aa07b73f059ec2d4c74bf4b2ff02b322377"
+  integrity sha512-DObd/KKUsU+FaFv4PLxSRenpXfQWmPXXP3pPZ6/K1PCrMu2vQpMDMuQe/BqYeoLcz8ro0bVDF1RxOJgfVEdhUw==
+  dependencies:
+    "@eslint/core" "^1.2.1"
+
+"@eslint/core@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-1.2.1.tgz#c1da7cd1b82fa8787f98b5629fb811848a1b63ce"
+  integrity sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
+"@eslint/js@10.0.1":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-10.0.1.tgz#1e8a876f50117af8ab67e47d5ad94d38d6622583"
+  integrity sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==
+
+"@eslint/object-schema@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-3.0.5.tgz#88e9bf4d11d2b19c082e78ebe7ce88724a5eb091"
+  integrity sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==
+
+"@eslint/plugin-kit@^0.7.2":
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz#4b0962f3f2c7ce8bc98b3ecfe34525c09d2cb729"
+  integrity sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==
+  dependencies:
+    "@eslint/core" "^1.2.1"
+    levn "^0.4.1"
+
+"@humanfs/core@^0.19.2":
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.2.tgz#a8272ca03b2acf492670222b2320b6c421bfde60"
+  integrity sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==
+  dependencies:
+    "@humanfs/types" "^0.15.0"
+
+"@humanfs/node@^0.16.6":
+  version "0.16.8"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.8.tgz#8f800cccc13f4f8cd3116e2d9c0a94939da3e3ed"
+  integrity sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==
+  dependencies:
+    "@humanfs/core" "^0.19.2"
+    "@humanfs/types" "^0.15.0"
+    "@humanwhocodes/retry" "^0.4.0"
+
+"@humanfs/types@^0.15.0":
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/@humanfs/types/-/types-0.15.0.tgz#f2a09f62012390b2bff3fc6fb248ddec8c09a090"
+  integrity sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/retry@^0.4.0", "@humanwhocodes/retry@^0.4.2":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz#c2b9d2e374ee62c586d3adbea87199b1d7a7a6ba"
+  integrity sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==
+
 "@isaacs/cliui@^8.0.2":
  version "8.0.2"
  resolved "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz"
@@ -1008,6 +1092,16 @@
  dependencies:
    "@babel/types" "^7.28.2"

+"@types/esrecurse@^4.3.1":
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@types/esrecurse/-/esrecurse-4.3.1.tgz#6f636af962fbe6191b830bd676ba5986926bccec"
+  integrity sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==
+
+"@types/estree@^1.0.6", "@types/estree@^1.0.8":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.9.tgz#cf3f0e876d7bee15a93ab925b82bf570a3904a24"
+  integrity sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.1", "@types/istanbul-lib-coverage@^2.0.6":
  version "2.0.6"
  resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz"
@@ -1027,6 +1121,11 @@
  dependencies:
    "@types/istanbul-lib-report" "*"

+"@types/json-schema@^7.0.15":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
 "@types/node@*", "@types/node@22.7.5":
  version "22.7.5"
  resolved "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz"
@@ -1153,11 +1252,31 @@
  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz#538b1e103bf8d9864e7b85cc96fa8d6fb6c40777"
  integrity sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==

+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
+acorn@^8.16.0:
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.18.0.tgz#4faf01b2d6d326bfeed97aea1f52220b5f4c1940"
+  integrity sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==
+
 aes-js@4.0.0-beta.5:
  version "4.0.0-beta.5"
  resolved "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz"
  integrity sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==

+ajv@^6.14.0:
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.15.0.tgz#07e982c74626167aa7a2495c53817892d7139492"
+  integrity sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ansi-escapes@^4.3.2:
  version "4.3.2"
  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
@@ -1297,6 +1416,13 @@ brace-expansion@^5.0.2:
  dependencies:
    balanced-match "^4.0.2"

+brace-expansion@^5.0.8:
+  version "5.0.9"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.9.tgz#7c72438809b5fa5babf54199a1f1c281a6984fcf"
+  integrity sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==
+  dependencies:
+    balanced-match "^4.0.2"
+
 braces@^3.0.3:
  version "3.0.3"
  resolved "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz"
@@ -1429,7 +1555,7 @@ cross-spawn@^7.0.3, cross-spawn@^7.0.6:
    shebang-command "^2.0.0"
    which "^2.0.1"

-debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
  version "4.4.3"
  resolved "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz"
  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -1446,6 +1572,11 @@ dedent@^1.6.0:
  resolved "https://registry.npmjs.org/dedent/-/dedent-1.7.1.tgz"
  integrity sha512-9JmrhGZpOlEgOLdQgSm0zxFaYoQon408V1v49aqTWuXENVlnCuY9JBZcXZiCsZQWDjTm5Qf/nIvAy77mXDAjEg==

+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
 deepmerge@^4.3.1:
  version "4.3.1"
  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"
@@ -1548,11 +1679,105 @@ escape-string-regexp@^2.0.0:
  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"
  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==

+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+eslint-scope@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-9.1.2.tgz#b9de6ace2fab1cff24d2e58d85b74c8fcea39802"
+  integrity sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==
+  dependencies:
+    "@types/esrecurse" "^4.3.1"
+    "@types/estree" "^1.0.8"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint-visitor-keys@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz#9e3c9489697824d2d4ce3a8ad12628f91e9f59be"
+  integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==
+
+eslint@10.8.1:
+  version "10.8.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.8.1.tgz#fb37d514c19b6dd5b2d6b70169fd26fddfa97967"
+  integrity sha512-wqA7W2jbsC/BnV9Iv1UZpKVFkO1AdNoSmYW8NWG4HNOBbkAMvIqDZ27pI2f07dqn583NcIC44ckjAcOXDL1QbQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.8.0"
+    "@eslint-community/regexpp" "^4.12.2"
+    "@eslint/config-array" "^0.23.5"
+    "@eslint/config-helpers" "^0.7.0"
+    "@eslint/core" "^1.2.1"
+    "@eslint/plugin-kit" "^0.7.2"
+    "@humanfs/node" "^0.16.6"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.4.2"
+    "@types/estree" "^1.0.6"
+    ajv "^6.14.0"
+    cross-spawn "^7.0.6"
+    debug "^4.3.2"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^9.1.2"
+    eslint-visitor-keys "^5.0.1"
+    espree "^11.2.0"
+    esquery "^1.7.0"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^8.0.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    ignore "^5.2.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    minimatch "^10.2.5"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+
+espree@^11.2.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-11.2.0.tgz#01d5e47dc332aaba3059008362454a8cc34ccaa5"
+  integrity sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==
+  dependencies:
+    acorn "^8.16.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^5.0.1"
+
 esprima@^4.0.0:
  version "4.0.1"
  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==

+esquery@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d"
+  integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
 ethereum-blockies-base64@^1.0.2:
  version "1.0.2"
  resolved "https://registry.npmjs.org/ethereum-blockies-base64/-/ethereum-blockies-base64-1.0.2.tgz"
@@ -1605,11 +1830,21 @@ expect@30.2.0:
    jest-mock "30.2.0"
    jest-util "30.2.0"

-fast-json-stable-stringify@^2.1.0:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==

+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+
 fb-watchman@^2.0.2:
  version "2.0.2"
  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz"
@@ -1617,6 +1852,13 @@ fb-watchman@^2.0.2:
  dependencies:
    bser "2.1.1"

+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
+  dependencies:
+    flat-cache "^4.0.0"
+
 fill-range@^7.1.1:
  version "7.1.1"
  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz"
@@ -1632,6 +1874,27 @@ find-up@^4.0.0, find-up@^4.1.0:
    locate-path "^5.0.0"
    path-exists "^4.0.0"

+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
+  dependencies:
+    flatted "^3.2.9"
+    keyv "^4.5.4"
+
+flatted@^3.2.9:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.4.tgz#aeeca2a506303f0cee61c59e6c9f2a88d2f29fc6"
+  integrity sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==
+
 foreground-child@^3.1.0:
  version "3.3.1"
  resolved "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz"
@@ -1670,6 +1933,13 @@ get-stream@^6.0.0:
  resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==

+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob@^10.3.10:
  version "10.5.0"
  resolved "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz"
@@ -1694,6 +1964,11 @@ glob@^7.1.4:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

+globals@17.11.0:
+  version "17.11.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-17.11.0.tgz#d643485bb30220d7751e511cf4f68c73d3870d87"
+  integrity sha512-Z2I8hM+PbJDXQDq3Icgpzv+mPdwr68iZUU9d5WW4FuXfDUQfkZaZuvjMv42/5crNyw154+9+VWXbYrUgDXbxNw==
+
 graceful-fs@^4.2.11, graceful-fs@^4.2.4:
  version "4.2.11"
  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"
@@ -1714,6 +1989,11 @@ human-signals@^2.1.0:
  resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==

+ignore@^5.2.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
+
 import-local@^3.2.0:
  version "3.2.0"
  resolved "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz"
@@ -1760,7 +2040,7 @@ is-generator-fn@^2.1.0:
  resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz"
  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==

-is-glob@^4.0.3:
+is-glob@^4.0.0, is-glob@^4.0.3:
  version "4.0.3"
  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -2212,21 +2492,51 @@ jsesc@^3.0.2:
  resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz"
  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==

+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-even-better-errors@^2.3.0:
  version "2.3.1"
  resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==

+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+
 json5@^2.2.3:
  version "2.2.3"
  resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==

+keyv@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 leven@^3.1.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"
  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==

+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
 libsodium-sumo@^0.8.0:
  version "0.8.2"
  resolved "https://registry.npmjs.org/libsodium-sumo/-/libsodium-sumo-0.8.2.tgz"
@@ -2325,6 +2635,13 @@ locate-path@^5.0.0:
  dependencies:
    p-locate "^4.1.0"

+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lru-cache@^10.2.0:
  version "10.4.3"
  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
@@ -2376,6 +2693,13 @@ mimic-fn@^2.1.0:
  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==

+minimatch@^10.2.4, minimatch@^10.2.5:
+  version "10.2.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.6.tgz#fd956bbe0b77241e9f15ac5dccb1c638060968ef"
+  integrity sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==
+  dependencies:
+    brace-expansion "^5.0.8"
+
 minimatch@^3.0.4, minimatch@^3.1.1:
  version "3.1.3"
  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.3.tgz"
@@ -2456,6 +2780,18 @@ onetime@^5.1.2:
  dependencies:
    mimic-fn "^2.1.0"

+optionator@^0.9.3:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.5"
+
 p-limit@^2.2.0:
  version "2.3.0"
  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
@@ -2463,7 +2799,7 @@ p-limit@^2.2.0:
  dependencies:
    p-try "^2.0.0"

-p-limit@^3.1.0:
+p-limit@^3.0.2, p-limit@^3.1.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -2477,6 +2813,13 @@ p-locate@^4.1.0:
  dependencies:
    p-limit "^2.2.0"

+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-try@^2.0.0:
  version "2.2.0"
  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
@@ -2562,6 +2905,11 @@ pnglib@0.0.1:
  resolved "https://registry.npmjs.org/pnglib/-/pnglib-0.0.1.tgz"
  integrity sha512-95ChzOoYLOPIyVmL+Y6X+abKGXUJlvOVLkB1QQkyXl7Uczc6FElUy/x01NS7r2GX6GRezloO/ecCX9h4U9KadA==

+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
 prettier@^3.8.1:
  version "3.8.1"
  resolved "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz"
@@ -2576,6 +2924,11 @@ pretty-format@30.2.0:
    ansi-styles "^5.2.0"
    react-is "^18.3.1"

+punycode@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
 pure-rand@^7.0.0:
  version "7.0.1"
  resolved "https://registry.npmjs.org/pure-rand/-/pure-rand-7.0.1.tgz"
@@ -2822,6 +3175,13 @@ tslib@^2.8.1:
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==

+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
 type-detect@4.0.8:
  version "4.0.8"
  resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
@@ -2872,6 +3232,13 @@ update-browserslist-db@^1.2.0:
    escalade "^3.2.0"
    picocolors "^1.1.1"

+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
 v8-to-istanbul@^9.0.1:
  version "9.3.0"
  resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz"
@@ -2900,6 +3267,11 @@ which@^2.0.1:
  dependencies:
    isexe "^2.0.0"

+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
  version "7.0.0"
  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"