src/components/DisplaySigit/index.tsx

@@ -22,16 +22,11 @@ import { useSigitMeta } from '../../hooks/useSigitMeta'
 import { extractFileExtensions } from '../../utils/file'
 
 type SigitProps = {
-  sigitCreateId: string
   meta: Meta
   parsedMeta: SigitCardDisplayInfo
 }
 
-export const DisplaySigit = ({
-  meta,
-  parsedMeta,
-  sigitCreateId: sigitCreateId
-}: SigitProps) => {
+export const DisplaySigit = ({ meta, parsedMeta }: SigitProps) => {
   const { title, createdAt, submittedBy, signers, signedStatus, isValid } =
     parsedMeta
 
@@ -40,19 +35,15 @@ export const DisplaySigit = ({
 
   return (
     <div className={styles.itemWrapper}>
-      {signedStatus === SigitStatus.Complete && (
       <Link
-          to={appPublicRoutes.verify}
+        to={
+          signedStatus === SigitStatus.Complete
+            ? appPublicRoutes.verify
+            : appPrivateRoutes.sign
+        }
         state={{ meta }}
         className={styles.insetLink}
       ></Link>
-      )}
-      {signedStatus !== SigitStatus.Complete && (
-        <Link
-          to={`${appPrivateRoutes.sign}/${sigitCreateId}`}
-          className={styles.insetLink}
-        ></Link>
-      )}
       <p className={`line-clamp-2 ${styles.title}`}>{title}</p>
       <div className={styles.users}>
         {submittedBy && (

src/components/MarkFormField/index.tsx

@@ -1,7 +1,7 @@
 import { CurrentUserMark } from '../../types/mark.ts'
 import styles from './style.module.scss'
 
-import { MARK_TYPE_TRANSLATION } from '../../utils/const.ts'
+import { MARK_TYPE_TRANSLATION, NEXT, SIGN } from '../../utils/const.ts'
 import {
   findNextIncompleteCurrentUserMark,
   isCurrentUserMarksComplete,
@@ -32,6 +32,7 @@ const MarkFormField = ({
   handleCurrentUserMarkChange
 }: MarkFormFieldProps) => {
   const [displayActions, setDisplayActions] = useState(true)
+  const getSubmitButtonText = () => (isReadyToSign() ? SIGN : NEXT)
   const isReadyToSign = () =>
     isCurrentUserMarksComplete(currentUserMarks) ||
     isCurrentValueLast(currentUserMarks, selectedMark, selectedMarkValue)
@@ -60,7 +61,6 @@ const MarkFormField = ({
           onClick={toggleActions}
           className={styles.triggerBtn}
           type="button"
-          title="Toggle"
         >
           <svg
             xmlns="http://www.w3.org/2000/svg"
@@ -93,7 +93,7 @@ const MarkFormField = ({
               />
               <div className={styles.actionsBottom}>
                 <button type="submit" className={styles.submitButton}>
-                  NEXT
+                  {getSubmitButtonText()}
                 </button>
               </div>
             </form>

src/pages/home/index.tsx

@@ -257,7 +257,6 @@ export const HomePage = () => {
             .map((key) => (
               <DisplaySigit
                 key={`sigit-${key}`}
-                sigitCreateId={key}
                 parsedMeta={parsedSigits[key]}
                 meta={sigits[key]}
               />

src/pages/landing/index.tsx

@@ -35,7 +35,7 @@ export const LandingPage = () => {
       title: <>Open Source</>,
       description: (
         <>
-          Code is AGPL licenced and available at{' '}
+          Code is MIT licenced and available at{' '}
           <a href="https://git.nostrdev.com/sigit/sigit.io">
             https://git.nostrdev.com/sigit/sigit.io
           </a>
@@ -120,7 +120,9 @@ export const LandingPage = () => {
       <Container className={styles.container}>
         <img className={styles.logo} src="/logo.svg" alt="Logo" width={300} />
         <div className={styles.titleSection}>
-          <h1 className={styles.title}>Secure &amp; Private Agreements</h1>
+          <h1 className={styles.title}>
+            Secure &amp; Private Document Signing
+          </h1>
           <p className={styles.subTitle}>
             An open-source and self-hostable solution for secure document
             signing and verification.

src/pages/sign/index.tsx

@@ -7,7 +7,7 @@ import { MuiFileInput } from 'mui-file-input'
 import { Event, verifyEvent } from 'nostr-tools'
 import { useCallback, useEffect, useState } from 'react'
 import { useSelector } from 'react-redux'
-import { useLocation, useNavigate, useParams } from 'react-router-dom'
+import { useLocation, useNavigate } from 'react-router-dom'
 import { toast } from 'react-toastify'
 import { LoadingSpinner } from '../../components/LoadingSpinner'
 import { NostrController } from '../../controllers'
@@ -54,7 +54,6 @@ import {
   SigitFile
 } from '../../utils/file.ts'
 import { ARRAY_BUFFER, DEFLATE } from '../../utils/const.ts'
-import { useAppSelector } from '../../hooks/store.ts'
 enum SignedStatus {
   Fully_Signed,
   User_Is_Next_Signer,
@@ -64,39 +63,17 @@ enum SignedStatus {
 export const SignPage = () => {
   const navigate = useNavigate()
   const location = useLocation()
-  const params = useParams()
-
-  const usersAppData = useAppSelector((state) => state.userAppData)
 
   /**
-   * Received from `location.state`
-   *
    * uploadedZip will be received from home page when a user uploads a sigit zip wrapper that contains keys.json
-   * arrayBuffer (decryptedArrayBuffer) will be received in navigation from create page in offline mode
-   * meta (metaInNavState) will be received in navigation from create & home page in online mode
+   * 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
    */
-  let metaInNavState = location?.state?.meta || undefined
-  const { arrayBuffer: decryptedArrayBuffer, uploadedZip } = location.state || {
-    decryptedArrayBuffer: undefined,
-    uploadedZip: undefined
-  }
-
-  /**
-   * If userAppData (redux) is available, and we have the route param (sigit id)
-   * which is actually a `createEventId`, we will fetch a `sigit`
-   * based on the provided route ID and set fetched `sigit` to the `metaInNavState`
-   */
-  if (usersAppData) {
-    const sigitCreateId = params.id
-
-    if (sigitCreateId) {
-      const sigit = usersAppData.sigits[sigitCreateId]
-
-      if (sigit) {
-        metaInNavState = sigit
-      }
-    }
-  }
+  const {
+    meta: metaInNavState,
+    arrayBuffer: decryptedArrayBuffer,
+    uploadedZip
+  } = location.state || {}
 
   const [displayInput, setDisplayInput] = useState(false)
 

src/routes/index.tsx

@@ -129,7 +129,7 @@ export const privateRoutes = [
     element: <CreatePage />
   },
   {
-    path: `${appPrivateRoutes.sign}/:id?`,
+    path: appPrivateRoutes.sign,
     element: <SignPage />
   },
   {

src/utils/const.ts

@@ -4,6 +4,8 @@ export const EMPTY: string = ''
 export const MARK_TYPE_TRANSLATION: { [key: string]: string } = {
   [MarkType.FULLNAME.valueOf()]: 'Full Name'
 }
+export const SIGN: string = 'Sign'
+export const NEXT: string = 'Next'
 export const ARRAY_BUFFER = 'arraybuffer'
 export const DEFLATE = 'DEFLATE'
 

src/utils/mark.ts

@@ -153,11 +153,6 @@ const findOtherUserMarks = (marks: Mark[], pubkey: string): Mark[] => {
 }
 
 export const DEFAULT_TOOLBOX: DrawTool[] = [
-  {
-    identifier: MarkType.TEXT,
-    icon: faT,
-    label: 'Text'
-  },
   {
     identifier: MarkType.FULLNAME,
     icon: faIdCard,
@@ -182,6 +177,11 @@ export const DEFAULT_TOOLBOX: DrawTool[] = [
     label: 'Date Time',
     isComingSoon: true
   },
+  {
+    identifier: MarkType.TEXT,
+    icon: faT,
+    label: 'Text'
+  },
   {
     identifier: MarkType.NUMBER,
     icon: fa1,