diff --git a/package.json b/package.json index fdc0e835..46b4c3ea 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,9 @@ "branches": [ "main", { - "name": "anvil-logs", - "channel": "mm-disable-st", - "prerelease": "mm-disable-st" + "name": "develop", + "channel": "alpha", + "prerelease": "alpha" } ] } diff --git a/packages/wallets/src/metamask/metamask-latest/metamask.page.ts b/packages/wallets/src/metamask/metamask-latest/metamask.page.ts index ff073ea3..c3c86c81 100644 --- a/packages/wallets/src/metamask/metamask-latest/metamask.page.ts +++ b/packages/wallets/src/metamask/metamask-latest/metamask.page.ts @@ -80,10 +80,7 @@ export class MetamaskPage implements WalletPage { await this.navigate(); if (!(await this.header.accountMenuButton.isVisible())) { await this.onboardingPage.firstTimeSetup(); - await this.loginPage.unlock(); - await this.popoverElements.closePopover(); - await this.popoverElements.closeConnectingProblemPopover(); - await this.walletOperation.cancelAllTxInQueue(); // reject all tx in queue if exist + await this.navigate(); } }); } diff --git a/packages/wallets/src/metamask/metamask-latest/pages/onboarding.page.ts b/packages/wallets/src/metamask/metamask-latest/pages/onboarding.page.ts index 27a381df..6cd1b352 100644 --- a/packages/wallets/src/metamask/metamask-latest/pages/onboarding.page.ts +++ b/packages/wallets/src/metamask/metamask-latest/pages/onboarding.page.ts @@ -10,6 +10,7 @@ export class OnboardingPage { importWalletOptionBtn: Locator; metricAgreeButton: Locator; secretPhraseTextArea: Locator; + clearSecretPhraseButton: Locator; secretPhraseImportButton: Locator; createPasswordInput: Locator; confirmPasswordInput: Locator; @@ -41,6 +42,9 @@ export class OnboardingPage { this.secretPhraseTextArea = this.page.getByTestId( 'srp-input-import__srp-note', ); + this.clearSecretPhraseButton = this.page.getByRole('button', { + name: 'Clear all', + }); this.secretPhraseImportButton = this.page.getByTestId('import-srp-confirm'); this.createPasswordInput = this.page.getByTestId( 'create-password-new-input', @@ -62,17 +66,35 @@ export class OnboardingPage { await this.iHaveExistingWalletButton.click(); await this.importWalletOptionBtn.click(); await this.fillSecretPhrase(this.accountConfig.SECRET_PHRASE); - await this.secretPhraseImportButton.click(); await this.createPassword(this.accountConfig.PASSWORD); await this.metricAgreeButton.click(); await this.completeButton.click(); - await this.page.waitForURL('**/home.html#'); + await this.page.close(); }); } async fillSecretPhrase(secretPhrase: string) { await test.step('Fill onboarding secret phrase field', async () => { - await this.secretPhraseTextArea.pressSequentially(secretPhrase); + let attempts = 3; + while (attempts >= 0) { + attempts--; + + await this.secretPhraseTextArea.pressSequentially(secretPhrase, { + delay: 10, + }); + + if (await this.secretPhraseImportButton.isDisabled()) { + await this.clearSecretPhraseButton.click(); + if (attempts == 0) + throw new Error( + 'Failed to fill the secret phrase after 3 attempts', + ); + continue; + } + + await this.secretPhraseImportButton.click(); + break; + } }); }