dappress 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -4,6 +4,12 @@ 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
@@ -92,7 +98,8 @@ 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.6.0...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

package/dist/metamask-pages.js

@@ -153,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.js

@@ -137,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
@@ -637,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)))
@@ -645,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) {
@@ -668,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;
@@ -687,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.
@@ -748,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

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.6.0",
+  "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",