fix: the address screen shows a token just added at its fetched balance, not 0.0000 (closes #516)

A balance refresh that returns now draws the balances on AddressDetail or
AddressToken again when that screen is up, not only the wallet list; their
transaction lists are left alone. Every add path on AddToken and
SettingsAddToken tracks a token through one step, trackToken(), which also
lists it in the new stored field tokensNotFetched: its line reads `quantity
unknown` instead of 0.0000 until a refresh that started with it tracked has
fetched every address's token balances, even if the popup closes first. To
tell an address whose token balances the explorer did not return, the refresh
takes them off its copy of the wallets before fetching.

Model: opus-5-5

README.md

@@ -1173,8 +1173,8 @@ fetched, without that cross-address check, and shows the row's figure.
 **Decoded amount lines on the transaction approval screen:** the `Amount` line
 of a decoded ERC-20 call, and the `Amount` and `Min. received` lines of a
 decoded swap (see TxApproval below; `Min. received` reads `Min. paid out` unless
-only the user is paid, see Transaction Decoding), do not always read as a
-number. They can read:
+only the user is paid and no allowance goes to a spender other than the router,
+see Transaction Decoding), do not always read as a number. They can read:
 
 - A formatted quantity, e.g. `17.1900 USDT`, when the token's scale is known:
   truncated to four decimals, with the floor and the zero cases described above.
@@ -1573,8 +1573,8 @@ 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 and, when AddressDetail or AddressToken is up, that
 screen's USD total and balance lines; its transaction list is left alone. No
-other screen is drawn again by a refresh, since the rest show no balances or
-hold what the user typed.
+other screen is drawn again by a refresh, 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
@@ -2090,10 +2090,11 @@ view would leave a wallet one click from deletion.
       **AddressDetail**. The token's balance is not known until a balance
       refresh that started with it tracked has fetched every address's token
       balances; until then its balance line reads `quantity unknown`, never
-      `0.0000`, unless the explorer had already listed a holding of it. A
-      refresh that returns draws AddressDetail's balances again (see
-      Navigation), so the fetched balance shows without the screen being
-      reopened
+      `0.0000`, unless the explorer had already listed a holding of it. That
+      holds after the popup is closed and opened again, as the tokens still
+      waiting for a fetch are stored with the profile. 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", then a network switch in Settings before the contract lookup
@@ -3214,8 +3215,9 @@ Currently supported:
   `Min. paid out`, because the swap's minimum includes the fee. The minimum
   reads `Min. received` only when some step pays the transaction's sender (the
   From address on TxApproval, the sender the explorer reports on
-  TransactionDetail) and no `Paid to` line is shown. `Paid to` lines after
-  `Token Out` name each other address paid; one reads
+  TransactionDetail), no `Paid to` line is shown, and no permit or batch grants
+  an allowance to a spender other than the router (see below). `Paid to` lines
+  after `Token Out` name each other address paid; one reads
   `The bridge, which pays the deposit's recipient on another network` for a
   bridge deposit; one reads, for example,
   `The router, 2000.0000 USDT from the sender (later steps may not spend all of it)`
@@ -3269,7 +3271,8 @@ Currently supported:
   (listed at the end of this section), a step whose input it cannot read, in
   whole or in part, and a step it fails on. Every other `PERMIT2_PERMIT`, before
   the step that sets the input side or after it, leaves `Token In` and the
-  `Amount` line as they read with no permit: a permit of 5,000 DAI to another
+  `Amount` line as they read with no permit, unless it lets a spender other than
+  the router take `Token In` (see below): a permit of 5,000 DAI to another
   address and then a V3 exact-in of 600 USDT read `Swap USDT → USDC` with
   `Amount 600.0000 USDT`, and so do that exact-in and then a permit of 5,000 DAI
   to the router. When a permit's amount stands and the step that sets the input
@@ -3336,19 +3339,26 @@ Currently supported:
   `PERMIT2_PERMIT` or `PERMIT2_PERMIT_BATCH` whose input the decoder cannot
   read, such as one whose token or spender word has a nonzero top byte, may let
   any spender take any amount of any token: it gives one `Permit2 allowance`
-  line alone, reading `Unknown (could not be decoded)`, and leaves no `Amount`
-  line, whose figure might be too low. These lines change neither the `Paid to`
-  lines nor the minimum's label: a permit or batch pays nobody. A step goes
-  unread when its recipient does not decode as an address, when it is a V3 swap
-  step whose path is shorter than one token address or has bytes after its last
-  hop, or when it is a command the decoder does not read: every command other
-  than `PERMIT2_PERMIT`, `PERMIT2_PERMIT_BATCH`, `PERMIT2_TRANSFER_FROM`,
-  `V2_SWAP_EXACT_IN`, `V2_SWAP_EXACT_OUT`, `V3_SWAP_EXACT_IN`,
-  `V3_SWAP_EXACT_OUT`, `V4_SWAP`, `SWEEP`, `TRANSFER`, `PAY_PORTION`,
-  `PAY_PORTION_FULL_PRECISION`, `ACROSS_V4_DEPOSIT_V3`, `WRAP_ETH`,
-  `UNWRAP_WETH` and `BALANCE_CHECK_ERC20` (`PERMIT2_TRANSFER_FROM_BATCH`,
-  `EXECUTE_SUB_PLAN` and the NFT commands among them), or a type its release
-  names no command for.
+  line alone, reading `Unknown (could not be decoded)`. These lines change no
+  `Paid to` line: a permit or batch pays nobody. But code that a step runs, such
+  as a V4 pool's hook or a token's own code, can call a spender other than the
+  router, which can then take up to its allowance from the user's wallet before
+  the transaction ends. So an allowance to any spender but the router, or a
+  permit or batch the decoder cannot read, makes the minimum read
+  `Min. paid out`, and when its token is `Token In`, or the decoder does not
+  know its token or `Token In`, it leaves no `Amount` line, whose figure might
+  be too low: a permit of 5,000 USDT to another address and then a V3 exact-in
+  of 600 USDT read with no `Amount` line, and the 600 USDT gets lines of its
+  own. A step goes unread when its recipient does not decode as an address, when
+  it is a V3 swap step whose path is shorter than one token address or has bytes
+  after its last hop, or when it is a command the decoder does not read: every
+  command other than `PERMIT2_PERMIT`, `PERMIT2_PERMIT_BATCH`,
+  `PERMIT2_TRANSFER_FROM`, `V2_SWAP_EXACT_IN`, `V2_SWAP_EXACT_OUT`,
+  `V3_SWAP_EXACT_IN`, `V3_SWAP_EXACT_OUT`, `V4_SWAP`, `SWEEP`, `TRANSFER`,
+  `PAY_PORTION`, `PAY_PORTION_FULL_PRECISION`, `ACROSS_V4_DEPOSIT_V3`,
+  `WRAP_ETH`, `UNWRAP_WETH` and `BALANCE_CHECK_ERC20`
+  (`PERMIT2_TRANSFER_FROM_BATCH`, `EXECUTE_SUB_PLAN` and the NFT commands among
+  them), or a type its release names no command for.
 
 ### Non-Goals Forever
 

src/popup/index.js

@@ -21,7 +21,6 @@ const {
     showSaveFailureBanner,
     pushCurrentView,
     goBack,
-    tokensNotFetched,
 } = require("./views/helpers");
 const { applyTheme } = require("./theme");
 const {
@@ -86,8 +85,7 @@ let refreshTimer = null;
 //
 // Once the save is done, the wallet list is drawn again, and so are the
 // balances on AddressDetail or AddressToken when that is the screen up. No
-// other screen is drawn again, since the rest show no balances or hold what the
-// user typed.
+// other screen is drawn again, DeleteAddress and its balance lines included.
 async function doRefreshAndRender() {
     if (refreshInFlight) return;
     refreshInFlight = true;
@@ -140,7 +138,9 @@ async function doRefreshAndRender() {
             // Each token this refresh asked about is now fetched for every
             // address.
             if (allTokenBalancesFetched) {
-                for (const token of tokens) tokensNotFetched.delete(token);
+                state.tokensNotFetched = state.tokensNotFetched.filter(
+                    (token) => !tokens.includes(token),
+                );
             }
             state.lastBalanceRefresh = Date.now();
             return true;

src/popup/views/addressToken.js

@@ -13,7 +13,6 @@ const {
     nativeCurrency,
     balanceLine,
     unknownableAmount,
-    tokensNotFetched,
     renderAddressHtml,
     attachCopyHandlers,
     goBack,
@@ -165,7 +164,7 @@ function renderBalance() {
         // 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 = tokensNotFetched.has(id) ? null : 0;
+        else amount = state.tokensNotFetched.includes(id) ? null : 0;
         price = getPrice(currentSymbol);
     }
 

src/popup/views/helpers.js

@@ -380,20 +380,16 @@ function balanceLine(symbol, amount, price, tokenId) {
     );
 }
 
-// Contract addresses, lowercased, of the tokens the user added that no balance
-// refresh has fetched yet. An address with no balance row for one of them has
-// no known balance of it, so its line says the quantity is unknown rather than
-// 0.0000. trackToken() adds a token here, and doRefreshAndRender() in
-// src/popup/index.js takes it off once a refresh that started with it tracked
-// has fetched every address's token balances
-// (https://git.eeqj.de/sneak/AutistMask/issues/516).
-const tokensNotFetched = new Set();
-
 // Tracks `token` on the active network, as every add path on AddToken and
-// SettingsAddToken does. No refresh has fetched its balance yet.
+// SettingsAddToken does, and lists it in `state.tokensNotFetched`: no refresh
+// has fetched its balance yet. An address with no balance row for it has no
+// known balance of it, so its line says the quantity is unknown rather than
+// 0.0000. doRefreshAndRender() in src/popup/index.js takes it off once a
+// refresh that started with it tracked has fetched every address's token
+// balances (https://git.eeqj.de/sneak/AutistMask/issues/516).
 function trackToken(token) {
     state.trackedTokens.push(token);
-    tokensNotFetched.add(token.address.toLowerCase());
+    state.tokensNotFetched.push(token.address.toLowerCase());
 }
 
 function balanceLinesForAddress(addr, trackedTokens, showZero) {
@@ -429,7 +425,7 @@ function balanceLinesForAddress(addr, trackedTokens, showZero) {
             if (seen.has(id)) continue;
             html += balanceLine(
                 t.symbol,
-                tokensNotFetched.has(id) ? null : 0,
+                state.tokensNotFetched.includes(id) ? null : 0,
                 getPrice(t.symbol),
                 id,
             );
@@ -803,7 +799,6 @@ module.exports = {
     flashCopyFeedback,
     balanceLine,
     balanceLinesForAddress,
-    tokensNotFetched,
     trackToken,
     addressHoldsFunds,
     keyMaterialName,

src/shared/persistedState.js

@@ -28,6 +28,13 @@ const DEFAULT_STATE = {
     // others are restored from when the active network changes. See
     // applyChainSwitchFields().
     networkTrackedTokens: {},
+    // Contract addresses, lowercased, of the tokens the user added that no
+    // balance refresh has fetched yet. trackToken() in
+    // src/popup/views/helpers.js adds one, and doRefreshAndRender() in
+    // src/popup/index.js takes it off. Stored, so a token added just before
+    // the popup closed still reads `quantity unknown` when it opens again
+    // (https://git.eeqj.de/sneak/AutistMask/issues/516).
+    tokensNotFetched: [],
     networkId: "mainnet",
     rpcUrl: DEFAULT_RPC_URL,
     blockscoutUrl: DEFAULT_BLOCKSCOUT_URL,
@@ -412,6 +419,8 @@ function normalizePersisted(saved) {
     // so a stored string walks through the `|| []` and a stored number walks
     // through an Array.isArray().
     out.fraudContracts = textList(saved.fraudContracts);
+    // Contract addresses too, read with `includes()` and `filter()`.
+    out.tokensNotFetched = textList(saved.tokensNotFetched);
     out.tokenHolderCache = structuredClone(saved.tokenHolderCache || {});
     out.theme = saved.theme || "system";
     out.debugMode = saved.debugMode !== undefined ? saved.debugMode : false;

src/shared/uniswap.js

@@ -1355,8 +1355,9 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         };
         // A PERMIT2_PERMIT or PERMIT2_PERMIT_BATCH at `step` whose input this
         // decoder cannot read may let any spender take any amount of any
-        // token: one line says so, and there is no Amount line, whose figure
-        // may then be too low.
+        // token: one line says so, there is no Amount line, whose figure may
+        // then be too low, and the minimum reads Min. paid out (see
+        // toAnotherSpender).
         const permitUnread = (step) => {
             permits.push({ token: null, amount: null, spender: null, step });
             stepsUnread.push(step);
@@ -2029,8 +2030,9 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // Every other PERMIT2_PERMIT leaves Token In and the Amount line as
         // they read with no permit, and gets lines of its own below. A step
         // that may take from the sender what this decoder did not read leaves
-        // no figure, permit or not (see spentUnread()), and so does a permit
-        // or batch whose input it cannot read (see permitUnread()). An
+        // no figure, permit or not (see spentUnread()), and so do a permit
+        // or batch whose input it cannot read (see permitUnread()) and an
+        // allowance of Token In to another spender (see toAnotherSpender). An
         // EXECUTE_SUB_PLAN step leaves both sides unknown (below).
         const stepCommands = Array.from(
             commandsBytes,
@@ -2216,16 +2218,30 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
             return amountText(amount, info);
         };
 
+        // Each allowance to a spender other than the router. Code that a step
+        // runs, such as a V4 pool's hook or a token's own code, can call that
+        // spender, which can then take up to the allowance from the sender
+        // before the transaction ends. A permit or batch this decoder could
+        // not read may be to any spender, of any token.
+        const toAnotherSpender = permits.filter(
+            (p) => !sameAddress(p.spender, toAddress),
+        );
+
         // A null token in `spentFromSender`, a step this decoder did not read
-        // or a token it does not know, and one in `permits`, a permit or
-        // batch it could not read, leave no Amount figure, which may then be
+        // or a token it does not know, and an allowance to another spender
+        // that may be of Token In, leave no Amount figure, which may then be
         // too low. With no Amount line, each take the total adds up gets
         // lines of its own, first, so that every amount this decoder read is
         // shown.
         if (
             present(inputAmount) &&
             spentFromSender.every((s) => present(s.token)) &&
-            permits.every((p) => present(p.token))
+            toAnotherSpender.every(
+                (p) =>
+                    present(p.token) &&
+                    present(inputToken) &&
+                    !sameAddress(p.token, inputToken),
+            )
         ) {
             const amount = spentText(inputAmount, inInfo);
             details.push({
@@ -2346,9 +2362,10 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // step pays the bridge, when one moves the sender's tokens into the
         // router, when a token stays in the router, and when a payout could
         // not be read. The output is received by the sender only when some
-        // step pays the sender and there is no such line. When no step names
-        // anyone paid, one line says so. `paidTo` holds these lines and the
-        // token line after each line about a token in the router.
+        // step pays the sender, there is no such line, and no allowance goes
+        // to another spender (see toAnotherSpender). When no step names anyone
+        // paid, one line says so. `paidTo` holds these lines and the token
+        // line after each line about a token in the router.
         const outputHeld =
             present(outputToken) && heldByRouter.has(outputToken.toLowerCase());
         const paidTo = paidElsewhere.map((address) => ({
@@ -2395,7 +2412,10 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         if (payeeUnread) {
             paidTo.push({ label: "Paid to", value: UNDECODED_CURRENCY });
         }
-        const received = paidToSender && paidTo.length === 0;
+        const received =
+            paidToSender &&
+            paidTo.length === 0 &&
+            toAnotherSpender.length === 0;
         if (!paidToSender && paidTo.length === 0) {
             paidTo.push({ label: "Paid to", value: UNNAMED_CURRENCY });
         }

tests/addedTokenBalance.test.js

@@ -1,9 +1,10 @@
 // After "Add" on AddToken, AddressDetail lists the new token, and its line reads
 // `quantity unknown`, not 0.0000, until a balance refresh that asked the
-// explorer about the token has returned for every address; so does a token
-// added on SettingsAddToken, 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
+// explorer about the token has returned for every address, the popup closing
+// and opening again meanwhile included; so does a token added on
+// SettingsAddToken, 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). 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.
@@ -163,6 +164,29 @@ test("a refresh already running when the token is added does not count as fetchi
     expect(newTokenRow(page)).toContain("0.0000");
 });
 
+test("closed and opened again before any refresh has fetched it, 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 gets no token balances back: the boot's
+    // stub of refreshBalances() writes 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");
+
+    const finish = holdNextRefresh(page);
+    const ticking = page.tick();
+    await page.settle();
+    await finish([MILLION]);
+    await ticking;
+
+    expect(newTokenRow(page)).toContain("1000000.0000");
+});
+
 test("a refresh in which the explorer did not answer leaves the new token's line quantity unknown", async () => {
     const page = await bootOnAddress();
     const finish = holdNextRefresh(page);

tests/persistedFieldContract.test.js

@@ -248,6 +248,13 @@ const CONTRACT = [
         floorOnly: [[42], [null], [{}], [[TOKEN_ADDRESS]]],
         holds: (v) => everyEntry(v, isText),
     },
+    {
+        field: "tokensNotFetched",
+        kind: KIND.ENTRIES,
+        hostile: [42, "notalist", { a: 1 }],
+        floorOnly: [[42], [null], [{}], [[TOKEN_ADDRESS]]],
+        holds: (v) => everyEntry(v, isText),
+    },
     {
         field: "viewStack",
         kind: KIND.ENTRIES,

tests/uniswap.test.js

@@ -2108,12 +2108,6 @@ describe("uniswap decoder", () => {
         const ONE_USDT_LINES = (spender) =>
             permitLines("1.0000 USDT", USDT_ADDR, "USDT", spender);
         test.each([
-            {
-                kind: "to another spender",
-                commands: [0x0a],
-                permits: [ONE_USDT_PERMIT(OTHER_ADDR)],
-                lines: ONE_USDT_LINES(OTHER_ADDR),
-            },
             {
                 kind: "that the router lets fail",
                 commands: [0x8a],
@@ -2550,20 +2544,6 @@ describe("uniswap decoder", () => {
                     ],
                     lines: USDT_600_LINES,
                 },
-                {
-                    kind: "a PERMIT2_PERMIT of 5,000 USDT to another spender, then a V3 exact-in of 600 USDT,",
-                    commands: [0x0a, 0x00],
-                    inputs: [
-                        encodePermit2(USDT_ADDR, USDT_5000, OTHER_ADDR),
-                        V3_600,
-                    ],
-                    lines: permitLines(
-                        "5000.0000 USDT",
-                        USDT_ADDR,
-                        "USDT",
-                        OTHER_ADDR,
-                    ),
-                },
                 {
                     kind: "a PERMIT2_PERMIT of 5,000 USDT to the router that the router may let fail, then a V3 exact-in of 600 USDT,",
                     commands: [0x8a, 0x00],
@@ -2677,45 +2657,41 @@ describe("uniswap decoder", () => {
             const DAI_5000 = 5000000000000000000000n;
             const MAX_UINT160 = 2n ** 160n - 1n;
 
-            // A batch names one spender for all its allowances.
-            test.each([
-                { kind: "the router", spender: ROUTER_ADDR },
-                { kind: "another spender", spender: OTHER_ADDR },
-            ])(
-                "a PERMIT2_PERMIT_BATCH of 5,000 USDT and unlimited DAI to $kind, then a V3 exact-in of 600 USDT, shows each allowance",
-                ({ spender }) => {
-                    const result = decodeSteps(
-                        [0x03, 0x00],
-                        [
-                            encodePermit2Batch(
-                                [
-                                    [USDT_ADDR, USDT_5000],
-                                    [DAI_ADDR, MAX_UINT160],
-                                ],
-                                spender,
-                            ),
-                            V3_600,
-                        ],
-                    );
-                    expect(result.name).toBe("Swap USDT → USDC");
-                    expect(linesBetweenTokens(result)).toEqual([
-                        ["Amount", "600.0000 USDT"],
-                        ...permitLines(
-                            "5000.0000 USDT",
-                            USDT_ADDR,
-                            "USDT",
-                            spender,
+            // A batch names one spender for all its allowances. One to
+            // another spender is under "an allowance to a spender other than
+            // the router" below.
+            test("a PERMIT2_PERMIT_BATCH of 5,000 USDT and unlimited DAI to the router, then a V3 exact-in of 600 USDT, shows each allowance", () => {
+                const result = decodeSteps(
+                    [0x03, 0x00],
+                    [
+                        encodePermit2Batch(
+                            [
+                                [USDT_ADDR, USDT_5000],
+                                [DAI_ADDR, MAX_UINT160],
+                            ],
+                            ROUTER_ADDR,
                         ),
-                        ...permitLines("Unlimited", DAI_ADDR, "DAI", spender),
-                    ]);
-                    // A batch pays nobody, so the swap's minimum is what the
-                    // sender receives.
-                    expect(detail(result, "Paid to")).toBeUndefined();
-                    expect(detail(result, "Min. received").value).toBe(
-                        "590.0000 USDC",
-                    );
-                },
-            );
+                        V3_600,
+                    ],
+                );
+                expect(result.name).toBe("Swap USDT → USDC");
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "600.0000 USDT"],
+                    ...permitLines(
+                        "5000.0000 USDT",
+                        USDT_ADDR,
+                        "USDT",
+                        ROUTER_ADDR,
+                    ),
+                    ...permitLines("Unlimited", DAI_ADDR, "DAI", ROUTER_ADDR),
+                ]);
+                // A batch pays nobody, so the swap's minimum is what the
+                // sender receives.
+                expect(detail(result, "Paid to")).toBeUndefined();
+                expect(detail(result, "Min. received").value).toBe(
+                    "590.0000 USDC",
+                );
+            });
 
             // A batch keeps a PERMIT2_PERMIT's amount from standing as the
             // Amount figure, before the permit as after it.
@@ -2768,7 +2744,7 @@ describe("uniswap decoder", () => {
                     ),
                 },
             ])(
-                "$kind that cannot be read, then a V3 exact-in of 600 USDT, says its allowances could not be decoded and shows no Amount figure",
+                "$kind that cannot be read, then a V3 exact-in of 600 USDT, says its allowances could not be decoded and shows no Amount figure and no Min. received",
                 ({ command, input }) => {
                     const result = decodeSteps(
                         [command, 0x00],
@@ -2778,6 +2754,14 @@ describe("uniswap decoder", () => {
                         ...USDT_600_GROUP,
                         ["Permit2 allowance", UNDECODED],
                     ]);
+                    // Its spender may be any address, as with an allowance
+                    // to a spender other than the router (below).
+                    // https://git.eeqj.de/sneak/AutistMask/issues/658 — on
+                    // next at e296546 this read Min. received.
+                    expect(detail(result, "Min. received")).toBeUndefined();
+                    expect(detail(result, "Min. paid out").value).toBe(
+                        "590.0000 USDC",
+                    );
                 },
             );
 
@@ -2806,6 +2790,125 @@ describe("uniswap decoder", () => {
             });
         });
 
+        // https://git.eeqj.de/sneak/AutistMask/issues/658 — code that a step
+        // runs can call a spender other than the router, which can then take
+        // up to its allowance from the sender before the transaction ends.
+        // On next at e296546 the Amount figure and Min. received took no
+        // account of it. An allowance of Token In to another spender now
+        // leaves no Amount figure, the swap steps' own takes get lines of
+        // their own, and any allowance to another spender leaves no Min.
+        // received.
+        describe("an allowance to a spender other than the router", () => {
+            const USDT_5000 = 5000000000n;
+            const DAI_5000 = 5000000000000000000000n;
+            const MAX_UINT160 = 2n ** 160n - 1n;
+            const USDT_5000_LINES = permitLines(
+                "5000.0000 USDT",
+                USDT_ADDR,
+                "USDT",
+                OTHER_ADDR,
+            );
+
+            test.each([
+                {
+                    kind: "a PERMIT2_PERMIT of 5,000 USDT to another spender, then a V3 exact-in of 600 USDT,",
+                    commands: [0x0a, 0x00],
+                    inputs: [
+                        encodePermit2(USDT_ADDR, USDT_5000, OTHER_ADDR),
+                        V3_600,
+                    ],
+                    lines: [...USDT_600_GROUP, ...USDT_5000_LINES],
+                    minimum: "590.0000 USDC",
+                },
+                {
+                    kind: "a V3 exact-in of 600 USDT, then a PERMIT2_PERMIT of 5,000 USDT to another spender,",
+                    commands: [0x00, 0x0a],
+                    inputs: [
+                        V3_600,
+                        encodePermit2(USDT_ADDR, USDT_5000, OTHER_ADDR),
+                    ],
+                    lines: [...USDT_600_GROUP, ...USDT_5000_LINES],
+                    minimum: "590.0000 USDC",
+                },
+                {
+                    kind: "a PERMIT2_PERMIT_BATCH of 5,000 USDT and unlimited DAI to another spender, then a V3 exact-in of 600 USDT,",
+                    commands: [0x03, 0x00],
+                    inputs: [
+                        encodePermit2Batch(
+                            [
+                                [USDT_ADDR, USDT_5000],
+                                [DAI_ADDR, MAX_UINT160],
+                            ],
+                            OTHER_ADDR,
+                        ),
+                        V3_600,
+                    ],
+                    lines: [
+                        ...USDT_600_GROUP,
+                        ...USDT_5000_LINES,
+                        ...permitLines(
+                            "Unlimited",
+                            DAI_ADDR,
+                            "DAI",
+                            OTHER_ADDR,
+                        ),
+                    ],
+                    minimum: "590.0000 USDC",
+                },
+                {
+                    kind: "a PERMIT2_PERMIT of 1 USDT to another spender, then a V3 exact-in of 600 USDT and a V2 exact-in of 400 USDT, both paid by the user,",
+                    commands: [0x0a, 0x00, 0x08],
+                    inputs: [
+                        ONE_USDT_PERMIT(OTHER_ADDR),
+                        V3_600,
+                        encodeV2SwapExactIn(USER_ADDR, USDT_400, 390000000n, [
+                            USDT_ADDR,
+                            USDC_ADDR,
+                        ]),
+                    ],
+                    lines: [
+                        ...USDT_600_GROUP,
+                        ...USDT_400_GROUP,
+                        ...ONE_USDT_LINES(OTHER_ADDR),
+                    ],
+                    // The last swap step's minimum.
+                    minimum: "390.0000 USDC",
+                },
+            ])(
+                "$kind shows each take's own lines and the allowances, and no Amount figure or Min. received",
+                ({ commands, inputs, lines, minimum }) => {
+                    const result = decodeSteps(commands, inputs);
+                    expect(result.name).toBe("Swap USDT → USDC");
+                    expect(linesBetweenTokens(result)).toEqual(lines);
+                    expect(detail(result, "Paid to")).toBeUndefined();
+                    expect(detail(result, "Min. received")).toBeUndefined();
+                    expect(detail(result, "Min. paid out").value).toBe(minimum);
+                },
+            );
+
+            // An allowance of another token leaves the Amount figure for
+            // Token In.
+            test("a PERMIT2_PERMIT of 5,000 DAI to another spender, then a V3 exact-in of 600 USDT, shows the swap's 600 USDT and no Min. received", () => {
+                const result = decodeSteps(
+                    [0x0a, 0x00],
+                    [encodePermit2(DAI_ADDR, DAI_5000, OTHER_ADDR), V3_600],
+                );
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "600.0000 USDT"],
+                    ...permitLines(
+                        "5000.0000 DAI",
+                        DAI_ADDR,
+                        "DAI",
+                        OTHER_ADDR,
+                    ),
+                ]);
+                expect(detail(result, "Min. received")).toBeUndefined();
+                expect(detail(result, "Min. paid out").value).toBe(
+                    "590.0000 USDC",
+                );
+            });
+        });
+
         // A V3_SWAP_EXACT_OUT whose path is shorter than one token cannot be
         // read. It may pay any address and take from the sender, so it
         // leaves no Amount figure.

tests/uniswapRecipient.test.js

@@ -2802,26 +2802,37 @@ describe("the allow-revert flag", () => {
     });
 
     // Only the routers from UniversalRouterV2 on let a PERMIT2_PERMIT fail.
+    // The permit's spender is the router at ROUTER, which on every other
+    // router is an allowance to another spender, so the minimum reads
+    // Min. paid out there.
     test.each([
-        { router: "UniversalRouterV1", address: ROUTER_V1, mark: "" },
+        {
+            router: "UniversalRouterV1",
+            address: ROUTER_V1,
+            mark: "",
+            minimum: "Min. paid out",
+        },
         {
             router: "UniversalRouterV1_2_V2Support",
             address: ROUTER_V1_2,
             mark: "",
+            minimum: "Min. paid out",
         },
         {
             router: "UniversalRouterV2",
             address: ROUTER,
             mark: " (allowed to fail)",
+            minimum: "Min. received",
         },
         {
             router: "UniversalRouterV2_1_2",
             address: ROUTER_V2_1_2,
             mark: " (allowed to fail)",
+            minimum: "Min. paid out",
         },
     ])(
         "on $router, a PERMIT2_PERMIT with the flag is listed as 'Permit2 Permit$mark', and the swap's lines read as without the flag",
-        ({ address, mark }) => {
+        ({ address, mark, minimum }) => {
             const steps = [
                 permit2Permit(USDT, USDT_2000),
                 swapToWeth(MSG_SENDER),
@@ -2853,7 +2864,7 @@ describe("the allow-revert flag", () => {
             expect(
                 labels(withFlag).filter((l) => permitLines.includes(l)),
             ).toEqual(permitLines);
-            expect(detail(withFlag, "Min. received").value).toBe("1.0000 WETH");
+            expect(detail(withFlag, minimum).value).toBe("1.0000 WETH");
         },
     );