use ancestor testID on TextField for Android EditText matching in change password test

Author: grvgoel81

app/components/Views/ResetPassword/index.tsx

@@ -570,16 +570,13 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
               {strings('manual_backup_step_1.enter_current_password')}
             </Label>
             <TextField
+              testID={ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID}
               placeholder={strings('password_reset.password_title')}
               onChangeText={onPasswordChange}
               value={password}
-              accessibilityLabel={
-                ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID
-              }
               inputProps={{
                 secureTextEntry: true,
                 onSubmitEditing: reauthenticateWithPassword,
-                testID: ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
                 keyboardAppearance: themeAppearance,
                 autoComplete: 'password',
               }}
@@ -648,16 +645,14 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
                     {strings('reset_password.password')}
                   </Label>
                   <TextField
+                    testID={ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID}
                     value={password}
                     onChangeText={onPasswordChange}
                     onFocus={() => setIsPasswordFieldFocused(true)}
                     onBlur={() => setIsPasswordFieldFocused(false)}
                     placeholder={strings(
                       'reset_password.new_password_placeholder',
                     )}
-                    accessibilityLabel={
-                      ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID
-                    }
                     isError={isPasswordTooShort()}
                     endAccessory={
                       <TouchableOpacity onPress={() => toggleShowPassword(0)}>
@@ -677,7 +672,6 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
                     }
                     inputProps={{
                       secureTextEntry: showPasswordIndex.includes(0),
-                      testID: ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
                       onSubmitEditing: jumpToConfirmPassword,
                       returnKeyType: 'next',
                       autoComplete: 'password-new',
@@ -698,15 +692,15 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
                     {strings('reset_password.confirm_password')}
                   </Label>
                   <TextField
+                    testID={
+                      ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID
+                    }
                     inputRef={confirmPasswordInput}
                     value={confirmPassword}
                     onChangeText={setConfirmPassword}
                     placeholder={strings(
                       'reset_password.confirm_password_placeholder',
                     )}
-                    accessibilityLabel={
-                      ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID
-                    }
                     endAccessory={
                       <TouchableOpacity onPress={() => toggleShowPassword(1)}>
                         <Icon
@@ -725,8 +719,6 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
                     }
                     inputProps={{
                       secureTextEntry: showPasswordIndex.includes(1),
-                      testID:
-                        ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID,
                       returnKeyType: 'done',
                       autoComplete: 'password-new',
                       autoCapitalize: 'none',

tests/page-objects/Settings/SecurityAndPrivacy/ChangePasswordView.ts

@@ -12,19 +12,15 @@ class ChangePasswordView {
   }
 
   get passwordInput(): DetoxElement {
-    return device.getPlatform() === 'ios'
-      ? Matchers.getElementByID(
-          ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
-        )
-      : Matchers.getElementByLabel(
-          ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
-        );
+    return Matchers.getEditTextWithAncestorTestId(
+      ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
+    );
   }
 
   get confirmPasswordInput(): DetoxElement {
-    return device.getPlatform() === 'ios'
-      ? Matchers.getElementByID(RESET_PASSWORD_CONFIRM_INPUT_BOX_ID)
-      : Matchers.getElementByLabel(RESET_PASSWORD_CONFIRM_INPUT_BOX_ID);
+    return Matchers.getEditTextWithAncestorTestId(
+      RESET_PASSWORD_CONFIRM_INPUT_BOX_ID,
+    );
   }
 
   get iUnderstandCheckBox(): DetoxElement {