src/components/PDFView/PdfMarking.tsx

@@ -23,7 +23,7 @@ interface PdfMarkingProps {
   meta: Meta | null
   otherUserMarks: Mark[]
   setCurrentUserMarks: (currentUserMarks: CurrentUserMark[]) => void
-  setIsMarksCompleted: (isMarksCompleted: boolean) => void
+  setIsReadyToSign: (isReadyToSign: boolean) => void
   setUpdatedMarks: (markToUpdate: Mark) => void
 }
 
@@ -37,7 +37,7 @@ const PdfMarking = (props: PdfMarkingProps) => {
   const {
     files,
     currentUserMarks,
-    setIsMarksCompleted,
+    setIsReadyToSign,
     setCurrentUserMarks,
     setUpdatedMarks,
     handleDownload,
@@ -101,7 +101,7 @@ const PdfMarking = (props: PdfMarkingProps) => {
     )
     setCurrentUserMarks(updatedCurrentUserMarks)
     setSelectedMark(null)
-    setIsMarksCompleted(true)
+    setIsReadyToSign(true)
     setUpdatedMarks(updatedMark.mark)
   }
 

src/pages/sign/index.tsx

@@ -39,7 +39,7 @@ import { Container } from '../../components/Container'
 import { DisplayMeta } from './internal/displayMeta'
 import styles from './style.module.scss'
 import { CurrentUserMark, Mark } from '../../types/mark.ts'
-import { getLastSignersSig, isFullySigned } from '../../utils/sign.ts'
+import { getLastSignersSig } from '../../utils/sign.ts'
 import {
   filterMarksByPubkey,
   getCurrentUserMarks,
@@ -112,13 +112,13 @@ export const SignPage = () => {
   const [currentUserMarks, setCurrentUserMarks] = useState<CurrentUserMark[]>(
     []
   )
-  const [isMarksCompleted, setIsMarksCompleted] = useState(false)
+  const [isReadyToSign, setIsReadyToSign] = useState(false)
   const [otherUserMarks, setOtherUserMarks] = useState<Mark[]>([])
 
   useEffect(() => {
     if (signers.length > 0) {
       // check if all signers have signed then its fully signed
-      if (isFullySigned(signers, signedBy)) {
+      if (signers.every((signer) => signedBy.includes(signer))) {
         setSignedStatus(SignedStatus.Fully_Signed)
       } else {
         for (const signer of signers) {
@@ -216,7 +216,7 @@ export const SignPage = () => {
         const otherUserMarks = findOtherUserMarks(signedMarks, usersPubkey!)
         setOtherUserMarks(otherUserMarks)
         setCurrentUserMarks(currentUserMarks)
-        setIsMarksCompleted(isCurrentUserMarksComplete(currentUserMarks))
+        setIsReadyToSign(isCurrentUserMarksComplete(currentUserMarks))
       }
 
       setSignedBy(Object.keys(meta.docSignatures) as `npub1${string}`[])
@@ -883,21 +883,7 @@ export const SignPage = () => {
     return <LoadingSpinner desc={loadingSpinnerDesc} />
   }
 
-  if (!isMarksCompleted && signedStatus === SignedStatus.User_Is_Next_Signer) {
-    return (
-      <PdfMarking
-        files={getCurrentUserFiles(files, currentFileHashes, creatorFileHashes)}
-        currentUserMarks={currentUserMarks}
-        setIsMarksCompleted={setIsMarksCompleted}
-        setCurrentUserMarks={setCurrentUserMarks}
-        setUpdatedMarks={setUpdatedMarks}
-        handleDownload={handleDownload}
-        otherUserMarks={otherUserMarks}
-        meta={meta}
-      />
-    )
-  }
-
+  if (isReadyToSign) {
     return (
       <>
         <Container className={styles.container}>
@@ -969,4 +955,18 @@ export const SignPage = () => {
         </Container>
       </>
     )
+  }
+
+  return (
+    <PdfMarking
+      files={getCurrentUserFiles(files, currentFileHashes, creatorFileHashes)}
+      currentUserMarks={currentUserMarks}
+      setIsReadyToSign={setIsReadyToSign}
+      setCurrentUserMarks={setCurrentUserMarks}
+      setUpdatedMarks={setUpdatedMarks}
+      handleDownload={handleDownload}
+      otherUserMarks={otherUserMarks}
+      meta={meta}
+    />
+  )
 }

src/utils/sign.ts

@@ -31,16 +31,4 @@ const getLastSignersSig = (
   }
 }
 
-/**
- * Checks if all signers have signed the sigit
- * @param signers - an array of npubs of all signers from the Sigit
- * @param signedBy - an array of npubs that have signed it already
- */
-const isFullySigned = (
-  signers: `npub1${string}`[],
-  signedBy: `npub1${string}`[]
-): boolean => {
-  return signers.every((signer) => signedBy.includes(signer))
-}
-
-export { getLastSignersSig, isFullySigned }
+export { getLastSignersSig }