Merge pull request #790 from nxglabs/fix_readonly

fix: width should be 100% of text type widgets
Merge pull request #1789 from OpenSignLabs/updates-15483575034
2026-09-04 16:58:05 +02:00 · 2025-06-11 17:51:34 +00:00 · 2025-06-06 11:17:12 +05:30 · 2025-06-06 05:33:37 +00:00 · 2025-06-04 00:17:30 +05:30 · 2025-06-03 18:45:49 +00:00
57 changed files with 7840 additions and 5535 deletions
@@ -73,12 +73,28 @@ Welcome to OpenSign, the premier open source docusign alternative - document e-s

 ---

-### Installation
+### Deploy

+Note: The default MongoDB instance used in deployment is not persistant and will be cleared on every restart. To retain your data, configure and supply your own MongoDB connection URL.
+
+#### DigitalOcean
+[![Deploy on DigitalOcean](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/OpenSignLabs/Deploy-OpenSign-to-Digital-Ocean/tree/main&refcode=30db1c901ab0)
+
+#### Docker
 The simplest way to install OpenSign on your own server is using official docker images by running the following command -
+
+**Command for linux/MacOS**
 ``` 
 export HOST_URL=https://opensign.yourdomain.com && curl --remote-name-all https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/docker-compose.yml https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/Caddyfile https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/.env.local_dev && mv .env.local_dev .env.prod && docker compose up --force-recreate
 ```
+**Command for Windows (Powershell)**
+```
+$env:HOST_URL="https://opensign.yourdomain.com"; Invoke-WebRequest -Uri https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/docker-compose.yml -OutFile docker-compose.yml; Invoke-WebRequest -Uri https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/Caddyfile -OutFile Caddyfile; Invoke-WebRequest -Uri https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/.env.local_dev -OutFile .env.local_dev; Rename-Item -Path .env.local_dev -NewName .env.prod; docker compose up --force-recreate
+```
+**Command for Windows (CMD/Terminal)**
+```
+set HOST_URL=https://opensign.yourdomain.com && curl -O https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/docker-compose.yml && curl -O https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/Caddyfile && curl -O https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/.env.local_dev && rename .env.local_dev .env.prod && docker compose up --force-recreate
+```
 Make sure that you have `Docker` and `git` installed before you run this command -

 Please refer to the [Installation Guide](https://docs.opensignlabs.com/docs/self-host/docker/run-locally/) for detailed instructions on how to install OpenSign on your system.
@@ -1,25 +0,0 @@
-# Use an official Node runtime as the base image
-FROM node:18
-
-# Set the working directory inside the container
-WORKDIR /usr/src/app
-
-# Copy package.json and package-lock.json first to leverage Docker cache
-COPY ./package*.json ./
-
-# Install application dependencies
-RUN npm install
-
-# Copy the current directory contents into the container
-COPY ./ .
-COPY ./.husky .
-
-# Make port 3000 available to the world outside this container
-EXPOSE 3000
-
-# Define environment variables if needed
-# ENV NODE_ENV production
-
-# Run the application
-ENTRYPOINT npm run start
-
@@ -13,6 +13,10 @@ RUN npm install
 # Copy the current directory contents into the container
 COPY apps/OpenSign/ .
 COPY apps/OpenSign/.husky .
+COPY apps/OpenSign/entrypoint.sh .
+
+# make the entrypoint.sh file executable
+RUN chmod +x entrypoint.sh

 # Define environment variables if needed
 ENV NODE_ENV=production
@@ -20,8 +24,13 @@ ENV GENERATE_SOURCEMAP=false
 # build
 RUN npm run build

+# Inject env.js loader into index.html
+RUN sed -i '/<head>/a\<script src="/env.js"></script>' build/index.html
+
 # Make port 3000 available to the world outside this container
 EXPOSE 3000

+ENTRYPOINT ["./entrypoint.sh"]
+
 # Run the application
 CMD ["npm", "start"]
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+ENV_FILE=./build/env.js
+DOTENV_FILE=./.env.prod # ✅ use .env.prod
+
+echo "Generating runtime env file at $ENV_FILE..."
+
+echo "window.RUNTIME_ENV = {" > $ENV_FILE
+
+# List of keys to include
+RUNTIME_KEYS="REACT_APP_SERVERURL"
+
+for key in $RUNTIME_KEYS; do
+  # First check docker env (-e), fallback to .env file
+  value=$(printenv "$key")
+
+  if [ -z "$value" ] && [ -f "$DOTENV_FILE" ]; then
+    # fallback: read from .env
+    value=$(grep "^$key=" "$DOTENV_FILE" | cut -d '=' -f2- | tr -d '\r\n' | sed 's/"/\\"/g')
+  else
+    value=$(echo "$value" | sed 's/"/\\"/g')
+  fi
+
+  echo "  $key: \"$value\"," >> $ENV_FILE
+done
+
+echo "};" >> $ENV_FILE
+
+exec "$@"
@@ -4,11 +4,11 @@
  "private": true,
  "dependencies": {
    "@formkit/auto-animate": "^0.8.2",
-    "@lottiefiles/dotlottie-react": "^0.13.5",
+    "@imgly/background-removal": "^1.6.0",
+    "@lottiefiles/dotlottie-react": "^0.14.0",
    "@pdf-lib/fontkit": "^1.1.1",
    "@radix-ui/themes": "^3.2.1",
    "@reduxjs/toolkit": "^2.8.2",
-    "@imgly/background-removal": "^1.6.0",
    "axios": "^1.9.0",
    "date-fns-tz": "^3.2.0",
    "file-saver": "^2.0.5",
@@ -20,13 +20,14 @@
    "moment": "^2.30.1",
    "parse": "^6.1.1",
    "pdf-lib": "^1.17.1",
+    "pkijs": "^3.0.8",
    "print-js": "^1.6.0",
    "prismjs": "^1.30.0",
    "radix-ui": "^1.4.2",
    "react": "^18.3.1",
    "react-bootstrap": "^2.10.10",
    "react-confetti": "^6.4.0",
-    "react-datepicker": "^8.3.0",
+    "react-datepicker": "^8.4.0",
    "react-dnd": "^16.0.1",
    "react-dnd-html5-backend": "^16.0.1",
    "react-dnd-multi-backend": "^9.0.0",
@@ -34,13 +35,13 @@
    "react-dom": "^18.3.1",
    "react-gtm-module": "^2.0.11",
    "react-helmet": "^6.1.0",
-    "react-i18next": "^15.5.1",
+    "react-i18next": "^15.5.2",
    "react-konva": "^18.2.10",
    "react-pdf": "^9.2.1",
    "react-quill-new": "^3.4.6",
    "react-redux": "^9.2.0",
    "react-rnd": "^10.5.2",
-    "react-router": "^7.6.0",
+    "react-router": "^7.6.1",
    "react-scrollbars-custom": "^4.1.1",
    "react-select": "^5.10.1",
    "react-signature-canvas": "^1.1.0-alpha.2",
@@ -51,7 +52,7 @@
    "regex-parser": "^2.3.1",
    "serve": "^14.2.4",
    "styled-components": "^5.3.11",
-    "web-vitals": "^5.0.1",
+    "web-vitals": "^5.0.2",
    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
  },
  "scripts": {
@@ -92,16 +93,17 @@
    }
  },
  "devDependencies": {
-    "@babel/core": "^7.27.1",
+    "@babel/core": "^7.27.4",
    "@babel/preset-env": "^7.27.2",
    "@babel/preset-react": "^7.27.1",
-    "@babel/runtime-corejs2": "^7.27.1",
+    "@babel/runtime-corejs2": "^7.27.4",
    "@testing-library/jest-dom": "^6.6.3",
    "@testing-library/react": "^16.3.0",
    "@testing-library/user-event": "^14.6.1",
-    "@types/react": "^18.3.22",
-    "@vitejs/plugin-react": "^4.4.1",
-    "@vitejs/plugin-react-swc": "^3.9.0",
+    "@types/react": "^18.3.23",
+    "@vitejs/plugin-react": "^4.5.1",
+    "@vitejs/plugin-react-swc": "^3.10.1",
+    "@vitest/ui": "^3.2.0",
    "autoprefixer": "^10.4.21",
    "babel-loader": "^10.0.0",
    "commitizen": "^4.3.1",
@@ -109,19 +111,20 @@
    "css-loader": "^7.1.2",
    "daisyui": "^4.12.24",
    "dotenv": "^16.5.0",
-    "eslint": "^9.27.0",
-    "eslint-plugin-prettier": "^5.4.0",
+    "eslint": "^9.28.0",
+    "eslint-plugin-prettier": "^5.4.1",
    "eslint-plugin-react": "^7.37.5",
-    "lint-staged": "^16.0.0",
-    "postcss": "^8.5.3",
+    "jsdom": "^26.1.0",
+    "lint-staged": "^16.1.0",
+    "postcss": "^8.5.4",
    "prettier": "^3.5.3",
-    "pretty-quick": "^4.1.1",
+    "pretty-quick": "^4.2.2",
    "rollup-plugin-node-polyfills": "^0.2.1",
    "tailwindcss": "^3.4.17",
    "vite": "^6.3.5",
    "vite-plugin-svgr": "^4.3.0",
    "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.0"
  },
  "engines": {
    "node": "18 || 20 || 22"
@@ -1,6 +1,7 @@
 { 
  "header-news": "Neue Funktion: Benutzer des Teams-Plans können jetzt ihre eigenen AWS S3-Buckets für die Dateispeicherung integrieren",
  "header-news-btn": "Jetzt einrichten",
+  "sandbox-news": "Dies ist eine Sandbox-Umgebung. Bitte nicht für produktive Zwecke verwenden.",
  "create-account": "Konto erstellen",
  "login": "Anmelden",
  "language": "Sprache",
@@ -360,6 +361,7 @@
    "date": "Datum",
    "text": "Text",
    "text input": "Texteingabe",
+    "cells": "Zellen",
    "checkbox": "Checkbox",
    "dropdown": "Dropdown",
    "radio button": "Radiobutton",
@@ -414,10 +416,12 @@
  "options": "Optionen",
  "minimun-check": "Minimale Anzahl",
  "maximum-check": "Maximale Anzahl",
+  "cell-count": "Zellzahl",
  "default-value": "Standardwert",
  "select": "Auswählen",
-  "read-only": "Nur lesen",
+  "read-only": "Ist schreibgeschützt",
  "hide-labels": "Labels ausblenden",
+  "layout": "Layout",
  "checkbox": "Checkbox",
  "alert": "Warnung",
  "zoom-in": "Vergrößern",
@@ -675,7 +679,7 @@
  "public-template-mssg-1": "Um OpenSign in Ihr React- oder Next.js-Projekt zu integrieren, führen Sie einfach den folgenden Befehl aus:",
  "public-template-mssg-2": "Stellen Sie sicher, dass npm oder yarn in Ihrem Projekt eingerichtet ist. Wenn Sie Yarn verwenden, können Sie npm install durch yarn add @opensign/react ersetzen.",
  "public-template-mssg-3": "Benötigen Sie weitere Details oder Beispiele?",
-  "public-template-mssg-4": "Besuchen Sie die",
+  "public-template-mssg-4": "Besuchen Sie die ",
  "public-template-mssg-5": " npm für die neuesten Updates, detaillierte Dokumentationen und Versionshistorie.",
  "public-template-mssg-6": "Bevor Sie diesen Code-Schnipsel verwenden können, müssen Sie diese Vorlage öffentlich machen.",
  "public-template-mssg-7": "Bevor Sie einen öffentlichen Link generieren können, müssen Sie diese Vorlage öffentlich machen.",
@@ -980,5 +984,50 @@
  "finish-mssg": "Sind Sie sicher, dass Sie das Dokument abschließen möchten?",
  "review": "Überprüfen",
  "next-field": "Nächstes Feld",
-  "required-mssg": "{{leftRequiredWidget}} von {{totalWidget}} Feldern übrig"
+  "required-mssg": "{{leftRequiredWidget}} von {{totalWidget}} Feldern übrig",
+  "verify-document-signature": "Dokumentensignatur überprüfen",
+  "select-pdf-document": "PDF-Dokument auswählen",
+  "selected-file": "Ausgewählte Datei",
+  "verify-signature": "Signatur überprüfen",
+  "verification-status": "Überprüfungsstatus",
+  "verification-in-progress": "Überprüfung läuft...",
+  "verification-results-will-appear-here": "Überprüfungsergebnisse werden hier angezeigt",
+  "please-select-pdf": "Bitte wählen Sie eine gültige PDF-Datei aus",
+  "please-select-file-to-verify": "Bitte wählen Sie eine Datei zur Überprüfung aus",
+  "no-signature-found": "Keine Signatur im Dokument gefunden",
+  "error-verifying-pdf": "Fehler beim Überprüfen der PDF",
+  "signature-valid-basic": "Signatur ist gültig",
+  "signature-invalid-basic": "Signatur ist ungültig",
+  "all-signatures-verified-convincing": "Dokument überprüft: Alle Signaturen wurden erfolgreich validiert.",
+  "some-signatures-invalid-basic": "Einige Signaturen sind ungültig",
+  "no-signatures-processed": "Keine Signaturen verarbeitet",
+  "unnamed-signature-field": "Unbenanntes Signaturfeld",
+  "error-processing-signature": "Fehler beim Verarbeiten der Signatur",
+  "signer-info-not-available": "Signaturinformationen nicht verfügbar",
+  "cert-validity-not-checked": "Gültigkeit des Zertifikats nicht geprüft",
+  "valid": "Gültig",
+  "expired-or-not-yet-valid": "Abgelaufen oder noch nicht gültig",
+  "valid-from": "Gültig von",
+  "to": "bis",
+  "signer": "Unterzeichner",
+  "issuer": "Aussteller",
+  "not-available": "Nicht verfügbar",
+  "not-performed": "Nicht durchgeführt",
+  "missing-acrofield-dict": "Fehlendes Acrofield-Wörterbuch",
+  "signature-dictionary-not-found-or-invalid": "Signaturwörterbuch nicht gefunden oder ungültig",
+  "missing-or-invalid-byterange": "Fehlender oder ungültiger ByteRange",
+  "missing-or-invalid-contents": "Fehlender oder ungültiger Inhalt",
+  "missing-signature-contents": "Fehlender Signaturinhalt",
+  "invalid-signature-hex-format": "Ungültiges Signatur-Hex-Format",
+  "unsupported-signature-format-not-signeddata": "Nicht unterstütztes Signaturformat - nicht SignedData",
+  "signer-certificate-not-found": "Unterzeichnerzertifikat nicht gefunden",
+  "no-certificates-in-signature": "Keine Zertifikate in der Signatur",
+  "no-signer-info-in-pkcs7": "Keine Signaturinformationen in PKCS#7",
+  "could-not-parse-signer-info": "Signaturinformationen konnten nicht analysiert werden",
+  "not-calculated": "Nicht berechnet",
+  "not-found-in-signature": "Nicht in Signatur gefunden",
+  "readonly-textinput-error": "Schreibgeschütztes Text-Widget muss einen Standardwert haben oder optional sein.",
+  "readonly-dropdown-error": "Schreibgeschütztes Dropdown-Widget muss einen Standardwert haben oder optional sein.",
+  "readonly-radiobtn-error": "Schreibgeschütztes Optionsfeld-Widget muss einen Standardwert haben oder optional sein.",
+  "choose-one":"Wählen Sie eine aus"
 }
@@ -1,6 +1,7 @@
 {
  "header-news": "New feature: Protect your account with Two-Factor Authentication (2FA) and enjoy the future of login with Passkeys — no passwords needed.",
  "header-news-btn": "Setup now",
+  "sandbox-news": "This is a sandbox environment. Please do not use it for production purposes.",
  "create-account": "Create account",
  "login": "Login",
  "language": "Language",
@@ -360,6 +361,7 @@
    "date": "date",
    "text": "text",
    "text input": "text input",
+    "cells": "cells",
    "checkbox": "checkbox",
    "dropdown": "dropdown",
    "radio button": "radio button",
@@ -414,10 +416,12 @@
  "options": "Options",
  "minimun-check": "Minimun check",
  "maximum-check": "Maximum check",
+  "cell-count": "Cell count",
  "default-value": "Default value",
  "select": "Select",
-  "read-only": "Is read only",
+  "read-only": "read only",
  "hide-labels": "Hide labels",
+  "layout": "Layout",
  "checkbox": "Checkbox",
  "alert": "Alert",
  "zoom-in": "Zoom in",
@@ -675,7 +679,7 @@
  "public-template-mssg-1": "To integrate OpenSign into your React or Next.js project, simply run the following command:",
  "public-template-mssg-2": "Ensure you have npm or yarn set up in your project. If you're using Yarn, you can replace npm install with yarn add @opensign/react.",
  "public-template-mssg-3": "Need more details or examples?",
-  "public-template-mssg-4": "Visit the",
+  "public-template-mssg-4": "Visit the ",
  "public-template-mssg-5": " npm for the latest updates, detailed documentation, and version history.",
  "public-template-mssg-6": "Before you can use this code snippet, you must make this template public.",
  "public-template-mssg-7": "Before you can generate a public link you must make this template public.",
@@ -980,5 +984,50 @@
  "finish-mssg":" Are you sure you want to finish the document ?",
  "review":"Review",
  "next-field":"Next Field",
-  "required-mssg":"{{leftRequiredWidget}} of {{totalWidget}} fields left"
+  "required-mssg":"{{leftRequiredWidget}} of {{totalWidget}} fields left",
+  "verify-document-signature": "Verify Document Signature",
+  "select-pdf-document": "Select PDF Document",
+  "selected-file": "Selected file",
+  "verify-signature": "Verify Signature",
+  "verification-status": "Verification Status",
+  "verification-in-progress": "Verification in progress...",
+  "verification-results-will-appear-here": "Verification results will appear here",
+  "please-select-pdf": "Please select a valid PDF file",
+  "please-select-file-to-verify": "Please select a file to verify",
+  "no-signature-found": "No signature found in the document",
+  "error-verifying-pdf": "Error verifying PDF",
+  "signature-valid-basic": "Signature is valid",
+  "signature-invalid-basic": "Signature is invalid",
+  "all-signatures-verified-convincing": "Document Verified: All signatures have been successfully validated.",
+  "some-signatures-invalid-basic": "Some signatures are invalid",
+  "no-signatures-processed": "No signatures were processed",
+  "unnamed-signature-field": "Unnamed Signature Field",
+  "error-processing-signature": "Error processing signature",
+  "signer-info-not-available": "Signer information not available",
+  "cert-validity-not-checked": "Certificate validity not checked",
+  "valid": "Valid",
+  "expired-or-not-yet-valid": "Expired or not yet valid",
+  "valid-from": "Valid from",
+  "to": "to",
+  "signer": "Signer",
+  "issuer": "Issuer",
+  "not-available": "Not available",
+  "not-performed": "Not performed",
+  "missing-acrofield-dict": "Missing acrofield dictionary",
+  "signature-dictionary-not-found-or-invalid": "Signature dictionary not found or invalid",
+  "missing-or-invalid-byterange": "Missing or invalid ByteRange",
+  "missing-or-invalid-contents": "Missing or invalid Contents",
+  "missing-signature-contents": "Missing signature contents",
+  "invalid-signature-hex-format": "Invalid signature hex format",
+  "unsupported-signature-format-not-signeddata": "Unsupported signature format - not SignedData",
+  "signer-certificate-not-found": "Signer certificate not found",
+  "no-certificates-in-signature": "No certificates in signature",
+  "no-signer-info-in-pkcs7": "No signer info in PKCS#7",
+  "could-not-parse-signer-info": "Could not parse signer info",
+  "not-calculated": "Not calculated",
+  "not-found-in-signature": "Not found in signature",
+  "readonly-textinput-error": "Read-only text widget must have a default value or you can make it optional.",
+  "readonly-dropdown-error": "Read-only dropdown widget must have a default value or you can make it optional.",
+  "readonly-radiobtn-error": "Read-only radio button widget must have a default value or you can make it optional.",
+  "choose-one":"Choose One"
 }
@@ -1,6 +1,7 @@
 {
  "header-news": "Nueva característica: los usuarios del plan Teams ahora pueden integrar sus propios depósitos de AWS S3 para el almacenamiento de archivos",
  "header-news-btn": "Configurar ahora",
+  "sandbox-news": "Este es un entorno sandbox. Por favor, no lo utilice con fines de producción.",
  "create-account": "Crear cuenta",
  "login": "Iniciar sesión",
  "language": "Idioma",
@@ -361,6 +362,7 @@
    "date": "fecha",
    "text": "texto",
    "text input": "entrada de texto",
+    "cells": "células",
    "checkbox": "casilla",
    "dropdown": "desplegable",
    "radio button": "botón de radio",
@@ -415,10 +417,12 @@
  "options": "Opciones",
  "minimun-check": "Chequeo mínimo",
  "maximum-check": "Chequeo máximo",
+  "cell-count": "recuento de células",
  "default-value": "Valor por defecto",
  "select": "Seleccionar",
  "read-only": "Es de solo lectura",
  "hide-labels": "Esconder etiquetas",
+  "layout": "Diseño",
  "checkbox": "Casilla",
  "alert": "Alerta",
  "zoom-in": "Acercar",
@@ -675,7 +679,7 @@
  "public-template-mssg-1": "Para integrar OpenSign a tu proyecto React o Next.js, simplemente ejecuta los siguientes comandos:",
  "public-template-mssg-2": "Asegúrate de tener «npm» o «yarn» configurado en tu proyecto. Si estás usando «yarn», puedes reemplazar «npm install» con «yarn add @opensign/react».",
  "public-template-mssg-3": "¿Necesitas más detalles o ejemplos?",
-  "public-template-mssg-4": "Visita la",
+  "public-template-mssg-4": "Visita la ",
  "public-template-mssg-5": " «npm» para las últimas actualizaciones, documentación detallada e historial de versiones.",
  "public-template-mssg-6": "Antes de que puedas usar este fragmento de código, debes convertir esta plantilla en pública.",
  "public-template-mssg-7": "Antes de poder generar un enlace público, debes hacer que esta plantilla sea pública.",
@@ -980,5 +984,50 @@
  "finish-mssg": "¿Está seguro de que desea finalizar el documento?",
  "review": "Revisar",
  "next-field": "Siguiente campo",
-  "required-mssg": "{{leftRequiredWidget}} de {{totalWidget}} campos restantes"
+  "required-mssg": "{{leftRequiredWidget}} de {{totalWidget}} campos restantes",
+  "verify-document-signature": "Verificar firma del documento",
+  "select-pdf-document": "Seleccionar documento PDF",
+  "selected-file": "Archivo seleccionado",
+  "verify-signature": "Verificar firma",
+  "verification-status": "Estado de verificación",
+  "verification-in-progress": "Verificación en curso...",
+  "verification-results-will-appear-here": "Los resultados de la verificación aparecerán aquí",
+  "please-select-pdf": "Por favor, seleccione un archivo PDF válido",
+  "please-select-file-to-verify": "Por favor, seleccione un archivo para verificar",
+  "no-signature-found": "No se encontró ninguna firma en el documento",
+  "error-verifying-pdf": "Error al verificar el PDF",
+  "signature-valid-basic": "La firma es válida",
+  "signature-invalid-basic": "La firma no es válida",
+  "all-signatures-verified-convincing": "Documento verificado: Todas las firmas han sido validadas exitosamente.",
+  "some-signatures-invalid-basic": "Algunas firmas no son válidas",
+  "no-signatures-processed": "No se procesaron firmas",
+  "unnamed-signature-field": "Campo de firma sin nombre",
+  "error-processing-signature": "Error al procesar la firma",
+  "signer-info-not-available": "Información del firmante no disponible",
+  "cert-validity-not-checked": "Validez del certificado no verificada",
+  "valid": "Válido",
+  "expired-or-not-yet-valid": "Caducado o aún no válido",
+  "valid-from": "Válido desde",
+  "to": "hasta",
+  "signer": "Firmante",
+  "issuer": "Emisor",
+  "not-available": "No disponible",
+  "not-performed": "No realizado",
+  "missing-acrofield-dict": "Falta el diccionario Acrofield",
+  "signature-dictionary-not-found-or-invalid": "Diccionario de firmas no encontrado o inválido",
+  "missing-or-invalid-byterange": "ByteRange faltante o inválido",
+  "missing-or-invalid-contents": "Contenido faltante o inválido",
+  "missing-signature-contents": "Falta el contenido de la firma",
+  "invalid-signature-hex-format": "Formato hexadecimal de firma inválido",
+  "unsupported-signature-format-not-signeddata": "Formato de firma no compatible - no SignedData",
+  "signer-certificate-not-found": "Certificado del firmante no encontrado",
+  "no-certificates-in-signature": "No hay certificados en la firma",
+  "no-signer-info-in-pkcs7": "No hay información del firmante en PKCS#7",
+  "could-not-parse-signer-info": "No se pudo analizar la información del firmante",
+  "not-calculated": "No calculado",
+  "not-found-in-signature": "No encontrado en la firma",
+  "readonly-textinput-error": "El widget de texto de solo lectura debe tener un valor predeterminado o puede hacerse opcional.",
+  "readonly-dropdown-error": "El widget desplegable de solo lectura debe tener un valor predeterminado o puede hacerse opcional.",
+  "readonly-radiobtn-error": "El widget de botón de opción de solo lectura debe tener un valor predeterminado o puede hacerse opcional.",
+  "choose-one":"Elige uno"
 }
@@ -1,6 +1,7 @@
 {
  "header-news": "Nouvelle fonctionnalité : les utilisateurs du forfait Teams peuvent désormais intégrer leurs propres compartiments AWS S3 pour le stockage de fichiers",
  "header-news-btn": "Configurer maintenant",
+  "sandbox-news": "Ceci est un environnement sandbox. Veuillez ne pas l'utiliser à des fins de production.",
  "create-account": "Créer un compte",
  "login": "Se Connecter",
  "language": "Langue",
@@ -360,6 +361,7 @@
    "date": "date",
    "text": "texte",
    "text input": "saisie de texte",
+    "cells": "cellules",
    "checkbox": "case à cocher",
    "dropdown": "dérouler",
    "radio button": "bouton radio",
@@ -414,10 +416,12 @@
  "options": "Possibilités",
  "minimun-check": "Vérification minimale",
  "maximum-check": "Contrôle maximum",
+  "cell-count": "numération cellulaire",
  "default-value": "Valeur par défaut",
  "select": "Sélectionner",
  "read-only": "Est en lecture seule",
  "hide-labels": "Masquer les étiquettes",
+  "layout": "Disposition",
  "checkbox": "Case à cocher",
  "alert": "Alerte",
  "zoom-in": "Agrandir",
@@ -675,7 +679,7 @@
  "public-template-mssg-1": "Pour intégrer OpenSign dans votre projet React ou Next.js, exécutez simplement la commande suivante :",
  "public-template-mssg-2": "Assurez-vous que npm ou Yarn est configuré dans votre projet. Si vous utilisez Yarn, vous pouvez remplacer npm install par Yarn Add @opensign/react.",
  "public-template-mssg-3": "Besoin de plus de détails ou d'exemples ?",
-  "public-template-mssg-4": "Visitez le",
+  "public-template-mssg-4": "Visitez le ",
  "public-template-mssg-5": "npm pour les dernières mises à jour, une documentation détaillée et l'historique des versions.",
  "public-template-mssg-6": "Avant de pouvoir utiliser cet extrait de code, vous devez rendre ce modèle public.",
  "public-template-mssg-7": "Avant de pouvoir générer un lien public, vous devez rendre ce modèle public.",
@@ -980,5 +984,50 @@
  "finish-mssg": "Êtes-vous sûr de vouloir terminer le document ?",
  "review": "Revoir",
  "next-field": "Champ suivant",
-  "required-mssg":"{{leftRequiredWidget}} champs sur {{totalWidget}} restants"
+  "required-mssg":"{{leftRequiredWidget}} champs sur {{totalWidget}} restants",
+  "verify-document-signature": "Vérifier la signature du document",
+  "select-pdf-document": "Sélectionner le document PDF",
+  "selected-file": "Fichier sélectionné",
+  "verify-signature": "Vérifier la signature",
+  "verification-status": "État de la vérification",
+  "verification-in-progress": "Vérification en cours...",
+  "verification-results-will-appear-here": "Les résultats de la vérification apparaîtront ici",
+  "please-select-pdf": "Veuillez sélectionner un fichier PDF valide",
+  "please-select-file-to-verify": "Veuillez sélectionner un fichier à vérifier",
+  "no-signature-found": "Aucune signature trouvée dans le document",
+  "error-verifying-pdf": "Erreur lors de la vérification du PDF",
+  "signature-valid-basic": "La signature est valide",
+  "signature-invalid-basic": "La signature est invalide",
+  "all-signatures-verified-convincing": "Document vérifié : Toutes les signatures ont été validées avec succès.",
+  "some-signatures-invalid-basic": "Certaines signatures sont invalides",
+  "no-signatures-processed": "Aucune signature traitée",
+  "unnamed-signature-field": "Champ de signature sans nom",
+  "error-processing-signature": "Erreur lors du traitement de la signature",
+  "signer-info-not-available": "Informations sur le signataire non disponibles",
+  "cert-validity-not-checked": "Validité du certificat non vérifiée",
+  "valid": "Valide",
+  "expired-or-not-yet-valid": "Expiré ou pas encore valide",
+  "valid-from": "Valide du",
+  "to": "au",
+  "signer": "Signataire",
+  "issuer": "Émetteur",
+  "not-available": "Non disponible",
+  "not-performed": "Non effectué",
+  "missing-acrofield-dict": "Dictionnaire Acrofield manquant",
+  "signature-dictionary-not-found-or-invalid": "Dictionnaire de signatures introuvable ou invalide",
+  "missing-or-invalid-byterange": "ByteRange manquant ou invalide",
+  "missing-or-invalid-contents": "Contenu manquant ou invalide",
+  "missing-signature-contents": "Contenu de la signature manquant",
+  "invalid-signature-hex-format": "Format hexadécimal de signature invalide",
+  "unsupported-signature-format-not-signeddata": "Format de signature non pris en charge - pas SignedData",
+  "signer-certificate-not-found": "Certificat du signataire introuvable",
+  "no-certificates-in-signature": "Aucun certificat dans la signature",
+  "no-signer-info-in-pkcs7": "Aucune information sur le signataire dans PKCS#7",
+  "could-not-parse-signer-info": "Impossible d'analyser les informations sur le signataire",
+  "not-calculated": "Non calculé",
+  "not-found-in-signature": "Introuvable dans la signature",
+  "readonly-textinput-error": "Le widget de texte en lecture seule doit avoir une valeur par défaut ou être rendu optionnel.",
+  "readonly-dropdown-error": "Le widget déroulant en lecture seule doit avoir une valeur par défaut ou être rendu optionnel.",
+  "readonly-radiobtn-error": "Le widget bouton radio en lecture seule doit avoir une valeur par défaut ou être rendu optionnel.",
+  "choose-one":"Choisissez-en un"
 }
@@ -1,6 +1,7 @@
 {
  "header-news": "Nuova funzionalità: Gli utenti del piano Teams possono ora integrare i propri bucket AWS S3 per l'archiviazione dei file",
  "header-news-btn": "Configura Ora",
+  "sandbox-news": "Questo è un ambiente sandbox. Si prega di non utilizzarlo per scopi di produzione.",  
  "create-account": "Crea Account",
  "login": "Accedi",
  "language": "Lingua",
@@ -360,6 +361,7 @@
    "date": "data",
    "text": "testo",
    "text input": "campo di testo",
+    "cells": "cellule",
    "checkbox": "casella di controllo",
    "dropdown": "menu a tendina",
    "radio button": "pulsante di opzione",
@@ -414,10 +416,12 @@
  "options": "Opzioni",
  "minimun-check": "Controllo minimo",
  "maximum-check": "Controllo massimo",
+  "cell-count": "conteggio delle cellule",
  "default-value": "Valore predefinita",
  "select": "Seleziona",
-  "read-only": "È solo lettura",
+  "read-only": "È di sola lettura",
  "hide-labels": "Nascondi etichette",
+  "layout": "Layout",
  "checkbox": "Casella di controllo",
  "alert": "Avviso",
  "zoom-in": "Ingrandisci",
@@ -675,7 +679,7 @@
  "public-template-mssg-1": "Per integrare OpenSign nel tuo progetto React o Next.js, esegui semplicemente il seguente comando:",
  "public-template-mssg-2": "Assicurati di avere npm o yarn configurato nel tuo progetto. Se usi Yarn, puoi sostituire npm install con yarn add @opensign/react.",
  "public-template-mssg-3": "Hai bisogno di maggiori dettagli o esempi?",
-  "public-template-mssg-4": "Visita il",
+  "public-template-mssg-4": "Visita il ",
  "public-template-mssg-5": " npm per gli aggiornamenti più recenti, documentazione dettagliata e cronologia delle versioni.",
  "public-template-mssg-6": "Prima di poter utilizzare questo frammento di codice, devi rendere questo modello pubblico.",
  "public-template-mssg-7": "Prima di poter generare un link pubblico, devi rendere questo modello pubblico.",
@@ -980,5 +984,50 @@
  "finish-mssg": "Sei sicuro di voler completare il documento?",
  "review": "Rivedere",
  "next-field": "Campo successivo",
-  "required-mssg":"{{leftRequiredWidget}} di {{totalWidget}} campi rimanenti"
+  "required-mssg":"{{leftRequiredWidget}} di {{totalWidget}} campi rimanenti",
+  "verify-document-signature": "Verifica firma documento",
+  "select-pdf-document": "Seleziona documento PDF",
+  "selected-file": "File selezionato",
+  "verify-signature": "Verifica firma",
+  "verification-status": "Stato verifica",
+  "verification-in-progress": "Verifica in corso...",
+  "verification-results-will-appear-here": "I risultati della verifica appariranno qui",
+  "please-select-pdf": "Seleziona un file PDF valido",
+  "please-select-file-to-verify": "Seleziona un file da verificare",
+  "no-signature-found": "Nessuna firma trovata nel documento",
+  "error-verifying-pdf": "Errore durante la verifica del PDF",
+  "signature-valid-basic": "La firma è valida",
+  "signature-invalid-basic": "La firma non è valida",
+  "all-signatures-verified-convincing": "Documento Verificato: Tutte le firme sono state validate con successo.",
+  "some-signatures-invalid-basic": "Alcune firme non sono valide",
+  "no-signatures-processed": "Nessuna firma elaborata",
+  "unnamed-signature-field": "Campo firma senza nome",
+  "error-processing-signature": "Errore durante l'elaborazione della firma",
+  "signer-info-not-available": "Informazioni firmatario non disponibili",
+  "cert-validity-not-checked": "Validità certificato non verificata",
+  "valid": "Valido",
+  "expired-or-not-yet-valid": "Scaduto o non ancora valido",
+  "valid-from": "Valido dal",
+  "to": "al",
+  "signer": "Firmatario",
+  "issuer": "Emittente",
+  "not-available": "Non disponibile",
+  "not-performed": "Non eseguito",
+  "missing-acrofield-dict": "Dizionario Acrofield mancante",
+  "signature-dictionary-not-found-or-invalid": "Dizionario firme non trovato o non valido",
+  "missing-or-invalid-byterange": "ByteRange mancante o non valido",
+  "missing-or-invalid-contents": "Contenuto mancante o non valido",
+  "missing-signature-contents": "Contenuto firma mancante",
+  "invalid-signature-hex-format": "Formato esadecimale firma non valido",
+  "unsupported-signature-format-not-signeddata": "Formato firma non supportato - non SignedData",
+  "signer-certificate-not-found": "Certificato firmatario non trovato",
+  "no-certificates-in-signature": "Nessun certificato nella firma",
+  "no-signer-info-in-pkcs7": "Nessuna informazione firmatario in PKCS#7",
+  "could-not-parse-signer-info": "Impossibile analizzare le informazioni del firmatario",
+  "not-calculated": "Non calcolato",
+  "not-found-in-signature": "Non trovato nella firma",
+  "readonly-textinput-error": "Il widget di testo di sola lettura deve avere un valore predefinito oppure può essere reso opzionale.",
+  "readonly-dropdown-error": "Il widget a discesa di sola lettura deve avere un valore predefinito oppure può essere reso opzionale.",
+  "readonly-radiobtn-error": "Il widget pulsante di opzione di sola lettura deve avere un valore predefinito oppure può essere reso opzionale.",
+  "choose-one":"Scegline uno"
 }
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, lazy } from "react";
+import { useState, useEffect, lazy } from "react";
 import { Routes, Route, BrowserRouter } from "react-router";
 import { pdfjs } from "react-pdf";
 import Form from "./pages/Form";
@@ -30,7 +30,7 @@ const AddAdmin = lazy(() => import("./pages/AddAdmin"));
 const UpdateExistUserAdmin = lazy(() => import("./pages/UpdateExistUserAdmin"));
 const Preferences = lazy(() => import("./pages/Preferences"));
 const Login = lazy(() => import("./pages/Login"));
-
+const VerifyDocument = lazy(() => import("./pages/VerifyDocument"));
 pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/legacy/build/pdf.worker.min.mjs`;
 const AppLoader = () => {
  return (
@@ -106,10 +106,10 @@ function App() {
              element={<LazyPage Page={GuestLogin} />}
            />
            <Route path="/debugpdf" element={<LazyPage Page={DebugPdf} />} />
-            <Route
-              path="/forgetpassword"
-              element={<LazyPage Page={ForgetPassword} />}
-            />
+              <Route
+                path="/forgetpassword"
+                element={<LazyPage Page={ForgetPassword} />}
+              />
            <Route
              element={
                <ValidateSession>
@@ -117,10 +117,10 @@ function App() {
                </ValidateSession>
              }
            >
-              <Route
-                path="/changepassword"
-                element={<LazyPage Page={ChangePassword} />}
-              />
+                <Route
+                  path="/changepassword"
+                  element={<LazyPage Page={ChangePassword} />}
+                />
              <Route path="/form/:id" element={<Form />} />
              <Route path="/report/:id" element={<Report />} />
              <Route path="/dashboard/:id" element={<Dashboard />} />
@@ -165,7 +165,11 @@ function App() {
                path="/recipientSignPdf/:docId"
                element={<PdfRequestFiles />}
              />
-              <Route path="/users" element={<UserList />} />
+                <Route path="/users" element={<UserList />} />
+              <Route
+                path="/verify-document"
+                element={<LazyPage Page={VerifyDocument} />}
+              />
              <Route
                path="/preferences"
                element={<LazyPage Page={Preferences} />}
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import dp from "../assets/images/dp.png";
 import FullScreenButton from "./FullScreenButton";
 import { useNavigate } from "react-router";
@@ -172,15 +172,26 @@ const Header = ({ showSidebar, setIsMenu, isConsole }) => {
                      <i className="fa-light fa-user"></i> {t("profile")}
                    </span>
                  </li>
+                    <li
+                      onClick={() => {
+                        setIsOpen(false);
+                        navigate("/changepassword");
+                      }}
+                    >
+                      <span>
+                        <i className="fa-light fa-lock"></i>{" "}
+                        {t("change-password")}
+                      </span>
+                    </li>
                  <li
                    onClick={() => {
                      setIsOpen(false);
-                      navigate("/changepassword");
+                      navigate("/verify-document");
                    }}
                  >
                    <span>
-                      <i className="fa-light fa-lock"></i>{" "}
-                      {t("change-password")}
+                      <i className="fa-light fa-check-square"></i>{" "}
+                      {t("verify-document")}
                    </span>
                  </li>
                </>
@@ -12,19 +12,32 @@ function AgreementSign(props) {
      <div className="op-modal op-modal-open absolute z-[448]">
        <div className="w-[95%] md:w-[60%] lg:w-[40%] op-modal-box overflow-y-auto hide-scrollbar text-sm p-4">
          <div className="flex flex-row items-center">
-            <input
-              data-tut="IsAgree"
-              className="mr-3 op-checkbox op-checkbox-m"
-              type="checkbox"
-              value={isChecked}
-              onChange={(e) => {
-                setIsChecked(e.target.checked);
-                if (e.target.checked) {
-                  props.setIsAgreeTour(false);
-                }
-                props.showFirstWidget();
-              }}
-            />
+            <label className="inline-flex justify-center items-center cursor-pointer mb-0">
+              {/* 1) This div becomes the “fake” checkbox */}
+              <div
+                data-tut="IsAgree"
+                className={`w-6 h-6 border-2 mr-3 rounded-full flex text-center items-center justify-center ${isChecked ? "op-border-primary" : "border-red-500"}`}
+              >
+                {isChecked ? (
+                  <span className="op-text-primary text-sm font-bold">✓</span>
+                ) : (
+                  <span className="text-red-500 text-sm font-bold">X</span>
+                )}
+              </div>
+              {/* 2) Visually hide the native checkbox but keep it in the DOM */}
+              <input
+                className="sr-only"
+                type="checkbox"
+                checked={isChecked}
+                onChange={(e) => {
+                  setIsChecked(e.target.checked);
+                  if (e.target.checked) {
+                    props.setIsAgreeTour(false);
+                  }
+                  props.showFirstWidget();
+                }}
+              />
+            </label>
            <div className="text-[11px] md:text-base">
              <span>{t("agree-p1")}</span>
              <span
@@ -0,0 +1,123 @@
+import { useState, useEffect, useRef } from "react";
+
+const Cell = ({
+  count,
+  h,
+  value,
+  editable,
+  onChange,
+  onKeyDown,
+  inputRef,
+  index
+}) => (
+  <div
+    className="flex items-center justify-center border border-gray-800 bg-white"
+    style={{ flex: `0 0 ${100 / count}%`, height: h }}
+  >
+    <input
+      maxLength={1}
+      value={value}
+      readOnly={!editable}
+      ref={inputRef}
+      onChange={editable ? (e) => onChange && onChange(e, index) : undefined}
+      onKeyDown={editable ? (e) => onKeyDown && onKeyDown(e, index) : undefined}
+      className="w-full text-center uppercase focus:outline-none bg-transparent text-[12px]"
+      style={{ fontFamily: "Arial, sans-serif" }}
+    />
+  </div>
+);
+
+export default function CellsWidget({
+  count = 8,
+  height = 40,
+  value = "",
+  editable = false,
+  onChange,
+  onKeyDown,
+  onCellCountChange,
+  inputRefs,
+  resizable = false
+}) {
+  const [cellCount, setCellCount] = useState(count);
+
+  // keep internal state in sync with prop updates
+  useEffect(() => setCellCount(count), [count]);
+
+  const startX = useRef(0);
+  const startCount = useRef(cellCount);
+
+  const capture = (downEv, onMove, onUp = () => {}) => {
+    const id = downEv.pointerId;
+    const move = (ev) => id === ev.pointerId && onMove(ev);
+    const up = (ev) => {
+      if (id !== ev.pointerId) return;
+      onUp(ev);
+      downEv.target.releasePointerCapture(id);
+      window.removeEventListener("pointermove", move);
+      window.removeEventListener("pointerup", up);
+    };
+    window.addEventListener("pointermove", move);
+    window.addEventListener("pointerup", up);
+    downEv.target.setPointerCapture(id);
+  };
+
+  const onTopHandlePointerDown = (ev) => {
+    // Prevent triggering the widget drag logic
+    ev.stopPropagation();
+    ev.preventDefault();
+    startX.current = ev.clientX;
+    startCount.current = cellCount;
+    capture(ev, (moveEv) => {
+      const dx = moveEv.clientX - startX.current;
+      const delta = Math.floor(-dx / 5);
+      let newCount = Math.max(1, startCount.current + delta);
+      if (newCount !== cellCount) {
+        setCellCount(newCount);
+        onCellCountChange?.(newCount);
+      }
+    });
+  };
+
+  const cells = Array.from({ length: cellCount }).map((_, i) => value[i] || "");
+
+  return (
+    <div
+      className="relative flex w-full h-full overflow-visible"
+      style={{ height }}
+    >
+      {resizable && (
+        <div
+          className="cell-size-handle absolute left-1/2 -translate-x-1/2 -top-3 cursor-ew-resize touch-none"
+          onPointerDown={onTopHandlePointerDown}
+        >
+          <svg
+            className="w-4 h-4 text-blue-600"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 20 20"
+            fill="currentColor"
+            aria-hidden="true"
+          >
+            <path
+              fillRule="evenodd"
+              d="m9.69 18.933.003.001C9.89 19.02 10 19 10 19s.11.02.308-.066l.002-.001.006-.003.018-.008a5.741 5.741 0 0 0 .281-.14c.186-.096.446-.24.757-.433.62-.384 1.445-.966 2.274-1.765C15.302 14.988 17 12.493 17 9A7 7 0 1 0 3 9c0 3.492 1.698 5.988 3.355 7.584a13.731 13.731 0 0 0 2.273 1.765 11.842 11.842 0 0 0 .976.544l.062.029.018.008.006.003ZM10 11.25a2.25 2.25 0 1 0 0-4.5 2.25 2.25 0 0 0 0 4.5Z"
+              clipRule="evenodd"
+            />
+          </svg>
+        </div>
+      )}
+      {cells.map((val, i) => (
+        <Cell
+          key={i}
+          count={cellCount}
+          h={height}
+          value={val}
+          editable={editable}
+          onChange={onChange}
+          onKeyDown={onKeyDown}
+          inputRef={inputRefs ? (el) => (inputRefs.current[i] = el) : undefined}
+          index={i}
+        />
+      ))}
+    </div>
+  );
+}
@@ -7,8 +7,8 @@ import { fontColorArr, fontsizeArr } from "../../constant/Utils";
 function DropdownWidgetOption(props) {
  const { t } = useTranslation();
  const [dropdownOptionList, setDropdownOptionList] = useState([
-    "option-1",
-    "option-2"
+    "Option-1",
+    "Option-2"
  ]);
  const [minCount, setMinCount] = useState(0);
  const [maxCount, setMaxCount] = useState(0);
@@ -17,18 +17,21 @@ function DropdownWidgetOption(props) {
  const [isHideLabel, setIsHideLabel] = useState(false);
  const [status, setStatus] = useState("required");
  const [defaultValue, setDefaultValue] = useState("");
-  const statusArr = ["required", "optional"];
  const [defaultCheckbox, setDefaultCheckbox] = useState([]);
+  const [layout, setLayout] = useState("vertical");
+  const statusArr = ["required", "optional"];
+  const layoutArr = ["vertical", "horizontal"];

  const resetState = () => {
-    setDropdownOptionList(["option-1", "option-2"]);
-    setDropdownName( props.currWidgetsDetails?.options?.name || props.type);
+    setDropdownOptionList(["Option-1", "Option-2"]);
+    setDropdownName(props.currWidgetsDetails?.options?.name || props.type);
    setIsReadOnly(false);
    setIsHideLabel(false);
    setMinCount(0);
    setMaxCount(0);
    setDefaultCheckbox([]);
    setDefaultValue("");
+    setLayout("vertical");
  };
  useEffect(() => {
    if (
@@ -48,6 +51,7 @@ function DropdownWidgetOption(props) {
      setStatus(props.currWidgetsDetails?.options?.status || "required");
      setDefaultValue(props.currWidgetsDetails?.options?.defaultValue || "");
      setDefaultCheckbox(props.currWidgetsDetails?.options?.defaultValue || []);
+      setLayout(props.currWidgetsDetails?.options?.layout || "vertical");
    } else {
      setStatus("required");
      resetState();
@@ -103,6 +107,25 @@ function DropdownWidgetOption(props) {
        ? defaultCheckbox
        : defaultValue;

+    const isDropdownOrRadio =
+      props?.type === "dropdown" || props?.type === radioButtonWidget;
+    const readOnlyWithoutValue =
+      isReadOnly && !defaultValue && status !== "optional";
+    const WidgetLayout = ["checkbox", radioButtonWidget].includes(props.type)
+      ? layout
+      : null;
+
+    // If it’s a dropdown and it’s read-only without a value (nor marked optional), stop here.
+    if (isDropdownOrRadio && readOnlyWithoutValue) {
+      alert(
+        props?.type === "dropdown"
+          ? t("readonly-dropdown-error")
+          : t("readonly-radiobtn-error")
+      );
+      return;
+    }
+
+    // Otherwise (either not a dropdown, or a valid dropdown), do the save + reset exactly once.
    props.handleSaveWidgetsOptions(
      dropdownName,
      dropdownOptionList,
@@ -113,9 +136,10 @@ function DropdownWidgetOption(props) {
      null,
      status,
      defaultData,
-      isHideLabel
+      isHideLabel,
+      WidgetLayout
    );
-    resetState()
+    resetState();
  };


@@ -137,17 +161,18 @@ function DropdownWidgetOption(props) {
          }}
        >
          <div>
-            <label className="text-[13px] font-semibold">
+            <label htmlFor="title" className="text-[13px] font-semibold">
              {t("name")}
              <span className="text-[red] text-[13px]"> *</span>
            </label>
            <input
+              id="title"
              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
              onInput={(e) => e.target.setCustomValidity("")}
-              required
              value={dropdownName}
              onChange={(e) => setDropdownName(e.target.value)}
              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+              required
            />

            <label className="text-[13px] font-semibold mt-[5px]">
@@ -228,28 +253,24 @@ function DropdownWidgetOption(props) {
                </select>
              </>
            )}
-            {props.type !== "checkbox" && props.type !== radioButtonWidget && (
-              <>
-                <div className="flex flex-row gap-[10px] mt-[0.5rem]">
-                  {statusArr.map((data, ind) => {
-                    return (
-                      <div
-                        key={ind}
-                        className="flex flex-row gap-[5px] items-center"
-                      >
-                        <input
-                          className="op-radio op-radio-xs my-1"
-                          type="radio"
-                          name="status"
-                          onChange={() => setStatus(data.toLowerCase())}
-                          checked={status.toLowerCase() === data.toLowerCase()}
-                        />
-                        <div className="text-[13px] font-500">{data}</div>
-                      </div>
-                    );
-                  })}
-                </div>
-              </>
+            {props.type !== "checkbox" && (
+              <div className="flex flex-row gap-[10px] mt-[0.5rem]">
+                {statusArr.map((data, ind) => (
+                  <div
+                    key={ind}
+                    className="flex flex-row gap-[5px] items-center"
+                  >
+                    <input
+                      className="op-radio op-radio-xs my-1"
+                      type="radio"
+                      name="status"
+                      onChange={() => setStatus(data.toLowerCase())}
+                      checked={status.toLowerCase() === data.toLowerCase()}
+                    />
+                    <div className="text-[13px] font-500 capitalize">{data}</div>
+                  </div>
+                ))}
+              </div>
            )}
            <div className="flex items-center mt-3 mb-3">
              <span>{t("font-size")} :</span>
@@ -270,8 +291,8 @@ function DropdownWidgetOption(props) {
                  );
                })}
              </select>
-              <div className="flex flex-row gap-1 items-center ml-4  ">
-                <span>{t("color")} : </span>
+              <div className="flex flex-row gap-1 items-center ml-4">
+                <span className="capitalize">{t("color")} : </span>
                <select
                  value={
                    props.fontColor ||
@@ -313,7 +334,7 @@ function DropdownWidgetOption(props) {
                      className="op-checkbox op-checkbox-sm"
                      onChange={(e) => setIsReadOnly(e.target.checked)}
                    />
-                    <label className="ml-1 mb-0" htmlFor="isreadonly">
+                    <label className="ml-2 mb-0 capitalize" htmlFor="isreadonly">
                      {t("read-only")}
                    </label>
                  </div>
@@ -328,15 +349,42 @@ function DropdownWidgetOption(props) {
                      onChange={(e) => setIsHideLabel(e.target.checked)}
                    />

-                    <label className="ml-1 mb-0" htmlFor="ishidelabel">
+                    <label className="ml-2 mb-0 capitalize" htmlFor="ishidelabel">
                      {t("hide-labels")}
                    </label>
                  </div>
                )}
              </div>
            )}
+            {["checkbox", radioButtonWidget].includes(props.type) && (
+              <>
+                <div className="text-[13px] font-semibold mt-[5px] capitalize">
+                  {t("layout")}
+                </div>
+                <div
+                  className={`${props.type === "checkbox" ? "mb-[10px]" : ""} flex flex-row gap-[10px] mt-[0.5rem]`}
+                >
+                  {layoutArr.map((data, ind) => (
+                    <div
+                      key={ind}
+                      className="flex flex-row gap-[5px] items-center"
+                    >
+                      <input
+                        className="op-radio op-radio-xs my-1"
+                        type="radio"
+                        name="layout"
+                        checked={layout.toLowerCase() === data.toLowerCase()}
+                        onChange={() => setLayout(data.toLowerCase())}
+                      />
+                      <label className="text-[13px] font-500 mb-0 capitalize">
+                        {data}
+                      </label>
+                    </div>
+                  ))}
+                </div>
+              </>
+            )}
          </div>
-
          <div
            className={`${
              props.type === "checkbox" && props.isShowAdvanceFeature
@@ -1,4 +1,4 @@
-import React, {
+import {
  useState,
  useRef,
 } from "react";
@@ -1,6 +1,5 @@
-import React, { useState, useEffect, useRef } from "react";
+import { useState, useEffect, useRef } from "react";
 import BorderResize from "./BorderResize";
-import PlaceholderBorder from "./PlaceholderBorder";
 import { Rnd } from "react-rnd";
 import {
  changeDateToMomentFormat,
@@ -14,6 +13,7 @@ import {
  onChangeInput,
  radioButtonWidget,
  textInputWidget,
+  cellsWidget,
  textWidget
 } from "../../constant/Utils";
 import PlaceholderType from "./PlaceholderType";
@@ -23,6 +23,7 @@ import ModalUi from "../../primitives/ModalUi";
 import { useTranslation } from "react-i18next";
 import { useDispatch } from "react-redux";
 import { setIsShowModal } from "../../redux/reducers/widgetSlice";
+import { themeColor } from "../../constant/const";

 const selectFormat = (data) => {
  switch (data) {
@@ -78,7 +79,6 @@ function Placeholder(props) {
  const dispatch = useDispatch();
  const widgetData =
    props.pos?.options?.defaultValue || props.pos?.options?.response;
-  const [placeholderBorder, setPlaceholderBorder] = useState({ w: 0, h: 0 });
  const [isDateModal, setIsDateModal] = useState(false);
  const [containerScale, setContainerScale] = useState();
  const holdTimeout = useRef(null);
@@ -86,6 +86,9 @@ function Placeholder(props) {
  const [selectDate, setSelectDate] = useState({});
  const [dateFormat, setDateFormat] = useState([]);
  const [clickonWidget, setClickonWidget] = useState({});
+  const [isDateReadOnly, setIsDateReadOnly] = useState(
+    props?.pos?.options?.isReadOnly || false
+  );
  const startDate = props?.pos?.options?.response
    ? getDefaultDate(
        props?.pos?.options?.response,
@@ -93,10 +96,6 @@ function Placeholder(props) {
      )
    : new Date();

-  const [getCheckboxRenderWidth, setGetCheckboxRenderWidth] = useState({
-    width: null,
-    height: null
-  });
  useEffect(() => {
    const getPdfPageWidth = props.pdfOriginalWH.find(
      (data) => data.pageNumber === props.pageNumber
@@ -127,18 +126,6 @@ function Placeholder(props) {
    }
  }, [widgetData]);

-  const handleGetDaynamicWH = () => {
-    if (
-      props?.pos?.type === "checkbox" ||
-      props?.pos?.type === radioButtonWidget
-    ) {
-      const rndElement = document.getElementById(props.pos.key);
-      if (rndElement) {
-        const { width, height } = rndElement.getBoundingClientRect();
-        setGetCheckboxRenderWidth({ width: width, height: height });
-      }
-    }
-  };
  //function change format array list with selected date and format
  const changeDateFormat = () => {
    const updateDate = [];
@@ -309,7 +296,6 @@ function Placeholder(props) {
      //The else condition is used to handle the case when the user clicks on a widget and open signature pad to draw sign
      props.setCurrWidgetsDetails && props.setCurrWidgetsDetails(props.pos);
      handleWidgetIdandPopup();
-      handleGetDaynamicWH();
    }
  };
  //`handleOnClickSettingIcon` is used set current widget details and open setting of it
@@ -424,10 +410,47 @@ function Placeholder(props) {
      false,
      data?.format,
      props.fontSize || props.pos?.options?.fontSize || 12,
-      props.fontColor || props.pos?.options?.fontColor || "black"
+      props.fontColor || props.pos?.options?.fontColor || "black",
+      isDateReadOnly || false
    );
    setSelectDate({ date: date, format: data?.format });
  };
+
+  const setCellCount = (key, newCount) => {
+    const isSignerList = props.xyPosition.some((d) => d.signerPtr);
+    if (isSignerList) {
+      const signerId = props.data?.Id || props.uniqueId;
+      const filterSignerPos = props.xyPosition.filter((d) => d.Id === signerId);
+      if (filterSignerPos.length > 0) {
+        const getPlaceHolder = filterSignerPos[0].placeHolder;
+        const updatedPlaceHolder = getPlaceHolder.map((ph) => {
+          if (ph.pageNumber !== props.pageNumber) return ph;
+          const newPos = ph.pos.map((p) =>
+            p.key === key
+              ? { ...p, options: { ...p.options, cellCount: newCount } }
+              : p
+          );
+          return { ...ph, pos: newPos };
+        });
+        const newSignerPos = props.xyPosition.map((obj) =>
+          obj.Id === signerId
+            ? { ...obj, placeHolder: updatedPlaceHolder }
+            : obj
+        );
+        props.setXyPosition(newSignerPos);
+      }
+    } else {
+      const updatePos = props.xyPosition[props.index].pos.map((p) =>
+        p.key === key
+          ? { ...p, options: { ...p.options, cellCount: newCount } }
+          : p
+      );
+      const updatePlaceholder = props.xyPosition.map((obj, ind) =>
+        ind === props.index ? { ...obj, pos: updatePos } : obj
+      );
+      props.setXyPosition(updatePlaceholder);
+    }
+  };
  const PlaceholderIcon = () => {
    // 1- If props.isShowBorder is true, display border's icon for all widgets. OR
    // 2- Use the combination of props?.isAlllowModify and !props?.assignedWidgetId.includes(props.pos.key) to determine when to show border's icon:
@@ -769,16 +792,9 @@ function Placeholder(props) {
          id={props.pos.key}
          data-tut={props.pos.key === props.unSignedWidgetId ? "IsSigned" : ""}
          key={props.pos.key}
+          cancel=".cell-size-handle"
          lockAspectRatio={
            !props.isFreeResize &&
-            ![
-              textWidget,
-              "email",
-              "name",
-              "company",
-              "job title",
-              textInputWidget
-            ].includes(props.pos.type) &&
            (props.pos.Width
              ? props.pos.Width / props.pos.Height
              : defaultWidthHeight(props.pos.type).width /
@@ -823,7 +839,6 @@ function Placeholder(props) {
            background: handleBackground()
          }}
          onDrag={() => {
-            handleGetDaynamicWH();
            props.handleTabDrag && props.handleTabDrag(props.pos.key);
          }}
          size={{
@@ -838,7 +853,12 @@ function Placeholder(props) {
                ? "auto"
                : props.posHeight(props.pos, props.isSignYourself)
          }}
-          minHeight={calculateFont(props.pos.options?.fontSize, true)}
+          minHeight={
+            props.pos.type === cellsWidget
+              ? calculateFont(props.pos.options?.fontSize, true)
+              : props.pos.type !== "checkbox" &&
+                calculateFont(props.pos.options?.fontSize, true)
+          }
          maxHeight="auto"
          onResizeStart={() => {
            props.setIsResize && props.setIsResize(true);
@@ -873,12 +893,6 @@ function Placeholder(props) {
            x: xPos(props.pos, props.isSignYourself),
            y: yPos(props.pos, props.isSignYourself)
          }}
-          onResize={(e, direction, ref) => {
-            setPlaceholderBorder({
-              w: ref.offsetWidth / (props.scale * containerScale),
-              h: ref.offsetHeight / (props.scale * containerScale)
-            });
-          }}
          disableDragging={handleDragging()}
        >
          {props.pos.key === props?.currWidgetsDetails?.key &&
@@ -911,40 +925,27 @@ function Placeholder(props) {
            props.pos.key === props?.currWidgetsDetails?.key && <BorderResize />
          )}

-          {/* 1- Show a border if props.pos.key === props?.currWidgetsDetails?.key, indicating the current user's selected widget.
-            2- If props.isShowBorder is true, display borders for all widgets. 
-            3- Use the combination of props?.isAlllowModify and !props?.assignedWidgetId.includes(props.pos.key) to determine when to show borders:
-               1- When isAlllowModify is true, show borders.
-               2- Do not display border for widgets already assigned (props.assignedWidgetId.includes(props.pos.key) is true).
-    */}
-          {props.pos.key === props?.currWidgetsDetails?.key &&
-            (props.isShowBorder ||
-              (props?.isAlllowModify &&
-                !props?.assignedWidgetId.includes(props.pos.key))) && (
-              <PlaceholderBorder
-                pos={props.pos}
-                isPlaceholder={props.isPlaceholder}
-                getCheckboxRenderWidth={getCheckboxRenderWidth}
-                scale={props.scale}
-                containerScale={containerScale}
-                placeholderBorder={placeholderBorder}
-              />
-            )}
+          {/* 1- Show a ouline if props.pos.key === props?.currWidgetsDetails?.key, indicating the current user's selected widget.
+            2- If props.isShowBorder is true, display ouline for all widgets. 
+            3- Use the combination of props?.isAlllowModify and !props?.assignedWidgetId.includes(props.pos.key) to determine when to show ouline:
+              3.1- When isAlllowModify is true, show ouline.
+              3.2- Do not display ouline for widgets already assigned (props.assignedWidgetId.includes(props.pos.key) is true). 
+            */}
          <div
-            className="flex items-stretch justify-center"
+            className={`${
+              props.pos.key === props?.currWidgetsDetails?.key &&
+              (props.isShowBorder ||
+                (props?.isAlllowModify &&
+                  !props?.assignedWidgetId.includes(props.pos.key)))
+                ? "outline-[0.3px] outline-dashed outline-offset-[10px]"
+                : ""
+            } flex items-stretch justify-center`}
            style={{
+              outlineColor: themeColor,
              left: xPos(props.pos, props.isSignYourself),
              top: yPos(props.pos, props.isSignYourself),
-              width:
-                props.pos.type === radioButtonWidget ||
-                props.pos.type === "checkbox"
-                  ? "auto"
-                  : props.posWidth(props.pos, props.isSignYourself),
-              height:
-                props.pos.type === radioButtonWidget ||
-                props.pos.type === "checkbox"
-                  ? "auto"
-                  : props.posHeight(props.pos, props.isSignYourself),
+              width: "100%",
+              height: "100%",
              zIndex: "10"
            }}
            onTouchEnd={() => handleOnClickPlaceholder()}
@@ -973,6 +974,7 @@ function Placeholder(props) {
              handleSaveDate={handleSaveDate}
              xPos={props.xPos}
              calculateFont={calculateFont}
+              setCellCount={setCellCount}
            />
          </div>
        </Rnd>
@@ -980,11 +982,11 @@ function Placeholder(props) {

      <ModalUi isOpen={isDateModal} title={t("widget-info")} showClose={false}>
        <div className="h-[100%] p-[20px]">
-          <div className="flex flex-row items-center">
-            <span>{t("format")} : </span>
-            <div className="flex">
+          <div className="flex flex-col md:flex-row md:items-center gap-y-3">
+            <div className="flex flex-row items-center gap-x-1">
+              <span className="capitalize">{t("format")} :</span>
              <select
-                className="ml-[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
+                className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
                defaultValue={""}
                onChange={(e) => {
                  const selectedIndex = e.target.value;
@@ -1008,23 +1010,23 @@ function Placeholder(props) {
              {selectDate.format}
            </span>
          </div>
-          <div className="flex items-center mt-4 md:mt-2">
-            <span>{t("font-size")} :</span>
-            <select
-              className="ml-[3px] md:ml:[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
-              value={props.fontSize || clickonWidget.options?.fontSize || 12}
-              onChange={(e) => props.setFontSize(parseInt(e.target.value))}
-            >
-              {fontsizeArr.map((size, ind) => {
-                return (
+          <div className="flex flex-col md:flex-row gap-y-2 md:gap-y-0 gap-x-2 mt-3">
+            <div className="flex flex-row items-center">
+              <span className="capitalize">{t("font-size")} :</span>
+              <select
+                className="ml-[3px] md:ml:[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
+                value={props.fontSize || clickonWidget.options?.fontSize || 12}
+                onChange={(e) => props.setFontSize(parseInt(e.target.value))}
+              >
+                {fontsizeArr.map((size, ind) => (
                  <option className="text-[13px]" value={size} key={ind}>
                    {size}
                  </option>
-                );
-              })}
-            </select>
-            <div className="flex flex-row gap-1 items-center ml-2 md:ml-4 ">
-              <span>{t("color")}: </span>
+                ))}
+              </select>
+            </div>
+            <div className="flex flex-row gap-1 items-center">
+              <span className="capitalize">{t("color")} :</span>
              <select
                value={
                  props.fontColor || clickonWidget.options?.fontColor || "black"
@@ -1032,13 +1034,11 @@ function Placeholder(props) {
                onChange={(e) => props.setFontColor(e.target.value)}
                className="ml-[4px] md:ml[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
              >
-                {fontColorArr.map((color, ind) => {
-                  return (
-                    <option value={color} key={ind}>
-                      {t(`color-type.${color}`)}
-                    </option>
-                  );
-                })}
+                {fontColorArr.map((color, ind) => (
+                  <option value={color} key={ind}>
+                    {t(`color-type.${color}`)}
+                  </option>
+                ))}
              </select>
              <span
                style={{
@@ -1049,7 +1049,26 @@ function Placeholder(props) {
              ></span>
            </div>
          </div>
-
+          {props?.isPlaceholder && (
+            <div className="flex items-center mt-3">
+              <input
+                id="isReadOnly"
+                name="isReadOnly"
+                type="checkbox"
+                checked={
+                  isDateReadOnly || props.pos.options?.isReadOnly || false
+                }
+                className="op-checkbox op-checkbox-xs"
+                onChange={() => setIsDateReadOnly(!isDateReadOnly)}
+              />
+              <label
+                className="ml-1.5 mb-0 capitalize text-[13px]"
+                htmlFor="isreadonly"
+              >
+                {t("read-only")}
+              </label>
+            </div>
+          )}
          <div className="h-[1px] w-full my-[15px] bg-[#9f9f9f]"></div>
          <button
            type="button"
@@ -1,56 +0,0 @@
-import React from "react";
-import { themeColor } from "../../constant/const";
-import {
-  defaultWidthHeight,
-  isMobile,
-  radioButtonWidget,
-  resizeBorderExtraWidth,
-  textWidget
-} from "../../constant/Utils";
-function PlaceholderBorder(props) {
-  const getResizeBorderExtraWidth = resizeBorderExtraWidth();
-  const defaultWidth = defaultWidthHeight(props.pos.type).width;
-  const defaultHeight = defaultWidthHeight(props.pos.type).height;
-  const width = () => {
-    const getWidth =
-      props.placeholderBorder.w || props.pos.Width || defaultWidth;
-    return (
-      getWidth * props.scale * props.containerScale + getResizeBorderExtraWidth
-    );
-  };
-  const height = () => {
-    const getHeight =
-      props.placeholderBorder.h || props.pos.Height || defaultHeight;
-
-    return (
-      getHeight * props.scale * props.containerScale + getResizeBorderExtraWidth
-    );
-  };
-
-  const handleMinWidth = () => {
-    if (props.pos.type === "checkbox" || props.pos.type === radioButtonWidget) {
-      return props.getCheckboxRenderWidth.width + getResizeBorderExtraWidth;
-    } else {
-      return width();
-    }
-  };
-  const handleMinHeight = () => {
-    if (props.pos.type === "checkbox" || props.pos.type === radioButtonWidget) {
-      return props.getCheckboxRenderWidth.height + getResizeBorderExtraWidth;
-    } else {
-      return height();
-    }
-  };
-  return (
-    <div
-      className="absolute inline-block w-[14px] h-[14px]  border-[0.2px] overflow-hidden border-dashed"
-      style={{
-        borderColor: themeColor,
-        minWidth: handleMinWidth() || 0,
-        minHeight: handleMinHeight() || 0
-      }}
-    ></div>
-  );
-}
-
-export default PlaceholderBorder;
@@ -4,6 +4,7 @@ import {
  getYear,
  radioButtonWidget,
  textInputWidget,
+  cellsWidget,
  textWidget,
  months,
  years,
@@ -14,8 +15,9 @@ import DatePicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
 import "../../styles/signature.css";
 import { useTranslation } from "react-i18next";
+import CellsWidget from "./CellsWidget";
 const textWidgetCls =
-  "w-full h-full md:min-w-full md:min-h-full z-[999] text-[12px] rounded-[2px] border-[1px] border-[#007bff] overflow-hidden resize-none outline-none text-base-content item-center whitespace-pre-wrap bg-white";
+  "w-full h-full md:min-w-full md:min-h-full z-[999] text-[12px] rounded-[2px] border-[1px] border-[#007bff] overflow-hidden resize-none outline-none text-base-content item-center whitespace-pre-wrap";
 const selectWidgetCls =
  "w-full h-full absolute left-0 top-0 border-[1px] border-[#007bff] rounded-[2px] focus:outline-none text-base-content";
 const widgetCls =
@@ -27,8 +29,12 @@ function PlaceholderType(props) {
    props.isSignYourself ||
    ((props.isSelfSign || props.isNeedSign) &&
      props.data?.signerObjId === props.signerObjId);
+  const isReadOnly =
+    props.pos.options?.isReadOnly ||
+    props.data?.signerObjId !== props.signerObjId;
+  // prefer the latest response value over any default value
  const widgetData =
-    props.pos?.options?.defaultValue || props.pos?.options?.response;
+    props.pos?.options?.response ?? props.pos?.options?.defaultValue ?? "";
  const widgetTypeTranslation = t(`widgets-name.${props?.pos?.type}`);
  const inputRef = useRef(null);
  const [widgetValue, setwidgetValue] = useState();
@@ -56,16 +62,13 @@ function PlaceholderType(props) {
            []
        );
      } else {
-        if (widgetData) {
-          setwidgetValue(widgetData);
-        }
+        // keep displayed value in sync with the stored response
+        setwidgetValue(widgetData);
      }
      if (props.pos?.options?.hint) {
        setHint(props.pos?.options.hint);
      } else if (props.pos?.options?.validation?.type) {
        checkRegularExpress(props.pos?.options?.validation?.type, setHint);
-      } else {
-        setHint(props.pos?.type);
      }
    }
    // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -77,7 +80,8 @@ function PlaceholderType(props) {
        color: fontColor,
        fontFamily: "Arial, sans-serif"
      }}
-      className={`${selectWidgetCls} overflow-hidden`}
+      className={`${isReadOnly ? `select-none` : ``} ${selectWidgetCls} overflow-hidden`}
+      disabled={isReadOnly}
      onClick={onClick}
      ref={ref}
    >
@@ -98,22 +102,6 @@ function PlaceholderType(props) {
    }
  };

-  //handle height on enter press in text area
-  // const handleEnterPress = (e) => {
-  //   const height = 18;
-  //   if (e.key === "Enter") {
-  //     //function to save height of text area
-  //     onChangeHeightOfTextArea(
-  //       height,
-  //       props.pos.type,
-  //       props.pos.key,
-  //       props.xyPosition,
-  //       props.index,
-  //       props.setXyPosition,
-  //       props.data && props.data?.Id
-  //     );
-  //   }
-  // };
  switch (type) {
    case "signature":
      return props.pos.SignUrl ? (
@@ -164,41 +152,42 @@ function PlaceholderType(props) {
        </div>
      );
    case "checkbox":
+      const checkBoxLayout = props.pos.options?.layout || "vertical";
+      const isMultipleCheckbox =
+        props.pos.options?.values?.length > 0 ? true : false;
+      const checkBoxWrapperClass = `flex items-start ${
+        checkBoxLayout === "horizontal"
+          ? `flex-row flex-wrap ${isMultipleCheckbox ? "gap-x-2" : ""}`
+          : `flex-col ${isMultipleCheckbox ? "gap-y-[5px]" : ""}`
+      }`; // Using gap-y-1 for consistency, adjust if needed
+
      return (
-        <div style={{ zIndex: props.isSignYourself && "99" }}>
-          {props.pos.options?.values?.map((data, ind) => {
-            return (
-              <div
-                key={ind}
-                className="select-none-cls flex items-center text-center gap-0.5 pointer-events-none"
+        <div
+          className={checkBoxWrapperClass}
+          style={{ zIndex: props.isSignYourself && "99" }}
+        >
+          {props.pos.options?.values?.map((data, ind) => (
+            <div key={ind} className="select-none-cls pointer-events-none">
+              <label
+                htmlFor={`checkbox-${props.pos.key + ind}`}
+                style={{ fontSize: fontSize, color: fontColor }}
+                className={`mb-0 flex items-center gap-1`}
              >
                <input
                  id={`checkbox-${props.pos.key + ind}`}
                  style={{ width: fontSize, height: fontSize }}
-                  className={`${
-                    ind === 0 ? "mt-0" : "mt-[5px]"
-                  } flex justify-center op-checkbox rounded-[1px] `}
-                  disabled={
-                    props.isNeedSign &&
-                    (props.pos.options?.isReadOnly ||
-                      props.data?.signerObjId !== props.signerObjId)
-                  }
+                  className="op-checkbox rounded-[1px]"
+                  disabled={props.isNeedSign && isReadOnly}
                  type="checkbox"
                  readOnly
                  checked={!!selectCheckbox(ind, selectedCheckbox)}
                />
                {!props.pos.options?.isHideLabel && (
-                  <label
-                    htmlFor={`checkbox-${props.pos.key + ind}`}
-                    style={{ fontSize: fontSize, color: fontColor }}
-                    className="text-xs mb-0 text-center"
-                  >
-                    {data}
-                  </label>
+                  <span className="leading-none">{data}</span>
                )}
-              </div>
-            );
-          })}
+              </label>
+            </div>
+          ))}
        </div>
      );
    case textInputWidget:
@@ -208,24 +197,15 @@ function PlaceholderType(props) {
          placeholder={hint || t("widgets-name.text")}
          rows={1}
          value={widgetValue}
-          className={`${
-            props.pos.options?.isReadOnly ||
-            props.data?.signerObjId !== props.signerObjId
-              ? "select-none"
-              : textWidgetCls
-          }`}
+          className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
          style={{
            fontSize: fontSize,
            color: fontColor,
-            background: props.data?.blockColor,
+            background: isReadOnly ? props.data?.blockColor : "white",
            pointerEvents: "none"
          }}
          readOnly
-          disabled={
-            props.isNeedSign &&
-            (props.pos.options?.isReadOnly ||
-              props.data?.signerObjId !== props.signerObjId)
-          }
+          disabled={props.isNeedSign && isReadOnly}
          cols="50"
        />
      ) : (
@@ -233,17 +213,34 @@ function PlaceholderType(props) {
          <span>{hint || widgetTypeTranslation}</span>
        </div>
      );
+    case cellsWidget: {
+      const count = props.pos.options?.cellCount || 5;
+      const cells = (widgetValue || "").split("");
+      const height = "100%";
+      const handleCellResize = (newCount) => {
+        if (props.setCellCount) props.setCellCount(props.pos.key, newCount);
+      };
+      return (
+        <CellsWidget
+          count={count}
+          height={height}
+          value={cells.join("")}
+          editable={props.isPlaceholder}
+          resizable={props.isPlaceholder}
+          onCellCountChange={handleCellResize}
+        />
+      );
+    }
    case "dropdown":
      return (
        <div
          style={textWidgetStyle}
          className="select-none-cls flex justify-between items-center"
        >
-          {widgetData || hint || widgetTypeTranslation}
+          {widgetData || t("choose-one")}
          <i className="fa-light fa-circle-chevron-down mr-1 "></i>
        </div>
      );
-
    case "initials":
      return props.pos.SignUrl ? (
        <img
@@ -276,13 +273,15 @@ function PlaceholderType(props) {
          placeholder={hint || widgetTypeTranslation}
          rows={1}
          value={widgetValue}
-          className={textWidgetCls}
+          className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
          style={{
            fontSize: fontSize,
            color: fontColor,
+            background: isReadOnly ? props.data?.blockColor : "white",
            pointerEvents: "none"
          }}
          cols="50"
+          disabled={props.isNeedSign && isReadOnly}
        />
      ) : (
        <div className="flex h-full select-none-cls" style={textWidgetStyle}>
@@ -297,13 +296,15 @@ function PlaceholderType(props) {
          placeholder={hint || widgetTypeTranslation}
          rows={1}
          value={widgetValue}
-          className={textWidgetCls}
+          className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
          style={{
            fontSize: fontSize,
            color: fontColor,
+            background: isReadOnly ? props.data?.blockColor : "white",
            pointerEvents: "none"
          }}
          cols="50"
+          disabled={props.isNeedSign && isReadOnly}
        />
      ) : (
        <div style={textWidgetStyle} className="select-none-cls">
@@ -318,13 +319,15 @@ function PlaceholderType(props) {
          placeholder={hint || widgetTypeTranslation}
          rows={1}
          value={widgetValue}
-          className={textWidgetCls}
+          className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
          style={{
            fontSize: fontSize,
            color: fontColor,
+            background: isReadOnly ? props.data?.blockColor : "white",
            pointerEvents: "none"
          }}
          cols="50"
+          disabled={props.isNeedSign && isReadOnly}
        />
      ) : (
        <div style={textWidgetStyle} className="select-none-cls">
@@ -422,15 +425,15 @@ function PlaceholderType(props) {
          placeholder={hint || widgetTypeTranslation}
          rows={1}
          value={widgetValue}
-          className={textWidgetCls}
+          className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
          style={{
            fontSize: fontSize,
            color: fontColor,
-            fontFamily: "Arial, sans-serif",
+            background: isReadOnly ? props.data?.blockColor : "white",
            pointerEvents: "none"
          }}
-          disabled
          cols="1"
+          disabled={props.isNeedSign && isReadOnly}
        />
      ) : (
        <div style={textWidgetStyle} className="select-none-cls">
@@ -438,45 +441,39 @@ function PlaceholderType(props) {
        </div>
      );
    case radioButtonWidget:
+      const radioLayout = props.pos.options?.layout || "vertical";
+      const isOnlyOneBtn = props.pos.options?.values?.length > 0 ? true : false;
+      const radioWrapperClass = `flex items-start ${
+        radioLayout === "horizontal"
+          ? `flex-row flex-wrap ${isOnlyOneBtn ? "gap-x-2" : ""}`
+          : `flex-col ${isOnlyOneBtn ? "gap-y-[5px]" : ""}`
+      }`; // Using gap-y-1 for consistency, adjust if needed
      return (
-        <div>
-          {props.pos.options?.values.map((data, ind) => {
-            return (
-              <div
-                key={ind}
-                className="select-none-cls flex items-center text-center gap-0.5 pointer-events-none"
+        <div className={radioWrapperClass}>
+          {props.pos.options?.values.map((data, ind) => (
+            <div key={ind} className="select-none-cls pointer-events-none">
+              <label
+                htmlFor={`radio-${props.pos.key + ind}`}
+                style={{ fontSize: fontSize, color: fontColor }}
+                className="text-xs mb-0 flex items-center gap-1"
              >
                <input
                  readOnly
                  id={`radio-${props.pos.key + ind}`}
-                  style={{
-                    width: fontSize,
-                    height: fontSize,
-                    marginTop: ind > 0 ? "10px" : "0px"
-                  }}
-                  className={`op-radio rounded-full border- border-black appearance-none bg-white inline-block align-middle relative ${
+                  style={{ width: fontSize, height: fontSize, lineHeight: 2 }}
+                  className={`op-radio rounded-full border-black appearance-none bg-white inline-block align-middle relative ${
                    handleRadioCheck(data) ? "checked-radio" : ""
                  }`}
                  type="radio"
-                  disabled={
-                    props.isNeedSign &&
-                    (props.pos.options?.isReadOnly ||
-                      props.data?.signerObjId !== props.signerObjId)
-                  }
+                  disabled={props.isNeedSign && isReadOnly}
                  checked={handleRadioCheck(data)}
                />
                {!props.pos.options?.isHideLabel && (
-                  <label
-                    htmlFor={`radio-${props.pos.key + ind}`}
-                    style={{ fontSize: fontSize, color: fontColor }}
-                    className="text-xs mb-0"
-                  >
-                    {data}
-                  </label>
+                  <span className="leading-none">{data}</span>
                )}
-              </div>
-            );
-          })}
+              </label>
+            </div>
+          ))}
        </div>
      );
    case textWidget:
@@ -490,7 +487,8 @@ function PlaceholderType(props) {
          style={{
            fontFamily: "Arial, sans-serif",
            fontSize: fontSize,
-            color: fontColor
+            color: fontColor,
+            background: "white"
          }}
          cols="50"
        />
@@ -79,7 +79,7 @@ function RenderPdf(props) {
    }
  };

-  //function for render placeholder block over pdf document
+  // function for render placeholder block over pdf document (all signing flow)
  const checkSignedSigners = (data) => {
    let checkSign = [];
    //condition to handle quick send flow and using normal request sign flow
@@ -91,73 +91,71 @@ function RenderPdf(props) {
      : [];
    return (
      checkSign.length === 0 &&
-      data?.placeHolder?.map((placeData, key) => {
-        return (
-          <React.Fragment key={key}>
-            {placeData.pageNumber === props.pageNumber &&
-              placeData.pos.map((pos, ind) => {
-                return (
-                  pos && (
-                    <React.Fragment key={ind}>
-                      <Placeholder
-                        pos={pos}
-                        handleSignYourselfImageResize={handleImageResize}
-                        index={props.pageNumber}
-                        xyPosition={props.signerPos}
-                        setXyPosition={props.setSignerPos}
-                        data={data}
-                        setIsResize={props.setIsResize}
-                        isShowBorder={props.isSelfSign}
-                        isAlllowModify={props.isAlllowModify}
-                        signerObjId={props.signerObjectId}
-                        isShowDropdown={true}
-                        isNeedSign={props.pdfRequest}
-                        isSelfSign={true}
-                        isSignYourself={false}
-                        posWidth={posWidth}
-                        posHeight={posHeight}
-                        isDragging={props.isDragging}
-                        pdfDetails={props.pdfDetails}
-                        unSignedWidgetId={props.unSignedWidgetId}
-                        setCurrWidgetsDetails={props.setCurrWidgetsDetails}
-                        uniqueId={props.uniqueId}
-                        scale={props.scale}
-                        containerWH={props.containerWH}
-                        pdfOriginalWH={props.pdfOriginalWH}
-                        pageNumber={props.pageNumber}
-                        ispublicTemplate={props.ispublicTemplate}
-                        handleUserDetails={props.handleUserDetails}
-                        isResize={props.isResize}
-                        setIsAgreeTour={props.setIsAgreeTour}
-                        isAgree={props.isAgree}
-                        handleTabDrag={props.handleTabDrag}
-                        handleStop={props.handleStop}
-                        setUniqueId={props.setUniqueId}
-                        setIsSelectId={props.setIsSelectId}
-                        handleDeleteSign={props.handleDeleteSign}
-                        setIsPageCopy={props.setIsPageCopy}
-                        handleTextSettingModal={props.handleTextSettingModal}
-                        setIsCheckbox={props.setIsCheckbox}
-                        isFreeResize={false}
-                        isOpenSignPad={true}
-                        assignedWidgetId={props.assignedWidgetId}
-                        isApplyAll={true}
-                        setFontSize={props.setFontSize}
-                        fontSize={props.fontSize}
-                        fontColor={props.fontColor}
-                        setFontColor={props.setFontColor}
-                        setRequestSignTour={props.setRequestSignTour}
-                        calculateFontsize={calculateFontsize}
-                        currWidgetsDetails={props?.currWidgetsDetails}
-                        setTempSignerId={props.setTempSignerId}
-                      />
-                    </React.Fragment>
-                  )
-                );
-              })}
-          </React.Fragment>
-        );
-      })
+      data?.placeHolder?.map((placeData, key) => (
+        <React.Fragment key={key}>
+          {placeData.pageNumber === props.pageNumber &&
+            placeData.pos.map(
+              (pos, ind) =>
+                pos && (
+                  <React.Fragment key={ind}>
+                    <Placeholder
+                      pos={pos}
+                      handleSignYourselfImageResize={handleImageResize}
+                      index={props.pageNumber}
+                      xyPosition={props.signerPos}
+                      setXyPosition={props.setSignerPos}
+                      data={data}
+                      setIsResize={props.setIsResize}
+                      isShowBorder={props.isSelfSign}
+                      isAlllowModify={props.isAlllowModify}
+                      signerObjId={props.signerObjectId}
+                      isShowDropdown={true}
+                      isNeedSign={props.pdfRequest}
+                      isSelfSign={true}
+                      isSignYourself={false}
+                      posWidth={posWidth}
+                      posHeight={posHeight}
+                      isDragging={props.isDragging}
+                      pdfDetails={props.pdfDetails}
+                      unSignedWidgetId={props.unSignedWidgetId}
+                      setCurrWidgetsDetails={props.setCurrWidgetsDetails}
+                      uniqueId={props.uniqueId}
+                      scale={props.scale}
+                      containerWH={props.containerWH}
+                      pdfOriginalWH={props.pdfOriginalWH}
+                      pageNumber={props.pageNumber}
+                      ispublicTemplate={props.ispublicTemplate}
+                      handleUserDetails={props.handleUserDetails}
+                      isResize={props.isResize}
+                      setIsAgreeTour={props.setIsAgreeTour}
+                      isAgree={props.isAgree}
+                      handleTabDrag={props.handleTabDrag}
+                      handleStop={props.handleStop}
+                      setUniqueId={props.setUniqueId}
+                      setIsSelectId={props.setIsSelectId}
+                      handleDeleteSign={props.handleDeleteSign}
+                      setIsPageCopy={props.setIsPageCopy}
+                      handleTextSettingModal={props.handleTextSettingModal}
+                      setIsCheckbox={props.setIsCheckbox}
+                      isFreeResize={false}
+                      isOpenSignPad={true}
+                      assignedWidgetId={props.assignedWidgetId}
+                      isApplyAll={true}
+                      setCellCount={props.setCellCount}
+                      setFontSize={props.setFontSize}
+                      fontSize={props.fontSize}
+                      fontColor={props.fontColor}
+                      setFontColor={props.setFontColor}
+                      setRequestSignTour={props.setRequestSignTour}
+                      calculateFontsize={calculateFontsize}
+                      currWidgetsDetails={props?.currWidgetsDetails}
+                      setTempSignerId={props.setTempSignerId}
+                    />
+                  </React.Fragment>
+                )
+            )}
+        </React.Fragment>
+      ))
    );
  };

@@ -172,148 +170,138 @@ function RenderPdf(props) {
    }
  };
  const pdfDataBase64 = `data:application/pdf;base64,${props.pdfBase64Url}`;
-  //calculate render height of pdf in mobile view
+  // calculate render height of pdf in mobile view
  const handlePageLoadSuccess = (page) => {
-    const containerWidth = props.divRef.current.offsetWidth; // Get container width
-    const viewport = page.getViewport({ scale: 1 });
-    const scale = containerWidth / viewport.width; // Scale to fit container width
-    const scaleHeight = viewport.height * scale;
-    setScaledHeight(scaleHeight);
+    if (isMobile) {
+      const containerWidth = props.divRef.current.offsetWidth; // Get container width
+      const viewport = page.getViewport({ scale: 1 });
+      const scale = containerWidth / viewport.width; // Scale to fit container width
+      const scaleHeight = viewport.height * scale;
+      setScaledHeight(scaleHeight);
+    }
  };
  return (
    <>
      {props.successEmail && (
        <Alert type={"success"}>{t("success-email-alert")}</Alert>
      )}
-      {isMobile ? (
-        <RSC
+      <RSC
+        style={{
+          position: "relative",
+          boxShadow: "rgba(17, 12, 46, 0.15) 0px 48px 100px 0px",
+          height: isMobile
+            ? isGuestSigner
+              ? window.innerHeight - 49 // 49 is height of header
+              : scaledHeight
+            : `${window.innerHeight}px`,
+          zIndex: 0
+        }}
+        noScrollY={isMobile ? props.scale === 1 : false}
+        noScrollX={props.scale === 1}
+      >
+        <div
+          data-tut={isMobile ? "reactourForth" : undefined}
+          className={
+            isMobile
+              ? `${isGuestSigner ? "30px" : ""} border-[0.1px] border-[#ebe8e8] overflow-x-auto`
+              : ""
+          }
          style={{
-            position: "relative",
-            boxShadow: "rgba(17, 12, 46, 0.15) 0px 48px 100px 0px",
-            //49 is height of header
-            height: isGuestSigner ? window.innerHeight - 49 : scaledHeight,
-            zIndex: 0
+            width:
+              props.containerWH?.width && props.containerWH?.width * props.scale
          }}
-          noScrollY={props.scale === 1 ? true : false}
-          noScrollX={props.scale === 1 ? true : false}
+          ref={props.drop}
+          id="container"
        >
-          <div
-            data-tut="reactourForth"
-            className={`${
-              isGuestSigner ? "30px" : ""
-            } border-[0.1px] border-[#ebe8e8] overflow-x-auto`}
-            style={{
-              width:
-                props.containerWH?.width &&
-                props.containerWH?.width * props.scale
-            }}
-            ref={props.drop}
-            id="container"
-          >
-            {props.containerWH?.width &&
-              props.pdfOriginalWH.length > 0 &&
-              (props.pdfRequest || props.isSelfSign
-                ? props.signerPos?.map((data, key) => {
-                    return (
+          {props.pdfLoad !== false &&
+            props.containerWH?.width &&
+            props.pdfOriginalWH.length > 0 && (
+              <>
+                {props.pdfRequest || props.isSelfSign
+                  ? // request sign, guest sign,
+                    props.signerPos?.map((data, key) => (
                      <React.Fragment key={key}>
                        {checkSignedSigners(data)}
                      </React.Fragment>
-                    );
-                  })
-                : props.placeholder // placeholder mobile
-                  ? props.signerPos?.map((data, ind) => {
-                      return (
+                    ))
+                  : props.placeholder // placeholdersign document, draft document, create template, draft template
+                    ? props.signerPos?.map((data, ind) => (
                        <React.Fragment key={ind}>
                          {data?.placeHolder &&
-                            data?.placeHolder.map((placeData, index) => {
-                              return (
-                                <React.Fragment key={index}>
-                                  {placeData.pageNumber === props.pageNumber &&
-                                    placeData.pos.map((pos) => {
-                                      return (
-                                        <React.Fragment key={pos.key}>
-                                          <Placeholder
-                                            pos={pos}
-                                            setIsPageCopy={props.setIsPageCopy}
-                                            handleDeleteSign={
-                                              props.handleDeleteSign
-                                            }
-                                            handleTabDrag={props.handleTabDrag}
-                                            handleStop={props.handleStop}
-                                            handleSignYourselfImageResize={
-                                              handleImageResize
-                                            }
-                                            index={props.pageNumber}
-                                            xyPosition={props.signerPos}
-                                            setXyPosition={props.setSignerPos}
-                                            data={data}
-                                            setIsResize={props.setIsResize}
-                                            setShowDropdown={
-                                              props.setShowDropdown
-                                            }
-                                            isShowBorder={true}
-                                            isPlaceholder={true}
-                                            setUniqueId={props.setUniqueId}
-                                            handleLinkUser={
-                                              props.handleLinkUser
-                                            }
-                                            isSignYourself={false}
-                                            posWidth={posWidth}
-                                            posHeight={posHeight}
-                                            isDragging={props.isDragging}
-                                            setIsValidate={props.setIsValidate}
-                                            setIsRadio={props.setIsRadio}
-                                            setIsCheckbox={props.setIsCheckbox}
-                                            setCurrWidgetsDetails={
-                                              props.setCurrWidgetsDetails
-                                            }
-                                            handleNameModal={
-                                              props.handleNameModal
-                                            }
-                                            setTempSignerId={
-                                              props.setTempSignerId
-                                            }
-                                            uniqueId={props.uniqueId}
-                                            handleTextSettingModal={
-                                              props.handleTextSettingModal
-                                            }
-                                            scale={props.scale}
-                                            containerWH={props.containerWH}
-                                            pdfOriginalWH={props.pdfOriginalWH}
-                                            pageNumber={props.pageNumber}
-                                            setIsSelectId={props.setIsSelectId}
-                                            fontSize={props.fontSize}
-                                            setFontSize={props.setFontSize}
-                                            fontColor={props.fontColor}
-                                            setFontColor={props.setFontColor}
-                                            isResize={props.isResize}
-                                            unSignedWidgetId={
-                                              props.unSignedWidgetId
-                                            }
-                                            isFreeResize={true}
-                                            calculateFontsize={
-                                              calculateFontsize
-                                            }
-                                            currWidgetsDetails={
-                                              props?.currWidgetsDetails
-                                            }
-                                          />
-                                        </React.Fragment>
-                                      );
-                                    })}
-                                </React.Fragment>
-                              );
-                            })}
+                            data?.placeHolder.map((placeData, index) => (
+                              <React.Fragment key={index}>
+                                {placeData.pageNumber === props.pageNumber &&
+                                  placeData.pos.map((pos) => (
+                                    <React.Fragment key={pos.key}>
+                                      <Placeholder
+                                        pos={pos}
+                                        setIsPageCopy={props.setIsPageCopy}
+                                        handleDeleteSign={
+                                          props.handleDeleteSign
+                                        }
+                                        handleTabDrag={props.handleTabDrag}
+                                        handleStop={props.handleStop}
+                                        handleSignYourselfImageResize={
+                                          handleImageResize
+                                        }
+                                        index={props.pageNumber}
+                                        xyPosition={props.signerPos}
+                                        setXyPosition={props.setSignerPos}
+                                        data={data}
+                                        setIsResize={props.setIsResize}
+                                        setShowDropdown={props.setShowDropdown}
+                                        isShowBorder={true}
+                                        isPlaceholder={true}
+                                        setUniqueId={props.setUniqueId}
+                                        handleLinkUser={props.handleLinkUser}
+                                        isSignYourself={false}
+                                        posWidth={posWidth}
+                                        posHeight={posHeight}
+                                        isDragging={props.isDragging}
+                                        setIsValidate={props.setIsValidate}
+                                        setIsRadio={props.setIsRadio}
+                                        setIsCheckbox={props.setIsCheckbox}
+                                        setCurrWidgetsDetails={
+                                          props.setCurrWidgetsDetails
+                                        }
+                                        handleNameModal={props.handleNameModal}
+                                        setTempSignerId={props.setTempSignerId}
+                                        uniqueId={props.uniqueId}
+                                        handleTextSettingModal={
+                                          props.handleTextSettingModal
+                                        }
+                                        scale={props.scale}
+                                        containerWH={props.containerWH}
+                                        pdfOriginalWH={props.pdfOriginalWH}
+                                        pageNumber={props.pageNumber}
+                                        setIsSelectId={props.setIsSelectId}
+                                        fontSize={props.fontSize}
+                                        setFontSize={props.setFontSize}
+                                        setCellCount={props.setCellCount}
+                                        fontColor={props.fontColor}
+                                        setFontColor={props.setFontColor}
+                                        isResize={props.isResize}
+                                        unSignedWidgetId={
+                                          props.unSignedWidgetId
+                                        }
+                                        isFreeResize={true}
+                                        calculateFontsize={calculateFontsize}
+                                        currWidgetsDetails={
+                                          props?.currWidgetsDetails
+                                        }
+                                      />
+                                    </React.Fragment>
+                                  ))}
+                              </React.Fragment>
+                            ))}
                        </React.Fragment>
-                      );
-                    })
-                  : !props.pdfDetails?.[0]?.IsCompleted &&
-                    props.xyPosition?.map((data, ind) => {
-                      return (
+                      ))
+                    : !props.pdfDetails?.[0]?.IsCompleted && // signyourself flow
+                      props.xyPosition?.map((data, ind) => (
                        <React.Fragment key={ind}>
                          {data.pageNumber === props.pageNumber &&
-                            data.pos.map((pos, id) => {
-                              return (
+                            data.pos.map(
+                              (pos, id) =>
                                pos && (
                                  <Placeholder
                                    key={id}
@@ -359,247 +347,43 @@ function RenderPdf(props) {
                                    }
                                  />
                                )
-                              );
-                            })}
+                            )}
                        </React.Fragment>
-                      );
-                    }))}
-            {/* Mobile */}
-            <Document
-              error={<p className="mx-2">{t("failed-to-load-refresh-page")}</p>}
-              onLoadError={() => props.setPdfLoad(false)}
-              loading={t("loading-doc")}
-              onLoadSuccess={props.pageDetails}
-              onClick={() =>
-                props.setCurrWidgetsDetails && props.setCurrWidgetsDetails({})
-              }
-              file={pdfDataBase64}
-            >
-              <Page
-                onLoadSuccess={handlePageLoadSuccess}
-                scale={props.scale || 1}
-                key={props.index}
-                pageNumber={props.pageNumber}
-                width={props.containerWH.width}
-                renderAnnotationLayer={false}
-                renderTextLayer={false}
-                onGetAnnotationsError={(error) => {
-                  console.log("annotation error", error);
-                }}
-                className="select-none touch-callout-none"
-              />
-            </Document>
-          </div>
-        </RSC>
-      ) : (
-        <RSC
-          style={{
-            position: "relative",
-            boxShadow: "rgba(17, 12, 46, 0.15) 0px 48px 100px 0px",
-            height: window.innerHeight + "px",
-            zIndex: 0
-          }}
-          noScrollY={false}
-          noScrollX={props.scale === 1 ? true : false}
-        >
-          <div
-            style={{
-              width:
-                props.containerWH?.width &&
-                props.containerWH?.width * props.scale
+                      ))}
+              </>
+            )}
+          <Document
+            error={<p className="mx-2">{t("failed-to-load-refresh-page")}</p>}
+            onLoadError={(e) => {
+              console.log("PDF load error", e);
+              props.setPdfLoad(false);
            }}
-            ref={props.drop}
-            id="container"
+            loading={t("loading-doc")}
+            onLoadSuccess={(pdf) => {
+              props.setPdfLoad(true);
+              props.pageDetails(pdf);
+            }}
+            onClick={() =>
+              props.setCurrWidgetsDetails && props.setCurrWidgetsDetails({})
+            }
+            file={pdfDataBase64}
          >
-            {props.pdfLoad &&
-              props.containerWH?.width &&
-              props.pdfOriginalWH.length > 0 &&
-              (props.pdfRequest || props.isSelfSign //pdf request sign flow
-                ? props.signerPos?.map((data, key) => {
-                    return (
-                      <React.Fragment key={key}>
-                        {checkSignedSigners(data)}
-                      </React.Fragment>
-                    );
-                  })
-                : props.placeholder //placeholder and template flow
-                  ? props.signerPos.map((data, ind) => {
-                      return (
-                        <React.Fragment key={ind}>
-                          {data?.placeHolder &&
-                            data?.placeHolder.map((placeData, index) => {
-                              return (
-                                <React.Fragment key={index}>
-                                  {placeData.pageNumber === props.pageNumber &&
-                                    placeData.pos.map((pos) => {
-                                      return (
-                                        <React.Fragment key={pos.key}>
-                                          <Placeholder
-                                            pos={pos}
-                                            setIsPageCopy={props.setIsPageCopy}
-                                            handleDeleteSign={
-                                              props.handleDeleteSign
-                                            }
-                                            handleTabDrag={props.handleTabDrag}
-                                            handleStop={props.handleStop}
-                                            handleSignYourselfImageResize={
-                                              handleImageResize
-                                            }
-                                            index={props.pageNumber}
-                                            xyPosition={props.signerPos}
-                                            setXyPosition={props.setSignerPos}
-                                            data={data}
-                                            setIsResize={props.setIsResize}
-                                            setShowDropdown={
-                                              props.setShowDropdown
-                                            }
-                                            isShowBorder={true}
-                                            isPlaceholder={true}
-                                            setUniqueId={props.setUniqueId}
-                                            handleLinkUser={
-                                              props.handleLinkUser
-                                            }
-                                            isSignYourself={false}
-                                            posWidth={posWidth}
-                                            posHeight={posHeight}
-                                            isDragging={props.isDragging}
-                                            setIsValidate={props.setIsValidate}
-                                            setIsRadio={props.setIsRadio}
-                                            setIsCheckbox={props.setIsCheckbox}
-                                            setCurrWidgetsDetails={
-                                              props.setCurrWidgetsDetails
-                                            }
-                                            handleNameModal={
-                                              props.handleNameModal
-                                            }
-                                            setTempSignerId={
-                                              props.setTempSignerId
-                                            }
-                                            uniqueId={props.uniqueId}
-                                            handleTextSettingModal={
-                                              props.handleTextSettingModal
-                                            }
-                                            scale={props.scale}
-                                            containerWH={props.containerWH}
-                                            pdfOriginalWH={props.pdfOriginalWH}
-                                            pageNumber={props.pageNumber}
-                                            setIsSelectId={props.setIsSelectId}
-                                            fontSize={props.fontSize}
-                                            setFontSize={props.setFontSize}
-                                            fontColor={props.fontColor}
-                                            setFontColor={props.setFontColor}
-                                            isResize={props.isResize}
-                                            unSignedWidgetId={
-                                              props.unSignedWidgetId
-                                            }
-                                            isFreeResize={true}
-                                            calculateFontsize={
-                                              calculateFontsize
-                                            }
-                                            currWidgetsDetails={
-                                              props?.currWidgetsDetails
-                                            }
-                                          />
-                                        </React.Fragment>
-                                      );
-                                    })}
-                                </React.Fragment>
-                              );
-                            })}
-                        </React.Fragment>
-                      );
-                    })
-                  : !props.pdfDetails?.[0]?.IsCompleted &&
-                    props.xyPosition?.map((data, ind) => {
-                      // signyourself flow
-                      return (
-                        <React.Fragment key={ind}>
-                          {data.pageNumber === props.pageNumber &&
-                            data.pos.map((pos) => {
-                              return (
-                                <React.Fragment key={pos.key}>
-                                  <Placeholder
-                                    pos={pos}
-                                    setIsPageCopy={props.setIsPageCopy}
-                                    handleDeleteSign={props.handleDeleteSign}
-                                    handleTabDrag={props.handleTabDrag}
-                                    handleStop={(event, dragElement) =>
-                                      props.handleStop(
-                                        event,
-                                        dragElement,
-                                        pos.type
-                                      )
-                                    }
-                                    handleSignYourselfImageResize={
-                                      handleSignYourselfImageResize
-                                    }
-                                    index={props.index}
-                                    xyPosition={props.xyPosition}
-                                    setXyPosition={props.setXyPosition}
-                                    isShowBorder={true}
-                                    isSignYourself={true}
-                                    posWidth={posWidth}
-                                    posHeight={posHeight}
-                                    pdfDetails={props.pdfDetails[0]}
-                                    isDragging={props.isDragging}
-                                    setIsCheckbox={props.setIsCheckbox}
-                                    setCurrWidgetsDetails={
-                                      props.setCurrWidgetsDetails
-                                    }
-                                    handleTextSettingModal={
-                                      props.handleTextSettingModal
-                                    }
-                                    scale={props.scale}
-                                    containerWH={props.containerWH}
-                                    pdfOriginalWH={props.pdfOriginalWH}
-                                    pageNumber={props.pageNumber}
-                                    fontSize={props.fontSize}
-                                    setFontSize={props.setFontSize}
-                                    fontColor={props.fontColor}
-                                    setFontColor={props.setFontColor}
-                                    isResize={props.isResize}
-                                    setIsResize={props.setIsResize}
-                                    isFreeResize={false}
-                                    isOpenSignPad={true}
-                                    calculateFontsize={calculateFontsize}
-                                    currWidgetsDetails={
-                                      props?.currWidgetsDetails
-                                    }
-                                  />
-                                </React.Fragment>
-                              );
-                            })}
-                        </React.Fragment>
-                      );
-                    }))}
-            {/* large device */}
-            {/* this component for render pdf document is in middle of the component */}
-            <Document
-              error={<p className="mx-2">{t("failed-to-load-refresh-page")}</p>}
-              onLoadError={() => props.setPdfLoad(false)}
-              loading={t("loading-doc")}
-              onLoadSuccess={props.pageDetails}
-              onClick={() =>
-                props.setCurrWidgetsDetails && props.setCurrWidgetsDetails({})
-              }
-              file={pdfDataBase64}
-            >
-              <Page
-                key={props.index}
-                width={props.containerWH.width}
-                scale={props.scale || 1}
-                className={"-z-[1]"} // when user zoom-in in tablet widgets move backward that's why pass -z-[1]
-                pageNumber={props.pageNumber}
-                renderAnnotationLayer={false}
-                renderTextLayer={false}
-                onGetAnnotationsError={(error) => {
-                  console.log("annotation error", error);
-                }}
-              />
-            </Document>
-          </div>
-        </RSC>
-      )}
+            <Page
+              key={props.index}
+              onLoadSuccess={handlePageLoadSuccess}
+              width={props.containerWH.width}
+              scale={props.scale || 1}
+              className={isMobile ? "select-none touch-callout-none" : "-z-[1]"}
+              pageNumber={props.pageNumber}
+              renderAnnotationLayer={false}
+              renderTextLayer={false}
+              onGetAnnotationsError={(error) => {
+                console.log("annotation error", error);
+              }}
+            />
+          </Document>
+        </div>
+      </RSC>
    </>
  );
 }
@@ -9,7 +9,8 @@ function SelectLanguage(props) {
    { value: "es", text: "Española" }, //spanish
    { value: "fr", text: "Français" }, //french
    { value: "it", text: "Italiano" }, //italian
-    { value: "de", text: "Deutsch" } //german
+    { value: "de", text: "Deutsch" }, //german
+    { value: "hi", text: "हिन्दी" } //hindi
  ];
  const defaultLanguage = i18next.language || "en";
  const [lang, setLang] = useState(defaultLanguage);
@@ -8,6 +8,7 @@ import {
  isMobile,
  radioButtonWidget,
  textInputWidget,
+  cellsWidget,
  textWidget,
  widgets
 } from "../../constant/Utils";
@@ -37,6 +38,10 @@ function WidgetComponent(props) {
    type: "BOX",
    item: { type: "BOX", id: 7, text: textInputWidget }
  });
+  const [, cells] = useDrag({
+    type: "BOX",
+    item: { type: "BOX", id: 17, text: cellsWidget }
+  });
  const [, initials] = useDrag({
    type: "BOX",
    item: { type: "BOX", id: 8, text: "initials" }
@@ -89,6 +94,7 @@ function WidgetComponent(props) {
      date,
      text,
      textInput,
+      cells,
      checkbox,
      dropdown,
      radioButton,
@@ -132,7 +138,9 @@ function WidgetComponent(props) {
  );
  const filterWidgets = widget.filter(
    (data) =>
-      !["dropdown", radioButtonWidget, textInputWidget].includes(data.type)
+      !["dropdown", radioButtonWidget, textInputWidget].includes(
+        data.type
+      )
  );
  const textWidgetData = widget.filter((data) => data.type !== textWidget);
  const updateWidgets = props.isSignYourself
@@ -241,6 +249,7 @@ function WidgetComponent(props) {
              handleDivClick={props.handleDivClick}
              handleMouseLeave={props.handleMouseLeave}
              signRef={signRef}
+              addPositionOfSignature={props.addPositionOfSignature}
            />
          </div>
        </div>
@@ -5,6 +5,7 @@ import RegexParser from "regex-parser";
 import {
  signatureTypes,
  textInputWidget,
+  cellsWidget,
  textWidget
 } from "../../constant/Utils";
 import { fontColorArr, fontsizeArr } from "../../constant/Utils";
@@ -19,7 +20,8 @@ const WidgetNameModal = (props) => {
    status: "required",
    hint: "",
    textvalidate: "",
-    isReadOnly: false
+    isReadOnly: false,
+    cellCount: 5
  });
  const [isValid, setIsValid] = useState(true);
  const statusArr = ["Required", "Optional"];
@@ -51,12 +53,14 @@ const WidgetNameModal = (props) => {
          props.defaultdata?.options?.validation?.type === "regex"
            ? props.defaultdata?.options?.validation?.pattern
            : props.defaultdata?.options?.validation?.type || "",
-        isReadOnly: props.defaultdata?.options?.isReadOnly || false
+        isReadOnly: props.defaultdata?.options?.isReadOnly || false,
+        cellCount: props.defaultdata?.options?.cellCount || 5
      });
    } else {
      setFormdata({
        ...formdata,
-        name: props.defaultdata?.options?.name || ""
+        name: props.defaultdata?.options?.name || "",
+        cellCount: props.defaultdata?.options?.cellCount || 5
      });
    }

@@ -83,6 +87,21 @@ const WidgetNameModal = (props) => {
          props.handleData(data, props.defaultdata?.type);
        }
      } else {
+        const isTextInput = [textInputWidget, cellsWidget].includes(
+          props.defaultdata?.type
+        );
+        const { isReadOnly, defaultValue, status } = formdata;
+        // If it’s a text‐input widget, enforce that read-only fields have
+        // either a defaultValue or an "optional" status.
+        if (isTextInput) {
+          const readOnlyWithoutValue =
+            isReadOnly && !defaultValue && status !== "optional";
+
+          if (readOnlyWithoutValue) {
+            alert(t("readonly-textinput-error"));
+            return;
+          }
+        }
        props.handleData(formdata);
      }
      setFormdata({
@@ -91,7 +110,8 @@ const WidgetNameModal = (props) => {
        defaultValue: "",
        status: "required",
        hint: "",
-        textvalidate: ""
+        textvalidate: "",
+        cellCount: 5
      });
      setSignatureType(signTypes);
    }
@@ -112,7 +132,11 @@ const WidgetNameModal = (props) => {
    } else {
      setIsValid(true);
    }
-    setFormdata({ ...formdata, [e.target.name]: e.target.value });
+    const val =
+      props.defaultdata?.type === cellsWidget
+        ? e.target.value.slice(0, formdata.cellCount)
+        : e.target.value;
+    setFormdata({ ...formdata, [e.target.name]: val });
  };

  function handleValidation(type) {
@@ -123,6 +147,8 @@ const WidgetNameModal = (props) => {
        return "/^\\d+$/";
      case "text":
        return "/^[a-zA-Zs]+$/";
+      case "ssn":
+        return "^\\d{3}-\\d{2}-\\d{4}$";
      default:
        return type;
    }
@@ -150,7 +176,7 @@ const WidgetNameModal = (props) => {
      <form
        onSubmit={handleSubmit}
        className={`${
-          props.defaultdata?.type === textInputWidget
+          [textInputWidget, cellsWidget].includes(props.defaultdata?.type)
            ? "pt-0"
            : ["signature", "initials"].includes(props.defaultdata?.type)
              ? "pt-2"
@@ -174,7 +200,21 @@ const WidgetNameModal = (props) => {
            />
          </div>
        )}
-        {props.defaultdata?.type === textInputWidget && (
+        {props.defaultdata?.type === cellsWidget && (
+          <div className="mb-[0.75rem] text-[13px]">
+            <label htmlFor="cellCount">{t("cell-count")}</label>
+            <input
+              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+              type="number"
+              min="1"
+              name="cellCount"
+              value={formdata.cellCount}
+              onChange={(e) => handleChange(e)}
+              required
+            />
+          </div>
+        )}
+        {[textInputWidget, cellsWidget].includes(props.defaultdata?.type) && (
          <>
            <div className="mb-[0.75rem]">
              <label htmlFor="name" className="text-[13px]">
@@ -186,6 +226,11 @@ const WidgetNameModal = (props) => {
                value={formdata.defaultValue}
                onChange={(e) => handledefaultChange(e)}
                autoComplete="off"
+                maxLength={
+                  props.defaultdata?.type === cellsWidget
+                    ? formdata.cellCount
+                    : undefined
+                }
                onBlur={() => {
                  if (isValid === false) {
                    setFormdata({ ...formdata, defaultValue: "" });
@@ -237,7 +282,9 @@ const WidgetNameModal = (props) => {
                );
              })}
            </div>
-            {[textInputWidget].includes(props.defaultdata?.type) && (
+            {[textInputWidget, cellsWidget].includes(
+              props.defaultdata?.type
+            ) && (
              <div className="flex items-center">
                <input
                  id="isReadOnly"
@@ -252,7 +299,7 @@ const WidgetNameModal = (props) => {
                    }))
                  }
                />
-                <label className="ml-1 mb-0" htmlFor="isreadonly">
+                <label className="ml-1.5 mb-0 capitalize text-[13px]" htmlFor="isreadonly">
                  {t("read-only")}
                </label>
              </div>
@@ -304,6 +351,7 @@ const WidgetNameModal = (props) => {
        {[
          textInputWidget,
          textWidget,
+          cellsWidget,
          "name",
          "company",
          "job title",
@@ -14,11 +14,12 @@ import {
  onSaveSign,
  radioButtonWidget,
  selectCheckbox,
-  signatureTypes,
  textInputWidget,
+  cellsWidget,
  textWidget,
  years
 } from "../../constant/Utils";
+import CellsWidget from "./CellsWidget";
 import DatePicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
 import SignatureCanvas from "react-signature-canvas";
@@ -85,7 +86,8 @@ function WidgetsValueModal(props) {
    setXyPosition,
    isSave,
    setUniqueId,
-    tempSignerId
+    tempSignerId,
+    signatureTypes
  } = props;
  const [penColor, setPenColor] = useState("blue");
  const [isOptional, setIsOptional] = useState(true);
@@ -93,7 +95,6 @@ function WidgetsValueModal(props) {
  const [isTab, setIsTab] = useState("");
  const [textWidth, setTextWidth] = useState(0);
  const [textHeight, setTextHeight] = useState(0);
-  const [signatureType, setSignatureType] = useState("");
  const [isSignTypes, setIsSignTypes] = useState(true);
  const [typedSignature, setTypedSignature] = useState("");
  const [selectDate, setSelectDate] = useState({});
@@ -119,13 +120,33 @@ function WidgetsValueModal(props) {
  const currentUserName = jsonSender && jsonSender?.name;
  const widgetTypeTranslation = t(`widgets-name.${currWidgetsDetails?.type}`);
  const [widgetValue, setWidgetValue] = useState(
-    currWidgetsDetails?.options?.response ||
-      currWidgetsDetails?.options?.defaultValue
+    currWidgetsDetails.type !== "checkbox" &&
+      (currWidgetsDetails?.options?.response ||
+        currWidgetsDetails?.options?.defaultValue)
  );
-  const [selectedCheckbox, setSelectedCheckbox] = useState(
-    currWidgetsDetails?.options?.response ||
+  const [cellsValue, setCellsValue] = useState(() => {
+    const count = currWidgetsDetails?.options?.cellCount || 5;
+    const val =
+      currWidgetsDetails?.options?.response ||
      currWidgetsDetails?.options?.defaultValue ||
-      []
+      "";
+    return Array.from({ length: count }, (_, i) => val[i] || "");
+  });
+  const cellRefs = useRef([]);
+
+  useEffect(() => {
+    const count = currWidgetsDetails?.options?.cellCount || 5;
+    const val =
+      currWidgetsDetails?.options?.response ||
+      currWidgetsDetails?.options?.defaultValue ||
+      "";
+    setCellsValue(Array.from({ length: count }, (_, i) => val[i] || ""));
+  }, [currWidgetsDetails?.key]);
+  const [selectedCheckbox, setSelectedCheckbox] = useState(
+    currWidgetsDetails.type === "checkbox" &&
+      (currWidgetsDetails?.options?.response ||
+        currWidgetsDetails?.options?.defaultValue ||
+        [])
  );
  const [startDate, setStartDate] = useState(
    currWidgetsDetails?.options?.response
@@ -156,34 +177,6 @@ function WidgetsValueModal(props) {
        setHint(currWidgetsDetails?.type);
      }
    }
-    //set already draw or save signature url/text url of signature text type and draw type for initial type and signature type widgets
-    if (currWidgetsDetails && canvasRef.current) {
-      const isWidgetType = currWidgetsDetails?.type;
-      const signatureType = currWidgetsDetails?.signatureType;
-      const url = currWidgetsDetails?.SignUrl;
-      //checking widget type and draw type signature url
-      if (currWidgetsDetails?.type === "initials") {
-        if (isWidgetType === "initials" && signatureType === "draw" && url) {
-          canvasRef.current.fromDataURL(url);
-        }
-      } else if (
-        isWidgetType === "signature" &&
-        signatureType === "draw" &&
-        url
-      ) {
-        canvasRef.current.fromDataURL(url);
-      }
-
-      const trimmedName = currentUserName && currentUserName?.trim();
-      const firstCharacter = trimmedName?.charAt(0);
-      const userName =
-        currWidgetsDetails?.type === "initials"
-          ? firstCharacter
-          : currentUserName;
-      const signatureValue = currWidgetsDetails?.typeSignature;
-      setTypedSignature(signatureValue || userName || "");
-      setFontSelect("Fasthand");
-    }
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [currWidgetsDetails]); // Added currWidgetsDetails to dependency array for reset logic

@@ -231,7 +224,9 @@ function WidgetsValueModal(props) {
      setXyPosition,
      uniqueId,
      false,
-      data?.format
+      data?.format,
+      currWidgetsDetails?.options?.fontSize || 12,
+      currWidgetsDetails?.options?.fontColor || "black"
    );
    setSelectDate({ date: date, format: data?.format });
  };
@@ -398,10 +393,9 @@ function WidgetsValueModal(props) {

    if (getIndex !== -1) {
      setIsSignTypes(true);
-      const tab = signatureTypes[getIndex].name;
+      const tab = signatureTypes?.[getIndex].name;
      if (tab === "draw") {
        setIsTab("draw");
-        setSignatureType("draw");
      } else if (tab === "upload") {
        setIsImageSelect(true);
        setIsTab("uploadImage");
@@ -425,7 +419,7 @@ function WidgetsValueModal(props) {
    }
  }
  function isTabEnabled(tabName) {
-    const isEnabled = signatureTypes.find((x) => x.name === tabName)?.enabled;
+    const isEnabled = signatureTypes?.find((x) => x.name === tabName)?.enabled;
    return isEnabled;
  }

@@ -447,7 +441,32 @@ function WidgetsValueModal(props) {
        setTypedSignature("");
      }
    } else {
-      setWidgetValue("");
+      if (currWidgetsDetails?.type === cellsWidget) {
+        const count =
+          currWidgetsDetails?.options?.cellCount || cellsValue.length || 1;
+        const cleared = Array.from({ length: count }, () => "");
+        setCellsValue(cleared);
+        const combined = cleared.join("");
+        setWidgetValue(combined);
+        onChangeInput(
+          combined,
+          currWidgetsDetails?.key,
+          xyPosition,
+          props.index,
+          setXyPosition,
+          uniqueId
+        );
+      } else {
+        setWidgetValue("");
+        onChangeInput(
+          "",
+          currWidgetsDetails?.key,
+          xyPosition,
+          props.index,
+          setXyPosition,
+          uniqueId
+        );
+      }
    }
  };
  //function for set signature url
@@ -581,7 +600,7 @@ function WidgetsValueModal(props) {
      if (isTab === "mysignature") {
        setSignature("");
        if (currWidgetsDetails?.type === "initials") {
-          handleSaveSignature(signatureType, "initials");
+          handleSaveSignature(isTab, "initials");
        } else {
          handleSaveSignature(null, "default");
        }
@@ -602,34 +621,32 @@ function WidgetsValueModal(props) {
        } else {
          setSignature("");
          canvasRef?.current?.clear();
-          handleSaveSignature(signatureType);
+          handleSaveSignature(isTab);
        }
      }
      setPenColor("blue");
    } else {
      setSignature("");
-      handleSaveImage(signatureType);
+      handleSaveImage();
    }
    setIsImageSelect(false);
    setIsDefaultSign(false);
    setImage();
    handleTab();
  };
-  const autoSignAll = () => {
-    return (
-      <label className="cursor-pointer flex items-center text-sm">
-        <input
-          className="mr-2 md:mr-3 op-checkbox op-checkbox-xs md:op-checkbox-sm"
-          type="checkbox"
-          value={isAutoSign}
-          onChange={(e) => {
-            setIsAutoSign(e.target.checked);
-          }}
-        />
-        {t("auto-sign-mssg")}
-      </label>
-    );
-  };
+  const autoSignAll = (
+    <label className="mb-0 cursor-pointer flex items-center text-sm">
+      <input
+        className="mr-2 md:mr-3 op-checkbox op-checkbox-xs md:op-checkbox-sm"
+        type="checkbox"
+        value={isAutoSign}
+        onChange={(e) => {
+          setIsAutoSign(e.target.checked);
+        }}
+      />
+      {t("auto-sign-mssg")}
+    </label>
+  );

  useEffect(() => {
    const loadFont = async () => {
@@ -649,24 +666,21 @@ function WidgetsValueModal(props) {
  }, [fontSelect]);

  useEffect(() => {
-    if (
-      ["signature", "initials"].includes(currWidgetsDetails?.type) &&
-      widgetValue
-    ) {
-      if (isTab === "draw" && currWidgetsDetails?.signatureType === "draw") {
-        setSignature(widgetValue);
-      } else if (isTab === "uploadImage" && currWidgetsDetails?.ImageType) {
-        setImage({ imgType: currWidgetsDetails?.ImageType, src: widgetValue });
+    if (currWidgetsDetails?.options?.response) {
+      const url = currWidgetsDetails?.options?.response;
+      if (["signature", "initials"].includes(currWidgetsDetails?.type)) {
+        if (isTab === "draw" && currWidgetsDetails?.signatureType === "draw") {
+          setSignature(url);
+          // Load the default signature after the component mounts
+          if (canvasRef.current) {
+            canvasRef.current.fromDataURL(url);
+          }
+        } else if (isTab === "uploadImage" && currWidgetsDetails?.ImageType) {
+          setImage({ imgType: currWidgetsDetails?.ImageType, src: url });
+        }
+      } else if (["image", "stamp"].includes(currWidgetsDetails?.type)) {
+        setImage({ imgType: currWidgetsDetails?.ImageType, src: url });
      }
-    } else if (
-      ["image", "stamp"].includes(currWidgetsDetails?.type) &&
-      widgetValue
-    ) {
-      setImage({ imgType: currWidgetsDetails?.ImageType, src: widgetValue });
-    }
-    // Load the default signature after the component mounts
-    if (canvasRef.current) {
-      canvasRef.current.fromDataURL(signature);
    }
    if (isTab === "type") {
      const trimmedName = typedSignature
@@ -683,51 +697,64 @@ function WidgetsValueModal(props) {
    }
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [isTab]);
-  //function for convert input text value in image
+  // function for convert input text value in image
  const convertToImg = async (fontStyle, text, color) => {
-    //get text content to convert in image
-    const textContent = text;
-    const fontfamily = fontStyle
-      ? fontStyle
-      : fontSelect
-        ? fontSelect
-        : "Fasthand";
-    const fontSizeValue = "40px";
-    //creating span for getting text content width
+    // 1) Read the max widget dimensions:
+    const maxWidth = currWidgetsDetails.Width; // e.g. 150 px
+    const maxHeight = currWidgetsDetails.Height; // e.g.  40 px
+
+    // 2) Pick a “baseline” font size for measurement:
+    const baselineFontSizePx = 40;
+    const chosenFontFamily = fontStyle || fontSelect || "Fasthand";
+    const fillColor = color || penColor;
+
+    // 3) Create a temporary <span> (hidden) to measure the text at 40px:
    const span = document.createElement("span");
-    span.textContent = textContent;
-    span.style.font = `${fontSizeValue} ${fontfamily}`; // here put your text size and font family
-    span.style.color = color ? color : penColor;
-    span.style.display = "hidden";
-    document.body.appendChild(span); // Replace 'container' with the ID of the container element
+    span.textContent = text;
+    span.style.font = `${baselineFontSizePx}px ${chosenFontFamily}`;
+    span.style.visibility = "hidden"; // keep it in the DOM so offsetWidth/Height works
+    span.style.whiteSpace = "nowrap"; // so we measure a single line
+    document.body.appendChild(span);

-    //create canvas to render text in canvas and convert in image
-    const canvasElement = document.createElement("canvas");
-    // Draw the text content on the canvas
-    const ctx = canvasElement.getContext("2d");
+    // Measured size at 40px:
+    const measuredWidth = span.offsetWidth;
+    const measuredHeight = span.offsetHeight;
+    document.body.removeChild(span);
+
+    // 4) Compute uniform scale so that 40px‐sized text fits inside (maxWidth × maxHeight):
+    const scaleX = maxWidth / measuredWidth;
+    const scaleY = maxHeight / measuredHeight;
+    const scale = Math.min(scaleX, scaleY, 1); // never scale up beyond 1
+
+    // 5) Final text size in **CSS px**:
+    const finalFontSizePx = baselineFontSizePx * scale;
+
+    // 6) Create a <canvas> that is ALWAYS maxWidth × maxHeight in **CSS px**,
+    //    but use devicePixelRatio for sharpness.
    const pixelRatio = window.devicePixelRatio || 1;
-    const addExtraWidth = currWidgetsDetails?.type === "initials" ? 10 : 50;
-    const width = span.offsetWidth + addExtraWidth;
-    const height = span.offsetHeight;
-    setTextWidth(width);
-    setTextHeight(height);
-    const font = span.style["font"];
-    // Set the canvas dimensions to match the span
-    canvasElement.width = width * pixelRatio;
-    canvasElement.height = height * pixelRatio;
+    const canvas = document.createElement("canvas");

-    // You can customize text styles if needed
-    ctx.font = font;
-    ctx.fillStyle = color ? color : penColor; // Set the text color
+    // ★ Instead of using `finalTextWidth/Height`, force it to be the max box:
+    canvas.width = Math.ceil(maxWidth * pixelRatio);
+    canvas.height = Math.ceil(maxHeight * pixelRatio);
+
+    const ctx = canvas.getContext("2d");
+    ctx.scale(pixelRatio, pixelRatio);
+
+    // 7) Draw the text **centered** inside the full maxWidth×maxHeight box:
+    ctx.font = `${finalFontSizePx}px ${chosenFontFamily}`;
+    ctx.fillStyle = fillColor;
    ctx.textAlign = "center";
    ctx.textBaseline = "middle";
-    ctx.scale(pixelRatio, pixelRatio);
-    // Draw the content of the span onto the canvas
-    ctx.fillText(span.textContent, width / 2, height / 2); // Adjust the x,y-coordinate as needed
-    //remove span tag
-    document.body.removeChild(span);
-    // Convert the canvas to image data
-    const dataUrl = canvasElement.toDataURL("image/png");
+
+    // ★ Center = (maxWidth/2, maxHeight/2):
+    const centerX = maxWidth / 2;
+    const centerY = maxHeight / 2;
+
+    ctx.fillText(text, centerX, centerY);
+
+    // 8) Export to a PNG data-URL:
+    const dataUrl = canvas.toDataURL("image/png");
    setSignature(dataUrl);
  };
  const PenColorComponent = (props) => {
@@ -857,7 +884,7 @@ function WidgetsValueModal(props) {
  ]);

  const savesigncheckbox = (
-    <label className="cursor-pointer flex items-center mb-0 text-center text-[11px] md:text-base">
+    <label className="cursor-pointer flex items-center mb-0 text-center text-sm">
      <input
        className="mr-2 md:mr-3 op-checkbox op-checkbox-xs md:op-checkbox-sm"
        type="checkbox"
@@ -940,6 +967,65 @@ function WidgetsValueModal(props) {
      uniqueId
    );
  };
+  const handleCellsInput = (e, idx) => {
+    const val = e.target.value.slice(0, 1);
+    const updated = [...cellsValue];
+    updated[idx] = val;
+    setCellsValue(updated);
+    const combined = updated.join("");
+    setWidgetValue(combined);
+    onChangeInput(
+      combined,
+      currWidgetsDetails?.key,
+      xyPosition,
+      props.index,
+      setXyPosition,
+      uniqueId
+    );
+    if (val) {
+      if (idx < cellRefs.current.length - 1) {
+        cellRefs.current[idx + 1]?.focus();
+      }
+    } else if (idx > 0) {
+      // move focus back when a cell becomes empty
+      cellRefs.current[idx - 1]?.focus();
+    }
+  };
+  const handleCellsKeyDown = (e, idx) => {
+    if (e.key === "Backspace" && !cellsValue[idx] && idx > 0) {
+      e.preventDefault();
+      const updated = [...cellsValue];
+      updated[idx - 1] = "";
+      const combined = updated.join("");
+      setCellsValue(updated);
+      setWidgetValue(combined);
+      onChangeInput(
+        combined,
+        currWidgetsDetails?.key,
+        xyPosition,
+        props.index,
+        setXyPosition,
+        uniqueId
+      );
+      cellRefs.current[idx - 1]?.focus();
+    }
+    if (e.key === "Delete") {
+      e.preventDefault();
+      const updated = [...cellsValue];
+      updated[idx] = "";
+      const combined = updated.join("");
+      setCellsValue(updated);
+      setWidgetValue(combined);
+      onChangeInput(
+        combined,
+        currWidgetsDetails?.key,
+        xyPosition,
+        props.index,
+        setXyPosition,
+        uniqueId
+      );
+    }
+  };
  //function is used to show widgets on modal according to selected widget type checkbox/date/radio/drodown/textbox/signature/image
  const getWidgetType = (type) => {
    switch (type) {
@@ -970,7 +1056,6 @@ function WidgetsValueModal(props) {
                                  setIsDefaultSign(true);
                                  setIsImageSelect(true);
                                  setIsTab("mysignature");
-                                  setSignatureType("");
                                  setImage();
                                }}
                                className={`${
@@ -990,7 +1075,6 @@ function WidgetsValueModal(props) {
                                    setIsDefaultSign(true);
                                    setIsImageSelect(true);
                                    setIsTab("mysignature");
-                                    setSignatureType("");
                                    setImage();
                                  }}
                                  className={`${
@@ -1027,7 +1111,6 @@ function WidgetsValueModal(props) {
                                  setIsDefaultSign(false);
                                  setIsImageSelect(true);
                                  setIsTab("uploadImage");
-                                  setSignatureType("");
                                }}
                                className={`${
                                  isTab === "uploadImage" && `${isTabCls}`
@@ -1044,7 +1127,6 @@ function WidgetsValueModal(props) {
                                  setIsDefaultSign(false);
                                  setIsImageSelect(false);
                                  setIsTab("type");
-                                  setSignatureType("");
                                  setImage();
                                }}
                                className={`${
@@ -1059,7 +1141,14 @@ function WidgetsValueModal(props) {
                      </div>
                    </div>
                  )}
-                <div className="mt-4 h-full">
+                <div
+                  className={`${
+                    currWidgetsDetails?.type === "stamp" ||
+                    currWidgetsDetails?.type === "image"
+                      ? ""
+                      : "mt-3"
+                  } h-full`}
+                >
                  {isDefaultSign ? (
                    <>
                      {currWidgetsDetails?.type !== "initials" &&
@@ -1085,7 +1174,7 @@ function WidgetsValueModal(props) {
                            {/* Standalone autoSignAll for "My Signature/Initials" (isDefaultSign) if conditions met */}
                            {setIsAutoSign && uniqueId && (
                              <div className="flex justify-center my-2">
-                                {autoSignAll()}
+                                {autoSignAll}
                              </div>
                            )}
                          </>
@@ -1114,7 +1203,7 @@ function WidgetsValueModal(props) {
                            {/* Standalone autoSignAll for "My Signature/Initials" (isDefaultSign) if conditions met */}
                            {setIsAutoSign && uniqueId && (
                              <div className="flex justify-center my-2">
-                                {autoSignAll()}
+                                {autoSignAll}
                              </div>
                            )}
                          </>
@@ -1163,9 +1252,8 @@ function WidgetsValueModal(props) {
                              ["image", "stamp"].includes(
                                currWidgetsDetails?.type
                              )))) && (
-                          <div className="flex justify-center items-center space-x-4 my-2">
-                            {setIsAutoSign && uniqueId && autoSignAll()}
-
+                          <div className="flex justify-center items-center gap-x-2 my-2">
+                            {setIsAutoSign && uniqueId && autoSignAll}
                            {image &&
                              (isImageSelect ||
                                ["image", "stamp"].includes(
@@ -1173,7 +1261,7 @@ function WidgetsValueModal(props) {
                                )) && (
                                <label
                                  htmlFor={`removeBgToggleModal-${currWidgetsDetails?.key}`}
-                                  className="cursor-pointer flex items-center text-sm"
+                                  className="mb-0 cursor-pointer flex items-center text-sm"
                                >
                                  <input
                                    type="checkbox"
@@ -1253,16 +1341,18 @@ function WidgetsValueModal(props) {
                      <div className="flex flex-row justify-between mt-[10px]">
                        <PenColorComponent />
                      </div>
-                      <div className="flex flex-col mt-2">
+                      <div className="flex flex-row ml-1 mt-2 gap-x-3">
                        {/* Standalone autoSignAll for "Type" tab if conditions met */}
                        {setIsAutoSign && uniqueId && (
                          <div className="flex justify-start my-1">
-                            {autoSignAll()}
+                            {autoSignAll}
+                          </div>
+                        )}
+                        {accesstoken && (
+                          <div className="flex justify-start my-1">
+                            {saveSignCheckbox?.isVisible && savesigncheckbox}
                          </div>
                        )}
-                        {accesstoken &&
-                          saveSignCheckbox?.isVisible &&
-                          savesigncheckbox}
                      </div>
                    </>
                  ) : (
@@ -1287,55 +1377,56 @@ function WidgetsValueModal(props) {
                      <div className="flex flex-row justify-between mt-[10px]">
                        <PenColorComponent />
                      </div>
-                      <div className="flex flex-col mt-2">
+                      <div className="flex flex-row ml-1 mt-1 gap-x-3">
                        {/* Standalone autoSignAll for "Draw" tab if conditions met */}
                        {setIsAutoSign && uniqueId && (
                          <div className="flex justify-start my-1">
-                            {autoSignAll()}
+                            {autoSignAll}
+                          </div>
+                        )}
+                        {accesstoken && (
+                          <div className="flex justify-start my-1">
+                            {saveSignCheckbox?.isVisible && savesigncheckbox}
                          </div>
                        )}
-                        {accesstoken &&
-                          saveSignCheckbox?.isVisible &&
-                          savesigncheckbox}
                      </div>
                    </>
                  )}
                </div>
              </>
            ) : (
-              <div>
-                <div className="relative flex flex-row items-center justify-between">
-                  <div className="text-base-content font-bold text-lg">
-                    {t("signature")}
-                  </div>
-                  <div
-                    className="text-[1.5rem] cursor-pointer"
-                    onClick={handleCancelBtn}
-                  >
-                    &times;
-                  </div>
-                </div>
-                <div className="mx-3 mb-6 mt-3">
-                  <p>{t("at-least-one-signature-type")}</p>
-                </div>
+              <div className="mx-3 mb-6 mt-3">
+                <p>{t("at-least-one-signature-type")}</p>
              </div>
            )}
          </div>
        );
      case "checkbox":
+        const checkBoxLayout =
+          currWidgetsDetails?.options?.layout || "vertical";
+        const isMultipleCheckbox =
+          currWidgetsDetails?.options?.values?.length > 0 ? true : false;
+        const checkBoxWrapperClass = `flex items-start ${
+          checkBoxLayout === "horizontal"
+            ? `flex-row flex-wrap ${isMultipleCheckbox ? "gap-x-2" : ""}`
+            : `flex-col ${isMultipleCheckbox ? "gap-y-[5px]" : ""}`
+        }`; // Using gap-y-1 for consistency, adjust if needed
+
        return (
-          <div className="border-[1px] border-gray-300 rounded-[2px] p-1 px-3">
-            {currWidgetsDetails?.options?.values?.map((data, ind) => {
-              return (
-                <div
-                  key={ind}
-                  className=" select-none-cls flex items-center text-center gap-0.5"
+          <div
+            className={`border-[1px] border-gray-300 rounded-[2px] pt-1 px-2.5 ${checkBoxWrapperClass}`}
+          >
+            {currWidgetsDetails?.options?.values?.map((data, ind) => (
+              <div key={ind} className=" select-none-cls">
+                <label
+                  htmlFor={`checkbox-${currWidgetsDetails?.key + ind}`}
+                  className="text-xs flex items-center gap-1"
                >
                  <input
                    id={`checkbox-${currWidgetsDetails?.key + ind}`}
                    className={`${
                      ind === 0 ? "mt-0" : "mt-[5px]"
-                    }  op-checkbox op-checkbox-sm rounded-[1px] `}
+                    }  op-checkbox op-checkbox-xs rounded-[1px] mt-1`}
                    type="checkbox"
                    checked={!!selectCheckbox(ind, selectedCheckbox)}
                    onChange={(e) => {
@@ -1360,17 +1451,10 @@ function WidgetsValueModal(props) {
                      }
                    }}
                  />
-                  {!currWidgetsDetails?.options?.isHideLabel && (
-                    <label
-                      htmlFor={`checkbox-${currWidgetsDetails?.key + ind}`}
-                      className="text-xs mb-0 text-center"
-                    >
-                      {data}
-                    </label>
-                  )}
-                </div>
-              );
-            })}
+                  {data}
+                </label>
+              </div>
+            ))}
          </div>
        );
      case textInputWidget:
@@ -1383,6 +1467,19 @@ function WidgetsValueModal(props) {
            className={textInputcls}
          />
        );
+      case cellsWidget:
+        return (
+          <CellsWidget
+            count={cellsValue.length}
+            height="100%"
+            value={cellsValue.join("")}
+            editable={true}
+            resizable={false}
+            onChange={handleCellsInput}
+            onKeyDown={handleCellsKeyDown}
+            inputRefs={cellRefs}
+          />
+        );
      case "dropdown":
        return (
          <select
@@ -1400,18 +1497,11 @@ function WidgetsValueModal(props) {
            >
              {currWidgetsDetails?.options?.name}
            </option>
-
-            {currWidgetsDetails?.options?.values?.map((data, ind) => {
-              return (
-                <option
-                  // style={{ fontSize: fontSize, color: fontColor }}
-                  key={ind}
-                  value={data}
-                >
-                  {data}
-                </option>
-              );
-            })}
+            {currWidgetsDetails?.options?.values?.map((data, ind) => (
+              <option key={ind} value={data}>
+                {data}
+              </option>
+            ))}
          </select>
        );
      case "name":
@@ -1511,20 +1601,27 @@ function WidgetsValueModal(props) {
          </>
        );
      case radioButtonWidget:
+        const radioLayout = currWidgetsDetails.options?.layout || "vertical";
+        const isOnlyOneBtn =
+          currWidgetsDetails.options?.values?.length > 0 ? true : false;
+        const radioWrapperClass = `flex items-start ${
+          radioLayout === "horizontal"
+            ? `flex-row flex-wrap ${isOnlyOneBtn ? "gap-x-2" : ""}`
+            : `flex-col ${isOnlyOneBtn ? "gap-y-[5px]" : ""}`
+        }`; // Using gap-y-1 for consistency, adjust if needed
        return (
-          <div className="border-[1px] border-gray-300 rounded-[2px] p-1 px-3">
-            {currWidgetsDetails?.options?.values.map((data, ind) => {
-              return (
-                <div
-                  key={ind}
-                  className="select-none-cls flex items-center text-center gap-0.5"
+          <div
+            className={`border-[1px] border-gray-300 rounded-[2px] pt-1 px-2.5 ${radioWrapperClass}`}
+          >
+            {currWidgetsDetails?.options?.values.map((data, ind) => (
+              <div key={ind} className="select-none-cls">
+                <label
+                  htmlFor={`radio-${currWidgetsDetails?.key + ind}`}
+                  className="cursor-pointer flex items-center text-sm gap-1"
                >
                  <input
                    id={`radio-${currWidgetsDetails?.key + ind}`}
-                    style={{
-                      marginTop: ind > 0 ? "10px" : "0px"
-                    }}
-                    className={`flex justify-center op-radio`}
+                    className={`op-radio op-radio-xs mt-1`}
                    type="radio"
                    value={data}
                    checked={handleRadioCheck(data)}
@@ -1532,18 +1629,10 @@ function WidgetsValueModal(props) {
                      handleCheckRadio(e.target.value);
                    }}
                  />
-                  {!currWidgetsDetails?.options?.isHideLabel && (
-                    <label
-                      htmlFor={`radio-${currWidgetsDetails?.key + ind}`}
-                      // style={{ fontSize: fontSize, color: fontColor }}
-                      className="text-xs mb-0"
-                    >
-                      {data}
-                    </label>
-                  )}
-                </div>
-              );
-            })}
+                  <span>{data}</span>
+                </label>
+              </div>
+            ))}
          </div>
        );
      case textWidget:
@@ -1581,15 +1670,9 @@ function WidgetsValueModal(props) {
      const minCount =
        currWidgetsDetails?.options?.validation?.minRequiredCount;
      const parseMin = minCount && parseInt(minCount);
-      //get maximum required count if  exist
-      const maxCount =
-        currWidgetsDetails?.options?.validation?.maxRequiredCount;
-      const parseMax = maxCount && parseInt(maxCount);
-      if (parseMin > 0 && parseMax > 0) {
+      if (parseMin > 0) {
        isRequired = true;
      }
-    } else if (isRadio) {
-      isRequired = true;
    } else {
      isRequired = currWidgetsDetails.options?.status === "required";
    }
@@ -1652,7 +1735,7 @@ function WidgetsValueModal(props) {
  const validateExpression = (regexValidation) => {
    if (widgetValue && regexValidation) {
      let regexObject = regexValidation;
-      if (props.pos?.options?.validation?.type === "regex") {
+      if (currWidgetsDetails?.options?.validation?.type === "regex") {
        regexObject = RegexParser(regexValidation);
      }
      let isValidate = regexObject.test(widgetValue);
@@ -1675,7 +1758,12 @@ function WidgetsValueModal(props) {
        validateExpression(regexValidation);
        break;
      default:
-        regexValidation = props.pos?.options?.validation?.pattern || "";
+        // Grab the current pattern (if it exists)
+        const pattern = currWidgetsDetails?.options?.validation?.pattern;
+        // Removed `backwordSupportPattern` (/^[a-zA-Z0-9s]+$/) — it blocked spaces and special characters.
+        const backwordSupportPattern =
+          pattern && pattern === "/^[a-zA-Z0-9s]+$/" ? "" : pattern; // If it matches exactly '/^[a-zA-Z0-9s]+$/', clear it
+        regexValidation = backwordSupportPattern || "";
        validateExpression(regexValidation);
        break;
    }
@@ -1785,21 +1873,70 @@ function WidgetsValueModal(props) {
      setUniqueId(tempSignerId);
    }
  };
+  //function is used to excecute on click finish button functionality
  const handleFinish = () => {
    props?.finishDocument();
    dispatch(setIsShowModal({}));
  };

+  useEffect(() => {
+    if (!isSave) {
+      handleFinishButton();
+    }
+  }, [isSave]);
+  //'handleFinishButton' function is used to show finish button click on any widge if all required widgtes have response
+  const handleFinishButton = () => {
+    const widgetsPosition = xyPosition?.find((data) => data.Id === uniqueId);
+    //using 'flatMap' create all nested array in one level
+    const editableWidgets = widgetsPosition?.placeHolder?.flatMap((page) =>
+      page.pos
+        .filter((widget) => !widget.options?.isReadOnly)
+        .map((widget) => widget)
+    );
+    const getcurrentwidget = editableWidgets?.find(
+      (data) => data?.key === currWidgetsDetails?.key
+    );
+    if (getcurrentwidget?.options?.response) {
+      props?.setCurrWidgetsDetails(getcurrentwidget);
+    }
+    let isResponse = true;
+    //condition to check all required widgets have response or not then show finish buutton
+    for (const data of editableWidgets) {
+      if (data?.type === "checkbox") {
+        const minCount = data.options?.validation?.minRequiredCount;
+        const parseMin = minCount && parseInt(minCount);
+        const hasNoResponse =
+          (!Array.isArray(data?.options?.response) ||
+            data.options.response.length === 0) &&
+          (!Array.isArray(data?.options?.defaultValue) ||
+            data.options.defaultValue.length === 0);
+        if (parseMin > 0 && hasNoResponse) {
+          isResponse = false;
+          break;
+        }
+      } else if (
+        !data.options.response &&
+        !data?.options?.defaultValue &&
+        data.options?.status === "required"
+      ) {
+        isResponse = false;
+        break;
+      }
+    }
+    if (isResponse) {
+      setIsLastWidget(true);
+    }
+  };
  return (
    <>
      <ModalUi
        isOpen={true}
        handleClose={() => !isShowValidation && handleclose()}
+        position="bottom"
      >
-        <div className="h-[100%] p-[20px]">
+        <div className="h-[100%] p-[18px]">
          {isFinish ? (
            <>
-              {" "}
              <div className="p-1 mt-3">
                <span className="text-base">{t("finish-mssg")}</span>
              </div>
@@ -1824,7 +1961,7 @@ function WidgetsValueModal(props) {
            </>
          ) : (
            <>
-              <div className="p-1 m-1">
+              <div>
                <div className="relative inline-block">
                  <span className="text-base">
                    {currWidgetsDetails?.options?.name || widgetTypeTranslation}
@@ -1835,7 +1972,7 @@ function WidgetsValueModal(props) {
                    </span>
                  )}
                </div>
-                <div className="flex flex-col justify-center m-2 mt-4">
+                <div className="flex flex-col justify-center m-2 mt-3">
                  <div className="flex justify-center">
                    {getWidgetType(currWidgetsDetails?.type)}
                  </div>
@@ -1852,15 +1989,18 @@ function WidgetsValueModal(props) {
                ) ? (
                  <button
                    type="button"
-                    className="op-btn op-btn-ghost mr-1 mt-[2px]"
+                    className="op-btn op-btn-ghost op-btn-sm mr-1"
                    onClick={() => handleClear()}
                  >
                    {t("clear")}
                  </button>
                ) : (
-                  <div className="w-[80px]"></div>
+                  <button
+                    type="button"
+                    className="op-btn op-btn-ghost op-btn-sm mr-1 cursor-default"
+                  ></button>
                )}
-                <div className="flex  items-center gap-2">
+                <div className="flex items-center gap-2">
                  {!isSave && <HandleRequiredField />}
                  {isSave ? (
                    <button
@@ -1888,7 +2028,7 @@ function WidgetsValueModal(props) {
                  ) : (
                    <button
                      type="button"
-                      className="op-btn op-btn-primary op-btn-sm"
+                      className="op-btn op-btn-primary op-btn-sm text-xs md:text-sm"
                      onClick={() => {
                        handleClickOnNext();
                      }}
@@ -2,9 +2,19 @@ import React, { useEffect, useState } from "react";
 import AsyncSelect from "react-select/async";
 import { useTranslation } from "react-i18next";
 import axios from "axios";
+import { handleUnlinkSigner } from "../../../constant/Utils";

 const SelectSigners = (props) => {
  const { t } = useTranslation();
+  const {
+    signerPos,
+    setSignerPos,
+    signersData,
+    setSignersData,
+    uniqueId,
+    isRemove,
+    handleAddUser
+  } = props;
  const [userList, setUserList] = useState([]);
  const [selected, setSelected] = useState();
  const [userData, setUserData] = useState({});
@@ -30,7 +40,7 @@ const SelectSigners = (props) => {
    //checking if user select no signer option from dropdown
    if (item) {
      //checking selected signer is already assign to the document or not
-      const alreadyAssign = props.signersData.some(
+      const alreadyAssign = signersData.some(
        (item2) => item2.objectId === item.value
      );
      if (alreadyAssign) {
@@ -49,7 +59,7 @@ const SelectSigners = (props) => {
  };
  const handleAdd = () => {
    if (userData && userData.objectId) {
-      props.details(userData);
+      handleAddUser(userData);
      if (props.closePopup) {
        props.closePopup();
      }
@@ -60,7 +70,13 @@ const SelectSigners = (props) => {
  };
  //function to use remove signer from assigned widgets in create template flow
  const handleRemove = () => {
-    props.handleUnlinkSigner();
+    handleUnlinkSigner(
+      signerPos,
+      setSignerPos,
+      signersData,
+      setSignersData,
+      uniqueId
+    );
    if (props.closePopup) {
      props.closePopup();
    }
@@ -161,7 +177,7 @@ const SelectSigners = (props) => {
          <button className="op-btn op-btn-primary" onClick={() => handleAdd()}>
            {t("submit")}
          </button>
-          {props.isExistSigner && props.handleUnlinkSigner && (
+          {props.isExistSigner && isRemove && (
            <button
              className="op-btn op-btn-accent op-btn-outline"
              onClick={() => handleRemove()}
@@ -1,6 +1,5 @@
 import axios from "axios";
 import moment from "moment";
-import React from "react";
 import { PDFDocument, rgb, degrees } from "pdf-lib";
 import Parse from "parse";
 import { appInfo } from "./appinfo";
@@ -21,7 +20,10 @@ export const isTabAndMobile = window.innerWidth < 1023;
 export const textInputWidget = "text input";
 export const textWidget = "text";
 export const radioButtonWidget = "radio button";
-
+export const cellsWidget = "cells";
+export function getEnv() {
+  return window?.RUNTIME_ENV || {};
+}

 //function for create list of year for date widget
 export const range = (start, end, step) => {
@@ -256,6 +258,7 @@ export const widgets = [
  { type: "date", icon: "fa-light fa-calendar-days", iconSize: "20px" },
  { type: textWidget, icon: "fa-light fa-text-width", iconSize: "20px" },
  { type: textInputWidget, icon: "fa-light fa-font", iconSize: "21px" },
+  { type: cellsWidget, icon: "fa-light fa-table-cells", iconSize: "20px" },
  { type: "checkbox", icon: "fa-light fa-square-check", iconSize: "22px" },
  {
    type: "dropdown",
@@ -348,6 +351,15 @@ export const addWidgetOptions = (type, signer, widgetValue) => {
      };
    case textInputWidget:
      return { ...status, name: "Text", isReadOnly: false };
+    case cellsWidget:
+      return {
+        ...status,
+        name: "Cells",
+        cellCount: 5,
+        defaultValue: "",
+        validation: { type: "", pattern: "" },
+        isReadOnly: false
+      };
    case "initials":
      return { ...status, name: "Initials" };
    case "name":
@@ -415,6 +427,14 @@ export const addWidgetSelfsignOptions = (type, getWidgetValue, owner) => {
      return { name: "Checkbox" };
    case textWidget:
      return { name: "Text" };
+    case cellsWidget:
+      return {
+        name: "Cells",
+        cellCount: 5,
+        defaultValue: "",
+        validation: { type: "", pattern: "" },
+        isReadOnly: false
+      };
    case "initials":
      return { name: "Initials" };
    case "name":
@@ -485,6 +505,8 @@ export const defaultWidthHeight = (type) => {
      return { width: 15, height: 19 };
    case textInputWidget:
      return { width: 150, height: 19 };
+    case cellsWidget:
+      return { width: 112, height: 22 };
    case "dropdown":
      return { width: 120, height: 22 };
    case "initials":
@@ -510,10 +532,6 @@ export const defaultWidthHeight = (type) => {
  }
 };

-export const resizeBorderExtraWidth = () => {
-  return 20;
-};
-
 export async function getBase64FromUrl(url, autosign) {
  const data = await fetch(url);
  const blob = await data.blob();
@@ -686,10 +704,14 @@ export const signPdfFun = async (
 };

 export const randomId = () => {
-  const randomBytes = crypto.getRandomValues(new Uint16Array(1));
-  const randomValue = randomBytes[0];
-  const randomDigit = 1000 + (randomValue % 9000);
-  return randomDigit;
+  // 1. Grab a cryptographically-secure 32-bit random value
+  const randomBytes = crypto.getRandomValues(new Uint32Array(1));
+  const raw = randomBytes[0]; // 0 … 4 294 967 295
+
+  // 2. Collapse into a 90 000 000-wide band (0…89 999 999), then shift to 10 000 000…99 999 999
+  const eightDigit = 10_000_000 + (raw % 90_000_000);
+
+  return eightDigit;
 };

 export const createDocument = async (
@@ -862,7 +884,8 @@ export const onChangeInput = (
  initial,
  dateFormat,
  fontSize,
-  fontColor
+  fontColor,
+  isDateReadOnly
 ) => {
  const isSigners = xyPosition.some((data) => data.signerPtr);
  let filterSignerPos;
@@ -891,6 +914,7 @@ export const onChangeInput = (
                  response: value,
                  fontSize: fontSize,
                  fontColor: fontColor,
+                  isReadOnly: isDateReadOnly || false,
                  validation: {
                    type: "date-format",
                    format: dateFormat // This indicates the required date format explicitly.
@@ -968,7 +992,6 @@ export const onChangeInput = (
    setXyPosition(updatePlaceholder);
  }
 };
-
 //function to increase height of text area on press enter
 export const onChangeHeightOfTextArea = (
  height,
@@ -1114,7 +1137,7 @@ export const addInitialData = (signerPos, setXyPosition, value, userId) => {
 };

 //function for embed document id
-export const embedDocId = async (pdfDoc, documentId, allPages) => {
+export const embedDocId = async (pdfOriginalWH, pdfDoc, documentId) => {
  const appName =
    "OpenSign™";
  // `fontBytes` is used to embed custom font in pdf
@@ -1123,19 +1146,21 @@ export const embedDocId = async (pdfDoc, documentId, allPages) => {
  );
  pdfDoc.registerFontkit(fontkit);
  const font = await pdfDoc.embedFont(fontBytes, { subset: true });
-  for (let i = 0; i < allPages; i++) {
+  //pdfOriginalWH contained all pdf's pages width and height
+  for (let i = 0; i < pdfOriginalWH?.length; i++) {
    const fontSize = 10;
    const textContent =
          documentId && `${appName} DocumentId: ${documentId} `;
    const pages = pdfDoc.getPages();
    const page = pages[i];
+    const getSize = pdfOriginalWH[i];
    try {
      const getObj = compensateRotation(
        page.getRotation().angle,
        10,
        5,
        1,
-        page.getSize(),
+        getSize,
        fontSize,
        rgb(0.5, 0.5, 0.5),
        font,
@@ -1210,8 +1235,8 @@ export function onSaveSign(
    }
    return obj;
  });
-  //condition  when user click on apply(signature,image,typed signature or defaullt signature) all widgets on signature pad for same widgets
-  if (isAutoSign) {
+  //condition  when draw/upload signature/initials then apply it all related to widgets (signature,image,typed signature or default signature)
+  if (isApplyAll || isAutoSign) {
    const updatedArray = updateXYposition.map((page) => ({
      ...page,
      pos: page.pos.map(
@@ -1230,26 +1255,6 @@ export function onSaveSign(
      )
    }));
    return updatedArray;
-  } //condition when user edit signature/initial then updated signature apply all existing drawn signatures
-  else if (isApplyAll) {
-    const updatedArray = updateXYposition.map((page) => ({
-      ...page,
-      pos: page.pos.map(
-        (item) =>
-          item.SignUrl && item.type === widgetsType
-            ? {
-                ...item,
-                Width: posWidth,
-                Height: posHeight,
-                SignUrl: signatureImg,
-                ...(type && { signatureType: type }),
-                options: { ...item.options, response: signatureImg },
-                ...(typedSignature && { typeSignature: typedSignature })
-              }
-            : item // Otherwise, keep it unchanged
-      )
-    }));
-    return updatedArray;
  } else {
    return updateXYposition;
  }
@@ -1358,35 +1363,13 @@ export function onSaveImage(
    }
    return obj;
  });
-  //condition  when user click on apply(stamp) all widgets on signature pad for same widgets
-  if (isAutoSign) {
+  //condition  when user upload(stamp) then apply it all related to widgets
+  if (isApplyAll || isAutoSign) {
    const updatedArray = updateXYposition.map((page) => ({
      ...page,
      pos: page.pos.map(
        (item) =>
-          item.type === widgetsType
-            ? {
-                ...item,
-                Width: getIMGWH.newWidth,
-                Height: getIMGWH.newHeight,
-                SignUrl: image.src,
-                ImageType: image.imgType,
-                options: {
-                  ...item.options,
-                  response: image.src
-                }
-              }
-            : item // Otherwise, keep it unchanged
-      )
-    }));
-    return updatedArray;
-  } //condition when user edit stamp then updated signature apply all existing drawn signatures
-  else if (isApplyAll) {
-    const updatedArray = updateXYposition.map((page) => ({
-      ...page,
-      pos: page.pos.map(
-        (item) =>
-          item.SignUrl && item.type === widgetsType && item.type !== "image"
+          item.type === widgetsType && item.type !== "image"
            ? {
                ...item,
                Width: getIMGWH.newWidth,
@@ -1537,7 +1520,13 @@ const getWidgetsFontColor = (type) => {
  }
 };
 //function for embed multiple signature using pdf-lib
-export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {
+export const multiSignEmbed = async (
+  pdfOriginalWH,
+  widgets,
+  pdfDoc,
+  signyourself,
+  scale
+) => {
  // `fontBytes` is used to embed custom font in pdf
  const fontBytes = await fileasbytes(
    "https://cdn.opensignlabs.com/webfonts/times.ttf"
@@ -1546,6 +1535,11 @@ export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {
  const font = await pdfDoc.embedFont(fontBytes, { subset: true });
  let hasError = false;
  for (let item of widgets) {
+    //pdfOriginalWH contained all pdf's pages width and height
+    //'getSize' is used to get particular pdf's page width and height
+    const getSize = pdfOriginalWH.find(
+      (page) => page?.pageNumber === item?.pageNumber
+    );
    if (hasError) break; // Stop the outer loop if an error occurred
    const typeExist = item.pos.some((data) => data?.type);
    let updateItem;
@@ -1641,6 +1635,7 @@ export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {
            const WidgetsTypeTextExist = [
              textWidget,
              textInputWidget,
+              cellsWidget,
              "name",
              "company",
              "job title",
@@ -1654,9 +1649,10 @@ export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {
        const color = position?.options?.fontColor;
        const updateColorInRgb = getWidgetsFontColor(color);
        const fontSize = parseInt(position?.options?.fontSize || 12);
-        const widgetTypeExist = [
+        const isTextTypeWidget = [
          textWidget,
          textInputWidget,
+          cellsWidget,
          "name",
          "company",
          "job title",
@@ -1664,138 +1660,185 @@ export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {
          "email"
        ].includes(position.type);
        if (position.type === "checkbox") {
-          let checkboxGapFromTop, isCheck;
-          let y = yPos(position);
-          const optionsFontSize = fontSize || 13;
-          const checkboxSize = fontSize;
-          const checkboxTextGapFromLeft = fontSize + 5 || 22;
+          // Determine layout mode: 'vertical' (default) or 'horizontal'
+          // const isHorizontal = position.layout === "horizontal";
+          const isHorizontal =
+            position?.options?.layout === "horizontal" ? true : false;
+          // Initial “cursor” positions
+          let currentX = xPos(position);
+          let currentY = yPos(position) + 2;
+          // Size and spacing settings
+          const checkboxSize = fontSize - 1; // checkbox diameter
+          const checkboxTextGapFromLeft = fontSize + 5; // gap between box and its label
+          const verticalGap = fontSize + 3.2; // gap between two rows (vertical layout)
+          let horizontalGap = 0; // will compute after drawing each label
          if (position?.options?.values.length > 0) {
-            position?.options?.values.forEach((item, ind) => {
-              const checkboxRandomId = "checkbox" + randomId();
-              if (
-                position?.options?.response &&
-                position?.options?.response?.length > 0
-              ) {
-                isCheck = position?.options?.response?.includes(ind);
-              } else if (position?.options?.defaultValue) {
-                isCheck = position?.options?.defaultValue?.includes(ind);
-              }
-
-              const checkbox = form.createCheckBox(checkboxRandomId);
-
+            position.options.values.forEach((item, ind) => {
+              // 1. Advance the “cursor” on second+ iteration
              if (ind > 0) {
-                y = y + checkboxGapFromTop;
-              } else {
-                checkboxGapFromTop = fontSize + 5 || 26;
+                if (isHorizontal) {
+                  currentX += horizontalGap;
+                } else {
+                  currentY += verticalGap;
+                }
+              }
+              // 2. Determine whether this checkbox should be checked
+              let isCheck = false;
+              if (
+                position.options.response &&
+                position.options.response.length > 0
+              ) {
+                isCheck = position.options.response.includes(ind);
+              } else if (position.options.defaultValue) {
+                isCheck = position.options.defaultValue.includes(ind);
              }

-              if (!position?.options?.isHideLabel) {
-                // below line of code is used to embed label with radio button in pdf
+              // 3. Draw the label (if labels are not hidden)
+              if (!position.options.isHideLabel) {
+                const labelX = currentX + checkboxTextGapFromLeft;
+                const labelY = currentY - 3;
+
                const optionsPosition = compensateRotation(
                  page.getRotation().angle,
-                  xPos(position) + checkboxTextGapFromLeft,
-                  y,
+                  labelX,
+                  labelY,
                  1,
-                  page.getSize(),
-                  optionsFontSize,
+                  getSize,
+                  fontSize,
                  updateColorInRgb,
                  font,
                  page
                );
                page.drawText(item, optionsPosition);
              }
+              // 4. Create and place the actual checkbox
+              const checkboxRandomId = "checkbox" + randomId();
+              const checkbox = form.createCheckBox(checkboxRandomId);
              let checkboxObj = {
-                x: xPos(position),
-                y: y,
+                x: currentX,
+                y: currentY,
                width: checkboxSize,
                height: checkboxSize
              };
-              checkboxObj = getWidgetPosition(page, checkboxObj, 1);
+              checkboxObj = getWidgetPosition(page, checkboxObj, 1, getSize);
              checkbox.addToPage(page, checkboxObj);
-
-              //applied which checkbox should be checked
+              // 5. Check or uncheck as needed, then make read‐only
              if (isCheck) {
                checkbox.check();
              } else {
                checkbox.uncheck();
              }
              checkbox.enableReadOnly();
+              // 6. If horizontal layout, compute how far to shift next checkbox‐circle
+              if (isHorizontal) {
+                // Measure the width of this label text at `fontSize`
+                const textWidth = font.widthOfTextAtSize(item, fontSize);
+                // Next checkbox should come after: [box] + gap + [label text] + extra 10pt padding
+                horizontalGap =
+                  checkboxSize + checkboxTextGapFromLeft + textWidth;
+              }
            });
          }
-        } else if (widgetTypeExist) {
-          let textContent;
+        } else if (isTextTypeWidget) {
+          let textContent = "";
          if (position?.options?.response) {
            textContent = position.options?.response;
          } else if (position?.options?.defaultValue) {
            textContent = position?.options?.defaultValue;
          }
-          const fixedWidth = widgetWidth; // Set your fixed width
-          const isNewOnEnterLineExist = textContent.includes("\n");
-
-          // Function to break text into lines based on the fixed width
-          const NewbreakTextIntoLines = (textContent, width) => {
-            const lines = [];
-            let currentLine = "";
-
-            for (const word of textContent.split(" ")) {
-              //get text line width
-              const lineWidth = font.widthOfTextAtSize(
-                `${currentLine} ${word}`,
-                fontSize
+          if (position.type === cellsWidget) {
+            const cellCount =
+              position?.options?.cellCount || textContent.length || 1;
+            const charWidth = widgetWidth / cellCount;
+            const y = yPos(position) - 4;
+            for (let i = 0; i < cellCount; i++) {
+              const ch = textContent[i] || "";
+              const charX =
+                xPos(position) +
+                charWidth * i +
+                (charWidth - font.widthOfTextAtSize(ch, fontSize)) / 2;
+              const textPosition = compensateRotation(
+                page.getRotation().angle,
+                charX,
+                y,
+                1,
+                getSize,
+                fontSize,
+                updateColorInRgb,
+                font,
+                page
              );
-              //check text content line width is less or equal to container width
-              if (lineWidth <= width) {
-                currentLine += ` ${word}`;
-              } else {
-                lines.push(currentLine.trim());
-                currentLine = `${word}`;
-              }
-            }
-            lines.push(currentLine.trim());
-            return lines;
-          };
-          // Function to break text into lines based on when user go next line on press enter button
-          const breakTextIntoLines = (textContent, width) => {
-            const lines = [];
-            for (const word of textContent.split("\n")) {
-              const lineWidth = font.widthOfTextAtSize(`${word}`, fontSize);
-              //checking string length to container width
-              //if string length is less then container width it means user press enter button
-              if (lineWidth <= width) {
-                lines.push(word);
-              }
-              //else adjust text content according to width and send it in new line
-              else {
-                const newLine = NewbreakTextIntoLines(word, width);
-                lines.push(...newLine);
-              }
+              if (ch) page.drawText(ch, textPosition);
            }
+          } else {
+            const fixedWidth = widgetWidth; // Set your fixed width
+            const isNewOnEnterLineExist = textContent.includes("\n");

-            return lines;
-          };
-          //check if text content have `\n` string it means user press enter to go next line and handle condition
-          //else auto adjust text content according to container width
-          const lines = isNewOnEnterLineExist
-            ? breakTextIntoLines(textContent, fixedWidth)
-            : NewbreakTextIntoLines(textContent, fixedWidth);
-          // Set initial y-coordinate for the first line
-          let x = xPos(position);
-          let y = yPos(position);
-          // Embed each line on the page
-          for (const line of lines) {
-            const textPosition = compensateRotation(
-              page.getRotation().angle,
-              x,
-              y,
-              1,
-              page.getSize(),
-              fontSize,
-              updateColorInRgb,
-              font,
-              page
-            );
-            page.drawText(line, textPosition);
-            y += 18; // Adjust the line height as needed
+            // Function to break text into lines based on the fixed width
+            const NewbreakTextIntoLines = (textContent, width) => {
+              const lines = [];
+              let currentLine = "";
+
+              for (const word of textContent.split(" ")) {
+                //get text line width
+                const lineWidth = font.widthOfTextAtSize(
+                  `${currentLine} ${word}`,
+                  fontSize
+                );
+                //check text content line width is less or equal to container width
+                if (lineWidth <= width) {
+                  currentLine += ` ${word}`;
+                } else {
+                  lines.push(currentLine.trim());
+                  currentLine = `${word}`;
+                }
+              }
+              lines.push(currentLine.trim());
+              return lines;
+            };
+            // Function to break text into lines based on when user go next line on press enter button
+            const breakTextIntoLines = (textContent, width) => {
+              const lines = [];
+              for (const word of textContent.split("\n")) {
+                const lineWidth = font.widthOfTextAtSize(`${word}`, fontSize);
+                //checking string length to container width
+                //if string length is less then container width it means user press enter button
+                if (lineWidth <= width) {
+                  lines.push(word);
+                }
+                //else adjust text content according to width and send it in new line
+                else {
+                  const newLine = NewbreakTextIntoLines(word, width);
+                  lines.push(...newLine);
+                }
+              }
+
+              return lines;
+            };
+            //check if text content have `\n` string it means user press enter to go next line and handle condition
+            //else auto adjust text content according to container width
+            const lines = isNewOnEnterLineExist
+              ? breakTextIntoLines(textContent, fixedWidth)
+              : NewbreakTextIntoLines(textContent, fixedWidth);
+            // Set initial y-coordinate for the first line
+            let x = xPos(position);
+            let y = yPos(position) - 4;
+            // Embed each line on the page
+            for (const line of lines) {
+              const textPosition = compensateRotation(
+                page.getRotation().angle,
+                x,
+                y,
+                1,
+                getSize,
+                fontSize,
+                updateColorInRgb,
+                font,
+                page
+              );
+              page.drawText(line, textPosition);
+              y += 18; // Adjust the line height as needed
+            }
          }
        } else if (position.type === "dropdown") {
          const dropdownRandomId = "dropdown" + randomId();
@@ -1822,7 +1865,12 @@ export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {
            width: widgetWidth,
            height: widgetHeight
          };
-          const dropdownOption = getWidgetPosition(page, dropdownObj, 1);
+          const dropdownOption = getWidgetPosition(
+            page,
+            dropdownObj,
+            1,
+            getSize
+          );
          const dropdownSelected = { ...dropdownOption, font: font };
          dropdown.defaultUpdateAppearances(font);
          dropdown.addToPage(page, dropdownSelected);
@@ -1830,27 +1878,46 @@ export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {
        } else if (position.type === radioButtonWidget) {
          const radioRandomId = "radio" + randomId();
          const radioGroup = form.createRadioGroup(radioRandomId);
-          let radioOptionGapFromTop;
-          const optionsFontSize = fontSize || 13;
-          const radioTextGapFromLeft = fontSize + 5 || 20;
-          const radioSize = fontSize;
-          let y = yPos(position);
+          //getting radio buttons options text font size
+          const optionsFontSize = fontSize; // font size for option text
+          const radioTextGapFromLeft = fontSize + 6; // gap between circle and its label
+          const radioSize = fontSize; // circle diameter (square of width×height)
+          // Initial “cursor” positions (from your existing helpers)
+          let currentX = xPos(position) + 2;
+          let currentY = yPos(position);
+          // Vertical gap between two radio‐rows
+          const verticalGap = fontSize + 6;
+          // We’ll compute horizontalGap on the fly—after drawing each label
+          // Initialize to zero (will be set after first option is placed)
+          let horizontalGap = 0;
+          // Determine layout mode: 'vertical' or 'horizontal'.
+          // (You mentioned “add one variable called layout” – here we read it from position.layout.)
+          const isHorizontal =
+            position?.options?.layout === "horizontal" ? true : false;
+          // Loop through each option in the group
          if (position?.options?.values.length > 0) {
-            position?.options?.values.forEach((item, ind) => {
+            position.options.values.forEach((item, ind) => {
+              // 1. Advance cursor on second+ iteration
              if (ind > 0) {
-                y = y + radioOptionGapFromTop;
-              } else {
-                radioOptionGapFromTop = fontSize + 10 || 25;
+                if (isHorizontal) {
+                  // Move to the right by horizontalGap
+                  currentX += horizontalGap;
+                } else {
+                  // Move down by verticalGap (vertical stacking)
+                  currentY += verticalGap;
+                }
              }
+              // 2. Draw the label text (if not hidden)
              if (!position?.options?.isHideLabel) {
-                // below line of code is used to embed label with radio button in pdf
-
+                // Compute where to draw the text (just to the right of the circle)
+                const labelX = currentX + radioTextGapFromLeft;
+                const labelY = currentY - 2;
                const optionsPosition = compensateRotation(
                  page.getRotation().angle,
-                  xPos(position) + radioTextGapFromLeft,
-                  y,
+                  labelX,
+                  labelY,
                  1,
-                  page.getSize(),
+                  getSize,
                  optionsFontSize,
                  updateColorInRgb,
                  font,
@@ -1859,22 +1926,33 @@ export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {

                page.drawText(item, optionsPosition);
              }
+              // 3. Place the radio‐circle itself at (currentX, currentY)
              let radioObj = {
-                x: xPos(position),
-                y: y,
+                x: currentX,
+                y: currentY,
                width: radioSize,
                height: radioSize
              };

-              radioObj = getWidgetPosition(page, radioObj, 1);
+              radioObj = getWidgetPosition(page, radioObj, 1, getSize);
              radioGroup.addOptionToPage(item, page, radioObj);
+              // 4. If horizontal layout, re-compute horizontalGap for next iteration:
+              if (isHorizontal) {
+                // Measure how wide the label text is, so we know how far to shift next circle
+                const textWidth = font.widthOfTextAtSize(item, optionsFontSize);
+                // radioSize = the circle.  radioTextGapFromLeft = gap between circle and label.
+                // Add a small extra padding (e.g. 10pt) before placing next circle.
+                horizontalGap = radioSize + radioTextGapFromLeft + textWidth;
+              }
            });
          }
+          // 5. Pre‐select a value if provided
          if (position?.options?.response) {
            radioGroup.select(position.options?.response);
          } else if (position?.options?.defaultValue) {
            radioGroup.select(position?.options?.defaultValue);
          }
+          // 6. Set to read‐only (if required)
          radioGroup.enableReadOnly();
        } else {
          const signature = {
@@ -1884,7 +1962,7 @@ export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {
            height: widgetHeight
          };

-          const imageOptions = getWidgetPosition(page, signature, 1);
+          const imageOptions = getWidgetPosition(page, signature, 1, getSize);
          page.drawImage(img, imageOptions);
        }
      } catch (err) {
@@ -2611,7 +2689,7 @@ function compensateRotation(
 }

 // `getWidgetPosition` is used to calulcate position of image type widget like x, y, width, height for pdf-lib
-function getWidgetPosition(page, image, sizeRatio) {
+function getWidgetPosition(page, image, sizeRatio, getSize) {
  let pageWidth;
  // pageHeight;
  if ([90, 270].includes(page.getRotation().angle)) {
@@ -2635,7 +2713,7 @@ function getWidgetPosition(page, image, sizeRatio) {
    imageX,
    imageYFromTop,
    1,
-    page.getSize(),
+    getSize,
    imageHeight
  );

@@ -3066,7 +3144,7 @@ export const mailTemplate = (param) => {
    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Note</td><td></td><td style='color:#626363;font-weight:bold'>" +
    param.note +
    "</td></tr><tr><td></td><td></td></tr></table></div> <div style='margin-left:70px'><a target=_blank href=" +
-    param.sigingUrl +
+    param.signingUrl +
    "><button style='padding:12px;background-color:#d46b0f;color:white;border:0px;font-weight:bold;margin-top:30px'>Sign here</button></a></div><div style='display:flex;justify-content:center;margin-top:10px'></div></div></div><div><p> This is an automated email from " +
    appName +
    ". For any queries regarding this email, please contact the sender " +
@@ -3157,7 +3235,53 @@ export const checkRegularExpress = (validateType, setValidatePlaceholder) => {
    case "text":
      setValidatePlaceholder("please enter text");
      break;
+    case "ssn":
+      setValidatePlaceholder("123-45-6789");
+      break;
    default:
      setValidatePlaceholder("please enter value");
  }
 };
+//function to use unlink signer from widgets
+export const handleUnlinkSigner = (
+  signerPos,
+  setSignerPos,
+  signersdata,
+  setSignersData,
+  uniqueId
+) => {
+  //remove existing signer's details from 'signerPos' array
+  const updatePlaceHolder = signerPos.map((x) => {
+    if (x.Id === uniqueId) {
+      return { ...x, signerPtr: {}, signerObjId: "" };
+    }
+    return { ...x };
+  });
+  setSignerPos(updatePlaceHolder);
+  //remove existing signer's details from 'signersdata' array and keep role and id
+  const updateSigner = signersdata.map((item) => {
+    if (item.Id == uniqueId) {
+      return { Role: item.Role, Id: item.Id, blockColor: item.blockColor };
+    }
+    return item;
+  });
+  setSignersData(updateSigner);
+};
+//function is used to get pdf original width and height
+export const getOriginalWH = async (pdf) => {
+  let pdfWHObj = [];
+  //get total page number
+  const totalPages = pdf?.numPages;
+  //according to page number get all pdf's pages width and height
+  for (let index = 0; index < totalPages; index++) {
+    try {
+      const getPage = await pdf.getPage(index + 1);
+      const width = getPage?.view[2];
+      const height = getPage?.view[3];
+      pdfWHObj.push({ pageNumber: index + 1, width, height });
+    } catch (e) {
+      console.log(`Error getting page ${index + 1} of PDF: ${e.message}`);
+    }
+  }
+  return pdfWHObj;
+};
@@ -1,9 +1,12 @@
 import logo from "../assets/images/logo.png";
+import { getEnv } from "./Utils";

 export function serverUrl_fn() {
-  let baseUrl = process.env.REACT_APP_SERVERURL
-    ? process.env.REACT_APP_SERVERURL
-    : window.location.origin + "/api/app";
+  const env = getEnv();
+  const serverurl = env?.REACT_APP_SERVERURL
+    ? env.REACT_APP_SERVERURL // env.REACT_APP_SERVERURL is used for prod
+    : process.env.REACT_APP_SERVERURL; //  process.env.REACT_APP_SERVERURL is used for dev (locally)
+  let baseUrl = serverurl ? serverurl : window.location.origin + "/api/app";
  return baseUrl;
 }
 export const appInfo = {
@@ -25,7 +25,7 @@ i18n
    interpolation: {
      escapeValue: false // Not needed for react as it escapes by default
    },
-    whitelist: ["en", "es", "fr", "it", "de"] // List of allowed languages
+    whitelist: ["en", "es", "fr", "it", "de", "hi"] // List of allowed languages
  });

 export default i18n;
@@ -186,6 +186,14 @@ export default function reportJson(id) {
                btnIcon: "fa-light fa-envelope",
                redirectUrl: "",
                action: "saveastemplate"
+              },
+              {
+                btnId: "8440",
+                btnLabel: "Fix & resend",
+                hoverLabel: "Fix & resend",
+                btnIcon: "fa-light fa-paper-plane",
+                redirectUrl: "",
+                action: "recreatedocument"
              }
            ]
          }
@@ -1,3 +1,13 @@
+const userssetting = [
+  {
+    icon: "fa-light fa-users fa-fw",
+    title: "Users",
+    target: "_self",
+    pageType: "",
+    description: "",
+    objectId: "users"
+  }
+];
 export const subSetting = [
  {
    icon: "fa-light fa-sliders",
@@ -7,14 +17,7 @@ export const subSetting = [
    description: "",
    objectId: "preferences"
  },
-  {
-    icon: "fa-light fa-users fa-fw",
-    title: "Users",
-    target: "_self",
-    pageType: "",
-    description: "",
-    objectId: "users"
-  }
+  ...userssetting
 ];

 const sidebarList = [
@@ -65,7 +68,7 @@ const sidebarList = [
        pageType: "report",
        description: "",
        objectId: "6TeaPr321t"
-      },
+      }
    ]
  },
  {
@@ -455,7 +455,7 @@ const Forms = (props) => {
          setBcc([]);
          setFolder({ ObjectId: "", Name: "" });
          const notifySign =
-                extUserData?.NotifyOnSignatures
+                extUserData?.NotifyOnSignatures !== undefined
                ? extUserData?.NotifyOnSignatures
                : true;
          setFormData({
@@ -534,7 +534,7 @@ const Forms = (props) => {
    setBcc([]);
    setFolder({ ObjectId: "", Name: "" });
    const notifySign =
-          extUserData?.NotifyOnSignatures
+          extUserData?.NotifyOnSignatures !== undefined
          ? extUserData?.NotifyOnSignatures
          : true;
    let obj = {
@@ -68,6 +68,7 @@ function Login() {
    setState({ ...state, loading: false, alertType: type, alertMsg: msg });
    setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
  };
+
  const checkUserExt = async () => {
    const app = await getAppLogo();
    if (app?.error === "invalid_json") {
@@ -82,11 +83,11 @@ function Login() {
    } else {
      setImage(appInfo?.applogo || undefined);
    }
+    dispatch(fetchAppInfo());
    if (localStorage.getItem("accesstoken")) {
      setState({ ...state, loading: true });
      GetLoginData();
    }
-    dispatch(fetchAppInfo());
  };
  const handleChange = (event) => {
    let { name, value } = event.target;
@@ -96,20 +97,15 @@ function Login() {
    setState({ ...state, [name]: value });
  };

-  const handleSubmit = async (event) => {
-    localStorage.removeItem("accesstoken");
-    event.preventDefault();
+  const handleLogin = async (
+  ) => {
+    const email = state?.email
+    const password = state?.password

-    if (!emailRegex.test(state.email)) {
-      alert("Please enter a valid email address.");
-      return;
-    }
-
-    const { email, password } = state;
    if (!email || !password) {
      return;
    }
-
+    localStorage.removeItem("accesstoken");
    try {
      setState({ ...state, loading: true });
      localStorage.setItem("appLogo", appInfo.applogo);
@@ -132,6 +128,14 @@ function Login() {
      showToast("danger", "Invalid username/password or region");
    }
  };
+  const handleLoginBtn = async (event) => {
+    event.preventDefault();
+    if (!emailRegex.test(state.email)) {
+      alert("Please enter a valid email address.");
+      return;
+    }
+    await handleLogin();
+  };

  const setThirdpartyLoader = (value) => {
    setState({ ...state, thirdpartyLoader: value });
@@ -275,7 +279,6 @@ function Login() {
      const userInformation = JSON.parse(
        localStorage.getItem("UserInformation")
      );
-      // console.log("payload ", payload);
      if (payload && payload.sessionToken) {
        const params = {
          userDetails: {
@@ -289,7 +292,6 @@ function Login() {
          }
        };
        const userSignUp = await Parse.Cloud.run("usersignup", params);
-        // console.log("userSignUp ", userSignUp);
        if (userSignUp && userSignUp.sessionToken) {
          const LocalUserDetails = {
            name: userInformation.name,
@@ -430,7 +432,7 @@ function Login() {
              </div>
              <div className="grid grid-cols-1 md:grid-cols-2 gap-x-2">
                <div>
-                  <form onSubmit={handleSubmit} aria-label="Login Form">
+                  <form onSubmit={handleLoginBtn} aria-label="Login Form">
                    <h1 className="text-[30px] mt-6">{t("welcome")}</h1>
                    <fieldset>
                      <legend className="text-[12px] text-[#878787]">
@@ -488,15 +490,14 @@ function Login() {
                                )}
                              </span>
                            </div>
-
-                        <div className="relative mt-1">
-                          <NavLink
-                            to="/forgetpassword"
-                            className="text-[13px] op-link op-link-primary underline-offset-1 focus:outline-none ml-1"
-                          >
-                            {t("forgot-password")}
-                          </NavLink>
-                        </div>
+                          <div className="relative mt-1">
+                            <NavLink
+                              to="/forgetpassword"
+                              className="text-[13px] op-link op-link-primary underline-offset-1 focus:outline-none ml-1"
+                            >
+                              {t("forgot-password")}
+                            </NavLink>
+                          </div>
                      </div>
                    </fieldset>
                    <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-center text-xs font-bold mt-2">
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect } from "react";
+import { useState, useRef, useEffect } from "react";
 import { PDFDocument } from "pdf-lib";
 import "../styles/signature.css";
 import Parse from "parse";
@@ -46,7 +46,8 @@ import {
  textWidget,
  mailTemplate,
  updateDateWidgetsRes,
-  widgetDataValue
+  widgetDataValue,
+  getOriginalWH,
 } from "../constant/Utils";
 import Header from "../components/pdf/PdfHeader";
 import RenderPdf from "../components/pdf/RenderPdf";
@@ -158,6 +159,9 @@ function PdfRequestFiles(
  const [assignedWidgetId, setAssignedWidgetId] = useState([]);
  const [showSignPagenumber, setShowSignPagenumber] = useState([]);
  const [owner, setOwner] = useState({});
+  const [currentIndex, setCurrentIndex] = useState(0);
+  const [formData, setFormData] = useState([]);
+  const [vacantRole, setVacantRole] = useState();
  const [, drop] = useDrop({
    accept: "BOX",
    drop: (item, monitor) => addPositionOfSignature(item, monitor),
@@ -623,6 +627,7 @@ function PdfRequestFiles(
      } catch (err) {
        console.log("err in get email verification ", err);
        setHandleError(t("something-went-wrong-mssg"));
+        setIsUiLoading(false);
      }
    }
    //check if isEmailVerified then go on next step
@@ -633,7 +638,6 @@ function PdfRequestFiles(
        );
        if (checkUser && checkUser.length > 0) {
          let checkboxExist,
-            requiredRadio,
            showAlert = false,
            widgetKey,
            radioExist,
@@ -704,39 +708,12 @@ function PdfRequestFiles(
                  }
                }
              }
-              //condition to check radio widget exist or not
-              else if (radioExist) {
-                //get all required type radio button
-                requiredRadio = checkUser[0].placeHolder[i].pos.filter(
-                  (position) =>
-                    !position.options?.isReadOnly &&
-                    position.type === radioButtonWidget
-                );
-                //if required type radio data exit then check user checked all radio button or some radio remain to check
-                if (requiredRadio && requiredRadio?.length > 0) {
-                  let checkSigned;
-                  for (let i = 0; i < requiredRadio?.length; i++) {
-                    checkSigned = requiredRadio[i]?.options?.response;
-                    if (!checkSigned) {
-                      let checkDefaultSigned =
-                        requiredRadio[i]?.options?.defaultValue;
-                      if (!checkDefaultSigned && !showAlert) {
-                        showAlert = true;
-                        widgetKey = requiredRadio[i].key;
-                        TourPageNumber = updatePage;
-                        setminRequiredCount(null);
-                      }
-                    }
-                  }
-                }
-              }
-              //else condition to check all type widget data fill or not except checkbox and radio button
+              //else condition to check all type widget data fill or not except checkbox
              else {
                //get all required type widgets except checkbox and radio
                const requiredWidgets = checkUser[0].placeHolder[i].pos.filter(
                  (position) =>
                    position.options?.status === "required" &&
-                    position.type !== radioButtonWidget &&
                    position.type !== "checkbox"
                );
                if (requiredWidgets && requiredWidgets?.length > 0) {
@@ -744,16 +721,13 @@ function PdfRequestFiles(
                  for (let i = 0; i < requiredWidgets?.length; i++) {
                    checkSigned = requiredWidgets[i]?.options?.response;
                    if (!checkSigned) {
-                      const checkSignUrl = requiredWidgets[i]?.pos?.SignUrl;
-                      if (!checkSignUrl) {
-                        let checkDefaultSigned =
-                          requiredWidgets[i]?.options?.defaultValue;
-                        if (!checkDefaultSigned && !showAlert) {
-                          showAlert = true;
-                          widgetKey = requiredWidgets[i].key;
-                          TourPageNumber = updatePage;
-                          setminRequiredCount(null);
-                        }
+                      let checkDefaultSigned =
+                        requiredWidgets[i]?.options?.defaultValue;
+                      if (!checkDefaultSigned && !showAlert) {
+                        showAlert = true;
+                        widgetKey = requiredWidgets[i].key;
+                        TourPageNumber = updatePage;
+                        setminRequiredCount(null);
                      }
                    }
                  }
@@ -765,20 +739,12 @@ function PdfRequestFiles(
              break;
            }
          }
-          if (checkboxExist && requiredCheckbox && showAlert) {
-            setUnSignedWidgetId(widgetKey);
-            setPageNumber(TourPageNumber);
-            setWidgetsTour(true);
-          } else if (radioExist && showAlert) {
-            setUnSignedWidgetId(widgetKey);
-            setPageNumber(TourPageNumber);
-            setWidgetsTour(true);
-          } else if (showAlert) {
+          if (showAlert) {
            setUnSignedWidgetId(widgetKey);
            setPageNumber(TourPageNumber);
            setWidgetsTour(true);
+            setIsUiLoading(false);
          } else {
-            setIsUiLoading(true);
            // `widgets` is Used to return widgets details with page number of current user
            const widgets = checkUser?.[0]?.placeHolder;
            let pdfArrBuffer;
@@ -816,11 +782,13 @@ function PdfRequestFiles(
              //embed document's object id to all pages in pdf document
              if (!HeaderDocId) {
                if (!isDocId) {
-                  await embedDocId(pdfDoc, docId, allPages);
+                  //pdfOriginalWH contained all pdf's pages width,height & pagenumber in array format
+                  await embedDocId(pdfOriginalWH, pdfDoc, docId);
                }
              }
-              //embed multi signature in pdf
+              //embed all widgets in document
              const pdfBytes = await multiSignEmbed(
+                pdfOriginalWH,
                widgets,
                pdfDoc,
                isSignYourSelfFlow,
@@ -852,17 +820,23 @@ function PdfRequestFiles(
                    isSuccessRoute,
                    contactId
                  );
-                  const index = pdfDetails?.[0]?.Signers.findIndex(
-                    (x) => x.objectId === signerObjectId
-                  );
+                  const index =
+                    updatedDoc.updatedPdfDetails?.[0]?.Signers.findIndex(
+                      (x) => x.objectId === contactId
+                    );
                  const newIndex = index + 1;
                  const usermail = {
-                    Email: pdfDetails?.[0]?.Placeholders[newIndex]?.email || ""
+                    Email:
+                      updatedDoc.updatedPdfDetails?.[0]?.Placeholders[newIndex]
+                        ?.email || ""
                  };
                  const user = usermail?.Email
                    ? usermail
-                    : pdfDetails?.[0]?.Signers[newIndex];
-                  if (sendmail !== "false" && sendInOrder) {
+                    : updatedDoc.updatedPdfDetails?.[0]?.Signers[newIndex];
+                  if (
+                    sendmail !== "false" &&
+                    sendInOrder
+                  ) {
                    const requestBody =
                      updatedDoc.updatedPdfDetails?.[0]?.RequestBody;
                    const requestSubject =
@@ -916,7 +890,7 @@ function PdfRequestFiles(
                          const htmlReqBody =
                            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>" +
                            replacedRequestBody +
-                            "</body> </html>";
+                            "</body></html>";

                          const variables = {
                            document_title: documentName,
@@ -929,7 +903,7 @@ function PdfRequestFiles(
                            receiver_phone: user?.Phone || "",
                            expiry_date: localExpireDate,
                            company_name: orgName,
-                            signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+                            signing_url: signPdf
                          };
                          replaceVar = replaceMailVaribles(
                            requestSubject,
@@ -944,7 +918,7 @@ function PdfRequestFiles(
                          title: documentName,
                          organization: orgName,
                          localExpireDate: localExpireDate,
-                          sigingUrl: signPdf
+                          signingUrl: signPdf
                        };
                        let params = {
                          replyto: senderEmail || "",
@@ -1017,6 +991,7 @@ function PdfRequestFiles(
            isShow: true,
            alertMessage: t("something-went-wrong-mssg")
          });
+          setIsUiLoading(false);
        }
      } catch (err) {
        console.log("err in embedsign", err);
@@ -1030,6 +1005,7 @@ function PdfRequestFiles(
  }

  const handleSignPdf = async () => {
+    setIsUiLoading(true);
      await embedWidgetsData();
  };

@@ -1169,14 +1145,7 @@ function PdfRequestFiles(
  ];
  //function for get pdf page details
  const pageDetails = async (pdf) => {
-    let pdfWHObj = [];
-    const totalPages = pdf.numPages; // Get the total number of pages
-    for (let index = 0; index < totalPages; index++) {
-      const getPage = await pdf.getPage(index + 1);
-      const scale = 1;
-      const { width, height } = getPage.getViewport({ scale });
-      pdfWHObj.push({ pageNumber: index + 1, width, height });
-    }
+    const pdfWHObj = await getOriginalWH(pdf);
    setPdfOriginalWH(pdfWHObj);
    setPdfLoad(true);
  };
@@ -1255,7 +1224,8 @@ function PdfRequestFiles(
    setRequestSignTour(true);
    if (isDontShow) {
      const isEnableOTP = pdfDetails?.[0]?.IsEnableOTP || false;
-      if (!isEnableOTP) {
+      const sessionToken = localStorage.getItem("accesstoken");
+      if (!isEnableOTP && !sessionToken) {
        try {
          await axios.post(
            `${localStorage.getItem("baseUrl")}functions/updatecontacttour`,
@@ -1568,11 +1538,15 @@ function PdfRequestFiles(
    const widgetValue = widgetDataValue(dragTypeValue, parseUser);
    //adding and updating drop position in array when user drop signature button in div
    if (item === "onclick") {
+      // `getBoundingClientRect()` is used to get accurate measurement width, height of the Pdf div
+      const divWidth = divRef.current.getBoundingClientRect().width;
      const divHeight = divRef.current.getBoundingClientRect().height;
-      // `getBoundingClientRect()` is used to get accurate measurement height of the div
+      //  Compute the pixel‐space center within the PDF viewport:
+      const centerX_Pixels = divWidth / 2 - widgetWidth / 2;
+      const xPosition_Final = centerX_Pixels / (containerScale * scale);
      dropObj = {
        //onclick put placeholder center on pdf
-        xPosition: widgetWidth / 4 + containerWH.width / 2,
+        xPosition: xPosition_Final,
        yPosition: widgetHeight + divHeight / 2,
        isStamp:
          (dragTypeValue === "stamp" || dragTypeValue === "image") && true,
@@ -1648,12 +1622,6 @@ function PdfRequestFiles(
        );
        setSignerPos(updatesignerPos);
      }
-
-      // if (dragTypeValue === "dropdown") {
-      //   setShowDropdown(true);
-      // } else if (dragTypeValue === "checkbox") {
-      //   setIsCheckbox(true);
-      // } else
      if (
        [textWidget, "name", "company", "job title", "email"].includes(
          dragTypeValue
@@ -1753,7 +1721,6 @@ function PdfRequestFiles(
      setShowSignPagenumber(sortedPagenumber);
    }
  };
-
  return (
    <DndProvider backend={HTML5Backend}>
      <Title
@@ -1825,6 +1792,7 @@ function PdfRequestFiles(
                {!requestSignTour &&
                  isAgree &&
                  signerObjectId &&
+                  !alreadySign &&
                  requestSignTourFunction()}
                <Tour
                  showNumber={false}
@@ -2263,6 +2231,7 @@ function PdfRequestFiles(
              index={pageNumber}
              setUniqueId={setUniqueId}
              tempSignerId={tempSignerId}
+              signatureTypes={signatureType}
            />
          )}
          <DownloadPdfZip
@@ -27,6 +27,7 @@ import {
  multiSignEmbed,
  addWidgetOptions,
  textInputWidget,
+  cellsWidget,
  textWidget,
  radioButtonWidget,
  color,
@@ -44,7 +45,8 @@ import {
  handleSignatureType,
  getBase64FromUrl,
  generatePdfName,
-  mailTemplate
+  mailTemplate,
+  getOriginalWH
 } from "../constant/Utils";
 import RenderPdf from "../components/pdf/RenderPdf";
 import { useNavigate } from "react-router";
@@ -192,7 +194,7 @@ function PlaceHolderSign() {
    );
    if (user) {
      try {
-        const defaultRequestBody = `<p>Hi {{receiver_name}},</p><br><p>We hope this email finds you well. {{sender_name}}&nbsp;has requested you to review and sign&nbsp;{{document_title}}.</p><p>Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.</p><br><p>{{signing_url}}</p><br><p>If you have any questions or need further clarification regarding the document or the signing process,  please contact the sender.</p><br><p>Thanks</p><p> Team ${appName}</p><br>`;
+        const defaultRequestBody = `<p>Hi {{receiver_name}},</p><br><p>We hope this email finds you well. {{sender_name}}&nbsp;has requested you to review and sign&nbsp;{{document_title}}.</p><p>Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.</p><br><p><a href='{{signing_url}}' rel='noopener noreferrer' target='_blank'>Sign here</a></p><br><br><p>If you have any questions or need further clarification regarding the document or the signing process,  please contact the sender.</p><br><p>Thanks</p><p> Team ${appName}</p><br>`;
        const defaultSubject = `{{sender_name}} has requested you to sign {{document_title}}`;
        setDefaultBody(defaultRequestBody);
        setDefaultSubject(defaultSubject);
@@ -523,11 +525,15 @@ function PlaceHolderSign() {
        defaultWidthHeight(dragTypeValue).height * containerScale;
      //adding and updating drop position in array when user drop signature button in div
      if (item === "onclick") {
+        // `getBoundingClientRect()` is used to get accurate measurement width, height of the Pdf div
+        const divWidth = divRef.current.getBoundingClientRect().width;
        const divHeight = divRef.current.getBoundingClientRect().height;
-        // `getBoundingClientRect()` is used to get accurate measurement height of the div
+        //  Compute the pixel‐space center within the PDF viewport:
+        const centerX_Pixels = divWidth / 2 - widgetWidth / 2;
+        const xPosition_Final = centerX_Pixels / (containerScale * scale);
        dropObj = {
          //onclick put placeholder center on pdf
-          xPosition: widgetWidth / 4 + containerWH.width / 2,
+          xPosition: xPosition_Final,
          yPosition: widgetHeight + divHeight / 2,
          isStamp:
            (dragTypeValue === "stamp" || dragTypeValue === "image") && true,
@@ -671,14 +677,7 @@ function PlaceHolderSign() {

  //function for get pdf page details
  const pageDetails = async (pdf) => {
-    let pdfWHObj = [];
-    const totalPages = pdf?.numPages;
-    for (let index = 0; index < totalPages; index++) {
-      const getPage = await pdf.getPage(index + 1);
-      const scale = 1;
-      const { width, height } = getPage.getViewport({ scale });
-      pdfWHObj.push({ pageNumber: index + 1, width, height });
-    }
+    const pdfWHObj = await getOriginalWH(pdf);
    setPdfOriginalWH(pdfWHObj);
    setPdfLoad(true);
  };
@@ -862,7 +861,9 @@ function PlaceHolderSign() {
      });
      const isSignYourSelfFlow = false;
      try {
+        //pdfOriginalWH contained all pdf's pages width,height & pagenumber in array format
        const pdfBase64 = await multiSignEmbed(
+          pdfOriginalWH,
          placeholder,
          pdfDoc,
          isSignYourSelfFlow,
@@ -1220,7 +1221,7 @@ function PlaceHolderSign() {
            receiver_phone: signerMail[i]?.Phone || "",
            expiry_date: localExpireDate,
            company_name: orgName,
-            signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+            signing_url: signPdf
          };
          replaceVar = replaceMailVaribles(
            requestSubject,
@@ -1249,7 +1250,7 @@ function PlaceHolderSign() {
            receiver_phone: signerMail[i]?.Phone || "",
            expiry_date: localExpireDate,
            company_name: orgName,
-            signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+            signing_url: signPdf
          };
          replaceVar = replaceMailVaribles(mailSubject, htmlReqBody, variables);
        }
@@ -1260,7 +1261,7 @@ function PlaceHolderSign() {
          title: documentName,
          organization: orgName,
          localExpireDate: localExpireDate,
-          sigingUrl: signPdf
+          signingUrl: signPdf
        };
        let params = {
          extUserId: owner?.objectId,
@@ -1417,7 +1418,8 @@ function PlaceHolderSign() {
    deleteOption,
    status,
    defaultValue,
-    isHideLabel
+    isHideLabel,
+    layout
  ) => {
    const filterSignerPos = signerPos.filter((data) => data.Id === uniqueId);
    if (filterSignerPos.length > 0) {
@@ -1452,6 +1454,8 @@ function PlaceHolderSign() {
                    ...position.options,
                    name: dropdownName,
                    values: dropdownOptions,
+                    status: status,
+                    layout: layout,
                    isReadOnly: isReadOnly || false,
                    isHideLabel: isHideLabel || false,
                    defaultValue: defaultValue,
@@ -1491,6 +1495,7 @@ function PlaceHolderSign() {
                      maxRequiredCount: maxCount
                    },
                    defaultValue: defaultValue,
+                    layout: layout,
                    isReadOnly: isReadOnly || false,
                    isHideLabel: isHideLabel || false,
                    fontSize:
@@ -1589,6 +1594,36 @@ function PlaceHolderSign() {
                  isReadOnly: defaultdata?.isReadOnly || false
                }
              };
+            } else if (position.type === cellsWidget) {
+              return {
+                ...position,
+                options: {
+                  ...position.options,
+                  name: defaultdata?.name || "Cells",
+                  status: defaultdata?.status || "required",
+                  hint: defaultdata?.hint || "",
+                  cellCount: parseInt(defaultdata?.cellCount || 5),
+                  defaultValue: (defaultdata?.defaultValue || "").slice(
+                    0,
+                    parseInt(defaultdata?.cellCount || 5)
+                  ),
+                  validation:
+                    isSubscribe && inputype
+                      ? {
+                          type: inputype,
+                          pattern:
+                            inputype === "regex" ? defaultdata.textvalidate : ""
+                        }
+                      : {},
+                  fontSize:
+                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                  fontColor:
+                    fontColor ||
+                    currWidgetsDetails?.options?.fontColor ||
+                    "black",
+                  isReadOnly: defaultdata?.isReadOnly || false
+                }
+              };
            } else if (["signature"].includes(position.type)) {
              return {
                ...position,
@@ -2593,6 +2628,7 @@ function PlaceHolderSign() {
            isSave={true}
            tempSignerId={tempSignerId}
            setUniqueId={setUniqueId}
+            signatureTypes={signatureType}
          />
        )}
        <ModalUi
@@ -218,7 +218,7 @@ const Preferences = () => {
      setIsLoader(true);
      const updateRes = tenantRes;
      setTenantId(updateRes?.objectId);
-      const defaultRequestBody = `<p>Hi {{receiver_name}},</p><br><p>We hope this email finds you well. {{sender_name}}&nbsp;has requested you to review and sign&nbsp;{{document_title}}.</p><p>Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.</p><br><p>{{signing_url}}</p><br><p>If you have any questions or need further clarification regarding the document or the signing process, please contact the sender.</p><br><p>Thanks</p><p> Team ${appName}</p><br>`;
+      const defaultRequestBody = `<p>Hi {{receiver_name}},</p><br><p>We hope this email finds you well. {{sender_name}}&nbsp;has requested you to review and sign&nbsp;{{document_title}}.</p><p>Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.</p><br><p><a href='{{signing_url}}' rel='noopener noreferrer' target='_blank'>Sign here</a></p><br><br><p>If you have any questions or need further clarification regarding the document or the signing process, please contact the sender.</p><br><p>Thanks</p><p> Team ${appName}</p><br>`;
      if (updateRes?.RequestBody) {
        setRequestBody(updateRes?.RequestBody);
        setRequestSubject(updateRes?.RequestSubject);
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useRef } from "react";
 import ReportTable from "../primitives/GetReportDisplay";
 import Parse from "parse";
 import axios from "axios";
@@ -27,12 +27,17 @@ const Report = () => {
  const [isImport, setIsImport] = useState(false);
  const abortController = new AbortController();
  const docPerPage = 10;
+  const [searchTerm, setSearchTerm] = useState("");
+  const [mobileSearchOpen, setMobileSearchOpen] = useState(false);
+  const debounceTimer = useRef(null);

  // below useEffect is call when id param change
  useEffect(() => {
    setReportName("");
    setList([]);
-    getReportData();
+    setSearchTerm("");
+    setMobileSearchOpen(false);
+    getReportData(0, docPerPage, "");

    // Function returned from useEffect is called on unmount
    return () => {
@@ -48,7 +53,7 @@ const Report = () => {
  // below useEffect call when isNextRecord state is true and fetch next record
  useEffect(() => {
    if (isNextRecord) {
-      getReportData(List.length, 20);
+      getReportData(List.length, 20, searchTerm);
    }
    // eslint-disable-next-line
  }, [isNextRecord]);
@@ -56,7 +61,46 @@ const Report = () => {
  const handleDontShow = (isChecked) => {
    setIsDontShow(isChecked);
  };
-  const getReportData = async (skipUserRecord = 0, limit = 20) => {
+
+  const handleSearchChange = async (e) => {
+    const term = e.target.value.toLowerCase();
+    setSearchTerm(term);
+    if (debounceTimer.current) {
+      clearTimeout(debounceTimer.current);
+    }
+    debounceTimer.current = setTimeout(async () => {
+      try {
+        const headers = {
+          "Content-Type": "application/json",
+          "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+          sessiontoken: localStorage.getItem("accesstoken"),
+        };
+        const url = `${localStorage.getItem("baseUrl")}functions/getReport`;
+        const res = await axios.post(
+          url,
+          { reportId: id, searchTerm: term, skip: 0, limit: docPerPage },
+          { headers }
+        );
+        const data = res.data?.result || [];
+        if (!data.error) {
+          setList(data);
+          setIsMoreDocs(data.length >= docPerPage);
+          setIsNextRecord(false);
+        }
+      } catch (err) {
+        console.error("Search error:", err);
+      }
+    }, 300);
+  };
+
+  useEffect(() => {
+    return () => {
+      if (debounceTimer.current) {
+        clearTimeout(debounceTimer.current);
+      }
+    };
+  }, []);
+  const getReportData = async (skipUserRecord = 0, limit = 20, term = searchTerm) => {
    // setIsLoader(true);
    const json = reportJson(id);
    if (json) {
@@ -77,6 +121,9 @@ const Report = () => {
        const skipRecord = id === "4Hhwbp482K" ? 0 : skipUserRecord;
        const limitRecord = id === "4Hhwbp482K" ? 200 : limit;
        const params = { reportId: id, skip: skipRecord, limit: limitRecord };
+        if (term) {
+          params.searchTerm = term;
+        }
        const url = `${localStorage.getItem("baseUrl")}functions/getReport`;
        const res = await axios.post(url, params, {
          headers: headers,
@@ -197,6 +244,10 @@ const Report = () => {
              report_help={reporthelp}
              tourData={tourData}
              isDontShow={isDontShow}
+              mobileSearchOpen={mobileSearchOpen}
+              setMobileSearchOpen={setMobileSearchOpen}
+              searchTerm={searchTerm}
+              handleSearchChange={handleSearchChange}
              isImport={isImport}
            />
          ) : (
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect } from "react";
+import { useState, useRef, useEffect } from "react";
 import { PDFDocument } from "pdf-lib";
 import "../styles/signature.css";
 import Parse from "parse";
@@ -22,6 +22,7 @@ import {
  randomId,
  getDate,
  textWidget,
+  cellsWidget,
  convertPdfArrayBuffer,
  textInputWidget,
  fetchImageBase64,
@@ -32,12 +33,13 @@ import {
  onClickZoomIn,
  onClickZoomOut,
  rotatePdfPage,
-  signatureTypes,
  getBase64FromUrl,
  convertBase64ToFile,
  generatePdfName,
  handleRemoveWidgets,
-  addWidgetSelfsignOptions
+  addWidgetSelfsignOptions,
+  getOriginalWH,
+  signatureTypes
 } from "../constant/Utils";
 import { useParams } from "react-router";
 import Tour from "../primitives/Tour";
@@ -355,9 +357,13 @@ function SignYourSelf() {
    );
    const dragTypeValue = item?.text ? item.text : monitor.type;
    const widgetValue = getWidgetValue(dragTypeValue);
-    const widgetTypeExist = ["name", "company", "job title", "email"].includes(
-      dragTypeValue
-    );
+    const widgetTypeExist = [
+      "name",
+      "company",
+      "job title",
+      "email",
+      cellsWidget
+    ].includes(dragTypeValue);
    const containerScale = getContainerScale(
      pdfOriginalWH,
      pageNumber,
@@ -365,15 +371,19 @@ function SignYourSelf() {
    );
    //adding and updating drop position in array when user drop signature button in div
    if (item === "onclick") {
-      // `getBoundingClientRect()` is used to get accurate measurement height of the div
+      // `getBoundingClientRect()` is used to get accurate measurement width, height of the Pdf div
      const divHeight = divRef.current.getBoundingClientRect().height;
+      const divWidth = divRef.current.getBoundingClientRect().width;
      const getWidth = widgetTypeExist
        ? calculateInitialWidthHeight(widgetValue).getWidth
        : defaultWidthHeight(dragTypeValue).width;
      const getHeight = defaultWidthHeight(dragTypeValue).height;

+      //  Compute the pixel‐space center within the PDF viewport:
+      const centerX_Pixels = divWidth / 2 - getWidth / 2;
+      const xPosition_Final = centerX_Pixels / (containerScale * scale);
      dropObj = {
-        xPosition: getWidth / 2 + containerWH.width / 2,
+        xPosition: xPosition_Final,
        yPosition: getHeight + divHeight / 2,
        isStamp:
          (dragTypeValue === "stamp" || dragTypeValue === "image") && true,
@@ -434,6 +444,7 @@ function SignYourSelf() {
      [
        textInputWidget,
        textWidget,
+        cellsWidget,
        "name",
        "company",
        "job title",
@@ -626,10 +637,12 @@ function SignYourSelf() {
            const HeaderDocId = extUserPtr?.HeaderDocId;
            //embed document's object id to all pages in pdf document
            if (!HeaderDocId) {
-              await embedDocId(pdfDoc, documentId, allPages);
+              //pdfOriginalWH contained all pdf's pages width,height & pagenumber in array format
+              await embedDocId(pdfOriginalWH, pdfDoc, documentId);
            }
-            //embed multi signature in pdf
+            //embed all widgets in document
            const pdfBytes = await multiSignEmbed(
+              pdfOriginalWH,
              xyPosition,
              pdfDoc,
              isSignYourSelfFlow,
@@ -738,7 +751,6 @@ function SignYourSelf() {
      getDocumentDetails(false);
    }
  };
-
  //function for save x and y position and show signature  tab on that position
  const handleTabDrag = (key) => {
    setDragKey(key);
@@ -789,14 +801,7 @@ function SignYourSelf() {
  };
  //function for get pdf page details
  const pageDetails = async (pdf) => {
-    let pdfWHObj = [];
-    const totalPages = pdf?.numPages;
-    for (let index = 0; index < totalPages; index++) {
-      const getPage = await pdf.getPage(index + 1);
-      const scale = 1;
-      const { width, height } = getPage.getViewport({ scale });
-      pdfWHObj.push({ pageNumber: index + 1, width, height });
-    }
+    const pdfWHObj = await getOriginalWH(pdf);
    setPdfOriginalWH(pdfWHObj);
    setPdfLoad(true);
  };
@@ -932,7 +937,8 @@ function SignYourSelf() {
    deleteOption,
    status,
    defaultValue,
-    isHideLabel
+    isHideLabel,
+    layout
  ) => {
    const getPageNumer = xyPosition.filter(
      (data) => data.pageNumber === pageNumber
@@ -940,6 +946,8 @@ function SignYourSelf() {
    if (getPageNumer.length > 0) {
      const getXYdata = getPageNumer[0].pos;
      const getPosData = getXYdata;
+      const widgetLayout =
+        currWidgetsDetails?.type === "checkbox" ? { layout: layout } : {};
      const addSignPos = getPosData.map((position) => {
        if (position.key === currWidgetsDetails?.key) {
          if (addOption) {
@@ -963,6 +971,7 @@ function SignYourSelf() {
                ...position.options,
                name: dropdownName,
                values: dropdownOptions,
+                ...widgetLayout,
                isReadOnly: isReadOnly,
                isHideLabel: isHideLabel || false,
                fontSize:
@@ -1029,6 +1038,19 @@ function SignYourSelf() {
      handleTextSettingModal(false);
    }
  };
+
+  const setCellCount = (key, newCount) => {
+    const getPageNumer = xyPosition.filter((data) => data.pageNumber === pageNumber);
+    if (getPageNumer.length > 0) {
+      const updatePos = getPageNumer[0].pos.map((p) =>
+        p.key === key ? { ...p, options: { ...p.options, cellCount: newCount } } : p
+      );
+      const updateXYposition = xyPosition.map((obj, ind) =>
+        ind === index ? { ...obj, pos: updatePos } : obj
+      );
+      setXyPosition(updateXYposition);
+    }
+  };
  const clickOnZoomIn = () => {
    onClickZoomIn(scale, zoomPercent, setScale, setZoomPercent);
  };
@@ -1290,6 +1312,7 @@ function SignYourSelf() {
                      pdfBase64Url={pdfBase64Url}
                      fontSize={fontSize}
                      setFontSize={setFontSize}
+                      setCellCount={setCellCount}
                      fontColor={fontColor}
                      setFontColor={setFontColor}
                      isResize={isResize}
@@ -1336,6 +1359,7 @@ function SignYourSelf() {
          currWidgetsDetails={currWidgetsDetails}
          index={index}
          isSave={true}
+          signatureTypes={signatureTypes}
        />
      )}
      <RotateAlert
@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useRef } from "react";
+import { useEffect, useState, useRef } from "react";
 import RenderAllPdfPage from "../components/pdf/RenderAllPdfPage";
 import { useParams, useNavigate } from "react-router";
 import axios from "axios";
@@ -22,6 +22,7 @@ import {
  defaultWidthHeight,
  addWidgetOptions,
  textInputWidget,
+  cellsWidget,
  radioButtonWidget,
  getContainerScale,
  convertBase64ToFile,
@@ -38,7 +39,8 @@ import {
  convertPdfArrayBuffer,
  generatePdfName,
  textWidget,
-  multiSignEmbed
+  multiSignEmbed,
+  getOriginalWH
 } from "../constant/Utils";
 import RenderPdf from "../components/pdf/RenderPdf";
 import "../styles/AddUser.css";
@@ -375,11 +377,15 @@ const TemplatePlaceholder = () => {
          filterSignerPos;
        let placeHolder;
        if (item === "onclick") {
-          // `getBoundingClientRect()` is used to get accurate measurement height of the div
+          // `getBoundingClientRect()` is used to get accurate measurement width, height of the Pdf div
+          const divWidth = divRef.current.getBoundingClientRect().width;
          const divHeight = divRef.current.getBoundingClientRect().height;
+          //  Compute the pixel‐space center within the PDF viewport:
+          const centerX_Pixels = divWidth / 2 - widgetWidth / 2;
+          const xPosition_Final = centerX_Pixels / (containerScale * scale);
          dropObj = {
            //onclick put placeholder center on pdf
-            xPosition: widgetWidth / 4 + containerWH.width / 2,
+            xPosition: xPosition_Final,
            yPosition: widgetHeight + divHeight / 2,
            isStamp:
              (dragTypeValue === "stamp" || dragTypeValue === "image") && true,
@@ -534,14 +540,7 @@ const TemplatePlaceholder = () => {

  //function for get pdf page details
  const pageDetails = async (pdf) => {
-    let pdfWHObj = [];
-    const totalPages = pdf?.numPages;
-    for (let index = 0; index < totalPages; index++) {
-      const getPage = await pdf.getPage(index + 1);
-      const scale = 1;
-      const { width, height } = getPage.getViewport({ scale });
-      pdfWHObj.push({ pageNumber: index + 1, width, height });
-    }
+    const pdfWHObj = await getOriginalWH(pdf);
    setPdfOriginalWH(pdfWHObj);
    setPdfLoad(true);
  };
@@ -832,7 +831,9 @@ const TemplatePlaceholder = () => {
      });
      const isSignYourSelfFlow = false;
      try {
+        //pdfOriginalWH contained all pdf's pages width,height & pagenumber in array format
        const pdfBase64 = await multiSignEmbed(
+          pdfOriginalWH,
          placeholder,
          pdfDoc,
          isSignYourSelfFlow,
@@ -1149,25 +1150,6 @@ const TemplatePlaceholder = () => {
  const handleLinkUser = (id) => {
    setIsAddUser({ [id]: true });
  };
-  //function to use unlink signer from widgets
-  const handleUnlinkSigner = () => {
-    //remove existing signer's details from 'signerPos' array
-    const updatePlaceHolder = signerPos.map((x) => {
-      if (x.Id === uniqueId) {
-        return { ...x, signerPtr: {}, signerObjId: "" };
-      }
-      return { ...x };
-    });
-    setSignerPos(updatePlaceHolder);
-    //remove existing signer's details from 'signersdata' array and keep role and id
-    const updateSigner = signersdata.map((item) => {
-      if (item.Id == uniqueId) {
-        return { Role: item.Role, Id: item.Id, blockColor: item.blockColor };
-      }
-      return item;
-    });
-    setSignersData(updateSigner);
-  };
  // `handleAddUser` is used to adduser
  const handleAddUser = (data) => {
    const signerPtr = {
@@ -1293,7 +1275,8 @@ const TemplatePlaceholder = () => {
    deleteOption,
    status,
    defaultValue,
-    isHideLabel
+    isHideLabel,
+    layout
  ) => {
    const filterSignerPos = signerPos.filter((data) => data.Id === uniqueId);
    if (filterSignerPos.length > 0) {
@@ -1332,6 +1315,7 @@ const TemplatePlaceholder = () => {
                    name: dropdownName,
                    values: dropdownOptions,
                    status: status,
+                    layout: layout,
                    defaultValue: defaultValue,
                    isReadOnly: isReadOnly || false,
                    isHideLabel: isHideLabel || false,
@@ -1370,6 +1354,7 @@ const TemplatePlaceholder = () => {
                      minRequiredCount: minCount,
                      maxRequiredCount: maxCount
                    },
+                    layout: layout,
                    isReadOnly: isReadOnly || false,
                    defaultValue: defaultValue,
                    isHideLabel: isHideLabel || false,
@@ -1470,6 +1455,36 @@ const TemplatePlaceholder = () => {
                    "black"
                }
              };
+            } else if (position.type === cellsWidget) {
+              return {
+                ...position,
+                options: {
+                  ...position.options,
+                  name: defaultdata?.name || "Cells",
+                  status: defaultdata?.status || "required",
+                  hint: defaultdata?.hint || "",
+                  cellCount: parseInt(defaultdata?.cellCount || 5),
+                  defaultValue: (defaultdata?.defaultValue || "").slice(
+                    0,
+                    parseInt(defaultdata?.cellCount || 5)
+                  ),
+                  validation:
+                    isSubscribe && inputype
+                      ? {
+                          type: inputype,
+                          pattern:
+                            inputype === "regex" ? defaultdata.textvalidate : ""
+                        }
+                      : {},
+                  isReadOnly: defaultdata?.isReadOnly || false,
+                  fontSize:
+                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                  fontColor:
+                    fontColor ||
+                    currWidgetsDetails?.options?.fontColor ||
+                    "black"
+                }
+              };
            } else if (["signature"].includes(position.type)) {
              return {
                ...position,
@@ -1529,6 +1544,22 @@ const TemplatePlaceholder = () => {
    setIsRadio(false);
    setIsCheckbox(false);
  };
+  const setCellCount = (key, newCount) => {
+    const updated = signerPos.map((signer) => {
+      if (signer.Id !== uniqueId) return signer;
+      const placeHolder = signer.placeHolder.map((ph) => {
+        if (ph.pageNumber !== pageNumber) return ph;
+        const pos = ph.pos.map((p) =>
+          p.key === key
+            ? { ...p, options: { ...p.options, cellCount: newCount } }
+            : p
+        );
+        return { ...ph, pos };
+      });
+      return { ...signer, placeHolder };
+    });
+    setSignerPos(updated);
+  };

  const clickOnZoomIn = () => {
    onClickZoomIn(scale, zoomPercent, setScale, setZoomPercent);
@@ -1847,6 +1878,7 @@ const TemplatePlaceholder = () => {
                        pdfBase64Url={pdfBase64Url}
                        fontSize={fontSize}
                        setFontSize={setFontSize}
+                        setCellCount={setCellCount}
                        fontColor={fontColor}
                        setFontColor={setFontColor}
                        isResize={isResize}
@@ -1950,7 +1982,9 @@ const TemplatePlaceholder = () => {
              closePopup={closePopup}
              signersData={signersdata}
              signerPos={signerPos}
-              handleUnlinkSigner={handleUnlinkSigner}
+              setSignerPos={setSignerPos}
+              setSignersData={setSignersData}
+              isRemove={true}
            />
          )}
        </div>
@@ -423,9 +423,9 @@ function UserProfile() {
                onClick={() =>
                  editmode ? handleCancel() : navigate("/changepassword")
                }
-                className={`op-btn ${
-                  editmode ? "op-btn-ghost w-[100px]" : "op-btn-secondary"
-                }`}
+                className={
+                      `op-btn ${editmode ? "op-btn-ghost w-[100px]" : "op-btn-secondary"}`
+                }
              >
                {editmode ? t("cancel") : t("change-password")}
              </button>
@@ -0,0 +1,864 @@
+import React, { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+import { PDFDocument, PDFName, PDFSignature, PDFRef, PDFDict } from 'pdf-lib'; // Updated import
+import * as asn1js from 'asn1js';
+import { Certificate, ContentInfo, SignedData, IssuerAndSerialNumber } from 'pkijs';
+// import * as jsrsasign from 'jsrsasign'; // Removed for dynamic loading
+
+const VerifyDocument = () => {
+  const { t } = useTranslation();
+  const [selectedFile, setSelectedFile] = useState(null);
+  const [fileBuffer, setFileBuffer] = useState(null);
+  const [verificationResult, setVerificationResult] = useState('');
+  const [detailedResults, setDetailedResults] = useState([]);
+  const [collapsedSections, setCollapsedSections] = useState({});
+  // const [jsrsasignStatus, setJsrsasignStatus] = useState('loading'); // Removed
+
+  // OID to human-readable label mapping
+  const oidMapping = {
+    '2.5.4.6': 'Country',
+    '2.5.4.10': 'Organization', 
+    '2.5.4.11': 'Organizational Unit',
+    '2.5.4.17': 'Postal Code',
+    '2.5.4.8': 'State',
+    '2.5.4.7': 'Locality', // Alternative for City
+    '2.5.4.9': 'City',
+    '2.5.4.51': 'Address',
+    '2.5.4.3': 'Common Name',
+    '2.5.4.4': 'Surname',
+    '2.5.4.5': 'Serial Number',
+    '2.5.4.12': 'Title',
+    '2.5.4.13': 'Description',
+    '2.5.4.16': 'Postal Address',
+    '2.5.4.18': 'Post Office Box',
+    '2.5.4.20': 'Telephone Number',
+    '1.2.840.113549.1.9.1': 'Email Address',
+    // Common alternative OIDs
+    'C': 'Country',
+    'O': 'Organization',
+    'OU': 'Organizational Unit',
+    'CN': 'Common Name',
+    'ST': 'State',
+    'L': 'Locality',
+    'STREET': 'Address',
+    'emailAddress': 'Email Address',
+    'serialNumber': 'Serial Number'
+  };
+
+  // Function to parse certificate subject/issuer into structured data
+  const parseCertificateInfo = (certString) => {
+    if (!certString) return {};
+    
+    const parsed = {};
+    
+    // Find all OID patterns and their positions
+    const oidPattern = /(\d+\.\d+\.\d+\.\d+|\w+)=/g;
+    const matches = [];
+    let match;
+    
+    while ((match = oidPattern.exec(certString)) !== null) {
+      matches.push({
+        oid: match[1],
+        startIndex: match.index,
+        equalIndex: match.index + match[1].length
+      });
+    }
+    
+    // Extract value for each OID
+    for (let i = 0; i < matches.length; i++) {
+      const currentMatch = matches[i];
+      const nextMatch = matches[i + 1];
+      
+      const valueStart = currentMatch.equalIndex + 1; // Skip the "=" character
+      const valueEnd = nextMatch ? nextMatch.startIndex - 2 : certString.length; // -2 to remove ", " before next OID
+      
+      const value = certString.substring(valueStart, valueEnd).trim();
+      const label = oidMapping[currentMatch.oid] || currentMatch.oid;
+      
+      parsed[label] = value;
+    }
+    
+    return parsed;
+  };
+
+  // Function to determine if status should show success icon
+  const isSuccessStatus = (status) => {
+    const successTerms = ['valid', 'success', 'parsed', 'verified'];
+    const errorTerms = ['error', 'invalid', 'failed', 'expired'];
+    
+    const statusLower = status.toLowerCase();
+    
+    // Check for explicit error terms first
+    if (errorTerms.some(term => statusLower.includes(term))) {
+      return false;
+    }
+    
+    // Check for success terms
+    return successTerms.some(term => statusLower.includes(term));
+  };
+
+  // Function to determine if certificate validity should show success icon
+  const isCertificateValid = (validityText) => {
+    const validityLower = validityText.toLowerCase();
+    
+    // If it contains "valid" and doesn't contain negative terms
+    return validityLower.includes('valid') && 
+           !validityLower.includes('expired') && 
+           !validityLower.includes('not yet valid') &&
+           !validityLower.includes('invalid');
+  };
+
+  // Toggle collapsible sections
+  const toggleSection = (signatureIndex, section) => {
+    const key = `${signatureIndex}-${section}`;
+    setCollapsedSections(prev => ({
+      ...prev,
+      [key]: !prev[key]
+    }));
+  };
+
+  // useEffect for jsrsasign loading removed
+
+  const handleFileChange = (event) => {
+    const file = event.target.files[0];
+    if (file && file.type === 'application/pdf') {
+      setSelectedFile(file);
+      setVerificationResult('');
+      setDetailedResults([]);
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        setFileBuffer(e.target.result);
+      };
+      reader.readAsArrayBuffer(file);
+    } else {
+      setSelectedFile(null);
+      setFileBuffer(null);
+      setDetailedResults([]);
+      setVerificationResult(t('please-select-pdf'));
+    }
+  };
+
+  const parseSignature = async (pdfDoc) => {
+    const signatureFields = pdfDoc.getForm().getFields().filter(field => field instanceof PDFSignature); // Updated filter logic
+    if (!signatureFields.length) {
+      return { error: t('no-signature-found') };
+    }
+
+    const results = [];
+
+    for (const field of signatureFields) {
+      try {
+        if (!field.acroField || !field.acroField.dict) {
+          results.push({
+            name: field.getName() || t('unnamed-signature-field'),
+            status: t('error-processing-signature'),
+            errorDetails: t('missing-acrofield-dict'),
+            signerInfo: t('signer-info-not-available'),
+            certificateSubject: '',
+            certificateIssuer: '',
+            certificateValidity: t('cert-validity-not-checked'),
+            isCertificateDateValid: false,
+            calculatedDocumentHash: t('not-available'),
+            messageDigestInSignature: t('not-available'),
+            hashComparisonResult: t('not-performed'),
+            authenticatedAttributesSignatureResult: t('not-performed'),
+          });
+          continue; 
+        }
+
+        // New logic to determine the actual signature dictionary
+        const fieldDict = field.acroField.dict;
+        const vEntry = fieldDict.get(PDFName.of('V'));
+        let actualSignatureDict = null;
+
+        if (vEntry) {
+          if (vEntry instanceof PDFRef) {
+            const lookedUp = pdfDoc.context.lookup(vEntry);
+            if (lookedUp instanceof PDFDict) {
+              actualSignatureDict = lookedUp;
+            }
+          } else if (vEntry instanceof PDFDict) {
+            actualSignatureDict = vEntry;
+          }
+        }
+
+        // Use actualSignatureDict if found, otherwise behavior might be problematic (as per existing logic)
+        // If actualSignatureDict is null, subsequent checks for byteRangeObject etc. will fail,
+        // leading to an error message for this signature, which is acceptable.
+        const signatureDict = actualSignatureDict; 
+
+        // Check if signatureDict is null (meaning actualSignatureDict was not resolved)
+        // and push an error if it is, before trying to get ByteRange or Contents.
+        if (!signatureDict) {
+          results.push({
+            name: field.getName() || t('unnamed-signature-field'),
+            status: t('error-processing-signature'),
+            errorDetails: t('signature-dictionary-not-found-or-invalid'), // New error message
+            signerInfo: t('signer-info-not-available'),
+            certificateSubject: '',
+            certificateIssuer: '',
+            certificateValidity: t('cert-validity-not-checked'),
+            isCertificateDateValid: false,
+            calculatedDocumentHash: t('not-available'),
+            messageDigestInSignature: t('not-available'),
+            hashComparisonResult: t('not-performed'),
+            authenticatedAttributesSignatureResult: t('not-performed'),
+          });
+          continue;
+        }
+
+        const byteRangeObject = signatureDict.get(PDFName.of('ByteRange'));
+        let byteRange; // Will be assigned after validation
+
+        // Comprehensive validation for byteRangeObject and its contents
+        if (!byteRangeObject || 
+            !byteRangeObject.array || 
+            !Array.isArray(byteRangeObject.array) || 
+            byteRangeObject.array.length === 0 || 
+            byteRangeObject.array.length % 2 !== 0) {
+          results.push({
+            name: field.getName() || t('unnamed-signature-field'),
+            status: t('error-processing-signature'),
+            errorDetails: t('missing-or-invalid-byterange'),
+            signerInfo: t('signer-info-not-available'),
+            certificateSubject: '',
+            certificateIssuer: '',
+            certificateValidity: t('cert-validity-not-checked'),
+            isCertificateDateValid: false,
+            calculatedDocumentHash: t('not-available'),
+            messageDigestInSignature: t('not-available'),
+            hashComparisonResult: t('not-performed'),
+            authenticatedAttributesSignatureResult: t('not-performed'),
+          });
+          continue;
+        }
+
+        const byteRangeNumbers = [];
+        let byteRangeIsValid = true;
+        for (const pdfObject of byteRangeObject.array) {
+          if (!pdfObject || typeof pdfObject.asNumber !== 'function') {
+            byteRangeIsValid = false;
+            break;
+          }
+          const num = pdfObject.asNumber();
+          if (!Number.isFinite(num)) { // Checks for NaN, Infinity, -Infinity
+            byteRangeIsValid = false;
+            break;
+          }
+          byteRangeNumbers.push(num);
+        }
+
+        if (!byteRangeIsValid) {
+          results.push({
+            name: field.getName() || t('unnamed-signature-field'),
+            status: t('error-processing-signature'),
+            errorDetails: t('missing-or-invalid-byterange'), // Or a more specific error like "ByteRange contains non-numeric values"
+            signerInfo: t('signer-info-not-available'),
+            certificateSubject: '',
+            certificateIssuer: '',
+            certificateValidity: t('cert-validity-not-checked'),
+            isCertificateDateValid: false,
+            calculatedDocumentHash: t('not-available'),
+            messageDigestInSignature: t('not-available'),
+            hashComparisonResult: t('not-performed'),
+            authenticatedAttributesSignatureResult: t('not-performed'),
+          });
+          continue;
+        }
+        byteRange = byteRangeNumbers; // Assign the validated numbers to byteRange
+
+        const contentsObject = signatureDict.get(PDFName.of('Contents'));
+        if (!contentsObject || typeof contentsObject.asString !== 'function') {
+          results.push({
+            name: field.getName() || t('unnamed-signature-field'),
+            status: t('error-processing-signature'),
+            errorDetails: t('missing-or-invalid-contents'),
+            signerInfo: t('signer-info-not-available'),
+            certificateSubject: '',
+            certificateIssuer: '',
+            certificateValidity: t('cert-validity-not-checked'),
+            isCertificateDateValid: false,
+            calculatedDocumentHash: t('not-available'),
+            messageDigestInSignature: t('not-available'),
+            hashComparisonResult: t('not-performed'),
+            authenticatedAttributesSignatureResult: t('not-performed'),
+          });
+          continue;
+        }
+        const contents = contentsObject.asString();
+        
+        // The old basic check can be removed now as the more specific checks above cover these cases.
+        // if (!byteRange || !contents) { ... }
+
+        // Calculate totalSignedLength for accurate buffer initialization
+        let totalSignedLength = 0;
+        for (let i = 1; i < byteRange.length; i += 2) {
+          totalSignedLength += byteRange[i];
+        }
+
+        if (totalSignedLength <= 0) {
+          results.push({
+            name: field.getName() || t('unnamed-signature-field'),
+            status: t('error-processing-signature'),
+            errorDetails: t('missing-or-invalid-byterange'), // totalSignedLength being non-positive implies invalid ByteRange
+            signerInfo: t('signer-info-not-available'),
+            certificateSubject: '',
+            certificateIssuer: '',
+            certificateValidity: t('cert-validity-not-checked'),
+            isCertificateDateValid: false,
+            calculatedDocumentHash: t('not-available'),
+            messageDigestInSignature: t('not-available'),
+            hashComparisonResult: t('not-performed'),
+            authenticatedAttributesSignatureResult: t('not-performed'),
+          });
+          continue;
+        }
+        const pdfSignedDataBytes = new Uint8Array(totalSignedLength);
+        let offset = 0;
+        let reconstructionFailed = false;
+
+        for (let i = 0; i < byteRange.length; i += 2) {
+          const start = byteRange[i];
+          const length = byteRange[i+1];
+
+          if (start < 0 || length <= 0 || start + length > fileBuffer.byteLength) {
+            reconstructionFailed = true;
+            break;
+          }
+          pdfSignedDataBytes.set(new Uint8Array(fileBuffer.slice(start, start + length)), offset);
+          offset += length;
+        }
+
+        if (reconstructionFailed) {
+          results.push({
+            name: field.getName() || t('unnamed-signature-field'),
+            status: t('error-processing-signature'),
+            errorDetails: t('missing-or-invalid-byterange'), // Error during reconstruction due to invalid segment
+            signerInfo: t('signer-info-not-available'),
+            certificateSubject: '',
+            certificateIssuer: '',
+            certificateValidity: t('cert-validity-not-checked'),
+            isCertificateDateValid: false,
+            calculatedDocumentHash: t('not-available'),
+            messageDigestInSignature: t('not-available'),
+            hashComparisonResult: t('not-performed'),
+            authenticatedAttributesSignatureResult: t('not-performed'),
+          });
+          continue;
+        }
+        
+        // Remove leading/trailing null bytes from hex if present from PDF content
+        const pkcs7Hex = contents.trim(); 
+        
+        if (!pkcs7Hex) { 
+            results.push({ 
+                name: field.getName() || t('unnamed-signature-field'),
+                status: t('signature-invalid-basic'),
+                errorDetails: t('missing-signature-contents'), // New i18n key
+                signerInfo: t('signer-info-not-available'),
+                certificateSubject: '',
+                certificateIssuer: '',
+                certificateValidity: t('cert-validity-not-checked'),
+            });
+            continue;
+        }
+
+        // Convert hex string to ArrayBuffer
+        let cmsContentBuffer;
+        try {
+            cmsContentBuffer = new Uint8Array(pkcs7Hex.match(/.{1,2}/g).map(byte => parseInt(byte, 16))).buffer;
+        } catch (hexError) {
+            // console.error('Error converting hex string to ArrayBuffer:', hexError); // Removed
+            results.push({
+                name: field.getName() || t('unnamed-signature-field'),
+                status: t('signature-invalid-basic'),
+                errorDetails: t('invalid-signature-hex-format'), // New i18n key
+                signerInfo: t('signer-info-not-available'),
+                certificateSubject: '',
+                certificateIssuer: '',
+                certificateValidity: t('cert-validity-not-checked'),
+            });
+            continue;
+        }
+
+
+        // Parse the CMS ContentInfo
+        const asn1 = asn1js.fromBER(cmsContentBuffer);
+        if (asn1.offset === -1) {
+          // console.error('Error parsing ASN.1 from signature data'); // Removed
+          results.push({
+            name: field.getName() || t('unnamed-signature-field'),
+            status: t('signature-invalid-basic'), 
+            errorDetails: 'ASN.1 parsing error from signature data.',
+            signerInfo: t('signer-info-not-available'),
+            certificateSubject: '',
+            certificateIssuer: '',
+            certificateValidity: t('cert-validity-not-checked'),
+          });
+          continue;
+        }
+
+        const cmsContentInfo = new ContentInfo({ schema: asn1.result });
+        if (String(cmsContentInfo.contentType).trim() !== String(ContentInfo.SIGNED_DATA).trim()) { 
+            // console.error('Not a SignedData content type. Actual type:', cmsContentInfo.contentType, 'Expected:', ContentInfo.SIGNED_DATA); // Removed
+            results.push({ 
+                name: field.getName() || t('unnamed-signature-field'),
+                status: t('signature-invalid-basic'),
+                errorDetails: t('unsupported-signature-format-not-signeddata'), // New i18n key
+                signerInfo: t('signer-info-not-available'),
+                certificateSubject: '',
+                certificateIssuer: '',
+                certificateValidity: t('cert-validity-not-checked'),
+            });
+            continue;
+        }
+        
+        const signedData = new SignedData({ schema: cmsContentInfo.content });
+
+        let signerInfoText = t('signer-info-not-available');
+        let certSubject = '';
+        let certIssuer = '';
+        let certValidity = t('cert-validity-not-checked');
+        let isValid = false; 
+
+        if (signedData.signerInfos && signedData.signerInfos.length > 0) {
+          const signerInfo = signedData.signerInfos[0]; 
+
+          if (signedData.certificates && signedData.certificates.length > 0) {
+            let signerCertificate = null;
+            for (const cert of signedData.certificates) {
+              if (cert instanceof Certificate) { 
+                const issuerAndSerialNumber = signerInfo.sid;
+                if (issuerAndSerialNumber instanceof IssuerAndSerialNumber) {
+                  let certMatch = true;
+                  if (cert.issuer.typesAndValues.length === issuerAndSerialNumber.issuer.typesAndValues.length) {
+                    for (let i = 0; i < cert.issuer.typesAndValues.length; i++) {
+                        if (cert.issuer.typesAndValues[i].type !== issuerAndSerialNumber.issuer.typesAndValues[i].type ||
+                            cert.issuer.typesAndValues[i].value.valueBlock.value !== issuerAndSerialNumber.issuer.typesAndValues[i].value.valueBlock.value) {
+                            certMatch = false;
+                            break;
+                        }
+                    }
+                  } else {
+                      certMatch = false;
+                  }
+                  
+                  if (certMatch && cert.serialNumber.valueBlock.valueHexView.join('') === issuerAndSerialNumber.serialNumber.valueBlock.valueHexView.join('')) {
+                    signerCertificate = cert;
+                    break;
+                  }
+                }
+              }
+            }
+
+            if (signerCertificate) {
+              certSubject = signerCertificate.subject.typesAndValues.map(tv => `${tv.type}=${tv.value.valueBlock.value}`).join(', ');
+              certIssuer = signerCertificate.issuer.typesAndValues.map(tv => `${tv.type}=${tv.value.valueBlock.value}`).join(', ');
+              signerInfoText = `${t('signer')}: ${certSubject}, ${t('issuer')}: ${certIssuer}`;
+              
+              const notBefore = signerCertificate.notBefore.value;
+              const notAfter = signerCertificate.notAfter.value;
+              const currentDate = new Date();
+              certValidity = `${t('valid-from')} ${notBefore.toLocaleDateString()} ${t('to')} ${notAfter.toLocaleDateString()}`;
+              if (currentDate < notBefore || currentDate > notAfter) {
+                  certValidity += ` (${t('expired-or-not-yet-valid')})`;
+                  isValid = false; // Explicitly false if expired
+              } else {
+                  certValidity += ` (${t('valid')})`;
+                  isValid = true; 
+              }
+            } else {
+              signerInfoText = t('signer-certificate-not-found'); // New i18n key
+            }
+          } else {
+            signerInfoText = t('no-certificates-in-signature'); // New i18n key
+          }
+        } else {
+          signerInfoText = t('no-signer-info-in-pkcs7'); // Re-use existing key, or make new one
+        }
+
+        results.push({
+          name: field.getName() || t('unnamed-signature-field'),
+          status: isValid ? t('signature-valid-basic') : t('signature-invalid-basic'),
+          signerInfo: signerInfoText,
+          certificateSubject: certSubject,
+          certificateIssuer: certIssuer,
+          certificateValidity: certValidity,
+          errorDetails: !isValid && signerInfoText === t('signer-info-not-available') ? t('could-not-parse-signer-info') : undefined, // New i18n key
+        });
+
+      } catch (e) {
+        console.error('Error processing signature field with pkijs:', field.getName(), e);
+        results.push({ 
+            name: field.getName() || t('unnamed-signature-field'),
+            status: t('error-processing-signature'),
+            errorDetails: e.message,
+            signerInfo: t('signer-info-not-available'),
+            certificateSubject: '',
+            certificateIssuer: '',
+            certificateValidity: t('cert-validity-not-checked'),
+        });
+      }
+    }
+    return { results };
+  };
+
+
+  const handleVerifyDocument = async () => {
+    // Removed jsrsasignStatus check
+
+    if (!fileBuffer) {
+      setVerificationResult(t('please-select-file-to-verify'));
+      setDetailedResults([]);
+      return;
+    }
+
+    setVerificationResult(t('verification-in-progress'));
+    setDetailedResults([]);
+
+    try {
+      // Removed window.KJUR and window.X509 check
+
+      const pdfDoc = await PDFDocument.load(fileBuffer, { ignoreEncryption: true });
+      const signatureInfo = await parseSignature(pdfDoc);
+
+      if (signatureInfo.error) {
+        setVerificationResult(signatureInfo.error);
+      } else if (signatureInfo.results && signatureInfo.results.length > 0) {
+        setDetailedResults(signatureInfo.results);
+        // Overall status can be determined by checking if all signatures are valid
+        const allValid = signatureInfo.results.every(res => res.status === t('signature-valid-basic'));
+        setVerificationResult(allValid ? t('all-signatures-verified-convincing') : t('some-signatures-invalid-basic'));
+      } else {
+        setVerificationResult(t('no-signatures-processed')); // Should be caught by no-signature-found earlier
+      }
+    } catch (e) {
+      console.error('Error during PDF processing or signature verification:', e);
+      setVerificationResult(`${t('error-verifying-pdf')}: ${e.message}`);
+      setDetailedResults([]);
+    }
+  };
+
+  return (
+    <div className="container mx-auto p-6 bg-base-100 shadow-xl rounded-lg mt-10">
+      <style>{`
+        .checkmark__circle {
+          stroke-dasharray: 166;
+          stroke-dashoffset: 166;
+          stroke-width: 2;
+          stroke-miterlimit: 10;
+          stroke: #7ac142; /* Green color */
+          fill: none;
+          animation: stroke 0.6s cubic-bezier(0.65, 0, 0.45, 1) forwards;
+        }
+
+        .checkmark {
+          width: 56px;
+          height: 56px;
+          border-radius: 50%;
+          display: block;
+          stroke-width: 2;
+          stroke: #fff; /* White check path */
+          stroke-miterlimit: 10;
+          margin: 10px auto; /* Example margin */
+          box-shadow: inset 0px 0px 0px #7ac142;
+          animation: fill .4s ease-in-out .4s forwards, scale .3s ease-in-out .9s both;
+        }
+
+        .checkmark__check {
+          transform-origin: 50% 50%;
+          stroke-dasharray: 48;
+          stroke-dashoffset: 48;
+          animation: stroke 0.3s cubic-bezier(0.65, 0, 0.45, 1) 0.8s forwards;
+        }
+
+        @keyframes stroke {
+          100% {
+            stroke-dashoffset: 0;
+          }
+        }
+
+        @keyframes scale {
+          0%, 100% {
+            transform: none;
+          }
+          50% {
+            transform: scale3d(1.1, 1.1, 1);
+          }
+        }
+
+        @keyframes fill {
+          100% {
+            box-shadow: inset 0px 0px 0px 30px #7ac142;
+          }
+        }
+      `}</style>
+      <h1 className="text-3xl font-bold mb-6 text-center text-base-content">
+        {t('verify-document-signature')}
+      </h1>
+
+      <div className="mb-6 p-6 border border-base-300 rounded-lg bg-base-200/30 shadow-sm">
+        <label
+          htmlFor="document-upload"
+          className="block text-lg font-medium text-base-content mb-2"
+        >
+          {t('select-pdf-document')}
+        </label>
+        <input
+          type="file"
+          id="document-upload"
+          accept=".pdf"
+          onChange={handleFileChange}
+          className="file-input file-input-bordered file-input-primary w-full max-w-xs"
+        />
+        {selectedFile && (
+          <p className="mt-2 text-sm text-base-content w-full truncate">
+            {t('selected-file')}: {selectedFile.name}
+          </p>
+        )}
+      </div>
+
+      <div className="text-center mb-6">
+        <button
+          onClick={handleVerifyDocument}
+          className="op-btn op-btn-primary op-btn-md"
+          disabled={!selectedFile || verificationResult === t('verification-in-progress')}
+        >
+          {/* Removed jsrsasignStatus === 'loading' condition for spinner */}
+          {verificationResult === t('verification-in-progress') ? (
+            <span className="loading loading-spinner"></span>
+          ) : (
+            t('verify-signature')
+          )}
+        </button>
+      </div>
+
+      {verificationResult && verificationResult !== t('verification-in-progress') && (
+        <div className="mt-8 p-6 border border-base-300 rounded-lg bg-base-200 shadow-md min-h-[120px] flex flex-col items-center justify-center">
+          <h2 className="text-2xl font-bold mb-4 text-base-content text-center">
+            {t('verification-status')}
+          </h2>
+          {verificationResult === "Document Verified: All signatures have been successfully validated." && (
+            <div className="flex flex-col items-center my-4">
+              <svg className="checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52">
+                <circle className="checkmark__circle" cx="26" cy="26" r="25" fill="none"/>
+                <path className="checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/>
+              </svg>
+            </div>
+          )}
+          <p className="text-lg text-base-content mb-4 text-center">{verificationResult}</p>
+          {detailedResults.length > 0 && (
+            <div className="w-full space-y-6"> 
+              {detailedResults.map((res, index) => {
+                const signerInfo = parseCertificateInfo(res.certificateSubject);
+                const issuerInfo = parseCertificateInfo(res.certificateIssuer);
+                
+                return (
+                  <div key={index} className="bg-white border border-gray-200 rounded-xl shadow-lg overflow-hidden">
+                    {/* Header Section */}
+                    <div className="bg-gradient-to-r from-blue-600 to-indigo-600 text-white p-6">
+                      <div className="flex items-center space-x-3">
+                        <span className="text-2xl">🔏</span>
+                        <div>
+                          <h4 className="text-xl font-bold">Signature Details</h4>
+                          <p className="text-blue-100 text-sm">Digital Certificate Information</p>
+                        </div>
+                      </div>
+                    </div>
+
+                    {/* Basic Info Section */}
+                    <div className="p-6 border-b border-gray-100">
+                      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                        <div>
+                          <span className="text-sm font-medium text-gray-500 uppercase tracking-wide">Field Name</span>
+                          <p className="mt-1 text-lg font-semibold text-gray-900 font-mono">{res.name}</p>
+                        </div>
+                        <div>
+                          <span className="text-sm font-medium text-gray-500 uppercase tracking-wide">Overall Status</span>
+                          <div className="mt-1 flex items-center space-x-2">
+                            <span className={`text-lg ${isSuccessStatus(res.status) ? 'text-green-600' : 'text-red-600'}`}>
+                              {isSuccessStatus(res.status) ? '✅' : '❌'}
+                            </span>
+                            <span className="text-lg font-semibold text-gray-900">{res.status}</span>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
+                    {/* Signer Information Section */}
+                    {Object.keys(signerInfo).length > 0 && (
+                      <div className="border-b border-gray-100">
+                        <button
+                          onClick={() => toggleSection(index, 'signer')}
+                          className="w-full px-6 py-4 text-left hover:bg-gray-50 transition-colors duration-200 focus:outline-none focus:bg-gray-50"
+                        >
+                          <div className="flex items-center justify-between">
+                            <div className="flex items-center space-x-3">
+                              <span className="text-xl">📇</span>
+                              <h5 className="text-lg font-semibold text-gray-900">Signer Information</h5>
+                            </div>
+                            <svg
+                              className={`w-5 h-5 text-gray-400 transition-transform duration-200 ${
+                                collapsedSections[`${index}-signer`] ? 'transform rotate-180' : ''
+                              }`}
+                              fill="none"
+                              stroke="currentColor"
+                              viewBox="0 0 24 24"
+                            >
+                              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+                            </svg>
+                          </div>
+                        </button>
+                        {!collapsedSections[`${index}-signer`] && (
+                          <div className="px-6 pb-6">
+                            <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                              {Object.entries(signerInfo).map(([label, value]) => (
+                                <div key={label} className="bg-gray-50 rounded-lg p-4">
+                                  <span className="text-xs font-medium text-gray-500 uppercase tracking-wide">{label}</span>
+                                  <p className="mt-1 text-sm font-mono text-gray-900 break-all">{value}</p>
+                                </div>
+                              ))}
+                            </div>
+                          </div>
+                        )}
+                      </div>
+                    )}
+
+                    {/* Issuer Information Section */}
+                    {Object.keys(issuerInfo).length > 0 && (
+                      <div className="border-b border-gray-100">
+                        <button
+                          onClick={() => toggleSection(index, 'issuer')}
+                          className="w-full px-6 py-4 text-left hover:bg-gray-50 transition-colors duration-200 focus:outline-none focus:bg-gray-50"
+                        >
+                          <div className="flex items-center justify-between">
+                            <div className="flex items-center space-x-3">
+                              <span className="text-xl">🏢</span>
+                              <h5 className="text-lg font-semibold text-gray-900">Issuer Details</h5>
+                            </div>
+                            <svg
+                              className={`w-5 h-5 text-gray-400 transition-transform duration-200 ${
+                                collapsedSections[`${index}-issuer`] ? 'transform rotate-180' : ''
+                              }`}
+                              fill="none"
+                              stroke="currentColor"
+                              viewBox="0 0 24 24"
+                            >
+                              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+                            </svg>
+                          </div>
+                        </button>
+                        {!collapsedSections[`${index}-issuer`] && (
+                          <div className="px-6 pb-6">
+                            <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                              {Object.entries(issuerInfo).map(([label, value]) => (
+                                <div key={label} className="bg-gray-50 rounded-lg p-4">
+                                  <span className="text-xs font-medium text-gray-500 uppercase tracking-wide">{label}</span>
+                                  <p className="mt-1 text-sm font-mono text-gray-900 break-all">{value}</p>
+                                </div>
+                              ))}
+                            </div>
+                          </div>
+                        )}
+                      </div>
+                    )}
+
+                    {/* Certificate Validity Section */}
+                    {res.certificateValidity && (
+                      <div className="p-6 bg-gray-50">
+                        <div className="flex items-center space-x-3 mb-4">
+                          <span className="text-xl">🕒</span>
+                          <h5 className="text-lg font-semibold text-gray-900">Certificate Validity</h5>
+                        </div>
+                        <div className="bg-white rounded-lg p-4 border">
+                          <div className="flex items-center space-x-2">
+                            <span className={`text-lg ${isCertificateValid(res.certificateValidity) ? 'text-green-600' : 'text-red-600'}`}>
+                              {isCertificateValid(res.certificateValidity) ? '✅' : '❌'}
+                            </span>
+                            <span className="text-sm font-mono text-gray-900">{res.certificateValidity}</span>
+                          </div>
+                        </div>
+                      </div>
+                    )}
+
+                    {/* Technical Details Section (if any) */}
+                    {(res.calculatedDocumentHash || res.messageDigestInSignature || res.hashComparisonResult || res.authenticatedAttributesSignatureResult || res.errorDetails || res.certificateSubject || res.certificateIssuer) && (
+                      <div className="p-6 bg-gray-50 border-t">
+                        <details className="group">
+                          <summary className="flex items-center justify-between cursor-pointer text-sm font-medium text-gray-700 hover:text-gray-900">
+                            <span>🔧 Technical Details</span>
+                            <svg className="w-4 h-4 transition-transform group-open:rotate-180" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+                            </svg>
+                          </summary>
+                          <div className="mt-4 space-y-3">
+                            {/* Raw Certificate Data */}
+                            {res.certificateSubject && (
+                              <div className="bg-white rounded p-3 border">
+                                <span className="text-xs font-medium text-gray-500 uppercase tracking-wide block mb-1">Raw Certificate Subject</span>
+                                <code className="text-xs text-gray-800 break-all bg-gray-100 p-2 rounded block">{res.certificateSubject}</code>
+                              </div>
+                            )}
+                            {res.certificateIssuer && (
+                              <div className="bg-white rounded p-3 border">
+                                <span className="text-xs font-medium text-gray-500 uppercase tracking-wide block mb-1">Raw Certificate Issuer</span>
+                                <code className="text-xs text-gray-800 break-all bg-gray-100 p-2 rounded block">{res.certificateIssuer}</code>
+                              </div>
+                            )}
+                            {res.calculatedDocumentHash && res.calculatedDocumentHash !== t('not-available') && res.calculatedDocumentHash !== t('not-calculated') && (
+                              <div className="bg-white rounded p-3 border">
+                                <span className="text-xs font-medium text-gray-500 uppercase tracking-wide block mb-1">Calculated Document Hash</span>
+                                <code className="text-xs text-gray-800 break-all bg-gray-100 p-2 rounded block">{res.calculatedDocumentHash}</code>
+                              </div>
+                            )}
+                            {res.messageDigestInSignature && res.messageDigestInSignature !== t('not-available') && res.messageDigestInSignature !== t('not-found-in-signature') && (
+                              <div className="bg-white rounded p-3 border">
+                                <span className="text-xs font-medium text-gray-500 uppercase tracking-wide block mb-1">Message Digest in Signature</span>
+                                <code className="text-xs text-gray-800 break-all bg-gray-100 p-2 rounded block">{res.messageDigestInSignature}</code>
+                              </div>
+                            )}
+                            {res.hashComparisonResult && res.hashComparisonResult !== t('not-performed') && (
+                              <div className="bg-white rounded p-3 border">
+                                <span className="text-xs font-medium text-gray-500 uppercase tracking-wide block mb-1">Hash Comparison</span>
+                                <span className="text-sm text-gray-800">{res.hashComparisonResult}</span>
+                              </div>
+                            )}
+                            {res.authenticatedAttributesSignatureResult && res.authenticatedAttributesSignatureResult !== t('not-performed') && (
+                              <div className="bg-white rounded p-3 border">
+                                <span className="text-xs font-medium text-gray-500 uppercase tracking-wide block mb-1">Attributes Signature Verification</span>
+                                <span className="text-sm text-gray-800">{res.authenticatedAttributesSignatureResult}</span>
+                              </div>
+                            )}
+                            {res.errorDetails && (
+                              <div className="bg-red-50 border border-red-200 rounded p-3">
+                                <span className="text-xs font-medium text-red-600 uppercase tracking-wide block mb-1">Error Details</span>
+                                <span className="text-sm text-red-800">{res.errorDetails}</span>
+                              </div>
+                            )}
+                          </div>
+                        </details>
+                      </div>
+                    )}
+                  </div>
+                );
+              })}
+            </div>
+          )}
+        </div>
+      )}
+       {verificationResult === t('verification-in-progress') && (
+         <div className="mt-8 p-4 border border-base-300 rounded-lg bg-base-200 min-h-[100px] flex justify-center items-center">
+            <span className="loading loading-lg loading-dots"></span>
+         </div>
+        )}
+
+      {!verificationResult && !selectedFile && (
+         <div className="mt-8 p-4 border border-base-300 rounded-lg bg-base-200 min-h-[100px] flex justify-center items-center"> {/* Added flex for centering */}
+           <p className="text-base-content/60 italic text-center">{t('verification-results-will-appear-here')}</p>
+         </div>
+      )}
+    </div>
+  );
+};
+
+export default VerifyDocument;
@@ -7,6 +7,7 @@ import ModalUi from "./ModalUi";
 import AddSigner from "../components/AddSigner";
 import {
  emailRegex,
+  iconColor,
 } from "../constant/const";
 import Alert from "./Alert";
 import Tooltip from "./Tooltip";
@@ -679,7 +680,7 @@ const ReportTable = (props) => {
      receiver_phone: userDetails?.Phone || "",
      expiry_date: localExpireDate,
      company_name: doc.ExtUserPtr.Company,
-      signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+      signing_url: signPdf
    };
    const res = replaceMailVaribles(subject, "", variables);
    setMail((prev) => ({ ...prev, subject: res.subject }));
@@ -710,7 +711,7 @@ const ReportTable = (props) => {
      receiver_phone: userDetails?.Phone || "",
      expiry_date: localExpireDate,
      company_name: doc.ExtUserPtr.Company,
-      signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+      signing_url: signPdf
    };
    const res = replaceMailVaribles("", body, variables);

@@ -754,7 +755,7 @@ const ReportTable = (props) => {
      receiver_phone: user?.signerPtr?.Phone || "",
      expiry_date: localExpireDate,
      company_name: doc?.ExtUserPtr?.Company || "",
-      signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+      signing_url: signPdf
    };
    const subject =
      doc?.RequestSubject ||
@@ -763,7 +764,7 @@ const ReportTable = (props) => {
    const body =
      doc?.RequestBody ||
      doc?.ExtUserPtr?.TenantId?.RequestBody ||
-      `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body><p>Hi {{receiver_name}},</p><br><p>We hope this email finds you well. {{sender_name}} has requested you to review and sign <b>"{{document_title}}"</b>.</p><p>Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.</p><br><p>{{signing_url}}</p><br><p>If you have any questions or need further clarification regarding the document or the signing process,  please contact the sender.</p><br><p>Thanks</p><p> Team ${appName}</p><br></body> </html>`;
+      `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body><p>Hi {{receiver_name}},</p><br><p>We hope this email finds you well. {{sender_name}} has requested you to review and sign <b>"{{document_title}}"</b>.</p><p>Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.</p><br><p><a href='{{signing_url}}' rel='noopener noreferrer' target='_blank'>Sign here</a></p><br><br><p>If you have any questions or need further clarification regarding the document or the signing process,  please contact the sender.</p><br><p>Thanks</p><p> Team ${appName}</p><br></body> </html>`;
    const res = replaceMailVaribles(subject, body, variables);
    setMail((prev) => ({ ...prev, subject: res.subject, body: res.body }));
    setIsNextStep({ [user.Id]: true });
@@ -907,7 +908,6 @@ const ReportTable = (props) => {
      setActLoader({});
    }
  };
-
  const handleUpdateExpiry = async (e, item) => {
    e.preventDefault();
    e.stopPropagation();
@@ -1314,7 +1314,6 @@ const ReportTable = (props) => {
    try {
      const params = { docId: doc?.objectId };
      const templateRes = await Parse.Cloud.run("saveastemplate", params);
-      // console.log("templateRes ", templateRes);
      setTemplateId(templateRes?.id);
      setIsSuccess({ [doc.objectId]: true });
    } catch (err) {
@@ -1394,6 +1393,12 @@ const ReportTable = (props) => {
      setActLoader({});
    }
  };
+
+  const restrictBtn = (item, act) => {
+    return item.IsSignyourself && act.action === "recreatedocument"
+      ? true
+      : false;
+  };
  return (
    <div className="relative">
      {Object.keys(actLoader)?.length > 0 && (
@@ -1449,6 +1454,23 @@ const ReportTable = (props) => {
                className="cursor-pointer fa-light fa-square-plus text-accent text-[30px] md:text-[35px]"
              ></i>
            )}
+            {/* Search input */}
+            <div className="hidden md:block p-2">
+              <input
+                type="search"
+                value={props.searchTerm}
+                onChange={props.handleSearchChange}
+                placeholder={t('search.documents')}
+                className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-64 text-xs"
+              />
+            </div>
+            <button
+              className="md:hidden p-2 flex justify-center items-center focus:outline-none rounded-md hover:bg-gray-200 text-[18px]"
+              aria-label="Search"
+              onClick={() => props.setMobileSearchOpen(!props.mobileSearchOpen)}
+            >
+              <i style={{ color: `${iconColor}` }} className="fa-solid fa-magnifying-glass"></i>
+            </button>
            <ModalUi
              isOpen={isModal?.export}
              title={t("bulk-import")}
@@ -1536,6 +1558,17 @@ const ReportTable = (props) => {
            </ModalUi>
          </div>
        </div>
+        {props.mobileSearchOpen && (
+          <div className="top-full left-0 w-full bg-white px-4 py-2 shadow-md md:hidden">
+            <input
+              type="search"
+              value={props.searchTerm}
+              onChange={props.handleSearchChange}
+              placeholder="Search documents…"
+              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+            />
+          </div>
+        )}
        <div
          className={`overflow-auto w-full border-b ${
            props.List?.length > 0
@@ -1837,33 +1870,39 @@ const ReportTable = (props) => {
                                        {isOption[item.objectId] &&
                                          act.action === "option" && (
                                            <ul className="absolute -right-1 top-auto z-[70] w-max op-dropdown-content op-menu shadow-black/20 shadow bg-base-100 text-base-content rounded-box">
-                                              {act.subaction?.map((subact) => (
-                                                <li
-                                                  key={subact.btnId}
-                                                  onClick={() =>
-                                                    handleActionBtn(
-                                                      subact,
-                                                      item
-                                                    )
-                                                  }
-                                                  title={t(
-                                                    `btnLabel.${subact.hoverLabel}`
-                                                  )}
-                                                >
-                                                  <span>
-                                                    <i
-                                                      className={`${subact.btnIcon} mr-1.5`}
-                                                    ></i>
-                                                    {subact.btnLabel && (
-                                                      <span className="text-[13px] capitalize font-medium">
-                                                        {t(
-                                                          `btnLabel.${subact.btnLabel}`
+                                              {act.subaction?.map(
+                                                (subact) =>
+                                                  !restrictBtn(
+                                                    item,
+                                                    subact
+                                                  ) && (
+                                                    <li
+                                                      key={subact.btnId}
+                                                      onClick={() =>
+                                                        handleActionBtn(
+                                                          subact,
+                                                          item
+                                                        )
+                                                      }
+                                                      title={t(
+                                                        `btnLabel.${subact.hoverLabel}`
+                                                      )}
+                                                    >
+                                                      <span>
+                                                        <i
+                                                          className={`${subact.btnIcon} mr-1.5`}
+                                                        ></i>
+                                                        {subact.btnLabel && (
+                                                          <span className="text-[13px] capitalize font-medium">
+                                                            {t(
+                                                              `btnLabel.${subact.btnLabel}`
+                                                            )}
+                                                          </span>
                                                        )}
                                                      </span>
-                                                    )}
-                                                  </span>
-                                                </li>
-                                              ))}
+                                                    </li>
+                                                  )
+                                              )}
                                            </ul>
                                          )}
                                      </div>
@@ -25,12 +25,10 @@ const LinkUserModal = (props) => {
      handleClose={props.closePopup}
    >
      <SelectSigners
-        details={props.handleAddUser}
+        {...props}
        closePopup={props.closePopup}
-        signersData={props?.signersData}
        isContact={isContact}
        setIsContact={setIsContact}
-        handleUnlinkSigner={props.handleUnlinkSigner}
        isExistSigner={isExistSigner}
      />
      {isContact && (
@@ -8,13 +8,18 @@ const ModalUi = ({
  handleClose,
  showHeader = true,
  showClose = true,
-  reduceWidth
+  reduceWidth,
+  position
 }) => {
  const width = reduceWidth;
+  const isBottom = position === "bottom" ? "items-end pb-2" : "";
  return (
    <>
      {isOpen && (
-        <dialog id="selectSignerModal" className="op-modal op-modal-open">
+        <dialog
+          id="selectSignerModal"
+          className={`${isBottom} op-modal op-modal-open`}
+        >
          <div
            className={`${
              width || "md:min-w-[500px]"
@@ -1,27 +0,0 @@
-# Use an official Node runtime as the base image
-FROM node:20
-
-# Set the working directory inside the container
-WORKDIR /usr/src/app
-
-# Copy package.json and package-lock.json first to leverage Docker cache
-COPY ./package*.json ./
-
-# Install application dependencies
-RUN npm install
-
-# If you have native dependencies, you'll need extra tools. Uncomment the following line if needed.
-# RUN apk add --no-cache make gcc g++ python3
-
-# Copy the current directory contents into the container
-COPY ./ .
-
-# Make port 8080 available to the world outside this container
-EXPOSE 8080
-
-# Define environment variables if needed
-# ENV NODE_ENV production
-# ENV DATABASE_URL mongodb://db:27017
-
-# Run the application
-ENTRYPOINT npm start
@@ -252,7 +252,7 @@ export const mailTemplate = param => {
    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Note</td><td></td><td style='color:#626363;font-weight:bold'>" +
    param.note +
    "</td></tr><tr><td></td><td></td></tr></table></div> <div style='margin-left:70px'><a target=_blank href=" +
-    param.sigingUrl +
+    param.signingUrl +
    "><button style='padding:12px;background-color:#d46b0f;color:white;border:0px;font-weight:bold;margin-top:30px'>Sign here</button></a></div><div style='display:flex;justify-content:center;margin-top:10px'></div></div></div><div><p> This is an automated email from " +
    AppName +
    '. For any queries regarding this email, please contact the sender ' +
@@ -4,9 +4,9 @@ export default async function Newsletter(request) {
  const email = request.params?.email?.toLowerCase()?.replace(/\s/g, '');
  const domain = request.params.domain;
  try {
-    const envAppId = process.env.REACT_APP_APPID || 'opensign';
+    const envAppId = 'opensign';
    const headers = { 'Content-Type': 'application/json', 'X-Parse-Application-Id': envAppId };
-    const envProdServer = process.env.REACT_APP_SERVERURL || 'https://app.opensignlabs.com/api/app';
+    const envProdServer = 'https://app.opensignlabs.com/api/app';
    const newsletter = await axios.post(
      `${envProdServer}/classes/Newsletter`,
      { Name: name, Email: email, Domain: domain },
@@ -14,9 +14,7 @@ async function deductcount(docsCount, extUserId) {
 }
 async function sendMail(document, publicUrl) {
  //sessionToken
-  const baseUrl = new URL(publicUrl); //process.env.PUBLIC_URL
-
-  // console.log("pdfDetails", pdfDetails);
+  const baseUrl = new URL(publicUrl);
  const timeToCompleteDays = document?.TimeToCompleteDays || 15;
  const ExpireDate = new Date(document.createdAt);
  ExpireDate.setDate(ExpireDate.getDate() + timeToCompleteDays);
@@ -71,7 +69,7 @@ async function sendMail(document, publicUrl) {
          receiver_phone: existSigner?.Phone || '',
          expiry_date: localExpireDate,
          company_name: orgName,
-          signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`,
+          signing_url: signPdf,
        };
        replaceVar = replaceMailVaribles(mailSubject, htmlReqBody, variables);
      }
@@ -82,7 +80,7 @@ async function sendMail(document, publicUrl) {
        title: document.Name,
        organization: orgName,
        localExpireDate: localExpireDate,
-        sigingUrl: signPdf,
+        signingUrl: signPdf,
      };
      let params = {
        extUserId: document.ExtUserPtr.objectId,
@@ -168,9 +166,9 @@ async function batchQuery(userId, Documents, Ip, parseConfig, type, publicUrl) {
            })),
            ACL: Acl,
            SentToOthers: true,
-            RemindOnceInEvery: x.RemindOnceInEvery || 5,
+            RemindOnceInEvery: x.RemindOnceInEvery ? parseInt(x.RemindOnceInEvery) : 5,
            AutomaticReminders: x.AutomaticReminders || false,
-            TimeToCompleteDays: x.TimeToCompleteDays || 15,
+            TimeToCompleteDays: x.TimeToCompleteDays ? parseInt(x.TimeToCompleteDays) : 15,
            OriginIp: Ip,
            DocSentAt: { __type: 'Date', iso: isoDate },
            IsEnableOTP: x?.IsEnableOTP || false,
@@ -231,6 +229,7 @@ export default async function createBatchDocs(request) {
  const sessionToken = request.headers?.sessiontoken;
  const type = request.headers?.type || 'quicksend';
  const Documents = JSON.parse(strDocuments);
+
  const Ip = request?.headers?.['x-real-ip'] || '';
  // Access the host from the headers
  const publicUrl = request.headers.public_url;
@@ -2,19 +2,26 @@ import { cloudServerUrl } from '../../Utils.js';
 import reportJson from './reportsJson.js';
 import axios from 'axios';

+// Escape regex special characters. Copied from filterDocs.js
+function escapeRegExp(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
 export default async function getReport(request) {
  const reportId = request.params.reportId;
  const limit = request.params.limit;
  const skip = request.params.skip;
+  const searchTerm = request.params.searchTerm || '';

  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
  const appId = process.env.APP_ID;
  const masterKey = process.env.MASTER_KEY;
+  const sessionToken = request.headers['sessiontoken'] || request.headers['x-parse-session-token'];
  try {
    const userRes = await axios.get(serverUrl + '/users/me', {
      headers: {
        'X-Parse-Application-Id': appId,
-        'X-Parse-Session-Token': request.headers['sessiontoken'],
+        'X-Parse-Session-Token': sessionToken,
      },
    });
    const userId = userRes.data && userRes.data.objectId;
@@ -25,7 +32,7 @@ export default async function getReport(request) {
        const { params, keys } = json;
        const orderBy = '-updatedAt';
        const strKeys = keys.join();
-        let strParams = JSON.stringify(params);
+        let paramsObj = { ...params };
        if (reportId == '6TeaPr321t') {
          const extUserQuery = new Parse.Query('contracts_Users');
          extUserQuery.equalTo('Email', userRes.data.email);
@@ -36,8 +43,8 @@ export default async function getReport(request) {
            if (_extUser?.TeamIds && _extUser.TeamIds?.length > 0) {
              let teamArr = [];
              _extUser?.TeamIds?.forEach(x => (teamArr = [...teamArr, ...x.Ancestors]));
-              strParams = JSON.stringify({
-                ...params,
+              paramsObj = {
+                ...paramsObj,
                $or: [
                  { SharedWith: { $in: teamArr } },
                  {
@@ -55,15 +62,23 @@ export default async function getReport(request) {
                    },
                  },
                ],
-              });
+              };
            } else {
-              strParams = JSON.stringify({
-                ...params,
+              paramsObj = {
+                ...paramsObj,
                CreatedBy: { __type: 'Pointer', className: '_User', objectId: userId },
-              });
+              };
            }
          }
        }
+        if (searchTerm) {
+          const escaped = escapeRegExp(searchTerm);
+          paramsObj = {
+            ...paramsObj,
+            Name: { $regex: `.*${escaped}.*`, $options: 'i' },
+          };
+        }
+        const strParams = JSON.stringify(paramsObj);
        const headers = {
          'Content-Type': 'application/json',
          'X-Parse-Application-Id': appId,
@@ -116,7 +116,7 @@ async function sendNotifyMail(doc, signUser, mailProvider, publicUrl) {
      const creatorEmail = doc.ExtUserPtr.Email;
      const signerName = signUser.Name;
      const signerEmail = signUser.Email;
-      const viewDocUrl = `${publicUrl}/recipientSignPdf/${doc.objectId}`; // ` ${process.env.PUBLIC_URL}/recipientSignPdf/${doc.objectId}`;
+      const viewDocUrl = `${publicUrl}/recipientSignPdf/${doc.objectId}`;
      const subject = `Document "${pdfName}" has been signed by ${signerName}`;
      const body =
        "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/></head><body><div style='background-color:#f5f5f5;padding:20px'><div style='background-color:white'>" +
@@ -14,11 +14,14 @@ export default async function recreateDocument(request) {
    if (!doc) {
      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Document not found');
    }
+    if (doc?.get('IsSignyourself')) {
+      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'Signyourself Document not allowed');
+    }
    const _docRes = doc?.toJSON();
    const { objectId, SignedUrl, AuditTrail, ACL, DeclineBy, DeclineReason, ...docRes } = _docRes;
    const createDoc = new Parse.Object('contracts_Document');
    Object.entries(docRes).forEach(([key, value]) => {
-      if (key === 'IsDeclined') {
+      if (key === 'IsDeclined' || key === 'IsCompleted') {
        createDoc.set(key, false);
      } else {
        createDoc.set(key, value);
@@ -123,6 +123,8 @@ export default function reportJson(id, userId) {
          'TimeToCompleteDays',
          'IsSignyourself',
          'IsCompleted',
+          'ExpiryDate',
+          'IsSignyourself',
        ],
      };
    //  declined documents report
@@ -53,10 +53,16 @@ const makeEmail = async (
        const isSecure =
          new URL(url)?.protocol === 'https:' && new URL(url)?.hostname !== 'localhost';
        if (isSecure) {
-          https.get(url, async function (response) {
-            response.pipe(Pdf);
-            response.on('end', () => resolve('success'));
-          });
+          https
+            .get(url, async function (response) {
+              response.pipe(Pdf);
+              Pdf.on('finish', () => resolve('success'));
+              Pdf.on('error', () => resolve('error'));
+            })
+            .on('error', e => {
+              console.error(`error: ${e.message}`);
+              resolve('error');
+            });
        } else {
          const httpsAgent = new https.Agent({ rejectUnauthorized: false }); // Disable SSL validation
          axios
@@ -161,7 +161,7 @@ app.use(express.urlencoded({ limit: '50mb', extended: true }));
 app.use(function (req, res, next) {
  req.headers['x-real-ip'] = getUserIP(req);
  const publicUrl = 'https://' + req?.get('host');
-  req.headers['public_url'] = publicUrl; // process.env.PUBLIC_URL
+  req.headers['public_url'] = publicUrl;
  next();
 });
 function getUserIP(request) {
@@ -18,10 +18,10 @@
    "watch": "nodemon index.js"
  },
  "dependencies": {
-    "@aws-sdk/client-s3": "^3.812.0",
-    "@aws-sdk/s3-request-presigner": "^3.812.0",
+    "@aws-sdk/client-s3": "^3.824.0",
+    "@aws-sdk/s3-request-presigner": "^3.824.0",
    "@parse/fs-files-adapter": "^3.0.0",
-    "@parse/s3-files-adapter": "^4.1.0",
+    "@parse/s3-files-adapter": "^4.1.1",
    "@pdf-lib/fontkit": "^1.1.1",
    "@signpdf/placeholder-pdf-lib": "^3.2.6",
    "@signpdf/signer-p12": "^3.2.4",
@@ -34,19 +34,19 @@
    "express": "^5.1.0",
    "form-data": "^4.0.2",
    "generate-api-key": "^1.0.2",
-    "googleapis": "^148.0.0",
-    "mailgun.js": "^12.0.1",
-    "mongodb": "^6.16.0",
-    "multer": "^2.0.0",
+    "googleapis": "^149.0.0",
+    "mailgun.js": "^12.0.2",
+    "mongodb": "^6.17.0",
+    "multer": "^2.0.1",
    "multer-s3": "^3.0.1",
    "node-forge": "^1.3.1",
    "nodemailer": "^7.0.3",
    "parse": "^6.1.1",
    "parse-dbtool": "^1.2.0",
-    "parse-server": "^8.2.0",
+    "parse-server": "^8.2.1",
    "parse-server-api-mail-adapter": "^4.1.0",
    "pdf-lib": "^1.17.1",
-    "posthog-node": "^4.17.1",
+    "posthog-node": "^4.18.0",
    "qrcode": "^1.5.4",
    "rate-limiter-flexible": "^7.1.1",
    "speakeasy": "^2.0.0",
@@ -54,8 +54,8 @@
  },
  "type": "module",
  "devDependencies": {
-    "@babel/eslint-parser": "^7.27.1",
-    "eslint": "^9.27.0",
+    "@babel/eslint-parser": "^7.27.5",
+    "eslint": "^9.28.0",
    "jasmine": "^5.7.1",
    "mongodb-runner": "^5.8.3",
    "nodemon": "^3.1.10",
Author	SHA1	Message	Date
nxglabs	7e87aa4c38	Merge pull request #790 from nxglabs/fix_readonly fix: width should be 100% of text type widgets	2025-06-11 17:51:34 +00:00
prafull-opensignlabsandGitHub	b0e0b38e8f	Merge pull request #1789 from OpenSignLabs/updates-15483575034 v2.24.1	2025-06-06 11:17:12 +05:30
prafull-opensignlabs	49c23fb52b	Merge pull request #753 from OpenSignLabs/staging v2.24.1	2025-06-06 05:33:37 +00:00
prafull-opensignlabsandGitHub	da4b604710	Merge pull request #1785 from OpenSignLabs/updates-15425322075 handle crashing pattern for text input widgets	2025-06-04 00:17:30 +05:30
prafull-opensignlabs	82d518b3c9	Merge pull request #739 from OpenSignLabs/staging disable signing request email when send_email flag is false	2025-06-03 18:45:49 +00:00
prafull-opensignlabsandGitHub	dcbde2b661	Merge pull request #1784 from OpenSignLabs/updates-15419310132 v2.23.1	2025-06-03 19:28:35 +05:30
prafull-opensignlabs	27b0b426ad	v2.23.1 Enable widget placement on click in desktop view Disable signature types not working Change icon of agreement sign checkbox Update dependencies	2025-06-03 13:55:57 +00:00
prafull-opensignlabsandGitHub	8788afaa8e	Merge pull request #1766 from OpenSignLabs/updates-15350472621 fix: add verify-document route	2025-05-30 21:19:35 +05:30
prafull-opensignlabs	428aa65b38	Merge pull request #710 from OpenSignLabs/staging fix: add verify-document route	2025-05-30 15:45:27 +00:00
AmolandGitHub	295d942427	feat: add deploy to digitalocean button	2025-05-30 20:33:43 +05:30
prafull-opensignlabsandGitHub	c4e28e6e6e	Merge pull request #1764 from OpenSignLabs/updates-15349515719 v2.23.0	2025-05-30 20:26:41 +05:30
prafull-opensignlabs	b19fb29b82	Merge pull request #708 from OpenSignLabs/staging refactor: unnecessary code	2025-05-30 14:54:53 +00:00
prafull-opensignlabsandGitHub	3d223ba343	Merge pull request #1756 from OpenSignLabs/updates-15275255429 v2.22.0	2025-05-27 18:13:12 +05:30
prafull-opensignlabsandGitHub	d888897b62	Update README.md	2025-05-20 20:10:44 +05:30
prafull-opensignlabsandGitHub	c4779c14c1	feat: add all three docker command	2025-05-14 19:11:18 +05:30
prafull-opensignlabsandGitHub	e48869cb2f	feat: add deploy to digitalocean button	2025-05-14 18:36:47 +05:30