Merge branch 'main' into ogp/22135

Author: OGPoyraz

appwright/tests/performance/login/send-flows.spec.js

@@ -23,6 +23,7 @@ test('Send flow - Ethereum, SRP 1 + SRP 2 + SRP 3', async ({
   device,
   performanceTracker,
 }, testInfo) => {
+  test.setTimeout(1800000); // TODO: Investigate why this is taking so long on Android
   WalletAccountModal.device = device;
   WalletMainScreen.device = device;
   AccountListComponent.device = device;
@@ -53,14 +54,12 @@ test('Send flow - Ethereum, SRP 1 + SRP 2 + SRP 3', async ({
   await SendScreen.assetsListIsDisplayed();
   timer1.stop();
   await SendScreen.typeTokenName('Link\n');
-  console.log('Ethereum typed, so waiting 5 seconds');
   await SendScreen.clickOnFirstTokenBadge();
   timer2.start();
 
   await AmountScreen.isVisible();
   timer2.stop();
   await AmountScreen.enterAmount(TEST_AMOUNTS.ETHEREUM);
-
   await AmountScreen.tapOnNextButton();
   timer3.start();
   await SendScreen.isSelectAddressScreenDisplayed();

appwright/utils/Flows.js

@@ -115,7 +115,7 @@ export async function importSRPFlow(device, srp) {
 
 export async function login(device, options = {}) {
   LoginScreen.device = device;
-  const { skipIntro = false, scenarioType = 'login' } = options;
+  const { scenarioType = 'login' } = options;
 
   const password = getPasswordForScenario(scenarioType);
 
@@ -149,7 +149,7 @@ export async function dismissRewardsBottomSheetModal(device) {
 
 export async function dismissMultichainAccountsIntroModal(
   device,
-  timeout = 5000,
+  timeout = 10000,
 ) {
   MultichainAccountEducationModal.device = device;
   const closeButton = await MultichainAccountEducationModal.closeButton;

wdio/screen-objects/SendScreen.js

@@ -81,7 +81,11 @@ class SendScreen {
   }
 
   get searchTokenField() {
-    return AppwrightSelectors.getElementByCatchAll(this._device, 'Search tokens and NFTs');
+    if (AppwrightSelectors.isIOS(this._device)) {
+      return AppwrightSelectors.getElementByCatchAll(this._device, 'Search tokens and NFTs');
+    } else {
+      return AppwrightSelectors.getElementByID(this._device, 'textfieldsearch');
+    }
   }
 
 
@@ -203,7 +207,7 @@ class SendScreen {
   }
 
   async clickOnFirstTokenBadge() {
-    const firstTokenBadge = await AppwrightSelectors.getElementByXpath(this._device, `//XCUIElementTypeOther[@name="badge-wrapper-badge"]`);
+    const firstTokenBadge = AppwrightSelectors.isIOS(this._device) ? await AppwrightSelectors.getElementByXpath(this._device, `//XCUIElementTypeOther[@name="badge-wrapper-badge"]`) : await AppwrightSelectors.getElementByID(this._device, 'badge-wrapper-badge');
     appwrightExpect(firstTokenBadge).toBeVisible();
     await AppwrightGestures.tap(firstTokenBadge);
   }