Skip to content

[CP Staging] Fix: navigate after clearing contact method #48466

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
mountiny merged 2 commits into from
Sep 3, 2024
Merged

[CP Staging] Fix: navigate after clearing contact method #48466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac51c3b
fix: navigate after clearning contact method
getusha Sep 3, 2024
056986b
remove uneccessary line
getusha Sep 3, 2024
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
1 change: 0 additions & 1 deletion src/libs/actions/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ function deleteContactMethod(contactMethod: string, loginList: Record<string, Lo
/**
* Clears a contact method optimistically. this is used when the contact method fails to be added to the backend
*/

function clearContactMethod(contactMethod: string) {
Onyx.merge(ONYXKEYS.LOGIN_LIST, {
[contactMethod]: null,
Expand Down
5 changes: 4 additions & 1 deletion src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,10 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
<ErrorMessageRow
errors={ErrorUtils.getLatestErrorField(loginData, 'addedLogin')}
errorRowStyles={[themeStyles.mh5, themeStyles.mv3]}
onClose={() => User.clearContactMethod(contactMethod)}
onClose={() => {
User.clearContactMethod(contactMethod);
Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo));
}}
canDismissError
/>
)}
Expand Down
1 change: 1 addition & 0 deletions src/pages/settings/Profile/Contacts/ValidateContactActionPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function ValidateContactActionPage() {
includeSafeAreaPaddingBottom={false}
shouldEnableMaxHeight
testID={ValidateContactActionPage.displayName}
offlineIndicatorStyle={themeStyles.mtAuto}
>
<HeaderWithBackButton
title={account?.primaryLogin ?? ''}
Expand Down