Merge branch 'staging'

Author: katamartin

app/(userSection)/account/account-info.tsx

@@ -12,20 +12,25 @@ import Login from './login'
 
 const SignOutListener = () => {
   const searchParams = useSearchParams()
+  const { status } = useSession()
 
   useEffect(() => {
-    if (searchParams.get('signOut')) {
+    if (!searchParams.get('signOut')) return
+
+    if (status === 'authenticated') {
       signOut()
-      const params = new URLSearchParams(searchParams.toString())
-      params.delete('signOut')
-      const filteredParams = params.toString()
-      window.history.replaceState(
-        null,
-        '',
-        `${window.location.pathname}${filteredParams ? `?${filteredParams}` : ''}`,
-      )
+      return
     }
-  }, [searchParams])
+
+    const params = new URLSearchParams(searchParams.toString())
+    params.delete('signOut')
+    const filteredParams = params.toString()
+    window.history.replaceState(
+      null,
+      '',
+      `${window.location.pathname}${filteredParams ? `?${filteredParams}` : ''}`,
+    )
+  }, [searchParams, status])
 
   return null
 }
@@ -34,12 +39,12 @@ const AccountInfo = () => {
   const { data: session, status, update } = useSession()
   return (
     <SharedLayout title='Account'>
+      <Suspense>
+        <SignOutListener />
+      </Suspense>
+
       {status === 'authenticated' && session?.user ? (
         <>
-          <Suspense>
-            <SignOutListener />
-          </Suspense>
-
           <Row columns={[6, 6, 8, 8]}>
             <Column start={1} width={[6, 4, 5, 4]}>
               <Field description='CDRXIV uses Janeway for authentication. Signing out does not deactivate your Janeway session.'>

app/preprint/[id]/preprint-metadata.tsx

@@ -58,8 +58,6 @@ const PreprintMetadata: React.FC<{
   const dataLicense = getAdditionalField(preprint, 'Data license')
   const dataLicenseInfo = getZenodoLicense(preprint)
   const articleLicenseInfo = getArticleLicense(preprint.license?.pk)
-  const hasConflictOfInterest =
-    conflictOfInterest && conflictOfInterest !== 'None'
 
   return (
     <Flex sx={{ flexDirection: 'column', gap: [6, 8, 9, 9] }}>
@@ -275,11 +273,19 @@ const PreprintMetadata: React.FC<{
         </Field>
       )}
 
-      {hasConflictOfInterest && (
-        <Field label='Conflict of interest'>
-          <Box sx={{ variant: 'text.mono' }}>{conflictOfInterest}</Box>
-        </Field>
-      )}
+      <Field label='Conflict of interest'>
+        <Box
+          sx={{
+            variant: 'text.mono',
+            color:
+              conflictOfInterest && conflictOfInterest !== 'None'
+                ? 'text'
+                : 'listBorderGrey',
+          }}
+        >
+          {conflictOfInterest ?? 'None'}
+        </Box>
+      </Field>
 
       {preprint.date_published && (
         <Field label={preprint.versions.length === 1 ? 'Published' : 'Dates'}>