diff --git a/packages/core-mobile/e2e/helpers/web.ts b/packages/core-mobile/e2e/helpers/web.ts index af694d133..c37d5b235 100644 --- a/packages/core-mobile/e2e/helpers/web.ts +++ b/packages/core-mobile/e2e/helpers/web.ts @@ -33,7 +33,7 @@ export enum WebScripts { .getAttribute('uri'); }`, CLICK_WC_CORE = `(element) => { - element.shadowRoot.querySelector('wui-flex > wui-card > w3m-router') + element.shadowRoot.querySelector('w3m-router') .shadowRoot.querySelector('w3m-connect-view') .shadowRoot.querySelector('wui-list-wallet[name="Core"]').click(); }`, diff --git a/packages/core-mobile/e2e/pages/accountManage.page.ts b/packages/core-mobile/e2e/pages/accountManage.page.ts index fac518c87..de1531b5a 100644 --- a/packages/core-mobile/e2e/pages/accountManage.page.ts +++ b/packages/core-mobile/e2e/pages/accountManage.page.ts @@ -4,6 +4,7 @@ import accountManage from '../locators/accountManage.loc' import { Platform } from '../helpers/constants' import Assert from '../helpers/assertions' import commonElsLoc from '../locators/commonEls.loc' +import delay from '../helpers/waits' class AccountManagePage { get account() { @@ -116,15 +117,20 @@ class AccountManagePage { async createNthAccountAndSwitchToNth(account: number) { await this.tapAccountDropdownTitle() await this.tapAddEditAccounts() + await device.disableSynchronization() + await delay(1000) for (let i = 1; i < account; i++) { await this.tapAddAccountButton() + await delay(1000) } await this.tapNthAccount(account) await this.tapDoneButton() + await device.enableSynchronization() } async tapNthAccount(account: number) { try { + await Action.waitForElementNoSync(by.text(`Account ${account}`)) await Action.tap(by.text(`Account ${account}`)) } catch (e) { console.log('Unable to tap Nth account') @@ -185,6 +191,7 @@ class AccountManagePage { } async tapAddAccountButton() { + await Action.waitForElementNoSync(this.addAccountButton) await Action.tapElementAtIndex(this.addAccountButton, 0) } diff --git a/packages/core-mobile/e2e/pages/browser.page.ts b/packages/core-mobile/e2e/pages/browser.page.ts index a94cd40a8..283634384 100644 --- a/packages/core-mobile/e2e/pages/browser.page.ts +++ b/packages/core-mobile/e2e/pages/browser.page.ts @@ -43,7 +43,8 @@ class BrowserPage { } async tapCoreConnectWallet() { - await Wbs.tapByText('Connect Wallet') + await Wbs.tapByText('Connect') + await Wbs.tapByXpath('//div[@data-testid="connect-core-mobile"]') } async connectTermAndContinue() { diff --git a/packages/core-mobile/e2e/pages/connectToSite.page.ts b/packages/core-mobile/e2e/pages/connectToSite.page.ts index 4ec3615d8..e7f19a7b2 100644 --- a/packages/core-mobile/e2e/pages/connectToSite.page.ts +++ b/packages/core-mobile/e2e/pages/connectToSite.page.ts @@ -65,7 +65,7 @@ class ConnectToSite { } async selectAccountAndconnect() { - await Action.waitForElement(this.selectAccounts, 18000) + await Action.waitForElement(this.selectAccounts, 25000) await this.tapSelectAccounts() await this.tapAccountCheckBox() await this.tapApproveBtn() diff --git a/packages/core-mobile/e2e/tests/plusIcon/walletConnect/dappIntegrationsCore.e2e.smoke.ts b/packages/core-mobile/e2e/tests/plusIcon/walletConnect/dappIntegrationsCore.e2e.smoke.ts index 5bfc0b677..28524c3c9 100644 --- a/packages/core-mobile/e2e/tests/plusIcon/walletConnect/dappIntegrationsCore.e2e.smoke.ts +++ b/packages/core-mobile/e2e/tests/plusIcon/walletConnect/dappIntegrationsCore.e2e.smoke.ts @@ -28,11 +28,12 @@ describe('Dapp - Core', () => { await wbs.waitForEleByTextToBeVisible('Error:') console.log('Unable to load `core.app` website') } catch (e) { + await device.disableSynchronization() await browserPage.tapAccept() await browserPage.tapCoreConnectWallet() - await browserPage.tapConnectWallet() await browserPage.connectTermAndContinue() await browserPage.connectCore() + await device.enableSynchronization() await connectToSitePage.selectAccountAndconnect() await securityAndPrivacyPage.goToConnectedSites() await connectedSitesPage.verifyDapp('Core')