diff --git a/src/pages/settings/Security/AddDelegate/ConfirmDelegateMagicCodePage.tsx b/src/pages/settings/Security/AddDelegate/ConfirmDelegateMagicCodePage.tsx index d4766a576b19..091657e5e5c9 100644 --- a/src/pages/settings/Security/AddDelegate/ConfirmDelegateMagicCodePage.tsx +++ b/src/pages/settings/Security/AddDelegate/ConfirmDelegateMagicCodePage.tsx @@ -26,6 +26,7 @@ function ConfirmDelegateMagicCodePage({route}: ConfirmDelegateMagicCodePageProps const currentDelegate = account?.delegatedAccess?.delegates?.find((d) => d.email === login); const addDelegateErrors = account?.delegatedAccess?.errorFields?.addDelegate?.[login]; const validateLoginError = getLatestError(addDelegateErrors); + const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false}); useEffect(() => { if (!currentDelegate || !!currentDelegate.pendingFields?.email || !!addDelegateErrors) { @@ -52,7 +53,7 @@ function ConfirmDelegateMagicCodePage({route}: ConfirmDelegateMagicCodePageProps title={translate('delegate.makeSureItIsYou')} sendValidateCode={() => requestValidateCodeAction()} handleSubmitForm={(validateCode) => addDelegate({email: login, role, validateCode, delegatedAccess: account?.delegatedAccess})} - descriptionPrimary={translate('delegate.enterMagicCode', {contactMethod: account?.primaryLogin ?? ''})} + descriptionPrimary={translate('delegate.enterMagicCode', {contactMethod: account?.primaryLogin ?? session?.email ?? ''})} /> ); } diff --git a/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx b/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx index 04e4fa7fecf9..bbb380ace521 100644 --- a/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx +++ b/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx @@ -21,6 +21,7 @@ function UpdateDelegateMagicCodePage({route}: UpdateDelegateMagicCodePageProps) const login = route.params.login; const newRole = route.params.newRole as ValueOf; const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true}); + const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: true}); const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE, {canBeMissing: true}); const currentDelegate = account?.delegatedAccess?.delegates?.find((d) => d.email === login); const updateDelegateErrors = account?.delegatedAccess?.errorFields?.updateDelegateRole?.[login]; @@ -49,7 +50,7 @@ function UpdateDelegateMagicCodePage({route}: UpdateDelegateMagicCodePageProps) title={translate('delegate.makeSureItIsYou')} sendValidateCode={() => requestValidateCodeAction()} handleSubmitForm={(validateCode) => updateDelegateRole({email: login, role: newRole, validateCode, delegatedAccess: account?.delegatedAccess})} - descriptionPrimary={translate('delegate.enterMagicCode', {contactMethod: account?.primaryLogin ?? ''})} + descriptionPrimary={translate('delegate.enterMagicCode', {contactMethod: account?.primaryLogin ?? session?.email ?? ''})} /> ); }