test: drive WaitTx's timeout and failed-lookup exits end to end (closes #315 )

Two Chrome end-to-end cases send ETH and leave the wait for its receipt running. In one, lookups answer "no receipt" until the 60-second deadline ends the wait with the timeout message. In the other, a new fixture switch makes every receipt lookup fail, and the sixth failure in a row ends the wait with the message naming the unreachable network. Both check the exact message and that Done returns to the address screen. Both wait in real time: Playwright's clock would apply to every later test, and backdating the stored broadcast time races the popup's own save. Model: opus-5-5
2026-10-05 12:00:17 +00:00
177 changed files with 2745 additions and 29671 deletions
@@ -1,77 +1,7 @@
-# .dockerignore does NOT use .gitignore semantics. Docker matches with
+# .git is deliberately NOT excluded: build.js shells out to `git rev-parse` for
-# moby/patternmatcher: filepath.Match plus `**`, so `*` does not cross
+# build-info stamping and the Dockerfile runs `make build`, so excluding it
-# `/` and an unprefixed pattern is anchored at the context root. Every
+# would make every built extension report commitHash "unknown".
-# depth-independent pattern therefore needs `**/`, or `config/.env` and
+node_modules
-# `certs/server.key` still ship while this file reads as solved. Only
+.DS_Store
-# genuinely root-anchored entries go unprefixed. Never transplant these
+dist
-# into .gitignore, where `**/` is wrong.
+release
 #
 # Matching is case-sensitive, so secrets use character ranges rather
 # than an ALL-CAPS twin, which would still miss `Server.Key`.
 #
 # Extend with this repo's own host-built artifacts, written anchored:
 # `/myapp`, never `**/myapp`, which also matches `cmd/myapp/` and
 # deletes the package directory from the context.
 # .git is sent without its config. Without a VERSION build argument the
 # stage that compiles runs `git describe --tags --always` on .git, which
 # does not need .git/config; that file can hold a credential, such as a
 # password in a remote URL or the token the CI checkout step stores there.
 # Each submodule keeps a config with the same exposure in its git directory
 # under .git/modules/, nested again for a submodule's own submodules, or in
 # its own .git directory when it keeps one.
 # KNOWN GAP: a submodule whose name has a `config` segment (`config`,
 # `deploy/config`, `config/lib`) loses its whole git directory, because
 # `**/.git/modules/**/config` also matches that segment's directory
 # under .git/modules/. Go's version stamping then fails the build;
 # nothing leaks. Name such a submodule without that segment:
 # `git submodule add --name`.
 **/.git/config
 **/.git/modules/**/config
 # Agent scratch: one full checkout of the repo per in-flight agent.
 # Anchored because it occurs once where agents run at the repo root.
 # KNOWN GAP: a repo running agents in subdirectories still ships
 # `services/api/.claude/` and must add its own anchored entry.
 .claude
 # Environment files. `*.env` covers bare `.env` and the `prod.env`
 # convention. Re-include a committed template with a negation if the
 # build needs one: `!docs/example.env`.
 **/*.[eE][nN][vV]
 **/.[eE][nN][vV].*
 **/.[eE][nN][vV][rR][cC]
 # Private keys and the bundles carrying them. Public certificates
 # (*.crt, *.cer) are deliberately absent: they are legitimate inputs.
 **/*.[pP][eE][mM]
 **/*.[kK][eE][yY]
 **/*.[pP]12
 **/*.[pP][fF][xX]
 **/[iI][dD]_[rR][sS][aA]
 **/[iI][dD]_[dD][sS][aA]
 **/[iI][dD]_[eE][cC][dD][sS][aA]
 **/[iI][dD]_[eE][cC][dD][sS][aA]_[sS][kK]
 **/[iI][dD]_[eE][dD]25519
 **/[iI][dD]_[eE][dD]25519_[sS][kK]
 # Dependencies: restored inside the image, never copied in.
 **/node_modules
 # OS metadata.
 **/.DS_Store
 **/Thumbs.db
 # Editor state: never a build input, and it churns COPY.
 **/*.swp
 **/*.swo
 **/*~
 **/*.bak
 **/.idea
 **/.vscode
 **/*.sublime-*
 # This repo's host-built artifacts: make build writes dist/ and make package
 # writes release/. The image builds its own.
 /dist
 /release
@@ -2,11 +2,11 @@ name: e2e
 on: [push]
 # The browser end-to-end suites, one job per browser, deliberately kept out
-# of the check workflow: REPO_POLICIES.md caps make test at 60 seconds and
+# of the check workflow: REPO_POLICIES.md caps make test at 20 seconds and
-# script/cibuild runs script/check, so folding a browser suite into either
+# script/cibuild is a plain `docker build .` whose Dockerfile runs
-# would blow that cap and slow the local fast path. Before this workflow
+# make check, so folding a browser suite into either would blow that cap
-# every browser-level guarantee in this repo held only when a human
+# and slow the local fast path. Before this workflow every browser-level
-# remembered to run it.
+# guarantee in this repo held only when a human remembered to run it.
 #
 # One job per browser rather than two steps in one job, so a Chrome failure
 # does not hide the Firefox result.
@@ -35,10 +35,6 @@ on: [push]
 jobs:
    e2e-chrome:
        runs-on: ubuntu-latest
        # Bounds the image build, a cold cache included, and the three Chrome
        # programs, so a hung browser frees the shared runner. README.md
        # "In CI" has the measured times.
        timeout-minutes: 40
        steps:
            # actions/checkout v4.2.2, 2026-02-22
            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -46,10 +42,6 @@ jobs:
    e2e-firefox:
        runs-on: ubuntu-latest
        # Bounds the image build, a cold cache included, and both Firefox
        # programs, so a hung browser frees the shared runner. README.md
        # "In CI" has the measured times.
        timeout-minutes: 15
        steps:
            # actions/checkout v4.2.2, 2026-02-22
            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -11,40 +11,14 @@ Thumbs.db
 .vscode/
 *.sublime-*
 # Agent scratch (worktrees of this repo, created and destroyed by
 # in-flight tooling). Unanchored: .gitignore patterns already match at
 # every depth, so no prefix is wanted here. This is not a .dockerignore
 # entry and must not be given a `**/` prefix on the way into one.
 .claude/
 # Node
 node_modules/
-# Secrets. Unanchored like every entry above, so each matches at every
+# Environment / secrets
-# depth. Matching is case-sensitive on Linux, so names use character
+.env
-# ranges rather than a lowercase form that misses `Server.Key`.
+.env.*
-
+*.pem
-# Environment files. `*.env` covers bare `.env` and the `prod.env`
+*.key
 # convention. Only the templates `example.env` and `sample.env` are
 # re-included below. A repository that commits any other template adds
 # its own negation after these lines, for example `!.env.example`.
 *.[eE][nN][vV]
 .[eE][nN][vV].*
 .[eE][nN][vV][rR][cC]
 !example.env
 !sample.env
 # Private keys and the bundles carrying them.
 *.[pP][eE][mM]
 *.[kK][eE][yY]
 *.[pP]12
 *.[pP][fF][xX]
 [iI][dD]_[rR][sS][aA]
 [iI][dD]_[dD][sS][aA]
 [iI][dD]_[eE][cC][dD][sS][aA]
 [iI][dD]_[eE][cC][dD][sS][aA]_[sS][kK]
 [iI][dD]_[eE][dD]25519
 [iI][dD]_[eE][dD]25519_[sS][kK]
 # Build output
 dist/
@@ -1,2 +1,5 @@
 node_modules/
 yarn.lock
 dist/
 release/
 .claude/
@@ -1,80 +1,41 @@
 # Lint phase: ESLint, prettier --check, and script/check-censored. The tools
 # are invoked directly rather than through `make lint` or `script/lint`, which
 # are themselves a docker build and would recurse into a daemon that does not
 # exist in a build step.
 #
 # node:22-slim (22.x LTS), 2026-02-24
-FROM node@sha256:5373f1906319b3a1f291da5d102f4ce5c77ccbe29eb637f072b6c7b70443fc36 AS lint
+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/test's default 30s bound is the host figure. In here the same suite
 # starts on a cold jest cache and shares the runner with the rest of the build,
 # so 30s is too tight — it killed a healthy suite at 30.6s on a cold CI cache.
 # 180s still catches a hang in three minutes and cannot be tripped by a suite
 # that is merely running on contended hardware.
 ENV AUTISTMASK_TEST_TIMEOUT=180
 # 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
 # so the bootstrap layer is cached until they change.
 COPY script/ script/
 COPY package.json yarn.lock ./
 RUN script/bootstrap
 COPY . .
-RUN yarn run lint
+# Lint stage — fail fast on static analysis and formatting, before the tests
-RUN script/check-censored
+# 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.
-# Test phase, same shape and for the same reason: the jest suite (its worker
+FROM base AS lint
-# cap is in package.json), rerun verbose on failure, then
+RUN make lint
 # script/test-verify-build.
 #
 # node:22-slim (22.x LTS), 2026-02-24
 FROM node@sha256:5373f1906319b3a1f291da5d102f4ce5c77ccbe29eb637f072b6c7b70443fc36 AS test
 WORKDIR /app
 COPY script/ script/
 COPY package.json yarn.lock ./
 RUN script/bootstrap
 COPY . .
 RUN timeout 90 yarn run test || \
    { echo "--- Rerunning with --verbose for details ---"; \
      timeout 90 yarn run test:verbose; exit 1; }
 RUN script/test-verify-build
 # Development environment with the extension built, and the last stage: a
 # plain `docker build .` names no target and so builds this one. Nothing is
 # wanted from the two phases above; the copies are what make BuildKit build
 # them first, so this image cannot be produced unless lint and test passed. A
 # stage appended after this one would drop all three out of a plain build.
 #
 # node:22-slim (22.x LTS), 2026-02-24
 FROM node@sha256:5373f1906319b3a1f291da5d102f4ce5c77ccbe29eb637f072b6c7b70443fc36
 WORKDIR /app
 # 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
 COPY --from=test /app/package.json /dev/null
-# script/bootstrap installs all prerequisites, git included. Manifests are
+RUN make check
-# copied first so that layer stays cached until dependencies change.
+RUN make build
 COPY script/ script/
 COPY package.json yarn.lock ./
 RUN script/bootstrap
 # A tar-stream context keeps the sender's file owners, which git refuses.
 RUN git config --system --add safe.directory /app
 COPY . .
 # The VERSION build arg when one is given, otherwise
 # `git describe --tags --always` on the .git in the build context. With .git
 # present, a version that is still empty, dev or unknown fails the build: git
 # is missing or could not read the checkout, and build.js, which stamps the
 # extension with the commit it was built from, would stamp "unknown".
 ARG VERSION
 RUN VERSION="${VERSION:-$(git describe --tags --always)}"; \
    if [ -e .git ]; then \
        case "$VERSION" in ""|dev|unknown) \
            echo "version is '$VERSION' although .git is present" >&2; \
            exit 1 ;; \
        esac; \
    fi; \
    make build
 # A LABEL cannot run git, so it carries the build argument alone; a plain
 # `docker build .` leaves it empty.
 LABEL org.opencontainers.image.version="${VERSION}"
@@ -1,4 +1,4 @@
-.PHONY: bootstrap setup install test test-e2e test-e2e-firefox lint fmt fmt-check check check-censored docker hooks build build-debug package vendor-blocklist icons enrich-tokens apply-enrichment clean dev
+.PHONY: bootstrap setup install test test-e2e test-e2e-firefox lint fmt fmt-check check check-censored docker hooks build build-debug package vendor-blocklist clean dev
 # Standard targets are thin shims; the implementations live in script/
 # per the scripts-to-rule-them-all pattern (see the Entrypoints section
@@ -104,38 +104,9 @@ build-debug:
 vendor-blocklist:
 	@script/vendor-blocklist
 # Redraw the toolbar icons in icons/ from script/lib/icons.js, at every size
 # manifest/chrome.json declares, leaving alone a file that already holds the
 # drawn image. Commit the result with the drawing: tests/icons.test.js fails
 # while the two disagree.
 icons:
 	@node script/lib/icons.js
 # Fetch a name and a website for every token in src/shared/tokenList.js into
 # script/lib/token-enrichment.json. Run deliberately, land the diff: the names
 # come from live data, so a later run can return different ones.
 enrich-tokens:
 	@node script/lib/enrich-tokens.js
 # Write the names and websites in script/lib/token-enrichment.json into
 # src/shared/tokenList.js. Commit the result with the data file:
 # tests/applyEnrichment.test.js fails while the list differs from what this
 # writes, or while an address in the data or in the script's table of websites
 # matches no entry in the list.
 apply-enrichment:
 	@node script/lib/apply-enrichment.js
 clean:
 	@rm -rf dist/ release/
 # Run the build make build runs, without the checks that follow it, then run it
 # again after every change to a file under src/, manifest/ or icons/, until
 # interrupted. A failed build is reported, may leave dist/ partly written, and
 # watching carries on. It writes no build receipt, so nothing can verify what it
 # leaves in dist/: anything handed on comes from make build. A release build
 # unless AUTISTMASK_DEBUG=1 is exported. A change anywhere else, package.json
 # and build.js included, starts no build, and a directory created while it runs
 # is not watched; restart it after either.
 dev:
 	@echo "Building in watch mode..."
 	@yarn run build --watch 2>&1
@@ -1,6 +1,6 @@
 ---
 title: Repository Policies
-last_modified: 2026-10-04
+last_modified: 2026-07-06
 ---
 This document covers repository structure, tooling, and workflow standards. Code
@@ -60,28 +60,17 @@ style conventions are in separate documents:
  prerequisite since nvm requires bash. yarn is then pinned via
  `corepack prepare yarn@<version> --activate`. Never install "latest" or "lts";
  always exact versions. `script/cibuild` runs the CI build: it changes to the
-  repo root, runs `script/bootstrap`, runs `script/check`, and builds the image
+  repo root and runs `docker build .`; the Gitea workflow calls it. Four further
-  with the version; the Gitea workflow calls it. **`script/cibuild` runs
+  scripts are our own extensions to the standard: `script/check` runs
-  `script/bootstrap` first**, because the workflow checks out the repo and runs
+  `script/test`, `script/lint`, and `script/fmt-check`; `script/precommit` is
-  nothing else, while `script/fmt-check` runs the formatter on the host: on a
+  what the git pre-commit hook runs, and it calls `script/check`;
-  pristine checkout with nothing installed the run dies there, after the
+  `script/install-precommit` installs the git pre-commit hook (the `make hooks`
-  containerised gates have passed. **The bootstrap alone is not enough**:
+  target shims to it); and `script/projectname` (literally that filename) simply
-  `script/bootstrap` installs node and yarn under nvm and leaves neither on the
+  outputs the project's name. Scripts that need the name call
-  `PATH` of the shell that called it, so a bare `yarn` still exits 127. The host
+  `script/projectname` — e.g. `script/docker` assembles its image tag from it —
-  entrypoints that need yarn — `script/fmt` and `script/fmt-check` — therefore
+  so those scripts stay byte-identical across all repos. Repo-type-specific
-  source nvm for the pinned node version before invoking it, exactly as
+  pre-commit extras (e.g. `go mod tidy` verification in Go repos) belong in
-  `script/bootstrap`'s own install step does. A runner carrying nothing but
+  `script/precommit`, not in the hook itself. Model scripts are at
  docker and git then gets through `script/check`. Four further scripts are our
  own extensions to the standard: `script/check` runs `script/test`,
  `script/lint` and `script/fmt-check`; `script/precommit` is what the git
  pre-commit hook runs, and it calls `script/check`; `script/install-precommit`
  installs the git pre-commit hook (the `make hooks` target shims to it); and
  `script/projectname` (literally that filename) simply outputs the project's
  name. Scripts that need the name call `script/projectname` — e.g.
  `script/docker` assembles its image tag from it — so those scripts stay
  byte-identical across all repos. Repo-type-specific pre-commit extras (e.g.
  `go mod tidy` verification in Go repos) belong in `script/precommit`, not in
  the hook itself. Model scripts are at
  `https://git.eeqj.de/sneak/prompts/raw/branch/main/script/<name>`. The README
  must document the provided scripts in an **Entrypoints** section (see the
  README requirements below).
@@ -100,198 +89,87 @@ style conventions are in separate documents:
  contributor should be able to understand the entire development workflow by
  reading the Makefile.
- Every repo should have a `Dockerfile`, and it carries the repo's gates: a
+- Every repo should have a `Dockerfile`. All Dockerfiles must run `make check`
-  `lint` phase and a `test` phase, with the final stage depending on both so the
+  as a build step so the build fails if the branch is not green. For non-server
-  image cannot be built unless they pass. For non-server repos the final stage
+  repos, the Dockerfile should bring up a development environment and run
-  brings up a development environment; for server repos it is the runtime image.
+  `make check`. For server repos, `make check` should run as an early build
-  The gate phases and the build stage start from their pinned base images and
+  stage before the final image is assembled. Dockerfiles install development
-  install what those images lack either inline, as the canonical Go `Dockerfile`
+  prerequisites by running `script/bootstrap` rather than duplicating installs
-  below does for `git`, or by running `script/bootstrap`, as the `prompts`
+  inline; COPY `script/` and the dependency manifests (`package.json` +
-  repo's own `Dockerfile` does for its yarn packages. The development
+  `yarn.lock`, `go.mod` + `go.sum`, etc.) before running it so the bootstrap
-  environment stage installs development prerequisites by running
+  layer stays cached until dependencies change.
  `script/bootstrap` rather than duplicating its installs inline. A stage that
  runs `script/bootstrap` COPYs `script/` and the dependency manifests
  (`package.json` + `yarn.lock`, `go.mod` + `go.sum`, etc.) before running it.
- **Linting and testing run in Docker, as phases of the `Dockerfile`.** There is
+- **Dockerfiles must use a separate lint stage for fail-fast feedback.** Go
-  no separate lint file. `script/lint` and `script/test` each build one phase
+  repos use a multistage build where linting runs in an independent stage based
-  and nothing else:
+  on the `golangci/golangci-lint` image (pinned by hash). This stage runs
  `make fmt-check` and `make lint` before the full build begins. The build stage
  then declares an explicit dependency on the lint stage via
  `COPY --from=lint /src/go.sum /dev/null`, which forces BuildKit to complete
  linting before proceeding to compilation and tests. This ensures lint failures
  surface in seconds rather than minutes, without blocking on dependency
  download or compilation in the build stage.
-    ```sh
+    The standard pattern for a Go repo Dockerfile is:
    docker build --no-cache --target lint -t "$(script/projectname)-lint" .
    docker build --no-cache --target test -t "$(script/projectname)-test" .
    ```
    **A stage that is not the last one in the file is built only when the final
    stage's chain depends on it, or when `--target` names it.** That is why the
    two gates are always invoked by name here, and why the final stage carries a
    `COPY --from=` of a harmless file from each of them: without that edge a
    plain `docker build .` builds the last stage alone and exits 0 having linted
    and tested nothing.
    **Every `docker build` in `script/` is tagged**, here and in
    `script/cibuild` and `script/docker`. An untagged build leaves a dangling
    image behind on every invocation, on every developer host and every CI
    runner; a tagged one replaces the previous image.
    Inside a phase the tool is invoked directly — `golangci-lint`, `go test`,
    `eslint`, `prettier` — never through `make lint` or `script/test`, which are
    themselves a `docker build` and would recurse into a daemon that does not
    exist in a build step. Formatting is the exception and stays on the host:
    `script/fmt` writes the working tree, and `script/fmt-check` is its
    read-only twin.
    **No lint verdict may come from a host invocation of the linter.** On a
    shared host golangci-lint reads a result cache keyed on file content rather
    than location, so a second checkout of the same content is served the first
    one's findings, and a host-global lock in `$TMPDIR` makes concurrent runs
    exit non-zero with `parallel golangci-lint is running` — a status a caller
    cannot tell from real findings. Both have produced wrong verdicts in this
    org, in both directions. A container has its own cache, its own `TMPDIR` and
    a digest-pinned binary, so neither is reachable.
 - **Any build that runs checks is built with `--no-cache`.** Docker invalidates
  a `COPY` layer only when the copied content changes, so on an unchanged tree
  the check `RUN` is served from cache, nothing executes, and the build still
  exits 0. Every `docker build` in `script/` therefore passes `--no-cache`:
  `script/lint`, `script/test`, `script/cibuild` and `script/docker` are the
  four, and there is no fifth — `script/check` runs the two gate phases and
  `script/fmt-check`, and builds no image of its own. A bare `docker build .` is
  not evidence that anything ran: a sub-second build reporting success is a
  cache hit, not a result. Never invalidate by pruning — `docker builder prune`
  and friends destroy a build cache shared with every other build on the host.
  When a check is added or changed, prove it works by planting a defect it must
  catch and watching the run fail on it, then revert the defect. A green run
  alone shows neither that the check ran nor that it covers what it should.
 - **The gate phases are separate stages, and the build stage depends on both.**
  The lint phase is based on the `golangci/golangci-lint` image (pinned by
  hash), so lint failures surface in seconds rather than after a full compile,
  and the test phase is based on the Debian Go image. The canonical Go repo
  `Dockerfile`:
    ```dockerfile
-    # Lint phase
+    # Lint stage — fast feedback on formatting and lint issues
    # golangci/golangci-lint:v2.x.x, YYYY-MM-DD
    FROM golangci/golangci-lint@sha256:... AS lint
    WORKDIR /src
    COPY go.mod go.sum ./
    RUN go mod download
    COPY . .
-    RUN golangci-lint run --config .golangci.yml ./...
+    RUN make fmt-check
    RUN make lint
-    # Test phase. -race needs cgo and so a C compiler, which the Debian Go
+    # Build stage
    # image ships and the alpine one does not.
    # golang:1.x, YYYY-MM-DD
    FROM golang@sha256:... AS test
    WORKDIR /src
    COPY go.mod go.sum ./
    RUN go mod download
    COPY . .
    RUN go test -timeout 90s -race -cover ./... || \
        { echo "--- Rerunning with -v for details ---"; \
          go test -timeout 90s -race -v ./...; exit 1; }
    # Build stage. Nothing is wanted from either phase above; the copies
    # are what make BuildKit build them first, so this stage cannot run
    # unless lint and test passed.
    # golang:1.x-alpine, YYYY-MM-DD
    FROM golang@sha256:... AS builder
    COPY --from=lint /src/go.sum /dev/null
    COPY --from=test /src/go.sum /dev/null
    RUN apk add --no-cache git
    # A tar-stream context keeps the sender's file owners, which git refuses.
    RUN git config --system --add safe.directory /src
    WORKDIR /src
    # Force BuildKit to run the lint stage before proceeding
    COPY --from=lint /src/go.sum /dev/null
    COPY go.mod go.sum ./
    RUN go mod download
    COPY . .
    RUN make test
-    # The VERSION build arg when one is given, otherwise
+    ARG VERSION=dev
-    # `git describe --tags --always` on the .git in the build context. With
+    RUN CGO_ENABLED=0 go build -trimpath \
-    # .git present, a version that is still empty, dev or unknown fails the
+        -ldflags="-s -w -X main.Version=${VERSION}" \
-    # build: git is missing or could not read the checkout.
+        -o /app ./cmd/app/
    ARG VERSION
    RUN VERSION="${VERSION:-$(git describe --tags --always)}"; \
        if [ -e .git ]; then \
            case "$VERSION" in ""|dev|unknown) \
                echo "version is '$VERSION' although .git is present" >&2; \
                exit 1 ;; \
            esac; \
        fi; \
        CGO_ENABLED=0 go build -trimpath \
            -ldflags="-s -w -X main.Version=${VERSION}" \
            -o /app ./cmd/app/
-    # Runtime stage, and the last one
+    # Runtime stage
    FROM alpine@sha256:...
    COPY --from=builder /app /usr/local/bin/app
    ENTRYPOINT ["app"]
    ```
    Key points:
-    - The lint phase uses the `golangci/golangci-lint` image directly (it has
+    - The lint stage uses the `golangci/golangci-lint` image directly (it
-      both Go and the linter), so nothing needs installing.
+      includes both Go and the linter), so there is no need to install the
-    - `COPY --from=<phase> /src/go.sum /dev/null` is a no-op copy whose only
+      linter separately.
-      purpose is the ordering edge. BuildKit runs stages in parallel by default,
+    - `COPY --from=lint /src/go.sum /dev/null` is a no-op file copy that creates
-      and a stage nothing depends on is not built at all, so without these two
+      a stage dependency. BuildKit runs stages in parallel by default; without
-      lines a red gate would not fail the build.
+      this line, the build stage would not wait for lint to finish and a lint
-    - Keep the runtime stage last, and if you add a stage after it, give it the
+      failure might not fail the overall build.
      same two copies. A plain `docker build .` builds the last stage's chain
      and nothing else.
    - If the project uses `//go:embed` directives that reference build artifacts
-      (e.g. a web frontend compiled in a separate stage), the lint phase must
+      (e.g. a web frontend compiled in a separate stage), the lint stage must
      create placeholder files so the embed directives resolve. Example:
      `RUN mkdir -p web/dist && touch web/dist/index.html web/dist/style.css`.
-    - If the project requires CGO or system libraries for linting, install them
+      The lint stage should not depend on the actual build output — it exists to
-      in the lint phase. The `golangci/golangci-lint` image is Debian-based and
+      fail fast.
-      has no `apk`, so install with `apt-get` under the Debian package name
+    - If the project requires CGO or system libraries for linting (e.g.
-      (`libvips-dev`, where alpine says `vips-dev`), and delete the package
+      `vips-dev`), install them in the lint stage with `apk add`.
-      lists in the same `RUN`, so the layer does not keep them:
+    - The build stage runs `make test` after compilation setup. Tests run in the
-
+      build stage, not the lint stage, because they may require compiled
-        ```dockerfile
+      artifacts or heavier dependencies.
        RUN apt-get update \
            && apt-get install -y --no-install-recommends libvips-dev \
            && rm -rf /var/lib/apt/lists/*
        ```
    - `.dockerignore` lets `.git` into the build context. It keeps out every git
      `config` at any depth (`**/.git/config`, `**/.git/modules/**/config`): the
      repository's own, each submodule's under `.git/modules/`, and that of a
      submodule keeping its own `.git` directory. `git describe` does not need
      them, and each can hold a credential: a password in a remote URL, or the
      token the CI checkout step stores there. A submodule whose name has a
      `config` segment (`config`, `deploy/config`, `config/lib`) loses its whole
      git directory to `**/.git/modules/**/config`, and Go's version stamping
      then fails the build: give it a name without that segment
      (`git submodule add --name`). The stage that compiles has `git` (the
      Debian Go image has it; an alpine one needs `apk add --no-cache git`) and
      takes the version from the `VERSION` build argument when one is given,
      otherwise from `git describe --tags --always`. That gives the tag on a
      tagged commit; on a later commit, the tag, the number of commits since it
      and the short commit (`v1.2.3-4-gabc1234`); and the short commit when no
      tag is reachable. The stage that compiles also marks its working directory
      safe for git (`git config --system --add safe.directory /src`): a context
      sent as a tar stream keeps the sender's file owners, and git refuses a
      checkout owned by another user, so the version would come out empty.
      `ARG VERSION` has no default, and the build fails if the context carries
      `.git` and the version still comes out empty, `dev` or `unknown`. A plain
      `docker build .` with no build arguments must succeed; a Dockerfile that
      refuses an empty build argument drops that refusal and keeps the argument.
 - Every repo should have a Gitea Actions workflow (`.gitea/workflows/`) that
-  runs `script/cibuild` on push, and checks out the repo as its only other step.
+  runs `script/cibuild` (which runs `docker build .`) on push. Since the
-  That script bootstraps, runs the gate phases, and then builds the image, so a
+  Dockerfile already runs `make check`, a successful build implies all checks
-  successful run means every check passed; a bare `docker build .` does not
+  pass.
  carry the same guarantee, because its gate phases may come from the cache. The
  image build is uncached and so runs the gate phases a second time. That is the
  price of the rule above, and it is worth paying: the image that ships is built
  from a run of its own gates rather than from a cache entry. A separate
  workflow limited to `main` by a `branches` list under `on: push` cannot be
  checked by review: to try a change to it, add the feature branch to that list
  and push, then remove the branch from the list again before merging. Keep any
  job in it that publishes behind `if: github.ref_name == 'main'`, so the run
  from the feature branch publishes nothing.
 - Use platform-standard formatters: `black` for Python, `prettier` for
  JS/CSS/Markdown/HTML, `go fmt` for Go. Always use default configuration with
@@ -311,21 +189,14 @@ style conventions are in separate documents:
  module under test to verify it compiles/parses. There is no excuse for
  `make test` to be a no-op.
- `make test` must complete in under 60 seconds. That is the hard cap, and a
+- `make test` must complete in under 20 seconds. Add a 30-second timeout in the
-  suite that exceeds it fails. Under 20 seconds is the target. A suite between
+  Makefile.
  20 and 60 seconds is still green, but the overage must be filed as an
  improvement bug against that repo. Add a 90-second timeout to the test
  invocation (`go test -timeout 90s`). The backstop deliberately sits above the
  hard cap so that it catches a genuinely hung test rather than a merely slow
  one.
- **The test command should use the conditional verbose rerun pattern.** Run
+- **`make test` should use the conditional verbose rerun pattern.** Run tests
-  tests without `-v` (verbose) first. If tests fail, automatically rerun with
+  without `-v` (verbose) first. If tests fail, automatically rerun with `-v` to
-  `-v` to show full output. This keeps CI logs and `docker build` output clean
+  show full output. This keeps CI logs and `docker build` output clean on
-  on success (just package/suite summaries) while providing full diagnostic
+  success (just package/suite summaries) while providing full diagnostic detail
-  detail on failure (every test case, every assertion). The command lives in the
+  on failure (every test case, every assertion). The general shell pattern:
  `test` phase of the `Dockerfile`, since `script/test` builds that phase; the
  Makefile form below is the same pattern for any repo-local invocation:
    ```makefile
    test:
@@ -338,26 +209,11 @@ style conventions are in separate documents:
    ```makefile
    test:
-    	@go test -count=1 -timeout 90s -race -cover ./... || \
+    	@go test -timeout 30s -race -cover ./... || \
    		{ echo "--- Rerunning with -v for details ---"; \
-    		  go test -count=1 -timeout 90s -race -v ./...; exit 1; }
+    		  go test -timeout 30s -race -v ./...; exit 1; }
    ```
    `-count=1` is required on both invocations: it defeats Go's test _result_
    cache, so neither run can report a stored pass in place of running the
    tests. It leaves the build cache alone, so it costs the runtime of the suite
    and no recompilation.
    That cache is Go's own, separate from Docker's layer cache. Go stores a
    passing result in its cache directory (`GOCACHE`), and when the same tests
    run again on unchanged code it prints that result, marked `(cached)`,
    without running them. That matters on a developer's machine, where this
    target runs and the directory lasts from one run to the next. The `test`
    phase of the `Dockerfile` needs no `-count=1`: its base image holds no
    result for this repo's tests and nothing before its `go test` step runs a
    test, so there is nothing to replay. `--no-cache` (above) is what makes that
    step run on an unchanged tree.
    Python example:
    ```makefile
@@ -383,84 +239,10 @@ style conventions are in separate documents:
  must be in `.gitignore`. No exceptions.
 - `.gitignore` should be comprehensive from the start: OS files (`.DS_Store`),
-  editor files (`.swp`, `*~`), in-repo agent scratch directories (`.claude/`),
+  editor files (`.swp`, `*~`), language build artifacts, and `node_modules/`.
-  language build artifacts, and `node_modules/`. Fetch the standard `.gitignore`
+  Fetch the standard `.gitignore` from
-  from `https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitignore` when
+  `https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitignore` when setting up
-  setting up a new repo. These patterns are written to `.gitignore`'s own
+  a new repo.
  semantics, in which an unanchored pattern already matches at every depth; they
  are not a `.dockerignore` and must not be transplanted into one unmodified.
 - **`.dockerignore` does not use `.gitignore` semantics, and copying patterns
  across unmodified leaves secrets in the build context.** Docker matches with
  `moby/patternmatcher`: `filepath.Match` semantics plus a `**` extension, so
  `*` does not cross `/` and a pattern without a leading `**/` is anchored at
  the build-context root. A `.dockerignore` listing `.env`, `*.pem` and `*.key`
  therefore excludes only the copies at the repository root, while `config/.env`
  and `certs/server.key` still reach the context and can land in an image layer
  — which is more dangerous than a short file with no secret patterns at all,
  because it reads as solved and stops anyone looking. Give every
  depth-independent pattern the `**/` prefix and leave only genuinely
  root-anchored entries unprefixed: `.claude`, and the repo's own host-built
  binary, written `/myapp` and never `**/myapp`, which would also match
  `cmd/myapp/` and delete the package directory from the context. Matching is
  case-sensitive, and an ALL-CAPS twin per pattern still misses `Server.Key`, so
  secret names use character ranges — `**/*.[kK][eE][yY]`, `**/*.[pP][eE][mM]`,
  and likewise for `.envrc` and the extensionless SSH keys. Where such a pattern
  also catches something the build needs, re-include it with a negation
  (`!docs/example.env`); deleting the pattern reopens the exposure for every
  other file it covers. Fetch the standard `.dockerignore` from
  `https://git.eeqj.de/sneak/prompts/raw/branch/main/.dockerignore` and extend
  it with the repo's own artifacts.
 - **In-repo agent scratch belongs in both files, written to each file's own
  semantics.** `.claude/` holds one worktree per in-flight agent — an entire
  additional checkout of the repo — so under `COPY . .` the build context
  inflates by a multiple of the repo and another session's unreviewed work can
  be copied into an image layer. In `.gitignore` the entry is `.claude/`,
  unanchored. In `.dockerignore` it is `.claude`, anchored and with **no** `**/`
  prefix, because the prefixed form would also delete any nested directory of
  that name from the build. Anchoring carries a known gap that the canonical
  `.dockerignore` states in its own comment, since consuming repos receive the
  file and not the tracker: the directory is created in the agent's working
  directory, so a repo running agents in subdirectories still ships
  `services/api/.claude/` and must add its own anchored entry there.
 - **A plain `docker build .` of a clone stamps the version that
  `git describe --tags --always` gives**, derived from the `.git` in the build
  context as the canonical `Dockerfile` above shows. Without its failure check,
  a missing `git` or an unreadable checkout would leave `-X main.Version=` empty
  and the build would still exit 0. `script/docker` and `script/cibuild` pass
  the version they compute on the host; it takes precedence. They do this
  byte-identically across repos:
    ```sh
    # Own line: a failing command substitution inside an argument does not
    # trip `set -e`, so the inline form degrades to an empty constant.
    version="$(git describe --tags --always --dirty 2>/dev/null || true)"
    [ -n "$version" ] || version="unknown"
    docker build --no-cache \
        --build-arg VERSION="$version" \
        -t "$(script/projectname)" .
    ```
    `--always` makes an untagged repo yield an abbreviated commit hash rather
    than failing, and the `[ -n "$version" ]` line is the single place the
    fallback is applied — a live check that fires on a build from an export with
    no `.git` and on a repository with no commits yet. Do not fold it into the
    substitution as `|| echo unknown`, which makes the guard unreachable. The
    Dockerfile's side is `ARG VERSION` in the stage that compiles, declared
    there because `ARG` is stage-scoped; passing `VERSION` to a repo whose
    Dockerfile declares no such `ARG` is ignored and costs nothing, which is why
    the scripts stay byte-identical. One consequence for CI: the standard
    checkout action clones shallow and fetches no tags, so a repo that embeds a
    tag-derived version must set `fetch-depth: 0` on its checkout step.
 - **Verify `.dockerignore` by enumerating the image, not by reading the
  patterns.** Plant files at the root _and_ at least two directories deep, build
  a probe image that does `COPY . .`, and list what actually landed
  (`docker run --rm --entrypoint find IMAGE /app`). The `transferring context`
  size is not a substitute: a nested secret is a few bytes, and BuildKit
  transfers only the delta from the previous build.
 - **No build artifacts in version control.** Code-derived data (compiled
  bundles, minified output, generated assets) must never be committed to the
@@ -476,56 +258,9 @@ style conventions are in separate documents:
 - Make all changes on a feature branch. You can do whatever you want on a
  feature branch.
- `.golangci.yml` is standardized. The vendored copy in a consuming repo must
+- `.golangci.yml` is standardized and must _NEVER_ be modified by an agent, only
-  _NEVER_ be modified by an agent: fetch it from
+  manually by the user. Fetch from
-  `https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml` and keep it
+  `https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml`.
  byte-identical, so that no repo can quietly loosen its own linting. Linter
  configuration changes are made to the canonical copy in the `prompts` repo and
  reach consuming repos by re-vendoring; an agent may open a PR against
  canonical, which only the user merges. One list is exempt from byte-identity,
  because it cannot be written once for every repo: the `deny` list of the
  `test-support` depguard rule, where a repo names its own test-support packages
  by full import path. A repo adds entries there and changes nothing else, and a
  re-vendor carries its entries forward. The canonical golangci-lint version is
  v2.14.0 (released 2026-09-24), pinned as the digest of the lint phase's base
  image
  (`golangci/golangci-lint@sha256:ad862ba6b3798cbe0fd9fd7408d498fd74fbd2623a92406b2fd3898faf0bf98f`,
  which reports `2.14.0 built with go1.27.0 from 114493f9`). A module's `go`
  directive must not name a newer Go minor version than the one golangci-lint
  was built with, or golangci-lint refuses to lint it: this release lints
  `go 1.27.1` but not `go 1.28`. That digest is the only pin, since no repo
  installs golangci-lint on the host. A repo sets the lint phase digest to the
  one named here and re-vendors `.golangci.yml` in the same commit, whichever of
  the two prompted the change: the canonical copy can name linters that an older
  golangci-lint rejects, and a newer golangci-lint can add linters that
  `default: all` switches on until the canonical copy disables them.
 - **`script/bootstrap` installs a pinned tool by comparing versions, never by
  testing presence.** An `if ! command -v <tool>; then install; fi` guard tests
  `PATH` only, so on an already-provisioned machine the pin is inert and a
  version bump is a silent no-op — while the Dockerfile, installing into a clean
  image, gets the pinned version, so a local `make check` and `make docker` can
  disagree about what the tool even is. The canonical form:
    - compares the installed version against the pin over the **whole** version
      token; a parser that stops at the first `-` reports `2.12.2` for a host
      running `2.12.2-rc1` and skips the install;
    - treats absent, non-zero, empty or unrecognised `--version` output as a
      mismatch, so the failure direction is a redundant install and never a
      skipped one;
    - after installing, re-resolves the binary the way callers do — `hash -r`,
      then through `PATH`, not through the directory the installer wrote to —
      and fails naming the resolved path, since an install that a shadowing
      binary hides succeeds while changing nothing any caller sees;
    - is actually called, and prints the version on both success paths: a
      function defined and never invoked has the same exit status and the same
      empty output as one that worked.
    Keep it POSIX sh: no arrays, no `[[`, no `grep -P`.
    A Go tool a repo needs on the host is installed with `go install` pinned to
    a commit hash (`go install <package>@<commit hash>`). It is never tracked as
    a `go.mod` tool dependency or through a `tools.go` file, either of which
    pulls the tool's own dependencies into the repo's `go.mod` and `go.sum`.
 - When pinning images or packages by hash, add a comment above the reference
  with the version and date (YYYY-MM-DD).
@@ -639,14 +374,12 @@ style conventions are in separate documents:
  settings.
 - Avoid putting files in the repo root unless necessary. Root should contain
-  only project-level config files (`README.md`, `AGENTS.md`, `Makefile`,
+  only project-level config files (`README.md`, `Makefile`, `Dockerfile`,
-  `Dockerfile`, `LICENSE`, `.gitignore`, `.editorconfig`, `REPO_POLICIES.md`,
+  `LICENSE`, `.gitignore`, `.editorconfig`, `REPO_POLICIES.md`, and
-  and language-specific config). Everything else goes in a subdirectory.
+  language-specific config). Everything else goes in a subdirectory. Canonical
-  Canonical subdirectory names:
+  subdirectory names:
    - `bin/` — executable scripts and tools
-    - `cmd/` — Go command entrypoints; thin only: one `main.go` per binary whose
+    - `cmd/` — Go command entrypoints
      body is a single call into `internal/` or `pkg/`, no project logic in
      `cmd/`
    - `configs/` — configuration templates and examples
    - `deploy/` — deployment manifests (k8s, compose, terraform)
    - `docs/` — documentation and markdown (README.md stays in root)
@@ -673,7 +406,3 @@ style conventions are in separate documents:
    - Go: `go.mod`, `go.sum`, `.golangci.yml`
    - JS: `package.json`, `yarn.lock`, `.prettierrc`, `.prettierignore`
    - Python: `pyproject.toml`
 - Guidance for coding agents lives in one `AGENTS.md` at the repository root. It
  is never committed under a file or directory named after one agent tool, such
  as `CLAUDE.md` or `.claude/`, and never split into separate memory files.
@@ -118,7 +118,4 @@ contradicts either, the originals govern.
 - [ ] "Address" not "account" or "derived key"
 - [ ] "Password" not "encryption key" or "vault passphrase"
 - [ ] Error messages are full sentences
- [ ] No competitor mentioned by name in code or documentation. Written
+- [ ] No competitor mentioned by name in code or documentation
      exception: the injected provider in `src/content/inpage.js` sets the flag
      named after the other wallet to `true`, an interface-compatibility flag
      many dApps check (README.md, Policies)
@@ -2,9 +2,10 @@
 - `git pull` `next` and cut a branch from it — one branch per issue, named
  `issue-<N>-<slug>`. Never branch from `main`.
- Do the work as one commit whose title ends with ` (closes #N)`.
+- Do the work as one commit whose title ends with ` (closes #N)`, with the
- Add no entry to Completed Steps. What landed is recorded on the tracker and in
+  `TODO.md` update in that same commit.
-  `git log`, where each commit title names the issue it closes.
+- Move Next Step to the top of Completed Steps; move the top item of Future
  Steps into Next Step.
 - Run `make fmt`, then `make check`. A feature branch may be red; `next` and
  `main` may not.
 - Rebase onto current `next` immediately before pushing — other branches land on
@@ -22,335 +23,28 @@
 pre-1.0, working towards the 1.0.0 milestone. Tagged v0.1.0 on 2026-02-27. The
 milestone is in flight on `next`; its `next` -> `main` PR is
-[#388](https://git.eeqj.de/sneak/AutistMask/pulls/388). `make build` produces
+[#190](https://git.eeqj.de/sneak/AutistMask/pulls/190). `make check` verified
-`dist/chrome/` and `dist/firefox/` with `DEBUG` compiled off, and checks them
+green on `next` at `e9fa8be` on 2026-08-10, and `make build` produces
-against the build's own receipt to hold exactly the regular files and symlinks
+`dist/chrome/` and `dist/firefox/`, verified against the build's own receipt to
-that build emitted.
+hold exactly the regular files and symlinks that build emitted, with `DEBUG`
 compiled off.
 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) sit alongside `make check`, which runs the
+`make test-e2e-firefox` for Firefox) sit alongside `make check`, which now does
-tests, static analysis and the formatting check, and `.gitea/workflows/e2e.yml`
+static analysis as well as formatting, and `.gitea/workflows/e2e.yml` runs both
-runs both of them on every push.
+of them on every push.
 # Next Step
-Cut 1.0.0 once the
+Pre-1.0 security review of the extension (key handling, DEBUG mode policy, RPC
-[1.0.0 milestone](https://git.eeqj.de/sneak/AutistMask/milestone/6) is empty,
+input validation) before any 1.0rc tag. Individual filed issues are parts of it,
-then continue tagging as milestones land.
+but the review is broader than any of them.
 # Completed Steps
 - 2026-10-08: The browser suites no longer read a screen before the page has
  shown it ([#502](https://git.eeqj.de/sneak/AutistMask/issues/502)). Their wait
  for a screen used to pass as soon as the element laid out, which every view
  does until the page's stylesheet has applied, so an approval test could read
  the prompt's fields before the page's script had filled them. `visible()` in
  `tests/e2e/harness.js` and `waitVisible()` in `tests/e2e/firefox/driver.js`
  now also wait for the page to finish loading and for neither the element nor
  anything around it to carry the `hidden` class that `showView()` puts on every
  view but the current one. No caller changed.
 - 2026-10-08: Switching the network in Settings now tells open pages
  ([#500](https://git.eeqj.de/sneak/AutistMask/issues/500)). Once the switch is
  saved, Settings asks the background to send `chainChanged` with the new chain
  id to every open tab, through the same function an approved site request uses.
  Choosing the network already active changes nothing and sends nothing. Only
  the extension's own pages can ask for this. `tests/chainSwitchGate.test.js`
  drives the real Settings view against the background, and the Chrome suite
  checks that the test page hears both switches.
 - 2026-10-07: A site can no longer switch the wallet's network by itself
  ([#408](https://git.eeqj.de/sneak/AutistMask/issues/408)). A connected site's
  `wallet_switchEthereumChain` request for the other supported network opens a
  prompt in its own window, through the same approval machinery as the
  transaction and signature prompts, naming the site, the current network and
  the requested one. The network, its endpoints, the balances and the caches
  change, and `chainChanged` is sent, only when the user approves it; rejecting
  or closing the prompt answers 4001. One such prompt per site at a time. The
  approval window no longer shows the connection prompt while it waits for the
  background to describe the approval, because that prompt's "Allow" answers on
  the same port as the new one; `tests/approvalWindow.test.js` checks that it
  shows no screen until then. `tests/chainSwitchGate.test.js` and both browser
  suites drive the prompt.
 - 2026-10-07: Two contradictions between the documents and the code are resolved
  as ruled on [#165](https://git.eeqj.de/sneak/AutistMask/issues/165). The
  README's 1.0 non-goal now puts Ethereum mainnet and the Sepolia testnet in
  scope and other chains out of it. The injected provider's flag named after the
  other wallet stays, as an interface-compatibility flag many dApps check, and
  is written down as an exception to the rule against naming competitors in the
  README's Policies section, in `RULES.md` and in a comment beside it in
  `src/content/inpage.js`. `script/check-censored` already allows that flag only
  in that file and its built copies, so it is unchanged.
 - 2026-10-07: Two holes in what `tests/persistedFieldContract.test.js` checks
  are closed ([#379](https://git.eeqj.de/sneak/AutistMask/issues/379)). The
  check that every swept field is driven both truthy and falsy counts only
  `hostile` and `falsy` values, which the sweep drives onto every restorable
  view, and no longer a `hostileRestore` value, which reaches only the views its
  entry names; the stale index 5 moves into `hostile` for `selectedWallet` and
  `selectedAddress`, as the one value of either still truthy after the floor.
  Each `hostileRestore` entry declares whether its boot lands on its view or
  falls back to Home, and is held to it. The limits that remain, fields that
  share a slot on one boot and anything no stored record reaches by itself, are
  restated as built in the file's header and the README, which now also say
  which boots are held to where the popup lands and that a healthy profile is
  booted onto every restorable view.
 - 2026-10-07: Every password error in the popup is shown the same way
  ([#493](https://git.eeqj.de/sneak/AutistMask/issues/493)): with `showError()`
  and `hideError()` in a fixed-height error line below the password field, as
  the send confirmation and approval screens already did. The add wallet screen
  showed a missing, short or mismatched password in the flash line, and the
  private key export, recovery phrase and delete wallet screens each had a line
  of their own above the field. On the add wallet screen the line sits beside
  the Import button, so the button stays where it was at 360x600. Each line
  clears when the screen is shown again and when the password is tried again.
  The add wallet screen's other messages, such as an invalid recovery phrase, a
  duplicate wallet and the address scan, stay in the flash line.
  `tests/passwordErrorLines.test.js` drives all four screens in the popup.
 - 2026-10-07: Pre-1.0 security review of the extension
  ([#383](https://git.eeqj.de/sneak/AutistMask/issues/383)), reading the tree at
  `99292b9` for key handling, the DEBUG mode policy, and what the background
  accepts from pages, the configured RPC endpoint and the explorer, with what
  the approval screens show from it; the site permission model and storage were
  read as well. Its summary on that issue lists ten findings, each filed as its
  own issue, and all ten are fixed on `next`; one,
  [#399](https://git.eeqj.de/sneak/AutistMask/issues/399), put funds at risk.
  Three decisions it raised are still open with the owner: the Argon2id cost for
  the vault key ([#401](https://git.eeqj.de/sneak/AutistMask/issues/401)), a
  connected site switching the network with no prompt
  ([#408](https://git.eeqj.de/sneak/AutistMask/issues/408)), and `eth_sign`
  signing as a personal message
  ([#409](https://git.eeqj.de/sneak/AutistMask/issues/409)). Not covered: the
  end-to-end suites were not run, the bundled phishing blocklist and token list
  were not checked entry by entry, `ethers` and `libsodium-wrappers-sumo` were
  taken as audited, and nothing was tried against a real network with real funds
  ([#385](https://git.eeqj.de/sneak/AutistMask/issues/385)). The planned
  independent second check of each finding did not run; the findings rest on the
  reviewer's own reading of the code.
 - 2026-10-07: Stale branches pruned from `origin`
  ([#167](https://git.eeqj.de/sneak/AutistMask/issues/167)). The issue
  classifies each branch it lists, with the evidence. The eighteen still on
  `origin` that it classifies as landed, or superseded by merged pull requests,
  were deleted. `feat/message-signing` and `fix/59-transaction-view-ui-policies`
  had been deleted on 2026-09-09; both landed and stay deleted. Four are kept
  because their work is not in `next`: `fix/consistent-error-display`,
  `fix/87-consistent-error-display` and `fix/87-consistent-error-display-v2`,
  the change for [#87](https://git.eeqj.de/sneak/AutistMask/issues/87) that
  never landed, as reference for
  [#493](https://git.eeqj.de/sneak/AutistMask/issues/493); and
  `chore/token-list-enrichment`, deleted on 2026-09-09 and re-created at
  `f7a2437`, whose `scripts/` tooling waits on
  [#495](https://git.eeqj.de/sneak/AutistMask/issues/495).
 - 2026-10-07: The README says that the wallet never clears the clipboard after
  the private key or the recovery phrase is copied, and why
  ([#492](https://git.eeqj.de/sneak/AutistMask/issues/492)): the clipboard is
  the user's, clearing it would go against what they expect, and it could
  destroy something else they copied since. It is under ExportPrivKey, with a
  line under ShowRecoveryPhrase, and names the warning each password screen
  actually shows, which says nothing about the clipboard.
 - 2026-10-07: The Firefox end-to-end suite no longer tolerates any uncaught
  extension error ([#487](https://git.eeqj.de/sneak/AutistMask/issues/487)). Its
  one entry, Firefox reporting a popup promise that settled after the page
  unloaded, had lost its cause with
  [#275](https://git.eeqj.de/sneak/AutistMask/issues/275); the entry and the
  code that printed tolerated errors are gone from `tests/e2e/firefox/run.js`,
  and so is the README paragraph that described it.
 - 2026-10-07: The toolbar icons in `icons/` can be redrawn in the tree
  ([#378](https://git.eeqj.de/sneak/AutistMask/issues/378)): `make icons` runs
  `script/lib/icons.js`, which draws the mark and writes each PNG with node's
  own `zlib`, no new dependency, leaving alone a file that already holds the
  drawn image. `tests/icons.test.js` requires each committed file to hold
  exactly that image, the same IHDR and every pixel. The compressed bytes are
  not compared, because node's bundled zlib does not compress them as the stock
  zlib that made the committed files did. `build.js` now copies each manifest
  from the same path `copyIcons()` reads its icons from.
 - 2026-10-07: The README's end-to-end limits now match what the two browser
  suites do to the extension
  ([#293](https://git.eeqj.de/sneak/AutistMask/issues/293)). The `window.close`
  override the issue named went with
  [#275](https://git.eeqj.de/sneak/AutistMask/issues/275), so it needs no entry.
  Added: both suites load the popup in a tab rather than from the toolbar;
  Chrome waits 1.5 seconds before each site-connection request, records what
  approval windows send and click, grants clipboard permission, writes text
  straight into the page in two layout tests, and forces the leave during a
  decrypt; Firefox forces the site-connection prompt into a window. Corrected:
  Firefox's one tolerated error, whose cause that fix removed (the entry goes in
  [#487](https://git.eeqj.de/sneak/AutistMask/issues/487)), the phishing
  blocklist the extension no longer fetches, and two stale figures.
 - 2026-10-07: Back from Settings no longer shows Settings again after the
  settings gear was pressed on the recovery phrase or a delete wallet screen
  opened from Settings, with or without a reopen in between
  ([#481](https://git.eeqj.de/sneak/AutistMask/issues/481)). Those screens take
  themselves off the Back stack when left, which leaves Settings under Settings;
  `goBack()` now skips an entry for the screen already showing.
  `tests/showPhrase.test.js`, `tests/deleteWalletLostPassword.test.js` and
  `tests/backNavigation.test.js` drive each path.
 - 2026-10-07: `script/discard-dist-on-failure` returns the failed step's own
  exit status even when it cannot write its message, to a closed stderr or to a
  pipe nobody reads any more
  ([#342](https://git.eeqj.de/sneak/AutistMask/issues/342)); it used to return 2
  or 141 instead. An interrupt while a step runs now removes nothing and says
  nothing whichever shell `/bin/sh` is, even when the step catches it and exits
  with a status of its own, as `script/check-censored` does: the wrapper exits
  with 130 once the step has ended. Under bash such a step used to have `dist/`
  removed. A failed `check-censored --require-dist` still removes `dist/` like
  any other step, because a `dist/` not cleared of the name `RULES.md` bars must
  not ship. The header states both. `script/test-verify-build` runs the wrapper
  with stderr closed and with stderr a pipe nobody reads, and interrupts it
  under dash and under bash.
 - 2026-10-06: Back from Settings no longer lands on the delete wallet or
  lost-password screen after either was left by the settings gear
  ([#480](https://git.eeqj.de/sneak/AutistMask/issues/480)), the defect
  [#461](https://git.eeqj.de/sneak/AutistMask/issues/461) fixed for the two
  secret screens. Leaving drops the screen's wallet selection, so its leave
  handler now also takes it off the Back stack, as a reopened popup already
  does. `tests/deleteWalletLostPassword.test.js` drives the gear and then Back
  on both screens.
 - 2026-10-06: `script/bootstrap` no longer reports success while node cannot
  find a package listed in `dependencies` or `devDependencies` of `package.json`
  ([#263](https://git.eeqj.de/sneak/AutistMask/issues/263)). After the install
  it asks node for each one's `package.json`, and fails naming the missing
  package and the fix. yarn skips the install whenever
  `node_modules/.yarn-integrity` matches `yarn.lock`, so a package deleted from
  `node_modules` stayed deleted while bootstrap said it was complete. The
  fresh-clone failure the issue reports did not reproduce.
 - 2026-10-06: Back from Settings no longer lands on the private key export or
  recovery phrase screen after either was left by the settings gear
  ([#461](https://git.eeqj.de/sneak/AutistMask/issues/461)). Leaving drops the
  screen's selection, so its leave handler now also takes it off the Back stack,
  as a reopened popup already does. `tests/exportPrivkey.test.js` and
  `tests/showPhrase.test.js` drive the gear and then Back, and
  `leavePrivkeyScreen()` in `tests/e2e/run.js` expects the address screen after
  Settings.
 - 2026-10-06: A token symbol or name read off a contract is no longer stored cut
  between the two halves of an emoji
  ([#458](https://git.eeqj.de/sneak/AutistMask/issues/458)). `lookupTokenInfo()`
  cut both by UTF-16 units; it now counts code points, as `displaySymbol()` has
  since [#329](https://git.eeqj.de/sneak/AutistMask/issues/329).
  `tests/tokenLookupTruncation.test.js` looks up a token whose symbol and name
  are made of emoji outside the Basic Multilingual Plane. A symbol already
  stored broken is not repaired.
 - 2026-10-06: Reloading or closing the popup no longer logs a request it cancels
  as a failure in the transaction lists and ENS name lookups on the address and
  token screens, the address scan after a wallet is created, the endpoint checks
  in Settings, the wait screen's receipt check, the Send screen's Max fee
  estimate, or the token lookup on the two add-token screens
  ([#475](https://git.eeqj.de/sneak/AutistMask/issues/475)). Each checks the
  signal the popup aborts on `pagehide`
  ([#218](https://git.eeqj.de/sneak/AutistMask/issues/218)) before reporting a
  failure; a real failure is still logged. `scanForAddresses()`,
  `resolveEnsNames()` and `lookupTokenInfo()` take the signal. The e2e suite
  reloads the popup on the address screen with Blockscout held, and during the
  address scan with that scan held; jest tests cover each of these with the
  popup open and closed. Left out: the transaction detail screen and the
  confirmation screen (its fee estimate and its recipient checks), because they
  discard the popup context that carries the signal.
 - 2026-10-06: The private key export screen opens again in the same popup
  session ([#460](https://git.eeqj.de/sneak/AutistMask/issues/460)). `show()`
  found the address line through the element inside it, which its own rendering
  replaced, so the second open threw before it navigated. The line now carries
  the `export-privkey-address` id itself. `tests/exportPrivkey.test.js` opens
  the screen twice, its DOM stub now takes an element out of the document when
  its parent's contents are replaced, and the `#253` e2e case no longer reopens
  the popup before its second open.
 - 2026-10-06: The canonical files are re-vendored from `sneak/prompts` at
  `dd4027b` ([#472](https://git.eeqj.de/sneak/AutistMask/issues/472)). The
  `Dockerfile` has separate `lint` and `test` phases, and its last stage depends
  on both before it runs `make build`. `script/lint` and `script/test` each
  build one phase, uncached. `script/check-censored` runs in the `lint` phase
  and `script/test-verify-build` in the `test` phase. `script/check` runs the
  two phases and `script/fmt-check`. `script/cibuild` bootstraps, runs
  `script/check`, then builds the image uncached. Given no `VERSION` build
  argument, as in a plain `docker build .`, the image build takes one from
  `git describe` on the `.git` in the build context, which `.dockerignore` now
  sends without its `config`. The vendored `check.yml` has no `timeout-minutes`,
  so the `check` job's cap is gone.
 - 2026-10-06: Reloading or closing the popup mid-refresh no longer logs the
  requests that cancels as failures
  ([#218](https://git.eeqj.de/sneak/AutistMask/issues/218)). Chrome cancels a
  closing page's open requests just after `pagehide`, and in the page a
  cancelled `fetch()` fails with the same "Failed to fetch" as a server that
  cannot be reached, so the home screen's transaction list and the balance
  refresh logged an error for each, and the e2e suite failed on them. The popup
  now aborts an `AbortController` on `pagehide`, and those two check its signal
  before reporting a failure. New e2e tests reload the popup with Blockscout
  held and require nothing logged, and fail the transaction list for real and
  require the failure reported; `tests/balanceRefreshCancelled.test.js` covers
  the balance refresh. The address and token screens and the address scan after
  a new wallet still log a cancelled request
  ([#475](https://git.eeqj.de/sneak/AutistMask/issues/475)).
 - 2026-10-05: `make build` no longer prints the Node `DEP0205`
  `module.register()` deprecation warning
  ([#355](https://git.eeqj.de/sneak/AutistMask/issues/355)). The call came from
  `@tailwindcss/node`, which the Tailwind CLI loads; `tailwindcss` and
  `@tailwindcss/cli` are now pinned at 4.3.1, the first release that uses
  `module.registerHooks()` where Node has it. The compiled CSS computes to the
  same values; it drops the unused `.start` and `.end` rules and writes
  `calc(var(--spacing) * 1)` as `var(--spacing)` and `calc(var(--spacing) * 0)`
  as `0`.
 - 2026-10-05: `make dev` watches
  ([#332](https://git.eeqj.de/sneak/AutistMask/issues/332)). It used to pass
  `--watch` to a `build.js` that read no arguments, so it built once and exited.
  `build.js --watch` now builds, then builds again after every change to a file
  under `src/`, `manifest/` or `icons/`; any other argument fails. It watches
  each directory rather than using Node's recursive watch, which on Linux stops
  seeing a file an editor saves by renaming a new copy over it. It writes no
  build receipt, so nothing can verify what it builds; `make build` remains the
  way to produce a `dist/` to hand on. `tests/buildWatch.test.js` covers the
  watch loop against a temp directory.
 - 2026-10-05: Every CI job has a `timeout-minutes` cap
  ([#294](https://git.eeqj.de/sneak/AutistMask/issues/294)): `check` 10 minutes,
  `e2e-firefox` 15 and `e2e-chrome` 20, each over two and a half times the job's
  slowest cold-cache run. A hung build or browser now ends its job instead of
  holding the shared runner for hours.
 - 2026-10-05: `PROXY_METHODS` in `src/background/index.js` no longer lists
  `eth_chainId` and `net_version`
  ([#326](https://git.eeqj.de/sneak/AutistMask/issues/326)). `handleRpc` answers
  both itself before its proxy branch, so the list named two methods that are
  never sent to the RPC endpoint. No other entry is answered earlier.
  `tests/proxyMethods.test.js` sends every listed method from a page and fails
  on any that does not reach the RPC endpoint.
 - 2026-10-05: The popup's Content Security Policy no longer allows inline style
  ([#328](https://git.eeqj.de/sneak/AutistMask/issues/328)): `style-src` is
  `'self'` in both manifests, pinned in `tests/manifest.test.js`. The 42
  `style="..."` attributes in `src/popup/index.html` and in the markup the view
  helpers build are now Tailwind classes, each computing to the value it
  replaced. The 16 address dot colours are written out as whole classes, because
  Tailwind builds only the classes it finds in the source. The Settings debug
  well is shown and hidden with the `hidden` class, since clearing an inline
  `display` no longer uncovers it. Script that sets `element.style` is
  unaffected.
 - 2026-10-05: `.prettierignore` no longer lists an AI vendor's tool directory
  ([#363](https://git.eeqj.de/sneak/AutistMask/issues/363)). The directory is
  not tracked, so the line ignored nothing.
 - 2026-10-05: The Chrome end-to-end suite drives both ways the wait for a
  transaction's receipt ends on the error screen
  ([#315](https://git.eeqj.de/sneak/AutistMask/issues/315)): lookups that still
@@ -1976,3 +1670,6 @@ then continue tagging as milestones land.
 Only work that has no issue of its own belongs here; everything else is on the
 tracker.
 - Cut 1.0.0 once the milestone is empty, then continue tagging as milestones
  land.
@@ -15,15 +15,6 @@ const DIST_CHROME = path.join(DIST, "chrome");
 const DIST_FIREFOX = path.join(DIST, "firefox");
 const SRC = path.join(__dirname, "src");
 // What `make dev` watches: the directories whose files build() bundles,
 // compiles or copies. A change anywhere else, package.json and build.js
 // included, starts no build; restart make dev after one.
 const WATCHED_DIRS = [
    SRC,
    path.join(__dirname, "manifest"),
    path.join(__dirname, "icons"),
 ];
 // The module whose compiled DEBUG state script/verify-build asserts. Which
 // bundles contain it is derived from esbuild's own dependency graph rather
 // than from a hardcoded list, so it tracks the bundle layout instead of
@@ -40,7 +31,7 @@ const AUDITED_MODULE = "src/shared/constants.js";
 // the build, whether or not a text matcher would have recognized it. A
 // background entry point the table does not name fails as well, so a second
 // worker is protected by default rather than by someone remembering this file.
-// The Dockerfile's last stage runs `make build`, so it is enforced in CI.
+// Dockerfile:42 runs `make build`, so it is enforced in CI.
 // The build receipt: every file this build emits, with its sha256 and whether
 // it is one of the audited bundles. script/verify-build is handed this and
@@ -450,10 +441,6 @@ function getBuildInfo() {
 async function build() {
    console.log("Building AutistMask extension...");
    // Under make dev this runs once per rebuild in the same process, and each
    // build accounts only for what it emits itself.
    emittedFiles.length = 0;
    const receiptPath = receiptTarget();
    if (!receiptPath) {
        console.warn(
@@ -588,10 +575,15 @@ async function build() {
        copyIcons(distDir);
    }
-    // copy manifests, the same files copyIcons() read
+    // copy manifests
-    for (const [distDir, manifestPath] of MANIFEST_SOURCES) {
+    copyEmitted(
-        copyEmitted(manifestPath, path.join(distDir, "manifest.json"));
+        path.join(__dirname, "manifest", "chrome.json"),
-    }
+        path.join(DIST_CHROME, "manifest.json"),
    );
    copyEmitted(
        path.join(__dirname, "manifest", "firefox.json"),
        path.join(DIST_FIREFOX, "manifest.json"),
    );
    assertForbiddenTableCovered(forbiddenRecord);
@@ -605,94 +597,27 @@ async function build() {
    console.log("Build complete: dist/chrome/ and dist/firefox/");
 }
 // make dev: build, then build again after every change under `dirs`, until
 // interrupted. A failed build is reported and watching carries on, so a
 // half-finished edit does not end it. A change that arrives while a build is
 // running is not lost: it causes one more build as soon as that one finishes.
 // A directory created after this starts is not watched until a restart.
 //
 // make dev sets no AUTISTMASK_BUILD_RECEIPT, so these builds write no receipt
 // and nothing can verify what they leave in dist/.
 //
 // `rebuild` is build() everywhere but tests/buildWatch.test.js, which also
 // closes the returned watchers.
 function watch(dirs, rebuild) {
    let building = false;
    let changedAgain = false;
    async function run() {
        if (building) {
            changedAgain = true;
            return;
        }
        building = true;
        do {
            // Let the rest of one save's events arrive first, so that one
            // save is one build.
            await new Promise((resolve) => setTimeout(resolve, 100));
            changedAgain = false;
            try {
                await rebuild();
            } catch (err) {
                console.error(
                    `Build failed: ${err && err.message ? err.message : err}`,
                );
            }
        } while (changedAgain);
        building = false;
        console.log("Watching for changes (Ctrl-C to stop)...");
    }
    // One watcher per directory rather than fs.watch's recursive option: on
    // Linux, Node's recursive watch watches each file, and stops seeing one
    // that an editor saves by renaming a new copy over it. A directory's
    // watcher reports every change to the files in it, however they are saved.
    const subdirectories = dirs.flatMap((dir) =>
        fs
            .readdirSync(dir, { recursive: true, withFileTypes: true })
            .filter((entry) => entry.isDirectory())
            .map((entry) => path.join(entry.parentPath, entry.name)),
    );
    const watchers = [...dirs, ...subdirectories].map((dir) =>
        fs.watch(dir, run),
    );
    run();
    return watchers;
 }
 // Run only as a program. Required as a module — which is how
-// tests/buildForbiddenInputs.test.js and tests/buildWatch.test.js reach the
+// tests/buildForbiddenInputs.test.js reaches the checks below — this file
-// functions below — this file builds nothing and writes nothing.
+// builds nothing and writes nothing.
 if (require.main === module) {
-    const args = process.argv.slice(2);
+    build().catch((err) => {
-    // An argument this file does not know fails rather than being ignored.
+        console.error(
-    if (args.length > 1 || (args.length === 1 && args[0] !== "--watch")) {
+            `Build failed: ${err && err.message ? err.message : err}`,
-        console.error("usage: node build.js [--watch]");
+        );
-        process.exit(2);
+        process.exit(1);
-    }
+    });
    if (args[0] === "--watch") {
        watch(WATCHED_DIRS, build);
    } else {
        build().catch((err) => {
            console.error(
                `Build failed: ${err && err.message ? err.message : err}`,
            );
            process.exit(1);
        });
    }
 }
-// Exported for tests only: watch() for tests/buildWatch.test.js, the rest for
+// Exported for tests/buildForbiddenInputs.test.js only. The prohibition these
-// tests/buildForbiddenInputs.test.js. The prohibition those enforce is the
+// three functions enforce is the guarantee behind
-// guarantee behind https://git.eeqj.de/sneak/AutistMask/issues/324, and
+// https://git.eeqj.de/sneak/AutistMask/issues/324, and `make check` does not
-// `make check` does not run `make build` — so they are unit tested against
+// run `make build` — so they are unit tested against synthetic metafiles
-// synthetic metafiles rather than being exercised only by CI, where "it ran"
+// rather than being exercised only by CI, where "it ran" is not "it works".
 // is not "it works".
 module.exports = {
    importChain,
    newForbiddenRecord,
    recordBundledInputs,
    assertNoForbiddenInputs,
    assertForbiddenTableCovered,
    watch,
 };
@@ -57,12 +57,11 @@ analytics, use a portfolio tracker. The wallet is not the place for any of that.
 - **No NFT galleries or portfolio views.** This is a wallet, not a dashboard.
- **No third-party token list APIs.** The balances of the tokens you track are
+- **No third-party token list APIs.** Token balances come from the same block
-  read from your RPC endpoint; while you have "Use Blockscout" on, the others
+  explorer you configure for transaction history, and the extension ships its
-  come from the same block explorer you configure for transaction history. The
+  own hardcoded list of top ERC-20 contract addresses for symbol-spoofing
-  extension ships its own hardcoded list of top ERC-20 contract addresses for
+  detection. Any token you want tracked across all your addresses, you add
-  symbol-spoofing detection. Any token you want tracked across all your
+  yourself by contract address.
  addresses, you add yourself by contract address.
 - **No backend servers operated by the developer.** Nothing is sent to any
  server run by AutistMask. Every network destination is listed below.
@@ -70,11 +69,8 @@ analytics, use a portfolio tracker. The wallet is not the place for any of that.
 ## How It Works
 AutistMask is a browser extension that runs entirely in your browser. It does
-not have a backend server. Out of the box it sends your data only to the
+not have a backend server. It communicates with five external destinations:
-Ethereum RPC endpoint, and asks the CoinDesk price API for prices with nothing
+three you configure yourself, and two fixed ones used for scam detection.
 but token symbols. Blockscout and Etherscan are sent none of your data until you
 turn on "Use Blockscout" or "Check recipients on Etherscan", on the Welcome
 screen or later in Settings. Both are off in a new install.
 ### External Services
@@ -100,23 +96,16 @@ addresses are necessarily visible to the RPC provider when querying balances.
 **Blockscout API** (default: `eth.blockscout.com/api/v2`;
 `eth-sepolia.blockscout.com/api/v2` on Sepolia)
-Off until you turn on "Use Blockscout". Used to fetch transaction history, the
+Used to fetch token balances and transaction history. Blockscout is an
-balances of the tokens you have not tracked, and the details of a transaction
+open-source blockchain explorer. AutistMask queries it for your ERC-20 token
-you open. Blockscout is an open-source blockchain explorer. AutistMask queries
+balances (including the holder counts used for spam filtering) and your recent
-it for your ERC-20 token balances (including the holder counts used for spam
+transactions and token transfers. You can change this in Settings to a
-filtering), your recent transactions and token transfers, and the block, fees
+self-hosted Blockscout instance.
 and calldata of a transaction you open. You can change this in Settings to a
 self-hosted Blockscout instance. While it is off, the screens that would show
 history say so, and only the tokens you track are listed.
-When it is contacted: while "Use Blockscout" is on, on every balance refresh,
+When it is contacted: on every balance refresh, and whenever a screen showing
-whenever a screen showing transaction history is opened, and when you open a
+transaction history is opened.
 transaction. The one exception, whether or not the setting is on, is pressing
 "Save" beside the Blockscout URL in Settings, which checks that URL by asking it
 for `/stats` and sends none of your data.
-What gets sent: your Ethereum addresses (to look up balances and transactions)
+What gets sent: your Ethereum addresses (to look up balances and transactions).
 and the hash of each transaction you open.
 **CoinDesk CADLI price API** (`data-api.coindesk.com`)
@@ -133,16 +122,13 @@ address.
 **Etherscan address labels** (`etherscan.io`; `sepolia.etherscan.io` on Sepolia)
-Off until you turn on "Check recipients on Etherscan". When you review a send,
+When you review a send, AutistMask fetches the recipient's public Etherscan
-AutistMask fetches the recipient's public Etherscan address page and looks for a
+address page and looks for a "Fake_Phishing"/"Phish/Hack" label or a scam
-"Fake_Phishing"/"Phish/Hack" label or a scam warning, and shows a red warning if
+warning, and shows a red warning if it finds one. This is a plain page fetch
-it finds one. This is a plain page fetch with no API key, made by your browser.
+with no API key, made by your browser. It is best-effort: if it fails, it is
-It is best-effort: if it fails, it is silently ignored. This endpoint is not
+silently ignored. This endpoint is not user-configurable.
 user-configurable. While it is off, the confirmation screen says that no
 Etherscan check was made.
-When it is contacted: only while "Check recipients on Etherscan" is on, each
+When it is contacted: each time you reach the send confirmation screen.
 time you reach the send confirmation screen.
 What gets sent: the recipient address you are about to send to, and your IP
 address. Your own addresses are not sent.
@@ -199,9 +185,6 @@ password.
 1. Click the AutistMask icon in your browser toolbar.
 2. Click "Add wallet" (on first use), or open Settings and click "+ Add wallet".
   On first use the same screen offers "Use Blockscout" and "Check recipients on
   Etherscan", both off; tick either if you want what it does (see External
   Services). You can change both later in Settings.
 3. On the "From Phrase" tab, click the die button to generate a random 12-word
   recovery phrase.
 4. **Write down the recovery phrase and store it safely.** Anyone with these
@@ -237,11 +220,10 @@ always produce the same sequence of addresses.
 ### Adding ERC-20 Tokens
-Tokens you hold show up automatically only while "Use Blockscout" is on, and
+Tokens you hold show up automatically only if they are in the extension's
-then only if they are in the extension's bundled list of well-known tokens or
+bundled list of well-known tokens or have at least 1,000 holders; everything
-have at least 1,000 holders; everything else is treated as spam and hidden. To
+else is treated as spam and hidden. To track a token explicitly (which also
-track a token explicitly (which also shows it at zero balance, and shows it
+shows it at zero balance), add it by contract address:
 whether or not "Use Blockscout" is on), add it by contract address:
 1. Go to an address detail view (click `[info]` on any address).
 2. Click "+ Token".
@@ -324,14 +306,7 @@ enter your password and click "Confirm" to authorize it. Message and typed-data
 signature requests work the same way, with a "Sign" button, and also require
 your password.
-A connected site can also ask to switch the wallet's network. A popup shows the
+If the requesting site's domain is on the phishing blocklist, all three approval
 site's origin, the current network and the requested network. Nothing changes
 unless you click "Switch"; clicking "Reject" or closing the popup leaves
 everything as it was. Switching works exactly as it does in Settings, and
 changes the network for the whole wallet and for every site, not only for the
 one that asked.
 If the requesting site's domain is on the phishing blocklist, all four approval
 screens show a red phishing warning before you decide.
 You can manage site permissions in Settings. Allowed and denied sites can be
@@ -403,14 +378,11 @@ Click the gear icon on the home screen to access settings:
 - **Display**: Toggle whether tracked tokens with zero balance are shown, switch
  timestamps to UTC, and choose the theme (System, Light, or Dark).
 - **Network**: Switch between Ethereum Mainnet and Sepolia Testnet. Switching
-  restores the RPC and Blockscout endpoints you last used on that network, or
+  resets the RPC and Blockscout endpoints to that network's defaults.
  that network's defaults if you have not used it before.
 - **Ethereum RPC**: Change the Ethereum node endpoint. Default is a public RPC.
  You can use your own node for maximum privacy.
- **Blockscout API**: "Use Blockscout", off until you tick it, and the
+- **Blockscout API**: Change the Blockscout instance used for token balances and
-  Blockscout instance used for transaction history, the tokens you have not
+  transaction history. You can use a self-hosted instance.
  tracked and transaction details. You can use a self-hosted instance.
 - **Etherscan**: "Check recipients on Etherscan", off until you tick it.
 - **Token Spam Protection**: Toggle individual scam filters and set the dust
  transaction threshold.
 - **Allowed Sites / Denied Sites**: View and manage web3 site permissions.
@@ -16,9 +16,9 @@ so the "release commit" throughout is the `main` commit the milestone PR merged.
 ## Procedure
 1. **Confirm `main` is green in CI.** The `check` workflow
-   (`.gitea/workflows/check.yml`) runs `script/cibuild`, which runs
+   (`.gitea/workflows/check.yml`) runs `script/cibuild`, i.e. `docker build .`,
-   `script/check` and then builds the image uncached, so a green `check` run is
+   and the `Dockerfile` runs `make check` as a build step, so a green `check`
-   a green `make check`. Find the run for the exact release commit on the
+   run is a green `make check`. Find the run for the exact release commit on the
   tracker's Actions view. _Check:_ that commit's `check` run succeeded; running
   `make check` on a clean checkout of the commit reproduces it and exits 0.
@@ -7,7 +7,7 @@
    "permissions": ["storage", "activeTab", "alarms"],
    "host_permissions": ["<all_urls>"],
    "content_security_policy": {
-        "extension_pages": "default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; style-src 'self'; img-src 'self' data:; connect-src 'self' https: http:; frame-src 'none'; form-action 'none'; base-uri 'none'"
+        "extension_pages": "default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; connect-src 'self' https: http:; frame-src 'none'; form-action 'none'; base-uri 'none'"
    },
    "icons": {
        "16": "icons/icon16.png",
@@ -4,7 +4,7 @@
    "version": "0.1.0",
    "description": "Minimal Ethereum wallet for Firefox",
    "permissions": ["storage", "activeTab", "alarms", "<all_urls>"],
-    "content_security_policy": "default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; style-src 'self'; img-src 'self' data:; connect-src 'self' https: http:; frame-src 'none'; form-action 'none'; base-uri 'none'",
+    "content_security_policy": "default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; connect-src 'self' https: http:; frame-src 'none'; form-action 'none'; base-uri 'none'",
    "icons": {
        "16": "icons/icon16.png",
        "32": "icons/icon32.png",
@@ -27,8 +27,7 @@
    "web_accessible_resources": ["src/content/inpage.js"],
    "browser_specific_settings": {
        "gecko": {
-            "id": "autistmask@sneak.berlin",
+            "id": "autistmask@sneak.berlin"
            "strict_min_version": "115.0"
        }
    }
 }
@@ -13,21 +13,16 @@
        "fmt": "prettier --write .",
        "fmt-check": "prettier --check ."
    },
    "jest": {
        "setupFiles": [
            "<rootDir>/tests/support/navigatorLocks.js"
        ]
    },
    "devDependencies": {
        "@eslint/js": "10.0.1",
-        "@tailwindcss/cli": "4.3.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",
-        "tailwindcss": "4.3.1"
+        "tailwindcss": "^4.2.1"
    },
    "dependencies": {
        "ethereum-blockies-base64": "^1.0.2",
@@ -127,40 +127,6 @@ install_js_deps() {
    fi
 }
 # run_node: run node from the repo root, through nvm when node is not on PATH;
 # the script comes on stdin
 run_node() {
    if missing node && [ -s "$HOME/.nvm/nvm.sh" ]; then
        nvm_sh "nvm use $NODE_VERSION >/dev/null && cd \"$ROOT\" && node"
    else
        node
    fi
 }
 # yarn install exits 0 without touching node_modules once
 # node_modules/.yarn-integrity matches yarn.lock, so a package deleted from
 # node_modules stays deleted. Fail unless node finds every package listed in
 # dependencies and devDependencies of package.json, by its package.json. When a
 # package's exports does not list that file, node throws
 # ERR_PACKAGE_PATH_NOT_EXPORTED, which it can only do once it has found the
 # package, so that error counts as found.
 check_js_deps() {
    run_node <<'EOF'
 const { dependencies, devDependencies } = require("./package.json");
 for (const name of Object.keys({ ...dependencies, ...devDependencies })) {
    try {
        require.resolve(name + "/package.json");
    } catch (e) {
        if (e.code !== "ERR_PACKAGE_PATH_NOT_EXPORTED") {
            console.error(`bootstrap: node cannot find ${name} after yarn install`);
            console.error("  fix: rm -rf node_modules && make bootstrap");
            process.exit(1);
        }
    }
 }
 EOF
 }
 main() {
    cd "$ROOT"
@@ -170,7 +136,6 @@ main() {
    ensure_node
    ensure_yarn
    install_js_deps
    check_js_deps
    echo "bootstrap complete"
 }
@@ -1,14 +1,14 @@
 #!/bin/sh
-# script/check: run all checks (test, lint, fmt-check). Our own
+# script/check: run all checks (test, test-verify-build, lint, fmt-check).
-# extension to scripts-to-rule-them-all. test and lint are Docker
+# Our own extension to scripts-to-rule-them-all. Must not modify any files.
 # phases; fmt-check is native, because a formatter writes the working
 # tree. Must not modify any files.
 set -eu
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 main() {
    "$SCRIPT_DIR/test"
    "$SCRIPT_DIR/test-verify-build"
    "$SCRIPT_DIR/check-censored"
    "$SCRIPT_DIR/lint"
    "$SCRIPT_DIR/fmt-check"
 }
@@ -1,8 +1,8 @@
 #!/bin/sh
 # script/check-censored: assert that the competitor name RULES.md bars appears
 # nowhere in this repo, and nowhere in the built extension, except where it is
-# deliberate. Our own extension to scripts-to-rule-them-all, run by the
+# deliberate. Our own extension to scripts-to-rule-them-all, run from
-# Dockerfile's lint phase and by make build.
+# script/check and from make build.
 #
 # Where the name is allowed, and why each one is not negotiable away:
 #
@@ -18,8 +18,6 @@
 #     (src/shared/balances.js), and this contract's on-chain name is that
 #     string, so censoring the repo cannot stop the wallet displaying it.
 #     Dropping the entry instead would cost the user MUSD spoof detection.
 #     script/lib/token-enrichment.json, the fetched data tokenList.js's names
 #     are written from, carries the same name for the same reason.
 #
 # Everything else fails, in the working tree and under dist/. The last two are
 # literals rather than whole files, so they are enforced by counting, and each
@@ -104,8 +102,8 @@ allowed_literals_for() {
    src/content/inpage.js | dist/*/src/content/inpage.js)
        printf 'is%s\n_%s\n' "$NAME" "$NAME" >"$ALLOWED_LITERALS_FILE"
        ;;
-    src/shared/tokenList.js | script/lib/token-enrichment.json | \
+    src/shared/tokenList.js | dist/*/src/background/index.js | \
-        dist/*/src/background/index.js | dist/*/src/popup/index.js)
+        dist/*/src/popup/index.js)
        printf '%s USD\n' "$NAME" >"$ALLOWED_LITERALS_FILE"
        ;;
    esac
@@ -1,28 +1,13 @@
 #!/bin/sh
-# script/cibuild: run the CI build. It bootstraps first: a CI runner
+# script/cibuild: run the CI build. The Dockerfile runs make check, so
-# checks out and runs this and nothing else, and script/fmt-check runs
+# a successful build implies all checks pass.
 # the formatter on the host, which a pristine checkout cannot do.
 # --no-cache for the same reason as script/docker: the gate phases the
 # final stage depends on are RUN steps, and a cached one is a check that
 # did not run.
 set -eu
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
 ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
 main() {
    cd "$ROOT"
-    "$SCRIPT_DIR/bootstrap"
+    docker build .
    "$SCRIPT_DIR/check"
    # Own line: a failing command substitution inside an argument does
    # not trip `set -e`, so the inline form degrades silently to an
    # empty constant. The VERSION build argument takes precedence over
    # the version a build stage derives from the .git in the context.
    version="$(git describe --tags --always --dirty 2>/dev/null || true)"
    [ -n "$version" ] || version="unknown"
    docker build --no-cache \
        --build-arg VERSION="$version" \
        -t "$("$SCRIPT_DIR/projectname")" .
 }
 main "$@"
@@ -3,21 +3,22 @@
 # step fails, remove dist/ before returning its exit status. Our own extension
 # to scripts-to-rule-them-all, wrapped around every step of make build.
 #
-# Why: with AUTISTMASK_DEBUG=1 exported, make build compiles a debug bundle and
+# Why: with AUTISTMASK_DEBUG=1 exported in the calling shell, make build
-# then fails on it in script/verify-build, after the bundle is written. It is
+# compiles a debug bundle and then fails on it in script/verify-build — but the
-# loadable, and every wallet it creates gets the publicly committed test
+# bundle is already written. It is loadable, and every wallet it creates gets
-# recovery phrase from src/shared/constants.js, so a failed build must not leave
+# the publicly committed test recovery phrase from src/shared/constants.js. A
-# it behind. The removal is never silent: it says on stderr that dist/ is gone
+# failed release build that leaves that behind is a smaller version of the trap
-# and why.
+# the verifier exists to close, and "the failure was loud" only works on an
 # operator who does not load dist/chrome/ anyway. Removing the artifact does not
 # depend on that.
 #
-# A failed check-censored --require-dist removes dist/ like any other step: a
+# Two things this deliberately does not do. It does not wrap make build-debug: a
-# dist/ not cleared of the name RULES.md bars must not ship either. A step that
+# debug build that failed is not a mistakable artifact, and its output is the
-# succeeds removes nothing. An interrupt (Ctrl-C) while a step runs removes
+# evidence of what went wrong. And it never removes anything on a step that
-# nothing and says nothing, even when the step catches it and exits with a
+# SUCCEEDS, including the final check-censored --require-dist pass.
-# status of its own: the wrapper exits with 130 once the step has ended. An
+#
-# interrupt is not a build failure, and whoever interrupted the build knows it
+# The removal is never silent: it says dist/ is gone and why, on stderr, above
-# did not finish. make build-debug is not wrapped: a debug build that failed is
+# the build's own failure.
 # not a mistakable artifact, and its output is the evidence of what went wrong.
 set -eu
 ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
@@ -65,20 +66,12 @@ main() {
        exit 1
    }
    # An interrupt is not a build failure: once the step has ended, exit
    # without removing anything, even if the step caught the interrupt and
    # exited with a status of its own. bash as /bin/sh would otherwise carry on.
    trap 'exit 130' INT
    _status=0
    "$@" || _status=$?
    [ "$_status" -ne 0 ] || return 0
-    # A message that cannot be written, to a closed stderr or to a pipe nobody
+    discard_dist
    # reads any more, must not replace the step's status.
    trap '' PIPE
    discard_dist || true
    exit "$_status"
 }
@@ -1,8 +1,6 @@
 #!/bin/sh
 # script/docker: build the Docker image tagged with the project name.
 # Identical in all repos; the tag comes from script/projectname.
 # --no-cache because the gate phases the final stage depends on are RUN
 # steps, and a cached one is a check that did not run.
 set -eu
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
@@ -10,15 +8,7 @@ ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
 main() {
    cd "$ROOT"
-    # Own line: a failing command substitution inside an argument does
+    docker build -t "$("$SCRIPT_DIR/projectname")" .
    # not trip `set -e`, so the inline form degrades silently to an
    # empty constant. The VERSION build argument takes precedence over
    # the version a build stage derives from the .git in the context.
    version="$(git describe --tags --always --dirty 2>/dev/null || true)"
    [ -n "$version" ] || version="unknown"
    docker build --no-cache \
        --build-arg VERSION="$version" \
        -t "$("$SCRIPT_DIR/projectname")" .
 }
 main "$@"
@@ -4,36 +4,10 @@ set -eu
 ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
 # Must match the pin in script/bootstrap.
 NODE_VERSION="22.17.0"
 # script/bootstrap installs node and yarn under nvm and leaves neither
 # on the PATH of the shell that called it, so resolve the pinned
 # toolchain here the way bootstrap's own install step does. nvm is a
 # bash script, hence the subshell.
 run_yarn() {
    if command -v yarn >/dev/null 2>&1; then
        exec yarn "$@"
    fi
    if [ ! -s "$HOME/.nvm/nvm.sh" ]; then
        echo "fmt: no yarn; run script/bootstrap first" >&2
        exit 1
    fi
    exec bash -c '. "$HOME/.nvm/nvm.sh" && nvm use "$1" >/dev/null &&
        shift && exec yarn "$@"' bash "$NODE_VERSION" "$@"
 }
 main() {
    cd "$ROOT"
    # Without the repo's own prettier, yarn runs whatever prettier is on
    # the PATH, which may be a version that formats files differently.
    if [ ! -x node_modules/.bin/prettier ]; then
        echo "fmt: this repo's prettier is not installed in node_modules/," \
            "so run script/bootstrap first." >&2
        exit 1
    fi
    echo "Formatting..."
-    run_yarn run fmt
+    yarn run fmt 2>&1
 }
 main "$@"
@@ -5,36 +5,10 @@ set -eu
 ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
 # Must match the pin in script/bootstrap.
 NODE_VERSION="22.17.0"
 # script/bootstrap installs node and yarn under nvm and leaves neither
 # on the PATH of the shell that called it, so resolve the pinned
 # toolchain here the way bootstrap's own install step does. nvm is a
 # bash script, hence the subshell.
 run_yarn() {
    if command -v yarn >/dev/null 2>&1; then
        exec yarn "$@"
    fi
    if [ ! -s "$HOME/.nvm/nvm.sh" ]; then
        echo "fmt-check: no yarn; run script/bootstrap first" >&2
        exit 1
    fi
    exec bash -c '. "$HOME/.nvm/nvm.sh" && nvm use "$1" >/dev/null &&
        shift && exec yarn "$@"' bash "$NODE_VERSION" "$@"
 }
 main() {
    cd "$ROOT"
    # Without the repo's own prettier, yarn runs whatever prettier is on
    # the PATH, which may be a version that formats files differently.
    if [ ! -x node_modules/.bin/prettier ]; then
        echo "fmt-check: this repo's prettier is not installed in" \
            "node_modules/, so run script/bootstrap first." >&2
        exit 1
    fi
    echo "Checking formatting..."
-    run_yarn run fmt-check
+    yarn run fmt-check 2>&1
 }
 main "$@"
@@ -1,159 +0,0 @@
 // Writes the names and URLs in script/lib/token-enrichment.json, which
 // script/lib/enrich-tokens.js fetches, into the matching entries of
 // src/shared/tokenList.js: the name and url an entry already has are replaced,
 // and an entry without them gets them after its decimals. Where the fetched
 // data has no URL for a token, EXTRA_URLS below supplies one. An entry the data
 // does not mention is left as it is. An address in the data or in EXTRA_URLS
 // that matches no entry in tokenList.js, capitals included, is an error naming
 // that address. Run by
 // `make apply-enrichment`; no build runs it. tests/applyEnrichment.test.js
 // checks that the committed tokenList.js is exactly what this writes from the
 // committed data.
 "use strict";
 const fs = require("fs");
 const path = require("path");
 const TOKEN_LIST = path.join(__dirname, "..", "..", "src/shared/tokenList.js");
 // Project websites by token address, each spelled as tokenList.js spells it. A
 // token gets its URL here only where the fetched data has none, so an address
 // the data has a URL for is never used.
 const EXTRA_URLS = {
    "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": "https://weth.io",
    "0xdAC17F958D2ee523a2206206994597C13D831ec7": "https://tether.to",
    "0xB8c77482e45F1F44dE1745F52C74426C631bDD52": "https://www.bnbchain.org",
    "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48": "https://www.circle.com/usdc",
    "0xdC035D45d973E3EC169d2276DDab16f1e407384F": "https://sky.money",
    "0x2AF5D2aD76741191D15Dfe7bF6aC92d4Bd912Ca3": "https://www.bitfinex.com",
    "0x514910771AF9Ca656af840dff83E8264EcF986CA": "https://chain.link",
    "0x4c9EDD5852cd905f086C759E8383e09bff1E68B3": "https://ethena.fi",
    "0x8d0D000Ee44948FC98c9B98A4FA4921476f08B0d":
        "https://www.worldlibertyfinancial.com",
    "0x6B175474E89094C44Da98b954EedeAC495271d0F": "https://makerdao.com",
    "0x6c3ea9036406852006290770BEdFcAbA0e23A0e8":
        "https://www.paypal.com/us/digital-wallet/manage-money/crypto/pyusd",
    "0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE": "https://shibatoken.com",
    "0xdA5e1988097297dCdc1f90D4dFE7909e847CBeF6":
        "https://www.worldlibertyfinancial.com",
    "0xA0b73E1Ff0B80914AB6fe0444E65848C4C34450b": "https://crypto.com",
    "0x582d872A1B094FC48F5DE31D3B73F2D9bE47def1": "https://ton.org",
    "0x68749665FF8D2d112Fa859AA293F07A622782F38": "https://gold.tether.to",
    "0x196C20DA81Fbc324EcdF55501e95Ce9f0bD84d14": "https://polkadot.network",
    "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984": "https://uniswap.org",
    "0x45804880De22913dAFE09f4980848ECE6EcbAf78":
        "https://www.paxos.com/paxgold",
    "0x3c3a81e81dc49A522A592e7622A7E711c06bf354": "https://www.mantle.xyz",
    "0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9": "https://aave.com",
    "0x75231F58b43240C9718Dd58B4967c5114342a86c": "https://www.okx.com",
    "0x6982508145454Ce325dDbE47a25d4ec3d2311933": "https://www.pepe.vip",
    "0x5A98FcBEA516Cf06857215779Fd812CA3beF1B32": "https://lido.fi",
    "0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72": "https://ens.domains",
    "0xD533a949740bb3306d119CC777fa900bA034cd52": "https://curve.fi",
    "0x111111111117dC0aa78b770fA6A738034120C302": "https://1inch.io",
    "0x163f8C2467924be0ae7B5347228CABF260318753": "https://worldcoin.org",
    "0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F": "https://synthetix.io",
    "0xBBbbCA6A901c926F240b89EacB641d8Aec7AEafD": "https://loopring.org",
    "0xC669928185DbCE49d2230CC9B0979BE6DC797957": "https://bitstable.finance",
    "0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3": "https://ondo.finance",
    "0x6De037ef9aD2725EB40118Bb1702EBb27e4Aeb24": "https://www.render.com",
    "0x4a220E6096B25EADb88358cb44068A3248254675": "https://www.quant.network",
    "0xba5BDe662c17e2aDFF1075610382B9B691296350": "https://superrare.com",
    "0xc00e94Cb662C3520282E6f5717214004A7f26888": "https://compound.finance",
    "0xE41d2489571d322189246DaFA5ebDe1F4699F498": "https://0x.org",
    "0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e": "https://yearn.fi",
    "0x6fB3e0A217407EFFf7Ca062D46c26E5d60a14d69": "https://iotex.io",
    "0xF57e7e7C23978C3cAEC3C3548E3D615c346e79fF": "https://immutable.com",
    "0x0F5D2fB29fb7d3CFeE444a200298f468908cC942": "https://decentraland.org",
    "0x3845badAde8e6dFF049820680d1F14bD3903a5d0": "https://www.sandbox.game",
    "0x6810e776880C02933D47DB1b9fc05908e5386b96": "https://gnosis.io",
    "0x5f98805A4E8be255a32880FDeC7F6728C6568bA0": "https://www.liquity.org",
    "0x0D8775F648430679A709E98d2b0Cb6250d2887EF":
        "https://basicattentiontoken.org",
    "0xc944E90C64B2c07662A292be6244BDf05Cda44a7": "https://thegraph.com",
    "0x853d955aCEf822Db058eb8505911ED77F175b99e": "https://frax.finance",
    "0x0000000000085d4780B73119b644AE5ecd22b376": "https://www.trueusd.com",
    "0x3432B6A60D23Ca0dFCa7761B7ab56459D9C964D0": "https://frax.finance",
    "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E": "https://curve.fi",
    "0x808507121B80c02388fAd14726482e061B8da827": "https://pendle.finance",
    "0xCa14007Eff0dB1f8135f4C25B34De49AB0d42766": "https://starknet.io",
    "0x8457CA5040ad67fdebbCC8EdCE889A335Bc0fbFB": "https://alt.layer",
    "0xB50721BCf8d664c30412Cfbc6cf7a15145234ad1": "https://arbitrum.io",
    "0x6985884C4392D348587B19cb9eAAf157F13271cd": "https://layerzero.network",
    "0xFe0c30065B384F05761f15d0CC899D4F9F9Cc0eB": "https://ethfi.org",
    "0x5283D291DBCF85356A21bA090E6db59121208b44": "https://blur.io",
    "0x43Dfc4159D86F3A37A5A4B3D4580b888ad7d4DDd": "https://dydx.exchange",
    "0xcf0C122c6b73ff809C693DB761e7BaeBe62b6a2E": "https://floki.com",
    "0xe53EC727dbDEB9E2d5456c3be40cFF031AB40A55": "https://superfarm.com",
    "0x32353A6C91143bfd6C7d363B546e62a9A2489A20": "https://www.agora.finance",
    "0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c": "https://www.euro-coin.com",
    "0xA35923162C49cF95e6BF26623385eb431ad920D3": "https://www.turbo-eth.com",
    "0x1151CB3d861920e07a38e03eEAd12C32178567F6": "https://bonk.com",
    "0x090185f2135308BaD17527004364eBcC2D37e5F6": "https://spell.club",
    "0xAf5191B0De278C7286d6C7CC6ab6BB8A73bA2Cd6": "https://stargate.finance",
 };
 // Returns tokenList, the text of tokenList.js, with the name and url of each
 // token in enrichment, the parsed data file, written into its entry.
 function applyEnrichment(tokenList, enrichment) {
    for (const addr of Object.keys(EXTRA_URLS)) {
        if (!tokenList.includes(`address: "${addr}"`)) {
            throw new Error(
                `No entry in src/shared/tokenList.js has the address ${addr} from EXTRA_URLS.`,
            );
        }
    }
    let result = tokenList;
    for (const [addr, data] of Object.entries(enrichment)) {
        // Escape special regex characters in the address
        const escaped = addr.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
        // Match the token block: { address: "...", symbol: "...", decimals: N, }
        // and the name: "...", url: "..." after decimals when it has them.
        // The closing }, may have trailing whitespace
        const blockRe = new RegExp(
            `(\\{\\s*address:\\s*"${escaped}",\\s*symbol:\\s*"[^"]+",\\s*decimals:\\s*\\d+)` +
                `(?:,\\s*name:\\s*"(?:[^"\\\\]|\\\\.)*",\\s*url:\\s*"(?:[^"\\\\]|\\\\.)*")?` +
                `,?(\\s*\\})`,
        );
        const match = result.match(blockRe);
        if (!match) {
            throw new Error(
                `No entry in src/shared/tokenList.js matches the address ${addr} from script/lib/token-enrichment.json.`,
            );
        }
        // A URL from EXTRA_URLS only where the fetched data has none.
        const url = data.url || EXTRA_URLS[addr] || "";
        // Build replacement: original fields + name + url
        const nameEscaped = data.name
            .replace(/\\/g, "\\\\")
            .replace(/"/g, '\\"');
        const urlEscaped = url.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
        const replacement =
            match[1] +
            `,\n        name: "${nameEscaped}",` +
            `\n        url: "${urlEscaped}",` +
            match[2];
        // A function, so a "$" in a name is not read as a replacement pattern.
        result = result.replace(blockRe, () => replacement);
    }
    return result;
 }
 if (require.main === module) {
    const enrichment = JSON.parse(
        fs.readFileSync(path.join(__dirname, "token-enrichment.json"), "utf8"),
    );
    const original = fs.readFileSync(TOKEN_LIST, "utf8");
    fs.writeFileSync(TOKEN_LIST, applyEnrichment(original, enrichment));
 }
 module.exports = { applyEnrichment };
@@ -1,115 +0,0 @@
 // Fetches a name and a website for every token in src/shared/tokenList.js and
 // writes them, keyed by address, to script/lib/token-enrichment.json, which
 // script/lib/apply-enrichment.js then writes into tokenList.js. Run by
 // `make enrich-tokens`; no build runs it and nothing here is shipped.
 //
 // Names come from CoinGecko's coin list, fetched whole in one request, matched
 // on the token's Ethereum contract address. A token CoinGecko does not list
 // gets its symbol as its name. The list is live data with no fixed version, so
 // a later run can return different names.
 //
 // Websites come from the ethereum-lists/tokens repository, one file per token,
 // read at a pinned commit. Most tokens have no file there and get an empty URL.
 // A file that is missing is not an error; any other failed request stops the
 // run, so a network fault cannot quietly empty a URL.
 "use strict";
 const fs = require("fs");
 const path = require("path");
 const TOKEN_LIST = path.join(__dirname, "..", "..", "src/shared/tokenList.js");
 const OUTPUT = path.join(__dirname, "token-enrichment.json");
 const COINGECKO_LIST =
    "https://api.coingecko.com/api/v3/coins/list?include_platform=true";
 // ethereum-lists/tokens at its master of 2026-02-27, when the committed
 // token-enrichment.json was made.
 const ETHEREUM_LISTS =
    "https://raw.githubusercontent.com/ethereum-lists/tokens/c3560d499a380a38e94caa7c4968d59aeffde59a/tokens/eth";
 const CONCURRENT = 10;
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 async function main() {
    const src = fs.readFileSync(TOKEN_LIST, "utf8");
    const tokens = [];
    const re =
        /\{\s*address:\s*"(0x[a-fA-F0-9]{40})",\s*symbol:\s*"([^"]+)",\s*decimals:\s*(\d+)/g;
    let m;
    while ((m = re.exec(src)) !== null) {
        tokens.push({ address: m[1], symbol: m[2], decimals: parseInt(m[3]) });
    }
    console.error(`Parsed ${tokens.length} tokens`);
    // --- Names from CoinGecko ---
    console.error("Fetching CoinGecko coins list...");
    const listResp = await fetch(COINGECKO_LIST);
    if (!listResp.ok) throw new Error(`CoinGecko list HTTP ${listResp.status}`);
    const coins = await listResp.json();
    const addrMap = new Map();
    for (const coin of coins) {
        const eth = (coin.platforms?.ethereum || "").toLowerCase().trim();
        if (eth && eth.startsWith("0x")) {
            addrMap.set(eth, { name: coin.name, id: coin.id });
        }
    }
    console.error(`CoinGecko map: ${addrMap.size} Ethereum tokens`);
    const enriched = new Map();
    let namesMatched = 0;
    for (const t of tokens) {
        const info = addrMap.get(t.address.toLowerCase());
        if (info) namesMatched++;
        enriched.set(t.address, { name: info?.name || t.symbol, url: "" });
    }
    console.error(`Matched ${namesMatched}/${tokens.length} names`);
    // --- Websites from ethereum-lists ---
    console.error("Fetching URLs from ethereum-lists GitHub...");
    let urlsFound = 0;
    for (let i = 0; i < tokens.length; i += CONCURRENT) {
        const batch = tokens.slice(i, i + CONCURRENT);
        await Promise.all(
            batch.map(async (t) => {
                const r = await fetch(`${ETHEREUM_LISTS}/${t.address}.json`);
                if (r.status === 404) return;
                if (!r.ok) {
                    throw new Error(
                        `ethereum-lists HTTP ${r.status} for ${t.address}`,
                    );
                }
                const data = await r.json();
                const website = (data.website || "").trim();
                if (website && website !== "https://") {
                    enriched.get(t.address).url = website;
                    urlsFound++;
                }
            }),
        );
        if (i % 100 === 0) {
            console.error(
                `  GitHub: ${Math.min(i + CONCURRENT, tokens.length)}/${tokens.length}, ${urlsFound} URLs`,
            );
        }
        await sleep(200);
    }
    console.error(`Found ${urlsFound} URLs in ethereum-lists`);
    // --- Output, in the layout prettier gives it ---
    const output = {};
    for (const [addr, e] of enriched) {
        output[addr] = { name: e.name, url: e.url };
    }
    fs.writeFileSync(OUTPUT, JSON.stringify(output, null, 4) + "\n");
    console.error(`Done! ${tokens.length} names, ${urlsFound} URLs.`);
 }
 main().catch((err) => {
    console.error(`enrich-tokens: ${err.message}`);
    process.exit(1);
 });
@@ -14,7 +14,7 @@
 // the build when esbuild's own metafile reports src/shared/state.js as an input
 // of a background bundle. That consults the resolution esbuild actually
 // performed, so no specifier syntax and no resolution rule can slip past it,
-// and the Dockerfile's last stage runs `make build` in CI.
+// and Dockerfile:42 runs `make build` in CI.
 //
 // What this rule is: fast local feedback, in the editor and in `make lint`,
 // before a full bundle. It reads sources from disk and matches import
@@ -1,203 +0,0 @@
 // Draws the toolbar icon and writes it to every file manifest/chrome.json
 // declares under "icons". Run by `make icons`; tests/icons.test.js checks that
 // the committed files hold exactly the image this draws.
 //
 // The icon is a dark-navy rounded square carrying a teal triangle with a
 // smaller triangle cut out of it. Every coordinate below is a fraction of the
 // icon's side, so one drawing serves every size. A pixel's colour is the
 // average of an 8x8 grid of samples, one at the centre of each cell, which
 // smooths the edges.
 //
 // The PNG is written here rather than by a library: RGBA at 8 bits per
 // channel, filter type 0 (none) on every row, one IDAT chunk compressed by
 // node's zlib at level 9. The committed files were compressed by stock zlib,
 // which node's bundled zlib does not reproduce byte for byte, so the image is
 // compared rather than the file: the IHDR and every pixel.
 "use strict";
 const fs = require("fs");
 const path = require("path");
 const zlib = require("zlib");
 const { icons } = require("../../manifest/chrome.json");
 const NAVY = [0x10, 0x1a, 0x2e];
 const TEAL = [0x35, 0xe0, 0xc2];
 const CORNER_RADIUS = 0.22;
 const OUTER_TRIANGLE = [
    [0.5, 0.15],
    [0.115, 0.855],
    [0.885, 0.855],
 ];
 const INNER_TRIANGLE = [
    [0.5, 0.4],
    [0.29, 0.7],
    [0.71, 0.7],
 ];
 const SAMPLES_PER_SIDE = 8;
 const PNG_SIGNATURE = Buffer.from([
    0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
 ]);
 // Points are in pixels from the icon's top-left corner.
 function insideRoundedSquare(x, y, size) {
    const r = CORNER_RADIUS * size;
    // How far the point is past the start of a corner's curve, on each axis.
    const dx = Math.max(r - x, 0, x - (size - r));
    const dy = Math.max(r - y, 0, y - (size - r));
    return dx * dx + dy * dy <= r * r;
 }
 // Inside or on an edge: the point is not on opposite sides of two edges.
 function insideTriangle(x, y, [a, b, c]) {
    const side = (p, q) =>
        (q[0] - p[0]) * (y - p[1]) - (q[1] - p[1]) * (x - p[0]);
    const sides = [side(a, b), side(b, c), side(c, a)];
    return !(sides.some((s) => s < 0) && sides.some((s) => s > 0));
 }
 // Rounds to the nearest integer and a half to the even neighbour, as the
 // committed icons were made. Math.round takes a half up, which would change
 // some pixels by one.
 function roundHalfToEven(v) {
    const down = Math.floor(v);
    if (v - down !== 0.5) {
        return Math.round(v);
    }
    return down % 2 === 0 ? down : down + 1;
 }
 // The RGBA bytes of the pixel whose top-left corner is (px, py).
 function pixel(px, py, size, outer, inner) {
    let inSquare = 0;
    let inTeal = 0;
    for (let j = 0; j < SAMPLES_PER_SIDE; j++) {
        const y = py + (j + 0.5) / SAMPLES_PER_SIDE;
        for (let i = 0; i < SAMPLES_PER_SIDE; i++) {
            const x = px + (i + 0.5) / SAMPLES_PER_SIDE;
            if (!insideRoundedSquare(x, y, size)) {
                continue;
            }
            inSquare++;
            if (insideTriangle(x, y, outer) && !insideTriangle(x, y, inner)) {
                inTeal++;
            }
        }
    }
    if (inSquare === 0) {
        return [0, 0, 0, 0];
    }
    const colour = NAVY.map((navy, k) =>
        roundHalfToEven(navy + ((TEAL[k] - navy) * inTeal) / inSquare),
    );
    const alpha = roundHalfToEven((255 * inSquare) / SAMPLES_PER_SIDE ** 2);
    return [...colour, alpha];
 }
 // A PNG chunk: the data's length, the type, the data, then the CRC-32 of the
 // type and the data.
 function chunk(type, data) {
    const typeAndData = Buffer.concat([Buffer.from(type, "ascii"), data]);
    const length = Buffer.alloc(4);
    length.writeUInt32BE(data.length);
    const crc = Buffer.alloc(4);
    crc.writeUInt32BE(zlib.crc32(typeAndData));
    return Buffer.concat([length, typeAndData, crc]);
 }
 // The complete PNG file for the icon at `size` pixels square.
 function drawIcon(size) {
    const toPixels = (corners) => corners.map(([x, y]) => [x * size, y * size]);
    const outer = toPixels(OUTER_TRIANGLE);
    const inner = toPixels(INNER_TRIANGLE);
    const rows = [];
    for (let py = 0; py < size; py++) {
        const row = [0]; // filter type 0: the row's bytes are stored as they are
        for (let px = 0; px < size; px++) {
            row.push(...pixel(px, py, size, outer, inner));
        }
        rows.push(Buffer.from(row));
    }
    const header = Buffer.alloc(13); // compression, filter, interlace: all 0
    header.writeUInt32BE(size, 0); // width
    header.writeUInt32BE(size, 4); // height
    header[8] = 8; // bits per channel
    header[9] = 6; // colour type: RGBA
    return Buffer.concat([
        PNG_SIGNATURE,
        chunk("IHDR", header),
        chunk("IDAT", zlib.deflateSync(Buffer.concat(rows), { level: 9 })),
        chunk("IEND", Buffer.alloc(0)),
    ]);
 }
 // The image in a PNG: its IHDR data, and its rows after decompression, each
 // row's filter type byte first. With filter type 0 on every row, as drawIcon
 // writes, the rows are the pixels themselves; a file using another filter does
 // not match even where its pixels do. Refuses a file that is not a PNG, a chunk
 // whose CRC-32 is wrong, and any chunk but IHDR, IDAT and IEND, rather than
 // ignoring what it cannot compare.
 function decodePng(png) {
    if (!png.subarray(0, 8).equals(PNG_SIGNATURE)) {
        throw new Error("not a PNG");
    }
    let header = null;
    const idat = [];
    for (let pos = 8; pos < png.length; ) {
        const length = png.readUInt32BE(pos);
        const typeAndData = png.subarray(pos + 4, pos + 8 + length);
        const type = typeAndData.toString("ascii", 0, 4);
        if (zlib.crc32(typeAndData) !== png.readUInt32BE(pos + 8 + length)) {
            throw new Error(`the ${type} chunk fails its CRC-32`);
        }
        if (type === "IHDR") {
            header = typeAndData.subarray(4);
        } else if (type === "IDAT") {
            idat.push(typeAndData.subarray(4));
        } else if (type !== "IEND") {
            throw new Error(`unexpected ${type} chunk`);
        }
        pos += 12 + length;
    }
    if (header === null) {
        throw new Error("no IHDR chunk");
    }
    return { header, rows: zlib.inflateSync(Buffer.concat(idat)) };
 }
 // True when `file` already holds the image in `png`. A file that is missing or
 // cannot be read as a PNG does not, and is written over.
 function holdsSameImage(file, png) {
    let existing;
    try {
        existing = decodePng(fs.readFileSync(file));
    } catch {
        return false;
    }
    const drawn = decodePng(png);
    return (
        existing.header.equals(drawn.header) && existing.rows.equals(drawn.rows)
    );
 }
 // A file already holding the drawn image is left alone, so running this does
 // not rewrite the committed icons with node's compression.
 if (require.main === module) {
    for (const [size, file] of Object.entries(icons)) {
        const target = path.join(__dirname, "..", "..", file);
        const png = drawIcon(Number(size));
        if (holdsSameImage(target, png)) {
            console.log(`icons: ${file} already holds this image`);
            continue;
        }
        fs.writeFileSync(target, png);
        console.log(`icons: wrote ${file}`);
    }
 }
 module.exports = { drawIcon, decodePng };
@@ -1,23 +1,51 @@
 #!/bin/sh
-# script/lint: run the linter. Linting is a phase of the Dockerfile and
+# script/lint: run the linter (eslint, then prettier --check).
 # this builds that phase alone; the linter is never installed or run on
 # a developer host, where a shared result cache and a host-global lock
 # make its answer untrustworthy.
 #
-# The phase is not the last stage in the file, so it is built only when
+# Linting is containerized. ESLint results depend on the ESLint version, and
-# --target names it. --no-cache because a cached lint layer is a lint
+# the pinned one is the one in the image; a host's own install must not be
-# that did not run. The tag makes each build replace the previous image
+# able to decide whether this repo is green. From a host this therefore builds
-# instead of leaving a dangling one behind.
+# 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
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
 ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
 main() {
    cd "$ROOT"
-    docker build --no-cache \
+
-        --target lint \
+    case "${AUTISTMASK_LINT_NATIVE:-}" in
-        -t "$("$SCRIPT_DIR/projectname")-lint" .
+    1)
        echo "Linting..."
        yarn run lint 2>&1
        return 0
        ;;
    "") ;;
    *)
        # Set but not recognized: say so rather than silently taking the
        # docker path, which would look like the variable had no effect.
        echo "lint: AUTISTMASK_LINT_NATIVE is set to" \
            "'${AUTISTMASK_LINT_NATIVE}'; the only recognized value is 1" >&2
        exit 1
        ;;
    esac
    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 "$@"
@@ -1,19 +1,52 @@
 #!/bin/sh
-# script/test: run the test suite. Testing is a phase of the Dockerfile
+# script/test: run the test suite.
-# and this builds that phase alone, on the same terms as script/lint:
+#
-# --target because a phase that is not the last stage is built only when
+# jest runs three worker processes (package.json), not one per CPU core: on a
-# named, --no-cache because a cached test layer is a test that did not
+# many-core shared host one per core took gigabytes of RAM per run.
-# run, and a tag so each build replaces the previous image.
+#
 # The timeout bounds a hung suite; it is not a performance budget. On the busy
 # shared build host the suite takes 8-13s with three workers, inside
 # REPO_POLICIES' 20s budget. Inside the image the same suite also pays a cold
 # jest cache and shares the runner with the rest of the build, which is not what
 # that budget describes, so the Dockerfile raises the bound through
 # AUTISTMASK_TEST_TIMEOUT. A cap a healthy suite can trip on a cold cache
 # produces a red that means nothing, and teaches "just run it again".
 set -eu
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
+ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
-ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
+TIMEOUT="${AUTISTMASK_TEST_TIMEOUT:-30}"
 main() {
    cd "$ROOT"
-    docker build --no-cache \
+    echo "Running tests (timeout ${TIMEOUT}s)..."
-        --target test \
+
-        -t "$("$SCRIPT_DIR/projectname")-test" .
+    status=0
    timeout "$TIMEOUT" yarn run test 2>&1 || status=$?
    [ "$status" -eq 0 ] && return 0
    # 124 is timeout(1) killing the suite. Say so: a kill is not a failed
    # assertion, and the verbose rerun would only spend the same wall clock
    # to be killed again.
    if [ "$status" -eq 124 ]; then
        echo "tests: TIMED OUT after ${TIMEOUT}s (no assertion failed)" >&2
        echo "tests: raise AUTISTMASK_TEST_TIMEOUT if the suite is healthy" >&2
        exit 1
    fi
    # 125 is timeout(1) itself failing, which here means AUTISTMASK_TEST_TIMEOUT
    # is not a duration it accepts. The suite never ran, so it neither timed out
    # nor failed, and the verbose rerun would only reprint the same complaint.
    if [ "$status" -eq 125 ]; then
        echo "tests: DID NOT RUN: timeout(1) rejected AUTISTMASK_TEST_TIMEOUT=\"${TIMEOUT}\"" >&2
        echo "tests: set it to a duration such as 30 or 180 (see timeout(1))" >&2
        exit 1
    fi
    echo "--- Rerunning with --verbose for details ---"
    timeout "$TIMEOUT" yarn run test:verbose 2>&1 || true
    # Always fail: the first run already proved the tests are broken, so a
    # flaky pass on the rerun must not turn the build green.
    exit 1
 }
 main "$@"
@@ -4,7 +4,7 @@
 # scripts-to-rule-them-all.
 #
 # Deliberately NOT called by script/check or script/test: REPO_POLICIES.md
-# caps make test at 60 seconds and a browser suite does not fit. Run it
+# caps make test at 20 seconds and a browser suite does not fit. Run it
 # 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.
@@ -22,29 +22,13 @@ set -eu
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
-# Each run builds, runs and then removes an image under a tag of its own.
+IMAGE="$("$SCRIPT_DIR/projectname")-e2e-chrome"
-# Under one tag shared by every run, a second clone's build moves the tag
+
-# off this run's image, and the image store can then delete that untagged
+IIDFILE=""
 # image before or while this run uses it. The tag is random rather than
 # $$ because CI jobs share one docker daemon, but each job's container
 # numbers its processes from scratch.
 SUFFIX="$(od -An -N6 -tx1 /dev/urandom | tr -d ' \n')"
 NAME="$("$SCRIPT_DIR/projectname")-e2e-chrome"
 IMAGE="$NAME:$SUFFIX"
 # Each docker run below uses this container name: docker run --rm returns
 # only once its container is removed, so no run meets the one before it.
 CONTAINER="$NAME-$SUFFIX"
 cleanup() {
-    # After a third Ctrl-C docker's client exits whether or not the
+    if [ -n "$IIDFILE" ]; then
-    # container has stopped, and a container still running keeps the image
+        rm -f "$IIDFILE"
    # in use.
    if docker container inspect "$CONTAINER" >/dev/null 2>&1; then
        docker container rm -f "$CONTAINER" >/dev/null
    fi
    # No image to remove when the build failed or was interrupted.
    if docker image inspect "$IMAGE" >/dev/null 2>&1; then
        docker image rm "$IMAGE" >/dev/null
    fi
 }
@@ -56,16 +40,19 @@ main() {
        exit 1
    fi
    IIDFILE="$(mktemp)"
    trap cleanup EXIT
-    # HUP: the terminal or SSH session running the suite closed.
+    trap 'cleanup; exit 130' INT TERM
    trap 'cleanup; exit 130' HUP INT TERM
    echo "Building the Chrome e2e image (extension included)..."
-    # --no-cache: the image build runs make build and its checks, and a
+    docker build --iidfile "$IIDFILE" -t "$IMAGE" -f tests/e2e/Dockerfile .
    # cached layer is a check that did not run.
    docker build --no-cache -t "$IMAGE" -f tests/e2e/Dockerfile .
    echo "Running e2e suite in the pinned Playwright container..."
    # The image is run by ID, not by tag: where two clones of this repo run
    # the suite at once, the other build can move the tag between this
    # build and this run, and the suite would then silently test the other
    # checkout.
    #
    # --ipc=host: Chromium's shared-memory needs more than the default
    #   64MB /dev/shm or renderers crash.
    # HOME=/tmp: the image's root home is not a reliable place for the
@@ -85,12 +72,11 @@ main() {
    #   probe. The image is pinned by digest, so this can only ever bite
    #   on a deliberate bump.
    docker run --rm \
        --name "$CONTAINER" \
        --ipc=host \
        -e HOME=/tmp \
        -e PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 \
        -e "E2E_TRACE_NETWORK=${E2E_TRACE_NETWORK:-0}" \
-        "$IMAGE" \
+        "$(cat "$IIDFILE")" \
        node tests/e2e/run.js
    # Where chrome.storage.local lives, and what moves it: two unpacked loads
@@ -104,24 +90,10 @@ main() {
    # --host-resolver-rules=MAP * ~NOTFOUND so nothing it does can leave.
    echo "Running the extension-id and storage-partition observations..."
    docker run --rm \
        --name "$CONTAINER" \
        --ipc=host \
        -e HOME=/tmp \
-        "$IMAGE" \
+        "$(cat "$IIDFILE")" \
        node tests/e2e/storagePartition.js
    # Approvals left open for seven minutes in minimized windows, past the
    # point where Chrome stopped the background worker when nothing kept it
    # running. Its own program, without Playwright: Playwright keeps DevTools
    # attached to the worker, and Chrome never stops a worker DevTools is
    # attached to. It reaches nothing but its own loopback server.
    echo "Running the approvals left open for seven minutes..."
    docker run --rm \
        --name "$CONTAINER" \
        --ipc=host \
        -e HOME=/tmp \
        "$IMAGE" \
        node tests/e2e/slowApproval.js
 }
 main "$@"
@@ -4,7 +4,7 @@
 # script/test-e2e. Our own extension to scripts-to-rule-them-all.
 #
 # Deliberately NOT called by script/check or script/test, for the same
-# reason as the Chrome suite: REPO_POLICIES.md caps make test at 60 seconds
+# reason as the Chrome suite: REPO_POLICIES.md caps make test at 20 seconds
 # and a browser suite does not fit. .gitea/workflows/e2e.yml also runs it
 # on every push, in a job separate from check.
 #
@@ -21,23 +21,13 @@ set -eu
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
-# A tag and a container name of this run's own, as in script/test-e2e,
+IMAGE="$("$SCRIPT_DIR/projectname")-e2e-firefox"
-# which says why.
+
-SUFFIX="$(od -An -N6 -tx1 /dev/urandom | tr -d ' \n')"
+IIDFILE=""
 NAME="$("$SCRIPT_DIR/projectname")-e2e-firefox"
 IMAGE="$NAME:$SUFFIX"
 CONTAINER="$NAME-$SUFFIX"
 cleanup() {
-    # After a third Ctrl-C docker's client exits whether or not the
+    if [ -n "$IIDFILE" ]; then
-    # container has stopped, and a container still running keeps the image
+        rm -f "$IIDFILE"
    # in use.
    if docker container inspect "$CONTAINER" >/dev/null 2>&1; then
        docker container rm -f "$CONTAINER" >/dev/null
    fi
    # No image to remove when the build failed or was interrupted.
    if docker image inspect "$IMAGE" >/dev/null 2>&1; then
        docker image rm "$IMAGE" >/dev/null
    fi
 }
@@ -49,16 +39,20 @@ main() {
        exit 1
    fi
    IIDFILE="$(mktemp)"
    trap cleanup EXIT
-    # HUP: the terminal or SSH session running the suite closed.
+    trap 'cleanup; exit 130' INT TERM
    trap 'cleanup; exit 130' HUP INT TERM
    echo "Building the pinned Firefox e2e image (extension included)..."
-    # --no-cache: the image build runs make build and its checks, and a
+    docker build --iidfile "$IIDFILE" -t "$IMAGE" \
-    # cached layer is a check that did not run.
+        -f tests/e2e/firefox/Dockerfile .
    docker build --no-cache -t "$IMAGE" -f tests/e2e/firefox/Dockerfile .
    echo "Running the Firefox e2e suite..."
    # The image is run by ID, not by tag: where two clones of this repo run
    # the suite at once, the other build can move the tag between this
    # build and this run, and the suite would then silently test the other
    # checkout.
    #
    # --shm-size=1g: Firefox needs more than the default 64MB /dev/shm.
    # --network none: the suite stubs nothing, so this is what keeps the
    #   run offline and deterministic. The extension swallows its own
@@ -73,11 +67,10 @@ main() {
    # "CanCreateUserNamespace() clone() failure: EPERM" on startup here;
    # it is cosmetic and headless Firefox runs fine without it.
    docker run --rm \
        --name "$CONTAINER" \
        --shm-size=1g \
        --network none \
        -e HOME=/tmp \
-        "$IMAGE" \
+        "$(cat "$IIDFILE")" \
        node tests/e2e/firefox/run.js dist/firefox
    # The install/uninstall/re-install property, against the packaged XPI
@@ -87,11 +80,10 @@ main() {
    # and the suite above shares one session throughout.
    echo "Running the Firefox re-install suite against the packaged XPI..."
    docker run --rm \
        --name "$CONTAINER" \
        --shm-size=1g \
        --network none \
        -e HOME=/tmp \
-        "$IMAGE" \
+        "$(cat "$IIDFILE")" \
        node tests/e2e/firefox/reinstall.js
 }
@@ -2,8 +2,7 @@
 # script/test-verify-build: exercise every failure mode of
 # script/verify-build, and what make build does with dist/ after one of them
 # (script/discard-dist-on-failure). Our own extension to
-# scripts-to-rule-them-all, run by the Dockerfile's test phase so make check
+# scripts-to-rule-them-all, run from script/check so make check covers it.
 # covers it.
 #
 # Why this exists: verify-build is the build-integrity guard, and four separate
 # reviews of it each found a fresh vacuous pass — the grep exit-2 conflation,
@@ -915,76 +914,6 @@ run_cases() {
    discard_case "the wrapper given no command removes nothing" \
        c_control 1 kept "no command given" ""
    # With stderr closed the wrapper cannot write its message, and must still
    # remove dist/ and return the step's own status.
    build_fixture
    _status=0
    (cd "$FIXTURE" &&
        "$FIXTURE/script/discard-dist-on-failure" sh -c 'exit 6' 2>&-) ||
        _status=$?
    if [ "$_status" -eq 6 ] && [ ! -e "$FIXTURE/dist" ]; then
        PASSED=$((PASSED + 1))
        echo "  ok: a failed step's status survives a closed stderr"
    else
        FAILED=$((FAILED + 1))
        echo "  FAIL: a failed step's status survives a closed stderr"
        echo "    exit status $_status, wanted 6, and dist/ must be gone"
    fi
    # The same with stderr a pipe nobody reads any more, where the write would
    # kill the wrapper with SIGPIPE. The FIFO's only reader opens it, exits and
    # is waited for before the wrapper runs, so the pipe never has a reader.
    build_fixture
    mkfifo "$WORK/stderr-fifo"
    _status=0
    (
        : <"$WORK/stderr-fifo" &
        exec 3>"$WORK/stderr-fifo"
        wait "$!"
        cd "$FIXTURE" &&
            "$FIXTURE/script/discard-dist-on-failure" sh -c 'exit 6' 2>&3
    ) || _status=$?
    if [ "$_status" -eq 6 ] && [ ! -e "$FIXTURE/dist" ]; then
        PASSED=$((PASSED + 1))
        echo "  ok: a failed step's status survives a pipe nobody reads"
    else
        FAILED=$((FAILED + 1))
        echo "  FAIL: a failed step's status survives a pipe nobody reads"
        echo "    exit status $_status, wanted 6, and dist/ must be gone"
    fi
    # An interrupt while a step runs removes nothing and says nothing, even
    # when the step catches it and exits with a status of its own, as
    # script/check-censored does. The step interrupts the wrapper and then
    # itself, as Ctrl-C interrupts every process of the build at once. Run
    # under dash and under bash, which /bin/sh may each be: bash carries on
    # after such a step unless the wrapper stops it.
    for _shell in dash bash; do
        _name="an interrupt under $_shell removes nothing"
        if ! command -v "$_shell" >/dev/null 2>&1; then
            SKIPPED=$((SKIPPED + 1))
            SKIPPED_NAMES="$SKIPPED_NAMES##   - $_name ($_shell not found)$NEWLINE"
            echo "  SKIP ($_shell not found): $_name"
            continue
        fi
        build_fixture
        _status=0
        _out="$(cd "$FIXTURE" && "$_shell" \
            "$FIXTURE/script/discard-dist-on-failure" \
            sh -c 'trap "exit 4" INT; kill -INT "$PPID" $$; exit 5' 2>&1)" ||
            _status=$?
        if [ "$_status" -eq 130 ] && [ -z "$_out" ] &&
            [ -f "$FIXTURE/dist/chrome/src/popup/index.js" ]; then
            PASSED=$((PASSED + 1))
            echo "  ok: $_name"
        else
            FAILED=$((FAILED + 1))
            echo "  FAIL: $_name"
            echo "    exit status $_status, wanted 130; dist/ must be intact" \
                "and nothing said. Output: $_out"
        fi
    done
    check_makefile_wiring
 }
@@ -22,11 +22,7 @@ const { debugFetch, log } = require("../shared/log");
 const {
    verifySignedTx,
    verifySignature,
    signedPrimaryType,
    typedDataMessageRefusal,
    typedDataChainRefusal,
    failureIsRetryable,
    nodeError,
    describeTxFailure,
    sameAddress,
    ApprovalMismatchError,
@@ -47,11 +43,7 @@ const {
 const {
    actionApi,
    getPlatformInfo,
    runtimeApi,
    sessionStorageGet,
    sessionStorageRemove,
    sessionStorageSet,
    tabsQuery,
    tabsSendMessage,
    windowsApi,
@@ -64,62 +56,16 @@ const runtime = runtimeApi();
 const windowsNs = windowsApi();
 const actionNs = actionApi();
-// Connections the user allowed without "Remember my choice for this site".
+// Connected sites (in-memory, non-persisted): { "origin:address": true }
 // Each is one item in the browser's session storage, key
 // origin + ":" + address and value true, and session storage holds nothing
 // else. Session storage outlives this worker being stopped when idle and
 // started again, so such a connection lasts until it is ended below or the
 // browser closes. One item per connection means that making one is a single
 // write, and two never overwrite each other.
 //
 // A site is its full origin (scheme://host[:port]), here and in the
 // remembered allowedSites/deniedSites lists alike: a grant to
 // https://dapp.example says nothing about http://dapp.example or another port.
-// An origin can carry a port, so the address is what follows the key's last
+const connectedSites = {};
 // colon and the origin is what precedes it.
 async function isConnected(origin, address) {
    const key = origin + ":" + address;
    const items = await sessionStorageGet(key);
    return items[key] === true;
 }
 // End every connection allowed without "Remember" whose key `ends` returns
 // true for.
 async function endConnections(ends) {
    const keys = Object.keys(await sessionStorageGet(null)).filter(ends);
    if (keys.length > 0) await sessionStorageRemove(keys);
 }
 // Pending approval requests: { id: { origin, resolve } }
 const pendingApprovals = {};
 // An approval, and the site's request waiting on it, exist only in this
 // worker's memory. Left alone, Chrome stopped the worker about six minutes
 // after the site's request while the user was still deciding, and the approval
 // was lost with it. Chrome counts an extension call as activity, so while any
 // approval is pending this worker makes one every 20 seconds, inside Chrome's
 // 30-second idle limit. It is the worker's own timer, so it runs whether or not
 // the approval window is visible, and it stops itself once nothing is pending.
 let keepRunningTimer = null;
 // Add an approval waiting for the user, and start the timer above if it is not
 // running. This is the ONLY place an approval is added, as settleApproval() is
 // the only place one is removed, so every kind of approval keeps the worker
 // running while it waits.
 function addPendingApproval(approval) {
    pendingApprovals[approval.id] = approval;
    if (keepRunningTimer) return;
    keepRunningTimer = setInterval(() => {
        if (Object.keys(pendingApprovals).length === 0) {
            clearInterval(keepRunningTimer);
            keepRunningTimer = null;
            return;
        }
        // Only the call matters; its answer is not used.
        getPlatformInfo().catch(() => {});
    }, 20000);
 }
 // One transaction approval at a time, wallet-wide.
 //
 // The transaction a site asks for is populated before its approval window
@@ -191,12 +137,11 @@ function releaseTxApprovalSlotFor(approvalId) {
    }
 }
-// One site-connection approval, one sign approval and one network-switch
+// One site-connection approval and one sign approval per site at a time: a
-// approval per site at a time: a page that asks again before the user has
+// page that asks again before the user has answered is refused with the code
-// answered is refused with the code above instead of opening another window,
+// above instead of opening another window, so it cannot bury the user in
-// so it cannot bury the user in prompts. The pending approval itself holds the
+// prompts. The pending approval itself holds the place, so a caller must test
-// place, so a caller must test this and raise its approval with nothing awaited
+// this and raise its approval with nothing awaited in between.
 // in between.
 function findPendingApproval(origin, type) {
    return Object.values(pendingApprovals).find(
        (approval) => approval.origin === origin && approval.type === type,
@@ -295,21 +240,6 @@ function failureError(err) {
    return { code: INTERNAL_ERROR_CODE, message: INTERNAL_ERROR_MESSAGE };
 }
 // The EIP-1193 error for a request that failed, with `message` as the
 // sentence the page is shown. `rpcError` holds the JSON-RPC code and data the
 // failure carries, if any: the node's own when the node refused the request,
 // passed on unchanged so a site can tell a revert from any other failure and
 // decode its revert data. A failure with no numeric code is the wallet's own,
 // and is answered with the internal error code above.
 function requestError(message, rpcError) {
    if (rpcError && typeof rpcError.code === "number") {
        const error = { code: rpcError.code, message };
        if (rpcError.data !== undefined) error.data = rpcError.data;
        return error;
    }
    return { code: INTERNAL_ERROR_CODE, message };
 }
 // The active address of a profile snapshot. Pure, and taking the snapshot as
 // an argument rather than reading storage itself: a handler that has already
 // read state must not answer "which account is this" from a SECOND, later read
@@ -355,8 +285,7 @@ function extractHostname(origin) {
    }
 }
-// Proxy an RPC call to the Ethereum node. An error the node answers with is
+// Proxy an RPC call to the Ethereum node
 // thrown with the node's own JSON-RPC `code` and `data` on it, for the page.
 async function proxyRpc(method, params) {
    const rpcUrl = await getRpcUrl();
    const resp = await debugFetch(rpcUrl, {
@@ -371,10 +300,7 @@ async function proxyRpc(method, params) {
    });
    const json = await resp.json();
    if (json.error) {
-        const err = new Error(json.error.message || "RPC error");
+        throw new Error(json.error.message || "RPC error");
        err.code = json.error.code;
        err.data = json.error.data;
        throw err;
    }
    return json.result;
 }
@@ -422,9 +348,8 @@ function settleApproval(id, result, options) {
 // What a pending approval resolves to when it is given up on rather than
 // answered: the window was closed, or could not be opened at all. A tx or sign
-// approval answers the requesting page in EIP-1193 shape; a site-connection or
+// approval answers the requesting page in EIP-1193 shape; a site-connection
-// network-switch approval answers its handler in the shape the popup's
+// approval answers the connection handler in its own.
 // decision has, as a refusal.
 function abandonedResult(approval, code, message) {
    if (approval.type === "tx" || approval.type === "sign") {
        return { error: { code, message } };
@@ -495,10 +420,7 @@ function releaseApproval(approval) {
 // the result on the floor, so a rejection here would be unhandled.
 async function openApprovalWindow(id) {
    const popupUrl = runtime.getURL("src/popup/index.html?approval=" + id);
-    // As wide as the page: body in src/popup/styles/main.css. The browser
+    const popupWidth = 360;
    // counts the window's frame in this width; the page itself adds back
    // whatever the frame takes (src/popup/index.js).
    const popupWidth = 396;
    const popupHeight = 600;
    let currentWin = null;
@@ -518,7 +440,7 @@ async function openApprovalWindow(id) {
    // Centred on a browser window only. The last focused window can be
    // another approval window still open, and centring on one can give a
    // position the browser refuses ("Bounds must be at least 50% within
-    // visible screen space"): headless Chrome reports this 396x600 popup as
+    // visible screen space"): headless Chrome reports this 360x600 popup as
    // 1280x720. The request then failed with no window at all. Over a popup,
    // the browser picks the position.
    if (currentWin && currentWin.type === "normal") {
@@ -589,7 +511,7 @@ async function openApprovalWindow(id) {
 function requestApproval(origin) {
    return new Promise((resolve) => {
        const id = crypto.randomUUID();
-        addPendingApproval({ id, origin, resolve, type: "site" });
+        pendingApprovals[id] = { id, origin, resolve, type: "site" };
        if (actionNs && typeof actionNs.openPopup === "function") {
            showInToolbarPopup(id);
@@ -632,14 +554,14 @@ function showInToolbarPopup(id) {
 function requestTxApproval(origin, approvedTx, approvedFrom, slot) {
    return new Promise((resolve) => {
        const id = crypto.randomUUID();
-        addPendingApproval({
+        pendingApprovals[id] = {
            id,
            origin,
            approvedTx,
            approvedFrom,
            resolve,
            type: "tx",
-        });
+        };
        if (slot) slot.approvalId = id;
        openApprovalWindow(id);
@@ -653,34 +575,14 @@ function requestTxApproval(origin, approvedTx, approvedFrom, slot) {
 function requestSignApproval(origin, signParams, approvedFrom) {
    return new Promise((resolve) => {
        const id = crypto.randomUUID();
-        addPendingApproval({
+        pendingApprovals[id] = {
            id,
            origin,
            signParams,
            approvedFrom,
            resolve,
            type: "sign",
-        });
+        };
        openApprovalWindow(id);
    });
 }
 // Open a network-switch approval popup and return a promise that resolves with
 // { approved }. Opened in a window, as tx and sign approvals are, because a
 // site's request is not a user gesture. The popup answers on the approval port,
 // as a site-connection approval does.
 function requestNetworkApproval(origin, currentNetworkId, requestedNetworkId) {
    return new Promise((resolve) => {
        const id = crypto.randomUUID();
        addPendingApproval({
            id,
            origin,
            currentNetworkId,
            requestedNetworkId,
            resolve,
            type: "network",
        });
        openApprovalWindow(id);
    });
@@ -695,8 +597,8 @@ function isExtensionSender(sender) {
 }
 // The approval popup's port: it carries the user's decision on a
-// site-connection or network-switch approval, and its disconnect is how that
+// site-connection approval, and its disconnect is how that approval learns the
-// approval learns the popup closed without one.
+// popup closed without one.
 //
 // The decision travels this port rather than a one-off runtime.sendMessage()
 // for exactly one reason: the port is also what the popup's window.close()
@@ -708,9 +610,8 @@ function isExtensionSender(sender) {
 // had refused.
 //
 // TX and sign approvals do not decide here. They stay pending across a
-// disconnect. When their window closes, the windows.onRemoved listener below
+// disconnect — the user can reopen the toolbar popup — and are rejected by the
-// rejects them, unless an approved attempt is still running, in which case
+// windows.onRemoved listener below.
 // that attempt answers the page.
 runtime.onConnect.addListener((port) => {
    if (port.name.startsWith("approval:")) {
        const id = port.name.split(":")[1];
@@ -738,9 +639,7 @@ runtime.onConnect.addListener((port) => {
            const approval = pendingApprovals[id];
            if (approval) {
                if (approval.type === "tx" || approval.type === "sign") {
-                    // When its window closes, windows.onRemoved rejects it,
+                    // Keep pending — user can reopen the toolbar popup
                    // unless an approved attempt is still running, in which
                    // case that attempt answers the page.
                    return;
                }
                settleApproval(id, { approved: false, remember: false });
@@ -770,7 +669,7 @@ async function handleConnectionRequest(origin) {
    const s = await getState();
    const activeAddress = activeAddressOf(s);
    if (!activeAddress) {
-        return { error: { code: 4100, message: "No accounts available" } };
+        return { error: { message: "No accounts available" } };
    }
    const allowed = s.allowedSites[activeAddress] || [];
@@ -786,10 +685,10 @@ async function handleConnectionRequest(origin) {
        };
    }
-    // Check allowed list or a connection allowed without "Remember"
+    // Check allowed list or in-memory connected
    if (
        allowed.includes(origin) ||
-        (await isConnected(origin, activeAddress))
+        connectedSites[origin + ":" + activeAddress]
    ) {
        return { result: [activeAddress] };
    }
@@ -826,7 +725,7 @@ async function handleConnectionRequest(origin) {
        if (decision.remember) {
            await rememberSiteChoice("allowedSites", activeAddress, origin);
        } else {
-            await sessionStorageSet({ [origin + ":" + activeAddress]: true });
+            connectedSites[origin + ":" + activeAddress] = true;
        }
        return { result: [activeAddress] };
    } else {
@@ -842,12 +741,11 @@ async function handleConnectionRequest(origin) {
    }
 }
-// Methods that are safe to proxy directly to the RPC node. A method handleRpc
+// Methods that are safe to proxy directly to the RPC node
 // answers before its proxy branch does not belong here: it would never reach
 // the node. tests/proxyMethods.test.js sends every one of these.
 const PROXY_METHODS = [
    "eth_blockNumber",
    "eth_call",
    "eth_chainId",
    "eth_estimateGas",
    "eth_gasPrice",
    "eth_getBalance",
@@ -861,6 +759,7 @@ const PROXY_METHODS = [
    "eth_getTransactionReceipt",
    "eth_maxPriorityFeePerGas",
    "eth_sendRawTransaction",
    "net_version",
    "web3_clientVersion",
    "eth_feeHistory",
    "eth_getBlockTransactionCountByHash",
@@ -880,7 +779,7 @@ async function handleRpc(method, params, origin) {
        const allowed = s.allowedSites[activeAddress] || [];
        if (
            allowed.includes(origin) ||
-            (await isConnected(origin, activeAddress))
+            connectedSites[origin + ":" + activeAddress]
        ) {
            return { result: [activeAddress] };
        }
@@ -907,16 +806,12 @@ async function handleRpc(method, params, origin) {
        // tab is served from, so a page the user never connected to must
        // not be able to do it. Ungated, any page could clear the
        // [TESTNET] banner under a user who believed they were on Sepolia.
        //
        // A connected site does not switch it either: only the user does,
        // by approving the request on the prompt below
        // (https://git.eeqj.de/sneak/AutistMask/issues/408).
        const s = await getState();
        const activeAddress = activeAddressOf(s);
        const allowed = s.allowedSites[activeAddress] || [];
        if (
            !allowed.includes(origin) &&
-            !(await isConnected(origin, activeAddress))
+            !connectedSites[origin + ":" + activeAddress]
        ) {
            return { error: { code: 4100, message: "Unauthorized" } };
        }
@@ -932,27 +827,6 @@ async function handleRpc(method, params, origin) {
        }
        if (SUPPORTED_CHAIN_IDS.has(chainId)) {
            const target = networkByChainId(chainId);
            if (findPendingApproval(origin, "network")) {
                return {
                    error: {
                        code: APPROVAL_PENDING_CODE,
                        message: APPROVAL_PENDING_MESSAGE,
                    },
                };
            }
            const decision = await requestNetworkApproval(
                origin,
                s.networkId,
                target.id,
            );
            if (!decision.approved) {
                return {
                    error: {
                        code: APPROVAL_REJECTED_CODE,
                        message: APPROVAL_REJECTED_MESSAGE,
                    },
                };
            }
            // Read-modify-write against storage. The old path went through
            // onChainSwitch(), which mutates the singleton and then persists
            // every field of it — on an unloaded worker that wrote empty
@@ -1009,10 +883,10 @@ async function handleRpc(method, params, origin) {
        const s = await getState();
        const activeAddress = activeAddressOf(s);
        const allowed = s.allowedSites[activeAddress] || [];
-        const hasPermission =
+        const isConnected =
            allowed.includes(origin) ||
-            (await isConnected(origin, activeAddress));
+            connectedSites[origin + ":" + activeAddress];
-        if (!hasPermission || !activeAddress) {
+        if (!isConnected || !activeAddress) {
            return { result: [] };
        }
        return {
@@ -1034,12 +908,12 @@ async function handleRpc(method, params, origin) {
        const s = await getState();
        const activeAddress = activeAddressOf(s);
        if (!activeAddress)
-            return { error: { code: 4100, message: "No accounts available" } };
+            return { error: { message: "No accounts available" } };
        const allowed = s.allowedSites[activeAddress] || [];
        if (
            !allowed.includes(origin) &&
-            !(await isConnected(origin, activeAddress))
+            !connectedSites[origin + ":" + activeAddress]
        ) {
            return { error: { code: 4100, message: "Unauthorized" } };
        }
@@ -1063,8 +937,9 @@ async function handleRpc(method, params, origin) {
        if (method === "eth_sign") {
            signParams.dangerWarning =
-                "This site used the older eth_sign method. " +
+                "\u26a0\ufe0f DANGER: This site is requesting to sign a raw hash. " +
-                "The data will be signed as a personal message.";
+                "This can be used to sign transactions that drain your funds. " +
                "Only proceed if you fully understand what you are signing.";
        }
        if (findPendingApproval(origin, "sign")) {
@@ -1088,12 +963,12 @@ async function handleRpc(method, params, origin) {
        const s = await getState();
        const activeAddress = activeAddressOf(s);
        if (!activeAddress)
-            return { error: { code: 4100, message: "No accounts available" } };
+            return { error: { message: "No accounts available" } };
        const allowed = s.allowedSites[activeAddress] || [];
        if (
            !allowed.includes(origin) &&
-            !(await isConnected(origin, activeAddress))
+            !connectedSites[origin + ":" + activeAddress]
        ) {
            return { error: { code: 4100, message: "Unauthorized" } };
        }
@@ -1135,13 +1010,12 @@ async function handleRpc(method, params, origin) {
            const result = await proxyRpc(method, params);
            return { result };
        } catch (e) {
-            // A node that answered with an error is reported as itself, with
+            // A node that answered with an error is reported as itself. The
-            // its own code and data. The wallet being unable to read its own
+            // wallet being unable to read its own profile is not that, and it
-            // profile is not that, and it must not be answered as an ordinary
+            // must not be flattened into a message with no code: it goes back
-            // failure: it goes back to the dispatcher, which has the one
+            // to the dispatcher, which has the one answer for it.
            // answer for it.
            if (e instanceof StateUnusableError) throw e;
-            return { error: requestError(e.message, e) };
+            return { error: { message: e.message } };
        }
    }
@@ -1157,14 +1031,12 @@ async function handleRpc(method, params, origin) {
 async function handleSendTransaction(params, origin) {
    const s = await getState();
    const activeAddress = activeAddressOf(s);
-    if (!activeAddress) {
+    if (!activeAddress) return { error: { message: "No accounts available" } };
        return { error: { code: 4100, message: "No accounts available" } };
    }
    const allowed = s.allowedSites[activeAddress] || [];
    if (
        !allowed.includes(origin) &&
-        !(await isConnected(origin, activeAddress))
+        !connectedSites[origin + ":" + activeAddress]
    ) {
        return { error: { code: 4100, message: "Unauthorized" } };
    }
@@ -1218,7 +1090,7 @@ async function handleSendTransaction(params, origin) {
                txParams,
            );
        } catch (e) {
-            return { error: requestError(e.message, e) };
+            return { error: { message: e.message } };
        }
        // Population is a network round trip, and the user can switch address
@@ -1228,9 +1100,10 @@ async function handleSendTransaction(params, origin) {
        // while the page is still waiting and nothing has been displayed.
        if (!sameAddress(await getActiveAddress(), activeAddress)) {
            return {
-                error: requestError(
+                error: {
-                    "The active address changed while this transaction was being prepared, so it was not sent.",
+                    message:
-                ),
+                        "The active address changed while this transaction was being prepared, so it was not sent.",
                },
            };
        }
@@ -1276,6 +1149,10 @@ async function broadcastChainChanged(chainId) {
 // Broadcast accountsChanged to all tabs, respecting per-address permissions
 async function broadcastAccountsChanged() {
    // Clear non-remembered approvals on address switch
    for (const key of Object.keys(connectedSites)) {
        delete connectedSites[key];
    }
    // Reject and close any pending approval popups so they don't hang. An
    // approval an attempt has already claimed is left alone entirely: it is
    // being signed and broadcast right now, and neither rejecting it to the
@@ -1294,10 +1171,6 @@ async function broadcastAccountsChanged() {
        }
    }
    resetPopupUrl();
    // An address switch ends every connection allowed without "Remember". This
    // waits on storage, so it comes after the pending approvals above, which
    // are still rejected the moment the switch arrives.
    await endConnections(() => true);
    const s = await getState();
    const activeAddress = activeAddressOf(s);
    const allowed = activeAddress ? s.allowedSites[activeAddress] || [] : [];
@@ -1308,24 +1181,17 @@ async function broadcastAccountsChanged() {
        return;
    }
    for (const tab of tabs) {
        // The tab's URL is all the background knows of the page in it, and a
        // page at a site's URL may have another origin: a page its server
        // sandboxes with a Content-Security-Policy has the origin "null". So
        // the event names the origin it was judged by, and the content script
        // passes the address on only to a page whose own origin is that one
        // (src/content/index.js).
        const origin = tab.url ? new URL(tab.url).origin : "";
        const hasPermission =
            activeAddress &&
            (allowed.includes(origin) ||
-                (await isConnected(origin, activeAddress)));
+                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, {
            type: "AUTISTMASK_EVENT",
            eventName: "accountsChanged",
            data: hasPermission ? [activeAddress] : [],
            origin,
        }).catch(() => {});
    }
 }
@@ -1379,13 +1245,6 @@ const RECENT_BALANCE_REFRESH_MS = Math.floor(BALANCE_REFRESH_PERIOD_MS / 2);
 // balances that came back — by address, onto whatever storage holds NOW.
 // Applying by address rather than writing the array back is what keeps a
 // wallet or address added, renamed or deleted during the round trip.
 //
 // Nothing is applied when the network stored NOW is not the one the refresh
 // ran on. A network switch during the round trip cleared every address's
 // balances (applyChainSwitchFields()), and the previous network's must not come
 // back over them (https://git.eeqj.de/sneak/AutistMask/issues/577).
 // lastBalanceRefresh is left as the switch set it, so the next tick refreshes
 // the new network.
 async function backgroundRefresh() {
    const s = await getState();
    const now = Date.now();
@@ -1397,7 +1256,6 @@ async function backgroundRefresh() {
        wallets,
        s.rpcUrl,
        s.blockscoutUrl,
        s.useBlockscout,
        s.trackedTokens,
        s.networkId,
    );
@@ -1410,7 +1268,6 @@ async function backgroundRefresh() {
    }
    await updateState((fresh) => {
        if (fresh.networkId !== s.networkId) return;
        for (const wallet of fresh.wallets) {
            for (const addr of wallet.addresses || []) {
                const got = refreshed.get(String(addr.address).toLowerCase());
@@ -1488,21 +1345,20 @@ startBackgroundJobs();
 // which then fails retryably settles instead of waiting in a window that no
 // longer exists.
 //
-// A site-connection or network-switch approval whose popup connected its port
+// A site-connection approval whose popup connected its port is not decided
-// is not decided here. That popup approves and closes in the same breath, and
+// here. That popup approves and closes in the same breath, and this event
-// this event races the decision on a channel of its own — the same race the
+// races the decision on a channel of its own — the same race the port exists
-// port exists to end. Its port disconnect says the same thing this event does,
+// to end. Its port disconnect says the same thing this event does, in an order
-// in an order that is defined, so the disconnect is left to say it. The window
+// that is defined, so the disconnect is left to say it. The window closing
-// closing before any port connected is the one case with nothing else to speak
+// before any port connected is the one case with nothing else to speak for it,
-// for it, and is rejected here so the dApp is not left waiting on a window that
+// and is rejected here so the dApp is not left waiting on a window that is
-// is gone.
+// gone.
 if (windowsNs && windowsNs.onRemoved) {
    windowsNs.onRemoved.addListener((windowId) => {
        for (const [id, approval] of Object.entries(pendingApprovals)) {
            if (approval.windowId !== windowId) continue;
-            const decidedOnPort =
+            const isSite = approval.type !== "tx" && approval.type !== "sign";
-                approval.type !== "tx" && approval.type !== "sign";
+            if (isSite && approval.portConnected) continue;
            if (decidedOnPort && approval.portConnected) continue;
            const rejection = abandonedResult(
                approval,
                APPROVAL_REJECTED_CODE,
@@ -1520,14 +1376,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
        // the message carries. Firefox before 126 gives no sender.origin, so
        // the origin of sender.url is used: the frame that sent the message,
        // not the tab's page, which may be another site embedding that
-        // frame.
+        // frame. With neither, the request is refused.
        //
        // A site is scheme://host[:port], so a request is refused when its
        // origin has no host, as when it has no origin at all, rather than
        // credited to the site its URL names. The browser reports "null" for
        // a page with an opaque origin, such as one its server sandboxes with
        // a Content-Security-Policy, and Chrome reports "file://" for a local
        // file.
        let trustedOrigin = sender.origin;
        if (!trustedOrigin && sender.url) {
            try {
@@ -1536,13 +1385,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                // an unparseable URL leaves the origin unknown
            }
        }
-        let host = "";
+        if (!trustedOrigin) {
        try {
            host = new URL(trustedOrigin).host;
        } catch {
            // no origin, or "null", is not a URL and so has no host
        }
        if (!host) {
            sendResponse({
                error: {
                    code: 4100,
@@ -1580,7 +1423,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
        "AUTISTMASK_ADDRESSES_REMOVED",
        "AUTISTMASK_GET_CONNECTED_SITES",
        "AUTISTMASK_REMOVE_SITE",
        "AUTISTMASK_NETWORK_CHANGED",
    ];
    if (POPUP_ONLY_TYPES.includes(msg.type) && !isExtensionSender(sender)) {
        sendResponse({ error: "Unauthorized sender" });
@@ -1604,11 +1446,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                resp.signParams = approval.signParams;
                resp.approvedFrom = approval.approvedFrom;
            }
            if (approval.type === "network") {
                resp.type = "network";
                resp.currentNetworkId = approval.currentNetworkId;
                resp.requestedNetworkId = approval.requestedNetworkId;
            }
            // Flag if the requesting domain is on the phishing blocklist.
            resp.isPhishingDomain = isPhishingDomain(
                extractHostname(approval.origin),
@@ -1739,7 +1576,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                if (outcome.spendApproval) {
                    settleApproval(
                        msg.id,
-                        { error: requestError(outcome.error) },
+                        { error: { message: outcome.error } },
                        { holdsClaim: true },
                    );
                } else {
@@ -1766,7 +1603,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                const outcome = describeTxFailure(TX_STAGE_NONCE, null);
                settleApproval(
                    msg.id,
-                    { error: requestError(outcome.error) },
+                    { error: { message: outcome.error } },
                    { holdsClaim: true },
                );
                sendResponse({
@@ -1799,13 +1636,10 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                // that says plainly it did not take the transaction:
                // describeTxFailure() reclassifies that, and the stage it
                // returns is the one reported.
                //
                // A node that refused the transaction gives the page its own
                // code and data, whatever sentence the page is shown.
                const outcome = describeTxFailure(TX_STAGE_BROADCAST, e);
                settleApproval(
                    msg.id,
-                    { error: requestError(outcome.error, nodeError(e)) },
+                    { error: { message: outcome.error } },
                    { holdsClaim: true },
                );
                sendResponse({
@@ -1876,8 +1710,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
        (async () => {
            try {
-                const s = await getState();
+                const activeAddress = await getActiveAddress();
                const activeAddress = activeAddressOf(s);
                // Same as the transaction path: the address the approval named
                // is the one that must have signed, and a switch since then is
                // a refusal rather than a signature from another account.
@@ -1896,29 +1729,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                    signature,
                    approval.approvedFrom,
                );
                // The sign screen refuses typed data whose message ethers
                // would sign differently from how it is shown, or whose
                // domain names another chain. A signature for it that arrives
                // anyway is refused here, against the network active now.
                const sp = approval.signParams;
                if (
                    sp.method === "eth_signTypedData_v4" ||
                    sp.method === "eth_signTypedData"
                ) {
                    const data = JSON.parse(sp.typedData);
                    const refusal =
                        typedDataMessageRefusal(
                            data.types,
                            signedPrimaryType(data.types),
                            data.message,
                            "",
                        ) ||
                        typedDataChainRefusal(
                            data.domain,
                            networkById(s.networkId),
                        );
                    if (refusal) throw new ApprovalMismatchError(refusal);
                }
                settleApproval(msg.id, { signature }, { holdsClaim: true });
                sendResponse({ signature });
            } catch (e) {
@@ -1927,7 +1737,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                if (!retryable) {
                    settleApproval(
                        msg.id,
-                        { error: requestError(errMsg) },
+                        { error: { message: errMsg } },
                        { holdsClaim: true },
                    );
                } else {
@@ -1955,65 +1765,40 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
    }
    // The popup removed these addresses, so no site stays connected to them.
    // A connectedSites key is origin + ":" + address, and an origin can carry
    // a port, so the address is what follows the last colon.
    if (msg.type === "AUTISTMASK_ADDRESSES_REMOVED") {
        const removed = Array.isArray(msg.addresses) ? msg.addresses : [];
-        endConnections((key) => {
+        for (const key of Object.keys(connectedSites)) {
            const address = key.slice(key.lastIndexOf(":") + 1);
-            return removed.some((a) => sameAddress(a, address));
+            if (removed.some((a) => sameAddress(a, address))) {
-        }).catch((err) => {
+                delete connectedSites[key];
-            log.errorf(
+            }
-                "ending the removed addresses' connections failed:",
+        }
                err,
            );
        });
        return false;
    }
-    // Settings lists the sites connected without "Remember", which only
+    // Settings lists the sites connected without "Remember", which only this
-    // session storage holds.
+    // worker knows. The origin is what precedes the key's last colon.
    if (msg.type === "AUTISTMASK_GET_CONNECTED_SITES") {
-        sessionStorageGet(null)
+        sendResponse(
-            .then((items) =>
+            Object.keys(connectedSites).map((key) =>
-                Object.keys(items).map((key) =>
+                key.slice(0, key.lastIndexOf(":")),
-                    key.slice(0, key.lastIndexOf(":")),
+            ),
-                ),
+        );
-            )
+        return false;
            .catch((err) => {
                log.errorf("listing the connected sites failed:", err);
                return [];
            })
            .then(sendResponse);
        return true;
    }
    // Settings removed this site (msg.origin) and has already dropped its
    // remembered entries. Its connections approved without "Remember" end
    // here, under every address, and its open tabs are told it has no account.
    // The answer goes back once they have ended, and Settings waits for it
    // before it lists the connected sites again.
    if (msg.type === "AUTISTMASK_REMOVE_SITE") {
-        endConnections(
+        for (const key of Object.keys(connectedSites)) {
-            (key) => key.slice(0, key.lastIndexOf(":")) === msg.origin,
+            if (key.slice(0, key.lastIndexOf(":")) === msg.origin) {
-        )
+                delete connectedSites[key];
-            .catch((err) => {
+            }
-                log.errorf(
+        }
-                    "ending the removed site's connections failed:",
+        broadcastSiteRemoved(msg.origin);
                    err,
                );
            })
            .then(() => {
                broadcastSiteRemoved(msg.origin);
                sendResponse(null);
            });
        return true;
    }
    // Settings switched the network and has saved it. Open tabs are told the
    // new chain id the same way as after a site's approved switch request.
    if (msg.type === "AUTISTMASK_NETWORK_CHANGED") {
        broadcastChainChanged(msg.chainId);
        return false;
    }
 });
 module.exports = { PROXY_METHODS };
@@ -16,20 +16,17 @@
 //                     across any number of awaits and no concurrent work can
 //                     move it.
 //   updateState(fn)   read fresh, apply fn to that fresh record, write it
-//                     back — all holding the lock every write of the stored
+//                     back — all inside a queue, so two background writes
-//                     record takes, so no other write lands in between, by
+//                     never interleave, and the read is one storage round trip
-//                     the background or by any page except a page in a
+//                     ahead of the write rather than a page lifetime ahead of
-//                     Firefox private window (README, "Stored state and its
+//                     it (which is what made the popup's saveState() need a
 //                     version"). The read is one storage round trip ahead of
 //                     the write rather than a page lifetime ahead of it
 //                     (which is what made the popup's saveState() need a
 //                     per-field merge against a baseline at all).
 //
 // A handler that must both read and write therefore does its network work
 // against a snapshot it owns, and applies the RESULT inside updateState().
 // It never publishes an object other in-flight work is holding.
-const { storageGet, storageSet, withLock } = require("../shared/browserApi");
+const { storageGet, storageSet } = require("../shared/browserApi");
 const { normalizePersisted } = require("../shared/persistedState");
 const {
    STATE_SCHEMA_VERSION,
@@ -54,6 +51,11 @@ async function getState() {
    return normalizePersisted(result.autistmask);
 }
 // Serializes the read-modify-write turns below. Two of them interleaved would
 // each read before the other wrote, and the second write would carry the first
 // one's fields back to their pre-turn values.
 let updateQueue = Promise.resolve();
 async function updateStateOnce(mutate) {
    const s = await getState();
    await mutate(s);
@@ -68,22 +70,27 @@ async function updateStateOnce(mutate) {
 // Apply `mutate` to a record read fresh from storage and write the result
 // back. `mutate` receives a detached, normalized profile and mutates it in
-// place; it may be async, but it must not do anything slow. The write is the
+// place; it may be async, but it must not do anything slow — the window
-// WHOLE record, which is safe only because the lock (withLock() in
+// between the read and the write is the window in which another context's
-// src/shared/browserApi.js) is held from the read to the write: two
+// write is lost, and keeping it to one storage round trip is what makes a
-// background turns, or a turn and a page's save, never interleave
+// whole-record write safe here. Concretely: the write is the WHOLE record, so
-// (https://git.eeqj.de/sneak/AutistMask/issues/641). Every page's save waits
+// a popup write that lands inside that window is reverted, in every field, by
-// while it is held, except a page in a Firefox private window, which Firefox
+// the record this turn read before it. That is accepted because the window is
-// gives locks of its own (README, "Stored state and its version").
+// one round trip long and the popup is not writing while the worker is;
 // widening it is what would make it a real hazard.
 //
 // `mutate` must also not call updateState() itself, directly or through
-// anything it awaits: the inner turn waits for the lock the outer one holds,
+// anything it awaits: the queue is strictly serial, so the inner turn waits on
-// and the outer one is waiting on the inner one. That deadlocks every write of
+// the outer one, which is waiting on the inner one. That deadlocks the whole
-// the stored record, not just the caller. Mutate the record you were handed.
+// background, not just the caller. Mutate the record you were handed.
 //
 // Resolves with the record that was written.
 function updateState(mutate) {
-    return withLock("autistmask", () => updateStateOnce(mutate));
+    const turn = updateQueue.then(() => updateStateOnce(mutate));
    // The queue must advance even when a turn rejects, or every update after
    // it queues behind a promise that never settles.
    updateQueue = turn.catch(() => {});
    return turn;
 }
 module.exports = { getState, updateState };
@@ -49,23 +49,14 @@ window.addEventListener("message", (event) => {
 // Listen for events pushed from the background (e.g. accountsChanged)
 runtimeApi().onMessage.addListener((msg) => {
-    if (msg.type !== "AUTISTMASK_EVENT") return;
+    if (msg.type === "AUTISTMASK_EVENT") {
-    // The background chooses the addresses in accountsChanged for the site
+        window.postMessage(
-    // at the origin the event names, which is the origin of the tab's URL.
+            {
-    // This page hears them only when its own origin is that one. A page whose
+                type: "AUTISTMASK_EVENT",
-    // origin has no host is not a site: one its server sandboxes with a
+                eventName: msg.eventName,
-    // Content-Security-Policy has the origin "null" whatever its URL, and is
+                data: msg.data,
-    // told no address, as its requests are refused.
+            },
-    let data = msg.data;
+            "*",
-    if (msg.eventName === "accountsChanged" && msg.origin !== window.origin) {
+        );
        data = [];
    }
    window.postMessage(
        {
            type: "AUTISTMASK_EVENT",
            eventName: msg.eventName,
            data,
        },
        "*",
    );
 });
@@ -99,10 +99,7 @@
    const provider = {
        isAutistMask: true,
-        // An interface-compatibility flag many dApps check. Kept as a written
+        isMetaMask: true, // compatibility — many dApps check this
        // exception to the rule that no competitor is named in code: see
        // Policies in README.md, and RULES.md.
        isMetaMask: true,
        chainId: currentChainId,
        networkVersion: currentNetworkVersion,
        selectedAddress: null,
@@ -7,10 +7,9 @@
        <link rel="stylesheet" href="styles.css" />
    </head>
    <!-- Chrome gives extension pages a stylesheet of its own that sets the
-         font and its size on body, and a Tailwind class beats it only when
+         font on body, and a Tailwind class beats it only when marked
-         marked important: hence font-mono! and text-sm! rather than
+         important: hence font-mono! rather than font-mono. -->
-         font-mono and text-sm. -->
+    <body class="bg-bg text-fg font-mono! text-sm">
    <body class="bg-bg text-fg font-mono! text-sm!">
        <div id="app" class="p-2 pr-5 overflow-x-hidden">
            <!-- ============ GLOBAL TITLE BAR ============ -->
            <div
@@ -43,38 +42,6 @@
            <!-- ============ WELCOME / FIRST USE ============ -->
            <div id="view-welcome" class="view hidden">
                <p class="mb-3">Welcome! To get started, add a wallet.</p>
                <div class="bg-well p-3 mx-1 mb-3">
                    <p class="text-xs mb-2">
                        This wallet sends your data only to the Ethereum RPC
                        endpoint, unless you turn on either of these, here or
                        later in Settings.
                    </p>
                    <label
                        class="text-xs flex items-center gap-1 cursor-pointer mb-1"
                    >
                        <input type="checkbox" id="welcome-use-blockscout" />
                        Use Blockscout
                    </label>
                    <p class="text-xs text-muted mb-2">
                        Sends your addresses, and the hash of each transaction
                        you open, to the Blockscout API, for transaction
                        history, tokens you have not tracked, and transaction
                        details.
                    </p>
                    <label
                        class="text-xs flex items-center gap-1 cursor-pointer mb-1"
                    >
                        <input
                            type="checkbox"
                            id="welcome-check-recipients-on-etherscan"
                        />
                        Check recipients on Etherscan
                    </label>
                    <p class="text-xs text-muted">
                        Sends the address you are about to send to, to
                        Etherscan, to look for a phishing or scam label on it.
                    </p>
                </div>
                <button
                    id="btn-welcome-add"
                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
@@ -120,14 +87,11 @@
                <!-- Mnemonic form section -->
                <div id="add-wallet-section-mnemonic">
-                    <!-- The die button shares the instruction's row: on a row
+                    <p class="mb-2">
-                         of its own it pushes Import below the fold at
+                        Enter your 12 or 24 word recovery phrase below, or click
-                         396x600. -->
+                        the button to roll the die for a new one.
-                    <div class="mb-2 flex justify-between items-start gap-2">
+                    </p>
-                        <p>
+                    <div class="mb-1 flex justify-end">
                            Enter your 12 or 24 word recovery phrase below, or
                            click the button to roll the die for a new one.
                        </p>
                        <button
                            id="btn-generate-phrase"
                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
@@ -146,7 +110,8 @@
                    </div>
                    <div
                        id="add-wallet-phrase-warning"
-                        class="text-xs mb-2 border border-border border-dashed p-2 invisible"
+                        class="text-xs mb-2 border border-border border-dashed p-2"
                        style="visibility: hidden"
                    >
                        Write these words down and keep them safe. Anyone with
                        them can take your funds; if you lose them, your wallet
@@ -243,22 +208,12 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                    />
                </div>
-                <!-- The error line sits beside Import, not above it: at
+                <button
-                     396x600 the button already starts near the bottom of
+                    id="btn-add-wallet-confirm"
-                     the popup, and a line of its own would push it below
+                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
-                     the fold. The longest error fits on one line here. -->
+                >
-                <div class="flex items-center gap-2">
+                    Import
-                    <button
+                </button>
                        id="btn-add-wallet-confirm"
                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                    >
                        Import
                    </button>
                    <div
                        id="add-wallet-password-error"
                        class="text-xs min-h-[1.25rem] invisible"
                    ></div>
                </div>
            </div>
            <!-- ============ MAIN VIEW: ALL WALLETS & ADDRESSES ============ -->
@@ -304,14 +259,13 @@
                <!-- wallet list -->
                <div id="wallet-list"></div>
                <p id="home-tokens-note" class="text-xs text-muted py-1 hidden">
                    Only tracked tokens are listed, because "Use Blockscout" is
                    off in Settings.
                </p>
                <!-- recent transactions across all addresses -->
                <div>
-                    <div class="font-bold bg-section py-1 px-2 -mx-2">
+                    <div
                        class="font-bold bg-section py-1 px-2"
                        style="margin-left: -0.5rem; margin-right: -0.5rem"
                    >
                        Recent Transactions
                    </div>
                    <div id="home-tx-list">
@@ -319,7 +273,7 @@
                    </div>
                </div>
-                <div class="py-1 -mx-2">&nbsp;</div>
+                <div class="py-1" style="margin: 0 -0.5rem">&nbsp;</div>
                <div class="text-xs text-muted">
                    <span
@@ -372,13 +326,6 @@
                    <div id="address-balances" class="min-h-[1.25rem]">
                        &nbsp;
                    </div>
                    <p
                        id="address-tokens-note"
                        class="text-xs text-muted hidden"
                    >
                        Only tracked tokens are listed, because "Use Blockscout"
                        is off in Settings.
                    </p>
                </div>
                <!-- actions -->
@@ -448,11 +395,23 @@
                ></div>
                <h2 class="font-bold mb-1">Export Private Key</h2>
                <p class="text-xs mb-1" id="export-privkey-title"></p>
-                <div id="export-privkey-address" class="text-xs mb-3"></div>
+                <div class="text-xs mb-3">
                    <span id="export-privkey-dot"></span>
                    <span
                        id="export-privkey-address"
                        class="cursor-pointer"
                        title="Click to copy"
                    ></span>
                </div>
                <p class="text-xs mb-3 text-muted">
                    Warning: anyone with this private key can access and
                    transfer all funds from this address. Never share it.
                </p>
                <div
                    id="export-privkey-flash"
                    class="text-xs mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <div id="export-privkey-password-section" class="mb-2">
                    <label class="block mb-1">Password</label>
                    <input
@@ -461,13 +420,9 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                        placeholder="Enter your password to continue"
                    />
                    <div
                        id="export-privkey-password-error"
                        class="text-xs mt-2 mb-2 min-h-[1.25rem] invisible"
                    ></div>
                    <button
                        id="btn-export-privkey-confirm"
-                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
+                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mt-2"
                    >
                        Reveal
                    </button>
@@ -587,7 +542,8 @@
                    />
                    <div
                        id="send-to-error"
-                        class="text-xs min-h-[1.25rem] text-[#cc0000]"
+                        class="text-xs"
                        style="min-height: 1.25rem; color: #cc0000"
                    ></div>
                </div>
                <div class="mb-2">
@@ -663,7 +619,7 @@
                    <div class="text-xs text-muted mb-1">Your balance</div>
                    <div id="confirm-balance" class="text-xs"></div>
                </div>
-                <div id="confirm-fee" class="mb-3 invisible">
+                <div id="confirm-fee" class="mb-3" style="visibility: hidden">
                    <div class="text-xs text-muted mb-1">Network fee</div>
                    <div id="confirm-fee-amount" class="text-xs"></div>
                    <!-- Holds its one line of space from the first paint, so
@@ -671,23 +627,42 @@
                    nothing. The placeholder is never seen. -->
                    <div
                        id="confirm-fee-reserve"
-                        class="text-xs text-muted invisible"
+                        class="text-xs text-muted"
                        style="visibility: hidden"
                    >
                        reserve pending
                    </div>
                </div>
-                <div id="confirm-warnings" class="mb-2 invisible"></div>
+                <div
-                <!-- These two sentences name the network's native token, so
+                    id="confirm-warnings"
-                show() in confirmTx.js sets them. -->
+                    class="mb-2"
                    style="visibility: hidden"
                ></div>
                <div
                    id="confirm-recipient-warning"
-                    class="mb-2 border border-red-500 border-dashed p-2 text-xs font-bold text-red-500 invisible"
+                    class="mb-2"
-                ></div>
+                    style="visibility: hidden"
                >
                    <div
                        class="border border-red-500 border-dashed p-2 text-xs font-bold text-red-500"
                    >
                        WARNING: The recipient address has ZERO transaction
                        history. This may indicate a fresh or unused address.
                        Double-check the address before sending.
                    </div>
                </div>
                <!-- Its sentence names the network's native token, so show()
                in confirmTx.js sets it. -->
                <div
                    id="confirm-contract-warning"
-                    class="mb-2 border border-red-500 border-dashed p-2 text-xs font-bold text-red-500 invisible"
+                    class="mb-2 border border-red-500 border-dashed p-2 text-xs font-bold text-red-500"
                    style="visibility: hidden"
                ></div>
-                <div id="confirm-burn-warning" class="mb-2 invisible">
+                <div
                    id="confirm-burn-warning"
                    class="mb-2"
                    style="visibility: hidden"
                >
                    <div
                        class="border border-red-500 border-dashed p-2 text-xs font-bold text-red-500"
                    >
@@ -695,7 +670,11 @@
                        here are permanently destroyed and cannot be recovered.
                    </div>
                </div>
-                <div id="confirm-etherscan-warning" class="mb-2 invisible">
+                <div
                    id="confirm-etherscan-warning"
                    class="mb-2"
                    style="visibility: hidden"
                >
                    <div
                        class="border border-red-500 border-dashed p-2 text-xs font-bold text-red-500"
                    >
@@ -703,34 +682,15 @@
                        phishing/scam. Do not send funds to this address.
                    </div>
                </div>
                <p
                    id="confirm-etherscan-note"
                    class="mb-2 text-xs text-muted hidden"
                >
                    This address was not checked on Etherscan, because "Check
                    recipients on Etherscan" is off in Settings.
                </p>
                <div
                    id="confirm-errors"
-                    class="mb-2 border border-border border-dashed p-2 invisible min-h-[1.25rem]"
+                    class="mb-2 border border-border border-dashed p-2"
                    style="visibility: hidden; min-height: 1.25rem"
                ></div>
                <!-- Its sentence names the token, or why the token's balance
                is unknown, so show() in confirmTx.js sets it. -->
                <div
                    id="confirm-balance-error"
                    class="mb-2 border border-border border-dashed p-2 text-xs invisible"
                ></div>
                <div
                    id="confirm-balance-read-error"
                    class="mb-2 border border-border border-dashed p-2 text-xs invisible"
                >
                    Your balance could not be read from the network, so this
                    transaction cannot be checked against it. Please go back and
                    try again.
                </div>
                <div
                    id="confirm-amount-fee-error"
-                    class="mb-2 border border-border border-dashed p-2 text-xs invisible"
+                    class="mb-2 border border-border border-dashed p-2 text-xs"
                    style="visibility: hidden"
                >
                    Your balance does not cover this amount plus the network
                    fee. Please go back and send a smaller amount.
@@ -739,41 +699,16 @@
                in confirmTx.js sets it. -->
                <div
                    id="confirm-gas-error"
-                    class="mb-2 border border-border border-dashed p-2 text-xs invisible"
+                    class="mb-2 border border-border border-dashed p-2 text-xs"
                    style="visibility: hidden"
                ></div>
                <!-- Its sentence names why the fee could not be estimated,
                so show() in confirmTx.js sets it. -->
                <div
                    id="confirm-fee-unknown-error"
-                    class="mb-2 border border-border border-dashed p-2 text-xs invisible"
+                    class="mb-2 border border-border border-dashed p-2 text-xs"
                    style="visibility: hidden"
                ></div>
                <!-- Shown when Sign & Send refuses a send for its network, for
                a From address the selected wallet does not hold, or for its
                gas limit or fee. Each holds its space from the first paint, so
                the refusal moves nothing. -->
                <div
                    id="confirm-network-changed-error"
                    class="mb-2 border border-border border-dashed p-2 text-xs invisible"
                >
                    The active network changed after this transaction was
                    reviewed, so it was not sent. Please go back and review it
                    again.
                </div>
                <div
                    id="confirm-from-address-error"
                    class="mb-2 border border-border border-dashed p-2 text-xs invisible"
                >
                    The selected wallet does not hold the From address above, so
                    nothing was sent. Please go back and send again.
                </div>
                <div
                    id="confirm-fee-bound-error"
                    class="mb-2 border border-border border-dashed p-2 text-xs invisible"
                >
                    The gas limit or fee the RPC endpoint quoted for this
                    transaction is more than this wallet will sign for, so it
                    was not sent. Please go back and try again.
                </div>
                <div class="mb-2">
                    <label class="block mb-1 text-xs">Password</label>
                    <input
@@ -784,7 +719,8 @@
                </div>
                <div
                    id="confirm-tx-password-error"
-                    class="text-xs mb-2 min-h-[1.25rem] invisible"
+                    class="text-xs mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <button
                    id="btn-confirm-send"
@@ -899,7 +835,8 @@
                </button>
                <div
                    id="receive-erc20-warning"
-                    class="text-xs border border-border border-dashed p-2 mt-3 invisible"
+                    class="text-xs border border-border border-dashed p-2 mt-3"
                    style="visibility: hidden"
                ></div>
            </div>
@@ -927,9 +864,10 @@
                </div>
                <div
                    id="add-token-info"
-                    class="text-xs text-muted mb-2 min-h-[1.25rem] invisible"
+                    class="text-xs text-muted mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
-                <div id="add-token-common" class="mb-2">
+                <div class="mb-2">
                    <label class="block mb-1 text-xs text-muted"
                        >Or pick a common token:</label
                    >
@@ -1015,9 +953,9 @@
                <div class="bg-well p-3 mx-1 mb-3">
                    <h3 class="font-bold mb-1">Network</h3>
                    <p class="text-xs text-muted mb-1">
-                        Select the Ethereum network. Switching restores the RPC
+                        Select the Ethereum network. Switching networks will
-                        and Blockscout endpoints last used on that network, or
+                        update the RPC and Blockscout endpoints to their
-                        that network's defaults if it has none.
+                        defaults.
                    </p>
                    <div class="text-xs flex items-center gap-1">
                        <select
@@ -1052,19 +990,8 @@
                <div class="bg-well p-3 mx-1 mb-3">
                    <h3 class="font-bold mb-1">Blockscout API</h3>
                    <label
                        class="text-xs flex items-center gap-1 cursor-pointer mb-1"
                    >
                        <input type="checkbox" id="settings-use-blockscout" />
                        Use Blockscout
                    </label>
                    <p class="text-xs text-muted mb-2">
                        Sends your addresses, and the hash of each transaction
                        you open, to the Blockscout API below, for transaction
                        history, tokens you have not tracked, and transaction
                        details.
                    </p>
                    <p class="text-xs text-muted mb-1">
                        Used to fetch token balances and transaction history.
                        Change this if you run your own Blockscout instance.
                    </p>
                    <input
@@ -1080,23 +1007,6 @@
                    </button>
                </div>
                <div class="bg-well p-3 mx-1 mb-3">
                    <h3 class="font-bold mb-1">Etherscan</h3>
                    <label
                        class="text-xs flex items-center gap-1 cursor-pointer mb-1"
                    >
                        <input
                            type="checkbox"
                            id="settings-check-recipients-on-etherscan"
                        />
                        Check recipients on Etherscan
                    </label>
                    <p class="text-xs text-muted">
                        Sends the address you are about to send to, to
                        Etherscan, to look for a phishing or scam label on it.
                    </p>
                </div>
                <div class="bg-well p-3 mx-1 mb-3">
                    <h3 class="font-bold mb-1">Token Spam Protection</h3>
                    <p class="text-xs text-muted mb-2">
@@ -1141,7 +1051,8 @@
                            type="text"
                            inputmode="numeric"
                            id="settings-dust-threshold"
-                            class="border border-border p-1 text-xs bg-bg text-fg w-[10ch]"
+                            class="border border-border p-1 text-xs bg-bg text-fg"
                            style="width: 10ch"
                        />
                        <span class="text-xs text-muted">gwei</span>
                    </div>
@@ -1218,7 +1129,8 @@
                <div
                    id="settings-debug-well"
-                    class="bg-well p-3 mx-1 mb-3 hidden"
+                    class="bg-well p-3 mx-1 mb-3"
                    style="display: none"
                >
                    <h3 class="font-bold mb-1">Debug</h3>
                    <label
@@ -1242,9 +1154,13 @@
                <p class="text-xs mb-3">
                    Deleting
                    <strong id="delete-wallet-name"></strong> is permanent. Any
-                    funds will be unrecoverable without your
+                    funds will be unrecoverable without your recovery phrase.
                    <span id="delete-wallet-key-material"></span>.
                </p>
                <div
                    id="delete-wallet-flash"
                    class="text-xs text-red-500 mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <div class="mb-2">
                    <label class="block mb-1">Password</label>
                    <input
@@ -1254,10 +1170,6 @@
                        placeholder="Enter your password to confirm"
                    />
                </div>
                <div
                    id="delete-wallet-password-error"
                    class="text-xs mb-2 min-h-[1.25rem] invisible"
                ></div>
                <button
                    id="btn-delete-wallet-confirm"
                    class="border border-border text-red-500 px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
@@ -1294,13 +1206,13 @@
                    money at its addresses is not moved or destroyed.
                </p>
                <p class="text-xs mb-2">
-                    If you have kept a copy of this wallet's
+                    If you have the recovery phrase for this wallet written
-                    <span id="delete-wallet-lost-key-material"></span>, add the
+                    down, add the wallet again afterwards with a new password
-                    wallet again afterwards with a new password and you will
+                    and you will have it back.
                    have it back.
                    <strong
-                        >If you have not, deleting this wallet means losing
+                        >If you do not have it written down, deleting this
-                        everything it holds, forever.</strong
+                        wallet means losing everything it holds,
                        forever.</strong
                    >
                </p>
                <p class="text-xs mb-3">Your other wallets are not touched.</p>
@@ -1320,7 +1232,8 @@
                </div>
                <div
                    id="delete-wallet-lost-flash"
-                    class="text-xs text-red-500 mb-2 min-h-[1.25rem] invisible"
+                    class="text-xs text-red-500 mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <button
                    id="btn-delete-wallet-lost-confirm"
@@ -1375,7 +1288,8 @@
                </p>
                <div
                    id="delete-address-flash"
-                    class="text-xs text-red-500 mb-2 min-h-[1.25rem] invisible"
+                    class="text-xs text-red-500 mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <button
                    id="btn-delete-address-confirm"
@@ -1402,6 +1316,11 @@
                    this wallet, from any device, without your password. Never
                    type them into a website and never show them to anyone.
                </div>
                <div
                    id="show-phrase-flash"
                    class="text-xs text-red-500 mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <div id="show-phrase-password-section" class="mb-2">
                    <label class="block mb-1">Password</label>
                    <input
@@ -1410,13 +1329,9 @@
                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
                        placeholder="Enter your password to continue"
                    />
                    <div
                        id="show-phrase-password-error"
                        class="text-xs mt-2 mb-2 min-h-[1.25rem] invisible"
                    ></div>
                    <button
                        id="btn-show-phrase-reveal"
-                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
+                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mt-2"
                    >
                        Reveal
                    </button>
@@ -1441,39 +1356,36 @@
                <h2 class="font-bold mb-2">Add Token</h2>
                <p class="text-xs text-muted mb-3">
                    Pick a common token or enter a contract address manually.
                    Common tokens are offered on Ethereum Mainnet only.
                </p>
-                <div id="settings-addtoken-common">
+                <!-- top 10 quick-pick buttons -->
-                    <!-- top 10 quick-pick buttons -->
+                <div class="mb-3">
-                    <div class="mb-3">
+                    <label class="block mb-1 text-xs text-muted"
-                        <label class="block mb-1 text-xs text-muted"
+                        >Top tokens:</label
-                            >Top tokens:</label
+                    >
-                        >
+                    <div
-                        <div
+                        id="settings-addtoken-top10"
-                            id="settings-addtoken-top10"
+                        class="flex flex-wrap gap-1"
-                            class="flex flex-wrap gap-1"
+                    ></div>
-                        ></div>
+                </div>
                    </div>
-                    <!-- top 100 dropdown -->
+                <!-- top 100 dropdown -->
-                    <div class="mb-3">
+                <div class="mb-3">
-                        <label class="block mb-1 text-xs text-muted"
+                    <label class="block mb-1 text-xs text-muted"
-                            >Or pick from top 100:</label
+                        >Or pick from top 100:</label
-                        >
+                    >
-                        <select
+                    <select
-                            id="settings-addtoken-select"
+                        id="settings-addtoken-select"
-                            class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
+                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                        >
+                    >
-                            <option value="">-- select --</option>
+                        <option value="">-- select --</option>
-                        </select>
+                    </select>
-                        <button
+                    <button
-                            id="btn-settings-addtoken-select"
+                        id="btn-settings-addtoken-select"
-                            class="border border-border px-2 py-1 mt-1 hover:bg-fg hover:text-bg cursor-pointer"
+                        class="border border-border px-2 py-1 mt-1 hover:bg-fg hover:text-bg cursor-pointer"
-                        >
+                    >
-                            Add selected
+                        Add selected
-                        </button>
+                    </button>
                    </div>
                </div>
                <!-- manual contract address -->
@@ -1489,7 +1401,8 @@
                    />
                    <div
                        id="settings-addtoken-info"
-                        class="text-xs text-muted mt-1 min-h-[1.25rem] invisible"
+                        class="text-xs text-muted mt-1 min-h-[1.25rem]"
                        style="visibility: hidden"
                    ></div>
                    <button
                        id="btn-settings-addtoken-manual"
@@ -1582,16 +1495,6 @@
                    </div>
                </div>
                <!-- Shown in place of the block, decoded details, network
                details and raw data, which only Blockscout gives. -->
                <p
                    id="tx-detail-blockscout-note"
                    class="text-xs text-muted mx-1 mb-3 hidden"
                >
                    No block, decoded details, network details or raw data are
                    shown, because "Use Blockscout" is off in Settings.
                </p>
                <!-- ── Decoded details ── -->
                <div id="tx-detail-calldata-section" class="hidden">
                    <div class="bg-well p-3 mx-1 mb-3">
@@ -1732,7 +1635,8 @@
                </div>
                <div
                    id="approve-tx-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.875rem] invisible"
+                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.875rem]"
                    style="visibility: hidden"
                ></div>
                <div class="flex justify-between">
                    <button
@@ -1768,7 +1672,15 @@
                <div
                    id="approve-sign-danger-warning"
-                    class="mb-3 p-2 text-xs font-bold invisible min-h-[1.25rem] bg-[#fee2e2] text-[#991b1b] border-2 border-[#dc2626] rounded-[6px]"
+                    class="mb-3 p-2 text-xs font-bold"
                    style="
                        visibility: hidden;
                        min-height: 1.25rem;
                        background: #fee2e2;
                        color: #991b1b;
                        border: 2px solid #dc2626;
                        border-radius: 6px;
                    "
                ></div>
                <div class="mb-3">
@@ -1785,7 +1697,8 @@
                    <div class="text-xs text-muted mb-1">Message</div>
                    <div
                        id="approve-sign-message"
-                        class="text-xs break-all max-h-48 overflow-y-auto"
+                        class="text-xs break-all"
                        style="max-height: 12rem; overflow-y: auto"
                    ></div>
                </div>
@@ -1793,7 +1706,8 @@
                    <div class="text-xs text-muted mb-1">Raw data</div>
                    <div
                        id="approve-sign-hex"
-                        class="text-xs break-all max-h-24 overflow-y-auto"
+                        class="text-xs break-all"
                        style="max-height: 6rem; overflow-y: auto"
                    ></div>
                </div>
@@ -1807,7 +1721,8 @@
                </div>
                <div
                    id="approve-sign-error"
-                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.875rem] invisible"
+                    class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.875rem]"
                    style="visibility: hidden"
                ></div>
                <div class="flex justify-between">
                    <button
@@ -1844,7 +1759,10 @@
                    <div class="text-xs text-muted mb-1">
                        Address that will be shared:
                    </div>
-                    <div id="approve-address" class="text-xs mb-2"></div>
+                    <div
                        id="approve-address"
                        class="text-xs flex items-center mb-2"
                    ></div>
                </div>
                <div class="mb-3">
                    <label
@@ -1870,54 +1788,6 @@
                </div>
            </div>
            <!-- ============ NETWORK SWITCH APPROVAL ============ -->
            <div id="view-approve-network" class="view hidden">
                <h2 class="font-bold mb-2">Network Switch Request</h2>
                <div
                    id="approve-network-phishing-warning"
                    class="mb-3 p-2 text-xs font-bold hidden bg-red-100 text-red-800 border-2 border-red-600 rounded-md"
                >
                    ⚠️ PHISHING WARNING: This site is on a known phishing
                    blocklist. Proceed with extreme caution.
                </div>
                <p class="mb-2">
                    <span id="approve-network-origin" class="font-bold"></span>
                    wants to switch the wallet's network.
                </p>
                <div class="mb-3">
                    <div class="text-xs text-muted mb-1">Current network</div>
                    <div
                        id="approve-network-current"
                        class="text-xs font-bold"
                    ></div>
                </div>
                <div class="mb-3">
                    <div class="text-xs text-muted mb-1">Requested network</div>
                    <div
                        id="approve-network-requested"
                        class="text-xs font-bold"
                    ></div>
                </div>
                <p class="mb-3 text-xs">
                    Switching changes the network for the whole wallet and for
                    every site, not only for this one.
                </p>
                <div class="flex justify-between">
                    <button
                        id="btn-approve-network"
                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                    >
                        Switch
                    </button>
                    <button
                        id="btn-reject-network"
                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
                    >
                        Reject
                    </button>
                </div>
            </div>
            <!-- ============ STATE RECOVERY ============ -->
            <!--
                Shown when the stored profile cannot be read at all. Every
@@ -1976,7 +1846,8 @@
                </div>
                <div
                    id="state-recovery-flash"
-                    class="text-xs text-red-500 mb-2 min-h-[1.25rem] invisible"
+                    class="text-xs text-red-500 mb-2 min-h-[1.25rem]"
                    style="visibility: hidden"
                ></div>
                <button
                    id="btn-state-recovery-reset"
@@ -5,14 +5,12 @@ const {
    state,
    saveState,
    onSaveFailure,
    takeStoredNetwork,
    loadState,
 } = require("../shared/state");
 const { StateUnusableError } = require("../shared/stateSchema");
 const { log, setRuntimeDebug } = require("../shared/log");
 const { refreshPrices } = require("../shared/prices");
 const { refreshBalances } = require("../shared/balances");
 const { clearPopupCaches } = require("../shared/chainSwitch");
 const {
    $,
    showView,
@@ -23,13 +21,6 @@ const {
    goBack,
 } = require("./views/helpers");
 const { applyTheme } = require("./theme");
 const {
    onStorageChanged,
    tabsGetCurrent,
    tabsGetZoom,
    windowsGetCurrent,
    windowsUpdate,
 } = require("../shared/browserApi");
 // 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/shared/restorableViews.js) go
@@ -57,70 +48,28 @@ function renderWalletList() {
    home.render(ctx);
 }
 // Aborted when the popup page goes away, closed or reloaded. Chrome then
 // cancels the requests the page still has open, and a cancelled fetch() fails
 // with the same "Failed to fetch" as a server that cannot be reached. pagehide
 // fires first, so code that reports a failed request checks this and stays
 // silent about one the page's own closing cancelled.
 const pageClosed = new AbortController();
 window.addEventListener("pagehide", () => pageClosed.abort());
 let refreshInFlight = false;
-// The ten-second refresh startRefresh() starts, stopped when the popup moves to
+// The ten-second refresh init() starts, stopped when the popup moves to the
-// the recovery screen: there is no profile left to refresh.
+// recovery screen: there is no profile left to refresh.
 let refreshTimer = null;
 // The refresh writes into a copy of the wallets. Inside the save, under the
 // lock, its results are copied onto the address records in `state` only if the
 // network it ran on is still the active one, on this page and in the stored
 // record; the background's switch, after the user approves a site's request,
 // reaches this page only after the stored record (followNetworkSwitch() below).
 // A switch while the refresh ran cleared every address's balances
 // (applyChainSwitchFields() in src/shared/chainSwitchFields.js), and the
 // previous network's must not come back over them
 // (https://git.eeqj.de/sneak/AutistMask/issues/577). A dropped refresh is not
 // recorded as done. Results are copied by address, so an address added or
 // removed meanwhile is left as it is.
 async function doRefreshAndRender() {
    if (refreshInFlight) return;
    refreshInFlight = true;
    try {
        const networkId = state.networkId;
        const wallets = structuredClone(state.wallets);
        await Promise.all([
            refreshPrices(),
            refreshBalances(
-                wallets,
+                state.wallets,
                state.rpcUrl,
                state.blockscoutUrl,
                state.useBlockscout,
                state.trackedTokens,
-                networkId,
+                state.networkId,
                pageClosed.signal,
            ),
        ]);
-        const refreshed = new Map();
+        state.lastBalanceRefresh = Date.now();
-        for (const wallet of wallets) {
+        await saveState();
            for (const addr of wallet.addresses) {
                refreshed.set(addr.address, addr);
            }
        }
        await saveState((stored) => {
            if (state.networkId !== networkId) return false;
            if (stored.networkId !== networkId) return false;
            for (const wallet of state.wallets) {
                for (const addr of wallet.addresses) {
                    const got = refreshed.get(addr.address);
                    if (!got) continue;
                    for (const key of ["balance", "ensName", "tokenBalances"]) {
                        if (got[key] !== undefined) addr[key] = got[key];
                    }
                }
            }
            state.lastBalanceRefresh = Date.now();
            return true;
        });
        renderWalletList();
    } catch (e) {
        // Every call site fires this and walks away — the boot below, the ten
@@ -135,25 +84,9 @@ async function doRefreshAndRender() {
    }
 }
 // Refreshes now and every ten seconds from then on. Called once a wallet
 // exists: by init() when the popup opens with one, and by AddWallet when it
 // adds one, which in a popup that opened on Welcome is the first
 // (https://git.eeqj.de/sneak/AutistMask/issues/530). With the refresh already
 // running it starts no second one, and on the recovery screen it does nothing.
 function startRefresh() {
    if (!$("view-state-recovery").classList.contains("hidden")) return;
    doRefreshAndRender();
    if (refreshTimer === null) {
        refreshTimer = setInterval(doRefreshAndRender, 10000);
    }
 }
 const ctx = {
    renderWalletList,
    doRefreshAndRender,
    startRefresh,
    restoreView,
    pageClosed: pageClosed.signal,
    showAddWalletView: () => {
        pushCurrentView();
        addWallet.show();
@@ -220,66 +153,10 @@ function fallbackView() {
    showView("main");
 }
 // When the background saves a network switch, once the user approves a site's
 // request, or another popup page saves one, this page follows the stored
 // record. It takes the network the record names as a save reads it, holding
 // the lock, so no later save of this page writes the previous network back, and
 // then leaves the page as a switch in Settings leaves it. This page's own
 // switch in Settings is made under the lock as well (onChainSwitch() in
 // src/shared/chainSwitch.js), so a record naming a network other than this
 // page's always holds a switch saved elsewhere, and a switch the user picks
 // here while this waits for the lock is made after it.
 async function followNetworkSwitch() {
    let switched = false;
    // A failed save is reported by saveState() itself: see onSaveFailure().
    await saveState((stored) => {
        if (stored.networkId === state.networkId) return false;
        settings.cutViewStack();
        takeStoredNetwork(stored);
        clearPopupCaches();
        switched = true;
    }).catch(() => {});
    if (switched) settings.showNewNetwork();
 }
 // The background opens the approval window as wide as the page, but the
 // browser counts the window's frame in that width, and a screen taller than
 // the window takes a vertical scrollbar out of it too. So once the screen is
 // up, the window is widened by however far the page would scroll sideways.
 // That distance is in page pixels and the window's width in screen pixels:
 // at 150% zoom one page pixel is 1.5 screen pixels. The zoom is read for this
 // page's own tab, because asked without a tab id Firefox answers for the
 // window focused last. Firefox draws some zoom steps a little larger than the
 // zoom it reports, 170% among them, so once the page has its new width (its
 // resize event) it is measured again, and the window widened again while the
 // page still falls short, three times at most. A window that cannot grow sends
 // no resize event, and the page stops there. The connection prompt can also
 // show in the toolbar popup, whose window is the user's browser window; that
 // one is left alone.
 async function widenApprovalWindow() {
    const page = document.documentElement;
    if (page.scrollWidth <= page.clientWidth) return;
    const win = await windowsGetCurrent();
    if (win.type !== "popup") return;
    const tab = await tabsGetCurrent();
    const zoom = await tabsGetZoom(tab.id);
    let width = win.width;
    for (let tries = 0; tries < 3; tries++) {
        const sideways = page.scrollWidth - page.clientWidth;
        if (sideways <= 0) return;
        width += Math.ceil(sideways * zoom);
        const resized = new Promise((resolve) =>
            window.addEventListener("resize", resolve, { once: true }),
        );
        await windowsUpdate(win.id, { width });
        await resized;
    }
 }
 async function init() {
    // First, before anything can save: showView() saves on every navigation
    // without awaiting, so a save that fails from here on has somewhere to be
-    // reported rather than reaching only the console
+    // reported rather than being swallowed by the save queue
    // (https://git.eeqj.de/sneak/AutistMask/issues/362). Registered ahead of
    // the approval-window branch below too, since that window saves as well.
    //
@@ -351,9 +228,9 @@ async function init() {
        // rejection rather than an uncaught error — measured as still failing
        // the run on both harnesses (Playwright `pageerror`, and the Firefox
        // driver's console-service drain), so nothing is lost by leaving it
-        // on that path. show() puts the approval's own screen up once the
+        // on that path.
-        // background has described it; the window is widened to fit it then.
+        approval.show(approvalId);
-        approval.show(approvalId).then(widenApprovalWindow);
+        showView("approve-site");
        return;
    }
@@ -386,23 +263,13 @@ async function init() {
    settingsAddToken.init(ctx);
    deleteAddress.init(ctx);
    // Only a record naming a network other than this page's is followed: the
    // one this page's own switch in Settings saves names the network it
    // already has, and a record naming none is no switch.
    onStorageChanged((changes) => {
        const written = changes.autistmask && changes.autistmask.newValue;
        if (!written || !written.networkId) return;
        if (written.networkId !== state.networkId) followNetworkSwitch();
    });
    // A switch saved since loadState() above, before there was a listener.
    followNetworkSwitch();
    if (!state.hasWallet) {
-        welcome.show();
+        showView("welcome");
    } else {
        renderWalletList();
        restoreView();
-        startRefresh();
+        doRefreshAndRender();
        refreshTimer = setInterval(doRefreshAndRender, 10000);
    }
 }
@@ -13,7 +13,6 @@
 // cannot be required outside a browser.
 const { RESTORABLE_VIEWS } = require("../shared/restorableViews");
 const { SUPPORTED_CHAIN_IDS } = require("../shared/networks");
 // The views this page load has rendered.
 //
@@ -38,13 +37,9 @@ function markViewRendered(view) {
    if (view) renderedViews.add(view);
 }
-// Begin a fresh page-load scope. The popup gets one by being loaded, and
+// Begin a fresh page-load scope. The popup gets one by being loaded; the
-// asks for one after a network switch, because every screen then on the page
+// unit tests, which simulate several page loads against one module
-// shows the previous network (showNewNetwork() in views/settings.js), and
+// instance, ask for one.
 // after "Use Blockscout" or "Check recipients on Etherscan" changes in
 // Settings, because every screen then on the page was drawn under the old
 // setting; the unit tests, which simulate several page loads against one
 // module instance, ask for one too.
 function resetRenderedViews() {
    renderedViews.clear();
 }
@@ -129,33 +124,25 @@ function isRenderableDecoded(value) {
 }
 // The pending transaction confirmTx.show() renders: `token` reaches
-// renderAddressHtml() when it is not "ETH", `from`/`to` reach
+// renderAddressHtml() when it is not "ETH", and `from`/`to` reach
-// addressTitle(), makeBlockie() and getLocalWarnings(), and `amount` reaches
+// addressTitle(), makeBlockie() and getLocalWarnings().
 // truncateAmountNeverZero(), which splits it. `chainId`, which show() fills in
 // when it is absent, picks the network whose explorer the address links open,
 // so it has to name one.
 function isRenderablePendingTx(value) {
    return (
        isRecord(value) &&
        isText(value.token) &&
        isAddressText(value.from) &&
-        isAddressText(value.to) &&
+        isAddressText(value.to)
        isText(value.amount) &&
        (!value.chainId || SUPPORTED_CHAIN_IDS.has(value.chainId))
    );
 }
 // The stored transaction transactionDetail.render() shows. contractAddress is
 // optional on an ETH transfer, and reaches addressDotHtml() when it is there.
 // `chainId` picks the network whose explorer the links open and whose
 // Blockscout the transaction is read from, so it has to name one.
 function isRenderableTx(value) {
    return (
        isRecord(value) &&
        isAddressText(value.from) &&
        isAddressText(value.to) &&
-        (!value.contractAddress || isAddressText(value.contractAddress)) &&
+        (!value.contractAddress || isAddressText(value.contractAddress))
        SUPPORTED_CHAIN_IDS.has(value.chainId)
    );
 }
@@ -207,19 +194,11 @@ function renderView(view, state, views) {
            if (!data.hash) return false;
            if (!isAddressText(data.to)) return false;
            if (!isRenderableDecoded(data.decoded)) return false;
            // `chainId` picks the network whose explorer the links open, so
            // when it is there it has to name one. Likewise on error-tx.
            if (data.chainId && !SUPPORTED_CHAIN_IDS.has(data.chainId)) {
                return false;
            }
            views.txStatus.renderSuccess();
            return true;
        case "error-tx":
            if (!data.message) return false;
            if (!isAddressText(data.to)) return false;
            if (data.chainId && !SUPPORTED_CHAIN_IDS.has(data.chainId)) {
                return false;
            }
            views.txStatus.renderError();
            return true;
        default:
@@ -234,10 +213,9 @@ function renderView(view, state, views) {
 // 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, and a network switch cuts
+//     stack is filtered against RESTORABLE_VIEWS, so such a view can only
-//     it the same way (views/settings.js), so such a view can only be on the
+//     be on the stack from this page load, where forward navigation
-//     stack from this page load, where forward navigation rendered it on the
+//     rendered it on the way in.
 //     way in.
 //   - This page load has rendered it. Re-rendering would re-fetch and
 //     clobber what it holds; Home is rendered anyway, see above.
 //
@@ -1,6 +1,6 @@
 const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
 const { getTopTokens } = require("../../shared/tokenList");
-const { state, saveState, currentNetwork } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const { lookupTokenInfo } = require("../../shared/balances");
 const { isScamAddress } = require("../../shared/scamlist");
 const { log } = require("../../shared/log");
@@ -9,12 +9,6 @@ function show() {
    $("add-token-address").value = "";
    $("add-token-info").textContent = "";
    $("add-token-info").style.visibility = "hidden";
    // The bundled list holds Ethereum Mainnet contracts, which name no token
    // on any other network.
    $("add-token-common").classList.toggle(
        "hidden",
        state.networkId !== "mainnet",
    );
    const list = $("common-token-list");
    list.innerHTML = getTopTokens(25)
        .map(
@@ -52,25 +46,12 @@ function init(ctx) {
        infoEl.textContent = "Looking up token...";
        infoEl.style.visibility = "visible";
        log.debugf("Looking up token contract", contractAddr);
        // The network the lookup asks, which Settings may switch away from
        // before it answers, as for a transaction in confirmTx.js.
        const chainId = currentNetwork().chainId;
        try {
            const info = await lookupTokenInfo(
                contractAddr,
                state.rpcUrl,
                state.networkId,
                ctx.pageClosed,
            );
            // A contract address names a token on one network only, so an
            // answer after a switch is not added to the new network's list.
            if (currentNetwork().chainId !== chainId) {
                showFlash(
                    "The active network changed before the lookup finished," +
                        " so the token was not added.",
                );
                return;
            }
            log.infof("Adding token", info.symbol, contractAddr);
            state.trackedTokens.push({
                address: contractAddr,
@@ -87,9 +68,6 @@ function init(ctx) {
            }
            require("./addressDetail").show();
        } catch (e) {
            // Cancelled by the popup closing, not failed: see pageClosed in
            // src/popup/index.js.
            if (ctx.pageClosed.aborted) return;
            const detail = e.shortMessage || e.message || String(e);
            log.errorf("Adding token failed for", contractAddr, detail);
            // lookupTokenInfo() rejects a contract with a one-line message
@@ -2,8 +2,6 @@ const {
    $,
    showView,
    showFlash,
    showError,
    hideError,
    goBack,
    clearViewStack,
    onViewLeave,
@@ -20,7 +18,6 @@ const {
 const { encryptWithPassword } = require("../../shared/vault");
 const { state, saveState } = require("../../shared/state");
 const { scanForAddresses } = require("../../shared/balances");
 const { notify } = require("../../shared/browserApi");
 /**
 * Check if an address already exists in ANY wallet (hd, xprv, or key).
@@ -101,7 +98,6 @@ function clear() {
    $("add-wallet-password").value = "";
    $("add-wallet-password-confirm").value = "";
    $("add-wallet-phrase-warning").style.visibility = "hidden";
    hideError("add-wallet-password-error");
 }
 // Each wallet has its own password (its own encryptedSecret), so adding a
@@ -129,18 +125,15 @@ function validatePassword() {
    const pw = $("add-wallet-password").value;
    const pw2 = $("add-wallet-password-confirm").value;
    if (!pw) {
-        showError("add-wallet-password-error", "Please choose a password.");
+        showFlash("Please choose a password.");
        return null;
    }
    if (pw.length < 12) {
-        showError(
+        showFlash("Password must be at least 12 characters.");
            "add-wallet-password-error",
            "Password must be at least 12 characters.",
        );
        return null;
    }
    if (pw !== pw2) {
-        showError("add-wallet-password-error", "Passwords do not match.");
+        showFlash("Passwords do not match.");
        return null;
    }
    return pw;
@@ -185,19 +178,11 @@ async function importMnemonic(ctx) {
        encryptedSecret: encrypted,
        nextIndex: 1,
        addresses: [
-            {
+            { address: firstAddress, balance: "0.0000", tokenBalances: [] },
                address: firstAddress,
                index: 0,
                balance: "0.0000",
                tokenBalances: [],
            },
        ],
    };
    state.wallets.push(wallet);
    state.hasWallet = true;
    if (state.activeAddress === null) {
        state.activeAddress = firstAddress;
    }
    await saveState();
    clearViewStack();
    ctx.renderWalletList();
@@ -205,36 +190,22 @@ async function importMnemonic(ctx) {
    // Scan for used HD addresses beyond index 0.
    showFlash("Scanning for addresses...", 30000);
-    const scan = await scanForAddresses(
+    const scan = await scanForAddresses(xpub, state.rpcUrl, state.networkId);
        xpub,
        state.rpcUrl,
        state.networkId,
        ctx.pageClosed,
    );
    if (scan.addresses.length > 1) {
        wallet.addresses = scan.addresses.map((a) => ({
            address: a.address,
            index: a.index,
            balance: "0.0000",
            tokenBalances: [],
        }));
        wallet.nextIndex = scan.nextIndex;
        // The new list leaves out the first address when the scan found it
        // unused. If it was the active one, the new list's first takes over,
        // and the background is told as when the user picks one on Home.
        const activeMoved =
            state.activeAddress === firstAddress &&
            wallet.addresses[0].address !== firstAddress;
        if (activeMoved) state.activeAddress = wallet.addresses[0].address;
        await saveState();
        ctx.renderWalletList();
        if (activeMoved) notify({ type: "AUTISTMASK_ACTIVE_CHANGED" });
        showFlash("Found " + scan.addresses.length + " addresses.");
    } else {
        showFlash("Ready.", 1000);
    }
-    ctx.startRefresh();
+    ctx.doRefreshAndRender();
 }
 async function importPrivateKey(ctx) {
@@ -266,15 +237,12 @@ async function importPrivateKey(ctx) {
        addresses: [{ address: addr, balance: "0.0000", tokenBalances: [] }],
    });
    state.hasWallet = true;
    if (state.activeAddress === null) {
        state.activeAddress = addr;
    }
    await saveState();
    clearViewStack();
    ctx.renderWalletList();
    showView("main");
-    ctx.startRefresh();
+    ctx.doRefreshAndRender();
 }
 async function importXprvKey(ctx) {
@@ -320,19 +288,11 @@ async function importXprvKey(ctx) {
        encryptedSecret: encrypted,
        nextIndex: 1,
        addresses: [
-            {
+            { address: firstAddress, balance: "0.0000", tokenBalances: [] },
                address: firstAddress,
                index: 0,
                balance: "0.0000",
                tokenBalances: [],
            },
        ],
    };
    state.wallets.push(wallet);
    state.hasWallet = true;
    if (state.activeAddress === null) {
        state.activeAddress = firstAddress;
    }
    await saveState();
    clearViewStack();
    ctx.renderWalletList();
@@ -340,35 +300,22 @@ async function importXprvKey(ctx) {
    // Scan for used HD addresses beyond index 0.
    showFlash("Scanning for addresses...", 30000);
-    const scan = await scanForAddresses(
+    const scan = await scanForAddresses(xpub, state.rpcUrl, state.networkId);
        xpub,
        state.rpcUrl,
        state.networkId,
        ctx.pageClosed,
    );
    if (scan.addresses.length > 1) {
        wallet.addresses = scan.addresses.map((a) => ({
            address: a.address,
            index: a.index,
            balance: "0.0000",
            tokenBalances: [],
        }));
        wallet.nextIndex = scan.nextIndex;
        // As for a recovery phrase: an active first address the scan left
        // out gives way to the new list's first.
        const activeMoved =
            state.activeAddress === firstAddress &&
            wallet.addresses[0].address !== firstAddress;
        if (activeMoved) state.activeAddress = wallet.addresses[0].address;
        await saveState();
        ctx.renderWalletList();
        if (activeMoved) notify({ type: "AUTISTMASK_ACTIVE_CHANGED" });
        showFlash("Found " + scan.addresses.length + " addresses.");
    } else {
        showFlash("Ready.", 1000);
    }
-    ctx.startRefresh();
+    ctx.doRefreshAndRender();
 }
 function init(ctx) {
@@ -385,10 +332,8 @@ function init(ctx) {
        $("add-wallet-phrase-warning").style.visibility = "visible";
    });
-    // Import / confirm. Each press starts with no password error on screen:
+    // Import / confirm
    // validatePassword() puts it back if the password is still wrong.
    $("btn-add-wallet-confirm").addEventListener("click", async () => {
        hideError("add-wallet-password-error");
        if (currentMode === "mnemonic") {
            await importMnemonic(ctx);
        } else if (currentMode === "privkey") {
@@ -4,7 +4,6 @@ const {
    showFlash,
    balanceLinesForAddress,
    txCounterpartyHtml,
    HISTORY_OFF_TEXT,
    addressTitle,
    escapeHtml,
    displaySymbol,
@@ -84,8 +83,6 @@ function show() {
                ctx.showAddressToken();
            });
        });
    // Tokens the user has not tracked are Blockscout's to report.
    $("address-tokens-note").classList.toggle("hidden", !!state.useBlockscout);
    renderSendTokenSelect(addr);
    $("tx-list").innerHTML =
        '<div class="text-muted text-xs py-1">Loading...</div>';
@@ -102,7 +99,6 @@ async function loadTransactions(address) {
        const rawTxs = await fetchRecentTransactions(
            address,
            state.blockscoutUrl,
            state.useBlockscout,
            currentNetwork().chainId,
        );
        const result = filterTransactions(rawTxs, {
@@ -139,7 +135,6 @@ async function loadTransactions(address) {
                    counterparties,
                    state.rpcUrl,
                    state.networkId,
                    ctx.pageClosed,
                );
            } catch {
                ensNameMap = new Map();
@@ -148,9 +143,6 @@ async function loadTransactions(address) {
        renderTransactions(txs);
    } catch (e) {
        // Cancelled by the popup closing, not failed: see pageClosed in
        // src/popup/index.js.
        if (ctx.pageClosed.aborted) return;
        log.errorf("loadTransactions failed:", e.message);
        $("tx-list").innerHTML =
            '<div class="text-muted text-xs py-1">Failed to load transactions.</div>';
@@ -159,10 +151,6 @@ async function loadTransactions(address) {
 function renderTransactions(txs) {
    const list = $("tx-list");
    if (!state.useBlockscout) {
        list.innerHTML = `<div class="text-muted text-xs py-1">${escapeHtml(HISTORY_OFF_TEXT)}</div>`;
        return;
    }
    if (txs.length === 0) {
        list.innerHTML =
            '<div class="text-muted text-xs py-1">No transactions found.</div>';
@@ -193,10 +181,10 @@ function renderTransactions(txs) {
        // it on the line above rather than replacing it.
        const nameStr = escapeHtml(title || ensName || "");
        const err = tx.isError ? " (failed)" : "";
-        const opacity = tx.isError ? " opacity-50" : "";
+        const opacity = tx.isError ? " opacity:0.5;" : "";
        const ago = escapeHtml(timeAgo(tx.timestamp));
        const iso = escapeHtml(isoDate(tx.timestamp));
-        html += `<div class="tx-row py-2 border-b border-border-light text-xs cursor-pointer hover:bg-hover${opacity}" data-tx="${i}">`;
+        html += `<div class="tx-row py-2 border-b border-border-light text-xs cursor-pointer hover:bg-hover" data-tx="${i}" style="${opacity}">`;
        html += `<div class="flex justify-between"><span class="text-muted" title="${iso}">${ago}</span><span>${dirLabel}${err}</span></div>`;
        html += txCounterpartyHtml(counterparty, nameStr, amountStr);
        html += `</div>`;
@@ -274,7 +262,7 @@ function init(_ctx) {
        // This address's private key can be derived from the stored key,
        // but export goes through getSignerForAddress, which refuses a key
        // that is not a master key. Without this the export screen would
-        // take a password and then refuse.
+        // take a password and then report that refusal as a wrong password.
        const defect = selectedWalletDefect();
        if (defect) {
            showFlash(defect.shortMessage);
@@ -7,7 +7,6 @@ const {
    showFlash,
    flashCopyFeedback,
    txCounterpartyHtml,
    HISTORY_OFF_TEXT,
    addressTitle,
    escapeHtml,
    displaySymbol,
@@ -174,7 +173,6 @@ async function loadTransactions(address, tokenId) {
        const rawTxs = await fetchRecentTransactions(
            address,
            state.blockscoutUrl,
            state.useBlockscout,
            currentNetwork().chainId,
        );
        const result = filterTransactions(rawTxs, {
@@ -221,7 +219,6 @@ async function loadTransactions(address, tokenId) {
                    counterparties,
                    state.rpcUrl,
                    state.networkId,
                    ctx.pageClosed,
                );
            } catch {
                ensNameMap = new Map();
@@ -230,9 +227,6 @@ async function loadTransactions(address, tokenId) {
        renderTransactions(txs);
    } catch (e) {
        // Cancelled by the popup closing, not failed: see pageClosed in
        // src/popup/index.js.
        if (ctx.pageClosed.aborted) return;
        log.errorf("loadTransactions failed:", e.message);
        $("address-token-tx-list").innerHTML =
            '<div class="text-muted text-xs py-1">Failed to load transactions.</div>';
@@ -241,10 +235,6 @@ async function loadTransactions(address, tokenId) {
 function renderTransactions(txs) {
    const list = $("address-token-tx-list");
    if (!state.useBlockscout) {
        list.innerHTML = `<div class="text-muted text-xs py-1">${escapeHtml(HISTORY_OFF_TEXT)}</div>`;
        return;
    }
    if (txs.length === 0) {
        list.innerHTML =
            '<div class="text-muted text-xs py-1">No transactions found.</div>';
@@ -268,10 +258,10 @@ function renderTransactions(txs) {
        // it on the line above rather than replacing it.
        const nameStr = escapeHtml(title || ensName || "");
        const err = tx.isError ? " (failed)" : "";
-        const opacity = tx.isError ? " opacity-50" : "";
+        const opacity = tx.isError ? " opacity:0.5;" : "";
        const ago = escapeHtml(timeAgo(tx.timestamp));
        const iso = escapeHtml(isoDate(tx.timestamp));
-        html += `<div class="tx-row py-2 border-b border-border-light text-xs cursor-pointer hover:bg-hover${opacity}" data-tx="${i}">`;
+        html += `<div class="tx-row py-2 border-b border-border-light text-xs cursor-pointer hover:bg-hover" data-tx="${i}" style="${opacity}">`;
        html += `<div class="flex justify-between"><span class="text-muted" title="${iso}">${ago}</span><span>${dirLabel}${err}</span></div>`;
        html += txCounterpartyHtml(counterparty, nameStr, amountStr);
        html += `</div>`;
@@ -11,11 +11,9 @@ const {
    onViewLeave,
    formatFee,
    tokenLabel,
    tokenSourcesByChainId,
 } = require("./helpers");
-const { state, saveState, currentNetwork } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const {
    networkById,
    networkByChainId,
    nativeCurrencyByChainId,
 } = require("../../shared/networks");
@@ -28,6 +26,7 @@ const {
    Interface,
    MaxUint256,
    toUtf8String,
    TypedDataEncoder,
 } = require("ethers");
 const { getPrice, formatUsd } = require("../../shared/prices");
 const { ERC20_ABI } = require("../../shared/constants");
@@ -46,27 +45,16 @@ const {
 const { decryptWithPassword } = require("../../shared/vault");
 const { getSignerForAddress } = require("../../shared/wallet");
 const { walletDefect } = require("../../shared/walletDefects");
-const {
+const { describeSigningFailure } = require("../../shared/approvalVerify");
    describeSigningFailure,
    signedPrimaryType,
    typedDataMessageRefusal,
    typedDataChainRefusal,
 } = require("../../shared/approvalVerify");
 const txStatus = require("./txStatus");
 const uniswap = require("../../shared/uniswap");
 const { notify, runtimeApi, sendMessage } = require("../../shared/browserApi");
 const erc20Iface = new Interface(ERC20_ABI);
-// The link opens the explorer of the network with `chainId`, or of the active
+function approvalAddressHtml(address) {
 // network when none is given. A chain id that names no network has no
 // explorer, so the address is drawn without a link.
 function approvalAddressHtml(address, chainId) {
    const title = addressTitle(address, state.wallets);
-    if (chainId && !networkByChainId(chainId)) {
+    return renderAddressHtml(address, { title });
        return renderAddressHtml(address, { title, noLink: true });
    }
    return renderAddressHtml(address, { title, chainId });
 }
 // The amount line for a decoded ERC-20 call. With a known scale it is the
@@ -86,18 +74,18 @@ function tokenAmountText(rawAmount, decimals, symbol) {
    };
 }
-// Try to decode calldata sent from `fromAddress` to `toAddress` on the network
+// Try to decode calldata using known ABIs.
 // with chain id `chainId`, using known ABIs.
 // Returns { name, description, details } or null.
-function decodeCalldata(data, toAddress, chainId, fromAddress) {
+function decodeCalldata(data, toAddress) {
    if (!data || data === "0x" || data.length < 10) return null;
-    // Where a token's name and scale are looked for, for every decoder below:
+    // Where a token's scale is looked for, for every decoder below: the ERC-20
-    // what the wallet knows of the tokens on the network with `chainId`, which
+    // amount line and the swap's Amount and Min. received lines resolve it the
-    // need not be the active one. The ERC-20 amount line and the swap's Amount
+    // same way, and refuse to format the same way when it is nowhere.
-    // and Min. received lines resolve the scale the same way, and refuse to
+    const decimalsSources = {
-    // format the same way when it is nowhere.
+        trackedTokens: state.trackedTokens,
-    const decimalsSources = tokenSourcesByChainId(chainId);
+        wallets: state.wallets,
    };
    // Try ERC-20 (approve / transfer)
    try {
@@ -192,13 +180,7 @@ function decodeCalldata(data, toAddress, chainId, fromAddress) {
    }
    // Try Uniswap Universal Router
-    const routerResult = uniswap.decode(
+    const routerResult = uniswap.decode(data, toAddress, decimalsSources);
        data,
        toAddress,
        chainId,
        decimalsSources,
        fromAddress,
    );
    if (routerResult) return routerResult;
    return null;
@@ -231,11 +213,10 @@ function showTxFee(approvedTx) {
    const feePerGas = BigInt(approvedTx.maxFeePerGas || approvedTx.gasPrice);
    // Through formatFee(), as the confirmation screen's fee is, so the same
    // fee reads the same on both. In the native currency of the network shown
-    // above, and at the price on it, as the value is.
+    // above, as the value is.
    $("approve-tx-fee").textContent = formatFee(
        gasLimit * feePerGas,
        nativeCurrencyByChainId(approvedTx.chainId),
        approvedTx.chainId,
    );
    let detail =
@@ -268,7 +249,10 @@ function showTxApproval(details) {
    const toAddr = approvedTx.to;
    const ethValue = formatEther(approvedTx.value || "0");
-    const sources = tokenSourcesByChainId(approvedTx.chainId);
+    const sources = {
        trackedTokens: state.trackedTokens,
        wallets: state.wallets,
    };
    // Build txInfo for status screens
    pendingTxDetails = {
@@ -280,15 +264,8 @@ function showTxApproval(details) {
        chainId: approvedTx.chainId,
    };
-    // If this is an ERC-20 call, try to extract the real recipient and amount.
+    // If this is an ERC-20 call, try to extract the real recipient and amount
-    // Decoded for the network the transaction is for, which the Network line
+    const decoded = decodeCalldata(approvedTx.data, toAddr || "");
    // names, and the address the From line names.
    const decoded = decodeCalldata(
        approvedTx.data,
        toAddr || "",
        approvedTx.chainId,
        details.approvedFrom,
    );
    if (decoded && decoded.details) {
        // The asset the status summary is counted in: an ERC-20 call's Token
        // contract, or a swap's input token. Its symbol is resolved from the
@@ -317,23 +294,6 @@ function showTxApproval(details) {
                sources,
            );
        }
        // A swap the decoder read no amount for, such as one whose V4 swap
        // action could not be read or a V4 exact-out swap. The wait and error
        // screens say the amount could not be decoded, with no currency after
        // it, rather than show the transaction's ETH value as the amount. A
        // swap paid in native ETH keeps that value: it is the ETH the swap
        // pays (for an exact-out swap, the most it pays), not a figure that
        // had to be read from the calldata.
        const tokenIn = decoded.details.find((d) => d.label === "Token In");
        if (
            tokenIn &&
            tokenIn.value !== "ETH (native)" &&
            !decoded.details.some((d) => d.label === "Amount")
        ) {
            pendingTxDetails.amount = "Unknown (could not be decoded)";
            pendingTxDetails.token = null;
            pendingTxDetails.tokenSymbol = null;
        }
    }
    // Carry decoded calldata info through to success/error views
@@ -345,40 +305,32 @@ function showTxApproval(details) {
        };
    }
    // Every address link on this screen opens the explorer of the network the
    // transaction is for, which the Network line names, whichever network is
    // active.
    $("approve-tx-origin").textContent = details.origin;
-    $("approve-tx-from").innerHTML = approvalAddressHtml(
+    $("approve-tx-from").innerHTML = approvalAddressHtml(details.approvedFrom);
        details.approvedFrom,
        approvedTx.chainId,
    );
-    // Show token symbol next to contract address if known on the network the
+    // Show token symbol next to contract address if known
-    // transaction is for
+    const symbol = toAddr ? tokenLabel(toAddr) : null;
    const symbol = toAddr ? tokenLabel(toAddr, approvedTx.chainId) : null;
    if (toAddr) {
        let toHtml = "";
        if (symbol) {
            toHtml += `<div class="font-bold mb-1">${escapeHtml(symbol)}</div>`;
        }
-        toHtml += approvalAddressHtml(toAddr, approvedTx.chainId);
+        toHtml += approvalAddressHtml(toAddr);
        $("approve-tx-to").innerHTML = toHtml;
    } else {
        $("approve-tx-to").innerHTML = escapeHtml(CONTRACT_CREATION_TEXT);
    }
-    const ethValueFormatted = formatTxValue(ethValue);
+    const ethValueFormatted = formatTxValue(
-    // Priced from the exact value, not the four-decimal figure, at the price
+        formatEther(approvedTx.value || "0"),
-    // on the network the transaction is for, as the confirmation screen prices
+    );
-    // its amount, so the same value reads the same on both.
+    const ethPrice = getPrice("ETH");
-    const ethPrice = getPrice("ETH", approvedTx.chainId);
+    const ethUsd = ethPrice ? parseFloat(ethValueFormatted) * ethPrice : null;
    const ethUsd = ethPrice ? parseFloat(ethValue) * ethPrice : null;
    const usdStr = formatUsd(ethUsd);
    // In the native currency of the network the transaction is for, which the
-    // Network line names, not the active network's: the active network can
+    // Network line names, not the active network's: a site can switch the
-    // change, in Settings or when the user approves a site's request, after
+    // active network after this transaction is prepared and back before it is
-    // this transaction is prepared and change back before it is signed.
+    // signed.
    $("approve-tx-value").textContent =
        ethValueFormatted +
        " " +
@@ -400,12 +352,9 @@ function showTxApproval(details) {
            detailsHtml += `<div class="text-muted">${escapeHtml(d.label)}</div>`;
            if (d.address) {
                if (d.isToken) {
-                    detailsHtml += `<div class="font-bold">${escapeHtml(tokenLabel(d.address, approvedTx.chainId) || "Unknown token")}</div>`;
+                    detailsHtml += `<div class="font-bold">${escapeHtml(tokenLabel(d.address) || "Unknown token")}</div>`;
                }
-                detailsHtml += approvalAddressHtml(
+                detailsHtml += approvalAddressHtml(d.address);
                    d.address,
                    approvedTx.chainId,
                );
            } else {
                detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
            }
@@ -479,12 +428,21 @@ function markInvisibleCharacters(text) {
        );
 }
 // The type ethers will sign typed data as. ethers does not read the page's
 // `primaryType`: it takes the one struct in `types` that no other struct
 // refers to. Throws when the types name no such single struct, which ethers
 // would refuse to sign as well.
 function signedPrimaryType(types) {
    const structs = { ...types };
    // ethers derives EIP712Domain itself and rejects it as an input.
    delete structs.EIP712Domain;
    return TypedDataEncoder.getPrimaryType(structs);
 }
 // Why a signature request cannot be signed, as a sentence for the error line,
 // or null when it can. Only typed data is refused: the `primaryType` the page
 // states has to be the type ethers will sign, or this screen would name one
-// message while another is signed. Its message has to hold every declared
+// message while another is signed.
 // field, with each `bool` true or false, and its domain may name no chain but
 // the active network's.
 function typedDataRefusal(sp) {
    if (sp.method === "personal_sign" || sp.method === "eth_sign") return null;
    let data;
@@ -507,10 +465,7 @@ function typedDataRefusal(sp) {
            ", so it cannot be signed."
        );
    }
-    return (
+    return null;
        typedDataMessageRefusal(data.types, signed, data.message, "") ||
        typedDataChainRefusal(data.domain, currentNetwork())
    );
 }
 // The largest amount a Permit2 allowance can hold, a uint160. Permit2 treats
@@ -666,38 +621,10 @@ function permitWarningHtml(types, primaryType, domain, message) {
    return html;
 }
 // What ethers signs of a message value of type `type`: a struct keeps only
 // the fields its type declares, in the type's order, and a list is read item
 // by item. ethers drops every other key, so each one is added to `notSigned`
 // with its place in the message and its value, for the screen to list apart.
 function signedValue(types, type, value, path, notSigned) {
    const itemType = type.replace(/\[\d*\]$/, "");
    if (itemType !== type) {
        if (!Array.isArray(value)) return value;
        return value.map((item, i) =>
            signedValue(types, itemType, item, `${path}[${i}]`, notSigned),
        );
    }
    const fields = types[type];
    if (!fields || !value || typeof value !== "object") return value;
    const at = (name) => (path ? `${path}.${name}` : name);
    for (const [key, val] of Object.entries(value)) {
        if (!fields.some((f) => f.name === key)) notSigned.push([at(key), val]);
    }
    return Object.fromEntries(
        fields.map((f) => [
            f.name,
            signedValue(types, f.type, value[f.name], at(f.name), notSigned),
        ]),
    );
 }
 // The typed data as the screen shows it. The primary type shown is the one
 // ethers signs, never the page's word for it; typedDataRefusal() keeps the two
-// from differing on anything that can be signed. The Message section shows
+// from differing on anything that can be signed. Only typed data that cannot
-// only what is signed, and any other key the page sent is listed after it as
+// be read at all is shown as raw text, and typedDataRefusal() refuses it.
 // not part of the signature. Only typed data that cannot be read at all is
 // shown as raw text, and typedDataRefusal() refuses it.
 function formatTypedDataHtml(jsonStr) {
    let data;
    let primaryType;
@@ -731,30 +658,12 @@ function formatTypedDataHtml(jsonStr) {
    html += `<div class="mb-2"><div class="text-muted">Primary type</div>`;
    html += `<div class="font-bold">${escapeHtml(primaryType)}</div></div>`;
    const lineHtml = (key, val) =>
        `<div><span class="text-muted">${escapeHtml(key)}:</span> <span class="break-all">${escapeHtml(display(val))}</span></div>`;
    if (data.message) {
        const notSigned = [];
        const message = signedValue(
            data.types,
            primaryType,
            data.message,
            "",
            notSigned,
        );
        html += `<div class="mb-2"><div class="text-muted">Message</div>`;
-        for (const [key, val] of Object.entries(message)) {
+        for (const [key, val] of Object.entries(data.message)) {
-            html += lineHtml(key, val);
+            html += `<div><span class="text-muted">${escapeHtml(key)}:</span> <span class="break-all">${escapeHtml(display(val))}</span></div>`;
        }
        html += `</div>`;
        if (notSigned.length > 0) {
            html += `<div class="mb-2"><div class="text-muted">Not part of the signature</div>`;
            for (const [key, val] of notSigned) {
                html += lineHtml(key, val);
            }
            html += `</div>`;
        }
    }
    return html;
@@ -811,7 +720,7 @@ function showSignApproval(details) {
            "This message is plain text, not hex, so it cannot be signed.";
    }
-    // The warning the background attaches to an eth_sign request.
+    // Display danger warning for eth_sign (raw hash signing)
    const warningEl = $("approve-sign-danger-warning");
    if (warningEl) {
        if (sp.dangerWarning) {
@@ -843,29 +752,9 @@ function showSignApproval(details) {
    );
 }
 function showNetworkApproval(details) {
    showPhishingWarning(
        "approve-network-phishing-warning",
        details.isPhishingDomain,
    );
    $("approve-network-origin").textContent = details.origin;
    $("approve-network-current").textContent = networkById(
        details.currentNetworkId,
    ).name;
    $("approve-network-requested").textContent = networkById(
        details.requestedNetworkId,
    ).name;
    showView("approve-network");
 }
 // 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.
 //
 // Nothing is on screen until the background has described the approval, so
 // the screen shown is always the one for the approval this window answers:
 // the connection prompt's "Allow" and the network switch prompt's "Switch"
 // answer on the same port, and either would approve the other.
 async function show(id) {
    approvalId = id;
    approvalPort = runtimeApi().connect({ name: "approval:" + id });
@@ -889,10 +778,6 @@ async function show(id) {
        showSignApproval(details);
        return;
    }
    if (details.type === "network") {
        showNetworkApproval(details);
        return;
    }
    // Site connection approval
    showPhishingWarning(
        "approve-site-phishing-warning",
@@ -902,7 +787,6 @@ async function show(id) {
    $("approve-address").innerHTML = approvalAddressHtml(state.activeAddress);
    attachCopyHandlers("view-approve-site");
    $("approve-remember").checked = state.rememberSiteChoice;
    showView("approve-site");
 }
 let approvalId = null;
@@ -953,15 +837,15 @@ function gateOnWalletDefect(errorId, buttonId, address) {
    return true;
 }
-// Locate the wallet and the stored address record owning an address. Returns
+// Locate the wallet and the address index owning an address. Returns null when
-// null when no wallet holds it. Approvals look up the address they were raised
+// no wallet holds it. Approvals look up the address they were raised for, not
-// for, not whichever address is active now: the approval named one account,
+// whichever address is active now: the approval named one account, and signing
-// and signing with another is what verification refuses.
+// with another is what verification refuses.
 function findWalletFor(address) {
    for (const wallet of state.wallets) {
        for (let i = 0; i < wallet.addresses.length; i++) {
            if (wallet.addresses[i].address === address) {
-                return { wallet, addr: wallet.addresses[i] };
+                return { wallet, addrIndex: i };
            }
        }
    }
@@ -982,21 +866,20 @@ function clearSignPassword() {
    hideError("approve-sign-error");
 }
-// Answer a site-connection or network-switch approval and close. The decision
+// Answer a site-connection approval and close. The decision goes out on the
-// goes out on the approval port — see approvalPort above for why — and carries
+// approval port — see approvalPort above for why — and carries no approval id,
-// no approval id, because the port name already names the approval the
+// because the port name already names the approval the background will settle.
-// background will settle. `remember` means something only for a site
+// The post is guarded because a throw must not cost the close: posting on a
-// connection. The post is guarded because a throw must not cost the close:
+// port whose background worker has been torn down throws, and the approval it
-// posting on a port whose background worker has been torn down throws, and the
+// would have settled died with that worker, so the only thing left to do is
-// approval it would have settled died with that worker, so the only thing left
+// what the user asked for — go away.
-// to do is what the user asked for — go away.
+function decideSite(approved) {
 function decide(approved, remember) {
    if (approvalPort) {
        try {
            approvalPort.postMessage({
                type: "AUTISTMASK_APPROVAL_DECISION",
                approved,
-                remember,
+                remember: $("approve-remember").checked,
            });
        } catch {
            // Nothing to report it to; the window closes either way.
@@ -1015,19 +898,11 @@ function init(_ctx) {
    });
    $("btn-approve").addEventListener("click", () => {
-        decide(true, $("approve-remember").checked);
+        decideSite(true);
    });
    $("btn-reject").addEventListener("click", () => {
-        decide(false, $("approve-remember").checked);
+        decideSite(false);
    });
    $("btn-approve-network").addEventListener("click", () => {
        decide(true, false);
    });
    $("btn-reject-network").addEventListener("click", () => {
        decide(false, false);
    });
    $("btn-approve-tx").addEventListener("click", async () => {
@@ -1088,7 +963,7 @@ function init(_ctx) {
        try {
            const signer = getSignerForAddress(
                active.wallet,
-                active.addr,
+                active.addrIndex,
                decryptedSecret,
            );
            // Sign the approved transaction exactly as it was displayed. The
@@ -1216,7 +1091,7 @@ function init(_ctx) {
        try {
            const signer = getSignerForAddress(
                active.wallet,
-                active.addr,
+                active.addrIndex,
                decryptedSecret,
            );
            const sp = pendingSignParams;
@@ -2,13 +2,7 @@
 // Shows transaction details, warnings, errors. On Sign & Send,
 // reads inline password, decrypts secret, signs and broadcasts.
-const {
+const { parseEther, parseUnits, formatEther, Contract } = require("ethers");
    parseEther,
    parseUnits,
    formatEther,
    formatUnits,
    Contract,
 } = require("ethers");
 const {
    $,
    showError,
@@ -17,16 +11,15 @@ const {
    addressTitle,
    escapeHtml,
    displaySymbol,
    nativeCurrency,
    renderAddressHtml,
    blockieHtml,
    attachCopyHandlers,
    goBack,
    onViewLeave,
    formatFee,
    reviewedNetworkProvider,
 } = require("./helpers");
 const { state, currentNetwork } = require("../../shared/state");
 const { nativeCurrencyByChainId } = require("../../shared/networks");
 const { getSignerForAddress } = require("../../shared/wallet");
 const { walletDefect } = require("../../shared/walletDefects");
 const { decryptWithPassword } = require("../../shared/vault");
@@ -39,12 +32,11 @@ const {
 const { ERC20_ABI, isBurnAddress } = require("../../shared/constants");
 const {
    displayedDecimals,
    toDecimals,
    transferAmountUnits,
 } = require("../../shared/transferAmount");
 const { assertWithinCeilings } = require("../../shared/approvalVerify");
-// The amount, the balance line and the fee reserve go through it, as the
+// The balance lines, the fee reserve and the insufficient-balance messages go
-// approval screen's amounts do.
+// through it, as the approval screen's amounts do.
 const { truncateAmountNeverZero } = require("../../shared/amountDisplay");
 const {
    CODES,
@@ -68,13 +60,6 @@ let feeWei = null;
 // amount was derived from. Null for any other send, which ethers prices from
 // the node at signing time.
 let maxSendFees = null;
 // The From address's balances on the network this screen is drawn for, read
 // from that network's node by readBalances() each time the screen is shown,
 // so a screen the popup reopens onto states them as they are then, not as
 // Send knew them. Null until the read returns; then `eth` and `token` are
 // decimal strings, `token` null for an ETH send or a token whose scale is
 // unknown, and both null if the read failed.
 let balances = null;
 function restore() {
    const d = state.viewData;
@@ -83,11 +68,11 @@ function restore() {
    }
 }
-function confirmAddressHtml(address, ensName, title, chainId) {
+function confirmAddressHtml(address, ensName, title) {
    const blockie = blockieHtml(address);
    return (
        `<div class="mb-1">${blockie}</div>` +
-        renderAddressHtml(address, { title, ensName, chainId })
+        renderAddressHtml(address, { title, ensName })
    );
 }
@@ -98,96 +83,30 @@ function valueWithUsd(text, usdAmount) {
    return text;
 }
-// The amount as this screen and the wait, success and error screens show it,
+// The Amount line, with its USD value. A max ETH send's line is drawn again
-// written as the approval screen writes a site's amount: the amount being
+// once its amount is re-derived from the fee estimate.
 // signed, parsed at the scale it is encoded with and written back as plain
 // decimal text, then cut to four decimals with the nonzero floor. So `.5` and
 // `00.5` read `0.5000`, as `0.5` does, except for a token whose scale is
 // unknown, which cannot be sent: its amount is cut as typed, so `.5` reads
 // `.5000`. txInfo.amount, which is what gets signed, is left as it is.
 function shownAmount(txInfo) {
    let exact = txInfo.amount;
    try {
        if (txInfo.token === "ETH") {
            exact = formatEther(parseEther(txInfo.amount));
        } else {
            const decimals = displayedDecimals(txInfo.tokenDecimals);
            exact = formatUnits(parseUnits(txInfo.amount, decimals), decimals);
        }
    } catch {
        // A token whose scale is unknown, which is never signed, or an amount
        // the amount check refuses: cut as Send's amount field held it.
    }
    return truncateAmountNeverZero(exact);
 }
 // The Amount line, with its USD value, which is priced from the exact amount.
 // A max ETH send's line is drawn again once its amount is re-derived from the
 // fee estimate.
 function renderAmount(txInfo) {
    const isErc20 = txInfo.token !== "ETH";
-    const rawSymbol = isErc20
+    const rawSymbol = isErc20 ? txInfo.tokenSymbol || "?" : nativeCurrency();
-        ? txInfo.tokenSymbol || "?"
+    const price = isErc20 ? getPrice(rawSymbol) : getPrice("ETH");
        : nativeCurrencyByChainId(txInfo.chainId);
    const price = getPrice(isErc20 ? rawSymbol : "ETH", txInfo.chainId);
    const amountUsd = price ? parseFloat(txInfo.amount) * price : null;
    $("confirm-amount").textContent = valueWithUsd(
-        shownAmount(txInfo) + " " + displaySymbol(rawSymbol),
+        txInfo.amount + " " + displaySymbol(rawSymbol),
        amountUsd,
    );
 }
 // The balance line, with its USD value: "Loading..." until readBalances()
 // returns, then the balance it read.
 function renderBalance(txInfo) {
    const isErc20 = txInfo.token !== "ETH";
    const rawSymbol = isErc20
        ? txInfo.tokenSymbol || "?"
        : nativeCurrencyByChainId(txInfo.chainId);
    const symbol = displaySymbol(rawSymbol);
    if (balances === null) {
        $("confirm-balance").textContent = "Loading...";
        return;
    }
    // A null balance is one nobody established, for a token whose scale is
    // unknown or after a read that failed, and is stated as unknown, never as
    // zero (https://git.eeqj.de/sneak/AutistMask/issues/349).
    const bal = isErc20 ? balances.token : balances.eth;
    if (bal === null) {
        $("confirm-balance").textContent = "unknown (" + symbol + ")";
        return;
    }
    const price = getPrice(isErc20 ? rawSymbol : "ETH", txInfo.chainId);
    const balUsd = price ? parseFloat(bal) * price : null;
    $("confirm-balance").textContent = valueWithUsd(
        truncateAmountNeverZero(bal) + " " + symbol,
        balUsd,
    );
 }
 function show(txInfo) {
    pendingTx = txInfo;
    feeStatus = FEE_PENDING;
    feeWei = null;
    maxSendFees = null;
    balances = null;
    // The network this screen is drawn for, and the only one it sends on: the
    // one active when Send handed the transaction over. Drawn again from the
    // saved transaction, as when the popup reopens onto this screen, it keeps
    // that network, so Sign & Send refuses once Settings has switched to
    // another. Everything this screen shows is that network's: native
    // currency, USD values, explorer links, the balance, and the node and
    // explorer its checks ask. The wait, success and error screens label
    // amounts by it.
    if (!txInfo.chainId) txInfo.chainId = currentNetwork().chainId;
    const isErc20 = txInfo.token !== "ETH";
    // The raw symbol is the price-table key; the capped one is what the
    // screen says. Truncating before the lookup would silently drop the
    // price of any token whose symbol is long enough to be capped.
-    const rawSymbol = isErc20
+    const rawSymbol = isErc20 ? txInfo.tokenSymbol || "?" : nativeCurrency();
        ? txInfo.tokenSymbol || "?"
        : nativeCurrencyByChainId(txInfo.chainId);
    const symbol = displaySymbol(rawSymbol);
    // Transaction type
@@ -203,7 +122,7 @@ function show(txInfo) {
    if (isErc20) {
        $("confirm-token-contract").innerHTML = renderAddressHtml(
            txInfo.token,
-            { chainId: txInfo.chainId },
+            {},
        );
        tokenSection.classList.remove("hidden");
        attachCopyHandlers(tokenSection);
@@ -217,7 +136,6 @@ function show(txInfo) {
        txInfo.from,
        null,
        fromTitle,
        txInfo.chainId,
    );
    // To (with blockie)
@@ -226,12 +144,37 @@ function show(txInfo) {
        txInfo.to,
        txInfo.ensName,
        toTitle,
        txInfo.chainId,
    );
    $("confirm-to-ens").classList.add("hidden");
    renderAmount(txInfo);
-    renderBalance(txInfo);
+
    // Balance (with inline USD)
    const ethPrice = getPrice("ETH");
    const tokenPrice = getPrice(rawSymbol);
    if (isErc20) {
        // null is a balance whose scale nothing knows, not a balance of zero
        // (https://git.eeqj.de/sneak/AutistMask/issues/349). The send is
        // refused at encode time for the same missing scale; what this line
        // must not do is state a quantity nobody established.
        const bal = txInfo.tokenBalance;
        const balUsd =
            tokenPrice && bal != null ? parseFloat(bal) * tokenPrice : null;
        $("confirm-balance").textContent =
            bal == null
                ? "unknown (" + symbol + ")"
                : valueWithUsd(
                      truncateAmountNeverZero(bal) + " " + symbol,
                      balUsd,
                  );
    } else {
        const bal = txInfo.balance || "0";
        const balUsd = ethPrice ? parseFloat(bal) * ethPrice : null;
        $("confirm-balance").textContent = valueWithUsd(
            truncateAmountNeverZero(bal) + " " + symbol,
            balUsd,
        );
    }
    // Check for warnings (synchronous local checks)
    const localWarnings = getLocalWarnings(txInfo.to, {
@@ -265,22 +208,15 @@ function show(txInfo) {
    $("confirm-gas-error").classList.toggle("hidden", !isErc20);
    $("confirm-gas-error").textContent =
        "You do not have enough " +
-        nativeCurrencyByChainId(txInfo.chainId) +
+        nativeCurrency() +
        " to pay the network fee for this transfer. Please add " +
-        nativeCurrencyByChainId(txInfo.chainId) +
+        nativeCurrency() +
        " to this address and try again.";
-    // Both shown later, by checkRecipientHistory(). The first sentence says
+    // Shown later, once checkRecipientHistory() finds a contract.
    // exactly what getFullWarnings() checks.
    $("confirm-recipient-warning").textContent =
        "WARNING: The recipient address has never sent a transaction and" +
        " holds no " +
        nativeCurrencyByChainId(txInfo.chainId) +
        ". This may indicate a fresh or unused address. Double-check the" +
        " address before sending.";
    $("confirm-contract-warning").textContent =
        "WARNING: The recipient is a smart contract. Sending " +
-        nativeCurrencyByChainId(txInfo.chainId) +
+        nativeCurrency() +
        " or tokens directly to a contract may result in permanent loss of" +
        " funds.";
@@ -297,29 +233,11 @@ function show(txInfo) {
              " cannot be checked against your balance. Please go back and" +
              " try again.";
    // So does the message for an amount the balance does not cover. It is
    // set here, before the first paint, so the balance read returning only
    // makes it visible and moves nothing, which is why it quotes no balance.
    // Without the token's scale readBalances() reads no token balance.
    $("confirm-balance-error").textContent =
        isErc20 && toDecimals(txInfo.tokenDecimals) === null
            ? "This token's balance is unknown, because nothing this wallet" +
              " can consult reports how many decimal places it uses, so the" +
              " amount you are trying to send cannot be checked against it."
            : "Your " +
              symbol +
              " balance does not cover this amount. Please go back and send" +
              " a smaller amount.";
    renderValidation(txInfo);
-    // Reset password field and error, and any refusal of an earlier Sign &
+    // Reset password field and error
    // Send.
    $("confirm-tx-password").value = "";
    hideError("confirm-tx-password-error");
    setVisible("confirm-network-changed-error", false);
    setVisible("confirm-from-address-error", false);
    setVisible("confirm-fee-bound-error", false);
    // Gas estimate — show placeholder then fetch async
    $("confirm-fee").style.visibility = "visible";
@@ -334,89 +252,74 @@ function show(txInfo) {
    $("confirm-contract-warning").style.visibility = "hidden";
    $("confirm-burn-warning").style.visibility = "hidden";
    $("confirm-etherscan-warning").style.visibility = "hidden";
    // While "Check recipients on Etherscan" is off there is no Etherscan
    // warning to reserve space for, and a line in its place says so.
    const etherscanOn = !!state.checkRecipientsOnEtherscan;
    $("confirm-etherscan-warning").classList.toggle("hidden", !etherscanOn);
    $("confirm-etherscan-note").classList.toggle("hidden", etherscanOn);
    // Show burn warning via reserved element (in addition to inline warning)
    if (isBurnAddress(txInfo.to)) {
        $("confirm-burn-warning").style.visibility = "visible";
    }
-    // The fee is estimated once the balances are read, because a max ETH
+    estimateGas(txInfo);
    // send's amount is the ETH balance minus the estimate's reserve.
    readBalances(txInfo).then(() => estimateGas(txInfo));
    checkRecipientHistory(txInfo);
 }
 // Read the From address's balances from the node of the network this
 // transaction was reviewed for: ETH, and for a token send the token, at the
 // scale the screen renders the amount with. A token whose scale is unknown has
 // no balance to read. Never rejects.
 async function readBalances(txInfo) {
    let read;
    try {
        const provider = reviewedNetworkProvider(txInfo);
        const decimals = toDecimals(txInfo.tokenDecimals);
        const readToken = txInfo.token !== "ETH" && decimals !== null;
        const [ethWei, tokenUnits] = await Promise.all([
            provider.getBalance(txInfo.from),
            readToken
                ? new Contract(txInfo.token, ERC20_ABI, provider).balanceOf(
                      txInfo.from,
                  )
                : null,
        ]);
        read = {
            eth: formatEther(ethWei),
            token: readToken ? formatUnits(tokenUnits, decimals) : null,
        };
    } catch (e) {
        log.errorf("balance read failed:", e.shortMessage || e.message);
        read = { eth: null, token: null };
    }
    // The user may have left this transaction while the read was in flight.
    if (pendingTx !== txInfo) return;
    balances = read;
    renderBalance(txInfo);
    renderValidation(txInfo);
 }
 // Render the balance check for the transaction on screen. Called once during
-// show(), again when the balances are read, and again when the fee estimate
+// show() and again when the fee estimate resolves or fails. Every element it
-// resolves or fails. Every element it touches already occupies its space, so
+// touches already occupies its space, so re-running it never moves anything.
 // re-running it never moves anything.
 function renderValidation(txInfo) {
    const isErc20 = txInfo.token !== "ETH";
-
+    const symbol = isErc20
-    // Null while the balances are being read and after a read that failed.
+        ? displaySymbol(txInfo.tokenSymbol || "?")
-    // validateTransfer() takes a missing balance as nothing to spend from, so
+        : nativeCurrency();
    // sending stays blocked either way, and the only message shown for it is
    // the one saying the read failed.
    const ethBalance = balances ? balances.eth : null;
    const tokenBalance = balances ? balances.token : null;
    const balanceRead = ethBalance !== null;
    const { canSend, codes } = validateTransfer({
        isErc20,
        amount: txInfo.amount,
-        tokenDecimals: txInfo.tokenDecimals,
+        ethBalance: txInfo.balance,
-        ethBalance,
+        tokenBalance: txInfo.tokenBalance,
        tokenBalance,
        feeStatus,
        feeWei,
    });
-    // An invalid amount is known before the first paint, so its message is
+    // Messages carrying the user's own numbers are built here; the fixed
-    // written here. Every message a later result brings has a reserved
+    // sentences live in the reserved elements in index.html, except the
-    // element, its sentence fixed in index.html or set by show(), and is only
+    // gas and fee-unknown ones, which show() sets.
    // made visible below, so nothing moves when the result arrives.
    const messages = [];
    if (codes.includes(CODES.AMOUNT_INVALID)) {
        messages.push("Please enter a valid amount to send.");
    }
    if (codes.includes(CODES.INSUFFICIENT_TOKEN)) {
        messages.push(
            txInfo.tokenBalance == null
                ? "This token's balance is unknown, because nothing this" +
                      " wallet can consult reports how many decimal places it" +
                      " uses, so the amount you are trying to send cannot be" +
                      " checked against it."
                : "Insufficient " +
                      symbol +
                      " balance. You have " +
                      truncateAmountNeverZero(txInfo.tokenBalance) +
                      " " +
                      symbol +
                      " but are trying to send " +
                      txInfo.amount +
                      " " +
                      symbol +
                      ".",
        );
    }
    if (codes.includes(CODES.INSUFFICIENT_ETH)) {
        messages.push(
            "Insufficient balance. You have " +
                truncateAmountNeverZero(txInfo.balance || "0") +
                " " +
                symbol +
                " but are trying to send " +
                txInfo.amount +
                " " +
                symbol +
                ".",
        );
    }
    const errorsEl = $("confirm-errors");
    if (messages.length > 0) {
@@ -429,20 +332,13 @@ function renderValidation(txInfo) {
        errorsEl.style.visibility = "hidden";
    }
    setVisible("confirm-balance-read-error", balances !== null && !balanceRead);
    setVisible(
        "confirm-balance-error",
        balanceRead &&
            (codes.includes(CODES.INSUFFICIENT_TOKEN) ||
                codes.includes(CODES.INSUFFICIENT_ETH)),
    );
    setVisible(
        "confirm-amount-fee-error",
-        balanceRead && codes.includes(CODES.INSUFFICIENT_ETH_WITH_FEE),
+        codes.includes(CODES.INSUFFICIENT_ETH_WITH_FEE),
    );
    setVisible(
        "confirm-gas-error",
-        balanceRead && codes.includes(CODES.INSUFFICIENT_ETH_FOR_FEE),
+        codes.includes(CODES.INSUFFICIENT_ETH_FOR_FEE),
    );
    setVisible(
        "confirm-fee-unknown-error",
@@ -463,7 +359,7 @@ function setVisible(id, visible) {
 async function estimateGas(txInfo) {
    try {
-        const provider = reviewedNetworkProvider(txInfo);
+        const provider = getProvider(state.rpcUrl, state.networkId);
        const feeData = await provider.getFeeData();
        let gasLimit;
@@ -511,17 +407,12 @@ async function estimateGas(txInfo) {
        // does, so the same fee reads the same on both.
        if (estimateWei !== null && estimateWei < gasCostWei) {
            $("confirm-fee-amount").textContent =
-                "~" +
+                "~" + formatFee(estimateWei, nativeCurrency());
                formatFee(
                    estimateWei,
                    nativeCurrencyByChainId(txInfo.chainId),
                    txInfo.chainId,
                );
            $("confirm-fee-reserve").textContent =
                "up to " +
                truncateAmountNeverZero(formatEther(gasCostWei)) +
                " " +
-                nativeCurrencyByChainId(txInfo.chainId) +
+                nativeCurrency() +
                " reserved";
            setVisible("confirm-fee-reserve", true);
        } else {
@@ -530,21 +421,20 @@ async function estimateGas(txInfo) {
            // cost is not below the reserve. Show the reserve alone.
            $("confirm-fee-amount").textContent = formatFee(
                gasCostWei,
-                nativeCurrencyByChainId(txInfo.chainId),
+                nativeCurrency(),
                txInfo.chainId,
            );
            setVisible("confirm-fee-reserve", false);
        }
        feeStatus = FEE_KNOWN;
        feeWei = gasCostWei;
-        // A max ETH send is the balance readBalances() read minus this
+        // A max ETH send is the balance minus this estimate's reserve, not the
-        // estimate's reserve, not the Send screen's, and is signed with this
+        // Send screen's, and is signed with this estimate's fee fields: fees
-        // estimate's fee fields: fees fetched again at signing could exceed
+        // fetched again at signing could exceed the reserve it leaves, and the
-        // the reserve it leaves, and the node would refuse it for want of
+        // node would refuse it for want of funds. Where the balance no longer
-        // funds. Where the balance is unknown or no longer covers the fee, the
+        // covers the fee, the amount is left as it is and the balance check
-        // amount is left as it is and the balance check below says so.
+        // below says so.
        if (txInfo.max && txInfo.token === "ETH") {
-            const amount = maxEthAmount(balances?.eth, gasCostWei);
+            const amount = maxEthAmount(txInfo.balance, gasCostWei);
            if (amount !== null) {
                txInfo.amount = amount;
                renderAmount(txInfo);
@@ -573,17 +463,16 @@ async function estimateGas(txInfo) {
    }
 }
-// Populate the transaction this send describes, enforce the bounds against the
+// Populate the transaction this send describes, enforce the fee bound against
-// gas limit and fees that were actually filled in, then sign and broadcast it.
+// the fees that were actually filled in, then sign and broadcast it. Apart
-// Apart from a max ETH send, which passes its estimate's fee fields as `fees`,
+// from a max ETH send, which passes its estimate's fee fields as `fees`, the
-// the send pins no fee fields, so ethers fills maxFeePerGas and the gas limit
+// send pins no fee fields, so ethers fills maxFeePerGas and the gas limit from
-// from what the configured RPC node answers, with nothing otherwise bounding
+// what the configured RPC node answers, with nothing otherwise bounding what a
-// what a hostile node can set — the dApp path's ceilings never reached this
+// hostile node can set — the dApp path's ceilings never reached this one.
-// one. Populating before the check is what makes assertWithinCeilings() see
+// Populating before the check is what makes assertWithinCeilings() see the
-// the same numbers that would be signed; it throws an ApprovalMismatchError
+// same numbers that would be signed; it throws an ApprovalMismatchError when
-// when the gas limit, a fee per gas, or the product gasLimit × maxFeePerGas is
+// the product gasLimit × maxFeePerGas is over the bound, which the caller
-// over its bound, and the caller then shows the one refusal reserved for all
+// shows in the reserved error area rather than sending.
 // three rather than sending.
 async function populateVerifyAndSend(connectedSigner, tx, fees = null) {
    let request;
    if (tx.token === "ETH") {
@@ -601,27 +490,26 @@ async function populateVerifyAndSend(connectedSigner, tx, fees = null) {
        );
        request = await contract.transfer.populateTransaction(tx.to, amount);
    }
-    // The chain id of the network the screen was drawn for: ethers refuses to
+    const populated = await connectedSigner.populateTransaction(request);
    // populate it for a provider on any other network.
    const populated = await connectedSigner.populateTransaction({
        ...request,
        chainId: tx.chainId,
    });
    assertWithinCeilings(populated);
    return connectedSigner.sendTransaction(populated);
 }
 // Show a full-sentence send failure in the reserved errors box, the same
 // element and markup renderValidation() uses for messages carrying the user's
 // own numbers, so it never moves anything on the screen.
 function showSendError(message) {
    const el = $("confirm-errors");
    el.innerHTML = `<div class="text-xs">${escapeHtml(message)}</div>`;
    el.style.visibility = "visible";
 }
 async function checkRecipientHistory(txInfo) {
    try {
-        const provider = reviewedNetworkProvider(txInfo);
+        const provider = getProvider(state.rpcUrl, state.networkId);
        const asyncWarnings = await getFullWarnings(txInfo.to, provider, {
            fromAddress: txInfo.from,
            chainId: txInfo.chainId,
            checkRecipientsOnEtherscan: state.checkRecipientsOnEtherscan,
        });
        // The user may have left this transaction while the checks were in
        // flight; its warnings must not reach another recipient's screen.
        if (pendingTx !== txInfo) return;
        for (const w of asyncWarnings) {
            if (w.type === "contract") {
                $("confirm-contract-warning").style.visibility = "visible";
@@ -650,11 +538,6 @@ function init(_ctx) {
    onViewLeave("confirm-tx", clearPassword);
    $("btn-confirm-send").addEventListener("click", async () => {
        // A press shows only its own refusal, if any.
        setVisible("confirm-network-changed-error", false);
        setVisible("confirm-from-address-error", false);
        setVisible("confirm-fee-bound-error", false);
        const wallet = state.wallets[state.selectedWallet];
        // Every Send button refuses a defective wallet before this screen,
        // but the popup also reopens onto it from a saved view.
@@ -664,24 +547,6 @@ function init(_ctx) {
            return;
        }
        // The screen describes the network the transaction was reviewed for,
        // which Settings may have switched away from since: "Back" from
        // Settings after a switch draws this screen again from the saved
        // transaction, as a popup reopened onto it does.
        if (currentNetwork().chainId !== pendingTx.chainId) {
            setVisible("confirm-network-changed-error", true);
            return;
        }
        // Sign as the From address this screen shows. The selection is saved
        // apart from this screen, so the popup can reopen onto it with another
        // address selected.
        const addr = wallet.addresses.find((a) => a.address === pendingTx.from);
        if (!addr) {
            setVisible("confirm-from-address-error", true);
            return;
        }
        const password = $("confirm-tx-password").value;
        if (!password) {
            showError(
@@ -710,13 +575,17 @@ function init(_ctx) {
        $("btn-confirm-send").disabled = true;
        $("btn-confirm-send").classList.add("text-muted");
-        // The wait, success and error screens show the amount as this screen
+        // The network it is sent on. The wait, success and error screens
-        // does, so they are handed a copy carrying that text. pendingTx keeps
+        // label its amount by this, not by the network active when they draw.
-        // the exact amount, which is the one signed.
+        pendingTx.chainId = currentNetwork().chainId;
-        const shownTx = { ...pendingTx, amount: shownAmount(pendingTx) };
+
        let tx;
        try {
-            const signer = getSignerForAddress(wallet, addr, decryptedSecret);
+            const signer = getSignerForAddress(
                wallet,
                state.selectedAddress,
                decryptedSecret,
            );
            const provider = getProvider(state.rpcUrl, state.networkId);
            const connectedSigner = signer.connect(provider);
@@ -730,23 +599,19 @@ function init(_ctx) {
            // Note: JS strings are immutable; this nulls the reference but
            // the original string may persist in memory until GC.
            decryptedSecret = null;
-            txStatus.showWait(shownTx, tx.hash);
+            txStatus.showWait(pendingTx, tx.hash);
        } catch (e) {
            decryptedSecret = null;
-            // A gas limit or fee over its bound is refused before anything is
+            // A fee over the bound is refused before anything is broadcast, so
-            // broadcast, so there is no transaction that may have reached the
+            // there is no transaction that may have reached the network to warn
-            // network to warn about: the refusal stays on the confirmation
+            // about: the message stays on the confirmation screen where the
-            // screen where the user can go back, rather than routing to the
+            // user can go back, rather than routing to the sent/failed screen.
            // sent/failed screen. Its sentence is fixed in index.html, so that
            // its box can hold its space from the first paint; the reason in
            // full, naming the bound, is logged.
            if (e && e.approvalMismatch) {
-                log.errorf("send refused:", e.message);
+                showSendError(e.message);
                setVisible("confirm-fee-bound-error", true);
                return;
            }
            const hash = tx ? tx.hash : null;
-            txStatus.showError(shownTx, hash, e.shortMessage || e.message);
+            txStatus.showError(pendingTx, hash, e.shortMessage || e.message);
        } finally {
            $("btn-confirm-send").disabled = false;
            $("btn-confirm-send").classList.remove("text-muted");
@@ -17,9 +17,9 @@ const {
    attachCopyHandlers,
    addressHoldsFunds,
    balanceLinesForAddress,
    keyMaterialName,
 } = require("./helpers");
 const { formatAddressTotal, getAddressValue } = require("../../shared/prices");
 const { walletHasRecoveryPhrase } = require("../../shared/wallet");
 const { state, saveState } = require("../../shared/state");
 const {
    canRemoveAddress,
@@ -54,7 +54,9 @@ function setFlash(msg) {
 // The noun follows the wallet: an xprv wallet holds no recovery phrase, and
 // this screen is offered on xprv wallets too.
 function recoveryPathText(wallet) {
-    const secret = keyMaterialName(wallet);
+    const secret = walletHasRecoveryPhrase(wallet)
        ? "recovery phrase"
        : "extended private key";
    return (
        "Getting the address back into this list is not easy, so be sure. " +
        "Adding an address derives the next unused one, not this one, and " +
@@ -2,12 +2,9 @@ const {
    $,
    showView,
    showFlash,
    showError,
    hideError,
    goBack,
    clearViewStack,
    onViewLeave,
    keyMaterialName,
 } = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 const { decryptWithPassword } = require("../../shared/vault");
@@ -16,7 +13,6 @@ const {
    broadcastActiveChanged,
 } = require("../../shared/walletDelete");
 const { INVISIBLE_CHARACTERS } = require("../../shared/symbolSpoof");
 const welcome = require("./welcome");
 let deleteWalletIndex = null;
 let lostPasswordIndex = null;
@@ -53,13 +49,14 @@ function confirmKey(name) {
 }
 // Drop the password from the DOM and the wallet selection from the
-// closure. Run by the view-leave handler as well as on entry, so the typed
+// closure. Registered as the view-leave handler as well as run on entry,
-// password does not sit in the hidden view after the user navigates away
+// so the typed password does not sit in the hidden view after the user
-// by any route, including the Settings gear.
+// navigates away by any route, including the Settings gear.
 function clear() {
    deleteWalletIndex = null;
    $("delete-wallet-password").value = "";
-    hideError("delete-wallet-password-error");
+    $("delete-wallet-flash").textContent = "";
    $("delete-wallet-flash").style.visibility = "hidden";
 }
 // The lost-password screen holds no secret — a wallet name is not one —
@@ -77,9 +74,6 @@ function show(walletIdx) {
    clear();
    deleteWalletIndex = walletIdx;
    $("delete-wallet-name").textContent = displayName(walletIdx);
    $("delete-wallet-key-material").textContent = keyMaterialName(
        state.wallets[walletIdx],
    );
    showView("delete-wallet-confirm");
 }
@@ -99,9 +93,6 @@ function showLostPassword() {
    clearLostPassword();
    $("delete-wallet-lost-name").textContent = name;
    $("delete-wallet-lost-name-echo").textContent = name;
    $("delete-wallet-lost-key-material").textContent = keyMaterialName(
        state.wallets[walletIdx],
    );
    // showView() runs the leave hook of delete-wallet-confirm, which nulls
    // deleteWalletIndex, so this screen's own selection is recorded after
    // it and not before.
@@ -136,7 +127,7 @@ async function finishDelete(walletIdx) {
        // Save before broadcasting: the background reads the active
        // address back out of storage to build accountsChanged.
        if (activeAddressChanged) broadcastActiveChanged();
-        welcome.show();
+        showView("welcome");
        return;
    }
@@ -156,25 +147,8 @@ async function finishDelete(walletIdx) {
 function init(_ctx) {
    ctx = _ctx;
-    // Leaving drops the wallet selection, so each screen also comes off the
+    onViewLeave("delete-wallet-confirm", clear);
-    // Back stack, where the settings gear has just put it: Back from
+    onViewLeave("delete-wallet-lost-password", clearLostPassword);
    // Settings must not land on a screen whose button can only answer "No
    // wallet selected for deletion." A reopened popup drops them from the
    // stack the same way (https://git.eeqj.de/sneak/AutistMask/issues/480).
    onViewLeave("delete-wallet-confirm", () => {
        clear();
        const stack = state.viewStack;
        if (stack[stack.length - 1] === "delete-wallet-confirm") {
            stack.pop();
        }
    });
    onViewLeave("delete-wallet-lost-password", () => {
        clearLostPassword();
        const stack = state.viewStack;
        if (stack[stack.length - 1] === "delete-wallet-lost-password") {
            stack.pop();
        }
    });
    // No wipe here: goBack() routes through showView(), which runs the
    // leave hook.
@@ -241,22 +215,19 @@ function init(_ctx) {
    $("btn-delete-wallet-confirm").addEventListener("click", async () => {
        const pw = $("delete-wallet-password").value;
        if (!pw) {
-            showError(
+            $("delete-wallet-flash").textContent =
-                "delete-wallet-password-error",
+                "Please enter your password.";
-                "Please enter your password.",
+            $("delete-wallet-flash").style.visibility = "visible";
            );
            return;
        }
        if (deleteWalletIndex === null) {
-            showError(
+            $("delete-wallet-flash").textContent =
-                "delete-wallet-password-error",
+                "No wallet selected for deletion.";
-                "No wallet selected for deletion.",
+            $("delete-wallet-flash").style.visibility = "visible";
            );
            return;
        }
        hideError("delete-wallet-password-error");
        const btn = $("btn-delete-wallet-confirm");
        btn.disabled = true;
        btn.classList.add("text-muted");
@@ -268,10 +239,9 @@ function init(_ctx) {
        try {
            await decryptWithPassword(wallet.encryptedSecret, pw);
        } catch {
-            showError(
+            $("delete-wallet-flash").textContent =
-                "delete-wallet-password-error",
+                "That password is incorrect. Please try again.";
-                "That password is incorrect. Please try again.",
+            $("delete-wallet-flash").style.visibility = "visible";
            );
            btn.disabled = false;
            btn.classList.remove("text-muted");
            return;
@@ -20,8 +20,6 @@ const {
    $,
    showView,
    showFlash,
    showError,
    hideError,
    flashCopyFeedback,
    goBack,
    onViewLeave,
@@ -58,6 +56,11 @@ function isCurrentReveal(generation) {
    );
 }
 function fail(message) {
    $("export-privkey-flash").textContent = message;
    $("export-privkey-flash").style.visibility = "visible";
 }
 // Wipe every trace of the key and drop the address selection. Safe to call
 // when nothing was ever revealed, and safe to call twice.
 function clear() {
@@ -68,7 +71,8 @@ function clear() {
    $("export-privkey-password").value = "";
    $("export-privkey-result").classList.add("hidden");
    $("export-privkey-password-section").classList.remove("hidden");
-    hideError("export-privkey-password-error");
+    $("export-privkey-flash").textContent = "";
    $("export-privkey-flash").style.visibility = "hidden";
 }
 function show(walletIdx, addrIdx) {
@@ -94,7 +98,7 @@ function show(walletIdx, addrIdx) {
    $("export-privkey-title").textContent =
        wallet.name + " — Address " + (addrIdx + 1);
-    const addrContainer = $("export-privkey-address");
+    const addrContainer = $("export-privkey-dot").parentElement;
    addrContainer.innerHTML = renderAddressHtml(addr.address);
    attachCopyHandlers(addrContainer);
@@ -108,19 +112,15 @@ function show(walletIdx, addrIdx) {
 async function reveal() {
    const password = $("export-privkey-password").value;
    if (!password) {
-        showError(
+        fail("Please enter your password.");
            "export-privkey-password-error",
            "Please enter your password.",
        );
        return;
    }
    if (walletIndex === null) {
-        showError("export-privkey-password-error", "No address is selected.");
+        fail("No address is selected.");
        return;
    }
    const wallet = state.wallets[walletIndex];
    hideError("export-privkey-password-error");
    const btn = $("btn-export-privkey-confirm");
    btn.disabled = true;
    btn.classList.add("text-muted");
@@ -135,28 +135,16 @@ async function reveal() {
        // decrypt ran, the wipe has already happened, so the key is not
        // even derived, let alone written.
        if (!isCurrentReveal(generation)) return;
-        let signer;
+        const signer = getSignerForAddress(wallet, addressIndex, secret);
        try {
            signer = getSignerForAddress(
                wallet,
                wallet.addresses[addressIndex],
                secret,
            );
        } catch (e) {
            // The password was right; it is the key that was refused.
            showError("export-privkey-password-error", e.message);
            return;
        }
        $("export-privkey-password").value = "";
        $("export-privkey-password-section").classList.add("hidden");
        $("export-privkey-value").textContent = signer.privateKey;
        $("export-privkey-result").classList.remove("hidden");
        $("export-privkey-flash").textContent = "";
        $("export-privkey-flash").style.visibility = "hidden";
    } catch {
        if (!isCurrentReveal(generation)) return;
-        showError(
+        fail("That password is incorrect. Please try again.");
            "export-privkey-password-error",
            "That password is incorrect. Please try again.",
        );
    } finally {
        btn.disabled = false;
        btn.classList.remove("text-muted");
@@ -164,16 +152,7 @@ async function reveal() {
 }
 function init() {
-    // Leaving drops the address selection, so the screen also comes off the
+    onViewLeave(VIEW, clear);
    // Back stack, where the settings gear has just put it: Back from Settings
    // must not land on a password prompt that can only fail. A reopened popup
    // drops it from the stack the same way
    // (https://git.eeqj.de/sneak/AutistMask/issues/461).
    onViewLeave(VIEW, () => {
        clear();
        const stack = state.viewStack;
        if (stack[stack.length - 1] === VIEW) stack.pop();
    });
    // No wipe here: goBack() routes through showView(), which runs the
    // leave hook. A per-button wipe would only cover this one path.
@@ -1,7 +1,4 @@
-// Helpers the views in this directory share: showing a view and going back,
+// Shared DOM helpers used by all views.
 // error and flash lines and the warning banners, formatting of amounts, fees,
 // balances, addresses and dates, the RPC and Blockscout URLs, node and tokens
 // of the network a chain id names, explorer links, and click-to-copy.
 //
 // Escaping rule for every view in this directory, since they all build
 // markup by concatenation: any VALUE interpolated into an innerHTML string
@@ -22,15 +19,12 @@ const {
    isBelowOneMillionth,
 } = require("../../shared/amountDisplay");
 const { resolveTokenSymbol } = require("../../shared/approvalAmount");
 const { getProvider } = require("../../shared/balances");
 const { DEBUG } = require("../../shared/constants");
 const { escapeHtml } = require("../../shared/html");
 const { isDebug } = require("../../shared/log");
 const { networkByChainId } = require("../../shared/networks");
 const { formatUsd, getPrice } = require("../../shared/prices");
 const { state, saveState, currentNetwork } = require("../../shared/state");
 const { displaySymbol } = require("../../shared/symbolDisplay");
 const { walletHasRecoveryPhrase } = require("../../shared/wallet");
 const { markViewRendered } = require("../viewRouter");
 // When views are added, removed, or transitions between them change,
@@ -57,7 +51,6 @@ const VIEWS = [
    "approve-site",
    "approve-tx",
    "approve-sign",
    "approve-network",
    "export-privkey",
    "show-phrase",
    // Shown by src/popup/views/stateRecovery.js when the stored profile
@@ -132,8 +125,7 @@ function showView(name) {
 }
 // Create or update the debug/insecure warning banner.
-// Called on every view switch, after the settings debug toggle changes, and
+// Called on every view switch and after the settings debug toggle changes.
 // after a network switch in Settings.
 // The banner is shown when the compile-time DEBUG constant is true OR when
 // the user has enabled runtime debug mode via the settings easter egg, OR
 // when the active network is a testnet.
@@ -224,21 +216,10 @@ function pushCurrentView() {
 // Pop the navigation stack and show the previous view.  If the stack
 // is empty, fall back to the main (home) view.
 //
 // An entry for the view already showing is skipped: landing on it would
 // make Back seem to do nothing. Settings, the recovery phrase or delete
 // wallet screen, then the gear leaves Settings under Settings, because that
 // screen takes itself off the stack when left, and a reopened popup cuts it
 // off the restored stack the same way
 // (https://git.eeqj.de/sneak/AutistMask/issues/481).
 function goBack() {
    const stack = state.viewStack;
    while (stack.length > 0 && stack[stack.length - 1] === state.currentView) {
        stack.pop();
    }
    let target;
-    if (stack.length > 0) {
+    if (state.viewStack.length > 0) {
-        target = stack.pop();
+        target = state.viewStack.pop();
    } else {
        target = "main";
    }
@@ -290,51 +271,34 @@ function unknownableAmount(balance) {
 // The active network's native token symbol, `ETH` on mainnet and `SepoliaETH`
 // on Sepolia, as src/shared/networks.js names it. The wallet's balances and
-// the Send screen, which sends on the active network, label a native amount
+// the Send and confirmation screens, which send on the active network, label a
-// with this; the confirmation screen, and a transaction already made or
+// native amount with this; a transaction already made or requested is labelled
-// requested, label it by the transaction's own chain id, through
+// by its own chain id, through nativeCurrencyByChainId() in networks.js. The
-// nativeCurrencyByChainId() in networks.js. The "ETH" that state.selectedToken
+// "ETH" that state.selectedToken and txInfo.token hold is the native token's
-// and txInfo.token hold is the native token's id, not its label, and stays
+// id, not its label, and stays "ETH" on every network.
 // "ETH" on every network.
 function nativeCurrency() {
    return currentNetwork().nativeCurrency;
 }
-// What the wallet knows of the tokens on the network with this chain id, or
+// The symbol shown for a token line, resolved from the bundled list, the
-// on the active network when no chain id is given, as the `sources` that
+// tokens the user tracks, and the explorer's report — the same chain the
-// resolveTokenSymbol() and resolveTokenDecimals() take. A contract address
+// amount line's scale comes from. Null when no source names one, so the token
-// names a token on one network only, and every token balance held is the
+// lines keep saying `Unknown token` for a token nothing knows.
-// active network's, so another network gets the tokens tracked on it
+function tokenLabel(address) {
-// (state.networkTrackedTokens, see applyChainSwitchFields()) and no balances.
+    return resolveTokenSymbol(address, {
-function tokenSourcesByChainId(chainId) {
+        trackedTokens: state.trackedTokens,
-    const net = chainId ? networkByChainId(chainId) : currentNetwork();
+        wallets: state.wallets,
-    if (net && net.id === state.networkId) {
+    });
        return { trackedTokens: state.trackedTokens, wallets: state.wallets };
    }
    return {
        trackedTokens: (net && state.networkTrackedTokens[net.id]) || [],
        wallets: [],
    };
 }
 // The symbol shown for a token line on the network with `chainId`, or on the
 // active network when none is given: from the bundled list, the tokens the
 // user tracks, and the explorer's report, the sources the amount line's scale
 // comes from. Null when no source names one, so the token lines keep saying
 // `Unknown token` for a token nothing knows.
 function tokenLabel(address, chainId) {
    return resolveTokenSymbol(address, tokenSourcesByChainId(chainId));
 }
 // A network fee in wei as the confirmation and approval screens both show it:
 // the ETH figure through truncateAmountNeverZero() and labelled `symbol`, the
 // native currency of the network the fee is paid on, then its USD value when
-// the ETH price is known on the network with `chainId`, or on the active
+// the ETH price is known. The USD value is of the exact fee, not of the
-// network when no chain id is given. The USD value is of the exact fee, not of
+// truncated figure.
-// the truncated figure.
+function formatFee(wei, symbol) {
 function formatFee(wei, symbol, chainId) {
    const eth = formatEther(wei);
-    const ethPrice = getPrice("ETH", chainId);
+    const ethPrice = getPrice("ETH");
    const usd = ethPrice ? formatUsd(parseFloat(eth) * ethPrice) : "";
    return (
        truncateAmountNeverZero(eth) +
@@ -371,7 +335,7 @@ function balanceLine(symbol, amount, price, tokenId) {
        : "";
    return (
        `<div class="flex text-xs${clickClass}"${tokenAttr}>` +
-        `<span class="flex justify-between w-[42ch] max-w-full">` +
+        `<span class="flex justify-between" style="width:42ch;max-width:100%">` +
        `<span>${escapeHtml(displaySymbol(symbol))}</span>` +
        `<span>${qty}</span>` +
        `</span>` +
@@ -442,16 +406,6 @@ function addressHoldsFunds(addr) {
    return false;
 }
 // The name of a wallet's key material, which is also its only backup: the
 // recovery phrase of an HD wallet, the private key of a key wallet, the
 // extended private key of an xprv wallet. DeleteWallet,
 // DeleteWalletLostPassword and DeleteAddress name the backup with it.
 function keyMaterialName(wallet) {
    if (walletHasRecoveryPhrase(wallet)) return "recovery phrase";
    if (wallet.type === "key") return "private key";
    return "extended private key";
 }
 // The fewest characters of an address any caller may ask to display. The
 // 10-character cap inside truncateMiddle() is the other half of the same
 // guarantee; this is the half that used to be spelled out at each call
@@ -476,26 +430,23 @@ function truncateMiddle(str, maxLen) {
 // 16 colors evenly spaced around the hue wheel (22.5° apart),
 // all at HSL saturation 70%, lightness 50% for uniform vibrancy.
 // Each is a whole Tailwind class: Tailwind builds only the classes it finds
 // written out in the source, so the class name cannot be put together at
 // runtime.
 const ADDRESS_COLORS = [
-    "bg-[#d92626]",
+    "#d92626",
-    "bg-[#d96926]",
+    "#d96926",
-    "bg-[#d9ac26]",
+    "#d9ac26",
-    "bg-[#c2d926]",
+    "#c2d926",
-    "bg-[#80d926]",
+    "#80d926",
-    "bg-[#3dd926]",
+    "#3dd926",
-    "bg-[#26d953]",
+    "#26d953",
-    "bg-[#26d996]",
+    "#26d996",
-    "bg-[#26d9d9]",
+    "#26d9d9",
-    "bg-[#2696d9]",
+    "#2696d9",
-    "bg-[#2653d9]",
+    "#2653d9",
-    "bg-[#3d26d9]",
+    "#3d26d9",
-    "bg-[#8026d9]",
+    "#8026d9",
-    "bg-[#c226d9]",
+    "#c226d9",
-    "bg-[#d926ac]",
+    "#d926ac",
-    "bg-[#d92669]",
+    "#d92669",
 ];
 function addressColor(address) {
@@ -505,12 +456,12 @@ function addressColor(address) {
 function addressDotHtml(address) {
    const color = addressColor(address);
-    return `<span class="inline-block w-[8px] h-[8px] rounded-[50%] ${color} mr-[4px] align-middle shrink-0"></span>`;
+    return `<span style="width:8px;height:8px;border-radius:50%;display:inline-block;background:${color};margin-right:4px;vertical-align:middle;flex-shrink:0;"></span>`;
 }
 function blockieHtml(address) {
    const src = makeBlockie(address);
-    return `<img src="${escapeHtml(src)}" width="48" height="48" class="inline-block rounded-[50%] [image-rendering:pixelated]">`;
+    return `<img src="${escapeHtml(src)}" width="48" height="48" style="image-rendering:pixelated;border-radius:50%;display:inline-block">`;
 }
 // Look up an address across all wallets and return its title
@@ -534,11 +485,6 @@ function addressTitle(address, wallets) {
 const CONTRACT_CREATION_TEXT =
    "This transaction creates a new contract. It has no recipient.";
 // What the transaction lists on Home, AddressDetail and AddressToken say while
 // the user has "Use Blockscout" off: the history comes from Blockscout alone.
 const HISTORY_OFF_TEXT =
    'No transaction history is shown, because "Use Blockscout" is off in Settings.';
 // The last two lines of a transaction history row: the counterparty's colour
 // dot and name beside the amount, then its full address. A contract creation
 // the user sent has no counterparty (its `to` is ""), so its row has the
@@ -625,50 +571,24 @@ function timeAgo(timestamp) {
 // Shared external-link icon SVG used across all views.
 const EXT_ICON =
-    `<span class="inline-block w-[10px] h-[10px] ml-[4px] align-middle">` +
+    `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
    `<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.5">` +
    `<path d="M4.5 1.5H2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h8a.5.5 0 00.5-.5V7.5"/>` +
    `<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
    `</svg></span>`;
 // The RPC and Blockscout URLs Settings has for the network with this chain id,
 // which need not be the active one: ConfirmTx, WaitTx and TransactionDetail
 // use the network their transaction's chain id names, and the popup can reopen
 // onto them after Settings switched the network. The active network's are
 // state.rpcUrl and state.blockscoutUrl, any other's the ones remembered for it,
 // or its defaults (see applyChainSwitchFields()).
 function endpointsByChainId(chainId) {
    const net = networkByChainId(chainId);
    if (net.id === state.networkId) {
        return { rpcUrl: state.rpcUrl, blockscoutUrl: state.blockscoutUrl };
    }
    const remembered = state.networkEndpoints[net.id] || {};
    return {
        rpcUrl: remembered.rpcUrl || net.defaultRpcUrl,
        blockscoutUrl: remembered.blockscoutUrl || net.defaultBlockscoutUrl,
    };
 }
 // The node of the network a transaction was reviewed for.
 function reviewedNetworkProvider(txInfo) {
    const net = networkByChainId(txInfo.chainId);
    return getProvider(endpointsByChainId(txInfo.chainId).rpcUrl, net.id);
 }
 // Block-explorer URLs. The origin is a per-network constant from
-// src/shared/networks.js, the explorer of the network with `chainId`, or of
+// src/shared/networks.js; only the path segment is data, and it comes out
-// the active network when no chain id is given; only the path segment is
+// of explorer JSON (a transaction's from/to, a token's address_hash), which
-// data, and it comes out of explorer JSON (a transaction's from/to, a token's
+// nothing upstream validates as hex. percent-encoding it keeps a segment
-// address_hash), which nothing upstream validates as hex. percent-encoding it
+// that contains a slash, a query or a fragment from re-pointing the link
-// keeps a segment that contains a slash, a query or a fragment from
+// somewhere else in the explorer.
-// re-pointing the link somewhere else in the explorer.
+function explorerUrl(kind, value) {
-function explorerUrl(kind, value, chainId) {
+    return `${currentNetwork().explorerUrl}/${kind}/${encodeURIComponent(value)}`;
    const network = chainId ? networkByChainId(chainId) : currentNetwork();
    return `${network.explorerUrl}/${kind}/${encodeURIComponent(value)}`;
 }
-function etherscanAddressUrl(address, chainId) {
+function etherscanAddressUrl(address) {
-    return explorerUrl("address", address, chainId);
+    return explorerUrl("address", address);
 }
 // The URL still has to be escaped on the way into href="...": encoding
@@ -734,18 +654,16 @@ function attachCopyHandlers(container) {
 //              with them, and the "at least 32 characters" guarantee has
 //              to survive having no current callers to be a guarantee.
 //   noLink   — if true, omit etherscan link
 //   chainId  — the network whose explorer the link opens; the active
 //              network's when absent
 //
 // After inserting the returned HTML into the DOM, call
 // attachCopyHandlers() on the parent to wire up click-to-copy.
 function renderAddressHtml(address, opts) {
-    const { title, ensName, maxLen, noLink, chainId } = opts || {};
+    const { title, ensName, maxLen, noLink } = opts || {};
    const dot = addressDotHtml(address);
    const displayAddr = maxLen
        ? truncateMiddle(address, Math.max(ADDRESS_MIN_DISPLAY_LEN, maxLen))
        : address;
-    const link = etherscanAddressUrl(address, chainId);
+    const link = etherscanAddressUrl(address);
    const extLink = noLink ? "" : etherscanLinkHtml(link);
    let html = "";
@@ -792,10 +710,8 @@ module.exports = {
    balanceLine,
    balanceLinesForAddress,
    addressHoldsFunds,
    keyMaterialName,
    unknownableAmount,
    nativeCurrency,
    tokenSourcesByChainId,
    tokenLabel,
    formatFee,
    addressDotHtml,
@@ -804,7 +720,6 @@ module.exports = {
    displaySymbol,
    addressTitle,
    CONTRACT_CREATION_TEXT,
    HISTORY_OFF_TEXT,
    txCounterpartyHtml,
    formatAddressHtml,
    renderAddressHtml,
@@ -812,8 +727,6 @@ module.exports = {
    attachCopyHandlers,
    etherscanLinkHtml,
    explorerUrl,
    endpointsByChainId,
    reviewedNetworkProvider,
    EXT_ICON,
    truncateMiddle,
    isoDate,
@@ -7,7 +7,6 @@ const {
    timeAgo,
    addressDotHtml,
    txCounterpartyHtml,
    HISTORY_OFF_TEXT,
    addressTitle,
    escapeHtml,
    displaySymbol,
@@ -101,10 +100,6 @@ let homeTxs = [];
 function renderHomeTxList(ctx) {
    const list = $("home-tx-list");
    if (!list) return;
    if (!state.useBlockscout) {
        list.innerHTML = `<div class="text-muted text-xs py-1">${escapeHtml(HISTORY_OFF_TEXT)}</div>`;
        return;
    }
    if (homeTxs.length === 0) {
        list.innerHTML =
            '<div class="text-muted text-xs py-1">No transactions found.</div>';
@@ -136,10 +131,10 @@ function renderHomeTxList(ctx) {
        const title = addressTitle(counterparty, state.wallets);
        const titleStr = title ? escapeHtml(title) : "";
        const err = tx.isError ? " (failed)" : "";
-        const opacity = tx.isError ? " opacity-50" : "";
+        const opacity = tx.isError ? " opacity:0.5;" : "";
        const ago = escapeHtml(timeAgo(tx.timestamp));
        const iso = escapeHtml(isoDate(tx.timestamp));
-        html += `<div class="home-tx-row py-2 border-b border-border-light text-xs cursor-pointer hover:bg-hover${opacity}" data-tx="${i}">`;
+        html += `<div class="home-tx-row py-2 border-b border-border-light text-xs cursor-pointer hover:bg-hover" data-tx="${i}" style="${opacity}">`;
        html += `<div class="flex justify-between"><span class="text-muted" title="${iso}">${ago}</span><span>${dirLabel}${err}</span></div>`;
        html += txCounterpartyHtml(counterparty, titleStr, amountStr);
        html += `</div>`;
@@ -197,7 +192,6 @@ async function loadHomeTxs(ctx) {
            fetchRecentTransactions(
                addr,
                state.blockscoutUrl,
                state.useBlockscout,
                currentNetwork().chainId,
            ),
        );
@@ -231,9 +225,6 @@ async function loadHomeTxs(ctx) {
        homeTxs = merged.slice(0, 25);
        renderHomeTxList(ctx);
    } catch (e) {
        // Cancelled by the popup closing, not failed: see pageClosed in
        // src/popup/index.js.
        if (ctx.pageClosed.aborted) return;
        log.errorf("loadHomeTxs failed:", e.message);
        const list = $("home-tx-list");
        if (list) {
@@ -250,7 +241,7 @@ function walletListHtml() {
    state.wallets.forEach((wallet, wi) => {
        const defect = walletDefect(wallet);
        html += `<div>`;
-        html += `<div class="flex justify-between items-center bg-section py-1 px-2 -mx-2">`;
+        html += `<div class="flex justify-between items-center bg-section py-1 px-2" style="margin:0 -0.5rem">`;
        html += `<span class="font-bold cursor-pointer wallet-name underline decoration-dashed" data-wallet="${wi}">${escapeHtml(wallet.name)}</span>`;
        // No "+" on a defective wallet: deriving another address from that
        // xpub would only add one more address the key does not produce
@@ -264,12 +255,12 @@ function walletListHtml() {
        wallet.addresses.forEach((addr, ai) => {
            html += `<div class="address-row py-1 border-b border-border-light cursor-pointer hover:bg-hover" data-wallet="${wi}" data-address="${ai}">`;
            const isActive = state.activeAddress === addr.address;
-            const infoBtn = `<span class="btn-addr-info text-xs cursor-pointer border border-border hover:bg-fg hover:text-bg p-0" data-wallet="${wi}" data-address="${ai}">[info]</span>`;
+            const infoBtn = `<span class="btn-addr-info text-xs cursor-pointer border border-border hover:bg-fg hover:text-bg" style="padding:0" data-wallet="${wi}" data-address="${ai}">[info]</span>`;
            // Only where a wallet can spare the address: a wallet holding a
            // single address has no remove control, because its last address
            // is never removable.
            const removeBtn = canRemoveAddress(wallet)
-                ? `<span class="btn-remove-address text-xs cursor-pointer border border-border hover:bg-fg hover:text-bg ml-1 p-0" data-wallet="${wi}" data-address="${ai}" title="Remove this address from the wallet">[x]</span>`
+                ? `<span class="btn-remove-address text-xs cursor-pointer border border-border hover:bg-fg hover:text-bg ml-1" style="padding:0" data-wallet="${wi}" data-address="${ai}" title="Remove this address from the wallet">[x]</span>`
                : "";
            const dot = addressDotHtml(addr.address);
            const titleBold = isActive ? "font-bold" : "";
@@ -306,8 +297,6 @@ function walletListHtml() {
 function render(ctx) {
    const container = $("wallet-list");
    // Tokens the user has not tracked are Blockscout's to report.
    $("home-tokens-note").classList.toggle("hidden", !!state.useBlockscout);
    if (state.wallets.length === 0) {
        container.innerHTML =
            '<p class="text-muted py-2">No wallets yet. Add one to get started.</p>';
@@ -362,7 +351,6 @@ function render(ctx) {
            );
            wallet.addresses.push({
                address: newAddr,
                index: wallet.nextIndex,
                balance: "0.0000",
                tokenBalances: [],
            });
@@ -24,7 +24,6 @@ const {
 } = require("../../shared/amountDisplay");
 const {
    feeReserveWei,
    isValidAmount,
    maxEthAmount,
    maxTokenAmount,
 } = require("../../shared/txValidation");
@@ -164,9 +163,8 @@ function renderSendTokenSelect(addr) {
    }
 }
-// The token balance the Send screen states, and the scale it hands the
+// The token balance and scale the Send screen states and hands the
-// confirmation screen, which reads the balance itself from the network it is
+// confirmation screen, so the two screens describe the holding the same way.
 // drawn for.
 //
 // The scale is resolved the same way balances.js resolved the scale it
 // DISPLAYED this token's balance at: bundled list, then the user's tracked
@@ -189,11 +187,13 @@ function renderSendTokenSelect(addr) {
 //
 // The two resolutions can therefore differ, and where they do, the stored
 // `balance` is a quantity computed at a scale this screen has just declined to
-// stand behind, so it is withdrawn: unknown scale means unknown balance. It is
+// stand behind. Stating it would leave validateTransfer() checking the amount
-// null rather than "0": this screen states it as unknown, as the confirmation
+// against a number the wallet does not vouch for, so it is withdrawn: unknown
-// screen does, and Max fills nothing in for it. Only a stored quantity is
+// scale means unknown balance. It is null rather than "0": both screens state
-// withdrawn: the "0" for a token that has no row at all is an absence of
+// an unknown balance as unknown, and validateTransfer() treats it as no balance
-// holdings, which is true at every scale.
+// to spend from, which is the fail-closed side of an amount nobody can check.
 // Only a stored quantity is withdrawn: the "0" for a token that has no row at
 // all is an absence of holdings, which is true at every scale.
 function tokenBalanceAndDecimals(addr, token) {
    const tb = (addr.tokenBalances || []).find(
        (t) => t.address.toLowerCase() === token.toLowerCase(),
@@ -255,18 +255,13 @@ async function fillMaxAmount() {
    const token = state.selectedToken || $("send-token").value;
    if (token !== "ETH") {
-        const { tokenBalance: bal, tokenDecimals } = tokenBalanceAndDecimals(
+        const bal = tokenBalanceAndDecimals(addr, token).tokenBalance;
            addr,
            token,
        );
        if (bal == null) {
            showFlash("This token's balance is unknown.");
            return;
        }
        const amount = maxTokenAmount(bal);
-        // The balance is stored at the token's own decimal places and cut to
+        if (!(parseFloat(amount) > 0)) {
        // 18 above, so the only balance this refuses is zero.
        if (!isValidAmount(amount, tokenDecimals)) {
            showFlash("This token's balance is zero.");
            return;
        }
@@ -297,9 +292,6 @@ async function fillMaxAmount() {
        ]);
        feeWei = feeReserveWei(gasLimit, feeData);
    } catch (e) {
        // Cancelled by the popup closing, not failed: see pageClosed in
        // src/popup/index.js.
        if (ctx.pageClosed.aborted) return;
        log.errorf(
            "max amount fee estimate failed:",
            e.shortMessage || e.message,
@@ -372,24 +364,7 @@ function init(_ctx) {
            );
            return;
        }
-
+        if (!amount || isNaN(parseFloat(amount)) || parseFloat(amount) <= 0) {
        const token = state.selectedToken || $("send-token").value;
        const addr = currentAddress();
        let tokenSymbol = null;
        let tokenDecimals = null;
        if (token !== "ETH") {
            tokenSymbol = resolveSymbol(
                token,
                addr.tokenBalances,
                state.trackedTokens,
            );
            ({ tokenDecimals } = tokenBalanceAndDecimals(addr, token));
        }
        // The confirmation screen's own amount check, so it is never shown
        // an amount it would refuse.
        if (!isValidAmount(amount, tokenDecimals)) {
            showFlash("Please enter a valid amount.");
            return;
        }
@@ -413,13 +388,33 @@ function init(_ctx) {
            }
        }
        const token = state.selectedToken || $("send-token").value;
        const addr = currentAddress();
        let tokenSymbol = null;
        let tokenBalance = null;
        let tokenDecimals = null;
        if (token !== "ETH") {
            tokenSymbol = resolveSymbol(
                token,
                addr.tokenBalances,
                state.trackedTokens,
            );
            ({ tokenBalance, tokenDecimals } = tokenBalanceAndDecimals(
                addr,
                token,
            ));
        }
        ctx.showConfirmTx({
            from: addr.address,
            to: resolvedTo,
            ensName: ensName,
            amount: amount,
            token: token,
            balance: addr.balance,
            tokenSymbol: tokenSymbol,
            tokenBalance: tokenBalance,
            tokenDecimals: tokenDecimals,
            max: amountIsMax,
        });
@@ -16,8 +16,6 @@ const {
 } = require("../dustThreshold");
 const { state, saveState, currentNetwork } = require("../../shared/state");
 const { onChainSwitch } = require("../../shared/chainSwitch");
 const { restorableStack } = require("../../shared/persistedState");
 const { resetRenderedViews, markViewRendered } = require("../viewRouter");
 const {
    log,
    debugFetch,
@@ -38,8 +36,6 @@ const {
 const { notify, sendMessage } = require("../../shared/browserApi");
 let ctx;
 let versionClickCount = 0;
 let versionClickTimer = null;
@@ -80,13 +76,11 @@ function forgetOrigin(siteMap, origin) {
 // Removing a site from Allowed Sites or Connected Sites disconnects it: it is
 // no longer allowed under any address, and the background ends its
-// connections approved without "Remember" and tells its open tabs. The
+// connections approved without "Remember" and tells its open tabs.
 // background answers once those have ended, so the lists drawn after it no
 // longer show the site.
 async function removeAllowedSite(origin) {
    forgetOrigin(state.allowedSites, origin);
    await saveState();
-    await sendMessage({ type: "AUTISTMASK_REMOVE_SITE", origin });
+    notify({ type: "AUTISTMASK_REMOVE_SITE", origin });
    await renderSiteLists();
 }
@@ -201,10 +195,6 @@ function show() {
    $("settings-rpc").value = state.rpcUrl;
    $("settings-blockscout").value = state.blockscoutUrl;
    $("settings-network").value = state.networkId;
    // Set on every show, not only at init: Welcome can change these two.
    $("settings-use-blockscout").checked = state.useBlockscout;
    $("settings-check-recipients-on-etherscan").checked =
        state.checkRecipientsOnEtherscan;
    renderTrackedTokens();
    renderSiteLists();
    renderWalletListSettings();
@@ -223,7 +213,12 @@ function show() {
    versionClickCount = 0;
    // Show debug well if debug mode is already enabled
-    $("settings-debug-well").classList.toggle("hidden", !state.debugMode);
+    const debugWell = $("settings-debug-well");
    if (state.debugMode) {
        debugWell.style.display = "";
    } else {
        debugWell.style.display = "none";
    }
    $("settings-debug-mode").checked = state.debugMode;
    showView("settings");
@@ -240,8 +235,8 @@ async function renderSiteLists() {
        Object.values(state.deniedSites).flat(),
        removeDeniedSite,
    );
-    // Sites allowed without "Remember" are held only in session storage, which
+    // Sites allowed without "Remember" are held only by the background, in
-    // the background keeps, so it is asked for them.
+    // memory, so it is asked for them.
    renderSiteList(
        "settings-connected-sites",
        await sendMessage({ type: "AUTISTMASK_GET_CONNECTED_SITES" }),
@@ -249,51 +244,7 @@ async function renderSiteLists() {
    );
 }
-// A network switch, made by the user here or saved by the background once the
+function init(ctx) {
 // user approved a site's request (src/popup/index.js), leaves every screen on
 // the page showing the previous network. These two leave the page as README's
 // Screen Map describes, the first before the switch is saved, so that save
 // keeps the cut for a popup closed straight after, the second once `state`
 // holds the new network.
 //
 // The stack is cut at the first screen that cannot be rendered from saved
 // state, such as Send or AddToken, and at AddressToken unless it shows the
 // native token: any other token there was picked on the previous network, so
 // it is no longer selected either. Without a wallet the stack starts at
 // Welcome, which that cut would drop, and Welcome shows nothing from a network.
 function cutViewStack() {
    if (!state.hasWallet) return;
    if (state.selectedToken !== "ETH") {
        const tokenView = state.viewStack.indexOf("address-token");
        if (tokenView !== -1) {
            state.viewStack = state.viewStack.slice(0, tokenView);
        }
        state.selectedToken = null;
    }
    state.viewStack = restorableStack(state.viewStack, state.currentView);
 }
 // Every screen counts as not yet rendered, so "Back" renders the one it lands
 // on for the new network. Settings on top is brought up to date in place;
 // any other screen is drawn again as a reopened popup draws it, which is Home
 // for one that cannot be rendered from saved state. Without a wallet any other
 // screen is Welcome or AddWallet, which show nothing from a network.
 function showNewNetwork() {
    resetRenderedViews();
    if (state.currentView === "settings") {
        markViewRendered("settings");
        $("settings-network").value = state.networkId;
        $("settings-rpc").value = state.rpcUrl;
        $("settings-blockscout").value = state.blockscoutUrl;
        renderTrackedTokens();
    } else if (state.hasWallet) {
        ctx.restoreView();
    }
    updateDebugBanner(state.currentView);
 }
 function init(_ctx) {
    ctx = _ctx;
    deleteWallet.init(ctx);
    showPhrase.init();
@@ -327,9 +278,6 @@ function init(_ctx) {
                return;
            }
        } catch {
            // Cancelled by the popup closing, not failed: see pageClosed in
            // src/popup/index.js.
            if (ctx.pageClosed.aborted) return;
            // Not the error's message: fetch puts the whole URL, password and
            // key included, in the message of the error it throws for a URL
            // with a user name and password or one it cannot parse.
@@ -356,7 +304,6 @@ function init(_ctx) {
                return;
            }
        } catch {
            if (ctx.pageClosed.aborted) return;
            // Not the error's message, as for the RPC check above.
            log.errorf("Blockscout validation failed:", urlOrigin(url));
            showFlash("Could not reach endpoint.");
@@ -367,47 +314,12 @@ function init(_ctx) {
        showFlash("Saved.");
    });
    // The screens under Settings were drawn under the old setting, so each
    // change makes every screen but Settings count as not yet drawn, as a
    // network switch does, and Back draws the one it lands on again. Welcome
    // offers the same two settings and is only unhidden on Back, so its boxes
    // are set here too.
    $("settings-use-blockscout").addEventListener("change", async () => {
        state.useBlockscout = $("settings-use-blockscout").checked;
        $("welcome-use-blockscout").checked = state.useBlockscout;
        resetRenderedViews();
        markViewRendered("settings");
        await saveState();
    });
    $("settings-check-recipients-on-etherscan").addEventListener(
        "change",
        async () => {
            state.checkRecipientsOnEtherscan = $(
                "settings-check-recipients-on-etherscan",
            ).checked;
            $("welcome-check-recipients-on-etherscan").checked =
                state.checkRecipientsOnEtherscan;
            resetRenderedViews();
            markViewRendered("settings");
            await saveState();
        },
    );
    const networkSelect = $("settings-network");
    networkSelect.addEventListener("change", async () => {
        // Whether `state` already has the network picked is asked only once
        // the switch holds the lock: while an earlier pick waits for it,
        // `state` still has the network before that pick, and a pick back to
        // that network must still be made.
        const newId = networkSelect.value;
        cutViewStack();
        const net = await onChainSwitch(newId);
-        if (!net) return;
+        $("settings-rpc").value = state.rpcUrl;
-        // Open pages are told by the background, as after a site's approved
+        $("settings-blockscout").value = state.blockscoutUrl;
        // switch request.
        notify({ type: "AUTISTMASK_NETWORK_CHANGED", chainId: net.chainId });
        showNewNetwork();
        showFlash("Switched to " + net.name + ".");
    });
@@ -522,7 +434,7 @@ function init(_ctx) {
        if (versionClickCount >= 10) {
            versionClickCount = 0;
            clearTimeout(versionClickTimer);
-            $("settings-debug-well").classList.remove("hidden");
+            $("settings-debug-well").style.display = "";
        }
    });
@@ -542,10 +454,4 @@ function init(_ctx) {
    });
 }
-module.exports = {
+module.exports = { init, show, renderSiteLists };
    init,
    show,
    renderSiteLists,
    cutViewStack,
    showNewNetwork,
 };
@@ -1,6 +1,6 @@
 const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
 const { getTopTokens } = require("../../shared/tokenList");
-const { state, saveState, currentNetwork } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const { lookupTokenInfo } = require("../../shared/balances");
 const { isScamAddress } = require("../../shared/scamlist");
 const { log } = require("../../shared/log");
@@ -75,12 +75,6 @@ function show() {
    $("settings-addtoken-address").value = "";
    $("settings-addtoken-info").textContent = "";
    $("settings-addtoken-info").style.visibility = "hidden";
    // The bundled list holds Ethereum Mainnet contracts, which name no token
    // on any other network.
    $("settings-addtoken-common").classList.toggle(
        "hidden",
        state.networkId !== "mainnet",
    );
    renderTop10();
    renderDropdown();
    showView("settings-addtoken");
@@ -136,25 +130,12 @@ function init(_ctx) {
        infoEl.textContent = "Looking up token...";
        infoEl.style.visibility = "visible";
        log.debugf("Looking up token contract", addr);
        // The network the lookup asks, which Settings may switch away from
        // before it answers, as for a transaction in confirmTx.js.
        const chainId = currentNetwork().chainId;
        try {
            const info = await lookupTokenInfo(
                addr,
                state.rpcUrl,
                state.networkId,
                ctx.pageClosed,
            );
            // A contract address names a token on one network only, so an
            // answer after a switch is not added to the new network's list.
            if (currentNetwork().chainId !== chainId) {
                showFlash(
                    "The active network changed before the lookup finished," +
                        " so the token was not added.",
                );
                return;
            }
            log.infof("Adding token", info.symbol, addr);
            state.trackedTokens.push({
                address: addr,
@@ -171,9 +152,6 @@ function init(_ctx) {
            renderDropdown();
            ctx.doRefreshAndRender();
        } catch (e) {
            // Cancelled by the popup closing, not failed: see pageClosed in
            // src/popup/index.js.
            if (ctx.pageClosed.aborted) return;
            const detail = e.shortMessage || e.message || String(e);
            log.errorf("Adding token failed for", addr, detail);
            // lookupTokenInfo() rejects a contract with a one-line message
@@ -21,8 +21,6 @@ const {
    $,
    showView,
    showFlash,
    showError,
    hideError,
    flashCopyFeedback,
    goBack,
    onViewLeave,
@@ -54,6 +52,11 @@ function isCurrentReveal(generation) {
    );
 }
 function fail(message) {
    $("show-phrase-flash").textContent = message;
    $("show-phrase-flash").style.visibility = "visible";
 }
 // Wipe every trace of the phrase and drop the wallet selection. Safe to
 // call when nothing was ever revealed, and safe to call twice.
 function clear() {
@@ -63,7 +66,8 @@ function clear() {
    $("show-phrase-password").value = "";
    $("show-phrase-result").classList.add("hidden");
    $("show-phrase-password-section").classList.remove("hidden");
-    hideError("show-phrase-password-error");
+    $("show-phrase-flash").textContent = "";
    $("show-phrase-flash").style.visibility = "hidden";
 }
 function show(walletIdx) {
@@ -86,23 +90,19 @@ function show(walletIdx) {
 async function reveal() {
    const password = $("show-phrase-password").value;
    if (!password) {
-        showError("show-phrase-password-error", "Please enter your password.");
+        fail("Please enter your password.");
        return;
    }
    if (walletIndex === null) {
-        showError("show-phrase-password-error", "No wallet is selected.");
+        fail("No wallet is selected.");
        return;
    }
    const wallet = state.wallets[walletIndex];
    if (!walletHasRecoveryPhrase(wallet)) {
-        showError(
+        fail("This wallet does not have a recovery phrase.");
            "show-phrase-password-error",
            "This wallet does not have a recovery phrase.",
        );
        return;
    }
    hideError("show-phrase-password-error");
    const btn = $("btn-show-phrase-reveal");
    btn.disabled = true;
    btn.classList.add("text-muted");
@@ -120,14 +120,13 @@ async function reveal() {
        $("show-phrase-password-section").classList.add("hidden");
        $("show-phrase-value").textContent = phrase;
        $("show-phrase-result").classList.remove("hidden");
        $("show-phrase-flash").textContent = "";
        $("show-phrase-flash").style.visibility = "hidden";
    } catch {
        if (!isCurrentReveal(generation)) return;
        // Deliberately not the caught error: the message is fixed so that
        // nothing derived from the ciphertext or the attempt can surface.
-        showError(
+        fail("That password is incorrect. Please try again.");
            "show-phrase-password-error",
            "That password is incorrect. Please try again.",
        );
    } finally {
        btn.disabled = false;
        btn.classList.remove("text-muted");
@@ -135,16 +134,7 @@ async function reveal() {
 }
 function init() {
-    // Leaving drops the wallet selection, so the screen also comes off the
+    onViewLeave(VIEW, clear);
    // Back stack, where the settings gear has just put it: Back from Settings
    // must not land on a password prompt that can only fail. A reopened popup
    // drops it from the stack the same way
    // (https://git.eeqj.de/sneak/AutistMask/issues/461).
    onViewLeave(VIEW, () => {
        clear();
        const stack = state.viewStack;
        if (stack[stack.length - 1] === VIEW) stack.pop();
    });
    $("btn-show-phrase-back").addEventListener("click", () => {
        goBack();
@@ -24,11 +24,7 @@
 // than written again locally so that tests/popupElementIds.test.js sees these
 // lookups and holds every id below against the markup.
 const { $, VIEWS } = require("./helpers");
-const {
+const { storageGet, storageRemove } = require("../../shared/browserApi");
    storageGet,
    storageRemove,
    withLock,
 } = require("../../shared/browserApi");
 const { log } = require("../../shared/log");
 // Typed in full before anything is erased, in the same spirit as the wallet
@@ -141,11 +137,7 @@ async function resetProfile() {
        return;
    }
    try {
-        // Under the lock every write of the stored record takes, so the erase
+        await storageRemove("autistmask");
        // cannot land between another write's read and its write and be undone.
        // A page in a Firefox private window is the exception: Firefox gives
        // it locks of its own (README, "Stored state and its version").
        await withLock("autistmask", () => storageRemove("autistmask"));
    } catch (e) {
        log.errorf("state recovery: reset failed:", e);
        setFlash("The saved data could not be erased. Nothing was changed.");
@@ -18,7 +18,6 @@ const {
    copyableHtml,
    etherscanLinkHtml,
    explorerUrl,
    endpointsByChainId,
    displaySymbol,
    goBack,
 } = require("./helpers");
@@ -49,16 +48,16 @@ function getTransactionType(tx) {
    return "Native " + nativeCurrencyByChainId(tx.chainId) + " Transfer";
 }
-function txAddressHtml(address, ensName, title, chainId) {
+function txAddressHtml(address, ensName, title) {
    const blockie = blockieHtml(address);
    return (
        `<div class="mb-1">${blockie}</div>` +
-        renderAddressHtml(address, { title, ensName, chainId })
+        renderAddressHtml(address, { title, ensName })
    );
 }
-function txHashHtml(hash, chainId) {
+function txHashHtml(hash) {
-    const link = explorerUrl("tx", hash, chainId);
+    const link = explorerUrl("tx", hash);
    const extLink = etherscanLinkHtml(link);
    return copyableHtml(hash, "break-all") + extLink;
 }
@@ -84,11 +83,9 @@ function show(tx) {
            method: tx.method || null,
            contractAddress: tx.contractAddress || null,
            // The network the history entry was read from. The type line and
-            // the fee are in its native currency, not the active network's,
+            // the fee are in its native currency, not the active network's:
-            // the links open its explorer, and the block, network details and
+            // a site can switch the active network before a later popup
-            // calldata are read from its Blockscout: the active network can
+            // shows this screen again.
            // change, in Settings or when the user approves a site's request,
            // before a later popup shows this screen again.
            chainId: tx.chainId,
        },
    };
@@ -98,24 +95,18 @@ function show(tx) {
 function render() {
    const tx = state.viewData.tx;
    if (!tx) return;
-    $("tx-detail-hash").innerHTML = txHashHtml(tx.hash, tx.chainId);
+    $("tx-detail-hash").innerHTML = txHashHtml(tx.hash);
    const fromTitle = addressTitle(tx.from, state.wallets);
    $("tx-detail-from").innerHTML = txAddressHtml(
        tx.from,
        tx.fromEns,
        fromTitle,
        tx.chainId,
    );
    // A contract creation has no recipient: transactions.js gives it `to: ""`.
    if (tx.to) {
        const toTitle = addressTitle(tx.to, state.wallets);
-        $("tx-detail-to").innerHTML = txAddressHtml(
+        $("tx-detail-to").innerHTML = txAddressHtml(tx.to, tx.toEns, toTitle);
            tx.to,
            tx.toEns,
            toTitle,
            tx.chainId,
        );
    } else {
        $("tx-detail-to").innerHTML = escapeHtml(CONTRACT_CREATION_TEXT);
    }
@@ -154,7 +145,7 @@ function render() {
    if (tokenContractSection && tokenContractEl) {
        if (tx.contractAddress) {
            const dot = addressDotHtml(tx.contractAddress);
-            const link = explorerUrl("token", tx.contractAddress, tx.chainId);
+            const link = explorerUrl("token", tx.contractAddress);
            // Hand-rolled rather than renderAddressHtml() because the
            // link goes to the explorer's /token/ page, not /address/.
            // Same two-row shape though: dot and link on the strip, the
@@ -191,12 +182,7 @@ function render() {
        if (el) el.classList.add("hidden");
    }
-    // Those details are Blockscout's; this line says why there are none.
+    loadFullTxDetails(tx.hash, tx.to, tx.chainId);
    $("tx-detail-blockscout-note").classList.toggle(
        "hidden",
        !!state.useBlockscout,
    );
    loadFullTxDetails(tx.hash, tx.chainId);
    const isoStr = isoDate(tx.timestamp);
    $("tx-detail-time").innerHTML =
@@ -217,11 +203,7 @@ function showDetailField(sectionId, contentId, value) {
 function populateOnChainDetails(txData, chainId) {
    // Block number
    if (txData.block_number != null) {
-        const blockLink = explorerUrl(
+        const blockLink = explorerUrl("block", String(txData.block_number));
            "block",
            String(txData.block_number),
            chainId,
        );
        const blockSection = $("tx-detail-block-section");
        const blockEl = $("tx-detail-block");
        if (blockSection && blockEl) {
@@ -308,11 +290,7 @@ function populateOnChainDetails(txData, chainId) {
    }
 }
-// The block, network details, calldata and its decoding, from Blockscout. While
+async function loadFullTxDetails(txHash, toAddress, chainId) {
 // the user has "Use Blockscout" off, Blockscout is not asked and none of them
 // is shown.
 async function loadFullTxDetails(txHash, chainId) {
    if (!state.useBlockscout) return;
    const section = $("tx-detail-calldata-section");
    const actionEl = $("tx-detail-calldata-action");
    const detailsEl = $("tx-detail-calldata-details");
@@ -322,9 +300,8 @@ async function loadFullTxDetails(txHash, chainId) {
    if (!section || !actionEl || !detailsEl) return;
    try {
        const { blockscoutUrl } = endpointsByChainId(chainId);
        const resp = await debugFetch(
-            blockscoutUrl + "/transactions/" + txHash,
+            state.blockscoutUrl + "/transactions/" + txHash,
        );
        if (!resp.ok) return;
        const txData = await resp.json();
@@ -335,17 +312,7 @@ async function loadFullTxDetails(txHash, chainId) {
        const inputData = txData.raw_input || txData.input || null;
        if (!inputData || inputData === "0x") return;
-        // Decoded against the address the transaction was sent to, as the
+        const decoded = decodeCalldata(inputData, toAddress || "");
        // explorer reports it, not the history entry's `to`: for a token
        // transfer that is the transfer's recipient, not the token contract.
        // On the network the transaction was sent on, whose Blockscout was
        // just asked, and from the sender it reports.
        const decoded = decodeCalldata(
            inputData,
            txData.to?.hash || "",
            chainId,
            txData.from?.hash || "",
        );
        if (decoded) {
            // Render decoded calldata matching approval view style
            actionEl.textContent = decoded.name;
@@ -362,9 +329,9 @@ async function loadFullTxDetails(txHash, chainId) {
                    if (tokenSymbol) {
                        detailsHtml += `<div class="font-bold">${escapeHtml(displaySymbol(tokenSymbol))}</div>`;
                    }
-                    detailsHtml += renderAddressHtml(d.address, { chainId });
+                    detailsHtml += renderAddressHtml(d.address);
                } else if (d.address) {
-                    detailsHtml += renderAddressHtml(d.address, { chainId });
+                    detailsHtml += renderAddressHtml(d.address);
                } else {
                    detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
                }
@@ -14,13 +14,10 @@ const {
    displaySymbol,
    clearViewStack,
    tokenLabel,
    reviewedNetworkProvider,
 } = require("./helpers");
 const { state } = require("../../shared/state");
-const {
+const { nativeCurrencyByChainId } = require("../../shared/networks");
-    SUPPORTED_CHAIN_IDS,
+const { getProvider } = require("../../shared/balances");
    nativeCurrencyByChainId,
 } = require("../../shared/networks");
 const { log } = require("../../shared/log");
 // Receipt poll cadence and the deadline after which the wait is reported as
@@ -64,22 +61,21 @@ function endWait() {
 }
 // A contract creation reaches these screens with `to` as "" (approval.js
-// writes `to: toAddr || ""`). The links below open the explorer of the network
+// writes `to: toAddr || ""`).
-// with `chainId`, or of the active network when none is given.
+function toAddressHtml(address) {
 function toAddressHtml(address, chainId) {
    if (!address) return escapeHtml(CONTRACT_CREATION_TEXT);
    const title = addressTitle(address, state.wallets);
-    return renderAddressHtml(address, { title, chainId });
+    return renderAddressHtml(address, { title });
 }
-function txHashHtml(hash, chainId) {
+function txHashHtml(hash) {
-    const link = explorerUrl("tx", hash, chainId);
+    const link = explorerUrl("tx", hash);
    return copyableHtml(hash, "break-all") + etherscanLinkHtml(link);
 }
-function blockNumberHtml(blockNumber, chainId) {
+function blockNumberHtml(blockNumber) {
    const num = String(blockNumber);
-    const link = explorerUrl("block", num, chainId);
+    const link = explorerUrl("block", num);
    return copyableHtml(num) + etherscanLinkHtml(link);
 }
@@ -93,23 +89,15 @@ function startWait(txInfo, txHash, broadcastTime, pollNow) {
    // A native amount, here and on the success and error screens, is in the
    // native currency of txInfo.chainId, the network the transaction was sent
-    // on, not the active network's: the active network can change, in
+    // on, not the active network's: a site can switch the active network
-    // Settings or when the user approves a site's request, while this screen
+    // while this screen is open or before a later popup resumes it.
-    // is open or before a later popup resumes it. The links on all three
+    const symbol =
-    // screens open that network's explorer, and this screen's receipt is
+        txInfo.token === "ETH"
-    // asked of that network's node, for the same reason. A null token is a
+            ? nativeCurrencyByChainId(txInfo.chainId)
-    // swap whose amount was not decoded (see showTxApproval() in
+            : displaySymbol(txInfo.tokenSymbol || "?");
-    // approval.js): the amount says so, and no symbol follows it.
+    $("wait-tx-summary").textContent = txInfo.amount + " " + symbol;
-    let symbol = "";
+    $("wait-tx-to").innerHTML = toAddressHtml(txInfo.to);
-    if (txInfo.token === "ETH") {
+    $("wait-tx-hash").innerHTML = txHashHtml(txHash);
        symbol = nativeCurrencyByChainId(txInfo.chainId);
    } else if (txInfo.token !== null) {
        symbol = displaySymbol(txInfo.tokenSymbol || "?");
    }
    $("wait-tx-summary").textContent =
        txInfo.amount + (symbol ? " " + symbol : "");
    $("wait-tx-to").innerHTML = toAddressHtml(txInfo.to, txInfo.chainId);
    $("wait-tx-hash").innerHTML = txHashHtml(txHash, txInfo.chainId);
    attachCopyHandlers("view-wait-tx");
    // Persisted so closing and reopening the popup resumes this wait
@@ -134,7 +122,7 @@ function startWait(txInfo, txHash, broadcastTime, pollNow) {
        renderElapsed();
    }, 1000);
-    const provider = reviewedNetworkProvider(txInfo);
+    const provider = getProvider(state.rpcUrl, state.networkId);
    let consecutiveFailures = 0;
    async function poll() {
@@ -144,9 +132,6 @@ function startWait(txInfo, txHash, broadcastTime, pollNow) {
        try {
            receipt = await provider.getTransactionReceipt(txHash);
        } catch (e) {
            // Cancelled by the popup closing, not failed: see pageClosed in
            // src/popup/index.js.
            if (ctx.pageClosed.aborted) return;
            // A thrown lookup means "no answer this tick", not "no
            // receipt": the RPC failed, the chain said nothing. Declaring
            // the timeout off it would report a confirmed transaction as
@@ -213,11 +198,10 @@ function showWait(txInfo, txHash) {
 // an object merely missing one of them throws a TypeError out of
 // restoreView() — which init() does not guard, skipping the rest of popup
 // init and leaving wait-tx on screen with no back control. A non-numeric
-// broadcastTime leaves an unexitable wait counting "NaNs". txInfo.chainId picks
+// broadcastTime leaves an unexitable wait counting "NaNs". txInfo.token,
-// the node the receipt is asked of and the explorer the links open, so it has
+// txInfo.tokenSymbol and txInfo.chainId are deliberately unchecked: they are
-// to name a network. txInfo.token and txInfo.tokenSymbol are deliberately
+// compared and coalesced rather than dereferenced, and tokenSymbol is null for
-// unchecked: they are compared and coalesced rather than dereferenced, and
+// ETH.
 // tokenSymbol is null for ETH.
 function restoreWait() {
    const d = state.viewData;
    if (!d || !d.pendingWait) return false;
@@ -233,7 +217,6 @@ function restoreWait() {
    // path itself created.
    if (typeof info.to !== "string") return false;
    if (typeof info.amount !== "string") return false;
    if (!SUPPORTED_CHAIN_IDS.has(info.chainId)) return false;
    if (typeof w.broadcastTime !== "number" || !isFinite(w.broadcastTime)) {
        return false;
    }
@@ -244,13 +227,10 @@ function restoreWait() {
 function showSuccess(txInfo, txHash, blockNumber) {
    endWait();
-    // As on the wait screen, a null token has no symbol.
+    const symbol =
-    let symbol = "";
+        txInfo.token === "ETH"
-    if (txInfo.token === "ETH") {
+            ? nativeCurrencyByChainId(txInfo.chainId)
-        symbol = nativeCurrencyByChainId(txInfo.chainId);
+            : displaySymbol(txInfo.tokenSymbol || "?");
    } else if (txInfo.token !== null) {
        symbol = displaySymbol(txInfo.tokenSymbol || "?");
    }
    state.viewData = {
        amount: txInfo.amount,
        symbol: symbol,
@@ -258,13 +238,12 @@ function showSuccess(txInfo, txHash, blockNumber) {
        hash: txHash,
        blockNumber: blockNumber,
        decoded: txInfo.decoded || null,
        chainId: txInfo.chainId,
    };
    renderSuccess();
    ctx.doRefreshAndRender();
 }
-function decodedDetailsHtml(decoded, chainId) {
+function decodedDetailsHtml(decoded) {
    if (!decoded || !decoded.details) return "";
    let html = `<div class="border border-border border-dashed p-2 mb-3">`;
    if (decoded.name) {
@@ -280,11 +259,11 @@ function decodedDetailsHtml(decoded, chainId) {
        html += `<div class="text-xs text-muted mb-1">${escapeHtml(d.label)}</div>`;
        if (d.address) {
            if (d.isToken) {
-                const sym = tokenLabel(d.address, chainId) || "Unknown token";
+                const sym = tokenLabel(d.address) || "Unknown token";
                html += `<div class="font-bold">${escapeHtml(sym)}</div>`;
-                html += toAddressHtml(d.address, chainId);
+                html += toAddressHtml(d.address);
            } else {
-                html += toAddressHtml(d.address, chainId);
+                html += toAddressHtml(d.address);
            }
        } else {
            html += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
@@ -311,18 +290,17 @@ function renderSuccess() {
    } else {
        summarySection.classList.remove("hidden");
        toSection.classList.remove("hidden");
-        $("success-tx-summary").textContent =
+        $("success-tx-summary").textContent = d.amount + " " + d.symbol;
-            d.amount + (d.symbol ? " " + d.symbol : "");
+        $("success-tx-to").innerHTML = toAddressHtml(d.to);
        $("success-tx-to").innerHTML = toAddressHtml(d.to, d.chainId);
    }
-    $("success-tx-block").innerHTML = blockNumberHtml(d.blockNumber, d.chainId);
+    $("success-tx-block").innerHTML = blockNumberHtml(d.blockNumber);
-    $("success-tx-hash").innerHTML = txHashHtml(d.hash, d.chainId);
+    $("success-tx-hash").innerHTML = txHashHtml(d.hash);
    // Show decoded calldata details if present
    const decodedEl = $("success-tx-decoded");
    if (decodedEl && hasDecoded) {
-        decodedEl.innerHTML = decodedDetailsHtml(d.decoded, d.chainId);
+        decodedEl.innerHTML = decodedDetailsHtml(d.decoded);
        decodedEl.classList.remove("hidden");
    } else if (decodedEl) {
        decodedEl.classList.add("hidden");
@@ -335,20 +313,16 @@ function renderSuccess() {
 function showError(txInfo, txHash, message) {
    endWait();
-    // As on the wait screen, a null token has no symbol.
+    const symbol =
-    let symbol = "";
+        txInfo.token === "ETH"
-    if (txInfo.token === "ETH") {
+            ? nativeCurrencyByChainId(txInfo.chainId)
-        symbol = nativeCurrencyByChainId(txInfo.chainId);
+            : displaySymbol(txInfo.tokenSymbol || "?");
    } else if (txInfo.token !== null) {
        symbol = displaySymbol(txInfo.tokenSymbol || "?");
    }
    state.viewData = {
        amount: txInfo.amount,
        symbol: symbol,
        to: txInfo.to,
        hash: txHash || null,
        message: message,
        chainId: txInfo.chainId,
    };
    renderError();
 }
@@ -356,13 +330,12 @@ function showError(txInfo, txHash, message) {
 function renderError() {
    const d = state.viewData;
    if (!d || !d.message) return;
-    $("error-tx-summary").textContent =
+    $("error-tx-summary").textContent = d.amount + " " + d.symbol;
-        d.amount + (d.symbol ? " " + d.symbol : "");
+    $("error-tx-to").innerHTML = toAddressHtml(d.to);
    $("error-tx-to").innerHTML = toAddressHtml(d.to, d.chainId);
    $("error-tx-message").textContent = d.message;
    if (d.hash) {
-        $("error-tx-hash").innerHTML = txHashHtml(d.hash, d.chainId);
+        $("error-tx-hash").innerHTML = txHashHtml(d.hash);
        $("error-tx-hash-section").classList.remove("hidden");
        attachCopyHandlers("view-error-tx");
    } else {
@@ -1,34 +1,7 @@
-// The first screen, shown while there is no wallet. It offers the two lookups
+const { $ } = require("./helpers");
 // at services other than the RPC endpoint, both off until the user ticks them,
 // which Settings offers as well.
 const { $, showView } = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 function show() {
    $("welcome-use-blockscout").checked = state.useBlockscout;
    $("welcome-check-recipients-on-etherscan").checked =
        state.checkRecipientsOnEtherscan;
    showView("welcome");
 }
 function init(ctx) {
    $("btn-welcome-add").addEventListener("click", ctx.showAddWalletView);
    $("welcome-use-blockscout").addEventListener("change", async () => {
        state.useBlockscout = $("welcome-use-blockscout").checked;
        await saveState();
    });
    $("welcome-check-recipients-on-etherscan").addEventListener(
        "change",
        async () => {
            state.checkRecipientsOnEtherscan = $(
                "welcome-check-recipients-on-etherscan",
            ).checked;
            await saveState();
        },
    );
 }
-module.exports = { init, show };
+module.exports = { init };
@@ -51,17 +51,12 @@ function getLocalWarnings(address, options = {}) {
 /**
 * Check an address against local lists AND via RPC queries.
- * Async — performs network calls to check contract status, tx count and
+ * Async — performs network calls to check contract status and tx history.
 * balance.
 *
 * @param {string} address - The target address to check.
 * @param {object} provider - An ethers.js provider instance.
 * @param {object} [options] - Optional context.
 * @param {string} [options.fromAddress] - Sender address (for self-send check).
 * @param {string} [options.chainId] - Chain id of the network whose explorer
 *   the Etherscan label check asks; the active network's when omitted.
 * @param {boolean} [options.checkRecipientsOnEtherscan] - The user's setting
 *   of that name. The Etherscan label check is made only while it is on.
 * @returns {Promise<Array<{type: string, message: string, severity: string}>>}
 */
 async function getFullWarnings(address, provider, options = {}) {
@@ -83,30 +78,21 @@ async function getFullWarnings(address, provider, options = {}) {
        log.errorf("contract check failed:", e.shortMessage || e.message);
    }
-    // The transaction count is the number of transactions the address has
+    // Skip tx count check for contracts — they may legitimately have
-    // sent, so an address that has only ever received has a count of zero.
+    // zero inbound EOA transactions.
    // Native token it received stays in its balance until it sends a
    // transaction, so the warning also needs a zero balance. A contract is
    // skipped: it has its own warning above.
    if (!isContract) {
        try {
            const txCount = await provider.getTransactionCount(address);
            if (txCount === 0) {
-                const balance = await provider.getBalance(address);
+                warnings.push({
-                if (balance === 0n) {
+                    type: "new-address",
-                    warnings.push({
+                    message:
-                        type: "new-address",
+                        "This address has never sent a transaction. Double-check it is correct.",
-                        message:
+                    severity: "info",
-                            "This address has never sent a transaction and holds none of the network's native token. Double-check it is correct.",
+                });
                        severity: "info",
                    });
                }
            }
        } catch (e) {
-            log.errorf(
+            log.errorf("tx count check failed:", e.shortMessage || e.message);
                "tx count or balance check failed:",
                e.shortMessage || e.message,
            );
        }
    }
@@ -114,11 +100,7 @@ async function getFullWarnings(address, provider, options = {}) {
    // Runs for ALL addresses including contracts, since many dangerous
    // flagged addresses on Etherscan (drainers, phishing contracts) are contracts.
    try {
-        const etherscanWarning = await checkEtherscanLabel(
+        const etherscanWarning = await checkEtherscanLabel(address);
            address,
            options.checkRecipientsOnEtherscan,
            options.chainId,
        );
        if (etherscanWarning) {
            warnings.push(etherscanWarning);
        }
@@ -1,14 +1,13 @@
 // Preparation of the transaction an approval screen displays.
 //
-// A dApp's eth_sendTransaction normally fixes `to`, `value` and `data`, and
+// A dApp's eth_sendTransaction normally fixes only `to`, `value` and `data`.
-// sometimes the gas limit. The nonce, the fees, and the gas limit when the
+// The nonce, the gas limit and the fees have to be filled in from the network
-// site gives none have to be filled in from the network before anything can
+// before anything can be signed, and whoever fills them in decides what the
-// be signed, and whoever fills them in decides what the user is shown. That
+// user is shown. That work used to happen in the popup, after the user had
-// work used to happen in the popup, after the user had already approved: the
+// already approved: the numbers on the approval screen came from the popup and
-// numbers on the approval screen came from the popup and were compared against
+// were compared against nothing, so a compromised popup could display one fee
-// nothing, so a compromised popup could display one fee and sign another, and
+// and sign another, and the ceilings in approvalVerify.js were all that stood
-// the ceilings in approvalVerify.js were all that stood between the user and a
+// between the user and a fee that hands the validator the balance.
 // fee that hands the validator the balance.
 //
 // So it happens here instead, in the background, before the approval window is
 // opened. The background populates the transaction, shows that object, and
@@ -32,7 +31,6 @@ const {
    VoidSigner,
    accessListify,
    getAddress,
    getBigInt,
    getBytes,
    hexlify,
    toQuantity,
@@ -41,7 +39,6 @@ const {
    ALLOWED_TX_TYPES,
    SERIALIZED_FIELDS,
    assertWithinCeilings,
    nodeError,
 } = require("./approvalVerify");
 // How long the population may take before the request is failed back to the
@@ -50,11 +47,10 @@ const {
 // minutes long, which is not a wait anyone will sit through.
 const POPULATE_TIMEOUT_MS = 20000;
-// The request fields taken from the page, plus `gas`, which requestFrom()
+// The request fields taken from the page. Anything else is dropped rather than
-// takes as the gas limit. Anything else is dropped rather than passed to
+// passed to ethers: the object is page-controlled, and a future ethers that
-// ethers: the object is page-controlled, and a future ethers that learns to
+// learns to carry a new transaction field must not start picking one up out of
-// carry a new transaction field must not start picking one up out of it
+// it without this module knowing.
 // without this module knowing.
 //
 // The nonce is not taken from the page; it is always the account's next nonce
 // from the network. A page that chose it could replace one of the user's
@@ -73,43 +69,21 @@ const REQUEST_FIELDS = [
    "type",
 ];
 // EIP-1474's code for invalid parameters: what the page is given when the
 // site asked for a transaction this wallet refuses as it was asked for.
 const INVALID_PARAMS_CODE = -32602;
 // Why no approval can be raised. The message is the sentence the page is
 // shown. `code` and `data` are the JSON-RPC ones it is given with it: the
 // node's own, unchanged, when the node refused the transaction, so a site can
 // decode a revert; INVALID_PARAMS_CODE when the site's request is refused;
 // none when the failure is the wallet's own, which the background answers as
 // an internal error.
 class ApprovalPrepareError extends Error {
-    constructor(message, code, data) {
+    constructor(message) {
        super(message);
        this.name = "ApprovalPrepareError";
        if (code !== undefined) this.code = code;
        if (data !== undefined) this.data = data;
    }
 }
-function fail(message, code, data) {
+function fail(message) {
-    return new ApprovalPrepareError(message, code, data);
+    return new ApprovalPrepareError(message);
 }
 function present(v) {
    return v !== null && v !== undefined && v !== "";
 }
 // Whether two quantities from the page are the same number. One that is not a
 // number matches nothing.
 function sameQuantity(a, b) {
    try {
        return getBigInt(a) === getBigInt(b);
    } catch {
        return false;
    }
 }
 // These strings reach the user through the requesting page, so they are full
 // sentences even when the tail of one came from ethers or from the node.
 function sentence(text) {
@@ -137,28 +111,12 @@ function requestFrom(txParams, from) {
    for (const key of REQUEST_FIELDS) {
        if (present(txParams[key])) request[key] = txParams[key];
    }
    // JSON-RPC calls the gas limit `gas`, and that is the name sites send.
    // ethers only reads `gasLimit`: left as `gas` it would be dropped and an
    // estimate signed in its place.
    if (present(txParams.gas)) {
        if (
            present(request.gasLimit) &&
            !sameQuantity(request.gasLimit, txParams.gas)
        ) {
            throw fail(
                "The site asked for two different gas limits for this transaction.",
                INVALID_PARAMS_CODE,
            );
        }
        request.gasLimit = txParams.gas;
    }
    if (
        present(request.type) &&
        !ALLOWED_TX_TYPES.includes(Number(request.type))
    ) {
        throw fail(
            "The site asked for a transaction of a type this wallet does not sign.",
            INVALID_PARAMS_CODE,
        );
    }
    return request;
@@ -216,7 +174,6 @@ async function prepareApprovalTx(provider, from, txParams) {
        throw fail("There is no active address to send this transaction from.");
    }
    const request = requestFrom(txParams || {}, from);
    const signer = new VoidSigner(getAddress(from), provider);
    let populated;
    try {
@@ -224,28 +181,15 @@ async function prepareApprovalTx(provider, from, txParams) {
        // nonce, gas, fee and chain id are populated exactly as they were when
        // the popup did this. VoidSigner cannot sign, which is the point: the
        // background prepares, the popup signs.
        //
        // ethers asks the node for a gas estimate only when the request has
        // no gas limit, and that estimate is the only check that the
        // transaction does not revert. So a request carrying the site's gas
        // limit is estimated first, with that limit: one that reverts, or
        // needs more gas than the site gave it, fails here as well. The
        // site's gas limit is still the one populated.
        populated = await withTimeout(
-            (async () => {
+            new VoidSigner(getAddress(from), provider).populateTransaction(
-                if (present(request.gasLimit)) {
+                request,
-                    await signer.estimateGas(request);
+            ),
                }
                return signer.populateTransaction(request);
            })(),
            POPULATE_TIMEOUT_MS,
            "The transaction could not be prepared: the network did not answer in time.",
        );
    } catch (e) {
        if (e instanceof ApprovalPrepareError) throw e;
        // A refusal from the node, such as a reverting gas estimate, keeps
        // the node's code and revert data.
        const fromNode = nodeError(e);
        throw fail(
            sentence(
                "The transaction could not be prepared: " +
@@ -253,8 +197,6 @@ async function prepareApprovalTx(provider, from, txParams) {
                        e.message ||
                        "the network did not answer"),
            ),
            fromNode?.code,
            fromNode?.data,
        );
    }
@@ -53,10 +53,8 @@ const {
    accessListify,
    formatEther,
    getAddress,
    getBigInt,
    getBytes,
    toQuantity,
    TypedDataEncoder,
    verifyMessage,
    verifyTypedData,
 } = require("ethers");
@@ -637,90 +635,6 @@ function verifySignature(signParams, signature, expectedFrom) {
    return recovered;
 }
 // The type ethers will sign typed data as. ethers does not read the page's
 // `primaryType`: it takes the one struct in `types` that no other struct
 // refers to. Throws when the types name no such single struct, which ethers
 // would refuse to sign as well.
 function signedPrimaryType(types) {
    const structs = { ...types };
    // ethers derives EIP712Domain itself and rejects it as an input.
    delete structs.EIP712Domain;
    return TypedDataEncoder.getPrimaryType(structs);
 }
 // Why a typed data message cannot be signed as the screen shows it, as a
 // sentence, or null when it can. ethers signs a `bool` field by whether its
 // value is truthy, so the string "false" is signed as true and a field left
 // out as false. Each field that `type` declares, at every level of nesting,
 // must be one of the value's own keys, and each `bool` must be true or false.
 // Called with the type ethers signs, the message, and a `path` of "".
 function typedDataMessageRefusal(types, type, value, path) {
    const itemType = type.replace(/\[\d*\]$/, "");
    if (itemType !== type) {
        // ethers refuses to sign a list field that is not a list.
        if (!Array.isArray(value)) return null;
        for (let i = 0; i < value.length; i++) {
            const refusal = typedDataMessageRefusal(
                types,
                itemType,
                value[i],
                `${path}[${i}]`,
            );
            if (refusal) return refusal;
        }
        return null;
    }
    if (type === "bool" && value !== true && value !== false) {
        return `The field "${path}" is not true or false, so this typed data cannot be signed.`;
    }
    for (const field of types[type] || []) {
        const at = path ? `${path}.${field.name}` : field.name;
        // An own key only: a plain lookup of `constructor` finds a function.
        const present =
            value !== null &&
            typeof value === "object" &&
            Object.prototype.hasOwnProperty.call(value, field.name);
        if (!present) {
            return `The field "${at}" is missing from the message, so this typed data cannot be signed.`;
        }
        const refusal = typedDataMessageRefusal(
            types,
            field.type,
            value[field.name],
            at,
        );
        if (refusal) return refusal;
    }
    return null;
 }
 // Why typed data cannot be signed while `network` is the active network, as a
 // sentence, or null when it can. EIP-712 has a wallet refuse typed data whose
 // domain names another chain, because the signature is valid on that chain.
 // ethers signs no chain id when the domain's is null or absent, and reads any
 // other with getBigInt(), so 1, "1" and "0x1" are the same chain here too.
 function typedDataChainRefusal(domain, network) {
    const chainId = domain?.chainId;
    if (chainId === undefined || chainId === null) return null;
    let named;
    try {
        named = getBigInt(chainId);
    } catch {
        return "This typed data cannot be read, so it cannot be signed.";
    }
    const active = getBigInt(network.chainId);
    if (named === active) return null;
    return (
        "This typed data is for chain id " +
        named +
        ", but the active network is " +
        network.name +
        " (chain id " +
        active +
        "), so it cannot be signed."
    );
 }
 // The stage a transaction approval failed at. Which stage it is decides
 // whether the approval survives the failure.
 const TX_STAGE_SIGN = "sign";
@@ -746,15 +660,6 @@ function errorText(err) {
    return "The transaction could not be sent.";
 }
 // The JSON-RPC error object the node answered with, `{ code, message, data }`,
 // out of the error ethers threw for that answer. ethers keeps it under
 // `info.error`, or under `error` when it could not classify it. Null when
 // there is none, as for a node that could not be reached.
 function nodeError(err) {
    if (!err || typeof err !== "object") return null;
    return err.error || (err.info && err.info.error) || null;
 }
 // Every string a failure might carry its reason in. ethers reports the node's
 // own words in `shortMessage`, but a JSON-RPC error it could not classify is
 // nested under `error` or `info.error` with the node's message intact, and the
@@ -766,7 +671,7 @@ function failureTexts(err) {
    for (const text of [err.shortMessage, err.message, err.reason]) {
        if (text) texts.push(String(text));
    }
-    const nested = nodeError(err);
+    const nested = err.error || (err.info && err.info.error);
    if (nested && nested.message) texts.push(String(nested.message));
    return texts;
 }
@@ -891,16 +796,12 @@ function describeSigningFailure(response, fallbackMessage) {
 module.exports = {
    verifySignedTx,
    verifySignature,
    signedPrimaryType,
    typedDataMessageRefusal,
    typedDataChainRefusal,
    assertNoForbiddenFields,
    assertNothingUnchecked,
    assertCanonicalBytes,
    assertWithinCeilings,
    sameAddress,
    failureIsRetryable,
    nodeError,
    isNonceCollision,
    describeTxFailure,
    describeSigningFailure,
@@ -1,7 +1,5 @@
-// Balance fetching: ETH balances and the balances of the tokens the user
+// Balance fetching: ETH balances via RPC, ERC-20 token balances via
-// tracks via RPC, the other ERC-20 token balances and the holder counts via
+// Blockscout, ENS reverse lookup via RPC.
 // Blockscout while the user has "Use Blockscout" on, ENS reverse lookup via
 // RPC.
 const {
    JsonRpcProvider,
@@ -38,18 +36,9 @@ const { resolveTokenDecimals } = require("./approvalAmount");
 // ethers knows chains this wallet does not, so an id that is not one of ours
 // is a caller bug and must not resolve to a working provider for some other
 // chain.
 //
 // `disableCcipRead` keeps every ENS lookup on the RPC endpoint. Left on, as
 // ethers has it, a resolver that says a name is resolved off-chain makes ethers
 // fetch the web address the resolver gives, straight from the browser, with the
 // name being looked up; for the reverse lookup of the user's addresses that is
 // the user's own name (https://git.eeqj.de/sneak/AutistMask/issues/668). Such a
 // name does not resolve.
 function getProvider(rpcUrl, networkId) {
    const net = Network.from(requireNetworkId(networkId).id);
-    const provider = new JsonRpcProvider(rpcUrl, net, { staticNetwork: net });
+    return new JsonRpcProvider(rpcUrl, net, { staticNetwork: net });
    provider.disableCcipRead = true;
    return provider;
 }
 function requireNetworkId(networkId) {
@@ -91,31 +80,14 @@ function rawUnits(value) {
 // Fetch token balances for a single address from Blockscout.
 // Returns [{ address, name, symbol, decimals, balance, holders }].
 //
 // `useBlockscout` is the user's "Use Blockscout" setting. While it is off,
 // Blockscout is not asked and the answer is an empty list: no token the user
 // has not tracked is listed.
 //
 // Filters out spam: only shows tokens that are in the known token list,
-// explicitly tracked by the user, or have >= 1000 holders. A tracked token's
+// explicitly tracked by the user, or have >= 1000 holders.
 // balance is read through the RPC endpoint instead, and its row here gives that
 // entry its holder count and `decimals` (fetchTrackedTokenBalances()).
 //
 // `decimals` and `balance` are each null when the answer is unknown, the same
 // way `holders` already is. Absence is never filled in here: this is the
 // upstream of every screen that displays a token amount, so a value invented
 // at this point is indistinguishable from a real one everywhere below it.
-//
+async function fetchTokenBalances(address, blockscoutUrl, trackedTokens) {
 // `signal`, passed by the popup, is aborted when the popup closes; a request
 // that fails after that was cancelled by the closing and is not logged.
 async function fetchTokenBalances(
    address,
    blockscoutUrl,
    useBlockscout,
    trackedTokens,
    signal,
 ) {
    if (!useBlockscout) return [];
    try {
        const resp = await debugFetch(
            blockscoutUrl + "/addresses/" + address + "/token-balances",
@@ -218,116 +190,21 @@ async function fetchTokenBalances(
        }
        return balances;
    } catch (e) {
-        if (!signal?.aborted) {
+        log.errorf("fetchTokenBalances failed:", e.message);
            log.errorf("fetchTokenBalances failed:", e.message);
        }
        return null;
    }
 }
 // The entries at `address` of the tokens the user tracks, shaped as
 // fetchTokenBalances() returns them, for the tokens the address holds.
 //
 // The balance is read with balanceOf through the RPC endpoint. The name and
 // symbol are the tracked token's. `decimals` and `holders` are those of
 // Blockscout's entry for the token in `explorerRequest`, this refresh's
 // fetchTokenBalances() for the address; while Blockscout fails they are kept
 // from the token's entry in `previous`, the address's entries before this
 // refresh. The balance is stated at the scale the screens read the token at
 // (resolveTokenDecimals()): the bundled list's, then the one the tracked token
 // records, then Blockscout's, as in fetchTokenBalances().
 //
 // A token whose balanceOf fails keeps its entry in `previous`, as a failed ETH
 // balance keeps its figure, or takes Blockscout's entry from this refresh when
 // it has none. The failure is logged. A balance of zero gets no entry, as a
 // zero Blockscout reports gets none: the balance lists take a tracked token's
 // zero from the tracked list. A token whose symbol the spoof rule refuses gets
 // no entry either, as in fetchTokenBalances().
 //
 // `signal` is as for fetchTokenBalances().
 async function fetchTrackedTokenBalances(
    provider,
    address,
    trackedTokens,
    previous,
    explorerRequest,
    signal,
 ) {
    const listed = trackedTokens.filter(
        (token) => !isSpoofedSymbol(token.symbol, token.address),
    );
    // Each token's balanceOf answer, or null where it failed.
    const balances = await Promise.all(
        listed.map(async (token) => {
            try {
                const contract = new Contract(
                    token.address,
                    ERC20_ABI,
                    provider,
                );
                return await contract.balanceOf(address);
            } catch (e) {
                if (!signal?.aborted) {
                    log.errorf(
                        "token balance failed",
                        address,
                        token.address,
                        e.shortMessage || e.message,
                    );
                }
                return null;
            }
        }),
    );
    const explorerRows = await explorerRequest;
    const reported = explorerRows ?? previous;
    const rows = [];
    listed.forEach((token, i) => {
        const lower = token.address.toLowerCase();
        const entryIn = (list) =>
            list.find((row) => String(row.address).toLowerCase() === lower);
        const raw = balances[i];
        if (raw === null) {
            const kept = entryIn(previous) || entryIn(explorerRows || []);
            if (kept) rows.push(kept);
            return;
        }
        if (raw === 0n) return;
        const entry = entryIn(reported);
        const decimals = entry ? entry.decimals : null;
        const known = resolveTokenDecimals(lower, { trackedTokens });
        const scale = known !== null ? known : decimals;
        rows.push({
            address: token.address,
            name: token.name || "",
            symbol: token.symbol || "???",
            decimals: decimals,
            // null when nothing knows the scale: a holding whose amount
            // cannot be stated, never a zero.
            balance: scale === null ? null : formatTokenBalance(raw, scale),
            holders: entry ? entry.holders : null,
        });
    });
    return rows;
 }
 // Fetch ETH balances, ENS names, and ERC-20 token balances for all addresses.
 // `trackedTokens` are the tokens tracked on the active network.
 // `useBlockscout` and `signal` are as for fetchTokenBalances().
 async function refreshBalances(
    wallets,
    rpcUrl,
    blockscoutUrl,
    useBlockscout,
    trackedTokens,
    networkId,
    signal,
 ) {
    log.debugf("refreshBalances start, rpc:", urlOrigin(rpcUrl));
    const provider = getProvider(rpcUrl, networkId);
    const tracked = trackedTokens || [];
    const trackedSet = new Set(tracked.map((t) => t.address.toLowerCase()));
    const updates = [];
    for (const wallet of wallets) {
@@ -343,7 +220,6 @@ async function refreshBalances(
                        log.debugf("ETH balance", addr.address, addr.balance);
                    })
                    .catch((e) => {
                        if (signal?.aborted) return;
                        log.errorf(
                            "ETH balance failed",
                            addr.address,
@@ -367,7 +243,6 @@ async function refreshBalances(
                        );
                    })
                    .catch((e) => {
                        if (signal?.aborted) return;
                        log.errorf(
                            "ENS reverse failed",
                            addr.address,
@@ -377,44 +252,22 @@ async function refreshBalances(
                    }),
            );
-            // ERC-20 token balances: the tracked tokens' through the RPC
+            // ERC-20 token balances via Blockscout
            // endpoint, and from Blockscout the tokens the user has not
            // tracked. When Blockscout fails, the untracked rows from before
            // this refresh stay; while "Use Blockscout" is off there are none.
            // The Blockscout request is started first and handed to
            // fetchTrackedTokenBalances() too, which waits for it after
            // sending its balanceOf reads, so the two run side by side.
            const previous = addr.tokenBalances || [];
            const explorerRequest = fetchTokenBalances(
                addr.address,
                blockscoutUrl,
                useBlockscout,
                tracked,
                signal,
            );
            updates.push(
-                Promise.all([
+                fetchTokenBalances(
-                    fetchTrackedTokenBalances(
+                    addr.address,
-                        provider,
+                    blockscoutUrl,
-                        addr.address,
+                    trackedTokens,
-                        tracked,
+                ).then((balances) => {
-                        previous,
+                    if (balances !== null) {
-                        explorerRequest,
+                        addr.tokenBalances = balances;
-                        signal,
+                        log.debugf(
-                    ),
+                            "Token balances",
-                    explorerRequest,
+                            addr.address,
-                ]).then(([trackedRows, explorerRows]) => {
+                            balances.length,
-                    const untrackedRows = (explorerRows ?? previous).filter(
+                            "tokens",
-                        (row) =>
+                        );
-                            !trackedSet.has(String(row.address).toLowerCase()),
+                    }
                    );
                    addr.tokenBalances = trackedRows.concat(untrackedRows);
                    log.debugf(
                        "Token balances",
                        addr.address,
                        addr.tokenBalances.length,
                        "tokens",
                    );
                }),
            );
        }
@@ -426,8 +279,7 @@ async function refreshBalances(
 // Look up token metadata from its contract.
 // Calls symbol() and decimals() to verify it implements ERC-20.
-// `signal` is as for fetchTokenBalances().
+async function lookupTokenInfo(contractAddress, rpcUrl, networkId) {
 async function lookupTokenInfo(contractAddress, rpcUrl, networkId, signal) {
    log.debugf("lookupTokenInfo", contractAddress, "rpc:", urlOrigin(rpcUrl));
    const provider = getProvider(rpcUrl, networkId);
    const contract = new Contract(contractAddress, ERC20_ABI, provider);
@@ -437,9 +289,7 @@ async function lookupTokenInfo(contractAddress, rpcUrl, networkId, signal) {
        symbol = await contract.symbol();
        log.debugf("symbol() =", symbol);
    } catch (e) {
-        if (!signal?.aborted) {
+        log.errorf("symbol() failed:", e.shortMessage || e.message);
            log.errorf("symbol() failed:", e.shortMessage || e.message);
        }
        throw new Error("Not a valid ERC-20 token (symbol() failed).");
    }
@@ -447,9 +297,7 @@ async function lookupTokenInfo(contractAddress, rpcUrl, networkId, signal) {
        decimals = await contract.decimals();
        log.debugf("decimals() =", decimals);
    } catch (e) {
-        if (!signal?.aborted) {
+        log.errorf("decimals() failed:", e.shortMessage || e.message);
            log.errorf("decimals() failed:", e.shortMessage || e.message);
        }
        throw new Error("Not a valid ERC-20 token (decimals() failed).");
    }
@@ -457,21 +305,16 @@ async function lookupTokenInfo(contractAddress, rpcUrl, networkId, signal) {
        name = await contract.name();
        log.debugf("name() =", name);
    } catch (e) {
-        if (!signal?.aborted) {
+        log.warnf(
-            log.warnf(
+            "name() failed, using symbol as name:",
-                "name() failed, using symbol as name:",
+            e.shortMessage || e.message,
-                e.shortMessage || e.message,
+        );
            );
        }
        name = symbol;
    }
-    // Truncate to prevent storage of excessively long values from RPC.
+    // Truncate to prevent storage of excessively long values from RPC
-    // Counted in code points, as displaySymbol() counts them, so the cut never
+    name = String(name).slice(0, 64);
-    // falls between the two halves of an emoji and stores a half that renders
+    symbol = String(symbol).slice(0, 12);
    // as U+FFFD.
    name = Array.from(String(name)).slice(0, 64).join("");
    symbol = Array.from(String(symbol)).slice(0, 12).join("");
    log.infof("Token resolved:", symbol, "decimals", Number(decimals));
    return { name, symbol, decimals: Number(decimals) };
@@ -481,8 +324,7 @@ async function lookupTokenInfo(contractAddress, rpcUrl, networkId, signal) {
 // Checks gapLimit addresses in parallel per batch.  Stops when an entire
 // batch has no used addresses (i.e. gapLimit consecutive empty addresses).
 // Returns { addresses: [{ address, index }], nextIndex }.
-// `signal` is as for fetchTokenBalances().
+async function scanForAddresses(xpub, rpcUrl, networkId, gapLimit = 5) {
 async function scanForAddresses(xpub, rpcUrl, networkId, signal, gapLimit = 5) {
    log.debugf("scanForAddresses start, gapLimit:", gapLimit);
    const provider = getProvider(rpcUrl, networkId);
    const used = [];
@@ -505,13 +347,11 @@ async function scanForAddresses(xpub, rpcUrl, networkId, signal, gapLimit = 5) {
                    ]);
                    return { addr, index, isUsed: balance > 0n || txCount > 0 };
                } catch (e) {
-                    if (!signal?.aborted) {
+                    log.errorf(
-                        log.errorf(
+                        "scanForAddresses check failed",
-                            "scanForAddresses check failed",
+                        addr,
-                            addr,
+                        e.shortMessage || e.message,
-                            e.shortMessage || e.message,
+                    );
                        );
                    }
                    return { addr, index, isUsed: false };
                }
            }),
@@ -31,11 +31,6 @@
 // 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 module also holds withLock(), a wrapper around the browser's
 // `navigator.locks`, which is in neither namespace. It sits beside
 // storageGet() and storageSet() because every write of the stored record
 // takes it.
 // The extension API namespace, preferring `browser.*` where it exists.
 //
@@ -150,14 +145,6 @@ function sendMessage(message) {
    return invoke(runtimeApi(), "sendMessage", message);
 }
 /**
 * @returns {Promise<Object>} the operating system and processor the browser
 *     runs on.
 */
 function getPlatformInfo() {
    return invoke(runtimeApi(), "getPlatformInfo");
 }
 /**
 * Send a message nobody is expected to answer, and swallow the fact that
 * nobody did.
@@ -179,9 +166,9 @@ function notify(message) {
 // default: resolving {} would make an existing wallet read back as no wallet,
 // and resolving a no-op write would discard the user's state with nothing
 // logged. A caller that wants to degrade takes storageLocal() directly.
-function storageUnavailable(area, method) {
+function storageUnavailable(method) {
    return Promise.reject(
-        new Error("extension storage." + area + " is not available: " + method),
+        new Error("extension storage.local is not available: " + method),
    );
 }
@@ -192,7 +179,7 @@ function storageUnavailable(area, method) {
 */
 function storageGet(keys) {
    const storage = storageLocal();
-    if (!storage) return storageUnavailable("local", "get");
+    if (!storage) return storageUnavailable("get");
    return Promise.resolve(storage.get(keys));
 }
@@ -203,7 +190,7 @@ function storageGet(keys) {
 */
 function storageSet(items) {
    const storage = storageLocal();
-    if (!storage) return storageUnavailable("local", "set");
+    if (!storage) return storageUnavailable("set");
    return Promise.resolve(storage.set(items));
 }
@@ -220,95 +207,7 @@ function storageSet(items) {
 */
 function storageRemove(keys) {
    const storage = storageLocal();
-    if (!storage) return storageUnavailable("local", "remove");
+    if (!storage) return storageUnavailable("remove");
    return Promise.resolve(storage.remove(keys));
 }
 /**
 * Call `listener` after every write to `storage.local`, whether this page,
 * another page or the background made it, with what the write changed, as the
 * browser reports it: `{ [key]: { oldValue, newValue } }`.
 *
 * @param {function(Object): void} listener
 */
 function onStorageChanged(listener) {
    namespaceMember("storage").onChanged.addListener((changes, areaName) => {
        if (areaName === "local") listener(changes);
    });
 }
 /**
 * Run `fn` while holding the browser's lock called `name`
 * (`navigator.locks`), and settle as `fn` settles. Every page of the extension
 * and its background share these locks, except a page in a Firefox private
 * window (README, "Stored state and its version"), so while one of them holds
 * `name` another asking for it waits, in the order they asked. The lock is let
 * go when `fn` settles, whether it resolved or rejected.
 *
 * Every write of the stored record holds the lock named after its key,
 * "autistmask", from its read to its write: saveState() in
 * src/shared/state.js, updateState() in src/background/state.js, and the
 * reset in src/popup/views/stateRecovery.js.
 *
 * @param {string} name
 * @param {function(): Promise<*>} fn
 * @returns {Promise<*>} what `fn` resolved with.
 * @throws rejects, without running `fn`, where `navigator.locks` is absent.
 */
 function withLock(name, fn) {
    if (typeof navigator === "undefined" || !navigator.locks) {
        return Promise.reject(
            new Error("navigator.locks is not available in this context"),
        );
    }
    return navigator.locks.request(name, () => fn());
 }
 // `storage.session`, the browser's session storage: what is kept there lasts
 // until the browser closes. It survives the background worker being stopped
 // and started again, which module-level variables do not (README, Background
 // scheduling). The background keeps the connections allowed without
 // "Remember" there; see src/background/index.js. Firefox has it from version
 // 115, the minimum manifest/firefox.json declares.
 //
 // The three below reject where it is absent, as the three above do where
 // `storage.local` is: a write that silently did nothing would tell a site it
 // is connected and then refuse its next request.
 function storageSession() {
    const storage = namespaceMember("storage");
    return (storage && storage.session) || null;
 }
 /**
 * @param {string|string[]|null} keys null for every item.
 * @returns {Promise<Object>} the stored items.
 * @throws rejects where `storage.session` is absent.
 */
 function sessionStorageGet(keys) {
    const storage = storageSession();
    if (!storage) return storageUnavailable("session", "get");
    return Promise.resolve(storage.get(keys));
 }
 /**
 * @param {Object} items
 * @returns {Promise<void>}
 * @throws rejects where `storage.session` is absent.
 */
 function sessionStorageSet(items) {
    const storage = storageSession();
    if (!storage) return storageUnavailable("session", "set");
    return Promise.resolve(storage.set(items));
 }
 /**
 * @param {string|string[]} keys
 * @returns {Promise<void>}
 * @throws rejects where `storage.session` is absent.
 */
 function sessionStorageRemove(keys) {
    const storage = storageSession();
    if (!storage) return storageUnavailable("session", "remove");
    return Promise.resolve(storage.remove(keys));
 }
@@ -336,22 +235,6 @@ function tabsSendMessage(tabId, message) {
    return invoke(tabsApi(), "sendMessage", tabId, message);
 }
 /**
 * @returns {Promise<Object|undefined>} the tab the calling page is in, or
 *     undefined for a page not in a tab, such as the toolbar popup.
 */
 function tabsGetCurrent() {
    return invoke(tabsApi(), "getCurrent");
 }
 /**
 * @param {number} tabId
 * @returns {Promise<number>} that tab's zoom: 1.5 at 150%.
 */
 function tabsGetZoom(tabId) {
    return invoke(tabsApi(), "getZoom", tabId);
 }
 /**
 * @param {Object} createData
 * @returns {Promise<Object>} the created window.
@@ -367,22 +250,6 @@ function windowsGetLastFocused() {
    return invoke(windowsApi(), "getLastFocused");
 }
 /**
 * @returns {Promise<Object>} the window the calling page is in.
 */
 function windowsGetCurrent() {
    return invoke(windowsApi(), "getCurrent");
 }
 /**
 * @param {number} windowId
 * @param {Object} updateInfo
 * @returns {Promise<Object>} the updated window.
 */
 function windowsUpdate(windowId, updateInfo) {
    return invoke(windowsApi(), "update", windowId, updateInfo);
 }
 /**
 * @param {number} windowId
 * @returns {Promise<void>}
@@ -395,29 +262,19 @@ module.exports = {
    actionApi,
    alarmsApi,
    extensionApi,
    getPlatformInfo,
    hasBrowserNamespace,
    notify,
    onStorageChanged,
    runtimeApi,
    sendMessage,
    sessionStorageGet,
    sessionStorageRemove,
    sessionStorageSet,
    storageGet,
    storageLocal,
    storageRemove,
    storageSet,
    tabsApi,
    tabsGetCurrent,
    tabsGetZoom,
    tabsQuery,
    tabsSendMessage,
    windowsApi,
    windowsCreate,
    windowsGetCurrent,
    windowsGetLastFocused,
    windowsRemove,
    windowsUpdate,
    withLock,
 };
@@ -1,18 +1,8 @@
-// The popup's network switch.
+// Consolidated chain-switch handler for the popup.
 //
-// A network switch reaches the popup's `state` in one of two ways:
+// Every state change required when the active network changes is
-//
+// performed here so that callers (settings UI, future chain additions) all go
-// - onChainSwitch() below makes the switch the user picks in Settings, with
+// through a single code path.
 //   applyChainSwitchFields() (chainSwitchFields.js).
 // - followNetworkSwitch() in src/popup/index.js takes a switch the background
 //   or another popup page saved, from the stored record, with
 //   takeStoredNetwork() (state.js), which copies it with
 //   copyChainSwitchFields() (chainSwitchFields.js).
 //
 // Both change `state` inside a save, holding the lock, and both reset the
 // popup's own caches through clearPopupCaches(), so a reset added there
 // reaches both. A field applyChainSwitchFields() sets has to be copied by
 // copyChainSwitchFields() too.
 //
 // Adding a new chain (e.g. ETC) requires only a new entry in
 // networks.js — no per-caller wiring is needed.
@@ -30,32 +20,22 @@
 const { applyChainSwitchFields } = require("./chainSwitchFields");
 const { clearPrices } = require("./prices");
 // The popup's own caches a network switch resets. Prices are chain-specific
 // (testnet tokens are worthless, ETC has different pricing, etc.). In-memory
 // and per bundle, so this is the popup's own cache — the only context that
 // ever fills it.
 function clearPopupCaches() {
    clearPrices();
 }
 // Switch the active chain and reset all chain-specific cached state.
-// Returns the network configuration object for the new chain, or null when
+// Returns the network configuration object for the new chain.
 // `state` already has that network once the save holds the lock, and nothing
 // is switched.
 //
 // `state` is switched inside the save that stores the switch, holding the
 // lock, so it is never switched while a follow of a switch saved elsewhere
 // waits for the lock (followNetworkSwitch() in src/popup/index.js): that
 // follow runs first, and this switch is made after it.
 async function onChainSwitch(newNetworkId) {
    const { state, saveState } = require("./state");
-    let net = null;
+
-    await saveState(() => {
+    const net = applyChainSwitchFields(state, newNetworkId);
-        if (state.networkId === newNetworkId) return false;
+
-        net = applyChainSwitchFields(state, newNetworkId);
+    // --- price cache ---
-        clearPopupCaches();
+    // Prices are chain-specific (testnet tokens are worthless,
-    });
+    // ETC has different pricing, etc.). In-memory and per bundle, so this is
    // the popup's own cache — the only context that ever fills it.
    clearPrices();
    await saveState();
    return net;
 }
-module.exports = { onChainSwitch, clearPopupCaches };
+module.exports = { onChainSwitch };
@@ -7,7 +7,7 @@
 // the singleton and saves; the background applies it to the detached record of
 // its own read-modify-write (src/background/state.js).
 //
-// Everything here is synchronous and touches nothing but the objects it is
+// Everything here is synchronous and touches nothing but the object it is
 // given: no storage, no caches, no imports beyond the network table. That is
 // what makes it usable on a record that has been read fresh from storage
 // microseconds earlier and is about to be written back.
@@ -38,16 +38,6 @@ function applyChainSwitchFields(s, newNetworkId) {
        blockscoutUrl: s.blockscoutUrl,
    };
    const remembered = s.networkEndpoints[net.id] || {};
    // Tracked tokens are kept per network the same way, because a contract
    // address names a token on one network only. s.trackedTokens stays the
    // active network's list, so nothing that reads it changes: the outgoing
    // list is put away under its network, and the incoming network's list, or
    // an empty one, takes its place.
    if (!s.networkTrackedTokens) s.networkTrackedTokens = {};
    s.networkTrackedTokens[s.networkId] = s.trackedTokens;
    s.trackedTokens = s.networkTrackedTokens[net.id] || [];
    s.networkId = net.id;
    s.rpcUrl = remembered.rpcUrl || net.defaultRpcUrl;
    s.blockscoutUrl = remembered.blockscoutUrl || net.defaultBlockscoutUrl;
@@ -76,33 +66,4 @@ function applyChainSwitchFields(s, newNetworkId) {
    return net;
 }
-// Give `s` every field applyChainSwitchFields() sets, as `switched` holds it:
+module.exports = { applyChainSwitchFields };
 // the popup takes a switch the background saved from the stored record this
 // way, rather than performing it again (takeStoredNetwork() in
 // src/shared/state.js). Balances are taken by address, and an address
 // `switched` does not have keeps none.
 function copyChainSwitchFields(s, switched) {
    s.networkEndpoints = switched.networkEndpoints;
    s.networkTrackedTokens = switched.networkTrackedTokens;
    s.trackedTokens = switched.trackedTokens;
    s.networkId = switched.networkId;
    s.rpcUrl = switched.rpcUrl;
    s.blockscoutUrl = switched.blockscoutUrl;
    s.lastBalanceRefresh = switched.lastBalanceRefresh;
    s.tokenHolderCache = switched.tokenHolderCache;
    s.fraudContracts = switched.fraudContracts;
    const stored = new Map();
    for (const wallet of switched.wallets) {
        for (const addr of wallet.addresses) stored.set(addr.address, addr);
    }
    for (const wallet of s.wallets) {
        for (const addr of wallet.addresses) {
            const got = stored.get(addr.address);
            addr.balance = got ? got.balance : "0";
            addr.tokenBalances = got ? got.tokenBalances : [];
        }
    }
 }
 module.exports = { applyChainSwitchFields, copyChainSwitchFields };
@@ -32,8 +32,7 @@ function setCache(address, name) {
    localStorage.setItem(key, JSON.stringify({ name, ts: Date.now() }));
 }
-// `signal` is as for fetchTokenBalances() in src/shared/balances.js.
+async function resolveEnsName(address, rpcUrl, networkId) {
 async function resolveEnsName(address, rpcUrl, networkId, signal) {
    const cached = getCached(address);
    if (cached !== undefined) return cached;
@@ -43,26 +42,21 @@ async function resolveEnsName(address, rpcUrl, networkId, signal) {
        setCache(address, name);
        return name;
    } catch (e) {
-        if (!signal?.aborted) {
+        log.errorf(
-            log.errorf(
+            "ENS reverse lookup failed",
-                "ENS reverse lookup failed",
+            address,
-                address,
+            e.shortMessage || e.message,
-                e.shortMessage || e.message,
+        );
            );
        }
        // Don't cache failures — let subsequent lookups retry
        return null;
    }
 }
-async function resolveEnsNames(addresses, rpcUrl, networkId, signal) {
+async function resolveEnsNames(addresses, rpcUrl, networkId) {
    const results = new Map();
    await Promise.all(
        addresses.map(async (addr) => {
-            results.set(
+            results.set(addr, await resolveEnsName(addr, rpcUrl, networkId));
                addr,
                await resolveEnsName(addr, rpcUrl, networkId, signal),
            );
        }),
    );
    return results;
@@ -2,8 +2,6 @@
 // Extension users make the requests directly to Etherscan — no proxy needed.
 // This is a best-effort enrichment: network failures return null silently.
 const { networkByChainId } = require("./networks");
 // Patterns in the page title that indicate a flagged address.
 // Title format: "Fake_Phishing184810 | Address: 0x... | Etherscan"
 const PHISHING_LABEL_PATTERNS = [/^Fake_Phishing/i, /^Phish:/i, /^Exploiter/i];
@@ -74,30 +72,18 @@ function parseEtherscanPage(html) {
 * Returns a warning object if the address is flagged, or null.
 * Network failures return null silently (best-effort check).
 *
- * Uses the explorer of the network with `chainId`, or of the active network
+ * Uses the current network's explorer URL so the lookup works on both
- * when it is omitted: etherscan.io on mainnet, sepolia.etherscan.io on
+ * mainnet (etherscan.io) and Sepolia (sepolia.etherscan.io).
 * Sepolia.
 *
 * While the user's "Check recipients on Etherscan" setting is off, Etherscan
 * is not asked and the answer is null.
 *
 * @param {string} address - Ethereum address to check.
 * @param {boolean} checkRecipientsOnEtherscan - The user's setting.
 * @param {string} [chainId] - Chain id of the network to look it up on.
 * @returns {Promise<{type: string, message: string, severity: string}|null>}
 */
-async function checkEtherscanLabel(
+async function checkEtherscanLabel(address) {
    address,
    checkRecipientsOnEtherscan,
    chainId,
 ) {
    if (!checkRecipientsOnEtherscan) return null;
    try {
        // Lazy require to avoid pulling in chrome.storage at module scope
        // (which breaks unit tests that only exercise parseEtherscanPage).
        const { currentNetwork } = require("./state");
-        const network = chainId ? networkByChainId(chainId) : currentNetwork();
+        const etherscanBase = currentNetwork().explorerUrl + "/address/";
        const etherscanBase = network.explorerUrl + "/address/";
        const resp = await fetch(etherscanBase + address, {
            headers: { Accept: "text/html" },
        });
@@ -23,11 +23,6 @@ const DEFAULT_STATE = {
    hasWallet: false,
    wallets: [],
    trackedTokens: [],
    // Tracked tokens remembered per network: { [networkId]: [token, ...] }.
    // trackedTokens above is the active network's list; this is what the
    // others are restored from when the active network changes. See
    // applyChainSwitchFields().
    networkTrackedTokens: {},
    networkId: "mainnet",
    rpcUrl: DEFAULT_RPC_URL,
    blockscoutUrl: DEFAULT_BLOCKSCOUT_URL,
@@ -48,12 +43,6 @@ const DEFAULT_STATE = {
    hideDustTransactions: true,
    dustThresholdGwei: 100000,
    utcTimestamps: false,
    // "Use Blockscout" and "Check recipients on Etherscan" in Settings, one
    // setting each for every network. Both off until the user turns them on:
    // the requests they allow send the user's addresses to a service other
    // than the RPC endpoint.
    useBlockscout: false,
    checkRecipientsOnEtherscan: false,
    fraudContracts: [],
    tokenHolderCache: {},
    theme: "system",
@@ -300,20 +289,6 @@ function normalizePersisted(saved) {
    // profile whose wallets are perfectly fine. An empty list is a legitimate
    // value and survives.
    out.trackedTokens = structuredClone(tokenRefs(saved.trackedTokens));
    // Each remembered list is floored like trackedTokens, because
    // applyChainSwitchFields() puts it straight back onto trackedTokens when
    // its network becomes the active one. A key that is not a network in
    // networks.js is dropped, which also keeps an own "__proto__" key from
    // reaching the plain assignment below.
    out.networkTrackedTokens = {};
    if (isRecord(saved.networkTrackedTokens)) {
        for (const netId of Object.keys(saved.networkTrackedTokens)) {
            if (!isKnownNetworkId(netId)) continue;
            out.networkTrackedTokens[netId] = structuredClone(
                tokenRefs(saved.networkTrackedTokens[netId]),
            );
        }
    }
    // The loud refusal for an unknown id is assertStateUsable(); this is the
    // floor under it. networkId is an object KEY into networkEndpoints below,
    // so a value that is not a network in networks.js must never get that far
@@ -412,12 +387,6 @@ function normalizePersisted(saved) {
            : 100000;
    out.utcTimestamps =
        saved.utcTimestamps !== undefined ? saved.utcTimestamps : false;
    out.useBlockscout =
        saved.useBlockscout !== undefined ? saved.useBlockscout : false;
    out.checkRecipientsOnEtherscan =
        saved.checkRecipientsOnEtherscan !== undefined
            ? saved.checkRecipientsOnEtherscan
            : false;
    // A list of contract addresses, floored the same way: send.js builds its
    // fraud set as `(state.fraudContracts || []).map((a) => a.toLowerCase())`
    // and filterTransactions() maps the same list through normalizeAddress(),
@@ -110,14 +110,11 @@ function hashListed(hash) {
 * Generate hostname variants for subdomain matching.
 * "sub.evil.com" yields ["sub.evil.com", "evil.com"].
 *
 * A trailing dot is dropped: "evil.com." is the fully qualified spelling of
 * "evil.com", and the browser loads the same site from either.
 *
 * @param {string} hostname
 * @returns {string[]}
 */
 function hostnameVariants(hostname) {
-    const h = hostname.toLowerCase().replace(/\.$/, "");
+    const h = hostname.toLowerCase();
    const variants = [h];
    const parts = h.split(".");
    // Parent domains: a.b.c.d -> b.c.d, c.d
@@ -2,7 +2,6 @@
 const { getTopTokenPrices } = require("./tokenList");
 const { isBelowOneMillionth } = require("./amountDisplay");
 const { networkByChainId } = require("./networks");
 const PRICE_CACHE_TTL = 300000; // 5 minutes
@@ -37,13 +36,10 @@ function clearPrices() {
    lastFetchedAt = 0;
 }
-// Return the USD price for a symbol on the network with `chainId`, or on the
+// Return the USD price for a symbol, or null on testnet / unknown.
-// active network when no chain id is given; null on testnet, on a chain id
+function getPrice(symbol) {
 // that names no network, or for a symbol with no price.
 function getPrice(symbol, chainId) {
    const { currentNetwork } = require("./state");
-    const network = chainId ? networkByChainId(chainId) : currentNetwork();
+    if (currentNetwork().isTestnet) return null;
    if (!network || network.isTestnet) return null;
    return prices[symbol] || null;
 }
@@ -23,7 +23,6 @@
 // guarantee.
 const { networkById } = require("./networks");
 const { copyChainSwitchFields } = require("./chainSwitchFields");
 const {
    DEFAULT_STATE,
    PERSISTED_FIELDS,
@@ -36,18 +35,16 @@ const {
    migrationNeeded,
 } = require("./stateSchema");
-const { storageGet, storageSet, withLock } = require("./browserApi");
+const { storageGet, storageSet } = require("./browserApi");
 const { log } = require("./log");
 // The live record the proxy below guards. Everything inside this module reads
 // and writes THIS object, never the proxy: the guard is for callers.
 const rawState = {
    ...DEFAULT_STATE,
-    // Their own objects, not the ones DEFAULT_STATE holds:
+    // Its own object, not the one DEFAULT_STATE holds: applyChainSwitchFields()
-    // applyChainSwitchFields() mutates these maps in place, and a spread copies
+    // mutates this map in place, and a spread copies the reference.
    // the reference.
    networkEndpoints: {},
    networkTrackedTokens: {},
    currentView: null,
    selectedWallet: null,
    selectedAddress: null,
@@ -126,10 +123,8 @@ function currentNetwork() {
 }
 // The persisted fields as this page held them when its last loadState()
-// finished, or when its last successful saveState() began, with any network
+// finished, or when its last successful saveState() began. saveState() diffs
-// switch saved elsewhere that this page has taken since (takeStoredNetwork()).
+// the live state against this to find only the fields THIS page changed since.
 // saveState() diffs the live state against this to find only the fields THIS
 // page changed since.
 //
 // Deep-cloned, not a reference: callers mutate persisted objects and arrays
 // in place (state.wallets.push(...)), and a reference baseline would mutate
@@ -443,14 +438,12 @@ function mergeNetworkEndpoints(base, ours, theirs) {
 //
 // Every other persisted field stays a whole-field diff:
 // `trackedTokens`/`fraudContracts`/`viewStack` are arrays of scalars with no
-// per-element identity to merge by; `networkTrackedTokens` is diffed whole like
+// per-element identity to merge by; `tokenHolderCache` is a map shaped like
-// `trackedTokens` and `networkId`, the two fields a network switch moves
+// the ones above, but nothing in src/ ever writes an entry into it — it is
-// together with it; `tokenHolderCache` is a map shaped like the ones above,
+// only ever reset wholesale to `{}` (applyChainSwitchFields()) — so there is
-// but nothing in src/ ever writes an entry into it — it is only ever reset
+// no in-place mutation for a whole-field diff to collide with; `viewData` is
-// wholesale to `{}` (applyChainSwitchFields()) — so there is no in-place
+// this page's own UI scratch space, not data another page has any reason to
-// mutation for a whole-field diff to collide with; `viewData` is this page's
+// share membership of.
 // own UI scratch space, not data another page has any reason to share
 // membership of.
 //
 // This does not make two pages that both change the SAME leaf concurrently
 // safe: last write wins on that one leaf, same as before. What it removes
@@ -461,18 +454,20 @@ function mergeNetworkEndpoints(base, ours, theirs) {
 // This page's own live `state` is deliberately NOT rehydrated from a field
 // another page changed — only the record written to storage is merged.
 // showView() fires saveState() on every navigation without awaiting it,
-// which is why saves from one page wait for each other (see saveState()), and
+// which is what makes the queue above necessary in the first place, and a
-// a save that is slow to come back has no way to tell whether the field it
+// save that is slow to come back has no way to tell whether the field it
 // is about to hand back is still the current answer or has since been
 // overtaken by something this very page did in the meantime; writing it
 // into `state` regardless reintroduced exactly the clobber this function
 // exists to remove, just delayed and confined to one page instead of two
 // (caught by tests/txStatus.test.js). A page's live picture of a field it
 // does not own goes on being whatever its last loadState() saw, same as
-// before this fix; only the persisted record is guaranteed current. The
+// before this fix; only the persisted record is guaranteed current.
-// network is the exception: the popup takes a switch another context saved
+async function saveStateOnce() {
-// through `beforeWrite` (followNetworkSwitch() in src/popup/index.js).
+    // A copy, so what this save compares and writes is the page's state as it
-async function saveStateOnce(beforeWrite) {
+    // stood when the save began. A change made while it waits on storage is
    // left for the next save, which compares against this copy.
    const current = structuredClone(snapshotPersisted());
    const result = await storageGet("autistmask");
    // The record in storage right now is about to be merged into and written
    // back, so it is validated exactly like a load validates it. Without this,
@@ -486,12 +481,6 @@ async function saveStateOnce(beforeWrite) {
    // come from storage in its loaded (self-healed) shape. See
    // normalizePersisted() in persistedState.js.
    const fresh = normalizePersisted(result.autistmask);
    if (beforeWrite && beforeWrite(fresh) === false) return;
    // A copy, so what this save compares and writes is the page's state as it
    // stood once the stored record was read. A change made while it waits on
    // the write is left for the next save, which compares against this copy.
    const current = structuredClone(snapshotPersisted());
    const merged = { ...fresh };
    for (const key of PERSISTED_FIELDS) {
@@ -536,21 +525,35 @@ async function saveStateOnce(beforeWrite) {
    rawState.hasWallet = rawState.wallets.length > 0;
    // What this save compared and wrote, not the page's state now: a change
-    // made during the save must still differ from the baseline, or the next
+    // made during the save must still differ from the baseline, or the save
-    // save finds nothing to store
+    // queued after it finds nothing to store
    // (https://git.eeqj.de/sneak/AutistMask/issues/448).
    baseline = current;
 }
 // showView() calls saveState() on every navigation without awaiting it, so
 // two saves from the SAME page can be in flight at once — e.g. a screen
 // shown, then immediately replaced before the first save's storageGet()
 // round trip has come back. Left concurrent, the first save's turn would
 // finish after the second's live-state mutation and then re-hydrate `state`
 // from what IT read, stomping the second, later change back to a stale
 // value — the same clobber this function exists to prevent, just between
 // two saves on one page instead of two pages. Queuing makes every save's
 // snapshot-diff-write-rehydrate run start to finish before the next one
 // begins, so each one only ever sees the true live state at its turn.
 let saveQueue = Promise.resolve();
 // Where a failed save is REPORTED, set once by the context that has a screen
 // to say it on (src/popup/index.js).
 //
 // A save that fails must not fail silently. showView() fires saveState() on
-// every navigation without awaiting it, and `await saveState()` inside an
+// every navigation without awaiting it, and the queue below has to attach a
-// unguarded event handler is no better: either way, without this, a failure
+// rejection handler to keep advancing — so a failing save was swallowed
-// would reach only the console, where the user never looks, and the wallet
+// entirely: no throw, no message, nothing on screen. The wallet kept running
-// would keep running against storage that rejects every write. That is the
+// against storage that was rejecting every write, which is the data-loss half
-// data-loss half of https://git.eeqj.de/sneak/AutistMask/issues/362.
+// of https://git.eeqj.de/sneak/AutistMask/issues/362. The awaited callers were
 // no better off: `await saveState()` inside an unguarded event handler surfaces
 // in the console and nowhere the user looks.
 //
 // This is the "tell the user" half; the other half is the floor in
 // normalizePersisted(), which stops the malformed-record cause from arising in
@@ -576,25 +579,11 @@ function reportSaveFailure(err) {
    }
 }
-// Each save runs start to finish holding the lock every write of the stored
+function saveState() {
-// record takes (withLock() in src/shared/browserApi.js), so no write by
+    const turn = saveQueue.then(saveStateOnce);
-// another page or the background lands between its read and its write and is
+    // The queue must advance even when a save rejects, or every save after
-// lost (https://git.eeqj.de/sneak/AutistMask/issues/641). A page in a Firefox
+    // it queues behind a promise that never settles.
-// private window is the exception: Firefox gives it locks of its own (README,
+    saveQueue = turn.catch(() => {});
 // "Stored state and its version").
 //
 // The same lock orders this page's own saves. showView() calls saveState() on
 // every navigation without awaiting it, so two saves from one page can be
 // asked for at once; they take the lock in the order they were asked, and each
 // compares the page's state, as it stands once the stored record has been read
 // and `beforeWrite` has run, against the baseline the save before it left.
 //
 // `beforeWrite`, when given, is called inside the lock with the stored record
 // as just read, before this page's state is compared against it. It may change
 // `state`, and this save writes that change. When it returns false, nothing is
 // written; any other return lets the save go ahead.
 function saveState(beforeWrite) {
    const turn = withLock("autistmask", () => saveStateOnce(beforeWrite));
    // Every failed save is reported, whether or not the caller awaited this
    // one. The returned promise still rejects, so a caller that DOES await
    // keeps its own error handling.
@@ -602,17 +591,6 @@ function saveState(beforeWrite) {
    return turn;
 }
 // Give this page the network switch held by `stored`, a record a save of this
 // page has just read (followNetworkSwitch() in src/popup/index.js calls this
 // from `beforeWrite`), in `state` and in `baseline` alike, as loadState() does
 // with a whole record. The switch is then not this page's own change, even when
 // that save fails to write: a later switch back to the previous network still
 // differs from `baseline`, and is stored.
 function takeStoredNetwork(stored) {
    copyChainSwitchFields(rawState, stored);
    copyChainSwitchFields(baseline, structuredClone(stored));
 }
 // Rejects with StateUnusableError for a stored record this build cannot make
 // sense of. Nothing is assigned and `loaded` stays false in that case, so a
 // caller that ignores the rejection gets StateNotLoadedError on the first
@@ -658,7 +636,6 @@ module.exports = {
    state,
    saveState,
    onSaveFailure,
    takeStoredNetwork,
    loadState,
    currentAddress,
    currentNetwork,
@@ -576,7 +576,7 @@ const TOKENS = [
        symbol: "FLOKI",
        decimals: 9,
        name: "FLOKI",
-        url: "https://floki.com",
+        url: "",
    },
    {
        address: "0x7420B4b9a0110cdC71fB720908340C03F9Bc03EC",
@@ -1290,7 +1290,7 @@ const TOKENS = [
        symbol: "TURBO",
        decimals: 18,
        name: "Turbo",
-        url: "https://www.turbo-eth.com",
+        url: "",
    },
    {
        address: "0xA27EC0006e59f245217Ff08CD52A7E8b169E62D2",
@@ -20,7 +20,6 @@ const { toDecimals } = require("./transferAmount");
 // truncation without the approval screens' nonzero floor: the transaction
 // detail view is the authoritative record and already shows exact precision.
 const { truncateAmount: formatTxValue } = require("./amountDisplay");
 const { routerRelease } = require("./uniswap");
 // Ethereum addresses are case-insensitive: EIP-55 mixed case is a checksum
 // over the address, not part of its identity.  Every address comparison in
@@ -52,6 +51,7 @@ function parseTx(tx, addrLower, chainId) {
        }
        // Map known DEX methods to "Swap" for cleaner display
        const SWAP_METHODS = new Set([
            "execute",
            "swap",
            "swapExactTokensForTokens",
            "swapTokensForExactTokens",
@@ -59,16 +59,9 @@ function parseTx(tx, addrLower, chainId) {
            "swapTokensForExactETH",
            "swapExactTokensForETH",
            "swapETHForExactTokens",
            "multicall",
        ]);
-        // Multisigs, smart accounts and many other contracts also have an
+        const label = SWAP_METHODS.has(method)
        // `execute` or `multicall` method, so either is a swap only when sent
        // to a Universal Router on this transaction's network: the same
        // addresses the approval screen decodes a swap for.
        const isSwap =
            SWAP_METHODS.has(method) ||
            ((method === "execute" || method === "multicall") &&
                routerRelease(to, chainId) !== null);
        const label = isSwap
            ? "Swap"
            : method.charAt(0).toUpperCase() + method.slice(1);
        direction = "contract";
@@ -235,18 +228,12 @@ function mergeTransactions(txs, tokenTransfers) {
 // `chainId` is the chain id of the network `blockscoutUrl` serves. Every entry
 // carries it, and a native entry is labelled with that network's
 // `nativeCurrency` from networks.js (`ETH`, `SepoliaETH`).
 //
 // `useBlockscout` is the user's "Use Blockscout" setting. While it is off,
 // Blockscout is not asked and there is no history: the answer is an empty
 // list.
 async function fetchRecentTransactions(
    address,
    blockscoutUrl,
    useBlockscout,
    chainId,
    count = 25,
 ) {
    if (!useBlockscout) return [];
    log.debugf("fetchRecentTransactions", address);
    const addrLower = normalizeAddress(address);
@@ -2,11 +2,11 @@
 // encoded with.
 //
 // A token amount is a decimal string plus a scale, and the two come from
-// different places. The confirmation screen renders the amount, the symbol and
+// different places. The confirmation screen renders the amount, the balance and
-// the balance it reads from the node with the block explorer's cached metadata
+// the symbol from the block explorer's cached metadata (see
-// (see fetchTokenBalances() in balances.js); the transfer used to be encoded
+// fetchTokenBalances() in balances.js); the transfer used to be encoded from
-// from decimals() read off the contract at signing time, and nothing compared
+// decimals() read off the contract at signing time, and nothing compared the
-// the two. A token whose on-chain scale differs from the cached one — an
+// two. A token whose on-chain scale differs from the cached one — an
 // upgradeable or proxy token, a caller-dependent one, a stale or wrong explorer
 // entry — therefore signed an amount that was never displayed, off by a power
 // of ten for every decimal place of disagreement.
@@ -1,5 +1,4 @@
-// The amount check and balance arithmetic for the Send and transaction
+// Balance arithmetic for the Send and transaction confirmation screens.
 // confirmation screens.
 //
 // Pure: no DOM, no network, no state. Everything is exact integer math on
 // 18-decimal fixed point (wei for ETH), so it can be unit tested directly
@@ -21,7 +20,7 @@ const FEE_KNOWN = "known";
 const FEE_UNAVAILABLE = "unavailable";
 const CODES = {
-    // The amount is one isValidAmount() refuses.
+    // The amount is not a non-negative number we can do exact arithmetic on.
    AMOUNT_INVALID: "amount-invalid",
    // ERC-20: the token amount exceeds the token balance.
    INSUFFICIENT_TOKEN: "insufficient-token",
@@ -88,31 +87,10 @@ function toFixedPoint(value) {
    }
 }
 // Whether `amount` can be sent: a number above zero, written as digits with
 // at most one decimal point ("0.5", "12", ".5"), with nothing but zeros after
 // the token's last decimal place, `tokenDecimals`, and nothing but zeros after
 // the 18th, the places the arithmetic here works in, which are ETH's. ETH, and
 // a token whose decimal places are unknown, pass null and are held to the 18
 // (the confirmation screen refuses to send such a token anyway). Zeros past
 // those places are accepted because parseUnits() drops them here and again
 // when the transfer is encoded, so "1.0000000" of a 6-place token is exactly
 // 1 everywhere. Refuses "1e-3", "1abc", "0" and "-1". The Send screen checks
 // it before the confirmation screen opens, and validateTransfer() checks it
 // again there.
 function isValidAmount(amount, tokenDecimals = null) {
    if (typeof amount !== "string") return false;
    const places = Math.min(tokenDecimals ?? SCALE_DECIMALS, SCALE_DECIMALS);
    try {
        return parseUnits(amount.trim(), places) > 0n;
    } catch {
        return false;
    }
 }
 // The most ETH a send can carry: the exact balance minus the fee reserve from
 // feeReserveWei(), as a decimal string, so validateTransfer() passes it with
-// exactly that reserve left behind. `ethBalance` is an exact decimal string as
+// exactly that reserve left behind. `ethBalance` is the exact decimal string
-// formatEther() writes it, never a rounded one. Null when the balance does not
+// balances.js stores, never a rounded one. Null when the balance does not
 // leave anything to send once the fee is paid, or when either input is
 // unusable.
 function maxEthAmount(ethBalance, feeWei) {
@@ -134,11 +112,9 @@ function maxTokenAmount(tokenBalance) {
 // Validate a pending transfer against the balances that must cover it.
 //
 //   isErc20      — token transfer rather than a native ETH transfer
-//   amount       — human decimal string being sent. One isValidAmount()
+//   amount       — human decimal string being sent, non-negative. Anything
-//                  refuses, a negative value included, is an unusable amount
+//                  else, a negative value included, is an unusable amount
 //                  rather than an amount that passes every comparison.
 //   tokenDecimals — ERC-20: the token's decimal places, or null when they
 //                  are unknown. Passed to isValidAmount().
 //   ethBalance   — human decimal string, the sender's ETH balance
 //   tokenBalance — human decimal string, the sender's token balance
 //   feeStatus    — FEE_PENDING, FEE_KNOWN or FEE_UNAVAILABLE. Anything else
@@ -152,7 +128,6 @@ function maxTokenAmount(tokenBalance) {
 function validateTransfer({
    isErc20 = false,
    amount,
    tokenDecimals = null,
    ethBalance,
    tokenBalance,
    feeStatus = FEE_PENDING,
@@ -160,17 +135,17 @@ function validateTransfer({
 } = {}) {
    const codes = [];
-    // An amount refused here never reaches the comparisons below: a negative
+    const amountFp = toFixedPoint(amount);
-    // one would pass every one of them, then die at encode time in
+    const ethFp = toFixedPoint(ethBalance) ?? 0n;
-    // parseEther().
+
-    if (!isValidAmount(amount, isErc20 ? tokenDecimals : null)) {
+    // A negative amount parses to a valid bigint, so every comparison below
    // is trivially false and the send clears the screen — then dies at encode
    // time in parseEther(). Unusable, on the same footing as a malformed fee.
    if (amountFp === null || amountFp < 0n) {
        codes.push(CODES.AMOUNT_INVALID);
        return { canSend: false, codes };
    }
    const amountFp = toFixedPoint(amount);
    const ethFp = toFixedPoint(ethBalance) ?? 0n;
    // Fail closed. Anything that is not a usable fee under a recognised
    // status — a malformed feeWei, or a status this module does not know —
    // is an unavailable estimate, never a fee of zero. Every such input errs
@@ -220,7 +195,6 @@ module.exports = {
    SCALE_DECIMALS,
    feeReserveWei,
    feeEstimateWei,
    isValidAmount,
    maxEthAmount,
    maxTokenAmount,
    toFixedPoint,
@@ -110,33 +110,16 @@ function addressFromPrivateKey(key) {
    return w.address;
 }
-// The signer for `addr`, one of the wallet's stored address records. An HD or
+function getSignerForAddress(walletData, addrIndex, decryptedSecret) {
 // xprv address is derived at its own `index`, never at its position in the
 // wallet's list: the two differ once an import scan passes over an unused
 // index, or once an address that is not the last is removed. An HD or xprv
 // record without a valid `index` is refused before anything is derived.
 // Whatever the wallet type, the key is refused unless it is the key of
 // `addr.address`.
 function getSignerForAddress(walletData, addr, decryptedSecret) {
    if (
        (walletData.type === "hd" || walletData.type === "xprv") &&
        !(Number.isInteger(addr.index) && addr.index >= 0)
    ) {
        throw new Error(
            "No derivation index is stored for " +
                addr.address +
                ", so its key cannot be derived.",
        );
    }
    let signer;
    if (walletData.type === "hd") {
        const node = HDNodeWallet.fromPhrase(
            decryptedSecret,
            "",
            BIP44_ETH_PATH,
        );
-        signer = node.deriveChild(addr.index);
+        return node.deriveChild(addrIndex);
-    } else if (walletData.type === "xprv") {
+    }
    if (walletData.type === "xprv") {
        // Checked here rather than through masterXprvOrThrow so the message
        // fits the situation: nobody is importing anything at signing time,
        // and this wallet is already in storage. src/shared/walletDefects.js
@@ -154,18 +137,9 @@ function getSignerForAddress(walletData, addr, decryptedSecret) {
                    "is not a master key, so it cannot sign.",
            );
        }
-        signer = node.derivePath(BIP44_ETH_PATH).deriveChild(addr.index);
+        return node.derivePath(BIP44_ETH_PATH).deriveChild(addrIndex);
    } else {
        signer = new Wallet(decryptedSecret);
    }
-    if (signer.address.toLowerCase() !== addr.address.toLowerCase()) {
+    return new Wallet(decryptedSecret);
        throw new Error(
            "The key this wallet holds for " +
                addr.address +
                " belongs to a different address, so it was not used.",
        );
    }
    return signer;
 }
 function isValidMnemonic(mnemonic) {
@@ -36,13 +36,11 @@ const DEFECTS = {
                "derivation path beneath that key instead of from a master " +
                "key, so the addresses listed here are not the ones that key " +
                "produces under the standard path.",
-            "Signing, sending and private key export are disabled for this " +
+            "Signing and sending are disabled for this wallet. The addresses " +
-                "wallet. Anything these addresses hold can be reached outside " +
+                "do descend from the extended private key you imported, so " +
-                "this wallet with the extended private key you imported, if " +
+                "anything they hold is still reachable by software that " +
-                "you kept a copy of it, or with the master extended private " +
+                "repeats the same non-standard derivation. Check them in a " +
-                "key or recovery phrase it came from, in software that " +
+                "block explorer before deciding what to do.",
                "repeats the same non-standard derivation. Check the " +
                "addresses in a block explorer before deciding what to do.",
            "To see the addresses this key produces under the standard path, " +
                "import the master extended private key, or the recovery " +
                "phrase it came from, as a new wallet. Nothing here has been " +
@@ -14,7 +14,7 @@ function sameAddress(a, b) {
 // Forget every site permission held against the given addresses: the
 // remembered ones in `state`, and the connections approved without
-// "Remember", which only the background holds, in session storage.
+// "Remember", which only the background holds, in memory.
 function dropSitePermissions(state, addresses) {
    for (const addr of addresses) {
        delete state.allowedSites[addr];
@@ -1,167 +0,0 @@
 // A page whose origin has no host is never told an address by accountsChanged
 // (https://git.eeqj.de/sneak/AutistMask/issues/564).
 //
 // When the user switches address, the background tells each open tab the new
 // active address if the site at the tab's URL is connected. A page at a
 // connected site's URL can still have another origin: one its server
 // sandboxes with a Content-Security-Policy has the origin "null", and every
 // request it makes is refused. Each test here switches the address in the real
 // background, takes the event it sent to a tab at the site's URL, and hands
 // that event to the real content script in a page of the given origin.
 const { networkById } = require("../src/shared/networks");
 const { makeStorageStub } = require("./support/storageStub");
 const ADDRESS = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
 const SITE = "https://dapp.example";
 const EXT_URL = "chrome-extension://autistmask/";
 const FROM_POPUP = { url: EXT_URL + "src/popup/index.html" };
 // One address, with SITE remembered as allowed for it.
 function storedProfile() {
    const mainnet = networkById("mainnet");
    return {
        hasWallet: true,
        wallets: [
            {
                name: "Wallet 1",
                type: "hd",
                addresses: [
                    { address: ADDRESS, balance: "0", tokenBalances: [] },
                ],
            },
        ],
        activeAddress: ADDRESS,
        networkId: "mainnet",
        rpcUrl: mainnet.defaultRpcUrl,
        blockscoutUrl: mainnet.defaultBlockscoutUrl,
        allowedSites: { [ADDRESS]: [SITE] },
        deniedSites: {},
        trackedTokens: [],
    };
 }
 async function settle() {
    for (let i = 0; i < 50; i++) await Promise.resolve();
 }
 afterEach(() => {
    delete global.chrome;
    delete global.window;
    jest.resetModules();
 });
 // The popup tells the background the active address changed, and the one
 // open tab, at SITE's URL, is sent an event. That event is returned.
 async function eventSentToSiteTab() {
    jest.resetModules();
    jest.doMock("../src/shared/balances", () => ({
        getProvider: () => ({}),
        refreshBalances: jest.fn(async () => {}),
    }));
    jest.doMock("../src/shared/phishingDomains", () => ({
        isPhishingDomain: () => false,
    }));
    jest.doMock("../src/shared/alarms", () => ({
        BALANCE_REFRESH_ALARM: "balance",
        BALANCE_REFRESH_PERIOD_MINUTES: 1,
        ensureRecurringAlarms: jest.fn(async () => {}),
        registerAlarmHandlers: jest.fn(),
    }));
    let messageListener = null;
    const sentToTabs = [];
    global.chrome = {
        storage: makeStorageStub({ autistmask: storedProfile() }),
        runtime: {
            getURL: (path) => EXT_URL + path,
            onMessage: {
                addListener: (fn) => {
                    messageListener = fn;
                },
            },
            onConnect: { addListener: () => {} },
            getPlatformInfo: (cb) => cb({ os: "linux" }),
            lastError: null,
        },
        windows: {
            remove: (id, cb) => {
                if (cb) cb();
            },
            onRemoved: { addListener: () => {} },
        },
        tabs: {
            query: (q, cb) => cb([{ id: 1, url: SITE + "/app" }]),
            sendMessage: (tabId, msg, cb) => {
                sentToTabs.push(msg);
                if (cb) cb();
            },
        },
        action: { setPopup: () => {} },
    };
    require("../src/background/index");
    messageListener(
        { type: "AUTISTMASK_ACTIVE_CHANGED" },
        FROM_POPUP,
        () => {},
    );
    await settle();
    expect(sentToTabs).toHaveLength(1);
    return sentToTabs[0];
 }
 // The content script in a page whose origin is `pageOrigin` is handed `event`
 // from the background. What it posts to the page is returned.
 function postedToPage(event, pageOrigin) {
    jest.resetModules();
    let eventListener = null;
    const posted = [];
    global.chrome = {
        runtime: {
            onMessage: {
                addListener: (fn) => {
                    eventListener = fn;
                },
            },
        },
    };
    global.window = {
        origin: pageOrigin,
        addEventListener: () => {},
        postMessage: (data) => posted.push(data),
    };
    require("../src/content/index");
    eventListener(event);
    return posted;
 }
 describe("accountsChanged after an address switch, at a connected site's URL", () => {
    test("the site's own page is told the active address", async () => {
        const event = await eventSentToSiteTab();
        expect(postedToPage(event, SITE)).toEqual([
            {
                type: "AUTISTMASK_EVENT",
                eventName: "accountsChanged",
                data: [ADDRESS],
            },
        ]);
    });
    test("a page whose origin has no host is told no address", async () => {
        const event = await eventSentToSiteTab();
        expect(postedToPage(event, "null")).toEqual([
            {
                type: "AUTISTMASK_EVENT",
                eventName: "accountsChanged",
                data: [],
            },
        ]);
    });
 });
@@ -1,503 +0,0 @@
 // Sending, a site's transaction and signature requests and private key export
 // each use the key of the address they name: the key at the index that address
 // was derived at, not the one at its position in the wallet's list. The two
 // differ after an import whose scan passed over an unused index, and after an
 // address that is not the last is removed
 // (https://git.eeqj.de/sneak/AutistMask/issues/510). A send is signed by the
 // From address its confirmation screen shows, whichever address is selected.
 //
 // Driven through the real import, "+" button, address removal, confirmation
 // screen, transaction and signature approval screens and export screen, with
 // the node, the vault and the DOM stubbed.
 "use strict";
 // The addresses the stub node reports a balance for, and the signed
 // transactions it was handed.
 const mockNode = { funded: new Set(), broadcast: [] };
 jest.mock("ethers", () => {
    const actual = jest.requireActual("ethers");
    class StubProvider {
        async getBalance(address) {
            return mockNode.funded.has(address) ? 1n : 0n;
        }
        async getTransactionCount() {
            return 0;
        }
        async estimateGas() {
            return 21000n;
        }
        async getFeeData() {
            return {
                maxFeePerGas: 20000000000n,
                maxPriorityFeePerGas: 1000000000n,
                gasPrice: 10000000000n,
            };
        }
        async getNetwork() {
            return { chainId: 1n };
        }
        async getCode() {
            return "0x";
        }
        async lookupAddress() {
            return null;
        }
        async broadcastTransaction(signed) {
            mockNode.broadcast.push(signed);
            return { hash: "0x" + "ab".repeat(32) };
        }
    }
    return { ...actual, JsonRpcProvider: StubProvider };
 });
 // No password is hashed: what the wallet stores is the phrase itself.
 jest.mock("../src/shared/vault", () => ({
    encryptWithPassword: async (secret) => secret,
    decryptWithPassword: async (secret) => secret,
 }));
 // The wait screen polls for a receipt; these tests stop at the broadcast.
 jest.mock("../src/popup/views/txStatus", () => ({
    showWait: jest.fn(),
    showError: jest.fn(),
 }));
 jest.mock("ethereum-blockies-base64", () => () => "data:image/png;base64,x");
 global.fetch = jest.fn(() => {
    throw new Error("tests must not perform network requests");
 });
 const {
    HDNodeWallet,
    Mnemonic,
    Transaction,
    getBytes,
    verifyMessage,
 } = require("ethers");
 // Publicly known development phrase; never fund it.
 const PHRASE = "test test test test test test test test test test test junk";
 // PHRASE's master extended private key, as the xprv import takes it.
 const XPRV = HDNodeWallet.fromSeed(
    Mnemonic.fromPhrase(PHRASE).computeSeed(),
 ).extendedKey;
 const PASSWORD = "correct horse battery staple";
 const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
 // "Hello", as the hex a page sends.
 const MESSAGE = "0x48656c6c6f";
 // The address and key at derivation index `index` of PHRASE, worked out with
 // ethers directly rather than through the wallet's own code.
 function derived(index) {
    return HDNodeWallet.fromPhrase(PHRASE, "", "m/44'/60'/0'/0/" + index);
 }
 // ------------------------------------------------------------ DOM stub
 function makeElement(id) {
    const classes = new Set();
    const el = {
        id,
        textContent: "",
        title: "",
        value: "",
        innerHTML: "",
        disabled: false,
        style: {},
        dataset: {},
        listeners: {},
        classList: {
            add: (...names) => names.forEach((n) => classes.add(n)),
            remove: (...names) => names.forEach((n) => classes.delete(n)),
            contains: (n) => classes.has(n),
            toggle: (n, force) => {
                const on = force === undefined ? !classes.has(n) : force;
                if (on) classes.add(n);
                else classes.delete(n);
                return on;
            },
        },
        addEventListener: (name, fn) => {
            el.listeners[name] = el.listeners[name] || [];
            el.listeners[name].push(fn);
        },
        querySelectorAll: () => [],
        appendChild: () => {},
    };
    // Views reach for .parentElement to hide whole sections.
    Object.defineProperty(el, "parentElement", {
        get: () => node(id + "-parent"),
    });
    return el;
 }
 function makeDocument() {
    const els = new Map();
    return {
        getElementById(id) {
            // The debug banner is created on demand by helpers.js; absent
            // is the state a non-debug, non-testnet popup is in.
            if (id === "debug-banner") return null;
            if (!els.has(id)) els.set(id, makeElement(id));
            return els.get(id);
        },
        createElement: () => makeElement("created"),
        addEventListener: () => {},
        body: { prepend: () => {} },
    };
 }
 function node(id) {
    return globalThis.document.getElementById(id);
 }
 function click(element) {
    const event = { stopPropagation: () => {} };
    return Promise.all((element.listeners.click || []).map((fn) => fn(event)));
 }
 // show() starts the fee estimate without awaiting it; this lets it settle.
 async function settle() {
    for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
 }
 // ------------------------------------------------------------ harness
 globalThis.chrome = {
    storage: { local: { get: async () => ({}), set: async () => {} } },
 };
 const { state } = require("../src/shared/state");
 const { removeAddressFromState } = require("../src/shared/walletDelete");
 const addWallet = require("../src/popup/views/addWallet");
 const home = require("../src/popup/views/home");
 const confirmTx = require("../src/popup/views/confirmTx");
 const approval = require("../src/popup/views/approval");
 const exportPrivkey = require("../src/popup/views/exportPrivkey");
 const txStatus = require("../src/popup/views/txStatus");
 // What the background answers when the approval window asks which approval it
 // was opened for, and every message the popup sent it.
 let approvalDetails;
 let sent;
 // The "+" button of the wallet list's last render. Each render attaches the
 // handler to the buttons it drew, as the browser's fresh list would have.
 let plusButton;
 beforeEach(() => {
    approvalDetails = null;
    sent = [];
    mockNode.broadcast = [];
    globalThis.document = makeDocument();
    globalThis.window = { close: () => {} };
    globalThis.chrome = {
        storage: { local: { get: async () => ({}), set: async () => {} } },
        runtime: {
            connect: () => ({ postMessage: () => {} }),
            sendMessage: (msg, reply) => {
                sent.push(msg);
                if (!reply) return;
                reply(
                    msg.type === "AUTISTMASK_GET_APPROVAL"
                        ? approvalDetails
                        : null,
                );
            },
        },
    };
    node("wallet-list").querySelectorAll = (selector) => {
        if (selector !== ".btn-add-address") return [];
        plusButton = makeElement("btn-add-address");
        plusButton.dataset.wallet = "0";
        return [plusButton];
    };
    // The explorer and price lookups these screens start fail offline, and
    // say so; that is not under test.
    for (const method of ["log", "warn", "error"]) {
        jest.spyOn(console, method).mockImplementation(() => {});
    }
    txStatus.showError.mockClear();
    state.wallets = [];
    state.rpcUrl = "https://rpc.example.invalid";
    state.networkId = "mainnet";
    state.viewStack = [];
    state.currentView = "main";
    addWallet.init({
        renderWalletList: () => {},
        startRefresh: () => {},
        pageClosed: new AbortController().signal,
    });
    confirmTx.init({});
    approval.init({});
    exportPrivkey.init();
 });
 afterEach(() => {
    jest.restoreAllMocks();
 });
 // Import PHRASE on the add-wallet screen, with the stub node reporting a
 // balance at each of `fundedIndices`, and wait for the address scan.
 async function importPhrase(fundedIndices) {
    mockNode.funded = new Set(fundedIndices.map((i) => derived(i).address));
    await click(node("tab-mnemonic"));
    node("wallet-mnemonic").value = PHRASE;
    node("add-wallet-password").value = PASSWORD;
    node("add-wallet-password-confirm").value = PASSWORD;
    await click(node("btn-add-wallet-confirm"));
 }
 // The same, importing XPRV on the add-wallet screen's xprv tab.
 async function importXprv(fundedIndices) {
    mockNode.funded = new Set(fundedIndices.map((i) => derived(i).address));
    await click(node("tab-xprv"));
    node("import-xprv-key").value = XPRV;
    node("add-wallet-password").value = PASSWORD;
    node("add-wallet-password-confirm").value = PASSWORD;
    await click(node("btn-add-wallet-confirm"));
 }
 // Press the wallet's "+" button on Home.
 async function addAddress() {
    home.render({
        doRefreshAndRender: () => {},
        pageClosed: new AbortController().signal,
    });
    await click(plusButton);
 }
 // The key the export screen reveals for the address at `position`.
 async function exportedKey(position) {
    exportPrivkey.show(0, position);
    node("export-privkey-password").value = PASSWORD;
    await click(node("btn-export-privkey-confirm"));
    return node("export-privkey-value").textContent;
 }
 // Confirm a send whose From line shows `from`, with the address at position
 // `selected` selected; resolves to the signed transaction the node was handed,
 // or undefined when none was.
 async function confirmSend(from, selected) {
    state.selectedWallet = 0;
    state.selectedAddress = selected;
    confirmTx.show({
        from,
        to: RECIPIENT,
        amount: "0.5",
        token: "ETH",
    });
    await settle();
    node("confirm-tx-password").value = PASSWORD;
    await click(node("btn-confirm-send"));
    return mockNode.broadcast.pop();
 }
 // Send from the address at `position`, with that address selected, as the Send
 // button leaves it.
 function sendFrom(position) {
    return confirmSend(state.wallets[0].addresses[position].address, position);
 }
 // A site asks the address at `position` to sign MESSAGE; resolves to the
 // response the approval window sent the background.
 async function signFor(position) {
    const address = state.wallets[0].addresses[position].address;
    approvalDetails = {
        type: "sign",
        origin: "https://dapp.example",
        isPhishingDomain: false,
        approvedFrom: address,
        signParams: {
            method: "personal_sign",
            message: MESSAGE,
            from: address,
        },
    };
    await approval.show(1);
    node("approve-sign-password").value = PASSWORD;
    await click(node("btn-approve-sign"));
    return sent.find((msg) => msg.type === "AUTISTMASK_SIGN_RESPONSE");
 }
 // A site asks the address at `position` to send RECIPIENT a transaction of no
 // value; resolves to the response the approval window sent the background.
 async function transactFor(position) {
    const address = state.wallets[0].addresses[position].address;
    approvalDetails = {
        type: "tx",
        origin: "https://dapp.example",
        isPhishingDomain: false,
        approvedFrom: address,
        approvedTx: {
            type: 2,
            from: address,
            chainId: "0x1",
            nonce: "0x0",
            gasLimit: "0x5208",
            maxPriorityFeePerGas: "0x3b9aca00",
            maxFeePerGas: "0x77359400",
            to: RECIPIENT,
            value: "0x0",
            data: "0x",
            accessList: [],
        },
    };
    await approval.show(1);
    node("approve-tx-password").value = PASSWORD;
    await click(node("btn-approve-tx"));
    return sent.find((msg) => msg.type === "AUTISTMASK_TX_RESPONSE");
 }
 describe.each([
    [
        "a recovery phrase import whose scan found only the first address",
        async () => {
            await importPhrase([0]);
        },
        // The address the import stores before its scan.
        { position: 0, index: 0 },
    ],
    [
        "an xprv import whose scan found only the first address",
        async () => {
            await importXprv([0]);
        },
        { position: 0, index: 0 },
    ],
    [
        "an import whose scan passed over index 3",
        async () => {
            await importPhrase([0, 1, 2, 4]);
        },
        // Address 4 on Home, derived at index 4.
        { position: 3, index: 4 },
    ],
    [
        "an xprv import whose scan passed over index 3",
        async () => {
            await importXprv([0, 1, 2, 4]);
        },
        { position: 3, index: 4 },
    ],
    [
        "removing the middle one of three addresses",
        async () => {
            await importPhrase([0]);
            await addAddress();
            await addAddress();
            removeAddressFromState(state, 0, 1);
        },
        // Address 2 on Home after the removal, derived at index 2.
        { position: 1, index: 2 },
    ],
 ])("after %s", (_name, setUp, { position, index }) => {
    beforeEach(setUp);
    test("the wallet lists the address derived at that index there", () => {
        expect(state.wallets[0].addresses[position].address).toBe(
            derived(index).address,
        );
    });
    test("export reveals that address's key", async () => {
        expect(await exportedKey(position)).toBe(derived(index).privateKey);
    });
    test("a send is signed by that address", async () => {
        const signed = await sendFrom(position);
        expect(Transaction.from(signed).from).toBe(derived(index).address);
    });
    test("a site's signature is made by that address", async () => {
        const response = await signFor(position);
        expect(verifyMessage(getBytes(MESSAGE), response.signature)).toBe(
            derived(index).address,
        );
    });
    test("a site's transaction is signed by that address", async () => {
        const response = await transactFor(position);
        expect(Transaction.from(response.rawSignedTx).from).toBe(
            derived(index).address,
        );
    });
 });
 // The selection and the confirmation screen are saved apart, so the popup can
 // reopen onto the screen with another address selected than its From line
 // shows.
 describe("a confirmation screen whose From is not the selected address", () => {
    beforeEach(async () => {
        await importPhrase([0, 1]);
    });
    test("the send is signed by the From address shown", async () => {
        const signed = await confirmSend(derived(1).address, 0);
        expect(Transaction.from(signed).from).toBe(derived(1).address);
    });
    // The refusal's sentence is fixed in index.html, in a box of its own that
    // holds its space from the first paint, so showing it moves nothing.
    test("nothing is sent when the selected wallet does not hold it", async () => {
        expect(await confirmSend(derived(5).address, 0)).toBeUndefined();
        expect(node("confirm-from-address-error").style.visibility).toBe(
            "visible",
        );
        expect(node("confirm-tx-password-error").textContent).toBe("");
        // Reviewing a send again draws the screen again, which hides it.
        confirmTx.show({
            from: derived(0).address,
            to: RECIPIENT,
            amount: "0.5",
            token: "ETH",
        });
        await settle();
        expect(node("confirm-from-address-error").style.visibility).toBe(
            "hidden",
        );
    });
 });
 describe("an address whose stored index derives a different address", () => {
    function refusal() {
        return (
            "The key this wallet holds for " +
            derived(0).address +
            " belongs to a different address, so it was not used."
        );
    }
    beforeEach(async () => {
        await importPhrase([0]);
        state.wallets[0].addresses[0].index = 1;
    });
    test("export reveals nothing and says why", async () => {
        expect(await exportedKey(0)).toBe("");
        expect(node("export-privkey-password-error").textContent).toBe(
            refusal(),
        );
    });
    test("nothing is sent", async () => {
        expect(await sendFrom(0)).toBeUndefined();
        expect(txStatus.showError).toHaveBeenCalledWith(
            expect.anything(),
            null,
            refusal(),
        );
    });
    test("nothing is signed", async () => {
        const response = await signFor(0);
        expect(response.signature).toBeUndefined();
        expect(response.error).toBe(refusal());
    });
 });
@@ -1,123 +0,0 @@
 // Creating a wallet from a recovery phrase or an extended private key does not
 // report an address scan request the popup's own closing cancelled, and still
 // reports one that failed while the popup was open
 // (https://git.eeqj.de/sneak/AutistMask/issues/475).
 //
 // In the popup a cancelled request fails with the same "Failed to fetch" as a
 // server that cannot be reached, so every RPC request here fails that way, and
 // only the signal the popup aborts on pagehide tells the two cases apart.
 // Driven against the fake elements tests/tokenLookupCancelled.test.js uses.
 const { FetchRequest, HDNodeWallet, Mnemonic } = require("ethers");
 const PHRASE =
    "abandon abandon abandon abandon abandon abandon " +
    "abandon abandon abandon abandon abandon about";
 const PASSWORD = "correct horse battery staple";
 let elements;
 function fakeElement() {
    return {
        value: "",
        textContent: "",
        style: {},
        classList: { toggle: () => {} },
        listeners: {},
        addEventListener(event, handler) {
            this.listeners[event] = handler;
        },
    };
 }
 // Stands in for document.getElementById(): one fake element per id.
 function element(id) {
    return (elements[id] ||= fakeElement());
 }
 jest.doMock("../src/popup/views/helpers", () => ({
    $: element,
    showView: () => {},
    showFlash: () => {},
    showError: () => {},
    hideError: () => {},
    goBack: () => {},
    clearViewStack: () => {},
    onViewLeave: () => {},
 }));
 // state.js reads chrome.storage.local at load, and saveState() writes it.
 globalThis.chrome = {
    storage: { local: { get: async () => ({}), set: async () => {} } },
 };
 const { state } = require("../src/shared/state");
 const addWallet = require("../src/popup/views/addWallet");
 let logged;
 beforeEach(() => {
    elements = {};
    logged = [];
    state.wallets = [];
    state.rpcUrl = "https://rpc.example.invalid";
    state.networkId = "mainnet";
    for (const method of ["warn", "error"]) {
        jest.spyOn(console, method).mockImplementation((...args) => {
            logged.push(args.map(String).join(" "));
        });
    }
    // What the scan found is logged at info level, which is not under test.
    jest.spyOn(console, "log").mockImplementation(() => {});
    FetchRequest.registerGetUrl(async () => {
        throw new TypeError("Failed to fetch");
    });
 });
 afterEach(() => {
    FetchRequest.registerGetUrl(FetchRequest.createGetUrlFunc());
    jest.restoreAllMocks();
 });
 describe.each([
    ["a recovery phrase", "mnemonic", "wallet-mnemonic", PHRASE],
    [
        "an extended private key",
        "xprv",
        "import-xprv-key",
        HDNodeWallet.fromSeed(Mnemonic.fromPhrase(PHRASE).computeSeed())
            .extendedKey,
    ],
 ])("creating a wallet from %s", (_name, mode, field, secret) => {
    // Enters `secret` on the add-wallet screen, presses its button and waits
    // for the address scan that follows.
    async function create(pageClosed) {
        addWallet.init({
            renderWalletList: () => {},
            startRefresh: () => {},
            pageClosed,
        });
        element("tab-" + mode).listeners.click();
        element(field).value = secret;
        element("add-wallet-password").value = PASSWORD;
        element("add-wallet-password-confirm").value = PASSWORD;
        await element("btn-add-wallet-confirm").listeners.click();
    }
    test("a scan failure while the popup is open is reported", async () => {
        await create(new AbortController().signal);
        expect(state.wallets).toHaveLength(1);
        expect(logged).not.toEqual([]);
        for (const line of logged) {
            expect(line).toContain("scanForAddresses check failed");
        }
    });
    test("a scan failure once the popup has closed is not", async () => {
        const pageClosed = new AbortController();
        pageClosed.abort();
        await create(pageClosed.signal);
        expect(state.wallets).toHaveLength(1);
        expect(logged).toEqual([]);
    });
 });
@@ -1,39 +0,0 @@
 // The confirmation screen's warning for a recipient that has never sent a
 // transaction (https://git.eeqj.de/sneak/AutistMask/issues/528).
 //
 // The node's transaction count for an address is the number of transactions
 // it has sent, so an address that only ever receives, such as a savings
 // address or an exchange deposit address, has a count of zero. The warning
 // used to fire on that count alone. It now also needs a zero balance: ETH an
 // address received stays in its balance until it sends a transaction.
 "use strict";
 const { getFullWarnings } = require("../src/shared/addressWarnings");
 global.fetch = jest.fn(async () => {
    throw new Error("tests must not perform network requests");
 });
 const RECIPIENT = "0x" + "b".repeat(40);
 // The warning types getFullWarnings() returns for RECIPIENT when the node
 // reports it as a regular address with `txCount` sent transactions and a
 // balance of `balance` wei.
 async function warningTypes(txCount, balance) {
    const provider = {
        getCode: async () => "0x",
        getTransactionCount: async () => txCount,
        getBalance: async () => balance,
    };
    const warnings = await getFullWarnings(RECIPIENT, provider);
    return warnings.map((w) => w.type);
 }
 test("a recipient that has received 0.5 ETH and never sent a transaction gets no warning", async () => {
    expect(await warningTypes(0, 500000000000000000n)).toEqual([]);
 });
 test("a recipient that has never sent a transaction and holds no ETH gets the warning", async () => {
    expect(await warningTypes(0, 0n)).toEqual(["new-address"]);
 });
@@ -1,19 +0,0 @@
 // The token names and URLs in src/shared/tokenList.js are written from
 // script/lib/token-enrichment.json by script/lib/apply-enrichment.js
 // (`make apply-enrichment`). This fails when the committed list differs from
 // what the script writes from the committed data, and when the data or the
 // script's table of websites has an address that no entry in the list matches.
 const fs = require("fs");
 const path = require("path");
 const enrichment = require("../script/lib/token-enrichment.json");
 const { applyEnrichment } = require("../script/lib/apply-enrichment");
 test("src/shared/tokenList.js is what make apply-enrichment writes from the committed data", () => {
    const committed = fs.readFileSync(
        path.join(__dirname, "..", "src/shared/tokenList.js"),
        "utf8",
    );
    expect(applyEnrichment(committed, enrichment)).toBe(committed);
 });
@@ -68,14 +68,7 @@ function swapData(amountIn, amountOutMin) {
 }
 function swapDetail(amountIn, amountOutMin, label) {
-    // Sent by the address the swap pays, so the output is the user's.
+    const decoded = uniswap.decode(swapData(amountIn, amountOutMin), ROUTER);
    const decoded = uniswap.decode(
        swapData(amountIn, amountOutMin),
        ROUTER,
        "0x1",
        {},
        RECIPIENT,
    );
    return decoded.details.find((d) => d.label === label);
 }
@@ -136,9 +136,7 @@ async function openTxApproval(approvedTx) {
            xpub: "xpub-wallet-1",
            encryptedSecret: "encrypted-secret-1",
            nextIndex: 1,
-            addresses: [
+            addresses: [{ address: FROM, balance: "0", tokenBalances: [] }],
                { address: FROM, index: 0, balance: "0", tokenBalances: [] },
            ],
        },
    ];
    approval.init({});
@@ -1,5 +1,5 @@
-// The connection, transaction, signature and network switch prompts name the
+// The connection, transaction and signature prompts name the site by its full
-// site by its full origin, scheme and port included, not by its bare hostname
+// origin, scheme and port included, not by its bare hostname
 // (https://git.eeqj.de/sneak/AutistMask/issues/402). A page served over http,
 // or on another port, of a host the user trusts over https must not raise a
 // prompt that reads as that trusted site.
@@ -104,7 +104,6 @@ beforeEach(() => {
 test("the connection prompt shows the origin", async () => {
    await openApproval({});
    expect(node("approve-origin").textContent).toBe(ORIGIN);
    expect(node("view-approve-site").classList.contains("hidden")).toBe(false);
 });
 test("the transaction prompt shows the origin", async () => {
@@ -139,24 +138,3 @@ test("the signature prompt shows the origin", async () => {
    });
    expect(node("approve-sign-origin").textContent).toBe(ORIGIN);
 });
 test("the network switch prompt shows the origin and both networks", async () => {
    await openApproval({
        type: "network",
        currentNetworkId: "mainnet",
        requestedNetworkId: "sepolia",
    });
    expect(node("approve-network-origin").textContent).toBe(ORIGIN);
    expect(node("approve-network-current").textContent).toBe(
        "Ethereum Mainnet",
    );
    expect(node("approve-network-requested").textContent).toBe(
        "Sepolia Testnet",
    );
    // Its own screen, and not the connection prompt, whose "Allow" answers
    // on the same port.
    expect(node("view-approve-network").classList.contains("hidden")).toBe(
        false,
    );
    expect(node("view-approve-site").classList.contains("hidden")).toBe(true);
 });
@@ -1,270 +0,0 @@
 // The approval screen for a site's Sepolia token transfer while Ethereum
 // Mainnet is active.
 //
 // The screen named the token, and scaled its amount, from the active network's
 // tracked tokens and balances, so a token the wallet tracks on Sepolia read as
 // an unknown token with its amount in base units, and the screens after it
 // labelled the amount `?` (https://git.eeqj.de/sneak/AutistMask/issues/629).
 // It now uses what the wallet knows of the tokens on the network the
 // transaction is for.
 //
 // Its address links opened the active network's explorer
 // (https://git.eeqj.de/sneak/AutistMask/issues/631). They now open the
 // explorer of the network the transaction is for.
 //
 // Driven through the real approval screen, password and Confirm included,
 // against a minimal DOM stub in the shape tests/swapStatusAmount.test.js uses.
 // The vault is mocked so that no password has to be hashed.
 jest.mock("../src/shared/vault", () => ({
    decryptWithPassword: jest.fn(),
 }));
 globalThis.chrome = {
    storage: { local: { get: async () => ({}), set: async () => {} } },
 };
 const { Interface } = require("ethers");
 const { state } = require("../src/shared/state");
 const { NETWORKS } = require("../src/shared/networks");
 const { decryptWithPassword } = require("../src/shared/vault");
 const approval = require("../src/popup/views/approval");
 const txStatus = require("../src/popup/views/txStatus");
 // A well-known test phrase, and its first address.
 const PHRASE = "test test test test test test test test test test test junk";
 const FROM = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266";
 const RECIPIENT = "0x711e691962E5c054b78071C789A0C8CE657377aD";
 // A token the bundled token list does not name.
 const TOKEN = "0x74de5d4FCbf63E00296fd95d33236B9794016631";
 // FROM sends 1234.5 of the 6-decimal token to RECIPIENT.
 const TRANSFER_DATA = new Interface([
    "function transfer(address to, uint256 amount)",
 ]).encodeFunctionData("transfer", [RECIPIENT, 1234500000n]);
 function makeElement(id) {
    const classes = new Set();
    const el = {
        id,
        textContent: "",
        value: "",
        innerHTML: "",
        disabled: false,
        style: {},
        dataset: {},
        listeners: {},
        classList: {
            add: (...names) => names.forEach((n) => classes.add(n)),
            remove: (...names) => names.forEach((n) => classes.delete(n)),
            contains: (n) => classes.has(n),
            toggle: (n, force) => {
                const on = force === undefined ? !classes.has(n) : force;
                if (on) classes.add(n);
                else classes.delete(n);
                return on;
            },
        },
        addEventListener: (name, fn) => {
            el.listeners[name] = el.listeners[name] || [];
            el.listeners[name].push(fn);
        },
        querySelectorAll: () => [],
        appendChild: () => {},
    };
    // Views reach for .parentElement to hide whole sections.
    Object.defineProperty(el, "parentElement", {
        get: () => node(id + "-parent"),
    });
    return el;
 }
 function makeDocument() {
    const els = new Map();
    return {
        getElementById(id) {
            // The debug banner is created on demand by helpers.js; absent
            // is the state a non-debug, non-testnet popup is in.
            if (id === "debug-banner") return null;
            if (!els.has(id)) els.set(id, makeElement(id));
            return els.get(id);
        },
        createElement: () => makeElement("created"),
        body: { prepend: () => {} },
    };
 }
 function node(id) {
    return globalThis.document.getElementById(id);
 }
 function click(id) {
    return Promise.all((node(id).listeners.click || []).map((fn) => fn()));
 }
 // One line of the decoded details: its label and what is drawn under it.
 function decodedLine(label) {
    return node("approve-tx-decoded-details")
        .innerHTML.split('<div class="mb-2">')
        .find((line) =>
            line.startsWith(`<div class="text-muted">${label}</div>`),
        );
 }
 // Open the approval screen, with Ethereum Mainnet active and FROM holding
 // `tokenBalances` there, for the site's transaction sending TRANSFER_DATA to
 // the token, on Sepolia unless `chainId` names another chain. Confirm answers
 // the signed transaction with a failure, which leads to the error screen.
 async function showTokenTransfer(
    tokenBalances = [],
    chainId = NETWORKS.sepolia.chainId,
 ) {
    globalThis.document = makeDocument();
    globalThis.window = { location: { search: "" }, close: () => {} };
    globalThis.chrome.runtime = {
        connect: () => ({ postMessage: () => {} }),
        sendMessage: (msg, reply) => {
            if (!reply) return;
            if (msg.type !== "AUTISTMASK_GET_APPROVAL") {
                return reply({
                    error: "The transaction could not be sent.",
                    retryable: false,
                });
            }
            reply({
                type: "tx",
                origin: "https://dapp.example",
                isPhishingDomain: false,
                approvedFrom: FROM,
                approvedTx: {
                    type: 2,
                    from: FROM,
                    chainId,
                    nonce: "0x7",
                    gasLimit: "0x30d40",
                    maxPriorityFeePerGas: "0x3b9aca00",
                    maxFeePerGas: "0x77359400",
                    to: TOKEN,
                    value: "0x0",
                    data: TRANSFER_DATA,
                    accessList: [],
                },
            });
        },
    };
    state.networkId = "mainnet";
    state.activeAddress = FROM;
    state.wallets = [
        {
            type: "hd",
            name: "Wallet 1",
            xpub: "xpub-wallet-1",
            encryptedSecret: "encrypted-secret-1",
            nextIndex: 1,
            addresses: [
                { address: FROM, index: 0, balance: "0", tokenBalances },
            ],
        },
    ];
    state.currentView = null;
    txStatus.init({ doRefreshAndRender: () => {} });
    approval.init({});
    await approval.show(1);
 }
 async function confirm() {
    decryptWithPassword.mockResolvedValue(PHRASE);
    node("approve-tx-password").value = "any password";
    await click("btn-approve-tx");
 }
 beforeEach(() => {
    state.trackedTokens = [];
    state.networkTrackedTokens = {};
 });
 describe("a token tracked on Sepolia only", () => {
    beforeEach(() => {
        state.networkTrackedTokens = {
            sepolia: [{ address: TOKEN, symbol: "TDOL", decimals: 6 }],
        };
    });
    test("is named on the Contract line and the decoded Token line, with its amount at its scale", async () => {
        await showTokenTransfer();
        expect(node("approve-tx-to").innerHTML).toContain(
            '<div class="font-bold mb-1">TDOL</div>',
        );
        expect(decodedLine("Token")).toContain(
            '<div class="font-bold">TDOL</div>',
        );
        expect(decodedLine("Amount")).toContain(
            '<div class="font-bold">1234.5000 TDOL</div>',
        );
    });
    test("labels the amount on the error screen that follows", async () => {
        await showTokenTransfer();
        await confirm();
        expect(state.currentView).toBe("error-tx");
        expect(node("error-tx-summary").textContent).toBe("1234.5000 TDOL");
    });
 });
 // The same contract address on mainnet is another token, so what the wallet
 // tracks and holds there names nothing on Sepolia.
 test("a token tracked and held on mainnet only is not named, and its amount is in base units", async () => {
    state.trackedTokens = [{ address: TOKEN, symbol: "MDOL", decimals: 18 }];
    await showTokenTransfer([
        { address: TOKEN, symbol: "MDOL", decimals: 18, balance: "1.0" },
    ]);
    expect(node("approve-tx-to").innerHTML).not.toContain("MDOL");
    expect(decodedLine("Token")).toContain(
        '<div class="font-bold">Unknown token</div>',
    );
    expect(decodedLine("Amount")).toContain(
        '<div class="font-bold">1234500000 base units (decimals unknown)</div>',
    );
 });
 // The From and Contract lines, and the decoded Token and Recipient lines.
 test("every address links to the Sepolia explorer", async () => {
    await showTokenTransfer();
    const sepolia = NETWORKS.sepolia.explorerUrl;
    expect(node("approve-tx-from").innerHTML).toContain(
        `href="${sepolia}/address/${FROM}"`,
    );
    expect(node("approve-tx-to").innerHTML).toContain(
        `href="${sepolia}/address/${TOKEN}"`,
    );
    expect(decodedLine("Token")).toContain(
        `href="${sepolia}/address/${TOKEN}"`,
    );
    expect(decodedLine("Recipient")).toContain(
        `href="${sepolia}/address/${RECIPIENT}"`,
    );
    for (const id of [
        "approve-tx-from",
        "approve-tx-to",
        "approve-tx-decoded-details",
    ]) {
        expect(node(id).innerHTML).not.toContain(NETWORKS.mainnet.explorerUrl);
    }
 });
 // Chain id 1337 names no network here, so it has no explorer to link to.
 test("a transaction on a chain id that names no network is shown with no address links", async () => {
    await showTokenTransfer([], "0x539");
    expect(state.currentView).toBe("approve-tx");
    expect(node("approve-tx-network").textContent).toBe(
        "Unknown network (chain id 1337)",
    );
    expect(node("approve-tx-from").innerHTML).toContain(FROM);
    for (const id of [
        "approve-tx-from",
        "approve-tx-to",
        "approve-tx-decoded-details",
    ]) {
        expect(node(id).innerHTML).not.toContain("href=");
    }
 });
@@ -9,7 +9,7 @@
 // requesting page or the RPC node can say turns it into an approval that
 // should never have been raised.
-const { Network, Transaction, Wallet, toQuantity } = require("ethers");
+const { Network, Wallet } = require("ethers");
 const {
    prepareApprovalTx,
    serializeApprovedTx,
@@ -138,49 +138,6 @@ describe("prepareApprovalTx", () => {
        expect(approved.maxFeePerGas).toBe("0x12a05f200");
    });
    // `gas` is the JSON-RPC name for the gas limit and the one sites send.
    // The node is still asked for its estimate, with the site's gas limit,
    // because the estimate is the check that the transaction does not revert.
    // It estimates 21000; the site's 200000 is what is shown and what is
    // signed.
    test("uses the gas limit a site sends as gas", async () => {
        const estimateGas = jest.fn(async () => 21000n);
        const approved = await prepareApprovalTx(
            providerWith({ estimateGas }),
            signer.address,
            { ...TX_PARAMS, gas: "0x30d40" },
        );
        expect(estimateGas).toHaveBeenCalledWith(
            expect.objectContaining({ gasLimit: 200000n }),
        );
        expect(approved.gasLimit).toBe("0x30d40");
        const signed = Transaction.from(
            await signer.signTransaction({ ...approved }),
        );
        expect(signed.gasLimit).toBe(200000n);
    });
    test("accepts gas and gasLimit that name the same number", async () => {
        const approved = await prepareApprovalTx(
            providerWith(),
            signer.address,
            { ...TX_PARAMS, gas: "0x30d40", gasLimit: 200000 },
        );
        expect(approved.gasLimit).toBe("0x30d40");
    });
    test("refuses gas and gasLimit that disagree", async () => {
        await expect(
            prepareApprovalTx(providerWith(), signer.address, {
                ...TX_PARAMS,
                gas: "0x30d40",
                gasLimit: "0x5208",
            }),
        ).rejects.toThrow(
            "The site asked for two different gas limits for this transaction.",
        );
    });
    test("carries an access list the request asked for", async () => {
        const approved = await prepareApprovalTx(
            providerWith(),
@@ -255,15 +212,6 @@ describe("prepareApprovalTx", () => {
        ).rejects.toThrow(/gas limit no network this wallet supports/);
    });
    test("refuses a gas limit the site sent above the ceiling", async () => {
        await expect(
            prepareApprovalTx(providerWith(), signer.address, {
                ...TX_PARAMS,
                gas: toQuantity(MAX_GAS_LIMIT + 1n),
            }),
        ).rejects.toThrow(/gas limit no network this wallet supports/);
    });
    // The combined bound at population: a gas limit and a fee that are each
    // under their own ceiling but multiply to thousands of ETH is refused
    // before the approval window opens, so the user is never shown a
@@ -303,22 +251,6 @@ describe("prepareApprovalTx", () => {
        expect(thrown.message).toMatch(/^[A-Z].*\.$/);
    });
    test("fails back a reverting request that sends its own gas limit", async () => {
        const reverting = providerWith({
            estimateGas: async () => {
                throw new Error("execution reverted: ERC20: transfer amount");
            },
        });
        await expect(
            prepareApprovalTx(reverting, signer.address, {
                ...TX_PARAMS,
                gas: "0x30d40",
            }),
        ).rejects.toThrow(
            /^The transaction could not be prepared: execution reverted/,
        );
    });
    // Without a bound, an unreachable node leaves the page's promise pending
    // with nothing on screen to explain it.
    test("gives up on a node that never answers", async () => {
@@ -341,28 +273,6 @@ describe("prepareApprovalTx", () => {
            jest.useRealTimers();
        }
    });
    // The estimate of a request carrying the site's gas limit is a call of its
    // own, made before populating, and is bounded the same way.
    test("gives up on a node that never answers the estimate of a request that sends its own gas limit", async () => {
        jest.useFakeTimers();
        try {
            const hanging = providerWith({
                estimateGas: () => new Promise(() => {}),
            });
            const pending = prepareApprovalTx(hanging, signer.address, {
                ...TX_PARAMS,
                gas: "0x30d40",
            });
            const settled = expect(pending).rejects.toThrow(
                /did not answer in time/,
            );
            await jest.advanceTimersByTimeAsync(POPULATE_TIMEOUT_MS + 1);
            await settled;
        } finally {
            jest.useRealTimers();
        }
    });
 });
 describe("serializeApprovedTx", () => {
@@ -1,192 +0,0 @@
 // The USD value on the approval screen's Value and Network fee lines, for a
 // site's ETH send.
 //
 // It was worked out from the four-decimal figure the line shows, at the price
 // on the active network, so the same value read a few cents different here than
 // on the confirmation screen, which prices the exact amount at the price on the
 // transaction's own network, and a transaction on another network than the
 // active one was priced at the active one's rate, its fee too
 // (https://git.eeqj.de/sneak/AutistMask/issues/614).
 //
 // Driven through the real approval screen, against a minimal DOM stub in the
 // shape tests/approvalTokenNetwork.test.js uses.
 globalThis.chrome = {
    storage: { local: { get: async () => ({}), set: async () => {} } },
 };
 const { state } = require("../src/shared/state");
 const { NETWORKS } = require("../src/shared/networks");
 const { prices, clearPrices } = require("../src/shared/prices");
 const approval = require("../src/popup/views/approval");
 const FROM = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266";
 const RECIPIENT = "0x711e691962E5c054b78071C789A0C8CE657377aD";
 function makeElement(id) {
    const classes = new Set();
    const el = {
        id,
        textContent: "",
        value: "",
        innerHTML: "",
        disabled: false,
        style: {},
        dataset: {},
        listeners: {},
        classList: {
            add: (...names) => names.forEach((n) => classes.add(n)),
            remove: (...names) => names.forEach((n) => classes.delete(n)),
            contains: (n) => classes.has(n),
            toggle: (n, force) => {
                const on = force === undefined ? !classes.has(n) : force;
                if (on) classes.add(n);
                else classes.delete(n);
                return on;
            },
        },
        addEventListener: (name, fn) => {
            el.listeners[name] = el.listeners[name] || [];
            el.listeners[name].push(fn);
        },
        querySelectorAll: () => [],
        appendChild: () => {},
    };
    // Views reach for .parentElement to hide whole sections.
    Object.defineProperty(el, "parentElement", {
        get: () => node(id + "-parent"),
    });
    return el;
 }
 function makeDocument() {
    const els = new Map();
    return {
        getElementById(id) {
            // The debug banner is created on demand by helpers.js; absent
            // is the state a non-debug, non-testnet popup is in.
            if (id === "debug-banner") return null;
            if (!els.has(id)) els.set(id, makeElement(id));
            return els.get(id);
        },
        createElement: () => makeElement("created"),
        body: { prepend: () => {} },
    };
 }
 function node(id) {
    return globalThis.document.getElementById(id);
 }
 // Open the approval screen, with the network `networkId` active, for the
 // site's transaction sending 1.23414 ETH to RECIPIENT on the chain `chainId`.
 async function showEthSend(chainId, networkId) {
    globalThis.document = makeDocument();
    globalThis.window = { location: { search: "" }, close: () => {} };
    globalThis.chrome.runtime = {
        connect: () => ({ postMessage: () => {} }),
        sendMessage: (msg, reply) => {
            if (!reply) return;
            reply({
                type: "tx",
                origin: "https://dapp.example",
                isPhishingDomain: false,
                approvedFrom: FROM,
                approvedTx: {
                    type: 2,
                    from: FROM,
                    chainId,
                    nonce: "0x7",
                    gasLimit: "0x5208",
                    maxPriorityFeePerGas: "0x3b9aca00",
                    maxFeePerGas: "0x77359400",
                    to: RECIPIENT,
                    value: "1234140000000000000",
                    data: "0x",
                    accessList: [],
                },
            });
        },
    };
    state.networkId = networkId;
    state.activeAddress = FROM;
    state.wallets = [
        {
            type: "hd",
            name: "Wallet 1",
            xpub: "xpub-wallet-1",
            encryptedSecret: "encrypted-secret-1",
            nextIndex: 1,
            addresses: [{ address: FROM, index: 0, balance: "0" }],
        },
    ];
    state.trackedTokens = [];
    state.networkTrackedTokens = {};
    state.currentView = null;
    approval.init({});
    await approval.show(1);
 }
 beforeEach(() => {
    prices.ETH = 2000;
 });
 afterEach(() => {
    clearPrices();
 });
 // 1.23414 ETH reads 1.2341 ETH. At $2,000 the exact value is $2,468.28, the
 // figure the confirmation screen shows for it; the shown figure would be
 // $2,468.20.
 test.each([
    [
        "a mainnet transaction is priced from its exact value",
        NETWORKS.mainnet.chainId,
        "mainnet",
        "1.2341 ETH ($2,468.28)",
    ],
    [
        "a mainnet transaction shown with Sepolia active is priced at the mainnet price",
        NETWORKS.mainnet.chainId,
        "sepolia",
        "1.2341 ETH ($2,468.28)",
    ],
    [
        "a Sepolia transaction shown with mainnet active has no USD value",
        NETWORKS.sepolia.chainId,
        "mainnet",
        "1.2341 SepoliaETH",
    ],
    // Chain id 1337 names no network here, so nothing knows its price.
    [
        "a transaction on a chain id that names no network has no USD value",
        "0x539",
        "mainnet",
        "1.2341 ETH",
    ],
 ])("%s", async (_label, chainId, networkId, expected) => {
    await showEthSend(chainId, networkId);
    expect(state.currentView).toBe("approve-tx");
    expect(node("approve-tx-value").textContent).toBe(expected);
 });
 // The Network fee line is priced on the transaction's network too. 21000 gas at
 // up to 2 gwei is 0.000042 ETH, $0.08 at $2,000.
 test.each([
    [
        "the fee of a mainnet transaction shown with Sepolia active is priced at the mainnet price",
        NETWORKS.mainnet.chainId,
        "sepolia",
        "0.00004 ETH ($0.08)",
    ],
    [
        "the fee of a Sepolia transaction shown with mainnet active has no USD value",
        NETWORKS.sepolia.chainId,
        "mainnet",
        "0.00004 SepoliaETH",
    ],
 ])("%s", async (_label, chainId, networkId, expected) => {
    await showEthSend(chainId, networkId);
    expect(state.currentView).toBe("approve-tx");
    expect(node("approve-tx-fee").textContent).toBe(expected);
 });
@@ -58,6 +58,7 @@ const TX_PARAMS = {
    to: RECIPIENT,
    value: "0x2386f26fc10000",
    data: "0xdeadbeef",
    gas: "0x5208",
 };
 // The values populateTransaction() fills in when the dApp fixed none of them.
@@ -1454,11 +1455,7 @@ describe("background population to popup signing to verification", () => {
    // What the popup does with it: signs it as given, populating nothing.
    async function popupSigns(approvedTx) {
-        const localSigner = getSignerForAddress(
+        const localSigner = getSignerForAddress(walletData, 0, SIGNER_KEY);
            walletData,
            { address: signer.address },
            SIGNER_KEY,
        );
        return localSigner.signTransaction({ ...approvedTx });
    }
@@ -1553,11 +1550,7 @@ describe("background population to popup signing to verification", () => {
    // address the user has switched to.
    test("the approved from stops the popup signing with another key", async () => {
        const approvedTx = await backgroundPrepares(TX_PARAMS);
-        const otherSigner = getSignerForAddress(
+        const otherSigner = getSignerForAddress(walletData, 0, OTHER_KEY);
            walletData,
            { address: other.address },
            OTHER_KEY,
        );
        await expect(
            otherSigner.signTransaction({ ...approvedTx }),
        ).rejects.toThrow(/from address mismatch/);
@@ -1,176 +0,0 @@
 // The approval window shows no screen until the background has described the
 // approval it answers (https://git.eeqj.de/sneak/AutistMask/issues/408). The
 // connection prompt's "Allow" and the network switch prompt's "Switch" answer
 // on the same port, so a window that showed the connection prompt while it
 // waited could approve a network switch.
 //
 // Booted through the real popup entry point, which is where the connection
 // prompt used to be put up before the background had answered.
 const {
    bootPopup,
    cleanupPopup,
    settle,
    unversionedValidProfile,
 } = require("./support/popupBoot");
 afterEach(cleanupPopup);
 test("the approval window shows no screen until the background describes the approval", async () => {
    // The background's answer, held until the test gives it.
    let answer = null;
    const env = await bootPopup(unversionedValidProfile(), {
        search: "?approval=approval-1",
        runtime: {
            connect: () => ({ postMessage: () => {} }),
            sendMessage: (msg, reply) => {
                if (msg.type === "AUTISTMASK_GET_APPROVAL") answer = reply;
            },
        },
    });
    expect(answer).not.toBeNull();
    // No screen at all, the connection prompt included.
    expect(env.visibleViews()).toEqual([]);
    answer({
        type: "network",
        origin: "https://dapp.example",
        currentNetworkId: "mainnet",
        requestedNetworkId: "sepolia",
        isPhishingDomain: false,
    });
    await settle();
    expect(env.visibleViews()).toEqual(["approve-network"]);
    expect(env.pageErrors).toEqual([]);
 });
 // The background opens the approval window as wide as the page, but the
 // browser counts the window's frame in that width, and a screen taller than
 // the window takes a vertical scrollbar out of it too
 // (https://git.eeqj.de/sneak/AutistMask/issues/518). The browser suites run
 // without frames, and only the Firefox suite's sign prompt at a zoom other
 // than 100%, so the widening is checked here too.
 //
 // A window 396 screen pixels wide whose page is drawn at `drawn` screen pixels
 // to the page pixel. Widening it gives the page its new width, less the 15
 // screen pixels of the scrollbar the approval screen has, and then calls the
 // page's resize listeners, each of which asked to be called once.
 function windowsStub(type, drawn) {
    const updates = [];
    return {
        updates,
        getCurrent: (done) => done({ id: 7, type, width: 396 }),
        update: (id, info, done) => {
            updates.push({ id, info });
            done({});
            globalThis.document.documentElement.clientWidth = Math.floor(
                (info.width - 15) / drawn,
            );
            const resized = globalThis.window.listeners.resize || [];
            globalThis.window.listeners.resize = [];
            for (const fn of resized) fn();
        },
    };
 }
 // The approval page's own tab is at `zoom`. Asked without a tab id, Firefox
 // answers for the window focused last, here a site's tab at 100%.
 function tabsStub(zoom) {
    return {
        getCurrent: (done) => done({ id: 11 }),
        getZoom: (...args) => {
            const done = args.pop();
            done(args[0] === 11 ? zoom : 1);
        },
    };
 }
 // An approval window at `zoom`, `clientWidth` page pixels wide before its
 // screen is up, whose background holds its answer until the test gives it.
 async function bootZoomedApprovalWindow(windows, zoom, clientWidth) {
    let answer = null;
    const env = await bootPopup(unversionedValidProfile(), {
        search: "?approval=approval-1",
        runtime: {
            connect: () => ({ postMessage: () => {} }),
            sendMessage: (msg, reply) => {
                if (msg.type === "AUTISTMASK_GET_APPROVAL") answer = reply;
            },
        },
        windows,
        tabs: tabsStub(zoom),
        documentElement: { scrollWidth: 396, clientWidth },
    });
    return { env, answer };
 }
 test("at 150% zoom the approval window widens by what its screen lacks, scrollbar included", async () => {
    const windows = windowsStub("popup", 1.5);
    // At 150% a window 396 screen pixels wide shows 264 page pixels.
    const { env, answer } = await bootZoomedApprovalWindow(windows, 1.5, 264);
    // Not before there is a screen to fit.
    expect(windows.updates).toEqual([]);
    // The screen is taller than the window, so once it is up a vertical
    // scrollbar takes 15 screen pixels, 10 page pixels at 150%.
    env.document.documentElement.clientWidth = 254;
    answer({
        type: "network",
        origin: "https://dapp.example",
        currentNetworkId: "mainnet",
        requestedNetworkId: "sepolia",
        isPhishingDomain: false,
    });
    await settle();
    // 396 - 254 = 142 page pixels short, which at 150% is 213 screen pixels.
    // At the 100% of the site's tab it would be 142, and the screen would
    // still not fit.
    expect(env.visibleViews()).toEqual(["approve-network"]);
    expect(windows.updates).toEqual([{ id: 7, info: { width: 609 } }]);
    expect(env.document.documentElement.clientWidth).toBe(396);
    expect(env.pageErrors).toEqual([]);
 });
 test("at 170% the approval window is widened again while its screen still falls short", async () => {
    // Firefox reports 170% as 1.7 but draws a page pixel about 1.714 screen
    // pixels wide, so a window 396 wide shows 231 page pixels.
    const windows = windowsStub("popup", 1.714);
    const { env, answer } = await bootZoomedApprovalWindow(windows, 1.7, 231);
    // Less the scrollbar once the screen is up.
    env.document.documentElement.clientWidth = 222;
    answer({
        type: "network",
        origin: "https://dapp.example",
        currentNetworkId: "mainnet",
        requestedNetworkId: "sepolia",
        isPhishingDomain: false,
    });
    await settle();
    // 174 page pixels short, so 296 screen pixels wider at 1.7. That shows 394
    // page pixels, still 2 short, so 4 screen pixels wider again.
    expect(windows.updates).toEqual([
        { id: 7, info: { width: 692 } },
        { id: 7, info: { width: 696 } },
    ]);
    const page = env.document.documentElement;
    expect(page.scrollWidth).toBeLessThanOrEqual(page.clientWidth);
    expect(env.pageErrors).toEqual([]);
 });
 test("a connection prompt in the toolbar popup leaves the browser window alone", async () => {
    const windows = windowsStub("normal", 1.5);
    const { env, answer } = await bootZoomedApprovalWindow(windows, 1.5, 264);
    answer({ origin: "https://dapp.example", isPhishingDomain: false });
    await settle();
    expect(env.visibleViews()).toEqual(["approve-site"]);
    expect(windows.updates).toEqual([]);
    expect(env.pageErrors).toEqual([]);
 });
@@ -52,7 +52,6 @@ const {
    resetRenderedViews,
 } = require("../src/popup/viewRouter");
 const { state } = require("../src/shared/state");
 const { restorableStack } = require("../src/shared/persistedState");
 const ADDRESS = "0x1111111111111111111111111111111111111111";
 const TOKEN = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48";
@@ -154,14 +153,7 @@ describe("Back onto a view the reopened popup never rendered", () => {
    test("Back onto the transaction detail renders it", () => {
        reopenedOn("settings", ["main", "transaction"], {
-            viewData: {
+            viewData: { tx: { hash: "0xdead", from: ADDRESS, to: ADDRESS } },
                tx: {
                    hash: "0xdead",
                    from: ADDRESS,
                    to: ADDRESS,
                    chainId: "0x1",
                },
            },
        });
        goBack();
        expect(calls).toEqual(["transactionDetail"]);
@@ -217,23 +209,6 @@ describe("Back onto a view the reopened popup never rendered", () => {
    });
 });
 // https://git.eeqj.de/sneak/AutistMask/issues/481. Settings, the recovery
 // phrase or delete wallet screen, the gear, then a reopen: the restored stack
 // is cut at the screen the gear left, which leaves Settings under the Settings
 // the popup reopens onto.
 describe("Back from Settings reopened over its own entry", () => {
    test.each(["show-phrase", "delete-wallet-confirm"])(
        "goes to the screen under it after leaving %s",
        (left) => {
            const stored = ["main", "settings", left];
            reopenedOn("settings", restorableStack(stored, "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", () => {
@@ -264,7 +264,6 @@ function loadBackground(options) {
                    connectListener = fn;
                },
            },
            getPlatformInfo: jest.fn((cb) => cb({ os: "linux" })),
            lastError: null,
        },
        windows: {
@@ -321,10 +320,9 @@ function loadBackground(options) {
    require("../src/background/index");
    // Send a message the way the browser would, and hand back whatever the
-    // handler passed to sendResponse. `onResponse`, when given, receives the
+    // handler passed to sendResponse.
-    // answer when the handler sends it, as the sender's callback does.
+    function send(msg, sender) {
-    function send(msg, sender, onResponse) {
+        const sendResponse = jest.fn();
        const sendResponse = jest.fn(onResponse);
        const kept = messageListener(msg, sender || {}, sendResponse);
        return { sendResponse, kept };
    }
@@ -386,26 +384,20 @@ function loadBackground(options) {
    // The same through eth_signTypedData_v4, whose params name the address
    // first and the typed data second.
-    function requestTypedData(typedData = TYPED_DATA) {
+    function requestTypedData() {
        let rpcResult = null;
        messageListener(
            {
                type: "AUTISTMASK_RPC",
                method: "eth_signTypedData_v4",
-                params: [signer.address, typedData],
+                params: [signer.address, TYPED_DATA],
            },
            { origin: ORIGIN },
            (r) => {
                rpcResult = r;
            },
        );
-        return {
+        return { result: () => rpcResult };
            id: () =>
                new URL(created[created.length - 1].url).searchParams.get(
                    "approval",
                ),
            result: () => rpcResult,
        };
    }
    // A dApp asking to connect. The origin defaults to one the persisted
@@ -880,45 +872,6 @@ describe("one transaction approval at a time", () => {
    });
 });
 // Chrome stops an idle worker, and the approvals in it go with it
 // (https://git.eeqj.de/sneak/AutistMask/issues/540). tests/e2e/slowApproval.js
 // shows the worker kept running in Chrome; this shows the calls stop once the
 // approval is answered, so the worker can stop again. Every kind of approval is
 // added through addPendingApproval(), which starts the calls, so a transaction
 // approval stands for all of them.
 describe("the worker keeps running while an approval is pending", () => {
    test("an extension call every 20 seconds until the approval is answered", async () => {
        const startTimer = jest
            .spyOn(global, "setInterval")
            .mockImplementation(() => 1);
        const stopTimer = jest
            .spyOn(global, "clearInterval")
            .mockImplementation(() => {});
        try {
            const bg = loadBackground();
            const calls = global.chrome.runtime.getPlatformInfo;
            bg.requestTx();
            await settle();
            expect(startTimer).toHaveBeenCalledTimes(1);
            expect(startTimer.mock.calls[0][1]).toBe(20000);
            const tick = startTimer.mock.calls[0][0];
            tick();
            expect(calls).toHaveBeenCalledTimes(1);
            // The user closes the approval window, which rejects it.
            bg.closeWindow(1);
            await settle();
            tick();
            expect(calls).toHaveBeenCalledTimes(1);
            expect(stopTimer).toHaveBeenCalledWith(1);
        } finally {
            startTimer.mockRestore();
            stopTimer.mockRestore();
        }
    });
 });
 // A page that asks again before the user has answered its last connection or
 // signature request is refused, instead of opening one more window per call.
 describe("one connection and one signature approval per site at a time", () => {
@@ -1162,12 +1115,9 @@ describe("a nonce collision is reported as a transaction that did not go out", (
        const pending = bg.requestTx();
        await settle();
        // As ethers throws it: its own classification, and the node's
        // JSON-RPC error under info.error.
        bg.broadcastTransaction.mockRejectedValue(
            Object.assign(new Error("nonce too low"), {
                code: "NONCE_EXPIRED",
                info: { error: { code: -32000, message: "nonce too low" } },
            }),
        );
        const answer = bg.send(
@@ -1186,10 +1136,8 @@ describe("a nonce collision is reported as a transaction that did not go out", (
            retryable: false,
            stage: "nonce",
        });
        // The wallet's sentence, with the node's own code.
        expect(pending.result()).toEqual({
            error: {
                code: -32000,
                message: expect.stringMatching(
                    /transaction was not sent, because its nonce/,
                ),
@@ -1239,7 +1187,6 @@ describe("a nonce collision is reported as a transaction that did not go out", (
        });
        expect(second.result()).toEqual({
            error: {
                code: -32603,
                message: expect.stringMatching(/nonce had already been used/),
            },
        });
@@ -1330,7 +1277,6 @@ describe("what the approval is verified against", () => {
        );
        expect(pending.result()).toEqual({
            error: {
                code: -32603,
                message: expect.stringMatching(/approved maximum fee per gas/),
            },
        });
@@ -1390,10 +1336,7 @@ describe("what the approval is verified against", () => {
            expect.objectContaining({ retryable: false, stage: "verify" }),
        );
        expect(pending.result()).toEqual({
-            error: {
+            error: { message: expect.stringMatching(/active address changed/) },
                code: -32603,
                message: expect.stringMatching(/active address changed/),
            },
        });
    });
@@ -1537,102 +1480,10 @@ describe("what the approval is verified against", () => {
            }),
        );
        expect(pending.result()).toEqual({
-            error: {
+            error: { message: expect.stringMatching(/active address changed/) },
                code: -32603,
                message: expect.stringMatching(/active address changed/),
            },
        });
    });
    // Typed data whose domain names another chain is refused on the sign
    // screen; a signature for it that reaches the background anyway is not
    // handed to the page (https://git.eeqj.de/sneak/AutistMask/issues/519).
    // TYPED_DATA names mainnet.
    async function answerTypedData(bg, pending, typedData = TYPED_DATA) {
        const { domain, types, message } = JSON.parse(typedData);
        delete types.EIP712Domain;
        const signature = await signer.signTypedData(domain, types, message);
        const answer = bg.send(
            {
                type: "AUTISTMASK_SIGN_RESPONSE",
                id: pending.id(),
                approved: true,
                signature,
            },
            { url: bg.fromPopup.url },
        );
        await settle();
        return { answer, signature };
    }
    test("typed data for the active chain is handed back signed", async () => {
        const bg = loadBackground();
        const pending = bg.requestTypedData();
        await settle();
        const { answer, signature } = await answerTypedData(bg, pending);
        expect(answer.sendResponse).toHaveBeenCalledWith({ signature });
        expect(pending.result()).toEqual({ result: signature });
    });
    test("typed data for another chain is refused, not handed back", async () => {
        const bg = loadBackground();
        bg.setNetwork(SEPOLIA);
        const pending = bg.requestTypedData();
        await settle();
        const { answer } = await answerTypedData(bg, pending);
        const refusal =
            "This typed data is for chain id 1, but the active network is Sepolia Testnet (chain id 11155111), so it cannot be signed.";
        expect(answer.sendResponse).toHaveBeenCalledWith({
            error: refusal,
            retryable: false,
        });
        expect(pending.result()).toEqual({
            error: { code: -32603, message: refusal },
        });
    });
    // ethers signs a `bool` field sent as the string "false" as true, and one
    // left out as false. The sign screen refuses both; a signature for either
    // that reaches the background anyway is not handed to the page
    // (https://git.eeqj.de/sneak/AutistMask/issues/552).
    test.each([
        [
            '"false"',
            "false",
            'The field "approved" is not true or false, so this typed data cannot be signed.',
        ],
        [
            "left out",
            undefined,
            'The field "approved" is missing from the message, so this typed data cannot be signed.',
        ],
    ])(
        "typed data with a bool %s is refused, not handed back",
        async (_, approved, refusal) => {
            const data = JSON.parse(TYPED_DATA);
            data.types.Note.push({ name: "approved", type: "bool" });
            data.message.approved = approved;
            const typedData = JSON.stringify(data);
            const bg = loadBackground();
            const pending = bg.requestTypedData(typedData);
            await settle();
            const { answer } = await answerTypedData(bg, pending, typedData);
            expect(answer.sendResponse).toHaveBeenCalledWith({
                error: refusal,
                retryable: false,
            });
            expect(pending.result()).toEqual({
                error: { code: -32603, message: refusal },
            });
        },
    );
    test("a sign request from another address raises no approval at all", async () => {
        const bg = loadBackground();
        const pending = bg.requestSign(other.address);
@@ -1667,7 +1518,6 @@ describe("what the approval is verified against", () => {
        expect(pending.result()).toEqual({
            error: {
                code: -32603,
                message: expect.stringMatching(
                    /active address changed while this transaction was being prepared/,
                ),
@@ -1690,11 +1540,8 @@ describe("what the approval is verified against", () => {
        const pending = bg.requestTx();
        await settle();
        // A failure with no node error in it is answered as the wallet's own;
        // tests/rpcErrorCodes.test.js has the node's own revert.
        expect(pending.result()).toEqual({
            error: {
                code: -32603,
                message: expect.stringMatching(
                    /could not be prepared.*execution reverted/,
                ),
@@ -1704,55 +1551,6 @@ describe("what the approval is verified against", () => {
    });
 });
 // eth_sign names the address first and the data second, the reverse of
 // personal_sign, and is answered as the JSON-RPC specification defines it:
 // with an EIP-191 personal message signature over the data, the same
 // signature personal_sign returns
 // (https://git.eeqj.de/sneak/AutistMask/issues/409). The signature below is
 // made by the test; that the sign screen makes the same one is tested in
 // tests/ethSign.test.js.
 describe("eth_sign", () => {
    test("is read address first, and returns a personal message signature over the data", async () => {
        const bg = loadBackground();
        const page = bg.send(
            {
                type: "AUTISTMASK_RPC",
                method: "eth_sign",
                params: [signer.address, MESSAGE],
            },
            { origin: ORIGIN },
        );
        await settle();
        const id = approvalIdIn(bg.created.map((c) => c.url));
        const details = bg.send(
            { type: "AUTISTMASK_GET_APPROVAL", id },
            { url: bg.fromPopup.url },
        );
        const { signParams } = details.sendResponse.mock.calls[0][0];
        expect(signParams).toMatchObject({
            method: "eth_sign",
            message: MESSAGE,
            from: signer.address,
        });
        expect(signParams.dangerWarning).toBe(
            "This site used the older eth_sign method. " +
                "The data will be signed as a personal message.",
        );
        const signature = await signer.signMessage(
            Buffer.from(MESSAGE.slice(2), "hex"),
        );
        bg.send(
            { type: "AUTISTMASK_SIGN_RESPONSE", id, approved: true, signature },
            { url: bg.fromPopup.url },
        );
        await settle();
        expect(page.sendResponse).toHaveBeenCalledWith({ result: signature });
    });
 });
 // The interlock must not cost the retry the approval exists to allow.
 describe("the interlock releases a failed attempt", () => {
    test("a retryable failure before the broadcast leaves the approval usable", async () => {
@@ -2616,9 +2414,9 @@ async function siteAccounts(bg, origin) {
    return sendResponse.mock.calls[0][0];
 }
-// A site connected without "Remember" is held only in the background's session
+// A site connected without "Remember" is held only in the background's memory,
-// storage, keyed to the address it was connected to. Removing that address, or
+// keyed to the address it was connected to. Removing that address, or the
-// the wallet holding it, must end the connection as part of the removal itself.
+// wallet holding it, must end the connection as part of the removal itself.
 // The accountsChanged broadcast the views send afterwards also clears it, but
 // only when the active address moved, and nothing waits for it to arrive.
 //
@@ -2797,7 +2595,8 @@ describe("removing a site in Settings disconnects it", () => {
        const element = (id) => (lists[id] ||= fakeSiteList());
        global.document = { getElementById: element };
        global.chrome.runtime.sendMessage = (msg, callback) => {
-            bg.send(msg, bg.fromPopup, callback);
+            const { sendResponse } = bg.send(msg, bg.fromPopup);
            if (callback) callback(sendResponse.mock.calls[0]?.[0]);
        };
        await require("../src/shared/state").loadState();
        await require("../src/popup/views/settings").renderSiteLists();
@@ -2951,7 +2750,7 @@ describe("where an approval window opens", () => {
        await settle();
        expect(bg.created).toHaveLength(1);
-        expect(bg.created[0]).toMatchObject({ left: 442, top: 60 });
+        expect(bg.created[0]).toMatchObject({ left: 460, top: 60 });
    });
    test("not centred on an approval window the user was last in", async () => {
@@ -2968,7 +2767,7 @@ describe("where an approval window opens", () => {
        bg.requestSign();
        await settle();
-        // Centred, it would be at left 882, the position the browser refused.
+        // Centred, it would be at left 900, the position the browser refused.
        expect(bg.created).toHaveLength(1);
        expect(bg.created[0].left).toBeUndefined();
        expect(bg.created[0].top).toBeUndefined();
@@ -2990,7 +2789,7 @@ describe("where an approval window opens", () => {
        await settle();
        expect(bg.created).toHaveLength(2);
-        expect(bg.created[0]).toMatchObject({ left: 1502, top: 750 });
+        expect(bg.created[0]).toMatchObject({ left: 1520, top: 750 });
        expect(bg.created[1].left).toBeUndefined();
        expect(bg.created[1].top).toBeUndefined();
@@ -19,16 +19,12 @@
 //     that followed persisted the pre-refresh values — while still stamping
 //     lastBalanceRefresh, suppressing the redo.
 //
-// A network switch landing inside a balance refresh's round trip is covered at
+// Both use the real persistence path over a cloning storage stub. Nothing here
 // the end (https://git.eeqj.de/sneak/AutistMask/issues/577).
 //
 // All use the real persistence path over a cloning storage stub. Nothing here
 // asserts the absence of a loadState() call; each asserts the OUTCOME, so it
 // holds against any implementation that gets the outcome right.
 const { Wallet } = require("ethers");
 const { networkById } = require("../src/shared/networks");
 const { applyChainSwitchFields } = require("../src/shared/chainSwitchFields");
 const { makeStorageStub } = require("./support/storageStub");
 const SIGNER_KEY =
@@ -244,8 +240,8 @@ describe("a chain switch under a transaction already committed to a chain", () =
    // The artifact is verified against the chain read at the top of the
    // attempt. Whatever endpoint it is then broadcast to has to be that same
    // chain's — otherwise the wallet checks a transaction against Sepolia and
-    // sends it to a mainnet node. The user can switch the network in Settings
+    // sends it to a mainnet node. A connected site can switch the chain at any
-    // at any moment, including this one.
+    // moment, including this one.
    test("the artifact is broadcast to the endpoint of the chain it was verified against", async () => {
        const bg = loadWorker("sepolia");
@@ -268,9 +264,9 @@ describe("a chain switch under a transaction already committed to a chain", () =
            populated(Number(SEPOLIA.networkVersion)),
        );
-        // The user switches the network in Settings while the attempt is
+        // A connected site switches the chain while the attempt is running,
-        // running: the popup writes the switched record to storage in full
+        // and the switch is committed to storage in full before the attempt
-        // before the attempt goes any further.
+        // goes any further.
        //
        // It is fired from inside the attempt's SECOND state read, because
        // that is where the window used to be: the chain id was captured at
@@ -281,18 +277,18 @@ describe("a chain switch under a transaction already committed to a chain", () =
        // this to fire on, and the switch below runs after the attempt is
        // done instead — which is the point.
        let reads = 0;
-        let switched = false;
+        let switched = null;
-        const doSwitch = () => {
+        const doSwitch = async () => {
-            const record = bg.persisted();
+            switched = bg.rpc("wallet_switchEthereumChain", [
-            applyChainSwitchFields(record, MAINNET.id);
+                { chainId: MAINNET.chainId },
-            global.chrome.storage.write("autistmask", record);
+            ]);
-            switched = true;
+            await settle();
        };
        bg.setGetHook(async () => {
            reads++;
            if (reads !== 2) return;
            bg.setGetHook(null);
-            doSwitch();
+            await doSwitch();
        });
        const attempt = bg.send(
@@ -307,7 +303,8 @@ describe("a chain switch under a transaction already committed to a chain", () =
        await settle();
        bg.setGetHook(null);
-        if (!switched) doSwitch();
+        if (!switched) await doSwitch();
        expect(switched.result()).toEqual({ result: null });
        expect(bg.persisted().networkId).toBe("mainnet");
        await settle();
@@ -398,55 +395,3 @@ describe("a balance refresh under another handler's state read", () => {
        expect(after.wallets[0].addresses[0].balance).toBe(REFRESHED_BALANCE);
    });
 });
 describe("a balance refresh under a network switch", () => {
    // https://git.eeqj.de/sneak/AutistMask/issues/577. The switch clears every
    // address's balances, and a refresh that started on the previous network
    // must not write that network's back over them when it returns. The same
    // refresh in the popup is in tests/balanceRefreshNetworkSwitch.test.js.
    test("a refresh that returns after a switch writes nothing, and the next one runs on the new network", async () => {
        const roundTrip = deferred();
        const reachedNetwork = deferred();
        const ranOn = [];
        const bg = loadWorker("sepolia", {
            refreshBalances: async (
                wallets,
                rpcUrl,
                explorer,
                useBlockscout,
                tokens,
                id,
            ) => {
                ranOn.push(id);
                reachedNetwork.resolve();
                await roundTrip.promise;
                wallets[0].addresses[0].balance = REFRESHED_BALANCE;
            },
        });
        const refresh = bg.fireBalanceAlarm();
        await reachedNetwork.promise;
        // The user switches to Ethereum Mainnet in Settings while the round
        // trip is out.
        const during = bg.persisted();
        applyChainSwitchFields(during, MAINNET.id);
        global.chrome.storage.write("autistmask", during);
        roundTrip.resolve();
        await refresh;
        const after = bg.persisted();
        expect(after.networkId).toBe("mainnet");
        expect(after.wallets[0].addresses[0].balance).toBe("0");
        expect(after.lastBalanceRefresh).toBe(0);
        await bg.fireBalanceAlarm();
        expect(ranOn).toEqual(["sepolia", "mainnet"]);
        expect(bg.persisted().wallets[0].addresses[0].balance).toBe(
            REFRESHED_BALANCE,
        );
    });
 });
@@ -5,7 +5,7 @@
 //
 // The browser half of the same claim — that a real Chrome renders that
 // string as text and puts no iframe in the popup DOM — is in
-// tests/e2e/run.js. This half runs inside the 60-second make test cap.
+// tests/e2e/run.js. This half runs inside the 20-second make test cap.
 "use strict";
@@ -1,102 +0,0 @@
 // The balance refresh, and the address scan after a wallet is created, do not
 // report a request the popup's own closing cancelled, and still report one
 // that failed while the popup was open
 // (https://git.eeqj.de/sneak/AutistMask/issues/218,
 // https://git.eeqj.de/sneak/AutistMask/issues/475).
 //
 // In the popup a cancelled fetch() fails with the same "Failed to fetch" as a
 // server that cannot be reached, so every request here fails that way, and
 // only the signal the popup aborts on pagehide tells the two cases apart.
 const { FetchRequest } = require("ethers");
 const { refreshBalances, scanForAddresses } = require("../src/shared/balances");
 const {
    generateMnemonic,
    hdWalletFromMnemonic,
 } = require("../src/shared/wallet");
 const RPC_URL = "https://rpc.example.invalid";
 const EXPLORER_URL = "https://explorer.example.invalid/api/v2";
 const ADDRESS = "0x1111111111111111111111111111111111111111";
 const TRACKED = {
    address: "0x7777777777777777777777777777777777777777",
    symbol: "TRK",
    decimals: 6,
 };
 const realFetch = globalThis.fetch;
 let logged;
 beforeEach(() => {
    logged = [];
    jest.spyOn(console, "error").mockImplementation((...args) => {
        logged.push(args.map(String).join(" "));
    });
    const failedToFetch = async () => {
        throw new TypeError("Failed to fetch");
    };
    // The RPC calls (ETH balance, ENS name, the tracked token's balance, and
    // the scan's balance and transaction count) and the explorer request (the
    // other token balances) all fail the same way.
    FetchRequest.registerGetUrl(failedToFetch);
    globalThis.fetch = jest.fn(failedToFetch);
 });
 afterEach(() => {
    FetchRequest.registerGetUrl(FetchRequest.createGetUrlFunc());
    globalThis.fetch = realFetch;
    jest.restoreAllMocks();
 });
 function refresh(signal) {
    const wallets = [{ addresses: [{ address: ADDRESS }] }];
    return refreshBalances(
        wallets,
        RPC_URL,
        EXPLORER_URL,
        true,
        [TRACKED],
        "mainnet",
        signal,
    );
 }
 test("a failure while the popup is open is reported", async () => {
    await refresh(new AbortController().signal);
    for (const label of [
        "ETH balance failed",
        "ENS reverse failed",
        "token balance failed",
        "fetchTokenBalances failed: Failed to fetch",
    ]) {
        expect(logged.some((line) => line.includes(label))).toBe(true);
    }
 });
 test("a failure once the popup has closed is not", async () => {
    const pageClosed = new AbortController();
    pageClosed.abort();
    await refresh(pageClosed.signal);
    expect(logged).toEqual([]);
 });
 function scan(signal) {
    // What the scan found is logged at info level, which is not under test.
    jest.spyOn(console, "log").mockImplementation(() => {});
    const { xpub } = hdWalletFromMnemonic(generateMnemonic());
    return scanForAddresses(xpub, RPC_URL, "mainnet", signal);
 }
 test("a scan failure while the popup is open is reported", async () => {
    await scan(new AbortController().signal);
    expect(
        logged.some((line) => line.includes("scanForAddresses check failed")),
    ).toBe(true);
 });
 test("a scan failure once the popup has closed is not", async () => {
    const pageClosed = new AbortController();
    pageClosed.abort();
    await scan(pageClosed.signal);
    expect(logged).toEqual([]);
 });
@@ -1,161 +0,0 @@
 // A balance refresh the popup started on one network, and that returns after
 // the network was switched to another, writes nothing: the switch cleared every
 // address's balances, and the previous network's must not come back over them
 // (https://git.eeqj.de/sneak/AutistMask/issues/577). The switch is made either
 // by the user in this popup's Settings, or by the background after the user
 // approved a site's request, which changes only the stored record. Driven
 // through the real popup over a stored profile on Ethereum Mainnet. The same
 // refresh in the background is in tests/backgroundStateIsolation.test.js.
 const {
    bootPopup,
    cleanupPopup,
    unversionedValidProfile,
    TOKEN_ADDRESS,
 } = require("./support/popupBoot");
 const { applyChainSwitchFields } = require("../src/shared/chainSwitchFields");
 afterEach(() => {
    cleanupPopup();
 });
 // Starts the ten-second refresh and holds it open. The balance stand-in writes
 // Ethereum Mainnet's balances in place, on the records handed in, as the real
 // refreshBalances() does, once the returned function is called. Resolves with
 // that function and the refresh still running.
 async function holdRefresh(page) {
    const { refreshBalances } = require("../src/shared/balances");
    let answer;
    refreshBalances.mockImplementationOnce(async (wallets) => {
        await new Promise((resolve) => {
            answer = resolve;
        });
        wallets[0].addresses[0].balance = "7.0";
        wallets[0].addresses[0].tokenBalances = [
            {
                address: TOKEN_ADDRESS,
                name: "Test Token",
                symbol: "TST",
                decimals: 18,
                balance: "5.0",
                holders: null,
            },
        ];
    });
    const ticking = page.tick();
    await page.settle();
    return {
        finish: async () => {
            answer();
            await ticking;
        },
    };
 }
 // Picks `networkId` in the Settings network selector, as the user does.
 async function chooseNetwork(page, networkId) {
    const select = page.node("settings-network");
    select.value = networkId;
    for (const fn of select.listeners.change) await fn();
    await page.settle();
 }
 // The stored record holds none of Ethereum Mainnet's balances, and no refresh
 // recorded as done.
 function expectNothingStored(page) {
    const stored = page.storage.read("autistmask");
    expect(stored.networkId).toBe("sepolia");
    expect(stored.wallets[0].addresses[0].balance).toBe("0");
    expect(stored.wallets[0].addresses[0].tokenBalances).toEqual([]);
    expect(stored.lastBalanceRefresh).toBe(0);
 }
 test("a refresh that returns after a switch in Settings writes nothing, and the next one runs on the new network", async () => {
    const page = await bootPopup(unversionedValidProfile());
    expect(page.pageErrors).toEqual([]);
    const { refreshBalances } = require("../src/shared/balances");
    const { state } = require("../src/shared/state");
    const refresh = await holdRefresh(page);
    await page.click("btn-settings");
    await chooseNetwork(page, "sepolia");
    await refresh.finish();
    expect(state.wallets[0].addresses[0].balance).toBe("0");
    expect(state.wallets[0].addresses[0].tokenBalances).toEqual([]);
    expectNothingStored(page);
    await page.click("btn-settings-back");
    expect(page.visibleViews()).toEqual(["main"]);
    expect(page.text("total-value")).toBe("0.0000 SepoliaETH");
    await page.tick();
    expect(refreshBalances.mock.lastCall[5]).toBe("sepolia");
    expect(page.storage.read("autistmask").lastBalanceRefresh).toBeGreaterThan(
        0,
    );
 });
 // The switch is made only once the refresh's save, holding the lock, has
 // written Ethereum Mainnet's balances, and the switch then clears them.
 test("a refresh whose save is reading the stored record when the user switches in Settings leaves none of its balances stored", async () => {
    const page = await bootPopup(unversionedValidProfile());
    expect(page.pageErrors).toEqual([]);
    const { state } = require("../src/shared/state");
    const refresh = await holdRefresh(page);
    await page.click("btn-settings");
    // The next read of the stored record, the refresh's save's, is held.
    const get = page.storage.local.get;
    const read = get.getMockImplementation();
    let releaseRead;
    get.mockImplementationOnce(async (key) => {
        await new Promise((resolve) => {
            releaseRead = resolve;
        });
        return read(key);
    });
    const finishing = refresh.finish();
    await page.settle();
    // The user picks Sepolia meanwhile; the switch's own save waits for the
    // refresh's save to let the lock go.
    const select = page.node("settings-network");
    select.value = "sepolia";
    const switching = Promise.all(select.listeners.change.map((fn) => fn()));
    await page.settle();
    releaseRead();
    await finishing;
    await switching;
    await page.settle();
    expect(state.networkId).toBe("sepolia");
    expect(state.wallets[0].addresses[0].balance).toBe("0");
    expect(state.wallets[0].addresses[0].tokenBalances).toEqual([]);
    expectNothingStored(page);
 });
 test("a refresh that returns after the background switched the network writes nothing", async () => {
    const page = await bootPopup(unversionedValidProfile());
    expect(page.pageErrors).toEqual([]);
    const { saveState } = require("../src/shared/state");
    const refresh = await holdRefresh(page);
    // The background writes the switch to Sepolia, as its updateState() does
    // once the user approves a site's request. This page is not told of it
    // yet.
    const record = page.storage.read("autistmask");
    applyChainSwitchFields(record, "sepolia");
    page.storage.write("autistmask", record);
    await refresh.finish();
    expectNothingStored(page);
    // Nor does a later save by this page, such as every navigation makes.
    await saveState();
    expectNothingStored(page);
 });
--- a/Show More
+++ b/Show More