dappress 0.5.1 → 0.6.1

package/CHANGELOG.md

@@ -4,6 +4,19 @@ What changes for the users of Dappress, version by version. The format follows [
 
 ## [Unreleased]
 
+## [0.6.1] - 2026-10-05
+
+### Fixed
+
+- `cy.confirmTransaction({ gas })` no longer confirms, now and then, with the fee MetaMask estimated in place of the one asked. MetaMask's confirmation carries the new fee a moment after the fee editor closes, and confirming meanwhile sent it the old one, which it kept. The command now waits for the "Network fee" row to change, as it did for the spending cap.
+
+## [0.6.0] - 2026-10-05
+
+### Fixed
+
+- The peer dependency on Cypress asks for 15.10 or later, the first version with `Cypress.expose()`, which the commands read their options with. Earlier versions were accepted at install, then failed as soon as the support file loaded.
+- A command sent right after another was answered in the popup no longer fails on "Timed out waiting for confirm-footer-button". The popup closes a moment after its button goes, and the next command could find it, still listed on the request just answered, then lose it. A decision now waits for the popup to close, and a confirmation that closes before it is acted on is looked for again.
+
 ## [0.5.1] - 2026-10-05
 
 ### Changed
@@ -85,7 +98,9 @@ What changes for the users of Dappress, version by version. The format follows [
 - The wallet setup file, `cypress/wallet.setup.ts`, and the opt-in profile cache.
 - TypeScript declarations.
 
-[Unreleased]: https://github.com/blassaut/dappress/compare/v0.5.1...HEAD
+[Unreleased]: https://github.com/blassaut/dappress/compare/v0.6.1...HEAD
+[0.6.1]: https://github.com/blassaut/dappress/compare/v0.6.0...v0.6.1
+[0.6.0]: https://github.com/blassaut/dappress/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/blassaut/dappress/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/blassaut/dappress/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/blassaut/dappress/compare/v0.3.3...v0.4.0

package/dist/actions.js

@@ -86,16 +86,27 @@ function createTasks(options) {
             await metamask.leaveUnlockForm(page, options);
         return state;
     }
-    /** Approve the prompt a network change raised: "Add network" or the permission to switch. */
-    async function approveNetworkChange(browser) {
-        const page = await (0, metamask_pages_1.getConfirmationPage)(browser, await metamaskId(browser), options.timeout);
-        await metamask.approveNetworkChange(page, options.timeout);
+    /**
+     * Find the confirmation and act on it. One that closes before it is acted
+     * on was the popup of the request before, found as it closed: the request's
+     * own is looked for once more.
+     */
+    async function onConfirmation(browser, act) {
+        for (let attempt = 0;; attempt++) {
+            const page = await (0, metamask_pages_1.getConfirmationPage)(browser, await metamaskId(browser), options.timeout);
+            try {
+                return await act(page);
+            }
+            catch (error) {
+                if (attempt > 0 || !(error instanceof metamask.ConfirmationClosed))
+                    throw error;
+            }
+        }
     }
+    /** Approve the prompt a network change raised: "Add network" or the permission to switch. */
+    const approveNetworkChange = (browser) => onConfirmation(browser, (page) => metamask.approveNetworkChange(page, options.timeout));
     /** The task for a decision: find the confirmation, press its button. */
-    const decide = (decision) => async (browser, argument) => {
-        const page = await (0, metamask_pages_1.getConfirmationPage)(browser, await metamaskId(browser), options.timeout);
-        await metamask.decide(decision, page, options.timeout, argument);
-    };
+    const decide = (decision) => (browser, argument) => onConfirmation(browser, (page) => metamask.decide(decision, page, options.timeout, argument));
     const actions = {
         setupWallet,
         approveNetworkChange,

package/dist/browser.js

@@ -1,6 +1,6 @@
 "use strict";
 // Connects Puppeteer to the browser Cypress launched, through the debugging
-// URL Cypress hands out in after:browser:launch (Cypress 13.6+).
+// URL Cypress hands out in after:browser:launch (Cypress 15.10+).
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,7 +20,7 @@ function captureDebuggerUrl(on) {
  */
 async function withBrowser(action) {
     if (!debuggerUrl) {
-        throw new Error('[dappress] No browser to connect to. Is configureDappress() called in setupNodeEvents, with Cypress 13.6 or later?');
+        throw new Error('[dappress] No browser to connect to. Is configureDappress() called in setupNodeEvents, with Cypress 15.10 or later?');
     }
     const browser = await puppeteer_core_1.default.connect({ browserWSEndpoint: debuggerUrl, defaultViewport: null });
     try {

package/dist/metamask-pages.d.ts

@@ -12,6 +12,16 @@ export declare function getRequestPages(browser: Browser, extensionId: string):
  * The page a dapp request is shown on. Waits for the popup to open, or takes
  * the side panel. A popup still on its home route is one closing after the
  * previous request, or one that hasn't routed to the request yet: skipped.
+ * The route is read from the page, which follows a change of hash at once,
+ * where the target can still name the request just answered.
  */
 export declare function getConfirmationPage(browser: Browser, extensionId: string, timeout: number): Promise<Page>;
+/**
+ * Once the request shown on a popup is answered, wait for the popup to close,
+ * at most `timeout` ms. MetaMask closes it a moment after its button goes, and
+ * left to close on its own, the next command could find it, still listed on
+ * `request`, and act on a page that vanishes under it. A popup that goes on
+ * to another request instead is left to it; so is the side panel, which stays.
+ */
+export declare function waitForDismissal(page: Page, request: string, timeout: number): Promise<void>;
 export declare function withUsableWindow(page: Page): Promise<Page>;

package/dist/metamask-pages.js

@@ -7,6 +7,7 @@ exports.findExtensionId = findExtensionId;
 exports.getHomePage = getHomePage;
 exports.getRequestPages = getRequestPages;
 exports.getConfirmationPage = getConfirmationPage;
+exports.waitForDismissal = waitForDismissal;
 exports.withUsableWindow = withUsableWindow;
 const page_helpers_1 = require("./page-helpers");
 const HOME_PATH = '/home.html';
@@ -97,14 +98,20 @@ async function getRequestPages(browser, extensionId) {
  * The page a dapp request is shown on. Waits for the popup to open, or takes
  * the side panel. A popup still on its home route is one closing after the
  * previous request, or one that hasn't routed to the request yet: skipped.
+ * The route is read from the page, which follows a change of hash at once,
+ * where the target can still name the request just answered.
  */
 async function getConfirmationPage(browser, extensionId, timeout) {
     const deadline = Date.now() + timeout;
     while (Date.now() < deadline) {
         for (const pathname of CONFIRMATION_PATHS) {
-            const [target] = pagesOf(browser, extensionId, pathname).filter((candidate) => !isHomeRoute(candidate.url()));
-            if (target)
-                return pathname === '/notification.html' ? withUsableWindow(await pageOf(target)) : pageOf(target);
+            for (const target of pagesOf(browser, extensionId, pathname)) {
+                // A target closing while its page is taken has none: not a confirmation either
+                const page = await target.page().catch(() => null);
+                if (!page || page.isClosed() || isHomeRoute(page.url()))
+                    continue;
+                return pathname === '/notification.html' ? withUsableWindow(page) : page;
+            }
         }
         await (0, page_helpers_1.sleep)(250);
     }
@@ -115,6 +122,26 @@ async function getConfirmationPage(browser, extensionId, timeout) {
         .join(', ');
     throw new Error(`[dappress] MetaMask showed no confirmation within ${timeout}ms. Did the dapp send a request? MetaMask pages seen: ${seen || 'none'}`);
 }
+/**
+ * Once the request shown on a popup is answered, wait for the popup to close,
+ * at most `timeout` ms. MetaMask closes it a moment after its button goes, and
+ * left to close on its own, the next command could find it, still listed on
+ * `request`, and act on a page that vanishes under it. A popup that goes on
+ * to another request instead is left to it; so is the side panel, which stays.
+ */
+async function waitForDismissal(page, request, timeout) {
+    if (!request.includes('/notification.html'))
+        return;
+    const deadline = Date.now() + timeout;
+    while (Date.now() < deadline) {
+        if (page.isClosed())
+            return;
+        const url = page.url();
+        if (url !== request && !isHomeRoute(url))
+            return;
+        await (0, page_helpers_1.sleep)(100);
+    }
+}
 // MetaMask asks Chrome for a 400x620 popup. Under Xvfb on a GitHub runner the
 // window it gets is 1x1: nothing is laid out, the pane of a confirmation that
 // must be read to the end has no height, so it can never be scrolled there and
@@ -126,7 +153,7 @@ async function withUsableWindow(page) {
         const { windowId, bounds } = await session.send('Browser.getWindowForTarget');
         if (bounds.windowState === 'normal' && (bounds.width ?? 0) >= 200 && (bounds.height ?? 0) >= 200)
             return page;
-        console.log(`[dappress] MetaMask's popup is ${bounds.width}x${bounds.height} (${bounds.windowState}); resizing it to ${POPUP.width}x${POPUP.height}`);
+        console.log(`[dappress] MetaMask's popup is ${bounds.width}x${bounds.height} (${bounds.windowState}), as under Xvfb without a window manager; resizing it to ${POPUP.width}x${POPUP.height}`);
         if (bounds.windowState !== 'normal')
             await session.send('Browser.setWindowBounds', { windowId, bounds: { windowState: 'normal' } });
         await session.send('Browser.setWindowBounds', { windowId, bounds: { ...POPUP } });

package/dist/metamask.d.ts

@@ -48,6 +48,13 @@ export declare function disconnectSite(page: Page, origin: string): Promise<void
 type CommandOptions = ConnectOptions & TransactionOptions;
 /** Press the button of `decision` on the confirmation shown on `page`, once it is set as `options` ask. */
 export declare function decide(decision: Decision, page: Page, timeout: number, options?: CommandOptions): Promise<void>;
+/**
+ * Thrown when the confirmation page closed before its button was pressed: it
+ * was the popup of the request before, found as it closed. The request's own
+ * popup is there to be looked for.
+ */
+export declare class ConfirmationClosed extends Error {
+}
 /** wallet_addEthereumChain on a network MetaMask knows behaves like a switch: either prompt may show. */
 export declare function approveNetworkChange(page: Page, timeout: number): Promise<void>;
 export {};

package/dist/metamask.js

@@ -7,7 +7,7 @@
 // first, then a fallback on the button's English text. When a MetaMask release
 // moves something, this is the file to fix.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decisions = void 0;
+exports.ConfirmationClosed = exports.decisions = void 0;
 exports.walletState = walletState;
 exports.onboard = onboard;
 exports.unlock = unlock;
@@ -20,6 +20,7 @@ exports.disconnectSite = disconnectSite;
 exports.decide = decide;
 exports.approveNetworkChange = approveNetworkChange;
 const page_helpers_1 = require("./page-helpers");
+const metamask_pages_1 = require("./metamask-pages");
 const testId = (id) => `[data-testid="${id}"]`;
 // XPath rather than Puppeteer's ::-p-text(): the latter needs MutationObserver,
 // which MetaMask's sandbox (LavaMoat) blocks in its pages.
@@ -136,6 +137,8 @@ const selectors = {
         gasForm: testId('gas-fee-advanced-eip1559-modal'),
         gasField: (id) => [`#${id}`, `${testId(id)} input`],
         gasSave: [testId('gas-fee-modal-save-button'), buttonText('Save')],
+        // The "Network fee" row: its amount and the name of its estimate
+        feeSection: testId('gas-fee-section'),
     },
     // The older footer, still used by the permission update a network switch
     // asks for, by "Add suggested tokens", and by template confirmations
@@ -553,11 +556,30 @@ async function decide(decision, page, timeout, options) {
         const adjust = adjustments[decision];
         if (!adjust)
             throw new Error(`[dappress] ${decision} takes no options`);
-        await (0, page_helpers_1.waitFor)(page, exports.decisions[decision], { timeout });
+        await waitForButton(page, exports.decisions[decision], timeout);
         await adjust(page, options, timeout);
     }
     return pressAndWaitForDismissal(page, exports.decisions[decision], timeout);
 }
+/**
+ * Thrown when the confirmation page closed before its button was pressed: it
+ * was the popup of the request before, found as it closed. The request's own
+ * popup is there to be looked for.
+ */
+class ConfirmationClosed extends Error {
+}
+exports.ConfirmationClosed = ConfirmationClosed;
+// The button of a confirmation, or ConfirmationClosed if the page went meanwhile
+async function waitForButton(page, button, timeout) {
+    try {
+        await (0, page_helpers_1.waitFor)(page, button, { timeout });
+    }
+    catch (error) {
+        if (page.isClosed())
+            throw new ConfirmationClosed(`[dappress] The confirmation closed before "${(0, page_helpers_1.describe)(button)}" was pressed`);
+        throw error;
+    }
+}
 /** wallet_addEthereumChain on a network MetaMask knows behaves like a switch: either prompt may show. */
 function approveNetworkChange(page, timeout) {
     return pressAndWaitForDismissal(page, [...selectors.confirmation.confirm, ...selectors.pageContainer.confirm], timeout);
@@ -617,7 +639,7 @@ async function setSpendingCap(page, cap) {
     const s = selectors.transaction;
     if (!(await (0, page_helpers_1.isVisible)(page, s.editSpendingCap, 10000)))
         throw await (0, page_helpers_1.failure)(page, 'MetaMask shows no spending cap to edit: spendingCap is for an ERC-20 approval');
-    const shown = await textOf(page, s.spendingCap);
+    const shown = await (0, page_helpers_1.textOf)(page, s.spendingCap);
     const asked = await openSpendingCap(page);
     await type(page, s.spendingCapInput, cap, 'spending cap');
     if (!(await pressToClose(page, s.spendingCapSave, s.spendingCapInput)))
@@ -625,9 +647,7 @@ async function setSpendingCap(page, cap) {
     // The modal closes before the confirmation has the new cap, and confirming
     // meanwhile approves the old one. Two caps may read the same once MetaMask
     // has rounded them, so a row that stays as it was is not a failure.
-    const deadline = Date.now() + (Number(asked) === Number(cap) ? 0 : 5000);
-    while (Date.now() < deadline && (await textOf(page, s.spendingCap)) === shown)
-        await (0, page_helpers_1.sleep)(250);
+    await (0, page_helpers_1.waitForTextChange)(page, s.spendingCap, shown, Number(asked) === Number(cap) ? 0 : 5000);
 }
 /** Open the spending cap's modal. Yields the cap the dapp asked for, which its field starts with. */
 async function openSpendingCap(page) {
@@ -648,11 +668,14 @@ async function setGas(page, gas) {
     const s = selectors.transaction;
     if (!(await (0, page_helpers_1.isVisible)(page, s.editGas, 10000)))
         throw await (0, page_helpers_1.failure)(page, 'MetaMask shows no network fee to edit on this confirmation');
+    const shown = await (0, page_helpers_1.textOf)(page, s.feeSection);
     await openFeeEditor(page);
-    if (typeof gas === 'string')
-        await pickGasEstimate(page, gas);
-    else
-        await fillGasForm(page, gas);
+    const changed = typeof gas === 'string' ? await pickGasEstimate(page, gas) : await fillGasForm(page, gas);
+    // The editor closes before the confirmation carries the new fee, and
+    // confirming meanwhile sends MetaMask the old one, which it keeps: the row
+    // is waited for to change. A fee set as it already was changes nothing.
+    if (changed)
+        await (0, page_helpers_1.waitForTextChange)(page, s.feeSection, shown, 5000);
 }
 async function openFeeEditor(page) {
     const s = selectors.transaction;
@@ -667,32 +690,45 @@ async function openFeeEditor(page) {
 // Picking an estimate closes the editor. MetaMask lists the estimates it has
 // for the network: Low, Market and Aggressive where it has fee estimates,
 // "Network suggested" where it only has a gas price, as on a local node.
+// Yields whether the transaction had another estimate before.
 async function pickGasEstimate(page, name) {
     const s = selectors.transaction;
     const option = s.gasOption(...gasEstimates[name]);
     if (!(await (0, page_helpers_1.isVisible)(page, option, 5000)))
         throw await (0, page_helpers_1.failure)(page, `MetaMask offers no "${name}" fee for this transaction`);
+    const selected = await hasEstimate(page, option);
     for (let attempt = 0; attempt < 3; attempt++) {
         await (0, page_helpers_1.click)(page, option);
         if (await (0, page_helpers_1.isGone)(page, s.gasEstimates, 10000))
-            return;
+            return !selected;
     }
     throw await (0, page_helpers_1.failure)(page, `MetaMask did not take the "${name}" fee`);
 }
+// The estimate the transaction has is marked by a class on its row
+async function hasEstimate(page, option) {
+    const element = await (0, page_helpers_1.waitFor)(page, option);
+    return element.evaluate((el) => el.className.includes('--selected')).catch(() => false);
+}
+// Yields whether a field is given another value than it had
 async function fillGasForm(page, values) {
     const s = selectors.transaction;
     await openGasForm(page);
+    const asked = Object.keys(gasFields).filter((field) => values[field] !== undefined);
+    let changed = false;
+    for (const field of asked) {
+        if (Number(await valueOf(page, s.gasField(gasFields[field]))) !== Number(values[field]))
+            changed = true;
+    }
     // The form checks each fee against the other as it stood, and keeps the old
     // value of a fee it refused: the max base fee is typed again once the
     // priority fee is in, for two fees that both move below or above the old ones.
-    const fields = Object.keys(gasFields).filter((field) => values[field] !== undefined);
-    if (values.maxBaseFee !== undefined && values.priorityFee !== undefined)
-        fields.push('maxBaseFee');
+    const fields = values.maxBaseFee !== undefined && values.priorityFee !== undefined ? [...asked, 'maxBaseFee'] : asked;
     for (const field of fields)
         await type(page, s.gasField(gasFields[field]), values[field], field);
     // "Save" stays disabled on a value the form refuses, and the error quotes what the form says of it
     if (!(await pressToClose(page, s.gasSave, s.gasForm)))
         throw await (0, page_helpers_1.failure)(page, 'MetaMask did not save the network fee');
+    return changed;
 }
 // "Advanced", in the list of estimates, replaces the list with the form. A
 // transaction with a gas price gets another form, which has none of these fields.
@@ -728,10 +764,6 @@ async function valueOf(page, selector) {
     const field = await (0, page_helpers_1.waitFor)(page, selector);
     return field.evaluate((el) => el.value);
 }
-async function textOf(page, selector) {
-    const element = await page.$(selector);
-    return element ? element.evaluate((el) => (el.textContent ?? '').trim()).catch(() => null) : null;
-}
 /**
  * Press a footer button, then wait for the confirmation to go away: the
  * popup closes, the side panel goes back to the home screen. A click that
@@ -741,7 +773,7 @@ async function textOf(page, selector) {
  * what MetaMask logged.
  */
 async function pressAndWaitForDismissal(page, button, timeout) {
-    await (0, page_helpers_1.waitFor)(page, button, { timeout });
+    await waitForButton(page, button, timeout);
     await dismissModal(page);
     const logged = recordErrors(page);
     const request = page.url();
@@ -751,7 +783,7 @@ async function pressAndWaitForDismissal(page, button, timeout) {
             if (await (0, page_helpers_1.isVisible)(page, selectors.alert.acknowledge, 500))
                 await (0, page_helpers_1.click)(page, selectors.alert.acknowledge);
             if (await (0, page_helpers_1.isGone)(page, button, 3000))
-                return;
+                return (0, metamask_pages_1.waitForDismissal)(page, request, 3000);
             await dismissModal(page);
             await (0, page_helpers_1.dispatchClick)(page, button, { timeout: 3000 }).catch(() => { });
         }

package/dist/page-helpers.d.ts

@@ -29,5 +29,13 @@ export declare function fill(page: Page, selector: Selector, text: string, optio
  * words for the log and as a screenshot to look at.
  */
 export declare function failure(page: Page, message: string): Promise<Error>;
+/** The text of the first element `selector` matches, or null when there is none. */
+export declare function textOf(page: Page, selector: string): Promise<string | null>;
+/**
+ * Wait for the text of `selector` to differ from `shown`, at most `timeout`
+ * ms. For a value MetaMask sets on its page a moment after a modal that
+ * edits it closes: acting on the page meanwhile acts on the old value.
+ */
+export declare function waitForTextChange(page: Page, selector: string, shown: string | null, timeout: number): Promise<void>;
 export declare function sleep(ms: number): Promise<void>;
 export {};

package/dist/page-helpers.js

@@ -18,6 +18,8 @@ exports.clickWhenEnabled = clickWhenEnabled;
 exports.dispatchClick = dispatchClick;
 exports.fill = fill;
 exports.failure = failure;
+exports.textOf = textOf;
+exports.waitForTextChange = waitForTextChange;
 exports.sleep = sleep;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
@@ -194,6 +196,21 @@ async function pageText(page) {
         return '';
     }
 }
+/** The text of the first element `selector` matches, or null when there is none. */
+async function textOf(page, selector) {
+    const element = await page.$(selector);
+    return element ? element.evaluate((el) => (el.textContent ?? '').trim()).catch(() => null) : null;
+}
+/**
+ * Wait for the text of `selector` to differ from `shown`, at most `timeout`
+ * ms. For a value MetaMask sets on its page a moment after a modal that
+ * edits it closes: acting on the page meanwhile acts on the old value.
+ */
+async function waitForTextChange(page, selector, shown, timeout) {
+    const deadline = Date.now() + timeout;
+    while (Date.now() < deadline && (await textOf(page, selector)) === shown)
+        await sleep(250);
+}
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dappress",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "description": "MetaMask automation for Cypress: load the real extension, import a test wallet, answer dapp requests with cy.* commands. Tracks the latest MetaMask release.",
   "license": "MIT",
   "author": "Benjamin Lassaut",
@@ -61,7 +61,7 @@
     "format:check": "prettier --check ."
   },
   "peerDependencies": {
-    "cypress": ">=13.6.0"
+    "cypress": ">=15.10.0"
   },
   "dependencies": {
     "@scure/bip39": "^1.6.0",