fix: a token lookup that answers after the user left AddToken no longer changes the screen (closes #603)

When the contract lookup on AddToken answered, the popup always went to AddressDetail, even after the user had opened another screen. The token is still added when the network has not changed. The popup now goes to AddressDetail only while AddToken is the screen showing. It tells this from state.currentView, as Send does. The status line is cleared once the token is added, so Back onto AddToken no longer shows "Looking up token...".

Model: opus-5-5

Dockerfile

@@ -10,7 +10,6 @@ WORKDIR /app
 
 COPY script/ script/
 COPY package.json yarn.lock ./
-# yarn warns about the workspaces field in eslint and babel-plugin-istanbul; no newer release drops it.
 RUN script/bootstrap
 
 COPY . .

README.md

@@ -905,8 +905,8 @@ src/
     prices.js         — ETH/USD and token/USD from Chainlink price feeds
     scamlist.js       — known fraud contract addresses
     state.js          — persisted state (extension storage)
-    storedSettings.js — "Use Blockscout", "Check recipients on Etherscan" and
+    storedSettings.js — "Use Blockscout" and "Check recipients on Etherscan",
-                        the active network, read from storage
+                        read from storage for the requests those settings gate
     symbolSpoof.js    — the known-symbol spoof rule, shared by all surfaces
     tokenList.js      — top ERC-20 tokens by market cap, and their Chainlink
                         price feeds (hardcoded)
@@ -1266,8 +1266,7 @@ see Transaction Decoding), do not always read as a number. They can read:
   the same words. `Unlimited`, `All available (V4 open delta)` and
   `Whatever an earlier step sent to the pair (V2 already paid)` keep their
   wording. When a V2 or V3 exact-out step sets `Min. received`, that line shows
-  its `amountOut`, the exact amount it buys. When earlier swap steps also pay
+  its `amountOut`, the exact amount it buys.
-  that token to the user, the line shows the sum (see Transaction Decoding).
 - `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. Transaction Decoding
@@ -1474,25 +1473,24 @@ tracked.
 
 A tracked token is shown when its balance is nonzero, and any other ERC-20 when
 its balance is nonzero and it is in the bundled known-token list or has 1,000 or
-more holders. The balance list always drops a token that claims a bundled-list
+more holders. A token claiming a symbol from the bundled list from any other
-symbol from another contract address, whatever the settings. The list also drops
+contract address is always dropped, tracked or not, and so is any token claiming
-every token that claims the native asset's symbol: `"ETH"`, or any network's
+a symbol that belongs to the native asset and therefore has no legitimate
-`nativeCurrency`, such as `"SepoliaETH"`. That filter is unconditional — the
+contract at all (`"ETH"`, and every network's `nativeCurrency`, such as
-"Hide tokens with fewer than 1,000 holders" setting governs the transaction
+`"SepoliaETH"`, on every network). That filter is unconditional — the "Hide
-history and the send-screen token selector, not this list. A token's holder
+tokens with fewer than 1,000 holders" setting governs the transaction history
-count is unknown when the explorer reports none, or reports anything other than
+and the send-screen token selector, not this list. A token's holder count is
-a whole number written in digits alone, such as `1,000` or `1e3`
+unknown when the explorer reports none, or reports anything other than a whole
-(`parseHoldersCount()` in `src/shared/holders.js`). This list does not take an
+number written in digits alone, such as `1,000` or `1e3` (`parseHoldersCount()`
-unknown count as 1,000 or more, so such a token is shown only when it is on the
+in `src/shared/holders.js`). This list does not take an unknown count as 1,000
-bundled list or tracked. Every nonzero holding of a token shown is stored
+or more, so such a token is shown only when it is on the bundled list or
-exactly, however small, but a holding below 0.000001 is left out of the balance
+tracked. Every nonzero holding of a token shown is stored exactly, however
-lists, the send-screen token selector, the address total and the remove-address
+small, but a holding below 0.000001 is left out of the balance lists, the
-warning (`isBelowOneMillionth()` in `src/shared/amountDisplay.js`). The Send and
+send-screen token selector, the address total and the remove-address warning
+(`isBelowOneMillionth()` in `src/shared/amountDisplay.js`). The Send and
 confirmation screens show it when its token is the one being sent. Tracked
 tokens with a zero balance are listed as well while "Show tracked tokens with
-zero balance" is on. While that setting is on, a token just added reads
+zero balance" is on.
-`quantity unknown` at an address with no entry for it, until a refresh has read
-its balance at every address (see AddToken).
 
 #### Stored state and its version
 
@@ -1676,13 +1674,6 @@ network switch (below). That popup then redraws its top screen as a reopened
 popup would. A screen that a reopened popup cannot render, such as Send, is
 replaced by Home.
 
-The popup refreshes balances every ten seconds while it is open
-(`doRefreshAndRender()` in `src/popup/index.js`). Each refresh that returns
-draws the wallet list again. When AddressDetail or AddressToken is up, the
-refresh also draws that screen's USD total and balance lines again, but not its
-transaction list. A refresh draws no other screen again, DeleteAddress and its
-balance lines included.
-
 A network switch leaves every screen on the page showing the previous network.
 The user makes it in Settings, or approves a site's request and the background
 saves it. Any other popup open meanwhile takes the switch from the stored
@@ -2062,21 +2053,15 @@ view would leave a wallet one click from deletion.
       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" (correct password) when the gas limit or a fee is over its
+    - "Sign & Send" (correct password) when the gas limit, a fee per gas or the
-      bound → nothing is signed; "The gas limit or fee the RPC endpoint quoted
+      total fee the RPC endpoint fills in at signing is over its bound in
-      for this transaction is more than this wallet will sign for, so it was not
+      `assertWithinCeilings()` (`src/shared/approvalVerify.js`) → nothing is
-      sent. Please go back and try again." in its own box, no screen change. For
+      signed; "The gas limit or fee the RPC endpoint quoted for this transaction
-      an ETH amount that Send's "Max" filled in, the gas limit and fees are
+      is more than this wallet will sign for, so it was not sent. Please go back
-      those of this screen's own fee estimate (see Amount above). For any other
+      and try again." in its own box, the same sentence for all three, no screen
-      send, the RPC endpoint fills in the gas limit and fees at signing. Just
+      change
-      before signing, `assertWithinCeilings()` (`src/shared/approvalVerify.js`)
+    - "Sign & Send" (wrong password) → "Wrong password." on the password error
-      refuses the send when any of these is over its bound:
+      line, no screen change
-        - the gas limit
-        - each fee per gas the transaction sets
-        - the total fee: the gas limit times `maxFeePerGas`, or times `gasPrice`
-          when the transaction has no `maxFeePerGas`
-    - "Sign & Send" (wrong password) → "That password is incorrect. Please try
-      again." on the password error line, no screen change
     - "Sign & Send" signs as the From address above, not as whichever address is
       selected: the two are saved separately, so the popup can reopen onto this
       screen with another address selected. When the selected wallet does not
@@ -2245,21 +2230,11 @@ view would leave a wallet one click from deletion.
     - "Add" button
 - **Transitions**:
     - "Add" (valid contract) → tracks the token, pops the stack, and re-renders
-      **AddressDetail**. Until a balance refresh on the token's network has read
+      **AddressDetail**
-      the token's balance at every address, its line never reads `0.0000`. The
-      line reads `quantity unknown` instead, or is left out while "Show tracked
-      tokens with zero balance" is off. Where Blockscout already listed a
-      holding of the token, the line shows that holding. Until that refresh, the
-      tracked token's record carries `balanceNotFetched`, so the line still
-      reads `quantity unknown` after the popup closes and opens again. A refresh
-      that returns draws AddressDetail's balances again (see Navigation), so the
-      fetched balance shows without the screen being reopened
     - "Add" with a token already tracked, a scam-listed address, or a failed
       contract lookup → flash message, no screen change
-    - "Add" with a token that the spoof rule refuses → nothing is tracked; "Not
+    - "Add", then leaving AddToken before the contract lookup answers → tracks
-      added: this token fakes a known symbol." flash message, no screen change
+      the token, no screen change
-    - "Add", then the contract lookup answers while another screen shows, or
-      after AddToken was opened again → tracks the token, no screen change
     - "Add", then a network switch in Settings before the contract lookup
       answers → nothing is tracked; "The active network changed before the
       lookup finished, so the token was not added." flash message, no screen
@@ -2309,8 +2284,6 @@ view would leave a wallet one click from deletion.
     - Either "Save" stores its URL only if the input still shows that URL when
       the endpoint answers. Otherwise a flash message says that the URL was not
       saved
-    - If the user taps the same "Save" again before the endpoint answers, the
-      earlier tap stores nothing and shows no flash message
     - Etherscan:
         - "Check recipients on Etherscan" checkbox, unticked until the user
           ticks it
@@ -2565,14 +2538,9 @@ view would leave a wallet one click from deletion.
       add path
 - **Transitions**:
     - Any of the add paths shown, on success → adds the token and shows an
-      "Added SYMBOL" flash message (no screen change). Until a refresh has read
+      "Added SYMBOL" flash message (no screen change)
-      the token's balance at every address, its lines read as after "Add" on
-      AddToken
     - A duplicate, a scam-listed address, or a failed contract lookup → flash
       message, no screen change
-    - "Add" by contract address with a token that the spoof rule refuses →
-      nothing is tracked; "Not added: this token fakes a known symbol." flash
-      message, no screen change
     - "Add" by contract address, then a network switch in Settings before the
       lookup answers → nothing is tracked; "The active network changed before
       the lookup finished, so the token was not added." flash message, no screen
@@ -3496,29 +3464,19 @@ Currently supported:
   name); and one more reads `Unknown (could not be decoded)` when a step that
   may pay an address went unread. When no step pays anyone, a single line reads
   `Unknown (not named in the calldata)`. Wherever there is a `Paid to` line, the
-  minimum reads `Min. paid out`. The step that sets the output side gives the
+  minimum reads `Min. paid out`. The `Amount` line gives the total the steps
-  minimum. When that step and earlier swap steps each pay the output token to
+  take of `Token In`, from the step that sets the input side on: the first V2 or
-  the transaction's sender, the minimum is the sum of their minimums. There is
+  V3 exact-in or exact-out, `WRAP_ETH` or V4 swap step that names an input token
-  no minimum when the decoder reads none from one of them, or when one of them
+  or amount. A V4 step with a swap action sets the input side when no earlier
-  pays part of that token elsewhere. There is also no minimum when the decoder
+  step set it, even when it names neither (see Display Consistency). That step
-  did not read one of them, or a step between them, in full. A swap step that
+  counts its own amount, whoever pays it: a V2 or V3 exact-out step its
-  spends the output token drops earlier steps from the sum. A V4 step spends
+  `amountInMax`, and a V4 step what it takes of its input token from the user's
-  each token that its swap actions spend. A V4 `SETTLE` or `SETTLE_ALL` of the
+  wallet, as below, or, when the user pays it none of that token, the `amountIn`
-  output token also drops earlier steps. A `PERMIT2_TRANSFER_FROM` of the output
+  of the swap action that spends it. Each later V2 or V3 exact-in or exact-out
-  token drops earlier steps too. A step after the step that sets the output side
+  step whose `payerIsUser` is true takes its amount, found in the same way, from
-  drops nothing from the sum. The `Amount` line gives the total the steps take
+  the user's wallet. Every V4 step, with a swap action or without, takes from
-  of `Token In`, from the step that sets the input side on: the first V2 or V3
+  the user's wallet what its `SETTLE`s paid by the user (`payerIsUser` true) and
-  exact-in or exact-out, `WRAP_ETH` or V4 swap step that names an input token or
+  its `SETTLE_ALL`s pay, for each token on its own; what the step that sets the
-  amount. A V4 step with a swap action sets the input side when no earlier step
-  set it, even when it names neither (see Display Consistency). That step counts
-  its own amount, whoever pays it: a V2 or V3 exact-out step its `amountInMax`,
-  and a V4 step what it takes of its input token from the user's wallet, as
-  below, or, when the user pays it none of that token, the `amountIn` of the
-  swap action that spends it. Each later V2 or V3 exact-in or exact-out step
-  whose `payerIsUser` is true takes its amount, found in the same way, from the
-  user's wallet. Every V4 step, with a swap action or without, takes from the
-  user's wallet what its `SETTLE`s paid by the user (`payerIsUser` true) and its
-  `SETTLE_ALL`s pay, for each token on its own; what the step that sets the
   input side takes of any other token counts as a later step's take. A `SETTLE`
   of any amount but `OPEN_DELTA` pays that amount, and a `SETTLE` of
   `OPEN_DELTA` or a `SETTLE_ALL` pays what the step owes, as above. So a V4 step

docs/README.md

@@ -380,8 +380,10 @@ but comes from an unrecognized contract, it is identified as a spoof and hidden.
 In your transaction history this is the "Hide fake tokens impersonating a known
 symbol" setting, which you can switch off; doing so also stops new entries being
 added to the fraud contract blocklist below, since detecting a spoof is what
-fills it. The send token list always applies the check. Your balance list always
+fills it. The send token list always applies the check. Your balances apply it
-applies the check too.
+too, with one exception: a token claiming the symbol "ETH" is not filtered
+there, so a fake "ETH" token can still show up in your balance list even though
+it is hidden from your transaction history and from the send token list.
 
 **Low-holder token filtering.** Tokens with fewer than 1,000 holders are hidden
 from transaction history and the send token list, and are left out of your

eslint.config.js

@@ -153,7 +153,8 @@ module.exports = [
         },
     },
 
-    // The files in script/lib/ run on plain node too, and are never bundled.
+    // The helpers the script/ entrypoints call: plain node programs too, run
+    // from a shell script rather than from yarn, and never bundled.
     {
         files: ["script/lib/**/*.js"],
         languageOptions: {

package.json

@@ -6,8 +6,8 @@
     "license": "GPL-3.0",
     "private": true,
     "scripts": {
-        "test": "node script/lib/jest.js --maxWorkers=3",
+        "test": "jest --forceExit --maxWorkers=3",
-        "test:verbose": "node script/lib/jest.js --maxWorkers=3 --verbose",
+        "test:verbose": "jest --forceExit --maxWorkers=3 --verbose",
         "build": "node build.js",
         "lint": "eslint . && prettier --check .",
         "fmt": "prettier --write .",

script/bootstrap

@@ -118,7 +118,6 @@ ensure_yarn() {
     fi
 }
 
-# yarn warns about the workspaces field in eslint and babel-plugin-istanbul; no newer release drops it.
 install_js_deps() {
     if missing yarn && [ -s "$HOME/.nvm/nvm.sh" ]; then
         nvm_sh "nvm use $NODE_VERSION >/dev/null && cd \"$ROOT\" && \

script/lib/jest.js

@@ -1,40 +0,0 @@
-// Runs jest with the arguments it is given, and fails the run when jest had to
-// force-stop the worker process that ran a test file. Jest itself only prints a
-// warning when that happens, and its run still passes. The warning means a test
-// left a timer or another open handle running. The test scripts in package.json
-// run jest through this file.
-//
-// Jest runs inside this process and writes to the terminal directly, so its
-// output looks the same as a plain jest run. This file only checks each write
-// to stderr for the warning below.
-
-"use strict";
-
-// The start of the warning that jest prints on stderr after it force-stops a
-// worker process.
-const WORKER_WARNING = "A worker process has failed to exit gracefully";
-
-let forceStopped = false;
-
-const writeStderr = process.stderr.write.bind(process.stderr);
-process.stderr.write = (chunk, ...rest) => {
-    if (String(chunk).includes(WORKER_WARNING)) {
-        forceStopped = true;
-    }
-    return writeStderr(chunk, ...rest);
-};
-
-// Runs after jest has finished, as the process exits.
-process.on("exit", () => {
-    if (forceStopped) {
-        console.error(
-            "script/lib/jest.js: failing the run, because jest force-stopped " +
-                "a worker process. A test left a timer or another open " +
-                "handle running.",
-        );
-        process.exitCode = 1;
-    }
-});
-
-// Jest's own command-line program. It reads its arguments from process.argv.
-require("jest/bin/jest");

src/popup/index.js

@@ -6,7 +6,6 @@ const {
     saveState,
     onSaveFailure,
     takeStoredNetwork,
-    clearBalanceNotFetched,
     loadState,
 } = require("../shared/state");
 const { StateUnusableError } = require("../shared/stateSchema");
@@ -96,17 +95,6 @@ let refreshTimer = null;
 // removed meanwhile is left as it is. Blockscout may have answered before the
 // user turned "Use Blockscout" off. So the save drops every token the user has
 // not tracked if the stored setting is off by then.
-//
-// The save also deletes `balanceNotFetched` from each tracked token whose
-// balance this refresh read at every address. trackToken() in
-// src/popup/views/helpers.js sets that field. The save takes the field off the
-// matching tokens of the stored record (clearBalanceNotFetched() in
-// src/shared/state.js). The rest of the stored tracked token list stays as it
-// is.
-//
-// Once the save is done, the wallet list is drawn again. So are the balances
-// on AddressDetail or AddressToken when that screen is up. No other screen is
-// drawn again, DeleteAddress and its balance lines included.
 async function doRefreshAndRender() {
     if (refreshInFlight) {
         refreshAgain = true;
@@ -117,7 +105,7 @@ async function doRefreshAndRender() {
         await followStoredSettings();
         const networkId = state.networkId;
         const wallets = structuredClone(state.wallets);
-        const [, readTokens] = await Promise.all([
+        await Promise.all([
             refreshPrices(pageClosed.signal),
             refreshBalances(
                 wallets,
@@ -149,13 +137,10 @@ async function doRefreshAndRender() {
             if (!stored.useBlockscout) {
                 dropUntrackedTokens(state.wallets, stored.trackedTokens);
             }
-            clearBalanceNotFetched(stored, readTokens);
             state.lastBalanceRefresh = Date.now();
             return true;
         });
         renderWalletList();
-        if (state.currentView === "address") addressDetail.renderBalances();
-        if (state.currentView === "address-token") addressToken.renderBalance();
     } catch (e) {
         // No caller waits for this function, so it must never reject. An
         // unhandled rejection reports nothing. The save inside it reports its

src/popup/views/addToken.js

@@ -1,24 +1,11 @@
-const {
+const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
-    $,
-    showView,
-    showFlash,
-    escapeHtml,
-    goBack,
-    trackToken,
-} = require("./helpers");
 const { getTopTokens } = require("../../shared/tokenList");
 const { state, saveState, currentNetwork } = require("../../shared/state");
 const { lookupTokenInfo } = require("../../shared/balances");
 const { isScamAddress } = require("../../shared/scamlist");
-const { isSpoofedSymbol } = require("../../shared/symbolSpoof");
 const { log } = require("../../shared/log");
 
-// Counts the times AddToken has opened. A contract lookup started before
-// AddToken was last opened changes neither the screen nor the status line.
-let addTokenScreenOpenings = 0;
-
 function show() {
-    addTokenScreenOpenings++;
     $("add-token-address").value = "";
     $("add-token-info").textContent = "";
     $("add-token-info").style.visibility = "hidden";
@@ -68,7 +55,6 @@ function init(ctx) {
         // The network the lookup asks, which Settings may switch away from
         // before it answers, as for a transaction in confirmTx.js.
         const chainId = currentNetwork().chainId;
-        const opening = addTokenScreenOpenings;
         try {
             const info = await lookupTokenInfo(
                 contractAddr,
@@ -85,17 +71,8 @@ function init(ctx) {
                 );
                 return;
             }
-            // The balance list never shows a token that the spoof rule
-            // refuses, so such a token is not tracked.
-            if (isSpoofedSymbol(info.symbol, contractAddr)) {
-                showFlash("Not added: this token fakes a known symbol.");
-                if (addTokenScreenOpenings !== opening) return;
-                infoEl.textContent = "";
-                infoEl.style.visibility = "hidden";
-                return;
-            }
             log.infof("Adding token", info.symbol, contractAddr);
-            trackToken({
+            state.trackedTokens.push({
                 address: contractAddr,
                 symbol: info.symbol,
                 decimals: info.decimals,
@@ -103,15 +80,11 @@ function init(ctx) {
             });
             await saveState();
             ctx.doRefreshAndRender();
-            // If the lookup answers after AddToken was opened again, the
-            // token is still added, but the screen and the status line stay
-            // as they are.
-            if (addTokenScreenOpenings !== opening) return;
             // The lookup is over, so a later Back onto AddToken shows no
             // status.
             infoEl.textContent = "";
             infoEl.style.visibility = "hidden";
-            // If the lookup answers while another screen shows, the token is
+            // If the user left AddToken while the lookup ran, the token is
             // still added but the screen does not change.
             if (state.currentView !== "add-token") return;
             // Pop the stack (back to address detail) and re-render it
@@ -134,7 +107,6 @@ function init(ctx) {
                     ? detail
                     : "Could not add the token.",
             );
-            if (addTokenScreenOpenings !== opening) return;
             infoEl.textContent = "";
             infoEl.style.visibility = "hidden";
         }

src/popup/views/addressDetail.js

@@ -22,7 +22,6 @@ const {
     filterTransactions,
 } = require("../../shared/transactions");
 const { resolveEnsNames } = require("../../shared/ens");
-const { storedNetworkIs } = require("../../shared/storedSettings");
 const {
     updateSendBalance,
     renderSendTokenSelect,
@@ -67,27 +66,11 @@ function show() {
     });
     $("address-line").dataset.full = addr.address;
     attachCopyHandlers($("address-line"));
+    const usdTotal = formatAddressTotal(getAddressValue(addr));
+    $("address-usd-total").innerHTML = escapeHtml(usdTotal) || " ";
     const ensEl = $("address-ens");
     // ENS is now shown inside renderAddressHtml, hide the separate element
     ensEl.classList.add("hidden");
-    renderBalances();
-    // Only Blockscout reports the tokens the user has not tracked.
-    $("address-tokens-note").classList.toggle("hidden", !!state.useBlockscout);
-    renderSendTokenSelect(addr);
-    $("tx-list").innerHTML =
-        '<div class="text-muted text-xs py-1">Loading...</div>';
-    showView("address");
-    loadTransactions(addr.address);
-}
-
-// The USD total and the balance list. Drawn again by each balance refresh
-// that returns while this screen is up (doRefreshAndRender() in
-// src/popup/index.js), which leaves the rest of the screen as it is.
-function renderBalances() {
-    const addr =
-        state.wallets[state.selectedWallet].addresses[state.selectedAddress];
-    const usdTotal = formatAddressTotal(getAddressValue(addr));
-    $("address-usd-total").innerHTML = escapeHtml(usdTotal) || "&nbsp;";
     $("address-balances").innerHTML = balanceLinesForAddress(
         addr,
         state.trackedTokens,
@@ -101,6 +84,13 @@ function renderBalances() {
                 ctx.showAddressToken();
             });
         });
+    // Only Blockscout reports the tokens the user has not tracked.
+    $("address-tokens-note").classList.toggle("hidden", !!state.useBlockscout);
+    renderSendTokenSelect(addr);
+    $("tx-list").innerHTML =
+        '<div class="text-muted text-xs py-1">Loading...</div>';
+    showView("address");
+    loadTransactions(addr.address);
 }
 
 let loadedTxs = [];
@@ -108,7 +98,6 @@ let loadedTxs = [];
 let ensNameMap = new Map();
 
 async function loadTransactions(address) {
-    const networkId = state.networkId;
     try {
         const rawTxs = await fetchRecentTransactions(
             address,
@@ -125,74 +114,43 @@ async function loadTransactions(address) {
         });
         const txs = result.transactions;
 
+        // Persist any newly discovered fraud contracts
+        if (result.newFraudContracts.length > 0) {
+            for (const addr of result.newFraudContracts) {
+                if (!state.fraudContracts.includes(addr)) {
+                    state.fraudContracts.push(addr);
+                }
+            }
+            await saveState();
+        }
+
+        loadedTxs = txs;
+
         // Collect ALL unique addresses (from + to) for ENS resolution so
         // that reverse lookups work for every displayed address, not just
         // the ones that were originally entered as ENS names.
         const counterparties = [
             ...new Set(txs.flatMap((tx) => [tx.from, tx.to].filter(Boolean))),
         ];
-        let names = new Map();
         if (counterparties.length > 0) {
             try {
-                names = await resolveEnsNames(
+                ensNameMap = await resolveEnsNames(
                     counterparties,
                     state.rpcUrl,
                     state.networkId,
                     ctx.pageClosed,
                 );
             } catch {
-                // The rows then show no ENS names.
+                ensNameMap = new Map();
             }
         }
 
-        // If the network changed during the lookups above, or the screen now
-        // shows another address, nothing is saved or drawn. See
-        // src/shared/storedSettings.js.
-        if (
-            state.networkId !== networkId ||
-            !(await storedNetworkIs(networkId)) ||
-            $("address-line").dataset.full !== address
-        ) {
-            return;
-        }
-
-        // Persist any newly discovered fraud contracts, inside the save and
-        // holding the lock. Nothing is added unless this page and the stored
-        // record both still name the request's network.
-        if (result.newFraudContracts.length > 0) {
-            let saved = false;
-            await saveState((stored) => {
-                if (state.networkId !== networkId) return false;
-                if (stored.networkId !== networkId) return false;
-                for (const addr of result.newFraudContracts) {
-                    if (!state.fraudContracts.includes(addr)) {
-                        state.fraudContracts.push(addr);
-                    }
-                }
-                saved = true;
-            });
-            // If the network changed while the save waited for the lock,
-            // nothing is drawn.
-            if (!saved) return;
-        }
-
-        loadedTxs = txs;
-        ensNameMap = names;
         renderTransactions(txs);
     } catch (e) {
         // Cancelled by the popup closing, not failed: see pageClosed in
         // src/popup/index.js.
         if (ctx.pageClosed.aborted) return;
         log.errorf("loadTransactions failed:", e.message);
-        // If the network changed, or the screen now shows another address,
-        // the failure is not shown.
-        if (
-            state.networkId !== networkId ||
-            !(await storedNetworkIs(networkId)) ||
-            $("address-line").dataset.full !== address
-        ) {
-            return;
-        }
         $("tx-list").innerHTML =
             '<div class="text-muted text-xs py-1">Failed to load transactions.</div>';
     }
@@ -329,4 +287,4 @@ function init(_ctx) {
     exportPrivkey.init();
 }
 
-module.exports = { init, show, renderBalances };
+module.exports = { init, show };

src/popup/views/addressToken.js

@@ -29,7 +29,6 @@ const {
     filterTransactions,
 } = require("../../shared/transactions");
 const { resolveEnsNames } = require("../../shared/ens");
-const { storedNetworkIs } = require("../../shared/storedSettings");
 const {
     updateSendBalance,
     renderSendTokenSelect,
@@ -50,18 +49,37 @@ function show() {
     const addr = wallet.addresses[state.selectedAddress];
     const ai = state.selectedAddress;
     const tokenId = state.selectedToken;
+
+    // Determine token symbol and balance
+    let symbol, amount, price;
     const knownToken = TOKEN_BY_ADDRESS.get(tokenId.toLowerCase());
-    currentSymbol =
+    if (tokenId === "ETH") {
-        tokenId === "ETH"
+        symbol = nativeCurrency();
-            ? nativeCurrency()
+        amount = parseFloat(addr.balance || "0");
-            : resolveSymbol(tokenId, addr.tokenBalances, state.trackedTokens);
+        price = getPrice("ETH");
+    } else {
+        const tb = (addr.tokenBalances || []).find(
+            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
+        );
+        symbol = resolveSymbol(
+            tokenId,
+            addr.tokenBalances,
+            state.trackedTokens,
+        );
+        // null when the scale is unknown: no quantity to show, and none to
+        // price. balanceLine() states that rather than printing 0.0000.
+        amount = tb ? unknownableAmount(tb.balance) : 0;
+        price = getPrice(tokenId);
+    }
+
+    currentSymbol = symbol;
 
     $("address-token-title").textContent =
         wallet.name +
         " \u2014 Address " +
         (ai + 1) +
         " \u2014 " +
-        displaySymbol(currentSymbol);
+        displaySymbol(symbol);
 
     // Blockie
     const blockieEl = $("address-token-jazzicon");
@@ -83,7 +101,13 @@ function show() {
     $("address-token-line").dataset.full = addr.address;
     attachCopyHandlers($("address-token-line"));
 
-    renderBalance();
+    // USD total for this token only
+    const usdVal = price && amount !== null ? amount * price : null;
+    const usdStr = formatUsd(usdVal);
+    $("address-token-usd-total").innerHTML = escapeHtml(usdStr) || " ";
+
+    // Single token balance line (no tokenId — not clickable here)
+    $("address-token-balance").innerHTML = balanceLine(symbol, amount, price);
 
     // Token contract details (ERC-20 only)
     const contractInfo = $("address-token-contract-info");
@@ -145,49 +169,7 @@ function show() {
     loadTransactions(addr.address, tokenId);
 }
 
-// The USD total and the balance line of the selected token. Drawn again by
-// each balance refresh that returns while this screen is up
-// (doRefreshAndRender() in src/popup/index.js), which leaves the rest of the
-// screen as it is.
-function renderBalance() {
-    const addr =
-        state.wallets[state.selectedWallet].addresses[state.selectedAddress];
-    const tokenId = state.selectedToken;
-    let amount, price;
-    if (tokenId === "ETH") {
-        amount = parseFloat(addr.balance || "0");
-        price = getPrice("ETH");
-    } else {
-        const id = tokenId.toLowerCase();
-        const tb = (addr.tokenBalances || []).find(
-            (t) => t.address.toLowerCase() === id,
-        );
-        const tracked = state.trackedTokens.find(
-            (t) => t.address.toLowerCase() === id,
-        );
-        // null when the scale is unknown, or when no refresh has read the
-        // balance of a token just added: no quantity to show, and none to
-        // price. balanceLine() states that rather than printing 0.0000.
-        if (tb) amount = unknownableAmount(tb.balance);
-        else amount = tracked && tracked.balanceNotFetched ? null : 0;
-        price = getPrice(tokenId);
-    }
-
-    // USD total for this token only
-    const usdVal = price && amount !== null ? amount * price : null;
-    const usdStr = formatUsd(usdVal);
-    $("address-token-usd-total").innerHTML = escapeHtml(usdStr) || " ";
-
-    // Single token balance line (no tokenId — not clickable here)
-    $("address-token-balance").innerHTML = balanceLine(
-        currentSymbol,
-        amount,
-        price,
-    );
-}
-
 async function loadTransactions(address, tokenId) {
-    const networkId = state.networkId;
     try {
         const rawTxs = await fetchRecentTransactions(
             address,
@@ -204,6 +186,16 @@ async function loadTransactions(address, tokenId) {
         });
         let txs = result.transactions;
 
+        // Persist any newly discovered fraud contracts
+        if (result.newFraudContracts.length > 0) {
+            for (const addr of result.newFraudContracts) {
+                if (!state.fraudContracts.includes(addr)) {
+                    state.fraudContracts.push(addr);
+                }
+            }
+            await saveState();
+        }
+
         // Filter to this token only
         if (tokenId === "ETH") {
             txs = txs.filter((tx) => tx.contractAddress === null);
@@ -215,75 +207,32 @@ async function loadTransactions(address, tokenId) {
             );
         }
 
+        loadedTxs = txs;
+
         // Collect ALL unique addresses for ENS resolution so reverse
         // lookups work for every displayed address.
         const counterparties = [
             ...new Set(txs.flatMap((tx) => [tx.from, tx.to].filter(Boolean))),
         ];
-        let names = new Map();
         if (counterparties.length > 0) {
             try {
-                names = await resolveEnsNames(
+                ensNameMap = await resolveEnsNames(
                     counterparties,
                     state.rpcUrl,
                     state.networkId,
                     ctx.pageClosed,
                 );
             } catch {
-                // The rows then show no ENS names.
+                ensNameMap = new Map();
             }
         }
 
-        // If the network changed during the lookups above, or the screen now
-        // shows another address or token, nothing is saved or drawn. See
-        // src/shared/storedSettings.js.
-        if (
-            state.networkId !== networkId ||
-            !(await storedNetworkIs(networkId)) ||
-            $("address-token-line").dataset.full !== address ||
-            state.selectedToken !== tokenId
-        ) {
-            return;
-        }
-
-        // Persist any newly discovered fraud contracts, inside the save and
-        // holding the lock. Nothing is added unless this page and the stored
-        // record both still name the request's network.
-        if (result.newFraudContracts.length > 0) {
-            let saved = false;
-            await saveState((stored) => {
-                if (state.networkId !== networkId) return false;
-                if (stored.networkId !== networkId) return false;
-                for (const addr of result.newFraudContracts) {
-                    if (!state.fraudContracts.includes(addr)) {
-                        state.fraudContracts.push(addr);
-                    }
-                }
-                saved = true;
-            });
-            // If the network changed while the save waited for the lock,
-            // nothing is drawn.
-            if (!saved) return;
-        }
-
-        loadedTxs = txs;
-        ensNameMap = names;
         renderTransactions(txs);
     } catch (e) {
         // Cancelled by the popup closing, not failed: see pageClosed in
         // src/popup/index.js.
         if (ctx.pageClosed.aborted) return;
         log.errorf("loadTransactions failed:", e.message);
-        // If the network changed, or the screen now shows another address or
-        // token, the failure is not shown.
-        if (
-            state.networkId !== networkId ||
-            !(await storedNetworkIs(networkId)) ||
-            $("address-token-line").dataset.full !== address ||
-            state.selectedToken !== tokenId
-        ) {
-            return;
-        }
         $("address-token-tx-list").innerHTML =
             '<div class="text-muted text-xs py-1">Failed to load transactions.</div>';
     }
@@ -399,4 +348,4 @@ function init(_ctx) {
     });
 }
 
-module.exports = { init, show, renderBalance };
+module.exports = { init, show };

src/popup/views/helpers.js

@@ -33,7 +33,6 @@ const { networkByChainId } = require("../../shared/networks");
 const { formatUsd, getPrice } = require("../../shared/prices");
 const { state, saveState, currentNetwork } = require("../../shared/state");
 const { displaySymbol } = require("../../shared/symbolDisplay");
-const { isSpoofedSymbol } = require("../../shared/symbolSpoof");
 const { walletHasRecoveryPhrase } = require("../../shared/wallet");
 const { markViewRendered } = require("../viewRouter");
 
@@ -418,15 +417,6 @@ function balanceLine(symbol, amount, price, tokenId) {
     );
 }
 
-// Tracks `token` on the active network, as every add path on AddToken and
-// SettingsAddToken does. The tracked record carries `balanceNotFetched: true`
-// until a balance refresh has read the token's balance at every address
-// (doRefreshAndRender() in src/popup/index.js). Until then, an address with no
-// balance row for the token shows `quantity unknown` for it, not 0.0000.
-function trackToken(token) {
-    state.trackedTokens.push({ ...token, balanceNotFetched: true });
-}
-
 function balanceLinesForAddress(addr, trackedTokens, showZero) {
     let html = balanceLine(
         nativeCurrency(),
@@ -457,12 +447,9 @@ function balanceLinesForAddress(addr, trackedTokens, showZero) {
     if (showZero && trackedTokens) {
         for (const t of trackedTokens) {
             if (seen.has(t.address.toLowerCase())) continue;
-            // A token that the spoof rule refuses has no stored balance, and
-            // gets no zero row either.
-            if (isSpoofedSymbol(t.symbol, t.address)) continue;
             html += balanceLine(
                 t.symbol,
-                t.balanceNotFetched ? null : 0,
+                0,
                 getPrice(t.address),
                 t.address.toLowerCase(),
             );
@@ -842,7 +829,6 @@ module.exports = {
     flashCopyFeedback,
     balanceLine,
     balanceLinesForAddress,
-    trackToken,
     addressHoldsFunds,
     keyMaterialName,
     unknownableAmount,

src/popup/views/home.js

@@ -44,7 +44,6 @@ const {
     fetchRecentTransactions,
     filterTransactions,
 } = require("../../shared/transactions");
-const { storedNetworkIs } = require("../../shared/storedSettings");
 const { log } = require("../../shared/log");
 
 function findActiveAddr() {
@@ -184,7 +183,6 @@ async function loadHomeTxs(ctx) {
     }
     if (allAddresses.length === 0) return;
 
-    const networkId = state.networkId;
     const filters = {
         hideSpoofedSymbols: state.hideSpoofedSymbols,
         hideLowHolderTokens: state.hideLowHolderTokens,
@@ -204,15 +202,6 @@ async function loadHomeTxs(ctx) {
         );
         const results = await Promise.all(fetches);
 
-        // If the network changed during the lookups, nothing is saved or
-        // drawn. See src/shared/storedSettings.js.
-        if (
-            state.networkId !== networkId ||
-            !(await storedNetworkIs(networkId))
-        ) {
-            return;
-        }
-
         // Merge, deduplicate by hash, filter, sort, take 25
         const seen = new Set();
         let merged = [];
@@ -226,24 +215,14 @@ async function loadHomeTxs(ctx) {
 
         const filtered = filterTransactions(merged, filters);
 
-        // Persist any newly discovered fraud contracts, inside the save and
+        // Persist any newly discovered fraud contracts
-        // holding the lock. Nothing is added unless this page and the stored
-        // record both still name the request's network.
         if (filtered.newFraudContracts.length > 0) {
-            let saved = false;
+            for (const addr of filtered.newFraudContracts) {
-            await saveState((stored) => {
+                if (!state.fraudContracts.includes(addr)) {
-                if (state.networkId !== networkId) return false;
+                    state.fraudContracts.push(addr);
-                if (stored.networkId !== networkId) return false;
-                for (const addr of filtered.newFraudContracts) {
-                    if (!state.fraudContracts.includes(addr)) {
-                        state.fraudContracts.push(addr);
-                    }
                 }
-                saved = true;
+            }
-            });
+            await saveState();
-            // If the network changed while the save waited for the lock,
-            // nothing is drawn.
-            if (!saved) return;
         }
 
         merged = filtered.transactions;
@@ -255,13 +234,6 @@ async function loadHomeTxs(ctx) {
         // src/popup/index.js.
         if (ctx.pageClosed.aborted) return;
         log.errorf("loadHomeTxs failed:", e.message);
-        // If the network changed, the failure is not shown.
-        if (
-            state.networkId !== networkId ||
-            !(await storedNetworkIs(networkId))
-        ) {
-            return;
-        }
         const list = $("home-tx-list");
         if (list) {
             list.innerHTML =

src/popup/views/settings.js

@@ -50,11 +50,6 @@ let versionClickTimer = null;
 // not the one in `state`.
 let shownNetwork = null;
 
-// Each endpoint "Save" counts its taps here, under the field that it stores.
-// Once the user taps the same "Save" again, the earlier tap shows no flash
-// message. The earlier tap stores its URL only if its write had already begun.
-const saveTaps = { rpcUrl: 0, blockscoutUrl: 0 };
-
 // One row per site origin, however many addresses it appears under, each with
 // an [x] that hands it to onRemove.
 function renderSiteList(containerId, origins, onRemove) {
@@ -352,16 +347,10 @@ function showNewSettings() {
 // shows `url`, nothing is saved. The flash message then says that the URL was
 // changed during the check. The save compares the input and sets `url` in
 // `state` in one step. So a redraw after the comparison shows `url`.
-//
+async function saveEndpoint(field, input, url, networkId) {
-// `tap` is the number of the "Save" tap that checked `url`. If the user taps
-// the same "Save" again before this save holds the lock, nothing is stored. If
-// the user taps the same "Save" again before the write ends, no flash message
-// is shown.
-async function saveEndpoint(field, input, url, networkId, tap) {
     let refused = false;
     let inputChanged = false;
     await saveState((stored) => {
-        if (saveTaps[field] !== tap) return false;
         refused =
             state.networkId !== networkId || stored.networkId !== networkId;
         inputChanged = $(input).value.trim() !== url;
@@ -369,7 +358,6 @@ async function saveEndpoint(field, input, url, networkId, tap) {
         state[field] = url;
         stored[field] = url;
     });
-    if (saveTaps[field] !== tap) return;
     if (refused) {
         showFlash("The URL was not saved because the network changed.");
     } else if (inputChanged) {
@@ -387,8 +375,6 @@ function init(_ctx) {
     showPhrase.init();
 
     $("btn-save-rpc").addEventListener("click", async () => {
-        saveTaps.rpcUrl++;
-        const tap = saveTaps.rpcUrl;
         const url = $("settings-rpc").value.trim();
         if (!url) {
             showFlash("Please enter an RPC URL.");
@@ -409,8 +395,6 @@ function init(_ctx) {
                 }),
             });
             const json = await resp.json();
-            // The user has tapped this "Save" again since the check began.
-            if (tap !== saveTaps.rpcUrl) return;
             if (json.error) {
                 log.errorf("RPC validation error:", json.error);
                 showFlash("Endpoint returned an error.");
@@ -424,7 +408,6 @@ function init(_ctx) {
             // Cancelled by the popup closing, not failed: see pageClosed in
             // src/popup/index.js.
             if (ctx.pageClosed.aborted) return;
-            if (tap !== saveTaps.rpcUrl) return;
             // Not the error's message: fetch puts the whole URL, password and
             // key included, in the message of the error it throws for a URL
             // with a user name and password or one it cannot parse.
@@ -432,12 +415,10 @@ function init(_ctx) {
             showFlash("Could not reach endpoint.");
             return;
         }
-        await saveEndpoint("rpcUrl", "settings-rpc", url, net.id, tap);
+        await saveEndpoint("rpcUrl", "settings-rpc", url, net.id);
     });
 
     $("btn-save-blockscout").addEventListener("click", async () => {
-        saveTaps.blockscoutUrl++;
-        const tap = saveTaps.blockscoutUrl;
         const url = $("settings-blockscout").value.trim();
         if (!url) {
             showFlash("Please enter a Blockscout API URL.");
@@ -447,26 +428,18 @@ function init(_ctx) {
         showFlash("Testing endpoint...");
         try {
             const resp = await debugFetch(url + "/stats");
-            if (tap !== saveTaps.blockscoutUrl) return;
             if (!resp.ok) {
                 showFlash("Endpoint returned HTTP " + resp.status + ".");
                 return;
             }
         } catch {
             if (ctx.pageClosed.aborted) return;
-            if (tap !== saveTaps.blockscoutUrl) return;
             // Not the error's message, as for the RPC check above.
             log.errorf("Blockscout validation failed:", urlOrigin(url));
             showFlash("Could not reach endpoint.");
             return;
         }
-        await saveEndpoint(
+        await saveEndpoint("blockscoutUrl", "settings-blockscout", url, net.id);
-            "blockscoutUrl",
-            "settings-blockscout",
-            url,
-            net.id,
-            tap,
-        );
     });
 
     // Each change is made inside the save, holding the lock. So

src/popup/views/settingsAddToken.js

@@ -1,16 +1,8 @@
-const {
+const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
-    $,
-    showView,
-    showFlash,
-    escapeHtml,
-    goBack,
-    trackToken,
-} = require("./helpers");
 const { getTopTokens } = require("../../shared/tokenList");
 const { state, saveState, currentNetwork } = require("../../shared/state");
 const { lookupTokenInfo } = require("../../shared/balances");
 const { isScamAddress } = require("../../shared/scamlist");
-const { isSpoofedSymbol } = require("../../shared/symbolSpoof");
 const { log } = require("../../shared/log");
 
 let ctx;
@@ -51,7 +43,7 @@ function renderTop10() {
                     decimals: parseInt(btn.dataset.decimals, 10),
                     name: btn.dataset.name || btn.dataset.symbol,
                 };
-                trackToken(token);
+                state.trackedTokens.push(token);
                 await saveState();
                 showFlash("Added " + token.symbol);
                 renderTop10();
@@ -118,7 +110,7 @@ function init(_ctx) {
             decimals: parseInt(opt.dataset.decimals, 10),
             name: opt.dataset.name || opt.dataset.symbol,
         };
-        trackToken(token);
+        state.trackedTokens.push(token);
         await saveState();
         showFlash("Added " + token.symbol);
         renderTop10();
@@ -163,18 +155,8 @@ function init(_ctx) {
                 );
                 return;
             }
-            // The balance list never shows a token that the spoof rule
-            // refuses, so such a token is not tracked. The rule never refuses
-            // a bundled token, so the "Top tokens:" buttons and the top 100
-            // dropdown need no such check.
-            if (isSpoofedSymbol(info.symbol, addr)) {
-                showFlash("Not added: this token fakes a known symbol.");
-                infoEl.textContent = "";
-                infoEl.style.visibility = "hidden";
-                return;
-            }
             log.infof("Adding token", info.symbol, addr);
-            trackToken({
+            state.trackedTokens.push({
                 address: addr,
                 symbol: info.symbol,
                 decimals: info.decimals,

src/shared/balances.js

@@ -247,11 +247,7 @@ async function fetchTokenBalances(
 // it has none. The failure is logged. A balance of zero gets no entry, as a
 // zero Blockscout reports gets none: the balance lists take a tracked token's
 // zero from the tracked list. A token whose symbol the spoof rule refuses gets
-// no entry either, as in fetchTokenBalances(), and its balance is not read.
+// no entry either, as in fetchTokenBalances().
-//
-// Resolves with `rows`, the entries, and `unread`, the tracked tokens whose
-// balance was not read, as lowercased contract addresses. A token is unread
-// when the spoof rule refuses it or its balanceOf fails.
 //
 // `signal` is as for fetchTokenBalances().
 async function fetchTrackedTokenBalances(
@@ -292,16 +288,12 @@ async function fetchTrackedTokenBalances(
     const reported = explorerRows ?? previous;
 
     const rows = [];
-    const unread = trackedTokens
-        .filter((token) => !listed.includes(token))
-        .map((token) => token.address.toLowerCase());
     listed.forEach((token, i) => {
         const lower = token.address.toLowerCase();
         const entryIn = (list) =>
             list.find((row) => String(row.address).toLowerCase() === lower);
         const raw = balances[i];
         if (raw === null) {
-            unread.push(lower);
             const kept = entryIn(previous) || entryIn(explorerRows || []);
             if (kept) rows.push(kept);
             return;
@@ -322,15 +314,12 @@ async function fetchTrackedTokenBalances(
             holders: entry ? entry.holders : null,
         });
     });
-    return { rows, unread };
+    return rows;
 }
 
 // Fetch ETH balances, ENS names, and ERC-20 token balances for all addresses.
 // `trackedTokens` are the tokens tracked on the active network. `signal` is as
 // for fetchTokenBalances().
-//
-// Resolves with the lowercased contract addresses of the tracked tokens whose
-// balance it read at every address.
 async function refreshBalances(
     wallets,
     rpcUrl,
@@ -343,8 +332,6 @@ async function refreshBalances(
     const provider = getProvider(rpcUrl, networkId);
     const tracked = trackedTokens || [];
     const trackedSet = new Set(tracked.map((t) => t.address.toLowerCase()));
-    // The tracked tokens whose balance was not read at some address.
-    const unread = new Set();
     const updates = [];
 
     for (const wallet of wallets) {
@@ -419,14 +406,12 @@ async function refreshBalances(
                         signal,
                     ),
                     explorerRequest,
-                ]).then(([trackedResult, explorerRows]) => {
+                ]).then(([trackedRows, explorerRows]) => {
-                    for (const lower of trackedResult.unread) unread.add(lower);
                     const untrackedRows = (explorerRows ?? previous).filter(
                         (row) =>
                             !trackedSet.has(String(row.address).toLowerCase()),
                     );
-                    addr.tokenBalances =
+                    addr.tokenBalances = trackedRows.concat(untrackedRows);
-                        trackedResult.rows.concat(untrackedRows);
                     log.debugf(
                         "Token balances",
                         addr.address,
@@ -440,7 +425,6 @@ async function refreshBalances(
 
     await Promise.all(updates);
     log.debugf("refreshBalances done");
-    return [...trackedSet].filter((lower) => !unread.has(lower));
 }
 
 // Drops the balance of each token not in `trackedTokens` from every address.

src/shared/chainSwitch.js

@@ -61,40 +61,20 @@ function clearPopupCaches() {
 // (https://git.eeqj.de/sneak/AutistMask/issues/653,
 // https://git.eeqj.de/sneak/AutistMask/issues/692).
 //
-// When the stored record is on another network, a switch saved elsewhere has
-// not reached this page yet. This page first takes that switch with
-// takeStoredNetwork() (state.js), as followStoredSettings() does. The switch to
-// `newNetworkId` is then made from the stored record's network. So every
-// network's list of tracked tokens in the stored record is kept
-// (https://git.eeqj.de/sneak/AutistMask/issues/701). When the stored record is
-// already on `newNetworkId`, the switch made from there only resets the
-// balances and caches.
-//
-// When the stored record is on this page's network, this page first takes the
-// stored `networkTrackedTokens` (takeStoredNetworkTrackedTokens() in state.js),
-// because another page's save may have changed a list this page holds.
-//
 // Before the switch, `state` takes the tracked tokens that another page stored
 // since this page's last save (takeStoredTrackedTokens() in state.js). The
 // switch then puts them away under the previous network, the network they were
-// added on.
+// added on. When the stored record is on another network, a switch saved
+// elsewhere has not reached this page yet. The stored record's tokens are then
+// that network's, and none are taken.
 async function onChainSwitch(newNetworkId) {
-    const {
+    const { state, saveState, takeStoredTrackedTokens } = require("./state");
-        state,
-        saveState,
-        takeStoredNetwork,
-        takeStoredTrackedTokens,
-        takeStoredNetworkTrackedTokens,
-    } = require("./state");
     let net = null;
     await saveState((stored) => {
         if (state.networkId === newNetworkId) return false;
-        if (stored.networkId !== state.networkId) {
+        if (stored.networkId === state.networkId) {
-            takeStoredNetwork(stored);
+            takeStoredTrackedTokens(stored);
-        } else {
-            takeStoredNetworkTrackedTokens(stored);
         }
-        takeStoredTrackedTokens(stored);
         net = applyChainSwitchFields(state, newNetworkId);
         stored.lastBalanceRefresh = 0;
         stored.fraudContracts = [];

src/shared/state.js

@@ -127,12 +127,10 @@ function currentNetwork() {
 
 // `baseline` holds the persisted fields as this page held them when its last
 // loadState() finished, or when its last successful saveState() began.
-// takeStoredNetwork(), takeStoredTrackedTokens() and
+// takeStoredNetwork() and takeStoredTrackedTokens() also write into it what
-// takeStoredNetworkTrackedTokens() also write into it what this page has taken
+// this page has taken from the stored record since then. saveState() diffs the
-// from the stored record since then. `baseline` also lacks any
+// live state against `baseline` to find only the fields THIS page changed
-// `balanceNotFetched` field that a balance refresh has deleted since
+// since.
-// (clearBalanceNotFetched()). saveState() diffs the live state against
-// `baseline` to find only the fields THIS page changed since.
 //
 // Deep-cloned, not a reference: callers mutate persisted objects and arrays
 // in place (state.wallets.push(...)), and a reference baseline would mutate
@@ -404,23 +402,6 @@ function mergeNetworkEndpoints(base, ours, theirs) {
     return mergeMapByKey(base, ours, theirs, mergeEndpointEntry);
 }
 
-// Returns a copy of `stored.networkTrackedTokens` for when this page has not yet
-// taken the switch in `stored`. `page` is this page's state. A token that this
-// page tracked or removed since its last save is tracked or removed in the list
-// of `page.networkId`, by contract address.
-function networkTrackedTokensWithChange(stored, page) {
-    return {
-        ...stored.networkTrackedTokens,
-        [page.networkId]: mergeListByIdentity(
-            baseline.trackedTokens,
-            page.trackedTokens,
-            stored.networkTrackedTokens[page.networkId],
-            (token) => token.address.toLowerCase(),
-            (base, ours) => ours,
-        ),
-    };
-}
-
 // Read-modify-write, merged per field, rather than one full-blob write.
 //
 // Every extension page (the toolbar popup, a dApp approval window) holds its
@@ -474,11 +455,6 @@ function networkTrackedTokensWithChange(stored, page) {
 // own UI scratch space, not data another page has any reason to share
 // membership of.
 //
-// One exception: when the stored record is on another network than this
-// page's, a save keeps the stored `trackedTokens`. It merges this page's change
-// into the list in `networkTrackedTokens` for this page's network, by contract
-// address.
-//
 // This does not make two pages that both change the SAME leaf concurrently
 // safe: last write wins on that one leaf, same as before. What it removes
 // is the cross-field (and now cross-membership-vs-leaf) clobber — a page
@@ -551,20 +527,6 @@ async function saveStateOnce(beforeWrite) {
             merged[key] = current[key];
         }
     }
-    // When the merged record names a network other than this page's, this page
-    // has not yet taken a switch saved elsewhere. This page's `trackedTokens`
-    // is then the list of this page's network. The stored record keeps the
-    // list of this page's network in `networkTrackedTokens`. So a token that
-    // this page added or removed since its last save is added to or removed
-    // from that stored list. The merged record keeps the stored `trackedTokens`
-    // (https://git.eeqj.de/sneak/AutistMask/issues/701).
-    if (merged.networkId !== current.networkId) {
-        merged.trackedTokens = fresh.trackedTokens;
-        merged.networkTrackedTokens = networkTrackedTokensWithChange(
-            fresh,
-            current,
-        );
-    }
     merged.hasWallet = Boolean(merged.wallets && merged.wallets.length > 0);
     // Stamped on every write, never merged or diffed: the record that goes to
     // storage is in THIS build's shape whatever shape it was read in, which is
@@ -645,27 +607,15 @@ function saveState(beforeWrite) {
     return turn;
 }
 
-// Give this page the network switch held by `stored`, in `state` and in
+// Give this page the network switch held by `stored`, a record a save of this
-// `baseline` alike, as loadState() does with a whole record. `stored` is the
+// page has just read (followStoredSettings() in src/popup/index.js calls this
-// record that a save of this page has just read. followStoredSettings() in
+// from `beforeWrite`), in `state` and in `baseline` alike, as loadState() does
-// src/popup/index.js and onChainSwitch() in src/shared/chainSwitch.js call this
+// with a whole record. The switch is then not this page's own change, even when
-// from `beforeWrite`. The switch is then not this page's own change, even when
 // that save fails to write: a later switch back to the previous network still
 // differs from `baseline`, and is stored.
-//
-// A token that this page tracked or removed since its last save was tracked or
-// removed on this page's network before the switch. `state` keeps that change
-// in the list in `networkTrackedTokens` for that network, merged with the
-// stored list by contract address. `baseline` takes the stored list, so the
-// save stores the change (https://git.eeqj.de/sneak/AutistMask/issues/706).
 function takeStoredNetwork(stored) {
-    const networkTrackedTokens = networkTrackedTokensWithChange(
-        stored,
-        rawState,
-    );
     copyChainSwitchFields(rawState, stored);
     copyChainSwitchFields(baseline, structuredClone(stored));
-    rawState.networkTrackedTokens = networkTrackedTokens;
 }
 
 // Give this page the tracked tokens of `stored`, a record on this page's
@@ -690,40 +640,6 @@ function takeStoredTrackedTokens(stored) {
     baseline.trackedTokens = structuredClone(stored.trackedTokens);
 }
 
-// Give `state` and `baseline` each their own copy of the stored
-// `networkTrackedTokens`. `stored` is a record on this page's network that a
-// save of this page has just read. onChainSwitch() in
-// src/shared/chainSwitch.js calls this from `beforeWrite`.
-function takeStoredNetworkTrackedTokens(stored) {
-    rawState.networkTrackedTokens = structuredClone(
-        stored.networkTrackedTokens,
-    );
-    baseline.networkTrackedTokens = structuredClone(
-        stored.networkTrackedTokens,
-    );
-}
-
-// Deletes `balanceNotFetched` from each tracked token whose lowercased
-// contract address is in `addresses`. The field goes from `stored`, from
-// `state` and from `baseline` alike. `stored` is the record a save of this
-// page has just read (doRefreshAndRender() in src/popup/index.js calls this
-// from `beforeWrite`). So the deletion is not a change this page made to its
-// tracked tokens. Unless this page has changed its tracked tokens itself, the
-// save then writes the stored list with only the field gone.
-function clearBalanceNotFetched(stored, addresses) {
-    for (const list of [
-        stored.trackedTokens,
-        rawState.trackedTokens,
-        baseline.trackedTokens,
-    ]) {
-        for (const token of list) {
-            if (addresses.includes(token.address.toLowerCase())) {
-                delete token.balanceNotFetched;
-            }
-        }
-    }
-}
-
 // Rejects with StateUnusableError for a stored record this build cannot make
 // sense of. Nothing is assigned and `loaded` stays false in that case, so a
 // caller that ignores the rejection gets StateNotLoadedError on the first
@@ -771,8 +687,6 @@ module.exports = {
     onSaveFailure,
     takeStoredNetwork,
     takeStoredTrackedTokens,
-    takeStoredNetworkTrackedTokens,
-    clearBalanceNotFetched,
     loadState,
     currentAddress,
     currentNetwork,

src/shared/storedSettings.js

@@ -1,5 +1,5 @@
-// Reads "Use Blockscout", "Check recipients on Etherscan" or the active network
+// Reads "Use Blockscout" or "Check recipients on Etherscan" from the stored
-// from the stored profile.
+// profile.
 //
 // Before each request that sends the user's data to Blockscout or Etherscan, the
 // wallet reads that service's setting from storage. The wallet reads the setting
@@ -7,11 +7,6 @@
 // made, and an answer that lands after the setting went off is dropped. A page's
 // own copy of the setting is not used, because another page may have just
 // changed it.
-//
-// Before asking Blockscout for the transaction history, a screen remembers
-// which network is active. If another network is active on the page or in
-// storage when the answer lands, the screen drops the answer. A switch saved
-// elsewhere reaches storage first and the page later.
 
 const { storageGet } = require("./browserApi");
 const { normalizePersisted } = require("./persistedState");
@@ -29,15 +24,4 @@ async function storedSettingIsOn(name) {
     }
 }
 
-// Whether `networkId` is the active network in the stored profile. A failed
+module.exports = { storedSettingIsOn };
-// read counts as no.
-async function storedNetworkIs(networkId) {
-    try {
-        const { autistmask } = await storageGet("autistmask");
-        return normalizePersisted(autistmask).networkId === networkId;
-    } catch {
-        return false;
-    }
-}
-
-module.exports = { storedSettingIsOn, storedNetworkIs };

src/shared/uniswap.js

@@ -988,9 +988,6 @@ function totalAmount(amounts) {
 // pays it of Token In as the step's amount in place of the rules' Amount, or
 // no amount when this decoder cannot tell what that is.
 //
-// `spent` lists the currency that each swap action spends, for each swap
-// action that this decoder could read.
-//
 // `takes` is every TAKE, TAKE_ALL and TAKE_PORTION, as the currency it takes
 // and its recipient as written, MSG_SENDER for a TAKE_ALL. TAKE_PORTION takes
 // a share of the currency, so it does not name the output side as TAKE does.
@@ -1166,8 +1163,6 @@ function decodeV4Swap(input) {
             }
         }
 
-        const spent = swaps.map((s) => s.tokenIn);
-
         // Rule 3.
         if (swapUndecoded) {
             return {
@@ -1175,7 +1170,6 @@ function decodeV4Swap(input) {
                 tokenOut: takeToken,
                 amountIn: null,
                 amountOutMin: null,
-                spent,
                 takes,
                 settledFromRouter,
                 paidByUser,
@@ -1186,6 +1180,7 @@ function decodeV4Swap(input) {
             };
         }
 
+        const spent = swaps.map((s) => s.tokenIn);
         const bought = swaps.map((s) => s.tokenOut);
 
         // Rules 1 and 2 for Token In.
@@ -1221,7 +1216,6 @@ function decodeV4Swap(input) {
             tokenOut,
             amountIn,
             amountOutMin,
-            spent,
             takes,
             settledFromRouter,
             paidByUser,
@@ -1313,9 +1307,8 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         const commandNames = [];
 
         // THE INVARIANT: an amount and the token it is counted in always come
-        // from the same hop, or from hops that all spend that token or all buy
+        // from the same hop, or from hops that all spend that token. A figure
-        // it. A figure is never rendered against a token that did not supply
+        // is never rendered against a token that did not supply it.
-        // it.
         //
         // Both sides are therefore set as a PAIR — never field by field, and
         // never on truthiness. An address is never falsy once set but an
@@ -1430,10 +1423,6 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
             const r = recipient.toLowerCase();
             return r === ADDRESS_THIS || r === toAddress.toLowerCase();
         };
-        const isSender = (recipient) => {
-            const r = recipient.toLowerCase();
-            return r === MSG_SENDER || r === sender;
-        };
         // A swap step or V4 SETTLE pays `amount` of `token` from the router's
         // own balance. CONTRACT_BALANCE pays all of it. Any other quantity
         // counts against the amount a WRAP_ETH stated, and the steps pay all
@@ -1466,73 +1455,17 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // A step pays `recipient`. `output` is the token a swap step or a V4
         // TAKE or TAKE_PORTION pays; other steps pass none.
         const addPayee = (recipient, output) => {
+            const r = recipient.toLowerCase();
             if (isRouter(recipient)) {
                 if (present(output)) {
                     heldByRouter.set(output.toLowerCase(), null);
                 }
-            } else if (isSender(recipient)) {
+            } else if (r === MSG_SENDER || r === sender) {
                 paidToSender = true;
             } else {
                 addPaidElsewhere(recipient);
             }
         };
-        // Each swap step that paid the sender some of the token it bought,
-        // as { step, token, amount, onlyToSender }:
-        // - `step` is the step's index;
-        // - `token` is that token;
-        // - `amount` is the step's stated minimum;
-        // - `onlyToSender` is whether the step paid all of that token to the
-        //   sender.
-        // A later step that spends that token takes the step off this list
-        // (see dropFromSum()).
-        let swapsPayingSender = [];
-        // The step being read spends `token`, so it may spend what an earlier
-        // swap step paid the sender. Each step on swapsPayingSender that
-        // bought `token` leaves the list. A step spends a token as follows:
-        // - a V2 or V3 swap step spends its input token;
-        // - a V4 step spends each token that one of its swap actions spends,
-        //   and each token that one of its SETTLEs or SETTLE_ALLs pays;
-        // - a PERMIT2_TRANSFER_FROM spends the token it moves.
-        const dropFromSum = (token) => {
-            swapsPayingSender = swapsPayingSender.filter(
-                (s) => !sameAddress(s.token, token),
-            );
-        };
-        // The minimum the output side shows for the swap step at `step`. The
-        // step buys `token` with the stated minimum `amount`, and pays
-        // `token` to `recipients`. The minimum is the step's own, unless this
-        // step and an earlier one on swapsPayingSender both pay `token` to
-        // the sender, as a route split across steps does. The minimum is then
-        // the total of all such steps' minimums. There is none when this
-        // decoder reads no minimum from one of them, or when one of them pays
-        // some of `token` elsewhere. There is also none when this decoder did
-        // not read one of them, or a step between them, in full (see
-        // stepsUnread).
-        const swapMinimum = (step, token, amount, recipients) => {
-            const toSender = recipients.filter(
-                (r) => present(r) && isSender(r),
-            );
-            if (toSender.length === 0) return amount;
-            swapsPayingSender.push({
-                step,
-                token,
-                amount,
-                onlyToSender: toSender.length === recipients.length,
-            });
-            const split = swapsPayingSender.filter((s) =>
-                sameAddress(s.token, token),
-            );
-            if (split.length < 2) return amount;
-            if (
-                split.some(
-                    (s) => !s.onlyToSender || typeof s.amount !== "bigint",
-                ) ||
-                stepsUnread.some((unread) => unread >= split[0].step)
-            ) {
-                return null;
-            }
-            return split.reduce((sum, s) => sum + s.amount, 0n);
-        };
         // A step that pays `token` to `recipient` is a hop, not a payout,
         // when the very next step is a V2 exact-in whose input is already
         // paid, whose path starts at `token`, and whose pair (see v2PairFor())
@@ -1674,7 +1607,6 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                                     : null,
                         });
                     }
-                    if (p) dropFromSum(p.token);
                 } else if (command === "BALANCE_CHECK_ERC20") {
                     const b = decodeBalanceCheck(inputs[i]);
                     if (!b) {
@@ -1717,18 +1649,10 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                         } else if (s.payerIsUser) {
                             addUserPaid(s.tokenIn, s.amountIn);
                         }
-                        dropFromSum(s.tokenIn);
                         // Always update output: in multi-step swaps (V3 → V4),
-                        // the last swap step determines the final output
+                        // the last swap step determines the final output token
-                        // token. swapMinimum() gives the minimum.
+                        // and minimum received amount.
-                        setOutput(
+                        setOutput(i, s.tokenOut, s.amountOutMin, [s.recipient]);
-                            i,
-                            s.tokenOut,
-                            swapMinimum(i, s.tokenOut, s.amountOutMin, [
-                                s.recipient,
-                            ]),
-                            [s.recipient],
-                        );
                         if (!s.payerIsUser) {
                             spendFromRouter(s.tokenIn, s.amountIn);
                         }
@@ -1749,15 +1673,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                         } else if (s.payerIsUser) {
                             addUserPaid(s.tokenIn, s.amountIn);
                         }
-                        dropFromSum(s.tokenIn);
+                        setOutput(i, s.tokenOut, s.amountOutMin, [s.recipient]);
-                        setOutput(
-                            i,
-                            s.tokenOut,
-                            swapMinimum(i, s.tokenOut, s.amountOutMin, [
-                                s.recipient,
-                            ]),
-                            [s.recipient],
-                        );
                         if (!s.payerIsUser) {
                             spendFromRouter(s.tokenIn, s.amountIn);
                         }
@@ -1789,15 +1705,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                         } else if (s.payerIsUser) {
                             addUserPaid(s.tokenIn, s.amountInMax);
                         }
-                        dropFromSum(s.tokenIn);
+                        setOutput(i, s.tokenOut, s.amountOut, [s.recipient]);
-                        setOutput(
-                            i,
-                            s.tokenOut,
-                            swapMinimum(i, s.tokenOut, s.amountOut, [
-                                s.recipient,
-                            ]),
-                            [s.recipient],
-                        );
                         if (!isHop(i, s.tokenOut, s.recipient)) {
                             addPayee(s.recipient, s.tokenOut);
                         }
@@ -1969,11 +1877,6 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                                 addPayee(t.recipient, t.currency);
                             }
                         }
-                        for (const token of v4.spent) dropFromSum(token);
-                        for (const s of v4.paidByUser) dropFromSum(s.currency);
-                        for (const s of v4.settledFromRouter) {
-                            dropFromSum(s.currency);
-                        }
                     }
                     if (!v4 || v4.recipientUnread) {
                         payeeUnread = true;
@@ -2022,12 +1925,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                             setInput(v4.tokenIn, amountIn);
                         }
                         outputToken = v4.tokenOut;
-                        minOutput = swapMinimum(
+                        minOutput = v4.amountOutMin;
-                            i,
-                            v4.tokenOut,
-                            v4.amountOutMin,
-                            takeRecipients,
-                        );
                         outputEstablished = true;
                         outputUnwrapped = false;
                         unwrapIntoRouterStep = null;

tests/addTokenLateAnswer.test.js

@@ -16,12 +16,8 @@ const TOKEN = {
     symbol: "TST",
     decimals: 18,
     name: "Test Token",
-    balanceNotFetched: true,
 };
 
-// A second contract address, typed after AddToken was opened again.
-const OTHER_TOKEN_ADDRESS = "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB";
-
 afterEach(() => {
     cleanupPopup();
 });
@@ -76,7 +72,7 @@ test("an answer after the user opened Settings adds the token and Settings stays
     expect(boot.storage.read("autistmask").trackedTokens).toEqual([TOKEN]);
 });
 
-test("Back from Settings onto AddToken after the lookup answered shows no lookup status", async () => {
+test("Back onto AddToken after that answer shows no lookup status", async () => {
     const boot = await openAddToken();
     const answerLookup = addWithPendingLookup(boot);
     expect(boot.text("add-token-info")).toBe("Looking up token...");
@@ -89,44 +85,6 @@ test("Back from Settings onto AddToken after the lookup answered shows no lookup
     expect(boot.node("add-token-info").style.visibility).toBe("hidden");
 });
 
-test("an answer after AddToken was opened again adds the token and leaves AddToken and its status line as they are", async () => {
-    const boot = await openAddToken();
-    const answerFirstLookup = addWithPendingLookup(boot);
-    await boot.click("btn-add-token-back");
-    await boot.click("btn-add-token");
-    expect(boot.visibleViews()).toEqual(["add-token"]);
-    boot.node("add-token-address").value = OTHER_TOKEN_ADDRESS;
-    // The second lookup is never answered.
-    addWithPendingLookup(boot);
-
-    await answerFirstLookup();
-    expect(boot.visibleViews()).toEqual(["add-token"]);
-    expect(boot.text("add-token-info")).toBe("Looking up token...");
-    expect(boot.storage.read("autistmask").trackedTokens).toEqual([TOKEN]);
-});
-
-test("a lookup that fails after AddToken was opened again leaves the status line as it is", async () => {
-    const boot = await openAddToken();
-    const { lookupTokenInfo } = require("../src/shared/balances");
-    let failFirstLookup;
-    lookupTokenInfo.mockImplementationOnce(
-        () =>
-            new Promise((_, reject) => {
-                failFirstLookup = reject;
-            }),
-    );
-    const firstAdd = boot.click("btn-add-token-confirm");
-    await boot.click("btn-add-token-back");
-    await boot.click("btn-add-token");
-    boot.node("add-token-address").value = OTHER_TOKEN_ADDRESS;
-    // The second lookup is never answered.
-    addWithPendingLookup(boot);
-
-    failFirstLookup(new Error("lookup failed"));
-    await firstAdd;
-    expect(boot.text("add-token-info")).toBe("Looking up token...");
-});
-
 test("an answer while AddToken still shows goes to AddressDetail with the token listed", async () => {
     const boot = await openAddToken();
     const answerLookup = addWithPendingLookup(boot);

tests/addedTokenBalance.test.js

@@ -1,441 +0,0 @@
-// After "Add" on AddToken, AddressDetail lists the new token. Its line reads
-// `quantity unknown`, not 0.0000, until a balance refresh has read the token's
-// balance at every address, even if the popup closes and opens again
-// meanwhile. A token added on SettingsAddToken reads the same wherever it is
-// listed. A refresh that returns draws the balances on AddressDetail or
-// AddressToken again, so the fetched balance shows without the screen being
-// reopened (https://git.eeqj.de/sneak/AutistMask/issues/516).
-//
-// The tracked token's record carries `balanceNotFetched` until a refresh has
-// read the token's balance. Removing the token removes that record. A network
-// switch keeps each network's records apart. A refresh takes the field off the
-// stored record's tokens and keeps another page's changes to the stored list.
-//
-// Driven through the real popup over a stored profile on Ethereum Mainnet,
-// with "Show tracked tokens with zero balance" on, as it is by default.
-
-const {
-    bootPopup,
-    cleanupPopup,
-    unversionedValidProfile,
-} = require("./support/popupBoot");
-
-// Tracked by nobody until a test adds it.
-const NEW_TOKEN = "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB";
-
-// A holding of a million NEW_TOKEN, as refreshBalances() stores it.
-const MILLION = {
-    address: NEW_TOKEN,
-    name: "New Token",
-    symbol: "NEW",
-    decimals: 18,
-    balance: "1000000.0",
-    holders: 3,
-};
-
-// NEW_TOKEN as "Add" on AddToken tracks it, once a refresh has read its
-// balance.
-const NEW_TRACKED = {
-    address: NEW_TOKEN,
-    symbol: "NEW",
-    name: "New Token",
-    decimals: 18,
-};
-
-// A token that another popup page tracks.
-const OTHER_TOKEN = {
-    address: "0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
-    symbol: "OTH",
-    name: "Other Token",
-    decimals: 18,
-};
-
-afterEach(() => {
-    cleanupPopup();
-});
-
-// The popup reopened onto AddressDetail for the one address.
-function bootOnAddress(extra) {
-    return bootPopup(
-        unversionedValidProfile({
-            currentView: "address",
-            selectedWallet: 0,
-            selectedAddress: 0,
-            ...extra,
-        }),
-    );
-}
-
-// Holds the next balance refresh open. The returned function lets it finish
-// with the address's ETH balance at 2 and `tokenBalances` as its token
-// entries, having read the balance of every token tracked when it started.
-// Given null, it finishes having read no token's balance, as when every
-// balanceOf fails, and leaves the token entries as they were.
-function holdNextRefresh(page) {
-    const { refreshBalances } = require("../src/shared/balances");
-    let release;
-    refreshBalances.mockImplementationOnce(
-        async (wallets, rpcUrl, explorerUrl, trackedTokens) => {
-            const read = trackedTokens.map((t) => t.address.toLowerCase());
-            const tokenBalances = await new Promise((resolve) => {
-                release = resolve;
-            });
-            wallets[0].addresses[0].balance = "2.0";
-            if (tokenBalances === null) return [];
-            wallets[0].addresses[0].tokenBalances = tokenBalances;
-            return read;
-        },
-    );
-    return async (tokenBalances) => {
-        release(tokenBalances);
-        await page.settle();
-    };
-}
-
-// Runs the ten-second refresh to the end, finishing it as holdNextRefresh()
-// does with `tokenBalances`.
-async function refreshOnce(page, tokenBalances) {
-    const finish = holdNextRefresh(page);
-    const ticking = page.tick();
-    await page.settle();
-    await finish(tokenBalances);
-    await ticking;
-}
-
-// "+ Token", NEW_TOKEN typed in, and "Add", with the contract lookup
-// answering at once.
-async function addNewToken(page) {
-    const { lookupTokenInfo } = require("../src/shared/balances");
-    lookupTokenInfo.mockResolvedValueOnce({
-        symbol: "NEW",
-        decimals: 18,
-        name: "New Token",
-    });
-    await page.click("btn-add-token");
-    page.node("add-token-address").value = NEW_TOKEN;
-    await page.click("btn-add-token-confirm");
-}
-
-// Settings' "+ Add token", NEW_TOKEN typed in, and "Add", with the contract
-// lookup answering at once. It ends on SettingsAddToken.
-async function addOnSettingsAddToken(page) {
-    const { lookupTokenInfo } = require("../src/shared/balances");
-    lookupTokenInfo.mockResolvedValueOnce({
-        symbol: "NEW",
-        decimals: 18,
-        name: "New Token",
-    });
-    await page.click("btn-settings-add-token");
-    page.node("settings-addtoken-address").value = NEW_TOKEN;
-    await page.click("btn-settings-addtoken-manual");
-}
-
-// The "[x]" button Settings draws beside the first tracked token. The page
-// stub does not turn the markup Settings draws into elements. So the list
-// hands Settings a stand-in for that button each time it is drawn, and
-// `press()` presses the last one drawn. Call it before Settings opens.
-function firstRemoveButton(page) {
-    const button = { press: null };
-    page.node("settings-tracked-tokens").querySelectorAll = () => [
-        {
-            dataset: { idx: "0" },
-            addEventListener: (name, fn) => {
-                button.press = fn;
-            },
-        },
-    ];
-    return button;
-}
-
-// Picks `networkId` in the Settings network selector, as the user does.
-async function chooseNetwork(page, networkId) {
-    const select = page.node("settings-network");
-    select.value = networkId;
-    for (const fn of select.listeners.change) await fn();
-    await page.settle();
-}
-
-// Another popup page saves `trackedTokens` as the tracked token list. This
-// page is not told of the write.
-function anotherPageTracks(page, trackedTokens) {
-    page.storage.write("autistmask", {
-        ...page.storage.read("autistmask"),
-        trackedTokens,
-    });
-}
-
-// NEW_TOKEN's row in the balance list in element `id`, AddressDetail's unless
-// another is named, as markup.
-function newTokenRow(page, id = "address-balances") {
-    return page
-        .node(id)
-        .innerHTML.split("<div ")
-        .find((row) =>
-            row.includes('data-token="' + NEW_TOKEN.toLowerCase() + '"'),
-        );
-}
-
-// AddressDetail for the one address opened from Home, as its `[info]` button
-// does.
-async function openAddress(page) {
-    const { state } = require("../src/shared/state");
-    state.selectedWallet = 0;
-    state.selectedAddress = 0;
-    require("../src/popup/views/helpers").pushCurrentView();
-    require("../src/popup/views/addressDetail").show();
-    await page.settle();
-}
-
-// AddressToken for `token` opened from AddressDetail, as tapping the token's
-// row there does.
-async function openToken(page, token) {
-    const { state } = require("../src/shared/state");
-    state.selectedToken = token;
-    require("../src/popup/views/helpers").pushCurrentView();
-    require("../src/popup/views/addressToken").show();
-    await page.settle();
-}
-
-test("until the refresh Add started returns, the new token's line reads quantity unknown", async () => {
-    const page = await bootOnAddress();
-    expect(page.pageErrors).toEqual([]);
-    const finish = holdNextRefresh(page);
-
-    await addNewToken(page);
-
-    expect(page.visibleViews()).toEqual(["address"]);
-    const row = newTokenRow(page);
-    expect(row).toContain("quantity unknown");
-    expect(row).not.toContain("0.0000");
-    await finish([MILLION]);
-});
-
-test("once that refresh returns, AddressDetail shows the fetched balance without being reopened", async () => {
-    const page = await bootOnAddress();
-    const finish = holdNextRefresh(page);
-    await addNewToken(page);
-    // Stands for the transactions on the screen, which only show() replaces.
-    page.node("tx-list").innerHTML = "transactions on the screen";
-
-    await finish([MILLION]);
-
-    expect(page.visibleViews()).toEqual(["address"]);
-    expect(newTokenRow(page)).toContain("1000000.0000");
-    // Only the balances are drawn again, not the transaction list.
-    expect(page.node("tx-list").innerHTML).toBe("transactions on the screen");
-});
-
-test("a refresh already running when the token is added does not count as reading its balance", async () => {
-    const page = await bootOnAddress();
-    const finishRunning = holdNextRefresh(page);
-    const ticking = page.tick();
-    await page.settle();
-
-    await addNewToken(page);
-    await finishRunning([]);
-    await ticking;
-
-    expect(newTokenRow(page)).toContain("quantity unknown");
-
-    // The next one reads the token's balance, which is zero.
-    await refreshOnce(page, []);
-
-    expect(newTokenRow(page)).toContain("0.0000");
-});
-
-test("closed and opened again before any refresh has read its balance, the new token's line still reads quantity unknown", async () => {
-    const closed = await bootOnAddress();
-    holdNextRefresh(closed);
-    await addNewToken(closed);
-    cleanupPopup();
-
-    // The refresh this boot starts reads no token's balance: the boot's stub
-    // of refreshBalances() reads none.
-    const page = await bootPopup(undefined, { storage: closed.storage });
-    expect(page.visibleViews()).toEqual(["address"]);
-    const row = newTokenRow(page);
-    expect(row).toContain("quantity unknown");
-    expect(row).not.toContain("0.0000");
-
-    await refreshOnce(page, [MILLION]);
-
-    expect(newTokenRow(page)).toContain("1000000.0000");
-});
-
-test("a refresh that could not read the new token's balance leaves its line quantity unknown", async () => {
-    const page = await bootOnAddress();
-    const finish = holdNextRefresh(page);
-    await addNewToken(page);
-
-    await finish(null);
-
-    // Drawn again: the ETH balance it fetched is shown.
-    expect(page.node("address-balances").innerHTML).toContain("2.0000");
-    expect(newTokenRow(page)).toContain("quantity unknown");
-});
-
-test("AddressToken for the new token reads quantity unknown until the refresh returns, then the fetched balance", async () => {
-    const page = await bootOnAddress();
-    const finish = holdNextRefresh(page);
-    await addNewToken(page);
-
-    await openToken(page, NEW_TOKEN.toLowerCase());
-
-    expect(page.visibleViews()).toEqual(["address-token"]);
-    const before = page.node("address-token-balance").innerHTML;
-    expect(before).toContain("quantity unknown");
-    expect(before).not.toContain("0.0000");
-
-    await finish([MILLION]);
-
-    expect(page.node("address-token-balance").innerHTML).toContain(
-        "1000000.0000",
-    );
-});
-
-test("a token added by contract address on SettingsAddToken reads quantity unknown until the refresh returns", async () => {
-    const page = await bootPopup(unversionedValidProfile());
-    expect(page.visibleViews()).toEqual(["main"]);
-    const finish = holdNextRefresh(page);
-
-    await page.click("btn-settings");
-    await addOnSettingsAddToken(page);
-    await page.click("btn-settings-addtoken-back");
-    await page.click("btn-settings-back");
-    expect(page.visibleViews()).toEqual(["main"]);
-    const onHome = newTokenRow(page, "wallet-list");
-    expect(onHome).toContain("quantity unknown");
-    expect(onHome).not.toContain("0.0000");
-
-    await openAddress(page);
-    const onAddress = newTokenRow(page);
-    expect(onAddress).toContain("quantity unknown");
-    expect(onAddress).not.toContain("0.0000");
-
-    await finish([MILLION]);
-
-    expect(newTokenRow(page)).toContain("1000000.0000");
-});
-
-test("a refresh that returns while AddressToken is up draws its balance again", async () => {
-    const page = await bootPopup(
-        unversionedValidProfile({
-            currentView: "address-token",
-            viewStack: ["main", "address"],
-            selectedWallet: 0,
-            selectedAddress: 0,
-            selectedToken: "ETH",
-        }),
-    );
-    expect(page.visibleViews()).toEqual(["address-token"]);
-    expect(page.node("address-token-balance").innerHTML).toContain("1.5000");
-
-    await refreshOnce(page, null);
-
-    expect(page.node("address-token-balance").innerHTML).toContain("2.0000");
-});
-
-test("a token removed before any refresh has read its balance leaves nothing stored, and adding it again tracks it once", async () => {
-    const page = await bootPopup(unversionedValidProfile());
-    const removeButton = firstRemoveButton(page);
-    const stored = () => page.storage.read("autistmask");
-
-    await page.click("btn-settings");
-    await addOnSettingsAddToken(page);
-    // Settings opened again from Home draws its list with the token in it.
-    await page.click("btn-settings-addtoken-back");
-    await page.click("btn-settings-back");
-    await page.click("btn-settings");
-    await removeButton.press();
-    await page.settle();
-
-    expect(stored().trackedTokens).toEqual([]);
-    // Nothing in the stored record names the token any more.
-    expect(JSON.stringify(stored()).toLowerCase()).not.toContain(
-        NEW_TOKEN.toLowerCase(),
-    );
-
-    await addOnSettingsAddToken(page);
-    // A second add of the same token is refused.
-    page.node("settings-addtoken-address").value = NEW_TOKEN;
-    await page.click("btn-settings-addtoken-manual");
-
-    const added = { address: NEW_TOKEN, symbol: "NEW", decimals: 18 };
-    expect(stored().trackedTokens).toEqual([
-        { ...added, name: "New Token", balanceNotFetched: true },
-    ]);
-
-    await refreshOnce(page, []);
-
-    expect(stored().trackedTokens).toEqual([{ ...added, name: "New Token" }]);
-});
-
-test("a refresh on another network leaves the new token reading quantity unknown on its own", async () => {
-    // Sepolia tracks a token at the same contract address, also just added.
-    const sepoliaToken = {
-        address: NEW_TOKEN,
-        symbol: "SEP",
-        name: "Sepolia Token",
-        decimals: 18,
-    };
-    const page = await bootOnAddress({
-        networkTrackedTokens: {
-            sepolia: [{ ...sepoliaToken, balanceNotFetched: true }],
-        },
-    });
-    const finishMainnet = holdNextRefresh(page);
-    await addNewToken(page);
-
-    await page.click("btn-settings");
-    await chooseNetwork(page, "sepolia");
-    // The refresh Add started returns after the switch and writes nothing.
-    await finishMainnet([MILLION]);
-    // Sepolia's refresh reads the balance of its own token.
-    await refreshOnce(page, []);
-
-    const stored = page.storage.read("autistmask");
-    expect(stored.trackedTokens).toEqual([sepoliaToken]);
-    expect(stored.networkTrackedTokens.mainnet[0].balanceNotFetched).toBe(true);
-
-    await chooseNetwork(page, "mainnet");
-    await page.click("btn-settings-back");
-
-    expect(page.visibleViews()).toEqual(["address"]);
-    expect(newTokenRow(page)).toContain("quantity unknown");
-
-    await refreshOnce(page, [MILLION]);
-
-    expect(newTokenRow(page)).toContain("1000000.0000");
-});
-
-test("a refresh keeps a token that another page added after this page loaded", async () => {
-    const page = await bootOnAddress();
-    const finish = holdNextRefresh(page);
-    await addNewToken(page);
-    const otherAdded = { ...OTHER_TOKEN, balanceNotFetched: true };
-    anotherPageTracks(page, [
-        { ...NEW_TRACKED, balanceNotFetched: true },
-        otherAdded,
-    ]);
-
-    await finish([MILLION]);
-
-    expect(page.storage.read("autistmask").trackedTokens).toEqual([
-        NEW_TRACKED,
-        otherAdded,
-    ]);
-    expect(newTokenRow(page)).toContain("1000000.0000");
-});
-
-test("a refresh does not bring back a token that another page removed after this page loaded", async () => {
-    const page = await bootOnAddress({ trackedTokens: [OTHER_TOKEN] });
-    const finish = holdNextRefresh(page);
-    await addNewToken(page);
-    anotherPageTracks(page, [{ ...NEW_TRACKED, balanceNotFetched: true }]);
-
-    await finish([MILLION]);
-
-    expect(page.storage.read("autistmask").trackedTokens).toEqual([
-        NEW_TRACKED,
-    ]);
-});

tests/addressKey.test.js

@@ -161,7 +161,7 @@ function click(element) {
 
 // show() starts the fee estimate without awaiting it; this lets it settle.
 async function settle() {
-    for (let i = 0; i < 10; i++) await jest.advanceTimersByTimeAsync(0);
+    for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
 }
 
 // ------------------------------------------------------------ harness
@@ -188,11 +188,7 @@ let sent;
 // handler to the buttons it drew, as the browser's fresh list would have.
 let plusButton;
 
-// showFlash() starts a timer that clears the message one or two seconds later.
-// Each test here runs on fake timers and drops them in afterEach, so that timer
-// never outlives the test.
 beforeEach(() => {
-    jest.useFakeTimers();
     approvalDetails = null;
     sent = [];
     mockNode.broadcast = [];
@@ -243,7 +239,6 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-    jest.useRealTimers();
     jest.restoreAllMocks();
 });
 

tests/backgroundApproval.test.js

@@ -537,18 +537,7 @@ async function settleIncludingRejections() {
     await new Promise((resolve) => setImmediate(resolve));
 }
 
-// While an approval is pending, the background starts a 20-second timer to
-// keep itself running. The timer is stubbed and never starts, so no test in
-// this file leaves it running.
-let keepRunningTimer;
-beforeEach(() => {
-    keepRunningTimer = jest
-        .spyOn(global, "setInterval")
-        .mockImplementation(() => 1);
-});
-
 afterEach(() => {
-    keepRunningTimer.mockRestore();
     delete global.chrome;
     jest.resetModules();
 });
@@ -1894,6 +1883,18 @@ describe("a closed approval window leaves the request pending", () => {
         return bg.actionPopups[bg.actionPopups.length - 1];
     }
 
+    // The timer that keeps the worker running while an approval is pending is
+    // stubbed, so no test here leaves that timer running when it ends.
+    let keepRunningTimer;
+    beforeEach(() => {
+        keepRunningTimer = jest
+            .spyOn(global, "setInterval")
+            .mockImplementation(() => 1);
+    });
+    afterEach(() => {
+        keepRunningTimer.mockRestore();
+    });
+
     test("the toolbar popup opens a closed transaction approval, and approving it there sends", async () => {
         const bg = loadBackground();
         const pending = bg.requestTx();

tests/backgroundStateIsolation.test.js

@@ -103,18 +103,7 @@ function deferred() {
     return { promise, resolve };
 }
 
-// While an approval is pending, the background starts a 20-second timer to
-// keep itself running. The timer is stubbed and never starts, so no test in
-// this file leaves it running.
-let keepRunningTimer;
-beforeEach(() => {
-    keepRunningTimer = jest
-        .spyOn(global, "setInterval")
-        .mockImplementation(() => 1);
-});
-
 afterEach(() => {
-    keepRunningTimer.mockRestore();
     delete global.chrome;
 });
 

tests/balanceRefreshNetworkSwitch.test.js

@@ -45,7 +45,6 @@ async function holdRefresh(page) {
                 holders: null,
             },
         ];
-        return [];
     });
     const ticking = page.tick();
     await page.settle();

tests/blockscoutEtherscanSettings.test.js

@@ -720,7 +720,6 @@ describe("the popup", () => {
                 tokenRow(TRACKED, "TRK"),
                 tokenRow(UNTRACKED, "TST"),
             ];
-            return [];
         });
         const ticking = page.tick();
         await page.settle();
@@ -765,7 +764,6 @@ describe("the popup", () => {
                 addr.tokenBalances = after
                     ? [tokenRow(TRACKED, "TRK"), tokenRow(UNTRACKED, "TST")]
                     : [tokenRow(TRACKED, "TRK")];
-                return [];
             });
 
             anotherPageSaves(page, { useBlockscout: after });

tests/chainSwitchGate.test.js

@@ -56,18 +56,7 @@ async function settle() {
     for (let i = 0; i < 50; i++) await Promise.resolve();
 }
 
-// While an approval is pending, the background starts a 20-second timer to
-// keep itself running. The timer is stubbed and never starts, so no test in
-// this file leaves it running.
-let keepRunningTimer;
-beforeEach(() => {
-    keepRunningTimer = jest
-        .spyOn(global, "setInterval")
-        .mockImplementation(() => 1);
-});
-
 afterEach(() => {
-    keepRunningTimer.mockRestore();
     delete global.chrome;
 });
 

tests/coldWorkerChainSwitch.test.js

@@ -64,18 +64,7 @@ async function settle() {
     for (let i = 0; i < 50; i++) await Promise.resolve();
 }
 
-// While an approval is pending, the background starts a 20-second timer to
-// keep itself running. The timer is stubbed and never starts, so no test in
-// this file leaves it running.
-let keepRunningTimer;
-beforeEach(() => {
-    keepRunningTimer = jest
-        .spyOn(global, "setInterval")
-        .mockImplementation(() => 1);
-});
-
 afterEach(() => {
-    keepRunningTimer.mockRestore();
     delete global.chrome;
 });
 

tests/coldWorkerSendTransaction.test.js

@@ -76,18 +76,7 @@ async function settle() {
     for (let i = 0; i < 60; i++) await Promise.resolve();
 }
 
-// While an approval is pending, the background starts a 20-second timer to
-// keep itself running. The timer is stubbed and never starts, so no test in
-// this file leaves it running.
-let keepRunningTimer;
-beforeEach(() => {
-    keepRunningTimer = jest
-        .spyOn(global, "setInterval")
-        .mockImplementation(() => 1);
-});
-
 afterEach(() => {
-    keepRunningTimer.mockRestore();
     delete global.chrome;
 });
 

tests/connectedSitesWorkerRestart.test.js

@@ -57,18 +57,7 @@ async function settle() {
     for (let i = 0; i < 50; i++) await Promise.resolve();
 }
 
-// While an approval is pending, the background starts a 20-second timer to
-// keep itself running. The timer is stubbed and never starts, so no test in
-// this file leaves it running.
-let keepRunningTimer;
-beforeEach(() => {
-    keepRunningTimer = jest
-        .spyOn(global, "setInterval")
-        .mockImplementation(() => 1);
-});
-
 afterEach(() => {
-    keepRunningTimer.mockRestore();
     delete global.chrome;
     jest.resetModules();
 });

tests/deleteWalletLostPassword.test.js

@@ -102,17 +102,6 @@ function makeDocument() {
 
 // ------------------------------------------------------------ harness
 
-// showFlash() starts a timer that clears the message two seconds later. Each
-// test here runs on fake timers and drops them in afterEach, so that timer
-// never outlives the test.
-beforeEach(() => {
-    jest.useFakeTimers();
-});
-
-afterEach(() => {
-    jest.useRealTimers();
-});
-
 function wallet(name, secret, addresses) {
     return {
         type: "hd",

tests/e2e/run.js

@@ -969,8 +969,7 @@ test("a token added by its contract address is listed on the address screen (#15
     await visible(env.page, "#view-address");
 
     // No wait: the confirm renders the balance list before it shows the
-    // screen. The refresh it starts draws the list again, with the row still
+    // screen, and nothing renders the list again while the screen is up.
-    // in it.
     const row = env.page.locator(
         '#address-balances [data-token="' + STUB_TOKEN.address + '"]',
         { hasText: STUB_TOKEN.symbol },

tests/firstWalletRefresh.test.js

@@ -48,7 +48,6 @@ async function boot(stored) {
         for (const wallet of wallets) {
             for (const addr of wallet.addresses) addr.balance = chainBalance;
         }
-        return [];
     });
     return { page, refreshBalances };
 }

tests/flashLine.test.js

@@ -88,7 +88,6 @@ describe.each([
             showFlash: (msg) => flashes.push(msg),
             escapeHtml: (s) => s,
             goBack: () => {},
-            trackToken: () => {},
         }));
 
         require("../src/popup/views/" + view).init({

tests/historyAfterNetworkSwitch.test.js

@@ -1,498 +0,0 @@
-// Home, AddressDetail and AddressToken drop a transaction history answer that
-// lands after a network switch. A dropped answer draws no rows and saves no
-// fraud contracts (https://git.eeqj.de/sneak/AutistMask/issues/657).
-//
-// Most tests hold the history request open, switch the network or what the
-// screen shows, and then let the answer land. The views run against a minimal
-// DOM stub, as in tests/transactionListCancelled.test.js, and over
-// tests/support/storageStub.js.
-
-const { makeStorageStub } = require("./support/storageStub");
-const { STATE_SCHEMA_VERSION } = require("../src/shared/stateSchema");
-
-jest.mock("../src/shared/transactions", () => ({
-    ...jest.requireActual("../src/shared/transactions"),
-    fetchRecentTransactions: jest.fn(async () => []),
-}));
-jest.mock("../src/shared/ens", () => ({
-    resolveEnsNames: jest.fn(async () => new Map()),
-}));
-
-const { fetchRecentTransactions } = require("../src/shared/transactions");
-const { resolveEnsNames } = require("../src/shared/ens");
-const { state, loadState } = require("../src/shared/state");
-const { onChainSwitch } = require("../src/shared/chainSwitch");
-const { applyChainSwitchFields } = require("../src/shared/chainSwitchFields");
-const { storedNetworkIs } = require("../src/shared/storedSettings");
-const home = require("../src/popup/views/home");
-const addressDetail = require("../src/popup/views/addressDetail");
-const addressToken = require("../src/popup/views/addressToken");
-
-const ADDRESS = "0x1111111111111111111111111111111111111111";
-const OTHER_ADDRESS = "0x2222222222222222222222222222222222222222";
-const RECIPIENT = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
-// A contract that sends a token claiming USDT's symbol. Spotting the spoof
-// adds this contract to the fraud contracts.
-const SPOOF_CONTRACT = "0x3333333333333333333333333333333333333333";
-const TOKEN = "0x6B175474E89094C44Da98b954EedeAC495271d0F";
-
-// A profile on Ethereum Mainnet with two addresses, "Use Blockscout" on and no
-// fraud contracts.
-function profile() {
-    return {
-        schemaVersion: STATE_SCHEMA_VERSION,
-        hasWallet: true,
-        wallets: [
-            {
-                type: "hd",
-                name: "Main",
-                xpub: "xpub-main",
-                encryptedSecret: "encrypted-secret",
-                nextIndex: 2,
-                addresses: [
-                    { address: ADDRESS, balance: "1.0", tokenBalances: [] },
-                    {
-                        address: OTHER_ADDRESS,
-                        balance: "0.0",
-                        tokenBalances: [],
-                    },
-                ],
-            },
-        ],
-        activeAddress: ADDRESS,
-        networkId: "mainnet",
-        rpcUrl: "https://ethereum-rpc.publicnode.com",
-        blockscoutUrl: "https://eth.blockscout.com/api/v2",
-        useBlockscout: true,
-        fraudContracts: [],
-    };
-}
-
-// What Blockscout answers for ADDRESS on Ethereum Mainnet:
-//
-// - a transfer of ETH from ADDRESS;
-// - a transfer of the fake USDT from SPOOF_CONTRACT.
-function history() {
-    return [
-        {
-            hash: "0x85215772ed26ea8b39c2b3b18779030487efbe0b5fd7e882592b2f62b837be84",
-            blockNumber: 2,
-            from: ADDRESS,
-            to: RECIPIENT,
-            value: "1.0000",
-            exactValue: "1.0",
-            rawAmount: "1000000000000000000",
-            rawUnit: "wei",
-            symbol: "ETH",
-            timestamp: 1790000000,
-            isError: false,
-            directionLabel: "Sent",
-            direction: "sent",
-            contractAddress: null,
-        },
-        {
-            hash: "0x0d6a6e0a0d1b7d4c3b2a19087f6e5d4c3b2a19087f6e5d4c3b2a19087f6e5d4c",
-            blockNumber: 1,
-            from: SPOOF_CONTRACT,
-            to: ADDRESS,
-            value: "100.0000",
-            exactValue: "100.0",
-            rawAmount: "100000000",
-            rawUnit: "base units",
-            symbol: "USDT",
-            timestamp: 1790000000,
-            isError: false,
-            directionLabel: "Received",
-            direction: "received",
-            contractAddress: SPOOF_CONTRACT,
-        },
-    ];
-}
-
-// The next history request waits until the returned function is called, and
-// then answers with `answer`.
-function holdHistory(answer = history()) {
-    let land;
-    fetchRecentTransactions.mockImplementationOnce(
-        () =>
-            new Promise((resolve) => {
-                land = () => resolve(answer);
-            }),
-    );
-    return () => land();
-}
-
-// The next history request waits until the returned function is called, and
-// then fails.
-function holdFailure() {
-    let fail;
-    fetchRecentTransactions.mockImplementationOnce(
-        () =>
-            new Promise((resolve, reject) => {
-                fail = () => reject(new Error("Blockscout is down"));
-            }),
-    );
-    return () => fail();
-}
-
-// Another write holds the lock until the returned function is called. Every
-// save waits until then.
-function holdLock() {
-    let release;
-    const held = navigator.locks.request(
-        "autistmask",
-        () =>
-            new Promise((resolve) => {
-                release = resolve;
-            }),
-    );
-    return async () => {
-        release();
-        await held;
-    };
-}
-
-function makeElement(id) {
-    const el = {
-        id,
-        textContent: "",
-        value: "",
-        innerHTML: "",
-        style: {},
-        dataset: {},
-        classList: {
-            add: () => {},
-            remove: () => {},
-            contains: () => false,
-            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, non-testnet popup is in.
-            if (id === "debug-banner") return null;
-            if (!els.has(id)) els.set(id, makeElement(id));
-            return els.get(id);
-        },
-        createElement: () => makeElement("created"),
-        addEventListener: () => {},
-        body: { prepend: () => {} },
-    };
-}
-
-function node(id) {
-    return globalThis.document.getElementById(id);
-}
-
-// Lets every promise that is not held open settle.
-function settle() {
-    return new Promise((resolve) => setTimeout(resolve, 0));
-}
-
-let storage;
-
-beforeEach(async () => {
-    storage = makeStorageStub({ autistmask: profile() });
-    globalThis.chrome = {
-        storage: { local: storage.local, onChanged: storage.onChanged },
-    };
-    globalThis.document = makeDocument();
-    globalThis.window = { location: { search: "" } };
-    await loadState();
-    state.viewStack = [];
-    state.selectedWallet = 0;
-    state.selectedAddress = 0;
-    state.selectedToken = "ETH";
-    const ctx = { pageClosed: new AbortController().signal };
-    addressDetail.init(ctx);
-    addressToken.init(ctx);
-});
-
-afterEach(() => {
-    delete globalThis.chrome;
-    delete globalThis.document;
-    delete globalThis.window;
-});
-
-const HOME = {
-    name: "Home",
-    listId: "home-tx-list",
-    open: () => home.render({ pageClosed: new AbortController().signal }),
-};
-const ADDRESS_DETAIL = {
-    name: "AddressDetail",
-    listId: "tx-list",
-    open: () => addressDetail.show(),
-};
-const ADDRESS_TOKEN = {
-    name: "AddressToken",
-    listId: "address-token-tx-list",
-    open: () => addressToken.show(),
-};
-
-// Three ways a test switches the network:
-//
-// - made in Settings: the page and storage have both switched;
-// - saved elsewhere: storage has switched and the page has not;
-// - not yet stored: the page has switched and storage has not.
-const SWITCHES = [
-    {
-        how: "made in Settings",
-        to: (networkId) => onChainSwitch(networkId),
-    },
-    {
-        // Another page or the background stored the switch, and this page has
-        // not followed it yet.
-        how: "saved elsewhere",
-        to: async (networkId) => {
-            const record = storage.read("autistmask");
-            applyChainSwitchFields(record, networkId);
-            storage.write("autistmask", record);
-        },
-    },
-    {
-        // The switch's own save has changed the page and has not yet written
-        // storage.
-        how: "not yet stored",
-        to: async (networkId) => {
-            applyChainSwitchFields(state, networkId);
-        },
-    },
-];
-
-// The list still shows `before`, and neither the page nor storage holds a
-// fraud contract.
-function expectNothingAdded(screen, before) {
-    expect(node(screen.listId).innerHTML).toBe(before);
-    expect(state.fraudContracts).toEqual([]);
-    expect(storage.read("autistmask").fraudContracts).toEqual([]);
-}
-
-describe.each([HOME, ADDRESS_DETAIL, ADDRESS_TOKEN])("$name", (screen) => {
-    test("an answer that lands on the same network is drawn and saved", async () => {
-        const land = holdHistory();
-        screen.open();
-        land();
-        await settle();
-
-        expect(node(screen.listId).innerHTML).toContain("tx-row");
-        expect(state.fraudContracts).toEqual([SPOOF_CONTRACT]);
-        expect(storage.read("autistmask").fraudContracts).toEqual([
-            SPOOF_CONTRACT,
-        ]);
-    });
-
-    test.each(SWITCHES)(
-        "an answer that lands after a switch $how adds nothing",
-        async ({ to }) => {
-            const land = holdHistory();
-            screen.open();
-            await settle();
-            const before = node(screen.listId).innerHTML;
-            await to("sepolia");
-            land();
-            await settle();
-
-            expectNothingAdded(screen, before);
-        },
-    );
-
-    // The answer is the transfer of ETH alone, which adds no fraud contract.
-    // Nothing is saved, so only the check before the save can drop the answer.
-    test.each(SWITCHES)(
-        "an answer without a fraud contract that lands after a switch $how adds nothing",
-        async ({ to }) => {
-            const land = holdHistory(history().slice(0, 1));
-            screen.open();
-            await settle();
-            const before = node(screen.listId).innerHTML;
-            await to("sepolia");
-            land();
-            await settle();
-
-            expectNothingAdded(screen, before);
-        },
-    );
-
-    test.each(SWITCHES)(
-        "a request that fails after a switch $how shows no message",
-        async ({ to }) => {
-            const fail = holdFailure();
-            screen.open();
-            await settle();
-            const before = node(screen.listId).innerHTML;
-            await to("sepolia");
-            fail();
-            await settle();
-
-            expect(node(screen.listId).innerHTML).toBe(before);
-        },
-    );
-
-    // The user picks Sepolia in Settings while another write holds the lock.
-    // The answer lands, and its save waits behind the switch.
-    test("an answer whose save waits behind a switch made in Settings adds nothing", async () => {
-        const land = holdHistory();
-        screen.open();
-        const before = node(screen.listId).innerHTML;
-        const releaseLock = holdLock();
-        const switching = onChainSwitch("sepolia");
-        land();
-        await settle();
-        await releaseLock();
-        await switching;
-        await settle();
-
-        expectNothingAdded(screen, before);
-    });
-
-    // The answer lands and its save waits for the lock. Another page or the
-    // background then stores a switch.
-    test("an answer whose save waits while a switch is saved elsewhere adds nothing", async () => {
-        const land = holdHistory();
-        screen.open();
-        const before = node(screen.listId).innerHTML;
-        const releaseLock = holdLock();
-        land();
-        await settle();
-        const record = storage.read("autistmask");
-        applyChainSwitchFields(record, "sepolia");
-        storage.write("autistmask", record);
-        await releaseLock();
-        await settle();
-
-        expectNothingAdded(screen, before);
-    });
-
-    // The answer lands and its save waits for the lock. The page then switches,
-    // and storage has not.
-    test("an answer whose save waits while the page switches adds nothing", async () => {
-        const land = holdHistory();
-        screen.open();
-        const before = node(screen.listId).innerHTML;
-        const releaseLock = holdLock();
-        land();
-        await settle();
-        applyChainSwitchFields(state, "sepolia");
-        await releaseLock();
-        await settle();
-
-        expectNothingAdded(screen, before);
-    });
-
-    test("a request that fails after a switch leaves the new network's rows", async () => {
-        const fail = holdFailure();
-        screen.open();
-        await onChainSwitch("sepolia");
-        fetchRecentTransactions.mockImplementationOnce(async () => history());
-        screen.open();
-        await settle();
-        const drawn = node(screen.listId).innerHTML;
-        fail();
-        await settle();
-
-        expect(drawn).toContain("tx-row");
-        expect(node(screen.listId).innerHTML).toBe(drawn);
-    });
-});
-
-describe.each([ADDRESS_DETAIL, ADDRESS_TOKEN])("$name", (screen) => {
-    test("an answer that lands once the screen shows another address adds nothing", async () => {
-        const land = holdHistory();
-        screen.open();
-        state.selectedAddress = 1;
-        screen.open();
-        await settle();
-        const before = node(screen.listId).innerHTML;
-        land();
-        await settle();
-
-        expectNothingAdded(screen, before);
-    });
-
-    test("a request that fails once the screen shows another address shows no message", async () => {
-        const fail = holdFailure();
-        screen.open();
-        state.selectedAddress = 1;
-        screen.open();
-        await settle();
-        const before = node(screen.listId).innerHTML;
-        fail();
-        await settle();
-
-        expect(node(screen.listId).innerHTML).toBe(before);
-    });
-
-    // The answer is the transfer of ETH alone, which adds no fraud contract.
-    // Nothing is saved, so only the check after the name lookup can drop the
-    // answer.
-    test("an answer whose name lookup lands after a switch adds nothing", async () => {
-        let landNames;
-        resolveEnsNames.mockImplementationOnce(
-            () =>
-                new Promise((resolve) => {
-                    landNames = () => resolve(new Map());
-                }),
-        );
-        fetchRecentTransactions.mockImplementationOnce(async () =>
-            history().slice(0, 1),
-        );
-        screen.open();
-        await settle();
-        const before = node(screen.listId).innerHTML;
-        await onChainSwitch("sepolia");
-        landNames();
-        await settle();
-
-        expectNothingAdded(screen, before);
-    });
-});
-
-test("AddressToken: an answer that lands once the screen shows another token adds nothing", async () => {
-    const land = holdHistory();
-    addressToken.show();
-    state.selectedToken = TOKEN;
-    addressToken.show();
-    await settle();
-    const before = node(ADDRESS_TOKEN.listId).innerHTML;
-    land();
-    await settle();
-
-    expectNothingAdded(ADDRESS_TOKEN, before);
-});
-
-test("AddressToken: a request that fails once the screen shows another token shows no message", async () => {
-    const fail = holdFailure();
-    addressToken.show();
-    state.selectedToken = TOKEN;
-    addressToken.show();
-    await settle();
-    const before = node(ADDRESS_TOKEN.listId).innerHTML;
-    fail();
-    await settle();
-
-    expect(node(ADDRESS_TOKEN.listId).innerHTML).toBe(before);
-});
-
-test("storedNetworkIs(): a failed read counts as no", async () => {
-    globalThis.chrome.storage.local = {
-        get: async () => {
-            throw new Error("storage is down");
-        },
-    };
-
-    await expect(storedNetworkIs("mainnet")).resolves.toBe(false);
-});

tests/sendAmountRule.test.js

@@ -131,14 +131,10 @@ async function review(amount, token) {
 async function confirm(amount, token) {
     const txInfo = await review("0.5", token);
     confirmTx.show({ ...txInfo, amount });
-    for (let i = 0; i < 10; i++) await jest.advanceTimersByTimeAsync(0);
+    for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
 }
 
-// showFlash() starts a timer that clears the message two seconds later. Each
-// test here runs on fake timers and drops them in afterEach, so that timer
-// never outlives the test.
 beforeEach(() => {
-    jest.useFakeTimers();
     elements.clear();
     state.wallets = [
         {
@@ -171,10 +167,6 @@ beforeEach(() => {
     state.currentView = null;
 });
 
-afterEach(() => {
-    jest.useRealTimers();
-});
-
 describe.each([
     ["1e-3", "ETH"],
     ["1e-3", "TOK"],

tests/sendMax.test.js

@@ -277,18 +277,14 @@ async function review() {
 
 // show() starts the fee estimate without awaiting it; this lets it settle.
 async function settle() {
-    for (let i = 0; i < 10; i++) await jest.advanceTimersByTimeAsync(0);
+    for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
 }
 
 function canSend() {
     return !el("btn-confirm-send").disabled;
 }
 
-// showFlash() starts a timer that clears the message two seconds later. Each
-// test here runs on fake timers and drops them in afterEach, so that timer
-// never outlives the test.
 beforeEach(() => {
-    jest.useFakeTimers();
     elements.clear();
     log.errorf.mockClear();
     pageClosed = new AbortController();
@@ -301,10 +297,6 @@ beforeEach(() => {
     mockNode.broadcast = [];
 });
 
-afterEach(() => {
-    jest.useRealTimers();
-});
-
 describe("Max on an ETH send", () => {
     test("fills in the exact balance minus the fee reserve", async () => {
         await refreshWith(BALANCE_WEI);

tests/settingsEndpointSave.test.js

@@ -167,272 +167,3 @@ test.each([
         );
     },
 );
-
-// This answer passes both endpoint checks on Ethereum Mainnet.
-const PASSING_ANSWER = {
-    ok: true,
-    json: async () => ({ result: NETWORKS.mainnet.chainId }),
-};
-
-// Both endpoint checks read this answer as an error. The RPC check reads the
-// answer's `error`. The Blockscout check reads the answer's `ok`.
-const ERROR_ANSWER = {
-    ok: false,
-    status: 500,
-    json: async () => ({ error: { code: -32603, message: "Internal error" } }),
-};
-
-// The user types a URL in Settings and taps "Save". Before the endpoint answers,
-// the user types a second URL and taps "Save" again. The second check passes
-// first. The second URL is stored, and the flash message reads "Saved.". The
-// first check then ends in one of three ways:
-//
-// - It passes.
-// - It fails, because fetch cannot reach the endpoint.
-// - It gets an answer that holds an error.
-//
-// None of the three changes the stored URL or the flash message
-// (https://git.eeqj.de/sneak/AutistMask/issues/698).
-test.each([
-    {
-        button: "btn-save-rpc",
-        input: "settings-rpc",
-        field: "rpcUrl",
-        first: "passes",
-    },
-    {
-        button: "btn-save-rpc",
-        input: "settings-rpc",
-        field: "rpcUrl",
-        first: "fails",
-    },
-    {
-        button: "btn-save-rpc",
-        input: "settings-rpc",
-        field: "rpcUrl",
-        first: "answers with an error",
-    },
-    {
-        button: "btn-save-blockscout",
-        input: "settings-blockscout",
-        field: "blockscoutUrl",
-        first: "passes",
-    },
-    {
-        button: "btn-save-blockscout",
-        input: "settings-blockscout",
-        field: "blockscoutUrl",
-        first: "fails",
-    },
-    {
-        button: "btn-save-blockscout",
-        input: "settings-blockscout",
-        field: "blockscoutUrl",
-        first: "answers with an error",
-    },
-])(
-    "$button keeps the second tap's result when the first check $first last",
-    async ({ button, input, field, first }) => {
-        const page = await bootPopup(unversionedValidProfile());
-        await page.click("btn-settings");
-        const checks = [];
-        globalThis.fetch.mockImplementation(
-            () =>
-                new Promise((resolve, reject) => {
-                    checks.push({ resolve, reject });
-                }),
-        );
-        const secondUrl = "https://second.example.invalid";
-
-        page.node(input).value = "https://first.example.invalid";
-        const firstTap = page.node(button).listeners.click.map((fn) => fn());
-        await page.settle();
-        page.node(input).value = secondUrl;
-        const secondTap = page.node(button).listeners.click.map((fn) => fn());
-        await page.settle();
-        checks[1].resolve(PASSING_ANSWER);
-        await Promise.all(secondTap);
-        await page.settle();
-        expect(page.text("flash-msg")).toBe("Saved.");
-        if (first === "passes") {
-            checks[0].resolve(PASSING_ANSWER);
-        } else if (first === "answers with an error") {
-            checks[0].resolve(ERROR_ANSWER);
-        } else {
-            // fetch rejects when it cannot reach the endpoint.
-            checks[0].reject(new TypeError("Failed to fetch"));
-        }
-        await Promise.all(firstTap);
-        await page.settle();
-
-        expect(checks).toHaveLength(2);
-        expect(page.storage.read("autistmask")[field]).toBe(secondUrl);
-        expect(page.text("flash-msg")).toBe("Saved.");
-    },
-);
-
-// The user types a URL in Settings and taps "Save". Before the endpoint answers,
-// the user empties the input and taps "Save" again. The flash message asks for
-// a URL. The first check then passes. The flash message still asks for a URL,
-// and the stored URL is unchanged.
-test.each([
-    {
-        button: "btn-save-rpc",
-        input: "settings-rpc",
-        field: "rpcUrl",
-        message: "Please enter an RPC URL.",
-    },
-    {
-        button: "btn-save-blockscout",
-        input: "settings-blockscout",
-        field: "blockscoutUrl",
-        message: "Please enter a Blockscout API URL.",
-    },
-])(
-    "$button keeps the empty-input message when the first check passes last",
-    async ({ button, input, field, message }) => {
-        const page = await bootPopup(unversionedValidProfile());
-        await page.click("btn-settings");
-        const storedUrl = page.value(input);
-        let answer;
-        globalThis.fetch.mockReturnValue(
-            new Promise((resolve) => {
-                answer = resolve;
-            }),
-        );
-
-        page.node(input).value = "https://typed.example.invalid";
-        const firstTap = page.node(button).listeners.click.map((fn) => fn());
-        await page.settle();
-        page.node(input).value = "";
-        await page.click(button);
-        expect(page.text("flash-msg")).toBe(message);
-        answer(PASSING_ANSWER);
-        await Promise.all(firstTap);
-        await page.settle();
-
-        expect(page.storage.read("autistmask")[field]).toBe(storedUrl);
-        expect(page.text("flash-msg")).toBe(message);
-    },
-);
-
-// The user types a URL in Settings and taps "Save". Another write holds the
-// lock. So the save waits for the lock once the check passes. The user then
-// taps "Save" again on the same URL. When the lock is free, the first save
-// stores nothing and shows no flash message. The second check then passes, and
-// the second save stores the URL.
-test.each([
-    { button: "btn-save-rpc", input: "settings-rpc", field: "rpcUrl" },
-    {
-        button: "btn-save-blockscout",
-        input: "settings-blockscout",
-        field: "blockscoutUrl",
-    },
-])(
-    "$button stores nothing for an earlier tap still waiting for the lock",
-    async ({ button, input, field }) => {
-        const page = await bootPopup(unversionedValidProfile());
-        await page.click("btn-settings");
-        const storedUrl = page.value(input);
-        const checks = [];
-        globalThis.fetch.mockImplementation(
-            () =>
-                new Promise((resolve) => {
-                    checks.push(resolve);
-                }),
-        );
-        const typedUrl = "https://typed.example.invalid";
-
-        page.node(input).value = typedUrl;
-        const firstTap = page.node(button).listeners.click.map((fn) => fn());
-        await page.settle();
-        let releaseLock;
-        const lockHeld = navigator.locks.request(
-            "autistmask",
-            () =>
-                new Promise((resolve) => {
-                    releaseLock = resolve;
-                }),
-        );
-        checks[0](PASSING_ANSWER);
-        await page.settle();
-        const secondTap = page.node(button).listeners.click.map((fn) => fn());
-        await page.settle();
-        releaseLock();
-        await lockHeld;
-        await Promise.all(firstTap);
-        await page.settle();
-
-        expect(page.storage.read("autistmask")[field]).toBe(storedUrl);
-        expect(page.text("flash-msg")).toBe("Testing endpoint...");
-
-        checks[1](PASSING_ANSWER);
-        await Promise.all(secondTap);
-        await page.settle();
-
-        expect(checks).toHaveLength(2);
-        expect(page.storage.read("autistmask")[field]).toBe(typedUrl);
-        expect(page.text("flash-msg")).toBe("Saved.");
-    },
-);
-
-// The user taps "Save", and the check passes. The save then begins its storage
-// write, and this test keeps the write waiting. The user taps "Save" again, and
-// the second check cannot reach the endpoint. When the write ends, the flash
-// message still reads "Could not reach endpoint.". The write stores the URL
-// anyway, because the write began before the second tap.
-test.each([
-    { button: "btn-save-rpc", input: "settings-rpc", field: "rpcUrl" },
-    {
-        button: "btn-save-blockscout",
-        input: "settings-blockscout",
-        field: "blockscoutUrl",
-    },
-])(
-    "$button keeps the second tap's message when tapped again during the write",
-    async ({ button, input, field }) => {
-        const page = await bootPopup(unversionedValidProfile());
-        await page.click("btn-settings");
-        const checks = [];
-        globalThis.fetch.mockImplementation(
-            () =>
-                new Promise((resolve, reject) => {
-                    checks.push({ resolve, reject });
-                }),
-        );
-        const typedUrl = "https://typed.example.invalid";
-
-        page.node(input).value = typedUrl;
-        const firstTap = page.node(button).listeners.click.map((fn) => fn());
-        await page.settle();
-        const { set } = page.storage.local;
-        const write = set.getMockImplementation();
-        let writeBegan = false;
-        let releaseWrite;
-        const writeHeld = new Promise((resolve) => {
-            releaseWrite = resolve;
-        });
-        set.mockImplementationOnce(async (items) => {
-            writeBegan = true;
-            await writeHeld;
-            await write(items);
-        });
-        checks[0].resolve(PASSING_ANSWER);
-        await page.settle();
-        expect(writeBegan).toBe(true);
-        const secondTap = page.node(button).listeners.click.map((fn) => fn());
-        await page.settle();
-        // fetch rejects when it cannot reach the endpoint.
-        checks[1].reject(new TypeError("Failed to fetch"));
-        await Promise.all(secondTap);
-        await page.settle();
-        expect(page.text("flash-msg")).toBe("Could not reach endpoint.");
-        releaseWrite();
-        await Promise.all(firstTap);
-        await page.settle();
-
-        expect(checks).toHaveLength(2);
-        expect(page.storage.read("autistmask")[field]).toBe(typedUrl);
-        expect(page.text("flash-msg")).toBe("Could not reach endpoint.");
-    },
-);

tests/spoofedTrackedToken.test.js

@@ -1,91 +0,0 @@
-// A token that the spoof rule refuses never shows in the balance list, even
-// tracked at zero balance with "Show tracked tokens with zero balance" on, and
-// the two add-token screens refuse to track one
-// (https://git.eeqj.de/sneak/AutistMask/issues/705). Driven through the real
-// popup over a stored profile.
-
-const {
-    bootPopup,
-    cleanupPopup,
-    unversionedValidProfile,
-    TOKEN_ADDRESS,
-} = require("./support/popupBoot");
-
-// Claims the symbol of the bundled USDT from another contract.
-const FAKE_USDT = {
-    address: TOKEN_ADDRESS,
-    symbol: "USDT",
-    decimals: 6,
-    name: "Tether USD",
-};
-// A symbol the bundled list does not have, so the spoof rule passes it.
-const TEST_TOKEN = {
-    address: "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB",
-    symbol: "TST",
-    decimals: 18,
-    name: "Test Token",
-};
-const REFUSED_FLASH = "Not added: this token fakes a known symbol.";
-
-afterEach(() => {
-    cleanupPopup();
-});
-
-test("a fake token tracked at zero balance is not listed while zero balances are shown", async () => {
-    const boot = await bootPopup(
-        unversionedValidProfile({
-            currentView: "address",
-            selectedWallet: 0,
-            selectedAddress: 0,
-            trackedTokens: [FAKE_USDT, TEST_TOKEN],
-            showZeroBalanceTokens: true,
-        }),
-    );
-    const rows = boot.node("address-balances").innerHTML;
-    expect(rows).toContain(`data-token="${TEST_TOKEN.address.toLowerCase()}"`);
-    expect(rows).not.toContain(
-        `data-token="${FAKE_USDT.address.toLowerCase()}"`,
-    );
-});
-
-// Each screen is opened from AddressDetail by the buttons named, in order.
-describe.each([
-    [
-        "AddToken",
-        ["btn-add-token"],
-        "add-token",
-        "add-token-address",
-        "btn-add-token-confirm",
-    ],
-    [
-        "SettingsAddToken",
-        ["btn-settings", "btn-settings-add-token"],
-        "settings-addtoken",
-        "settings-addtoken-address",
-        "btn-settings-addtoken-manual",
-    ],
-])("%s", (_, opening, view, field, button) => {
-    test("refuses a fake token by contract address", async () => {
-        const boot = await bootPopup(
-            unversionedValidProfile({
-                currentView: "address",
-                selectedWallet: 0,
-                selectedAddress: 0,
-            }),
-        );
-        for (const id of opening) await boot.click(id);
-        expect(boot.visibleViews()).toEqual([view]);
-        const { lookupTokenInfo } = require("../src/shared/balances");
-        lookupTokenInfo.mockResolvedValueOnce({
-            symbol: FAKE_USDT.symbol,
-            decimals: FAKE_USDT.decimals,
-            name: FAKE_USDT.name,
-        });
-        boot.node(field).value = FAKE_USDT.address;
-
-        await boot.click(button);
-        expect(boot.text("flash-msg")).toBe(REFUSED_FLASH);
-        expect(boot.visibleViews()).toEqual([view]);
-        expect(boot.storage.read("autistmask").trackedTokens).toEqual([]);
-    });
-});

tests/support/popupBoot.js

@@ -279,11 +279,10 @@ async function bootPopup(stored, options) {
         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. refreshBalances()
+    // no used address: AddWallet reads `addresses` from it.
-    // answers as a refresh that read no tracked token's balance.
     jest.doMock("../../src/shared/balances", () => ({
         fetchTokenBalances: jest.fn(async () => []),
-        refreshBalances: jest.fn(async () => []),
+        refreshBalances: jest.fn(async () => {}),
         dropUntrackedTokens: jest.requireActual("../../src/shared/balances")
             .dropUntrackedTokens,
         lookupTokenInfo: jest.fn(async () => null),

tests/trackedTokenBalances.test.js

@@ -307,31 +307,3 @@ test("a tracked token wearing a known symbol from another contract is not listed
     );
     expect(first.tokenBalances).toEqual([]);
 });
-
-test("the refresh resolves with each tracked token whose balance it read at every address", async () => {
-    const flaky = "0x9999999999999999999999999999999999999999";
-    holdings[TOKEN] = { [FIRST]: 2000000n, [SECOND]: 0n };
-    // balanceOf answers at FIRST and fails at SECOND.
-    holdings[flaky] = { [FIRST]: 2000000n };
-    const read = await refreshBalances(
-        [
-            {
-                addresses: [
-                    { address: FIRST, tokenBalances: [] },
-                    { address: SECOND, tokenBalances: [] },
-                ],
-            },
-        ],
-        RPC_URL,
-        EXPLORER_URL,
-        [
-            TRACKED,
-            { address: flaky, symbol: "FLK", name: "Flaky", decimals: 6 },
-            // A known symbol from another contract: its balance is not read.
-            { address: OTHER, symbol: "USDC", name: "Fake", decimals: 6 },
-        ],
-        "mainnet",
-        new AbortController().signal,
-    );
-    expect(read).toEqual([TOKEN]);
-});

tests/trackedTokensPerNetwork.test.js

@@ -162,9 +162,7 @@ test("a token added by contract address on Sepolia is tracked on Sepolia only",
         "sepolia",
         expect.anything(),
     );
-    // No refresh has read the new token's balance yet.
+    expect(stored().trackedTokens).toEqual([SEPOLIA_TOKEN]);
-    const added = { ...SEPOLIA_TOKEN, balanceNotFetched: true };
-    expect(stored().trackedTokens).toEqual([added]);
 
     await boot.click("btn-settings");
     await chooseNetwork(boot, "mainnet");
@@ -176,7 +174,7 @@ test("a token added by contract address on Sepolia is tracked on Sepolia only",
 
     await chooseNetwork(boot, "sepolia");
     expect(stored().networkId).toBe("sepolia");
-    expect(stored().trackedTokens).toEqual([added]);
+    expect(stored().trackedTokens).toEqual([SEPOLIA_TOKEN]);
     const onSepolia = boot.node("settings-tracked-tokens").innerHTML;
     expect(onSepolia).toContain("TST");
     expect(onSepolia).not.toContain("DAI");
@@ -269,192 +267,6 @@ test("a token tracked on Sepolia when another page switched there is not tracked
     expect(stored.networkTrackedTokens.mainnet).toEqual([]);
 });
 
-// Another popup page saves a switch to Sepolia, where TST is tracked. Before
-// taking that switch, this page adds a token on Ethereum Mainnet. The add's
-// save adds the token to Ethereum Mainnet's list and leaves Sepolia's list as
-// it was.
-test("a token added before this page takes another page's switch is tracked on Ethereum Mainnet", async () => {
-    const boot = await bootOnAddToken("mainnet", {
-        trackedTokens: [MAINNET_TOKEN],
-        networkTrackedTokens: { sepolia: [SEPOLIA_TOKEN] },
-    });
-    expect(boot.pageErrors).toEqual([]);
-    boot.storage.write("autistmask", {
-        ...boot.storage.read("autistmask"),
-        networkId: "sepolia",
-        trackedTokens: [SEPOLIA_TOKEN],
-        networkTrackedTokens: {
-            mainnet: [MAINNET_TOKEN],
-            sepolia: [SEPOLIA_TOKEN],
-        },
-    });
-    const { lookupTokenInfo } = require("../src/shared/balances");
-    lookupTokenInfo.mockResolvedValueOnce({
-        symbol: "NEW",
-        decimals: 18,
-        name: "New Token",
-    });
-
-    boot.node("settings-addtoken-address").value = NEW_TOKEN_ADDRESS;
-    await boot.click("btn-settings-addtoken-manual");
-
-    const stored = boot.storage.read("autistmask");
-    expect(stored.networkId).toBe("sepolia");
-    expect(stored.trackedTokens).toEqual([SEPOLIA_TOKEN]);
-    expect(stored.networkTrackedTokens.mainnet).toEqual([
-        MAINNET_TOKEN,
-        {
-            address: NEW_TOKEN_ADDRESS,
-            symbol: "NEW",
-            decimals: 18,
-            name: "New Token",
-            balanceNotFetched: true,
-        },
-    ]);
-});
-
-// Another popup page tracks DAI on Ethereum Mainnet and then saves a switch to
-// Sepolia. This page does not track DAI. Before taking that switch, this page
-// adds a token on Ethereum Mainnet. The add's save puts both DAI and the new
-// token on Ethereum Mainnet's list.
-test("a token added before this page takes another page's switch joins that page's tokens on Ethereum Mainnet", async () => {
-    const boot = await bootOnAddToken("mainnet");
-    expect(boot.pageErrors).toEqual([]);
-    boot.storage.write("autistmask", {
-        ...boot.storage.read("autistmask"),
-        networkId: "sepolia",
-        trackedTokens: [],
-        networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
-    });
-    const { lookupTokenInfo } = require("../src/shared/balances");
-    lookupTokenInfo.mockResolvedValueOnce({
-        symbol: "NEW",
-        decimals: 18,
-        name: "New Token",
-    });
-
-    boot.node("settings-addtoken-address").value = NEW_TOKEN_ADDRESS;
-    await boot.click("btn-settings-addtoken-manual");
-
-    const stored = boot.storage.read("autistmask");
-    expect(stored.networkId).toBe("sepolia");
-    expect(stored.trackedTokens).toEqual([]);
-    expect(stored.networkTrackedTokens.mainnet).toEqual([
-        MAINNET_TOKEN,
-        {
-            address: NEW_TOKEN_ADDRESS,
-            symbol: "NEW",
-            decimals: 18,
-            name: "New Token",
-            balanceNotFetched: true,
-        },
-    ]);
-});
-
-// Another popup page saves a switch to Sepolia, where TST is tracked. Before
-// taking that switch, this page removes DAI on Ethereum Mainnet, as the `[x]`
-// on a tracked token in Settings does. The removal's save drops DAI from
-// Ethereum Mainnet's list and leaves Sepolia's list as it was.
-test("a token removed before this page takes another page's switch is gone from Ethereum Mainnet", async () => {
-    const boot = await bootPopup(
-        unversionedValidProfile({
-            trackedTokens: [MAINNET_TOKEN],
-            networkTrackedTokens: { sepolia: [SEPOLIA_TOKEN] },
-        }),
-    );
-    expect(boot.pageErrors).toEqual([]);
-    boot.storage.write("autistmask", {
-        ...boot.storage.read("autistmask"),
-        networkId: "sepolia",
-        trackedTokens: [SEPOLIA_TOKEN],
-        networkTrackedTokens: {
-            mainnet: [MAINNET_TOKEN],
-            sepolia: [SEPOLIA_TOKEN],
-        },
-    });
-
-    const { state, saveState } = require("../src/shared/state");
-    state.trackedTokens.splice(0, 1);
-    await saveState();
-
-    const stored = boot.storage.read("autistmask");
-    expect(stored.networkId).toBe("sepolia");
-    expect(stored.trackedTokens).toEqual([SEPOLIA_TOKEN]);
-    expect(stored.networkTrackedTokens.mainnet).toEqual([]);
-});
-
-// Another popup page tracks DAI on Ethereum Mainnet and then saves a switch to
-// Sepolia. That switch puts DAI away under Ethereum Mainnet. This page has not
-// taken the switch yet. A switch to Sepolia in this page's Settings keeps DAI
-// on Ethereum Mainnet's list.
-test("a token another page tracked before its own switch stays tracked on Ethereum Mainnet", async () => {
-    const boot = await bootPopup(unversionedValidProfile());
-    expect(boot.pageErrors).toEqual([]);
-    await boot.click("btn-settings");
-    boot.storage.write("autistmask", {
-        ...boot.storage.read("autistmask"),
-        networkId: "sepolia",
-        trackedTokens: [],
-        networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
-    });
-
-    await chooseNetwork(boot, "sepolia");
-
-    const stored = boot.storage.read("autistmask");
-    expect(stored.networkId).toBe("sepolia");
-    expect(stored.networkTrackedTokens.mainnet).toEqual([MAINNET_TOKEN]);
-});
-
-// This page switches to Sepolia. Another popup page has not taken that switch,
-// and its save adds a token to Ethereum Mainnet's list. This page switches back
-// and tracks that token.
-test("a token another page added on Ethereum Mainnet is tracked when this page switches back there", async () => {
-    const boot = await bootPopup(
-        unversionedValidProfile({ trackedTokens: [MAINNET_TOKEN] }),
-    );
-    expect(boot.pageErrors).toEqual([]);
-    await boot.click("btn-settings");
-    await chooseNetwork(boot, "sepolia");
-    const newToken = {
-        address: NEW_TOKEN_ADDRESS,
-        symbol: "NEW",
-        decimals: 18,
-        name: "New Token",
-    };
-    boot.storage.write("autistmask", {
-        ...boot.storage.read("autistmask"),
-        networkTrackedTokens: { mainnet: [MAINNET_TOKEN, newToken] },
-    });
-
-    await chooseNetwork(boot, "mainnet");
-
-    const stored = boot.storage.read("autistmask");
-    expect(stored.networkId).toBe("mainnet");
-    expect(stored.trackedTokens).toEqual([MAINNET_TOKEN, newToken]);
-});
-
-// This page tracks DAI on Ethereum Mainnet and switches to Sepolia. Another
-// popup page has not taken that switch, and its save removes DAI from Ethereum
-// Mainnet's list. This page switches back and does not track DAI again.
-test("a token another page removed on Ethereum Mainnet stays removed when this page switches back there", async () => {
-    const boot = await bootPopup(
-        unversionedValidProfile({ trackedTokens: [MAINNET_TOKEN] }),
-    );
-    expect(boot.pageErrors).toEqual([]);
-    await boot.click("btn-settings");
-    await chooseNetwork(boot, "sepolia");
-    boot.storage.write("autistmask", {
-        ...boot.storage.read("autistmask"),
-        networkTrackedTokens: { mainnet: [] },
-    });
-
-    await chooseNetwork(boot, "mainnet");
-
-    const stored = boot.storage.read("autistmask");
-    expect(stored.networkId).toBe("mainnet");
-    expect(stored.trackedTokens).toEqual([]);
-});
-
 // Another popup page records a fraud contract on Ethereum Mainnet after this
 // page's last save. The switch to Sepolia drops that fraud contract, as the
 // switch drops this page's own.
@@ -522,169 +334,10 @@ test("a token added while a switch in Settings waits for the lock stays tracked
             symbol: "NEW",
             decimals: 18,
             name: "New Token",
-            balanceNotFetched: true,
         },
     ]);
 });
 
-// The contract lookup on SettingsAddToken answers on Ethereum Mainnet while
-// this page's switch to Sepolia waits for the lock. Another popup page holds
-// the lock and stores its own switch to Sepolia, with DAI tracked on Ethereum
-// Mainnet. This page's switch keeps DAI and the new token on Ethereum Mainnet's
-// list.
-test("a token added while a switch in Settings waits for another page's switch stays tracked on Ethereum Mainnet", async () => {
-    const boot = await bootOnAddToken("mainnet");
-    expect(boot.pageErrors).toEqual([]);
-    const { lookupTokenInfo } = require("../src/shared/balances");
-    let answer;
-    lookupTokenInfo.mockImplementationOnce(
-        () =>
-            new Promise((resolve) => {
-                answer = resolve;
-            }),
-    );
-    boot.node("settings-addtoken-address").value = NEW_TOKEN_ADDRESS;
-    const adding = boot.click("btn-settings-addtoken-manual");
-    await boot.click("btn-settings");
-
-    let releaseLock;
-    const lockHeld = navigator.locks.request(
-        "autistmask",
-        () =>
-            new Promise((resolve) => {
-                releaseLock = resolve;
-            }),
-    );
-    const select = boot.node("settings-network");
-    select.value = "sepolia";
-    const switching = Promise.all(select.listeners.change.map((fn) => fn()));
-    await boot.settle();
-    boot.storage.write("autistmask", {
-        ...boot.storage.read("autistmask"),
-        networkId: "sepolia",
-        trackedTokens: [],
-        networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
-    });
-
-    answer({ symbol: "NEW", decimals: 18, name: "New Token" });
-    await boot.settle();
-    releaseLock();
-    await lockHeld;
-    await switching;
-    await adding;
-
-    const stored = boot.storage.read("autistmask");
-    expect(stored.networkId).toBe("sepolia");
-    expect(stored.trackedTokens).toEqual([]);
-    expect(stored.networkTrackedTokens.mainnet).toEqual([
-        MAINNET_TOKEN,
-        {
-            address: NEW_TOKEN_ADDRESS,
-            symbol: "NEW",
-            decimals: 18,
-            name: "New Token",
-            balanceNotFetched: true,
-        },
-    ]);
-});
-
-// Another popup page holds the lock and stores its switch to Sepolia, with DAI
-// tracked on Ethereum Mainnet. This page waits for the lock to take that
-// switch. Meanwhile, the contract lookup on SettingsAddToken answers on
-// Ethereum Mainnet. When this page takes that switch, DAI and the new token
-// stay on Ethereum Mainnet's list.
-test("a token added while this page waits to take another page's switch stays tracked on Ethereum Mainnet", async () => {
-    const boot = await bootOnAddToken("mainnet");
-    expect(boot.pageErrors).toEqual([]);
-    let releaseLock;
-    const lockHeld = navigator.locks.request(
-        "autistmask",
-        () =>
-            new Promise((resolve) => {
-                releaseLock = resolve;
-            }),
-    );
-    await boot.storage.local.set({
-        autistmask: {
-            ...boot.storage.read("autistmask"),
-            networkId: "sepolia",
-            trackedTokens: [],
-            networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
-        },
-    });
-    await boot.settle();
-    const { lookupTokenInfo } = require("../src/shared/balances");
-    lookupTokenInfo.mockResolvedValueOnce({
-        symbol: "NEW",
-        decimals: 18,
-        name: "New Token",
-    });
-
-    boot.node("settings-addtoken-address").value = NEW_TOKEN_ADDRESS;
-    const adding = boot.click("btn-settings-addtoken-manual");
-    await boot.settle();
-    releaseLock();
-    await lockHeld;
-    await adding;
-    await boot.settle();
-
-    const stored = boot.storage.read("autistmask");
-    expect(stored.networkId).toBe("sepolia");
-    expect(stored.trackedTokens).toEqual([]);
-    expect(stored.networkTrackedTokens.mainnet).toEqual([
-        MAINNET_TOKEN,
-        {
-            address: NEW_TOKEN_ADDRESS,
-            symbol: "NEW",
-            decimals: 18,
-            name: "New Token",
-            balanceNotFetched: true,
-        },
-    ]);
-});
-
-// This page tracks DAI on Ethereum Mainnet. Another popup page holds the lock
-// and stores its switch to Sepolia, with DAI on Ethereum Mainnet's list. This
-// page waits for the lock to take that switch. Meanwhile, the user removes DAI,
-// as the `[x]` on a tracked token in Settings does. When this page takes that
-// switch, DAI is gone from Ethereum Mainnet's list.
-test("a token removed while this page waits to take another page's switch is gone from Ethereum Mainnet", async () => {
-    const boot = await bootPopup(
-        unversionedValidProfile({ trackedTokens: [MAINNET_TOKEN] }),
-    );
-    expect(boot.pageErrors).toEqual([]);
-    let releaseLock;
-    const lockHeld = navigator.locks.request(
-        "autistmask",
-        () =>
-            new Promise((resolve) => {
-                releaseLock = resolve;
-            }),
-    );
-    await boot.storage.local.set({
-        autistmask: {
-            ...boot.storage.read("autistmask"),
-            networkId: "sepolia",
-            trackedTokens: [],
-            networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
-        },
-    });
-    await boot.settle();
-
-    const { state, saveState } = require("../src/shared/state");
-    state.trackedTokens.splice(0, 1);
-    const removing = saveState();
-    releaseLock();
-    await lockHeld;
-    await removing;
-    await boot.settle();
-
-    const stored = boot.storage.read("autistmask");
-    expect(stored.networkId).toBe("sepolia");
-    expect(stored.trackedTokens).toEqual([]);
-    expect(stored.networkTrackedTokens.mainnet).toEqual([]);
-});
-
 describe("Back after a switch from the Settings gear", () => {
     test("SettingsAddToken no longer offers the common tokens", async () => {
         const boot = await bootOnAddToken("mainnet");

tests/uniswap.test.js

@@ -2871,9 +2871,8 @@ describe("uniswap decoder", () => {
                         ...USDT_400_GROUP,
                         ...ONE_USDT_LINES(OTHER_ADDR),
                     ],
-                    // Both swap steps pay USDC to the user, so the minimum
+                    // The last swap step's minimum.
-                    // is the sum of their two minimums.
+                    minimum: "390.0000 USDC",
-                    minimum: "980.0000 USDC",
                 },
             ])(
                 "$kind shows each take's own lines and the allowances, and no Amount figure or Min. received",
@@ -3639,356 +3638,6 @@ describe("uniswap decoder", () => {
                 ]);
             });
         });
-
-        // https://git.eeqj.de/sneak/AutistMask/issues/647 — on next at
-        // f550d8c, a split whose steps each pay WETH to the user showed only
-        // the last step's minimum.
-        describe("the minimum of a split that pays WETH to the user", () => {
-            const WETH_01 = 100000000000000000n;
-            const WETH_02 = 200000000000000000n;
-            const WETH_03 = 300000000000000000n;
-            // A V3 exact-in of 600 USDT for at least 0.3 WETH, and a V2
-            // exact-in of 400 USDT for at least 0.2 WETH, each paid to the
-            // user.
-            const V3_TO_WETH = encodeV3SwapExactIn(
-                USER_ADDR,
-                USDT_600,
-                WETH_03,
-                [USDT_ADDR, WETH_ADDR],
-            );
-            const V2_TO_WETH = encodeV2SwapExactIn(
-                USER_ADDR,
-                USDT_400,
-                WETH_02,
-                [USDT_ADDR, WETH_ADDR],
-            );
-            // A V4 step that swaps 400 USDT for at least 0.2 WETH, with these
-            // TAKEs of the WETH.
-            const v4ToWeth = (...takes) =>
-                encodeV4Swap(
-                    new Uint8Array([
-                        V4_SWAP_EXACT_IN_SINGLE_ID,
-                        V4_SETTLE_ID,
-                        ...takes.map(() => V4_TAKE_ID),
-                    ]),
-                    [
-                        encodeV4ExactInSingle(
-                            USDT_ADDR,
-                            WETH_ADDR,
-                            USDT_400,
-                            WETH_02,
-                        ),
-                        encodeV4Settle(USDT_ADDR), // paid by the user
-                        ...takes,
-                    ],
-                );
-            // The swap's minimum line as [label, value], or undefined.
-            const minimum = (result) =>
-                result.details
-                    .filter(
-                        (d) =>
-                            d.label === "Min. received" ||
-                            d.label === "Min. paid out",
-                    )
-                    .map((d) => [d.label, d.value])[0];
-
-            test("a V3 and a V2 exact-in show the total of their minimums", () => {
-                const result = decodeSteps(
-                    [0x00, 0x08],
-                    [V3_TO_WETH, V2_TO_WETH],
-                );
-                expect(minimum(result)).toEqual([
-                    "Min. received",
-                    "0.5000 WETH",
-                ]);
-            });
-
-            test("a V3 exact-in and a V4 step show the total of their minimums", () => {
-                const result = decodeSteps(
-                    [0x00, 0x10],
-                    [V3_TO_WETH, v4ToWeth(encodeV4Take(WETH_ADDR))],
-                );
-                expect(minimum(result)).toEqual([
-                    "Min. received",
-                    "0.5000 WETH",
-                ]);
-            });
-
-            // The second route buys DAI for the router, then swaps all of it
-            // from the router for at least 0.2 WETH.
-            test("a route that hops through DAI counts its last hop's minimum", () => {
-                const result = decodeSteps(
-                    [0x00, 0x08, 0x00],
-                    [
-                        V3_TO_WETH,
-                        encodeV2SwapExactIn(ROUTER_ADDR, USDT_400, DAI_400, [
-                            USDT_ADDR,
-                            DAI_ADDR,
-                        ]),
-                        coder.encode(
-                            ["address", "uint256", "uint256", "bytes", "bool"],
-                            [
-                                USER_ADDR,
-                                2n ** 255n, // CONTRACT_BALANCE
-                                WETH_02,
-                                encodeV3Path([DAI_ADDR, WETH_ADDR]),
-                                false, // paid from the router
-                            ],
-                        ),
-                    ],
-                );
-                expect(minimum(result)).toEqual([
-                    "Min. received",
-                    "0.5000 WETH",
-                ]);
-            });
-
-            // The middle step swaps 0.3 of the user's WETH for USDC, so the
-            // sum of minimums starts again after it.
-            test.each([
-                {
-                    kind: "a V3 exact-in",
-                    command: 0x00,
-                    input: encodeV3SwapExactIn(USER_ADDR, WETH_03, 1n, [
-                        WETH_ADDR,
-                        USDC_ADDR,
-                    ]),
-                },
-                {
-                    kind: "a V2 exact-in",
-                    command: 0x08,
-                    input: encodeV2SwapExactIn(USER_ADDR, WETH_03, 1n, [
-                        WETH_ADDR,
-                        USDC_ADDR,
-                    ]),
-                },
-                {
-                    kind: "a V2 exact-out",
-                    command: 0x09,
-                    input: encodeV2SwapExactOut(USER_ADDR, 1n, WETH_03, [
-                        WETH_ADDR,
-                        USDC_ADDR,
-                    ]),
-                },
-                {
-                    kind: "a V3 exact-out",
-                    command: 0x01,
-                    input: encodeV3SwapExactOut(USER_ADDR, 1n, WETH_03, [
-                        USDC_ADDR,
-                        WETH_ADDR,
-                    ]),
-                },
-            ])(
-                "$kind that spends WETH between them leaves the last step's minimum",
-                ({ command, input }) => {
-                    const result = decodeSteps(
-                        [0x00, command, 0x08],
-                        [V3_TO_WETH, input, V2_TO_WETH],
-                    );
-                    expect(minimum(result)).toEqual([
-                        "Min. received",
-                        "0.2000 WETH",
-                    ]);
-                },
-            );
-
-            // The middle step swaps 0.3 WETH and 400 DAI for USDC, both paid
-            // by the user. It spends WETH whichever SETTLE comes last.
-            test.each([
-                { order: "WETH first", settled: [WETH_ADDR, DAI_ADDR] },
-                { order: "DAI first", settled: [DAI_ADDR, WETH_ADDR] },
-            ])(
-                "a V4 step that spends WETH and DAI between them leaves the last step's minimum, with the SETTLE of $order",
-                ({ settled }) => {
-                    const wethAndDaiForUsdc = encodeV4Swap(
-                        new Uint8Array([
-                            V4_SWAP_EXACT_IN_SINGLE_ID,
-                            V4_SWAP_EXACT_IN_SINGLE_ID,
-                            V4_SETTLE_ID,
-                            V4_SETTLE_ID,
-                            V4_TAKE_ALL_ID,
-                        ]),
-                        [
-                            encodeV4ExactInSingle(
-                                WETH_ADDR,
-                                USDC_ADDR,
-                                WETH_03,
-                                1n,
-                            ),
-                            encodeV4ExactInSingle(
-                                DAI_ADDR,
-                                USDC_ADDR,
-                                DAI_400,
-                                1n,
-                            ),
-                            ...settled.map((token) => encodeV4Settle(token)),
-                            encodeV4TakeAll(USDC_ADDR, 0n),
-                        ],
-                    );
-                    const result = decodeSteps(
-                        [0x00, 0x10, 0x08],
-                        [V3_TO_WETH, wethAndDaiForUsdc, V2_TO_WETH],
-                    );
-                    expect(minimum(result)).toEqual([
-                        "Min. received",
-                        "0.2000 WETH",
-                    ]);
-                },
-            );
-
-            // The middle step's swap actions buy WETH with the user's USDT,
-            // then swap all of that WETH for USDC.
-            test("a V4 step that swaps through WETH between them leaves the last step's minimum", () => {
-                const usdtToUsdcThroughWeth = encodeV4Swap(
-                    new Uint8Array([
-                        V4_SWAP_EXACT_IN_SINGLE_ID,
-                        V4_SWAP_EXACT_IN_SINGLE_ID,
-                        V4_SETTLE_ID,
-                        V4_TAKE_ALL_ID,
-                    ]),
-                    [
-                        encodeV4ExactInSingle(
-                            USDT_ADDR,
-                            WETH_ADDR,
-                            USDT_400,
-                            WETH_01,
-                        ),
-                        encodeV4ExactInSingle(WETH_ADDR, USDC_ADDR, 0n, 1n),
-                        encodeV4Settle(USDT_ADDR), // paid by the user
-                        encodeV4TakeAll(USDC_ADDR, 0n),
-                    ],
-                );
-                const result = decodeSteps(
-                    [0x00, 0x10, 0x08],
-                    [V3_TO_WETH, usdtToUsdcThroughWeth, V2_TO_WETH],
-                );
-                expect(minimum(result)).toEqual([
-                    "Min. received",
-                    "0.2000 WETH",
-                ]);
-            });
-
-            // The middle step has no swap action. Its SETTLE or SETTLE_ALL
-            // pays 0.3 WETH, and its TAKE pays that WETH to another address.
-            test.each([
-                {
-                    payment: "a SETTLE of WETH paid by the user",
-                    actions: [V4_SETTLE_ID, V4_TAKE_ID],
-                    params: [
-                        settle(WETH_ADDR, WETH_03, true),
-                        take(WETH_ADDR, OTHER_ADDR, 0n),
-                    ],
-                },
-                {
-                    payment: "a SETTLE of WETH paid from the router",
-                    actions: [V4_SETTLE_ID, V4_TAKE_ID],
-                    params: [
-                        settle(WETH_ADDR, WETH_03, false),
-                        take(WETH_ADDR, OTHER_ADDR, 0n),
-                    ],
-                },
-                {
-                    payment: "a SETTLE_ALL of WETH",
-                    actions: [V4_TAKE_ID, V4_SETTLE_ALL_ID],
-                    params: [
-                        take(WETH_ADDR, OTHER_ADDR, WETH_03),
-                        encodeV4SettleAll(WETH_ADDR, WETH_03),
-                    ],
-                },
-            ])(
-                "a V4 step with $payment between them leaves the last step's minimum",
-                ({ actions, params }) => {
-                    const wethToOther = encodeV4Swap(
-                        new Uint8Array(actions),
-                        params,
-                    );
-                    const result = decodeSteps(
-                        [0x00, 0x10, 0x08],
-                        [V3_TO_WETH, wethToOther, V2_TO_WETH],
-                    );
-                    expect(minimum(result)).toEqual([
-                        "Min. paid out",
-                        "0.2000 WETH",
-                    ]);
-                },
-            );
-
-            test("a PERMIT2_TRANSFER_FROM of WETH between them leaves the last step's minimum", () => {
-                const result = decodeSteps(
-                    [0x00, 0x02, 0x08],
-                    [
-                        V3_TO_WETH,
-                        permit2TransferFrom(WETH_ADDR, OTHER_ADDR, WETH_03),
-                        V2_TO_WETH,
-                    ],
-                );
-                expect(minimum(result)).toEqual([
-                    "Min. paid out",
-                    "0.2000 WETH",
-                ]);
-            });
-
-            // The decoder reads no minimum from a V4 exact-out action.
-            test("a step that states no minimum leaves no figure", () => {
-                const exactOut = encodeV4Swap(
-                    new Uint8Array([
-                        V4_SWAP_EXACT_OUT_SINGLE_ID,
-                        V4_SETTLE_ALL_ID,
-                        V4_TAKE_ALL_ID,
-                    ]),
-                    [
-                        encodeV4ExactOutSingle(
-                            USDT_ADDR,
-                            WETH_ADDR,
-                            WETH_02,
-                            USDT_400,
-                        ),
-                        encodeV4SettleAll(USDT_ADDR, USDT_400),
-                        encodeV4TakeAll(WETH_ADDR, 0n),
-                    ],
-                );
-                const result = decodeSteps(
-                    [0x10, 0x00],
-                    [exactOut, V3_TO_WETH],
-                );
-                expect(minimum(result)).toBeUndefined();
-                expect(detail(result, "Paid to")).toBeUndefined();
-            });
-
-            test("a step that pays some of its WETH to the router leaves no figure", () => {
-                const result = decodeSteps(
-                    [0x00, 0x10],
-                    [
-                        V3_TO_WETH,
-                        v4ToWeth(
-                            take(WETH_ADDR, USER_ADDR, WETH_01),
-                            take(WETH_ADDR, ROUTER_ADDR, 0n),
-                        ),
-                    ],
-                );
-                expect(minimum(result)).toBeUndefined();
-            });
-
-            // The router still runs a swap step whose recipient cannot be
-            // read, and that step may spend the WETH the first step paid.
-            test("a step between them that cannot be read leaves no figure", () => {
-                const result = decodeSteps(
-                    [0x00, 0x00, 0x08],
-                    [
-                        V3_TO_WETH,
-                        dirtyWord(
-                            encodeV3SwapExactIn(USER_ADDR, WETH_03, 1n, [
-                                WETH_ADDR,
-                                USDC_ADDR,
-                            ]),
-                            0,
-                        ),
-                        V2_TO_WETH,
-                    ],
-                );
-                expect(minimum(result)).toBeUndefined();
-            });
-        });
     });
 
     // https://git.eeqj.de/sneak/AutistMask/issues/359 — the output half, in

tests/walletDefects.test.js

@@ -357,11 +357,6 @@ describe("every way to a signature or the private key refuses a defective wallet
     });
 
     beforeEach(() => {
-        // showFlash() starts a timer that clears the message two seconds
-        // later. Each test here runs on fake timers and drops them in
-        // afterEach, so that timer never outlives the test.
-        jest.useFakeTimers();
-
         const broken = brokenXprvWallet();
         // A balance, so that no Send button's zero-balance refusal can stand
         // in for the defect check.
@@ -403,7 +398,6 @@ describe("every way to a signature or the private key refuses a defective wallet
     });
 
     afterEach(() => {
-        jest.useRealTimers();
         state.wallets = [];
         state.activeAddress = null;
         state.selectedWallet = null;