chore

packages/playwright-utils/src/playwright-utils/button.ts

@@ -1,4 +1,5 @@
-import type { Page } from '@playwright/test';
+import type { Locator, Page } from '@playwright/test';
+import { expect } from '../fixtures';
 
 export function getButtonByText(
   page: Page,
@@ -7,3 +8,21 @@ export function getButtonByText(
 ) {
   return page.locator('button').getByText(selector, { exact });
 }
+
+export function expectButtonToBeEnabled(
+  button: Locator,
+  locatorOptions: {
+    message?: string;
+    timeout?: number;
+    intervals?: number[];
+  } = {}
+) {
+  const { message, timeout, intervals } = locatorOptions;
+  return expect
+    .poll(async () => await button.isEnabled(), {
+      timeout: timeout ?? 7000,
+      intervals: intervals ?? [1000, 2000, 3000, 4000, 5000, 6000, 7000],
+      message: message ?? 'Button is not enabled',
+    })
+    .toBeTruthy();
+}

packages/playwright-utils/src/playwright-utils/fuelWalletTestHelper.ts

@@ -4,7 +4,7 @@ import { expect } from '../fixtures';
 import { FUEL_MNEMONIC, FUEL_WALLET_PASSWORD } from '../mocks';
 import { shortAddress } from '../utils';
 
-import { getButtonByText } from './button';
+import { expectButtonToBeEnabled, getButtonByText } from './button';
 import { getByAriaLabel } from './locator';
 import { hasText } from './text';
 
@@ -268,32 +268,23 @@ export class FuelWalletTestHelper {
     const addNetworkButton = getByAriaLabel(this.walletPage, 'Add network');
     await addNetworkButton.click();
 
-    await expect
-      .poll(
-        () =>
-          hasText(this.walletPage, 'Cancel')
-            .then(() => true)
-            .catch(() => false),
-        { timeout: 3000 }
-      )
-      .toBeTruthy();
-
     const urlInput = getByAriaLabel(this.walletPage, 'Network url');
     await urlInput.fill(providerUrl);
     const chainIdLocator = getByAriaLabel(this.walletPage, 'Chain ID');
     await chainIdLocator.fill(chainId.toString());
 
-    await getByAriaLabel(this.walletPage, 'Test connection').click();
+    const testConnectionButton = getByAriaLabel(
+      this.walletPage,
+      'Test connection'
+    );
+    await expectButtonToBeEnabled(testConnectionButton);
+    await testConnectionButton.click();
 
     const addNewNetworkButton = getByAriaLabel(
       this.walletPage,
       'Add new network'
     );
-    await expect
-      .poll(async () => await addNewNetworkButton.isEnabled(), {
-        timeout: 7000,
-      })
-      .toBeTruthy();
+    await expectButtonToBeEnabled(addNewNetworkButton);
     await addNewNetworkButton.click();
   }