Merge pull request #1731 from OpenSignLabs/updates-15022725718

v2.21.0
2026-09-03 16:28:56 +02:00 · 2025-05-14 19:33:19 +05:30 · 2025-05-14 14:00:50 +00:00 · 2025-05-06 15:35:42 +05:30 · 2025-05-06 10:01:20 +00:00 · 2025-05-05 10:46:07 +05:30
152 changed files with 10841 additions and 6209 deletions
@@ -1,8 +1,15 @@
 name: ci
+
+# 👇 add this block
+permissions:
+  contents: read        # allow checkout & metadata-action to read repo
+  id-token: write       # needed by docker/metadata-action v4
+
 on:
  push:
    branches:
      - 'main'
+      - 'staging'

 jobs:
  docker:
@@ -3,11 +3,11 @@

 <head>
  <meta charset="utf-8" />
-  <link rel="icon" href="/favicon.ico" />
+  <link rel="icon"  type="image/x-icon" href="/favicon.ico" />
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
  <meta name="theme-color" content="#000000" />
  <meta name="description" content="The fastest way to sign PDFs & request signatures from others" />
-  <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
+  <!-- <link rel="apple-touch-icon" href="/logo192.png" /> -->

  <link rel="manifest" href="/manifest.json" />
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css"
@@ -17,5 +17,6 @@
 </head>
 <body>
  <div id="root" style="touch-action:pan-x pan-y;"></div>
+  <script type="module" src="/src/index.jsx"></script>
 </body>
-</html>
+</html>
@@ -4,22 +4,22 @@
  "private": true,
  "dependencies": {
    "@formkit/auto-animate": "^0.8.2",
-    "@lottiefiles/dotlottie-react": "^0.13.2",
+    "@lottiefiles/dotlottie-react": "^0.13.5",
    "@pdf-lib/fontkit": "^1.1.1",
    "@radix-ui/themes": "^3.1.6",
-    "@reduxjs/toolkit": "^2.5.1",
-    "axios": "^1.8.4",
+    "@reduxjs/toolkit": "^2.7.0",
+    "axios": "^1.9.0",
    "css-minimizer-webpack-plugin": "^7.0.2",
    "date-fns-tz": "^3.2.0",
    "file-saver": "^2.0.5",
    "i18next": "^23.16.8",
-    "i18next-browser-languagedetector": "^8.0.4",
+    "i18next-browser-languagedetector": "^8.1.0",
    "i18next-http-backend": "^3.0.2",
    "jszip": "^3.10.1",
    "jwt-decode": "^4.0.0",
    "moment": "^2.30.1",
    "nth-check": "^2.1.1",
-    "parse": "^5.3.0",
+    "parse": "^6.1.1",
    "pdf-lib": "^1.17.1",
    "print-js": "^1.6.0",
    "radix-ui": "^1.0.1",
@@ -35,20 +35,20 @@
    "react-dom": "^18.2.0",
    "react-gtm-module": "^2.0.11",
    "react-helmet": "^6.1.0",
-    "react-i18next": "^15.4.1",
+    "react-i18next": "^15.5.0",
    "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.1.5",
+    "react-router": "^7.5.3",
    "react-scripts": "^5.0.1",
    "react-scrollbars-custom": "^4.1.1",
    "react-select": "^5.10.1",
    "react-signature-canvas": "^1.0.7",
    "react-syntax-highlighter": "^15.6.1",
    "react-timezone-select": "^3.2.8",
-    "react-tooltip": "^5.28.0",
+    "react-tooltip": "^5.28.1",
    "react-web-share": "^2.0.2",
    "reactour": "^1.19.4",
    "redux": "^5.0.1",
@@ -57,18 +57,23 @@
    "serve": "^14.2.4",
    "styled-components": "^5.3.0",
    "web-vitals": "^4.2.4",
-    "ws": "^8.18.1",
+    "ws": "^8.18.2",
    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
  },
  "scripts": {
+    "build-template-win": "vite build --config vite.public-template.config.js",
+    "build-template": "NODE_OPTIONS=\"--max-old-space-size=8192\" vite build --config vite.public-template.config.js",
    "build": "npm run version && react-scripts build",
-    "start-dev": "react-scripts start",
+    "build-template-watch": "NODE_OPTIONS=\"--max-old-space-size=8192\" vite build --config vite.public-template.config.js --watch",
+    "start-dev": "vite",
+    "dev": "vite",
+    "preview": "vite preview",
    "start": "serve -s build",
    "version": "curl -s https://api.github.com/repos/opensignlabs/opensign/releases/latest | grep '\"tag_name\":' | awk -F '\"' '{print $4}' > ./public/version.txt",
    "version-win": "powershell -Command \"Invoke-RestMethod -Uri 'https://api.github.com/repos/opensignlabs/opensign/releases/latest' | Select-Object -ExpandProperty tag_name | Out-File -FilePath ./public/version.txt\"",
    "build-win": "npm run version-win && react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject",
+    "test": "vitest run",
+    "test:watch": "vitest",
    "release": "standard-version",
    "commit": "cz"
  },
@@ -96,28 +101,39 @@
    }
  },
  "devDependencies": {
-    "@babel/core": "^7.26.10",
-    "@babel/preset-env": "^7.26.9",
-    "@babel/preset-react": "^7.26.3",
-    "@babel/runtime-corejs2": "^7.27.0",
+    "@babel/core": "^7.27.1",
+    "@babel/preset-env": "^7.27.1",
+    "@babel/preset-react": "^7.27.1",
+    "@babel/runtime-corejs2": "^7.27.1",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.3.0",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/react": "^18.3.21",
+    "@vitejs/plugin-react": "^4.4.1",
+    "@vitejs/plugin-react-swc": "^3.9.0",
    "autoprefixer": "^10.4.21",
    "babel-loader": "^10.0.0",
    "commitizen": "^4.3.1",
    "concurrently": "^9.1.2",
    "css-loader": "^7.1.2",
-    "daisyui": "^4.12.23",
-    "dotenv": "^16.4.7",
+    "daisyui": "^4.12.24",
+    "dotenv": "^16.5.0",
    "dotenv-webpack": "^8.1.0",
-    "eslint": "^9.23.0",
-    "eslint-plugin-prettier": "^5.2.5",
-    "eslint-plugin-react": "^7.37.4",
-    "lint-staged": "^15.5.0",
+    "eslint": "^8.57.1",
+    "eslint-plugin-prettier": "^5.4.0",
+    "eslint-plugin-react": "^7.37.5",
+    "lint-staged": "^15.5.1",
    "mini-css-extract-plugin": "^2.9.2",
    "postcss": "^8.5.3",
    "prettier": "^3.5.3",
    "pretty-quick": "^4.1.1",
+    "rollup-plugin-node-polyfills": "^0.2.1",
    "tailwindcss": "^3.4.17",
-    "terser-webpack-plugin": "^5.3.11",
+    "terser-webpack-plugin": "^5.3.14",
+    "vite": "^6.3.5",
+    "vite-plugin-svgr": "^4.3.0",
+    "vite-tsconfig-paths": "^5.1.4",
+    "vitest": "^3.1.3",
    "webpack-cli": "^5.1.4"
  },
  "overrides": {
@@ -1,4 +1,4 @@
-{
+{ 
  "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",
  "create-account": "Konto erstellen",
@@ -152,7 +152,9 @@
    "Duplicate Template": "Vorlage duplizieren",
    "Duplicate": "Duplikat",
    "daily-mail-quota": "Tägliches E-Mail-Kontingent",
-    "Save as template": "Als Vorlage speichern"
+    "Save as template": "Als Vorlage speichern",
+    "Fix & resend": "Korrigieren und erneut senden",
+    "Kiosk Mode": "Kiosk Modus"
  },
  "report-heading": {
    "Sr.No": "Nr.",
@@ -303,7 +305,7 @@
  "send": "Senden",
  "quick-send-alert-1": "Alle Rollen in diesem Dokument sind derzeit mit Kontakten verknüpft. Um Kopien dieser Vorlage schnell an mehrere Unterzeichner zu senden, stellen Sie sicher, dass mindestens eine Rolle keinem Kontakt zugeordnet ist.",
  "quick-send-alert-2": "Bitte stellen Sie sicher, dass für alle Empfänger mindestens ein Signatur-Widget hinzugefügt wurde.",
-  "quick-send-alert-3": "Bitte fügen Sie mindestens eine Rolle zu dieser Vorlage hinzu, um Kopien davon schnell an mehrere Unterzeichner zu senden.",
+  "quick-send-alert-3": "Bitte fügen Sie diesem template mindestens eine Rolle hinzu.",
  "quick-send-alert-4": "Das Limit für Schnellsendungen wurde erreicht.",
  "copy-link": "Link kopieren",
  "copy": "Kopieren",
@@ -340,7 +342,7 @@
  "verify-email-1": "E-Mail verifizieren",
  "resend": "Erneut senden",
  "contact-details": "Kontaktdetails",
-  "verify-email": "Bitte verifizieren Sie Ihre E-Mail!",
+  "verify-email": "Bitte bestätigen Sie Ihre E-Mail, um fortzufahren. Dies ist ein einmaliger Schritt, um die mit Ihrem OpenSign-Konto verknüpfte E-Mail zu bestätigen.",
  "send-otp": "OTP senden",
  "otp-placeholder": "Verifizierungscode aus der E-Mail eingeben",
  "loading-doc": "Dokument wird geladen...",
@@ -881,5 +883,93 @@
  "contact-billing-at-opensign": "Um weitere Plätze hinzuzufügen, kontaktieren Sie bitte OpenSign™ unter <1>billing@opensignlabs.com</1> für Unterstützung.",
  "title-length-alert": "Der Titel darf höchstens 250 Zeichen lang sein.",
  "note-length-alert": "Die Notiz darf höchstens 200 Zeichen lang sein.",
-  "description-length-alert": "Die Beschreibung darf höchstens 500 Zeichen lang sein."
+  "description-length-alert": "Die Beschreibung darf höchstens 500 Zeichen lang sein.",
+  "fix-&-resend-document": "Dokument korrigieren und erneut senden",
+  "do-you-want-recreate-document?": "Dadurch wird ein Entwurf aus diesem Dokument mit allen vorhandenen Feldern erstellt. Sind Sie sicher, dass Sie dieses Dokument neu erstellen möchten?",
+  "start-editing": "Bearbeitung starten",
+  "unsaved-changes-discard-them?": "Sie haben ungespeicherte Änderungen. Verwerfen?",
+  "yes-discard": "Ja, verwerfen",
+  "LTV-enabled-signatures": "LTV-fähige Signaturen",
+  "BETA": "BETA",
+  "two-factor-authentication": "Zwei-Faktor-Authentifizierung",
+  "2fa-help-text": "Die Zwei-Faktor-Authentifizierung fügt Ihrem Konto eine zusätzliche Sicherheitsebene hinzu, indem sie mehr als nur ein Passwort zum Anmelden erfordert.",
+  "2fa-help-bullet1": "Erhöht die Sicherheit, indem sowohl Ihr Passwort als auch ein Bestätigungscode erforderlich sind.",
+  "2fa-help-bullet2": "Der Bestätigungscode wird von einer Authentifizierungs-App auf Ihrem Gerät generiert.",
+  "2fa-help-bullet3": "Schützt Ihr Konto, selbst wenn Ihr Passwort kompromittiert wurde.",
+  "setup-2fa": "2FA einrichten",
+  "setup-2fa-again": "2FA erneut einrichten",
+  "2fa-setup-intro": "Schützen Sie Ihr Konto mit der Zwei-Faktor-Authentifizierung. Wenn aktiviert, müssen Sie bei jeder Anmeldung einen Code aus Ihrer Authentifizierungs-App eingeben.",
+  "scan-qr-code": "QR-Code scannen",
+  "scan-qr-instructions": "Verwenden Sie eine Authentifizierungs-App wie Google Authenticator, Microsoft Authenticator oder Authy, um diesen QR-Code zu scannen.",
+  "manual-setup-instructions": "Können Sie den Code nicht scannen? Sie können Ihre Authentifizierungs-App manuell mit diesem geheimen Schlüssel einrichten:",
+  "secret-key": "Geheimer Schlüssel",
+  "copied-to-clipboard": "In die Zwischenablage kopiert",
+  "copy-to-clipboard": "In die Zwischenablage kopieren",
+  "recovery-codes": "Wiederherstellungscodes",
+  "recovery-codes-instructions": "Speichern Sie diese Wiederherstellungscodes an einem sicheren Ort. Wenn Sie den Zugriff auf Ihre Authentifizierungs-App verlieren, können Sie einen dieser Einmal-Codes verwenden, um sich anzumelden.",
+  "download-recovery-codes": "Wiederherstellungscodes herunterladen",
+  "verification-code": "Bestätigungscode",
+  "enter-code-from-authenticator-app": "Geben Sie den 6-stelligen Code aus Ihrer Authentifizierungs-App ein",
+  "verification-code-required": "Bestätigungscode ist erforderlich",
+  "verification-code-invalid": "Ungültiger Bestätigungscode. Bitte versuchen Sie es erneut.",
+  "2fa-enabled": "2FA aktiviert",
+  "2fa-enabled-successfully": "Zwei-Faktor-Authentifizierung erfolgreich aktiviert",
+  "2fa-setup-complete": "Einrichtung abgeschlossen!",
+  "2fa-setup-complete-instructions": "Ihr Konto ist jetzt mit der Zwei-Faktor-Authentifizierung geschützt. Sie müssen bei jeder Anmeldung einen Bestätigungscode eingeben.",
+  "two-factor-verification": "Zwei-Faktor-Verifizierung",
+  "enter-verification-code-instructions": "Geben Sie den 6-stelligen Bestätigungscode aus Ihrer Authentifizierungs-App ein, um fortzufahren.",
+  "recovery-code": "Wiederherstellungscode",
+  "enter-recovery-code-help": "Geben Sie einen Ihrer Wiederherstellungscodes ein",
+  "recovery-code-required": "Wiederherstellungscode ist erforderlich",
+  "use-verification-code-instead": "Stattdessen Bestätigungscode verwenden",
+  "use-recovery-code-instead": "Stattdessen Wiederherstellungscode verwenden",
+  "regenerate-2fa-remove-existing": "Sind Sie sicher, dass Sie die Zwei-Faktor-Authentifizierung neu generieren möchten? Diese Aktion entfernt Ihre bestehenden Authentifizierungseinstellungen.",
+  "use-passkey": "Mit Passkey anmelden",
+  "security-section": "Sicherheit",
+  "passkey-authentication": "Passkey-Authentifizierung",
+  "passkey-not-supported": "Ihr Browser oder Gerät unterstützt keine Passkey-Authentifizierung",
+  "passkey-description": "Passkeys bieten eine stärkere, phishing-resistente Alternative zu Passwörtern. Sie können Ihren Fingerabdruck, Ihre Gesichtserkennung oder Ihre Geräte-PIN verwenden, um sich sicher anzumelden.",
+  "passkey-tooltip": "Passkeys sind eine einfachere und sicherere Alternative zu Passwörtern. Sie verwenden biometrische Daten wie Fingerabdrücke oder Gesichtserkennung, die bereits auf Ihrem Gerät gespeichert sind.",
+  "security-section-help": "Verwalten Sie Sicherheitsoptionen, einschließlich Passkeys und Authentifizierungsmethoden, um Ihr Konto zu schützen.",
+  "passkey-register": "Passkey registrieren",
+  "passkey-register-another": "Weiteren Passkey registrieren",
+  "passkey-registered": "Passkey registriert",
+  "passkey-registering": "Passkey wird registriert...",
+  "passkey-registered-success": "Passkey erfolgreich registriert!",
+  "passkey-registration-failed": "Passkey-Registrierung fehlgeschlagen",
+  "passkey-auth-failed": "Passkey-Authentifizierung fehlgeschlagen",
+  "passkey-missing-user-info": "Benutzerinformationen erforderlich",
+  "passkeys-list": "Ihre Passkeys",
+  "default-passkey": "Ihr Passkey",
+  "passkey-rename": "Umbenennen",
+  "passkey-delete": "Löschen",
+  "passkey-rename-title": "Passkey umbenennen",
+  "passkey-delete-title": "Passkey löschen",
+  "passkey-delete-confirm": "Möchten Sie den Passkey \"{{name}}\" wirklich löschen?",
+  "passkey-name": "Passkey-Name",
+  "passkey-name-placeholder": "Geben Sie einen beschreibenden Namen für diesen Passkey ein",
+  "passkey-renamed-success": "Passkey erfolgreich umbenannt",
+  "passkey-deleted-success": "Passkey erfolgreich gelöscht",
+  "passkey-rename-failed": "Passkey konnte nicht umbenannt werden",
+  "passkey-delete-failed": "Passkey konnte nicht gelöscht werden",
+  "processing": "Wird verarbeitet...",
+  "today": "Heute",
+  "yesterday": "Gestern",
+  "days-ago": "Vor {{days}} Tagen",
+  "verify-with-passkey": "Mit Passkey verifizieren",
+  "verify-with-otp": "Mit OTP verifizieren",
+  "verify-identity": "Identität verifizieren",
+  "verify-account": "Verifizieren Sie Ihre Identität",
+  "verification": "Verifizierung",
+  "passkey-verification-failed": "Passkey-Verifizierung fehlgeschlagen",
+  "security-auth-help": {
+    "p1": "Administre la configuración de seguridad de su cuenta para mantener sus datos seguros. OpenSign admite métodos de autenticación avanzados para mejorar la protección de la cuenta.",
+    "2fa-auth-help": "Agregue una capa adicional de seguridad activando 2FA. Esto requiere ingresar un código de verificación desde una aplicación autenticadora después de su contraseña.",
+    "passkey-auth-help": "Use claves de acceso para iniciar sesión sin contraseña con verificación biométrica o basada en el dispositivo, proporcionando una seguridad sólida y comodidad."
+  },
+  "signer-already-present": "Unterzeichner bereits vorhanden",
+  "kiosk-sign": "Kiosk-Unterschrift",
+  "dont-have-access-to-template": "Das template wurde gelöscht oder Sie haben keinen Zugriff. Bitte kontaktieren Sie den Absender.",
+  "kiosk-info": "Kiosk Modus ermöglicht es Ihnen, persönliche Unterschriften schnell und effizient zu erfassen. Ideal für Messen, Veranstaltungen oder Laufkundschaft, bei denen alle Unterzeichner physisch anwesend sind. ",
+  "learn-more": "Mehr erfahren"
 }
@@ -1,5 +1,5 @@
 {
-  "header-news": "New feature: Teams plan users can now integrate their own AWS S3 buckets for file storage",
+  "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",
  "create-account": "Create account",
  "login": "Login",
@@ -152,7 +152,9 @@
    "Duplicate Template": "Duplicate template",
    "Duplicate": "Duplicate",
    "daily-mail-quota": "Daily Email Quota",
-    "Save as template": "Save as template"
+    "Save as template": "Save as template",
+    "Fix & resend": "Fix & Resend",
+    "Kiosk Mode": "Kiosk Mode"
  },
  "report-heading": {
    "Sr.No": "Sr.No",
@@ -303,7 +305,7 @@
  "send": "Send",
  "quick-send-alert-1": "All roles in this document are currently linked to contacts. To quick send copies of this template to multiple signers, please ensure that at least one role is not linked to any contact.",
  "quick-send-alert-2": "Please ensure there's at least one signature widget added for all recipients.",
-  "quick-send-alert-3": "Please add at least one role to this template in order to 'quick send' copies of it to multiple signers.",
+  "quick-send-alert-3": "Please add at least one role to this template.",
  "quick-send-alert-4": "Quick send reached limit.",
  "copy-link": "Copy link",
  "copy": "Copy",
@@ -340,7 +342,7 @@
  "verify-email-1": "Verify email",
  "resend": "Resend",
  "contact-details": "Contact details",
-  "verify-email": "Please verify your email !",
+  "verify-email": "Please verify your email to continue. This is a one-time step to confirm the email associated with your OpenSign account.",
  "send-otp": " Send OTP",
  "otp-placeholder": "Enter verification code received over email",
  "loading-doc": "Loading document..",
@@ -881,5 +883,93 @@
  "contact-billing-at-opensign": "To add more seats, please contact OpenSign™ at <1>billing@opensignlabs.com</1> for assistance",
  "title-length-alert": "Title must be at most 250 characters long.",
  "note-length-alert": "Note must be at most 200 characters long.",
-  "description-length-alert": "Description must be at most 500 characters long."
-}
+  "description-length-alert": "Description must be at most 500 characters long.",
+  "fix-&-resend-document": "Fix & Resend Document",
+  "do-you-want-recreate-document?": "This will create a draft from this document with all fields intact. Are you sure you want to recreate this document?",
+  "start-editing": "Start Editing",
+  "unsaved-changes-discard-them?": "You have unsaved changes. Discard them?",
+  "yes-discard": "Yes, Discard",
+  "LTV-enabled-signatures": "LTV enabled signatures",
+  "BETA": "BETA",
+  "two-factor-authentication": "Two-Factor Authentication",
+  "2fa-help-text": "Two-factor authentication adds an extra layer of security to your account by requiring more than just a password to sign in.",
+  "2fa-help-bullet1": "Enhances security by requiring both your password and a verification code.",
+  "2fa-help-bullet2": "The verification code is generated by an authenticator app on your device.",
+  "2fa-help-bullet3": "Protects your account even if your password is compromised.",
+  "setup-2fa": "Setup 2FA",
+  "setup-2fa-again": "Setup 2FA again",
+  "2fa-setup-intro": "Protect your account with two-factor authentication. When enabled, you'll need to enter a code from your authenticator app whenever you sign in.",
+  "scan-qr-code": "Scan QR Code",
+  "scan-qr-instructions": "Use an authenticator app like Google Authenticator, Microsoft Authenticator, or Authy to scan this QR code.",
+  "manual-setup-instructions": "Can't scan the code? You can manually set up your authenticator app using this secret key:",
+  "secret-key": "Secret Key",
+  "copied-to-clipboard": "Copied to clipboard",
+  "copy-to-clipboard": "Copy to clipboard",
+  "recovery-codes": "Recovery Codes",
+  "recovery-codes-instructions": "Save these recovery codes in a secure location. If you lose access to your authenticator app, you can use one of these one-time codes to sign in.",
+  "download-recovery-codes": "Download Recovery Codes",
+  "verification-code": "Verification Code",
+  "enter-code-from-authenticator-app": "Enter the 6-digit code from your authenticator app",
+  "verification-code-required": "Verification code is required",
+  "verification-code-invalid": "Invalid verification code. Please try again.",
+  "2fa-enabled": "2FA enabled",
+  "2fa-enabled-successfully": "Two-factor authentication enabled successfully",
+  "2fa-setup-complete": "Setup Complete!",
+  "2fa-setup-complete-instructions": "Your account is now protected with two-factor authentication. You'll need to enter a verification code each time you sign in.",
+  "two-factor-verification": "Two-Factor Verification",
+  "enter-verification-code-instructions": "Enter the 6-digit verification code from your authenticator app to continue.",
+  "recovery-code": "Recovery Code",
+  "enter-recovery-code-help": "Enter one of your recovery codes",
+  "recovery-code-required": "Recovery code is required",
+  "use-verification-code-instead": "Use verification code instead",
+  "use-recovery-code-instead": "Use recovery code instead",
+  "regenerate-2fa-remove-existing": "Are you sure you want to regenerate two-factor authentication? This action will remove your existing authentication settings.",
+  "use-passkey": "Sign in with passkey",
+  "security-section": "Security",
+  "passkey-authentication": "Passkey Authentication",
+  "passkey-not-supported": "Your browser or device doesn't support passkey authentication",
+  "passkey-description": "Passkeys provide a stronger, phishing-resistant alternative to passwords. You can use your fingerprint, face recognition, or device PIN to sign in securely.",
+  "passkey-tooltip": "Passkeys are a simpler and more secure alternative to passwords. They use biometric data like fingerprints or facial recognition that's already stored on your device.",
+  "security-section-help": "Manage security options including passkeys and authentication methods to protect your account.",
+  "passkey-register": "Register passkey",
+  "passkey-register-another": "Register another passkey",
+  "passkey-registered": "Passkey registered",
+  "passkey-registering": "Registering passkey...",
+  "passkey-registered-success": "Passkey successfully registered!",
+  "passkey-registration-failed": "Failed to register passkey",
+  "passkey-auth-failed": "Passkey authentication failed",
+  "passkey-missing-user-info": "User information is required",
+  "passkeys-list": "Your Passkeys",
+  "default-passkey": "Your Passkey",
+  "passkey-rename": "Rename",
+  "passkey-delete": "Delete",
+  "passkey-rename-title": "Rename Passkey",
+  "passkey-delete-title": "Delete Passkey",
+  "passkey-delete-confirm": "Are you sure you want to delete passkey \"{{name}}\"?",
+  "passkey-name": "Passkey Name",
+  "passkey-name-placeholder": "Enter a descriptive name for this passkey",
+  "passkey-renamed-success": "Passkey renamed successfully",
+  "passkey-deleted-success": "Passkey deleted successfully",
+  "passkey-rename-failed": "Failed to rename passkey",
+  "passkey-delete-failed": "Failed to delete passkey",
+  "processing": "Processing...",
+  "today": "Today",
+  "yesterday": "Yesterday",
+  "days-ago": "{{days}} days ago",
+  "verify-with-passkey": "Verify with passkey",
+  "verify-with-otp": "Verify with OTP",
+  "verification": "Verification",
+  "verify-account": "Verify your account",
+  "verify-identity": "Verify identity",
+  "passkey-verification-failed": "Passkey verification failed. Please try again or use OTP.",
+  "security-auth-help": {
+    "p1":"Manage your account's security settings to keep your data safe. OpenSign supports advanced authentication methods to enhance account protection.",
+    "2fa-auth-help":" Add an extra layer of security by enabling 2FA. This requires you to enter a verification code from an authenticator app after your password.",
+    "passkey-auth-help":"Use passkeys for passwordless sign-in with biometric or device-based verification, providing both strong security and convenience."
+  },
+  "signer-already-present": "Signer already present",
+  "kiosk-sign": "Kiosk Sign",
+  "dont-have-access-to-template": "The template has been deleted or you don't have access. Please contact the sender.",
+  "kiosk-info": "Kiosk Mode lets you collect in-person signatures quickly and efficiently. Ideal for trade shows, events, or walk-in scenarios where all signers are physically present. ",
+  "learn-more": "Learn more"
+}
@@ -152,7 +152,9 @@
    "Duplicate Template": "Plantilla duplicada",
    "Duplicate": "Duplicada",
    "daily-mail-quota": "Cuota diaria de correos electrónicos",
-    "Save as template": "Guardar como plantilla"
+    "Save as template": "Guardar como plantilla",
+    "Fix & resend": "Corregir y reenviar",
+    "Kiosk Mode": "Modo Kiosco"
  },
  "report-heading": {
    "Sr.No": "Nº",
@@ -304,7 +306,7 @@
  "send": "Enviar",
  "quick-send-alert-1": "Todos los roles de este documento están actualmente vinculados a contactos. Para enviar rápidamente copias de esta plantilla a varios firmantes, por favor, asegúrate de que al menos un rol no esté vinculado a ningún contacto.",
  "quick-send-alert-2": "Por favor, asegúrate de que hay al menos un widget de firma añadido para cada destinatario.",
-  "quick-send-alert-3": "Por favor, añade al menos un rol a esta plantilla para poder hacer un «envío rápido» de copias a varios firmantes.",
+  "quick-send-alert-3": "Veuillez ajouter au moins un rôle à ce template.",
  "quick-send-alert-4": "El envío rápido ha alcanzado el límite.",
  "copy-link": "Copiar enlace",
  "copy": "Copiar",
@@ -341,7 +343,7 @@
  "verify-email-1": "Verificar correo",
  "resend": "Reenviar",
  "contact-details": "Detalles del contacto",
-  "verify-email": "¡Por favor, verifica tu correo!",
+  "verify-email": "Por favor verifique su correo electrónico para continuar. Este es un paso único para confirmar el correo electrónico asociado a su cuenta de OpenSign.",
  "send-otp": " Enviar OTP",
  "otp-placeholder": "Ingresa el código de verificación enviado por correo",
  "loading-doc": "Cargando documento...",
@@ -881,5 +883,93 @@
  "contact-billing-at-opensign": "Para agregar más asientos, comuníquese con OpenSign™ a <1>billing@opensignlabs.com</1> para obtener ayuda.",
  "title-length-alert": "El título debe tener como máximo 250 caracteres.",
  "note-length-alert": "La nota debe tener como máximo 200 caracteres.",
-  "description-length-alert": "La descripción debe tener como máximo 500 caracteres."
+  "description-length-alert": "La descripción debe tener como máximo 500 caracteres.",
+  "fix-&-resend-document": "Corregir y reenviar el documento",
+  "do-you-want-recreate-document?": "Esto creará un borrador a partir de este documento con todos los campos intactos. ¿Está seguro de que desea recrear este documento?",
+  "start-editing": "Comenzar a editar",
+  "unsaved-changes-discard-them?": "Tienes cambios sin guardar. ¿Deseas descartarlos?",
+  "yes-discard": "Sí, descartar",
+  "LTV-enabled-signatures": "Firmas con LTV habilitado",
+  "BETA": "BETA",
+  "two-factor-authentication": "Autenticación de dos factores",
+  "2fa-help-text": "La autenticación de dos factores agrega una capa adicional de seguridad a su cuenta al requerir más que solo una contraseña para iniciar sesión.",
+  "2fa-help-bullet1": "Mejora la seguridad al requerir tanto su contraseña como un código de verificación.",
+  "2fa-help-bullet2": "El código de verificación es generado por una aplicación de autenticación en su dispositivo.",
+  "2fa-help-bullet3": "Protege su cuenta incluso si su contraseña se ve comprometida.",
+  "setup-2fa": "Configurar 2FA",
+  "setup-2fa-again": "Configurar 2FA nuevamente",
+  "2fa-setup-intro": "Proteja su cuenta con la autenticación de dos factores. Cuando esté habilitada, deberá ingresar un código de su aplicación de autenticación cada vez que inicie sesión.",
+  "scan-qr-code": "Escanear código QR",
+  "scan-qr-instructions": "Use una aplicación de autenticación como Google Authenticator, Microsoft Authenticator o Authy para escanear este código QR.",
+  "manual-setup-instructions": "¿No puede escanear el código? Puede configurar manualmente su aplicación de autenticación utilizando esta clave secreta:",
+  "secret-key": "Clave secreta",
+  "copied-to-clipboard": "Copiado al portapapeles",
+  "copy-to-clipboard": "Copiar al portapapeles",
+  "recovery-codes": "Códigos de recuperación",
+  "recovery-codes-instructions": "Guarde estos códigos de recuperación en un lugar seguro. Si pierde el acceso a su aplicación de autenticación, puede usar uno de estos códigos de un solo uso para iniciar sesión.",
+  "download-recovery-codes": "Descargar códigos de recuperación",
+  "verification-code": "Código de verificación",
+  "enter-code-from-authenticator-app": "Ingrese el código de 6 dígitos de su aplicación de autenticación",
+  "verification-code-required": "Se requiere el código de verificación",
+  "verification-code-invalid": "Código de verificación inválido. Por favor, inténtelo de nuevo.",
+  "2fa-enabled": "2FA activado",
+  "2fa-enabled-successfully": "Autenticación de dos factores habilitada con éxito",
+  "2fa-setup-complete": "¡Configuración completa!",
+  "2fa-setup-complete-instructions": "Su cuenta ahora está protegida con autenticación de dos factores. Deberá ingresar un código de verificación cada vez que inicie sesión.",
+  "two-factor-verification": "Verificación de dos factores",
+  "enter-verification-code-instructions": "Ingrese el código de verificación de 6 dígitos de su aplicación de autenticación para continuar.",
+  "recovery-code": "Código de recuperación",
+  "enter-recovery-code-help": "Ingrese uno de sus códigos de recuperación",
+  "recovery-code-required": "Se requiere el código de recuperación",
+  "use-verification-code-instead": "Usar código de verificación en su lugar",
+  "use-recovery-code-instead": "Usar código de recuperación en su lugar",
+  "regenerate-2fa-remove-existing": "¿Está seguro de que desea regenerar la autenticación de dos factores? Esta acción eliminará su configuración de autenticación actual.",
+  "use-passkey": "Iniciar sesión con passkey",
+  "security-section": "Seguridad",
+  "passkey-authentication": "Autenticación con passkey",
+  "passkey-not-supported": "Tu navegador o dispositivo no admite la autenticación con passkey",
+  "passkey-description": "Las passkeys proporcionan una alternativa más segura y resistente al phishing que las contraseñas. Puedes usar tu huella digital, reconocimiento facial o PIN del dispositivo para iniciar sesión de forma segura.",
+  "passkey-tooltip": "Las passkeys son una alternativa más simple y segura a las contraseñas. Usan datos biométricos como huellas digitales o reconocimiento facial ya almacenados en tu dispositivo.",
+  "security-section-help": "Administra las opciones de seguridad, incluidas las passkeys y métodos de autenticación para proteger tu cuenta.",
+  "passkey-register": "Registrar passkey",
+  "passkey-register-another": "Registrar otra passkey",
+  "passkey-registered": "Passkey registrada",
+  "passkey-registering": "Registrando passkey...",
+  "passkey-registered-success": "¡Passkey registrada con éxito!",
+  "passkey-registration-failed": "Fallo al registrar la passkey",
+  "passkey-auth-failed": "Falló la autenticación con passkey",
+  "passkey-missing-user-info": "Se requiere información del usuario",
+  "passkeys-list": "Tus passkeys",
+  "default-passkey": "Tu passkey",
+  "passkey-rename": "Renombrar",
+  "passkey-delete": "Eliminar",
+  "passkey-rename-title": "Renombrar passkey",
+  "passkey-delete-title": "Eliminar passkey",
+  "passkey-delete-confirm": "¿Estás seguro de que deseas eliminar la passkey \"{{name}}\"?",
+  "passkey-name": "Nombre de la passkey",
+  "passkey-name-placeholder": "Introduce un nombre descriptivo para esta passkey",
+  "passkey-renamed-success": "Passkey renombrada con éxito",
+  "passkey-deleted-success": "Passkey eliminada con éxito",
+  "passkey-rename-failed": "No se pudo renombrar la passkey",
+  "passkey-delete-failed": "No se pudo eliminar la passkey",
+  "processing": "Procesando...",
+  "today": "Hoy",
+  "yesterday": "Ayer",
+  "days-ago": "Hace {{days}} días",
+  "verify-with-passkey": "Verificar con passkey",
+  "verify-with-otp": "Verificar con OTP",
+  "verify-identity": "Verificar identidad",
+  "verify-account": "Verifique su identidad",
+  "verification": "Verificación",
+  "passkey-verification-failed": "La verificación con passkey ha fallado",
+  "security-auth-help": {
+    "p1": "Administre la configuración de seguridad de su cuenta para mantener sus datos seguros. OpenSign admite métodos de autenticación avanzados para mejorar la protección de la cuenta.",
+    "2fa-auth-help": "Agregue una capa adicional de seguridad activando 2FA. Esto requiere ingresar un código de verificación desde una aplicación autenticadora después de su contraseña.",
+    "passkey-auth-help": "Use claves de acceso para iniciar sesión sin contraseña con verificación biométrica o basada en el dispositivo, proporcionando una seguridad sólida y comodidad."
+  },
+  "signer-already-present": "Firmante ya presente",
+  "kiosk-sign": "Firma en quiosco",
+  "dont-have-access-to-template": "El template ha sido eliminado o no tiene acceso. Por favor, contacte al remitente.",
+  "kiosk-info": "El Modo Kiosco le permite recopilar firmas en persona de forma rápida y eficiente. Ideal para ferias, eventos o situaciones con personas que firman en el lugar. ",
+  "learn-more": "Más información"
 }
@@ -173,7 +173,9 @@
    "Duplicate Template": "dupliquer le modèle",
    "Duplicate": "Double",
    "daily-mail-quota": "Quota d'e-mails quotidien",
-    "Save as template": "Enregistrer comme modèle"
+    "Save as template": "Enregistrer comme modèle",
+    "Fix & resend": "Corriger et renvoyer",
+    "Kiosk Mode": "Mode Kiosque"
  },
  "report-help": {
    "Draft Documents": "Il s'agit de documents que vous avez commencés mais que vous n'avez pas finalisés pour envoi.",
@@ -303,7 +305,7 @@
  "send": "envoyer",
  "quick-send-alert-1": "Tous les rôles dans ce document sont actuellement liés à des contacts. Pour envoyer rapidement des copies de ce modèle à plusieurs signataires, veuillez vous assurer qu'au moins un rôle n'est lié à aucun contact.",
  "quick-send-alert-2": "Veuillez vous assurer qu'au moins un widget de signature est ajouté pour tous les destinataires.",
-  "quick-send-alert-3": "Veuillez ajouter au moins un rôle à ce modèle afin d'en « envoyer rapidement » des copies à plusieurs signataires.",
+  "quick-send-alert-3": "Veuillez ajouter au moins un rôle à ce template.",
  "quick-send-alert-4": "L'envoi rapide a atteint la limite.",
  "copy-link": "Copier le lien",
  "copy": "Copier",
@@ -340,7 +342,7 @@
  "verify-email-1": "Vérifier l'e-mail",
  "resend": "Renvoyer",
  "contact-details": "Coordonnées",
-  "verify-email": "Veuillez vérifier votre email!",
+  "verify-email": "Veuillez vérifier votre e-mail pour continuer. C'est une étape unique pour confirmer l'adresse e-mail associée à votre compte OpenSign.",
  "send-otp": "envoyer un code à usage unique",
  "otp-placeholder": "Entrez le code de vérification reçu par e-mail",
  "loading-doc": "Chargement du document..",
@@ -881,5 +883,93 @@
  "contact-billing-at-opensign": "Pour ajouter plus de places, veuillez contacter OpenSign™ à l'adresse <1>billing@opensignlabs.com</1> pour obtenir de l'aide.",
  "title-length-alert": "Le titre doit comporter au maximum 250 caractères.",
  "note-length-alert": "La note doit comporter au maximum 200 caractères.",
-  "description-length-alert": "La description doit comporter au maximum 500 caractères"
+  "description-length-alert": "La description doit comporter au maximum 500 caractères",
+  "fix-&-resend-document": "Corriger et renvoyer le document",
+  "do-you-want-recreate-document?": "Cela créera un brouillon à partir de ce document avec tous les champs intacts. Êtes-vous sûr de vouloir recréer ce document ?",
+  "start-editing": "Commencer l'édition",
+  "unsaved-changes-discard-them?": "Vous avez des modifications non enregistrées. Les supprimer ?",
+  "yes-discard": "Oui, supprimer",
+  "LTV-enabled-signatures": "Signatures avec LTV activée",
+  "BETA": "BETA",
+  "two-factor-authentication": "Authentification à deux facteurs",
+  "2fa-help-text": "L'authentification à deux facteurs ajoute une couche de sécurité supplémentaire à votre compte en exigeant plus qu'un simple mot de passe pour se connecter.",
+  "2fa-help-bullet1": "Renforce la sécurité en demandant à la fois votre mot de passe et un code de vérification.",
+  "2fa-help-bullet2": "Le code de vérification est généré par une application d'authentification sur votre appareil.",
+  "2fa-help-bullet3": "Protège votre compte même si votre mot de passe est compromis.",
+  "setup-2fa": "Configurer 2FA",
+  "setup-2fa-again": "Reconfigurer 2FA",
+  "2fa-setup-intro": "Protégez votre compte avec l'authentification à deux facteurs. Une fois activée, vous devrez saisir un code provenant de votre application d'authentification à chaque connexion.",
+  "scan-qr-code": "Scanner le code QR",
+  "scan-qr-instructions": "Utilisez une application d'authentification comme Google Authenticator, Microsoft Authenticator ou Authy pour scanner ce code QR.",
+  "manual-setup-instructions": "Vous ne pouvez pas scanner le code ? Configurez manuellement votre application d'authentification avec cette clé secrète :",
+  "secret-key": "Clé secrète",
+  "copied-to-clipboard": "Copié dans le presse-papiers",
+  "copy-to-clipboard": "Copier dans le presse-papiers",
+  "recovery-codes": "Codes de récupération",
+  "recovery-codes-instructions": "Enregistrez ces codes de récupération dans un endroit sûr. Si vous perdez l'accès à votre application d'authentification, vous pourrez utiliser l'un de ces codes à usage unique pour vous connecter.",
+  "download-recovery-codes": "Télécharger les codes de récupération",
+  "verification-code": "Code de vérification",
+  "enter-code-from-authenticator-app": "Saisissez le code à 6 chiffres de votre application d'authentification",
+  "verification-code-required": "Le code de vérification est requis",
+  "verification-code-invalid": "Code de vérification invalide. Veuillez réessayer.",
+  "2fa-enabled": "2FA activé",
+  "2fa-enabled-successfully": "Authentification à deux facteurs activée avec succès",
+  "2fa-setup-complete": "Configuration terminée !",
+  "2fa-setup-complete-instructions": "Votre compte est maintenant protégé par l'authentification à deux facteurs. Vous devrez entrer un code de vérification à chaque connexion.",
+  "two-factor-verification": "Vérification en deux étapes",
+  "enter-verification-code-instructions": "Saisissez le code de vérification à 6 chiffres de votre application d'authentification pour continuer.",
+  "recovery-code": "Code de récupération",
+  "enter-recovery-code-help": "Saisissez l'un de vos codes de récupération",
+  "recovery-code-required": "Le code de récupération est requis",
+  "use-verification-code-instead": "Utiliser le code de vérification à la place",
+  "use-recovery-code-instead": "Utiliser le code de récupération à la place",
+  "regenerate-2fa-remove-existing": "Êtes-vous sûr de vouloir régénérer l'authentification à deux facteurs ? Cette action supprimera vos paramètres d'authentification existants.",
+  "use-passkey": "Se connecter avec une clé d'accès",
+  "security-section": "Sécurité",
+  "passkey-authentication": "Authentification par clé d'accès",
+  "passkey-not-supported": "Votre navigateur ou appareil ne prend pas en charge l'authentification par clé d'accès",
+  "passkey-description": "Les clés d'accès offrent une alternative plus sécurisée et résistante au phishing que les mots de passe. Vous pouvez utiliser votre empreinte digitale, reconnaissance faciale ou code PIN de l'appareil pour vous connecter en toute sécurité.",
+  "passkey-tooltip": "Les clés d'accès sont une alternative plus simple et plus sécurisée aux mots de passe. Elles utilisent des données biométriques comme les empreintes digitales ou la reconnaissance faciale déjà stockées sur votre appareil.",
+  "security-section-help": "Gérez les options de sécurité, y compris les clés d'accès et les méthodes d'authentification pour protéger votre compte.",
+  "passkey-register": "Enregistrer une clé d'accès",
+  "passkey-register-another": "Enregistrer une autre clé d'accès",
+  "passkey-registered": "Clé d'accès enregistrée",
+  "passkey-registering": "Enregistrement de la clé d'accès...",
+  "passkey-registered-success": "Clé d'accès enregistrée avec succès !",
+  "passkey-registration-failed": "Échec de l'enregistrement de la clé d'accès",
+  "passkey-auth-failed": "Échec de l'authentification avec la clé d'accès",
+  "passkey-missing-user-info": "Informations utilisateur requises",
+  "passkeys-list": "Vos clés d'accès",
+  "default-passkey": "Votre clé d'accès",
+  "passkey-rename": "Renommer",
+  "passkey-delete": "Supprimer",
+  "passkey-rename-title": "Renommer la clé d'accès",
+  "passkey-delete-title": "Supprimer la clé d'accès",
+  "passkey-delete-confirm": "Êtes-vous sûr de vouloir supprimer la clé d'accès « {{name}} » ?",
+  "passkey-name": "Nom de la clé d'accès",
+  "passkey-name-placeholder": "Entrez un nom descriptif pour cette clé d'accès",
+  "passkey-renamed-success": "Clé d'accès renommée avec succès",
+  "passkey-deleted-success": "Clé d'accès supprimée avec succès",
+  "passkey-rename-failed": "Échec du renommage de la clé d'accès",
+  "passkey-delete-failed": "Échec de la suppression de la clé d'accès",
+  "processing": "Traitement en cours...",
+  "today": "Aujourd'hui",
+  "yesterday": "Hier",
+  "days-ago": "Il y a {{days}} jours",
+  "verify-with-passkey": "Vérifier avec une passkey",
+  "verify-with-otp": "Vérifier avec OTP",
+  "verify-identity": "Vérifier l'identité",
+  "verify-account": "Vérifiez votre identité",
+  "verification": "Vérification",
+  "passkey-verification-failed": "La vérification par passkey a échoué",
+  "security-auth-help": {
+    "p1": "Gérez les paramètres de sécurité de votre compte pour protéger vos données. OpenSign prend en charge des méthodes d'authentification avancées pour renforcer la protection de votre compte.",
+    "2fa-auth-help": "Ajoutez une couche de sécurité supplémentaire en activant 2FA. Cela vous demandera de saisir un code de vérification provenant d’une application d’authentification après votre mot de passe.",
+    "passkey-auth-help": "Utilisez des passkeys pour une connexion sans mot de passe grâce à une vérification biométrique ou basée sur l’appareil, offrant à la fois une sécurité renforcée et une grande commodité."
+  },
+  "signer-already-present": "Signataire déjà présent",
+  "kiosk-sign": "Signature sur kiosque",
+  "dont-have-access-to-template": "Le template a été supprimé ou vous n'y avez pas accès. Veuillez contacter l'expéditeur.",
+  "kiosk-info": "Le Mode Kiosque vous permet de recueillir des signatures en personne rapidement et efficacement. Idéal pour les salons, événements ou situations où tous les signataires sont physiquement présents. ",
+  "learn-more": "En savoir plus"
 }
@@ -152,7 +152,9 @@
    "Duplicate Template": "Duplica modello",
    "Duplicate": "Duplica",
    "daily-mail-quota": "Quota e-mail giornaliera",
-    "Save as template": "Salva come modello"
+    "Save as template": "Salva come modello",
+    "Fix & resend": "Correggi e reinvia",
+    "Kiosk Mode": "Modalità Kiosk"
  },
  "report-heading": {
    "Sr.No": "Nr.",
@@ -303,7 +305,7 @@
  "send": "Invia",
  "quick-send-alert-1": "Tutti i ruoli in questo documento sono attualmente collegati a contatti. Per inviare rapidamente copie di questo modello a più firmatari, assicurati che almeno un ruolo non sia collegato a nessun contatto.",
  "quick-send-alert-2": "Assicurati che ci sia almeno un widget firma aggiunto per tutti i destinatari.",
-  "quick-send-alert-3": "Aggiungi almeno un ruolo a questo modello per 'invio rapido' a più firmatari.",
+  "quick-send-alert-3": "Si prega di aggiungere almeno un ruolo a questo template.",
  "quick-send-alert-4": "Limite di invio rapido raggiunto.",
  "copy-link": "Copia link",
  "copy": "Copia",
@@ -340,7 +342,7 @@
  "verify-email-1": "Verifica email",
  "resend": "Reinvia",
  "contact-details": "Dettagli contatto",
-  "verify-email": "Verifica la tua email!",
+  "verify-email": "Si prega di verificare l'e-mail per continuare. Questo è un passaggio unico per confermare l'e-mail associata al tuo account OpenSign.",
  "send-otp": "Invia OTP",
  "otp-placeholder": "Inserisci il codice di verifica ricevuto via email",
  "loading-doc": "Caricamento del documento...",
@@ -881,5 +883,93 @@
  "contact-billing-at-opensign": " Per aggiungere altri posti, contattare OpenSign™ all'indirizzo <1>billing@opensignlabs.com</1> per assistenza.",
  "title-length-alert": "Il titolo può contenere al massimo 250 caratteri.",
  "note-length-alert": "La nota può contenere al massimo 200 caratteri.",
-  "description-length-alert": " La descrizione può contenere al massimo 500 caratteri."
+  "description-length-alert": " La descrizione può contenere al massimo 500 caratteri.",
+  "fix-&-resend-document": "Correggi e reinvia il documento",
+  "do-you-want-recreate-document?": "Questo creerà una bozza da questo documento con tutti i campi intatti. Sei sicuro di voler ricreare questo documento?",  
+  "start-editing": "Inizia a modificare",
+  "unsaved-changes-discard-them?": "Hai modifiche non salvate. Vuoi scartarle?",
+  "yes-discard": "Sì, scarta",
+  "LTV-enabled-signatures": "Firme con LTV abilitato",
+  "BETA": "BETA",
+  "two-factor-authentication": "Autenticazione a due fattori",
+  "2fa-help-text": "L'autenticazione a due fattori aggiunge un ulteriore livello di sicurezza al tuo account richiedendo più di una semplice password per accedere.",
+  "2fa-help-bullet1": "Aumenta la sicurezza richiedendo sia la password che un codice di verifica.",
+  "2fa-help-bullet2": "Il codice di verifica viene generato da un'app di autenticazione sul tuo dispositivo.",
+  "2fa-help-bullet3": "Protegge il tuo account anche se la password è stata compromessa.",
+  "setup-2fa": "Configura 2FA",
+  "setup-2fa-again": "Configura nuovamente 2FA",
+  "2fa-setup-intro": "Proteggi il tuo account con l'autenticazione a due fattori. Quando è attiva, dovrai inserire un codice dall'app di autenticazione ogni volta che accedi.",
+  "scan-qr-code": "Scansiona il codice QR",
+  "scan-qr-instructions": "Usa un'app di autenticazione come Google Authenticator, Microsoft Authenticator o Authy per scansionare questo codice QR.",
+  "manual-setup-instructions": "Non riesci a scansionare il codice? Puoi configurare manualmente l'app usando questa chiave segreta:",
+  "secret-key": "Chiave segreta",
+  "copied-to-clipboard": "Copiato negli appunti",
+  "copy-to-clipboard": "Copia negli appunti",
+  "recovery-codes": "Codici di recupero",
+  "recovery-codes-instructions": "Salva questi codici di recupero in un luogo sicuro. Se perdi l'accesso all'app di autenticazione, puoi usarne uno per accedere.",
+  "download-recovery-codes": "Scarica i codici di recupero",
+  "verification-code": "Codice di verifica",
+  "enter-code-from-authenticator-app": "Inserisci il codice a 6 cifre dalla tua app di autenticazione",
+  "verification-code-required": "È richiesto il codice di verifica",
+  "verification-code-invalid": "Codice di verifica non valido. Riprova.",
+  "2fa-enabled": "2FA abilitato",
+  "2fa-enabled-successfully": "Autenticazione a due fattori attivata con successo",
+  "2fa-setup-complete": "Configurazione completata!",
+  "2fa-setup-complete-instructions": "Il tuo account è ora protetto da autenticazione a due fattori. Dovrai inserire un codice ogni volta che accedi.",
+  "two-factor-verification": "Verifica a due fattori",
+  "enter-verification-code-instructions": "Inserisci il codice di verifica a 6 cifre dalla tua app di autenticazione per continuare.",
+  "recovery-code": "Codice di recupero",
+  "enter-recovery-code-help": "Inserisci uno dei tuoi codici di recupero",
+  "recovery-code-required": "È richiesto il codice di recupero",
+  "use-verification-code-instead": "Usa il codice di verifica invece",
+  "use-recovery-code-instead": "Usa il codice di recupero invece",
+  "regenerate-2fa-remove-existing": "Sei sicuro di voler rigenerare l'autenticazione a due fattori? Questa azione rimuoverà le impostazioni di autenticazione esistenti.",
+  "use-passkey": "Accedi con passkey",
+  "security-section": "Sicurezza",
+  "passkey-authentication": "Autenticazione passkey",
+  "passkey-not-supported": "Il tuo browser o dispositivo non supporta l'autenticazione passkey",
+  "passkey-description": "Le passkey offrono un’alternativa più sicura e resistente al phishing rispetto alle password. Puoi usare l’impronta digitale, il riconoscimento facciale o il PIN del dispositivo per accedere in sicurezza.",
+  "passkey-tooltip": "Le passkey sono un’alternativa più semplice e sicura alle password. Usano dati biometrici come impronte digitali o riconoscimento facciale già presenti sul tuo dispositivo.",
+  "security-section-help": "Gestisci le opzioni di sicurezza, incluse passkey e metodi di autenticazione, per proteggere il tuo account.",
+  "passkey-register": "Registra passkey",
+  "passkey-register-another": "Registra un'altra passkey",
+  "passkey-registered": "Passkey registrata",
+  "passkey-registering": "Registrazione passkey in corso...",
+  "passkey-registered-success": "Passkey registrata con successo!",
+  "passkey-registration-failed": "Registrazione della passkey non riuscita",
+  "passkey-auth-failed": "Autenticazione passkey fallita",
+  "passkey-missing-user-info": "Informazioni utente richieste",
+  "passkeys-list": "Le tue passkey",
+  "default-passkey": "La tua passkey",
+  "passkey-rename": "Rinomina",
+  "passkey-delete": "Elimina",
+  "passkey-rename-title": "Rinomina passkey",
+  "passkey-delete-title": "Elimina passkey",
+  "passkey-delete-confirm": "Sei sicuro di voler eliminare la passkey \"{{name}}\"?",
+  "passkey-name": "Nome della passkey",
+  "passkey-name-placeholder": "Inserisci un nome descrittivo per questa passkey",
+  "passkey-renamed-success": "Passkey rinominata con successo",
+  "passkey-deleted-success": "Passkey eliminata con successo",
+  "passkey-rename-failed": "Impossibile rinominare la passkey",
+  "passkey-delete-failed": "Impossibile eliminare la passkey",
+  "processing": "Elaborazione...",
+  "today": "Oggi",
+  "yesterday": "Ieri",
+  "days-ago": "{{days}} giorni fa",
+  "verify-with-passkey": "Verifica con passkey",
+  "verify-with-otp": "Verifica con OTP",
+  "verify-identity": "Verifica identità",
+  "verify-account": "Verifica la tua identità",
+  "verification": "Verifica",
+  "passkey-verification-failed": "Verifica con passkey fallita",
+  "security-auth-help": {
+    "p1": "Gestisci le impostazioni di sicurezza del tuo account per proteggere i tuoi dati. OpenSign supporta metodi di autenticazione avanzati per migliorare la protezione dell’account.",
+    "2fa-auth-help": "Aggiungi un ulteriore livello di sicurezza abilitando 2FA. Ti verrà richiesto di inserire un codice di verifica da un'app di autenticazione dopo la password.",
+    "passkey-auth-help": "Usa le passkey per accedere senza password con verifica biometrica o basata sul dispositivo, garantendo sicurezza elevata e praticità."
+  },
+  "signer-already-present": "Firmatario già presente",
+  "kiosk-sign": "Firma su chiosco",
+  "dont-have-access-to-template": "Il template è stato eliminato o non hai accesso. Si prega di contattare il mittente.",
+  "kiosk-info": "La Modalità Kiosk consente di raccogliere firme in presenza in modo rapido ed efficiente. Ideale per fiere, eventi o situazioni con firmatari fisicamente presenti. ",
+  "learn-more": "Scopri di più"
 }
@@ -0,0 +1 @@
+import "@testing-library/jest-dom";
@@ -1,7 +1,6 @@
 import React, { useState, useEffect, lazy } from "react";
 import { Routes, Route, BrowserRouter } from "react-router";
 import { pdfjs } from "react-pdf";
-import Login from "./pages/Login";
 import Form from "./pages/Form";
 import Report from "./pages/Report";
 import Dashboard from "./pages/Dashboard";
@@ -30,6 +29,7 @@ const ManageSign = lazy(() => import("./pages/Managesign"));
 const AddAdmin = lazy(() => import("./pages/AddAdmin"));
 const UpdateExistUserAdmin = lazy(() => import("./pages/UpdateExistUserAdmin"));
 const Preferences = lazy(() => import("./pages/Preferences"));
+const Login = lazy(() => import("./pages/Login"));

 pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/legacy/build/pdf.worker.min.mjs`;
 const AppLoader = () => {
@@ -67,7 +67,7 @@ function App() {
        <BrowserRouter>
          <Routes>
            <Route element={<ValidateRoute />}>
-              <Route exact path="/" element={<Login />} />
+              <Route exact path="/" element={<LazyPage Page={Login} />} />
                  <Route
                    path="/addadmin"
                    element={<LazyPage Page={AddAdmin} />}
@@ -24,7 +24,7 @@ const AddSigner = (props) => {
    if (savedUserDetails && addYourself) {
      setName(savedUserDetails.name);
      setPhone(savedUserDetails?.phone || "");
-      setEmail(savedUserDetails.email);
+      setEmail(savedUserDetails.email?.toLowerCase()?.replace(/\s/g, ""));
    }
  }, [addYourself]);

@@ -1,385 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Parse from "parse";
-import Title from "./Title";
-import Loader from "../primitives/Loader";
-import { copytoData, usertimezone } from "../constant/Utils";
-import { emailRegex } from "../constant/const";
-import { useTranslation } from "react-i18next";
-function generatePassword(length) {
-  const characters =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  let result = "";
-  const charactersLength = characters.length;
-
-  for (let i = 0; i < length; i++) {
-    result += characters.charAt(Math.floor(Math.random() * charactersLength));
-  }
-  return result;
-}
-
-const AddUser = (props) => {
-  const { t } = useTranslation();
-  const [formdata, setFormdata] = useState({
-    name: "",
-    phone: "",
-    email: "",
-    team: "",
-    password: "",
-    role: ""
-  });
-  const [isFormLoader, setIsFormLoader] = useState(false);
-  const [teamList, setTeamList] = useState([]);
-  const role = ["OrgAdmin", "Editor", "User"];
-  useEffect(() => {
-    getTeamList();
-    // eslint-disable-next-line
-  }, []);
-
-  const getTeamList = async () => {
-    setFormdata((prev) => ({ ...prev, password: generatePassword(12) }));
-    const teamRes = await Parse.Cloud.run("getteams", { active: true });
-    if (teamRes.length > 0) {
-      const _teamRes = JSON.parse(JSON.stringify(teamRes));
-      setTeamList(_teamRes);
-      const allUserId =
-        _teamRes.find((x) => x.Name === "All Users")?.objectId || "";
-      setFormdata((prev) => ({ ...prev, team: allUserId }));
-    }
-  };
-  const checkUserExist = async () => {
-    try {
-      const res = await Parse.Cloud.run("getUserDetails", {
-        email: formdata.email
-      });
-      if (res) {
-        return true;
-      } else {
-        return false;
-      }
-    } catch (err) {
-      console.log("err", err);
-    }
-  };
-  // Define a function to handle form submission
-  const handleSubmit = async (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    if (!emailRegex.test(formdata.email)) {
-      alert("Please enter a valid email address.");
-    } else {
-      const localUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
-      setIsFormLoader(true);
-      const res = await checkUserExist();
-      if (res) {
-        props.showAlert("danger", t("user-already-exist"));
-        setIsFormLoader(false);
-      } else {
-        if (localStorage.getItem("TenantId")) {
-          try {
-            const extUser = new Parse.Object("contracts_Users");
-            extUser.set("Name", formdata.name);
-            if (formdata.phone) {
-              extUser.set("Phone", formdata.phone);
-            }
-            extUser.set("Email", formdata.email);
-            extUser.set("UserRole", `contracts_${formdata.role}`);
-            if (formdata?.team) {
-              extUser.set("TeamIds", [
-                {
-                  __type: "Pointer",
-                  className: "contracts_Teams",
-                  objectId: formdata.team
-                }
-              ]);
-            }
-            if (localUser && localUser.OrganizationId) {
-              extUser.set("OrganizationId", {
-                __type: "Pointer",
-                className: "contracts_Organizations",
-                objectId: localUser.OrganizationId.objectId
-              });
-            }
-            if (localUser && localUser.Company) {
-              extUser.set("Company", localUser.Company);
-            }
-
-            if (localStorage.getItem("TenantId")) {
-              extUser.set("TenantId", {
-                __type: "Pointer",
-                className: "partners_Tenant",
-                objectId: localStorage.getItem("TenantId")
-              });
-            }
-            const timezone = usertimezone;
-            if (timezone) {
-              extUser.set("Timezone", timezone);
-            }
-            try {
-              const _users = Parse.Object.extend("User");
-              const _user = new _users();
-              _user.set("name", formdata.name);
-              _user.set("username", formdata.email);
-              _user.set("email", formdata.email);
-              _user.set("password", formdata.password);
-              if (formdata.phone) {
-                _user.set("phone", formdata.phone);
-              }
-
-              const user = await _user.save();
-              if (user) {
-                const currentUser = Parse.User.current();
-                extUser.set(
-                  "CreatedBy",
-                  Parse.User.createWithoutData(currentUser.id)
-                );
-
-                extUser.set("UserId", user);
-                const acl = new Parse.ACL();
-                acl.setPublicReadAccess(true);
-                acl.setPublicWriteAccess(true);
-                acl.setReadAccess(currentUser.id, true);
-                acl.setWriteAccess(currentUser.id, true);
-
-                extUser.setACL(acl);
-
-                const res = await extUser.save();
-
-                const parseData = JSON.parse(JSON.stringify(res));
-
-                if (props.closePopup) {
-                  props.closePopup();
-                }
-                if (props.handleUserData) {
-                  if (formdata?.team) {
-                    const team = teamList.find(
-                      (x) => x.objectId === formdata.team
-                    );
-                    parseData.TeamIds = parseData.TeamIds.map((y) =>
-                      y.objectId === team.objectId ? team : y
-                    );
-                  }
-                  props.handleUserData(parseData);
-                }
-
-                setIsFormLoader(false);
-                setFormdata({
-                  name: "",
-                  email: "",
-                  phone: "",
-                  team: "",
-                  role: ""
-                });
-                props.showAlert("success", t("user-created-successfully"));
-              }
-            } catch (err) {
-              console.log("err ", err);
-              if (err.code === 202) {
-                const params = { email: formdata.email };
-                const userRes = await Parse.Cloud.run("getUserId", params);
-                const currentUser = Parse.User.current();
-                extUser.set(
-                  "CreatedBy",
-                  Parse.User.createWithoutData(currentUser.id)
-                );
-
-                extUser.set("UserId", {
-                  __type: "Pointer",
-                  className: "_User",
-                  objectId: userRes.id
-                });
-                const acl = new Parse.ACL();
-                acl.setPublicReadAccess(true);
-                acl.setPublicWriteAccess(true);
-                acl.setReadAccess(currentUser.id, true);
-                acl.setWriteAccess(currentUser.id, true);
-
-                extUser.setACL(acl);
-                const res = await extUser.save();
-
-                const parseData = JSON.parse(JSON.stringify(res));
-                if (props.closePopup) {
-                  props.closePopup();
-                }
-                if (props.handleUserData) {
-                  if (formdata?.team) {
-                    const team = teamList.find(
-                      (x) => x.objectId === formdata.team
-                    );
-                    parseData.TeamIds = parseData.TeamIds.map((y) =>
-                      y.objectId === team.objectId ? team : y
-                    );
-                  }
-                  props.handleUserData(parseData);
-                }
-                setIsFormLoader(false);
-                setFormdata({
-                  name: "",
-                  email: "",
-                  phone: "",
-                  team: "",
-                  role: ""
-                });
-                props.showAlert("success", t("user-created-successfully"));
-              } else {
-                setIsFormLoader(false);
-                props.showAlert("danger", t("something-went-wrong-mssg"));
-              }
-            }
-          } catch (err) {
-            console.log("err", err);
-            setIsFormLoader(false);
-            props.showAlert("danger", t("something-went-wrong-mssg"));
-          }
-        } else {
-          props.showAlert("danger", t("something-went-wrong-mssg"));
-        }
-      }
-    }
-  };
-
-  // Define a function to handle the "add yourself" checkbox
-  const handleReset = () => {
-    setFormdata({ name: "", email: "", phone: "", team: "", role: "" });
-    if (props.closePopup) {
-      props.closePopup();
-    }
-  };
-  const handleChange = (event) => {
-    let { name, value } = event.target;
-    if (name === "email") {
-      value = value?.toLowerCase()?.replace(/\s/g, "");
-    }
-    setFormdata((prev) => ({ ...prev, [name]: value }));
-  };
-
-  const copytoclipboard = (text) => {
-    copytoData(text);
-    props.showAlert("success", t("copied"));
-  };
-  return (
-    <div className="shadow-md rounded-box my-[1px] p-3 bg-base-100 relative">
-      <Title title={t("add-user")} />
-      {isFormLoader && (
-        <div className="absolute w-full h-full inset-0 flex justify-center items-center bg-base-content/30 z-50">
-          <Loader />
-        </div>
-      )}
-      <div className="w-full mx-auto">
-        <form onSubmit={handleSubmit}>
-          <div className="mb-3">
-            <label
-              htmlFor="name"
-              className="block text-xs text-gray-700 font-semibold"
-            >
-              {t("name")}
-              <span className="text-[red] text-[13px]"> *</span>
-            </label>
-            <input
-              type="text"
-              name="name"
-              value={formdata.name}
-              onChange={(e) => handleChange(e)}
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
-              onInput={(e) => e.target.setCustomValidity("")}
-              required
-              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-            />
-          </div>
-          <div className="mb-3">
-            <label
-              htmlFor="email"
-              className="block text-xs text-gray-700 font-semibold"
-            >
-              {t("email")}
-              <span className="text-[red] text-[13px]"> *</span>
-            </label>
-            <input
-              type="email"
-              name="email"
-              value={formdata.email}
-              onChange={(e) => handleChange(e)}
-              required
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
-              onInput={(e) => e.target.setCustomValidity("")}
-              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-            />
-          </div>
-          <div className="mb-3">
-            <label className="block text-xs text-gray-700 font-semibold">
-              {t("password")}
-            </label>
-            <div className="flex justify-between items-center op-input op-input-bordered op-input-sm text-base-content w-full h-full text-[13px]">
-              <div className="break-all">{formdata?.password}</div>
-              <i
-                onClick={() => copytoclipboard(formdata?.password)}
-                className="fa-light fa-copy rounded-full hover:bg-base-300 p-[8px] cursor-pointer "
-              ></i>
-            </div>
-            <div className="text-[12px] ml-2 mb-0 text-[red] select-none">
-              {t("password-generateed")}
-            </div>
-          </div>
-          <div className="mb-3">
-            <label
-              htmlFor="phone"
-              className="block text-xs text-gray-700 font-semibold"
-            >
-              {t("phone")}
-              {/* <span className="text-[red] text-[13px]"> *</span> */}
-            </label>
-            <input
-              type="text"
-              name="phone"
-              placeholder={t("phone-optional")}
-              value={formdata.phone}
-              onChange={(e) => handleChange(e)}
-              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-            />
-          </div>
-          <div className="mb-3">
-            <label
-              htmlFor="phone"
-              className="block text-xs text-gray-700 font-semibold"
-            >
-              {t("Role")}
-              <span className="text-[red] text-[13px]"> *</span>
-            </label>
-            <select
-              value={formdata.role}
-              onChange={(e) => handleChange(e)}
-              name="role"
-              className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content w-full text-xs"
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
-              onInput={(e) => e.target.setCustomValidity("")}
-              required
-            >
-              <option defaultValue={""} value={""}>
-                {t("Select")}
-              </option>
-              {role.length > 0 &&
-                role.map((x) => (
-                  <option key={x} value={x}>
-                    {x}
-                  </option>
-                ))}
-            </select>
-          </div>
-          <div className="flex items-center mt-3 gap-2 text-white">
-            <button type="submit" className="op-btn op-btn-primary">
-              {t("submit")}
-            </button>
-            <div
-              type="button"
-              onClick={() => handleReset()}
-              className="op-btn op-btn-secondary"
-            >
-              {t("cancel")}
-            </div>
-          </div>
-        </form>
-      </div>
-    </div>
-  );
-};
-
-export default AddUser;
@@ -0,0 +1,288 @@
+import React, { useEffect, useState } from "react";
+import Parse from "parse";
+import Title from "./Title";
+import Loader from "../primitives/Loader";
+import {
+  copytoData,
+  usertimezone
+} from "../constant/Utils";
+import {
+  emailRegex,
+} from "../constant/const";
+import {
+  useTranslation
+} from "react-i18next";
+function generatePassword(length) {
+  const characters =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+  let result = "";
+  const charactersLength = characters.length;
+
+  for (let i = 0; i < length; i++) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+  }
+  return result;
+}
+
+const AddUser = (props) => {
+  const { t } = useTranslation();
+  const [formdata, setFormdata] = useState({
+    name: "",
+    phone: "",
+    email: "",
+    team: "",
+    password: "",
+    role: ""
+  });
+  const [isFormLoader, setIsFormLoader] = useState(false);
+  const [teamList, setTeamList] = useState([]);
+  const role = ["OrgAdmin", "Editor", "User"];
+  useEffect(() => {
+    getTeamList();
+    // eslint-disable-next-line
+  }, []);
+
+  const getTeamList = async () => {
+    setFormdata((prev) => ({ ...prev, password: generatePassword(12) }));
+    const teamRes = await Parse.Cloud.run("getteams", { active: true });
+    if (teamRes.length > 0) {
+      const _teamRes = JSON.parse(JSON.stringify(teamRes));
+      setTeamList(_teamRes);
+        const allUserId =
+          _teamRes.find((x) => x.Name === "All Users")?.objectId || "";
+        setFormdata((prev) => ({ ...prev, team: allUserId }));
+    }
+  };
+  const checkUserExist = async () => {
+    try {
+      const res = await Parse.Cloud.run("getUserDetails", {
+        email: formdata.email
+      });
+      if (res) {
+        return true;
+      } else {
+        return false;
+      }
+    } catch (err) {
+      console.log("err", err);
+    }
+  };
+  // Define a function to handle form submission
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (!emailRegex.test(formdata.email)) {
+      alert("Please enter a valid email address.");
+    } else {
+      const localUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
+      setIsFormLoader(true);
+      const res = await checkUserExist();
+      if (res) {
+        props.showAlert("danger", t("user-already-exist"));
+        setIsFormLoader(false);
+      } else {
+        if (localStorage.getItem("TenantId")) {
+          const timezone = usertimezone;
+          try {
+            const params = {
+              name: formdata.name,
+              email: formdata.email,
+              phone: formdata.phone,
+              password: formdata.password,
+              role: formdata.role,
+              team: formdata.team,
+              timezone: timezone,
+              tenantId: localStorage.getItem("TenantId"),
+              organization: {
+                objectId: localUser?.OrganizationId?.objectId,
+                company: localUser?.Company
+              },
+            };
+            const res = await Parse.Cloud.run("adduser", params);
+            const parseData = JSON.parse(JSON.stringify(res));
+            console.log("parseData ", parseData);
+            if (props.closePopup) {
+              props.closePopup();
+            }
+            if (props.handleUserData) {
+              if (formdata?.team) {
+                const team = teamList.find((x) => x.objectId === formdata.team);
+                parseData.TeamIds = parseData.TeamIds.map((y) =>
+                  y.objectId === team.objectId ? team : y
+                );
+              }
+              props.handleUserData(parseData);
+            }
+            setIsFormLoader(false);
+            setFormdata({
+              name: "",
+              email: "",
+              phone: "",
+              team: "",
+              role: ""
+            });
+            props.showAlert("success", t("user-created-successfully"));
+          } catch (err) {
+            console.log("err", err);
+            setIsFormLoader(false);
+            props.showAlert("danger", t("something-went-wrong-mssg"));
+          }
+        } else {
+          props.showAlert("danger", t("something-went-wrong-mssg"));
+        }
+      }
+    }
+  };
+
+  // Define a function to handle the "add yourself" checkbox
+  const handleReset = () => {
+    setFormdata({ name: "", email: "", phone: "", team: "", role: "" });
+    if (props.closePopup) {
+      props.closePopup();
+    }
+  };
+  const handleChange = (event) => {
+    let { name, value } = event.target;
+    if (name === "email") {
+      value = value?.toLowerCase()?.replace(/\s/g, "");
+    }
+    setFormdata((prev) => ({ ...prev, [name]: value }));
+  };
+
+  const copytoclipboard = (text) => {
+    copytoData(text);
+    props.showAlert("success", t("copied"));
+  };
+  return (
+    <div className="shadow-md rounded-box my-[1px] p-3 bg-base-100 relative">
+      <Title title={t("add-user")} />
+      {isFormLoader && (
+        <div className="absolute w-full h-full inset-0 flex justify-center items-center bg-base-content/30 z-50">
+          <Loader />
+        </div>
+      )}
+              <div className="w-full mx-auto">
+                    <form onSubmit={handleSubmit}>
+                      <div className="mb-3">
+                        <label
+                          htmlFor="name"
+                          className="block text-xs text-gray-700 font-semibold"
+                        >
+                          {t("name")}
+                          <span className="text-[red] text-[13px]"> *</span>
+                        </label>
+                        <input
+                          type="text"
+                          name="name"
+                          value={formdata.name}
+                          onChange={(e) => handleChange(e)}
+                          onInvalid={(e) =>
+                            e.target.setCustomValidity(t("input-required"))
+                          }
+                          onInput={(e) => e.target.setCustomValidity("")}
+                          required
+                          className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+                        />
+                      </div>
+                      <div className="mb-3">
+                        <label
+                          htmlFor="email"
+                          className="block text-xs text-gray-700 font-semibold"
+                        >
+                          {t("email")}
+                          <span className="text-[red] text-[13px]"> *</span>
+                        </label>
+                        <input
+                          type="email"
+                          name="email"
+                          value={formdata.email}
+                          onChange={(e) => handleChange(e)}
+                          required
+                          onInvalid={(e) =>
+                            e.target.setCustomValidity(t("input-required"))
+                          }
+                          onInput={(e) => e.target.setCustomValidity("")}
+                          className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+                        />
+                      </div>
+                      <div className="mb-3">
+                        <label className="block text-xs text-gray-700 font-semibold">
+                          {t("password")}
+                        </label>
+                        <div className="flex justify-between items-center op-input op-input-bordered op-input-sm text-base-content w-full h-full text-[13px]">
+                          <div className="break-all">{formdata?.password}</div>
+                          <i
+                            onClick={() => copytoclipboard(formdata?.password)}
+                            className="fa-light fa-copy rounded-full hover:bg-base-300 p-[8px] cursor-pointer "
+                          ></i>
+                        </div>
+                        <div className="text-[12px] ml-2 mb-0 text-[red] select-none">
+                          {t("password-generateed")}
+                        </div>
+                      </div>
+                      <div className="mb-3">
+                        <label
+                          htmlFor="phone"
+                          className="block text-xs text-gray-700 font-semibold"
+                        >
+                          {t("phone")}
+                          {/* <span className="text-[red] text-[13px]"> *</span> */}
+                        </label>
+                        <input
+                          type="text"
+                          name="phone"
+                          placeholder={t("phone-optional")}
+                          value={formdata.phone}
+                          onChange={(e) => handleChange(e)}
+                          className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+                        />
+                      </div>
+                      <div className="mb-3">
+                        <label
+                          htmlFor="phone"
+                          className="block text-xs text-gray-700 font-semibold"
+                        >
+                          {t("Role")}
+                          <span className="text-[red] text-[13px]"> *</span>
+                        </label>
+                        <select
+                          value={formdata.role}
+                          onChange={(e) => handleChange(e)}
+                          name="role"
+                          className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content w-full text-xs"
+                          onInvalid={(e) =>
+                            e.target.setCustomValidity(t("input-required"))
+                          }
+                          onInput={(e) => e.target.setCustomValidity("")}
+                          required
+                        >
+                          <option defaultValue={""} value={""}>
+                            {t("Select")}
+                          </option>
+                          {role.length > 0 &&
+                            role.map((x) => (
+                              <option key={x} value={x}>
+                                {x}
+                              </option>
+                            ))}
+                        </select>
+                      </div>
+                      <div className="flex items-center mt-3 gap-2 text-white">
+                        <button type="submit" className="op-btn op-btn-primary">
+                          {t("submit")}
+                        </button>
+                        <div
+                          type="button"
+                          onClick={() => handleReset()}
+                          className="op-btn op-btn-secondary"
+                        >
+                          {t("cancel")}
+                        </div>
+                      </div>
+                    </form>
+              </div>
+    </div>
+  );
+};
+
+export default AddUser;
@@ -3,7 +3,9 @@ import axios from "axios";
 import SuggestionInput from "./shared/fields/SuggestionInput";
 import Loader from "../primitives/Loader";
 import { useTranslation } from "react-i18next";
-import { emailRegex } from "../constant/const";
+import {
+  emailRegex,
+} from "../constant/const";
 const BulkSendUi = (props) => {
  const { t } = useTranslation();
  const [forms, setForms] = useState([]);
@@ -20,15 +22,15 @@ const BulkSendUi = (props) => {

  //function to check atleast one signature field exist
  const signatureExist = async () => {
-    setIsDisableBulkSend(false);
-    const getPlaceholder = props?.Placeholders;
-    const checkIsSignatureExistt = getPlaceholder?.every((placeholderObj) =>
-      placeholderObj?.placeHolder?.some((holder) =>
-        holder?.pos?.some((posItem) => posItem?.type === "signature")
-      )
-    );
-    setIsSignatureExist(checkIsSignatureExistt);
-    setIsLoader(false);
+      setIsDisableBulkSend(false);
+      const getPlaceholder = props?.Placeholders;
+      const checkIsSignatureExistt = getPlaceholder?.every((placeholderObj) =>
+        placeholderObj?.placeHolder?.some((holder) =>
+          holder?.pos?.some((posItem) => posItem?.type === "signature")
+        )
+      );
+      setIsSignatureExist(checkIsSignatureExistt);
+      setIsLoader(false);
  };
  useEffect(() => {
    if (scrollOnNextUpdate && formRef.current) {
@@ -72,6 +74,7 @@ const BulkSendUi = (props) => {
    setForms(newForms);
  };

+
  const handleRemoveForm = (index) => {
    const updatedForms = forms.filter((_, i) => i !== index);
    setForms(updatedForms);
@@ -92,83 +95,82 @@ const BulkSendUi = (props) => {
  const handleSubmit = async (e) => {
    e.preventDefault();
    e.stopPropagation();
-    setIsSubmit(true);
-    if (validateEmails(forms)) {
-      // Create a copy of Placeholders array from props.item
-      let Placeholders = [...props.Placeholders];
-      // Initialize an empty array to store updated documents
-      let Documents = [];
-      // Loop through each form
-      forms.forEach((form) => {
-        //checking if user enter email which already exist as a signer then add user in a signers array
-        let existSigner = [];
-        form.fields.map((data) => {
-          if (data.signer) {
-            existSigner.push(data.signer);
-          }
-        });
-        // Map through the copied Placeholders array to update email values
-        const updatedPlaceholders = Placeholders.map((placeholder) => {
-          // Find the field in the current form that matches the placeholder Id
-          const field = form.fields.find(
-            (element) => parseInt(element.fieldId) === placeholder.Id
-          );
-          // If a matching field is found, update the email value in the placeholder
-          const signer = field?.signer?.objectId ? field.signer : "";
-          if (field) {
-            if (signer) {
-              return {
-                ...placeholder,
-                signerObjId: field?.signer?.objectId || "",
-                signerPtr: signer
-              };
-            } else {
-              return {
-                ...placeholder,
-                email: field.email,
-                signerObjId: field?.signer?.objectId || "",
-                signerPtr: signer
-              };
+      setIsSubmit(true);
+      if (validateEmails(forms)) {
+        // Create a copy of Placeholders array from props.item
+        let Placeholders = [...props.Placeholders];
+        // Initialize an empty array to store updated documents
+        let Documents = [];
+        // Loop through each form
+        forms.forEach((form) => {
+          //checking if user enter email which already exist as a signer then add user in a signers array
+          let existSigner = [];
+          form.fields.map((data) => {
+            if (data.signer) {
+              existSigner.push(data.signer);
            }
-          }
-          // If no matching field is found, keep the placeholder as is
-          return placeholder;
-        });
+          });
+          // Map through the copied Placeholders array to update email values
+          const updatedPlaceholders = Placeholders.map((placeholder) => {
+            // Find the field in the current form that matches the placeholder Id
+            const field = form.fields.find(
+              (element) => parseInt(element.fieldId) === placeholder.Id
+            );
+            // If a matching field is found, update the email value in the placeholder
+            const signer = field?.signer?.objectId ? field.signer : "";
+            if (field) {
+              if (signer) {
+                return {
+                  ...placeholder,
+                  signerObjId: field?.signer?.objectId || "",
+                  signerPtr: signer
+                };
+              } else {
+                return {
+                  ...placeholder,
+                  email: field.email,
+                  signerObjId: field?.signer?.objectId || "",
+                  signerPtr: signer
+                };
+              }
+            }
+            // If no matching field is found, keep the placeholder as is
+            return placeholder;
+          });

-        // Push a new document object with updated Placeholders into the Documents array
-        if (existSigner?.length > 0) {
-          Documents.push({
-            ...props.item,
-            Placeholders: updatedPlaceholders,
-            Signers: props.item.Signers
-              ? [...props.item.Signers, ...existSigner]
-              : [...existSigner]
-          });
-        } else {
-          Documents.push({
-            ...props.item,
-            Placeholders: updatedPlaceholders,
-            SignatureType: props.signatureType
-          });
-        }
-      });
-      await batchQuery(Documents);
-    } else {
-      setIsSubmit(false);
-    }
+          // Push a new document object with updated Placeholders into the Documents array
+          if (existSigner?.length > 0) {
+            Documents.push({
+              ...props.item,
+              Placeholders: updatedPlaceholders,
+              Signers: props.item.Signers
+                ? [...props.item.Signers, ...existSigner]
+                : [...existSigner]
+            });
+          } else {
+            Documents.push({
+              ...props.item,
+              Placeholders: updatedPlaceholders,
+              SignatureType: props.signatureType
+            });
+          }
+        });
+        await batchQuery(Documents);
+      } else {
+        setIsSubmit(false);
+      }
  };

  const batchQuery = async (Documents) => {
-    const token = {
-      "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-    };
+    const token =
+          { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };
    const functionsUrl = `${localStorage.getItem(
      "baseUrl"
    )}functions/batchdocuments`;
    const headers = {
      "Content-Type": "application/json",
      "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-      ...token
+      ...token,
    };
    const params = { Documents: JSON.stringify(Documents) };
    try {
@@ -275,7 +277,8 @@ const BulkSendUi = (props) => {
              )}
            </>
          ) : (
-            <></>
+            <>
+            </>
          )}
        </>
      )}
@@ -31,6 +31,8 @@ const Header = ({ showSidebar, setIsMenu, isConsole }) => {
    initializeHead();
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);
+
+
  async function initializeHead() {
      const applogo = await getAppLogo();
      if (applogo?.logo) {
@@ -1,334 +0,0 @@
-import React, { useState } from "react";
-import { getFileName } from "../../constant/Utils";
-import {
-  maxDescriptionLength,
-  maxNoteLength,
-  maxTitleLength
-} from "../../constant/const";
-import { useTranslation } from "react-i18next";
-import { Tooltip } from "react-tooltip";
-import SignersInput from "../shared/fields/SignersInput";
-
-const EditTemplate = ({ template, onSuccess }) => {
-  const appName = "OpenSign™";
-  const { t } = useTranslation();
-  const [formData, setFormData] = useState({
-    Name: template?.Name || "",
-    Note: template?.Note || "",
-    Description: template?.Description || "",
-    SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false",
-    AutomaticReminders: template?.AutomaticReminders || false,
-    RemindOnceInEvery: template?.RemindOnceInEvery || 5,
-    IsEnableOTP: template?.IsEnableOTP ? `${template?.IsEnableOTP}` : "false",
-    IsTourEnabled: template?.IsTourEnabled
-      ? `${template?.IsTourEnabled}`
-      : "false",
-    NotifyOnSignatures:
-      template?.NotifyOnSignatures !== undefined
-        ? template?.NotifyOnSignatures
-        : false,
-    Bcc: template?.Bcc,
-    RedirectUrl: template?.RedirectUrl || "",
-    AllowModifications: template?.AllowModifications || false,
-    TimeToCompleteDays: template?.TimeToCompleteDays || 15
-  });
-
-  // `isValidURL` is used to check valid webhook url
-  function isValidURL(value) {
-    try {
-      const url = new URL(value);
-      return url.protocol === "https:" || url.protocol === "http:";
-    } catch (error) {
-      return false;
-    }
-  }
-
-  const handleStrInput = (e) => {
-    setFormData({ ...formData, [e.target.name]: e.target.value });
-  };
-
-  // Define a function to handle form submission
-  const handleSubmit = async (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    if (formData.RedirectUrl && !isValidURL(formData?.RedirectUrl)) {
-      alert(t("invalid-redirect-url"));
-      return;
-    }
-    if (formData?.Name?.length > maxTitleLength) {
-      alert(t("title-length-alert"));
-      return;
-    }
-    if (formData?.Note?.length > maxNoteLength) {
-      alert(t("note-length-alert"));
-      return;
-    }
-    if (formData?.Description?.length > maxDescriptionLength) {
-      alert(t("description-length-alert"));
-      return;
-    }
-    const isChecked = formData.SendinOrder === "true" ? true : false;
-    const isTourEnabled = formData?.IsTourEnabled === "false" ? false : true;
-    const AutoReminder = formData?.AutomaticReminders || false;
-    const IsEnableOTP = formData.IsEnableOTP === "true" ? true : false;
-    const allowModify = formData?.AllowModifications || false;
-    let reminderDate = {};
-    const remindOnceInEvery = formData?.RemindOnceInEvery;
-    const TimeToCompleteDays = parseInt(formData?.TimeToCompleteDays);
-    const reminderCount = TimeToCompleteDays / remindOnceInEvery;
-    if (AutoReminder && reminderCount > 15) {
-      alert(t("only-15-reminder-allowed"));
-      return;
-    }
-    if (AutoReminder) {
-      const RemindOnceInEvery = parseInt(formData?.RemindOnceInEvery);
-      const ReminderDate = new Date(template?.createdAt);
-      ReminderDate.setDate(ReminderDate.getDate() + RemindOnceInEvery);
-      reminderDate = { NextReminderDate: ReminderDate };
-    }
-    const data = {
-      ...formData,
-      SendinOrder: isChecked,
-      IsEnableOTP: IsEnableOTP,
-      IsTourEnabled: isTourEnabled,
-      AllowModifications: allowModify,
-      ...reminderDate
-    };
-    onSuccess(data);
-  };
-
-  // `handleNotifySignChange` is trigger when user change radio of notify on signatures
-  const handleNotifySignChange = (value) => {
-    setFormData((obj) => ({ ...obj, NotifyOnSignatures: value }));
-  };
-  const handleBcc = (data) => {
-    if (data && data.length > 0) {
-      const trimEmail = data.map((item) => ({
-        objectId: item?.value,
-        Name: item?.label,
-        Email: item?.email
-      }));
-      setFormData((prev) => ({ ...prev, Bcc: trimEmail }));
-    }
-  };
-  return (
-    <div className="max-h-[300px] md:max-h-[400px] overflow-y-scroll p-[10px]">
-      <div className="text-base-content">
-        <form onSubmit={handleSubmit}>
-          <div className="mb-[0.35rem]">
-            <label htmlFor="name" className="text-[13px]">
-              {t("report-heading.File")}
-            </label>
-            <div className="op-input op-input-bordered op-input-sm focus:outline-none py-2 font-semibold w-full text-xs">
-              {getFileName(template.URL)}
-            </div>
-          </div>
-          <div className="mb-[0.35rem]">
-            <label htmlFor="name" className="text-[13px]">
-              {t("Title")}
-              <span className="text-[13px] text-[red]"> *</span>
-            </label>
-            <input
-              type="text"
-              name="Name"
-              value={formData.Name}
-              onChange={(e) => handleStrInput(e)}
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
-              onInput={(e) => e.target.setCustomValidity("")}
-              required
-              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-            />
-          </div>
-          <div className="mb-[0.35rem]">
-            <label htmlFor="Note" className="text-[13px]">
-              {t("report-heading.Note")}
-            </label>
-            <input
-              type="text"
-              name="Note"
-              id="Note"
-              value={formData.Note}
-              onChange={(e) => handleStrInput(e)}
-              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-            />
-          </div>
-          <div className="mb-[0.35rem]">
-            <label htmlFor="Description" className="text-[13px]">
-              {t("description")}
-            </label>
-            <input
-              type="text"
-              name="Description"
-              id="Description"
-              value={formData.Description}
-              onChange={(e) => handleStrInput(e)}
-              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-            />
-          </div>
-          <div className="mb-[0.35rem]">
-            <label className="text-[13px]">{t("send-in-order")}</label>
-            <div className="flex flex-col md:flex-row md:gap-4">
-              <div className="flex items-center gap-[8px] ml-[8px] mb-[5px]">
-                <input
-                  type="radio"
-                  value={"true"}
-                  className="op-radio op-radio-xs"
-                  name="SendinOrder"
-                  checked={formData.SendinOrder === "true"}
-                  onChange={handleStrInput}
-                />
-                <div className="text-[12px]">{t("yes")}</div>
-              </div>
-              <div className="flex items-center gap-[8px] ml-[8px] mb-[5px]">
-                <input
-                  type="radio"
-                  value={"false"}
-                  name="SendinOrder"
-                  className="op-radio op-radio-xs"
-                  checked={formData.SendinOrder === "false"}
-                  onChange={handleStrInput}
-                />
-                <div className="text-[12px]">{t("no")}</div>
-              </div>
-            </div>
-          </div>
-          <div className="text-xs mt-3">
-            <label className="block">
-              <span>
-                {t("enable-tour")}
-                <a data-tooltip-id="istourenabled-tooltip" className="ml-1">
-                  <sup>
-                    <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
-                  </sup>
-                </a>{" "}
-              </span>
-              <Tooltip id="istourenabled-tooltip" className="z-50">
-                <div className="max-w-[200px] md:max-w-[450px]">
-                  <p className="font-bold">{t("enable-tour")}</p>
-                  <div className="p-[5px]">
-                    <ol className="list-disc">
-                      <li>
-                        <span className="font-bold">{t("yes")}: </span>
-                        <span>{t("istourenabled-help.p1")}</span>
-                      </li>
-                      <li>
-                        <span className="font-bold">{t("no")}: </span>
-                        <span>{t("istourenabled-help.p2")}</span>
-                      </li>
-                    </ol>
-                  </div>
-                  <p>{t("istourenabled-help.p3", { appName: appName })}</p>
-                </div>
-              </Tooltip>
-            </label>
-            <div className="flex flex-col md:flex-row md:gap-4">
-              <div className="flex items-center gap-2 ml-2 mb-1">
-                <input
-                  type="radio"
-                  value={"true"}
-                  className="op-radio op-radio-xs"
-                  name="IsTourEnabled"
-                  checked={formData.IsTourEnabled === "true"}
-                  onChange={handleStrInput}
-                />
-                <div className="text-center">{t("yes")}</div>
-              </div>
-              <div className="flex items-center gap-2 ml-2 mb-1">
-                <input
-                  type="radio"
-                  value={"false"}
-                  name="IsTourEnabled"
-                  className="op-radio op-radio-xs"
-                  checked={formData.IsTourEnabled === "false"}
-                  onChange={handleStrInput}
-                />
-                <div className="text-center">{t("no")}</div>
-              </div>
-            </div>
-          </div>
-          <div className="text-xs mt-3">
-            <label>
-              {t("notify-on-signatures")}
-              <a data-tooltip-id="nos-tooltip" className="ml-1">
-                <sup>
-                  <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
-                </sup>
-              </a>{" "}
-              <Tooltip id="nos-tooltip" className="z-[999]">
-                <div className="max-w-[200px] md:max-w-[450px] text-[11px]">
-                  <p className="font-bold">{t("notify-on-signatures")}</p>
-                  <p>{t("notify-on-signatures-help.p1")}</p>
-                  <p>{t("notify-on-signatures-help.note")}</p>
-                </div>
-              </Tooltip>
-            </label>
-            <div className="flex flex-col md:flex-row md:gap-4">
-              <div className={`flex items-center gap-2 ml-2 mb-1`}>
-                <input
-                  className="mr-[2px] op-radio op-radio-xs"
-                  type="radio"
-                  onChange={() => handleNotifySignChange(true)}
-                  checked={formData.NotifyOnSignatures === true}
-                />
-                <div className="text-center">{t("yes")}</div>
-              </div>
-              <div className={`flex items-center gap-2 ml-2 mb-1`}>
-                <input
-                  className="mr-[2px] op-radio op-radio-xs"
-                  type="radio"
-                  onChange={() => handleNotifySignChange(false)}
-                  checked={formData.NotifyOnSignatures === false}
-                />
-                <div className="text-center">{t("no")}</div>
-              </div>
-            </div>
-          </div>
-          <div className="text-xs mt-3">
-            <SignersInput
-              label={t("Bcc")}
-              initialData={template?.Bcc}
-              onChange={handleBcc}
-              helptextZindex={50}
-              helpText={t("bcc-help")}
-              isCaptureAllData
-            />
-          </div>
-          <div className="text-xs mt-2">
-            <label className="block">Redirect Url</label>
-            <input
-              name="RedirectUrl"
-              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-              value={formData.RedirectUrl}
-              onChange={handleStrInput}
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
-              onInput={(e) => e.target.setCustomValidity("")}
-            />
-          </div>
-          <div className="text-xs mt-2">
-            <label className="block">
-              {t("time-to-complete")}
-              <span className="text-red-500 text-[13px]">*</span>
-            </label>
-            <input
-              type="number"
-              name="TimeToCompleteDays"
-              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-              value={formData.TimeToCompleteDays}
-              onChange={(e) => handleStrInput(e)}
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
-              onInput={(e) => e.target.setCustomValidity("")}
-              required
-            />
-          </div>
-          <div className="mt-[1rem] flex justify-start">
-            <button type="submit" className="op-btn op-btn-primary">
-              {t("submit")}
-            </button>
-          </div>
-        </form>
-      </div>
-    </div>
-  );
-};
-
-export default EditTemplate;
@@ -0,0 +1,538 @@
+import React, {
+  useState,
+  useRef,
+} from "react";
+import {
+  base64ToArrayBuffer,
+  convertBase64ToFile,
+  generatePdfName,
+  getFileName
+} from "../../constant/Utils";
+import {
+  maxDescriptionLength,
+  maxNoteLength,
+  maxTitleLength
+} from "../../constant/const";
+import { useTranslation } from "react-i18next";
+import { Tooltip } from "react-tooltip";
+import SignersInput from "../shared/fields/SignersInput";
+import { PDFDocument } from "pdf-lib";
+import ModalUi from "../../primitives/ModalUi";
+import { SaveFileSize } from "../../constant/saveFileSize";
+
+const EditTemplate = ({
+  title,
+  handleClose,
+  pdfbase64,
+  template,
+  onSuccess,
+  setPdfArrayBuffer,
+  setPdfBase64Url,
+}) => {
+  const appName =
+    "OpenSign™";
+  const { t } = useTranslation();
+  const inputFileRef = useRef(null);
+  const [formData, setFormData] = useState({
+    Name: template?.Name || "",
+    Note: template?.Note || "",
+    Description: template?.Description || "",
+    SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false",
+    AutomaticReminders: template?.AutomaticReminders || false,
+    RemindOnceInEvery: template?.RemindOnceInEvery || 5,
+    IsEnableOTP: template?.IsEnableOTP ? `${template?.IsEnableOTP}` : "false",
+    IsTourEnabled: template?.IsTourEnabled
+      ? `${template?.IsTourEnabled}`
+      : "false",
+    NotifyOnSignatures:
+      template?.NotifyOnSignatures !== undefined
+        ? template?.NotifyOnSignatures
+        : false,
+    Bcc: template?.Bcc,
+    RedirectUrl: template?.RedirectUrl || "",
+    AllowModifications: template?.AllowModifications || false,
+    TimeToCompleteDays: template?.TimeToCompleteDays || 15
+  });
+  const [isUpdate, setIsUpdate] = useState(false);
+  const [showConfirm, setShowConfirm] = useState(false);
+  const [uploadPdf, setUploadPdf] = useState({
+    name: "",
+    base64: "",
+    url: ""
+  });
+  const handleDrop = (e) => {
+    e.preventDefault();
+    const file = e.dataTransfer.files[0];
+    handleFile(file);
+  };
+
+  const handleFile = (file) => {
+    if (file && file.type === "application/pdf") {
+      handleReplaceFileValdition(file);
+      // You can handle the file here
+    } else {
+      alert("Only pdf files are allowed.");
+      if (inputFileRef.current) inputFileRef.current.value = "";
+    }
+  };
+  const handleDragOver = (e) => {
+    e.preventDefault();
+  };
+
+  // `isValidURL` is used to check valid webhook url
+  function isValidURL(value) {
+    try {
+      const url = new URL(value);
+      return url.protocol === "https:" || url.protocol === "http:";
+    } catch (error) {
+      return false;
+    }
+  }
+
+  const handleStrInput = (e) => {
+    setIsUpdate(true);
+    setFormData({ ...formData, [e.target.name]: e.target.value });
+  };
+  const getPdfMetadataHash = async (pdfBytes) => {
+    const pdfDoc = await PDFDocument.load(pdfBytes);
+    const pages = pdfDoc.getPages();
+    const metaString = pages
+      .map((page, index) => {
+        const { width, height } = page.getSize();
+        return `${index + 1}:${Math.round(width)}x${Math.round(height)}`;
+      })
+      .join("|");
+    const encoder = new TextEncoder();
+    const data = encoder.encode(metaString);
+    const hashBuffer = await crypto.subtle.digest("SHA-256", data);
+    return Array.from(new Uint8Array(hashBuffer))
+      .map((b) => b.toString(16).padStart(2, "0"))
+      .join("");
+  };
+
+  const handleFileInput = async (e) => {
+    const file = e.target.files[0];
+    if (!file) return;
+    handleReplaceFileValdition(file);
+  };
+  const handleReplaceFileValdition = async (file) => {
+    try {
+      const basePdfBytes = base64ToArrayBuffer(pdfbase64);
+      const expectedHash = await getPdfMetadataHash(basePdfBytes);
+      const fileReader = new FileReader();
+      fileReader.onload = async (event) => {
+        const uploadedPdfBytes = event.target.result;
+        const uploadedHash = await getPdfMetadataHash(uploadedPdfBytes);
+
+        if (expectedHash === uploadedHash) {
+          const arrayBuffer = uploadedPdfBytes;
+          const uint8Array = new Uint8Array(arrayBuffer);
+          const binaryString = Array.from(uint8Array)
+            .map((b) => String.fromCharCode(b))
+            .join("");
+          const base64 = btoa(binaryString);
+          const pdfName = generatePdfName(16);
+          setIsUpdate(true);
+          setUploadPdf((prev) => ({ ...prev, name: pdfName, base64: base64 }));
+          // alert("✅ PDFs match (based on page number, width, height)");
+        } else {
+          alert("❌ PDF do NOT match based on page number, width, height");
+          if (inputFileRef.current) inputFileRef.current.value = "";
+        }
+      };
+
+      fileReader.readAsArrayBuffer(file);
+    } catch (err) {
+      alert("Error: " + err.message);
+      if (inputFileRef.current) inputFileRef.current.value = "";
+    }
+  };
+  // Define a function to handle form submission
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (formData.RedirectUrl && !isValidURL(formData?.RedirectUrl)) {
+      alert(t("invalid-redirect-url"));
+      return;
+    }
+    if (formData?.Name?.length > maxTitleLength) {
+      alert(t("title-length-alert"));
+      return;
+    }
+    if (formData?.Note?.length > maxNoteLength) {
+      alert(t("note-length-alert"));
+      return;
+    }
+    if (formData?.Description?.length > maxDescriptionLength) {
+      alert(t("description-length-alert"));
+      return;
+    }
+    let pdfUrl;
+    if (uploadPdf?.base64) {
+      pdfUrl = await convertBase64ToFile(
+        uploadPdf.name,
+        uploadPdf.base64,
+      );
+      setUploadPdf((prev) => ({ ...prev, url: pdfUrl }));
+      const pdfBuffer = base64ToArrayBuffer(uploadPdf.base64);
+      setPdfArrayBuffer && setPdfArrayBuffer(pdfBuffer);
+      setPdfBase64Url && setPdfBase64Url(uploadPdf.base64);
+      const tenantId =
+        localStorage.getItem("TenantId") ||
+        template?.ExtUserPtr?.TenantId?.objectId;
+      const buffer = atob(uploadPdf.base64);
+      SaveFileSize(buffer.length, pdfUrl, tenantId);
+    }
+    const isChecked = formData.SendinOrder === "true" ? true : false;
+    const isTourEnabled = formData?.IsTourEnabled === "false" ? false : true;
+    const AutoReminder = formData?.AutomaticReminders || false;
+    const IsEnableOTP = formData.IsEnableOTP === "true" ? true : false;
+    const allowModify = formData?.AllowModifications || false;
+    let reminderDate = {};
+    const remindOnceInEvery = formData?.RemindOnceInEvery;
+    const TimeToCompleteDays = parseInt(formData?.TimeToCompleteDays);
+    const reminderCount = TimeToCompleteDays / remindOnceInEvery;
+    if (AutoReminder && reminderCount > 15) {
+      alert(t("only-15-reminder-allowed"));
+      return;
+    }
+    if (AutoReminder) {
+      const RemindOnceInEvery = parseInt(formData?.RemindOnceInEvery);
+      const ReminderDate = new Date(template?.createdAt);
+      ReminderDate.setDate(ReminderDate.getDate() + RemindOnceInEvery);
+      reminderDate = { NextReminderDate: ReminderDate };
+    }
+    const data = {
+      ...formData,
+      ...(pdfUrl ? { URL: pdfUrl } : {}),
+      SendinOrder: isChecked,
+      IsEnableOTP: IsEnableOTP,
+      IsTourEnabled: isTourEnabled,
+      AllowModifications: allowModify,
+      ...reminderDate
+    };
+    onSuccess(data);
+  };
+
+  // `handleNotifySignChange` is trigger when user change radio of notify on signatures
+  const handleNotifySignChange = (value) => {
+    setIsUpdate(true);
+    setFormData((obj) => ({ ...obj, NotifyOnSignatures: value }));
+  };
+  const handleBcc = (data) => {
+    if (data && data.length > 0) {
+      const trimEmail = data.map((item) => ({
+        objectId: item?.value,
+        Name: item?.label,
+        Email: item?.email
+      }));
+      setIsUpdate(true);
+      setFormData((prev) => ({ ...prev, Bcc: trimEmail }));
+    }
+  };
+
+  const handleEditTemplateClose = () => {
+    if (isUpdate) {
+      setShowConfirm(true);
+    } else {
+      handleClose();
+    }
+  };
+  const discardChanges = () => {
+    setShowConfirm(false);
+    handleClose();
+  };
+  return (
+    <ModalUi
+      isOpen
+      title={isUpdate ? `${title} (unsaved)` : title}
+      handleClose={handleEditTemplateClose}
+    >
+      <ModalUi isOpen={showConfirm} showClose={false}>
+        <div className="p-[20px]">
+          <p className="text-base font-normal text-base-content py-[5px] md:py-[6px] px-[5px]">
+            {t("unsaved-changes-discard-them?")}
+          </p>
+          <div className="flex items-center mt-2.5 gap-2 md:gap-3 text-white">
+            <button
+              className="op-btn op-btn-primary px-6"
+              onClick={discardChanges}
+            >
+              {t("yes-discard")}
+            </button>
+            <button
+              className="op-btn op-btn-secondary px-4 md:px-6"
+              onClick={() => setShowConfirm(false)}
+            >
+              {t("cancel")}
+            </button>
+          </div>
+        </div>
+      </ModalUi>
+      <div className="max-h-[300px] md:max-h-[400px] overflow-y-scroll p-[10px]">
+        <div className="text-base-content">
+          <form onSubmit={handleSubmit}>
+            <div className="mb-[0.35rem]">
+              <label htmlFor="name" className="text-[13px]">
+                {t("report-heading.File")}
+              </label>
+              <div
+                className="border-[1.5px] border-dashed border-gray-300 rounded-lg px-4 py-6 text-center text-gray-500 bg-white cursor-pointer hover:border-base-content transition"
+                onDrop={handleDrop}
+                onDragOver={handleDragOver}
+                onClick={() => inputFileRef?.current?.click()}
+              >
+                <label
+                  htmlFor="fileUpload"
+                  className="cursor-pointer text-center mb-0"
+                >
+                  Browse or drag & drop a new file to replace the existng one
+                </label>
+              </div>
+              <input
+                ref={inputFileRef}
+                type="file"
+                className="hidden"
+                accept="application/pdf"
+                onChange={(e) => handleFileInput(e)}
+                onInvalid={(e) =>
+                  e.target.setCustomValidity(t("input-required"))
+                }
+                onInput={(e) => e.target.setCustomValidity("")}
+              />
+              {uploadPdf?.name && (
+                <div
+                  onClick={() => inputFileRef?.current?.click()}
+                  className="mt-2 cursor-pointer op-input op-input-bordered op-input-sm focus:outline-none py-2 font-semibold w-full text-xs"
+                >
+                  selected:{" "}
+                  {uploadPdf?.url
+                    ? `${uploadPdf?.name}.pdf`
+                    : getFileName(template.URL)}
+                </div>
+              )}
+            </div>
+            <div className="mb-[0.35rem]">
+              <label htmlFor="name" className="text-[13px]">
+                {t("Title")}
+                <span className="text-[13px] text-[red]"> *</span>
+              </label>
+              <input
+                type="text"
+                name="Name"
+                value={formData.Name}
+                onChange={(e) => handleStrInput(e)}
+                onInvalid={(e) =>
+                  e.target.setCustomValidity(t("input-required"))
+                }
+                onInput={(e) => e.target.setCustomValidity("")}
+                required
+                className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+              />
+            </div>
+            <div className="mb-[0.35rem]">
+              <label htmlFor="Note" className="text-[13px]">
+                {t("report-heading.Note")}
+              </label>
+              <input
+                type="text"
+                name="Note"
+                id="Note"
+                value={formData.Note}
+                onChange={(e) => handleStrInput(e)}
+                className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+              />
+            </div>
+            <div className="mb-[0.35rem]">
+              <label htmlFor="Description" className="text-[13px]">
+                {t("description")}
+              </label>
+              <input
+                type="text"
+                name="Description"
+                id="Description"
+                value={formData.Description}
+                onChange={(e) => handleStrInput(e)}
+                className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+              />
+            </div>
+            <div className="mb-[0.35rem]">
+              <label className="text-[13px]">{t("send-in-order")}</label>
+              <div className="flex flex-col md:flex-row md:gap-4">
+                <div className="flex items-center gap-[8px] ml-[8px] mb-[5px]">
+                  <input
+                    type="radio"
+                    value={"true"}
+                    className="op-radio op-radio-xs"
+                    name="SendinOrder"
+                    checked={formData.SendinOrder === "true"}
+                    onChange={handleStrInput}
+                  />
+                  <div className="text-[12px]">{t("yes")}</div>
+                </div>
+                <div className="flex items-center gap-[8px] ml-[8px] mb-[5px]">
+                  <input
+                    type="radio"
+                    value={"false"}
+                    name="SendinOrder"
+                    className="op-radio op-radio-xs"
+                    checked={formData.SendinOrder === "false"}
+                    onChange={handleStrInput}
+                  />
+                  <div className="text-[12px]">{t("no")}</div>
+                </div>
+              </div>
+            </div>
+            <div className="text-xs mt-3">
+              <label className="block">
+                <span>
+                  {t("enable-tour")}
+                  <a data-tooltip-id="istourenabled-tooltip" className="ml-1">
+                    <sup>
+                      <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
+                    </sup>
+                  </a>{" "}
+                </span>
+                <Tooltip id="istourenabled-tooltip" className="z-50">
+                  <div className="max-w-[200px] md:max-w-[450px]">
+                    <p className="font-bold">{t("enable-tour")}</p>
+                    <div className="p-[5px]">
+                      <ol className="list-disc">
+                        <li>
+                          <span className="font-bold">{t("yes")}: </span>
+                          <span>{t("istourenabled-help.p1")}</span>
+                        </li>
+                        <li>
+                          <span className="font-bold">{t("no")}: </span>
+                          <span>{t("istourenabled-help.p2")}</span>
+                        </li>
+                      </ol>
+                    </div>
+                    <p>{t("istourenabled-help.p3", { appName: appName })}</p>
+                  </div>
+                </Tooltip>
+              </label>
+              <div className="flex flex-col md:flex-row md:gap-4">
+                <div className="flex items-center gap-2 ml-2 mb-1">
+                  <input
+                    type="radio"
+                    value={"true"}
+                    className="op-radio op-radio-xs"
+                    name="IsTourEnabled"
+                    checked={formData.IsTourEnabled === "true"}
+                    onChange={handleStrInput}
+                  />
+                  <div className="text-center">{t("yes")}</div>
+                </div>
+                <div className="flex items-center gap-2 ml-2 mb-1">
+                  <input
+                    type="radio"
+                    value={"false"}
+                    name="IsTourEnabled"
+                    className="op-radio op-radio-xs"
+                    checked={formData.IsTourEnabled === "false"}
+                    onChange={handleStrInput}
+                  />
+                  <div className="text-center">{t("no")}</div>
+                </div>
+              </div>
+            </div>
+            <div className="text-xs mt-3">
+              <label>
+                {t("notify-on-signatures")}
+                <a data-tooltip-id="nos-tooltip" className="ml-1">
+                  <sup>
+                    <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
+                  </sup>
+                </a>{" "}
+                <Tooltip id="nos-tooltip" className="z-[999]">
+                  <div className="max-w-[200px] md:max-w-[450px] text-[11px]">
+                    <p className="font-bold">{t("notify-on-signatures")}</p>
+                    <p>{t("notify-on-signatures-help.p1")}</p>
+                    <p>{t("notify-on-signatures-help.note")}</p>
+                  </div>
+                </Tooltip>
+              </label>
+              <div className="flex flex-col md:flex-row md:gap-4">
+                <div
+                  className={
+                    `flex items-center gap-2 ml-2 mb-1`
+                  }
+                >
+                  <input
+                    className="mr-[2px] op-radio op-radio-xs"
+                    type="radio"
+                    onChange={() => handleNotifySignChange(true)}
+                    checked={formData.NotifyOnSignatures === true}
+                  />
+                  <div className="text-center">{t("yes")}</div>
+                </div>
+                <div
+                  className={
+                    `flex items-center gap-2 ml-2 mb-1`
+                  }
+                >
+                  <input
+                    className="mr-[2px] op-radio op-radio-xs"
+                    type="radio"
+                    onChange={() => handleNotifySignChange(false)}
+                    checked={formData.NotifyOnSignatures === false}
+                  />
+                  <div className="text-center">{t("no")}</div>
+                </div>
+              </div>
+            </div>
+            <div className="text-xs mt-3">
+              <SignersInput
+                label={t("Bcc")}
+                initialData={template?.Bcc}
+                onChange={handleBcc}
+                helptextZindex={50}
+                helpText={t("bcc-help")}
+                isCaptureAllData
+              />
+            </div>
+            <div className="text-xs mt-2">
+              <label className="block">Redirect Url</label>
+              <input
+                name="RedirectUrl"
+                className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+                value={formData.RedirectUrl}
+                onChange={handleStrInput}
+                onInvalid={(e) =>
+                  e.target.setCustomValidity(t("input-required"))
+                }
+                onInput={(e) => e.target.setCustomValidity("")}
+              />
+            </div>
+            <div className="text-xs mt-2">
+              <label className="block">
+                {t("time-to-complete")}
+                <span className="text-red-500 text-[13px]">*</span>
+              </label>
+              <input
+                type="number"
+                name="TimeToCompleteDays"
+                className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+                value={formData.TimeToCompleteDays}
+                onChange={(e) => handleStrInput(e)}
+                onInvalid={(e) =>
+                  e.target.setCustomValidity(t("input-required"))
+                }
+                onInput={(e) => e.target.setCustomValidity("")}
+                required
+              />
+            </div>
+            <div className="mt-[1rem] flex justify-start">
+              <button type="submit" className="op-btn op-btn-primary">
+                {t("submit")}
+              </button>
+            </div>
+          </form>
+        </div>
+      </div>
+    </ModalUi>
+  );
+};
+
+export default EditTemplate;
@@ -1,6 +1,10 @@
 import React, { useState } from "react";
-import { handleToPrint } from "../../constant/Utils";
-import { emailRegex } from "../../constant/const";
+import {
+  handleToPrint,
+} from "../../constant/Utils";
+import {
+  emailRegex,
+} from "../../constant/const";
 import Loader from "../../primitives/Loader";
 import ModalUi from "../../primitives/ModalUi";
 import { useTranslation } from "react-i18next";
@@ -37,7 +41,8 @@ function EmailComponent({
        setEmailList([]);
      }, 1500);
      setIsLoading(false);
-    } else {
+    }
+    else {
      setIsLoading(false);
      setIsEmail(false);
      setIsAlert({
@@ -28,8 +28,12 @@ function Header(props) {
  const enabledBackBtn = props?.disabledBackBtn === true ? false : true;
  //function for show decline alert
  const handleDeclinePdfAlert = async () => {
-    const currentDecline = { currnt: "Sure", isDeclined: true };
-    props?.setIsDecline(currentDecline);
+    if (props?.handleDecline) {
+      props.handleDecline();
+    } else {
+      const currentDecline = { currnt: "Sure", isDeclined: true };
+      props?.setIsDecline(currentDecline);
+    }
  };
  const handleDetelePage = async () => {
    props?.setIsUploadPdf && props?.setIsUploadPdf(true);
@@ -102,7 +106,6 @@ function Header(props) {
      console.error("Error merging PDF:", error);
    }
  };
-
  return (
    <div className="flex py-[5px]">
      {isMobile && props?.isShowHeader ? (
@@ -502,16 +505,6 @@ function Header(props) {
              </div>
            ) : (
              <div className="flex" data-tut="reactourFifth">
-                {(!props?.templateId && !props?.isSelfSign) ||
-                  (!props.isGuestSignFlow && (
-                    <button
-                      onClick={() => window.history.go(-2)}
-                      type="button"
-                      className="op-btn op-btn-ghost op-btn-sm mr-[3px]"
-                    >
-                      {t("back")}
-                    </button>
-                  ))}
                {props?.currentSigner && (
                  <>
                    {props?.templateId && (
@@ -3,6 +3,7 @@ import BorderResize from "./BorderResize";
 import PlaceholderBorder from "./PlaceholderBorder";
 import { Rnd } from "react-rnd";
 import {
+  changeDateToMomentFormat,
  defaultWidthHeight,
  fontColorArr,
  fontsizeArr,
@@ -52,32 +53,6 @@ const selectFormat = (data) => {
  }
 };

-const changeDateToMomentFormat = (format) => {
-  switch (format) {
-    case "MM/dd/yyyy":
-      return "L";
-    case "dd-MM-yyyy":
-      return "DD-MM-YYYY";
-    case "dd/MM/yyyy":
-      return "DD/MM/YYYY";
-    case "MMMM dd, yyyy":
-      return "LL";
-    case "dd MMM, yyyy":
-      return "DD MMM, YYYY";
-    case "yyyy-MM-dd":
-      return "YYYY-MM-DD";
-    case "MM-dd-yyyy":
-      return "MM-DD-YYYY";
-    case "MM.dd.yyyy":
-      return "MM.DD.YYYY";
-    case "MMM dd, yyyy":
-      return "MMM DD, YYYY";
-    case "dd MMMM, yyyy":
-      return "DD MMMM, YYYY";
-    default:
-      return "L";
-  }
-};
 //function to get default format
 const getDefaultFormat = (dateFormat) => dateFormat || "MM/dd/yyyy";

@@ -199,7 +174,7 @@ function Placeholder(props) {
  }, [selectDate]);

  //`handleWidgetIdandPopup` is used to set current widget id and open relative popup
-  const handleWidgetIdandPopup = () => {
+  const handleWidgetIdandPopup = async () => {
    if (props.setSelectWidgetId) {
      props.setSelectWidgetId(props.pos.key);
    }
@@ -222,31 +197,31 @@ function Placeholder(props) {
      if (props?.ispublicTemplate) {
        props.handleUserDetails();
      } else {
-        if (props?.isNeedSign) {
-          //funcion is used to height widgets on top if two widgets on overlap
-          const getCurrentSignerPos = props.xyPosition.find(
-            (x) => x.Id === props.uniqueId
-          );
-          const updateZindex = handleHeighlightWidget(
-            getCurrentSignerPos,
-            props.pos.key,
-            props.pageNumber
-          );
-          const updatesignerPos = props.xyPosition.map((x) =>
-            x.Id === props.uniqueId ? { ...x, placeHolder: updateZindex } : x
-          );
-          props.setXyPosition(updatesignerPos);
-        }
-        if (
-          ["signature", "stamp", "image", "initials"].includes(props.pos.type)
-        ) {
-          props.setIsSignPad(true);
-          props.setSignKey(props.pos.key);
-          props.setIsStamp(props.pos.isStamp);
-        }
-        if (props.pos.type === "initials") {
-          props.setIsInitial(true);
-        }
+          if (props?.isNeedSign) {
+            //funcion is used to heightlight widgets on top if two widgets on overlap
+            const getCurrentSignerPos = props.xyPosition.find(
+              (x) => x.Id === props.uniqueId
+            );
+            const updateZindex = handleHeighlightWidget(
+              getCurrentSignerPos,
+              props.pos.key,
+              props.pageNumber
+            );
+            const updatesignerPos = props.xyPosition.map((x) =>
+              x.Id === props.uniqueId ? { ...x, placeHolder: updateZindex } : x
+            );
+            props.setXyPosition(updatesignerPos);
+          }
+          if (
+            ["signature", "stamp", "image", "initials"].includes(props.pos.type)
+          ) {
+            props.setIsSignPad(true);
+            props.setSignKey(props.pos.key);
+            props.setIsStamp(props.pos.isStamp);
+          }
+          if (props.pos.type === "initials") {
+            props.setIsInitial(true);
+          }
      }
    } else if (
      props.isPlaceholder &&
@@ -367,6 +342,8 @@ function Placeholder(props) {
      } else {
        widgetClickHandler();
      }
+      // }
+      // }
    } else {
      //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);
@@ -7,7 +7,8 @@ import {
  radioButtonWidget,
  range,
  textInputWidget,
-  textWidget
+  textWidget,
+  widgetDataValue
 } from "../../constant/Utils";
 import DatePicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
@@ -24,6 +25,8 @@ const widgetCls =
 function PlaceholderType(props) {
  const { t } = useTranslation();
  const type = props?.pos?.type;
+  const widgetData =
+    props.pos?.options?.defaultValue || props.pos?.options?.response;
  const widgetTypeTranslation = t(`widgets-name.${props?.pos?.type}`);
  const [selectOption, setSelectOption] = useState("");
  const [validatePlaceholder, setValidatePlaceholder] = useState("");
@@ -141,29 +144,6 @@ function PlaceholderType(props) {
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);

-  useEffect(() => {
-    if (
-      ["name", "email", "job title", "company"].includes(props.pos?.type) &&
-      props.isNeedSign &&
-      props.data?.signerObjId === props?.signerObjId
-    ) {
-      const defaultData = props.pos?.options?.defaultValue;
-      if (defaultData) {
-        setTextValue(defaultData);
-      }
-      if (props.pos?.options?.hint) {
-        setHint(props.pos?.options.hint);
-      } else {
-        setHint(props.pos?.type);
-      }
-    } else if ([textInputWidget].includes(props.pos?.type)) {
-      const defaultData = props.pos?.options?.defaultValue;
-      if (defaultData) {
-        setTextValue(defaultData);
-      }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props.pos?.options?.defaultValue]);
  const ExampleCustomInput = forwardRef(({ value, onClick }, ref) => (
    <div
      style={{
@@ -176,32 +156,30 @@ function PlaceholderType(props) {
      ref={ref}
    >
      {value}
-      <i className="fa-light fa-calendar  ml-[5px]"></i>
+      <i className="fa-light fa-calendar ml-[5px]"></i>
    </div>
  ));
  ExampleCustomInput.displayName = "ExampleCustomInput";
-
  useEffect(() => {
    if (
-      ["name", "email", "job title", "company"].includes(type) &&
+      ["name", "email", "job title", "company", textInputWidget].includes(
+        type
+      ) &&
      props.isNeedSign &&
      props.data?.signerObjId === props.signerObjId
    ) {
-      const isDefault = true;
-      const senderUser = localStorage.getItem(`Extand_Class`);
-      const jsonSender = JSON.parse(senderUser);
-      onChangeInput(
-        jsonSender && jsonSender[0],
-        null,
-        props.xyPosition,
-        null,
-        props.setXyPosition,
-        props.data.Id,
-        isDefault
-      );
+      if (widgetData) {
+        setTextValue(widgetData);
+      }
+    }
+
+    if (props.pos?.options?.hint) {
+      setHint(props.pos?.options.hint);
+    } else {
+      setHint(props.pos?.type);
    }
    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [type]);
+  }, [type, widgetData]);
  //function for show checked checkbox
  const selectCheckbox = (ind) => {
    const res = props.pos.options?.response;
@@ -462,10 +440,14 @@ function PlaceholderType(props) {
            props.isNeedSign &&
            (props.pos.options?.isReadOnly ||
              props.data?.signerObjId !== props.signerObjId)
-              ? " bg-black/68 select-none "
+              ? "select-none"
              : "" + textWidgetCls
          }`}
-          style={{ fontSize: fontSize, color: fontColor }}
+          style={{
+            fontSize: fontSize,
+            color: fontColor,
+            background: props.data?.blockColor
+          }}
          disabled={
            props.isNeedSign &&
            (props.pos.options?.isReadOnly ||
@@ -403,6 +403,7 @@ function RenderPdf(props) {
                onGetAnnotationsError={(error) => {
                  console.log("annotation error", error);
                }}
+                className="select-none touch-callout-none"
              />
            </Document>
          </div>
@@ -71,8 +71,15 @@ function SignPad(props) {
      } else if (tab === "typed") {
        setIsTab("type");
      } else if (tab === "default") {
-        setIsDefaultSign(true);
-        setIsTab("mysignature");
+        if (
+          (props?.isInitial && props?.myInitial) ||
+          (!props?.isInitial && props?.defaultSign)
+        ) {
+          setIsDefaultSign(true);
+          setIsTab("mysignature");
+        } else {
+          setIsTab("draw");
+        }
      } else {
        setIsTab(true);
      }
@@ -630,26 +637,59 @@ function SignPad(props) {
                <div className="p-[20px] h-full">
                  {isDefaultSign ? (
                    <>
-                      <div className="flex justify-center">
-                        <div
-                          className={`${props?.isInitial ? "intialSignatureCanvas" : "signatureCanvas"} bg-white border-[1.3px] border-[#007bff] flex flex-col justify-center items-center mb-[6px] cursor-pointer`}
-                        >
-                          <img
-                            alt="stamp img"
-                            className="w-full h-full object-contain bg-white"
-                            draggable="false"
-                            src={
-                              props?.isInitial
-                                ? props?.myInitial
-                                : props?.defaultSign
-                            }
-                          />
-                        </div>
-                      </div>
-                      {props.setIsAutoSign && autoSignAll()}
-                      <div className="flex justify-end">
-                        <SaveBtn />
-                      </div>
+                      {!props?.isInitial &&
+                        props?.defaultSign &&
+                        isTabEnabled("default") && (
+                          <>
+                            <div className="flex justify-center">
+                              <div
+                                className={`${props?.isInitial ? "intialSignatureCanvas" : "signatureCanvas"} bg-white border-[1.3px] border-[#007bff] flex flex-col justify-center items-center mb-[6px] cursor-pointer`}
+                              >
+                                <img
+                                  alt="stamp img"
+                                  className="w-full h-full object-contain bg-white"
+                                  draggable="false"
+                                  src={
+                                    props?.isInitial
+                                      ? props?.myInitial
+                                      : props?.defaultSign
+                                  }
+                                />
+                              </div>
+                            </div>
+                            {props.setIsAutoSign && autoSignAll()}
+                            <div className="flex justify-end">
+                              <SaveBtn />
+                            </div>
+                          </>
+                        )}
+
+                      {props?.isInitial &&
+                        props?.myInitial &&
+                        isTabEnabled("default") && (
+                          <>
+                            <div className="flex justify-center">
+                              <div
+                                className={`${props?.isInitial ? "intialSignatureCanvas" : "signatureCanvas"} bg-white border-[1.3px] border-[#007bff] flex flex-col justify-center items-center mb-[6px] cursor-pointer`}
+                              >
+                                <img
+                                  alt="stamp img"
+                                  className="w-full h-full object-contain bg-white"
+                                  draggable="false"
+                                  src={
+                                    props?.isInitial
+                                      ? props?.myInitial
+                                      : props?.defaultSign
+                                  }
+                                />
+                              </div>
+                            </div>
+                            {props.setIsAutoSign && autoSignAll()}
+                            <div className="flex justify-end">
+                              <SaveBtn />
+                            </div>
+                          </>
+                        )}
                    </>
                  ) : props?.isImageSelect || props?.isStamp ? (
                    !props?.image ? (
@@ -117,6 +117,7 @@ const WidgetNameModal = (props) => {
    }
  }

+
  const handleCheckboxChange = (index) => {
    // Update the state with the modified array
    setSignatureType((prev) =>
@@ -1,173 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Parse from "parse";
-import Alert from "../../../primitives/Alert";
-import Loader from "../../../primitives/Loader";
-import { useTranslation } from "react-i18next";
-
-const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
-  const folderPtr = {
-    __type: "Pointer",
-    className: folderCls,
-    objectId: parentFolderId
-  };
-  const { t } = useTranslation();
-  const [name, setName] = useState("");
-  const [folderList, setFolderList] = useState([]);
-  const [isAlert, setIsAlert] = useState(false);
-  const [isLoader, setIsLoader] = useState(false);
-  const [selectedParent, setSelectedParent] = useState();
-  const [alert, setAlert] = useState({ type: "info", message: "" });
-  useEffect(() => {
-    fetchFolder();
-    // eslint-disable-next-line
-  }, []);
-
-  const fetchFolder = async () => {
-    try {
-      const FolderQuery = new Parse.Query(folderCls);
-      if (parentFolderId) {
-        FolderQuery.equalTo("Folder", folderPtr);
-        FolderQuery.equalTo("Type", "Folder");
-        FolderQuery.notEqualTo("IsArchive", true);
-        FolderQuery.equalTo("CreatedBy", Parse.User.current());
-      } else {
-        FolderQuery.doesNotExist("Folder");
-        FolderQuery.equalTo("Type", "Folder");
-        FolderQuery.notEqualTo("IsArchive", true);
-        FolderQuery.equalTo("CreatedBy", Parse.User.current());
-      }
-
-      const res = await FolderQuery.find();
-      if (res) {
-        const result = JSON.parse(JSON.stringify(res));
-        if (result) {
-          setFolderList(result);
-        }
-      }
-    } catch (error) {
-      console.log("Err ", error);
-    }
-  };
-  const handleCreateFolder = async (event) => {
-    event.preventDefault();
-    handleLoader(true);
-    if (name) {
-      const currentUser = Parse.User.current();
-      const exsitQuery = new Parse.Query(folderCls);
-      exsitQuery.equalTo("Name", name);
-      exsitQuery.equalTo("Type", "Folder");
-      exsitQuery.notEqualTo("IsArchive", true);
-      if (parentFolderId) {
-        exsitQuery.equalTo("Folder", folderPtr);
-      }
-      const templExist = await exsitQuery.first();
-      if (templExist) {
-        setAlert({ type: "danger", message: t("folder-already-exist") });
-        setIsAlert(true);
-        setTimeout(() => {
-          setIsAlert(false);
-        }, 1000);
-      } else {
-        const template = new Parse.Object(folderCls);
-        template.set("Name", name);
-        template.set("Type", "Folder");
-
-        if (selectedParent) {
-          template.set("Folder", {
-            __type: "Pointer",
-            className: folderCls,
-            objectId: selectedParent
-          });
-        } else if (parentFolderId) {
-          template.set("Folder", folderPtr);
-        }
-        template.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
-        const res = await template.save();
-        if (res) {
-          handleLoader(false);
-          setAlert({
-            type: "success",
-            message: t("folder-created-successfully")
-          });
-          setIsAlert(true);
-          setTimeout(() => {
-            setIsAlert(false);
-          }, 1000);
-          if (onSuccess) {
-            onSuccess(res);
-          }
-        }
-      }
-    } else {
-      handleLoader(false);
-      setAlert({ type: "info", message: t("fill-folder-name") });
-      setIsAlert(true);
-      setTimeout(() => {
-        setIsAlert(false);
-      }, 1000);
-    }
-  };
-  const handleOptions = (e) => {
-    setSelectedParent(e.target.value);
-  };
-  const handleLoader = (status) => {
-    setIsLoader(status);
-  };
-  return (
-    <div>
-      {isAlert && <Alert type={alert.type}>{alert.message}</Alert>}
-      <div id="createFolder" className="relative">
-        {isLoader && (
-          <div className="absolute h-full w-full flex justify-center items-center">
-            <Loader />
-          </div>
-        )}
-        <h1 className="text-base font-semibold mt-[0.4rem]">
-          {t("create-folder")}
-        </h1>
-        <div className="text-xs mt-2">
-          <label className="block">
-            {t("name")}
-            <span className="text-red-500 text-[13px]">*</span>
-          </label>
-          <input
-            className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-            value={name}
-            onChange={(e) => setName(e.target.value)}
-            onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
-            onInput={(e) => e.target.setCustomValidity("")}
-            required
-          />
-        </div>
-        <div className="text-xs mt-2">
-          <label className="block">{t("parent-folder")}</label>
-          <select
-            value={selectedParent}
-            onChange={handleOptions}
-            className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content w-full text-xs"
-          >
-            <option>select</option>
-            {folderList.length > 0 &&
-              folderList.map((x) => (
-                <option key={x.objectId} value={x.objectId}>
-                  {x.Name}
-                </option>
-              ))}
-          </select>
-        </div>
-        <div>
-          <button
-            onClick={handleCreateFolder}
-            disabled={isLoader}
-            className="op-btn op-btn-primary op-btn-sm mt-3"
-          >
-            <i className="fa-light fa-plus"></i>
-            <span>{t("create")}</span>
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default CreateFolder;
@@ -0,0 +1,109 @@
+import React, { useState } from "react";
+import Parse from "parse";
+import Alert from "../../../primitives/Alert";
+import Loader from "../../../primitives/Loader";
+import { useTranslation } from "react-i18next";
+
+const CreateFolder = ({ parentFolderId, onSuccess, folderCls, onBack }) => {
+  const folderPtr = {
+    __type: "Pointer",
+    className: folderCls,
+    objectId: parentFolderId
+  };
+  const { t } = useTranslation();
+  const [name, setName] = useState("");
+  const [isLoader, setIsLoader] = useState(false);
+  const [alert, setAlert] = useState({ type: "info", message: "" });
+  const showToast = (type, msg) => {
+    setAlert({ type: type, message: msg });
+    setTimeout(() => setAlert({ type: type, message: "" }), 1000);
+  };
+  const handleCreateFolder = async (event) => {
+    event.preventDefault();
+    handleLoader(true);
+    if (name) {
+      const currentUser = Parse.User.current();
+      const exsitQuery = new Parse.Query(folderCls);
+      exsitQuery.equalTo("Name", name);
+      exsitQuery.equalTo("Type", "Folder");
+      exsitQuery.notEqualTo("IsArchive", true);
+      if (parentFolderId) {
+        exsitQuery.equalTo("Folder", folderPtr);
+      }
+      const templExist = await exsitQuery.first();
+      if (templExist) {
+        showToast("danger", t("folder-already-exist"));
+      } else {
+        const template = new Parse.Object(folderCls);
+        template.set("Name", name);
+        template.set("Type", "Folder");
+        if (parentFolderId) {
+          template.set("Folder", folderPtr);
+        }
+        template.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
+        const res = await template.save();
+        if (res) {
+          handleLoader(false);
+          showToast("success", t("folder-created-successfully"));
+          onSuccess && onSuccess(res?.toJSON());
+        }
+      }
+    } else {
+      handleLoader(false);
+      showToast("info", t("fill-folder-name"));
+    }
+  };
+  const handleLoader = (status) => setIsLoader(status);
+
+  return (
+    <div>
+      {alert.message && <Alert type={alert.type}>{alert.message}</Alert>}
+      <div id="createFolder" className="relative">
+        {isLoader && (
+          <div className="absolute h-full w-full flex justify-center items-center">
+            <Loader />
+          </div>
+        )}
+        <h1 className="text-base font-semibold mt-[0.4rem]">
+          {t("create-folder")}
+        </h1>
+        <div className="text-xs mt-2">
+          <label className="block">
+            {t("name")}
+            <span className="text-red-500 text-[13px]">*</span>
+          </label>
+          <input
+            className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+            value={name}
+            onChange={(e) => setName(e.target.value)}
+            onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
+            onInput={(e) => e.target.setCustomValidity("")}
+            required
+          />
+        </div>
+        <div className="flex justify-between items-center py-[1rem] ">
+          <button
+            onClick={handleCreateFolder}
+            disabled={isLoader}
+            className="op-btn op-btn-primary op-btn-sm"
+          >
+            <i className="fa-light fa-plus"></i>
+            <span>{t("create")}</span>
+          </button>
+          {onBack && (
+            <div
+              className="op-btn op-btn-seconday op-btn-sm"
+              title={t("back")}
+              onClick={() => onBack()}
+            >
+              <i className="fa-light fa-arrow-left" aria-hidden="true"></i>
+              <span className="text-xs">{t("back")}</span>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default CreateFolder;
@@ -45,7 +45,7 @@ const DateFormatSelector = (props) => {
          </option>
        ))}
      </select>
-      <div className="flex flex-col md:flex-row md:gap-4 mt-[0.75rem] text-[12px]">
+      <div className="flex flex-row gap-4 mt-[0.75rem] text-[12px]">
        <div className="flex items-center gap-2 ml-2">
          <input
            type="radio"
@@ -105,49 +105,45 @@ const FolderModal = (props) => {
  // `handleCancel` is call when user click on folder name from path/tab in popup
  const removeTabListItem = async (e, i) => {
    e.preventDefault();
-    // setEditable(false);
-    if (!isAdd) {
-      setIsLoader(true);
-      let folderPtr;
-      if (i) {
-        setFolderList([]);
-        let list = tabList.filter((itm, j) => {
-          if (j <= i) {
-            return itm;
-          }
-        });
-        let _len = list.length - 1;
-        folderPtr = {
-          __type: "Pointer",
-          className: props.folderCls,
-          objectId: list[_len].objectId
-        };
-        setTabList(list);
-      } else {
-        setClickFolder({});
-        setFolderList([]);
-        setTabList([]);
-      }
+
+    setIsLoader(true);
+    setIsAdd(false);
+    if (i !== undefined) {
+      setFolderList([]);
+      const list = tabList.filter((folder, j) => j <= i && folder);
+      const index = list.length - 1;
+      const folderPtr = {
+        __type: "Pointer",
+        className: props.folderCls,
+        objectId: list[index].objectId
+      };
+      setTabList(list);
      fetchFolder(folderPtr);
+    } else {
+      setClickFolder({});
+      setFolderList([]);
+      setTabList([]);
+      fetchFolder();
    }
  };
  // `handleCreate` is used to open folder creation form in popup
-  const handleCreate = () => {
-    setIsAdd(!isAdd);
-  };
+  const handleCreate = () => setIsAdd(true);
+  const handleBack = () => setIsAdd(false);
  // `handleAddFolder` is call when user folder created successfully and it fetch folder list on the basis of folderPtr or without folderPtr
  const handleAddFolder = (newFolder) => {
-    props.setPdfData((prev) => [...prev, newFolder?.toJSON()]);
+    props.setPdfData((prev) => [...prev, newFolder]);
    if (clickFolder && clickFolder.ObjectId) {
      fetchFolder({
        __type: "Pointer",
        className: props.folderCls,
-        objectId: clickFolder.ObjectId
+        objectId: newFolder.objectId // clickFolder.ObjectId
      });
    } else {
      fetchFolder();
    }
-    handleCreate();
+    setClickFolder({ ObjectId: newFolder.objectId, Name: newFolder.Name });
+    setTabList((prev) => [...prev, newFolder]);
+    handleBack();
  };
  return (
    <div className="text-xs mt-2">
@@ -180,54 +176,57 @@ const FolderModal = (props) => {
              ))}
            <hr className="bg-[#8a8a8a] mt-[0.750rem]" />
          </div>
-          <div className="mt-2 mb-3">
-            <div className="max-h-[210px] overflow-auto">
-              {!isAdd && folderList.length > 0
-                ? folderList.map((folder) => (
-                    <div
-                      key={folder.objectId}
-                      className={`${
-                        folder.Type === "Folder"
-                          ? "cursor-pointer"
-                          : "cursor-default"
-                      } border-b-[1px] border-[#8a8a8a] py-2 mb-0.5"`}
-                      onClick={() =>
-                        folder.Type === "Folder" && handleSelect(folder)
-                      }
-                    >
-                      <div className="flex items-center gap-2">
-                        {folder.Type === "Folder" ? (
-                          <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            viewBox="0 0 512 512"
-                            className="w-[1.4rem] h-[1.4rem] fill-current op-text-secondary"
-                          >
-                            <path d="M64 480H448c35.3 0 64-28.7 64-64V160c0-35.3-28.7-64-64-64H288c-10.1 0-19.6-4.7-25.6-12.8L243.2 57.6C231.1 41.5 212.1 32 192 32H64C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64z" />
-                          </svg>
-                        ) : (
-                          <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            viewBox="0 0 384 512"
-                            className="w-[1.4rem] h-[1.4rem] fill-current op-text-primary"
-                          >
-                            <path d="M374.629 150.627L233.371 9.373C227.371 3.371 219.23 0 210.746 0H64C28.652 0 0 28.652 0 64V448C0 483.345 28.652 512 64 512H320C355.348 512 384 483.345 384 448V173.254C384 164.767 380.629 156.629 374.629 150.627ZM224 22.629L361.375 160H248C234.781 160 224 149.234 224 136V22.629ZM368 448C368 474.467 346.469 496 320 496H64C37.531 496 16 474.467 16 448V64C16 37.533 37.531 16 64 16H208V136C208 158.062 225.938 176 248 176H368V448ZM96 264C96 268.406 99.594 272 104 272H280C284.406 272 288 268.406 288 264S284.406 256 280 256H104C99.594 256 96 259.594 96 264ZM280 320H104C99.594 320 96 323.594 96 328S99.594 336 104 336H280C284.406 336 288 332.406 288 328S284.406 320 280 320ZM280 384H104C99.594 384 96 387.594 96 392S99.594 400 104 400H280C284.406 400 288 396.406 288 392S284.406 384 280 384Z" />
-                          </svg>
-                        )}
-                        <span className="font-semibold">{folder.Name}</span>
+          <div className={`${!isAdd ? "mb-3" : ""} mt-2`}>
+            {!isAdd && (
+              <div className="max-h-[210px] overflow-auto">
+                {folderList.length > 0
+                  ? folderList.map((folder) => (
+                      <div
+                        key={folder.objectId}
+                        className={`${
+                          folder.Type === "Folder"
+                            ? "cursor-pointer"
+                            : "cursor-default"
+                        } border-b-[1px] border-[#8a8a8a] py-2 mb-0.5"`}
+                        onClick={() =>
+                          folder.Type === "Folder" && handleSelect(folder)
+                        }
+                      >
+                        <div className="flex items-center gap-2">
+                          {folder.Type === "Folder" ? (
+                            <svg
+                              xmlns="http://www.w3.org/2000/svg"
+                              viewBox="0 0 512 512"
+                              className="w-[1.4rem] h-[1.4rem] fill-current op-text-secondary"
+                            >
+                              <path d="M64 480H448c35.3 0 64-28.7 64-64V160c0-35.3-28.7-64-64-64H288c-10.1 0-19.6-4.7-25.6-12.8L243.2 57.6C231.1 41.5 212.1 32 192 32H64C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64z" />
+                            </svg>
+                          ) : (
+                            <svg
+                              xmlns="http://www.w3.org/2000/svg"
+                              viewBox="0 0 384 512"
+                              className="w-[1.4rem] h-[1.4rem] fill-current op-text-primary"
+                            >
+                              <path d="M374.629 150.627L233.371 9.373C227.371 3.371 219.23 0 210.746 0H64C28.652 0 0 28.652 0 64V448C0 483.345 28.652 512 64 512H320C355.348 512 384 483.345 384 448V173.254C384 164.767 380.629 156.629 374.629 150.627ZM224 22.629L361.375 160H248C234.781 160 224 149.234 224 136V22.629ZM368 448C368 474.467 346.469 496 320 496H64C37.531 496 16 474.467 16 448V64C16 37.533 37.531 16 64 16H208V136C208 158.062 225.938 176 248 176H368V448ZM96 264C96 268.406 99.594 272 104 272H280C284.406 272 288 268.406 288 264S284.406 256 280 256H104C99.594 256 96 259.594 96 264ZM280 320H104C99.594 320 96 323.594 96 328S99.594 336 104 336H280C284.406 336 288 332.406 288 328S284.406 320 280 320ZM280 384H104C99.594 384 96 387.594 96 392S99.594 400 104 400H280C284.406 400 288 396.406 288 392S284.406 384 280 384Z" />
+                            </svg>
+                          )}
+                          <span className="font-semibold">{folder.Name}</span>
+                        </div>
                      </div>
-                    </div>
-                  ))
-                : !isLoader && (
-                    <div className="text-base-content text-center my-2">
-                      {t("no-data")}
-                    </div>
-                  )}
-            </div>
+                    ))
+                  : !isLoader && (
+                      <div className="text-base-content text-center my-2">
+                        {t("no-data")}
+                      </div>
+                    )}
+              </div>
+            )}
            {isAdd && (
              <CreateFolder
                parentFolderId={clickFolder && clickFolder.ObjectId}
                folderCls={props.folderCls}
                onSuccess={handleAddFolder}
+                onBack={handleBack}
              />
            )}
            {isLoader && (
@@ -238,33 +237,26 @@ const FolderModal = (props) => {
          </div>
        </div>
        <hr />
-        <div className="flex justify-between items-center py-[.75rem] px-[1.25rem]">
-          <div
-            className="op-btn op-btn-seconday op-btn-sm"
-            title={t("save-here")}
-            onClick={handleCreate}
-          >
-            {isAdd ? (
-              <>
-                <i className="fa-light fa-arrow-left" aria-hidden="true"></i>
-                <span className="text-xs">{t("back")}</span>
-              </>
-            ) : (
-              <>
-                <i className="fa-light fa-square-plus" aria-hidden="true"></i>
-                <span className="">{t("add-folder")}</span>
-              </>
-            )}
+        {!isAdd && (
+          <div className="flex justify-between items-center py-[.75rem] px-[1.25rem]">
+            <div
+              className="op-btn op-btn-primary op-btn-sm"
+              title={t("save-here")}
+              onClick={handleSubmit}
+            >
+              <i className="fa-light fa-save" aria-hidden="true"></i>
+              {t("save-here")}
+            </div>
+            <div
+              className="op-btn op-btn-seconday op-btn-sm"
+              title={t("add-folder")}
+              onClick={handleCreate}
+            >
+              <i className="fa-light fa-square-plus" aria-hidden="true"></i>
+              <span className="">{t("add-folder")}</span>
+            </div>
          </div>
-          <div
-            className="op-btn op-btn-primary op-btn-sm"
-            title={t("save-here")}
-            onClick={handleSubmit}
-          >
-            <i className="fa-light fa-save" aria-hidden="true"></i>
-            {t("save-here")}
-          </div>
-        </div>
+        )}
      </ModalUi>
    </div>
  );
@@ -125,50 +125,46 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
  // `handleCancel` is call when user click on folder name from path/tab in popup
  const removeTabListItem = async (e, i) => {
    e.preventDefault();
-    // setEditable(false);
-    if (!isAdd) {
-      setIsLoader(true);
-      let folderPtr;
-      if (i) {
-        setFolderList([]);
-        let list = tabList.filter((itm, j) => {
-          if (j <= i) {
-            return itm;
-          }
-        });
-        let _len = list.length - 1;
-        folderPtr = {
-          __type: "Pointer",
-          className: folderCls,
-          objectId: list[_len].objectId
-        };
-        setTabList(list);
-      } else {
-        setClickFolder({});
-        setSelectedFolder({});
-        setFolderList([]);
-        setTabList([]);
-      }
+    setIsLoader(true);
+    setIsAdd(false);
+    if (i !== undefined) {
+      setFolderList([]);
+      const list = tabList.filter((folder, j) => j <= i && folder);
+      const index = list.length - 1;
+      const folderPtr = {
+        __type: "Pointer",
+        className: folderCls,
+        objectId: list[index].objectId
+      };
      fetchFolder(folderPtr);
+      setTabList(list);
+    } else {
+      setClickFolder({});
+      setSelectedFolder({});
+      setFolderList([]);
+      setTabList([]);
+      fetchFolder();
    }
  };
  // `handleCreate` is used to open folder creation form in popup
-  const handleCreate = () => {
-    setIsAdd(!isAdd);
-  };
+  const handleCreate = () => setIsAdd(true);
+  const handleBack = () => setIsAdd(false);
+
  // `handleAddFolder` is call when user folder created successfully and it fetch folder list on the basis of folderPtr or without folderPtr
-  const handleAddFolder = () => {
+  const handleAddFolder = (newFolder) => {
    setFolderList([]);
    if (clickFolder && clickFolder.ObjectId) {
      fetchFolder({
        __type: "Pointer",
        className: folderCls,
-        objectId: clickFolder.ObjectId
+        objectId: newFolder.objectId // clickFolder.ObjectId
      });
    } else {
      fetchFolder();
    }
-    handleCreate();
+    setClickFolder({ ObjectId: newFolder.objectId, Name: newFolder.Name });
+    setTabList((prev) => [...prev, newFolder]);
+    handleBack();
  };
  return (
    <div className="text-xs mt-2 ">
@@ -246,53 +242,56 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
            <hr className="bg-[#8a8a8a] mt-[0.750rem]" />
          </div>
          <div className="mb-2">
-            <div className="max-h-[210px] overflow-auto">
-              {!isAdd && folderList.length > 0
-                ? folderList.map((folder) => (
-                    <div
-                      key={folder.objectId}
-                      className={`${
-                        folder.Type === "Folder"
-                          ? "cursor-pointer"
-                          : "cursor-default"
-                      } border-b-[1px] border-[#8a8a8a] py-2 mb-0.5"`}
-                      onClick={() =>
-                        folder.Type === "Folder" && handleSelect(folder)
-                      }
-                    >
-                      <div className="flex items-center gap-2">
-                        {folder.Type === "Folder" ? (
-                          <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            viewBox="0 0 512 512"
-                            className="w-[1.4rem] h-[1.4rem] fill-current op-text-secondary"
-                          >
-                            <path d="M64 480H448c35.3 0 64-28.7 64-64V160c0-35.3-28.7-64-64-64H288c-10.1 0-19.6-4.7-25.6-12.8L243.2 57.6C231.1 41.5 212.1 32 192 32H64C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64z" />
-                          </svg>
-                        ) : (
-                          <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            viewBox="0 0 384 512"
-                            className="w-[1.4rem] h-[1.4rem] fill-current op-text-primary"
-                          >
-                            <path d="M374.629 150.627L233.371 9.373C227.371 3.371 219.23 0 210.746 0H64C28.652 0 0 28.652 0 64V448C0 483.345 28.652 512 64 512H320C355.348 512 384 483.345 384 448V173.254C384 164.767 380.629 156.629 374.629 150.627ZM224 22.629L361.375 160H248C234.781 160 224 149.234 224 136V22.629ZM368 448C368 474.467 346.469 496 320 496H64C37.531 496 16 474.467 16 448V64C16 37.533 37.531 16 64 16H208V136C208 158.062 225.938 176 248 176H368V448ZM96 264C96 268.406 99.594 272 104 272H280C284.406 272 288 268.406 288 264S284.406 256 280 256H104C99.594 256 96 259.594 96 264ZM280 320H104C99.594 320 96 323.594 96 328S99.594 336 104 336H280C284.406 336 288 332.406 288 328S284.406 320 280 320ZM280 384H104C99.594 384 96 387.594 96 392S99.594 400 104 400H280C284.406 400 288 396.406 288 392S284.406 384 280 384Z" />
-                          </svg>
-                        )}
-                        <span className="font-semibold">{folder.Name}</span>
+            {!isAdd && (
+              <div className="max-h-[210px] overflow-auto">
+                {folderList.length > 0
+                  ? folderList.map((folder) => (
+                      <div
+                        key={folder.objectId}
+                        className={`${
+                          folder.Type === "Folder"
+                            ? "cursor-pointer"
+                            : "cursor-default"
+                        } border-b-[1px] border-[#8a8a8a] py-2 mb-0.5"`}
+                        onClick={() =>
+                          folder.Type === "Folder" && handleSelect(folder)
+                        }
+                      >
+                        <div className="flex items-center gap-2">
+                          {folder.Type === "Folder" ? (
+                            <svg
+                              xmlns="http://www.w3.org/2000/svg"
+                              viewBox="0 0 512 512"
+                              className="w-[1.4rem] h-[1.4rem] fill-current op-text-secondary"
+                            >
+                              <path d="M64 480H448c35.3 0 64-28.7 64-64V160c0-35.3-28.7-64-64-64H288c-10.1 0-19.6-4.7-25.6-12.8L243.2 57.6C231.1 41.5 212.1 32 192 32H64C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64z" />
+                            </svg>
+                          ) : (
+                            <svg
+                              xmlns="http://www.w3.org/2000/svg"
+                              viewBox="0 0 384 512"
+                              className="w-[1.4rem] h-[1.4rem] fill-current op-text-primary"
+                            >
+                              <path d="M374.629 150.627L233.371 9.373C227.371 3.371 219.23 0 210.746 0H64C28.652 0 0 28.652 0 64V448C0 483.345 28.652 512 64 512H320C355.348 512 384 483.345 384 448V173.254C384 164.767 380.629 156.629 374.629 150.627ZM224 22.629L361.375 160H248C234.781 160 224 149.234 224 136V22.629ZM368 448C368 474.467 346.469 496 320 496H64C37.531 496 16 474.467 16 448V64C16 37.533 37.531 16 64 16H208V136C208 158.062 225.938 176 248 176H368V448ZM96 264C96 268.406 99.594 272 104 272H280C284.406 272 288 268.406 288 264S284.406 256 280 256H104C99.594 256 96 259.594 96 264ZM280 320H104C99.594 320 96 323.594 96 328S99.594 336 104 336H280C284.406 336 288 332.406 288 328S284.406 320 280 320ZM280 384H104C99.594 384 96 387.594 96 392S99.594 400 104 400H280C284.406 400 288 396.406 288 392S284.406 384 280 384Z" />
+                            </svg>
+                          )}
+                          <span className="font-semibold">{folder.Name}</span>
+                        </div>
                      </div>
-                    </div>
-                  ))
-                : !isLoader && (
-                    <div className="text-base-content text-center my-2">
-                      {t("no-data")}
-                    </div>
-                  )}
-            </div>
+                    ))
+                  : !isLoader && (
+                      <div className="text-base-content text-center my-2">
+                        {t("no-data")}
+                      </div>
+                    )}
+              </div>
+            )}
            {isAdd && (
              <CreateFolder
                parentFolderId={clickFolder && clickFolder.ObjectId}
                folderCls={folderCls}
                onSuccess={handleAddFolder}
+                onBack={handleBack}
              />
            )}
            {isLoader && (
@@ -303,33 +302,26 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
          </div>
        </div>
        <hr />
-        <div className="flex justify-between items-center py-[.75rem] px-[1.25rem]">
-          <div
-            className="op-btn op-btn-seconday op-btn-sm"
-            title={t("save-here")}
-            onClick={handleCreate}
-          >
-            {isAdd ? (
-              <>
-                <i className="fa-light fa-arrow-left" aria-hidden="true"></i>
-                <span className="text-xs">{t("back")}</span>
-              </>
-            ) : (
-              <>
-                <i className="fa-light fa-square-plus" aria-hidden="true"></i>
-                <span className="">{t("add-folder")}</span>
-              </>
-            )}
+        {!isAdd && (
+          <div className="flex justify-between items-center py-[.75rem] px-[1.25rem]">
+            <div
+              className="op-btn op-btn-primary op-btn-sm"
+              title={t("save-here")}
+              onClick={handleSubmit}
+            >
+              <i className="fa-light fa-save" aria-hidden="true"></i>
+              {t("save-here")}
+            </div>
+            <div
+              className="op-btn op-btn-seconday op-btn-sm"
+              title={t("add-folder")}
+              onClick={handleCreate}
+            >
+              <i className="fa-light fa-square-plus" aria-hidden="true"></i>
+              <span className="">{t("add-folder")}</span>
+            </div>
          </div>
-          <div
-            className="op-btn op-btn-primary op-btn-sm"
-            title={t("save-here")}
-            onClick={handleSubmit}
-          >
-            <i className="fa-light fa-save" aria-hidden="true"></i>
-            {t("save-here")}
-          </div>
-        </div>
+        )}
      </ModalUi>
    </div>
  );
@@ -117,7 +117,9 @@ const SignersInput = (props) => {
  };
  const loadOptions = async (inputValue) => {
    try {
-      const contactRes = await findContact(inputValue);
+      const contactRes = await findContact(
+        inputValue,
+      );
      if (contactRes) {
        const res = JSON.parse(JSON.stringify(contactRes));
        //compareArrays is a function where compare between two array (total signersList and dcument signers list)
@@ -152,9 +154,7 @@ const SignersInput = (props) => {
        {props.label ? props.label : t("signers")}
        {props.required && <span className="text-red-500 text-[13px]">*</span>}
        <span
-          className={`z-[${
-            props?.helptextZindex ? props.helptextZindex : 30
-          }] absolute ml-1 text-xs`}
+          className={`z-[${props?.helptextZindex ? props.helptextZindex : 30}] absolute ml-1 text-xs`}
        >
          <Tooltip
            id={`${props.label ? props.label : "signers"}-tooltip`}
@@ -3,7 +3,8 @@ import { useTranslation } from "react-i18next";
 import { NavLink } from "react-router";

 const Menu = ({ item, isOpen, closeSidebar }) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const drivename = appName === "OpenSign™" ? "OpenSign™" : "";
  const { t } = useTranslation();
  return (
@@ -3,7 +3,8 @@ import { useTranslation } from "react-i18next";
 import { NavLink } from "react-router";

 const Submenu = ({ item, closeSidebar, toggleSubmenu, submenuOpen }) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const drivename = appName === "OpenSign™" ? "OpenSign™" : "";
  const { t } = useTranslation();
  const { title, icon, children } = item;
@@ -7,7 +7,9 @@ import { appInfo } from "./appinfo";
 import { saveAs } from "file-saver";
 import printModule from "print-js";
 import fontkit from "@pdf-lib/fontkit";
-import { themeColor } from "./const";
+import {
+  themeColor
+} from "./const";
 import { format, toZonedTime } from "date-fns-tz";

 export const fontsizeArr = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28];
@@ -135,12 +137,15 @@ export const pdfNewWidthFun = (divRef) => {
 };

 //`contractUsers` function is used to get contract_User details
-export const contractUsers = async () => {
+export const contractUsers = async (
+) => {
  try {
    const url = `${localStorage.getItem("baseUrl")}functions/getUserDetails`;
    const parseAppId = localStorage.getItem("parseAppId");
-    const accesstoken = localStorage.getItem("accesstoken");
-    const token = { "X-Parse-Session-Token": accesstoken };
+    const accesstoken =
+      localStorage.getItem("accesstoken");
+    const token =
+          { "X-Parse-Session-Token": accesstoken };
    const headers = {
      headers: {
        "Content-Type": "application/json",
@@ -272,7 +277,33 @@ export const selectFormat = (data) => {
  }
 };

-export const addWidgetOptions = (type, signer) => {
+export const changeDateToMomentFormat = (format) => {
+  switch (format) {
+    case "MM/dd/yyyy":
+      return "L";
+    case "dd-MM-yyyy":
+      return "DD-MM-YYYY";
+    case "dd/MM/yyyy":
+      return "DD/MM/YYYY";
+    case "MMMM dd, yyyy":
+      return "LL";
+    case "dd MMM, yyyy":
+      return "DD MMM, YYYY";
+    case "yyyy-MM-dd":
+      return "YYYY-MM-DD";
+    case "MM-dd-yyyy":
+      return "MM-DD-YYYY";
+    case "MM.dd.yyyy":
+      return "MM.DD.YYYY";
+    case "MMM dd, yyyy":
+      return "MMM DD, YYYY";
+    case "dd MMMM, yyyy":
+      return "DD MMMM, YYYY";
+    default:
+      return "L";
+  }
+};
+export const addWidgetOptions = (type, signer, widgetValue) => {
  const defaultOpt = { name: type, status: "required" };
  switch (type) {
    case "signature":
@@ -289,11 +320,11 @@ export const addWidgetOptions = (type, signer) => {
    case "initials":
      return defaultOpt;
    case "name":
-      return { ...defaultOpt };
+      return { ...defaultOpt, defaultValue: widgetValue ? widgetValue : "" };
    case "company":
-      return { ...defaultOpt };
+      return { ...defaultOpt, defaultValue: widgetValue ? widgetValue : "" };
    case "job title":
-      return { ...defaultOpt };
+      return { ...defaultOpt, defaultValue: widgetValue ? widgetValue : "" };
    case "date": {
      const dateFormat = signer?.DateFormat
        ? selectFormat(signer?.DateFormat)
@@ -307,7 +338,11 @@ export const addWidgetOptions = (type, signer) => {
    case "image":
      return defaultOpt;
    case "email":
-      return { ...defaultOpt, validation: { type: "email", pattern: "" } };
+      return {
+        ...defaultOpt,
+        validation: { type: "email", pattern: "" },
+        defaultValue: widgetValue ? widgetValue : ""
+      };
    case "dropdown":
      return defaultOpt;
    case radioButtonWidget:
@@ -530,7 +565,7 @@ export const signPdfFun = async (
  documentId,
  signerObjectId,
  objectId,
-  widgets
+  widgets,
 ) => {
  let isCustomCompletionMail = false;
  try {
@@ -539,7 +574,10 @@ export const signPdfFun = async (
    if (tenantDetails && tenantDetails === "user does not exist!") {
      return { status: "error", message: "User does not exist." };
    } else {
-      if (tenantDetails?.CompletionBody && tenantDetails?.CompletionSubject) {
+      if (
+        tenantDetails?.CompletionBody &&
+        tenantDetails?.CompletionSubject
+      ) {
        isCustomCompletionMail = true;
      }
    }
@@ -829,7 +867,8 @@ export const onChangeInput = (
                ...position,
                options: {
                  ...position.options,
-                  response: value
+                  response: value,
+                  defaultValue:""
                }
              };
            }
@@ -983,21 +1022,21 @@ export const calculateInitialWidthHeight = (widgetData) => {
  document.body.removeChild(span);
  return { getWidth: width, getHeight: height };
 };
-export const addInitialData = (signerPos, setXyPosition, value, userId) => {
-  function widgetDataValue(type) {
-    switch (type) {
-      case "name":
-        return value?.Name;
-      case "company":
-        return value?.Company;
-      case "job title":
-        return value?.JobTitle;
-      case "email":
-        return value?.Email;
-      default:
-        return "";
-    }
+export const widgetDataValue = (type, value) => {
+  switch (type) {
+    case "name":
+      return value?.Name;
+    case "company":
+      return value?.Company;
+    case "job title":
+      return value?.JobTitle;
+    case "email":
+      return value?.Email;
+    default:
+      return "";
  }
+};
+export const addInitialData = (signerPos, setXyPosition, value, userId) => {
  return signerPos.map((item) => {
    if (item.placeHolder && item.placeHolder.length > 0) {
      // If there is a nested array, recursively add the field to the last object
@@ -1022,7 +1061,7 @@ export const addInitialData = (signerPos, setXyPosition, value, userId) => {
        // Adjust this line to add the desired field
      };
    } else {
-      const widgetData = widgetDataValue(item.type);
+      const widgetData = widgetDataValue(item.type, value);
      if (["name", "company", "job title", "email"].includes(item.type)) {
        return {
          ...item,
@@ -1040,7 +1079,8 @@ export const addInitialData = (signerPos, setXyPosition, value, userId) => {

 //function for embed document id
 export const embedDocId = async (pdfDoc, documentId, allPages) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  // `fontBytes` is used to embed custom font in pdf
  const fontBytes = await fileasbytes(
    "https://cdn.opensignlabs.com/webfonts/times.ttf"
@@ -1049,7 +1089,8 @@ export const embedDocId = async (pdfDoc, documentId, allPages) => {
  const font = await pdfDoc.embedFont(fontBytes, { subset: true });
  for (let i = 0; i < allPages; i++) {
    const fontSize = 10;
-    const textContent = documentId && `${appName} DocumentId: ${documentId} `;
+    const textContent =
+          documentId && `${appName} DocumentId: ${documentId} `;
    const pages = pdfDoc.getPages();
    const page = pages[i];
    try {
@@ -1874,7 +1915,9 @@ export const placeholderHeight = (pos) => {
 };

 //function for getting contracts_contactbook details
-export const contactBook = async (objectId) => {
+export const contactBook = async (
+  objectId,
+) => {
  const result = await axios
    .get(
      `${localStorage.getItem(
@@ -1884,7 +1927,8 @@ export const contactBook = async (objectId) => {
        headers: {
          "Content-Type": "application/json",
          "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+          "X-Parse-Session-Token":
+            localStorage.getItem("accesstoken")
        }
      }
    )
@@ -1902,9 +1946,12 @@ export const contactBook = async (objectId) => {
 };

 //function for getting document details from contract_Documents class
-export const contractDocument = async (documentId) => {
+export const contractDocument = async (
+  documentId,
+) => {
  const data = { docId: documentId };
-  const token = { sessionToken: localStorage.getItem("accesstoken") };
+  const token =
+        { sessionToken: localStorage.getItem("accesstoken") };
  const documentDeatils = await axios
    .post(`${localStorage.getItem("baseUrl")}functions/getDocument`, data, {
      headers: {
@@ -2088,31 +2135,36 @@ export const getFileName = (fileUrl) => {

 //fetch tenant app logo from `partners_Tenant` class by domain name
 export const getAppLogo = async () => {
-  const domain = window.location.host;
-  try {
-    const tenant = await Parse.Cloud.run("getlogobydomain", {
-      domain: domain
-    });
-    if (tenant) {
-      localStorage.setItem("appname", "OpenSign™");
-      return { logo: tenant?.logo, user: tenant?.user };
+    const domain = window.location.host;
+    try {
+      const tenant = await Parse.Cloud.run("getlogobydomain", {
+        domain: domain
+      });
+      if (tenant) {
+          localStorage.setItem("appname", "OpenSign™");
+        return { logo: tenant?.logo, user: tenant?.user };
+      }
+    } catch (err) {
+      console.log("err in getlogo ", err);
+      if (err?.message?.includes("valid JSON")) {
+        return { logo: appInfo.applogo, user: "exist", error: "invalid_json" };
+      } else {
+        return { logo: appInfo.applogo, user: "exist" };
+      }
    }
-  } catch (err) {
-    console.log("err in getlogo ", err);
-    if (err?.message?.includes("valid JSON")) {
-      return { logo: appInfo.applogo, user: "exist", error: "invalid_json" };
-    } else {
-      return { logo: appInfo.applogo, user: "exist" };
-    }
-  }
 };
-export const getTenantDetails = async (objectId, contactId) => {
+export const getTenantDetails = async (
+  objectId,
+  contactId
+) => {
  try {
    const url = `${localStorage.getItem("baseUrl")}functions/gettenant`;
    const parseAppId = localStorage.getItem("parseAppId");
    const accesstoken = localStorage.getItem("accesstoken");
-    const token = { "X-Parse-Session-Token": accesstoken };
-    const data = { userId: objectId, contactId: contactId };
+    const token =
+          { "X-Parse-Session-Token": accesstoken };
+    const data =
+          { userId: objectId, contactId: contactId };
    const res = await axios.post(url, data, {
      headers: {
        "Content-Type": "application/json",
@@ -2193,7 +2245,7 @@ export const handleSendOTP = async (email) => {
      "X-Parse-Application-Id": localStorage.getItem("parseAppId")
    };
    const body = {
-      email: email
+      email: email,
    };
    await axios.post(url, body, { headers: headers });
  } catch (error) {
@@ -2201,7 +2253,8 @@ export const handleSendOTP = async (email) => {
  }
 };
 export const fetchUrl = async (url, pdfName) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  try {
    const response = await fetch(url);
    if (!response.ok) {
@@ -2215,7 +2268,11 @@ export const fetchUrl = async (url, pdfName) => {
    console.error("Error downloading the file:", error);
  }
 };
-export const getSignedUrl = async (pdfUrl, docId, templateId) => {
+export const getSignedUrl = async (
+  pdfUrl,
+  docId,
+  templateId
+) => {
  //use only axios here due to public template sign
  const axiosRes = await axios.post(
    `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
@@ -2276,7 +2333,10 @@ export const handleDownloadPdf = async (
    setIsDownloading && setIsDownloading("pdf");
    const docId = pdfDetails?.[0]?.objectId || "";
    try {
-      const url = await getSignedUrl(pdfUrl, docId);
+      const url = await getSignedUrl(
+        pdfUrl,
+        docId,
+      );
      await fetchUrl(url, pdfName);
      setIsDownloading && setIsDownloading("");
    } catch (err) {
@@ -2306,7 +2366,7 @@ export const handleToPrint = async (event, setIsDownloading, pdfDetails) => {
      `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
      {
        url: pdfUrl,
-        docId: docId
+        docId: docId,
      },
      {
        headers: {
@@ -2350,7 +2410,8 @@ export const handleDownloadCertificate = async (
  setIsDownloading,
  isZip
 ) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  if (pdfDetails?.length > 0 && pdfDetails[0]?.CertificateUrl) {
    try {
      await fetch(pdfDetails[0] && pdfDetails[0]?.CertificateUrl);
@@ -2434,13 +2495,14 @@ export const handleDownloadCertificate = async (
 export function escapeRegExp(string) {
  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // Escape special characters
 }
-export async function findContact(value) {
+export async function findContact(
+  value,
+) {
  try {
    const baseURL = localStorage.getItem("baseUrl");
    const url = `${baseURL}functions/getsigners`;
-    const token = {
-      "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-    };
+    const token =
+          { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };
    const headers = {
      "Content-Type": "application/json",
      "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
@@ -2652,20 +2714,23 @@ export function base64ToArrayBuffer(base64) {
  return bytes.buffer;
 }

-export const convertBase64ToFile = async (pdfName, pdfBase64) => {
+export const convertBase64ToFile = async (
+  pdfName,
+  pdfBase64,
+) => {
  const fileName = sanitizeFileName(pdfName) + ".pdf";
-  try {
-    const pdfFile = new Parse.File(fileName, { base64: pdfBase64 });
-    // Save the Parse File if needed
-    const pdfData = await pdfFile.save();
-    const pdfUrl = pdfData.url();
-    const fileRes = await getSecureUrl(pdfUrl);
-    if (fileRes?.url) {
-      return fileRes.url;
+    try {
+        const pdfFile = new Parse.File(fileName, { base64: pdfBase64 });
+        // Save the Parse File if needed
+        const pdfData = await pdfFile.save();
+        const pdfUrl = pdfData.url();
+        const fileRes = await getSecureUrl(pdfUrl);
+        if (fileRes?.url) {
+          return fileRes.url;
+        }
+    } catch (e) {
+      console.log("error in convertbase64tofile", e);
    }
-  } catch (e) {
-    console.log("error in convertbase64tofile", e);
-  }
 };
 export const onClickZoomIn = (scale, zoomPercent, setScale, setZoomPercent) => {
  setScale(scale + 0.1 * scale);
@@ -2955,10 +3020,13 @@ export const flattenPdf = async (pdfFile) => {
 };

 export const mailTemplate = (param) => {
-  const appName = "OpenSign™";
-  const logo = `<div style='padding:10px'><img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' /></div>`;
+  const appName =
+    "OpenSign™";
+  const logo =
+        `<div style='padding:10px'><img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' /></div>`;

-  const opurl = ` <a href='https://www.opensignlabs.com' target=_blank>here</a>.</p></div></div></body></html>`;
+  const opurl =
+        ` <a href='https://www.opensignlabs.com' target=_blank>here</a>.</p></div></div></body></html>`;

  const subject = `${param.senderName} has requested you to sign "${param.title}"`;
  const body =
@@ -3000,3 +3068,52 @@ export function formatDateTime(date, dateFormat, timeZone, is12Hour) {
      )
    : formatTimeInTimezone(date, timeZone);
 }
+
+export const updateDateWidgetsRes = (documentData, signerId, journey) => {
+  const extUser =
+        localStorage.getItem("Extand_Class");
+  const contactUser = documentData?.Signers.find(
+    (data) => data.objectId === signerId
+  );
+  const placeHolders = documentData?.Placeholders;
+  const userDetails = extUser ? JSON.parse(extUser)[0] : contactUser;
+  return placeHolders?.map((item) => {
+    if (item?.signerObjId === signerId) {
+      return {
+        ...item,
+        placeHolder: item.placeHolder.map((ph) => ({
+          ...ph,
+          pos: ph.pos.map((widget) => {
+            // only for date widgets *and* missing response
+            if (widget.type === "date" && !widget.options.response) {
+              return {
+                ...widget,
+                options: {
+                  ...widget.options,
+                  response: getDate(
+                    changeDateToMomentFormat(widget.options.validation.format)
+                  )
+                }
+              };
+            } else if (
+              ["name", "email", "job title", "company"].includes(widget.type) &&
+              !widget.options.defaultValue &&
+              !widget.options.response
+            ) {
+              return {
+                ...widget,
+                options: {
+                  ...widget.options,
+                  response: widgetDataValue(widget.type, userDetails)
+                }
+              };
+            }
+            return widget;
+          })
+        }))
+      };
+    } else {
+      return item;
+    }
+  });
+};
@@ -11,9 +11,6 @@ export const appInfo = {
  appId: process.env.REACT_APP_APPID ? process.env.REACT_APP_APPID : "opensign",
  baseUrl: serverUrl_fn(),
  defaultRole: "contracts_User",
-  fbAppId: process.env.REACT_APP_FBAPPID
-    ? `${process.env.REACT_APP_FBAPPID}`
-    : "",
  fev_Icon:
    "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAALlJREFUaEPtmN0NwjAMBpNxYDKYiM1Yp90g93CKStH1NbIdfz921Dker2Pc+Js1cDF7MXAxASMGYkAigBI6vh9ZwoXP53uZoAYcvhwdA3mAVbI2aSb+9zFKU4IURB6j/HoPUIEa2G3iGIAhQQDlAUIoE2diabIklISS0NoFPebo77RF6OenEF3QntOm128he0GKrwHyACFoz2MgBqSGkpAEcHs47oHtN5AFakACqMNjQEMoE8SABFCHn4HE2zGHSLeEAAAAAElFTkSuQmCC",
  googleClietId: process.env.REACT_APP_GOOGLECLIENTID
@@ -1,4 +0,0 @@
-export default function linkURL(url) {
-  let newURL = (url && decodeURIComponent(url)) || "";
-  return newURL.substring(newURL.indexOf(".com/") + 5, newURL.indexOf("_"));
-}
@@ -13,15 +13,13 @@ import {
  MouseTransition,
  Preview
 } from "react-dnd-multi-backend";
-import DragElement from "./components/pdf/DragElement";
+import DragElement from "./components/pdf/DragElement.jsx";
 import Parse from "parse";
 import "./polyfills";
 import { serverUrl_fn } from "./constant/appinfo";
 import "./i18n";

-const appId = process.env.REACT_APP_APPID
-  ? process.env.REACT_APP_APPID
-  : "opensign";
+const appId = import.meta.env.VITE_APPID || process.env.REACT_APP_APPID || "opensign";
 const serverUrl = serverUrl_fn();
 Parse.initialize(appId);
 Parse.serverURL = serverUrl;
@@ -55,6 +53,7 @@ const generatePreview = (props) => {
  );
 };

+
 const root = ReactDOM.createRoot(document.getElementById("root"));
 root.render(
  <CookiesProvider defaultSetOptions={{ path: "/" }}>
@@ -219,7 +219,6 @@ export default function reportJson(id) {
            btnId: "44534",
            hoverLabel: "option",
            btnColor: "",
-            restrictBtn: true,
            textColor: "black",
            btnIcon: "fa-light fa-ellipsis-vertical fa-lg",
            action: "option",
@@ -228,9 +227,18 @@ export default function reportJson(id) {
                btnId: "0940",
                btnLabel: "Save as template",
                hoverLabel: "Save as template",
+                restrictBtn: true,
                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"
              }
            ]
          }
@@ -36,7 +36,7 @@ const dashboardJson = [
            queryType: "",
            class: "contracts_Document",
            query:
-              'where={"Type":{"#*ne":"Folder"},"Signers":{"#*exists":true,"#*ne":[]},"Placeholders":{"#*ne":null},"SignedUrl":{"#*ne":null},"IsCompleted":{"#*ne":true},"IsDeclined":{"#*ne":true},"IsArchive":{"#*ne":true},"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"#UserId.objectId#"},"ExpiryDate":{"#*gt":{"__type":"#Date#","iso":"#today#"}}}&count=1',
+              'where={"Type":null,"Signers":{"#*exists":true},"Placeholders":{"#*exists":true},"SignedUrl":{"#*exists":true},"IsCompleted":false,"IsDeclined":false,"IsArchive":null,"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"#UserId.objectId#"},"ExpiryDate":{"#*gt":{"__type":"#Date#","iso":"#today#"}}}&keys=Name,ExpiryDate,SignedUrl,Signers&count=1',
            key: "count",
            Redirect_type: "Report",
            Redirect_id: "1MwEuxLEkF",
@@ -15,7 +15,8 @@ import { showHeader } from "../redux/reducers/showHeader";
 import { useTranslation } from "react-i18next";

 const HomeLayout = () => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const { t, i18n } = useTranslation();
  const navigate = useNavigate();
  const location = useLocation();
@@ -53,8 +54,8 @@ const HomeLayout = () => {
          });
          if (user) {
            localStorage.setItem("profileImg", user.get("ProfilePic") || "");
-            setIsUserValid(true);
-            setIsLoader(false);
+              setIsUserValid(true);
+              setIsLoader(false);
          } else {
            setIsUserValid(false);
          }
@@ -96,7 +96,7 @@ const AddAdmin = () => {
        setState({ loading: true });
        const userDetails = {
          name: name,
-          email: email,
+          email: email?.toLowerCase()?.replace(/\s/g, ""),
          phone: phone,
          company: company,
          jobTitle: jobTitle
@@ -106,10 +106,10 @@ const AddAdmin = () => {
          event.preventDefault();
          const user = new Parse.User();
          user.set("name", name);
-          user.set("email", email);
+          user.set("email", email?.toLowerCase()?.replace(/\s/g, ""));
          user.set("password", password);
          user.set("phone", phone);
-          user.set("username", email);
+          user.set("username", email?.toLowerCase()?.replace(/\s/g, ""));
          const userRes = await user.save();
          if (userRes) {
            const params = {
@@ -117,7 +117,7 @@ const AddAdmin = () => {
                jobTitle: jobTitle,
                company: company,
                name: name,
-                email: email,
+                email: email?.toLowerCase()?.replace(/\s/g, ""),
                phone: phone,
                role: "contracts_Admin",
                timezone: usertimezone
@@ -176,7 +176,6 @@ const AddAdmin = () => {
      localStorage.setItem("accesstoken", sessionToken);
      localStorage.setItem("UserInformation", JSON.stringify(_user));
      localStorage.setItem("accesstoken", _user.sessionToken);
-      localStorage.setItem("scriptId", true);
      if (_user.ProfilePic) {
        localStorage.setItem("profileImg", _user.ProfilePic);
      } else {
@@ -5,7 +5,7 @@ import {
  getBase64FromUrl,
  handleDownloadCertificate,
  handleDownloadPdf,
-  handleToPrint
+  handleToPrint,
 } from "../constant/Utils";
 import ModalUi from "../primitives/ModalUi";
 import Loader from "../primitives/Loader";
@@ -7,7 +7,9 @@ import Alert from "../primitives/Alert";
 import { appInfo } from "../constant/appinfo";
 import { useDispatch } from "react-redux";
 import { fetchAppInfo } from "../redux/reducers/infoReducer";
-import { emailRegex } from "../constant/const";
+import {
+  emailRegex,
+} from "../constant/const";
 import { useTranslation } from "react-i18next";
 import Loader from "../primitives/Loader";

@@ -46,7 +48,7 @@ function ForgotPassword() {
      if (state.email) {
        const username = state.email;
        try {
-          await Parse.User.requestPasswordReset(username);
+            await Parse.User.requestPasswordReset(username);
          setToast({ type: "success", message: t("reset-password-alert-1") });
        } catch (err) {
          console.log("err ", err.code);
@@ -76,7 +78,7 @@ function ForgotPassword() {
    } catch (err) {
      console.log("err while logging out ", err);
    }
-    setImage(appInfo?.applogo || undefined);
+      setImage(appInfo?.applogo || undefined);
  };
  return (
    <div>
@@ -42,7 +42,8 @@ function Form() {
 }

 const Forms = (props) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const { t } = useTranslation();
  const abortController = new AbortController();
  const inputFileRef = useRef(null);
@@ -105,12 +106,12 @@ const Forms = (props) => {
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);
  const initializeValues = async () => {
-    setFormData((obj) => ({
-      ...obj,
-      NotifyOnSignatures: true,
-      SendinOrder: sendinorder,
-      IsTourEnabled: istourenabled
-    }));
+      setFormData((obj) => ({
+        ...obj,
+        NotifyOnSignatures: true,
+        SendinOrder: sendinorder,
+        IsTourEnabled: istourenabled
+      }));
  };

  function getFileAsArrayBuffer(file) {
@@ -148,81 +149,17 @@ const Forms = (props) => {
            const name = generatePdfName(16);
            const pdfName = `${name?.split(".")[0]}.pdf`;
            setfileload(true);
-            try {
-              const res = await getFileAsArrayBuffer(files[0]);
-              const flatPdf = await flattenPdf(res);
-              const parseFile = new Parse.File(
-                pdfName,
-                [...flatPdf],
-                "application/pdf"
-              );
-
              try {
-                const response = await parseFile.save({
-                  progress: (progressValue, loaded, total, { type }) => {
-                    if (type === "upload" && progressValue !== null) {
-                      const percentCompleted = Math.round(
-                        (loaded * 100) / total
-                      );
-                      setpercentage(percentCompleted);
-                    }
-                  }
-                });
-                // The response object will contain information about the uploaded file
-                // You can access the URL of the uploaded file using response.url()
-                if (response.url()) {
-                  const fileRes = await getSecureUrl(response.url());
-                  if (fileRes.url) {
-                    setFileUpload(fileRes.url);
-                    setfileload(false);
-                    const tenantId = localStorage.getItem("TenantId");
-                    const title = generateTitleFromFilename(files?.[0]?.name);
-                    setFormData((obj) => ({ ...obj, Name: title }));
-                    SaveFileSize(size, fileRes.url, tenantId);
-                    return fileRes.url;
-                  } else {
-                    removeFile(e);
-                  }
-                } else {
-                  removeFile(e);
-                }
-              } catch (error) {
-                removeFile(e);
-                console.error("Error uploading file:", error);
-              }
-            } catch (err) {
-              if (err?.message?.includes("is encrypted")) {
-                try {
-                  setIsDecrypting(true);
-                  const size = files?.[0].size;
-                  const name = generatePdfName(16);
-                  const url = "https://ai.nxglabs.in/decryptpdf"; //
-                  let formData = new FormData();
-                  formData.append("file", files[0]);
-                  formData.append("password", "");
-                  const config = {
-                    headers: { "content-type": "multipart/form-data" },
-                    responseType: "blob"
-                  };
-                  const response = await axios.post(url, formData, config);
-                  const pdfBlob = new Blob([response.data], {
-                    type: "application/pdf"
-                  });
-                  const pdfFile = new File([pdfBlob], name, {
-                    type: "application/pdf"
-                  });
-                  setIsDecrypting(false);
-                  setfileload(true);
-                  const res = await getFileAsArrayBuffer(pdfFile);
-                  const flatPdf = await flattenPdf(res);
-                  // Upload the file to Parse Server
-                  const parseFile = new Parse.File(
-                    name,
-                    [...flatPdf],
-                    "application/pdf"
-                  );
+                const res = await getFileAsArrayBuffer(files[0]);
+                const flatPdf = await flattenPdf(res);
+                const parseFile = new Parse.File(
+                  pdfName,
+                  [...flatPdf],
+                  "application/pdf"
+                );

-                  await parseFile.save({
+                try {
+                  const response = await parseFile.save({
                    progress: (progressValue, loaded, total, { type }) => {
                      if (type === "upload" && progressValue !== null) {
                        const percentCompleted = Math.round(
@@ -232,16 +169,16 @@ const Forms = (props) => {
                      }
                    }
                  });
-
-                  // Retrieve the URL of the uploaded file
-                  if (parseFile.url()) {
-                    const fileRes = await getSecureUrl(parseFile.url());
+                  // The response object will contain information about the uploaded file
+                  // You can access the URL of the uploaded file using response.url()
+                  if (response.url()) {
+                    const fileRes = await getSecureUrl(response.url());
                    if (fileRes.url) {
                      setFileUpload(fileRes.url);
-                      removeFile();
+                      setfileload(false);
+                      const tenantId = localStorage.getItem("TenantId");
                      const title = generateTitleFromFilename(files?.[0]?.name);
                      setFormData((obj) => ({ ...obj, Name: title }));
-                      const tenantId = localStorage.getItem("TenantId");
                      SaveFileSize(size, fileRes.url, tenantId);
                      return fileRes.url;
                    } else {
@@ -250,22 +187,88 @@ const Forms = (props) => {
                  } else {
                    removeFile(e);
                  }
-                } catch (err) {
-                  removeFile();
-                  if (err?.response?.status === 401) {
-                    setIsPassword(true);
-                  } else {
-                    console.log("Error uploading file: ", err?.response);
-                    setIsDecrypting(false);
-                    e.target.value = "";
-                  }
+                } catch (error) {
+                  removeFile(e);
+                  console.error("Error uploading file:", error);
+                }
+              } catch (err) {
+                if (err?.message?.includes("is encrypted")) {
+                  try {
+                    setIsDecrypting(true);
+                    const size = files?.[0].size;
+                    const name = generatePdfName(16);
+                    const url = "https://ai.nxglabs.in/decryptpdf"; //
+                    let formData = new FormData();
+                    formData.append("file", files[0]);
+                    formData.append("password", "");
+                    const config = {
+                      headers: { "content-type": "multipart/form-data" },
+                      responseType: "blob"
+                    };
+                    const response = await axios.post(url, formData, config);
+                    const pdfBlob = new Blob([response.data], {
+                      type: "application/pdf"
+                    });
+                    const pdfFile = new File([pdfBlob], name, {
+                      type: "application/pdf"
+                    });
+                    setIsDecrypting(false);
+                    setfileload(true);
+                      const res = await getFileAsArrayBuffer(pdfFile);
+                      const flatPdf = await flattenPdf(res);
+                      // Upload the file to Parse Server
+                      const parseFile = new Parse.File(
+                        name,
+                        [...flatPdf],
+                        "application/pdf"
+                      );
+
+                      await parseFile.save({
+                        progress: (progressValue, loaded, total, { type }) => {
+                          if (type === "upload" && progressValue !== null) {
+                            const percentCompleted = Math.round(
+                              (loaded * 100) / total
+                            );
+                            setpercentage(percentCompleted);
+                          }
+                        }
+                      });
+
+                      // Retrieve the URL of the uploaded file
+                      if (parseFile.url()) {
+                        const fileRes = await getSecureUrl(parseFile.url());
+                        if (fileRes.url) {
+                          setFileUpload(fileRes.url);
+                          removeFile();
+                          const title = generateTitleFromFilename(
+                            files?.[0]?.name
+                          );
+                          setFormData((obj) => ({ ...obj, Name: title }));
+                          const tenantId = localStorage.getItem("TenantId");
+                          SaveFileSize(size, fileRes.url, tenantId);
+                          return fileRes.url;
+                        } else {
+                          removeFile(e);
+                        }
+                      } else {
+                        removeFile(e);
+                      }
+                  } catch (err) {
+                    removeFile();
+                    if (err?.response?.status === 401) {
+                      setIsPassword(true);
+                    } else {
+                      console.log("Error uploading file: ", err?.response);
+                      setIsDecrypting(false);
+                      e.target.value = "";
+                    }
+                  }
+                } else {
+                  console.log("err ", err);
+                  setFileUpload("");
+                  removeFile(e);
                }
-              } else {
-                console.log("err ", err);
-                setFileUpload("");
-                removeFile(e);
              }
-            }
          } else {
            const isImage = files?.[0]?.type.includes("image/");
            if (isImage) {
@@ -290,50 +293,50 @@ const Forms = (props) => {
              });
              const size = files?.[0]?.size;
              const name = generatePdfName(16);
-              const getFile = await pdfDoc.save({
-                useObjectStreams: false
-              });
-              setfileload(true);
-              const pdfName = `${name?.split(".")[0]}.pdf`;
-              const parseFile = new Parse.File(
-                pdfName,
-                [...getFile],
-                "application/pdf"
-              );
-
-              try {
-                const response = await parseFile.save({
-                  progress: (progressValue, loaded, total, { type }) => {
-                    if (type === "upload" && progressValue !== null) {
-                      const percentCompleted = Math.round(
-                        (loaded * 100) / total
-                      );
-                      setpercentage(percentCompleted);
-                    }
-                  }
+                const getFile = await pdfDoc.save({
+                  useObjectStreams: false
                });
-                // The response object will contain information about the uploaded file
-                // You can access the URL of the uploaded file using response.url()
-                if (response.url()) {
-                  const fileRes = await getSecureUrl(response.url());
-                  if (fileRes.url) {
-                    setFileUpload(fileRes.url);
-                    setfileload(false);
-                    const tenantId = localStorage.getItem("TenantId");
-                    const title = generateTitleFromFilename(files?.[0]?.name);
-                    setFormData((obj) => ({ ...obj, Name: title }));
-                    SaveFileSize(size, fileRes.url, tenantId);
-                    return fileRes.url;
+                setfileload(true);
+                const pdfName = `${name?.split(".")[0]}.pdf`;
+                const parseFile = new Parse.File(
+                  pdfName,
+                  [...getFile],
+                  "application/pdf"
+                );
+
+                try {
+                  const response = await parseFile.save({
+                    progress: (progressValue, loaded, total, { type }) => {
+                      if (type === "upload" && progressValue !== null) {
+                        const percentCompleted = Math.round(
+                          (loaded * 100) / total
+                        );
+                        setpercentage(percentCompleted);
+                      }
+                    }
+                  });
+                  // The response object will contain information about the uploaded file
+                  // You can access the URL of the uploaded file using response.url()
+                  if (response.url()) {
+                    const fileRes = await getSecureUrl(response.url());
+                    if (fileRes.url) {
+                      setFileUpload(fileRes.url);
+                      setfileload(false);
+                      const tenantId = localStorage.getItem("TenantId");
+                      const title = generateTitleFromFilename(files?.[0]?.name);
+                      setFormData((obj) => ({ ...obj, Name: title }));
+                      SaveFileSize(size, fileRes.url, tenantId);
+                      return fileRes.url;
+                    } else {
+                      removeFile(e);
+                    }
                  } else {
                    removeFile(e);
                  }
-                } else {
+                } catch (error) {
                  removeFile(e);
+                  console.error("Error uploading file:", error);
                }
-              } catch (error) {
-                removeFile(e);
-                console.error("Error uploading file:", error);
-              }
            }
          }
        }
@@ -408,11 +411,11 @@ const Forms = (props) => {
          object.set("RemindOnceInEvery", remindOnceInEvery);
          object.set("IsTourEnabled", isTourEnabled);
          object.set("TimeToCompleteDays", TimeToCompleteDays);
-          object.set("AllowModifications", false);
-          object.set("IsEnableOTP", false);
-          if (formData.NotifyOnSignatures !== undefined) {
-            object.set("NotifyOnSignatures", formData.NotifyOnSignatures);
-          }
+            object.set("AllowModifications", false);
+            object.set("IsEnableOTP", false);
+            if (formData.NotifyOnSignatures !== undefined) {
+              object.set("NotifyOnSignatures", formData.NotifyOnSignatures);
+            }
          if (formData?.RedirectUrl) {
            object.set("RedirectUrl", formData.RedirectUrl);
          }
@@ -451,9 +454,10 @@ const Forms = (props) => {
          setSigners([]);
          setBcc([]);
          setFolder({ ObjectId: "", Name: "" });
-          const notifySign = extUserData?.NotifyOnSignatures
-            ? extUserData?.NotifyOnSignatures
-            : true;
+          const notifySign =
+                extUserData?.NotifyOnSignatures
+                ? extUserData?.NotifyOnSignatures
+                : true;
          setFormData({
            Name: "",
            Description: "",
@@ -529,9 +533,10 @@ const Forms = (props) => {
    setSigners([]);
    setBcc([]);
    setFolder({ ObjectId: "", Name: "" });
-    const notifySign = extUserData?.NotifyOnSignatures
-      ? extUserData?.NotifyOnSignatures
-      : true;
+    const notifySign =
+          extUserData?.NotifyOnSignatures
+          ? extUserData?.NotifyOnSignatures
+          : true;
    let obj = {
      Name: "",
      Description: "",
@@ -585,28 +590,36 @@ const Forms = (props) => {
        type: "application/pdf"
      });
      setIsDecrypting(false);
-      const res = await getFileAsArrayBuffer(pdfFile);
-      const flatPdf = await flattenPdf(res);
-      const parseFile = new Parse.File(name, [...flatPdf], "application/pdf");
-      await parseFile.save({
-        progress: (progressValue, loaded, total, { type }) => {
-          if (type === "upload" && progressValue !== null) {
-            const percentCompleted = Math.round((loaded * 100) / total);
-            setpercentage(percentCompleted);
+        const res = await getFileAsArrayBuffer(pdfFile);
+        const flatPdf = await flattenPdf(res);
+        const parseFile = new Parse.File(name, [...flatPdf], "application/pdf");
+        await parseFile.save({
+          progress: (progressValue, loaded, total, { type }) => {
+            if (type === "upload" && progressValue !== null) {
+              const percentCompleted = Math.round((loaded * 100) / total);
+              setpercentage(percentCompleted);
+            }
+          }
+        });
+        // Retrieve the URL of the uploaded file
+        if (parseFile.url()) {
+          const fileRes = await getSecureUrl(parseFile.url());
+          if (fileRes.url) {
+            setFileUpload(fileRes.url);
+            removeFile();
+            const title = generateTitleFromFilename(formData?.file?.name);
+            setFormData((obj) => ({ ...obj, password: "", Name: title }));
+            const tenantId = localStorage.getItem("TenantId");
+            SaveFileSize(size, fileRes.url, tenantId);
+            return fileRes.url;
+          } else {
+            removeFile();
+            setFormData((prev) => ({ ...prev, password: "" }));
+            setIsDecrypting(false);
+            if (inputFileRef.current) {
+              inputFileRef.current.value = ""; // Set file input value to empty string
+            }
          }
-        }
-      });
-      // Retrieve the URL of the uploaded file
-      if (parseFile.url()) {
-        const fileRes = await getSecureUrl(parseFile.url());
-        if (fileRes.url) {
-          setFileUpload(fileRes.url);
-          removeFile();
-          const title = generateTitleFromFilename(formData?.file?.name);
-          setFormData((obj) => ({ ...obj, password: "", Name: title }));
-          const tenantId = localStorage.getItem("TenantId");
-          SaveFileSize(size, fileRes.url, tenantId);
-          return fileRes.url;
        } else {
          removeFile();
          setFormData((prev) => ({ ...prev, password: "" }));
@@ -615,14 +628,6 @@ const Forms = (props) => {
            inputFileRef.current.value = ""; // Set file input value to empty string
          }
        }
-      } else {
-        removeFile();
-        setFormData((prev) => ({ ...prev, password: "" }));
-        setIsDecrypting(false);
-        if (inputFileRef.current) {
-          inputFileRef.current.value = ""; // Set file input value to empty string
-        }
-      }
    } catch (err) {
      removeFile();
      if (err?.response?.status === 401) {
@@ -744,7 +749,9 @@ const Forms = (props) => {
            )}
            <div className="text-xs">
              <label className="block">
-                {`${`${t("report-heading.File")} (${t("file-type")}`}${")"}`}
+                {`${`${t("report-heading.File")} (${t("file-type")}`}${
+                      ")"
+                }`}
                <span className="text-red-500 text-[13px]">*</span>
              </label>
              {fileupload.length > 0 ? (
@@ -768,7 +775,9 @@ const Forms = (props) => {
                    className="op-file-input op-file-input-bordered op-file-input-sm focus:outline-none hover:border-base-content w-full text-xs"
                    onChange={(e) => handleFileInput(e)}
                    ref={inputFileRef}
-                    accept={"application/pdf,image/png,image/jpeg"}
+                    accept={
+                          "application/pdf,image/png,image/jpeg"
+                    }
                    onInvalid={(e) =>
                      e.target.setCustomValidity(t("input-required"))
                    }
@@ -1058,7 +1067,10 @@ const Forms = (props) => {
                {isAdvanceOpt && (
                  <div
                    style={{
-                      height: props.title === "New Template" ? "100px" : "280px"
+                      height:
+                              props.title === "New Template"
+                            ? "100px"
+                            : "280px"
                    }}
                    className="w-[1px] bg-gray-300 m-auto hidden md:inline-block"
                  ></div>
@@ -1167,7 +1179,11 @@ const Forms = (props) => {
                        </Tooltip>
                      </label>
                      <div className="flex flex-col md:flex-row md:gap-4">
-                        <div className={`flex items-center gap-2 ml-2 mb-1`}>
+                        <div
+                          className={
+                            `flex items-center gap-2 ml-2 mb-1`
+                          }
+                        >
                          <input
                            className="mr-[2px] op-radio op-radio-xs"
                            type="radio"
@@ -1176,7 +1192,11 @@ const Forms = (props) => {
                          />
                          <div className="text-center">{t("yes")}</div>
                        </div>
-                        <div className={`flex items-center gap-2 ml-2 mb-1`}>
+                        <div
+                          className={
+                            `flex items-center gap-2 ml-2 mb-1`
+                          }
+                        >
                          <input
                            className="mr-[2px] op-radio op-radio-xs"
                            type="radio"
@@ -1,8 +1,13 @@
 import React, { useState, useEffect } from "react";
 import { useNavigate, useParams } from "react-router";
 import axios from "axios";
-import { emailRegex } from "../constant/const";
-import { contractUsers, saveLanguageInLocal } from "../constant/Utils";
+import {
+  emailRegex,
+} from "../constant/const";
+import {
+  contractUsers,
+  saveLanguageInLocal
+} from "../constant/Utils";
 import logo from "../assets/images/logo.png";
 import { appInfo } from "../constant/appinfo";
 import Parse from "parse";
@@ -10,6 +15,8 @@ import { useTranslation } from "react-i18next";
 import SelectLanguage from "../components/pdf/SelectLanguage";
 import LoaderWithMsg from "../primitives/LoaderWithMsg";
 import Title from "../components/Title";
+import ModalUi from "../primitives/ModalUi";
+import Loader from "../primitives/Loader";

 function GuestLogin() {
  const { t, i18n } = useTranslation();
@@ -30,6 +37,8 @@ function GuestLogin() {
  const [contactId, setContactId] = useState(contactBookId);
  const [sendmail, setSendmail] = useState();
  const [contact, setContact] = useState({ name: "", phone: "", email: "" });
+
+
  const navigateToDoc = async (docId, contactId) => {
    try {
      const docDetails = await Parse.Cloud.run("getDocument", {
@@ -53,17 +62,22 @@ function GuestLogin() {
      return false;
    }
  };
+
  useEffect(() => {
    handleServerUrl();
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);

+
  //function generate serverUrl and parseAppId from url and save it in local storage
  const handleServerUrl = async () => {
-    setAppLogo(logo);
+      setAppLogo(logo);

    localStorage.clear(); // Clears everything
-    localStorage.setItem("appname", "OpenSign™");
+    localStorage.setItem(
+      "appname",
+        "OpenSign™"
+    );
    //save isGuestSigner true in local to handle login flow header in mobile view
    localStorage.setItem("isGuestSigner", true);
    saveLanguageInLocal(i18n);
@@ -115,7 +129,7 @@ function GuestLogin() {
    try {
      const params = {
        email: email?.toLowerCase()?.replace(/\s/g, "")?.toString(),
-        docId: documentId
+        docId: documentId,
      };
      const Otp = await Parse.Cloud.run("SendOTPMailV1", params);
      if (Otp) {
@@ -124,6 +138,7 @@ function GuestLogin() {
      }
    } catch (error) {
      alert(t("something-went-wrong-mssg"));
+      setLoading(false);
    }
  };

@@ -188,11 +203,14 @@ function GuestLogin() {
        }
      } catch (error) {
        console.log("err ", error);
+        setLoading(false);
      }
    } else {
      alert(t("enter-otp-alert"));
    }
  };
+
+
  const handleUserData = async (e) => {
    e.preventDefault();
    if (!emailRegex.test(contact.email?.toLowerCase()?.replace(/\s/g, ""))) {
@@ -221,6 +239,7 @@ function GuestLogin() {
      }
    }
  };
+
  const handleInputChange = (e) => {
    if (e.target.name === "email") {
      setContact((prev) => ({
@@ -231,9 +250,56 @@ function GuestLogin() {
      setContact((prev) => ({ ...prev, [e.target.name]: e.target.value }));
    }
  };
+
  return (
    <div>
      <Title title="Request Sign" />
+
+      {/* OTP Verification Modal */}
+      {EnterOTP && (
+        <ModalUi
+          isOpen
+          title={t("otp-verification")}
+          handleClose={() => setEnterOtp(false)}
+        >
+          {loading ? (
+            <div className="h-[150px] flex justify-center items-center">
+              <Loader />
+            </div>
+          ) : (
+            <form onSubmit={(e) => VerifyOTP(e)}>
+              <div className="px-6 py-3 text-base-content">
+                <label className="mb-2">{t("enter-otp")}</label>
+                <input
+                  onInvalid={(e) =>
+                    e.target.setCustomValidity(t("input-required"))
+                  }
+                  onInput={(e) => e.target.setCustomValidity("")}
+                  required
+                  type="tel"
+                  pattern="[0-9]{4}"
+                  className="w-full op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content text-xs"
+                  placeholder={t("otp-placeholder")}
+                  value={OTP}
+                  onChange={(e) => setOTP(e.target.value)}
+                />
+              </div>
+              <div className="px-6 mb-3">
+                <button type="submit" className="op-btn op-btn-primary">
+                  {t("verify")}
+                </button>
+                <button
+                  className="op-btn op-btn-secondary ml-2"
+                  onClick={(e) => handleSendOTPBtn(e)}
+                >
+                  {t("resend")}
+                </button>
+              </div>
+            </form>
+          )}
+        </ModalUi>
+      )}
+
      {isLoading.isLoad ? (
        <LoaderWithMsg isLoading={isLoading} />
      ) : (
@@ -249,63 +315,34 @@ function GuestLogin() {
              )}
            </div>
            {contactId ? (
-              <>
-                {!EnterOTP ? (
-                  <div className="w-full md:w-[50%] text-base-content">
-                    <h1 className="text-2xl md:text-[30px]">{t("welcome")}</h1>
-                    <legend className="text-[12px] text-[#878787] mt-2 mb-1">
-                      {t("get-otp-alert")}
-                    </legend>
-                    <div className="p-[20px] outline outline-1 outline-slate-300/50 my-2 op-card shadow-md">
-                      <input
-                        type="email"
-                        name="email"
-                        value={email}
-                        className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full disabled:text-[#5c5c5c] text-xs"
-                        disabled
-                      />
-                    </div>
-                    <div className="mt-3">
-                      <button
-                        className="op-btn op-btn-primary"
-                        onClick={(e) => handleSendOTPBtn(e)}
-                        disabled={loading}
-                      >
-                        {loading ? t("loading") : t("get-verification-code")}
-                      </button>
-                    </div>
-                  </div>
-                ) : (
-                  <form
-                    className="w-full md:w-[50%] text-base-content"
-                    onSubmit={VerifyOTP}
+              <div className="w-full md:w-[50%] text-base-content">
+                <h1 className="text-2xl md:text-[30px]">{t("welcome")}</h1>
+                <legend className="text-[12px] text-[#878787] mt-2 mb-1">
+                  {t("get-otp-alert")}
+                </legend>
+                <div className="p-[20px] outline outline-1 outline-slate-300/50 my-2 op-card shadow-md">
+                  <input
+                    type="email"
+                    name="email"
+                    value={email}
+                    className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full disabled:text-[#5c5c5c] text-xs"
+                    disabled
+                  />
+                </div>
+                <div className="mt-3">
+                  <button
+                    className="op-btn op-btn-primary flex items-center"
+                    onClick={(e) => {
+                      e.preventDefault();
+                        SendOtp();
+                    }}
+                    disabled={loading}
                  >
-                    <h1 className="text-2xl md:text-[30px]">{t("welcome")}</h1>
-                    <legend className="text-[12px] text-[#878787] mt-2">
-                      {t("guest-email-alert")}
-                    </legend>
-                    <div className="p-[20px] pt-[15px] outline outline-1 outline-slate-300/50 op-card my-2 shadow-md">
-                      <p className="text-sm">{t("enter-verification-code")}</p>
-                      <input
-                        type="number"
-                        className="mt-2 op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-                        name="OTP"
-                        value={OTP}
-                        onChange={(e) => setOTP(e.target.value)}
-                      />
-                    </div>
-                    <div className="mt-2.5">
-                      <button
-                        className="op-btn op-btn-primary"
-                        type="submit"
-                        disabled={loading}
-                      >
-                        {loading ? t("loading") : t("verify")}
-                      </button>
-                    </div>
-                  </form>
-                )}
-              </>
+                        <i className="fa-light fa-message-sms mr-2"></i>
+                        {loading ? t("loading") : t("get-verification-code")}
+                  </button>
+                </div>
+              </div>
            ) : (
              <div className="w-full md:w-[50%] text-base-content">
                <h1 className="text-2xl md:text-[30px]">{t("welcome")}</h1>
@@ -7,7 +7,9 @@ import { NavLink, useNavigate, useLocation } from "react-router";
 import login_img from "../assets/images/login_img.svg";
 import { useWindowSize } from "../hook/useWindowSize";
 import ModalUi from "../primitives/ModalUi";
-import { emailRegex } from "../constant/const";
+import {
+  emailRegex,
+} from "../constant/const";
 import Alert from "../primitives/Alert";
 import { appInfo } from "../constant/appinfo";
 import { fetchAppInfo } from "../redux/reducers/infoReducer";
@@ -22,7 +24,8 @@ import { useTranslation } from "react-i18next";
 import SelectLanguage from "../components/pdf/SelectLanguage";

 function Login() {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const { t, i18n } = useTranslation();
  const navigate = useNavigate();
  const location = useLocation();
@@ -30,17 +33,12 @@ function Login() {
  const { width } = useWindowSize();
  const [state, setState] = useState({
    email: "",
+    password: "",
    alertType: "success",
    alertMsg: "",
-    password: "",
    passwordVisible: false,
-    mobile: "",
-    phone: "",
-    scanResult: "",
-    baseUrl: localStorage.getItem("baseUrl"),
-    parseAppId: localStorage.getItem("parseAppId"),
    loading: false,
-    thirdpartyLoader: false
+    thirdpartyLoader: false,
  });
  const [userDetails, setUserDetails] = useState({
    Company: "",
@@ -54,6 +52,18 @@ function Login() {
    // eslint-disable-next-line
  }, []);

+
+  const setLocalVar = (user) => {
+    localStorage.setItem("accesstoken", user.sessionToken);
+    localStorage.setItem("UserInformation", JSON.stringify(user));
+    localStorage.setItem("userEmail", user.email);
+    if (user.ProfilePic) {
+      localStorage.setItem("profileImg", user.ProfilePic);
+    } else {
+      localStorage.setItem("profileImg", "");
+    }
+  };
+
  const showToast = (type, msg) => {
    setState({ ...state, loading: false, alertType: type, alertMsg: msg });
    setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
@@ -62,7 +72,9 @@ function Login() {
    const app = await getAppLogo();
    if (app?.error === "invalid_json") {
      setErrMsg(t("server-down", { appName: appName }));
-    } else if (app?.user === "not_exist") {
+    } else if (
+      app?.user === "not_exist"
+    ) {
      navigate("/addadmin");
    }
    if (app?.logo) {
@@ -87,106 +99,44 @@ function Login() {
  const handleSubmit = async (event) => {
    localStorage.removeItem("accesstoken");
    event.preventDefault();
+
    if (!emailRegex.test(state.email)) {
      alert("Please enter a valid email address.");
-    } else {
-      const { email, password } = state;
-      if (email && password) {
-        try {
-          setState({ ...state, loading: true });
-          localStorage.setItem("appLogo", appInfo.applogo);
-          // Pass the username and password to logIn function
-          const user = await Parse.User.logIn(email, password);
-          if (user) {
-            let _user = user.toJSON();
-            localStorage.setItem("UserInformation", JSON.stringify(_user));
-            localStorage.setItem("userEmail", email);
-            localStorage.setItem("accesstoken", _user.sessionToken);
-            localStorage.setItem("scriptId", true);
-            if (_user.ProfilePic) {
-              localStorage.setItem("profileImg", _user.ProfilePic);
-            } else {
-              localStorage.setItem("profileImg", "");
-            }
-            // Check extended class user role and tenentId
-            try {
-              const userSettings = appInfo.settings;
-              await Parse.Cloud.run("getUserDetails")
-                .then(async (extUser) => {
-                  if (extUser) {
-                    // console.log("extUser", extUser, extUser?.get("IsDisabled"));
-                    const IsDisabled = extUser?.get("IsDisabled") || false;
-                    if (!IsDisabled) {
-                      const userRole = extUser?.get("UserRole");
-                      const menu =
-                        userRole &&
-                        userSettings.find((menu) => menu.role === userRole);
-                      if (menu) {
-                        const _currentRole = userRole;
-                        const redirectUrl =
-                          location?.state?.from ||
-                          `/${menu.pageType}/${menu.pageId}`;
-                        let _role = _currentRole.replace("contracts_", "");
-                        localStorage.setItem("_user_role", _role);
-                        const checkLanguage = extUser?.get("Language");
-                        if (checkLanguage) {
-                          checkLanguage && i18n.changeLanguage(checkLanguage);
-                        }
+      return;
+    }

-                        const results = [extUser];
-                        const extUser_str = JSON.stringify(results);
+    const { email, password } = state;
+    if (!email || !password) {
+      return;
+    }

-                        localStorage.setItem("Extand_Class", extUser_str);
-                        const extInfo = JSON.parse(JSON.stringify(extUser));
-                        localStorage.setItem("userEmail", extInfo.Email);
-                        localStorage.setItem("username", extInfo.Name);
-                        if (extInfo?.TenantId) {
-                          const tenant = {
-                            Id: extInfo?.TenantId?.objectId || "",
-                            Name: extInfo?.TenantId?.TenantName || ""
-                          };
-                          localStorage.setItem("TenantId", tenant?.Id);
-                          dispatch(showTenant(tenant?.Name));
-                          localStorage.setItem("TenantName", tenant?.Name);
-                        }
-                        localStorage.setItem("PageLanding", menu.pageId);
-                        localStorage.setItem("defaultmenuid", menu.menuId);
-                        localStorage.setItem("pageType", menu.pageType);
-                        setState({ ...state, loading: false });
-                        // Redirect to the appropriate URL after successful login
-                        navigate(redirectUrl);
-                      } else {
-                        setState({ ...state, loading: false });
-                        setIsModal(true);
-                      }
-                    } else {
-                      showToast("danger", t("do-not-access-contact-admin"));
-                      logOutUser();
-                    }
-                  } else {
-                    showToast("danger", t("user-not-found"));
-                    logOutUser();
-                  }
-                })
-                .catch((error) => {
-                  showToast("danger", t("something-went-wrong-mssg"));
-                  console.error("Error while fetching Follow", error);
-                });
-            } catch (error) {
-              showToast("danger", `${error.message}`);
-            }
-          }
-        } catch (error) {
-          console.error("Error while logging in user", error);
-          showToast("danger", "Invalid username/password or region");
-        }
+    try {
+      setState({ ...state, loading: true });
+      localStorage.setItem("appLogo", appInfo.applogo);
+      const _user = await Parse.Cloud.run("loginuser", { email, password });
+      if (!_user) {
+        setState({ ...state, loading: false });
+        return;
      }
+      // Get extended user data (including 2FA status) using cloud function
+      try {
+        await Parse.User.become(_user.sessionToken);
+        setLocalVar(_user);
+        await continueLoginFlow();
+      } catch (error) {
+        console.error("Error checking 2FA status:", error);
+        showToast("danger", t("something-went-wrong-mssg"));
+      }
+    } catch (error) {
+      console.error("Error while logging in user", error);
+      showToast("danger", "Invalid username/password or region");
    }
  };

  const setThirdpartyLoader = (value) => {
    setState({ ...state, thirdpartyLoader: value });
  };
+
  const thirdpartyLoginfn = async (sessionToken) => {
    const baseUrl = localStorage.getItem("baseUrl");
    const parseAppId = localStorage.getItem("parseAppId");
@@ -201,113 +151,27 @@ function Login() {
    });
    if (res.data) {
      let _user = res.data;
-      localStorage.setItem("UserInformation", JSON.stringify(_user));
-      localStorage.setItem("userEmail", _user.email);
-      localStorage.setItem("accesstoken", _user.sessionToken);
-      localStorage.setItem("scriptId", true);
-      if (_user.ProfilePic) {
-        localStorage.setItem("profileImg", _user.ProfilePic);
-      } else {
-        localStorage.setItem("profileImg", "");
-      }
+      setLocalVar(_user);
      // Check extended class user role and tenentId
      try {
        const userSettings = appInfo.settings;
-        await Parse.Cloud.run("getUserDetails")
-          .then(async (extUser) => {
-            if (extUser) {
-              const IsDisabled = extUser?.get("IsDisabled") || false;
-              if (!IsDisabled) {
-                const userRole = extUser?.get("UserRole");
-                const menu =
-                  userRole &&
-                  userSettings.find((menu) => menu.role === userRole);
-                if (menu) {
-                  const _currentRole = userRole;
-                  const redirectUrl =
-                    location?.state?.from || `/${menu.pageType}/${menu.pageId}`;
-                  const _role = _currentRole.replace("contracts_", "");
-                  localStorage.setItem("_user_role", _role);
-                  const results = [extUser];
-                  const extUser_stringify = JSON.stringify(results);
-                  localStorage.setItem("Extand_Class", extUser_stringify);
-                  const extInfo = JSON.parse(JSON.stringify(extUser));
-                  localStorage.setItem("userEmail", extInfo?.Email);
-                  localStorage.setItem("username", extInfo?.Name);
-                  if (extInfo?.TenantId) {
-                    const tenant = {
-                      Id: extInfo?.TenantId?.objectId || "",
-                      Name: extInfo?.TenantId?.TenantName || ""
-                    };
-                    localStorage.setItem("TenantId", tenant?.Id);
-                    dispatch(showTenant(tenant?.Name));
-                    localStorage.setItem("TenantName", tenant?.Name);
-                  }
-                  localStorage.setItem("PageLanding", menu.pageId);
-                  localStorage.setItem("defaultmenuid", menu.menuId);
-                  localStorage.setItem("pageType", menu.pageType);
-                  navigate(redirectUrl);
-                } else {
-                  showToast("danger", t("role-not-found"));
-                  logOutUser();
-                }
-              } else {
-                showToast("danger", t("do-not-access-contact-admin"));
-                logOutUser();
-              }
-            } else {
-              showToast("danger", t("user-not-found"));
-              logOutUser();
-            }
-          })
-          .catch((err) => {
-            console.error("err in fetching extUser", err);
-            showToast("danger", `${err.message}`);
-            const payload = { sessionToken: sessionToken };
-            handleSubmitbtn(payload);
-          });
-      } catch (error) {
-        showToast("danger", `${error.message}`);
-        console.log(error);
-      } finally {
-        setThirdpartyLoader(false);
-      }
-    }
-  };
-
-  const GetLoginData = async () => {
-    setState({ ...state, loading: true });
-    try {
-      const user = await Parse.User.become(localStorage.getItem("accesstoken"));
-      const _user = user.toJSON();
-      localStorage.setItem("UserInformation", JSON.stringify(_user));
-      localStorage.setItem("accesstoken", _user.sessionToken);
-      localStorage.setItem("scriptId", true);
-      if (_user.ProfilePic) {
-        localStorage.setItem("profileImg", _user.ProfilePic);
-      } else {
-        localStorage.setItem("profileImg", "");
-      }
-      const userSettings = appInfo.settings;
-      await Parse.Cloud.run("getUserDetails").then(async (extUser) => {
+        const extUser = await Parse.Cloud.run("getUserDetails");
        if (extUser) {
          const IsDisabled = extUser?.get("IsDisabled") || false;
          if (!IsDisabled) {
-            const userRole = extUser.get("UserRole");
-            const _currentRole = userRole;
+            const userRole = extUser?.get("UserRole");
            const menu =
              userRole && userSettings.find((menu) => menu.role === userRole);
            if (menu) {
-              const _role = _currentRole.replace("contracts_", "");
-              localStorage.setItem("_user_role", _role);
+              const _currentRole = userRole;
              const redirectUrl =
                location?.state?.from || `/${menu.pageType}/${menu.pageId}`;
-              const results = [extUser];
-              const extendedInfo_stringify = JSON.stringify(results);
-              localStorage.setItem("Extand_Class", extendedInfo_stringify);
+              const _role = _currentRole.replace("contracts_", "");
              const extInfo = JSON.parse(JSON.stringify(extUser));
-              localStorage.setItem("userEmail", extInfo.Email);
-              localStorage.setItem("username", extInfo.Name);
+              localStorage.setItem("_user_role", _role);
+              localStorage.setItem("Extand_Class", JSON.stringify([extUser]));
+              localStorage.setItem("userEmail", extInfo?.Email);
+              localStorage.setItem("username", extInfo?.Name);
              if (extInfo?.TenantId) {
                const tenant = {
                  Id: extInfo?.TenantId?.objectId || "",
@@ -320,10 +184,9 @@ function Login() {
              localStorage.setItem("PageLanding", menu.pageId);
              localStorage.setItem("defaultmenuid", menu.menuId);
              localStorage.setItem("pageType", menu.pageType);
-              // Redirect to the appropriate URL after successful login
-              navigate(redirectUrl);
+                navigate(redirectUrl);
            } else {
-              setState({ ...state, loading: false });
+              showToast("danger", t("role-not-found"));
              logOutUser();
            }
          } else {
@@ -334,7 +197,66 @@ function Login() {
          showToast("danger", t("user-not-found"));
          logOutUser();
        }
-      });
+      } catch (error) {
+        console.error("err in fetching extUser", err);
+        showToast("danger", `${err.message}`);
+        const payload = { sessionToken: _user.sessionToken };
+        handleSubmitbtn(payload);
+      } finally {
+        setThirdpartyLoader(false);
+      }
+    }
+  };
+
+  const GetLoginData = async () => {
+    setState({ ...state, loading: true });
+    try {
+      const user = await Parse.User.become(localStorage.getItem("accesstoken"));
+      const _user = user.toJSON();
+      setLocalVar(_user);
+      const userSettings = appInfo.settings;
+      const extUser = await Parse.Cloud.run("getUserDetails");
+      if (extUser) {
+        const IsDisabled = extUser?.get("IsDisabled") || false;
+        if (!IsDisabled) {
+          const userRole = extUser.get("UserRole");
+          const _currentRole = userRole;
+          const menu =
+            userRole && userSettings.find((menu) => menu.role === userRole);
+          if (menu) {
+            const extInfo = JSON.parse(JSON.stringify(extUser));
+            const _role = _currentRole.replace("contracts_", "");
+            localStorage.setItem("_user_role", _role);
+            const redirectUrl =
+              location?.state?.from || `/${menu.pageType}/${menu.pageId}`;
+            localStorage.setItem("Extand_Class", JSON.stringify([extUser]));
+            localStorage.setItem("userEmail", extInfo.Email);
+            localStorage.setItem("username", extInfo.Name);
+            if (extInfo?.TenantId) {
+              const tenant = {
+                Id: extInfo?.TenantId?.objectId || "",
+                Name: extInfo?.TenantId?.TenantName || ""
+              };
+              localStorage.setItem("TenantId", tenant?.Id);
+              dispatch(showTenant(tenant?.Name));
+              localStorage.setItem("TenantName", tenant?.Name);
+            }
+            localStorage.setItem("PageLanding", menu.pageId);
+            localStorage.setItem("defaultmenuid", menu.menuId);
+            localStorage.setItem("pageType", menu.pageType);
+              navigate(redirectUrl);
+          } else {
+            setState({ ...state, loading: false });
+            logOutUser();
+          }
+        } else {
+          showToast("danger", t("do-not-access-contact-admin"));
+          logOutUser();
+        }
+      } else {
+        showToast("danger", t("user-not-found"));
+        logOutUser();
+      }
    } catch (error) {
      showToast("danger", t("something-went-wrong-mssg"));
      console.log("err", error);
@@ -417,6 +339,63 @@ function Login() {
    localStorage.setItem("parseAppId", appid);
  };

+  const continueLoginFlow = async () => {
+    try {
+      const userSettings = appInfo.settings;
+      const extUser = await Parse.Cloud.run("getUserDetails");
+      if (extUser) {
+        const IsDisabled = extUser?.get("IsDisabled") || false;
+        if (!IsDisabled) {
+          const userRole = extUser?.get("UserRole");
+          const menu =
+            userRole && userSettings?.find((menu) => menu.role === userRole);
+          if (menu) {
+            const _currentRole = userRole;
+            const redirectUrl =
+              location?.state?.from || `/${menu.pageType}/${menu.pageId}`;
+            const _role = _currentRole.replace("contracts_", "");
+            localStorage.setItem("_user_role", _role);
+            const checkLanguage = extUser?.get("Language");
+            if (checkLanguage) {
+              checkLanguage && i18n.changeLanguage(checkLanguage);
+            }
+            const extInfo = JSON.parse(JSON.stringify(extUser));
+            // Continue with storing user data and redirecting
+            localStorage.setItem("Extand_Class", JSON.stringify([extUser]));
+            localStorage.setItem("userEmail", extInfo.Email);
+            localStorage.setItem("username", extInfo.Name);
+            if (extInfo?.TenantId) {
+              const tenant = {
+                Id: extInfo?.TenantId?.objectId || "",
+                Name: extInfo?.TenantId?.TenantName || ""
+              };
+              localStorage.setItem("TenantId", tenant?.Id);
+              dispatch(showTenant(tenant?.Name));
+              localStorage.setItem("TenantName", tenant?.Name);
+            }
+            localStorage.setItem("PageLanding", menu.pageId);
+            localStorage.setItem("defaultmenuid", menu.menuId);
+            localStorage.setItem("pageType", menu.pageType);
+              setState({ ...state, loading: false });
+              navigate(redirectUrl);
+          } else {
+            setState({ ...state, loading: false });
+            setIsModal(true);
+          }
+        } else {
+          showToast("danger", t("do-not-access-contact-admin"));
+          logOutUser();
+        }
+      } else {
+          showToast("danger", t("user-not-found"));
+          logOutUser();
+      }
+    } catch (error) {
+      console.error("Error during login flow", error);
+      showToast("danger", error.message || t("something-went-wrong-mssg"));
+    }
+  };
+
  return errMsg ? (
    <div className="h-screen flex justify-center text-center items-center p-4 text-gray-500 text-base">
      {errMsg}
@@ -437,7 +416,7 @@ function Login() {
          <div
            aria-labelledby="loginHeading"
            role="region"
-            className="pb-1 md:pb-4 pt-10 md:px-10 lg:px-16 h-screen"
+            className="pb-1 md:pb-4 pt-10 md:px-10 lg:px-16 h-full"
          >
            <div className="md:p-4 lg:p-10 p-4 bg-base-100 text-base-content op-card">
              <div className="w-[250px] h-[66px] inline-block overflow-hidden">
@@ -476,35 +455,39 @@ function Login() {
                          onInput={(e) => e.target.setCustomValidity("")}
                        />
                        <hr className="my-1 border-none" />
-                        <label className="block text-xs" htmlFor="password">
-                          {t("password")}
-                        </label>
-                        <div className="relative">
-                          <input
-                            id="password"
-                            type={state.passwordVisible ? "text" : "password"}
-                            className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-                            name="password"
-                            value={state.password}
-                            autoComplete="current-password"
-                            onChange={handleChange}
-                            onInvalid={(e) =>
-                              e.target.setCustomValidity(t("input-required"))
-                            }
-                            onInput={(e) => e.target.setCustomValidity("")}
-                            required
-                          />
-                          <span
-                            className="absolute cursor-pointer top-[50%] right-[10px] -translate-y-[50%] text-base-content"
-                            onClick={togglePasswordVisibility}
-                          >
-                            {state.passwordVisible ? (
-                              <i className="fa-light fa-eye-slash text-xs pb-1" /> // Close eye icon
-                            ) : (
-                              <i className="fa-light fa-eye text-xs pb-1 " /> // Open eye icon
-                            )}
-                          </span>
-                        </div>
+                            <label className="block text-xs" htmlFor="password">
+                              {t("password")}
+                            </label>
+                            <div className="relative">
+                              <input
+                                id="password"
+                                type={
+                                  state.passwordVisible ? "text" : "password"
+                                }
+                                className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+                                name="password"
+                                value={state.password}
+                                autoComplete="current-password"
+                                onChange={handleChange}
+                                onInvalid={(e) =>
+                                  e.target.setCustomValidity(
+                                    t("input-required")
+                                  )
+                                }
+                                onInput={(e) => e.target.setCustomValidity("")}
+                                required
+                              />
+                              <span
+                                className="absolute cursor-pointer top-[50%] right-[10px] -translate-y-[50%] text-base-content"
+                                onClick={togglePasswordVisibility}
+                              >
+                                {state.passwordVisible ? (
+                                  <i className="fa-light fa-eye-slash text-xs pb-1" /> // Close eye icon
+                                ) : (
+                                  <i className="fa-light fa-eye text-xs pb-1 " /> // Open eye icon
+                                )}
+                              </span>
+                            </div>

                        <div className="relative mt-1">
                          <NavLink
@@ -1,7 +1,11 @@
 import React, { useEffect, useState, useRef } from "react";
 import "../styles/opensigndrive.css";
-import { iconColor } from "../constant/const";
-import { getDrive } from "../constant/Utils";
+import {
+  iconColor,
+} from "../constant/const";
+import {
+  getDrive
+} from "../constant/Utils";
 import { useNavigate } from "react-router";
 import Title from "../components/Title";
 import Parse from "parse";
@@ -25,7 +29,8 @@ const AppLoader = () => {
  );
 };
 function Opensigndrive() {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const drivename = appName === "OpenSign™" ? "OpenSign™" : "";
  const { t } = useTranslation();
  const navigate = useNavigate();
@@ -58,6 +63,9 @@ function Opensigndrive() {
  const [isDontShow, setIsDontShow] = useState(false);
  const [tourData, setTourData] = useState();
  const [showTourFirstTIme, setShowTourFirstTime] = useState(true);
+  const [searchTerm, setSearchTerm] = useState("");
+  const [mobileSearchOpen, setMobileSearchOpen] = useState(false);
+  const debounceTimer = useRef(null);
  const orderName = {
    Ascending: "Ascending",
    Descending: "Descending",
@@ -125,7 +133,7 @@ function Opensigndrive() {
    }
  ];
  const getDetails = async () => {
-    getPdfDocumentList();
+      getPdfDocumentList();
  };
  //function for get all pdf document list
  const getPdfDocumentList = async (disbaleLoading) => {
@@ -209,9 +217,7 @@ function Opensigndrive() {
      });
    } finally {
      setLoading(false);
-      setIsLoading({
-        isLoad: false
-      });
+      setIsLoading({ isLoad: false });
    }
  };

@@ -219,15 +225,16 @@ function Opensigndrive() {
  const handleScroll = () => {
    //get document of render openSign-drive component using id
    const documentList = document.getElementById("renderList");
-    //documentList.clientHeight property returns the height of an element's content area, including padding but not including borders, margins, or scrollbars.
-    //documentList.scrollHeight property returns the entire height of an element,including the parts that are not visible due to overflow..
-    // documentList.scrollTop property show height of element, how much the content has been scrolled from the top.
+    const { scrollTop, clientHeight, scrollHeight } = documentList;
+    const scrolled = Math.ceil(scrollTop + clientHeight); // ceil return e.g 3.14 => 4
+    const totalHeight = Math.floor(scrollHeight); // floor return e.g 3.14 => 3
+
+    // clientHeight property returns the height of an element's content area, including padding but not including borders, margins, or scrollbars.
+    // scrollHeight property returns the entire height of an element,including the parts that are not visible due to overflow..
+    // scrollTop property show height of element, how much the content has been scrolled from the top.
    // When the sum of scrollTop and clientHeight is equal to scrollHeight, it means that the user has scrolled to the bottom of the div.
-    if (
-      documentList &&
-      documentList.scrollTop + documentList.clientHeight >=
-        documentList.scrollHeight
-    ) {
+
+    if (scrolled >= totalHeight) {
      //disableLoading is used disable initial loader
      const disableLoading = true;
      // If the fetched data length is less than the limit, it means there's no more data to fetch
@@ -252,11 +259,7 @@ function Opensigndrive() {
  const handleRoute = (index, folderData) => {
    setSkip(0);
    // after onclick on route filter route from that index
-    const updateFolderName = folderName.filter((x, i) => {
-      if (i <= index) {
-        return x;
-      }
-    });
+    const updateFolderName = folderName.filter((_, i) => i <= index);
    setFolderName(updateFolderName);
    //get route details after onclick path of folder name
    const getCurrentId = folderData[index];
@@ -517,6 +520,34 @@ function Opensigndrive() {
      setIsTour(true);
    }
  }
+
+  const handleSearchChange = async (e) => {
+    const name = e.target.value.toLowerCase();
+    setSearchTerm(name);
+    // Clear previous timer
+    if (debounceTimer.current) {
+      clearTimeout(debounceTimer.current);
+    }
+    // Start new debounce timer
+    debounceTimer.current = setTimeout(async () => {
+      try {
+        const res = await Parse.Cloud.run("filterdocs", { searchTerm: name });
+        setPdfData(JSON.parse(JSON.stringify(res)));
+      } catch (err) {
+        console.error("Search error:", err);
+        alert(`Error: ${err.message}`);
+      }
+    }, 300);
+  };
+  // Cleanup on unmount
+  useEffect(() => {
+    return () => {
+      if (debounceTimer.current) {
+        clearTimeout(debounceTimer.current);
+      }
+    };
+  }, []);
+
  return (
    <div className="bg-base-100 text-base-content rounded-box w-full shadow-md">
      <Title title={`${drivename} Drive`} drive={true} />
@@ -524,22 +555,14 @@ function Opensigndrive() {
        isOpen={isAlert.isShow}
        title={t("alert")}
        handleClose={() => {
-          setIsAlert({
-            isShow: false,
-            alertMessage: ""
-          });
+          setIsAlert({ isShow: false, alertMessage: "" });
        }}
      >
        <div className="h-full p-[20px] pb-[15px]">
          <p>{isAlert.alertMessage}</p>
          <div className="h-[1px] bg-[#9f9f9f] w-full my-[15px]"></div>
          <button
-            onClick={() =>
-              setIsAlert({
-                isShow: false,
-                alertMessage: ""
-              })
-            }
+            onClick={() => setIsAlert({ isShow: false, alertMessage: "" })}
            type="button"
            className="op-btn op-btn-neutral op-btn-sm"
          >
@@ -608,7 +631,7 @@ function Opensigndrive() {
        </div>
      ) : (
        <>
-          <div className="flex flex-row justify-between items-center px-[15px] md:px-[25px] pt-[20px]">
+          <div className="flex flex-row justify-between items-center px-[15px] md:px-[25px] pt-2 md:pt-[20px]">
            {tourData && (
              <Tour
                onRequestClose={closeTour}
@@ -627,24 +650,42 @@ function Opensigndrive() {
            >
              {handleFolderTab(folderName)}
            </div>
-            <div className="flex flex-row items-center">
+            <div className="flex flex-row items-center justify-center md:gap-1">
+              {/* Desktop search input */}
+              <div className="hidden md:block p-2">
+                <input
+                  type="search"
+                  value={searchTerm}
+                  onChange={handleSearchChange}
+                  placeholder="Search documents…"
+                  className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-64 text-xs"
+                />
+              </div>
+              {/* Mobile search toggle */}
+              <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={() => setMobileSearchOpen((open) => !open)}
+              >
+                <i
+                  style={{ color: `${iconColor}` }}
+                  className="fa-solid fa-magnifying-glass"
+                ></i>
+              </button>
              <div
                id="folder-menu"
-                className={`${
-                  isOptions ? "dropdown show dropDownStyle" : "dropdown"
-                } hidden md:block`}
+                className={`${isOptions ? "dropdown show dropDownStyle" : "dropdown"} hidden md:block cursor-pointer hover:bg-gray-200 p-2 rounded-md`}
                onClick={() => setIsOptions(!isOptions)}
              >
-                <div className="sort" data-tut="reactourSecond">
+                <div data-tut="reactourSecond">
                  <i
-                    className="fa-light fa-plus-square"
+                    className="fa-light fa-plus-square text-[24px]"
                    aria-hidden="true"
-                    style={{ fontSize: "25px", color: `${iconColor}` }}
+                    style={{ color: `${iconColor}` }}
                  ></i>
                </div>
                <div
                  className={`${isOptions ? "block" : "hidden"} ${dropdowncss}`}
-                  // className={isOptions ? "dropdown-menu show" : "dropdown-menu"}
                  aria-labelledby="dropdownMenuButton"
                  aria-expanded={isOptions ? "true" : "false"}
                >
@@ -683,11 +724,11 @@ function Opensigndrive() {
              >
                <div
                  data-tut="reactourThird"
-                  className="sort "
+                  className="cursor-pointer flex flex-row items-center justify-center p-2 hover:bg-gray-200 rounded-md"
                  data-toggle="dropdown"
                >
                  <i
-                    className="fa-light fa-sort-amount-asc mr-[5px] text-[14px]"
+                    className="fa-light fa-sort-amount-asc mr-[5px] text-[19px]"
                    aria-hidden="true"
                    style={{ color: `${iconColor}` }}
                  ></i>
@@ -702,81 +743,67 @@ function Opensigndrive() {
                  aria-labelledby="dropdownMenuButton"
                  aria-expanded={isShowSort ? "true" : "false"}
                >
-                  {sortingValue.map((value, ind) => {
-                    return (
-                      <span
-                        key={ind}
-                        onClick={() => {
-                          setSelectedSort(value);
-                          sortingData(value, null, pdfData);
-                        }}
-                        className="dropdown-item text-[10px] md:text-[13px]"
-                        style={{
-                          paddingLeft: selectedSort !== value && "31px"
-                        }}
-                      >
-                        {selectedSort === value && (
-                          <i
-                            className="fa-light fa-check"
-                            aria-hidden="true"
-                          ></i>
-                        )}
-                        <span className="ml-[5px]">
-                          {t(`sort-order.${value}`)}
-                        </span>
+                  {sortingValue.map((value, ind) => (
+                    <span
+                      key={ind}
+                      onClick={() => {
+                        setSelectedSort(value);
+                        sortingData(value, null, pdfData);
+                      }}
+                      className="dropdown-item text-[10px] md:text-[13px]"
+                      style={{
+                        paddingLeft: selectedSort !== value && "31px"
+                      }}
+                    >
+                      {selectedSort === value && (
+                        <i className="fa-light fa-check" aria-hidden="true"></i>
+                      )}
+                      <span className="ml-[5px]">
+                        {t(`sort-order.${value}`)}
                      </span>
-                    );
-                  })}
+                    </span>
+                  ))}
                  <hr className="hrStyle" />
-                  {sortOrder.map((order, ind) => {
-                    return (
-                      <span
-                        key={ind}
-                        onClick={() => {
-                          setSortingOrder(order);
-                          sortingData(null, order, pdfData);
-                        }}
-                        className="dropdown-item text-[10px] md:text-[13px]"
-                        style={{
-                          paddingLeft: sortingOrder !== order && "31px"
-                        }}
-                      >
-                        {sortingOrder === order && (
-                          <i
-                            className="fa-light fa-check"
-                            aria-hidden="true"
-                          ></i>
-                        )}
-                        <span className="ml-[5px]">
-                          {t(`sort-order.${order}`)}
-                        </span>
+                  {sortOrder.map((order, ind) => (
+                    <span
+                      key={ind}
+                      onClick={() => {
+                        setSortingOrder(order);
+                        sortingData(null, order, pdfData);
+                      }}
+                      className="dropdown-item text-[10px] md:text-[13px]"
+                      style={{
+                        paddingLeft: sortingOrder !== order && "31px"
+                      }}
+                    >
+                      {sortingOrder === order && (
+                        <i className="fa-light fa-check" aria-hidden="true"></i>
+                      )}
+                      <span className="ml-[5px]">
+                        {t(`sort-order.${order}`)}
                      </span>
-                    );
-                  })}
+                    </span>
+                  ))}
                </div>
              </div>
              <div
+                className="cursor-pointer p-2 hover:bg-gray-200 rounded-md flex justify-center items-center"
                data-tut="reactourForth"
-                className="sort"
                onClick={() => setIsList(!isList)}
              >
                <i
-                  className={
-                    isList ? "fa-light fa-th-large" : "fa-light fa-list"
-                  }
-                  style={{ fontSize: "24px", color: `${iconColor}` }}
+                  className={`${isList ? "fa-light fa-th-large" : "fa-light fa-list"} text-[20px]`}
+                  style={{ color: `${iconColor}` }}
                  aria-hidden="true"
                ></i>
              </div>
              <div
                id="folder-menu"
-                className={`${
-                  isOptions ? "dropdown show dropDownStyle" : "dropdown"
-                } md:hidden`}
+                className={`${isOptions ? "dropdown show dropDownStyle" : "dropdown"} md:hidden`}
                onClick={() => setIsOptions(!isOptions)}
              >
                <div
-                  className="p-[19px] my-2 flex items-center justify-center cursor-pointer hover:bg-[var(--mauve-3)] rounded-[2px] shadow-[0_2px_4px_rgba(168,204,206,0.1)]"
+                  className="p-3 flex items-center justify-center cursor-pointer rounded-md hover:bg-gray-200"
                  data-tut="reactourSecond"
                >
                  <i
@@ -820,7 +847,18 @@ function Opensigndrive() {
              </div>
            </div>
          </div>
-
+          {/* Mobile search overlay */}
+          {mobileSearchOpen && (
+            <div className="top-full left-0 w-full bg-white px-4 py-2 shadow-md md:hidden">
+              <input
+                type="search"
+                value={searchTerm}
+                onChange={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>
+          )}
          {pdfData && pdfData.length === 0 ? (
            <div className="flex justify-center items-center w-full h-[50vh]">
              <span className="text-base-content font-bold">
@@ -3,7 +3,9 @@ import axios from "axios";
 import Parse from "parse";
 import "../styles/signature.css";
 import { PDFDocument } from "pdf-lib";
-import { maxTitleLength } from "../constant/const";
+import {
+  maxTitleLength
+} from "../constant/const";
 import { DndProvider } from "react-dnd";
 import { HTML5Backend } from "react-dnd-html5-backend";
 import { useDrop } from "react-dnd";
@@ -70,7 +72,8 @@ import AddContact from "../primitives/AddContact";
 function PlaceHolderSign() {
  const { t } = useTranslation();
  const copyUrlRef = useRef(null);
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const editorRef = useRef();
  const { state } = useLocation();
  const navigate = useNavigate();
@@ -869,7 +872,11 @@ function PlaceHolderSign() {
          scale
        );
        const pdfName = generatePdfName(16);
-        const pdfUrl = await convertBase64ToFile(pdfName, pdfBase64, "");
+        const pdfUrl = await convertBase64ToFile(
+          pdfName,
+          pdfBase64,
+          "",
+        );
        const tenantId = localStorage.getItem("TenantId");
        const buffer = atob(pdfBase64);
        SaveFileSize(buffer.length, pdfUrl, tenantId);
@@ -881,7 +888,11 @@ function PlaceHolderSign() {
    } else if (pdfBase64Url) {
      try {
        const pdfName = generatePdfName(16);
-        const pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+        const pdfUrl = await convertBase64ToFile(
+          pdfName,
+          pdfBase64Url,
+          "",
+        );
        return pdfUrl;
      } catch (err) {
        console.log("error to convertBase64ToFile in placeholder flow", err);
@@ -987,7 +998,11 @@ function PlaceHolderSign() {
    let pdfUrl;
    if (isUploadPdf) {
      const pdfName = generatePdfName(16);
-      pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+      pdfUrl = await convertBase64ToFile(
+        pdfName,
+        pdfBase64Url,
+        "",
+      );
    }
    try {
      const docCls = new Parse.Object("contracts_Document");
@@ -1058,9 +1073,7 @@ function PlaceHolderSign() {
          ExpiryDate: { iso: updateExpiryDate, __type: "Date" }
        };
        await axios.put(
-          `${localStorage.getItem(
-            "baseUrl"
-          )}classes/contracts_Document/${documentId}`,
+          `${localStorage.getItem("baseUrl")}classes/contracts_Document/${documentId}`,
          data,
          {
            headers: {
@@ -1152,7 +1165,8 @@ function PlaceHolderSign() {
      year: "numeric"
    });

-    let senderEmail = pdfDetails?.[0]?.ExtUserPtr?.Email;
+    let senderEmail =
+      pdfDetails?.[0]?.ExtUserPtr?.Email;
    let senderPhone = pdfDetails?.[0]?.ExtUserPtr?.Phone;
    let signerMail = signersdata.slice();

@@ -1178,11 +1192,16 @@ function PlaceHolderSign() {
        const orgName = pdfDetails[0]?.ExtUserPtr.Company
          ? pdfDetails[0].ExtUserPtr.Company
          : "";
-        const senderName = pdfDetails?.[0].ExtUserPtr.Name;
+        const senderName =
+          pdfDetails?.[0].ExtUserPtr.Name;
        const documentName = `${pdfDetails?.[0].Name}`;
        let replaceVar;

-        if (requestBody && requestSubject && isCustomize) {
+        if (
+          requestBody &&
+          requestSubject &&
+          isCustomize
+        ) {
          const replacedRequestBody = requestBody.replace(/"/g, "'");
          htmlReqBody =
            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>" +
@@ -1207,7 +1226,10 @@ function PlaceHolderSign() {
            htmlReqBody,
            variables
          );
-        } else if (tenantMailTemplate?.body && tenantMailTemplate?.subject) {
+        } else if (
+          tenantMailTemplate?.body &&
+          tenantMailTemplate?.subject
+        ) {
          const mailBody = tenantMailTemplate?.body;
          const mailSubject = tenantMailTemplate?.subject;
          const replacedRequestBody = mailBody.replace(/"/g, "'");
@@ -1246,7 +1268,8 @@ function PlaceHolderSign() {
            ? replaceVar?.subject
            : mailTemplate(mailparam).subject,
          replyto: senderEmail,
-          from: senderEmail,
+          from:
+            senderEmail,
          html: replaceVar?.body
            ? replaceVar?.body
            : mailTemplate(mailparam).body
@@ -1261,13 +1284,20 @@ function PlaceHolderSign() {
      setMailStatus("success");
      try {
        let data;
-        if (requestBody && requestSubject && isCustomize) {
+        if (
+          requestBody &&
+          requestSubject &&
+          isCustomize
+        ) {
          data = {
            RequestBody: htmlReqBody,
            RequestSubject: requestSubject,
            SendMail: true
          };
-        } else if (tenantMailTemplate?.body && tenantMailTemplate?.subject) {
+        } else if (
+          tenantMailTemplate?.body &&
+          tenantMailTemplate?.subject
+        ) {
          data = {
            RequestBody: tenantMailTemplate?.body,
            RequestSubject: tenantMailTemplate?.subject,
@@ -1305,7 +1335,8 @@ function PlaceHolderSign() {
      setIsSend(true);
      setIsMailSend(true);
      setIsUiLoading(false);
-    } else {
+    }
+    else {
      setMailStatus("failed");
      setIsSend(true);
      setIsMailSend(true);
@@ -1546,7 +1577,8 @@ function PlaceHolderSign() {
                  status: defaultdata?.status || "required",
                  hint: defaultdata?.hint || "",
                  defaultValue: defaultdata?.defaultValue || "",
-                  validation: {},
+                  validation:
+                        {},
                  fontSize:
                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
                  fontColor:
@@ -2029,26 +2061,30 @@ function PlaceHolderSign() {
                          {!isCustomize && (
                            <span>{t("placeholder-alert-3")}</span>
                          )}
-                          {isCustomize && (
-                            <>
-                              <EmailBody
-                                editorRef={editorRef}
-                                requestBody={requestBody}
-                                requestSubject={requestSubject}
-                                handleOnchangeRequest={handleOnchangeRequest}
-                                setRequestSubject={setRequestSubject}
-                              />
-                              <div
-                                className="flex justify-end items-center gap-1 mt-2 op-link op-link-primary"
-                                onClick={() => {
-                                  setRequestBody(defaultBody);
-                                  setRequestSubject(defaultSubject);
-                                }}
-                              >
-                                <span>{t("reset-to-default")}</span>
-                              </div>
-                            </>
-                          )}
+                          {
+                              isCustomize && (
+                                <>
+                                  <EmailBody
+                                    editorRef={editorRef}
+                                    requestBody={requestBody}
+                                    requestSubject={requestSubject}
+                                    handleOnchangeRequest={
+                                      handleOnchangeRequest
+                                    }
+                                    setRequestSubject={setRequestSubject}
+                                  />
+                                  <div
+                                    className="flex justify-end items-center gap-1 mt-2 op-link op-link-primary"
+                                    onClick={() => {
+                                      setRequestBody(defaultBody);
+                                      setRequestSubject(defaultSubject);
+                                    }}
+                                  >
+                                    <span>{t("reset-to-default")}</span>
+                                  </div>
+                                </>
+                              )
+                          }
                          <div className="flex flex-row items-center gap-2 md:gap-6 mt-2">
                            <div className="flex flex-row gap-2">
                              <button
@@ -2066,14 +2102,16 @@ function PlaceHolderSign() {
                                </button>
                              )}
                            </div>
-                            {!isCustomize && (
-                              <span
-                                className="op-link op-link-accent text-sm"
-                                onClick={() => setIsCustomize(!isCustomize)}
-                              >
-                                {t("cutomize-email")}
-                              </span>
-                            )}
+                            {
+                                !isCustomize && (
+                                  <span
+                                    className="op-link op-link-accent text-sm"
+                                    onClick={() => setIsCustomize(!isCustomize)}
+                                  >
+                                    {t("cutomize-email")}
+                                  </span>
+                                )
+                            }
                          </div>
                        </>
                      )}
@@ -23,7 +23,8 @@ import EditorToolbar, {
 import DateFormatSelector from "../components/shared/fields/DateFormatSelector";

 const Preferences = () => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const { t } = useTranslation();
  const editorRef = useRef();
  const editorRefCom = useRef();
@@ -44,13 +45,17 @@ const Preferences = () => {
  const [isNotifyOnSignatures, setIsNotifyOnSignatures] = useState();
  const [timezone, setTimezone] = useState(usertimezone);
  const [activeTab, setactiveTab] = useState(0);
-  const generaltab = { title: t("general"), icon: "fa-light fa-gears" };
+  const generaltab = {
+    name: "general",
+    title: t("general"),
+    icon: "fa-light fa-gears"
+  };
  const [tab, setTab] = useState([generaltab]);
  const [sendinOrder, setSendinOrder] = useState(true);
  const [isTourEnabled, setIsTourEnabled] = useState(false);
  const [dateFormat, setDateFormat] = useState("MM/DD/YYYY");
  const [is12HourTime, setIs12HourTime] = useState(false);
-
+  const [isLTVEnabled, setIsLTVEnabled] = useState(false);
  useEffect(() => {
    fetchSignType();
    // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -60,9 +65,12 @@ const Preferences = () => {
    setIsTopLoader(true);
    const EmailTab =
      extClass?.[0]?.UserRole === "contracts_Admin"
-        ? [{ title: t("email"), icon: "fa-light fa-envelope" }]
+        ? [{ name: "email", title: t("email"), icon: "fa-light fa-envelope" }]
        : [];
-    const arr = [generaltab, ...EmailTab];
+    const arr = [
+      generaltab,
+      ...EmailTab,
+    ];
    setTab(arr);
    try {
      const user = JSON.parse(
@@ -110,6 +118,9 @@ const Preferences = () => {
        const is12Hr =
          _getUser?.Is12HourTime !== undefined ? _getUser?.Is12HourTime : false;
        setIs12HourTime(is12Hr);
+        const isLTVEnabled =
+          _getUser?.IsLTVEnabled !== undefined ? _getUser?.IsLTVEnabled : false;
+        setIsLTVEnabled(isLTVEnabled);
      }
    } catch (err) {
      console.log("err while getting user details", err);
@@ -167,7 +178,8 @@ const Preferences = () => {
          SendinOrder: sendinOrder,
          IsTourEnabled: isTourEnabled,
          DateFormat: dateFormat,
-          Is12HourTime: is12HourTime
+          Is12HourTime: is12HourTime,
+          IsLTVEnabled: isLTVEnabled
        };
        const updateRes = await Parse.Cloud.run("updatepreferences", params);
        if (updateRes) {
@@ -322,7 +334,7 @@ const Preferences = () => {

  const handleTourInput = () => setIsTourEnabled(!isTourEnabled);
  const handleSendinOrderInput = () => setSendinOrder(!sendinOrder);
-
+  const tabName = (ind) => tab.find((t, i) => i === ind)?.name;
  return (
    <React.Fragment>
      <Title title={t("Preferences")} />
@@ -344,7 +356,7 @@ const Preferences = () => {
                  <Loader />
                </div>
              )}
-              <h1 className="ml-4 mt-3 mb-2 font-semibold">
+              <h1 className="ml-4 mt-3 text-lg mb-2 font-semibold text-base-content">
                {appName} {t("Preferences")}{" "}
                <span>
                  <Tooltip message={`${appName} ${t("Preferences")}`} />
@@ -360,9 +372,9 @@ const Preferences = () => {
                      onClick={() => setactiveTab(ind)}
                      key={ind}
                      role="tab"
-                      className={`${
-                        activeTab === ind ? "op-tab-active" : ""
-                      } op-tab text-xs md:text-base pb-2 md:pb-0 }`}
+                      className={`${activeTab === ind ? "op-tab-active" : ""} op-tab text-xs md:text-base pb-2 md:pb-0 transition-all `}
+                      aria-selected={activeTab === ind}
+                      aria-controls={`panel-${tabData.title}`}
                    >
                      <i className={tabData.icon}></i>
                      <span className="ml-1 md:ml-2">{tabData.title}</span>
@@ -370,275 +382,336 @@ const Preferences = () => {
                  ))}
                </div>
              </div>
-              <div className="flex justify-center md:justify-start mt-3 md:mt-4 break-all">
-                {activeTab === 0 ? (
-                  <div className="ml-4 mt-1 mb-2 flex flex-col">
-                    <div className="mb-[0.75rem]">
-                      <label
-                        className="mb-[0.7rem] text-[12px]"
-                        htmlFor="signaturetype"
-                      >
-                        <span className="font-medium text-[14px]">
-                          {t("allowed-signature-types")}
-                        </span>
-                        <a data-tooltip-id="signtypes-tooltip" className="ml-1">
-                          <sup>
-                            <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
-                          </sup>
-                        </a>
-                        <ReactTooltip
-                          id="signtypes-tooltip"
-                          className="z-[999]"
+              <div
+                id="panel-general"
+                className="px-6 pt-4 pb-6"
+                aria-labelledby="tab-general"
+                role="tabpanel"
+              >
+                {tabName(activeTab) === "general" && (
+                  <div className="grid grid-cols-1 md:grid-cols-12 md:gap-x-8">
+                    {/* Left Column - Signature Settings */}
+                    <div className="md:col-span-5 flex flex-col">
+                      {/* Signature Types Section */}
+                      <div className="mb-6">
+                        <label
+                          className="text-[14px] mb-[0.7rem] font-medium"
+                          htmlFor="signaturetype"
                        >
-                          <div className="max-w-[200px] md:max-w-[450px]">
-                            <p className="font-bold">
-                              {t("allowed-signature-types")}
-                            </p>
-                            <p>{t("allowed-signature-types-help.p1")}</p>
-                            <div className="p-[5px] ml-2">
-                              <ol className="list-disc">
-                                <li>
-                                  <span className="font-bold">Draw: </span>
-                                  <span>
-                                    {t("allowed-signature-types-help.l1")}
-                                  </span>
-                                </li>
-                                <li>
-                                  <span className="font-bold">Type: </span>
-                                  <span>
-                                    {t("allowed-signature-types-help.l2")}
-                                  </span>
-                                </li>
-                                <li>
-                                  <span className="font-bold">Upload: </span>
-                                  <span>
-                                    {t("allowed-signature-types-help.l3")}
-                                  </span>
-                                </li>
-                                <li>
-                                  <span className="font-bold">Default: </span>
-                                  <span>
-                                    {t("allowed-signature-types-help.l4")}
-                                  </span>
-                                </li>
-                              </ol>
+                          {t("allowed-signature-types")}
+                          <a
+                            data-tooltip-id="signtypes-tooltip"
+                            className="ml-1"
+                          >
+                            <sup>
+                              <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
+                            </sup>
+                          </a>
+                          <ReactTooltip
+                            id="signtypes-tooltip"
+                            className="z-[999]"
+                          >
+                            <div className="max-w-[200px] md:max-w-[450px]">
+                              <p className="font-bold">
+                                {t("allowed-signature-types")}
+                              </p>
+                              <p>{t("allowed-signature-types-help.p1")}</p>
+                              <div className="p-[5px] ml-2">
+                                <ol className="list-disc">
+                                  <li>
+                                    <span className="font-bold">Draw: </span>
+                                    <span>
+                                      {t("allowed-signature-types-help.l1")}
+                                    </span>
+                                  </li>
+                                  <li>
+                                    <span className="font-bold">Type: </span>
+                                    <span>
+                                      {t("allowed-signature-types-help.l2")}
+                                    </span>
+                                  </li>
+                                  <li>
+                                    <span className="font-bold">Upload: </span>
+                                    <span>
+                                      {t("allowed-signature-types-help.l3")}
+                                    </span>
+                                  </li>
+                                  <li>
+                                    <span className="font-bold">Default: </span>
+                                    <span>
+                                      {t("allowed-signature-types-help.l4")}
+                                    </span>
+                                  </li>
+                                </ol>
+                              </div>
                            </div>
-                          </div>
-                        </ReactTooltip>
-                      </label>
-                      <div className="ml-[7px] flex flex-col md:flex-row gap-[10px] mb-[0.7rem]">
-                        {signatureType.map((type, i) => (
+                          </ReactTooltip>
+                        </label>
+                        <div className="flex flex-col md:flex-row gap-3 mb-2">
+                          {signatureType.map((type, i) => (
+                            <div
+                              key={i}
+                              className="flex flex-row gap-2 items-center"
+                            >
+                              <input
+                                className="op-checkbox op-checkbox-xs"
+                                type="checkbox"
+                                id={`signature-type-${type.name}`}
+                                name="signaturetype"
+                                onChange={() => handleCheckboxChange(i)}
+                                checked={type.enabled}
+                              />
+                              <label
+                                htmlFor={`signature-type-${type.name}`}
+                                className="text-sm font-medium text-base-content hover:underline underline-offset-2 cursor-pointer capitalize mb-0"
+                                title={`Enabling this allows signers to ${type.name} signature`}
+                              >
+                                {type?.name === "typed" ? "type" : type?.name}
+                              </label>
+                            </div>
+                          ))}
+                        </div>
+                      </div>
+
+                      {/* Notify on Signatures Section */}
+                      <div className="mb-6">
+                        <label className="text-[14px] mb-[0.7rem] font-medium">
+                          {t("notify-on-signatures")}
+                          <a data-tooltip-id="nos-tooltip" className="ml-1">
+                            <sup>
+                              <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
+                            </sup>
+                          </a>
+                          <ReactTooltip id="nos-tooltip" className="z-[999]">
+                            <div className="max-w-[200px] md:max-w-[450px]">
+                              <p className="font-bold">
+                                {t("notify-on-signatures")}
+                              </p>
+                              <p>{t("notify-on-signatures-help.p1")}</p>
+                              <p>{t("notify-on-signatures-help.note")}</p>
+                            </div>
+                          </ReactTooltip>
+                        </label>
+                        <div className="flex flex-row gap-6">
                          <div
-                            key={i}
-                            className="flex flex-row gap-[5px] items-center"
+                            className={
+                              "flex items-center gap-2"
+                            }
                          >
                            <input
-                              className="mr-[2px] op-checkbox op-checkbox-xs"
-                              type="checkbox"
-                              name="signaturetype"
-                              onChange={() => handleCheckboxChange(i)}
-                              checked={type.enabled}
+                              id="notify-yes"
+                              className="op-radio op-radio-xs"
+                              type="radio"
+                              onChange={() => handleNotifySignChange(true)}
+                              checked={isNotifyOnSignatures === true}
                            />
-                            <div
-                              className="text-[13px] font-medium hover:underline underline-offset-2 cursor-default capitalize"
-                              title={`Enabling this allow signers to ${type.name} signature`}
+                            <label
+                              htmlFor="notify-yes"
+                              className="text-sm text-base-content cursor-pointer mb-0"
                            >
-                              {type?.name === "typed" ? "type" : type?.name}
-                            </div>
+                              {t("yes")}
+                            </label>
                          </div>
-                        ))}
-                      </div>
-                    </div>
-                    <div className="mb-[0.75rem]">
-                      <label className="mb-[0.7rem] text-[12px]">
-                        <span className="text-[14px] font-medium">
-                          {t("notify-on-signatures")}
-                        </span>
-                        <a data-tooltip-id="nos-tooltip" className="ml-1">
-                          <sup>
-                            <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
-                          </sup>
-                        </a>
-                        <ReactTooltip id="nos-tooltip" className="z-[999]">
-                          <div className="max-w-[200px] md:max-w-[450px]">
-                            <p className="font-bold">
-                              {t("notify-on-signatures")}
-                            </p>
-                            <p>{t("notify-on-signatures-help.p1")}</p>
-                            <p>{t("notify-on-signatures-help.note")}</p>
-                          </div>
-                        </ReactTooltip>
-                      </label>
-                      <div className="flex flex-col md:flex-row md:gap-4">
-                        <div className={"flex items-center gap-2 ml-2 mb-1"}>
-                          <input
-                            className="mr-[2px] op-radio op-radio-xs"
-                            type="radio"
-                            onChange={() => handleNotifySignChange(true)}
-                            checked={isNotifyOnSignatures === true}
-                          />
-                          <div className="text-[13px] cursor-default capitalize">
-                            {t("yes")}
-                          </div>
-                        </div>
-                        <div className={"flex items-center gap-2 ml-2 mb-1"}>
-                          <input
-                            className="mr-[2px] op-radio op-radio-xs"
-                            type="radio"
-                            onChange={() => handleNotifySignChange(false)}
-                            checked={isNotifyOnSignatures === false}
-                          />
-                          <div className="text-[13px] cursor-default capitalize">
-                            {t("no")}
+                          <div
+                            className={
+                              "flex items-center gap-2"
+                            }
+                          >
+                            <input
+                              id="notify-no"
+                              className="op-radio op-radio-xs"
+                              type="radio"
+                              onChange={() => handleNotifySignChange(false)}
+                              checked={isNotifyOnSignatures === false}
+                            />
+                            <label
+                              htmlFor="notify-no"
+                              className="text-sm text-base-content cursor-pointer mb-0"
+                            >
+                              {t("no")}
+                            </label>
                          </div>
                        </div>
                      </div>
-                    </div>
-                    <div className="mb-[0.75rem]">
-                      <TimezoneSelector
-                        timezone={timezone}
-                        setTimezone={setTimezone}
-                      />
-                    </div>
-                    <div className="mb-[0.75rem]">
-                      <DateFormatSelector
-                        timezone={timezone}
-                        dateFormat={dateFormat}
-                        is12HourTime={is12HourTime}
-                        setIs12HourTime={setIs12HourTime}
-                        setDateFormat={setDateFormat}
-                      />
-                    </div>
-                    <div className="mb-[0.75rem] text-[12px]">
-                      <label className="block mb-[0.7rem]">
-                        <span className="text-[14px] font-medium">
+
+                      {/* Send in Order Section */}
+                      <div className="mb-6">
+                        <label className="text-[14px] mb-[0.7rem] font-medium">
                          {t("send-in-order")}
-                        </span>
-                        <a
-                          data-tooltip-id="sendInOrder-tooltip"
-                          className="ml-1"
-                        >
-                          <sup>
-                            <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
-                          </sup>
-                        </a>
-                        <ReactTooltip
-                          id="sendInOrder-tooltip"
-                          className="z-[999]"
-                        >
-                          <div className="max-w-[200px] md:max-w-[450px]">
-                            <p className="font-bold">{t("send-in-order")}</p>
-                            <p>{t("send-in-order-help.p1")}</p>
-                            <div className="p-[5px]">
-                              <ol className="list-disc">
-                                <li>
-                                  <span className="font-bold">
-                                    {t("yes")}:{" "}
-                                  </span>
-                                  <span>{t("send-in-order-help.p2")}</span>
-                                </li>
-                                <li>
-                                  <span className="font-bold">{t("no")}: </span>
-                                  <span>{t("send-in-order-help.p3")}</span>
-                                </li>
-                              </ol>
+                          <a
+                            data-tooltip-id="sendInOrder-tooltip"
+                            className="ml-1"
+                          >
+                            <sup>
+                              <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
+                            </sup>
+                          </a>
+                          <ReactTooltip
+                            id="sendInOrder-tooltip"
+                            className="z-[999]"
+                          >
+                            <div className="max-w-[200px] md:max-w-[450px]">
+                              <p className="font-bold">{t("send-in-order")}</p>
+                              <p>{t("send-in-order-help.p1")}</p>
+                              <div className="p-[5px]">
+                                <ol className="list-disc">
+                                  <li>
+                                    <span className="font-bold">
+                                      {t("yes")}:{" "}
+                                    </span>
+                                    <span>{t("send-in-order-help.p2")}</span>
+                                  </li>
+                                  <li>
+                                    <span className="font-bold">
+                                      {t("no")}:{" "}
+                                    </span>
+                                    <span>{t("send-in-order-help.p3")}</span>
+                                  </li>
+                                </ol>
+                              </div>
+                              <p>{t("send-in-order-help.p4")}</p>
                            </div>
-                            <p>{t("send-in-order-help.p4")}</p>
+                          </ReactTooltip>
+                        </label>
+                        <div className="flex flex-row gap-6">
+                          <div className="flex items-center gap-2">
+                            <input
+                              id="order-yes"
+                              type="radio"
+                              value={true}
+                              className="op-radio op-radio-xs"
+                              name="SendinOrder"
+                              checked={sendinOrder}
+                              onChange={handleSendinOrderInput}
+                            />
+                            <label
+                              htmlFor="order-yes"
+                              className="text-sm text-base-content cursor-pointer mb-0"
+                            >
+                              {t("yes")}
+                            </label>
+                          </div>
+                          <div className="flex items-center gap-2">
+                            <input
+                              id="order-no"
+                              type="radio"
+                              value={false}
+                              name="SendinOrder"
+                              className="op-radio op-radio-xs"
+                              checked={!sendinOrder}
+                              onChange={handleSendinOrderInput}
+                            />
+                            <label
+                              htmlFor="order-no"
+                              className="text-sm text-base-content cursor-pointer mb-0"
+                            >
+                              {t("no")}
+                            </label>
                          </div>
-                        </ReactTooltip>
-                      </label>
-                      <div className="flex flex-col md:flex-row md:gap-4">
-                        <div className="flex items-center gap-2 ml-2 mb-1">
-                          <input
-                            type="radio"
-                            value={true}
-                            className="op-radio op-radio-xs"
-                            name="SendinOrder"
-                            checked={sendinOrder}
-                            onChange={handleSendinOrderInput}
-                          />
-                          <div className="text-center">{t("yes")}</div>
-                        </div>
-                        <div className="flex items-center gap-2 ml-2 mb-1">
-                          <input
-                            type="radio"
-                            value={false}
-                            name="SendinOrder"
-                            className="op-radio op-radio-xs"
-                            checked={!sendinOrder}
-                            onChange={handleSendinOrderInput}
-                          />
-                          <div className="text-center">{t("no")}</div>
                        </div>
                      </div>
-                    </div>
-                    <div className="mb-[0.75rem] text-[12px]">
-                      <label className="block mb-[0.7rem]">
-                        <span className="text-[14px] font-medium">
+
+                      {/* Enable Tour Section */}
+                      <div className="mb-6">
+                        <label className="text-[14px] mb-[0.7rem] font-medium">
                          {t("enable-tour")}
-                        </span>
-                        <a
-                          data-tooltip-id="istourenabled-tooltip"
-                          className="ml-1"
-                        >
-                          <sup>
-                            <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
-                          </sup>
-                        </a>
-                        <ReactTooltip
-                          id="istourenabled-tooltip"
-                          className="z-[999]"
-                        >
-                          <div className="max-w-[200px] md:max-w-[450px]">
-                            <p className="font-bold">{t("enable-tour")}</p>
-                            <div className="p-[5px]">
-                              <ol className="list-disc">
-                                <li>
-                                  <span className="font-bold">
-                                    {t("yes")}:{" "}
-                                  </span>
-                                  <span>{t("istourenabled-help.p1")}</span>
-                                </li>
-                                <li>
-                                  <span className="font-bold">{t("no")}: </span>
-                                  <span>{t("istourenabled-help.p2")}</span>
-                                </li>
-                              </ol>
+                          <a
+                            data-tooltip-id="istourenabled-tooltip"
+                            className="ml-1"
+                          >
+                            <sup>
+                              <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
+                            </sup>
+                          </a>
+                          <ReactTooltip
+                            id="istourenabled-tooltip"
+                            className="z-[999]"
+                          >
+                            <div className="max-w-[200px] md:max-w-[450px]">
+                              <p className="font-bold">{t("enable-tour")}</p>
+                              <div className="p-[5px]">
+                                <ol className="list-disc">
+                                  <li>
+                                    <span className="font-bold">
+                                      {t("yes")}:{" "}
+                                    </span>
+                                    <span>{t("istourenabled-help.p1")}</span>
+                                  </li>
+                                  <li>
+                                    <span className="font-bold">
+                                      {t("no")}:{" "}
+                                    </span>
+                                    <span>{t("istourenabled-help.p2")}</span>
+                                  </li>
+                                </ol>
+                              </div>
+                              <p>
+                                {t("istourenabled-help.p3", {
+                                  appName: appName
+                                })}
+                              </p>
                            </div>
-                            <p>
-                              {t("istourenabled-help.p3", {
-                                appName: appName
-                              })}
-                            </p>
+                          </ReactTooltip>
+                        </label>
+                        <div className="flex flex-row gap-6">
+                          <div className="flex items-center gap-2">
+                            <input
+                              id="tour-yes"
+                              type="radio"
+                              value={true}
+                              className="op-radio op-radio-xs"
+                              name="IsTourEnabled"
+                              checked={isTourEnabled}
+                              onChange={handleTourInput}
+                            />
+                            <label
+                              htmlFor="tour-yes"
+                              className="text-sm text-base-content cursor-pointer mb-0"
+                            >
+                              {t("yes")}
+                            </label>
+                          </div>
+                          <div className="flex items-center gap-2">
+                            <input
+                              id="tour-no"
+                              type="radio"
+                              value={false}
+                              name="IsTourEnabled"
+                              className="op-radio op-radio-xs"
+                              checked={!isTourEnabled}
+                              onChange={handleTourInput}
+                            />
+                            <label
+                              htmlFor="tour-no"
+                              className="text-sm text-base-content cursor-pointer mb-0"
+                            >
+                              {t("no")}
+                            </label>
                          </div>
-                        </ReactTooltip>
-                      </label>
-                      <div className="flex flex-col md:flex-row md:gap-4">
-                        <div className="flex items-center gap-2 ml-2 mb-1">
-                          <input
-                            type="radio"
-                            value={true}
-                            className="op-radio op-radio-xs"
-                            name="IsTourEnabled"
-                            checked={isTourEnabled}
-                            onChange={handleTourInput}
-                          />
-                          <div className="text-center">{t("yes")}</div>
-                        </div>
-                        <div className="flex items-center gap-2 ml-2 mb-1">
-                          <input
-                            type="radio"
-                            value={false}
-                            name="IsTourEnabled"
-                            className="op-radio op-radio-xs"
-                            checked={!isTourEnabled}
-                            onChange={handleTourInput}
-                          />
-                          <div className="text-center">{t("no")}</div>
                        </div>
                      </div>
                    </div>
-                    <div className="mb-[0.75rem]">
+                    {/* Right Column - Timezone & Date Settings */}
+                    <div className="md:col-span-7 flex flex-col">
+                      <div className="mb-6">
+                        <TimezoneSelector
+                          timezone={timezone}
+                          setTimezone={setTimezone}
+                        />
+                      </div>
+
+                      <div className="mb-6">
+                        <DateFormatSelector
+                          timezone={timezone}
+                          dateFormat={dateFormat}
+                          is12HourTime={is12HourTime}
+                          setIs12HourTime={setIs12HourTime}
+                          setDateFormat={setDateFormat}
+                        />
+                      </div>
+                    </div>
+                    {/* Save Button - Full Width */}
+                    <div className="md:col-span-12 flex justify-start mt-2">
                      <button
                        className="op-btn op-btn-primary w-[110px]"
                        onClick={handleSave}
@@ -647,8 +720,9 @@ const Preferences = () => {
                      </button>
                    </div>
                  </div>
-                ) : (
-                  <div className="flex flex-col mx-4 mb-4">
+                )}
+                {tabName(activeTab) === "email" && (
+                  <div className="flex flex-col mb-4">
                    <div className="flex flex-col">
                      <h1 className="text-[14px] mb-[0.7rem] font-medium">
                        {t("request-email")}
@@ -660,12 +734,10 @@ const Preferences = () => {
                        >
                          <div className="text-lg font-normal">
                            <label className="text-sm">
-                              {t("subject")}
+                              {t("subject")}{" "}
                              <Tooltip
                                id={"request-sub-tooltip"}
-                                message={`${t(
-                                  "variables-use"
-                                )}: {{sender_name}} {{document_title}}`}
+                                message={`${t("variables-use")}: {{sender_name}} {{document_title}}`}
                              />
                            </label>
                            <input
@@ -674,20 +746,16 @@ const Preferences = () => {
                              onChange={(e) =>
                                setRequestSubject(e.target.value)
                              }
-                              placeholder={`{{sender_name}} ${t(
-                                "send-to-sign"
-                              )} {{document_title}}`}
+                              placeholder={`{{sender_name}} ${t("send-to-sign")} {{document_title}}`}
                              className="w-full op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content text-xs"
                            />
                          </div>
                          <div className="text-lg font-normal py-2">
                            <label className="text-sm mt-3">
-                              {t("body")}
+                              {t("body")}{" "}
                              <Tooltip
                                id={"request-body-tooltip"}
-                                message={`${t(
-                                  "variables-use"
-                                )}: {{sender_name}} {{document_title}}`}
+                                message={`${t("variables-use")}: {{sender_name}} {{document_title}}`}
                              />
                            </label>
                            <EditorToolbar containerId="toolbar1" />
@@ -730,12 +798,10 @@ const Preferences = () => {
                        >
                          <div className="text-lg font-normal">
                            <label className="text-sm">
-                              {t("subject")}
+                              {t("subject")}{" "}
                              <Tooltip
                                id={"complete-sub-tooltip"}
-                                message={`${t(
-                                  "variables-use"
-                                )}:{{sender_name}} {{document_title}}`}
+                                message={`${t("variables-use")}:{{sender_name}} {{document_title}}`}
                              />
                            </label>
                            <input
@@ -744,20 +810,16 @@ const Preferences = () => {
                              onChange={(e) =>
                                setCompletionSubject(e.target.value)
                              }
-                              placeholder={`{{sender_name}}  ${t(
-                                "send-to-sign"
-                              )} {{document_title}}`}
+                              placeholder={`{{sender_name}}  ${t("send-to-sign")} {{document_title}}`}
                              className="w-full op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content text-xs"
                            />
                          </div>
                          <div className="text-lg font-normal py-2">
                            <label className="text-sm mt-3">
-                              {t("body")}
+                              {t("body")}{" "}
                              <Tooltip
                                id={"complete-body-tooltip"}
-                                message={`${t(
-                                  "variables-use"
-                                )}:{{sender_name}} {{document_title}} {{signing_url}}`}
+                                message={`${t("variables-use")}:{{sender_name}} {{document_title}} {{signing_url}}`}
                              />
                            </label>
                            <EditorToolbar containerId="toolbar2" />
@@ -793,6 +855,10 @@ const Preferences = () => {
                    </div>
                  </div>
                )}
+                {tabName(activeTab) === "security" && (
+                  <>
+                  </>
+                )}
              </div>
            </div>
          )}
@@ -67,7 +67,8 @@ import LoaderWithMsg from "../primitives/LoaderWithMsg";
 function SignYourSelf() {
  const { t } = useTranslation();
  const { docId } = useParams();
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const divRef = useRef(null);
  const nodeRef = useRef(null);
  const imageRef = useRef(null);
@@ -520,7 +521,11 @@ function SignYourSelf() {
    let pdfUrl;
    if (isUploadPdf) {
      const pdfName = generatePdfName(16);
-      pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+      pdfUrl = await convertBase64ToFile(
+        pdfName,
+        pdfBase64Url,
+        "",
+      );
    }
    const widgetsType = ["signature", "stamp", "image", "initials"];
    let updatedXYPosition;
@@ -706,7 +711,10 @@ function SignYourSelf() {
    if (tenantDetails && tenantDetails === "user does not exist!") {
      alert(t("user-not-exist"));
    } else {
-      if (tenantDetails?.CompletionBody && tenantDetails?.CompletionSubject) {
+      if (
+        tenantDetails?.CompletionBody &&
+        tenantDetails?.CompletionSubject
+      ) {
        isCustomCompletionMail = true;
      }
    }
@@ -742,7 +750,7 @@ function SignYourSelf() {
      pdfFile: base64Url,
      docId: documentId,
      isCustomCompletionMail: isCustomCompletionMail,
-      signature: suffixbase64
+      signature: suffixbase64,
    };
    const resSignPdf = await Parse.Cloud.run("signPdf", params);
    if (resSignPdf) {
@@ -166,6 +166,7 @@ const TemplatePlaceholder = () => {
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [divRef.current, isHeader]);

+
  //function to fetch tenant Details
  const fetchTenantDetails = async () => {
    const user = JSON.parse(
@@ -733,20 +734,18 @@ const TemplatePlaceholder = () => {
    let isLabel = false;
    let unfilledTextWidgetId = "";
    //condition is used to check text widget data is empty or have response
-    if (getPrefill) {
-      if (prefillPlaceholder) {
-        prefillPlaceholder.map((data) => {
-          if (!isLabel) {
-            const unfilledTextWidgets = data.pos.find(
-              (position) => !position.options.response
-            );
-            if (unfilledTextWidgets) {
-              isLabel = true;
-              unfilledTextWidgetId = unfilledTextWidgets.key;
-            }
+    if (getPrefill && prefillPlaceholder) {
+      prefillPlaceholder.map((data) => {
+        if (!isLabel) {
+          const unfilledTextWidgets = data.pos.find(
+            (position) => !position.options.response
+          );
+          if (unfilledTextWidgets) {
+            isLabel = true;
+            unfilledTextWidgetId = unfilledTextWidgets.key;
          }
-        });
-      }
+        }
+      });
    }
    if (getPrefill && isLabel) {
      setUnSignedWidgetId(unfilledTextWidgetId);
@@ -779,7 +778,11 @@ const TemplatePlaceholder = () => {
    let pdfUrl;
    if (isUploadPdf) {
      const pdfName = generatePdfName(16);
-      pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+      pdfUrl = await convertBase64ToFile(
+        pdfName,
+        pdfBase64Url,
+        "",
+      );
    }
    if (signersdata?.length > 0) {
      signersdata.forEach((x) => {
@@ -846,7 +849,11 @@ const TemplatePlaceholder = () => {
          scale
        );
        const pdfName = generatePdfName(16);
-        const pdfUrl = await convertBase64ToFile(pdfName, pdfBase64, "");
+        const pdfUrl = await convertBase64ToFile(
+          pdfName,
+          pdfBase64,
+          "",
+        );
        const tenantId = localStorage.getItem("TenantId");
        const buffer = atob(pdfBase64);
        SaveFileSize(buffer.length, pdfUrl, tenantId);
@@ -858,7 +865,11 @@ const TemplatePlaceholder = () => {
    } else if (pdfBase64Url) {
      try {
        const pdfName = generatePdfName(16);
-        const pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+        const pdfUrl = await convertBase64ToFile(
+          pdfName,
+          pdfBase64Url,
+          "",
+        );
        return pdfUrl;
      } catch (err) {
        console.log("error to convertBase64ToFile in placeholder flow", err);
@@ -1250,6 +1261,7 @@ const TemplatePlaceholder = () => {
        ? { RedirectUrl: updateTemplate?.[0]?.RedirectUrl }
        : {};
      const data = {
+        ...(updateTemplate?.[0]?.URL ? { URL: updateTemplate?.[0]?.URL } : {}),
        Name: updateTemplate?.[0]?.Name || "",
        Note: updateTemplate?.[0]?.Note || "",
        Description: updateTemplate?.[0]?.Description || "",
@@ -1281,7 +1293,6 @@ const TemplatePlaceholder = () => {
  const handleCloseRoleModal = () => {
    setIsModalRole(false);
  };
-
  const handleSaveWidgetsOptions = (
    dropdownName,
    dropdownOptions,
@@ -1458,7 +1469,9 @@ const TemplatePlaceholder = () => {
                  status: defaultdata?.status || "required",
                  hint: defaultdata?.hint || "",
                  defaultValue: defaultdata?.defaultValue || "",
-                  validation: {},
+                  isReadOnly: defaultdata?.isReadOnly || false,
+                  validation:
+                        {},
                  fontSize:
                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
                  fontColor:
@@ -1579,6 +1592,7 @@ const TemplatePlaceholder = () => {
      style: { fontSize: "13px" }
    }
  ];
+
  const textFieldTour = [
    {
      selector: '[data-tut="IsSigned"]',
@@ -1964,16 +1978,17 @@ const TemplatePlaceholder = () => {
            />
          )}
        </div>
-        <ModalUi
-          title={t("edit-template")}
-          isOpen={isEditTemplate}
-          handleClose={handleEditTemplateModal}
-        >
+        {isEditTemplate && (
          <EditTemplate
+            title={t("edit-template")}
+            handleClose={handleEditTemplateModal}
+            pdfbase64={pdfBase64Url}
            template={pdfDetails?.[0]}
            onSuccess={handleEditTemplateForm}
+            setPdfArrayBuffer={setPdfArrayBuffer}
+            setPdfBase64Url={setPdfBase64Url}
          />
-        </ModalUi>
+        )}
        <WidgetNameModal
          signatureType={signatureType}
          widgetName={widgetName}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
prafull-opensignlabsandGitHub	6927540741	Merge pull request #1731 from OpenSignLabs/updates-15022725718 v2.21.0	2025-05-14 19:33:19 +05:30
prafull-opensignlabs	1ceeee36ac	v2.21.0 Merge pull request #601 from OpenSignLabs/staging	2025-05-14 14:00:50 +00:00
prafull-opensignlabsandGitHub	81d3969d1f	Merge pull request #1719 from OpenSignLabs/updates-14856876951 v2.20.1	2025-05-06 15:35:42 +05:30
prafull-opensignlabs	5819103f57	v2.20.1	2025-05-06 10:01:20 +00:00
prafull-opensignlabsandGitHub	6653b7ae5a	Merge pull request #1717 from OpenSignLabs/updates-14829517615 v2.20.0	2025-05-05 10:46:07 +05:30
prafull-opensignlabs	b50c1e70ee	v2.20.0	2025-05-05 05:12:54 +00:00
prafull-opensignlabsandGitHub	365c2a217e	Merge pull request #1709 from OpenSignLabs/prafull-opensignlabs-patch-5 fix: quick send not working	2025-04-29 12:11:39 +05:30
prafull-opensignlabsandGitHub	b1b9b20e97	Update Validate.js	2025-04-29 12:10:14 +05:30
prafull-opensignlabsandGitHub	75c0cdb5f9	fix: quick send not working	2025-04-29 12:09:05 +05:30
prafull-opensignlabsandGitHub	740ccca1f6	Merge pull request #1704 from OpenSignLabs/updates-14689408163 Merge pull request #547 from OpenSignLabs/staging	2025-04-27 12:21:00 +05:30
prafull-opensignlabs	f3b79cb71f	Merge pull request #547 from OpenSignLabs/staging refactor: remove extra comment	2025-04-27 06:50:12 +00:00
prafull-opensignlabsandGitHub	f95ea0b9e9	Merge pull request #1702 from OpenSignLabs/updates-14689261849 fix: update migration script	2025-04-27 12:01:50 +05:30
prafull-opensignlabs	647a9ce5b4	Merge pull request #545 from OpenSignLabs/staging fix: update migration script	2025-04-27 06:30:15 +00:00
prafull-opensignlabsandGitHub	3f3ca668f5	Merge pull request #1700 from OpenSignLabs/updates-14666117248 fix: return https protocol for signing urls	2025-04-25 19:17:21 +05:30
prafull-opensignlabs	2fd6d1a37a	fix: return https protocol for signing urls	2025-04-25 13:46:14 +00:00
prafull-opensignlabsandGitHub	307137f926	Merge pull request #1699 from OpenSignLabs/updates-14660165068 remove non-exist class from migration script	2025-04-25 13:51:06 +05:30
prafull-opensignlabs	2394880dfc	Merge pull request #541 from OpenSignLabs/staging remove non-exist defaultOtp class from migration	2025-04-25 08:19:46 +00:00
AmolandGitHub	414cdcd4b5	Merge pull request #1698 from OpenSignLabs/prafull-opensignlabs-patch-4 fix: Workflow does not contain permissions	2025-04-25 13:29:43 +05:30
prafull-opensignlabsandGitHub	1fa6b25890	fix: Workflow does not contain permissions	2025-04-25 13:29:03 +05:30
prafull-opensignlabsandGitHub	ff2fd44b19	Merge pull request #1697 from OpenSignLabs/updates-14659684433 build(deps): update react-router package to fix vulnerabilities	2025-04-25 13:22:28 +05:30
prafull-opensignlabs	ad466fb066	build(deps): update react-router package to fix vulnerabilities	2025-04-25 07:51:45 +00:00
AmolandGitHub	0f179fed67	Merge pull request #1696 from OpenSignLabs/updates-14659482113 v2.19.0	2025-04-25 13:13:08 +05:30
nxglabs	3ded6c35a1	Merge pull request #536 from OpenSignLabs/doc_load_drive refactor: remove protected fields migration	2025-04-25 07:39:21 +00:00
AmolandGitHub	64293db3a1	Merge pull request #1695 from OpenSignLabs/prafull-opensignlabs-patch-3 Update Docker.yml	2025-04-25 13:06:15 +05:30
prafull-opensignlabsandGitHub	18a4c8523a	Update Docker.yml	2025-04-25 13:03:50 +05:30
prafull-opensignlabsandGitHub	f7b39409a8	Merge pull request #1692 from OpenSignLabs/updates-14590419587 fix: normalize emails, migrate user logic to cloud function	2025-04-22 14:09:18 +05:30
prafull-opensignlabs	6283524d2f	Merge pull request #524 from OpenSignLabs/publicurl_adduser fix: correct public URL, normalize emails, migrate user/orgAdmin logic to cloud function	2025-04-22 08:36:56 +00:00
prafull-opensignlabsandGitHub	216288fd09	Merge pull request #1689 from OpenSignLabs/updates-14509601184 v2.18.0	2025-04-17 12:06:43 +05:30
prafull-opensignlabs	3b1d8a48b7	v2.18.0 New Features: 1. Added support to recreate a new document from declined document without having to redo everything from scratch. 2. Added replace pdf file feature for Templates. PDF underlying a Template can now be replaced while keeping all the fields the same. 3. Introduced the ability to replace pdf file for in UpdateTemplate and CreateDocumentfromtemplate API. 4. Revamped the preferences menu UI. Bug Fixes: 1. Fixed issue with capital letters in contact emails via API. 2. Better validations & error handling in APIs	2025-04-17 06:34:06 +00:00