Skip to content

Account - RBR is shown after removing secondary contact #72028

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
MonilBhavsar merged 8 commits into from
Nov 3, 2025
Merged

Account - RBR is shown after removing secondary contact #72028

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
336b6ab
fix: Account - RBR is shown after remove secondary contact
thelullabyy Oct 7, 2025
431186d
Merge branch 'main' into fix/71741-RBR-is-shown-after-removing-second…
thelullabyy Oct 13, 2025
1d97ad8
Merge branch 'main' into fix/71741-RBR-is-shown-after-removing-second…
thelullabyy Oct 14, 2025
6b9ecec
Merge branch 'main' into fix/71741-RBR-is-shown-after-removing-second…
thelullabyy Oct 28, 2025
72c87e5
update code
thelullabyy Oct 28, 2025
9c51a92
Merge branch 'main' of https://github.com/Expensify/App into fix/7174…
thelullabyy Oct 29, 2025
fd59aed
Merge branch 'main' of https://github.com/Expensify/App into fix/7174…
thelullabyy Oct 30, 2025
f8c7ec0
fix: type err
thelullabyy Oct 30, 2025
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
10 changes: 8 additions & 2 deletions src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import {close} from '@userActions/Modal';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {Login} from '@src/types/onyx';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
import KeyboardUtils from '@src/utils/keyboard';
Expand Down Expand Up @@ -71,7 +72,12 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
*/
const contactMethod: string = useMemo(() => getDecodedContactMethodFromUriParam(route.params.contactMethod), [route.params.contactMethod]);

const loginData = useMemo(() => loginList?.[contactMethod], [loginList, contactMethod]);
const loginDataRef = useRef<Login | undefined>(undefined);
const loginData = useMemo(() => {
// eslint-disable-next-line react-compiler/react-compiler
loginDataRef.current = loginList?.[contactMethod];
return loginList?.[contactMethod];
}, [loginList, contactMethod]);

const isDefaultContactMethod = useMemo(() => session?.email === loginData?.partnerUserID, [session?.email, loginData?.partnerUserID]);
const validateLoginError = getEarliestErrorField(loginData, 'validateLogin');
Expand Down Expand Up @@ -330,7 +336,7 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
clearError={() => {
// When removing unverified contact methods, the ValidateCodeActionForm unmounts and triggers clearError.
// This causes loginData to become an object, which makes sendValidateCode trigger, so we add this check to prevent clearing the error.
if (!loginData.partnerUserID) {
if (!loginDataRef.current?.partnerUserID) {
return;
}
clearContactMethodErrors(contactMethod, !isEmptyObject(validateLoginError) ? 'validateLogin' : 'validateCodeSent');
Expand Down
Loading