Skip to content

Commit 51f24e3

Browse files
committed
fix: After switching account and switching back, magic code page is missing email
1 parent 764b403 commit 51f24e3

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/pages/settings/Security/AddDelegate/ConfirmDelegateMagicCodePage.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ function ConfirmDelegateMagicCodePage({route}: ConfirmDelegateMagicCodePageProps
2626
const currentDelegate = account?.delegatedAccess?.delegates?.find((d) => d.email === login);
2727
const addDelegateErrors = account?.delegatedAccess?.errorFields?.addDelegate?.[login];
2828
const validateLoginError = getLatestError(addDelegateErrors);
29+
const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false});
2930

3031
useEffect(() => {
3132
if (!currentDelegate || !!currentDelegate.pendingFields?.email || !!addDelegateErrors) {
@@ -52,7 +53,7 @@ function ConfirmDelegateMagicCodePage({route}: ConfirmDelegateMagicCodePageProps
5253
title={translate('delegate.makeSureItIsYou')}
5354
sendValidateCode={() => requestValidateCodeAction()}
5455
handleSubmitForm={(validateCode) => addDelegate({email: login, role, validateCode, delegatedAccess: account?.delegatedAccess})}
55-
descriptionPrimary={translate('delegate.enterMagicCode', {contactMethod: account?.primaryLogin ?? ''})}
56+
descriptionPrimary={translate('delegate.enterMagicCode', {contactMethod: account?.primaryLogin ?? session ?? ''})}
5657
/>
5758
);
5859
}

src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ function UpdateDelegateMagicCodePage({route}: UpdateDelegateMagicCodePageProps)
2121
const login = route.params.login;
2222
const newRole = route.params.newRole as ValueOf<typeof CONST.DELEGATE_ROLE>;
2323
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
24+
const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: true});
2425
const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE, {canBeMissing: true});
2526
const currentDelegate = account?.delegatedAccess?.delegates?.find((d) => d.email === login);
2627
const updateDelegateErrors = account?.delegatedAccess?.errorFields?.updateDelegateRole?.[login];
@@ -49,7 +50,7 @@ function UpdateDelegateMagicCodePage({route}: UpdateDelegateMagicCodePageProps)
4950
title={translate('delegate.makeSureItIsYou')}
5051
sendValidateCode={() => requestValidateCodeAction()}
5152
handleSubmitForm={(validateCode) => updateDelegateRole({email: login, role: newRole, validateCode, delegatedAccess: account?.delegatedAccess})}
52-
descriptionPrimary={translate('delegate.enterMagicCode', {contactMethod: account?.primaryLogin ?? ''})}
53+
descriptionPrimary={translate('delegate.enterMagicCode', {contactMethod: account?.primaryLogin ?? session?.email ?? ''})}
5354
/>
5455
);
5556
}

0 commit comments

Comments
 (0)