Skip to content

Fix "Link has been re-sent" text in verify secondary login is not cleared even reload the page #23601

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

Merged
flodnv merged 5 commits into from
Jul 27, 2023
Merged

Fix "Link has been re-sent" text in verify secondary login is not cleared even reload the page #23601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae7d787
Reset contact method validate code sent state when leave page
hoangzinh Jul 25, 2023
5c9a8b2
Add until to reset validate code sent state
hoangzinh Jul 26, 2023
8459d74
Move logic to componentDidMount to handle kill app/browser
hoangzinh Jul 26, 2023
02e26d4
Update comment text
hoangzinh Jul 26, 2023
2fc60da
Update comment
hoangzinh Jul 26, 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
14 changes: 14 additions & 0 deletions src/libs/actions/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,19 @@ function clearContactMethodErrors(contactMethod, fieldName) {
});
}

/**
* Resets the state indicating whether a validation code has been sent to a specific contact method.
*
* @param {String} contactMethod - The identifier of the contact method to reset.
*/
function resetContactMethodValidateCodeSentState(contactMethod) {
Onyx.merge(ONYXKEYS.LOGIN_LIST, {
[contactMethod]: {
validateCodeSent: false,
},
});
}

/**
* Adds a secondary login to a user's account
*
Expand Down Expand Up @@ -827,4 +840,5 @@ export {
updateChatPriorityMode,
setContactMethodAsDefault,
updateTheme,
resetContactMethodValidateCodeSentState,
};
4 changes: 4 additions & 0 deletions src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ class ContactMethodDetailsPage extends Component {
};
}

componentDidMount() {
User.resetContactMethodValidateCodeSentState(this.getContactMethod());

@eVoloshchak eVoloshchak Sep 14, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 Coming from #24521, this has caused a small regression
Full details can be found here, but in short we didn't check if the contact method exists before calling resetContactMethodValidateCodeSentState.
That meant you could edit URL to contain an invalid contact method and still proceed with the validation flow instead of being presented with the Not Found page

}

componentDidUpdate(prevProps) {
const errorFields = lodashGet(this.props.loginList, [this.getContactMethod(), 'errorFields'], {});
const prevPendingFields = lodashGet(prevProps.loginList, [this.getContactMethod(), 'pendingFields'], {});
Expand Down