fix: a confirmation screen drawn again keeps the network it was reviewed for (closes #586 )

ConfirmTx set the transaction's chain id to the active network's every time it drew the screen, so a popup reopened onto a saved confirmation after a network switch in Settings described the reviewed transfer as the new network's and sent it there. show() now sets the chain id only on a transaction Send hands over, and the screen describes the transaction entirely on that network: native currency, USD values, explorer links, and the node and explorer its checks ask. explorerUrl(), renderAddressHtml(), getPrice(), formatFee() and checkEtherscanLabel() take an optional chain id for this. A saved transaction whose chain id names no network is not restored. Model: opus-5-5
fix: the swap decoder reads each command's type with its router's mask (closes #535 )
2026-10-19 05:22:21 +00:00 · 2026-10-19 07:13:22 +02:00 · 2026-10-19 06:51:17 +02:00 · 2026-10-19 06:12:00 +02:00 · 2026-10-19 05:28:21 +02:00 · 2026-10-19 04:40:55 +02:00
58 changed files with 4017 additions and 577 deletions
@@ -362,6 +362,14 @@ are outside `make check`. Neither opens the popup from the toolbar button: both
 load its page in an ordinary tab, so what the toolbar popup itself adds, its
 size and its closing when it loses focus, is covered by neither.

+Each run builds its image under a tag of its own, `autistmask-e2e-chrome:` or
+`autistmask-e2e-firefox:` followed by twelve random hex digits, so two clones
+can run the same suite at once without one build taking the other's image away.
+The run removes that image, and its container if one is still running, after the
+suite passes or fails, on Ctrl-C, on `kill`, and when the terminal or SSH
+session it runs in closes. A run killed outright (`kill -9`) cannot clean up:
+its image stays under its tag until removed by hand with `docker image rm`.
+
 ### Chrome (`make test-e2e`)

 `make test-e2e` builds `dist/chrome/` and drives the **real popup in a real
@@ -563,9 +571,12 @@ the worker stopping. It starts Chromium itself, speaks the DevTools protocol
 over `--remote-debugging-pipe`, and attaches to pages only. Before raising the
 approvals it requires the worker to stop on its own with nothing pending, so a
 run in which something else keeps the worker running fails. The site is
-connected and the RPC endpoint set through the extension's own screens, against
-the loopback dApp page and stub node the Firefox suite also uses
-(`tests/e2e/dapp.js`). Unlike the suite above, it does not fail on page errors.
+connected, without "Remember my choice for this site", and the RPC endpoint set
+through the extension's own screens, against the loopback dApp page and stub
+node the Firefox suite also uses (`tests/e2e/dapp.js`). Once the worker has
+stopped, the run requires the site still to be told the address
+([#526](https://git.eeqj.de/sneak/AutistMask/issues/526)). Unlike the suite
+above, it does not fail on page errors.

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

@@ -849,7 +860,11 @@ on the next event. Two consequences shape every recurring job in the background:
 - Module-level variables do not survive either. Anything that must be remembered
  across a restart goes in extension storage. `localStorage` does not exist in a
  service worker at all — the one remaining user of it, `src/shared/ens.js`,
-  runs only in the popup and is marked as such.
+  runs only in the popup and is marked as such. The sites allowed without
+  "Remember my choice for this site" are kept in the browser's session storage
+  (`storage.session`), which outlives the worker but not the browser, so such a
+  connection lasts until it is ended or the browser closes. Firefox has session
+  storage from version 115, the minimum `manifest/firefox.json` declares.

 Pending approvals are the exception: an approval waiting for the user, and the
 site's request waiting on it, live only in the worker's memory, and only the
@@ -998,14 +1013,16 @@ rendered differently on two screens.

 The native token's label is a network's `nativeCurrency` in
 `src/shared/networks.js`: `ETH` on mainnet, `SepoliaETH` on Sepolia. The
-wallet's balances and the Send and confirmation screens, which send on the
-active network, use the active network's. A transaction's figures use the one of
-the network its chain id names, whichever network is active: the value and fee
-on the approval screen, the amount on the wait, success and error screens, the
+wallet's balances and the Send screen, which sends on the active network, use
+the active network's. The confirmation screen uses the one of the network its
+transaction was reviewed on, the network active when Send showed it, even after
+the network is switched in Settings. A transaction's figures use the one of the
+network its chain id names, whichever network is active: the value and fee on
+the approval screen, the amount on the wait, success and error screens, the
 transaction history and the transaction detail screen, and the refusal of a fee
 above 1 ETH. A chain id that names no network reads `ETH`. Wherever this
 document shows ETH as the label of a native balance, value or fee, in a "Native
-ETH transfer" type line, in the contract-recipient warning or in that refusal,
+ETH transfer" type line, in the two recipient warnings or in that refusal,
 Sepolia shows `SepoliaETH`. The swap lines keep `ETH`, the router's own name for
 the native currency, and the ETH/USD price line, shown on mainnet only, keeps
 its fixed wording.
@@ -1153,11 +1170,13 @@ read:
 - `All available (V4 open delta)`: the swap's `Amount` line, when the amount it
  shows is a V4 exact-in `amountIn` of zero. V4 reads that zero as "use the
  whole open delta", so the calldata states no quantity. The line shows the
-  amount of one step that names an input token or amount: the last
-  `PERMIT2_PERMIT` step if there is one, otherwise the first V2 or V3 exact-in,
-  V2 exact-out, `WRAP_ETH` or V4 swap step. A V2 exact-out step gives its
-  `amountInMax`, and a V4 swap step the `amountIn` of its first readable
-  exact-in action.
+  amount of the step that sets the input side: the last `PERMIT2_PERMIT` step if
+  there is one, otherwise the first V2 or V3 exact-in, V2 exact-out, `WRAP_ETH`
+  or V4 swap step that names an input token or amount. A V4 step with a swap
+  action sets the input side when no earlier step set it, even when it names
+  neither, as described below. A V2 exact-out step gives its `amountInMax`, and
+  a V4 swap step the `amountIn` of the swap action that spends its input
+  currency.
 - `Whatever an earlier step sent to the pair (V2 already paid)`: the swap's
  `Amount` line, when the amount it shows is a V2 exact-in `amountIn` of zero.
  The router reads that zero as "the pair already holds the input tokens": the
@@ -1178,17 +1197,40 @@ read:
 The swap's `Token In` and `Token Out` lines name a currency, not an amount; each
 reads `Unknown (not named in the calldata)` when the decoder found no token for
 that side, or `Unknown (could not be decoded)` instead when a V4 swap action in
-the transaction could not be read (see Transaction Decoding below). A V4 step
-whose swap action could not be read still sets each side as a swap step does,
-and a side its `SETTLE` or `TAKE` did not name is then unknown: no other step's
-token or figure is shown for it. An `UNWRAP_WETH` step makes `Token Out` ETH
-only when the output side is WETH, on mainnet or Sepolia, or when no step set
-the output side; a WETH `Min. received` figure then reads in ETH. Otherwise
-`Token Out` and `Min. received` keep the output side's own token and figure,
-whether the swap was paid in ETH or in a token: a V2 exact-out swap that buys
-USDC and then unwraps the WETH it did not spend shows USDC. The token permission
-warning on the signature screen has its own amount wording, including `Unknown`;
-the SignApproval section below describes it.
+the transaction could not be read or the transaction has an `EXECUTE_SUB_PLAN`
+step, which leaves both sides unknown (see Transaction Decoding below). A V4
+step with a swap action always sets the output side, and sets the input side
+only when no earlier step set it. It finds each side by three rules:
+
+1. Its input side is the currency its `SETTLE` or `SETTLE_ALL` names, or else
+   the one currency that some swap action in the step spends and none buys. Its
+   output side is the currency its `TAKE` or `TAKE_ALL` names, or else the one
+   currency that some swap action buys and none spends. If there is not exactly
+   one such currency, that side is unknown, and the step sets it as unknown with
+   no figure. A step that buys WETH with USDT and USDC with that WETH, with
+   nothing naming its sides, reads `Swap USDT → USDC`.
+2. Its `Amount` is the `amountIn` of the swap action that spends the input
+   currency. If several exact-in actions spend it, each with a stated amount, it
+   is their sum; in any other case the step gives no `Amount`. The decoder reads
+   no amount from an exact-out action, and an open delta is not a stated amount.
+   Its `Min. received` is found the same way, from the `amountOutMin` of the
+   actions that buy the output currency.
+3. If any swap action in the step could not be read, only `SETTLE`,
+   `SETTLE_ALL`, `TAKE` and `TAKE_ALL` name its sides, and the step gives no
+   `Amount` or `Min. received`. A side they did not name is unknown, and the
+   step sets it as unknown with no figure.
+
+A V4 step with no swap action sets only the sides its `SETTLE`, `SETTLE_ALL`,
+`TAKE` or `TAKE_ALL` names.
+
+An `UNWRAP_WETH` step makes `Token Out` ETH only when the output side is WETH,
+on mainnet or Sepolia, or when no step set the output side; a WETH
+`Min. received` figure then reads in ETH. Otherwise `Token Out` and
+`Min. received` keep the output side's own token and figure, whether the swap
+was paid in ETH or in a token: a V2 exact-out swap that buys USDC and then
+unwraps the WETH it did not spend shows USDC. The token permission warning on
+the signature screen has its own amount wording, including `Unknown`; the
+SignApproval section below describes it.

 The swap's `Deadline` line is the router's deadline as a UTC date and time, e.g.
 `2026-02-27 08:25:51`. A JavaScript date reaches only to 275760-09-13 00:00:00
@@ -1544,8 +1586,14 @@ view would leave a wallet one click from deletion.
 - **Transitions**:
    - "Import" with a valid entry and a matching password of at least 12
      characters → creates the wallet, clears the navigation stack, and →
-      **Home**. The phrase and xprv modes then scan for further used addresses
-      and report the count as a flash message.
+      **Home**. When no address is active yet, as on the first wallet, the new
+      wallet's first address becomes the active one. The phrase and xprv modes
+      then scan for further used addresses and report the count as a flash
+      message. When the scan finds two or more used addresses, they replace the
+      wallet's list, which then holds the first address only if it was used. If
+      the first address was active and is not in the new list, the new list's
+      first address becomes the active one and `AUTISTMASK_ACTIVE_CHANGED` is
+      broadcast.
    - "Import" with a missing, short or mismatched password → full-sentence
      error on the error line, no screen change
    - "Import" with an invalid entry or a duplicate wallet or address → flash
@@ -1672,7 +1720,13 @@ view would leave a wallet one click from deletion.
 - **Transitions**:
    - "Review" (valid inputs, ENS resolved) → **ConfirmTx**
    - "Review" with an unresolvable ENS name or an invalid amount → flash
-      message, no screen change
+      message, no screen change. An amount is valid when it is a number above
+      zero, written as digits with at most one decimal point, with nothing but
+      zeros after the token's last decimal place. ETH has 18 places, and a token
+      with more, or with an unknown number, is held to 18. Zeros past those
+      places leave the amount unchanged, so `1.0000000` of a 6-place token
+      passes and is sent as exactly 1. ConfirmTx makes the same check before
+      anything can be sent
    - "Back" → previous screen (Home, AddressDetail, or AddressToken)

 #### ConfirmTx (`confirm-tx`)
@@ -1703,8 +1757,10 @@ view would leave a wallet one click from deletion.
      reserved either way
    - Warnings: inline warnings from the local checks (scam address, self-send)
      plus four reserved warning boxes made visible by the async checks —
-      recipient with no transaction history, recipient is a contract, burn
-      address, and an Etherscan phishing/scam label
+      recipient that has never sent a transaction and holds no ETH, recipient is
+      a contract, burn address, and an Etherscan phishing/scam label. An address
+      that has received ETH but never sent a transaction still holds that ETH,
+      so it gets no warning
    - Errors (insufficient balance), plus three reserved error boxes — the
      amount plus the fee exceeds the balance (ETH transfers), not enough ETH to
      pay the fee for the transfer (ERC-20 transfers), and the fee could not be
@@ -1728,12 +1784,20 @@ view would leave a wallet one click from deletion.
      the contract's own answer is read at signing time only to be compared with
      it, and a disagreement is a refusal rather than a preference for either
      value (`src/shared/transferAmount.js`)
-    - "Sign & Send" after the active network was switched in Settings while this
-      screen was open → nothing is signed; "The active network changed after
+    - "Sign & Send" after the active network was switched in Settings since this
+      transaction was reviewed, with this screen open or before the popup
+      reopened onto it → nothing is signed; "The active network changed after
      this transaction was reviewed, so it was not sent. Please go back and
      review it again." in the errors box, no screen change. The transaction
-      carries the chain id of the network the screen was shown for, so it cannot
-      be signed for another
+      carries the chain id of the network active when Send showed this screen,
+      and keeps it when the screen is drawn again from the saved transaction, so
+      it cannot be signed for another. The screen describes it on that network,
+      whichever network is active: its amounts are in that network's native
+      currency, its USD values are that network's, so a testnet transaction
+      shows none, its From, To and token contract links open that network's
+      explorer, the fee estimate and the contract and never-sent recipient
+      checks ask that network's RPC endpoint, and the Etherscan label check asks
+      that network's explorer
    - "Sign & Send" (wrong password) → "Wrong password." on the password error
      line, no screen change
    - "Sign & Send" signs as the From address above, not as whichever address is
@@ -1916,7 +1980,7 @@ view would leave a wallet one click from deletion.
      under any address, with remove buttons
    - Connected Sites: the origins of the sites allowed without "Remember my
      choice" that are still connected, with remove buttons. Only the background
-      holds these, in memory, and Settings asks it for them with
+      holds these, in session storage, and Settings asks it for them with
      `AUTISTMASK_GET_CONNECTED_SITES`
    - Denied Sites: the origins remembered as denied, under any address, with
      remove buttons
@@ -1935,9 +1999,10 @@ view would leave a wallet one click from deletion.
      its origin is dropped from Allowed Sites under every address, and
      `AUTISTMASK_REMOVE_SITE` has the background end every connection approved
      without "Remember" from that origin, under any address, and send
-      `accountsChanged` with an empty list to the open tabs of that origin. The
-      same host under another scheme or port is another site and is left alone.
-      Only the extension's own pages may send either message
+      `accountsChanged` with an empty list to the open tabs of that origin.
+      Settings waits for the background's answer before it draws the lists
+      again. The same host under another scheme or port is another site and is
+      left alone. Only the extension's own pages may send either message
    - `[x]` on a denied site → forgets the refusal, in place; it connects
      nothing and tells the background nothing
    - Ten clicks on the version → reveals the Debug well (no screen change)
@@ -1982,7 +2047,9 @@ view would leave a wallet one click from deletion.
 - **Elements**:
    - "Back" button, "Delete Wallet" heading
    - Warning naming the wallet and stating that deletion is permanent and any
-      funds are unrecoverable without the recovery phrase
+      funds are unrecoverable without the recovery phrase, the private key or
+      the extended private key, according to the wallet's kind
+      (`keyMaterialName()` in `src/popup/views/helpers.js`)
    - Password input
    - Error line
    - "Confirm Delete" button
@@ -1998,8 +2065,8 @@ view would leave a wallet one click from deletion.
      (`src/shared/walletDelete.js`)
    - Either way, every address the wallet held loses its site permissions of
      both kinds: the remembered ones in storage, and the connections approved
-      without "Remember", which only the background holds, in memory, and drops
-      on `AUTISTMASK_ADDRESSES_REMOVED`
+      without "Remember", which only the background holds, in session storage,
+      and drops on `AUTISTMASK_ADDRESSES_REMOVED`
    - "Confirm Delete" (wrong password) → "That password is incorrect. Please
      try again." on the error line, nothing deleted
    - "I have lost my password" → **DeleteWalletLostPassword**
@@ -2023,9 +2090,10 @@ view would leave a wallet one click from deletion.
      cannot be unlocked again, and that no password is needed to delete it
    - What deletion does and does not do: it erases the copy of the key stored
      on this device; nothing on chain changes and no money is moved
-    - The route back — adding the wallet again with the recovery phrase and a
-      new password — and, in bold, that without that phrase written down the
-      deletion loses everything the wallet holds, forever
+    - The route back — adding the wallet again, with a new password, from a kept
+      copy of its recovery phrase, private key or extended private key (named as
+      on DeleteWallet) — and, in bold, that without that copy the deletion loses
+      everything the wallet holds, forever
    - That the other wallets are not touched
    - The wallet's name, and a text input asking for it to be typed back. A name
      that shows nothing at all (only spaces, or only characters that paint
@@ -2083,8 +2151,9 @@ view would leave a wallet one click from deletion.
      the address **only if it has on-chain activity**. An address that was
      never used is not found by that scan. The text is written by
      `recoveryPathText()` rather than sitting in `index.html`, so it can name
-      the wallet's own kind of key material: an xprv wallet has no recovery
-      phrase to re-import.
+      the wallet's own kind of key material through `keyMaterialName()`, as
+      DeleteWallet and DeleteWalletLostPassword do: an xprv wallet has no
+      recovery phrase to re-import.
    - A warning when the address holds anything, ETH or any tracked ERC-20,
      followed by the holdings themselves via `balanceLinesForAddress()` and the
      USD total via `formatAddressTotal()` (see
@@ -2112,8 +2181,8 @@ view would leave a wallet one click from deletion.
  one in this wallet follows the splice.
 - The address loses its site permissions of both kinds, whether or not it was
  the active one: the remembered ones in storage, and any connection approved
-  without "Remember", which only the background holds, in memory, and drops on
-  `AUTISTMASK_ADDRESSES_REMOVED`.
+  without "Remember", which only the background holds, in session storage, and
+  drops on `AUTISTMASK_ADDRESSES_REMOVED`.
 - The wallet's derivation counter (`nextIndex`) is not rewound, so "+" derives a
  fresh address rather than handing back the one just removed.

@@ -2147,14 +2216,17 @@ view would leave a wallet one click from deletion.
  code `4100` and opens no prompt. Two such origins are `null`, which the
  browser reports for a page with an opaque origin, such as one its server
  sandboxes with a Content-Security-Policy, and `file://`, which Chrome reports
-  for a local file. The background script prefers the toolbar popup
-  (`action.openPopup()`) and falls back to a separate popup window
-  (`src/background/index.js`, `requestApproval()`). Only one exists per site at
-  a time: a further connection request from a site whose prompt is still
-  unanswered is refused with EIP-1193 code `-32002` and opens no new prompt. If
-  that prompt was in a toolbar popup that closed before it connected, and the
-  toolbar popup has since been set to open something else, the refused request
-  shows that prompt again.
+  for a local file. Nor is such a page told the active address by
+  `accountsChanged`, even at a connected site's URL: the background names the
+  origin of the tab's URL on the event, and the content script passes the
+  address on only to a page whose own origin is that one. The background script
+  prefers the toolbar popup (`action.openPopup()`) and falls back to a separate
+  popup window (`src/background/index.js`, `requestApproval()`). Only one exists
+  per site at a time: a further connection request from a site whose prompt is
+  still unanswered is refused with EIP-1193 code `-32002` and opens no new
+  prompt. If that prompt was in a toolbar popup that closed before it connected,
+  and the toolbar popup has since been set to open something else, the refused
+  request shows that prompt again.
 - **Elements**:
    - "Connection Request" heading
    - Phishing warning banner (shown when the hostname is on the phishing
@@ -2186,8 +2258,10 @@ view would leave a wallet one click from deletion.
  one shown and signed in place of the node's estimate, but the node still
  estimates the transaction with that limit, as the check that it neither
  reverts nor runs out of gas; a request that gives both with different values
-  is refused. A request that cannot be populated — unreachable node, reverting
-  gas estimate — opens no window and is failed back to the site. Only one
+  is refused with EIP-1474 code `-32602`. A request that cannot be populated —
+  unreachable node, reverting gas estimate — opens no window and is failed back
+  to the site, with the node's own error code and data when the node refused it,
+  so the site can decode a revert, and with `-32603` otherwise. Only one
  transaction approval exists at a time: populating fixes the nonce, so a second
  `eth_sendTransaction` arriving while one is unanswered is refused with
  EIP-1193 code `-32002` rather than being populated at the same nonce. It opens
@@ -2821,11 +2895,26 @@ Currently supported:
  or recipient, and amount.
 - **Uniswap Universal Router**: `execute()` calls — shows swap direction (e.g.
  "Swap USDT → ETH"), token addresses, amounts, execution steps, and deadline.
-  Decodes Permit2, V2/V3/V4 swaps, wrap/unwrap, and balance checks. A V4 swap
-  action is read only in the parameter shape deployed on mainnet and Sepolia,
-  not in the newer one on `v4-periphery` `main`, which adds a `minHopPriceX36`
-  field. An action in any other shape is not read, and its step is listed as
-  `V4 Swap (could not be decoded)`.
+  The swap summary is shown only for a transaction sent to one of the Universal
+  Router addresses Uniswap publishes for the network: on TxApproval the network
+  the transaction is for, on TransactionDetail the active network. The same
+  calldata sent to any other address is shown as raw data. Decodes Permit2,
+  V2/V3/V4 swaps, wrap/unwrap, and balance checks. A V4 swap action is read only
+  in the parameter shape deployed on mainnet and Sepolia, not in the newer one
+  on `v4-periphery` `main`, which adds a `minHopPriceX36` field. An action in
+  any other shape is not read, and its step is listed as
+  `V4 Swap (could not be decoded)`. Each step is named by its command type,
+  which the decoder reads from the command byte with the mask the router at that
+  address uses: `0x1f` for `UniversalRouterV1`, `0x3f` for
+  `UniversalRouterV1_2_V2Support` and `UniversalRouterV2`, and `0x7f` for
+  `UniversalRouterV2_1_1` and `UniversalRouterV2_1_2`. The allow-revert flag
+  (`0x80`) therefore does not change a step's name. The decoder does not read
+  the commands inside an `EXECUTE_SUB_PLAN` (`0x21`) step, and wherever that
+  step stands they may spend the user's tokens or pay the user. That step is
+  listed as `Execute Sub-Plan (its steps are not shown)`, and whatever the other
+  steps state, the summary names no swap direction, `Token In` and `Token Out`
+  read `Unknown (could not be decoded)`, and there is no `Amount` or
+  `Min. received` line.

 ### Non-Goals Forever

@@ -306,7 +306,14 @@ 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.

-If the requesting site's domain is on the phishing blocklist, all three approval
+A connected site can also ask to switch the wallet's network. A popup shows the
+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
@@ -378,7 +385,8 @@ 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
-  resets the RPC and Blockscout endpoints to that network's defaults.
+  restores the RPC and Blockscout endpoints you last used on that network, or
+  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**: Change the Blockscout instance used for token balances and
@@ -27,7 +27,8 @@
    "web_accessible_resources": ["src/content/inpage.js"],
    "browser_specific_settings": {
        "gecko": {
-            "id": "autistmask@sneak.berlin"
+            "id": "autistmask@sneak.berlin",
+            "strict_min_version": "115.0"
        }
    }
 }
@@ -22,13 +22,29 @@ set -eu
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"

-IMAGE="$("$SCRIPT_DIR/projectname")-e2e-chrome"
-
-IIDFILE=""
+# Each run builds, runs and then removes an image under a tag of its own.
+# 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
+# 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() {
-    if [ -n "$IIDFILE" ]; then
-        rm -f "$IIDFILE"
+    # After a third Ctrl-C docker's client exits whether or not the
+    # container has stopped, and a container still running keeps the image
+    # 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
 }

@@ -40,22 +56,16 @@ main() {
        exit 1
    fi

-    IIDFILE="$(mktemp)"
    trap cleanup EXIT
-    trap 'cleanup; exit 130' INT TERM
+    # HUP: the terminal or SSH session running the suite closed.
+    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
    # cached layer is a check that did not run.
-    docker build --no-cache --iidfile "$IIDFILE" -t "$IMAGE" \
-        -f tests/e2e/Dockerfile .
+    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
@@ -75,11 +85,12 @@ 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}" \
-        "$(cat "$IIDFILE")" \
+        "$IMAGE" \
        node tests/e2e/run.js

    # Where chrome.storage.local lives, and what moves it: two unpacked loads
@@ -93,9 +104,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 \
-        "$(cat "$IIDFILE")" \
+        "$IMAGE" \
        node tests/e2e/storagePartition.js

    # Approvals left open for seven minutes in minimized windows, past the
@@ -105,9 +117,10 @@ main() {
    # 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 \
-        "$(cat "$IIDFILE")" \
+        "$IMAGE" \
        node tests/e2e/slowApproval.js
 }

@@ -21,13 +21,23 @@ set -eu
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"

-IMAGE="$("$SCRIPT_DIR/projectname")-e2e-firefox"
-
-IIDFILE=""
+# A tag and a container name of this run's own, as in script/test-e2e,
+# which says why.
+SUFFIX="$(od -An -N6 -tx1 /dev/urandom | tr -d ' \n')"
+NAME="$("$SCRIPT_DIR/projectname")-e2e-firefox"
+IMAGE="$NAME:$SUFFIX"
+CONTAINER="$NAME-$SUFFIX"

 cleanup() {
-    if [ -n "$IIDFILE" ]; then
-        rm -f "$IIDFILE"
+    # After a third Ctrl-C docker's client exits whether or not the
+    # container has stopped, and a container still running keeps the image
+    # 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
 }

@@ -39,22 +49,16 @@ main() {
        exit 1
    fi

-    IIDFILE="$(mktemp)"
    trap cleanup EXIT
-    trap 'cleanup; exit 130' INT TERM
+    # HUP: the terminal or SSH session running the suite closed.
+    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
    # cached layer is a check that did not run.
-    docker build --no-cache --iidfile "$IIDFILE" -t "$IMAGE" \
-        -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
@@ -69,10 +73,11 @@ 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 \
-        "$(cat "$IIDFILE")" \
+        "$IMAGE" \
        node tests/e2e/firefox/run.js dist/firefox

    # The install/uninstall/re-install property, against the packaged XPI
@@ -82,10 +87,11 @@ 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 \
-        "$(cat "$IIDFILE")" \
+        "$IMAGE" \
        node tests/e2e/firefox/reinstall.js
 }

@@ -26,6 +26,7 @@ const {
    typedDataMessageRefusal,
    typedDataChainRefusal,
    failureIsRetryable,
+    nodeError,
    describeTxFailure,
    sameAddress,
    ApprovalMismatchError,
@@ -48,6 +49,9 @@ const {
    actionApi,
    getPlatformInfo,
    runtimeApi,
+    sessionStorageGet,
+    sessionStorageRemove,
+    sessionStorageSet,
    tabsQuery,
    tabsSendMessage,
    windowsApi,
@@ -60,12 +64,31 @@ const runtime = runtimeApi();
 const windowsNs = windowsApi();
 const actionNs = actionApi();

-// Connected sites (in-memory, non-persisted): { "origin:address": true }
+// Connections the user allowed without "Remember my choice for this site".
+// 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.
-const connectedSites = {};
+// An origin can carry a port, so the address is what follows the key's last
+// 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 = {};
@@ -272,6 +295,21 @@ 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
@@ -317,7 +355,8 @@ function extractHostname(origin) {
    }
 }

-// Proxy an RPC call to the Ethereum node
+// Proxy an RPC call to the Ethereum node. An error the node answers with is
+// 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, {
@@ -332,7 +371,10 @@ async function proxyRpc(method, params) {
    });
    const json = await resp.json();
    if (json.error) {
-        throw new Error(json.error.message || "RPC error");
+        const err = new Error(json.error.message || "RPC error");
+        err.code = json.error.code;
+        err.data = json.error.data;
+        throw err;
    }
    return json.result;
 }
@@ -728,7 +770,7 @@ async function handleConnectionRequest(origin) {
    const s = await getState();
    const activeAddress = activeAddressOf(s);
    if (!activeAddress) {
-        return { error: { message: "No accounts available" } };
+        return { error: { code: 4100, message: "No accounts available" } };
    }

    const allowed = s.allowedSites[activeAddress] || [];
@@ -744,10 +786,10 @@ async function handleConnectionRequest(origin) {
        };
    }

-    // Check allowed list or in-memory connected
+    // Check allowed list or a connection allowed without "Remember"
    if (
        allowed.includes(origin) ||
-        connectedSites[origin + ":" + activeAddress]
+        (await isConnected(origin, activeAddress))
    ) {
        return { result: [activeAddress] };
    }
@@ -784,7 +826,7 @@ async function handleConnectionRequest(origin) {
        if (decision.remember) {
            await rememberSiteChoice("allowedSites", activeAddress, origin);
        } else {
-            connectedSites[origin + ":" + activeAddress] = true;
+            await sessionStorageSet({ [origin + ":" + activeAddress]: true });
        }
        return { result: [activeAddress] };
    } else {
@@ -838,7 +880,7 @@ async function handleRpc(method, params, origin) {
        const allowed = s.allowedSites[activeAddress] || [];
        if (
            allowed.includes(origin) ||
-            connectedSites[origin + ":" + activeAddress]
+            (await isConnected(origin, activeAddress))
        ) {
            return { result: [activeAddress] };
        }
@@ -874,7 +916,7 @@ async function handleRpc(method, params, origin) {
        const allowed = s.allowedSites[activeAddress] || [];
        if (
            !allowed.includes(origin) &&
-            !connectedSites[origin + ":" + activeAddress]
+            !(await isConnected(origin, activeAddress))
        ) {
            return { error: { code: 4100, message: "Unauthorized" } };
        }
@@ -967,10 +1009,10 @@ async function handleRpc(method, params, origin) {
        const s = await getState();
        const activeAddress = activeAddressOf(s);
        const allowed = s.allowedSites[activeAddress] || [];
-        const isConnected =
+        const hasPermission =
            allowed.includes(origin) ||
-            connectedSites[origin + ":" + activeAddress];
-        if (!isConnected || !activeAddress) {
+            (await isConnected(origin, activeAddress));
+        if (!hasPermission || !activeAddress) {
            return { result: [] };
        }
        return {
@@ -992,12 +1034,12 @@ async function handleRpc(method, params, origin) {
        const s = await getState();
        const activeAddress = activeAddressOf(s);
        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) &&
-            !connectedSites[origin + ":" + activeAddress]
+            !(await isConnected(origin, activeAddress))
        ) {
            return { error: { code: 4100, message: "Unauthorized" } };
        }
@@ -1046,12 +1088,12 @@ async function handleRpc(method, params, origin) {
        const s = await getState();
        const activeAddress = activeAddressOf(s);
        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) &&
-            !connectedSites[origin + ":" + activeAddress]
+            !(await isConnected(origin, activeAddress))
        ) {
            return { error: { code: 4100, message: "Unauthorized" } };
        }
@@ -1093,12 +1135,13 @@ 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. The
-            // wallet being unable to read its own profile is not that, and it
-            // must not be flattened into a message with no code: it goes back
-            // to the dispatcher, which has the one answer for it.
+            // A node that answered with an error is reported as itself, with
+            // its own code and data. The wallet being unable to read its own
+            // profile is not that, and it must not be answered as an ordinary
+            // failure: it goes back to the dispatcher, which has the one
+            // answer for it.
            if (e instanceof StateUnusableError) throw e;
-            return { error: { message: e.message } };
+            return { error: requestError(e.message, e) };
        }
    }

@@ -1114,12 +1157,14 @@ async function handleRpc(method, params, origin) {
 async function handleSendTransaction(params, origin) {
    const s = await getState();
    const activeAddress = activeAddressOf(s);
-    if (!activeAddress) return { error: { message: "No accounts available" } };
+    if (!activeAddress) {
+        return { error: { code: 4100, message: "No accounts available" } };
+    }

    const allowed = s.allowedSites[activeAddress] || [];
    if (
        !allowed.includes(origin) &&
-        !connectedSites[origin + ":" + activeAddress]
+        !(await isConnected(origin, activeAddress))
    ) {
        return { error: { code: 4100, message: "Unauthorized" } };
    }
@@ -1173,7 +1218,7 @@ async function handleSendTransaction(params, origin) {
                txParams,
            );
        } catch (e) {
-            return { error: { message: e.message } };
+            return { error: requestError(e.message, e) };
        }

        // Population is a network round trip, and the user can switch address
@@ -1183,10 +1228,9 @@ async function handleSendTransaction(params, origin) {
        // while the page is still waiting and nothing has been displayed.
        if (!sameAddress(await getActiveAddress(), activeAddress)) {
            return {
-                error: {
-                    message:
-                        "The active address changed while this transaction was being prepared, so it was not sent.",
-                },
+                error: requestError(
+                    "The active address changed while this transaction was being prepared, so it was not sent.",
+                ),
            };
        }

@@ -1232,10 +1276,6 @@ 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
@@ -1254,6 +1294,10 @@ 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] || [] : [];
@@ -1264,17 +1308,24 @@ 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) ||
-                connectedSites[origin + ":" + activeAddress]);
+                (await isConnected(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(() => {});
    }
 }
@@ -1679,7 +1730,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                if (outcome.spendApproval) {
                    settleApproval(
                        msg.id,
-                        { error: { message: outcome.error } },
+                        { error: requestError(outcome.error) },
                        { holdsClaim: true },
                    );
                } else {
@@ -1706,7 +1757,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                const outcome = describeTxFailure(TX_STAGE_NONCE, null);
                settleApproval(
                    msg.id,
-                    { error: { message: outcome.error } },
+                    { error: requestError(outcome.error) },
                    { holdsClaim: true },
                );
                sendResponse({
@@ -1739,10 +1790,13 @@ 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: { message: outcome.error } },
+                    { error: requestError(outcome.error, nodeError(e)) },
                    { holdsClaim: true },
                );
                sendResponse({
@@ -1864,7 +1918,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                if (!retryable) {
                    settleApproval(
                        msg.id,
-                        { error: { message: errMsg } },
+                        { error: requestError(errMsg) },
                        { holdsClaim: true },
                    );
                } else {
@@ -1892,41 +1946,57 @@ 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 : [];
-        for (const key of Object.keys(connectedSites)) {
+        endConnections((key) => {
            const address = key.slice(key.lastIndexOf(":") + 1);
-            if (removed.some((a) => sameAddress(a, address))) {
-                delete connectedSites[key];
-            }
-        }
+            return removed.some((a) => sameAddress(a, address));
+        }).catch((err) => {
+            log.errorf(
+                "ending the removed addresses' connections failed:",
+                err,
+            );
+        });
        return false;
    }

-    // Settings lists the sites connected without "Remember", which only this
-    // worker knows. The origin is what precedes the key's last colon.
+    // Settings lists the sites connected without "Remember", which only
+    // session storage holds.
    if (msg.type === "AUTISTMASK_GET_CONNECTED_SITES") {
-        sendResponse(
-            Object.keys(connectedSites).map((key) =>
-                key.slice(0, key.lastIndexOf(":")),
-            ),
-        );
-        return false;
+        sessionStorageGet(null)
+            .then((items) =>
+                Object.keys(items).map((key) =>
+                    key.slice(0, key.lastIndexOf(":")),
+                ),
+            )
+            .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") {
-        for (const key of Object.keys(connectedSites)) {
-            if (key.slice(0, key.lastIndexOf(":")) === msg.origin) {
-                delete connectedSites[key];
-            }
-        }
-        broadcastSiteRemoved(msg.origin);
-        return false;
+        endConnections(
+            (key) => key.slice(0, key.lastIndexOf(":")) === msg.origin,
+        )
+            .catch((err) => {
+                log.errorf(
+                    "ending the removed site's connections failed:",
+                    err,
+                );
+            })
+            .then(() => {
+                broadcastSiteRemoved(msg.origin);
+                sendResponse(null);
+            });
+        return true;
    }

    // Settings switched the network and has saved it. Open tabs are told the
@@ -49,14 +49,23 @@ window.addEventListener("message", (event) => {

 // Listen for events pushed from the background (e.g. accountsChanged)
 runtimeApi().onMessage.addListener((msg) => {
-    if (msg.type === "AUTISTMASK_EVENT") {
-        window.postMessage(
-            {
-                type: "AUTISTMASK_EVENT",
-                eventName: msg.eventName,
-                data: msg.data,
-            },
-            "*",
-        );
+    if (msg.type !== "AUTISTMASK_EVENT") return;
+    // The background chooses the addresses in accountsChanged for the site
+    // 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
+    // origin has no host is not a site: one its server sandboxes with a
+    // Content-Security-Policy has the origin "null" whatever its URL, and is
+    // 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,
+        },
+        "*",
+    );
 });
@@ -634,17 +634,12 @@
                    </div>
                </div>
                <div id="confirm-warnings" class="mb-2 invisible"></div>
-                <div id="confirm-recipient-warning" class="mb-2 invisible">
-                    <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. -->
+                <!-- These two sentences name the network's native token, so
+                show() in confirmTx.js sets them. -->
+                <div
+                    id="confirm-recipient-warning"
+                    class="mb-2 border border-red-500 border-dashed p-2 text-xs font-bold text-red-500 invisible"
+                ></div>
                <div
                    id="confirm-contract-warning"
                    class="mb-2 border border-red-500 border-dashed p-2 text-xs font-bold text-red-500 invisible"
@@ -929,9 +924,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 networks will
-                        update the RPC and Blockscout endpoints to their
-                        defaults.
+                        Select the Ethereum network. Switching restores the RPC
+                        and Blockscout endpoints last used on that network, or
+                        that network's defaults if it has none.
                    </p>
                    <div class="text-xs flex items-center gap-1">
                        <select
@@ -1128,7 +1123,8 @@
                <p class="text-xs mb-3">
                    Deleting
                    <strong id="delete-wallet-name"></strong> is permanent. Any
-                    funds will be unrecoverable without your recovery phrase.
+                    funds will be unrecoverable without your
+                    <span id="delete-wallet-key-material"></span>.
                </p>
                <div class="mb-2">
                    <label class="block mb-1">Password</label>
@@ -1179,13 +1175,13 @@
                    money at its addresses is not moved or destroyed.
                </p>
                <p class="text-xs mb-2">
-                    If you have the recovery phrase for this wallet written
-                    down, add the wallet again afterwards with a new password
-                    and you will have it back.
+                    If you have kept a copy of this wallet's
+                    <span id="delete-wallet-lost-key-material"></span>, add the
+                    wallet again afterwards with a new password and you will
+                    have it back.
                    <strong
-                        >If you do not have it written down, deleting this
-                        wallet means losing everything it holds,
-                        forever.</strong
+                        >If you have not, deleting this wallet means losing
+                        everything it holds, forever.</strong
                    >
                </p>
                <p class="text-xs mb-3">Your other wallets are not touched.</p>
@@ -64,8 +64,8 @@ window.addEventListener("pagehide", () => pageClosed.abort());

 let refreshInFlight = false;

-// The ten-second refresh init() starts, stopped when the popup moves to the
-// recovery screen: there is no profile left to refresh.
+// The ten-second refresh startRefresh() starts, stopped when the popup moves to
+// the recovery screen: there is no profile left to refresh.
 let refreshTimer = null;

 async function doRefreshAndRender() {
@@ -99,9 +99,23 @@ 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,
    pageClosed: pageClosed.signal,
    showAddWalletView: () => {
        pushCurrentView();
@@ -318,8 +332,7 @@ async function init() {
    } else {
        renderWalletList();
        restoreView();
-        doRefreshAndRender();
-        refreshTimer = setInterval(doRefreshAndRender, 10000);
+        startRefresh();
    }
 }

@@ -13,6 +13,7 @@
 // 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.
 //
@@ -125,13 +126,16 @@ function isRenderableDecoded(value) {

 // The pending transaction confirmTx.show() renders: `token` reaches
 // renderAddressHtml() when it is not "ETH", and `from`/`to` reach
-// addressTitle(), makeBlockie() and getLocalWarnings().
+// addressTitle(), makeBlockie() and getLocalWarnings(). `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) &&
+        (!value.chainId || SUPPORTED_CHAIN_IDS.has(value.chainId))
    );
 }

@@ -20,6 +20,7 @@ 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).
@@ -194,6 +195,9 @@ async function importMnemonic(ctx) {
    };
    state.wallets.push(wallet);
    state.hasWallet = true;
+    if (state.activeAddress === null) {
+        state.activeAddress = firstAddress;
+    }
    await saveState();
    clearViewStack();
    ctx.renderWalletList();
@@ -215,14 +219,22 @@ async function importMnemonic(ctx) {
            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.doRefreshAndRender();
+    ctx.startRefresh();
 }

 async function importPrivateKey(ctx) {
@@ -254,12 +266,15 @@ 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.doRefreshAndRender();
+    ctx.startRefresh();
 }

 async function importXprvKey(ctx) {
@@ -315,6 +330,9 @@ async function importXprvKey(ctx) {
    };
    state.wallets.push(wallet);
    state.hasWallet = true;
+    if (state.activeAddress === null) {
+        state.activeAddress = firstAddress;
+    }
    await saveState();
    clearViewStack();
    ctx.renderWalletList();
@@ -336,14 +354,21 @@ async function importXprvKey(ctx) {
            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.doRefreshAndRender();
+    ctx.startRefresh();
 }

 function init(ctx) {
@@ -79,9 +79,10 @@ function tokenAmountText(rawAmount, decimals, symbol) {
    };
 }

-// Try to decode calldata using known ABIs.
+// Try to decode calldata sent to `toAddress` on the network with chain id
+// `chainId`, using known ABIs.
 // Returns { name, description, details } or null.
-function decodeCalldata(data, toAddress) {
+function decodeCalldata(data, toAddress, chainId) {
    if (!data || data === "0x" || data.length < 10) return null;

    // Where a token's scale is looked for, for every decoder below: the ERC-20
@@ -185,7 +186,12 @@ function decodeCalldata(data, toAddress) {
    }

    // Try Uniswap Universal Router
-    const routerResult = uniswap.decode(data, toAddress, decimalsSources);
+    const routerResult = uniswap.decode(
+        data,
+        toAddress,
+        chainId,
+        decimalsSources,
+    );
    if (routerResult) return routerResult;

    return null;
@@ -269,8 +275,14 @@ function showTxApproval(details) {
        chainId: approvedTx.chainId,
    };

-    // If this is an ERC-20 call, try to extract the real recipient and amount
-    const decoded = decodeCalldata(approvedTx.data, toAddr || "");
+    // 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
+    // names.
+    const decoded = decodeCalldata(
+        approvedTx.data,
+        toAddr || "",
+        approvedTx.chainId,
+    );
    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
@@ -11,7 +11,6 @@ const {
    addressTitle,
    escapeHtml,
    displaySymbol,
-    nativeCurrency,
    renderAddressHtml,
    blockieHtml,
    attachCopyHandlers,
@@ -20,6 +19,10 @@ const {
    formatFee,
 } = require("./helpers");
 const { state, currentNetwork } = require("../../shared/state");
+const {
+    networkByChainId,
+    nativeCurrencyByChainId,
+} = require("../../shared/networks");
 const { getSignerForAddress } = require("../../shared/wallet");
 const { walletDefect } = require("../../shared/walletDefects");
 const { decryptWithPassword } = require("../../shared/vault");
@@ -68,11 +71,11 @@ function restore() {
    }
 }

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

@@ -87,8 +90,10 @@ function valueWithUsd(text, usdAmount) {
 // once its amount is re-derived from the fee estimate.
 function renderAmount(txInfo) {
    const isErc20 = txInfo.token !== "ETH";
-    const rawSymbol = isErc20 ? txInfo.tokenSymbol || "?" : nativeCurrency();
-    const price = isErc20 ? getPrice(rawSymbol) : getPrice("ETH");
+    const rawSymbol = isErc20
+        ? txInfo.tokenSymbol || "?"
+        : nativeCurrencyByChainId(txInfo.chainId);
+    const price = getPrice(isErc20 ? rawSymbol : "ETH", txInfo.chainId);
    const amountUsd = price ? parseFloat(txInfo.amount) * price : null;
    $("confirm-amount").textContent = valueWithUsd(
        txInfo.amount + " " + displaySymbol(rawSymbol),
@@ -101,16 +106,22 @@ function show(txInfo) {
    feeStatus = FEE_PENDING;
    feeWei = null;
    maxSendFees = null;
-    // The network this screen is drawn for, and the only one it sends on:
-    // Settings can switch the active network while the screen is open. The
-    // wait, success and error screens label the amount by it too.
-    txInfo.chainId = currentNetwork().chainId;
+    // 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, 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 ? txInfo.tokenSymbol || "?" : nativeCurrency();
+    const rawSymbol = isErc20
+        ? txInfo.tokenSymbol || "?"
+        : nativeCurrencyByChainId(txInfo.chainId);
    const symbol = displaySymbol(rawSymbol);

    // Transaction type
@@ -126,7 +137,7 @@ function show(txInfo) {
    if (isErc20) {
        $("confirm-token-contract").innerHTML = renderAddressHtml(
            txInfo.token,
-            {},
+            { chainId: txInfo.chainId },
        );
        tokenSection.classList.remove("hidden");
        attachCopyHandlers(tokenSection);
@@ -140,6 +151,7 @@ function show(txInfo) {
        txInfo.from,
        null,
        fromTitle,
+        txInfo.chainId,
    );

    // To (with blockie)
@@ -148,14 +160,15 @@ function show(txInfo) {
        txInfo.to,
        txInfo.ensName,
        toTitle,
+        txInfo.chainId,
    );
    $("confirm-to-ens").classList.add("hidden");

    renderAmount(txInfo);

    // Balance (with inline USD)
-    const ethPrice = getPrice("ETH");
-    const tokenPrice = getPrice(rawSymbol);
+    const ethPrice = getPrice("ETH", txInfo.chainId);
+    const tokenPrice = getPrice(rawSymbol, txInfo.chainId);
    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
@@ -212,15 +225,22 @@ function show(txInfo) {
    $("confirm-gas-error").classList.toggle("hidden", !isErc20);
    $("confirm-gas-error").textContent =
        "You do not have enough " +
-        nativeCurrency() +
+        nativeCurrencyByChainId(txInfo.chainId) +
        " to pay the network fee for this transfer. Please add " +
-        nativeCurrency() +
+        nativeCurrencyByChainId(txInfo.chainId) +
        " to this address and try again.";

-    // Shown later, once checkRecipientHistory() finds a contract.
+    // Both shown later, by checkRecipientHistory(). The first sentence says
+    // 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 " +
-        nativeCurrency() +
+        nativeCurrencyByChainId(txInfo.chainId) +
        " or tokens directly to a contract may result in permanent loss of" +
        " funds.";

@@ -273,11 +293,12 @@ function renderValidation(txInfo) {
    const isErc20 = txInfo.token !== "ETH";
    const symbol = isErc20
        ? displaySymbol(txInfo.tokenSymbol || "?")
-        : nativeCurrency();
+        : nativeCurrencyByChainId(txInfo.chainId);

    const { canSend, codes } = validateTransfer({
        isErc20,
        amount: txInfo.amount,
+        tokenDecimals: txInfo.tokenDecimals,
        ethBalance: txInfo.balance,
        tokenBalance: txInfo.tokenBalance,
        feeStatus,
@@ -361,9 +382,23 @@ function setVisible(id, visible) {
    $(id).style.visibility = visible ? "visible" : "hidden";
 }

+// The node of the network this transaction was reviewed for, which need not be
+// the active one: the popup can reopen onto this screen after Settings switched
+// the network. Its RPC URL is the one Settings has for that network: the
+// active network's is state.rpcUrl, any other's the one remembered for it (see
+// applyChainSwitchFields()).
+function reviewedNetworkProvider(txInfo) {
+    const net = networkByChainId(txInfo.chainId);
+    if (net.id === state.networkId) {
+        return getProvider(state.rpcUrl, net.id);
+    }
+    const remembered = state.networkEndpoints[net.id] || {};
+    return getProvider(remembered.rpcUrl || net.defaultRpcUrl, net.id);
+}
+
 async function estimateGas(txInfo) {
    try {
-        const provider = getProvider(state.rpcUrl, state.networkId);
+        const provider = reviewedNetworkProvider(txInfo);
        const feeData = await provider.getFeeData();
        let gasLimit;

@@ -411,12 +446,17 @@ 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)) +
                " " +
-                nativeCurrency() +
+                nativeCurrencyByChainId(txInfo.chainId) +
                " reserved";
            setVisible("confirm-fee-reserve", true);
        } else {
@@ -425,7 +465,8 @@ async function estimateGas(txInfo) {
            // cost is not below the reserve. Show the reserve alone.
            $("confirm-fee-amount").textContent = formatFee(
                gasCostWei,
-                nativeCurrency(),
+                nativeCurrencyByChainId(txInfo.chainId),
+                txInfo.chainId,
            );
            setVisible("confirm-fee-reserve", false);
        }
@@ -515,9 +556,10 @@ function showSendError(message) {

 async function checkRecipientHistory(txInfo) {
    try {
-        const provider = getProvider(state.rpcUrl, state.networkId);
+        const provider = reviewedNetworkProvider(txInfo);
        const asyncWarnings = await getFullWarnings(txInfo.to, provider, {
            fromAddress: txInfo.from,
+            chainId: txInfo.chainId,
        });
        for (const w of asyncWarnings) {
            if (w.type === "contract") {
@@ -556,8 +598,10 @@ function init(_ctx) {
            return;
        }

-        // Back from Settings only unhides this screen, still drawn for the
-        // network that was active when it was shown.
+        // The screen describes the network the transaction was reviewed for,
+        // which Settings may have switched away from since: with this screen
+        // open, where Back only unhides it, or before the popup reopened onto
+        // it.
        if (currentNetwork().chainId !== pendingTx.chainId) {
            showSendError(
                "The active network changed after this transaction was" +
@@ -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,9 +54,7 @@ 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 = walletHasRecoveryPhrase(wallet)
-        ? "recovery phrase"
-        : "extended private key";
+    const secret = keyMaterialName(wallet);
    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 " +
@@ -7,6 +7,7 @@ const {
    goBack,
    clearViewStack,
    onViewLeave,
+    keyMaterialName,
 } = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 const { decryptWithPassword } = require("../../shared/vault");
@@ -75,6 +76,9 @@ 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");
 }

@@ -94,6 +98,9 @@ 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.
@@ -22,9 +22,11 @@ const { resolveTokenSymbol } = require("../../shared/approvalAmount");
 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,
@@ -283,11 +285,12 @@ 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 and confirmation screens, which send on the active network, label a
-// native amount with this; a transaction already made or requested is labelled
-// by its own chain id, through nativeCurrencyByChainId() in networks.js. The
-// "ETH" that state.selectedToken and txInfo.token hold is the native token's
-// id, not its label, and stays "ETH" on every network.
+// the Send screen, which sends on the active network, label a native amount
+// with this; the confirmation screen, and a transaction already made or
+// requested, label it by the transaction's own chain id, through
+// nativeCurrencyByChainId() in networks.js. The "ETH" that state.selectedToken
+// and txInfo.token hold is the native token's id, not its label, and stays
+// "ETH" on every network.
 function nativeCurrency() {
    return currentNetwork().nativeCurrency;
 }
@@ -306,11 +309,12 @@ function tokenLabel(address) {
 // 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. The USD value is of the exact fee, not of the
-// truncated figure.
-function formatFee(wei, symbol) {
+// the ETH price is known on the network with `chainId`, or on the active
+// network when no chain id is given. The USD value is of the exact fee, not of
+// the truncated figure.
+function formatFee(wei, symbol, chainId) {
    const eth = formatEther(wei);
-    const ethPrice = getPrice("ETH");
+    const ethPrice = getPrice("ETH", chainId);
    const usd = ethPrice ? formatUsd(parseFloat(eth) * ethPrice) : "";
    return (
        truncateAmountNeverZero(eth) +
@@ -418,6 +422,16 @@ 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
@@ -593,17 +607,19 @@ const EXT_ICON =
    `</svg></span>`;

 // Block-explorer URLs. The origin is a per-network constant from
-// src/shared/networks.js; only the path segment is data, and it comes out
-// of explorer JSON (a transaction's from/to, a token's address_hash), which
-// nothing upstream validates as hex. percent-encoding it keeps a segment
-// that contains a slash, a query or a fragment from re-pointing the link
-// somewhere else in the explorer.
-function explorerUrl(kind, value) {
-    return `${currentNetwork().explorerUrl}/${kind}/${encodeURIComponent(value)}`;
+// src/shared/networks.js, the explorer of the network with `chainId`, or of
+// the active network when no chain id is given; only the path segment is
+// data, and it comes out of explorer JSON (a transaction's from/to, a token's
+// address_hash), which nothing upstream validates as hex. percent-encoding it
+// keeps a segment that contains a slash, a query or a fragment from
+// re-pointing the link somewhere else in the explorer.
+function explorerUrl(kind, value, chainId) {
+    const network = chainId ? networkByChainId(chainId) : currentNetwork();
+    return `${network.explorerUrl}/${kind}/${encodeURIComponent(value)}`;
 }

-function etherscanAddressUrl(address) {
-    return explorerUrl("address", address);
+function etherscanAddressUrl(address, chainId) {
+    return explorerUrl("address", address, chainId);
 }

 // The URL still has to be escaped on the way into href="...": encoding
@@ -669,16 +685,18 @@ 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 } = opts || {};
+    const { title, ensName, maxLen, noLink, chainId } = opts || {};
    const dot = addressDotHtml(address);
    const displayAddr = maxLen
        ? truncateMiddle(address, Math.max(ADDRESS_MIN_DISPLAY_LEN, maxLen))
        : address;
-    const link = etherscanAddressUrl(address);
+    const link = etherscanAddressUrl(address, chainId);
    const extLink = noLink ? "" : etherscanLinkHtml(link);

    let html = "";
@@ -725,6 +743,7 @@ module.exports = {
    balanceLine,
    balanceLinesForAddress,
    addressHoldsFunds,
+    keyMaterialName,
    unknownableAmount,
    nativeCurrency,
    tokenLabel,
@@ -24,6 +24,7 @@ const {
 } = require("../../shared/amountDisplay");
 const {
    feeReserveWei,
+    isValidAmount,
    maxEthAmount,
    maxTokenAmount,
 } = require("../../shared/txValidation");
@@ -255,13 +256,18 @@ async function fillMaxAmount() {
    const token = state.selectedToken || $("send-token").value;

    if (token !== "ETH") {
-        const bal = tokenBalanceAndDecimals(addr, token).tokenBalance;
+        const { tokenBalance: bal, tokenDecimals } = tokenBalanceAndDecimals(
+            addr,
+            token,
+        );
        if (bal == null) {
            showFlash("This token's balance is unknown.");
            return;
        }
        const amount = maxTokenAmount(bal);
-        if (!(parseFloat(amount) > 0)) {
+        // The balance is stored at the token's own decimal places and cut to
+        // 18 above, so the only balance this refuses is zero.
+        if (!isValidAmount(amount, tokenDecimals)) {
            showFlash("This token's balance is zero.");
            return;
        }
@@ -367,7 +373,28 @@ 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 tokenBalance = null;
+        let tokenDecimals = null;
+        if (token !== "ETH") {
+            tokenSymbol = resolveSymbol(
+                token,
+                addr.tokenBalances,
+                state.trackedTokens,
+            );
+            ({ tokenBalance, 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;
        }
@@ -391,24 +418,6 @@ 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,
@@ -76,11 +76,13 @@ 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.
+// connections approved without "Remember" and tells its open tabs. The
+// 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();
-    notify({ type: "AUTISTMASK_REMOVE_SITE", origin });
+    await sendMessage({ type: "AUTISTMASK_REMOVE_SITE", origin });
    await renderSiteLists();
 }

@@ -230,8 +232,8 @@ async function renderSiteLists() {
        Object.values(state.deniedSites).flat(),
        removeDeniedSite,
    );
-    // Sites allowed without "Remember" are held only by the background, in
-    // memory, so it is asked for them.
+    // Sites allowed without "Remember" are held only in session storage, which
+    // the background keeps, so it is asked for them.
    renderSiteList(
        "settings-connected-sites",
        await sendMessage({ type: "AUTISTMASK_GET_CONNECTED_SITES" }),
@@ -21,7 +21,7 @@ const {
    displaySymbol,
    goBack,
 } = require("./helpers");
-const { state } = require("../../shared/state");
+const { state, currentNetwork } = require("../../shared/state");
 const { nativeCurrencyByChainId } = require("../../shared/networks");
 const { formatEther, formatUnits } = require("ethers");
 const { log, debugFetch } = require("../../shared/log");
@@ -316,7 +316,12 @@ async function loadFullTxDetails(txHash, chainId) {
        // Decoded against the address the transaction was sent to, as the
        // explorer reports it, not the history entry's `to`: for a token
        // transfer that is the transfer's recipient, not the token contract.
-        const decoded = decodeCalldata(inputData, txData.to?.hash || "");
+        // On the active network, the one whose explorer was just asked.
+        const decoded = decodeCalldata(
+            inputData,
+            txData.to?.hash || "",
+            currentNetwork().chainId,
+        );
        if (decoded) {
            // Render decoded calldata matching approval view style
            actionEl.textContent = decoded.name;
@@ -51,12 +51,15 @@ function getLocalWarnings(address, options = {}) {

 /**
 * Check an address against local lists AND via RPC queries.
- * Async — performs network calls to check contract status and tx history.
+ * Async — performs network calls to check contract status, tx count and
+ * 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.
 * @returns {Promise<Array<{type: string, message: string, severity: string}>>}
 */
 async function getFullWarnings(address, provider, options = {}) {
@@ -78,21 +81,30 @@ async function getFullWarnings(address, provider, options = {}) {
        log.errorf("contract check failed:", e.shortMessage || e.message);
    }

-    // Skip tx count check for contracts — they may legitimately have
-    // zero inbound EOA transactions.
+    // The transaction count is the number of transactions the address has
+    // sent, so an address that has only ever received has a count of zero.
+    // 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) {
-                warnings.push({
-                    type: "new-address",
-                    message:
-                        "This address has never sent a transaction. Double-check it is correct.",
-                    severity: "info",
-                });
+                const balance = await provider.getBalance(address);
+                if (balance === 0n) {
+                    warnings.push({
+                        type: "new-address",
+                        message:
+                            "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("tx count check failed:", e.shortMessage || e.message);
+            log.errorf(
+                "tx count or balance check failed:",
+                e.shortMessage || e.message,
+            );
        }
    }

@@ -100,7 +112,10 @@ 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(address);
+        const etherscanWarning = await checkEtherscanLabel(
+            address,
+            options.chainId,
+        );
        if (etherscanWarning) {
            warnings.push(etherscanWarning);
        }
@@ -41,6 +41,7 @@ const {
    ALLOWED_TX_TYPES,
    SERIALIZED_FIELDS,
    assertWithinCeilings,
+    nodeError,
 } = require("./approvalVerify");

 // How long the population may take before the request is failed back to the
@@ -72,15 +73,27 @@ 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) {
+    constructor(message, code, data) {
        super(message);
        this.name = "ApprovalPrepareError";
+        if (code !== undefined) this.code = code;
+        if (data !== undefined) this.data = data;
    }
 }

-function fail(message) {
-    return new ApprovalPrepareError(message);
+function fail(message, code, data) {
+    return new ApprovalPrepareError(message, code, data);
 }

 function present(v) {
@@ -134,6 +147,7 @@ function requestFrom(txParams, from) {
        ) {
            throw fail(
                "The site asked for two different gas limits for this transaction.",
+                INVALID_PARAMS_CODE,
            );
        }
        request.gasLimit = txParams.gas;
@@ -144,6 +158,7 @@ function requestFrom(txParams, from) {
    ) {
        throw fail(
            "The site asked for a transaction of a type this wallet does not sign.",
+            INVALID_PARAMS_CODE,
        );
    }
    return request;
@@ -228,6 +243,9 @@ async function prepareApprovalTx(provider, from, txParams) {
        );
    } 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: " +
@@ -235,6 +253,8 @@ async function prepareApprovalTx(provider, from, txParams) {
                        e.message ||
                        "the network did not answer"),
            ),
+            fromNode?.code,
+            fromNode?.data,
        );
    }

@@ -746,6 +746,15 @@ 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
@@ -757,7 +766,7 @@ function failureTexts(err) {
    for (const text of [err.shortMessage, err.message, err.reason]) {
        if (text) texts.push(String(text));
    }
-    const nested = err.error || (err.info && err.info.error);
+    const nested = nodeError(err);
    if (nested && nested.message) texts.push(String(nested.message));
    return texts;
 }
@@ -891,6 +900,7 @@ module.exports = {
    assertWithinCeilings,
    sameAddress,
    failureIsRetryable,
+    nodeError,
    isNonceCollision,
    describeTxFailure,
    describeSigningFailure,
@@ -174,9 +174,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(method) {
+function storageUnavailable(area, method) {
    return Promise.reject(
-        new Error("extension storage.local is not available: " + method),
+        new Error("extension storage." + area + " is not available: " + method),
    );
 }

@@ -187,7 +187,7 @@ function storageUnavailable(method) {
 */
 function storageGet(keys) {
    const storage = storageLocal();
-    if (!storage) return storageUnavailable("get");
+    if (!storage) return storageUnavailable("local", "get");
    return Promise.resolve(storage.get(keys));
 }

@@ -198,7 +198,7 @@ function storageGet(keys) {
 */
 function storageSet(items) {
    const storage = storageLocal();
-    if (!storage) return storageUnavailable("set");
+    if (!storage) return storageUnavailable("local", "set");
    return Promise.resolve(storage.set(items));
 }

@@ -215,7 +215,55 @@ function storageSet(items) {
 */
 function storageRemove(keys) {
    const storage = storageLocal();
-    if (!storage) return storageUnavailable("remove");
+    if (!storage) return storageUnavailable("local", "remove");
+    return Promise.resolve(storage.remove(keys));
+}
+
+// `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));
 }

@@ -307,6 +355,9 @@ module.exports = {
    notify,
    runtimeApi,
    sendMessage,
+    sessionStorageGet,
+    sessionStorageRemove,
+    sessionStorageSet,
    storageGet,
    storageLocal,
    storageRemove,
@@ -2,6 +2,8 @@
 // Extension users make the requests directly to Etherscan — no proxy needed.
 // This is a best-effort enrichment: network failures return null silently.

+const { 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];
@@ -72,18 +74,21 @@ function parseEtherscanPage(html) {
 * Returns a warning object if the address is flagged, or null.
 * Network failures return null silently (best-effort check).
 *
- * Uses the current network's explorer URL so the lookup works on both
- * mainnet (etherscan.io) and Sepolia (sepolia.etherscan.io).
+ * Uses the explorer of the network with `chainId`, or of the active network
+ * when it is omitted: etherscan.io on mainnet, sepolia.etherscan.io on
+ * Sepolia.
 *
 * @param {string} address - Ethereum address to check.
+ * @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(address) {
+async function checkEtherscanLabel(address, chainId) {
    try {
        // Lazy require to avoid pulling in chrome.storage at module scope
        // (which breaks unit tests that only exercise parseEtherscanPage).
        const { currentNetwork } = require("./state");
-        const etherscanBase = currentNetwork().explorerUrl + "/address/";
+        const network = chainId ? networkByChainId(chainId) : currentNetwork();
+        const etherscanBase = network.explorerUrl + "/address/";
        const resp = await fetch(etherscanBase + address, {
            headers: { Accept: "text/html" },
        });
@@ -2,6 +2,7 @@

 const { getTopTokenPrices } = require("./tokenList");
 const { isBelowOneMillionth } = require("./amountDisplay");
+const { networkByChainId } = require("./networks");

 const PRICE_CACHE_TTL = 300000; // 5 minutes

@@ -36,10 +37,12 @@ function clearPrices() {
    lastFetchedAt = 0;
 }

-// Return the USD price for a symbol, or null on testnet / unknown.
-function getPrice(symbol) {
+// Return the USD price for a symbol on the network with `chainId`, or on the
+// active network when no chain id is given; null on testnet / unknown.
+function getPrice(symbol, chainId) {
    const { currentNetwork } = require("./state");
-    if (currentNetwork().isTestnet) return null;
+    const network = chainId ? networkByChainId(chainId) : currentNetwork();
+    if (network.isTestnet) return null;
    return prices[symbol] || null;
 }

@@ -1,4 +1,5 @@
-// Balance arithmetic for the Send and transaction confirmation screens.
+// The amount check and balance arithmetic for the Send and transaction
+// 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
@@ -20,7 +21,7 @@ const FEE_KNOWN = "known";
 const FEE_UNAVAILABLE = "unavailable";

 const CODES = {
-    // The amount is not a non-negative number we can do exact arithmetic on.
+    // The amount is one isValidAmount() refuses.
    AMOUNT_INVALID: "amount-invalid",
    // ERC-20: the token amount exceeds the token balance.
    INSUFFICIENT_TOKEN: "insufficient-token",
@@ -87,6 +88,27 @@ 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 the exact decimal string
@@ -112,9 +134,11 @@ 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, non-negative. Anything
-//                  else, a negative value included, is an unusable amount
+//   amount       — human decimal string being sent. One isValidAmount()
+//                  refuses, 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
@@ -128,6 +152,7 @@ function maxTokenAmount(tokenBalance) {
 function validateTransfer({
    isErc20 = false,
    amount,
+    tokenDecimals = null,
    ethBalance,
    tokenBalance,
    feeStatus = FEE_PENDING,
@@ -135,17 +160,17 @@ function validateTransfer({
 } = {}) {
    const codes = [];

-    const amountFp = toFixedPoint(amount);
-    const ethFp = toFixedPoint(ethBalance) ?? 0n;
-
-    // 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) {
+    // An amount refused here never reaches the comparisons below: a negative
+    // one would pass every one of them, then die at encode time in
+    // parseEther().
+    if (!isValidAmount(amount, isErc20 ? tokenDecimals : null)) {
        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
@@ -195,6 +220,7 @@ module.exports = {
    SCALE_DECIMALS,
    feeReserveWei,
    feeEstimateWei,
+    isValidAmount,
    maxEthAmount,
    maxTokenAmount,
    toFixedPoint,
@@ -8,6 +8,7 @@ const {
    resolveTokenSymbol,
    unknownDecimalsAmount,
 } = require("./approvalAmount");
+const { NETWORKS } = require("./networks");

 const coder = AbiCoder.defaultAbiCoder();

@@ -15,7 +16,57 @@ const ROUTER_IFACE = new Interface([
    "function execute(bytes commands, bytes[] inputs, uint256 deadline)",
 ]);

-// Universal Router command IDs (lower 5 bits of each command byte)
+// The Universal Router deployments on each network, by chain id, copied from
+// the deployment files Uniswap publishes, each address named by its key there.
+// The files also list `UnsupportedProtocol`, which is not a router.
+//
+// Beside each address is the mask that router reads a command's type with:
+// its dispatcher runs `commandType & Commands.COMMAND_TYPE_MASK`, and the bits
+// above the mask are the allow-revert flag (0x80) or ignored. The mask grew
+// between releases. Each is `COMMAND_TYPE_MASK` in the release's
+// `contracts/libraries/Commands.sol`, the same file as in the source verified
+// for that address:
+// - 0x1f, UniversalRouterV1: https://github.com/Uniswap/universal-router/blob/cda697da221e24ca143bc4f55023694a2a16796f/contracts/libraries/Commands.sol
+// - 0x3f, UniversalRouterV1_2_V2Support: https://github.com/Uniswap/universal-router/blob/41183d6eb154f0ab0e74a0e911a5ef9ea51fc4bd/contracts/libraries/Commands.sol
+// - 0x3f, UniversalRouterV2: https://github.com/Uniswap/universal-router/blob/3663f6db6e2fe121753cd2d899699c2dc75dca86/contracts/libraries/Commands.sol
+// - 0x7f, UniversalRouterV2_1_1: https://github.com/Uniswap/universal-router/blob/999d561c3ad58fb5cab91b602911f3c75591a9c7/contracts/libraries/Commands.sol
+// - 0x7f, UniversalRouterV2_1_2: https://github.com/Uniswap/universal-router/blob/802fe4c18f47300e0f183e2a42e9146ec2ea9fc3/contracts/libraries/Commands.sol
+const ROUTER_ADDRESSES = new Map([
+    [
+        NETWORKS.mainnet.chainId,
+        // https://github.com/Uniswap/universal-router/blob/543e1a19d6e21e31ced2512eec5792b50f13a0ba/deploy-addresses/mainnet.json
+        [
+            ["0xEf1c6E67703c7BD7107eed8303Fbe6EC2554BF6B", 0x1f], // UniversalRouterV1
+            ["0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD", 0x3f], // UniversalRouterV1_2_V2Support
+            ["0x66a9893cc07d91d95644aedd05d03f95e1dba8af", 0x3f], // UniversalRouterV2
+            ["0x4C82D1fBFe28C977cBB58D8C7FF8FCF9F70a2cCA", 0x7f], // UniversalRouterV2_1_1
+            ["0x23617e59A5925b2A4Bf75d73ff6711cD0b29De85", 0x7f], // UniversalRouterV2_1_2
+        ],
+    ],
+    [
+        NETWORKS.sepolia.chainId,
+        // https://github.com/Uniswap/universal-router/blob/543e1a19d6e21e31ced2512eec5792b50f13a0ba/deploy-addresses/sepolia.json
+        [
+            ["0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD", 0x3f], // UniversalRouterV1_2_V2Support
+            ["0x3a9d48ab9751398bbfa63ad67599bb04e4bdf98b", 0x3f], // UniversalRouterV2
+            ["0x7DfD4F31be6814D2906BDE155c3e1B146EAc1468", 0x7f], // UniversalRouterV2_1_1
+            ["0x7E4f6c5e954Da5c61B3423D81E2277431Ac043f3", 0x7f], // UniversalRouterV2_1_2
+        ],
+    ],
+]);
+
+// The mask the Universal Router deployment at `address` on the network with
+// this chain id reads a command's type with, or null when `address` is not one
+// of them. Address case is ignored.
+function routerCommandTypeMask(address, chainId) {
+    const routers = ROUTER_ADDRESSES.get(chainId) || [];
+    const wanted = (address || "").toLowerCase();
+    const router = routers.find(([a]) => a.toLowerCase() === wanted);
+    return router ? router[1] : null;
+}
+
+// Universal Router command types, each read from its command byte with the
+// router's mask (see ROUTER_ADDRESSES)
 const COMMAND_NAMES = {
    0x00: "V3 Swap (Exact In)",
    0x01: "V3 Swap (Exact Out)",
@@ -54,8 +105,10 @@ function formatAmount(raw, decimals) {
 const UNNAMED_CURRENCY = "Unknown (not named in the calldata)";

 // The same refusal when a V4 swap action could not be read (see
-// decodeExactly()). That action names both of its currencies, so saying the
-// calldata did not name one would be false.
+// decodeExactly()), or the transaction has an EXECUTE_SUB_PLAN step, whose
+// commands this decoder does not read. That action names both of its
+// currencies, and those commands may name one, so saying the calldata did not
+// name it would be false.
 const UNDECODED_CURRENCY = "Unknown (could not be decoded)";

 // Explicit presence, never truthiness. Every gate in this file that guards a
@@ -120,7 +173,7 @@ const NO_MINIMUM = "None (no minimum guaranteed)";
 const MAX_UINT160 = BigInt("0xffffffffffffffffffffffffffffffffffffffff");

 // WETH, the token UNWRAP_WETH turns into ETH: on mainnet, then on Sepolia.
-// decode() is not told the network, so it takes either.
+// Either one counts on either network.
 const WETH_ADDRESSES = [
    "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
    "0xfff9976782d46cc05630d1f6ebab18b2324d6b14",
@@ -290,7 +343,9 @@ const V4_SWAP_EXACT_IN = 0x07;
 const V4_SWAP_EXACT_OUT_SINGLE = 0x08;
 const V4_SWAP_EXACT_OUT = 0x09;
 const V4_SETTLE = 0x0b;
+const V4_SETTLE_ALL = 0x0c;
 const V4_TAKE = 0x0e;
+const V4_TAKE_ALL = 0x0f;

 // A V4 exact-in `amountIn`, read the way V4Router reads it: zero is
 // ActionConstants.OPEN_DELTA, not a quantity of zero. See the OPEN_DELTA
@@ -318,10 +373,133 @@ function decodeExactly(types, data) {
    return decoded;
 }

+// Decode one V4 swap action's parameters into the currency it spends
+// (`tokenIn`), the currency it buys (`tokenOut`) and, for an exact-in action,
+// its `amountIn` and `amountOutMin`. The exact-out actions decode no amounts.
+// A field the action does not state is null. Throws when the parameters are
+// not in the deployed shape (see decodeExactly()).
+function decodeV4SwapAction(actionId, param) {
+    if (actionId === V4_SWAP_EXACT_IN) {
+        // ExactInputParams: (address currencyIn,
+        //   tuple(address,uint24,int24,address,bytes)[] path,
+        //   uint128 amountIn, uint128 amountOutMin)
+        const s = decodeExactly(
+            [
+                "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
+            ],
+            param,
+        );
+        const path = s[0][1];
+        return {
+            tokenIn: s[0][0],
+            tokenOut: path.length > 0 ? path[path.length - 1][0] : null,
+            amountIn: v4ExactInAmount(s[0][2]),
+            amountOutMin: s[0][3],
+        };
+    }
+    if (actionId === V4_SWAP_EXACT_IN_SINGLE) {
+        // ExactInputSingleParams: (tuple(address,address,uint24,int24,address) poolKey,
+        //   bool zeroForOne, uint128 amountIn, uint128 amountOutMin, bytes hookData)
+        const s = decodeExactly(
+            [
+                "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
+            ],
+            param,
+        );
+        const poolKey = s[0][0];
+        const zeroForOne = s[0][1];
+        return {
+            tokenIn: zeroForOne ? poolKey[0] : poolKey[1],
+            tokenOut: zeroForOne ? poolKey[1] : poolKey[0],
+            amountIn: v4ExactInAmount(s[0][2]),
+            amountOutMin: s[0][3],
+        };
+    }
+    if (actionId === V4_SWAP_EXACT_OUT) {
+        // ExactOutputParams: (address currencyOut,
+        //   tuple(address,uint24,int24,address,bytes)[] path,
+        //   uint128 amountOut, uint128 amountInMaximum)
+        const s = decodeExactly(
+            [
+                "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
+            ],
+            param,
+        );
+        // The router works through the path from its last entry back to its
+        // first, starting from currencyOut, so the first entry is what the
+        // action spends.
+        const path = s[0][1];
+        return {
+            tokenIn: path.length > 0 ? path[0][0] : null,
+            tokenOut: s[0][0],
+            amountIn: null,
+            amountOutMin: null,
+        };
+    }
+    // V4_SWAP_EXACT_OUT_SINGLE. ExactOutputSingleParams: (poolKey as above,
+    //   bool zeroForOne, uint128 amountOut, uint128 amountInMaximum,
+    //   bytes hookData)
+    const s = decodeExactly(
+        [
+            "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
+        ],
+        param,
+    );
+    const poolKey = s[0][0];
+    const zeroForOne = s[0][1];
+    return {
+        tokenIn: zeroForOne ? poolKey[0] : poolKey[1],
+        tokenOut: zeroForOne ? poolKey[1] : poolKey[0],
+        amountIn: null,
+        amountOutMin: null,
+    };
+}
+
+// The currencies in `list` that `other` does not hold, each listed once.
+function currenciesNotIn(list, other) {
+    return [...new Set(list.filter((c) => !other.includes(c)))];
+}
+
+// The amount that the swap actions on one side of a V4 step state together:
+// the one action's own amount, or the sum when there are several and each
+// states a quantity. Exact-out actions state none here, and the open delta is
+// not a quantity. Otherwise null.
+function totalAmount(amounts) {
+    if (amounts.length === 1) return amounts[0];
+    if (amounts.length === 0) return null;
+    if (!amounts.every((a) => typeof a === "bigint")) return null;
+    return amounts.reduce((sum, a) => sum + a, 0n);
+}
+
 // Decode V4_SWAP (command 0x10) input bytes.
-// The input is ABI-encoded as (bytes actions, bytes[] params).
-// We extract token addresses from SETTLE (input) and TAKE (output) sub-actions,
-// and swap amounts from the swap sub-actions.
+// The input is ABI-encoded as (bytes actions, bytes[] params). Each swap
+// action gives the currency it spends and the currency it buys (see
+// decodeV4SwapAction()). The step's sides then follow three rules:
+//
+// 1. Token In is the currency SETTLE or SETTLE_ALL names; otherwise the one
+//    currency that some swap action spends and none buys. Token Out is the
+//    currency TAKE or TAKE_ALL names; otherwise the one currency that some
+//    swap action buys and none spends. If there is not exactly one such
+//    currency, that side is unknown.
+// 2. Amount is the amountIn of the swap action that spends Token In. If
+//    several exact-in actions spend it, each with a stated amount, it is
+//    their sum; in any other case there is none. Min. received is the same
+//    for amountOutMin and the actions that buy Token Out.
+// 3. If any swap action in the step cannot be read, only SETTLE, SETTLE_ALL,
+//    TAKE and TAKE_ALL name the sides, and there is no Amount or Min.
+//    received.
+//
+// A currency a swap action does not name, such as what an exact-in action
+// with an empty path buys, is null and counts in rules 1 and 2 as a currency
+// like any other: a step of only that action has an unknown Token Out and
+// the action's amountOutMin as Min. received.
+//
+// `hasSwapAction` is true when the step has a swap action, read or not.
+// decode() then always sets the output side from this step, and sets the
+// input side from it only when no earlier step set it. A side it sets that
+// these rules leave unknown is set unknown, with no figure. A step with no
+// swap action sets only the sides SETTLE, SETTLE_ALL, TAKE and TAKE_ALL
+// name.
 function decodeV4Swap(input) {
    try {
        const d = coder.decode(["bytes", "bytes[]"], input);
@@ -330,11 +508,12 @@ function decodeV4Swap(input) {

        let settleToken = null;
        let takeToken = null;
-        let amountIn = null;
-        let amountOutMin = null;
+        // The step's swap actions that could be read, as decodeV4SwapAction()
+        // reads them.
+        const swaps = [];
        // Set when a swap action's parameters are not in the deployed shape
-        // (see decodeExactly()), so nothing was read from that action. SETTLE
-        // and TAKE may still name both currencies.
+        // (see decodeExactly()), so nothing was read from that action. SETTLE,
+        // SETTLE_ALL, TAKE and TAKE_ALL may still name both currencies.
        let swapUndecoded = false;

        for (let i = 0; i < actions.length; i++) {
@@ -347,6 +526,10 @@ function decodeV4Swap(input) {
                        params[i],
                    );
                    settleToken = s[0];
+                } else if (actionId === V4_SETTLE_ALL) {
+                    // SETTLE_ALL: (address currency, uint256 maxAmount)
+                    const s = coder.decode(["address", "uint256"], params[i]);
+                    settleToken = s[0];
                } else if (actionId === V4_TAKE) {
                    // TAKE: (address currency, address recipient, uint256 amount)
                    const t = coder.decode(
@@ -354,107 +537,20 @@ function decodeV4Swap(input) {
                        params[i],
                    );
                    takeToken = t[0];
+                } else if (actionId === V4_TAKE_ALL) {
+                    // TAKE_ALL: (address currency, uint256 minAmount)
+                    const t = coder.decode(["address", "uint256"], params[i]);
+                    takeToken = t[0];
                } else if (
+                    actionId === V4_SWAP_EXACT_IN_SINGLE ||
                    actionId === V4_SWAP_EXACT_IN ||
-                    actionId === V4_SWAP_EXACT_IN_SINGLE
+                    actionId === V4_SWAP_EXACT_OUT_SINGLE ||
+                    actionId === V4_SWAP_EXACT_OUT
                ) {
-                    // Extract amounts from exact-in swap actions
-                    if (actionId === V4_SWAP_EXACT_IN) {
-                        // ExactInputParams: (address currencyIn,
-                        //   tuple(address,uint24,int24,address,bytes)[] path,
-                        //   uint128 amountIn, uint128 amountOutMin)
-                        try {
-                            const s = decodeExactly(
-                                [
-                                    "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
-                                ],
-                                params[i],
-                            );
-                            if (!present(settleToken)) settleToken = s[0][0];
-                            const path = s[0][1];
-                            if (path.length > 0 && !present(takeToken)) {
-                                takeToken = path[path.length - 1][0];
-                            }
-                            if (!present(amountIn)) {
-                                amountIn = v4ExactInAmount(s[0][2]);
-                            }
-                            if (!present(amountOutMin)) {
-                                amountOutMin = s[0][3];
-                            }
-                        } catch {
-                            swapUndecoded = true;
-                        }
-                    } else {
-                        // ExactInputSingleParams: (tuple(address,address,uint24,int24,address) poolKey,
-                        //   bool zeroForOne, uint128 amountIn, uint128 amountOutMin, bytes hookData)
-                        try {
-                            const s = decodeExactly(
-                                [
-                                    "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
-                                ],
-                                params[i],
-                            );
-                            const poolKey = s[0][0];
-                            const zeroForOne = s[0][1];
-                            if (!present(settleToken))
-                                settleToken = zeroForOne
-                                    ? poolKey[0]
-                                    : poolKey[1];
-                            if (!present(takeToken))
-                                takeToken = zeroForOne
-                                    ? poolKey[1]
-                                    : poolKey[0];
-                            if (!present(amountIn)) {
-                                amountIn = v4ExactInAmount(s[0][2]);
-                            }
-                            if (!present(amountOutMin)) {
-                                amountOutMin = s[0][3];
-                            }
-                        } catch {
-                            swapUndecoded = true;
-                        }
-                    }
-                } else if (
-                    actionId === V4_SWAP_EXACT_OUT ||
-                    actionId === V4_SWAP_EXACT_OUT_SINGLE
-                ) {
-                    if (actionId === V4_SWAP_EXACT_OUT) {
-                        try {
-                            const s = decodeExactly(
-                                [
-                                    "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
-                                ],
-                                params[i],
-                            );
-                            if (!present(takeToken)) takeToken = s[0][0];
-                            const path = s[0][1];
-                            if (path.length > 0 && !present(settleToken)) {
-                                settleToken = path[path.length - 1][0];
-                            }
-                        } catch {
-                            swapUndecoded = true;
-                        }
-                    } else {
-                        try {
-                            const s = decodeExactly(
-                                [
-                                    "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
-                                ],
-                                params[i],
-                            );
-                            const poolKey = s[0][0];
-                            const zeroForOne = s[0][1];
-                            if (!present(settleToken))
-                                settleToken = zeroForOne
-                                    ? poolKey[0]
-                                    : poolKey[1];
-                            if (!present(takeToken))
-                                takeToken = zeroForOne
-                                    ? poolKey[1]
-                                    : poolKey[0];
-                        } catch {
-                            swapUndecoded = true;
-                        }
+                    try {
+                        swaps.push(decodeV4SwapAction(actionId, params[i]));
+                    } catch {
+                        swapUndecoded = true;
                    }
                }
            } catch {
@@ -462,22 +558,70 @@ function decodeV4Swap(input) {
            }
        }

+        // Rule 3.
+        if (swapUndecoded) {
+            return {
+                tokenIn: settleToken,
+                tokenOut: takeToken,
+                amountIn: null,
+                amountOutMin: null,
+                swapUndecoded,
+                hasSwapAction: true,
+            };
+        }
+
+        const spent = swaps.map((s) => s.tokenIn);
+        const bought = swaps.map((s) => s.tokenOut);
+
+        // Rules 1 and 2 for Token In.
+        let tokenIn = null;
+        let amountIn = null;
+        const spentOnly = currenciesNotIn(spent, bought);
+        if (present(settleToken) || spentOnly.length === 1) {
+            tokenIn = present(settleToken) ? settleToken : spentOnly[0];
+            amountIn = totalAmount(
+                swaps
+                    .filter((s) => s.tokenIn === tokenIn)
+                    .map((s) => s.amountIn),
+            );
+        }
+
+        // Rules 1 and 2 for Token Out.
+        let tokenOut = null;
+        let amountOutMin = null;
+        const boughtOnly = currenciesNotIn(bought, spent);
+        if (present(takeToken) || boughtOnly.length === 1) {
+            tokenOut = present(takeToken) ? takeToken : boughtOnly[0];
+            amountOutMin = totalAmount(
+                swaps
+                    .filter((s) => s.tokenOut === tokenOut)
+                    .map((s) => s.amountOutMin),
+            );
+        }
+
        return {
-            tokenIn: settleToken,
-            tokenOut: takeToken,
+            tokenIn,
+            tokenOut,
            amountIn,
            amountOutMin,
            swapUndecoded,
+            hasSwapAction: swaps.length > 0,
        };
    } catch {
        return null;
    }
 }

-// Try to decode a Universal Router execute() call.
+// Try to decode a Universal Router execute() call sent to `toAddress` on the
+// network with chain id `chainId`.
 // Returns { name, description, details } matching the format used by
-// the approval UI, or null if the calldata is not a recognised execute().
-function decode(data, toAddress, sources) {
+// the approval UI, or null if the calldata is not a recognised execute() or
+// `toAddress` is not a Universal Router on that network: the same calldata
+// sent to any other contract is not a swap through the router, whatever that
+// contract does with it.
+function decode(data, toAddress, chainId, sources) {
+    const commandTypeMask = routerCommandTypeMask(toAddress, chainId);
+    if (commandTypeMask === null) return null;
    try {
        const parsed = ROUTER_IFACE.parseTransaction({ data });
        if (!parsed) return null;
@@ -491,9 +635,11 @@ function decode(data, toAddress, sources) {
        let inputEstablished = false;
        let outputToken = null;
        let minOutput = null;
+        let outputEstablished = false;
        let hasUnwrapWeth = false;
        let hasV2ExactOut = false;
        let swapUndecoded = false;
+        let hasSubPlan = false;
        const commandNames = [];

        // THE INVARIANT: an amount and the token it is counted in always come
@@ -510,8 +656,11 @@ function decode(data, toAddress, sources) {
        //
        // The input side is fixed by the first hop that states either half, the
        // output side by the last, because the final leg is what the user
-        // receives. A half the establishing hop did not state stays null and
-        // the line says so, rather than being filled in from a different hop.
+        // receives. A V4 step with a swap action sets a side even when it
+        // states neither half: the output side always, and the input side
+        // when no earlier hop set it. A half the establishing hop did not
+        // state stays null and the line says so, rather than being filled in
+        // from a different hop.
        const setInput = (token, amount) => {
            inputToken = present(token) ? token : null;
            inputAmount = present(amount) ? amount : null;
@@ -526,16 +675,25 @@ function decode(data, toAddress, sources) {
            if (!present(token) && !present(amount)) return;
            outputToken = present(token) ? token : null;
            minOutput = present(amount) ? amount : null;
+            outputEstablished = true;
        };

        for (let i = 0; i < commandsBytes.length; i++) {
-            const cmdId = commandsBytes[i] & 0x1f;
+            const cmdId = commandsBytes[i] & commandTypeMask;
            commandNames.push(
                COMMAND_NAMES[cmdId] ||
                    "Command 0x" + cmdId.toString(16).padStart(2, "0"),
            );

            try {
+                if (cmdId === 0x21) {
+                    // EXECUTE_SUB_PLAN runs a further list of commands held in
+                    // its input, which this decoder does not read. The step
+                    // says so, and after this loop neither side is named.
+                    hasSubPlan = true;
+                    commandNames[i] += " (its steps are not shown)";
+                }
+
                if (cmdId === 0x0a) {
                    const p = decodePermit2(inputs[i]);
                    // A permit states both halves itself, so it may replace an
@@ -597,30 +755,33 @@ function decode(data, toAddress, sources) {
                if (cmdId === 0x10) {
                    const v4 = decodeV4Swap(inputs[i]);
                    if (v4 && v4.swapUndecoded) {
-                        // The unread swap action named this step's currencies
-                        // and amounts, so the step is marked and still sets
-                        // both sides as a swap step does. A side its SETTLE or
-                        // TAKE did not name is set undetermined, not left to
-                        // an earlier or later step's token and figure.
+                        // A swap action of this step went unread, so the step
+                        // is marked.
                        swapUndecoded = true;
                        commandNames[i] += " (could not be decoded)";
+                    }
+                    if (v4 && v4.hasSwapAction) {
+                        // A step with a swap action always sets the output
+                        // side, as the last swap step wins, and sets the
+                        // input side only when no earlier step set it. Each
+                        // side it sets is set as a pair, even when the step
+                        // states neither half, so a side decodeV4Swap() left
+                        // unknown is set unknown with no figure. A token
+                        // stated without a figure, or a figure without a
+                        // token, likewise never sits beside an earlier step's
+                        // other half.
                        if (!inputEstablished) {
                            setInput(v4.tokenIn, v4.amountIn);
                        }
                        outputToken = v4.tokenOut;
                        minOutput = v4.amountOutMin;
+                        outputEstablished = true;
                    } else if (v4) {
+                        // A step with no swap action sets only the sides its
+                        // SETTLE, SETTLE_ALL, TAKE or TAKE_ALL names:
+                        // setInputOnce() and setOutput() leave alone a side
+                        // whose two halves are both unstated.
                        setInputOnce(v4.tokenIn, v4.amountIn);
-                        // Always update output: last swap step wins. A step
-                        // that carries the Min. received figure but decoded no
-                        // output currency makes the output *undetermined* — it
-                        // is neither ETH nor whatever an earlier step named,
-                        // and that figure is no longer counted in that token.
-                        // Equally, a step that names an output currency but no
-                        // minimum leaves Min. received unstated rather than
-                        // keeping an earlier step's figure beside the new
-                        // token. setOutput() is both rules; a step that states
-                        // neither half leaves the output alone.
                        setOutput(v4.tokenOut, v4.amountOutMin);
                    }
                }
@@ -633,22 +794,34 @@ function decode(data, toAddress, sources) {
            }
        }

+        // The commands of an EXECUTE_SUB_PLAN step may spend the user's tokens
+        // or pay the user, before or after any other step, and a permit among
+        // them would replace the input side. What the other steps state is
+        // then not the whole swap, so both sides are set unknown, with no
+        // figure, wherever the step stands.
+        if (hasSubPlan) {
+            inputToken = null;
+            inputAmount = null;
+            outputToken = null;
+            minOutput = null;
+            outputEstablished = true;
+        }
+
        // Resolve token info. A null token on either side means no step named
-        // a currency for it, or a V4 step whose swap action went unread left
-        // it undetermined; tokenInfo() refuses rather than calling it ETH.
-        // UNWRAP_WETH turns WETH into ETH, so it makes the output ETH when the
-        // output side is WETH, or when no step set the output side. A step
-        // whose swap action went unread did set it, to undetermined. Any other
-        // output keeps its own token and figure: a swap that buys USDC and
-        // then unwraps the WETH it did not spend receives USDC.
+        // a currency for it, a V4 step with a swap action left it unknown, or
+        // an EXECUTE_SUB_PLAN step did; tokenInfo() refuses rather than calling
+        // it ETH. UNWRAP_WETH turns WETH into ETH, so it makes the output ETH
+        // when the output side is WETH, or when no step set the output side. A
+        // V4 step with a swap action, or an EXECUTE_SUB_PLAN step, did set it,
+        // even when it set it unknown. Any other output keeps its own token
+        // and figure: a swap that buys USDC and then unwraps the WETH it did
+        // not spend receives USDC.
        const outputIsWeth =
            present(outputToken) &&
            WETH_ADDRESSES.includes(outputToken.toLowerCase());
-        const outputUnset =
-            !present(outputToken) && !present(minOutput) && !swapUndecoded;
        const inInfo = tokenInfo(inputToken, sources);
        const outInfo =
-            hasUnwrapWeth && (outputIsWeth || outputUnset)
+            hasUnwrapWeth && (outputIsWeth || !outputEstablished)
                ? { symbol: "ETH", decimals: 18, address: null }
                : tokenInfo(outputToken, sources);

@@ -687,7 +860,10 @@ function decode(data, toAddress, sources) {
            // screen must not describe the same condition in two ways.
            details.push({
                label: "Token In",
-                value: swapUndecoded ? UNDECODED_CURRENCY : UNNAMED_CURRENCY,
+                value:
+                    swapUndecoded || hasSubPlan
+                        ? UNDECODED_CURRENCY
+                        : UNNAMED_CURRENCY,
            });
        }

@@ -753,7 +929,10 @@ function decode(data, toAddress, sources) {
            // calldata did not state.
            details.push({
                label: "Token Out",
-                value: swapUndecoded ? UNDECODED_CURRENCY : UNNAMED_CURRENCY,
+                value:
+                    swapUndecoded || hasSubPlan
+                        ? UNDECODED_CURRENCY
+                        : UNNAMED_CURRENCY,
            });
        }

@@ -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 memory.
+// "Remember", which only the background holds, in session storage.
 function dropSitePermissions(state, addresses) {
    for (const addr of addresses) {
        delete state.allowedSites[addr];
@@ -0,0 +1,167 @@
+// 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: [],
+            },
+        ]);
+    });
+});
@@ -230,7 +230,7 @@ beforeEach(() => {

    addWallet.init({
        renderWalletList: () => {},
-        doRefreshAndRender: () => {},
+        startRefresh: () => {},
        pageClosed: new AbortController().signal,
    });
    confirmTx.init({});
@@ -94,7 +94,7 @@ describe.each([
    async function create(pageClosed) {
        addWallet.init({
            renderWalletList: () => {},
-            doRefreshAndRender: () => {},
+            startRefresh: () => {},
            pageClosed,
        });
        element("tab-" + mode).listeners.click();
@@ -0,0 +1,39 @@
+// 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"]);
+});
@@ -68,7 +68,11 @@ function swapData(amountIn, amountOutMin) {
 }

 function swapDetail(amountIn, amountOutMin, label) {
-    const decoded = uniswap.decode(swapData(amountIn, amountOutMin), ROUTER);
+    const decoded = uniswap.decode(
+        swapData(amountIn, amountOutMin),
+        ROUTER,
+        "0x1",
+    );
    return decoded.details.find((d) => d.label === label);
 }

@@ -321,9 +321,10 @@ function loadBackground(options) {
    require("../src/background/index");

    // Send a message the way the browser would, and hand back whatever the
-    // handler passed to sendResponse.
-    function send(msg, sender) {
-        const sendResponse = jest.fn();
+    // handler passed to sendResponse. `onResponse`, when given, receives the
+    // answer when the handler sends it, as the sender's callback does.
+    function send(msg, sender, onResponse) {
+        const sendResponse = jest.fn(onResponse);
        const kept = messageListener(msg, sender || {}, sendResponse);
        return { sendResponse, kept };
    }
@@ -1161,9 +1162,12 @@ 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(
@@ -1182,8 +1186,10 @@ 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/,
                ),
@@ -1233,6 +1239,7 @@ 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/),
            },
        });
@@ -1323,6 +1330,7 @@ describe("what the approval is verified against", () => {
        );
        expect(pending.result()).toEqual({
            error: {
+                code: -32603,
                message: expect.stringMatching(/approved maximum fee per gas/),
            },
        });
@@ -1382,7 +1390,10 @@ describe("what the approval is verified against", () => {
            expect.objectContaining({ retryable: false, stage: "verify" }),
        );
        expect(pending.result()).toEqual({
-            error: { message: expect.stringMatching(/active address changed/) },
+            error: {
+                code: -32603,
+                message: expect.stringMatching(/active address changed/),
+            },
        });
    });

@@ -1526,7 +1537,10 @@ describe("what the approval is verified against", () => {
            }),
        );
        expect(pending.result()).toEqual({
-            error: { message: expect.stringMatching(/active address changed/) },
+            error: {
+                code: -32603,
+                message: expect.stringMatching(/active address changed/),
+            },
        });
    });

@@ -1576,7 +1590,9 @@ describe("what the approval is verified against", () => {
            error: refusal,
            retryable: false,
        });
-        expect(pending.result()).toEqual({ error: { message: refusal } });
+        expect(pending.result()).toEqual({
+            error: { code: -32603, message: refusal },
+        });
    });

    // ethers signs a `bool` field sent as the string "false" as true, and one
@@ -1611,7 +1627,9 @@ describe("what the approval is verified against", () => {
                error: refusal,
                retryable: false,
            });
-            expect(pending.result()).toEqual({ error: { message: refusal } });
+            expect(pending.result()).toEqual({
+                error: { code: -32603, message: refusal },
+            });
        },
    );

@@ -1649,6 +1667,7 @@ 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/,
                ),
@@ -1671,8 +1690,11 @@ 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/,
                ),
@@ -2594,9 +2616,9 @@ async function siteAccounts(bg, origin) {
    return sendResponse.mock.calls[0][0];
 }

-// A site connected without "Remember" is held only in the background's memory,
-// keyed to the address it was connected to. Removing that address, or the
-// wallet holding it, must end the connection as part of the removal itself.
+// A site connected without "Remember" is held only in the background's session
+// storage, keyed to the address it was connected to. Removing that address, or
+// the 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.
 //
@@ -2775,8 +2797,7 @@ describe("removing a site in Settings disconnects it", () => {
        const element = (id) => (lists[id] ||= fakeSiteList());
        global.document = { getElementById: element };
        global.chrome.runtime.sendMessage = (msg, callback) => {
-            const { sendResponse } = bg.send(msg, bg.fromPopup);
-            if (callback) callback(sendResponse.mock.calls[0]?.[0]);
+            bg.send(msg, bg.fromPopup, callback);
        };
        await require("../src/shared/state").loadState();
        await require("../src/popup/views/settings").renderSiteLists();
@@ -7,25 +7,52 @@
 // reviewed on Sepolia went out as 1 ETH on mainnet once mainnet was chosen in
 // Settings in between.
 //
+// The same holds when the popup was closed after the switch and reopened, and
+// Back drew the screen again from the transaction it saved
+// (https://git.eeqj.de/sneak/AutistMask/issues/586): the screen was drawn for
+// the new network, and Sign & Send sent the reviewed transfer there. Drawn
+// again, the screen describes the transaction entirely on the network it was
+// reviewed for, because choosing that network again in Settings and pressing
+// Back only unhides it, and Sign & Send then sends from it.
+//
 // Driven through the real confirmation screen, signer and chain switch, with
-// only the node and the DOM stubbed. The stub node is on the network its
-// provider was built for, so a broadcast records the network it went to.
+// only the node, fetch and the DOM stubbed. The stub node is on the network
+// its provider was built for, so a broadcast records the network it went to.

 "use strict";

-// The signed transactions the stub node was handed, with its network's chain id.
-const mockNode = { broadcast: [] };
+// The questions the stub node was asked for the fee and the recipient checks,
+// by method, network name and RPC URL, in order. The signed transactions it
+// was handed, with its network's chain id and RPC URL. And whether it quotes
+// fees as a network with no type-2 pricing does.
+const mockNode = { asked: [], broadcast: [], legacyFees: false };

 jest.mock("ethers", () => {
    const actual = jest.requireActual("ethers");
    class StubProvider {
        constructor(url, network) {
+            this.url = url;
            this.network = network;
        }
+        record(method) {
+            mockNode.asked.push({
+                method,
+                network: this.network.name,
+                url: this.url,
+            });
+        }
        async getNetwork() {
            return this.network;
        }
        async getFeeData() {
+            this.record("getFeeData");
+            if (mockNode.legacyFees) {
+                return {
+                    maxFeePerGas: null,
+                    maxPriorityFeePerGas: null,
+                    gasPrice: 10000000000n,
+                };
+            }
            return {
                maxFeePerGas: 20000000000n,
                maxPriorityFeePerGas: 1000000000n,
@@ -36,16 +63,22 @@ jest.mock("ethers", () => {
            return 21000n;
        }
        async getCode() {
+            this.record("getCode");
            return "0x";
        }
        async getTransactionCount() {
+            this.record("getTransactionCount");
            return 1;
        }
        async lookupAddress() {
            return null;
        }
        async broadcastTransaction(signed) {
-            mockNode.broadcast.push({ chainId: this.network.chainId, signed });
+            mockNode.broadcast.push({
+                chainId: this.network.chainId,
+                url: this.url,
+                signed,
+            });
            return { hash: "0x" + "ab".repeat(32) };
        }
    }
@@ -75,6 +108,8 @@ jest.mock("../src/popup/views/txStatus", () => ({
    showError: jest.fn(),
 }));

+// The Etherscan label check is its only caller here: the explorer pages it
+// asks for are recorded, and nothing is fetched.
 global.fetch = jest.fn(() => {
    throw new Error("tests must not perform network requests");
 });
@@ -125,15 +160,27 @@ global.navigator = { clipboard: { writeText() {} } };

 const { BaseWallet, Transaction, Wallet } = require("ethers");
 const { encryptWithPassword } = require("../src/shared/vault");
-const { state, loadState } = require("../src/shared/state");
+const { state, loadState, saveState } = require("../src/shared/state");
 const { onChainSwitch } = require("../src/shared/chainSwitch");
 const { NETWORKS } = require("../src/shared/networks");
+const { prices } = require("../src/shared/prices");
+const {
+    goBack,
+    pushCurrentView,
+    setBackRenderer,
+    showView,
+} = require("../src/popup/views/helpers");
+const {
+    makeBackRenderer,
+    resetRenderedViews,
+} = require("../src/popup/viewRouter");
 const txStatus = require("../src/popup/views/txStatus");
 const confirmTx = require("../src/popup/views/confirmTx");

 const PRIVATE_KEY = "0x" + "11".repeat(32);
 const HOLDER = new Wallet(PRIVATE_KEY).address;
 const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
+const TOKEN = "0x7070707070707070707070707070707070707070";
 const PASSWORD = "correct horse battery staple";

 function el(id) {
@@ -150,7 +197,10 @@ beforeAll(async () => {

 beforeEach(() => {
    elements.clear();
+    mockNode.asked = [];
    mockNode.broadcast = [];
+    mockNode.legacyFees = false;
+    global.fetch.mockClear();
    txStatus.showWait.mockClear();
    txStatus.showError.mockClear();
    signTransaction = jest.spyOn(BaseWallet.prototype, "signTransaction");
@@ -160,10 +210,16 @@ afterEach(() => {
    signTransaction.mockRestore();
 });

-// Show the confirmation screen for 1 of the native token on `networkId`, as
-// Review on the Send screen does, with its fee estimate settled.
-async function review(networkId) {
+// Show the confirmation screen for 1 of the native token on `networkId`, or
+// for the transfer `changes` makes of it, as Review on the Send screen does,
+// with its fee estimate settled.
+async function review(networkId, changes = {}) {
    await onChainSwitch(networkId);
+    await reviewOnActiveNetwork(changes);
+}
+
+// review() on the network already active, without switching to it again.
+async function reviewOnActiveNetwork(changes = {}) {
    state.wallets = [
        {
            type: "key",
@@ -186,7 +242,90 @@ async function review(networkId) {
        tokenBalance: null,
        tokenDecimals: null,
        max: false,
+        ...changes,
    });
+    await settle();
+}
+
+// The user's own node for a network, set in Settings.
+function ownNode(networkId) {
+    return "https://" + networkId + ".node.example.invalid";
+}
+
+// After review() on `reviewedOn`: the user's own node set for it, the Settings
+// gear, `switchedTo` chosen there, the popup closed and reopened onto
+// Settings, and Back, which draws the confirmation screen again from the
+// transaction it saved. The reopened page holds an ETH price of $2,000 and a
+// USDC price of $1 whichever network is active, so each USD value shows which
+// network it was priced for.
+async function switchReopenAndGoBack(reviewedOn, switchedTo) {
+    state.rpcUrl = ownNode(reviewedOn);
+    pushCurrentView();
+    showView("settings");
+    await onChainSwitch(switchedTo);
+
+    await loadState();
+    elements.clear();
+    resetRenderedViews();
+    setBackRenderer(makeBackRenderer(state, { confirmTx }));
+    confirmTx.init({});
+    prices.ETH = 2000;
+    prices.USDC = 1;
+    mockNode.asked = [];
+    global.fetch.mockClear();
+    goBack();
+    await settle();
+}
+
+// The USD value `text` as the screen appends it for `networkId`: nothing on a
+// testnet, which has no USD values.
+function usdOn(networkId, text) {
+    return NETWORKS[networkId].isTestnet ? "" : " (" + text + ")";
+}
+
+// The screen for the transfer review() shows by default, described on
+// `networkId`: in its native currency, priced by it, linking to its explorer.
+function expectNativeTransferOn(networkId) {
+    const { nativeCurrency: symbol, explorerUrl } = NETWORKS[networkId];
+    expect(el("confirm-type").textContent).toBe(
+        "Native " + symbol + " transfer",
+    );
+    expect(el("confirm-amount").textContent).toBe(
+        "1 " + symbol + usdOn(networkId, "$2,000.00"),
+    );
+    expect(el("confirm-balance").textContent).toBe(
+        "5.0000 " + symbol + usdOn(networkId, "$10,000.00"),
+    );
+    expect(el("confirm-fee-amount").textContent).toBe(
+        "~0.0002 " + symbol + usdOn(networkId, "$0.42"),
+    );
+    expect(el("confirm-fee-reserve").textContent).toBe(
+        "up to 0.0004 " + symbol + " reserved",
+    );
+    expect(el("confirm-gas-error").textContent).toBe(
+        "You do not have enough " +
+            symbol +
+            " to pay the network fee for this transfer. Please add " +
+            symbol +
+            " to this address and try again.",
+    );
+    expect(el("confirm-recipient-warning").textContent).toContain(
+        " holds no " + symbol + ". ",
+    );
+    expect(el("confirm-contract-warning").textContent).toContain(
+        " Sending " + symbol + " or tokens ",
+    );
+    expect(el("confirm-from").innerHTML).toContain(
+        `href="${explorerUrl}/address/${HOLDER}"`,
+    );
+    expect(el("confirm-to").innerHTML).toContain(
+        `href="${explorerUrl}/address/${RECIPIENT}"`,
+    );
+}
+
+// show() estimates the fee and checks the recipient without awaiting either;
+// this lets both finish.
+async function settle() {
    for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
 }

@@ -208,6 +347,24 @@ test("a transfer reviewed on Sepolia and sent goes out on Sepolia", async () =>
    expect(txStatus.showWait).toHaveBeenCalledTimes(1);
 });

+// Saving an RPC endpoint in Settings (src/popup/views/settings.js) sets only
+// state.rpcUrl: the endpoint remembered for the active network keeps its old
+// value until the next switch away from it.
+test("a transfer reviewed after the active network's RPC endpoint was changed in Settings asks the new endpoint", async () => {
+    const newNode = "https://new.node.example.invalid";
+    await onChainSwitch("sepolia");
+    state.rpcUrl = newNode;
+    await saveState();
+
+    await reviewOnActiveNetwork();
+
+    expect(mockNode.asked).toEqual([
+        { method: "getFeeData", network: "sepolia", url: newNode },
+        { method: "getCode", network: "sepolia", url: newNode },
+        { method: "getTransactionCount", network: "sepolia", url: newNode },
+    ]);
+});
+
 describe.each([
    ["sepolia", "mainnet", "SepoliaETH"],
    ["mainnet", "sepolia", "ETH"],
@@ -238,6 +395,128 @@ describe.each([
    },
 );

+describe.each([
+    ["sepolia", "mainnet"],
+    ["mainnet", "sepolia"],
+])(
+    "a transfer reviewed on %s, with %s chosen in Settings, the popup reopened and Back pressed",
+    (reviewedOn, switchedTo) => {
+        const { nativeCurrency: symbol, explorerUrl } = NETWORKS[reviewedOn];
+
+        test("is described on the network it was reviewed for, and neither signed nor sent", async () => {
+            await review(reviewedOn);
+            await switchReopenAndGoBack(reviewedOn, switchedTo);
+
+            expect(state.currentView).toBe("confirm-tx");
+            expectNativeTransferOn(reviewedOn);
+            expect(mockNode.asked).toEqual([
+                {
+                    method: "getFeeData",
+                    network: reviewedOn,
+                    url: ownNode(reviewedOn),
+                },
+                {
+                    method: "getCode",
+                    network: reviewedOn,
+                    url: ownNode(reviewedOn),
+                },
+                {
+                    method: "getTransactionCount",
+                    network: reviewedOn,
+                    url: ownNode(reviewedOn),
+                },
+            ]);
+            expect(global.fetch.mock.calls.map(([url]) => url)).toEqual([
+                explorerUrl + "/address/" + RECIPIENT,
+            ]);
+            expect(el("btn-confirm-send").disabled).toBe(false);
+
+            await signAndSend();
+
+            expect(signTransaction).not.toHaveBeenCalled();
+            expect(mockNode.broadcast).toEqual([]);
+            expect(txStatus.showWait).not.toHaveBeenCalled();
+            expect(txStatus.showError).not.toHaveBeenCalled();
+            expect(el("confirm-errors").innerHTML).toContain(
+                "The active network changed after this transaction was" +
+                    " reviewed, so it was not sent.",
+            );
+        });
+
+        test("is sent on that network, as described, once it is chosen in Settings again and Back pressed", async () => {
+            await review(reviewedOn);
+            await switchReopenAndGoBack(reviewedOn, switchedTo);
+            // The Settings gear, the reviewed network chosen, and Back, which
+            // only unhides the screen as it was drawn.
+            pushCurrentView();
+            showView("settings");
+            await onChainSwitch(reviewedOn);
+            goBack();
+
+            expect(state.currentView).toBe("confirm-tx");
+            expectNativeTransferOn(reviewedOn);
+
+            await signAndSend();
+
+            const chainId = BigInt(NETWORKS[reviewedOn].chainId);
+            expect(mockNode.broadcast).toHaveLength(1);
+            expect(mockNode.broadcast[0].chainId).toBe(chainId);
+            expect(mockNode.broadcast[0].url).toBe(ownNode(reviewedOn));
+            expect(Transaction.from(mockNode.broadcast[0].signed).chainId).toBe(
+                chainId,
+            );
+            expect(txStatus.showWait).toHaveBeenCalledTimes(1);
+        });
+
+        test("for more than the balance, says so in that network's native currency", async () => {
+            await review(reviewedOn, { amount: "10" });
+            await switchReopenAndGoBack(reviewedOn, switchedTo);
+
+            expect(el("confirm-errors").innerHTML).toContain(
+                "Insufficient balance. You have 5.0000 " +
+                    symbol +
+                    " but are trying to send 10 " +
+                    symbol +
+                    ".",
+            );
+        });
+
+        test("with a fee quoted by a node with no type-2 pricing, shows the fee in that network's native currency and price", async () => {
+            await review(reviewedOn);
+            mockNode.legacyFees = true;
+            await switchReopenAndGoBack(reviewedOn, switchedTo);
+
+            expect(el("confirm-fee-amount").textContent).toBe(
+                "0.0002 " + symbol + usdOn(reviewedOn, "$0.42"),
+            );
+        });
+
+        test("of an ERC-20 token, links the token contract to that network's explorer and prices the token by that network", async () => {
+            await review(reviewedOn, {
+                token: TOKEN,
+                tokenSymbol: "USDC",
+                tokenBalance: "50",
+                tokenDecimals: 6,
+                amount: "10",
+            });
+            await switchReopenAndGoBack(reviewedOn, switchedTo);
+
+            expect(el("confirm-type").textContent).toBe(
+                "ERC-20 token transfer (USDC)",
+            );
+            expect(el("confirm-token-contract").innerHTML).toContain(
+                `href="${explorerUrl}/address/${TOKEN}"`,
+            );
+            expect(el("confirm-amount").textContent).toBe(
+                "10 USDC" + usdOn(reviewedOn, "$10.00"),
+            );
+            expect(el("confirm-balance").textContent).toBe(
+                "50.0000 USDC" + usdOn(reviewedOn, "$50.00"),
+            );
+        });
+    },
+);
+
 // The check in the click handler tells the user; the send itself carries the
 // chain id the screen was drawn for, so a signer on another network's node
 // cannot sign it even if the network changes after that check.
@@ -0,0 +1,354 @@
+// A site allowed without "Remember my choice for this site" stays connected
+// when the background worker is stopped and started again
+// (https://git.eeqj.de/sneak/AutistMask/issues/526).
+//
+// Chrome stops the worker after about 30 seconds idle and evaluates the
+// module afresh on the next event, so nothing held at module scope survives
+// it. Such a connection used to be held exactly there, and so lasted until the
+// first idle spell. Each test here makes the connection in one load of the
+// background, loads the module afresh over the same storage, as the browser
+// does, and asks the new one. The paths that end a connection are driven after
+// that restart, so each is shown to end what the earlier worker stored.
+
+const { networkById } = require("../src/shared/networks");
+const { makeStorageStub } = require("./support/storageStub");
+const {
+    removeAddressFromState,
+    removeWalletFromState,
+} = require("../src/shared/walletDelete");
+
+const ADDRESS = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
+const OTHER_ADDRESS = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8";
+
+const SITE = "https://dapp.example";
+const OTHER_SITE = "https://other.example";
+
+const EXT_URL = "chrome-extension://autistmask/";
+const FROM_POPUP = { url: EXT_URL + "src/popup/index.html" };
+
+// One wallet with two addresses, so that one of them can be removed, and no
+// remembered sites, so that every connection here is one made without
+// "Remember".
+function storedProfile() {
+    const mainnet = networkById("mainnet");
+    return {
+        hasWallet: true,
+        wallets: [
+            {
+                name: "Wallet 1",
+                type: "hd",
+                addresses: [
+                    { address: ADDRESS, balance: "0", tokenBalances: [] },
+                    { address: OTHER_ADDRESS, balance: "0", tokenBalances: [] },
+                ],
+            },
+        ],
+        activeAddress: ADDRESS,
+        networkId: "mainnet",
+        rpcUrl: mainnet.defaultRpcUrl,
+        blockscoutUrl: mainnet.defaultBlockscoutUrl,
+        allowedSites: {},
+        deniedSites: {},
+        trackedTokens: [],
+    };
+}
+
+async function settle() {
+    for (let i = 0; i < 50; i++) await Promise.resolve();
+}
+
+afterEach(() => {
+    delete global.chrome;
+    jest.resetModules();
+});
+
+// Load the background module afresh, as the browser does when it starts the
+// worker, over `storage`. The storage stub stands in for the browser's own
+// storage, local and session, so it outlives each load.
+function startWorker(storage) {
+    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;
+    let connectListener = null;
+    // Every URL the toolbar popup was set to open: a site's connection prompt
+    // is shown there, so this is where its approval id appears.
+    const toolbarPopups = [];
+    const windowsCreated = [];
+    const sentToTabs = [];
+
+    global.chrome = {
+        storage,
+        runtime: {
+            getURL: (path) => EXT_URL + path,
+            onMessage: {
+                addListener: (fn) => {
+                    messageListener = fn;
+                },
+            },
+            onConnect: {
+                addListener: (fn) => {
+                    connectListener = fn;
+                },
+            },
+            getPlatformInfo: (cb) => cb({ os: "linux" }),
+            // What the popup sends reaches the worker from the extension's own
+            // page.
+            sendMessage: (msg, callback) => {
+                messageListener(msg, FROM_POPUP, callback || (() => {}));
+            },
+            lastError: null,
+        },
+        windows: {
+            getLastFocused: (cb) => cb(null),
+            create: (options, cb) => {
+                windowsCreated.push(options);
+                cb({ id: windowsCreated.length });
+            },
+            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: (o) => {
+                toolbarPopups.push(o.popup);
+            },
+            openPopup: () => Promise.resolve(),
+        },
+    };
+
+    require("../src/background/index");
+
+    // A request from a site, answered once the worker has had time to answer.
+    async function rpc(method, origin, params) {
+        let response = null;
+        messageListener(
+            { type: "AUTISTMASK_RPC", method, params: params || [] },
+            { origin },
+            (r) => {
+                response = r;
+            },
+        );
+        await settle();
+        return response;
+    }
+
+    // A message from the popup, and the worker's answer to it.
+    async function fromPopup(msg) {
+        let response;
+        messageListener(msg, FROM_POPUP, (r) => {
+            response = r;
+        });
+        await settle();
+        return response;
+    }
+
+    // The site asks to connect, and the user allows it in the prompt with
+    // "Remember my choice for this site" left unchecked.
+    async function connectWithoutRemember(origin) {
+        let response = null;
+        messageListener(
+            { type: "AUTISTMASK_RPC", method: "eth_requestAccounts" },
+            { origin },
+            (r) => {
+                response = r;
+            },
+        );
+        await settle();
+        const id = new URL(toolbarPopups.at(-1), EXT_URL).searchParams.get(
+            "approval",
+        );
+        const decisionListeners = [];
+        const port = {
+            name: "approval:" + id,
+            sender: { url: EXT_URL + "src/popup/index.html?approval=" + id },
+            onMessage: { addListener: (fn) => decisionListeners.push(fn) },
+            onDisconnect: { addListener: () => {} },
+        };
+        connectListener(port);
+        for (const fn of decisionListeners) {
+            fn(
+                {
+                    type: "AUTISTMASK_APPROVAL_DECISION",
+                    approved: true,
+                    remember: false,
+                },
+                port,
+            );
+        }
+        await settle();
+        return response;
+    }
+
+    return {
+        rpc,
+        fromPopup,
+        connectWithoutRemember,
+        windowsCreated,
+        sentToTabs,
+    };
+}
+
+// A site connected without "Remember" in one worker, and the worker started
+// again over the same storage, where the site is still connected.
+async function connectedThenRestarted() {
+    const storage = makeStorageStub({ autistmask: storedProfile() });
+    const first = startWorker(storage);
+    expect(await first.connectWithoutRemember(SITE)).toEqual({
+        result: [ADDRESS],
+    });
+    const worker = startWorker(storage);
+    expect(await worker.rpc("eth_accounts", SITE)).toEqual({
+        result: [ADDRESS],
+    });
+    return { storage, worker };
+}
+
+describe("a site allowed without Remember, after the worker restarts", () => {
+    test("is still told the address, and is not asked again", async () => {
+        const { worker } = await connectedThenRestarted();
+
+        expect(await worker.rpc("eth_accounts", SITE)).toEqual({
+            result: [ADDRESS],
+        });
+        expect(await worker.rpc("eth_requestAccounts", SITE)).toEqual({
+            result: [ADDRESS],
+        });
+    });
+
+    test("is still listed under Connected Sites in Settings", async () => {
+        const { worker } = await connectedThenRestarted();
+
+        expect(
+            await worker.fromPopup({ type: "AUTISTMASK_GET_CONNECTED_SITES" }),
+        ).toEqual([SITE]);
+    });
+
+    test("may still ask for a signature", async () => {
+        // Refused with 4100 before the fix. Allowed, it raises the signing
+        // prompt and waits on the user.
+        const { worker } = await connectedThenRestarted();
+
+        const response = await worker.rpc("personal_sign", SITE, [
+            "0x48656c6c6f",
+            ADDRESS,
+        ]);
+
+        expect(response).toBeNull();
+        expect(worker.windowsCreated).toHaveLength(1);
+    });
+
+    test("is not connected after the browser restarts", async () => {
+        // The browser empties session storage when it closes; the wallet's
+        // own storage keeps nothing of the connection.
+        const { storage } = await connectedThenRestarted();
+        const afterBrowserRestart = startWorker(
+            makeStorageStub({ autistmask: storage.read("autistmask") }),
+        );
+
+        expect(await afterBrowserRestart.rpc("eth_accounts", SITE)).toEqual({
+            result: [],
+        });
+    });
+});
+
+describe("each way a connection allowed without Remember ends, after the worker restarts", () => {
+    test("removing the site in Settings", async () => {
+        const { worker } = await connectedThenRestarted();
+        expect(await worker.connectWithoutRemember(OTHER_SITE)).toEqual({
+            result: [ADDRESS],
+        });
+
+        await worker.fromPopup({
+            type: "AUTISTMASK_REMOVE_SITE",
+            origin: SITE,
+        });
+
+        expect(await worker.rpc("eth_accounts", SITE)).toEqual({ result: [] });
+        expect(worker.sentToTabs).toEqual([
+            {
+                type: "AUTISTMASK_EVENT",
+                eventName: "accountsChanged",
+                data: [],
+            },
+        ]);
+        expect(
+            await worker.fromPopup({ type: "AUTISTMASK_GET_CONNECTED_SITES" }),
+        ).toEqual([OTHER_SITE]);
+        expect(await worker.rpc("eth_accounts", OTHER_SITE)).toEqual({
+            result: [ADDRESS],
+        });
+    });
+
+    test("switching to another address", async () => {
+        // Switched away and back again, so the answer turns on the connection
+        // having ended rather than on which address is active.
+        const { storage, worker } = await connectedThenRestarted();
+        const switched = { ...storage.read("autistmask") };
+
+        switched.activeAddress = OTHER_ADDRESS;
+        storage.write("autistmask", switched);
+        await worker.fromPopup({ type: "AUTISTMASK_ACTIVE_CHANGED" });
+        switched.activeAddress = ADDRESS;
+        storage.write("autistmask", switched);
+
+        expect(await worker.rpc("eth_accounts", SITE)).toEqual({ result: [] });
+        expect(
+            await worker.fromPopup({ type: "AUTISTMASK_GET_CONNECTED_SITES" }),
+        ).toEqual([]);
+    });
+
+    // The two below ask while storage still names the removed address as
+    // active, because the popup has not saved yet, so the answer turns on the
+    // connection alone.
+    test("removing the connected address", async () => {
+        const { storage, worker } = await connectedThenRestarted();
+
+        const popupState = storage.read("autistmask");
+        expect(removeAddressFromState(popupState, 0, 0).removed).toBe(true);
+        await settle();
+
+        expect(await worker.rpc("eth_accounts", SITE)).toEqual({ result: [] });
+    });
+
+    test("removing the wallet holding the connected address", async () => {
+        const { storage, worker } = await connectedThenRestarted();
+
+        removeWalletFromState(storage.read("autistmask"), 0);
+        await settle();
+
+        expect(await worker.rpc("eth_accounts", SITE)).toEqual({ result: [] });
+    });
+
+    test("removing a different address leaves it connected", async () => {
+        const { storage, worker } = await connectedThenRestarted();
+
+        const popupState = storage.read("autistmask");
+        expect(removeAddressFromState(popupState, 0, 1).removed).toBe(true);
+        await settle();
+
+        expect(await worker.rpc("eth_accounts", SITE)).toEqual({
+            result: [ADDRESS],
+        });
+    });
+});
@@ -259,6 +259,36 @@ describe("reaching the screen", () => {
    });
 });

+// Both screens tell the user what they need to get the wallet back, and a
+// key or xprv wallet has no recovery phrase: telling its owner to rely on
+// one sends them looking for words that do not exist
+// (https://git.eeqj.de/sneak/AutistMask/issues/529).
+describe("what the screens say the wallet's backup is", () => {
+    test.each([
+        ["hd", "recovery phrase"],
+        ["key", "private key"],
+        ["xprv", "extended private key"],
+    ])(
+        "a wallet of type %s is told about its %s",
+        async (type, keyMaterial) => {
+            const { deleteWallet, state } = load();
+            state.wallets[1].type = type;
+
+            deleteWallet.show(1);
+            expect(state.currentView).toBe("delete-wallet-confirm");
+            expect(node("delete-wallet-key-material").textContent).toBe(
+                keyMaterial,
+            );
+
+            await click("btn-delete-wallet-lost-password");
+            expect(state.currentView).toBe(VIEW);
+            expect(node("delete-wallet-lost-key-material").textContent).toBe(
+                keyMaterial,
+            );
+        },
+    );
+});
+
 describe("the typed confirmation", () => {
    test("a name that is not the wallet's deletes nothing", async () => {
        const { deleteWallet, state, storage } = load();
@@ -3861,10 +3861,8 @@ test("eth_requestAccounts approved returns the selected address (#183)", async (
        // all; this measures that the whole address is visible (#517).
        await assertAddressesFit(popup, "the connection prompt");

-        // Remembered, so the connection survives a background worker that MV3
-        // terminates after 30 seconds idle. The in-memory connectedSites map
-        // does not, and the sign and transaction tests below all require the
-        // origin to still be authorized.
+        // Remembered, because the sign and transaction tests below all
+        // require the origin to still be authorized.
        await popup.check("#approve-remember");
        await clickAndClose(popup, "#btn-approve");

@@ -22,6 +22,11 @@
 // Before the approvals are raised it watches the worker stop on its own, so a
 // run in which something else keeps the worker running cannot pass.
 //
+// The site is connected without "Remember", and once the worker has stopped
+// the program requires the site still to be told the address: such a
+// connection used to be held in the worker's memory and ended with it
+// (https://git.eeqj.de/sneak/AutistMask/issues/526).
+//
 // The dApp page and the stub node are the loopback ones the Firefox suite also
 // uses (tests/e2e/dapp.js). The site is connected and the node chosen
 // through the extension's own screens, so nothing is written to its storage
@@ -311,8 +316,8 @@ async function main() {
        );
        await send("Target.closeTarget", { targetId: popup.targetId });

-        // The site, connected through the real prompt with "Remember", so
-        // the connection is stored rather than held by the worker.
+        // The site, connected through the real prompt without "Remember", so
+        // the connection is one that has to outlive the worker stopping below.
        const dapp = await openPage(node.url);
        await until("the injected provider", () =>
            dapp.evaluate("!!window.ethereum && !!window.__dapp"),
@@ -329,7 +334,7 @@ async function main() {
            inPrompt(shows("view-approve-site")),
        );
        await inPrompt(
-            "document.getElementById('approve-remember').checked = true",
+            "document.getElementById('approve-remember').checked = false",
        );
        // The prompt closes itself on the click.
        await inPrompt(click("btn-approve")).catch(() => {});
@@ -365,6 +370,20 @@ async function main() {
                "s",
        );

+        // The site's request starts the worker again, and the new worker still
+        // has the connection allowed without "Remember"
+        // (https://git.eeqj.de/sneak/AutistMask/issues/526).
+        const stillConnected = await dapp.evaluate(
+            "window.ethereum.request({ method: 'eth_accounts' })",
+        );
+        check(
+            "a site allowed without Remember is still connected after the worker stopped",
+            Array.isArray(stillConnected) &&
+                stillConnected.length === 1 &&
+                getAddress(stillConnected[0]) === address,
+            "eth_accounts answered " + JSON.stringify(stillConnected),
+        );
+
        // A transaction approval and a signature approval, both open at once.
        await dapp.evaluate(
            "window.__dapp.start('tx', 'eth_sendTransaction', [" +
@@ -136,7 +136,7 @@ function erc20AmountLine(data, tokenAddress) {
 }

 function swapAmountLine(data) {
-    return decodeCalldata(data, ROUTER).details.find(
+    return decodeCalldata(data, ROUTER, "0x1").details.find(
        (d) => d.label === "Amount",
    ).value;
 }
@@ -0,0 +1,141 @@
+// Adding the first wallet left no address active until the popup was reopened,
+// so Send and Receive on Home only said "No active address selected."
+// (https://git.eeqj.de/sneak/AutistMask/issues/512). Each test adds a wallet
+// through one of the three import tabs and checks which address is active by
+// opening Receive from Home in the same popup.
+
+const { HDNodeWallet, Mnemonic, Wallet } = require("ethers");
+
+const {
+    bootPopup,
+    cleanupPopup,
+    unversionedValidProfile,
+    ADDRESS,
+} = require("./support/popupBoot");
+
+const PHRASE =
+    "abandon abandon abandon abandon abandon abandon " +
+    "abandon abandon abandon abandon abandon about";
+const PRIVATE_KEY = "0x" + "11".repeat(32);
+// The master key of PHRASE, so its first address is the phrase's.
+const XPRV = HDNodeWallet.fromSeed(
+    Mnemonic.fromPhrase(PHRASE).computeSeed(),
+).extendedKey;
+const PASSWORD = "correct horse battery staple";
+
+const PHRASE_ADDRESS = HDNodeWallet.fromPhrase(PHRASE).address;
+
+// Addresses 1 and 2 of PHRASE used, address 0 not: a scan that answers these
+// replaces the wallet's list with one that leaves out its first address.
+const account = HDNodeWallet.fromPhrase(PHRASE, "", "m/44'/60'/0'/0");
+const used = [1, 2].map((index) => ({
+    address: account.deriveChild(index).address,
+    index,
+}));
+
+const TABS = [
+    {
+        tab: "tab-mnemonic",
+        field: "wallet-mnemonic",
+        secret: PHRASE,
+        address: PHRASE_ADDRESS,
+    },
+    {
+        tab: "tab-privkey",
+        field: "import-private-key",
+        secret: PRIVATE_KEY,
+        address: new Wallet(PRIVATE_KEY).address,
+    },
+    {
+        tab: "tab-xprv",
+        field: "import-xprv-key",
+        secret: XPRV,
+        address: PHRASE_ADDRESS,
+    },
+];
+
+// Fills in the open AddWallet screen and presses "Import".
+async function importOn(page, { tab, field, secret }) {
+    await page.click(tab);
+    page.node(field).value = secret;
+    page.node("add-wallet-password").value = PASSWORD;
+    page.node("add-wallet-password-confirm").value = PASSWORD;
+    await page.click("btn-add-wallet-confirm");
+}
+
+afterEach(() => {
+    cleanupPopup();
+});
+
+describe("the first wallet's first address is active right away", () => {
+    test.each(TABS)("added from $tab, Receive opens on it", async (entry) => {
+        const page = await bootPopup(undefined);
+        expect(page.pageErrors).toEqual([]);
+        await page.click("btn-welcome-add");
+        await importOn(page, entry);
+        expect(page.visibleViews()).toEqual(["main"]);
+
+        await page.click("btn-main-receive");
+        expect(page.visibleViews()).toEqual(["receive"]);
+        expect(page.node("receive-address-block").dataset.full).toBe(
+            entry.address,
+        );
+    });
+});
+
+describe("a scan that leaves out the first address", () => {
+    // The key tab runs no scan.
+    test.each(TABS.filter((t) => t.tab !== "tab-privkey"))(
+        "added from $tab, the scan's first address is active",
+        async (entry) => {
+            const page = await bootPopup(undefined);
+            const { scanForAddresses } = require("../src/shared/balances");
+            scanForAddresses.mockResolvedValueOnce({
+                addresses: used,
+                nextIndex: 3,
+            });
+            await page.click("btn-welcome-add");
+            await importOn(page, entry);
+
+            expect(page.storage.read("autistmask").activeAddress).toBe(
+                used[0].address,
+            );
+            expect(globalThis.chrome.runtime.sendMessage).toHaveBeenCalledWith({
+                type: "AUTISTMASK_ACTIVE_CHANGED",
+            });
+            await page.click("btn-main-receive");
+            expect(page.node("receive-address-block").dataset.full).toBe(
+                used[0].address,
+            );
+        },
+    );
+});
+
+describe("adding a wallet while an address is active", () => {
+    test.each(TABS)(
+        "added from $tab, the active address is unchanged",
+        async (entry) => {
+            const page = await bootPopup(unversionedValidProfile());
+            expect(page.pageErrors).toEqual([]);
+            // The phrase and xprv scans leave out the new wallet's first
+            // address, which was never active here. The key tab runs no scan.
+            const { scanForAddresses } = require("../src/shared/balances");
+            scanForAddresses.mockResolvedValueOnce({
+                addresses: used,
+                nextIndex: 3,
+            });
+            await page.click("btn-add-wallet-bottom");
+            await importOn(page, entry);
+            expect(page.visibleViews()).toEqual(["main"]);
+
+            expect(page.storage.read("autistmask").activeAddress).toBe(ADDRESS);
+            expect(
+                globalThis.chrome.runtime.sendMessage,
+            ).not.toHaveBeenCalledWith({ type: "AUTISTMASK_ACTIVE_CHANGED" });
+            await page.click("btn-main-receive");
+            expect(page.node("receive-address-block").dataset.full).toBe(
+                ADDRESS,
+            );
+        },
+    );
+});
@@ -0,0 +1,135 @@
+// A popup that opened with no wallet never started the ten-second refresh, so
+// after the first wallet was added Home went on showing the balance it had then
+// until the popup was reopened
+// (https://git.eeqj.de/sneak/AutistMask/issues/530). Each test boots the real
+// popup, adds wallets through AddWallet, and runs the intervals the popup set
+// with tick(). The balance stand-in writes what the chain holds onto every
+// address, as the real refreshBalances() does.
+
+const { HDNodeWallet, Mnemonic } = require("ethers");
+
+const {
+    bootPopup,
+    cleanupPopup,
+    unversionedValidProfile,
+    ADDRESS,
+} = require("./support/popupBoot");
+
+const PHRASE =
+    "abandon abandon abandon abandon abandon abandon " +
+    "abandon abandon abandon abandon abandon about";
+const PRIVATE_KEY = "0x" + "11".repeat(32);
+const XPRV = HDNodeWallet.fromSeed(
+    Mnemonic.fromPhrase(PHRASE).computeSeed(),
+).extendedKey;
+const PASSWORD = "correct horse battery staple";
+
+const TABS = [
+    { tab: "tab-mnemonic", field: "wallet-mnemonic", secret: PHRASE },
+    { tab: "tab-privkey", field: "import-private-key", secret: PRIVATE_KEY },
+    { tab: "tab-xprv", field: "import-xprv-key", secret: XPRV },
+];
+
+// A record this build cannot read: its wallets are a string.
+const UNREADABLE = {
+    hasWallet: true,
+    wallets: ADDRESS,
+    activeAddress: ADDRESS,
+};
+
+// The ETH balance the chain holds for every address, in ether.
+let chainBalance = "0.0";
+
+// Boots the popup over `stored`, with the balance stand-in reading the chain.
+async function boot(stored) {
+    const page = await bootPopup(stored);
+    const { refreshBalances } = require("../src/shared/balances");
+    refreshBalances.mockImplementation(async (wallets) => {
+        for (const wallet of wallets) {
+            for (const addr of wallet.addresses) addr.balance = chainBalance;
+        }
+    });
+    return { page, refreshBalances };
+}
+
+// Fills in the open AddWallet screen and presses "Import".
+async function importOn(page, { tab, field, secret }) {
+    await page.click(tab);
+    page.node(field).value = secret;
+    page.node("add-wallet-password").value = PASSWORD;
+    page.node("add-wallet-password-confirm").value = PASSWORD;
+    await page.click("btn-add-wallet-confirm");
+}
+
+beforeEach(() => {
+    chainBalance = "0.0";
+});
+
+afterEach(() => {
+    cleanupPopup();
+});
+
+describe("a popup that opened on Welcome", () => {
+    test.each(TABS)(
+        "after the first wallet is added from $tab, funds that arrive show on Home",
+        async (entry) => {
+            const { page } = await boot(undefined);
+            expect(page.pageErrors).toEqual([]);
+            await page.click("btn-welcome-add");
+            await importOn(page, entry);
+            expect(page.visibleViews()).toEqual(["main"]);
+            expect(page.text("total-value")).toBe("0.0000 ETH");
+
+            chainBalance = "2.0";
+            await page.tick();
+
+            expect(page.text("total-value")).toBe("2.0000 ETH");
+        },
+    );
+
+    test("a second wallet starts no second refresh", async () => {
+        const { page, refreshBalances } = await boot(undefined);
+        await page.click("btn-welcome-add");
+        await importOn(page, TABS[1]);
+        await page.click("btn-add-wallet-bottom");
+        await importOn(page, TABS[0]);
+        const calls = refreshBalances.mock.calls.length;
+
+        await page.tick();
+
+        expect(refreshBalances).toHaveBeenCalledTimes(calls + 1);
+    });
+
+    test("a wallet added as the recovery screen goes up starts no refresh", async () => {
+        const { page, refreshBalances } = await boot(undefined);
+        // The stored record becomes unreadable during the address scan that
+        // follows the import, and a save finds it.
+        const { scanForAddresses } = require("../src/shared/balances");
+        const { saveState } = require("../src/shared/state");
+        scanForAddresses.mockImplementationOnce(async () => {
+            page.storage.write("autistmask", UNREADABLE);
+            await saveState().catch(() => {});
+            return { addresses: [], nextIndex: 1 };
+        });
+        await page.click("btn-welcome-add");
+        await importOn(page, TABS[0]);
+        expect(page.visibleViews()).toEqual(["state-recovery"]);
+
+        await page.tick();
+
+        expect(refreshBalances).not.toHaveBeenCalled();
+    });
+});
+
+describe("a popup that opened with a wallet", () => {
+    test("adding a wallet starts no second refresh", async () => {
+        const { page, refreshBalances } = await boot(unversionedValidProfile());
+        await page.click("btn-add-wallet-bottom");
+        await importOn(page, TABS[1]);
+        const calls = refreshBalances.mock.calls.length;
+
+        await page.tick();
+
+        expect(refreshBalances).toHaveBeenCalledTimes(calls + 1);
+    });
+});
@@ -267,6 +267,13 @@ describe.each([
        );
    });

+    test("the warning for a recipient that has never sent a transaction", async () => {
+        await confirmSend("0.1");
+        expect(text("confirm-recipient-warning")).toContain(
+            "has never sent a transaction and holds no " + symbol + ".",
+        );
+    });
+
    // A token reports whatever symbol it likes. One reporting the label the
    // wallet shows its native token under, on this network or any other, is
    // a fake, exactly as one reporting `ETH` always was.
@@ -453,6 +453,20 @@ const CONTRACT = [
                views: ["confirm-tx"],
                restored: false,
            },
+            // A chain id naming no network has no explorer to link to.
+            {
+                value: {
+                    pendingTx: {
+                        token: "ETH",
+                        from: ADDRESS,
+                        to: ADDRESS,
+                        amount: "1",
+                        chainId: "0x5",
+                    },
+                },
+                views: ["confirm-tx"],
+                restored: false,
+            },
            // wait-tx passes on `pendingWait.hash`; restoreWait() has checked
            // the fields below it since it was written, and this is the
            // regression guard.
@@ -0,0 +1,42 @@
+// A timer the popup started and that fires after cleanupPopup() has removed
+// the page throws "document is not defined", and the throw fails whatever test
+// the jest worker is running by then, in this file or another
+// (https://git.eeqj.de/sneak/AutistMask/issues/578). The flash message's
+// timer is the one that did it. A throw from a timer during a test fails that
+// test, so each test here passes only if nothing throws.
+
+const {
+    bootPopup,
+    cleanupPopup,
+    unversionedValidProfile,
+} = require("./support/popupBoot");
+
+const FLASH_MS = 10;
+
+function wait(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+afterEach(() => {
+    cleanupPopup();
+});
+
+test("a flash message clears while the page is up", async () => {
+    const page = await bootPopup(unversionedValidProfile());
+    const { showFlash } = require("../src/popup/views/helpers");
+    showFlash("Copied.", FLASH_MS);
+    expect(page.text("flash-msg")).toBe("Copied.");
+
+    await wait(FLASH_MS * 5);
+
+    expect(page.text("flash-msg")).toBe("");
+});
+
+test("a flash message's timer does not fire after cleanupPopup()", async () => {
+    await bootPopup(unversionedValidProfile());
+    const { showFlash } = require("../src/popup/views/helpers");
+    showFlash("Copied.", FLASH_MS);
+    cleanupPopup();
+
+    await wait(FLASH_MS * 5);
+});
@@ -0,0 +1,282 @@
+// What a page is told when a request fails
+// (https://git.eeqj.de/sneak/AutistMask/issues/533).
+//
+// EIP-1193 gives every rejected request a numeric `code`, and lets it carry
+// `data`. A node's error used to reach the page as its message alone: a
+// reverting eth_call lost code 3 and the revert data a site needs to decode
+// the revert, and a site could not tell that failure from any other.
+//
+// Each request here goes from a page through the real background to a fake
+// node, and what is checked is the answer the background gives the page. The
+// content script relays that answer as it is, and src/content/inpage.js turns
+// its code and data into the error the page catches (tests/inpageErrors.test.js).
+//
+// The background reaches a node two ways, and the fake node answers both:
+// fetch(), which the read-only methods are proxied through, and ethers' own
+// HTTP transport, which a transaction is prepared through.
+
+const { AbiCoder } = require("ethers");
+const { networkById } = require("../src/shared/networks");
+const { makeStorageStub } = require("./support/storageStub");
+
+const ORIGIN = "https://dapp.example";
+const ADDRESS = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
+const TOKEN = "0x1111111111111111111111111111111111111111";
+const SEPOLIA = networkById("sepolia");
+
+// Error("bal"), which a token whose transfer() does require(..., "bal")
+// reverts with when the balance is too low.
+const REVERT_DATA =
+    "0x08c379a0" +
+    AbiCoder.defaultAbiCoder().encode(["string"], ["bal"]).slice(2);
+
+// What a node answers for a call that reverts, and for an address that is not
+// one.
+const REVERTED = {
+    code: 3,
+    message: "execution reverted: bal",
+    data: REVERT_DATA,
+};
+const INVALID_ADDRESS = { code: -32602, message: "invalid string length" };
+
+const WITH_ADDRESS = {
+    hasWallet: true,
+    wallets: [
+        {
+            name: "Wallet 1",
+            type: "hd",
+            xpub: "xpub-1",
+            addresses: [
+                { address: ADDRESS, balance: "0.0", tokenBalances: [] },
+            ],
+        },
+    ],
+    activeAddress: ADDRESS,
+    networkId: "sepolia",
+    rpcUrl: SEPOLIA.defaultRpcUrl,
+    blockscoutUrl: SEPOLIA.defaultBlockscoutUrl,
+    allowedSites: { [ADDRESS]: [ORIGIN] },
+    deniedSites: {},
+    trackedTokens: [],
+};
+
+const NO_ADDRESS = {
+    ...WITH_ADDRESS,
+    hasWallet: false,
+    wallets: [],
+    activeAddress: null,
+    allowedSites: {},
+};
+
+const realFetch = globalThis.fetch;
+
+afterEach(() => {
+    delete global.chrome;
+    globalThis.fetch = realFetch;
+});
+
+// The background, over a stored profile, with a node that answers each
+// JSON-RPC method from `node`: a method's entry is the result, or
+// `{ error }` for the error the node answers with. A method not in `node`
+// is answered "method not found", so a test that reaches one fails on it.
+// `node` null is a node that cannot be reached at all.
+function loadBackground(profile, node) {
+    jest.resetModules();
+
+    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(),
+    }));
+
+    function reply({ id, method }) {
+        const entry = node[method];
+        if (entry === undefined) {
+            return {
+                jsonrpc: "2.0",
+                id,
+                error: { code: -32601, message: "method not found: " + method },
+            };
+        }
+        if (entry && entry.error)
+            return { jsonrpc: "2.0", id, error: entry.error };
+        return { jsonrpc: "2.0", id, result: entry };
+    }
+
+    globalThis.fetch = jest.fn(async (url, opts) => {
+        if (!node) throw new TypeError("fetch failed");
+        return { status: 200, json: async () => reply(JSON.parse(opts.body)) };
+    });
+
+    // The ethers the background is about to load: jest.resetModules() above
+    // means it is a fresh copy, not the one this file required at the top.
+    require("ethers").FetchRequest.registerGetUrl(async (req) => {
+        if (!node) throw new Error("connect ECONNREFUSED");
+        const body = JSON.parse(Buffer.from(req.body).toString("utf8"));
+        const answer = Array.isArray(body) ? body.map(reply) : reply(body);
+        return {
+            statusCode: 200,
+            statusMessage: "OK",
+            headers: { "content-type": "application/json" },
+            body: Buffer.from(JSON.stringify(answer)),
+        };
+    });
+
+    let messageListener = null;
+    global.chrome = {
+        storage: makeStorageStub({ autistmask: profile }),
+        runtime: {
+            getURL: (path) => "chrome-extension://autistmask/" + path,
+            onMessage: {
+                addListener: (fn) => {
+                    messageListener = fn;
+                },
+            },
+            onConnect: { addListener: () => {} },
+            lastError: null,
+        },
+        windows: { onRemoved: { addListener: () => {} } },
+        action: { setPopup: () => {} },
+    };
+
+    require("../src/background/index");
+
+    // The answer the page gets to one request.
+    return function request(method, params) {
+        return new Promise((resolve) => {
+            messageListener(
+                { type: "AUTISTMASK_RPC", method, params },
+                { origin: ORIGIN },
+                resolve,
+            );
+        });
+    };
+}
+
+const TRANSFER = {
+    from: ADDRESS,
+    to: TOKEN,
+    // transfer(ADDRESS, 1)
+    data:
+        "0xa9059cbb" +
+        AbiCoder.defaultAbiCoder()
+            .encode(["address", "uint256"], [ADDRESS, 1])
+            .slice(2),
+};
+
+describe("a node's error reaches the page with the node's code and data", () => {
+    test("a reverting eth_call", async () => {
+        const request = loadBackground(WITH_ADDRESS, {
+            eth_call: { error: REVERTED },
+        });
+
+        const answer = await request("eth_call", [TRANSFER, "latest"]);
+
+        expect(answer).toEqual({ error: REVERTED });
+    });
+
+    test("an eth_getBalance for an address that is not one", async () => {
+        const request = loadBackground(WITH_ADDRESS, {
+            eth_getBalance: { error: INVALID_ADDRESS },
+        });
+
+        const answer = await request("eth_getBalance", ["0x1234", "latest"]);
+
+        expect(answer).toEqual({ error: INVALID_ADDRESS });
+    });
+
+    // The wallet's own sentence, with the node's code and revert data, so the
+    // site can decode why its transaction would revert.
+    test("an eth_sendTransaction whose gas estimate reverts", async () => {
+        const request = loadBackground(WITH_ADDRESS, {
+            eth_getTransactionCount: "0x7",
+            eth_estimateGas: { error: REVERTED },
+        });
+
+        const answer = await request("eth_sendTransaction", [TRANSFER]);
+
+        expect(answer).toEqual({
+            error: {
+                code: REVERTED.code,
+                message: expect.stringMatching(
+                    /^The transaction could not be prepared: execution reverted/,
+                ),
+                data: REVERT_DATA,
+            },
+        });
+    });
+});
+
+// One request for each way a request is refused without the node's code: by
+// the wallet itself, or because the node could not be reached.
+describe("no rejected request reaches the page without a numeric code", () => {
+    test.each([
+        [
+            "eth_requestAccounts with no address",
+            NO_ADDRESS,
+            {},
+            "eth_requestAccounts",
+            [],
+            4100,
+        ],
+        [
+            "personal_sign with no address",
+            NO_ADDRESS,
+            {},
+            "personal_sign",
+            ["0x00", ADDRESS],
+            4100,
+        ],
+        [
+            "eth_signTypedData_v4 with no address",
+            NO_ADDRESS,
+            {},
+            "eth_signTypedData_v4",
+            [ADDRESS, "{}"],
+            4100,
+        ],
+        [
+            "eth_sendTransaction with no address",
+            NO_ADDRESS,
+            {},
+            "eth_sendTransaction",
+            [TRANSFER],
+            4100,
+        ],
+        [
+            "eth_sendTransaction with two different gas limits",
+            WITH_ADDRESS,
+            {},
+            "eth_sendTransaction",
+            [{ ...TRANSFER, gas: "0x5208", gasLimit: "0x5209" }],
+            -32602,
+        ],
+        [
+            "eth_call to a node that cannot be reached",
+            WITH_ADDRESS,
+            null,
+            "eth_call",
+            [TRANSFER, "latest"],
+            -32603,
+        ],
+        [
+            "eth_sendTransaction to a node that cannot be reached",
+            WITH_ADDRESS,
+            null,
+            "eth_sendTransaction",
+            [TRANSFER],
+            -32603,
+        ],
+    ])("%s", async (_name, profile, node, method, params, code) => {
+        const request = loadBackground(profile, node);
+
+        const answer = await request(method, params);
+
+        expect(answer.error.code).toBe(code);
+        expect(answer.error.message).toEqual(expect.any(String));
+    });
+});
@@ -74,7 +74,7 @@ test("ethers puts the URL in the error message, not in the short message", async
 test("the recipient checks before a send", async () => {
    await getFullWarnings(ADDRESS, getProvider(RPC_URL, "mainnet"));
    expectFailureLoggedWithoutKey("contract check failed");
-    expectFailureLoggedWithoutKey("tx count check failed");
+    expectFailureLoggedWithoutKey("tx count or balance check failed");
 });

 test("the ENS reverse lookup", async () => {
@@ -0,0 +1,213 @@
+// The Send screen refuses every amount the confirmation screen would refuse,
+// by the same check (https://git.eeqj.de/sneak/AutistMask/issues/532).
+//
+// Send used to accept anything parseFloat() read as above zero, so "1e-3",
+// "1abc" and an amount with more decimal places than the token has went on to
+// a confirmation screen that then refused them. Both screens now call
+// isValidAmount() in src/shared/txValidation.js.
+//
+// Driven through the real Send review handler and the real confirmation
+// screen, with only the node and the DOM stubbed.
+
+"use strict";
+
+jest.mock("../src/shared/log", () => ({
+    log: {
+        debugf: () => {},
+        infof: () => {},
+        warnf: () => {},
+        errorf: () => {},
+    },
+    debugFetch: jest.fn(),
+    setRuntimeDebug: () => {},
+    isDebug: () => false,
+}));
+
+// What the confirmation screen asks the node for.
+const mockProvider = {
+    getFeeData: async () => ({
+        maxFeePerGas: 2000000000n,
+        gasPrice: 1000000000n,
+    }),
+    estimateGas: async () => 21000n,
+    getCode: async () => "0x",
+    getTransactionCount: async () => 1,
+    getBalance: async () => 0n,
+};
+
+jest.mock("../src/shared/balances", () => {
+    const actual = jest.requireActual("../src/shared/balances");
+    return { ...actual, getProvider: () => mockProvider };
+});
+
+// The confirmation screen's Etherscan label lookup fails, as it does offline.
+global.fetch = jest.fn(() => {
+    throw new Error("tests must not perform network requests");
+});
+
+const { makeStorageStub } = require("./support/storageStub");
+global.chrome = { storage: makeStorageStub(), runtime: { sendMessage() {} } };
+
+// A stub DOM: every id resolves to a recording element.
+const elements = new Map();
+
+function makeEl(id) {
+    const handlers = new Map();
+    return {
+        id,
+        textContent: "",
+        innerHTML: "",
+        value: "",
+        disabled: false,
+        style: {},
+        dataset: {},
+        classList: {
+            add() {},
+            remove() {},
+            toggle() {},
+            contains: () => false,
+        },
+        handlers,
+        addEventListener(name, fn) {
+            handlers.set(name, fn);
+        },
+        appendChild(child) {
+            return child;
+        },
+        querySelectorAll: () => [],
+        querySelector: () => null,
+        remove() {},
+        focus() {},
+    };
+}
+
+global.document = {
+    getElementById(id) {
+        if (!elements.has(id)) elements.set(id, makeEl(id));
+        return elements.get(id);
+    },
+    createElement: (tag) => makeEl(tag),
+    body: { prepend() {}, appendChild() {} },
+    addEventListener() {},
+};
+global.navigator = { clipboard: { writeText() {} } };
+
+const { state } = require("../src/shared/state");
+const send = require("../src/popup/views/send");
+const confirmTx = require("../src/popup/views/confirmTx");
+
+const HOLDER = "0x" + "a".repeat(40);
+const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
+// A token with 6 decimal places, as USDC has.
+const TOKEN = "0x" + "d".repeat(40);
+const TOKEN_BY_SYMBOL = { ETH: "ETH", TOK: TOKEN };
+
+function el(id) {
+    return global.document.getElementById(id);
+}
+
+// Press Review on the Send screen with `amount` entered, for a send of `token`
+// ("ETH" or TOKEN), and return what it handed the confirmation screen, or null
+// when it handed nothing over.
+async function review(amount, token) {
+    let handed = null;
+    send.init({ showConfirmTx: (info) => (handed = info) });
+    state.selectedToken = token;
+    el("send-to").value = RECIPIENT;
+    el("send-amount").value = amount;
+    await el("btn-send-review").handlers.get("click")();
+    return handed;
+}
+
+// Show the confirmation screen for the send Review hands over for 0.5, with
+// `amount` in its place, and let its fee estimate settle.
+async function confirm(amount, token) {
+    const txInfo = await review("0.5", token);
+    confirmTx.show({ ...txInfo, amount });
+    for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
+}
+
+beforeEach(() => {
+    elements.clear();
+    state.wallets = [
+        {
+            name: "Wallet 1",
+            addresses: [
+                {
+                    address: HOLDER,
+                    balance: "1.0",
+                    tokenBalances: [
+                        {
+                            address: TOKEN,
+                            name: "Token",
+                            symbol: "TOK",
+                            decimals: 6,
+                            balance: "250.0",
+                            holders: 50000,
+                        },
+                    ],
+                },
+            ],
+        },
+    ];
+    state.selectedWallet = 0;
+    state.selectedAddress = 0;
+    state.trackedTokens = [
+        { address: TOKEN, symbol: "TOK", name: "Token", decimals: 6 },
+    ];
+    state.fraudContracts = [];
+    state.selectedToken = null;
+    state.currentView = null;
+});
+
+describe.each([
+    ["1e-3", "ETH"],
+    ["1e-3", "TOK"],
+    ["1abc", "ETH"],
+    // 19 decimal places; ETH has 18.
+    ["0.0000000000000000001", "ETH"],
+    // 7 decimal places; the token has 6.
+    ["0.0000001", "TOK"],
+    ["0", "ETH"],
+    ["-1", "ETH"],
+])("%s %s", (amount, symbol) => {
+    const token = TOKEN_BY_SYMBOL[symbol];
+
+    test("Send refuses it with a flash message and opens nothing", async () => {
+        expect(await review(amount, token)).toBe(null);
+        expect(el("flash-msg").textContent).toBe(
+            "Please enter a valid amount.",
+        );
+    });
+
+    test("the confirmation screen refuses it too", async () => {
+        await confirm(amount, token);
+        expect(el("confirm-errors").innerHTML).toContain(
+            "Please enter a valid amount to send.",
+        );
+        expect(el("btn-confirm-send").disabled).toBe(true);
+    });
+});
+
+describe.each([
+    ["0.5", "ETH"],
+    ["0.5", "TOK"],
+    // Exactly the 6 decimal places the token has.
+    ["0.000001", "TOK"],
+    // Only zeros past the token's 6 places, and past ETH's 18.
+    ["1.0000000", "TOK"],
+    ["0.5000000000000000000", "ETH"],
+])("%s %s", (amount, symbol) => {
+    const token = TOKEN_BY_SYMBOL[symbol];
+
+    test("Send hands it to the confirmation screen", async () => {
+        expect((await review(amount, token)).amount).toBe(amount);
+        expect(el("flash-msg").textContent).toBe("");
+    });
+
+    test("the confirmation screen lets it be sent", async () => {
+        await confirm(amount, token);
+        expect(el("confirm-errors").innerHTML).toBe("");
+        expect(el("btn-confirm-send").disabled).toBe(false);
+    });
+});
@@ -43,6 +43,12 @@ jest.doMock("ethereum-blockies-base64", () => makeBlockie);
 // Taken before any boot replaces them; see bootPopup().
 const realSetInterval = globalThis.setInterval;
 const realClearInterval = globalThis.clearInterval;
+const realSetTimeout = globalThis.setTimeout;
+const realClearTimeout = globalThis.clearTimeout;
+
+// Every timeout set since the last cleanupPopup() that has neither fired nor
+// been cleared. cleanupPopup() clears them all.
+const pendingTimeouts = new Set();

 const POPUP_HTML = fs.readFileSync(
    path.join(__dirname, "..", "..", "src", "popup", "index.html"),
@@ -265,12 +271,17 @@ async function bootPopup(stored, options) {
        formatAddressTotal: () => "",
        getAddressValue: () => ({ usd: null, partial: false }),
    }));
+    // scanForAddresses() answers in the real one's shape, a scan that found
+    // no used address: AddWallet reads `addresses` from it.
    jest.doMock("../../src/shared/balances", () => ({
        fetchTokenBalances: jest.fn(async () => []),
        refreshBalances: jest.fn(async () => {}),
        lookupTokenInfo: jest.fn(async () => null),
        getProvider: () => ({}),
-        scanForAddresses: jest.fn(async () => []),
+        scanForAddresses: jest.fn(async () => ({
+            addresses: [],
+            nextIndex: 1,
+        })),
    }));
    // filterTransactions() answers in the real one's shape: Home,
    // AddressDetail and AddressToken read both fields, and a bare list makes
@@ -337,6 +348,24 @@ async function bootPopup(stored, options) {
    globalThis.clearInterval = (id) => {
        intervals.delete(id);
    };
+    // Timeouts, such as the one that clears a flash message, run for real, but
+    // each is recorded until it fires or is cleared, so cleanupPopup() can
+    // clear the ones still pending. One that fired after the page was removed
+    // would throw "document is not defined" into whatever test the worker runs
+    // by then. jest.useFakeTimers() in a test does not reach them. Put back by
+    // cleanupPopup().
+    globalThis.setTimeout = (fn, ms, ...args) => {
+        const timer = realSetTimeout(() => {
+            pendingTimeouts.delete(timer);
+            fn(...args);
+        }, ms);
+        pendingTimeouts.add(timer);
+        return timer;
+    };
+    globalThis.clearTimeout = (timer) => {
+        pendingTimeouts.delete(timer);
+        realClearTimeout(timer);
+    };

    require("../../src/popup/index");

@@ -402,6 +431,10 @@ function cleanupPopup() {
    delete globalThis.window;
    globalThis.setInterval = realSetInterval;
    globalThis.clearInterval = realClearInterval;
+    for (const timer of pendingTimeouts) realClearTimeout(timer);
+    pendingTimeouts.clear();
+    globalThis.setTimeout = realSetTimeout;
+    globalThis.clearTimeout = realClearTimeout;
 }

 module.exports = {
@@ -1,4 +1,4 @@
-// A chrome.storage.local stub that behaves like the real one.
+// A chrome.storage stub that behaves like the real one.
 //
 // The real extension storage API is a serialization boundary: `set` writes a
 // structured clone of what it is given, and `get` hands back a structured
@@ -17,13 +17,8 @@
 // So every test that drives real persistence uses this, and nothing rebuilds
 // a storage stub by hand.

-// `initial` is the starting contents, keyed as storage is: { autistmask: {...} }.
-// `onOp` runs before each operation, for a test that needs to advance a clock
-// or count round trips.
-function makeStorageStub(initial, onOp) {
-    const store = initial ? structuredClone(initial) : {};
-    const tick = onOp || (() => {});
-
+// One storage area: get, set and remove over its own store, cloning both ways.
+function makeArea(store, tick) {
    const get = jest.fn(async (key) => {
        tick();
        if (key === undefined || key === null) return structuredClone(store);
@@ -49,15 +44,28 @@ function makeStorageStub(initial, onOp) {
        for (const k of Array.isArray(key) ? key : [key]) delete store[k];
    });

+    return { get, set, remove };
+}
+
+// `initial` is the starting contents of `storage.local`, keyed as storage is:
+// { autistmask: {...} }. `storage.session` starts empty.
+// `onOp` runs before each operation on either area, for a test that needs to
+// advance a clock or count round trips.
+function makeStorageStub(initial, onOp) {
+    const store = initial ? structuredClone(initial) : {};
+    const tick = onOp || (() => {});
+    const local = makeArea(store, tick);
+
    return {
        // Drop this straight in as chrome.storage.
-        local: { get, set, remove },
-        get,
-        set,
-        remove,
-        // What is stored, cloned on the way out: a test can neither observe a
-        // later write through an object it read nor reach into the store by
-        // mutating one.
+        local,
+        session: makeArea({}, tick),
+        get: local.get,
+        set: local.set,
+        remove: local.remove,
+        // What is stored in `storage.local`, cloned on the way out: a test can
+        // neither observe a later write through an object it read nor reach
+        // into the store by mutating one.
        read: (key) =>
            key === undefined
                ? structuredClone(store)
@@ -116,6 +116,12 @@ describe("transferAmountUnits", () => {
        expect(() => transferAmountUnits("0.0000001", 6, 6n)).toThrow();
    });

+    test("encodes zeros past the token's scale as the amount typed", () => {
+        // The Send screen accepts "1.0000000" for a 6-place token, so the
+        // transfer must move exactly 1 of it.
+        expect(transferAmountUnits("1.0000000", 6, 6n)).toBe(1000000n);
+    });
+
    test("every refusal is a full sentence", () => {
        const messages = [];
        for (const args of [
@@ -6,6 +6,7 @@ const {
    FEE_UNAVAILABLE,
    feeReserveWei,
    feeEstimateWei,
+    isValidAmount,
    maxEthAmount,
    maxTokenAmount,
    toFixedPoint,
@@ -33,6 +34,49 @@ describe("toFixedPoint", () => {
    });
 });

+// The one amount check the Send screen and the confirmation screen share.
+// The screens themselves are driven in tests/sendAmountRule.test.js.
+describe("isValidAmount", () => {
+    test("accepts a number above zero written as digits and a decimal point", () => {
+        expect(isValidAmount("0.5")).toBe(true);
+        expect(isValidAmount("12")).toBe(true);
+        expect(isValidAmount(".5")).toBe(true);
+        expect(isValidAmount("0.000000000000000001")).toBe(true);
+    });
+
+    test("refuses an exponent, trailing text, zero and a negative amount", () => {
+        expect(isValidAmount("1e-3")).toBe(false);
+        expect(isValidAmount("1abc")).toBe(false);
+        expect(isValidAmount("0")).toBe(false);
+        expect(isValidAmount("0.0")).toBe(false);
+        expect(isValidAmount("-1")).toBe(false);
+        expect(isValidAmount("")).toBe(false);
+        expect(isValidAmount(undefined)).toBe(false);
+    });
+
+    test("refuses a digit other than 0 past the token's places", () => {
+        expect(isValidAmount("0.000001", 6)).toBe(true);
+        expect(isValidAmount("0.0000001", 6)).toBe(false);
+        expect(isValidAmount("5", 0)).toBe(true);
+        expect(isValidAmount("0.5", 0)).toBe(false);
+    });
+
+    test("accepts zeros past the token's places, which leave the amount unchanged", () => {
+        expect(isValidAmount("1.0000000", 6)).toBe(true);
+        expect(isValidAmount("5.0", 0)).toBe(true);
+        expect(isValidAmount("1.0000000000000000000")).toBe(true);
+        expect(isValidAmount("0.0000000", 6)).toBe(false);
+    });
+
+    test("holds ETH, a token of unknown places, and any token to 18 places", () => {
+        const nineteen = "0.0000000000000000001";
+        expect(isValidAmount(nineteen)).toBe(false);
+        expect(isValidAmount(nineteen, null)).toBe(false);
+        expect(isValidAmount(nineteen, 24)).toBe(false);
+        expect(isValidAmount("0.000000000000000001", 24)).toBe(true);
+    });
+});
+
 describe("validateTransfer, native ETH", () => {
    const eth = (over) => ({
        isErc20: false,
@@ -134,6 +178,17 @@ describe("validateTransfer, native ETH", () => {
        ).toEqual({ canSend: false, codes: [CODES.AMOUNT_INVALID] });
    });

+    test("rejects a zero amount and an exponent", () => {
+        expect(validateTransfer(eth({ amount: "0" }))).toEqual({
+            canSend: false,
+            codes: [CODES.AMOUNT_INVALID],
+        });
+        expect(validateTransfer(eth({ amount: "1e-3" }))).toEqual({
+            canSend: false,
+            codes: [CODES.AMOUNT_INVALID],
+        });
+    });
+
    test("treats a missing balance as zero, not as unlimited", () => {
        const r = validateTransfer(eth({ ethBalance: undefined }));
        expect(r.codes).toEqual([CODES.INSUFFICIENT_ETH]);
@@ -205,6 +260,16 @@ describe("validateTransfer, ERC-20", () => {
        expect(r).toEqual({ canSend: false, codes: [CODES.AMOUNT_INVALID] });
    });

+    test("rejects more decimal places than the token has", () => {
+        const r = validateTransfer(
+            erc20({ amount: "0.0000001", tokenDecimals: 6 }),
+        );
+        expect(r).toEqual({ canSend: false, codes: [CODES.AMOUNT_INVALID] });
+        expect(
+            validateTransfer(erc20({ amount: "0.000001", tokenDecimals: 6 })),
+        ).toEqual({ canSend: true, codes: [] });
+    });
+
    test("treats a missing token balance as zero", () => {
        const r = validateTransfer(erc20({ tokenBalance: undefined }));
        expect(r.codes).toEqual([CODES.INSUFFICIENT_TOKEN]);
@@ -0,0 +1,298 @@
+// Which transactions are shown as a swap through the Uniswap Universal Router
+// (https://git.eeqj.de/sneak/AutistMask/issues/520).
+//
+// The decoder used to recognise the router's execute() call by its selector
+// alone, so the same calldata sent to an ordinary address was shown as a swap
+// through the router, with that address as its Protocol. It is now decoded
+// only when the transaction is sent to a Universal Router deployment on the
+// network it is for; anywhere else it is left to the raw data.
+//
+// The transaction detail screen and the approval screen are driven against a
+// minimal DOM stub in the shape tests/tokenTransferDetail.test.js uses, the
+// approval screen opened the way tests/swapStatusAmount.test.js opens it.
+
+const { AbiCoder, Interface, getAddress, solidityPacked } = require("ethers");
+
+jest.mock("../src/shared/log", () => ({
+    log: {
+        debugf: () => {},
+        infof: () => {},
+        warnf: () => {},
+        errorf: () => {},
+    },
+    debugFetch: async (url) => ({
+        ok: true,
+        json: async () => mockExplorerAnswer(url),
+    }),
+    setRuntimeDebug: () => {},
+    isDebug: () => false,
+}));
+
+globalThis.chrome = {
+    storage: { local: { get: async () => ({}), set: async () => {} } },
+};
+
+const { state } = require("../src/shared/state");
+const approval = require("../src/popup/views/approval");
+const { decodeCalldata } = approval;
+const transactionDetail = require("../src/popup/views/transactionDetail");
+
+const MAINNET = "0x1";
+const SEPOLIA = "0xaa36a7";
+
+// From Uniswap's deployment files: one router on Ethereum Mainnet only, one on
+// Sepolia only, and one at the same address on both.
+const MAINNET_ROUTER = "0x66a9893cc07d91d95644aedd05d03f95e1dba8af";
+const SEPOLIA_ROUTER = "0x3a9d48ab9751398bbfa63ad67599bb04e4bdf98b";
+const ROUTER_ON_BOTH = "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD";
+// The address with no code from the issue.
+const ORDINARY = "0x0b0050Da68435b3EcBC236c40F16dB2070bCD79A";
+
+const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
+const SEPOLIA_WETH = "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14";
+const TOKEN = "0xE2E0000000000000000000000000000000000E2e";
+const HUNDREDTH_ETH = 10000000000000000n;
+
+const coder = AbiCoder.defaultAbiCoder();
+const routerIface = new Interface([
+    "function execute(bytes commands, bytes[] inputs, uint256 deadline)",
+]);
+
+// The calldata from the issue: wrap 0.01 ETH, then a V3 swap of it into a
+// token.
+const SWAP_DATA = routerIface.encodeFunctionData("execute", [
+    solidityPacked(["uint8", "uint8"], [0x0b, 0x00]),
+    [
+        coder.encode(["address", "uint256"], [RECIPIENT, HUNDREDTH_ETH]),
+        coder.encode(
+            ["address", "uint256", "uint256", "bytes", "bool"],
+            [
+                RECIPIENT,
+                HUNDREDTH_ETH,
+                1n,
+                solidityPacked(
+                    ["address", "uint24", "address"],
+                    [SEPOLIA_WETH, 3000, TOKEN],
+                ),
+                false,
+            ],
+        ),
+    ],
+    9999999999n,
+]);
+
+beforeEach(() => {
+    state.trackedTokens = [];
+    state.wallets = [];
+});
+
+describe("execute() calldata on the approval screen's decoder", () => {
+    test("sent to a router on the transaction's network, it is a swap", () => {
+        const onMainnet = decodeCalldata(SWAP_DATA, MAINNET_ROUTER, MAINNET);
+        expect(onMainnet.description).toBe("Swap via Uniswap Universal Router");
+        expect(onMainnet.details[0]).toMatchObject({
+            label: "Protocol",
+            address: MAINNET_ROUTER,
+        });
+        expect(
+            decodeCalldata(SWAP_DATA, SEPOLIA_ROUTER, SEPOLIA).description,
+        ).toBe("Swap via Uniswap Universal Router");
+    });
+
+    test("sent to an ordinary address, it is not decoded", () => {
+        expect(decodeCalldata(SWAP_DATA, ORDINARY, MAINNET)).toBeNull();
+        expect(decodeCalldata(SWAP_DATA, ORDINARY, SEPOLIA)).toBeNull();
+    });
+
+    test("sent to a router of the other network only, it is not decoded", () => {
+        expect(decodeCalldata(SWAP_DATA, SEPOLIA_ROUTER, MAINNET)).toBeNull();
+        expect(decodeCalldata(SWAP_DATA, MAINNET_ROUTER, SEPOLIA)).toBeNull();
+    });
+
+    test("a router deployed at the same address on both networks is one on each", () => {
+        expect(
+            decodeCalldata(SWAP_DATA, ROUTER_ON_BOTH, MAINNET),
+        ).not.toBeNull();
+        expect(
+            decodeCalldata(SWAP_DATA, ROUTER_ON_BOTH, SEPOLIA),
+        ).not.toBeNull();
+    });
+
+    test("the router address matches in any letter case", () => {
+        const upper = "0x" + MAINNET_ROUTER.slice(2).toUpperCase();
+        for (const address of [getAddress(MAINNET_ROUTER), upper]) {
+            expect(decodeCalldata(SWAP_DATA, address, MAINNET)).not.toBeNull();
+        }
+    });
+});
+
+// The transaction the explorer reports: SWAP_DATA, sent to `mockSentTo`.
+const TX_HASH = "0x" + "5".repeat(64);
+let mockSentTo = null;
+
+function mockExplorerAnswer(url) {
+    if (url.endsWith("/transactions/" + TX_HASH)) {
+        return {
+            to: { hash: mockSentTo },
+            raw_input: SWAP_DATA,
+            method: "execute",
+        };
+    }
+    return {};
+}
+
+function makeElement(id) {
+    const classes = new Set();
+    const el = {
+        id,
+        textContent: "",
+        value: "",
+        innerHTML: "",
+        style: {},
+        dataset: {},
+        classList: {
+            add: (...names) => names.forEach((n) => classes.add(n)),
+            remove: (...names) => names.forEach((n) => classes.delete(n)),
+            contains: (n) => classes.has(n),
+            toggle: () => false,
+        },
+        addEventListener: () => {},
+        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 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 transaction detail screen with Sepolia active, for the
+// transaction the explorer reports sent to `sentTo`, and wait for its
+// decoded details.
+async function showDetailSentTo(sentTo) {
+    mockSentTo = sentTo;
+    globalThis.document = makeDocument();
+    globalThis.window = { location: { search: "" } };
+    state.networkId = "sepolia";
+    state.blockscoutUrl = "https://explorer.example/api/v2";
+    state.viewData = {};
+    state.viewStack = [];
+    state.currentView = null;
+    transactionDetail.show({
+        hash: TX_HASH,
+        from: RECIPIENT,
+        to: sentTo,
+        value: "",
+        symbol: "SepoliaETH",
+        timestamp: 1790000000,
+        isError: false,
+        direction: "contract",
+        directionLabel: "Swap",
+        method: "execute",
+        chainId: SEPOLIA,
+    });
+    for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
+}
+
+describe("execute() calldata on the transaction detail screen", () => {
+    test("sent to a router on the active network, it is a swap", async () => {
+        await showDetailSentTo(SEPOLIA_ROUTER);
+        expect(node("tx-detail-calldata-details").innerHTML).toContain(
+            "Swap via Uniswap Universal Router",
+        );
+    });
+
+    test("sent to an ordinary address, it is not decoded", async () => {
+        await showDetailSentTo(ORDINARY);
+        expect(node("tx-detail-calldata-action").textContent).toBe("execute");
+        expect(node("tx-detail-calldata-details").innerHTML).toBe("");
+        expect(node("tx-detail-rawdata").innerHTML).toContain(SWAP_DATA);
+    });
+
+    test("sent to a router of the other network only, it is not decoded", async () => {
+        await showDetailSentTo(MAINNET_ROUTER);
+        expect(node("tx-detail-calldata-action").textContent).toBe("execute");
+        expect(node("tx-detail-calldata-details").innerHTML).toBe("");
+        expect(node("tx-detail-rawdata").innerHTML).toContain(SWAP_DATA);
+    });
+});
+
+// Open the approval screen with Ethereum Mainnet active, for a site's Sepolia
+// transaction that sends SWAP_DATA to `sentTo`.
+async function showApprovalSentTo(sentTo) {
+    globalThis.document = makeDocument();
+    globalThis.window = { location: { search: "" }, close: () => {} };
+    globalThis.chrome.runtime = {
+        connect: () => ({ postMessage: () => {} }),
+        sendMessage: (_msg, reply) =>
+            reply({
+                type: "tx",
+                origin: "https://dapp.example",
+                isPhishingDomain: false,
+                approvedFrom: RECIPIENT,
+                approvedTx: {
+                    type: 2,
+                    from: RECIPIENT,
+                    chainId: SEPOLIA,
+                    nonce: "0x7",
+                    gasLimit: "0x30d40",
+                    maxPriorityFeePerGas: "0x3b9aca00",
+                    maxFeePerGas: "0x77359400",
+                    to: sentTo,
+                    value: "0x" + HUNDREDTH_ETH.toString(16),
+                    data: SWAP_DATA,
+                    accessList: [],
+                },
+            }),
+    };
+    state.networkId = "mainnet";
+    state.currentView = null;
+    await approval.show(1);
+}
+
+// The router is on Sepolia's list only, so the swap is shown only if the
+// screen decodes for the transaction's network: on Ethereum Mainnet, the
+// active network, that address is not a router.
+describe("execute() calldata on the approval screen, for a Sepolia transaction while Ethereum Mainnet is active", () => {
+    test("sent to a router on Sepolia, it is a swap", async () => {
+        await showApprovalSentTo(SEPOLIA_ROUTER);
+        expect(node("approve-tx-decoded").classList.contains("hidden")).toBe(
+            false,
+        );
+        expect(node("approve-tx-decoded-details").innerHTML).toContain(
+            "Swap via Uniswap Universal Router",
+        );
+    });
+
+    test("sent to an ordinary address, it is shown as raw data", async () => {
+        await showApprovalSentTo(ORDINARY);
+        expect(node("approve-tx-decoded").classList.contains("hidden")).toBe(
+            true,
+        );
+        expect(node("approve-tx-decoded-details").innerHTML).toBe("");
+        expect(node("approve-tx-data").textContent).toBe(SWAP_DATA);
+        expect(
+            node("approve-tx-data-section").classList.contains("hidden"),
+        ).toBe(false);
+    });
+});
@@ -53,7 +53,7 @@ function unwrapData() {
 }

 function detail(data, label, sources) {
-    const decoded = uniswap.decode(data, ROUTER, sources || {});
+    const decoded = uniswap.decode(data, ROUTER, "0x1", sources || {});
    return decoded.details.find((d) => d.label === label);
 }

@@ -79,7 +79,7 @@ function balanceCheck(token, minBalance) {
 }

 function detail(data, label) {
-    const decoded = uniswap.decode(data, ROUTER, {});
+    const decoded = uniswap.decode(data, ROUTER, "0x1", {});
    expect(decoded).not.toBeNull();
    return decoded.details.find((d) => d.label === label);
 }
@@ -113,7 +113,9 @@ describe("an execute() whose input currency never decoded", () => {
    });

    test("does not name ETH in the swap title either", () => {
-        expect(uniswap.decode(data(), ROUTER, {}).name).toBe("Uniswap Swap");
+        expect(uniswap.decode(data(), ROUTER, "0x1", {}).name).toBe(
+            "Uniswap Swap",
+        );
    });
 });

@@ -123,7 +125,9 @@ describe("an execute() that names only an output token", () => {

    test("refuses the input rather than defaulting it to ETH", () => {
        expect(detail(data(), "Token In").value).toBe(REFUSAL);
-        expect(uniswap.decode(data(), ROUTER, {}).name).toBe("Uniswap Swap");
+        expect(uniswap.decode(data(), ROUTER, "0x1", {}).name).toBe(
+            "Uniswap Swap",
+        );
    });

    test("still states the output it did establish", () => {
@@ -170,7 +174,9 @@ describe("native ETH in, which V4 spells as the zero address", () => {

        expect(detail(data, "Token In").value).toBe("ETH (native)");
        expect(detail(data, "Amount").value).toBe("1.0000 ETH");
-        expect(uniswap.decode(data, ROUTER, {}).name).toBe("Swap ETH → USDT");
+        expect(uniswap.decode(data, ROUTER, "0x1", {}).name).toBe(
+            "Swap ETH → USDT",
+        );
    });

    test("WRAP_ETH is still ETH at 18 decimals", () => {
@@ -105,7 +105,7 @@ function v3ExactIn(tokenIn, tokenOut, amountIn, amountOutMin) {
 }

 function detail(data, label) {
-    const decoded = uniswap.decode(data, ROUTER, {});
+    const decoded = uniswap.decode(data, ROUTER, "0x1", {});
    expect(decoded).not.toBeNull();
    return decoded.details.find((d) => d.label === label);
 }
@@ -140,7 +140,7 @@ describe("a V4 step that states a Min. received but no output currency", () => {
    });

    test("does not name ETH in the swap title either", () => {
-        const decoded = uniswap.decode(data(), ROUTER, {});
+        const decoded = uniswap.decode(data(), ROUTER, "0x1", {});
        expect(decoded.name).toBe("Uniswap Swap");
    });
 });
@@ -206,6 +206,8 @@ describe("native ETH out, which V4 spells as the zero address", () => {
    test("is still named ETH and still scaled at 18 decimals", () => {
        expect(detail(data(), "Token Out").value).toBe("ETH");
        expect(detail(data(), "Min. received").value).toBe("0.5000 ETH");
-        expect(uniswap.decode(data(), ROUTER, {}).name).toBe("Swap USDT → ETH");
+        expect(uniswap.decode(data(), ROUTER, "0x1", {}).name).toBe(
+            "Swap USDT → ETH",
+        );
    });
 });
@@ -82,7 +82,7 @@ function walletsHolding(token, decimals) {
 // decodeCalldata() rather than uniswap.decode() directly, because the scale
 // sources the screen supplies are part of what is under test.
 function swapDetail(data, label) {
-    const decoded = decodeCalldata(data, ROUTER);
+    const decoded = decodeCalldata(data, ROUTER, "0x1");
    return decoded.details.find((d) => d.label === label);
 }
Author	SHA1	Message	Date
sneak	640f31e0a1	fix: a confirmation screen drawn again keeps the network it was reviewed for (closes #586 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details ConfirmTx set the transaction's chain id to the active network's every time it drew the screen, so a popup reopened onto a saved confirmation after a network switch in Settings described the reviewed transfer as the new network's and sent it there. show() now sets the chain id only on a transaction Send hands over, and the screen describes the transaction entirely on that network: native currency, USD values, explorer links, and the node and explorer its checks ask. explorerUrl(), renderAddressHtml(), getPrice(), formatFee() and checkEtherscanLabel() take an optional chain id for this. A saved transaction whose chain id names no network is not restored. Model: opus-5-5	2026-10-19 05:22:21 +00:00
clawbot	b5d2cedb57	fix: the swap decoder reads each command's type with its router's mask (closes #535 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details Each Universal Router address now carries the mask its own source reads a command's type with: 0x1f for UniversalRouterV1, 0x3f for V1_2 and V2, 0x7f for V2_1_1 and V2_1_2. The fixed 0x1f dropped the 0x20 bit, so EXECUTE_SUB_PLAN (0x21) was listed as a V3 exact-out swap. A sub-plan step is now listed as "Execute Sub-Plan (its steps are not shown)". Its commands are not read and may spend from or pay the user wherever the step stands, so with one the summary names no swap direction, Token In and Token Out read "Unknown (could not be decoded)", and there is no Amount or Min. received. Model: opus-5-5	2026-10-19 07:13:22 +02:00
clawbot	f8b050f501	docs: the user guide says switching networks restores the last endpoints used (closes #589 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details The user guide said switching the network in Settings resets the RPC and Blockscout endpoints to that network's defaults. Switching restores the endpoints last used on that network, or its defaults if it has none, as README's Settings section says; the guide now says that. The guide also said all three approval screens show the phishing warning. There are four: a connected site's request to switch the network has its own approval screen with the same warning. The guide now describes that request in a short paragraph and says four. Model: opus-5-5	2026-10-19 06:51:17 +02:00
clawbot	e791dc72d2	fix: the delete wallet screens name the wallet's own key material (closes #529 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details DeleteWallet and DeleteWalletLostPassword told key and xprv wallets that their recovery phrase was the way back, but those wallets have none. Both screens now name the recovery phrase, the private key or the extended private key, according to the wallet's kind. The noun comes from keyMaterialName() in the popup view helpers, which DeleteAddress now uses too in place of its own two-way choice, so these three screens get it from one place. The lost-password screen's route-back sentence is reworded to fit all three kinds. Model: opus-5-5	2026-10-19 06:12:00 +02:00
clawbot	cb58e9d5f7	fix: the Settings network help text says switching restores the last endpoints used (closes #513 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details The text under Network said switching resets the RPC and Blockscout endpoints to their defaults. Switching actually restores the endpoints last used on that network, or that network's defaults if it has none, as README's Settings section says. The text now says that, in README's words. Model: opus-5-5	2026-10-19 05:28:21 +02:00
clawbot	8b6c2b4df9	fix: the swap summary is shown only for a transaction sent to a Universal Router (closes #520 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details The Universal Router decoder recognised execute() by its selector alone, so the same calldata sent to any address was described as a swap through the router. It now keeps the router deployments Uniswap publishes for Ethereum Mainnet and Sepolia, and decodes only a transaction sent to one of them on its network, ignoring address case. TxApproval passes the transaction's chain id, TransactionDetail the active network's. Model: opus-5-5	2026-10-19 04:40:55 +02:00
clawbot	85fa864db4	test: no timer a popup test started fires after cleanupPopup() (closes #578 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details tests/support/popupBoot.js recorded every interval the popup sets but left timeouts alone, so the two-second timer that clears a flash message could fire after cleanupPopup() had removed the page, throw "document is not defined", and fail whichever test file the jest worker had moved on to. Timeouts still run for real during a popup test; the helper now records each one until it fires or is cleared, and cleanupPopup() clears the ones still pending. The fake timers tests/firstWalletRefresh.test.js used to hold that timer are removed. tests/popupBoot.test.js shows a flash message, cleans up, waits past the flash duration, and fails if anything throws. Model: opus-5-5	2026-10-19 04:06:24 +02:00
clawbot	d2fd0f532a	fix: a popup that opened on Welcome keeps refreshing once the first wallet is added (closes #530 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details The ten-second refresh was started only by init(), and only when a wallet existed as the popup opened, so a popup that opened on Welcome refreshed the new wallet once and then showed that balance until it was reopened. init() and the three import paths on AddWallet now call startRefresh(), which refreshes at once and starts the ten-second refresh unless it is already running, and does nothing while the recovery screen is up. The two AddWallet tests that build their own context pass it in place of the refresh they passed before. Model: opus-5-5	2026-10-19 03:19:53 +02:00
clawbot	b923b2c19c	fix: a V4 step of chained swap actions shows what the user receives (closes #563 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details A V4 step's input side is what SETTLE or SETTLE_ALL names, else the one currency its swap actions spend and never buy; its output side is what TAKE or TAKE_ALL names, else the one they buy and never spend. Amount sums the amountIn of the actions spending the input side, shown only when each states one; Min. received likewise. An unread swap action leaves the sides to SETTLE, SETTLE_ALL, TAKE and TAKE_ALL, with no figure. A step with a swap action always sets the output side, sets the input side only if no earlier step did, and leaves a side its rules cannot name unknown, with no figure. SWAP_EXACT_OUT spends its first path entry. Model: opus-5-5	2026-10-19 02:50:16 +02:00
clawbot	e2e1c5d40e	fix: the recipient warning says what it checked and skips addresses that have received ETH (closes #528 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details The transaction count the node reports is what an address has sent, so an address that only receives, such as a savings address, got the "ZERO transaction history" box on every send. The check now also asks the node for the recipient's balance and warns only when both are zero. The box says the address has never sent a transaction and holds no ETH, naming the active network's native token as the contract warning does. Model: opus-5-5	2026-10-19 02:34:13 +02:00
clawbot	fc042c3191	fix: a page whose origin has no host is never told an address by accountsChanged (closes #564 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details The background judges each tab by its URL's origin, the only one it can see, so a page its server sandboxes, whose own origin is null, was still sent the new active address on an address switch although all its requests are refused. The background now names the origin it judged by on each accountsChanged event, and the content script passes the address to the page only when the page's own window.origin is that origin, an empty list otherwise. An event naming no origin also reaches the page as an empty list. chainChanged is unchanged. The README's SiteApproval section says the same. Judgement call: covered by a unit test that sets window.origin; no browser-suite test. Model: opus-5-5	2026-10-19 00:59:39 +02:00
clawbot	8b0a1bff02	fix: a site allowed without Remember stays connected when the background worker idles (closes #526 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details A connection allowed without "Remember my choice for this site" lived in a module-level object in the background, so it ended the first time Chrome stopped the idle worker. Each such connection is now one item in the browser's session storage, which outlives the worker and is emptied when the browser closes, read and written through new wrappers in src/shared/browserApi.js. Removal in Settings, address switch, address removal and wallet removal still end it; Settings now waits for the removal before redrawing. manifest/firefox.json now declares a minimum of Firefox 115.0, the first with session storage. Judgement call: address and wallet removal still notify the background without waiting. Model: opus-5-5	2026-10-18 23:59:24 +02:00
clawbot	1f5ec1c8de	fix: Send refuses every amount the confirmation screen would refuse (closes #532 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details Send's Review accepted any amount parseFloat() read as above zero, so 1e-3, 1abc and amounts with too many decimal places reached ConfirmTx, which then refused them or failed to estimate the fee. isValidAmount() in src/shared/txValidation.js is now the one amount check, used by Send's Review and Max and by validateTransfer() for ConfirmTx: plain digits with at most one decimal point, above zero, nothing but zeros past the token's places. Zeros past those places are accepted, since the transfer encodes the amount exactly. Send now reads the token's decimal places before the ENS lookup, because the check needs them. Judgement call: ConfirmTx now also refuses zero, as Send already did. Model: opus-5-5	2026-10-18 22:46:07 +02:00
clawbot	f00954e2c5	fix: failed requests reach the page with an error code and the node's data (closes #533 ) check / check (push) Waiting to run Details e2e / e2e-chrome (push) Waiting to run Details e2e / e2e-firefox (push) Waiting to run Details A request the node refuses now reaches the page with the node's own JSON-RPC code and data: a reverting eth_call, an eth_sendTransaction whose gas estimate reverts, a failed broadcast. Every other refusal from the background carries a code too: 4100 when there is no address, -32603 for a failure inside the wallet, -32602 for a transaction request the wallet refuses as malformed. On the transaction path the page keeps the wallet's own sentence. nodeError(), which finds the node's error inside an ethers error, lives in src/shared/approvalVerify.js beside failureTexts(), which did the same lookup. Not run in a browser. Model: opus-5-5	2026-10-18 22:12:10 +02:00
clawbot	e48308c5b6	fix: the first wallet's first address is active as soon as it is added (closes #512 ) check / check (push) Canceled after 0s Details e2e / e2e-chrome (push) Canceled after 0s Details e2e / e2e-firefox (push) Canceled after 0s Details The popup picked an active address only when it opened, so after the first wallet was created nothing was active until a reopen: Home had no headline, and Send and Receive refused. Each of the three import paths on AddWallet now makes the new wallet's first address active when no address is. When the phrase or xprv scan then replaces the address list with one that leaves that address out, the new list's first address becomes active and the background is told, as when the user picks an address on Home. The address scan stand-in in the popup test boot now answers in the real scan's shape, which the phrase and xprv imports read. Model: opus-5-5	2026-10-16 07:15:29 +02:00
clawbot	aa10a2a5f5	fix: each browser-suite run builds and removes an image of its own (closes #547 ) check / check (push) Canceled after 0s Details e2e / e2e-chrome (push) Canceled after 0s Details e2e / e2e-firefox (push) Canceled after 0s Details script/test-e2e and script/test-e2e-firefox tagged their image with one fixed name. When two clones ran a suite at once, the second build moved that tag, the image store deleted the first run's now-untagged image, and that suite exited 125 without running a test. Each run now tags its image with the suite's name and twelve random hex digits and runs it by that tag. The cleanup that runs on exit, Ctrl-C, kill and a closed terminal removes the run's container if docker's client left it running, then the image. The image-ID file that guarded against a moving tag is gone. README.md's End-to-End Tests section says which endings clean up. Model: opus-5-5	2026-10-16 06:51:08 +02:00