Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactored the NewPasswordForm component to functional #18081

Merged
merged 3 commits into from
May 9, 2023
Merged

Refactored the NewPasswordForm component to functional #18081

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74f39af
refactored the component to functional
techievivek Apr 27, 2023
b754cc6
Merge branch 'main' into techievivek_refactor_newpasswordform
techievivek May 4, 2023
cbbda3d
tested and updated
techievivek May 4, 2023
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
95 changes: 39 additions & 56 deletions src/pages/settings/NewPasswordForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, {useState, useEffect} from 'react';
import PropTypes from 'prop-types';
import {View} from 'react-native';
import Text from '../../components/Text';
Expand All @@ -23,74 +23,57 @@ const propTypes = {
...withLocalizePropTypes,
};

class NewPasswordForm extends React.Component {
constructor(props) {
super(props);
const NewPasswordForm = (props) => {
const [passwordHintError, setPasswordHintError] = useState(false);

this.state = {
passwordHintError: false,
};
}
const isValidPassword = () => props.password.match(CONST.PASSWORD_COMPLEXITY_REGEX_STRING);

componentDidUpdate(prevProps) {
const passwordChanged = (this.props.password !== prevProps.password);
if (passwordChanged) {
this.props.updateIsFormValid(this.isValidForm());
}
}

onBlurNewPassword() {
if (this.state.passwordHintError) {
const onBlurNewPassword = () => {
if (passwordHintError) {
return;
}
if (this.props.password && !this.isValidPassword()) {
this.setState({passwordHintError: true});
if (props.password && !isValidPassword()) {
setPasswordHintError(true);
}
}

isValidPassword() {
return this.props.password.match(CONST.PASSWORD_COMPLEXITY_REGEX_STRING);
}
};

/**
* checks if the password invalid
* @returns {Boolean}
*/
isInvalidPassword() {
return this.state.passwordHintError && this.props.password && !this.isValidPassword();
}
const isInvalidPassword = () => passwordHintError && props.password && !isValidPassword();

isValidForm() {
return this.isValidPassword();
}
useEffect(() => {
props.updateIsFormValid(isValidPassword());
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [props.password]);

render() {
return (
<View style={styles.mb6}>
<TextInput
autoFocus
label={`${this.props.translate('setPasswordPage.enterPassword')}`}
secureTextEntry
autoComplete={ComponentUtils.NEW_PASSWORD_AUTOCOMPLETE_TYPE}
textContentType="newPassword"
value={this.props.password}
onChangeText={password => this.props.updatePassword(password)}
onBlur={() => this.onBlurNewPassword()}
/>
<Text
style={[
styles.formHelp,
styles.mt1,
this.isInvalidPassword() && styles.formError,
]}
>
{this.props.translate('setPasswordPage.newPasswordPrompt')}
</Text>
</View>
);
}
}
return (
<View style={styles.mb6}>
<TextInput
autoFocus
label={`${props.translate('setPasswordPage.enterPassword')}`}
secureTextEntry
autoComplete={ComponentUtils.NEW_PASSWORD_AUTOCOMPLETE_TYPE}
textContentType="newPassword"
value={props.password}
onChangeText={password => props.updatePassword(password)}
onBlur={onBlurNewPassword}
/>
<Text
style={[
styles.formHelp,
styles.mt1,
isInvalidPassword() && styles.formError,
]}
>
{props.translate('setPasswordPage.newPasswordPrompt')}
</Text>
</View>
);
};

NewPasswordForm.propTypes = propTypes;
NewPasswordForm.displayName = 'NewPasswordForm';

export default withLocalize(NewPasswordForm);