Prefill email with user's primary email if available

UniversityOfHelsinkiCS · Feb 24, 2023 · e9d6785 · e9d6785
1 parent 4b44075
commit e9d6785
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/client/components/ResultPage/EmailForm.tsx b/src/client/components/ResultPage/EmailForm.tsx
@@ -8,7 +8,13 @@ import apiClient from '../../util/apiClient'
 
 import styles from './styles'
 
-const EmailForm = ({ resultHTML }: { resultHTML: HTMLElement }) => {
+const EmailForm = ({
+  resultHTML,
+  primaryEmail = '',
+}: {
+  resultHTML: HTMLElement
+  primaryEmail: string
+}) => {
   const { t } = useTranslation()
   const [isSent, setIsSent] = useState(false)
 
@@ -35,7 +41,7 @@ const EmailForm = ({ resultHTML }: { resultHTML: HTMLElement }) => {
     mode: 'onBlur',
     resolver: yupResolver(validationSchema),
     defaultValues: {
-      email: '',
+      email: primaryEmail,
     },
   })
 

diff --git a/src/client/components/ResultPage/ProceedSection.tsx b/src/client/components/ResultPage/ProceedSection.tsx
@@ -5,10 +5,14 @@ import { Box, Button, Container, Stack, Typography } from '@mui/material'
 
 import styles from './styles'
 import EmailForm from './EmailForm'
+import useLoggedInUser from '../../hooks/useLoggedInUser'
 
 const ProceedSection = () => {
   const { t } = useTranslation()
   const [openMailPrompt, setOpenMailPrompt] = useState(false)
+  const { user, isLoading } = useLoggedInUser()
+
+  if (isLoading) return null
 
   const resultHTML = document.getElementById('result-component')
 
@@ -53,7 +57,7 @@ const ProceedSection = () => {
               </Button>
             </>
           ) : (
-            <EmailForm resultHTML={resultHTML} />
+            <EmailForm resultHTML={resultHTML} primaryEmail={user?.email} />
           )}
         </Stack>
       </Box>