Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions wdio/screen-objects/LoginScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ class LoginScreen {
get loginScreen() {
if (!this._device) {
return Selectors.getXpathElementByResourceId(LoginViewSelectors.CONTAINER);
} else {
return AppwrightSelectors.getElementByResourceId(this._device, LoginViewSelectors.CONTAINER);
}
return AppwrightSelectors.getElementByID(
this._device,
LoginViewSelectors.CONTAINER,
);
}

get welcomeBackText() {
Expand Down Expand Up @@ -52,16 +54,17 @@ class LoginScreen {
return Selectors.getXpathElementByResourceId(
LoginViewSelectors.PASSWORD_INPUT,
);
} else {
if (AppwrightSelectors.isAndroid(this._device)) {
return AppwrightSelectors.getElementByID(
this._device,
LoginViewSelectors.PASSWORD_INPUT,
);
} else {
return AppwrightSelectors.getElementByID(this._device, "textfield", true);
}
}
if (AppwrightSelectors.isAndroid(this._device)) {
return AppwrightSelectors.getElementByCatchAll(
this._device,
LoginViewSelectors.PASSWORD_INPUT,
);
}
return AppwrightSelectors.getElementByID(
this._device,
LoginViewSelectors.PASSWORD_INPUT,
);
}

// Migrated to LoginView.ts (tests/page-objects/wallet/LoginView.ts)
Expand Down
Loading