From 8e71592d8815471bde6fb74230ba9742308daad8 Mon Sep 17 00:00:00 2001
From: Stixx <stixx@nostrdev.com>
Date: Wed, 11 Sep 2024 11:59:12 +0200
Subject: [PATCH] fix: routing, removed useEffect

---
 src/components/DisplaySigit/index.tsx |  1 -
 src/pages/sign/index.tsx              | 63 ++++++++++-----------------
 src/routes/index.tsx                  |  7 +--
 3 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/src/components/DisplaySigit/index.tsx b/src/components/DisplaySigit/index.tsx
index 00716a3..641e9d6 100644
--- a/src/components/DisplaySigit/index.tsx
+++ b/src/components/DisplaySigit/index.tsx
@@ -50,7 +50,6 @@ export const DisplaySigit = ({ meta, parsedMeta, sigitKey }: SigitProps) => {
             ? appPublicRoutes.verify
             : `${appPrivateRoutes.sign}/${sigitKey}`
         }
-        state={{ meta }}
         className={styles.insetLink}
       ></Link>
       <p className={`line-clamp-2 ${styles.title}`}>{title}</p>
diff --git a/src/pages/sign/index.tsx b/src/pages/sign/index.tsx
index 70d9784..fa11fb7 100644
--- a/src/pages/sign/index.tsx
+++ b/src/pages/sign/index.tsx
@@ -65,6 +65,8 @@ export const SignPage = () => {
   const location = useLocation()
   const params = useParams()
 
+  const usersAppData = useAppSelector((state) => state.userAppData)
+
   /**
    * Received from `location.state`
    *
@@ -72,11 +74,27 @@ export const SignPage = () => {
    * arrayBuffer will be received in navigation from create page in offline mode
    * meta will be received in navigation from create & home page in online mode
    */
-  const [metaInNavState, setMetaInNavState] = useState<Meta | undefined>()
-  const [decryptedArrayBuffer, setDecryptedArrayBuffer] = useState<
-    ArrayBuffer | undefined
-  >()
-  const [uploadedZip, setUploadedZip] = useState<File | undefined>()
+  const {
+    meta: metaInNavState,
+    arrayBuffer: decryptedArrayBuffer,
+    uploadedZip
+  } = location.state || {
+    meta: undefined,
+    arrayBuffer: undefined,
+    uploadedZip: undefined
+  }
+
+  if (usersAppData) {
+    const sigitId = params.id
+
+    if (sigitId) {
+      const sigit = usersAppData.sigits[sigitId]
+
+      if (sigit) {
+        metaInNavState = sigit
+      }
+    }
+  }
 
   const [displayInput, setDisplayInput] = useState(false)
 
@@ -119,41 +137,6 @@ export const SignPage = () => {
   const [isMarksCompleted, setIsMarksCompleted] = useState(false)
   const [otherUserMarks, setOtherUserMarks] = useState<Mark[]>([])
 
-  const usersAppData = useAppSelector((state) => state.userAppData)
-
-  /**
-   * When location state changes, update the states in the component
-   * If sigit id is found in the URL PARAM we will set metaInNavState manually
-   * after we do the fetching based on the ID
-   */
-  useEffect(() => {
-    if (location.state) {
-      const { meta, arrayBuffer, uploadedZip } = location.state
-
-      setMetaInNavState(meta)
-      setDecryptedArrayBuffer(arrayBuffer)
-      setUploadedZip(uploadedZip)
-    }
-  }, [location.state])
-
-  useEffect(() => {
-    // If meta in nav state is populated we will not try to fetch sigit details
-    // from the redux store
-    if (metaInNavState) return
-
-    if (usersAppData) {
-      const sigitId = params.id
-
-      if (sigitId) {
-        const sigit = usersAppData.sigits[sigitId]
-
-        if (sigit) {
-          setMetaInNavState(sigit)
-        }
-      }
-    }
-  }, [usersAppData, metaInNavState, params.id])
-
   useEffect(() => {
     if (signers.length > 0) {
       // check if all signers have signed then its fully signed
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index 643017f..3e42e78 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -19,7 +19,6 @@ export const appPrivateRoutes = {
   homePage: '/',
   create: '/create',
   sign: '/sign',
-  signId: '/sign/:id',
   settings: '/settings',
   profileSettings: '/settings/profile/:npub',
   cacheSettings: '/settings/cache',
@@ -130,11 +129,7 @@ export const privateRoutes = [
     element: <CreatePage />
   },
   {
-    path: appPrivateRoutes.sign,
-    element: <SignPage />
-  },
-  {
-    path: appPrivateRoutes.signId,
+    path: `${appPrivateRoutes.sign}/:id?`,
     element: <SignPage />
   },
   {