src/components/PDFView/PdfItem.tsx

@@ -1,14 +1,13 @@
 import { PdfFile } from '../../types/drawing.ts'
-import { CurrentUserMark, Mark } from '../../types/mark.ts'
+import { CurrentUserMark } from '../../types/mark.ts'
 import PdfPageItem from './PdfPageItem.tsx'
 
 interface PdfItemProps {
+  pdfFile: PdfFile
   currentUserMarks: CurrentUserMark[]
   handleMarkClick: (id: number) => void
-  otherUserMarks: Mark[]
-  pdfFile: PdfFile
-  selectedMark: CurrentUserMark | null
   selectedMarkValue: string
+  selectedMark: CurrentUserMark | null
 }
 
 /**
@@ -19,8 +18,7 @@ const PdfItem = ({
   currentUserMarks,
   handleMarkClick,
   selectedMarkValue,
-  selectedMark,
-  otherUserMarks
+  selectedMark
 }: PdfItemProps) => {
   const filterByPage = (
     marks: CurrentUserMark[],
@@ -28,9 +26,6 @@ const PdfItem = ({
   ): CurrentUserMark[] => {
     return marks.filter((m) => m.mark.location.page === page)
   }
-  const filterMarksByPage = (marks: Mark[], page: number): Mark[] => {
-    return marks.filter((mark) => mark.location.page === page)
-  }
   return pdfFile.pages.map((page, i) => {
     return (
       <PdfPageItem
@@ -40,7 +35,6 @@ const PdfItem = ({
         handleMarkClick={handleMarkClick}
         selectedMarkValue={selectedMarkValue}
         selectedMark={selectedMark}
-        otherUserMarks={filterMarksByPage(otherUserMarks, i)}
       />
     )
   })

src/components/PDFView/PdfMarking.tsx

@@ -18,14 +18,13 @@ import { UsersDetails } from '../UsersDetails.tsx'
 import { Meta } from '../../types'
 
 interface PdfMarkingProps {
-  currentUserMarks: CurrentUserMark[]
   files: CurrentUserFile[]
+  currentUserMarks: CurrentUserMark[]
+  setIsReadyToSign: (isReadyToSign: boolean) => void
+  setCurrentUserMarks: (currentUserMarks: CurrentUserMark[]) => void
+  setUpdatedMarks: (markToUpdate: Mark) => void
   handleDownload: () => void
   meta: Meta | null
-  otherUserMarks: Mark[]
-  setCurrentUserMarks: (currentUserMarks: CurrentUserMark[]) => void
-  setIsReadyToSign: (isReadyToSign: boolean) => void
-  setUpdatedMarks: (markToUpdate: Mark) => void
 }
 
 /**
@@ -42,8 +41,7 @@ const PdfMarking = (props: PdfMarkingProps) => {
     setCurrentUserMarks,
     setUpdatedMarks,
     handleDownload,
-    meta,
-    otherUserMarks
+    meta
   } = props
   const [selectedMark, setSelectedMark] = useState<CurrentUserMark | null>(null)
   const [selectedMarkValue, setSelectedMarkValue] = useState<string>('')
@@ -144,7 +142,6 @@ const PdfMarking = (props: PdfMarkingProps) => {
                   selectedMarkValue={selectedMarkValue}
                   selectedMark={selectedMark}
                   currentUserMarks={currentUserMarks}
-                  otherUserMarks={otherUserMarks}
                 />
               </div>
             )}

src/components/PDFView/PdfPageItem.tsx

@@ -1,17 +1,14 @@
 import styles from '../DrawPDFFields/style.module.scss'
 import { PdfPage } from '../../types/drawing.ts'
-import { CurrentUserMark, Mark } from '../../types/mark.ts'
+import { CurrentUserMark } from '../../types/mark.ts'
 import PdfMarkItem from './PdfMarkItem.tsx'
 import { useEffect, useRef } from 'react'
-import pdfViewStyles from './style.module.scss'
-import { inPx } from '../../utils/pdf.ts'
 interface PdfPageProps {
+  page: PdfPage
   currentUserMarks: CurrentUserMark[]
   handleMarkClick: (id: number) => void
-  otherUserMarks: Mark[]
-  page: PdfPage
-  selectedMark: CurrentUserMark | null
   selectedMarkValue: string
+  selectedMark: CurrentUserMark | null
 }
 
 /**
@@ -22,8 +19,7 @@ const PdfPageItem = ({
   currentUserMarks,
   handleMarkClick,
   selectedMarkValue,
-  selectedMark,
-  otherUserMarks
+  selectedMark
 }: PdfPageProps) => {
   useEffect(() => {
     if (selectedMark !== null && !!markRefs.current[selectedMark.id]) {
@@ -53,20 +49,6 @@ const PdfPageItem = ({
           />
         </div>
       ))}
-      {otherUserMarks.map((m, i) => (
-        <div
-          key={i}
-          className={pdfViewStyles.otherUserMarksDisplay}
-          style={{
-            left: inPx(m.location.left),
-            top: inPx(m.location.top),
-            width: inPx(m.location.width),
-            height: inPx(m.location.height)
-          }}
-        >
-          {m.value}
-        </div>
-      ))}
     </div>
   )
 }

src/components/PDFView/index.tsx

@@ -1,17 +1,16 @@
 import { Divider } from '@mui/material'
 import PdfItem from './PdfItem.tsx'
-import { CurrentUserMark, Mark } from '../../types/mark.ts'
+import { CurrentUserMark } from '../../types/mark.ts'
 import { CurrentUserFile } from '../../types/file.ts'
 import { useEffect, useRef } from 'react'
 
 interface PdfViewProps {
-  currentFile: CurrentUserFile | null
-  currentUserMarks: CurrentUserMark[]
   files: CurrentUserFile[]
+  currentUserMarks: CurrentUserMark[]
   handleMarkClick: (id: number) => void
-  otherUserMarks: Mark[]
-  selectedMark: CurrentUserMark | null
   selectedMarkValue: string
+  selectedMark: CurrentUserMark | null
+  currentFile: CurrentUserFile | null
 }
 
 /**
@@ -23,8 +22,7 @@ const PdfView = ({
   handleMarkClick,
   selectedMarkValue,
   selectedMark,
-  currentFile,
-  otherUserMarks
+  currentFile
 }: PdfViewProps) => {
   const pdfRefs = useRef<(HTMLDivElement | null)[]>([])
   useEffect(() => {
@@ -43,9 +41,6 @@ const PdfView = ({
       (currentUserMark) => currentUserMark.mark.pdfFileHash === hash
     )
   }
-  const filterMarksByFile = (marks: Mark[], hash: string): Mark[] => {
-    return marks.filter((mark) => mark.pdfFileHash === hash)
-  }
   const isNotLastPdfFile = (index: number, files: CurrentUserFile[]): boolean =>
     index !== files.length - 1
   return (
@@ -65,7 +60,6 @@ const PdfView = ({
               selectedMark={selectedMark}
               handleMarkClick={handleMarkClick}
               selectedMarkValue={selectedMarkValue}
-              otherUserMarks={filterMarksByFile(otherUserMarks, hash)}
             />
             {isNotLastPdfFile(index, arr) && <Divider>File Separator</Divider>}
           </div>

src/components/PDFView/style.module.scss

@@ -29,11 +29,3 @@
   height: 100%;
   gap: 10px;
 }
-
-.otherUserMarksDisplay {
-  position: absolute;
-  z-index: 50;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}

src/pages/sign/index.tsx

@@ -32,8 +32,7 @@ import {
   readContentOfZipEntry,
   sendNotification,
   signEventForMetaFile,
-  updateUsersAppData,
-  findOtherUserMarks
+  updateUsersAppData
 } from '../../utils'
 import { Container } from '../../components/Container'
 import { DisplayMeta } from './internal/displayMeta'
@@ -111,7 +110,6 @@ export const SignPage = () => {
     []
   )
   const [isReadyToSign, setIsReadyToSign] = useState(false)
-  const [otherUserMarks, setOtherUserMarks] = useState<Mark[]>([])
 
   useEffect(() => {
     if (signers.length > 0) {
@@ -211,8 +209,6 @@ export const SignPage = () => {
         )
         const signedMarks = extractMarksFromSignedMeta(meta)
         const currentUserMarks = getCurrentUserMarks(metaMarks, signedMarks)
-        const otherUserMarks = findOtherUserMarks(signedMarks, usersPubkey!)
-        setOtherUserMarks(otherUserMarks)
         setCurrentUserMarks(currentUserMarks)
         setIsReadyToSign(isCurrentUserMarksComplete(currentUserMarks))
       }
@@ -964,7 +960,6 @@ export const SignPage = () => {
       setCurrentUserMarks={setCurrentUserMarks}
       setUpdatedMarks={setUpdatedMarks}
       handleDownload={handleDownload}
-      otherUserMarks={otherUserMarks}
       meta={meta}
     />
   )

src/utils/mark.ts

@@ -127,10 +127,6 @@ const getUpdatedMark = (
   }
 }
 
-const findOtherUserMarks = (marks: Mark[], pubkey: string): Mark[] => {
-  return marks.filter((mark) => mark.npub !== hexToNpub(pubkey))
-}
-
 export {
   getCurrentUserMarks,
   filterMarksByPubkey,
@@ -140,6 +136,5 @@ export {
   updateMarks,
   updateCurrentUserMarks,
   isCurrentValueLast,
-  getUpdatedMark,
-  findOtherUserMarks
+  getUpdatedMark
 }