Merge pull request #353 from OpenSignLabs/mismatch_attach

fix: exclude DailyEmailReset and DailyEmailCount from query
2026-09-04 16:58:05 +02:00 · 2025-03-03 18:50:50 +00:00
91 changed files with 7099 additions and 6596 deletions
@@ -8,11 +8,13 @@ PUBLIC_URL=https://localhost:3001
 GENERATE_SOURCEMAP=false
 # Set it to the URL from where APIs will be accessible, for local development it should be localhost:3000/api/app (use your local port number instead)
 # REACT_APP_SERVERURL=http://localhost:8080/app
-# (DEPRECATED) This should not be changed if provided; it should be 'opensign'.
+# A 12 character long random app identifier. The value of this should be same as APP_ID which is a variable used by backend API.
 REACT_APP_APPID=opensign


 # Backend ExpressJS config ****************************************************************************************************************************************************************************************
+# A 12 character long random app identifier. The value of this should be same as REACT_APP_APPID which is a variable used by Frontend React App.
+APP_ID=opensign
 # Name of the app. It will be visible in the verification emails sent out.
 appName=open_sign_server
 # A 12 character long random secret key that allows access to all the data. It is used in Parse dashboard config to view all the data in the database.
@@ -109,6 +111,3 @@ CRUxFgQUDYlgGVxSxuOknhQc256x3++7BDwwMTAhMAkGBSsOAwIaBQAEFFjASdYl

 # Provide Pass pharse of above PFX or p12 document
 PASS_PHRASE=opensign 
-
-# (DEPRECATED) This should not be changed if provided; it should be 'opensign'.
-APP_ID=opensign
@@ -1,7 +1,7 @@
 {$HOST_URL} {
    reverse_proxy client:3000
-    handle_path /api/* {
+    handle_path /app/* {
        reverse_proxy server:8080
-            rewrite * {uri}
+            rewrite * /app{uri}
    }
 }
@@ -77,7 +77,7 @@ Welcome to OpenSign, the premier open source docusign alternative - document e-s

 The simplest way to install OpenSign on your own server is using official docker images by running the following command -
 ``` 
-export HOST_URL=https://opensign.yourdomain.com && curl --remote-name-all https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/docker-compose.yml https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/Caddyfile https://raw.githubusercontent.com/OpenSignLabs/OpenSign/main/.env.local_dev && mv .env.local_dev .env.prod && docker compose up --force-recreate
+export HOST_URL=https://opensign.yourdomain.com && curl --remote-name-all https://raw.githubusercontent.com/OpenSignLabs/OpenSign/docker_beta/docker-compose.yml https://raw.githubusercontent.com/OpenSignLabs/OpenSign/docker_beta/Caddyfile https://raw.githubusercontent.com/OpenSignLabs/OpenSign/docker_beta/.env.local_dev && mv .env.local_dev .env.prod && docker compose up --force-recreate
 ```
 Make sure that you have `Docker` and `git` installed before you run this command -

@@ -1,5 +1,5 @@
 # Use an official Node runtime as the base image
-FROM node:22.14.0
+FROM node:18

 # Set the working directory inside the container
 WORKDIR /usr/src/app
@@ -16,7 +16,8 @@ COPY apps/OpenSign/.husky .

 # Define environment variables if needed
 ENV NODE_ENV=production
-ENV GENERATE_SOURCEMAP=false
+ENV REACT_APP_DEPLOYMENT=free_selfhost
+
 # build
 RUN npm run build

@@ -4,17 +4,17 @@
  "private": true,
  "dependencies": {
    "@formkit/auto-animate": "^0.8.2",
-    "@lottiefiles/dotlottie-react": "^0.13.2",
+    "@lottiefiles/dotlottie-react": "^0.13.0",
    "@pdf-lib/fontkit": "^1.1.1",
    "@radix-ui/themes": "^3.1.6",
+    "@react-pdf/renderer": "^4.1.6",
    "@reduxjs/toolkit": "^2.5.1",
-    "axios": "^1.8.4",
-    "css-minimizer-webpack-plugin": "^7.0.2",
-    "date-fns-tz": "^3.2.0",
+    "axios": "^1.7.9",
+    "css-minimizer-webpack-plugin": "^7.0.0",
    "file-saver": "^2.0.5",
    "i18next": "^23.16.8",
-    "i18next-browser-languagedetector": "^8.0.4",
-    "i18next-http-backend": "^3.0.2",
+    "i18next-browser-languagedetector": "^8.0.2",
+    "i18next-http-backend": "^3.0.1",
    "jszip": "^3.10.1",
    "jwt-decode": "^4.0.0",
    "moment": "^2.30.1",
@@ -25,7 +25,7 @@
    "radix-ui": "^1.0.1",
    "react": "^18.2.0",
    "react-bootstrap": "^2.10.9",
-    "react-confetti": "^6.4.0",
+    "react-confetti": "^6.2.2",
    "react-cookie": "^7.2.2",
    "react-datepicker": "^7.6.0",
    "react-dnd": "^16.0.1",
@@ -35,16 +35,16 @@
    "react-dom": "^18.2.0",
    "react-gtm-module": "^2.0.11",
    "react-helmet": "^6.1.0",
-    "react-i18next": "^15.4.1",
+    "react-i18next": "^15.4.0",
    "react-konva": "^18.2.10",
    "react-pdf": "^9.2.1",
-    "react-quill-new": "^3.4.6",
+    "react-quill-new": "^3.3.3",
    "react-redux": "^9.2.0",
-    "react-rnd": "^10.5.2",
+    "react-rnd": "^10.4.14",
    "react-router": "^7.1.5",
    "react-scripts": "^5.0.1",
    "react-scrollbars-custom": "^4.1.1",
-    "react-select": "^5.10.1",
+    "react-select": "^5.10.0",
    "react-signature-canvas": "^1.0.7",
    "react-syntax-highlighter": "^15.6.1",
    "react-timezone-select": "^3.2.8",
@@ -53,11 +53,11 @@
    "reactour": "^1.19.4",
    "redux": "^5.0.1",
    "redux-thunk": "^3.1.0",
-    "regex-parser": "^2.3.1",
+    "regex-parser": "^2.3.0",
    "serve": "^14.2.4",
    "styled-components": "^5.3.0",
    "web-vitals": "^4.2.4",
-    "ws": "^8.18.1",
+    "ws": "^8.18.0",
    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
  },
  "scripts": {
@@ -96,26 +96,26 @@
    }
  },
  "devDependencies": {
-    "@babel/core": "^7.26.10",
+    "@babel/core": "^7.26.9",
    "@babel/preset-env": "^7.26.9",
    "@babel/preset-react": "^7.26.3",
-    "@babel/runtime-corejs2": "^7.27.0",
-    "autoprefixer": "^10.4.21",
-    "babel-loader": "^10.0.0",
+    "@babel/runtime-corejs2": "^7.26.9",
+    "autoprefixer": "^10.4.20",
+    "babel-loader": "^9.2.1",
    "commitizen": "^4.3.1",
    "concurrently": "^9.1.2",
    "css-loader": "^7.1.2",
    "daisyui": "^4.12.23",
    "dotenv": "^16.4.7",
    "dotenv-webpack": "^8.1.0",
-    "eslint": "^9.23.0",
-    "eslint-plugin-prettier": "^5.2.5",
+    "eslint": "^9.20.0",
+    "eslint-plugin-prettier": "^5.2.3",
    "eslint-plugin-react": "^7.37.4",
-    "lint-staged": "^15.5.0",
+    "lint-staged": "^15.4.3",
    "mini-css-extract-plugin": "^2.9.2",
-    "postcss": "^8.5.3",
-    "prettier": "^3.5.3",
-    "pretty-quick": "^4.1.1",
+    "postcss": "^8.5.1",
+    "prettier": "^3.5.0",
+    "pretty-quick": "^4.0.0",
    "tailwindcss": "^3.4.17",
    "terser-webpack-plugin": "^5.3.11",
    "webpack-cli": "^5.1.4"
@@ -79,7 +79,6 @@
    "Storage": "Speicher",
    "Signing certificate": "Signierzertifikat",
    "Teams": "Teams",
-    "General": "Allgemein",
    "Teams-Children": {
      "Organizations": "Organisationen",
      "OrgAdmins": "OrgAdmins"
@@ -150,9 +149,7 @@
    "Copy Public URL": "Öffentliche URL kopieren",
    "extend-expiry-date": "Ablaufdatum verlängern",
    "Duplicate Template": "Vorlage duplizieren",
-    "Duplicate": "Duplikat",
-    "daily-mail-quota": "Tägliches E-Mail-Kontingent",
-    "Save as template": "Als Vorlage speichern"
+    "Duplicate": "Duplikat"
  },
  "report-heading": {
    "Sr.No": "Nr.",
@@ -172,7 +169,7 @@
    "Name": "Name",
    "Status": "Status",
    "created-date": "Erstellungsdatum",
-    "Type": "Type",
+    "Type": "Typ",
    "Logs": "Protokolle",
    "Expiry-date": "Ablaufdatum"
  },
@@ -248,7 +245,7 @@
  "generate-token-alert": "Sind Sie sicher, dass Sie das Token neu generieren möchten? Das alte Token wird ablaufen.",
  "yes": "Ja",
  "copied": "Kopiert",
-  "something-went-wrong-mssg": "Etwas ist schiefgelaufen, Das Aktualisieren dieser Seite kann das Problem lösen.",
+  "something-went-wrong-mssg": "Etwas ist schiefgelaufen. Bitte versuchen Sie es später erneut.",
  "token-generated": "Token erfolgreich generiert.",
  "webhook": "Webhook",
  "update-webhook": "Webhook aktualisieren",
@@ -309,7 +306,7 @@
  "revoke-document": "Dokument widerrufen",
  "revoke-document-alert": "Sind Sie sicher, dass Sie dieses Dokument widerrufen möchten?",
  "resend-mail": "E-Mail erneut senden",
-  "resend-mail-help": "Sie können folgende Variablen verwenden, die durch ihre tatsächlichen Werte ersetzt werden: {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}, {{note}}.",
+  "resend-mail-help": "Sie können folgende Variablen verwenden, die durch ihre tatsächlichen Werte ersetzt werden: {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}.",
  "subject": "Betreff",
  "body": "Inhalt",
  "add-contact": "Kontakt hinzufügen",
@@ -459,7 +456,6 @@
  "placeholder-alert-3": "Sind Sie sicher, dass Sie dieses Dokument zur Unterzeichnung senden möchten?",
  "placeholder-alert-4": "Sie haben erfolgreich E-Mails an alle Empfänger gesendet!",
  "placeholder-mail-alert": "Sie haben erfolgreich eine E-Mail an {{name}} gesendet. Die nachfolgenden Unterzeichner erhalten eine E-Mail, sobald {{name}} das Dokument unterzeichnet.",
-  "placeholder-mail-alert-you": "Nachfolgende Unterzeichner erhalten E-Mails, sobald Sie das Dokument unterschreiben.",
  "placeholder-alert-5": "Möchten Sie die Dokumente jetzt unterschreiben?",
  "placeholder-alert-6": "Bitte richten Sie den E-Mail-Adapter ein, um E-Mails zu senden!",
  "placeholder-alert-7": "Bitte wählen Sie einen Unterzeichner aus, um Platzhalter hinzuzufügen!",
@@ -523,7 +519,7 @@
  "correct-password": "Bitte korrektes Passwort angeben",
  "decrypting-pdf": "PDF wird entschlüsselt, bitte warten...",
  "invalid-otp": "Ungültiger OTP",
-  "user-not-found": "Benutzer nicht gefunden",
+  "user-not-found": "Benutzer nicht gefunden!",
  "enter-otp-alert": "Bitte OTP eingeben!",
  "get-verification-code": "Verifizierungscode erhalten",
  "get-verification-code-2": "Sie erhalten einen Verifizierungscode per E-Mail",
@@ -608,7 +604,6 @@
    "placeholder-sign-4": "Ziehen Sie ein Feld in das Dokument oder klicken Sie darauf, um es hinzuzufügen.",
    "placeholder-sign-5": "Der PDF-Inhaltsbereich zeigt bereits die vorhandenen Platzhalter der Vorlage an. Diese Platzhalter entsprechen der Farbe des Empfängernamens, um sie leicht erkennbar zu machen.",
    "placeholder-sign-6": "Mit einem Klick auf 'Weiter' wird das Dokument gespeichert. Im nächsten Schritt können Sie die E-Mails, die an die Empfänger versendet werden sollen, anpassen oder die Signaturlinks kopieren und diese selbst mit den Empfängern teilen.",
-    "report-1":"Klicken Sie auf die Schaltfläche „Hinzufügen“, um eine neue Vorlage zu erstellen. Vorlagen sind wiederverwendbare Dokumente, mit denen schnell neue Dokumente mit derselben Struktur und unterschiedlichen Unterzeichnern erstellt werden können. Eine HR-Vorlage für die Einarbeitung könnte beispielsweise vordefinierte Rollen wie „Personalleiter“ und „Neuer Mitarbeiter“ enthalten. Bei jeder Verwendung der Vorlage können Sie die Rolle „Neuer Mitarbeiter“ verschiedenen neuen Mitarbeitern zuweisen, während die Rolle „Personalleiter“ unverändert bleibt. So wird ein nahtloser Einarbeitungsprozess für jeden neuen Mitarbeiter ermöglicht.",
    "redirect": "Klicken Sie auf die Schaltfläche 'Verwenden', um ein neues Dokument aus einer bestehenden Vorlage zu erstellen.",
    "bulksend": "Um schnell mehrere Dokumente mithilfe einer vorhandenen Vorlage zu versenden, indem Sie einfach die E-Mail-Adressen der Empfänger erstellen, klicken Sie auf die Schaltfläche ‚Massenversand‘",
    "option": "Dieses Menü zeigt weitere Optionen wie Bearbeiten und Löschen. Verwenden Sie die Schaltfläche 'Bearbeiten', um Unterzeichnerrollen hinzuzufügen, Felder zu ändern und Ihre Vorlage zu aktualisieren. Änderungen gelten für alle zukünftigen Dokumente, die aus dieser Vorlage erstellt werden, wirken sich jedoch nicht auf vorhandene Dokumente aus. Verwenden Sie die Schaltfläche 'Löschen', um die Vorlage zu entfernen.",
@@ -833,7 +828,7 @@
  "initial-type": "Ihre Initialen",
  "redirect-url": "Weiterleitungs-URL",
  "bulk-send": "Massenversand",
-  "select-timezone": "Zeitzone",
+  "select-timezone": "Wählen Sie Ihre Zeitzone",
  "current-time": "Aktuelle Uhrzeit",
  "email-help": "Aus Sicherheitsgründen dürfen Sie die E-Mail-Adresse nicht ändern. Bitte erstellen Sie ein weiteres kostenloses Konto mit der neuen E-Mail-Adresse.",
  "doc-sent": "Dokument erfolgreich gesendet.",
@@ -853,25 +848,5 @@
  "draft-template-info-p1": "Um Ihre Vorlage öffentlich zu machen, muss sie entweder eine einzelne Rolle enthalten oder, wenn sie mehrere Rollen umfasst, müssen alle zusätzlichen Rollen bereits den Unterzeichnern zugewiesen sein. Die nicht zugewiesene öffentliche Rolle muss leer bleiben und an erster Stelle stehen.",
  "visit-below-link": "Besuchen Sie den untenstehenden Link, um mehr zu erfahren -",
  "storage-help": "Durch die Aktivierung von BYOC können Sie Ihren eigenen S3-Speicher verbinden, sodass Ihre Dateien vollständig unter Ihrer Kontrolle bleiben und keine externen Kopien gespeichert werden. Wenn Ihnen Datenautonomie wichtig ist, erwägen Sie ein Upgrade auf Teams, um diese Funktion freizuschalten.",
-  "daily-quota-reached": "Sie haben Ihr tägliches Kontingent erreicht. Für Unterstützung kontaktieren Sie bitte quotas@opensignlabs.com.",
-  "enabled-signature-type": "Aktivierte Signaturtypen",
-  "enabled-signature-type-help": "Die Einstellung 'Aktivierte Signaturtypen' bestimmt, welche Signaturoptionen in Ihrer Organisation verfügbar sind. Wenn Sie beispielsweise die Option 'Zeichnen' deaktivieren, wird sie den Mitgliedern Ihrer Organisation im Signatur-Widget nicht angezeigt, während die anderen drei Optionen weiterhin zugänglich bleiben.",
-  "indexing-public-profile": "Erlaube die Indexierung des öffentlichen Profils durch Suchmaschinen",
-  "user-created-successfully": "Benutzer erfolgreich erstellt.",
-  "only-15-reminder-allowed": "Sie können bis zu 15 automatische Erinnerungen festlegen. Wenn zum Beispiel 'TimeToComplete' auf 15 Tage und 'RemindOnceInEvery' auf 1 Tag eingestellt ist, erreichen Sie das maximale Limit von 15 Erinnerungen. Passen Sie Ihre Einstellungen entsprechend an.",
-  "rate-your-experience": "Wie war Ihre Erfahrung mit {{appName}}?",
-  "thanks-for-feedback": "Danke für Ihr Feedback 🙏",
-  "share-your-feedback": "Teilen Sie Ihr Feedback",
-  "share-your-review": "Teilen Sie Ihre Bewertung",
-  "date-format": "Datumsformat",
-  "document-deleted": "Das Dokument wurde gelöscht oder Sie haben keinen Zugriff. Bitte kontaktieren Sie den Absender.",
-  "save-as-template-?": "Sind Sie sicher, dass Sie dieses Dokument als Vorlage speichern möchten?",
-  "go-to-manage-templates": "Zu 'Vorlagen verwalten' gehen",
-  "template-created": "Vorlage erstellt",
-  "how-would-you-like-to-proceed?": "Wie möchten Sie fortfahren?",
-  "failed-to-load-refresh-page": "Fehler beim Laden des Dokuments. Bitte versuchen Sie, diese Seite zu aktualisieren.",
-  "document-has-been-signed": "Das Dokument wurde erfolgreich unterschrieben!",
-  "document-has-been-signed-by-you": "Das Dokument wurde erfolgreich von Ihnen unterschrieben!",
-  "participant-completed-signing": "Alle Teilnehmer haben den Signaturprozess abgeschlossen.",
-  "you-will-receive-email-shortly": "✅ Das war's! Sie erhalten in Kürze eine Bestätigungs-E-Mail."
+  "daily-quota-reached": "You’ve reached your daily quota. For assistance, please contact quotas@opensignlabs.com."
 }
@@ -79,7 +79,6 @@
    "Storage": "Storage",
    "Signing certificate": "Signing certificate",
    "Teams": "Teams",
-    "General": "General",
    "Teams-Children": {
      "Organizations": "Organizations",
      "OrgAdmins": "OrgAdmins"
@@ -150,9 +149,7 @@
    "Copy Public URL": "Copy public URL",
    "extend-expiry-date": "Extend expiry date",
    "Duplicate Template": "Duplicate template",
-    "Duplicate": "Duplicate",
-    "daily-mail-quota": "Daily Email Quota",
-    "Save as template": "Save as template"
+    "Duplicate": "Duplicate"
  },
  "report-heading": {
    "Sr.No": "Sr.No",
@@ -248,7 +245,7 @@
  "generate-token-alert": "Are you sure you want to regenerate token it will expire old token?",
  "yes": "Yes",
  "copied": "Copied",
-  "something-went-wrong-mssg": "Something went wrong, refreshing this page may solve this issue.",
+  "something-went-wrong-mssg": "Something went wrong, please try again later.",
  "token-generated": "Token generated successfully.",
  "webhook": "Webhook",
  "update-webhook": "Update webhook",
@@ -309,7 +306,7 @@
  "revoke-document": "Revoke document",
  "revoke-document-alert": "Are you sure you want to revoke this document?",
  "resend-mail": "Resend mail",
-  "resend-mail-help": "You can use following variables which will get replaced with their actual values:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}, {{note}}.",
+  "resend-mail-help": "You can use following variables which will get replaced with their actual values:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}.",
  "subject": "Subject",
  "body": "Body",
  "add-contact": "Add contact",
@@ -459,7 +456,6 @@
  "placeholder-alert-3": " Are you sure you want to send out this document for signatures?",
  "placeholder-alert-4": "You have successfully sent mails to all recipients!",
  "placeholder-mail-alert": "You have successfully sent email to {{name}}. Subsequent signers will get email(s) once {{name}} signs the document",
-  "placeholder-mail-alert-you": "Subsequent signers will get email(s) once you signs the document.",
  "placeholder-alert-5": "Do you want to sign the document right now?",
  "placeholder-alert-6": "Please setup mail adapter to send mail!",
  "placeholder-alert-7": "Please select signer for add placeholder!",
@@ -523,7 +519,7 @@
  "correct-password": "Please provide correct password",
  "decrypting-pdf": " Decrypting pdf please wait...",
  "invalid-otp": "Invalid otp",
-  "user-not-found": "User not found",
+  "user-not-found": "User not found!",
  "enter-otp-alert": "Please enter OTP!",
  "get-verification-code": "Get verification code",
  "get-verification-code-2": "You will get a verification code via Email",
@@ -833,7 +829,7 @@
  "initial-type": "Your initials",
  "redirect-url": "Redirect url",
  "bulk-send": "Bulk send",
-  "select-timezone": "Timezone",
+  "select-timezone": "Select your Timezone",
  "current-time": "Current time",
  "email-help": "You are not allowed to change email address due to security reasons. Please create another free account using the new email address.",
  "doc-sent": "Document sent successfully.",
@@ -853,25 +849,5 @@
  "draft-template-info-p1": "To make your template public, it must either contain a  single role, or, if it includes multiple roles, all additional roles must already be assigned to signers. The unassigned public role should remain empty and must be placed in the first position.",
  "visit-below-link": "Visit below link to know more -",
  "storage-help": "Enabling BYOC lets you connect your own S3 storage so your files remain entirely under your control—no external copies retained. If data autonomy matters to you, consider upgrading to Teams to unlock this feature.",
-  "daily-quota-reached": "You’ve reached your daily quota. For assistance, please contact quotas@opensignlabs.com.",
-  "enabled-signature-type": "Enabled Signature Types",
-  "enabled-signature-type-help": "The 'Enabled Signature Types' setting determines which signature options are available across your organization. For example, if you disable the 'Draw' option, members of your organization will not see it in the signature widget, while the other three options will remain accessible.",
-  "indexing-public-profile": "Allow indexing of public profile by search engines",
-  "user-created-successfully": "user created successfully.",
-  "only-15-reminder-allowed": "You can set up to 15 automatic reminders. For example, if 'TimeToComplete' is 15 days and 'RemindOnceInEvery' is 1 day, you'll reach the maximum limit of 15 reminders. Adjust your settings accordingly.",
-  "rate-your-experience": "How was your experience with {{appName}}?",
-  "thanks-for-feedback": "Thanks for your feedback 🙏",
-  "share-your-feedback": "Share your feedback",
-  "share-your-review": "Share your review",
-  "date-format": "Date format",
-  "document-deleted": "The document has been deleted or you don't have access. Please contact the sender.",
-  "save-as-template-?": "Are you sure you want to save this document as template?",
-  "go-to-manage-templates": "go to 'Manage templates'",
-  "template-created": "Template Created",
-  "how-would-you-like-to-proceed?": "How would you like to proceed?",
-  "failed-to-load-refresh-page": "Failed to load the document. Please try refreshing this page.",
-  "document-has-been-signed": "The document has been signed successfully!",
-  "document-has-been-signed-by-you": "The document has been successfully signed by you!",
-  "participant-completed-signing": "All participants have completed the signing process.",
-  "you-will-receive-email-shortly": "✅ That's it! You'll receive a confirmation email shortly."
+  "daily-quota-reached": "You’ve reached your daily quota. For assistance, please contact quotas@opensignlabs.com."
 }
@@ -79,7 +79,6 @@
    "Storage": "Almacenamiento",
    "Signing certificate": "Certificado de firma",
    "Teams": "Equipos",
-    "General": "General",
    "Teams-Children": {
      "Organizations": "Organizaciones",
      "OrgAdmins": "OrgAdmins"
@@ -150,9 +149,7 @@
    "Copy Public URL": "Copiar URL pública",
    "extend-expiry-date": "Date d'expiration",
    "Duplicate Template": "Plantilla duplicada",
-    "Duplicate": "Duplicada",
-    "daily-mail-quota": "Cuota diaria de correos electrónicos",
-    "Save as template": "Guardar como plantilla"
+    "Duplicate": "Duplicada"
  },
  "report-heading": {
    "Sr.No": "Nº",
@@ -249,7 +246,7 @@
  "generate-token-alert": "¿En definitiva quieres regenerar el token? Esto expirará el token antiguo.",
  "yes": "Sí",
  "copied": "Copiado",
-  "something-went-wrong-mssg": "Un problème est survenu, Actualiser cette page peut résoudre le problème.",
+  "something-went-wrong-mssg": "Algo salió mal, por favor, intenta de nuevo más tarde.",
  "token-generated": "Token generado exitosamente.",
  "webhook": "Webhook",
  "update-webhook": "Actualizar webhook",
@@ -310,7 +307,7 @@
  "revoke-document": "Revocar documento",
  "revoke-document-alert": "¿En definitiva quieres revocar este documento?",
  "resend-mail": "Reenviar correo",
-  "resend-mail-help": "Puedes usar las siguientes variables que serán reemplazadas por sus valores reales:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}, {{note}}.",
+  "resend-mail-help": "Puedes usar las siguientes variables que serán reemplazadas por sus valores reales:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}.",
  "subject": "Asunto",
  "body": "Cuerpo",
  "add-contact": "Agregar contacto",
@@ -459,7 +456,6 @@
  "placeholder-alert-3": " ¿En definitiva quieres enviar este documento para ser firmado?",
  "placeholder-alert-4": "¡Has enviado exitosamente correos a todos los destinatarios!",
  "placeholder-mail-alert": "Has enviado un correo electrónico con éxito a {{name}}. Los siguientes firmantes recibirán un correo electrónico una vez que {{name}} firme el documento.",
-  "placeholder-mail-alert-you": "Los firmantes posteriores recibirán correos electrónicos una vez que firme el documento.",
  "placeholder-alert-5": "¿Quieres firmar documentos ahora mismo?",
  "placeholder-alert-6": "¡Por favor, configura el adaptador de correo para enviar correos!",
  "placeholder-alert-7": "¡Por favor, selecciona un firmante para agregar un marcador de posición!",
@@ -523,7 +519,7 @@
  "correct-password": "Por favor, proporciona la contraseña correcta",
  "decrypting-pdf": " Desencriptando PDF, por favor, espera...",
  "invalid-otp": "OTP inválido",
-  "user-not-found": "Usuario no encontrado",
+  "user-not-found": "¡Usuario no encontrado!",
  "enter-otp-alert": "¡Por favor, ingresa el OTP!",
  "get-verification-code": "Obtener código de verificación",
  "get-verification-code-2": "Obtendrás un código de verificación por correo",
@@ -769,6 +765,8 @@
  "term-cond-p3": "Recibirá y firmará documentos electrónicamente a través de {{appName}}.",
  "term-cond-p4": "Su firma electrónica es jurídicamente vinculante y equivalente a una firma manuscrita.",
  "term-cond-h2": "2. Consentimiento para el uso de registros y firmas electrónicas",
+  "js-snippet-msg-2": "Administrar plantillas",
+  "js-snippet-msg-3": "página.",
  "term-cond-p5": "Al aceptar esta Divulgación:",
  "term-cond-p6": "Usted acepta realizar transacciones electrónicas con el Remitente utilizando {{appName}} y comprende que este consentimiento es válido hasta que se retire.",
  "term-cond-p7": "Usted acepta revisar, firmar y devolver documentos electrónicamente utilizando {{appName}}.",
@@ -804,8 +802,6 @@
  "term-cond-p30": " o correo electrónico",
  "js-snippet-msg": "Para integrar plantillas {{appName}} en sus sitios web HTML o páginas de destino, puede utilizar el siguiente código:",
  "js-snippet-msg-1": "Puede obtener el TemplateId en la página Administrar plantillas",
-  "js-snippet-msg-2": "Administrar plantillas",
-  "js-snippet-msg-3": "página.",
  "agrrement-alert": "Para continuar, debe consentir la divulgación de registros y firmas electrónicas.",
  "webhook-already-exists": "¡La URL ya existe! Pruebe con uno diferente.",
  "webhook-must-be-secure": "La URL del webhook debe ser segura y utilizar https://",
@@ -833,7 +829,7 @@
  "initial-type": "Tus iniciales",
  "redirect-url": "URL de redireccionamiento",
  "bulk-send": "envío masivo",
-  "select-timezone": "Zona horaria",
+  "select-timezone": "Seleccione su zona horaria",
  "current-time": "Hora actual",
  "email-help": "No se permite cambiar la dirección de correo electrónico por razones de seguridad. Por favor, cree otra cuenta gratuita utilizando la nueva dirección de correo electrónico.",
  "doc-sent": "Documento enviado con éxito.",
@@ -852,26 +848,7 @@
  "agreement-note": "Nota: Aceptar esto no significa que esté firmando el documento de inmediato. Esto solo le permite revisar el documento electrónicamente. Tendrá la oportunidad de leerlo en su totalidad y decidir si desea firmarlo después.",
  "draft-template-info-p1": "Para hacer que tu plantilla sea pública, debe contener un único rol o, si incluye múltiples roles, todos los roles adicionales deben estar ya asignados a firmantes. El rol público no asignado debe permanecer vacío y debe estar en la primera posición.",
  "visit-below-link": "Visita el siguiente enlace para saber más -",
+  "upgrade-to-team-plan": "Actualizar a team plan",
  "storage-help": "Habilitar BYOC te permite conectar tu propio almacenamiento S3 para que tus archivos permanezcan completamente bajo tu control, sin copias externas retenidas. Si la autonomía de los datos es importante para ti, considera actualizar a Teams para desbloquear esta función.",
-  "daily-quota-reached": "Ha alcanzado su cuota diaria. Para obtener ayuda, comuníquese con quotas@opensignlabs.com.",
-  "enabled-signature-type": "Tipos de firma habilitados",
-  "enabled-signature-type-help": "La configuración de 'Tipos de firma habilitados' determina qué opciones de firma están disponibles en su organización. Por ejemplo, si desactiva la opción 'Dibujar', los miembros de su organización no la verán en el widget de firma, mientras que las otras tres opciones seguirán siendo accesibles.",
-  "indexing-public-profile": "Permitir la indexación del perfil público por los motores de búsqueda",
-  "user-created-successfully": "Usuario creado con éxito.",
-  "only-15-reminder-allowed": "Puede configurar hasta 15 recordatorios automáticos. Por ejemplo, si 'TimeToComplete' es de 15 días y 'RemindOnceInEvery' es de 1 día, alcanzará el límite máximo de 15 recordatorios. Ajuste su configuración en consecuencia.",
-  "rate-your-experience": "¿Cómo fue su experiencia con {{appName}}?",
-  "thanks-for-feedback": "Gracias por su comentario 🙏",
-  "share-your-feedback": "Comparta sus comentarios",
-  "share-your-review": "Comparta su reseña",
-  "date-format": "Formato de fecha",
-  "document-deleted": "El documento ha sido eliminado o no tiene acceso. Por favor, contacte al remitente.",
-  "save-as-template-?": "¿Está seguro de que desea guardar este documento como plantilla?",
-  "go-to-manage-templates": "Ir a 'Gestionar plantillas'",
-  "template-created": "Plantilla creada",
-  "how-would-you-like-to-proceed?": "¿Cómo le gustaría proceder?",
-  "failed-to-load-refresh-page": "Error al cargar el documento. Intente actualizar esta página.",
-  "document-has-been-signed": "¡El documento ha sido firmado con éxito!",
-  "document-has-been-signed-by-you": "¡El documento ha sido firmado con éxito por usted!",
-  "participant-completed-signing": "Todos los participantes han completado el proceso de firma.",
-  "you-will-receive-email-shortly": "✅ ¡Eso es todo! Recibirá un correo de confirmación en breve."
+  "daily-quota-reached": "You’ve reached your daily quota. For assistance, please contact quotas@opensignlabs.com."
 }
@@ -79,7 +79,6 @@
    "Storage": "Stockage",
    "Signing certificate": "Certificat de signature",
    "Teams": "Équipes",
-    "General": "Général",
    "Teams-Children": {
      "Organizations": "Organisations",
      "OrgAdmins": "OrgAdmins"
@@ -171,9 +170,7 @@
    "Copy Public URL": "Copier l'URL publique",
    "extend-expiry-date": "Prolonger la date d'expiration",
    "Duplicate Template": "dupliquer le modèle",
-    "Duplicate": "Double",
-    "daily-mail-quota": "Quota d'e-mails quotidien",
-    "Save as template": "Enregistrer comme modèle"
+    "Duplicate": "Double"
  },
  "report-help": {
    "Draft Documents": "Il s'agit de documents que vous avez commencés mais que vous n'avez pas finalisés pour envoi.",
@@ -309,7 +306,7 @@
  "revoke-document": "Révoquer le document",
  "revoke-document-alert": "Êtes-vous sûr de vouloir révoquer ce document ?",
  "resend-mail": "Renvoyer le courrier",
-  "resend-mail-help": "Vous pouvez utiliser les variables suivantes qui seront remplacées par leurs valeurs réelles : - {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email} }, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}, {{note}}.",
+  "resend-mail-help": "Vous pouvez utiliser les variables suivantes qui seront remplacées par leurs valeurs réelles : - {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email} }, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}.",
  "subject": "Sujet",
  "body": "Corps",
  "add-contact": "Ajouter le contact",
@@ -453,13 +450,11 @@
  "add-recipients": "Ajouter des destinataires",
  "loading-mssg": "Cela pourrait prendre du temps",
  "send-mail": "Envoyer un mail",
-  "signature-field-widget": "Au moins un champ de signature doit être ajouté pour chaque utilisateur. Vous n'avez pas ajouté de champs de signature pour {{signersName}}",
  "placeholder-alert-1": "Veuillez vous assurer qu'au moins un widget de signature est ajouté pour tous les destinataires.",
  "placeholder-alert-2": "Veuillez confirmer que vous avez rempli le champ de texte.",
  "placeholder-alert-3": "Etes-vous sûr de vouloir envoyer ce document pour signature ? ",
  "placeholder-alert-4": "Vous avez envoyé avec succès des mails à tous les",
  "placeholder-mail-alert": "Vous avez envoyé un e-mail avec succès à {{name}}. Les signataires suivants recevront un e-mail une fois que {{name}} aura signé le document.",
-  "placeholder-mail-alert-you": "Les signataires suivants recevront un e-mail dès que vous signez le document.",
  "placeholder-alert-5": "Voulez-vous signer des documents maintenant ?",
  "placeholder-alert-6": "Veuillez configurer l'adaptateur de messagerie pour envoyer du courrier !",
  "placeholder-alert-7": "Veuillez sélectionner le signataire pour ajouter un espace réservé !",
@@ -523,7 +518,7 @@
  "correct-password": "Veuillez fournir un mot de passe correct",
  "decrypting-pdf": "Décryptage du pdf, veuillez patienter...",
  "invalid-otp": "OTP invalide",
-  "user-not-found": "Utilisateur non trouvé",
+  "user-not-found": "Utilisateur non trouvé!",
  "enter-otp-alert": "Veuillez saisir OTP !",
  "get-verification-code": "Obtenir le code de vérification",
  "get-verification-code-2": "Vous recevrez un code de vérification par e-mail",
@@ -562,8 +557,7 @@
  "do-not-access-contact-admin": "Vous n'y avez pas accès, veuillez contacter l'administrateur.",
  "filed-required-correctly": "Veuillez remplir correctement les informations requises.",
  "admin-created": "Administrateur créé",
-  "invalid-masterkey": "Clé principale invalide",
-  "master-key": "La clef maitresse",
+  "invalid-masterkey": "Clé principale invalide",  "master-key": "La clef maitresse",
  "profile-update-alert": "Mise à jour du profil réussie.",
  "date": "Date",
  "report-not-found": "Rapport introuvable",
@@ -833,7 +827,7 @@
  "initial-type": "Vos initiales",
  "redirect-url": "URL de redirection",
  "bulk-send": "Envoi groupé",
-  "select-timezone": "Fuseau horaire",
+  "select-timezone": "Sélectionnez votre fuseau horaire",
  "current-time": "Heure actuelle",
  "email-help": "Vous n'êtes pas autorisé à changer d'adresse e-mail pour des raisons de sécurité. Veuillez créer un autre compte gratuit en utilisant la nouvelle adresse e-mail.",
  "doc-sent": "Document envoyé avec succès.",
@@ -853,25 +847,5 @@
  "draft-template-info-p1": "Pour rendre votre modèle public, il doit contenir un seul rôle ou, s'il inclut plusieurs rôles, tous les rôles supplémentaires doivent déjà être attribués aux signataires. Le rôle public non attribué doit rester vide et être placé en première position.",
  "visit-below-link": "Visitez le lien ci-dessous pour en savoir plus -",
  "storage-help": "Activer BYOC vous permet de connecter votre propre stockage S3 afin que vos fichiers restent entièrement sous votre contrôle, sans copie externe conservée. Si l'autonomie des données est importante pour vous, envisagez de passer à l'offre Teams pour débloquer cette fonctionnalité.",
-  "daily-quota-reached": "Vous avez atteint votre quota quotidien. Pour obtenir de l'aide, veuillez contacter quotas@opensignlabs.com.",
-  "enabled-signature-type": "Types de signature activés",
-  "enabled-signature-type-help": "Le paramètre 'Types de signature activés' détermine quelles options de signature sont disponibles dans votre organisation. Par exemple, si vous désactivez l'option 'Dessiner', les membres de votre organisation ne la verront pas dans le widget de signature, tandis que les trois autres options resteront accessibles.",
-  "indexing-public-profile": "Autoriser l'indexation du profil public par les moteurs de recherche",
-  "user-created-successfully": "Utilisateur créé avec succès.",
-  "only-15-reminder-allowed": "Vous pouvez définir jusqu'à 15 rappels automatiques. Par exemple, si 'TimeToComplete' est de 15 jours et 'RemindOnceInEvery' est de 1 jour, vous atteindrez la limite maximale de 15 rappels. Ajustez vos paramètres en conséquence.",
-  "rate-your-experience": "Comment s'est passée votre expérience avec {{appName}} ?",
-  "thanks-for-feedback": "Merci pour votre retour 🙏",
-  "share-your-feedback": "Partagez votre avis",
-  "share-your-review": "Partagez votre avis",
-  "date-format": "Format de date",
-  "document-deleted": "Le document a été supprimé ou vous n'y avez pas accès. Veuillez contacter l'expéditeur.",
-  "save-as-template-?": "Êtes-vous sûr de vouloir enregistrer ce document comme modèle ?",
-  "go-to-manage-templates": "Aller à 'Gérer les modèles'",
-  "template-created": "Modèle créé",
-  "how-would-you-like-to-proceed?": "Comment souhaitez-vous procéder ?",
-  "failed-to-load-refresh-page": "Échec du chargement du document. Veuillez essayer d'actualiser cette page.",
-  "document-has-been-signed": "Le document a été signé avec succès !",
-  "document-has-been-signed-by-you": "Le document a été signé avec succès par vous !",
-  "participant-completed-signing": "Tous les participants ont terminé le processus de signature.",
-  "you-will-receive-email-shortly": "✅ Voilà, c'est fait ! Vous recevrez un e-mail de confirmation sous peu."
+  "daily-quota-reached": "You’ve reached your daily quota. For assistance, please contact quotas@opensignlabs.com."
 }
@@ -79,7 +79,6 @@
    "Storage": "Archiviazione",
    "Signing certificate": "Certificato di firma",
    "Teams": "Squadre",
-    "General": "Generale",
    "Teams-Children": {
      "Organizations": "Organizzazioni",
      "OrgAdmins": "OrgAdmins"
@@ -150,9 +149,7 @@
    "Copy Public URL": "Copia URL pubblico",
    "extend-expiry-date": "Estendi data di scadenza",
    "Duplicate Template": "Duplica modello",
-    "Duplicate": "Duplica",
-    "daily-mail-quota": "Quota e-mail giornaliera",
-    "Save as template": "Salva come modello"
+    "Duplicate": "Duplica"
  },
  "report-heading": {
    "Sr.No": "Nr.",
@@ -248,7 +245,7 @@
  "generate-token-alert": "Sei sicuro di voler rigenerare il token? Questo invaliderà il vecchio token.",
  "yes": "Sì",
  "copied": "Copiato",
-  "something-went-wrong-mssg": "Si è verificato un errore, L'aggiornamento della pagina potrebbe risolvere il problema.",
+  "something-went-wrong-mssg": "Qualcosa è andato storto, riprova più tardi.",
  "token-generated": "Token generato con successo.",
  "webhook": "Webhook",
  "update-webhook": "Aggiorna Webhook",
@@ -309,7 +306,7 @@
  "revoke-document": "Revoca documento",
  "revoke-document-alert": "Sei sicuro di voler revocare questo documento?",
  "resend-mail": "Reinvia email",
-  "resend-mail-help": "Puoi usare le seguenti variabili che verranno sostituite con i loro valori effettivi: {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}, {{note}}.",
+  "resend-mail-help": "Puoi usare le seguenti variabili che verranno sostituite con i loro valori effettivi: {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}.",
  "subject": "Oggetto",
  "body": "Corpo del messaggio",
  "add-contact": "Aggiungi contatto",
@@ -453,13 +450,11 @@
  "add-recipients": "Aggiungi destinatari",
  "loading-mssg": "Questo potrebbe richiedere del tempo",
  "send-mail": "Invia Mail",
-  "signature-field-widget":"È necessario aggiungere almeno un campo firma per ogni utente. Non hai aggiunto campi firma per {{signersName}}",
  "placeholder-alert-1": "Assicurati che sia stato aggiunto almeno un widget per la firma per tutti i destinatari.",
  "placeholder-alert-2": "Conferma di aver compilato il campo di testo.",
  "placeholder-alert-3": "Sei sicuro di voler inviare questo documento per le firme?",
  "placeholder-alert-4": "Hai inviato con successo le mail a tutti i destinatari!",
  "placeholder-mail-alert": "Hai inviato con successo un'e-mail a {{name}}. I firmatari successivi riceveranno un'e-mail una volta che {{name}} avrà firmato il documento.",
-  "placeholder-mail-alert-you": "I firmatari successivi riceveranno un'email non appena firmi il documento.",
  "placeholder-alert-5": "Vuoi firmare i documenti ora?",
  "placeholder-alert-6": "Configura l'adattatore email per inviare mail!",
  "placeholder-alert-7": "Seleziona il firmatario per aggiungere un segnaposto!",
@@ -523,7 +518,7 @@
  "correct-password": "Fornisci la password corretta",
  "decrypting-pdf": "Decrittazione PDF, attendi...",
  "invalid-otp": "OTP non valido",
-  "user-not-found": "Utente non trovato",
+  "user-not-found": "Utente non trovato!",
  "enter-otp-alert": "Inserisci l'OTP!",
  "get-verification-code": "Ottieni codice di verifica",
  "get-verification-code-2": "Riceverai un codice di verifica tramite Email",
@@ -833,7 +828,7 @@
  "initial-type": "Le tue iniziali",
  "redirect-url": "URL di reindirizzamento",
  "bulk-send": "Invio in blocco",
-  "select-timezone": "Fuso orario",
+  "select-timezone": "Seleziona il tuo fuso orario",
  "current-time": "Ora corrente",
  "email-help": "Non ti è permesso cambiare l'indirizzo email per motivi di sicurezza. Ti preghiamo di creare un altro account gratuito utilizzando il nuovo indirizzo email.",
  "doc-sent": "Documento inviato con successo.",
@@ -853,25 +848,5 @@
  "draft-template-info-p1": "Per rendere il tuo modello pubblico, deve contenere un solo ruolo oppure, se include più ruoli, tutti i ruoli aggiuntivi devono essere già assegnati ai firmatari. Il ruolo pubblico non assegnato deve rimanere vuoto e deve essere posizionato per primo.",
  "visit-below-link": "Visita il link qui sotto per saperne di più -",
  "storage-help": "Abilitare BYOC ti consente di collegare il tuo archivio S3 in modo che i tuoi file rimangano completamente sotto il tuo controllo, senza copie esterne conservate. Se l'autonomia dei dati è importante per te, considera l'upgrade a Teams per sbloccare questa funzionalità.",
-  "daily-quota-reached": "Hai raggiunto la tua quota giornaliera. Per assistenza, contatta quotas@opensignlabs.com.",
-  "enabled-signature-type": "Tipi di firma abilitati",
-  "enabled-signature-type-help": "L'impostazione 'Tipi di firma abilitati' determina quali opzioni di firma sono disponibili nella tua organizzazione. Ad esempio, se disabiliti l'opzione 'Disegna', i membri della tua organizzazione non la vedranno nel widget della firma, mentre le altre tre opzioni resteranno accessibili.",
-  "indexing-public-profile": "Consenti l'indicizzazione del profilo pubblico dai motori di ricerca",
-  "user-created-successfully": "Utente creato con successo.",
-  "only-15-reminder-allowed": "Puoi impostare fino a 15 promemoria automatici. Ad esempio, se 'TimeToComplete' è di 15 giorni e 'RemindOnceInEvery' è di 1 giorno, raggiungerai il limite massimo di 15 promemoria. Regola le tue impostazioni di conseguenza.",
-  "rate-your-experience": "Com'è stata la sua esperienza con {{appName}}?",
-  "thanks-for-feedback": "Grazie per il tuo feedback 🙏",
-  "share-your-feedback": "Condividi il tuo feedback",
-  "share-your-review": "Condividi la tua recensione",
-  "date-format": "Formato data",
-  "document-deleted": "Il documento è stato eliminato o non hai accesso. Si prega di contattare il mittente.",
-  "save-as-template-?": "Sei sicuro di voler salvare questo documento come modello?",
-  "go-to-manage-templates": "Vai a 'Gestisci modelli'",
-  "template-created": "Modello creato",
-  "how-would-you-like-to-proceed?": "Come desideri procedere?",
-  "failed-to-load-refresh-page": "Impossibile caricare il documento. Prova ad aggiornare questa pagina.",
-  "document-has-been-signed": "Il documento è stato firmato con successo!",
-  "document-has-been-signed-by-you": "Il documento è stato firmato con successo da lei!",
-  "participant-completed-signing": "Tutti i partecipanti hanno completato il processo di firma.",
-  "you-will-receive-email-shortly": "✅ È tutto! Riceverà a breve un'e-mail di conferma."
+  "daily-quota-reached": "You’ve reached your daily quota. For assistance, please contact quotas@opensignlabs.com."
 }
@@ -2,8 +2,13 @@ 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 {
+  copytoData,
+  usertimezone
+} from "../constant/Utils";
+import {
+  emailRegex,
+} from "../constant/const";
 import { useTranslation } from "react-i18next";
 function generatePassword(length) {
  const characters =
@@ -41,9 +46,9 @@ const AddUser = (props) => {
    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 allUserId =
+          _teamRes.find((x) => x.Name === "All Users")?.objectId || "";
+        setFormdata((prev) => ({ ...prev, team: allUserId }));
    }
  };
  const checkUserExist = async () => {
@@ -71,167 +76,167 @@ const AddUser = (props) => {
      setIsFormLoader(true);
      const res = await checkUserExist();
      if (res) {
-        props.showAlert("danger", t("user-already-exist"));
+        props.setIsAlert({ type: "danger", msg: t("user-already-exist") });
        setIsFormLoader(false);
+        setTimeout(() => props.setIsAlert({ type: "success", msg: "" }), 1000);
      } 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 extUser = new Parse.Object("contracts_Users");
-            extUser.set("Name", formdata.name);
+            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) {
-              extUser.set("Phone", formdata.phone);
+              _user.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
+
+            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
+                  );
                }
-              ]);
-            }
-            if (localUser && localUser.OrganizationId) {
-              extUser.set("OrganizationId", {
-                __type: "Pointer",
-                className: "contracts_Organizations",
-                objectId: localUser.OrganizationId.objectId
+                props.handleUserData(parseData);
+              }
+
+              setIsFormLoader(false);
+              setFormdata({
+                name: "",
+                email: "",
+                phone: "",
+                team: "",
+                role: ""
              });
            }
-            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"));
+            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: ""
+              });
+            }
          }
-        } else {
-          props.showAlert("danger", t("something-went-wrong-mssg"));
+        } catch (err) {
+          console.log("err", err);
+          setIsFormLoader(false);
+          props.setIsAlert({
+            type: "danger",
+            msg: t("something-went-wrong-mssg")
+          });
+        } finally {
+          setTimeout(
+            () => props.setIsAlert({ type: "success", msg: "" }),
+            1500
+          );
        }
      }
    }
@@ -254,7 +259,8 @@ const AddUser = (props) => {

  const copytoclipboard = (text) => {
    copytoData(text);
-    props.showAlert("success", t("copied"));
+    props.setIsAlert({ type: "success", msg: t("copied") });
+    setTimeout(() => props.setIsAlert({ type: "success", msg: "" }), 1500); // Reset copied state after 1.5 seconds
  };
  return (
    <div className="shadow-md rounded-box my-[1px] p-3 bg-base-100 relative">
@@ -264,120 +270,126 @@ const AddUser = (props) => {
          <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 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>
  );
 };
@@ -1,9 +1,7 @@
 import React from "react";
 import { Document, Page } from "react-pdf";
 import { Stage, Layer, Rect, Text } from "react-konva";
-import { useTranslation } from "react-i18next";
 const RenderDebugPdf = (props) => {
-  const { t } = useTranslation();
  return (
    <div>
      <div className="sticky top-0 p-[10px] z-10 bg-white border-[1px] border-[gray] my-[5px]">
@@ -14,9 +12,10 @@ const RenderDebugPdf = (props) => {
        onMouseMove={props.handleMouseMoveDiv}
      >
        <Document
-          onLoadError={() => props.setPdfLoadFail(false)}
-          loading={t("loading-doc")}
-          error={<p className="mx-2">{t("failed-to-load-refresh-page")}</p>}
+          onLoadError={() => {
+            props.setPdfLoadFail(false);
+          }}
+          loading={"Loading Document.."}
          onLoadSuccess={props.pageDetails}
          ref={props.pdfRef}
          file={props.pdfUrl}
@@ -17,8 +17,8 @@ const AddRoleModal = (props) => {
            onChange={(e) => props.setRoleName(e.target.value)}
            placeholder={
              props.signersdata.length > 0
-                ? "Role " + (props.signersdata.length + 1)
-                : "Role 1"
+                ? "User " + (props.signersdata.length + 1)
+                : "User 1"
            }
            className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs mt-1"
          />
@@ -0,0 +1,276 @@
+import React, { useEffect, useState } from "react";
+import opensignLogo from "../../assets/images/logo.png";
+import {
+  Page,
+  Text,
+  View,
+  Document,
+  StyleSheet,
+  Image
+} from "@react-pdf/renderer";
+
+function Certificate({ pdfData }) {
+  const [isMultiSigners, setIsMultiSigners] = useState();
+  const [multiSigner, setMultiSigners] = useState([]);
+  const [isLoad, setIsLoad] = useState(false);
+
+  useEffect(() => {
+    handleSignerData();
+    // eslint-disable-next-line
+  }, []);
+
+  const handleSignerData = () => {
+    const checkSigners = pdfData.filter((data) => data.Signers);
+    if (checkSigners && checkSigners.length > 0) {
+      setIsMultiSigners(true);
+
+      const checkSignSigners =
+        pdfData[0].AuditTrail &&
+        pdfData[0].AuditTrail.length > 0 &&
+        pdfData[0].AuditTrail.filter((data) => data.Activity === "Signed");
+
+      setMultiSigners(checkSignSigners);
+    } else {
+      setIsMultiSigners(false);
+    }
+    setIsLoad(true);
+  };
+
+  const styles = StyleSheet.create({
+    page: {
+      borderRadius: "5px",
+      padding: "10px",
+      backgroundColor: "white"
+    },
+    section1: {
+      border: "1px solid rgb(177, 174, 174)",
+      padding: "20px"
+    },
+    textStyle: {
+      fontWeight: "bold",
+      fontSize: "11px",
+      marginBottom: "10px"
+    },
+    textStyle2: {
+      fontWeight: "600",
+      fontSize: "11px",
+      marginBottom: "10px",
+      color: "gray"
+    },
+    image: {
+      width: "71px",
+      height: "17px"
+    }
+  });
+
+  const generatedDate = () => {
+    const newDate = new Date();
+    const utcTime = newDate.toUTCString();
+
+    return (
+      <Text
+        style={{
+          color: "gray",
+          fontSize: "10px"
+        }}
+      >
+        Generated On {utcTime}
+      </Text>
+    );
+  };
+  const changeCompletedDate = () => {
+    const completedOn = pdfData[0].updatedAt;
+    const newDate = new Date(completedOn);
+    const utcTime = newDate.toUTCString();
+
+    return <Text style={styles.textStyle2}>{utcTime}</Text>;
+  };
+
+  const signerName = (data) => {
+    const getSignerName = pdfData[0].Signers.filter(
+      (sign) => sign.objectId === data.UserPtr.objectId
+    );
+
+    return (
+      getSignerName[0] &&
+      getSignerName.length > 0 && (
+        <>
+          <Text style={styles.textStyle}>
+            Name : &nbsp;
+            <Text style={styles.textStyle2}>{getSignerName[0].Name}</Text>
+          </Text>
+          <Text style={styles.textStyle}>
+            Email : &nbsp;
+            <Text style={styles.textStyle2}>{getSignerName[0].Email}</Text>
+          </Text>
+        </>
+      )
+    );
+  };
+
+  return (
+    isLoad && (
+      <Document>
+        {/** Page defines a single page of content. */}
+        <Page size="A4" style={styles.page}>
+          <View style={styles.section1}>
+            <View
+              style={{
+                display: "flex",
+                flexDirection: "row",
+                justifyContent: "space-between",
+                alignItems: "center",
+                marginBottom: "30px"
+              }}
+            >
+              <Image src={opensignLogo} style={styles.image} />
+              {generatedDate()}
+            </View>
+
+            <View style={{ justifyContent: "center" }}>
+              <Text
+                style={{
+                  textAlign: "center",
+                  fontSize: "20px",
+                  fontWeight: "bold",
+                  color: "#31bceb",
+                  marginBottom: "10px"
+                }}
+              >
+                {" "}
+                Certificate of Completion
+              </Text>
+              <View style={{ border: "1px solid #bdbbbb" }}></View>
+              <View>
+                <View>
+                  <Text
+                    style={{
+                      fontSize: "16px",
+                      fontWeight: "bold",
+                      color: "#31bceb",
+                      margin: "10px 0px 10px 0px"
+                    }}
+                  >
+                    Summary
+                  </Text>
+                </View>
+                <View style={{ display: "flex", flexDirection: "column" }}>
+                  <Text style={styles.textStyle}>
+                    Document ID : &nbsp;
+                    <Text style={styles.textStyle2}>{pdfData[0].objectId}</Text>
+                  </Text>
+                  <Text style={styles.textStyle}>
+                    Document Name : &nbsp;
+                    <Text style={styles.textStyle2}>{pdfData[0].Name}</Text>
+                  </Text>
+                  <Text style={styles.textStyle}>
+                    Organization : &nbsp;
+                    <Text style={styles.textStyle2}>
+                      {pdfData[0].ExtUserPtr.Company}
+                    </Text>
+                  </Text>
+                  <Text style={styles.textStyle}>
+                    Completed on : &nbsp;{changeCompletedDate()}
+                  </Text>
+                  {multiSigner && multiSigner.length > 0 && (
+                    <Text style={styles.textStyle}>
+                      Signers : &nbsp;
+                      <Text style={styles.textStyle2}>
+                        {multiSigner.length}
+                      </Text>
+                    </Text>
+                  )}
+                </View>
+                {isMultiSigners ? (
+                  <View style={{ display: "flex", flexDirection: "column" }}>
+                    <Text
+                      style={{
+                        fontSize: "16px",
+                        fontWeight: "bold",
+                        color: "#31bceb",
+                        margin: "10px 0px 10px 0px"
+                      }}
+                    >
+                      Recipients
+                    </Text>
+
+                    <View>
+                      {multiSigner &&
+                        multiSigner.map((data, ind) => {
+                          return (
+                            <View
+                              key={ind}
+                              style={{
+                                display: "flex",
+                                flexDirection: "column"
+                              }}
+                            >
+                              <View
+                                style={{
+                                  border: "0.4px solid #bdbbbb",
+                                  marginBottom: "10px"
+                                }}
+                              ></View>
+                              {signerName(data)}
+
+                              <Text style={styles.textStyle}>
+                                Accessed from : &nbsp;
+                                <Text style={styles.textStyle2}>
+                                  {data.ipAddress}
+                                </Text>
+                              </Text>
+                            </View>
+                          );
+                        })}
+                    </View>
+                  </View>
+                ) : (
+                  <View style={{ display: "flex", flexDirection: "column" }}>
+                    <Text
+                      style={{
+                        fontSize: "16px",
+                        fontWeight: "bold",
+                        color: "#31bceb",
+                        margin: "10px 0px 10px 0px"
+                      }}
+                    >
+                      Recipients
+                    </Text>
+                    <Text style={styles.textStyle}>
+                      Signers : &nbsp;<Text style={styles.textStyle2}>1</Text>
+                    </Text>
+                    <Text style={styles.textStyle}>
+                      Name : &nbsp;
+                      <Text style={styles.textStyle2}>
+                        {pdfData[0].ExtUserPtr.Name}
+                      </Text>
+                    </Text>
+                    <Text style={styles.textStyle}>
+                      Email : &nbsp;
+                      <Text style={styles.textStyle2}>
+                        {pdfData[0].ExtUserPtr.Email}
+                      </Text>
+                    </Text>
+                    <Text style={styles.textStyle}>
+                      Accessed from : &nbsp;
+                      <Text style={styles.textStyle2}>
+                        {pdfData[0].AuditTrail &&
+                          pdfData[0].AuditTrail[0].ipAddress}
+                      </Text>
+                    </Text>
+
+                    <Text style={styles.textStyle}>
+                      Signed on : &nbsp;{changeCompletedDate()}
+                    </Text>
+                  </View>
+                )}
+              </View>
+            </View>
+          </View>
+        </Page>
+      </Document>
+    )
+  );
+}
+
+export default Certificate;
@@ -30,19 +30,15 @@ function DraftDocument() {
      documentData === "Error: Something went wrong!" ||
      (documentData.result && documentData.result.error)
    ) {
-      if (documentData?.result?.error?.includes("deleted")) {
-        setIsLoading({
-          isLoader: false,
-          message: t("document-deleted")
-        });
-      } else {
-        setIsLoading({
-          isLoader: false,
-          message: t("something-went-wrong-mssg")
-        });
-      }
+      setIsLoading({
+        isLoader: false,
+        message: "Error: Something went wrong!"
+      });
    } else {
-      setIsLoading({ isLoader: false, message: t("no-data") });
+      setIsLoading({
+        isLoader: false,
+        message: "No data found!"
+      });
    }
  };

@@ -1,11 +1,19 @@
-import React, { useState } from "react";
-import { getFileName } from "../../constant/Utils";
+import React, {
+  useState,
+} from "react";
+import {
+  getFileName
+} from "../../constant/Utils";
 import { useTranslation } from "react-i18next";
 import { Tooltip } from "react-tooltip";
 import SignersInput from "../shared/fields/SignersInput";

-const EditTemplate = ({ template, onSuccess }) => {
-  const appName = "OpenSign™";
+const EditTemplate = ({
+  template,
+  onSuccess,
+}) => {
+  const appName =
+    "OpenSign™";
  const { t } = useTranslation();
  const [formData, setFormData] = useState({
    Name: template?.Name || "",
@@ -56,13 +64,6 @@ const EditTemplate = ({ template, onSuccess }) => {
    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);
@@ -188,7 +189,7 @@ const EditTemplate = ({ template, onSuccess }) => {
              <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]">
+                  <p className="p-[5px]">
                    <ol className="list-disc">
                      <li>
                        <span className="font-bold">{t("yes")}: </span>
@@ -199,7 +200,7 @@ const EditTemplate = ({ template, onSuccess }) => {
                        <span>{t("istourenabled-help.p2")}</span>
                      </li>
                    </ol>
-                  </div>
+                  </p>
                  <p>{t("istourenabled-help.p3", { appName: appName })}</p>
                </div>
              </Tooltip>
@@ -246,7 +247,11 @@ const EditTemplate = ({ template, onSuccess }) => {
              </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"
@@ -255,7 +260,11 @@ const EditTemplate = ({ template, onSuccess }) => {
                />
                <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,34 +1,100 @@
 import React, { useState } from "react";
+import axios from "axios";
 import { handleToPrint } from "../../constant/Utils";
-import { emailRegex } from "../../constant/const";
+import { themeColor, emailRegex } from "../../constant/const";
 import Loader from "../../primitives/Loader";
 import ModalUi from "../../primitives/ModalUi";
 import { useTranslation } from "react-i18next";
-import Parse from "parse";

 function EmailComponent({
  isEmail,
+  pdfUrl,
  setIsEmail,
  setSuccessEmail,
  pdfDetails,
+  sender,
  setIsAlert,
+  extUserId,
  setIsDownloadModal
 }) {
  const { t } = useTranslation();
+  const appName =
+    "OpenSign™";
  const [emailList, setEmailList] = useState([]);
  const [emailValue, setEmailValue] = useState("");
  const [isLoading, setIsLoading] = useState(false);
  const [emailErr, setEmailErr] = useState(false);
  const [isDownloading, setIsDownloading] = useState("");
  const isAndroid = /Android/i.test(navigator.userAgent);
-
  //function for send email
  const sendEmail = async () => {
+    const pdfName = pdfDetails[0]?.Name;
    setIsLoading(true);
-    const params = { docId: pdfDetails?.[0]?.objectId, recipients: emailList };
-    const sendmail = await Parse.Cloud.run("forwarddoc", params);
-    console.log("sendmail ", sendmail);
-    if (sendmail?.status === "success") {
+    let sendMail;
+    const docId = pdfDetails?.[0]?.objectId || "";
+    let presignedUrl = pdfUrl;
+    try {
+      const axiosRes = await axios.post(
+        `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
+        {
+          url: pdfUrl,
+          docId: docId,
+        },
+        {
+          headers: {
+            "content-type": "Application/json",
+            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+            "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+          }
+        }
+      );
+      presignedUrl = axiosRes.data.result;
+    } catch (err) {
+      console.log("err in getsignedurl", err);
+    }
+    for (let i = 0; i < emailList.length; i++) {
+      try {
+        let url = `${localStorage.getItem("baseUrl")}functions/sendmailv3`;
+        const headers = {
+          "Content-Type": "application/json",
+          "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+          sessionToken: localStorage.getItem("accesstoken")
+        };
+        const logo =
+              `<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' style='padding:20px'/>`;
+        const opurl =
+              ` <a href='www.opensignlabs.com' target=_blank>here</a>`;
+
+        let params = {
+          extUserId: extUserId,
+          pdfName: pdfName,
+          url: presignedUrl,
+          recipient: emailList[i],
+          subject: `${sender.name} has signed the doc - ${pdfName}`,
+          replyto:
+            pdfDetails?.[0]?.ExtUserPtr?.Email ||
+            "",
+          from:
+            sender.email,
+          html:
+            `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/></head><body><div style='background-color:#f5f5f5;padding:20px'><div style='background-color:white'><div>` +
+            `${logo}</div><div style='padding:2px;font-family:system-ui;background-color:${themeColor}'><p style='font-size:20px;font-weight:400;color:white;padding-left:20px'>Document Copy</p></div><div>` +
+            `<p style='padding:20px;font-family:system-ui;font-size:14px'>A copy of the document <strong>${pdfName}</strong> is attached to this email. Kindly download the document from the attachment.</p>` +
+            `</div></div><div><p>This is an automated email from ${appName}. For any queries regarding this email, please contact the sender ${sender.email} directly. ` +
+            `If you think this email is inappropriate or spam, you may file a complaint with ${appName}${opurl}.</p></div></div></body></html>`
+        };
+        sendMail = await axios.post(url, params, { headers: headers });
+      } catch (error) {
+        console.log("error", error);
+        setIsLoading(false);
+        setIsEmail(false);
+        setIsAlert({
+          isShow: true,
+          alertMessage: t("something-went-wrong-mssg")
+        });
+      }
+    }
+    if (sendMail?.data?.result?.status === "success") {
      setSuccessEmail(true);
      setIsEmail(false);
      setTimeout(() => {
@@ -37,6 +103,15 @@ function EmailComponent({
        setEmailList([]);
      }, 1500);
      setIsLoading(false);
+    } else if (sendMail?.data?.result?.status === "daily-quota-reached") {
+      setIsLoading(false);
+      setIsEmail(false);
+      setIsAlert({
+        isShow: true,
+        alertMessage: t("daily-quota-reached")
+      });
+      setEmailValue("");
+      setEmailList([]);
    } else {
      setIsLoading(false);
      setIsEmail(false);
@@ -107,7 +182,7 @@ function EmailComponent({
            </div>
          )}
          <div className="flex justify-between items-center py-[10px] px-[20px] border-b-[1px] border-base-content">
-            <span className="text-base-content font-bold text-sm md:text-lg">
+            <span className="text-base-content font-semibold">
              {t("successfully-signed")}
            </span>
            <div className="flex flex-row">
@@ -116,14 +191,14 @@ function EmailComponent({
                  onClick={(e) =>
                    handleToPrint(e, setIsDownloading, pdfDetails)
                  }
-                  className="op-btn op-btn-neutral op-btn-sm text-xs md:text-[15px]"
+                  className="op-btn op-btn-neutral op-btn-sm text-[15px]"
                >
                  <i className="fa-light fa-print" aria-hidden="true"></i>
                  {t("print")}
                </button>
              )}
              <button
-                className="op-btn op-btn-primary op-btn-sm text-xs md:text-[15px] ml-2"
+                className="op-btn op-btn-primary op-btn-sm text-[15px] ml-2"
                onClick={() => {
                  handleClose();
                  setIsDownloadModal(true);
@@ -139,12 +214,12 @@ function EmailComponent({
              {t("email-mssg")}
            </p>
            {emailList.length > 0 ? (
-              <div className="p-0 border-[1px] op-border-primary w-full rounded-md text-[15px] overflow-hidden">
+              <div className="p-0 border-[1.5px] op-border-primary rounded w-full text-[15px]">
                <div className="flex flex-row flex-wrap">
                  {emailList.map((data, ind) => {
                    return (
                      <div
-                        className="flex flex-row items-center op-bg-primary mx-[2px] mt-[2px] rounded-md py-[5px] px-[10px]"
+                        className="flex flex-row items-center op-bg-primary m-[4px] rounded-md py-[5px] px-[10px]"
                        key={ind}
                      >
                        <span className="text-base-100 text-[13px]">
@@ -164,7 +239,7 @@ function EmailComponent({
                  <input
                    type="email"
                    value={emailValue}
-                    className="p-[10px] rounded-md w-full text-[15px] bg-transparent outline-none"
+                    className="p-[10px] pb-[20px] rounded w-full text-[15px] bg-transparent outline-none"
                    onChange={handleEmailValue}
                    onKeyDown={handleEnterPress}
                    onBlur={() => emailValue && handleEnterPress("add")}
@@ -181,7 +256,7 @@ function EmailComponent({
                <input
                  type="email"
                  value={emailValue}
-                  className="p-[10px] pb-[20px] rounded-md w-full text-[15px] outline-none bg-transparent border-[1px] op-border-primary"
+                  className="p-[10px] pb-[20px] rounded w-full text-[15px] outline-none bg-transparent border-[1.5px] op-border-primary"
                  onChange={handleEmailValue}
                  onKeyDown={handleEnterPress}
                  placeholder={t("enter-email-plaholder")}
@@ -199,7 +274,7 @@ function EmailComponent({
                {t("email-error-1")}
              </p>
            )}
-            {/* <button
+            <button
              className={`${
                emailValue ? "cursor-pointer" : "cursor-default"
              } op-btn op-btn-primary op-btn-sm m-2 shadow-md`}
@@ -207,27 +282,26 @@ function EmailComponent({
            >
              <i className="fa-light fa-plus" aria-hidden="true"></i>
            </button>
+
            <div className="bg-[#e3e2e1] mt-[10px] p-[5px] rounded">
              <span className="font-bold">{t("report-heading.Note")}: </span>
              <span className="text-[15px]">{t("email-error-2")}</span>
            </div>
-            <hr className="w-full my-[15px] bg-base-content" /> */}
-            <div className="mt-2">
-              <button
-                type="button"
-                className="op-btn op-btn-secondary"
-                onClick={() => emailList.length > 0 && sendEmail()}
-              >
-                {t("send")}
-              </button>
-              <button
-                type="button"
-                className="op-btn op-btn-ghost ml-2"
-                onClick={() => handleClose()}
-              >
-                {t("close")}
-              </button>
-            </div>
+            <hr className="w-full my-[15px] bg-base-content" />
+            <button
+              type="button"
+              className="op-btn op-btn-secondary"
+              onClick={() => emailList.length > 0 && sendEmail()}
+            >
+              {t("send")}
+            </button>
+            <button
+              type="button"
+              className="op-btn op-btn-ghost ml-2"
+              onClick={() => handleClose()}
+            >
+              {t("close")}
+            </button>
          </div>
        </ModalUi>
      )}
@@ -0,0 +1,305 @@
+import React, { useState } from "react";
+import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
+import { tomorrow } from "react-syntax-highlighter/dist/esm/styles/prism";
+import { copytoData } from "../../constant/Utils";
+import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router";
+
+function EmbedTab(props) {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const tabName = [
+    { title: "React/Next.js", icon: "fa-brands fa-react", color: "#61dafb" },
+    { title: "JavaScript", icon: "fa-brands fa-js", color: "#ffd43b" },
+    { title: "Angular", icon: "fa-brands fa-angular", color: "#ff5733" }
+  ];
+  const [activeTab, setActiveTab] = useState(0);
+  // State to track if the code has been copied
+  const [isCopied, setIsCopied] = useState(false);
+  const reactCode = [
+    {
+      id: 0,
+      title: "Installation",
+      codeString: `npm install @opensign/react`
+    },
+    {
+      id: 1,
+      title: "Usage",
+      codeString: `
+import React from "react"; 
+import Opensign from "@opensign/react";
+
+export default function App() {
+  return (
+    <div className="app">
+      <Opensign
+        onLoad={() => console.log("success")}
+        onLoadError={(error) => console.log(error)}
+        templateId= "${props.templateId ? props.templateId : "#templateId"}"
+      />
+    </div>
+  );
+}
+
+`
+    }
+  ];
+
+  const angularCode = [
+    {
+      id: 0,
+      title: "Installation",
+      codeString: `npm install @opensign/angular`
+    },
+    {
+      id: 1,
+      title: "Usage",
+      codeString: `
+import { Component } from '@angular/core';
+import { OpensignComponent } from "@opensign/angular"
+ 
+@Component({
+  selector:'app-root',
+  standalone: true,
+  imports: [OpensignComponent], 
+  template:\`<opensign templateId="${props.templateId ? props.templateId : "#templateId"}"
+            (onLoad)="handleLoad()"
+            (onLoadError)="handleError($event)"
+             ></opensign>\`,
+})
+export class AppComponent {
+  handleLoad() {
+    console.log("success");
+  }
+  handleError(error: string) {
+    console.log(error);
+  }
+}
+
+`
+    }
+  ];
+  const jsCodeString = `
+<script
+  src= "${window.location.origin}/static/js/public-template.bundle.js"
+  id="opensign-script"
+  templateId=${props.templateId ? props.templateId : "#templateId"}
+  ></script>
+  `;
+
+  const handleCopy = (code, ind) => {
+    copytoData(code);
+    setIsCopied({ ...isCopied, [ind]: true });
+    setTimeout(() => setIsCopied(false), 3000);
+  };
+
+  return (
+    <div className={`${props.templateId && "border-t-[1px] mt-4"}`}>
+      {props.templateId && (
+        <h3 className="text-base-content font-bold text-lg pt-[15px] pb-[5px]">
+          {t("embed-template")}
+        </h3>
+      )}
+      <div className="flex justify-center items-center mt-2">
+        <div role="tablist" className="op-tabs op-tabs-bordered">
+          {tabName.map((tabData, ind) => (
+            <div
+              onClick={() => setActiveTab(ind)}
+              key={ind}
+              role="tab"
+              className={`${
+                activeTab === ind ? "op-tab-active" : ""
+              } op-tab flex items-center pb-10 md:pb-0`}
+            >
+              <i
+                className={`${tabData.icon}`}
+                style={{ color: tabData.color }}
+              ></i>
+              <span className="ml-1 text-[10px] font-medium md:font-normal md:text-[15px]">
+                {tabData.title}
+              </span>
+            </div>
+          ))}
+        </div>
+      </div>
+      <div>
+        {activeTab === 0 ? (
+          <div className="mt-4">
+            {reactCode.map((data, ind) => {
+              return (
+                <div key={ind}>
+                  <p className="font-medium text-[18px]">
+                    {t(`${data.title}`)}
+                  </p>
+                  {ind === 0 && (
+                    <p className="text-[15px] mt-2">
+                      {t("public-template-mssg-1")}
+                    </p>
+                  )}
+                  <div className="relative p-1">
+                    <div
+                      onClick={() => handleCopy(data.codeString, ind)}
+                      className="absolute top-[20px] right-[20px] cursor-pointer"
+                    >
+                      <i className="fa-light fa-copy text-white mr-[2px]" />
+                      <span className=" text-white">
+                        {isCopied[ind] ? t("copied-code") : t("copy-code")}
+                      </span>
+                    </div>
+                    <SyntaxHighlighter
+                      customStyle={{
+                        borderRadius: "15px"
+                      }}
+                      language="javascript"
+                      style={tomorrow}
+                    >
+                      {data.codeString}
+                    </SyntaxHighlighter>
+                  </div>
+                </div>
+              );
+            })}
+            {props.isEmbedPage && (
+              <p className="text-[15px] my-2">
+                {t("js-snippet-msg-1")}
+                <span
+                  className="text-blue-600 cursor-pointer px-1"
+                  onClick={() => navigate("/report/6TeaPr321t")}
+                >
+                  {t("js-snippet-msg-2")}
+                </span>
+                <span>{t("js-snippet-msg-3")}</span>
+              </p>
+            )}
+            <p className="font-medium mt-3 text-[15px]">
+              {t("public-template-mssg-3")}
+            </p>
+            <p className="my-[6px]">
+              {" "}
+              {t("public-template-mssg-4")}
+              <a
+                href="https://www.npmjs.com/package/@opensign/react"
+                target="_blank"
+                rel="noreferrer"
+                className="cursor-pointer text-blue-700  "
+              >
+                {" "}
+                OpenSign React package{" "}
+              </a>
+              {t("public-template-mssg-5")}
+            </p>
+          </div>
+        ) : activeTab === 1 ? (
+          <div className="mt-4">
+            <div>
+              <p className="font-medium text-[18px]">{t(`Usage`)}</p>
+              <p className="text-[15px] my-2">{t("js-snippet-msg")}</p>
+              <div className="relative p-1">
+                <div
+                  onClick={() => handleCopy(jsCodeString, 0)}
+                  className="absolute top-[20px] right-[20px] cursor-pointer"
+                >
+                  <i className="fa-light fa-copy text-white mr-[2px]" />
+                  <span className=" text-white">
+                    {isCopied[0] ? t("copied-code") : t("copy-code")}
+                  </span>
+                </div>
+                <SyntaxHighlighter
+                  customStyle={{
+                    borderRadius: "15px"
+                  }}
+                  language="javascript"
+                  style={tomorrow}
+                >
+                  {jsCodeString}
+                </SyntaxHighlighter>
+              </div>
+              {props.isEmbedPage && (
+                <p className="text-[15px] my-2">
+                  {t("js-snippet-msg-1")}
+                  <span
+                    className="text-blue-600 cursor-pointer px-1"
+                    onClick={() => navigate("/report/6TeaPr321t")}
+                  >
+                    {t("js-snippet-msg-2")}
+                  </span>
+                  <span>{t("js-snippet-msg-3")}</span>
+                </p>
+              )}
+            </div>
+          </div>
+        ) : (
+          activeTab === 2 && (
+            <div className="mt-4">
+              {angularCode.map((data, ind) => {
+                return (
+                  <div key={ind}>
+                    <p className="font-medium text-[18px]">
+                      {t(`${data.title}`)}
+                    </p>
+                    {ind === 0 && (
+                      <p className="text-[15px] mt-2">
+                        {t("angular-npm-mssg-1")}
+                      </p>
+                    )}
+                    <div className="relative p-1">
+                      <div
+                        onClick={() => handleCopy(data.codeString, ind)}
+                        className="absolute top-[20px] right-[20px] cursor-pointer"
+                      >
+                        <i className="fa-light fa-copy text-white mr-[2px]" />
+                        <span className=" text-white">
+                          {isCopied[ind] ? t("copied-code") : t("copy-code")}
+                        </span>
+                      </div>
+                      <SyntaxHighlighter
+                        customStyle={{
+                          borderRadius: "15px"
+                        }}
+                        language="javascript"
+                        style={tomorrow}
+                      >
+                        {data.codeString}
+                      </SyntaxHighlighter>
+                    </div>
+                  </div>
+                );
+              })}
+              {props.isEmbedPage && (
+                <p className="text-[15px] my-2">
+                  {t("js-snippet-msg-1")}
+                  <span
+                    className="text-blue-600 cursor-pointer px-1"
+                    onClick={() => navigate("/report/6TeaPr321t")}
+                  >
+                    {t("js-snippet-msg-2")}
+                  </span>
+                  <span>{t("js-snippet-msg-3")}</span>
+                </p>
+              )}
+              <p className="font-medium mt-3 text-[15px]">
+                {t("public-template-mssg-3")}
+              </p>
+              <p className="my-[6px]">
+                {" "}
+                {t("public-template-mssg-4")}
+                <a
+                  href="https://www.npmjs.com/package/@opensign/angular"
+                  target="_blank"
+                  rel="noreferrer"
+                  className="cursor-pointer text-blue-700  "
+                >
+                  {" "}
+                  OpenSign Angular package{" "}
+                </a>
+                {t("public-template-mssg-5")}
+              </p>
+            </div>
+          )
+        )}
+      </div>
+    </div>
+  );
+}
+
+export default EmbedTab;
@@ -14,7 +14,6 @@ import ModalUi from "../../primitives/ModalUi";
 import Loader from "../../primitives/Loader";
 import { useTranslation } from "react-i18next";
 import { PDFDocument } from "pdf-lib";
-import { maxFileSize } from "../../constant/const";

 function Header(props) {
  const { t } = useTranslation();
@@ -51,13 +50,6 @@ function Header(props) {
    }
  };

-  // `removeFile` is used to  remove file if exists
-  const removeFile = (e) => {
-    if (e) {
-      e.target.value = "";
-    }
-  };
-
  const handleFileUpload = async (e) => {
    const file = e.target.files[0];
    if (!file) {
@@ -68,13 +60,6 @@ function Header(props) {
      alert("Only PDF files are allowed.");
      return;
    }
-
-    const mb = Math.round(file?.size / Math.pow(1024, 2));
-    if (mb > maxFileSize) {
-      alert(`${t("file-alert-1")} ${maxFileSize} MB`);
-      removeFile(e);
-      return;
-    }
    try {
      const uploadedPdfBytes = await file.arrayBuffer();
      const uploadedPdfDoc = await PDFDocument.load(uploadedPdfBytes, {
@@ -7,7 +7,6 @@ import {
 } from "../../constant/Utils";
 import ModalUi from "../../primitives/ModalUi";
 import { PDFDocument } from "pdf-lib";
-import { maxFileSize } from "../../constant/const";

 function PdfZoom(props) {
  const { t } = useTranslation();
@@ -42,14 +41,6 @@ function PdfZoom(props) {
      console.log("error in delete pdf page", e);
    }
  };
-
-  // `removeFile` is used to  remove file if exists
-  const removeFile = (e) => {
-    if (e) {
-      e.target.value = "";
-    }
-  };
-
  const handleFileUpload = async (e) => {
    const file = e.target.files[0];
    if (!file) {
@@ -60,12 +51,6 @@ function PdfZoom(props) {
      alert("Only PDF files are allowed.");
      return;
    }
-    const mb = Math.round(file?.size / Math.pow(1024, 2));
-    if (mb > maxFileSize) {
-      alert(`${t("file-alert-1")} ${maxFileSize} MB`);
-      removeFile(e);
-      return;
-    }
    try {
      const uploadedPdfBytes = await file.arrayBuffer();
      const uploadedPdfDoc = await PDFDocument.load(uploadedPdfBytes, {
@@ -25,8 +25,6 @@ const selectFormat = (data) => {
  switch (data) {
    case "L":
      return "MM/dd/yyyy";
-    case "MM/DD/YYYY":
-      return "MM/dd/yyyy";
    case "DD-MM-YYYY":
      return "dd-MM-yyyy";
    case "DD/MM/YYYY":
@@ -43,8 +41,6 @@ const selectFormat = (data) => {
      return "MM.dd.yyyy";
    case "MMM DD, YYYY":
      return "MMM dd, yyyy";
-    case "MMMM DD, YYYY":
-      return "MMMM dd, yyyy";
    case "DD MMMM, YYYY":
      return "dd MMMM, yyyy";
    default:
@@ -80,7 +76,6 @@ const changeDateToMomentFormat = (format) => {
 };
 //function to get default format
 const getDefaultFormat = (dateFormat) => dateFormat || "MM/dd/yyyy";
-
 //function to convert formated date to new Date() format
 const getDefaultDate = (dateStr, format) => {
  //get valid date format for moment to convert formated date to new Date() format
@@ -95,7 +90,6 @@ const getDefaultDate = (dateStr, format) => {
    return date;
  }
 };
-
 function Placeholder(props) {
  //'isTouchDevice' is used to detect whether a device has a touchscreen or is mouse-based
  const isTouchDevice = navigator.maxTouchPoints > 0;
@@ -443,9 +437,7 @@ function Placeholder(props) {

    //checking widget's type and open widget copy modal for required widgets
    if (
-      ["signature", textInputWidget, textWidget, "stamp", "initials"].includes(
-        props.pos.type
-      )
+      ["signature", textWidget, "stamp", "initials"].includes(props.pos.type)
    ) {
      props.setIsPageCopy(true);
      props.setSignKey(props.pos.key);
@@ -1091,7 +1083,7 @@ function Placeholder(props) {
              isSignYourself={props.isSignYourself}
              isSelfSign={props.isSelfSign}
              signerObjId={props.signerObjId}
-              calculateFontsize={props.calculateFontsize}
+              handleUserName={props.handleUserName}
              pdfDetails={props?.pdfDetails && props?.pdfDetails[0]}
              isNeedSign={props.isNeedSign}
              setSelectDate={setSelectDate}
@@ -24,13 +24,12 @@ const widgetCls =
 function PlaceholderType(props) {
  const { t } = useTranslation();
  const type = props?.pos?.type;
-  const widgetTypeTranslation = t(`widgets-name.${props?.pos?.type}`);
+  const widgetTypeTraslation = t(`widgets-name.${props?.pos?.type}`);
  const [selectOption, setSelectOption] = useState("");
  const [validatePlaceholder, setValidatePlaceholder] = useState("");
  const inputRef = useRef(null);
  const [textValue, setTextValue] = useState();
  const [selectedCheckbox, setSelectedCheckbox] = useState([]);
-  const [hint, setHint] = useState("");
  const years = range(1950, getYear(new Date()) + 16, 1);
  const fontSize = props.calculateFont(props.pos.options?.fontSize);
  const fontColor = props.pos.options?.fontColor || "black";
@@ -151,11 +150,6 @@ function PlaceholderType(props) {
      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) {
@@ -164,6 +158,7 @@ function PlaceholderType(props) {
    }
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [props.pos?.options?.defaultValue]);
+
  const ExampleCustomInput = forwardRef(({ value, onClick }, ref) => (
    <div
      style={{
@@ -332,20 +327,13 @@ function PlaceholderType(props) {
        />
      ) : (
        <div className={widgetCls}>
-          {props.pos.type && (
-            <div
-              style={{
-                fontSize: props.pos
-                  ? props.calculateFontsize(props.pos)
-                  : "11px"
-              }}
-              className="font-medium"
-            >
-              {props.isNeedSign
-                ? props.pos?.options?.hint || widgetTypeTranslation
-                : widgetTypeTranslation}
-            </div>
-          )}
+          {props?.handleUserName &&
+            props?.handleUserName(
+              props?.data?.Id,
+              props?.data?.Role,
+              widgetTypeTraslation,
+              props.pos
+            )}
        </div>
      );
    case "stamp":
@@ -358,20 +346,13 @@ function PlaceholderType(props) {
        />
      ) : (
        <div className={widgetCls}>
-          {props.pos.type && (
-            <div
-              style={{
-                fontSize: props.pos
-                  ? props.calculateFontsize(props.pos)
-                  : "11px"
-              }}
-              className="font-medium"
-            >
-              {props.isNeedSign
-                ? props.pos?.options?.hint || widgetTypeTranslation
-                : widgetTypeTranslation}
-            </div>
-          )}
+          {props?.handleUserName &&
+            props?.handleUserName(
+              props?.data?.Id,
+              props?.data?.Role,
+              widgetTypeTraslation,
+              props.pos
+            )}
        </div>
      );
    case "checkbox":
@@ -475,7 +456,7 @@ function PlaceholderType(props) {
        />
      ) : (
        <div style={textWidgetStyle} className="select-none-cls">
-          <span>{textValue || widgetTypeTranslation}</span>
+          <span>{textValue || widgetTypeTraslation}</span>
        </div>
      );
    case "dropdown":
@@ -538,7 +519,7 @@ function PlaceholderType(props) {
        >
          {props.pos?.options?.name
            ? props.pos.options.name
-            : widgetTypeTranslation}
+            : widgetTypeTraslation}
          <i className="fa-light fa-circle-chevron-down mr-1 "></i>
        </div>
      );
@@ -552,20 +533,13 @@ function PlaceholderType(props) {
        />
      ) : (
        <div className={widgetCls}>
-          {props.pos.type && (
-            <div
-              style={{
-                fontSize: props.pos
-                  ? props.calculateFontsize(props.pos)
-                  : "11px"
-              }}
-              className="font-medium text-center"
-            >
-              {props.isNeedSign
-                ? props.pos?.options?.hint || widgetTypeTranslation
-                : widgetTypeTranslation}
-            </div>
-          )}
+          {props?.handleUserName &&
+            props?.handleUserName(
+              props?.data?.Id,
+              props?.data?.Role,
+              widgetTypeTraslation,
+              props.pos
+            )}
        </div>
      );
    case "name":
@@ -574,7 +548,7 @@ function PlaceholderType(props) {
        (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
        <textarea
          ref={inputRef}
-          placeholder={hint || widgetTypeTranslation}
+          placeholder={t("widgets-name.name")}
          rows={1}
          onKeyDown={handleEnterPress}
          value={textValue}
@@ -597,7 +571,7 @@ function PlaceholderType(props) {
        />
      ) : (
        <div className="flex h-full select-none-cls" style={textWidgetStyle}>
-          <span>{widgetTypeTranslation}</span>
+          <span>{widgetTypeTraslation}</span>
        </div>
      );
    case "company":
@@ -606,7 +580,7 @@ function PlaceholderType(props) {
        (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
        <textarea
          ref={inputRef}
-          placeholder={hint || widgetTypeTranslation}
+          placeholder={t("widgets-name.company")}
          rows={1}
          onKeyDown={handleEnterPress}
          value={textValue}
@@ -628,7 +602,7 @@ function PlaceholderType(props) {
        />
      ) : (
        <div style={textWidgetStyle} className="select-none-cls">
-          <span>{widgetTypeTranslation}</span>
+          <span>{widgetTypeTraslation}</span>
        </div>
      );
    case "job title":
@@ -637,7 +611,7 @@ function PlaceholderType(props) {
        (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
        <textarea
          ref={inputRef}
-          placeholder={hint || widgetTypeTranslation}
+          placeholder={t("widgets-name.job title")}
          rows={1}
          onKeyDown={handleEnterPress}
          value={textValue}
@@ -659,7 +633,7 @@ function PlaceholderType(props) {
        />
      ) : (
        <div style={textWidgetStyle} className="select-none-cls">
-          <span>{widgetTypeTranslation}</span>
+          <span>{widgetTypeTraslation}</span>
        </div>
      );
    case "date":
@@ -738,20 +712,13 @@ function PlaceholderType(props) {
        />
      ) : (
        <div className={widgetCls}>
-          {props.pos.type && (
-            <div
-              style={{
-                fontSize: props.pos
-                  ? props.calculateFontsize(props.pos)
-                  : "11px"
-              }}
-              className="font-medium text-center"
-            >
-              {props.isNeedSign
-                ? props.pos?.options?.hint || widgetTypeTranslation
-                : widgetTypeTranslation}
-            </div>
-          )}
+          {props?.handleUserName &&
+            props?.handleUserName(
+              props?.data?.Id,
+              props?.data?.Role,
+              widgetTypeTraslation,
+              props.pos
+            )}
        </div>
      );
    case "email":
@@ -760,7 +727,7 @@ function PlaceholderType(props) {
        (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
        <textarea
          ref={inputRef}
-          placeholder={hint || widgetTypeTranslation}
+          placeholder={t("widgets-name.email")}
          rows={1}
          onKeyDown={(e) => {
            // Prevent new line on Enter key press
@@ -792,7 +759,7 @@ function PlaceholderType(props) {
        />
      ) : (
        <div style={textWidgetStyle} className="select-none-cls">
-          <span>{widgetTypeTranslation}</span>
+          <span>{widgetTypeTraslation}</span>
        </div>
      );
    case radioButtonWidget:
@@ -881,20 +848,13 @@ function PlaceholderType(props) {
      ) : (
        <div className={widgetCls}>
          {props.pos.isStamp ? <div>stamp</div> : <div>signature</div>}
-          {props.pos.type && (
-            <div
-              style={{
-                fontSize: props.pos
-                  ? props.calculateFontsize(props.pos)
-                  : "11px"
-              }}
-              className="font-medium"
-            >
-              {props.isNeedSign
-                ? props.pos?.options?.hint || widgetTypeTranslation
-                : widgetTypeTranslation}
-            </div>
-          )}
+          {props?.handleUserName &&
+            props?.handleUserName(
+              props?.data?.Id,
+              props?.data?.Role,
+              null,
+              props.pos
+            )}
        </div>
      );
  }
@@ -4,7 +4,6 @@ import { Document, Page } from "react-pdf";
 import { useSelector } from "react-redux";
 import { PDFDocument } from "pdf-lib";
 import { base64ToArrayBuffer } from "../../constant/Utils";
-import { maxFileSize } from "../../constant/const";

 function RenderAllPdfPage(props) {
  const { t } = useTranslation();
@@ -63,12 +62,6 @@ function RenderAllPdfPage(props) {
  };
  const pdfDataBase64 = `data:application/pdf;base64,${props?.pdfBase64Url}`;

-  // `removeFile` is used to  remove file if exists
-  const removeFile = (e) => {
-    if (e) {
-      e.target.value = "";
-    }
-  };
  // `handleFileUpload` is trigger when user click on add pages btn and is used to merge multiple pdf
  const handleFileUpload = async (e) => {
    const file = e.target.files[0];
@@ -80,12 +73,6 @@ function RenderAllPdfPage(props) {
      alert("Only PDF files are allowed.");
      return;
    }
-    const mb = Math.round(file?.size / Math.pow(1024, 2));
-    if (mb > maxFileSize) {
-      alert(`${t("file-alert-1")} ${maxFileSize} MB`);
-      removeFile(e);
-      return;
-    }
    try {
      const uploadedPdfBytes = await file.arrayBuffer();
      const uploadedPdfDoc = await PDFDocument.load(uploadedPdfBytes, {
@@ -123,7 +110,6 @@ function RenderAllPdfPage(props) {
         autoSignScroll hide-scrollbar max-h-[100vh] `}
      >
        <Document
-          error=""
          loading={t("loading-doc")}
          onLoadSuccess={onDocumentLoad}
          file={pdfDataBase64}
@@ -89,6 +89,35 @@ function RenderPdf(props) {
            sign?.Id === data?.Id || sign?.objectId === data?.signerObjId
        )
      : [];
+    const handleAllUserName = (Id, Role, type, pos) => {
+      return (
+        <React.Fragment>
+          <div className="text-black text-[8px] font-bold">
+            {
+              props.pdfDetails[0].Signers?.find(
+                (signer) => signer.objectId === data.signerObjId
+              )?.Name
+            }
+          </div>
+          {type && (
+            <div
+              style={{ fontSize: pos ? calculateFontsize(pos) : "11px" }}
+              className="font-bold"
+            >
+              {type}
+            </div>
+          )}
+          {Role && (
+            <div
+              style={{ fontSize: pos ? calculateFontsize(pos) : "8px" }}
+              className="text-black font-medium"
+            >
+              {`(${Role})`}
+            </div>
+          )}
+        </React.Fragment>
+      );
+    };
    return (
      checkSign.length === 0 &&
      data?.placeHolder?.map((placeData, key) => {
@@ -119,6 +148,7 @@ function RenderPdf(props) {
                        isSignYourself={false}
                        posWidth={posWidth}
                        posHeight={posHeight}
+                        handleUserName={handleAllUserName}
                        isDragging={props.isDragging}
                        pdfDetails={props.pdfDetails}
                        setIsInitial={props.setIsInitial}
@@ -155,7 +185,6 @@ function RenderPdf(props) {
                        fontColor={props.fontColor}
                        setFontColor={props.setFontColor}
                        setRequestSignTour={props.setRequestSignTour}
-                        calculateFontsize={calculateFontsize}
                      />
                    </React.Fragment>
                  )
@@ -177,6 +206,73 @@ function RenderPdf(props) {
      return `${width / 10}px`;
    }
  };
+  //function for render placeholder block over pdf document
+
+  const handleUserName = (Id, Role, type, pos) => {
+    if (Id) {
+      const checkSign = props.signersdata.find((sign) => sign.Id === Id);
+      if (checkSign?.Name) {
+        return (
+          <>
+            <div
+              style={{
+                fontSize: pos ? calculateFontsize(pos) : "8px"
+              }}
+              className="text-black font-medium"
+            >
+              {checkSign?.Name}
+            </div>
+            {type && (
+              <div
+                style={{
+                  fontSize: pos ? calculateFontsize(pos) : "11px"
+                }}
+                className=" font-bold"
+              >
+                {type}
+              </div>
+            )}
+            {Role && (
+              <div
+                style={{
+                  fontSize: pos ? calculateFontsize(pos) : "8px"
+                }}
+                className="text-black text-[8px] font-medium"
+              >
+                {`(${Role})`}
+              </div>
+            )}
+          </>
+        );
+      } else {
+        return (
+          <>
+            {type && (
+              <div
+                style={{ fontSize: pos ? calculateFontsize(pos) : "11px" }}
+                className=" font-bold"
+              >
+                {type}
+              </div>
+            )}
+            <div
+              style={{ fontSize: pos ? calculateFontsize(pos) : "8px" }}
+              className="text-black font-medium"
+            >
+              {Role}
+            </div>
+          </>
+        );
+      }
+    } else {
+      return (
+        <>
+          {type && <div className="text-[11px] font-bold">{type}</div>}
+          <div className="text-black text-[8px] font-medium">{Role}</div>
+        </>
+      );
+    }
+  };
  const pdfDataBase64 = `data:application/pdf;base64,${props.pdfBase64Url}`;
  //calculate render height of pdf in mobile view
  const handlePageLoadSuccess = (page) => {
@@ -265,6 +361,7 @@ function RenderPdf(props) {
                                            handleLinkUser={
                                              props.handleLinkUser
                                            }
+                                            handleUserName={handleUserName}
                                            isSignYourself={false}
                                            posWidth={posWidth}
                                            posHeight={posHeight}
@@ -306,9 +403,6 @@ function RenderPdf(props) {
                                              props.unSignedWidgetId
                                            }
                                            isFreeResize={true}
-                                            calculateFontsize={
-                                              calculateFontsize
-                                            }
                                          />
                                        </React.Fragment>
                                      );
@@ -354,6 +448,7 @@ function RenderPdf(props) {
                                    setWidgetType={props.setWidgetType}
                                    setSelectWidgetId={props.setSelectWidgetId}
                                    selectWidgetId={props.selectWidgetId}
+                                    handleUserName={handleUserName}
                                    setIsCheckbox={props.setIsCheckbox}
                                    setValidateAlert={props.setValidateAlert}
                                    setCurrWidgetsDetails={
@@ -373,7 +468,6 @@ function RenderPdf(props) {
                                    setIsResize={props.setIsResize}
                                    isFreeResize={false}
                                    isOpenSignPad={true}
-                                    calculateFontsize={calculateFontsize}
                                  />
                                )
                              );
@@ -381,15 +475,17 @@ function RenderPdf(props) {
                        </React.Fragment>
                      );
                    }))}
-            {/* Mobile */}
+
            <Document
-              error={<p className="mx-2">{t("failed-to-load-refresh-page")}</p>}
              onLoadError={() => props.setPdfLoad(false)}
              loading={t("loading-doc")}
              onLoadSuccess={props.pageDetails}
-              onClick={() =>
-                props.setSelectWidgetId && props.setSelectWidgetId("")
-              }
+              // ref={pdfRef}'
+              onClick={() => {
+                if (props.setSelectWidgetId) {
+                  props.setSelectWidgetId("");
+                }
+              }}
              file={pdfDataBase64}
            >
              <Page
@@ -477,6 +573,7 @@ function RenderPdf(props) {
                                            handleLinkUser={
                                              props.handleLinkUser
                                            }
+                                            handleUserName={handleUserName}
                                            isSignYourself={false}
                                            posWidth={posWidth}
                                            posHeight={posHeight}
@@ -518,9 +615,6 @@ function RenderPdf(props) {
                                              props.unSignedWidgetId
                                            }
                                            isFreeResize={true}
-                                            calculateFontsize={
-                                              calculateFontsize
-                                            }
                                          />
                                        </React.Fragment>
                                      );
@@ -571,6 +665,7 @@ function RenderPdf(props) {
                                    setWidgetType={props.setWidgetType}
                                    setSelectWidgetId={props.setSelectWidgetId}
                                    selectWidgetId={props.selectWidgetId}
+                                    handleUserName={handleUserName}
                                    setIsCheckbox={props.setIsCheckbox}
                                    setValidateAlert={props.setValidateAlert}
                                    setCurrWidgetsDetails={
@@ -591,7 +686,6 @@ function RenderPdf(props) {
                                    setIsResize={props.setIsResize}
                                    isFreeResize={false}
                                    isOpenSignPad={true}
-                                    calculateFontsize={calculateFontsize}
                                  />
                                </React.Fragment>
                              );
@@ -599,16 +693,17 @@ function RenderPdf(props) {
                        </React.Fragment>
                      );
                    }))}
-            {/* large device */}
+
            {/* this component for render pdf document is in middle of the component */}
            <Document
-              error={<p className="mx-2">{t("failed-to-load-refresh-page")}</p>}
              onLoadError={() => props.setPdfLoad(false)}
              loading={t("loading-doc")}
              onLoadSuccess={props.pageDetails}
-              onClick={() =>
-                props.setSelectWidgetId && props.setSelectWidgetId("")
-              }
+              onClick={() => {
+                if (props.setSelectWidgetId) {
+                  props.setSelectWidgetId("");
+                }
+              }}
              file={pdfDataBase64}
            >
              <Page
@@ -31,11 +31,7 @@ const WidgetNameModal = (props) => {
        name: props.defaultdata?.options?.name || "",
        defaultValue: props.defaultdata?.options?.defaultValue || "",
        status: props.defaultdata?.options?.status || "required",
-        hint:
-          props.defaultdata?.options?.hint ||
-          (props.defaultdata?.type === textInputWidget
-            ? "Enter text"
-            : `Enter ${props.defaultdata?.options?.name}`),
+        hint: props.defaultdata?.options?.hint || "",
        textvalidate:
          props.defaultdata?.options?.validation?.type === "regex"
            ? props.defaultdata?.options?.validation?.pattern
@@ -117,6 +113,7 @@ const WidgetNameModal = (props) => {
    }
  }

+
  const handleCheckboxChange = (index) => {
    // Update the state with the modified array
    setSignatureType((prev) =>
@@ -275,13 +272,12 @@ const WidgetNameModal = (props) => {
            </div>
          </div>
        )}
-        {props.defaultdata?.type !== textWidget && (
+        {props.defaultdata?.type === textInputWidget && (
          <div className="mb-[0.75rem]">
            <label htmlFor="hint" className="text-[13px]">
              {t("hint")}
            </label>
            <input
-              maxLength={40}
              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
              name="hint"
              value={formdata.hint}
@@ -299,7 +295,7 @@ const WidgetNameModal = (props) => {
        ].includes(props.defaultdata?.type) && (
          <div className="flex flex-col md:flex-row md:items-center gap-3 mb-3">
            <div className="flex items-center gap-2 ">
-              <span className="whitespace-nowrap">{t("font-size")}: </span>
+              <span>{t("font-size")}:</span>
              <select
                className="ml-[7px] w-[60%] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
                value={
@@ -1,79 +0,0 @@
-import React, { useState } from "react";
-import { formatDateTime } from "../../../constant/Utils";
-import { useTranslation } from "react-i18next";
-
-const DateFormatSelector = (props) => {
-  const { t } = useTranslation();
-  const date = new Date();
-  const [selectedFormat, setSelectedFormat] = useState(props.dateFormat);
-  const [is12Hour, setIs12Hour] = useState(props?.is12HourTime);
-
-  const dateFormats = [
-    "MM/DD/YYYY",
-    "MMMM DD, YYYY",
-    "DD MMMM, YYYY",
-    "DD-MM-YYYY",
-    "DD MMM, YYYY",
-    "YYYY-MM-DD",
-    "MM-DD-YYYY",
-    "MM.DD.YYYY",
-    "MMM DD, YYYY"
-  ];
-
-  // Handle format change
-  const handleFormatChange = (event) => {
-    setSelectedFormat(event.target.value);
-    props.setDateFormat && props.setDateFormat(event.target.value);
-  };
-  const handleHrInput = () => {
-    setIs12Hour(!is12Hour);
-    props.setIs12HourTime && props.setIs12HourTime(!is12Hour);
-  };
-  return (
-    <div className="max-w-[400px] pr-[20px]">
-      <label className="text-[14px] mb-[0.7rem] font-medium">
-        {t("date-format")}
-      </label>
-      <select
-        className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content w-full h-full text-[11px]"
-        value={selectedFormat}
-        onChange={handleFormatChange}
-      >
-        {dateFormats.map((format) => (
-          <option key={format} value={format}>
-            {format}
-          </option>
-        ))}
-      </select>
-      <div className="flex flex-col md:flex-row md:gap-4 mt-[0.75rem] text-[12px]">
-        <div className="flex items-center gap-2 ml-2">
-          <input
-            type="radio"
-            value={true}
-            className="op-radio op-radio-xs"
-            checked={is12Hour}
-            onChange={handleHrInput}
-          />
-          <div className="text-center">12 hr</div>
-        </div>
-        <div className="flex items-center gap-2 ml-2">
-          <input
-            type="radio"
-            value={false}
-            className="op-radio op-radio-xs"
-            checked={!is12Hour}
-            onChange={handleHrInput}
-          />
-          <div className="text-center">24 hr</div>
-        </div>
-      </div>
-      <p className="mt-[12px] ml-[10px] text-[13px] font-medium">
-        <strong>
-          {formatDateTime(date, selectedFormat, props?.timezone, is12Hour)}
-        </strong>
-      </p>
-    </div>
-  );
-};
-
-export default DateFormatSelector;
@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from "react";
 import AsyncSelect from "react-select/async";
-import AddContact from "../../../primitives/AddContact";
+import AddSigner from "../../AddSigner";
+import Parse from "parse";
 import Tooltip from "../../../primitives/Tooltip";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
-import { findContact } from "../../../constant/Utils";
 function arrayMove(array, from, to) {
  array = array.slice();
  array.splice(to < 0 ? array.length + to : to, 0, array.splice(from, 1)[0]);
@@ -103,21 +103,17 @@ const SignersInput = (props) => {

  // `handleNewDetails` is used to set just save from quick form to selected option in dropdown
  const handleNewDetails = (data) => {
-    const user = {
-      value: data["objectId"],
-      label: data["Name"],
-      email: data?.Email
-    };
-    setState([...state, user]);
+    setState([...state, data]);
    if (selected.length > 0) {
-      setSelected([...selected, user]);
+      setSelected([...selected, data]);
    } else {
-      setSelected([user]);
+      setSelected([data]);
    }
  };
  const loadOptions = async (inputValue) => {
    try {
-      const contactRes = await findContact(inputValue);
+      const params = { search: inputValue };
+      const contactRes = await Parse.Cloud.run("getsigners", params);
      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 +148,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`}
@@ -215,8 +209,9 @@ const SignersInput = (props) => {
            ✕
          </button>
          {isModal && (
-            <AddContact
-              isDisableTitle
+            <AddSigner
+              valueKey={"objectId"}
+              displayKey={"Name"}
              details={handleNewDetails}
              closePopup={handleModalCloseClick}
            />
@@ -7,10 +7,27 @@ const TimezoneSelector = (props) => {
  // Intl.DateTimeFormat().resolvedOptions().timeZone // Default to the user's local timezone

  const onChangeTimezone = (timezone) => {
-    setSelectedTimezone(timezone?.value);
+    setSelectedTimezone(timezone);
    props.setTimezone && props.setTimezone(timezone?.value);
  };

+  // Format date and time for the selected timezone
+  const formatDate = (date, timezone) => {
+    return timezone
+      ? new Intl.DateTimeFormat("en-US", {
+          weekday: "short",
+          year: "numeric",
+          month: "short",
+          day: "numeric",
+          hour: "2-digit",
+          minute: "2-digit",
+          second: "2-digit",
+          timeZone: timezone,
+          hour12: false
+        }).format(date)
+      : new Date(date).toUTCString();
+  };
+
  return (
    <>
      <div className="max-w-[400px] pr-[20px]">
@@ -37,6 +54,11 @@ const TimezoneSelector = (props) => {
          }}
        />
      </div>
+      <div className="mt-[12px] ml-[10px] text-[13px]">
+        <strong>
+          {formatDate(new Date(), selectedTimezone?.value || selectedTimezone)}
+        </strong>{" "}
+      </div>
    </>
  );
 };
@@ -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 (
@@ -17,15 +18,13 @@ const Menu = ({ item, isOpen, closeSidebar }) => {
        className={({ isActive }) =>
          `${
            isActive ? " bg-base-300 text-base-content" : ""
-          } flex items-center justify-start text-left p-3 lg:p-4 text-base-content hover:text-base-content focus:bg-base-300 hover:bg-base-300 hover:no-underline focus:outline-none`
+          } flex items-center text-left p-3 lg:p-4 text-base-content hover:text-base-content focus:bg-base-300 hover:bg-base-300 hover:no-underline focus:outline-none`
        }
        onClick={closeSidebar}
        tabIndex={isOpen ? 0 : -1}
        role="menuitem"
      >
-        <span className="w-[20px] h-[20px] flex justify-center">
-          <i className={`${item.icon} text-[18px]`} aria-hidden="true"></i>
-        </span>
+        <i className={`${item.icon} text-[18px]`} aria-hidden="true"></i>
        <span className="ml-3 lg:ml-4">
          {t(`sidebar.${item.title}`, { appName: drivename })}
        </span>
@@ -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;
@@ -11,16 +12,14 @@ const Submenu = ({ item, closeSidebar, toggleSubmenu, submenuOpen }) => {
    <li role="none" className="my-0.5">
      <button
        onClick={() => toggleSubmenu(item.title)}
-        className="flex items-center justify-start text-left p-3 lg:p-4 text-base-content hover:text-base-content focus:bg-base-300 hover:bg-base-300 hover:no-underline focus:outline-none "
+        className="flex items-center text-left p-3 lg:p-4 text-base-content hover:text-base-content focus:bg-base-300 hover:bg-base-300 hover:no-underline focus:outline-none "
        aria-expanded={submenuOpen}
        aria-haspopup="true"
        aria-controls={`submenu-${title}`}
      >
-        <span className="w-[20px] h-[20px] flex justify-center">
-          <i className={`${icon} text-[18px]`}></i>
-        </span>
+        <i className={`${icon} text-[18px]`}></i>
        <div className="flex justify-between items-center w-full">
-          <span className="ml-3 lg:ml-4 text-start">
+          <span className="ml-3 lg:ml-4">
            {t(`sidebar.${item.title}`, { appName })}
          </span>
          <i
@@ -46,18 +45,16 @@ const Submenu = ({ item, closeSidebar, toggleSubmenu, submenuOpen }) => {
                className={({ isActive }) =>
                  `${
                    isActive ? "bg-base-300 text-base-content" : ""
-                  } flex items-center justify-start text-left pl-6 md:pl-8 py-2 text-sm cursor-pointer text-base-content hover:text-base-content focus:bg-base-300 hover:bg-base-300 hover:no-underline focus:outline-none`
+                  } flex items-center text-left pl-6 md:pl-8 py-2 text-sm cursor-pointer text-base-content hover:text-base-content focus:bg-base-300 hover:bg-base-300 hover:no-underline focus:outline-none`
                }
                onClick={closeSidebar}
                role="menuitem"
                tabIndex={submenuOpen ? 0 : -1}
              >
-                <span className="w-[15px] h-[15px] flex justify-center">
-                  <i
-                    className={`${childItem.icon} text-[18px]`}
-                    aria-hidden="true"
-                  ></i>
-                </span>
+                <i
+                  className={`${childItem.icon} text-[18px]`}
+                  aria-hidden="true"
+                ></i>
                <span className="ml-3 lg:ml-4">
                  {t(`sidebar.${item.title}-Children.${childItem.title}`, {
                    appName: drivename
@@ -7,8 +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 { format, toZonedTime } from "date-fns-tz";
+import {
+  themeColor
+} from "./const";

 export const fontsizeArr = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28];
 export const fontColorArr = ["red", "black", "blue", "yellow"];
@@ -135,12 +136,14 @@ 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 token =
+          { "X-Parse-Session-Token": accesstoken };
    const headers = {
      headers: {
        "Content-Type": "application/json",
@@ -233,47 +236,17 @@ export const widgets = [
  { type: "email", icon: "fa-light fa-envelope", iconSize: "20px" }
 ];

-export const getDate = (dateformat) => {
-  const format = dateformat || "MM/DD/YYYY";
+export const getDate = () => {
  const date = new Date();
  const milliseconds = date.getTime();
-  const newDate = moment(milliseconds).format(format);
+  const newDate = moment(milliseconds).format("MM/DD/YYYY");
  return newDate;
 };
-
-export const selectFormat = (data) => {
-  switch (data) {
-    case "L":
-      return "MM/dd/yyyy";
-    case "MM/DD/YYYY":
-      return "MM/dd/yyyy";
-    case "DD-MM-YYYY":
-      return "dd-MM-yyyy";
-    case "DD/MM/YYYY":
-      return "dd/MM/yyyy";
-    case "LL":
-      return "MMMM dd, yyyy";
-    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 "MMMM DD, YYYY":
-      return "MMMM dd, yyyy";
-    case "DD MMMM, YYYY":
-      return "dd MMMM, yyyy";
-    default:
-      return "MM/dd/yyyy";
-  }
-};
-
-export const addWidgetOptions = (type, signer) => {
-  const defaultOpt = { name: type, status: "required" };
+export const addWidgetOptions = (type) => {
+  const defaultOpt = {
+    name: type,
+    status: "required"
+  };
  switch (type) {
    case "signature":
      return defaultOpt;
@@ -294,16 +267,12 @@ export const addWidgetOptions = (type, signer) => {
      return { ...defaultOpt };
    case "job title":
      return { ...defaultOpt };
-    case "date": {
-      const dateFormat = signer?.DateFormat
-        ? selectFormat(signer?.DateFormat)
-        : "MM/dd/yyyy";
+    case "date":
      return {
        ...defaultOpt,
-        response: getDate(signer?.DateFormat),
-        validation: { format: dateFormat, type: "date-format" }
+        response: getDate(),
+        validation: { format: "MM/dd/yyyy", type: "date-format" }
      };
-    }
    case "image":
      return defaultOpt;
    case "email":
@@ -324,7 +293,7 @@ export const addWidgetOptions = (type, signer) => {
  }
 };

-export const addWidgetSelfsignOptions = (type, getWidgetValue, owner) => {
+export const addWidgetSelfsignOptions = (type, getWidgetValue) => {
  switch (type) {
    case "signature":
      return { name: "signature" };
@@ -354,16 +323,12 @@ export const addWidgetSelfsignOptions = (type, getWidgetValue, owner) => {
        defaultValue: getWidgetValue(type),
        validation: { type: "text", pattern: "" }
      };
-    case "date": {
-      const dateFormat = owner?.DateFormat
-        ? selectFormat(owner?.DateFormat)
-        : "MM/dd/yyyy";
+    case "date":
      return {
        name: "date",
-        response: getDate(owner?.DateFormat),
-        validation: { format: dateFormat, type: "date-format" }
+        response: getDate(),
+        validation: { format: "MM/dd/yyyy", type: "date-format" }
      };
-    }
    case "image":
      return { name: "image" };
    case "email":
@@ -530,7 +495,7 @@ export const signPdfFun = async (
  documentId,
  signerObjectId,
  objectId,
-  widgets
+  widgets,
 ) => {
  let isCustomCompletionMail = false;
  try {
@@ -539,7 +504,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;
      }
    }
@@ -674,13 +642,7 @@ export const createDocument = async (
      ...Bcc,
      ...RedirectUrl
    };
-    const remindOnceInEvery = Doc?.RemindOnceInEvery;
-    const TimeToCompleteDays = parseInt(Doc?.TimeToCompleteDays);
-    const reminderCount = TimeToCompleteDays / remindOnceInEvery;
-    const AutomaticReminders = Doc.autoreminder;
-    if (AutomaticReminders && reminderCount > 15) {
-      return { status: "error", id: "only-15-reminder-allowed" };
-    }
+
    try {
      const res = await axios.post(
        `${localStorage.getItem("baseUrl")}classes/contracts_Document`,
@@ -698,7 +660,7 @@ export const createDocument = async (
      }
    } catch (err) {
      console.log("axois err ", err);
-      return { status: "error", id: "something-went-wrong-mssg" };
+      return { status: "error", id: "Something Went Wrong!" };
    }
  }
 };
@@ -971,7 +933,10 @@ export const calculateInitialWidthHeight = (widgetData) => {
  const height = span.offsetHeight;

  document.body.removeChild(span);
-  return { getWidth: width, getHeight: height };
+  return {
+    getWidth: width,
+    getHeight: height
+  };
 };
 export const addInitialData = (signerPos, setXyPosition, value, userId) => {
  function widgetDataValue(type) {
@@ -1002,7 +967,9 @@ export const addInitialData = (signerPos, setXyPosition, value, userId) => {
          )
        };
      } else {
-        return item;
+        return {
+          ...item
+        };
      }
    } else if (item.pos && item.pos.length > 0) {
      // If there is no nested array, add the new field
@@ -1018,11 +985,19 @@ export const addInitialData = (signerPos, setXyPosition, value, userId) => {
          ...item,
          options: {
            ...item.options,
-            defaultValue: item?.options?.defaultValue || widgetData
+            defaultValue: widgetData
          }
+          // Width:
+          //   calculateInitialWidthHeight(item.type, widgetData).getWidth ||
+          //   item?.Width,
+          // Height:
+          //   calculateInitialWidthHeight(item.type, widgetData).getHeight ||
+          //   item?.Height
        };
      } else {
-        return item;
+        return {
+          ...item
+        };
      }
    }
  });
@@ -1030,7 +1005,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"
@@ -1892,9 +1868,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: {
@@ -2078,31 +2057,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",
@@ -2182,30 +2166,33 @@ export const handleSendOTP = async (email) => {
      "Content-Type": "application/json",
      "X-Parse-Application-Id": localStorage.getItem("parseAppId")
    };
-    const body = {
-      email: email
-    };
+    const body = { email: email };
    await axios.post(url, body, { headers: headers });
  } catch (error) {
    alert(error.message);
  }
 };
 export const fetchUrl = async (url, pdfName) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  try {
    const response = await fetch(url);
    if (!response.ok) {
-      alert("something went wrong, refreshing this page may solve this issue.");
+      alert("something went wrong, please try again later.");
      throw new Error("Network response was not ok");
    }
    const blob = await response.blob();
    saveAs(blob, `${sanitizeFileName(pdfName)}_signed_by_${appName}.pdf`);
  } catch (error) {
-    alert("something went wrong, refreshing this page may solve this issue.");
+    alert("something went wrong, please try again later.");
    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`,
@@ -2266,13 +2253,16 @@ 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) {
      console.log("err in getsignedurl", err);
      setIsDownloading("");
-      alert("something went wrong, refreshing this page may solve this issue.");
+      alert("something went wrong, please try again later.");
    }
  }
 };
@@ -2296,7 +2286,7 @@ export const handleToPrint = async (event, setIsDownloading, pdfDetails) => {
      `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
      {
        url: pdfUrl,
-        docId: docId
+        docId: docId,
      },
      {
        headers: {
@@ -2330,7 +2320,7 @@ export const handleToPrint = async (event, setIsDownloading, pdfDetails) => {
  } catch (err) {
    setIsDownloading("");
    console.log("err in getsignedurl", err);
-    alert("something went wrong, refreshing this page may solve this issue.");
+    alert("something went wrong, please try again later.");
  }
 };

@@ -2340,7 +2330,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);
@@ -2416,7 +2407,7 @@ export const handleDownloadCertificate = async (
    } catch (err) {
      setIsDownloading("certificate_err");
      console.log("err in download in certificate", err);
-      alert("something went wrong, refreshing this page may solve this issue.");
+      alert("something went wrong, please try again later.");
    }
  }
 };
@@ -2424,13 +2415,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"),
@@ -2642,20 +2634,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);
@@ -2873,11 +2868,20 @@ export function generatePdfName(length) {

 // Format date and time for the selected timezone
 export const formatTimeInTimezone = (date, timezone) => {
-  const nyDate = timezone && toZonedTime(date, timezone);
-  const generatedDate = timezone
-    ? format(nyDate, "EEE, dd MMM yyyy HH:mm:ss zzz", { timeZone: timezone })
+  return timezone
+    ? new Intl.DateTimeFormat("en-US", {
+        weekday: "short",
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+        hour: "2-digit",
+        minute: "2-digit",
+        second: "2-digit",
+        timeZone: timezone,
+        timeZoneName: "short",
+        hour12: false
+      }).format(date)
    : new Date(date).toUTCString();
-  return generatedDate;
 };

 // `usertimezone` is used to get timezone of current user
@@ -2945,10 +2949,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 =
@@ -2962,10 +2969,8 @@ export const mailTemplate = (param) => {
    param.senderMail +
    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td><td></td><td style='color:#626363;font-weight:bold'> " +
    param.organization +
-    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td></td><td style='color:#626363;font-weight:bold'>" +
+    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expire on</td><td></td><td style='color:#626363;font-weight:bold'>" +
    param.localExpireDate +
-    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Note</td><td></td><td style='color:#626363;font-weight:bold'>" +
-    param.note +
    "</td></tr><tr><td></td><td></td></tr></table></div> <div style='margin-left:70px'><a target=_blank href=" +
    param.sigingUrl +
    "><button style='padding:12px;background-color:#d46b0f;color:white;border:0px;font-weight:bold;margin-top:30px'>Sign here</button></a></div><div style='display:flex;justify-content:center;margin-top:10px'></div></div></div><div><p> This is an automated email from " +
@@ -2978,15 +2983,3 @@ export const mailTemplate = (param) => {

  return { subject, body };
 };
-
-export function formatDateTime(date, dateFormat, timeZone, is12Hour) {
-  const zonedDate = toZonedTime(date, timeZone); // Convert date to the given timezone
-  const timeFormat = is12Hour ? "hh:mm:ss a" : "HH:mm:ss";
-  return dateFormat
-    ? format(
-        zonedDate,
-        `${selectFormat(dateFormat)}, ${timeFormat} 'GMT' XXX`,
-        { timeZone }
-      )
-    : formatTimeInTimezone(date, timeZone);
-}
@@ -1,9 +1,11 @@
 import logo from "../assets/images/logo.png";

 export function serverUrl_fn() {
-  let baseUrl = process.env.REACT_APP_SERVERURL
-    ? process.env.REACT_APP_SERVERURL
-    : window.location.origin + "/api/app";
+  let baseUrl;
+    baseUrl = process.env.REACT_APP_SERVERURL
+      ? process.env.REACT_APP_SERVERURL
+      : window.location.origin + "/app";
+
  return baseUrl;
 }
 export const appInfo = {
@@ -4,4 +4,3 @@ export const documentCls = "contracts_Document";
 export const themeColor = "#47a3ad";
 export const iconColor = "#686968";
 export const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-export const maxFileSize = 10; // 10MB
@@ -14,6 +14,7 @@ import {
  Preview
 } from "react-dnd-multi-backend";
 import DragElement from "./components/pdf/DragElement";
+import TagManager from "react-gtm-module";
 import Parse from "parse";
 import "./polyfills";
 import { serverUrl_fn } from "./constant/appinfo";
@@ -55,6 +56,13 @@ const generatePreview = (props) => {
  );
 };

+if (process.env.REACT_APP_GTM) {
+  const tagManagerArgs = {
+    gtmId: process.env.REACT_APP_GTM
+  };
+  TagManager.initialize(tagManagerArgs);
+}
+
 const root = ReactDOM.createRoot(document.getElementById("root"));
 root.render(
  <CookiesProvider defaultSetOptions={{ path: "/" }}>
@@ -1,3 +1,4 @@
+
 export default function reportJson(id) {
  // console.log("json ", json);
  const head = ["Title", "Note", "Folder", "File", "Owner", "Signers"];
@@ -28,25 +29,6 @@ export default function reportJson(id) {
            btnIcon: "fa-light fa-trash",
            redirectUrl: "",
            action: "delete"
-          },
-          {
-            btnId: "22534",
-            hoverLabel: "option",
-            btnColor: "",
-            restrictBtn: true,
-            textColor: "black",
-            btnIcon: "fa-light fa-ellipsis-vertical fa-lg",
-            action: "option",
-            subaction: [
-              {
-                btnId: "1630",
-                btnLabel: "Save as template",
-                hoverLabel: "Save as template",
-                btnIcon: "fa-light fa-envelope",
-                redirectUrl: "",
-                action: "saveastemplate"
-              }
-            ]
          }
        ],
        helpMsg:
@@ -125,14 +107,6 @@ export default function reportJson(id) {
                redirectUrl: "",
                action: "revoke"
              },
-              {
-                btnId: "0630",
-                btnLabel: "Save as template",
-                hoverLabel: "Save as template",
-                btnIcon: "fa-light fa-envelope",
-                redirectUrl: "",
-                action: "saveastemplate"
-              },
              {
                btnId: "1488",
                btnLabel: "Delete",
@@ -169,25 +143,6 @@ export default function reportJson(id) {
            restrictBtn: true,
            redirectUrl: "",
            action: "delete"
-          },
-          {
-            btnId: "33534",
-            hoverLabel: "option",
-            btnColor: "",
-            restrictBtn: true,
-            textColor: "black",
-            btnIcon: "fa-light fa-ellipsis-vertical fa-lg",
-            action: "option",
-            subaction: [
-              {
-                btnId: "0930",
-                btnLabel: "Save as template",
-                hoverLabel: "Save as template",
-                btnIcon: "fa-light fa-envelope",
-                redirectUrl: "",
-                action: "saveastemplate"
-              }
-            ]
          }
        ],
        helpMsg:
@@ -214,25 +169,6 @@ export default function reportJson(id) {
            btnIcon: "fa-light fa-trash",
            redirectUrl: "",
            action: "delete"
-          },
-          {
-            btnId: "44534",
-            hoverLabel: "option",
-            btnColor: "",
-            restrictBtn: true,
-            textColor: "black",
-            btnIcon: "fa-light fa-ellipsis-vertical fa-lg",
-            action: "option",
-            subaction: [
-              {
-                btnId: "0940",
-                btnLabel: "Save as template",
-                hoverLabel: "Save as template",
-                btnIcon: "fa-light fa-envelope",
-                redirectUrl: "",
-                action: "saveastemplate"
-              }
-            ]
          }
        ],
        helpMsg:
@@ -276,14 +212,6 @@ export default function reportJson(id) {
                btnIcon: "fa-light fa-hourglass-end",
                redirectUrl: "",
                action: "extendexpiry"
-              },
-              {
-                btnId: "5530",
-                btnLabel: "Save as template",
-                hoverLabel: "Save as template",
-                btnIcon: "fa-light fa-envelope",
-                redirectUrl: "",
-                action: "saveastemplate"
              }
            ]
          }
@@ -345,14 +273,6 @@ export default function reportJson(id) {
                redirectUrl: "",
                action: "revoke"
              },
-              {
-                btnId: "7730",
-                btnLabel: "Save as template",
-                hoverLabel: "Save as template",
-                btnIcon: "fa-light fa-envelope",
-                redirectUrl: "",
-                action: "saveastemplate"
-              },
              {
                btnId: "2000",
                btnLabel: "Delete",
@@ -403,25 +323,6 @@ export default function reportJson(id) {
            btnIcon: "fa-light fa-trash",
            redirectUrl: "",
            action: "delete"
-          },
-          {
-            btnId: "55534",
-            hoverLabel: "option",
-            btnColor: "",
-            restrictBtn: true,
-            textColor: "black",
-            btnIcon: "fa-light fa-ellipsis-vertical fa-lg",
-            action: "option",
-            subaction: [
-              {
-                btnId: "6630",
-                btnLabel: "Save as template",
-                hoverLabel: "Save as template",
-                btnIcon: "fa-light fa-envelope",
-                redirectUrl: "",
-                action: "saveastemplate"
-              }
-            ]
          }
        ]
      };
@@ -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);
          }
@@ -71,7 +72,7 @@ const HomeLayout = () => {
  //function to use save data in cookies storage
  const saveCookies = () => {
    const main_Domain = window.location.origin;
-    const domainName = window.location.hostname;
+    const domainName = window.location.hostname; //app.opensignlabs.com
    // Find the index of the first dot in the string
    const indexOfFirstDot = domainName.indexOf(".");
    // Remove the first dot and get the substring starting from the next character
@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import Confetti from "react-confetti"; // Import the confetti library
 import {
  getBase64FromUrl,
  handleDownloadCertificate,
@@ -11,25 +10,19 @@ import ModalUi from "../primitives/ModalUi";
 import Loader from "../primitives/Loader";
 import DownloadPdfZip from "../primitives/DownloadPdfZip";
 import Title from "../components/Title";
-import CheckCircle from "../primitives/CheckCircle";

 const DocSuccessPage = () => {
-  const { t } = useTranslation();
  const signed = window.location?.search?.includes("docid");
  const sent = window.location?.search?.includes("message");
  const [isDownloading, setIsDownloading] = useState(false);
  const [isDownloadModal, setIsDownloadModal] = useState(false);
  const [pdfDetails, setPdfDetails] = useState([]);
  const [pdfBase64Url, setPdfBase64Url] = useState("");
-  const [showConfetti, setShowConfetti] = useState(true); // State to control confetti
+  const { t } = useTranslation();

  useEffect(() => {
    initialsetup();
-    // Stop confetti after 5 seconds
-    const timer = setTimeout(() => setShowConfetti(false), 5000);
-    return () => clearTimeout(timer);
  }, []);
-
  const initialsetup = async () => {
    const search = window.location.search.split("?")[1];
    if (search) {
@@ -51,7 +44,6 @@ const DocSuccessPage = () => {
      }
    }
  };
-
  const handleDownload = () => {
    if (pdfDetails?.[0]?.IsCompleted) {
      setIsDownloadModal(true);
@@ -59,79 +51,50 @@ const DocSuccessPage = () => {
      handleDownloadPdf(pdfDetails, setIsDownloading, pdfBase64Url);
    }
  };
-
  return (
-    <>
+    <div className="flex h-screen justify-center items-center text-sm md:text-base">
      <Title title="Success" />
-      {/* Confetti Effect */}
-      {showConfetti && (
-        <Confetti width={window.innerWidth} height={window.innerHeight} />
-      )}
      {sent ? (
-        <div className="min-h-screen flex flex-col items-center justify-center p-3 md:p-8 text-center">
-          <div className="max-w-lg md:max-w-2xl bg-white rounded-lg shadow-lg p-3 md:p-10">
-            {t("doc-sent")}
-          </div>
-        </div>
+        <div>{t("doc-sent")}</div>
      ) : signed ? (
-        <>
-          <div className="min-h-screen flex flex-col items-center justify-center p-3 md:p-8 text-center">
-            <div className="max-w-lg md:max-w-2xl bg-white rounded-lg shadow-lg p-3 md:p-10">
-              <div className="flex flex-col items-center space-y-4 ">
-                <CheckCircle className="text-green-500 w-12 h-12 md:w-14 md:h-14" />
-                <h1 className="text-xl md:text-2xl font-semibold text-gray-800">
-                  {pdfDetails?.[0]?.IsCompleted
-                    ? t("document-has-been-signed")
-                    : t("document-has-been-signed-by-you")}
-                </h1>
-                {pdfDetails?.[0]?.IsCompleted && (
-                  <p className="text-sm md:text-base text-gray-600">
-                    {t("participant-completed-signing")}
-                  </p>
-                )}
-              </div>
-              {/* Action Buttons */}
-              <div className="mt-6 flex flex-wrap justify-center gap-2">
-                <button
-                  type="button"
-                  className="font-medium text-sm md:text-[13px] md:px-4 py-2 op-btn op-btn-primary"
-                  onClick={() => handleDownload()}
-                >
-                  <i className="fa-light fa-download" aria-hidden="true"></i>
-                  <span>{t("download")}</span>
-                </button>
-
-                {pdfDetails?.[0]?.IsCompleted && (
-                  <button
-                    type="button"
-                    onClick={() =>
-                      handleDownloadCertificate(pdfDetails, setIsDownloading)
-                    }
-                    className="font-medium text-sm md:text-[13px] md:px-4 py-2 op-btn op-btn-secondary"
-                  >
-                    <i
-                      className="fa-light fa-award mx-[3px] md:mx-0"
-                      aria-hidden="true"
-                    ></i>
-                    <span>{t("certificate")}</span>
-                  </button>
-                )}
-                <button
-                  onClick={(e) =>
-                    handleToPrint(e, setIsDownloading, pdfDetails)
-                  }
-                  type="button"
-                  className="font-medium text-sm md:text-[13px] px-4 py-2 op-btn op-btn-neutral"
-                >
-                  <i className="fa-light fa-print" aria-hidden="true"></i>
-                  <span>{t("print")}</span>
-                </button>
-              </div>
-              {/* Footer Message */}
-              <p className="mt-4 md:mt-6 text-xs md:text-sm text-gray-500">
-                {t("you-will-receive-email-shortly")}
-              </p>
-            </div>
+        <div className="text-center">
+          <p>
+            {pdfDetails?.[0]?.IsCompleted
+              ? t("document-signed-alert-4")
+              : t("document-signed-alert")}
+          </p>
+          <div className="m-2">
+            <button
+              onClick={(e) => handleToPrint(e, setIsDownloading, pdfDetails)}
+              type="button"
+              className="font-[500] text-[13px] mr-[5px] op-btn op-btn-neutral"
+            >
+              <i className="fa-light fa-print" aria-hidden="true"></i>
+              <span className="hidden lg:block">{t("print")}</span>
+            </button>
+            {pdfDetails?.[0]?.IsCompleted && (
+              <button
+                type="button"
+                onClick={() =>
+                  handleDownloadCertificate(pdfDetails, setIsDownloading)
+                }
+                className="font-[500] text-[13px] mr-[5px] op-btn op-btn-secondary"
+              >
+                <i
+                  className="fa-light fa-award mx-[3px] lg:mx-0"
+                  aria-hidden="true"
+                ></i>
+                <span className="hidden lg:block">{t("certificate")}</span>
+              </button>
+            )}
+            <button
+              type="button"
+              className="font-[500] text-[13px] mr-[5px] op-btn op-btn-primary"
+              onClick={() => handleDownload()}
+            >
+              <i className="fa-light fa-download" aria-hidden="true"></i>
+              <span className="hidden lg:block">{t("download")}</span>
+            </button>
          </div>
          {isDownloading === "pdf" && (
            <div className="fixed z-[1000] inset-0 flex justify-center items-center bg-black bg-opacity-30">
@@ -151,7 +114,7 @@ const DocSuccessPage = () => {
            }
            handleClose={() => setIsDownloading("")}
          >
-            <div className="p-3 md:p-5 text-sm md:text-base text-center text-base-content">
+            <div className="p-3 md:p-5 text-[13px] md:text-base text-center text-base-content">
              {isDownloading === "certificate" ? (
                <p>{t("generate-certificate-alert")}</p>
              ) : (
@@ -166,11 +129,11 @@ const DocSuccessPage = () => {
            isDocId={true}
            pdfBase64={pdfBase64Url}
          />
-        </>
+        </div>
      ) : (
        <></>
      )}
-    </>
+    </div>
  );
 };

@@ -18,7 +18,6 @@ import {
 } from "../constant/Utils";
 import { PDFDocument } from "pdf-lib";
 import axios from "axios";
-import { maxFileSize } from "../constant/const";
 import ModalUi from "../primitives/ModalUi";
 import { Tooltip } from "react-tooltip";
 import Loader from "../primitives/Loader";
@@ -37,8 +36,10 @@ function Form() {
 }

 const Forms = (props) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const { t } = useTranslation();
+  const maxFileSize = 20;
  const abortController = new AbortController();
  const inputFileRef = useRef(null);
  const navigate = useNavigate();
@@ -80,15 +81,6 @@ const Forms = (props) => {
  const extUserData =
    localStorage.getItem("Extand_Class") &&
    JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
-  const sendinorder =
-    extUserData?.SendinOrder !== undefined && extUserData?.SendinOrder === false
-      ? "false"
-      : "true";
-  const istourenabled =
-    extUserData?.IsTourEnabled !== undefined &&
-    extUserData?.IsTourEnabled === false
-      ? "false"
-      : "true";
  useEffect(() => {
    handleReset();
    return () => abortController.abort();
@@ -100,12 +92,7 @@ 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 }));
  };

  function getFileAsArrayBuffer(file) {
@@ -143,81 +130,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(
@@ -227,16 +150,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 {
@@ -245,22 +168,95 @@ 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 {
+                    await Parse.Cloud.run("encryptedpdf", {
+                      email: Parse.User.current().getEmail()
+                    });
+                  } catch (err) {
+                    console.log("err in sending posthog encryptedpdf", err);
+                  }
+                  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) {
@@ -285,50 +281,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);
-              }
            }
          }
        }
@@ -378,24 +374,19 @@ const Forms = (props) => {
          const isChecked = formData.SendinOrder === "false" ? false : true;
          const isTourEnabled =
            formData?.IsTourEnabled === "false" ? false : true;
-          const remindOnceInEvery = parseInt(formData.remindOnceInEvery);
-          const TimeToCompleteDays = parseInt(formData?.TimeToCompleteDays);
-          const AutomaticReminders = formData.autoreminder;
-          const reminderCount = TimeToCompleteDays / remindOnceInEvery;
-          if (AutomaticReminders && reminderCount > 15) {
-            alert(t("only-15-reminder-allowed"));
-            return;
-          }
          object.set("SendinOrder", isChecked);
-          object.set("AutomaticReminders", AutomaticReminders);
-          object.set("RemindOnceInEvery", remindOnceInEvery);
+          object.set("AutomaticReminders", formData.autoreminder);
+          object.set("RemindOnceInEvery", parseInt(formData.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(
+            "TimeToCompleteDays",
+            parseInt(formData?.TimeToCompleteDays)
+          );
+            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);
          }
@@ -434,9 +425,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: "",
@@ -445,14 +437,14 @@ const Forms = (props) => {
                ? "Note to myself"
                : "Please review and sign this document",
            TimeToCompleteDays: 15,
-            SendinOrder: sendinorder,
+            SendinOrder: "true",
            password: "",
            file: "",
            NotifyOnSignatures: notifySign,
            remindOnceInEvery: 5,
            autoreminder: false,
            IsEnableOTP: "false",
-            IsTourEnabled: istourenabled,
+            IsTourEnabled: "true",
            RedirectUrl: "",
            AllowModifications: false
          });
@@ -462,17 +454,7 @@ const Forms = (props) => {
        }
      } catch (err) {
        console.log("err ", err);
-        if (err.message === "only 15 reminder allowed") {
-          setIsAlert({
-            type: "danger",
-            message: t("only-15-reminder-allowed")
-          });
-        } else {
-          setIsAlert({
-            type: "danger",
-            message: t("something-went-wrong-mssg")
-          });
-        }
+        setIsAlert({ type: "danger", message: t("something-went-wrong-mssg") });
      } finally {
        setTimeout(() => setIsAlert({ type: "success", message: "" }), 1000);
        setIsSubmit(false);
@@ -512,9 +494,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: "",
@@ -523,13 +506,13 @@ const Forms = (props) => {
          ? "Note to myself"
          : "Please review and sign this document",
      TimeToCompleteDays: 15,
-      SendinOrder: sendinorder,
+      SendinOrder: "true",
      password: "",
      file: "",
      remindOnceInEvery: 5,
      autoreminder: false,
      IsEnableOTP: "false",
-      IsTourEnabled: istourenabled,
+      IsTourEnabled: "true",
      NotifyOnSignatures: notifySign,
      RedirectUrl: "",
      AllowModifications: false
@@ -568,28 +551,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: "" }));
@@ -598,14 +589,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) {
@@ -727,7 +710,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 ? (
@@ -751,7 +736,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"))
                    }
@@ -852,7 +839,7 @@ const Forms = (props) => {
                            <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]">
+                              <p className="p-[5px]">
                                <ol className="list-disc">
                                  <li>
                                    <span className="font-bold">
@@ -867,7 +854,7 @@ const Forms = (props) => {
                                    <span>{t("send-in-order-help.p3")}</span>
                                  </li>
                                </ol>
-                              </div>
+                              </p>
                              <p>{t("send-in-order-help.p4")}</p>
                            </div>
                          </Tooltip>
@@ -949,7 +936,7 @@ const Forms = (props) => {
                                    {t("send-in-order")}
                                  </p>
                                  <p>{t("send-in-order-help.p1")}</p>
-                                  <div className="p-[5px]">
+                                  <p className="p-[5px]">
                                    <ol className="list-disc">
                                      <li>
                                        <span className="font-bold">
@@ -968,7 +955,7 @@ const Forms = (props) => {
                                        </span>
                                      </li>
                                    </ol>
-                                  </div>
+                                  </p>
                                  <p>{t("send-in-order-help.p4")}</p>
                                </div>
                              </Tooltip>
@@ -1041,7 +1028,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>
@@ -1086,7 +1076,7 @@ const Forms = (props) => {
                        <Tooltip 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]">
+                            <p className="p-[5px]">
                              <ol className="list-disc">
                                <li>
                                  <span className="font-bold">
@@ -1099,7 +1089,7 @@ const Forms = (props) => {
                                  <span>{t("istourenabled-help.p2")}</span>
                                </li>
                              </ol>
-                            </div>
+                            </p>
                            <p>
                              {t("istourenabled-help.p3", { appName: appName })}
                            </p>
@@ -1150,7 +1140,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"
@@ -1159,7 +1153,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";
@@ -58,10 +63,13 @@ function GuestLogin() {

  //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);
@@ -105,10 +113,7 @@ function GuestLogin() {
    setLoading(true);
    setEmail(email);
    try {
-      const params = {
-        email: email.toString(),
-        docId: documentId
-      };
+      const params = { email: email.toString(), docId: documentId };
      const Otp = await Parse.Cloud.run("SendOTPMailV1", params);
      if (Otp) {
        setLoading(false);
@@ -211,14 +216,7 @@ function GuestLogin() {
    }
  };
  const handleInputChange = (e) => {
-    if (e.target.name === "email") {
-      setContact((prev) => ({
-        ...prev,
-        [e.target.name]: e.target.value?.toLowerCase()?.replace(/\s/g, "")
-      }));
-    } else {
-      setContact((prev) => ({ ...prev, [e.target.name]: e.target.value }));
-    }
+    setContact((prev) => ({ ...prev, [e.target.name]: e.target.value }));
  };
  return (
    <div>
@@ -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();
@@ -40,7 +43,7 @@ function Login() {
    baseUrl: localStorage.getItem("baseUrl"),
    parseAppId: localStorage.getItem("parseAppId"),
    loading: false,
-    thirdpartyLoader: false
+    thirdpartyLoader: false,
  });
  const [userDetails, setUserDetails] = useState({
    Company: "",
@@ -54,15 +57,13 @@ function Login() {
    // eslint-disable-next-line
  }, []);

-  const showToast = (type, msg) => {
-    setState({ ...state, loading: false, alertType: type, alertMsg: msg });
-    setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
-  };
  const checkUserExt = async () => {
    const app = await getAppLogo();
    if (app?.error === "invalid_json") {
      setErrMsg(t("server-down", { appName: appName }));
-    } else if (app?.user === "not_exist") {
+    } else if (
+      app?.user === "not_exist"
+    ) {
      navigate("/addadmin");
    }
    if (app?.logo) {
@@ -152,33 +153,68 @@ function Login() {
                        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);
+                          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"));
+                      setState({
+                        ...state,
+                        loading: false,
+                        alertType: "danger",
+                        alertMsg:
+                          "You don't have access, please contact the admin."
+                      });
                      logOutUser();
                    }
                  } else {
-                    showToast("danger", t("user-not-found"));
-                    logOutUser();
+                      setState({ ...state, loading: false });
+                      setState({
+                        ...state,
+                        loading: false,
+                        alertType: "danger",
+                        alertMsg: "User not found."
+                      });
+                      logOutUser();
                  }
                })
                .catch((error) => {
-                  showToast("danger", t("something-went-wrong-mssg"));
+                  setState({
+                    ...state,
+                    loading: false,
+                    alertType: "danger",
+                    alertMsg: `Something went wrong.`
+                  });
+                  setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
                  console.error("Error while fetching Follow", error);
                });
            } catch (error) {
-              showToast("danger", `${error.message}`);
+              setState({
+                ...state,
+                loading: false,
+                alertType: "danger",
+                alertMsg: `${error.message}`
+              });
+              console.log(error);
+              setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
            }
          }
        } catch (error) {
+          setState({
+            ...state,
+            loading: false,
+            alertType: "danger",
+            alertMsg: "Invalid username/password or region"
+          });
          console.error("Error while logging in user", error);
-          showToast("danger", "Invalid username/password or region");
+        } finally {
+          setTimeout(
+            () => setState((prev) => ({ ...prev, alertMsg: "" })),
+            2000
+          );
        }
      }
    }
@@ -246,31 +282,55 @@ function Login() {
                  localStorage.setItem("PageLanding", menu.pageId);
                  localStorage.setItem("defaultmenuid", menu.menuId);
                  localStorage.setItem("pageType", menu.pageType);
-                  navigate(redirectUrl);
+                    navigate(redirectUrl);
                } else {
-                  showToast("danger", t("role-not-found"));
+                  setState({
+                    ...state,
+                    loading: false,
+                    alertType: "danger",
+                    alertMsg: "Role not found."
+                  });
                  logOutUser();
                }
              } else {
-                showToast("danger", t("do-not-access-contact-admin"));
+                setState({
+                  ...state,
+                  loading: false,
+                  alertType: "danger",
+                  alertMsg: "You don't have access, please contact the admin."
+                });
                logOutUser();
              }
            } else {
-              showToast("danger", t("user-not-found"));
+              setState({
+                ...state,
+                alertType: "danger",
+                alertMsg: "User not found."
+              });
              logOutUser();
            }
          })
          .catch((err) => {
            console.error("err in fetching extUser", err);
-            showToast("danger", `${err.message}`);
+            setState({
+              ...state,
+              alertType: "danger",
+              alertMsg: `${err.message}`
+            });
            const payload = { sessionToken: sessionToken };
            handleSubmitbtn(payload);
          });
      } catch (error) {
-        showToast("danger", `${error.message}`);
+        setState({
+          ...state,
+          alertType: "danger",
+          alertMsg: `${error.message}`
+        });
        console.log(error);
      } finally {
        setThirdpartyLoader(false);
+        setState({ ...state, loading: false });
+        setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
      }
    }
  };
@@ -320,24 +380,40 @@ 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);
+                // Redirect to the appropriate URL after successful login
+                navigate(redirectUrl);
            } else {
              setState({ ...state, loading: false });
              logOutUser();
            }
          } else {
-            showToast("danger", t("do-not-access-contact-admin"));
+            setState({
+              ...state,
+              loading: false,
+              alertType: "danger",
+              alertMsg: "You don't have access, please contact the admin."
+            });
            logOutUser();
          }
        } else {
-          showToast("danger", t("user-not-found"));
+          setState({
+            ...state,
+            alertType: "danger",
+            alertMsg: "User not found."
+          });
          logOutUser();
        }
      });
    } catch (error) {
-      showToast("danger", t("something-went-wrong-mssg"));
+      setState({
+        ...state,
+        alertType: "danger",
+        alertMsg: "Something went wrong, please try again later."
+      });
      console.log("err", error);
+    } finally {
+      setState({ ...state, loading: false });
+      setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
    }
  };

@@ -349,6 +425,8 @@ function Login() {
    e.preventDefault();
    if (userDetails.Destination && userDetails.Company) {
      setThirdpartyLoader(true);
+      // console.log("handelSubmit", userDetails);
+      // const payload = await Parse.User.logIn(state.email, state.password);
      const payload = { sessionToken: localStorage.getItem("accesstoken") };
      const userInformation = JSON.parse(
        localStorage.getItem("UserInformation")
@@ -388,7 +466,13 @@ function Login() {
        alert(t("server-error"));
      }
    } else {
-      showToast("warning", t("fill-required-details!"));
+      setState({
+        ...state,
+        loading: false,
+        alertType: "warning",
+        alertMsg: "Please fill required details."
+      });
+      setTimeout(() => setState((prev) => ({ ...prev, alertMsg: "" })), 2000);
    }
  };

@@ -417,6 +501,7 @@ function Login() {
    localStorage.setItem("parseAppId", appid);
  };

+
  return errMsg ? (
    <div className="h-screen flex justify-center text-center items-center p-4 text-gray-500 text-base">
      {errMsg}
@@ -437,7 +522,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"
          >
            <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 +561,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();
@@ -125,7 +130,7 @@ function Opensigndrive() {
    }
  ];
  const getDetails = async () => {
-    getPdfDocumentList();
+      getPdfDocumentList();
  };
  //function for get all pdf document list
  const getPdfDocumentList = async (disbaleLoading) => {
@@ -139,7 +144,7 @@ function Opensigndrive() {
    try {
      const driveDetails = await getDrive(docId, skip, limit);
      if (driveDetails && driveDetails === "Error: Something went wrong!") {
-        setHandleError(t("something-went-wrong-mssg"));
+        setHandleError("Error: Something went wrong!");
      } else if (driveDetails && driveDetails.length > 0) {
        const addMoreTour = [
          {
@@ -630,9 +635,7 @@ function Opensigndrive() {
            <div className="flex flex-row items-center">
              <div
                id="folder-menu"
-                className={`${
-                  isOptions ? "dropdown show dropDownStyle" : "dropdown"
-                } hidden md:block`}
+                className={`${isOptions ? "dropdown show dropDownStyle" : "dropdown"} hidden md:block`}
                onClick={() => setIsOptions(!isOptions)}
              >
                <div className="sort" data-tut="reactourSecond">
@@ -770,9 +773,7 @@ function Opensigndrive() {
              </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
@@ -68,8 +68,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();
@@ -150,6 +150,7 @@ function PlaceHolderSign() {
    status: false,
    message: ""
  });
+  const [extUserId, setExtUserId] = useState("");
  const [isCustomize, setIsCustomize] = useState(false);
  const [zoomPercent, setZoomPercent] = useState(0);
  const [scale, setScale] = useState(1);
@@ -163,13 +164,13 @@ function PlaceHolderSign() {
  const [userList, setUserList] = useState([]);
  const [isAttchSignerModal, setIsAttchSignerModal] = useState(false);
  const [isNewContact, setIsNewContact] = useState({ status: false, id: "" });
-  const [owner, setOwner] = useState({});
  const isMobile = window.innerWidth < 767;
  const [, drop] = useDrop({
    accept: "BOX",
    drop: (item, monitor) => addPositionOfSignature(item, monitor),
    collect: (monitor) => ({ isOver: !!monitor.isOver() })
  });
+
  const documentId = docId;
  useEffect(() => {
    if (documentId) {
@@ -285,7 +286,7 @@ function PlaceHolderSign() {
        setPdfArrayBuffer(arrayBuffer);
        setPdfBase64Url(base64Pdf);
      }
-      setOwner(documentData?.[0]?.ExtUserPtr);
+      setExtUserId(documentData[0]?.ExtUserPtr?.objectId);
      const alreadyPlaceholder = documentData[0]?.SignedUrl;
      // Check if document is sent for signing
      if (alreadyPlaceholder) {
@@ -456,11 +457,7 @@ function PlaceHolderSign() {
      documentData === "Error: Something went wrong!" ||
      (documentData.result && documentData.result.error)
    ) {
-      if (documentData?.result?.error?.includes("deleted")) {
-        setHandleError(t("document-deleted"));
-      } else {
-        setHandleError(t("something-went-wrong-mssg"));
-      }
+      setHandleError(t("something-went-wrong-mssg"));
      setIsLoading({ isLoad: false });
    } else {
      setHandleError(t("no-data-avaliable"));
@@ -528,7 +525,7 @@ function PlaceHolderSign() {
          scale: containerScale,
          zIndex: posZIndex,
          type: dragTypeValue,
-          options: addWidgetOptions(dragTypeValue, owner),
+          options: addWidgetOptions(dragTypeValue),
          Width: widgetWidth / (containerScale * scale),
          Height: widgetHeight / (containerScale * scale)
        };
@@ -559,7 +556,7 @@ function PlaceHolderSign() {
          scale: containerScale,
          zIndex: posZIndex,
          type: dragTypeValue,
-          options: addWidgetOptions(dragTypeValue, owner),
+          options: addWidgetOptions(dragTypeValue),
          Width: widgetWidth / (containerScale * scale),
          Height: widgetHeight / (containerScale * scale)
        };
@@ -866,7 +863,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);
@@ -878,7 +879,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);
@@ -984,7 +989,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");
@@ -1082,9 +1091,6 @@ function PlaceHolderSign() {

  const copytoclipboard = (text) => {
    copytoData(text);
-    if (copyUrlRef.current) {
-      copyUrlRef.current.textContent = text; // Update text safely
-    }
    setCopied(true);
    setTimeout(() => setCopied(false), 1500); // Reset copied state after 1.5 seconds
  };
@@ -1143,7 +1149,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();

@@ -1169,11 +1176,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>" +
@@ -1182,7 +1194,6 @@ function PlaceHolderSign() {

          const variables = {
            document_title: documentName,
-            note: pdfDetails?.[0]?.Note,
            sender_name: senderName,
            sender_mail: senderEmail,
            sender_phone: senderPhone || "",
@@ -1198,7 +1209,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, "'");
@@ -1208,7 +1222,6 @@ function PlaceHolderSign() {
            "</body> </html>";
          const variables = {
            document_title: documentName,
-            note: pdfDetails?.[0]?.Note,
            sender_name: senderName,
            sender_mail: senderEmail,
            sender_phone: senderPhone || "",
@@ -1223,7 +1236,6 @@ function PlaceHolderSign() {
        }
        const mailparam = {
          senderName: senderName,
-          note: pdfDetails?.[0]?.Note || "",
          senderMail: senderEmail,
          title: documentName,
          organization: orgName,
@@ -1231,13 +1243,14 @@ function PlaceHolderSign() {
          sigingUrl: signPdf
        };
        let params = {
-          extUserId: owner?.objectId,
+          extUserId: extUserId,
          recipient: signerMail[i].Email,
          subject: replaceVar?.subject
            ? replaceVar?.subject
            : mailTemplate(mailparam).subject,
          replyto: senderEmail,
-          from: senderEmail,
+          from:
+            senderEmail,
          html: replaceVar?.body
            ? replaceVar?.body
            : mailTemplate(mailparam).body
@@ -1252,13 +1265,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,
@@ -1291,6 +1311,11 @@ function PlaceHolderSign() {
      setIsMailSend(true);
      setIsLoading({ isLoad: false });
      setIsUiLoading(false);
+    } else if (sendMail?.data?.result?.status === "daily-quota-reached") {
+      setMailStatus("daily-quota-reached");
+      setIsSend(true);
+      setIsMailSend(true);
+      setIsUiLoading(false);
    } else if (sendMail?.data?.result?.status === "quota-reached") {
      setMailStatus("quotareached");
      setIsSend(true);
@@ -1537,7 +1562,8 @@ function PlaceHolderSign() {
                  status: defaultdata?.status || "required",
                  hint: defaultdata?.hint || "",
                  defaultValue: defaultdata?.defaultValue || "",
-                  validation: {},
+                  validation:
+                        {},
                  fontSize:
                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
                  fontColor:
@@ -1547,15 +1573,6 @@ function PlaceHolderSign() {
                  isReadOnly: defaultdata?.isReadOnly || false
                }
              };
-            } else if (["signature"].includes(position.type)) {
-              return {
-                ...position,
-                options: {
-                  ...position.options,
-                  name: defaultdata.name,
-                  hint: defaultdata?.hint || ""
-                }
-              };
            } else {
              return {
                ...position,
@@ -1564,7 +1581,6 @@ function PlaceHolderSign() {
                  name: defaultdata.name,
                  status: defaultdata.status,
                  defaultValue: defaultdata.defaultValue,
-                  hint: defaultdata?.hint || "",
                  fontSize:
                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
                  fontColor:
@@ -2012,26 +2028,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
@@ -2049,14 +2069,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>
                        </>
                      )}
@@ -2068,11 +2090,6 @@ function PlaceHolderSign() {
                            <span className="h-[1px] w-[20%] bg-[#ccc]"></span>
                          </div>
                          <div className="my-3">{handleShareList()}</div>
-                          <p
-                            id="copyUrl"
-                            ref={copyUrlRef}
-                            className="hidden"
-                          ></p>
                        </>
                      )}
                    </div>
@@ -2099,11 +2116,9 @@ function PlaceHolderSign() {
                          <LottieWithLoader />
                          {pdfDetails[0].SendinOrder ? (
                            <p>
-                              {isCurrUser
-                                ? t("placeholder-mail-alert-you")
-                                : t("placeholder-mail-alert", {
-                                    name: signersdata[0]?.Name
-                                  })}
+                              {t("placeholder-mail-alert", {
+                                name: signersdata[0]?.Name
+                              })}
                            </p>
                          ) : (
                            <p>{t("placeholder-alert-4")}</p>
@@ -2116,11 +2131,7 @@ function PlaceHolderSign() {
                        </div>
                      ) : (
                        <div className="mb-[10px]">
-                          {mailStatus === "dailyquotareached" ? (
-                            <p>{t("daily-quota-reached")}</p>
-                          ) : (
-                            <p>{t("placeholder-alert-6")}</p>
-                          )}
+                          <p>{t("placeholder-alert-6")}</p>
                          {isCurrUser && (
                            <p className="mt-1">{t("placeholder-alert-5")}</p>
                          )}
@@ -20,10 +20,10 @@ import EditorToolbar, {
  module2,
  formats
 } from "../components/pdf/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();
@@ -46,10 +46,6 @@ const Preferences = () => {
  const [activeTab, setactiveTab] = useState(0);
  const generaltab = { 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);

  useEffect(() => {
    fetchSignType();
@@ -94,26 +90,10 @@ const Preferences = () => {
          const SignatureType = _getUser?.SignatureType || signatureTypes;
          setSignatureType(SignatureType);
        }
-        const sendinorder =
-          _getUser?.SendinOrder !== undefined ? _getUser?.SendinOrder : true;
-        setSendinOrder(sendinorder);
-        const istourenabled =
-          _getUser?.IsTourEnabled !== undefined
-            ? _getUser?.IsTourEnabled
-            : true;
-        setIsTourEnabled(istourenabled);
-        const DateFormat =
-          _getUser?.DateFormat !== undefined
-            ? _getUser?.DateFormat
-            : "MM/DD/YYYY";
-        setDateFormat(DateFormat);
-        const is12Hr =
-          _getUser?.Is12HourTime !== undefined ? _getUser?.Is12HourTime : false;
-        setIs12HourTime(is12Hr);
      }
    } catch (err) {
      console.log("err while getting user details", err);
-      setErrMsg(t("something-went-wrong-mssg"));
+      setErrMsg("Something went wrong");
    } finally {
      setIsTopLoader(false);
    }
@@ -162,25 +142,14 @@ const Preferences = () => {
        params = { ...params, NotifyOnSignatures: isNotifyOnSignatures };
      }
      try {
-        params = {
-          ...params,
-          SendinOrder: sendinOrder,
-          IsTourEnabled: isTourEnabled,
-          DateFormat: dateFormat,
-          Is12HourTime: is12HourTime
-        };
        const updateRes = await Parse.Cloud.run("updatepreferences", params);
        if (updateRes) {
-          setIsAlert({ type: "success", msg: t("saved-successfully") });
+          setIsAlert({ type: "success", msg: "Saved successfully." });
          let extUser =
            localStorage.getItem("Extand_Class") &&
            JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
          if (extUser && extUser?.objectId) {
            extUser.NotifyOnSignatures = isNotifyOnSignatures;
-            extUser.SendinOrder = sendinOrder;
-            extUser.IsTourEnabled = isTourEnabled;
-            extUser.DateFormat = dateFormat;
-            extUser.Is12HourTime = is12HourTime;
            const _extUser = JSON.parse(JSON.stringify(extUser));
            localStorage.setItem("Extand_Class", JSON.stringify([_extUser]));
          }
@@ -244,23 +213,21 @@ const Preferences = () => {
      setIsLoader(true);
      const replacedHtmlBody = completionBody.replace(/"/g, "'");
      const htmlBody = `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>${replacedHtmlBody}</body></html>`;
-      const updateTenant = await Parse.Cloud.run("updatetenant", {
-        tenantId: tenantId,
-        details: {
-          CompletionBody: htmlBody,
-          CompletionSubject: completionsubject
-        }
-      });
-      if (updateTenant) {
-        const updateRes = JSON.parse(JSON.stringify(updateTenant));
+      const tenantQuery = new Parse.Query("partners_Tenant");
+      const updateTenantObj = await tenantQuery.get(tenantId);
+      updateTenantObj.set("CompletionBody", htmlBody);
+      updateTenantObj.set("CompletionSubject", completionsubject);
+      const res = await updateTenantObj.save();
+      if (res) {
+        const updateRes = JSON.parse(JSON.stringify(res));
        SetCompletionBody(updateRes?.CompletionBody);
        setCompletionSubject(updateRes?.CompletionSubject);
-        setIsAlert({ type: "success", msg: t("saved-successfully") });
+        setIsAlert({ type: "success", msg: "Saved successfully." });
        setTimeout(() => setIsAlert({ type: "", msg: "" }), 1500);
      }
    } catch (err) {
      console.log("Err", err);
-      setIsAlert({ type: "danger", msg: t("something-went-wrong-mssg") });
+      setIsAlert({ type: "danger", msg: "Something went wrong." });
      setTimeout(() => setIsAlert({ type: "", msg: "" }), 1500);
    } finally {
      setIsLoader(false);
@@ -273,23 +240,21 @@ const Preferences = () => {
      setIsLoader(true);
      const replacedHtmlBody = requestBody.replace(/"/g, "'");
      const htmlBody = `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>${replacedHtmlBody}</body></html>`;
-      const updateTenant = await Parse.Cloud.run("updatetenant", {
-        tenantId: tenantId,
-        details: {
-          RequestBody: htmlBody,
-          RequestSubject: requestSubject
-        }
-      });
-      if (updateTenant) {
-        const updateRes = JSON.parse(JSON.stringify(updateTenant));
+      const tenantQuery = new Parse.Query("partners_Tenant");
+      const updateTenantObj = await tenantQuery.get(tenantId);
+      updateTenantObj.set("RequestBody", htmlBody);
+      updateTenantObj.set("RequestSubject", requestSubject);
+      const res = await updateTenantObj.save();
+      if (res) {
+        const updateRes = JSON.parse(JSON.stringify(res));
        setRequestBody(updateRes?.RequestBody);
        setRequestSubject(updateRes?.RequestSubject);
-        setIsAlert({ type: "success", msg: t("saved-successfully") });
+        setIsAlert({ type: "success", msg: "Saved successfully." });
        setTimeout(() => setIsAlert({ type: "", msg: "" }), 1500);
      }
    } catch (err) {
      console.log("Err", err);
-      setIsAlert({ type: "danger", msg: t("something-went-wrong-mssg") });
+      setIsAlert({ type: "danger", msg: "Something went wrong." });
      setTimeout(() => setIsAlert({ type: "", msg: "" }), 1500);
    } finally {
      setIsLoader(false);
@@ -320,9 +285,6 @@ const Preferences = () => {
    }
  };

-  const handleTourInput = () => setIsTourEnabled(!isTourEnabled);
-  const handleSendinOrderInput = () => setSendinOrder(!sendinOrder);
-
  return (
    <React.Fragment>
      <Title title={t("Preferences")} />
@@ -340,7 +302,7 @@ const Preferences = () => {
          ) : (
            <div className="relative bg-base-100 text-base-content flex flex-col justify-center shadow-md rounded-box mb-3">
              {isLoader && (
-                <div className="flex z-[100] justify-center items-center absolute w-full h-full rounded-box bg-black/30">
+                <div className="flex justify-center items-center absolute w-full h-full rounded-box bg-black/30">
                  <Loader />
                </div>
              )}
@@ -360,9 +322,7 @@ 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 }`}
                    >
                      <i className={tabData.icon}></i>
                      <span className="ml-1 md:ml-2">{tabData.title}</span>
@@ -372,281 +332,154 @@ const Preferences = () => {
              </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 className="ml-4 mt-1 mb-2 flex flex-col">
+                      <div className="mb-[0.75rem]">
+                        <label
+                          htmlFor="signaturetype"
+                          className="text-[14px] mb-[0.7rem] font-medium"
                        >
-                          <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] text-[11px]">
+                              <p className="font-bold">
+                                {t("allowed-signature-types")}
+                              </p>
+                              <p>{t("allowed-signature-types-help.p1")}</p>
+                              <p 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>
+                              </p>
                            </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=" ml-[7px] flex flex-col md:flex-row gap-[10px] mb-[0.7rem]">
+                          {signatureType.map((type, i) => (
+                            <div
+                              key={i}
+                              className="flex flex-row gap-[5px] items-center"
+                            >
+                              <input
+                                className="mr-[2px] op-checkbox op-checkbox-xs"
+                                type="checkbox"
+                                name="signaturetype"
+                                onChange={() => handleCheckboxChange(i)}
+                                checked={type.enabled}
+                              />
+                              <div
+                                className="text-[13px] font-medium hover:underline underline-offset-2 cursor-default capitalize"
+                                title={`Enabling this allow signers to ${type.name} signature`}
+                              >
+                                {type?.name === "typed" ? "type" : type?.name}
+                              </div>
+                            </div>
+                          ))}
+                        </div>
+                      </div>
+                      <div className="mb-[0.75rem]">
+                        <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] 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>
+                          </ReactTooltip>
+                        </label>
+                        <div className="flex flex-col md:flex-row md:gap-4">
                          <div
-                            key={i}
-                            className="flex flex-row gap-[5px] items-center"
+                            className={
+                              "flex items-center gap-2 ml-2 mb-1"
+                            }
                          >
                            <input
-                              className="mr-[2px] op-checkbox op-checkbox-xs"
-                              type="checkbox"
-                              name="signaturetype"
-                              onChange={() => handleCheckboxChange(i)}
-                              checked={type.enabled}
+                              className="mr-[2px] op-radio op-radio-xs"
+                              type="radio"
+                              onChange={() => handleNotifySignChange(true)}
+                              checked={isNotifyOnSignatures === true}
                            />
+                            <div className="text-[13px] font-medium cursor-default capitalize">
+                              {t("yes")}
+                            </div>
+                          </div>
+                          <div className="flex flex-col md:flex-row md:gap-4">
                            <div
-                              className="text-[13px] font-medium hover:underline underline-offset-2 cursor-default capitalize"
-                              title={`Enabling this allow signers to ${type.name} signature`}
+                              className={
+                                "flex items-center gap-2 ml-2 mb-1"
+                              }
                            >
-                              {type?.name === "typed" ? "type" : type?.name}
+                              <input
+                                className="mr-[2px] op-radio op-radio-xs"
+                                type="radio"
+                                onChange={() => handleNotifySignChange(false)}
+                                checked={isNotifyOnSignatures === false}
+                              />
+                              <div className="text-[13px] font-medium cursor-default capitalize">
+                                {t("no")}
+                              </div>
                            </div>
                          </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>
                        </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">
-                          {t("send-in-order")}
-                        </span>
-                        <a
-                          data-tooltip-id="sendInOrder-tooltip"
-                          className="ml-1"
+                      <div className="mb-[0.75rem]">
+                        <TimezoneSelector
+                          timezone={timezone}
+                          setTimezone={setTimezone}
+                        />
+                      </div>
+                      <div className="mb-[0.75rem]">
+                        <button
+                          className="op-btn op-btn-primary"
+                          onClick={handleSave}
                        >
-                          <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>
-                        </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>
+                          {t("save")}
+                        </button>
                      </div>
                    </div>
-                    <div className="mb-[0.75rem] text-[12px]">
-                      <label className="block mb-[0.7rem]">
-                        <span className="text-[14px] 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>
-                            </div>
-                            <p>
-                              {t("istourenabled-help.p3", {
-                                appName: appName
-                              })}
-                            </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
-                            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]">
-                      <button
-                        className="op-btn op-btn-primary w-[110px]"
-                        onClick={handleSave}
-                      >
-                        {t("save")}
-                      </button>
-                    </div>
-                  </div>
+                  </>
                ) : (
                  <div className="flex flex-col mx-4 mb-4">
                    <div className="flex flex-col">
@@ -663,9 +496,7 @@ const Preferences = () => {
                              {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,9 +505,7 @@ 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>
@@ -685,9 +514,7 @@ const Preferences = () => {
                              {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" />
@@ -733,9 +560,7 @@ const Preferences = () => {
                              {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,9 +569,7 @@ 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>
@@ -755,9 +578,7 @@ const Preferences = () => {
                              {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" />
@@ -40,8 +40,7 @@ import {
  convertBase64ToFile,
  generatePdfName,
  handleRemoveWidgets,
-  compressedFileSize,
-  addWidgetSelfsignOptions
+  compressedFileSize
 } from "../constant/Utils";
 import { useParams } from "react-router";
 import Tour from "reactour";
@@ -67,7 +66,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);
@@ -124,6 +124,7 @@ function SignYourSelf() {
  const [pdfLoad, setPdfLoad] = useState(false);
  const [isAlert, setIsAlert] = useState({ isShow: false, alertMessage: "" });
  const [isDontShow, setIsDontShow] = useState(false);
+  const [extUserId, setExtUserId] = useState("");
  const [isCompleted, setIsCompleted] = useState(false);
  const [isCelebration, setIsCelebration] = useState(false);
  const [pdfArrayBuffer, setPdfArrayBuffer] = useState("");
@@ -145,7 +146,6 @@ function SignYourSelf() {
    isVisible: false,
    signId: ""
  });
-  const [owner, setOwner] = useState({});
  const [, drop] = useDrop({
    accept: "BOX",
    drop: (item, monitor) => addPositionOfSignature(item, monitor),
@@ -206,8 +206,8 @@ function SignYourSelf() {
      const documentData = await contractDocument(documentId);

      if (documentData && documentData.length > 0) {
-        setOwner(documentData?.[0]?.ExtUserPtr);
        setPdfDetails(documentData);
+        setExtUserId(documentData[0]?.ExtUserPtr?.objectId);
        const placeholders =
          documentData[0]?.Placeholders?.length > 0
            ? documentData[0]?.Placeholders
@@ -252,11 +252,7 @@ function SignYourSelf() {
        documentData === "Error: Something went wrong!" ||
        (documentData.result && documentData.result.error)
      ) {
-        if (documentData?.result?.error?.includes("deleted")) {
-          setHandleError(t("document-deleted"));
-        } else {
-          setHandleError(t("something-went-wrong-mssg"));
-        }
+        setHandleError(t("something-went-wrong-mssg"));
        setIsLoading({ isLoad: false });
      } else {
        setHandleError(t("no-data-avaliable"));
@@ -328,7 +324,7 @@ function SignYourSelf() {
      }
    } catch (err) {
      console.log("Error: error in getDocumentDetails", err);
-      setHandleError(t("something-went-wrong-mssg"));
+      setHandleError("Error: Something went wrong!");
      setIsLoading({ isLoad: false });
    }
  };
@@ -351,6 +347,54 @@ function SignYourSelf() {
    }
  };

+  const addWidgetOptions = (type) => {
+    switch (type) {
+      case "signature":
+        return { name: "signature" };
+      case "stamp":
+        return { name: "stamp" };
+      case "checkbox":
+        return { name: "checkbox" };
+      case textWidget:
+        return { name: "text" };
+      case "initials":
+        return { name: "initials" };
+      case "name":
+        return {
+          name: "name",
+          defaultValue: getWidgetValue(type),
+          validation: { type: "text", pattern: "" }
+        };
+      case "company":
+        return {
+          name: "company",
+          defaultValue: getWidgetValue(type),
+          validation: { type: "text", pattern: "" }
+        };
+      case "job title":
+        return {
+          name: "job title",
+          defaultValue: getWidgetValue(type),
+          validation: { type: "text", pattern: "" }
+        };
+      case "date":
+        return {
+          name: "date",
+          response: getDate(),
+          validation: { format: "MM/dd/yyyy", type: "date-format" }
+        };
+      case "image":
+        return { name: "image" };
+      case "email":
+        return {
+          name: "email",
+          defaultValue: getWidgetValue(type),
+          validation: { type: "email", pattern: "" }
+        };
+      default:
+        return {};
+    }
+  };
  //function for setting position after drop signature button over pdf
  const addPositionOfSignature = (item, monitor) => {
    setCurrWidgetsDetails({});
@@ -375,7 +419,7 @@ function SignYourSelf() {
      // `getBoundingClientRect()` is used to get accurate measurement height of the div
      const divHeight = divRef.current.getBoundingClientRect().height;
      const getWidth = widgetTypeExist
-        ? calculateInitialWidthHeight(widgetValue).getWidth
+        ? calculateInitialWidthHeight(dragTypeValue, widgetValue).getWidth
        : defaultWidthHeight(dragTypeValue).width;
      const getHeight = defaultWidthHeight(dragTypeValue).height;

@@ -389,7 +433,7 @@ function SignYourSelf() {
        scale: containerScale,
        Width: getWidth,
        Height: getHeight,
-        options: addWidgetSelfsignOptions(dragTypeValue, getWidgetValue, owner)
+        options: addWidgetOptions(dragTypeValue)
      };
      dropData.push(dropObj);
    } else {
@@ -418,7 +462,7 @@ function SignYourSelf() {
        type: dragTypeValue,
        Width: getWidth / (containerScale * scale),
        Height: getHeight / (containerScale * scale),
-        options: addWidgetSelfsignOptions(dragTypeValue, getWidgetValue, owner),
+        options: addWidgetOptions(dragTypeValue),
        scale: containerScale
      };
      dropData.push(dropObj);
@@ -520,7 +564,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 +754,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 +793,7 @@ function SignYourSelf() {
      pdfFile: base64Url,
      docId: documentId,
      isCustomCompletionMail: isCustomCompletionMail,
-      signature: suffixbase64
+      signature: suffixbase64,
    };
    const resSignPdf = await Parse.Cloud.run("signPdf", params);
    if (resSignPdf) {
@@ -1212,7 +1263,7 @@ function SignYourSelf() {
              setPdfBase64Url={setPdfBase64Url}
              setIsUploadPdf={setIsUploadPdf}
              pdfArrayBuffer={pdfArrayBuffer}
-              isMergePdfBtn={!pdfDetails?.[0]?.IsCompleted}
+              isMergePdfBtn={true}
            />
            <div className=" w-full md:w-[57%] flex mr-4">
              <PdfZoom
@@ -1320,10 +1371,13 @@ function SignYourSelf() {
                {/*render email component to send email after finish signature on document */}
                <EmailComponent
                  isEmail={isEmail}
+                  pdfUrl={pdfUrl}
                  setIsEmail={setIsEmail}
-                  setSuccessEmail={setSuccessEmail}
                  pdfDetails={pdfDetails}
+                  setSuccessEmail={setSuccessEmail}
+                  sender={jsonSender}
                  setIsAlert={setIsAlert}
+                  extUserId={extUserId}
                  setIsDownloadModal={setIsDownloadModal}
                />
                {/* pdf header which contain funish back button */}
@@ -139,7 +139,6 @@ const TemplatePlaceholder = () => {
  const [updatedPdfUrl, setUpdatedPdfUrl] = useState("");
  const [tempSignerId, setTempSignerId] = useState("");
  const [unSignedWidgetId, setUnSignedWidgetId] = useState("");
-  const [owner, setOwner] = useState({});
  useEffect(() => {
    fetchTemplate();
    // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -166,6 +165,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(
@@ -215,7 +215,6 @@ const TemplatePlaceholder = () => {
          : [];

      if (documentData && documentData.length > 0) {
-        setOwner(documentData?.[0]?.ExtUserPtr);
        const url = documentData[0] && documentData[0]?.URL;
        if (url) {
          const arrayBuffer = await convertPdfArrayBuffer(url);
@@ -284,14 +283,14 @@ const TemplatePlaceholder = () => {
            const updatedSigners = documentData[0].Signers.map((x, index) => ({
              ...x,
              Id: randomId(),
-              Role: "Role " + (index + 1)
+              Role: "User " + (index + 1)
            }));
            setSignersData(updatedSigners);
            setUniqueId(updatedSigners[0].Id);
            setBlockColor(updatedSigners[0].blockColor);
          }
        } else {
-          setRoleName("Role 1");
+          setRoleName("User 1");
          if (
            documentData[0].Placeholders &&
            documentData[0].Placeholders.length > 0
@@ -393,7 +392,7 @@ const TemplatePlaceholder = () => {
            scale: containerScale,
            zIndex: posZIndex,
            type: dragTypeValue,
-            options: addWidgetOptions(dragTypeValue, owner),
+            options: addWidgetOptions(dragTypeValue),
            Width: widgetWidth / (containerScale * scale),
            Height: widgetHeight / (containerScale * scale)
          };
@@ -423,7 +422,7 @@ const TemplatePlaceholder = () => {
            // isMobile: isMobile,
            zIndex: posZIndex,
            type: item.text,
-            options: addWidgetOptions(dragTypeValue, owner),
+            options: addWidgetOptions(dragTypeValue),
            Width: widgetWidth / (containerScale * scale),
            Height: widgetHeight / (containerScale * scale)
          };
@@ -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);
@@ -870,14 +881,6 @@ const TemplatePlaceholder = () => {
  };
  const handleSaveTemplate = async () => {
    if (signersdata?.length) {
-      const remindOnceInEvery = parseInt(pdfDetails[0]?.RemindOnceInEvery);
-      const TimeToCompleteDays = parseInt(pdfDetails[0]?.TimeToCompleteDays);
-      const AutomaticReminders = pdfDetails[0]?.AutomaticReminders;
-      const reminderCount = TimeToCompleteDays / remindOnceInEvery;
-      if (AutomaticReminders && reminderCount > 15) {
-        alert(t("only-15-reminder-allowed"));
-        return;
-      }
      setIsLoading({ isLoad: true, message: t("loading-mssg") });
      setIsSendAlert(false);
      let signers = [],
@@ -1083,7 +1086,7 @@ const TemplatePlaceholder = () => {
      });
      setIsCreateDoc(false);
    } else {
-      setHandleError(t(res.id));
+      setHandleError(t("something-went-wrong-mssg"));
      setIsCreateDoc(false);
    }
  };
@@ -1101,7 +1104,7 @@ const TemplatePlaceholder = () => {
    const Id = randomId();
    const index = signersdata.length;
    const obj = {
-      Role: roleName || "Role " + count,
+      Role: roleName || "User " + count,
      Id: Id,
      blockColor: color[index]
    };
@@ -1110,7 +1113,7 @@ const TemplatePlaceholder = () => {
      signerPtr: {},
      signerObjId: "",
      blockColor: color[index],
-      Role: roleName || "Role " + count,
+      Role: roleName || "User " + count,
      Id: Id
    };

@@ -1458,7 +1461,8 @@ const TemplatePlaceholder = () => {
                  status: defaultdata?.status || "required",
                  hint: defaultdata?.hint || "",
                  defaultValue: defaultdata?.defaultValue || "",
-                  validation: {},
+                  validation:
+                        {},
                  fontSize:
                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
                  fontColor:
@@ -1467,15 +1471,6 @@ const TemplatePlaceholder = () => {
                    "black"
                }
              };
-            } else if (["signature"].includes(position.type)) {
-              return {
-                ...position,
-                options: {
-                  ...position.options,
-                  name: defaultdata.name,
-                  hint: defaultdata?.hint || ""
-                }
-              };
            } else {
              return {
                ...position,
@@ -1484,7 +1479,6 @@ const TemplatePlaceholder = () => {
                  name: defaultdata.name,
                  status: defaultdata.status,
                  defaultValue: defaultdata.defaultValue,
-                  hint: defaultdata?.hint || "",
                  fontSize:
                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
                  fontColor:
@@ -7,7 +7,8 @@ import Title from "../components/Title";
 import { useTranslation } from "react-i18next";
 import { emailRegex } from "../constant/const";
 const UpdateExistUserAdmin = () => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
  const { t } = useTranslation();
  const navigate = useNavigate();
  const [formdata, setFormdata] = useState({ email: "", masterkey: "" });
@@ -29,7 +30,7 @@ const UpdateExistUserAdmin = () => {
      }
    } catch (err) {
      console.log("Err in checkadminexist", err);
-      setErrMsg(t("something-went-wrong-mssg"));
+      setErrMsg("Something went wrong.");
    } finally {
      setLoader(false);
    }
@@ -10,6 +10,7 @@ import AddUser from "../components/AddUser";
 import Title from "../components/Title";
 import { useTranslation } from "react-i18next";
 const heading = ["Sr.No", "Name", "Email", "Phone", "Role", "Team", "Active"];
+// const actions = [];
 const UserList = () => {
  const { t } = useTranslation();
  const [userList, setUserList] = useState([]);
@@ -113,8 +114,9 @@ const UserList = () => {
      setUserList(_userRes);
    } catch (err) {
      console.log("Err in fetch userlist", err);
-      showAlert("danger", t("something-went-wrong-mssg"));
+      setIsAlert({ type: "danger", msg: t("something-went-wrong-mssg") });
    } finally {
+      setTimeout(() => setIsAlert({ type: "success", msg: "" }), 1500);
      setIsLoader(false);
    }
  }
@@ -171,15 +173,17 @@ const UserList = () => {
        extUser.id = user.objectId;
        extUser.set("IsDisabled", !IsDisabled);
        await extUser.save();
-        showAlert(
-          !IsDisabled === true ? "danger" : "success",
-          !IsDisabled === true ? t("user-deactivated") : t("user-activated")
-        );
+        setIsAlert({
+          type: !IsDisabled === true ? "danger" : "success",
+          msg:
+            !IsDisabled === true ? t("user-deactivated") : t("user-activated")
+        });
      } catch (err) {
-        showAlert("danger", t("something-went-wrong-mssg"));
+        setIsAlert({ type: "danger", msg: t("something-went-wrong-mssg") });
        console.log("err in disable team", err);
      } finally {
        setIsActLoader({});
+        setTimeout(() => setIsAlert({ type: "success", msg: "" }), 1500);
      }
    }
  };
@@ -187,11 +191,6 @@ const UserList = () => {
    setIsActiveModal({ [user.objectId]: true });
  };

-  // `showAlert` handle show/hide alert
-  const showAlert = (type, msg) => {
-    setIsAlert({ type, msg });
-    setTimeout(() => setIsAlert({ type: "success", msg: "" }), 1500);
-  };
  return (
    <div className="relative">
      <Title title={isAdmin ? "Users" : "Page not found"} />
@@ -206,187 +205,197 @@ const UserList = () => {
        </div>
      )}

-      {!isLoader && (
-        <>
-          {isAdmin ? (
-            <div className="p-2 w-full bg-base-100 text-base-content op-card shadow-lg">
-              {isAlert.msg && <Alert type={isAlert.type}>{isAlert.msg}</Alert>}
-              <div className="flex flex-row items-center justify-between my-2 mx-3 text-[20px] md:text-[23px]">
-                <div className="font-light">
-                  {t("report-name.Users")}{" "}
-                  <span className="text-xs md:text-[13px] font-normal">
-                    <Tooltip message={t("users-from-teams")} />
-                  </span>
-                </div>
-                <div className="flex flex-row gap-2 items-center">
-                  <div
-                    className="cursor-pointer"
-                    onClick={() => handleModal("form")}
-                  >
-                    <i className="fa-light fa-square-plus text-accent text-[30px] md:text-[40px]"></i>
+      {
+          !isLoader && (
+            <>
+              {isAdmin ? (
+                <div className="p-2 w-full bg-base-100 text-base-content op-card shadow-lg">
+                  {isAlert.msg && (
+                    <Alert type={isAlert.type}>{isAlert.msg}</Alert>
+                  )}
+                  <div className="flex flex-row items-center justify-between my-2 mx-3 text-[20px] md:text-[23px]">
+                    <div className="font-light">
+                      {t("report-name.Users")}{" "}
+                      <span className="text-xs md:text-[13px] font-normal">
+                        <Tooltip message={t("users-from-teams")} />
+                      </span>
+                    </div>
+                    <div className="flex flex-row gap-2 items-center">
+                      <div
+                        className="cursor-pointer"
+                        onClick={() => handleModal("form")}
+                      >
+                        <i className="fa-light fa-square-plus text-accent text-[30px] md:text-[40px]"></i>
+                      </div>
+                    </div>
                  </div>
-                </div>
-              </div>
-              <div className="w-full overflow-x-auto">
-                <table className="op-table border-collapse w-full mb-[50px]">
-                  <thead className="text-[14px]">
-                    <tr className="border-y-[1px]">
-                      {heading?.map((item, index) => (
-                        <th key={index} className="px-4 py-2">
-                          {t(`report-heading.${item}`)}
-                        </th>
-                      ))}
-                    </tr>
-                  </thead>
-                  {userList?.length > 0 && (
-                    <tbody className="text-[12px]">
-                      {currentList.map((item, index) => (
-                        <tr className="border-y-[1px]" key={index}>
-                          {heading.includes("Sr.No") && (
-                            <th className="px-4 py-2">
-                              {startIndex + index + 1}
+                  <div className="overflow-x-auto w-full">
+                    <table className="op-table border-collapse w-full">
+                      <thead className="text-[14px]">
+                        <tr className="border-y-[1px]">
+                          {heading?.map((item, index) => (
+                            <th key={index} className="px-4 py-2">
+                              {t(`report-heading.${item}`)}
                            </th>
-                          )}
-                          <td className="px-4 py-2 font-semibold">
-                            {item?.Name}{" "}
-                          </td>
-                          <td className="px-4 py-2 ">{item?.Email || "-"}</td>
-                          <td className="px-4 py-2">{item?.Phone || "-"}</td>
-                          <td className="px-4 py-2">
-                            {item?.UserRole?.split("_").pop() || "-"}
-                          </td>
-                          <td className="px-4 py-2">
-                            {formatRow(item.TeamIds)}
-                          </td>
-                          {item.UserRole !== "contracts_Admin" ? (
-                            <td className="px-4 py-2 font-semibold">
-                              <label className="cursor-pointer relative block items-center mb-0">
-                                <input
-                                  type="checkbox"
-                                  className="op-toggle transition-all op-toggle-secondary"
-                                  checked={item?.IsDisabled !== true}
-                                  onChange={() => handleToggleBtn(item)}
-                                />
-                              </label>
-                              {isActiveModal[item.objectId] && (
-                                <ModalUi
-                                  isOpen
-                                  title={t("user-status")}
-                                  handleClose={handleClose}
-                                >
-                                  <div className="m-[20px]">
-                                    <div className="text-lg font-normal text-black">
-                                      {t("are-you-sure")}{" "}
-                                      {item?.IsDisabled
-                                        ? t("activate")
-                                        : t("deactivate")}{" "}
-                                      {t("this-user")}?
-                                    </div>
-                                    <hr className="bg-[#ccc] mt-4 " />
-                                    <div className="flex items-center mt-3 gap-2 text-white">
-                                      <button
-                                        onClick={() => handleToggleSubmit(item)}
-                                        className="op-btn op-btn-primary"
-                                      >
-                                        {t("yes")}
-                                      </button>
-                                      <button
-                                        onClick={handleClose}
-                                        className="op-btn op-btn-secondary"
-                                      >
-                                        {t("no")}
-                                      </button>
-                                    </div>
-                                  </div>
-                                </ModalUi>
-                              )}
-                            </td>
-                          ) : (
-                            <td className="px-4 py-2 font-semibold"></td>
-                          )}
+                          ))}
                        </tr>
-                      ))}
-                    </tbody>
-                  )}
-                </table>
-              </div>
-              <div className="flex flex-row justify-between items-center text-xs font-medium">
-                <div className="op-join flex flex-wrap items-center p-2">
-                  {userList.length > recordperPage && (
-                    <button
-                      onClick={() => paginateBack()}
-                      className="op-join-item op-btn op-btn-sm"
-                    >
-                      {t("prev")}
-                    </button>
-                  )}
-                  {pageNumbers.map((x, i) => (
-                    <button
-                      key={i}
-                      onClick={() => setCurrentPage(x)}
-                      disabled={x === "..."}
-                      className={`${
-                        x === currentPage ? "op-btn-active" : ""
-                      } op-join-item op-btn op-btn-sm`}
-                    >
-                      {x}
-                    </button>
-                  ))}
-                  {userList.length > recordperPage && (
-                    <button
-                      onClick={() => paginateFront()}
-                      className="op-join-item op-btn op-btn-sm"
-                    >
-                      {t("next")}
-                    </button>
-                  )}
-                </div>
-              </div>
-              {userList?.length <= 0 && (
-                <div
-                  className={`${
-                    isDashboard ? "h-[317px]" : ""
-                  } flex flex-col items-center justify-center w-ful bg-base-100 text-base-content rounded-xl py-4`}
-                >
-                  <div className="w-[60px] h-[60px] overflow-hidden">
-                    <img
-                      className="w-full h-full object-contain"
-                      src={pad}
-                      alt="img"
-                    />
+                      </thead>
+                      <tbody className="text-[12px]">
+                        {userList?.length > 0 && (
+                          <>
+                            {currentList.map((item, index) => (
+                              <tr className="border-y-[1px]" key={index}>
+                                {heading.includes("Sr.No") && (
+                                  <th className="px-4 py-2">
+                                    {startIndex + index + 1}
+                                  </th>
+                                )}
+                                <td className="px-4 py-2 font-semibold">
+                                  {item?.Name}{" "}
+                                </td>
+                                <td className="px-4 py-2 ">
+                                  {item?.Email || "-"}
+                                </td>
+                                <td className="px-4 py-2">
+                                  {item?.Phone || "-"}
+                                </td>
+                                <td className="px-4 py-2">
+                                  {item?.UserRole?.split("_").pop() || "-"}
+                                </td>
+                                <td className="px-4 py-2">
+                                  {formatRow(item.TeamIds)}
+                                </td>
+                                {item.UserRole !== "contracts_Admin" && (
+                                  <td className="px-4 py-2 font-semibold">
+                                    <label className="cursor-pointer relative block items-center mb-0">
+                                      <input
+                                        type="checkbox"
+                                        className="op-toggle transition-all op-toggle-secondary"
+                                        checked={item?.IsDisabled !== true}
+                                        onChange={() => handleToggleBtn(item)}
+                                      />
+                                    </label>
+                                    {isActiveModal[item.objectId] && (
+                                      <ModalUi
+                                        isOpen
+                                        title={t("user-status")}
+                                        handleClose={handleClose}
+                                      >
+                                        <div className="m-[20px]">
+                                          <div className="text-lg font-normal text-black">
+                                            {t("are-you-sure")}{" "}
+                                            {item?.IsDisabled
+                                              ? t("activate")
+                                              : t("deactivate")}{" "}
+                                            {t("this-user")}?
+                                          </div>
+                                          <hr className="bg-[#ccc] mt-4 " />
+                                          <div className="flex items-center mt-3 gap-2 text-white">
+                                            <button
+                                              onClick={() =>
+                                                handleToggleSubmit(item)
+                                              }
+                                              className="op-btn op-btn-primary"
+                                            >
+                                              {t("yes")}
+                                            </button>
+                                            <button
+                                              onClick={handleClose}
+                                              className="op-btn op-btn-secondary"
+                                            >
+                                              {t("no")}
+                                            </button>
+                                          </div>
+                                        </div>
+                                      </ModalUi>
+                                    )}
+                                  </td>
+                                )}
+                              </tr>
+                            ))}
+                          </>
+                        )}
+                      </tbody>
+                    </table>
                  </div>
-                  <div className="text-sm font-semibold">
-                    {t("no-data-avaliable")}
+                  <div className="flex flex-row  justify-between items-center text-xs font-medium">
+                    <div className="op-join flex flex-wrap items-center p-2">
+                      {userList.length > recordperPage && (
+                        <button
+                          onClick={() => paginateBack()}
+                          className="op-join-item op-btn op-btn-sm"
+                        >
+                          {t("prev")}
+                        </button>
+                      )}
+                      {pageNumbers.map((x, i) => (
+                        <button
+                          key={i}
+                          onClick={() => setCurrentPage(x)}
+                          disabled={x === "..."}
+                          className={`${
+                            x === currentPage ? "op-btn-active" : ""
+                          } op-join-item op-btn op-btn-sm`}
+                        >
+                          {x}
+                        </button>
+                      ))}
+                      {userList.length > recordperPage && (
+                        <button
+                          onClick={() => paginateFront()}
+                          className="op-join-item op-btn op-btn-sm"
+                        >
+                          {t("next")}
+                        </button>
+                      )}
+                    </div>
+                  </div>
+                  {userList?.length <= 0 && (
+                    <div
+                      className={`${
+                        isDashboard ? "h-[317px]" : ""
+                      } flex flex-col items-center justify-center w-ful bg-base-100 text-base-content rounded-xl py-4`}
+                    >
+                      <div className="w-[60px] h-[60px] overflow-hidden">
+                        <img
+                          className="w-full h-full object-contain"
+                          src={pad}
+                          alt="img"
+                        />
+                      </div>
+                      <div className="text-sm font-semibold">
+                        {t("no-data-avaliable")}
+                      </div>
+                    </div>
+                  )}
+                  <ModalUi
+                    isOpen={isModal.form}
+                    title={formHeader}
+                    handleClose={() => handleModal("form")}
+                  >
+                    <AddUser
+                      setIsAlert={setIsAlert}
+                      handleUserData={handleUserData}
+                      closePopup={() => handleModal("form")}
+                      setFormHeader={setFormHeader}
+                    />
+                  </ModalUi>
+                </div>
+              ) : (
+                <div className="flex items-center justify-center h-screen w-full bg-base-100 text-base-content rounded-box">
+                  <div className="text-center">
+                    <h1 className="text-[60px] lg:text-[120px] font-semibold">
+                      404
+                    </h1>
+                    <p className="text-[30px] lg:text-[50px]">
+                      {t("page-not-found")}
+                    </p>
                  </div>
                </div>
              )}
-              <ModalUi
-                isOpen={isModal.form}
-                title={formHeader}
-                handleClose={() => handleModal("form")}
-              >
-                <AddUser
-                  showAlert={showAlert}
-                  handleUserData={handleUserData}
-                  closePopup={() => handleModal("form")}
-                  setFormHeader={setFormHeader}
-                />
-              </ModalUi>
-            </div>
-          ) : (
-            <div className="flex items-center justify-center h-screen w-full bg-base-100 text-base-content rounded-box">
-              <div className="text-center">
-                <h1 className="text-[60px] lg:text-[120px] font-semibold">
-                  404
-                </h1>
-                <p className="text-[30px] lg:text-[50px]">
-                  {t("page-not-found")}
-                </p>
-              </div>
-            </div>
-          )}
-        </>
-      )}
+            </>
+          )
+      }
    </div>
  );
 };
@@ -33,9 +33,8 @@ const AddContact = (props) => {
    try {
      const baseURL = localStorage.getItem("baseUrl");
      const url = `${baseURL}functions/isuserincontactbook`;
-      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"),
@@ -64,15 +63,18 @@ const AddContact = (props) => {
        )
      );
      const userId = user?.objectId || "";
-      const tenantDetails = await getTenantDetails(userId);
+      const tenantDetails = await getTenantDetails(
+        userId,
+      );
      const tenantId = tenantDetails?.objectId || "";
      if (tenantId) {
        try {
          const baseURL = localStorage.getItem("baseUrl");
          const url = `${baseURL}functions/savecontact`;
-          const token = {
-            "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-          };
+          const token =
+                {
+                  "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+                };
          const data = { name, email, phone, tenantId };
          const headers = {
            "Content-Type": "application/json",
@@ -135,9 +137,7 @@ const AddContact = (props) => {
        </div>
      )}
      <div className="w-full mx-auto p-[8px]">
-        {!props?.isDisableTitle && (
-          <div className="text-[14px] font-[700]">{t("add-contact")}</div>
-        )}
+        <div className="text-[14px] font-[700]">{t("add-contact")}</div>
        {isUserExist && (
          <div className="mb-[0.75rem] flex items-center mt-1">
            <input
@@ -11,7 +11,7 @@ const Alert = ({ children, type, className }) => {
      case "danger":
        return "op-alert-error";
      case "warning":
-        return "op-alert-warning text-black";
+        return "op-alert-warning";
      default:
        return "";
    }
@@ -1,34 +0,0 @@
-import React from "react";
-
-const CheckCircle = ({ size = 56, color = "text-green-500" }) => {
-  return (
-    <div className={`flex items-center justify-center ${color}`}>
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        className={`w-${size / 4} h-${size / 4}`}
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke="currentColor"
-        strokeWidth={2}
-      >
-        <circle
-          cx="12"
-          cy="12"
-          r="10"
-          stroke="currentColor"
-          strokeWidth="2"
-          fill="none"
-        />
-        <path
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="2"
-          d="M9 12l2 2l4-4"
-        />
-      </svg>
-    </div>
-  );
-};
-
-export default CheckCircle;
@@ -1,7 +1,7 @@
 function sanitizeFileName(fileName) {
  // Remove spaces and invalid characters
-  const file = fileName?.replace(/[^a-zA-Z0-9._-]/g, "");
-  const removedot = file?.replace(/\.(?=.*\.)/g, "");
-  return removedot?.replace(/[^a-zA-Z0-9._-]/g, "");
+  const file = fileName.replace(/[^a-zA-Z0-9._-]/g, "");
+  const removedot = file.replace(/\.(?=.*\.)/g, "");
+  return removedot.replace(/[^a-zA-Z0-9._-]/g, "");
 }
 export default sanitizeFileName;
@@ -1,9 +1,5 @@
 # Use an official Node runtime as the base image
-FROM node:22.14.0
-
-# install java
-RUN wget https://download.oracle.com/java/23/latest/jdk-23_linux-x64_bin.deb \
- && dpkg -i jdk-23_linux-x64_bin.deb 
+FROM node:20

 # Set the working directory inside the container
 WORKDIR /usr/src/app
@@ -5,7 +5,12 @@ import { PDFDocument } from 'pdf-lib';
 dotenv.config();

 export const cloudServerUrl = 'http://localhost:8080/app';
-export const appName = 'OpenSign™';
+export const appName =
+  'OpenSign™';
+export function customAPIurl() {
+  const url = new URL(cloudServerUrl);
+  return url.pathname === '/api/app' ? url.origin + '/api' : url.origin;
+}

 export const color = [
  '#93a3db',
@@ -49,7 +54,7 @@ export const saveFileUsage = async (size, fileUrl, userId) => {
        className: '_User',
        objectId: userId,
      });
-      const tenant = await tenantQuery.first({ useMasterKey: true });
+      const tenant = await tenantQuery.first();
      if (tenant) {
        const tenantPtr = { __type: 'Pointer', className: 'partners_Tenant', objectId: tenant.id };
        try {
@@ -134,6 +139,131 @@ export const updateMailCount = async (extUserId, plan, monthchange) => {
  }
 };

+export function formatWidgetOptions(type, options) {
+  const colorsArr = ['red', 'black', 'blue', 'yellow'];
+  const fontSizes = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28];
+  const status = options?.required === true ? 'required' : 'optional' || 'required';
+  const defaultValue = options?.default || '';
+  const values = options?.values || [];
+  const color = options?.color ? options.color : 'black';
+  const fontColor = colorsArr.includes(color) ? color : 'black';
+  const size = options?.fontsize ? parseInt(options.fontsize) : 12;
+  const fontSize = fontSizes.includes(size) ? size : 12;
+  switch (type) {
+    case 'signature':
+      return { name: 'signature', status: 'required' };
+    case 'stamp':
+      return { status: status, name: 'stamp' };
+    case 'initials':
+      return { status: status, name: options.name || 'initials' };
+    case 'image':
+      return { status: status, name: options.name || 'image' };
+    case 'email':
+      return {
+        status: status,
+        name: options.name || 'email',
+        validation: { type: 'email' },
+        fontColor: fontColor,
+        fontSize: fontSize,
+      };
+    case 'name':
+      return {
+        status: status,
+        name: options.name || 'name',
+        fontColor: fontColor,
+        fontSize: fontSize,
+      };
+    case 'job title':
+      return {
+        status: status,
+        name: options.name || 'job title',
+        fontColor: fontColor,
+        fontSize: fontSize,
+      };
+    case 'company':
+      return {
+        status: status,
+        name: options.name || 'company',
+        fontColor: fontColor,
+        fontSize: fontSize,
+      };
+    case 'date': {
+      let today = new Date();
+      let dd = String(today.getDate()).padStart(2, '0');
+      let mm = String(today.getMonth() + 1).padStart(2, '0'); // January is 0!
+      let yyyy = today.getFullYear();
+      today = dd + '-' + mm + '-' + yyyy;
+      let dateFormat = options?.format;
+      dateFormat = dateFormat.replace(/m/g, 'M');
+      return {
+        status: status,
+        name: options.name || 'date',
+        response: defaultValue || today,
+        validation: { format: dateFormat || 'dd-MM-yyyy', type: 'date-format' },
+        fontColor: fontColor,
+        fontSize: fontSize,
+      };
+    }
+    case 'textbox':
+      return {
+        status: status,
+        name: 'textbox',
+        defaultValue: defaultValue,
+        hint: options.hint,
+        validation: { type: 'regex', pattern: options?.regularexpression || '/^[a-zA-Z0-9s]+$/' },
+        fontColor: fontColor,
+        fontSize: fontSize,
+        isReadOnly: options?.readonly || false,
+      };
+    case 'checkbox': {
+      const arr = options?.values;
+      let selectedvalues = [];
+      for (const obj of options.selectedvalues) {
+        const index = arr.indexOf(obj);
+        selectedvalues.push(index);
+      }
+      return {
+        status: status,
+        name: options.name || 'checkbox',
+        values: values,
+        isReadOnly: options?.readonly || false,
+        isHideLabel: options?.hidelabel || false,
+        validation: {
+          minRequiredCount: options?.validation?.minselections || 0,
+          maxRequiredCount: options?.validation?.maxselections || 0,
+        },
+        defaultValue: selectedvalues || [],
+        fontColor: fontColor,
+        fontSize: fontSize,
+      };
+    }
+    case 'radio button': {
+      return {
+        status: status,
+        name: options.name || 'radio',
+        values: values,
+        isReadOnly: options?.readonly || false,
+        isHideLabel: options?.hidelabel || false,
+        defaultValue: defaultValue,
+        fontColor: fontColor,
+        fontSize: fontSize,
+      };
+    }
+    case 'dropdown':
+      return {
+        status: status,
+        name: options.name || 'dropdown',
+        values: values,
+        defaultValue: defaultValue,
+        fontColor: fontColor,
+        fontSize: fontSize,
+        isReadOnly: options?.readonly || false,
+      };
+    default:
+      break;
+  }
+}
+
 export function sanitizeFileName(fileName) {
  // Remove spaces and invalid characters
  const file = fileName.replace(/[^a-zA-Z0-9._-]/g, '');
@@ -146,6 +276,7 @@ export const smtpsecure = process.env.SMTP_PORT && process.env.SMTP_PORT !== '46
 export const smtpenable =
  process.env.SMTP_ENABLE && process.env.SMTP_ENABLE.toLowerCase() === 'true' ? true : false;

+
 // `generateId` is used to unique Id for fileAdapter
 export function generateId(length) {
  const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
@@ -225,10 +356,11 @@ export const flattenPdf = async pdfFile => {
 export const mailTemplate = param => {
  const themeColor = '#47a3ad';
  const subject = `${param.senderName} has requested you to sign "${param.title}"`;
-  const AppName = appName;
-  const logo = `<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' />`;
+  const logo =
+        `<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' />`;

-  const opurl = ` <a href='www.opensignlabs.com' target=_blank>here</a>`;
+  const opurl =
+        ` <a href='www.opensignlabs.com' target=_blank>here</a>`;

  const body =
    "<html><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8' /></head><body><div style='background-color:#f5f5f5;padding:20px'><div style='background:white;padding-bottom:20px'><div style='padding:10px'>" +
@@ -241,56 +373,15 @@ export const mailTemplate = param => {
    param.senderMail +
    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td><td></td><td style='color:#626363;font-weight:bold'> " +
    param.organization +
-    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td></td><td style='color:#626363;font-weight:bold'>" +
+    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expire on</td><td></td><td style='color:#626363;font-weight:bold'>" +
    param.localExpireDate +
-    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Note</td><td></td><td style='color:#626363;font-weight:bold'>" +
-    param.note +
    "</td></tr><tr><td></td><td></td></tr></table></div> <div style='margin-left:70px'><a target=_blank href=" +
    param.sigingUrl +
    "><button style='padding:12px;background-color:#d46b0f;color:white;border:0px;font-weight:bold;margin-top:30px'>Sign here</button></a></div><div style='display:flex;justify-content:center;margin-top:10px'></div></div></div><div><p> This is an automated email from " +
-    AppName +
+    appName +
    '. For any queries regarding this email, please contact the sender ' +
    param.senderMail +
-    ` directly. If you think this email is inappropriate or spam, you may file a complaint with ${AppName}${opurl}.</p></div></div></body></html>`;
+    ` directly. If you think this email is inappropriate or spam, you may file a complaint with ${appName}${opurl}.</p></div></div></body></html>`;

  return { subject, body };
 };
-
-export const selectFormat = data => {
-  switch (data) {
-    case 'L':
-      return 'MM/dd/yyyy';
-    case 'MM/DD/YYYY':
-      return 'MM/dd/yyyy';
-    case 'DD-MM-YYYY':
-      return 'dd-MM-yyyy';
-    case 'DD/MM/YYYY':
-      return 'dd/MM/yyyy';
-    case 'LL':
-      return 'MMMM dd, yyyy';
-    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 'MMMM DD, YYYY':
-      return 'MMMM dd, yyyy';
-    case 'DD MMMM, YYYY':
-      return 'dd MMMM, yyyy';
-    default:
-      return 'MM/dd/yyyy';
-  }
-};
-
-export function formatDateTime(date, dateFormat, timeZone, is12Hour) {
-  const zonedDate = toZonedTime(date, timeZone); // Convert date to the given timezone
-  const timeFormat = is12Hour ? 'hh:mm:ss a' : 'HH:mm:ss';
-  return dateFormat
-    ? format(zonedDate, `${selectFormat(dateFormat)}, ${timeFormat} 'GMT' XXX`, { timeZone })
-    : formatTimeInTimezone(date, timeZone);
-}
@@ -1,3 +1,4 @@
+
 import PDF from './parsefunction/pdf/PDF.js';
 import sendmailv3 from './parsefunction/sendMailv3.js';
 import usersignup from './parsefunction/usersignup.js';
@@ -12,6 +13,7 @@ import getDrive from './parsefunction/getDrive.js';
 import getReport from './parsefunction/getReport.js';
 import TemplateAfterSave from './parsefunction/TemplateAfterSave.js';
 import GetTemplate from './parsefunction/GetTemplate.js';
+import callWebhook from './parsefunction/callWebhook.js';
 import DocumentBeforesave from './parsefunction/DocumentBeforesave.js';
 import TemplateBeforeSave from './parsefunction/TemplateBeforesave.js';
 import DocumentBeforeFind from './parsefunction/DocumentAfterFind.js';
@@ -20,6 +22,7 @@ import UserAfterFind from './parsefunction/UserAfterFInd.js';
 import SignatureAfterFind from './parsefunction/SignatureAfterFind.js';
 import TenantAterFind from './parsefunction/TenantAfterFind.js';
 import VerifyEmail from './parsefunction/VerifyEmail.js';
+import encryptedpdf from './parsefunction/encryptedPdf.js';
 import { getSignedUrl } from './parsefunction/getSignedUrl.js';
 import createBatchDocs from './parsefunction/createBatchDocs.js';
 import linkContactToDoc from './parsefunction/linkContactToDoc.js';
@@ -48,9 +51,7 @@ import generateCertificatebydocId from './parsefunction/generateCertificatebydoc
 import fileUpload from './parsefunction/fileUpload.js';
 import getUserListByOrg from './parsefunction/getUserListByOrg.js';
 import editContact from './parsefunction/editContact.js';
-import forwardDoc from './parsefunction/ForwardDoc.js';
-import saveAsTemplate from './parsefunction/saveAsTemplate.js';
-import updateTenant from './parsefunction/updateTenant.js';
+

 // This afterSave function triggers after an object is added or updated in the specified class, allowing for post-processing logic.
 Parse.Cloud.afterSave('contracts_Document', DocumentAftersave);
@@ -81,7 +82,9 @@ Parse.Cloud.define('getDocument', getDocument);
 Parse.Cloud.define('getDrive', getDrive);
 Parse.Cloud.define('getReport', getReport);
 Parse.Cloud.define('getTemplate', GetTemplate);
+Parse.Cloud.define('callwebhook', callWebhook);
 Parse.Cloud.define('verifyemail', VerifyEmail);
+Parse.Cloud.define('encryptedpdf', encryptedpdf);
 Parse.Cloud.define('getsignedurl', getSignedUrl);
 Parse.Cloud.define('batchdocuments', createBatchDocs);
 Parse.Cloud.define('linkcontacttodoc', linkContactToDoc);
@@ -109,6 +112,3 @@ Parse.Cloud.define('generatecertificate', generateCertificatebydocId);
 Parse.Cloud.define('fileupload', fileUpload);
 Parse.Cloud.define('getuserlistbyorg', getUserListByOrg);
 Parse.Cloud.define('editcontact', editContact);
-Parse.Cloud.define('forwarddoc', forwardDoc);
-Parse.Cloud.define('saveastemplate', saveAsTemplate);
-Parse.Cloud.define('updatetenant', updateTenant);
@@ -61,7 +61,7 @@ async function addTeamAndOrg(extUser) {

 async function saveUser(userDetails) {
  const userQuery = new Parse.Query(Parse.User);
-  userQuery.equalTo('username', userDetails.email?.toLowerCase()?.replace(/\s/g, ''));
+  userQuery.equalTo('username', userDetails.email);
  const userRes = await userQuery.first({ useMasterKey: true });

  if (userRes) {
@@ -83,9 +83,9 @@ async function saveUser(userDetails) {
    return { id: login.objectId, sessionToken: login.sessionToken };
  } else {
    const user = new Parse.User();
-    user.set('username', userDetails.email?.toLowerCase()?.replace(/\s/g, ''));
+    user.set('username', userDetails.email);
    user.set('password', userDetails.password);
-    user.set('email', userDetails.email?.toLowerCase()?.replace(/\s/g, ''));
+    user.set('email', userDetails.email);
    if (userDetails?.phone) {
      user.set('phone', userDetails.phone);
    }
@@ -111,6 +111,7 @@ export default async function AddAdmin(request) {
    if (extUser) {
      return { message: 'User already exist' };
    } else {
+      // console.log("role ", role);
      const partnerQuery = new Parse.Object('partners_Tenant');
      partnerQuery.set('UserId', {
        __type: 'Pointer',
@@ -122,7 +123,7 @@ export default async function AddAdmin(request) {
        partnerQuery.set('ContactNumber', userDetails.phone);
      }
      partnerQuery.set('TenantName', userDetails.company);
-      partnerQuery.set('EmailAddress', userDetails.email?.toLowerCase()?.replace(/\s/g, ''));
+      partnerQuery.set('EmailAddress', userDetails.email);
      partnerQuery.set('IsActive', true);
      partnerQuery.set('CreatedBy', {
        __type: 'Pointer',
@@ -153,7 +154,7 @@ export default async function AddAdmin(request) {
        objectId: user.id,
      });
      newObj.set('UserRole', userDetails.role);
-      newObj.set('Email', userDetails.email?.toLowerCase()?.replace(/\s/g, ''));
+      newObj.set('Email', userDetails.email);
      newObj.set('Name', userDetails.name);
      if (userDetails?.phone) {
        newObj.set('Phone', userDetails?.phone);
@@ -176,7 +177,7 @@ export default async function AddAdmin(request) {
      const extUser = {
        objectId: extRes.id,
        Name: userDetails.name,
-        Email: userDetails.email?.toLowerCase()?.replace(/\s/g, ''),
+        Email: userDetails.email,
        Phone: userDetails?.phone ? userDetails.phone : '',
        TenantId: { objectId: tenantRes.id },
        UserId: { objectId: user.id },
@@ -1,13 +1,4 @@
 async function DocumentBeforesave(request) {
-  if (!request.original) {
-    const TimeToCompleteDays = request.object.get('TimeToCompleteDays') || 15;
-    const RemindOnceInEvery = request?.object?.get('RemindOnceInEvery') || 5;
-    const AutoReminder = request?.object?.get('AutomaticReminders') || false;
-    const reminderCount = TimeToCompleteDays / RemindOnceInEvery;
-    if (AutoReminder && reminderCount > 15) {
-      throw new Parse.Error(Parse.Error.INVALID_QUERY, 'only 15 reminder allowed');
-    }
-  }
  try {
    // below code is used to update document when user sent document or self signed
    const document = request.object;
@@ -1,82 +0,0 @@
-import axios from 'axios';
-import { appName, cloudServerUrl } from '../../Utils.js';
-
-export default async function forwardDoc(request) {
-  try {
-    if (!request.user) {
-      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'unauthorized.');
-    }
-    const { docId, recipients } = request.params;
-    const isReceipents = recipients?.length > 0 && recipients?.length <= 10;
-    if (docId && isReceipents) {
-      const userPtr = { __type: 'Pointer', className: '_User', objectId: request.user.id };
-      const docQuery = new Parse.Query('contracts_Document');
-      docQuery
-        .equalTo('objectId', docId)
-        .equalTo('CreatedBy', userPtr)
-        .notEqualTo('IsArchive', true)
-        .notEqualTo('IsDeclined', true)
-        .include('Signers')
-        .include('ExtUserPtr')
-        .include('Placeholders.signerPtr')
-        .include('ExtUserPtr.TenantId');
-      const docRes = await docQuery.first({ useMasterKey: true });
-      if (!docRes) {
-        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Document not found.');
-      }
-      const _docRes = docRes?.toJSON();
-      const docName = _docRes.Name;
-      const fileAdapterId = _docRes?.FileAdapterId || '';
-      const extUserId = _docRes?.ExtUserPtr?.objectId;
-      const TenantAppName = appName;
-      const from = _docRes?.ExtUserPtr?.Email;
-      const replyTo = _docRes?.ExtUserPtr?.Email;
-      const senderName = _docRes?.ExtUserPtr?.Name;
-
-      try {
-        let mailRes;
-        for (let i = 0; i < recipients.length; i++) {
-          const logo = `<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' style='padding:20px'/>`;
-          const opurl = ` <a href='www.opensignlabs.com' target=_blank>here</a>`;
-          const themeColor = '#47a3ad';
-
-          let params = {
-            extUserId: extUserId,
-            pdfName: docName,
-            url: _docRes?.SignedUrl || '',
-            recipient: recipients[i],
-            subject: `${senderName} has signed the doc - ${docName}`,
-            replyto: replyTo || '',
-            from: from,
-            html:
-              `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/></head><body><div style='background-color:#f5f5f5;padding:20px'><div style='background-color:white'><div>` +
-              `${logo}</div><div style='padding:2px;font-family:system-ui;background-color:${themeColor}'><p style='font-size:20px;font-weight:400;color:white;padding-left:20px'>Document Copy</p></div><div>` +
-              `<p style='padding:20px;font-family:system-ui;font-size:14px'>A copy of the document <strong>${docName}</strong> is attached to this email. Kindly download the document from the attachment.</p>` +
-              `</div></div><div><p>This is an automated email from ${TenantAppName}. For any queries regarding this email, please contact the sender ${replyTo} directly. ` +
-              `If you think this email is inappropriate or spam, you may file a complaint with ${TenantAppName}${opurl}.</p></div></div></body></html>`,
-          };
-          mailRes = await axios.post(`${cloudServerUrl}/functions/sendmailv3`, params, {
-            headers: {
-              'Content-Type': 'application/json',
-              'X-Parse-Application-Id': process.env.APP_ID,
-              'X-Parse-Master-Key': process.env.MASTER_KEY,
-            },
-          });
-        }
-        return mailRes.data?.result;
-      } catch (error) {
-        const msg =
-          error?.response?.data?.error ||
-          error?.response?.data ||
-          error?.message ||
-          'Something went wrong.';
-        throw new Parse.Error(400, msg);
-      }
-    } else {
-      throw new Parse.Error(Parse.Error.INVALID_QUERY, 'please provide parameters.');
-    }
-  } catch (err) {
-    console.log('Err in forwardDoc', err);
-    throw err;
-  }
-}
@@ -6,17 +6,13 @@ export default async function GetLogoByDomain(request) {
  try {
    const tenantCreditsQuery = new Parse.Query('partners_Tenant');
    tenantCreditsQuery.equalTo('Domain', domain);
-    const res = await tenantCreditsQuery.first({ useMasterKey: true });
+    const res = await tenantCreditsQuery.first();
    if (res) {
      const updateRes = JSON.parse(JSON.stringify(res));
-      return {
-        logo: updateRes?.Logo,
-        appname: appName,
-        user: 'exist',
-      };
+      return { logo: updateRes?.Logo, appname: appName, user: 'exist' };
    } else {
      const tenantCreditsQuery = new Parse.Query('partners_Tenant');
-      const tenantRes = await tenantCreditsQuery.first({ useMasterKey: true });
+      const tenantRes = await tenantCreditsQuery.first();
      if (tenantRes) {
        return { logo: '', appname: appName, user: 'exist' };
      } else {
@@ -1,10 +1,10 @@
 import axios from 'axios';
 export default async function Newsletter(request) {
  const name = request.params.name;
-  const email = request.params?.email?.toLowerCase()?.replace(/\s/g, '');
+  const email = request.params.email;
  const domain = request.params.domain;
  try {
-    const envAppId = process.env.REACT_APP_APPID || 'opensign';
+    const envAppId = process.env.REACT_APP_APPID || 'legadranaxn';
    const headers = { 'Content-Type': 'application/json', 'X-Parse-Application-Id': envAppId };
    const envProdServer = process.env.REACT_APP_SERVERURL || 'https://app.opensignlabs.com/api/app';
    const newsletter = await axios.post(
@@ -11,7 +11,7 @@ async function getDocument(docId) {
    query.include('Placeholders');
    query.notEqualTo('IsArchive', true);
    const res = await query.first({ useMasterKey: true });
-    const _res = res?.toJSON();
+    const _res = res.toJSON();
    return _res?.ExtUserPtr?.objectId;
  } catch (err) {
    console.log('err ', err);
@@ -22,20 +22,19 @@ async function sendMailOTPv1(request) {
    //--for elearning app side
    let code = Math.floor(1000 + Math.random() * 9000);
    let email = request.params.email;
-    let TenantId = request.params.TenantId ? request.params.TenantId : undefined;
-    const AppName = appName;
+    var TenantId = request.params.TenantId ? request.params.TenantId : undefined;

    if (email) {
      const recipient = request.params.email;
      const mailsender = smtpenable ? process.env.SMTP_USER_EMAIL : process.env.MAILGUN_SENDER;
      try {
        await Parse.Cloud.sendEmail({
-          from: AppName + ' <' + mailsender + '>',
+          from: appName + ' <' + mailsender + '>',
          recipient: recipient,
-          subject: `Your ${AppName} OTP`,
+          subject: `Your ${appName} OTP`,
          text: 'This email is a test.',
          html:
-            `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body><div style='background-color:#f5f5f5;padding:20px'><div style='box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background-color:white;'><div style='background-color:red;padding:2px;font-family:system-ui; background-color:#47a3ad;'>    <p style='font-size:20px;font-weight:400;color:white;padding-left:20px',>OTP Verification</p></div><div style='padding:20px'><p style='font-family:system-ui;font-size:14px'>Your OTP for ${AppName} verification is:</p><p style=' text-decoration: none; font-weight: bolder; color:blue;font-size:45px;margin:20px'>` +
+            `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body><div style='background-color:#f5f5f5;padding:20px'><div style='box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background-color:white;'><div style='background-color:red;padding:2px;font-family:system-ui; background-color:#47a3ad;'>    <p style='font-size:20px;font-weight:400;color:white;padding-left:20px',>OTP Verification</p></div><div style='padding:20px'><p style='font-family:system-ui;font-size:14px'>Your OTP for ${appName} verification is:</p><p style=' text-decoration: none; font-weight: bolder; color:blue;font-size:45px;margin:20px'>` +
            code +
            '</p></div> </div> </div></body></html>',
        });
@@ -1,13 +1,4 @@
 async function TemplateBeforeSave(request) {
-  if (!request.original) {
-    const TimeToCompleteDays = request.object.get('TimeToCompleteDays') || 15;
-    const RemindOnceInEvery = request?.object?.get('RemindOnceInEvery') || 5;
-    const AutoReminder = request?.object?.get('AutomaticReminders') || false;
-    const reminderCount = TimeToCompleteDays / RemindOnceInEvery;
-    if (AutoReminder && reminderCount > 15) {
-      throw new Parse.Error(Parse.Error.INVALID_QUERY, 'only 15 reminder allowed');
-    }
-  }
  try {
    if (!request.original) {
      // below code is used to update template when user sent template or self signed
@@ -0,0 +1,108 @@
+import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
+export default async function callWebhook(request) {
+  const event = request.params.event;
+  const body = request.params.body;
+  const docId = body.objectId;
+  const contactId = request.params.contactId;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
+  const appId = process.env.APP_ID;
+  try {
+    const docQuery = new Parse.Query('contracts_Document');
+    docQuery.include('ExtUserPtr.TenantId');
+    const docRes = await docQuery.get(docId, { useMasterKey: true });
+    const isEnableOTP = docRes?.get('IsEnableOTP') || false;
+    let userId;
+    if (isEnableOTP) {
+      const userRes = await axios.get(serverUrl + '/users/me', {
+        headers: {
+          'X-Parse-Application-Id': appId,
+          'X-Parse-Session-Token': request.headers['sessiontoken'],
+        },
+      });
+      userId = userRes.data && userRes.data.objectId;
+    }
+    if (!isEnableOTP || userId) {
+      if (event === 'viewed' && contactId) {
+        if (docRes) {
+          const _docRes = docRes.toJSON();
+          const userPtr = {
+            __type: 'Pointer',
+            className: 'contracts_Contactbook',
+            objectId: contactId,
+          };
+          const date = new Date().toISOString();
+          const obj = {
+            UserPtr: userPtr,
+            SignedUrl: _docRes.SignedUrl,
+            Activity: 'Viewed',
+            ipAddress: request.headers['x-real-ip'],
+            ViewedOn: date,
+          };
+          const isUserExist = _docRes?.AuditTrail?.some(
+            x => x.UserPtr.objectId === contactId && x?.ViewedOn
+          );
+          if (!isUserExist) {
+            const updateDoc = new Parse.Object('contracts_Document');
+            updateDoc.id = docRes.id;
+            if (_docRes?.AuditTrail && _docRes?.AuditTrail?.length > 0) {
+              updateDoc.set('AuditTrail', [..._docRes?.AuditTrail, obj]);
+            } else {
+              updateDoc.set('AuditTrail', [obj]);
+            }
+            await updateDoc.save(null, { useMasterKey: true });
+          }
+        }
+      }
+      const extendcls = new Parse.Query('contracts_Users');
+      extendcls.equalTo('objectId', docRes.get('ExtUserPtr')?.id);
+      // extendcls.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: userId });
+      const resExt = await extendcls.first({ useMasterKey: true });
+      if (resExt) {
+        const extUser = JSON.parse(JSON.stringify(resExt));
+        if (extUser?.Webhook) {
+          const params = { event: event, ...body };
+          await axios
+            .post(extUser?.Webhook, params, {
+              headers: { 'Content-Type': 'application/json' },
+            })
+            .then(res => {
+              try {
+                const webhook = new Parse.Object('contracts_Webhook');
+                webhook.set('Log', res?.status);
+                webhook.set('UserId', {
+                  __type: 'Pointer',
+                  className: '_User',
+                  objectId: userId,
+                });
+                webhook.save(null, { useMasterKey: true });
+              } catch (err) {
+                console.log('err save in contracts_Webhook', err.message);
+              }
+            })
+            .catch(err => {
+              console.log('Err send data to webhook', err.message);
+              try {
+                const webhook = new Parse.Object('contracts_Webhook');
+                webhook.set('Log', err?.status);
+                webhook.set('UserId', {
+                  __type: 'Pointer',
+                  className: '_User',
+                  objectId: userId,
+                });
+                webhook.save(null, { useMasterKey: true });
+              } catch (err) {
+                console.log('err save in contracts_Webhook', err.message);
+              }
+            });
+        }
+        return { message: 'webhook called!' };
+      }
+    } else {
+      return { message: 'User not found!' };
+    }
+  } catch (err) {
+    console.log('Err in callwebhook', err);
+    return { message: 'Something went wrong!' };
+  }
+}
@@ -21,7 +21,7 @@ export default async function createBatchContact(req) {
            TenantId: { __type: 'Pointer', className: 'partners_Tenant', objectId: x.TenantId },
            CreatedBy: { __type: 'Pointer', className: '_User', objectId: req.user.id },
            Name: x.Name,
-            Email: x.Email?.toLowerCase()?.replace(/\s/g, ''),
+            Email: x.Email,
            IsDeleted: false,
            IsImported: true,
            ...(x?.Phone ? { Phone: `${x?.Phone}` } : {}),
@@ -1,8 +1,14 @@
 import axios from 'axios';
-import { cloudServerUrl, replaceMailVaribles } from '../../Utils.js';
+import {
+  cloudServerUrl,
+  replaceMailVaribles,
+} from '../../Utils.js';
 const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const appId = process.env.APP_ID;
-async function deductcount(docsCount, extUserId) {
+async function deductcount(
+  docsCount,
+  extUserId,
+) {
  try {
    const extCls = new Parse.Object('contracts_Users');
    extCls.id = extUserId;
@@ -12,9 +18,9 @@ async function deductcount(docsCount, extUserId) {
    console.log('Err in deduct in quick send', err);
  }
 }
-async function sendMail(document, publicUrl) {
+async function sendMail(document) {
  //sessionToken
-  const baseUrl = new URL(publicUrl); //process.env.PUBLIC_URL
+  const baseUrl = new URL(process.env.PUBLIC_URL);

  // console.log("pdfDetails", pdfDetails);
  const timeToCompleteDays = document?.TimeToCompleteDays || 15;
@@ -27,8 +33,10 @@ async function sendMail(document, publicUrl) {
    year: 'numeric',
  });
  let signerMail = document.Placeholders;
-  const senderName = document.ExtUserPtr.Name;
-  const senderEmail = document.ExtUserPtr.Email;
+  const senderName =
+    document.ExtUserPtr.Name;
+  const senderEmail =
+    document.ExtUserPtr.Email;

  if (document.SendinOrder) {
    signerMail = signerMail.slice();
@@ -62,7 +70,6 @@ async function sendMail(document, publicUrl) {
          '</body></html>';
        const variables = {
          document_title: document?.Name,
-          note: document?.Note || '',
          sender_name: senderName,
          sender_mail: senderEmail,
          sender_phone: senderObj?.Phone || '',
@@ -76,7 +83,6 @@ async function sendMail(document, publicUrl) {
        replaceVar = replaceMailVaribles(mailSubject, htmlReqBody, variables);
      }
      const mailparam = {
-        note: document?.Note || '',
        senderName: senderName,
        senderMail: senderEmail,
        title: document.Name,
@@ -88,7 +94,8 @@ async function sendMail(document, publicUrl) {
        extUserId: document.ExtUserPtr.objectId,
        recipient: objectId ? existSigner?.Email : signerMail[i].email,
        subject: replaceVar?.subject ? replaceVar?.subject : mailTemplate(mailparam).subject,
-        from: document.ExtUserPtr.Email,
+        from:
+          document.ExtUserPtr.Email,
        replyto: senderEmail || '',
        html: replaceVar?.body ? replaceVar?.body : mailTemplate(mailparam).body,
      };
@@ -101,7 +108,13 @@ async function sendMail(document, publicUrl) {
    }
  }
 }
-async function batchQuery(userId, Documents, Ip, parseConfig, type, publicUrl) {
+async function batchQuery(
+  userId,
+  Documents,
+  Ip,
+  parseConfig,
+  type
+) {
  const extCls = new Parse.Query('contracts_Users');
  extCls.equalTo('UserId', {
    __type: 'Pointer',
@@ -186,22 +199,22 @@ async function batchQuery(userId, Documents, Ip, parseConfig, type, publicUrl) {
        };
      });
      // console.log('requests ', requests);
-      if (requests?.length > 0) {
-        const newrequests = [requests?.[0]];
-        const response = await axios.post('batch', { requests: newrequests }, parseConfig);
-        // Handle the batch query response
-        // console.log('Batch query response:', response.data);
-        if (response.data && response.data.length > 0) {
-          const document = Documents?.[0];
-          const updateDocuments = {
-            ...document,
-            objectId: response.data[0]?.success?.objectId,
-            createdAt: response.data[0]?.success?.createdAt,
-          };
-          deductcount(response.data.length, resExt.id);
-          sendMail(updateDocuments, publicUrl); //sessionToken
-          return 'success';
-        }
+        if (requests?.length > 0) {
+          const newrequests = [requests?.[0]];
+          const response = await axios.post('batch', { requests: newrequests }, parseConfig);
+          // Handle the batch query response
+          // console.log('Batch query response:', response.data);
+          if (response.data && response.data.length > 0) {
+            const document = Documents?.[0];
+            const updateDocuments = {
+              ...document,
+              objectId: response.data[0]?.success?.objectId,
+              createdAt: response.data[0]?.success?.createdAt,
+            };
+            deductcount(response.data.length, resExt.id);
+            sendMail(updateDocuments); //sessionToken
+            return 'success';
+          }
      }
    } catch (error) {
      const code = error?.response?.data?.code || error?.response?.status || error?.code || 400;
@@ -223,8 +236,6 @@ export default async function createBatchDocs(request) {
  const type = request.headers?.type || 'quicksend';
  const Documents = JSON.parse(strDocuments);
  const Ip = request?.headers?.['x-real-ip'] || '';
-  // Access the host from the headers
-  const publicUrl = request.headers.public_url;
  const parseConfig = {
    baseURL: serverUrl,
    headers: {
@@ -235,8 +246,9 @@ export default async function createBatchDocs(request) {
  };
  try {
    if (request?.user) {
-      return await batchQuery(request.user.id, Documents, Ip, parseConfig, '', type, publicUrl);
-    } else {
+      return await batchQuery(request.user.id, Documents, Ip, parseConfig, '', type);
+    }
+    else {
      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
    }
  } catch (err) {
@@ -15,7 +15,7 @@ export default async function editContact(request) {
      const query = new Parse.Query('contracts_Contactbook');
      query.equalTo('CreatedBy', createdBy);
      query.notEqualTo('IsDeleted', true);
-      query.equalTo('Email', email?.toLowerCase()?.replace(/\s/g, ''));
+      query.equalTo('Email', email);
      const isContactExist = await query.first({ useMasterKey: true });
      if (isContactExist) {
        throw new Parse.Error(Parse.Error.DUPLICATE_VALUE, 'Contact already exists.');
@@ -25,7 +25,7 @@ export default async function editContact(request) {
      if (phone) {
        contactQuery.set('Phone', phone);
      }
-      contactQuery.set('Email', email?.toLowerCase()?.replace(/\s/g, ''));
+      contactQuery.set('Email', email);
      contactQuery.set('UserRole', 'contracts_Guest');
      contactQuery.set('IsDeleted', false);
      contactQuery.set('TenantId', {
@@ -37,9 +37,9 @@ export default async function editContact(request) {
        const _users = Parse.Object.extend('User');
        const _user = new _users();
        _user.set('name', name);
-        _user.set('username', email?.toLowerCase()?.replace(/\s/g, ''));
-        _user.set('email', email?.toLowerCase()?.replace(/\s/g, ''));
-        _user.set('password', email?.toLowerCase()?.replace(/\s/g, ''));
+        _user.set('username', email);
+        _user.set('email', email);
+        _user.set('password', email);
        if (phone) {
          _user.set('phone', phone);
        }
@@ -0,0 +1,14 @@
+import { PostHog } from 'posthog-node';
+const ph_project_api_key = process.env.PH_PROJECT_API_KEY;
+const client = ph_project_api_key ? new PostHog(ph_project_api_key) : '';
+export default async function encryptedpdf(request) {
+  const email = request.params.email;
+  if (client) {
+    client?.capture({
+      distinctId: email,
+      event: 'encrypted_pdf_error',
+      properties: { response_code: 200 },
+    });
+  }
+  return { message: 'success' };
+}
@@ -12,18 +12,21 @@ const eSignName = 'OpenSign';
 const eSigncontact = 'hello@opensignlabs.com';

 // `uploadFile` is used to create url in from pdfFile
-async function uploadFile(pdfName, filepath) {
+async function uploadFile(
+  pdfName,
+  filepath,
+) {
  try {
    const filedata = fs.readFileSync(filepath);
    let fileUrl;
-    const file = new Parse.File(pdfName, [...filedata], 'application/pdf');
-    await file.save({ useMasterKey: true });
-    const fileRes = getSecureUrl(file.url());
-    fileUrl = fileRes.url;
+      const file = new Parse.File(pdfName, [...filedata], 'application/pdf');
+      await file.save({ useMasterKey: true });
+      const fileRes = getSecureUrl(file.url());
+      fileUrl = fileRes.url;
    return { imageUrl: fileUrl };
  } catch (err) {
    console.log('Err ', err);
-    // `unlinkCertificate` is used to remove exported certificate file from exports folder
+    // `unlinkCertificate` is used to remove exported signed pdf file from exports folder
    unlinkCertificate(filepath);
  }
 }
@@ -83,7 +86,10 @@ export default async function generateCertificatebydocId(req) {

      //below is used to save signed certificate in exports folder
      fs.writeFileSync(certificatePath, signedCertificate);
-      const file = await uploadFile('certificate.pdf', certificatePath);
+      const file = await uploadFile(
+        'certificate.pdf',
+        certificatePath,
+      );
      const updateDoc = new Parse.Object('contracts_Document');
      updateDoc.id = doc.objectId;
      updateDoc.set('CertificateUrl', file.imageUrl);
@@ -1,5 +1,7 @@
 import axios from 'axios';
-import { cloudServerUrl } from '../../Utils.js';
+import {
+  cloudServerUrl,
+} from '../../Utils.js';
 export default async function getDocument(request) {
  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
  const docId = request.params.docId;
@@ -45,12 +47,13 @@ export default async function getDocument(request) {
                console.log('err user in not authenticated', err);
                return { error: "You don't have access of this document!" };
              }
-            } else {
+            }
+            else {
              return { error: "You don't have access of this document!" };
            }
          }
        } else {
-          return { error: "document deleted or you don't have access." };
+          return { error: "You don't have access of this document!" };
        }
      } catch (err) {
        console.log('err', err);
@@ -13,6 +13,8 @@ export default async function getUserListByOrg(req) {
      extUser.equalTo('OrganizationId', orgPtr);
      extUser.include('TeamIds');
      extUser.descending('createdAt');
+      extUser.exclude('DailyEmailReset');
+      extUser.exclude('DailyEmailCount');
      const userRes = await extUser.find({ useMasterKey: true });
      if (userRes.length > 0) {
        const _userRes = JSON.parse(JSON.stringify(userRes));
@@ -52,8 +52,7 @@ const saveRoleContact = async contact => {
 // `linkContactToDoc` cloud function is used to create contact, add this contact in contracts_Guest role and
 // save contact pointer in placeholder, signers and ACL of Document
 export default async function linkContactToDoc(req) {
-  const requestemail = req.params?.email;
-  const email = requestemail?.toLowerCase()?.replace(/\s/g, '');
+  const email = req.params.email;
  const docId = req.params.docId;
  const name = req.params.name;
  const phone = req.params.phone;
@@ -1,35 +0,0 @@
-import { exec } from 'child_process';
-
-export default function DigitalSign(pdf, pfx, details) {
-  const signcmd = `java -jar PDFDigitalSigner.jar "${pdf}" "${pfx.name}" "${pfx.passphrase}" "${details.name}" "${details.location}" "${details.reason}"`;
-  // const signcmd = `java -jar PDFDigitalSigner.jar "${pdf}" keystore.pfx opensign "${details.name}" "${details.location}" "${details.reason}"`;
-  return new Promise((resolve, reject) => {
-    exec(signcmd, (error, stdout, stderr) => {
-      if (error) {
-        reject(`Error: ${error.message}`);
-      }
-      if (stderr) {
-        reject(`stderr: ${stderr}`);
-      }
-      // Resolve the promise with the output
-      resolve(stdout.trim());
-    });
-  });
-}
-
-export async function retryAsync(fn, args = [], retries = 3, delay = 2000) {
-  for (let attempt = 1; attempt <= retries; attempt++) {
-    try {
-      const response = await fn(...args); // Try executing the async function
-      if (response) return { response, attempt }; // Stop retrying if response is received
-    } catch (error) {
-      if (attempt < retries) {
-        console.log(`Attempt ${attempt} failed. Retrying in ${delay / 1000} seconds...\n`);
-        await new Promise(resolve => setTimeout(resolve, delay)); // Wait before retrying
-      } else {
-        return { error, attempt };
-        // throw new Error(error);
-      }
-    }
-  }
-}
@@ -1,12 +1,12 @@
 import { PDFDocument, rgb } from 'pdf-lib';
 import fs from 'node:fs';
 import fontkit from '@pdf-lib/fontkit';
-import { formatDateTime } from '../../../Utils.js';
+import {
+  formatTimeInTimezone,
+} from '../../../Utils.js';

 export default async function GenerateCertificate(docDetails) {
  const timezone = docDetails?.ExtUserPtr?.Timezone || '';
-  const Is12Hr = docDetails?.ExtUserPtr?.Is12HourTime || false;
-  const DateFormat = docDetails?.ExtUserPtr?.DateFormat || 'MM/DD/YYYY';
  const pdfDoc = await PDFDocument.create();
  // `fontBytes` is used to embed custom font in pdf
  const fontBytes = fs.readFileSync('./font/times.ttf'); //
@@ -22,27 +22,23 @@ export default async function GenerateCertificate(docDetails) {
  const titleColor = rgb(0, 0.2, 0.4); //rgb(0, 0.53, 0.71);
  const titleUnderline = rgb(0, 0.2, 0.4); // rgb(0.12, 0.12, 0.12);
  const title = 25;
-  const subtitle = 16;
-  const text = 13;
-  const signertext = 13;
+  const subtitle = 20;
+  const text = 14;
  const timeText = 11;
  const textKeyColor = rgb(0.12, 0.12, 0.12);
  const textValueColor = rgb(0.3, 0.3, 0.3);
  const completedAt = docDetails?.completedAt ? new Date(docDetails?.completedAt) : new Date();
-  const completedAtperTimezone = formatDateTime(completedAt, DateFormat, timezone, Is12Hr);
+  const completedAtperTimezone = formatTimeInTimezone(completedAt, timezone);
  const completedUTCtime = completedAtperTimezone;
  const signersCount = docDetails?.Signers?.length || 1;
  const generateAt = docDetails?.completedAt ? new Date(docDetails?.completedAt) : new Date();
-  const generatedAtperTimezone = formatDateTime(generateAt, DateFormat, timezone, Is12Hr);
+  const generatedAtperTimezone = formatTimeInTimezone(generateAt, timezone);
  const generatedUTCTime = generatedAtperTimezone;
  const generatedOn = 'Generated On ' + generatedUTCTime;
-  const textWidth = timesRomanFont.widthOfTextAtSize(generatedOn, 12);
-  const margin = 30;
-  const maxX = width - margin - textWidth; // Ensures text stays inside the border with 30px margin
  const OriginIp = docDetails?.OriginIp || '';
  const company = docDetails?.ExtUserPtr?.Company || '';
  const createdAt = docDetails?.DocSentAt?.iso || docDetails.createdAt;
-  const createdAtperTimezone = formatDateTime(createdAt, DateFormat, timezone, Is12Hr);
+  const createdAtperTimezone = formatTimeInTimezone(createdAt, timezone);
  const IsEnableOTP = docDetails?.IsEnableOTP || false;
  const filteredaudit = docDetails?.AuditTrail?.filter(x => x?.UserPtr?.objectId);
  const auditTrail =
@@ -79,15 +75,15 @@ export default async function GenerateCertificate(docDetails) {
    borderColor: borderColor,
    borderWidth: 1,
  });
-  page.drawImage(pngImage, {
-    x: 30,
-    y: 790,
-    width: 100,
-    height: 25,
-  });
+    page.drawImage(pngImage, {
+      x: 30,
+      y: 790,
+      width: 100,
+      height: 25,
+    });

  page.drawText(generatedOn, {
-    x: Math.max(startX, maxX), // Adjusts dynamically 320
+    x: 320,
    y: 810,
    size: 12,
    font: timesRomanFont,
@@ -96,13 +92,13 @@ export default async function GenerateCertificate(docDetails) {

  page.drawText('Certificate of Completion', {
    x: 160,
-    y: 755,
+    y: 750,
    size: title,
    font: timesRomanFont,
    color: titleColor,
  });

-  const underlineY = 745;
+  const underlineY = 740;
  page.drawLine({
    start: { x: 30, y: underlineY },
    end: { x: width - 30, y: underlineY },
@@ -112,7 +108,7 @@ export default async function GenerateCertificate(docDetails) {

  page.drawText('Summary', {
    x: 30,
-    y: 727,
+    y: 710,
    size: subtitle,
    font: timesRomanFont,
    color: titleColor,
@@ -120,15 +116,15 @@ export default async function GenerateCertificate(docDetails) {

  page.drawText('Document Id :', {
    x: 30,
-    y: 710,
+    y: 685,
    size: text,
    font: timesRomanFont,
    color: textKeyColor,
  });

  page.drawText(docDetails.objectId, {
-    x: 110,
-    y: 710,
+    x: 115,
+    y: 685,
    size: text,
    font: timesRomanFont,
    color: textValueColor,
@@ -136,15 +132,15 @@ export default async function GenerateCertificate(docDetails) {

  page.drawText('Document Name :', {
    x: 30,
-    y: 690,
+    y: 665,
    size: text,
    font: timesRomanFont,
    color: textKeyColor,
  });

  page.drawText(docDetails?.Name, {
-    x: 130,
-    y: 690,
+    x: 140,
+    y: 665,
    size: docDetails?.Name?.length >= 78 ? 12 : text,
    font: timesRomanFont,
    color: textValueColor,
@@ -152,52 +148,52 @@ export default async function GenerateCertificate(docDetails) {

  page.drawText('Organization :', {
    x: 30,
-    y: 670,
+    y: 645,
    size: text,
    font: timesRomanFont,
    color: textKeyColor,
  });

  page.drawText(company, {
-    x: 110,
-    y: 670,
+    x: 115,
+    y: 645,
    size: text,
    font: timesRomanFont,
    color: textValueColor,
  });
  page.drawText('Created on :', {
    x: 30,
-    y: 650,
+    y: 625,
    size: text,
    font: timesRomanFont,
    color: textKeyColor,
  });

  page.drawText(`${createdAtperTimezone}`, {
-    x: 97,
-    y: 650,
+    x: 105,
+    y: 625,
    size: text,
    font: timesRomanFont,
    color: textValueColor,
  });
  page.drawText('Completed on :', {
    x: 30,
-    y: 630,
+    y: 605,
    size: text,
    font: timesRomanFont,
    color: textKeyColor,
  });

  page.drawText(`${completedUTCtime}`, {
-    x: 115,
-    y: 630,
+    x: 125,
+    y: 605,
    size: text,
    font: timesRomanFont,
    color: textValueColor,
  });
  page.drawText('Signers :', {
    x: 30,
-    y: 610,
+    y: 585,
    size: text,
    font: timesRomanFont,
    color: textKeyColor,
@@ -205,76 +201,73 @@ export default async function GenerateCertificate(docDetails) {

  page.drawText(`${signersCount}`, {
    x: 80,
-    y: 610,
+    y: 585,
    size: text,
    font: timesRomanFont,
    color: textValueColor,
  });
  page.drawText('Document originator', {
    x: 30,
-    y: 590,
+    y: 565,
    size: 17,
    font: timesRomanFont,
    color: titleColor,
  });
  page.drawText('Name :', {
    x: 60,
-    y: 573,
+    y: 545,
    size: text,
    font: timesRomanFont,
    color: textKeyColor,
  });
  page.drawText(ownerName, {
    x: 105,
-    y: 573,
+    y: 545,
    size: text,
    font: timesRomanFont,
    color: textValueColor,
  });
  page.drawText('Email :', {
    x: 60,
-    y: 553,
+    y: 525,
    size: text,
    font: timesRomanFont,
    color: textKeyColor,
  });
  page.drawText(ownerEmail, {
    x: 105,
-    y: 553,
+    y: 525,
    size: text,
    font: timesRomanFont,
    color: textValueColor,
  });
  page.drawText('IP address :', {
    x: 60,
-    y: 533,
+    y: 505,
    size: text,
    font: timesRomanFont,
    color: textKeyColor,
  });
  page.drawText(`${OriginIp}`, {
-    x: 125,
-    y: 533,
+    x: 130,
+    y: 505,
    size: text,
    font: timesRomanFont,
    color: textValueColor,
  });

  page.drawLine({
-    start: { x: 30, y: 527 },
-    end: { x: width - 30, y: 527 },
+    start: { x: 30, y: 495 },
+    end: { x: width - 30, y: 495 },
    color: rgb(0.12, 0.12, 0.12),
    thickness: 0.5,
  });
-  let yPosition1 = 512;
-  let yPosition2 = 498;
-  let yPosition3 = 478;
-  let yPosition4 = 458;
-  let yPosition5 = 438;
-  let yPosition6 = 418;
-  let yPosition7 = 398;
-  let yPosition8 = 363;
-
+  let yPosition1 = 475;
+  let yPosition2 = 455;
+  let yPosition3 = 435;
+  let yPosition4 = 415;
+  let yPosition5 = 395;
+  let yPosition6 = 360;
  auditTrail.slice(0, 3).forEach(async (x, i) => {
    const embedPng = x.Signature ? await pdfDoc.embedPng(x.Signature) : '';
    page.drawText(`Signer ${i + 1}`, {
@@ -287,7 +280,7 @@ export default async function GenerateCertificate(docDetails) {
    page.drawText('Name :', {
      x: 30,
      y: yPosition2,
-      size: signertext,
+      size: text,
      font: timesRomanFont,
      color: textKeyColor,
    });
@@ -295,32 +288,32 @@ export default async function GenerateCertificate(docDetails) {
    page.drawText(x?.Name, {
      x: 75,
      y: yPosition2,
-      size: signertext,
+      size: text,
      font: timesRomanFont,
      color: textValueColor,
    });

-    if (IsEnableOTP) {
-      page.drawText('Security level :', {
-        x: half + 120,
-        y: yPosition2,
-        size: timeText,
-        font: timesRomanFont,
-        color: textKeyColor,
-      });
-      page.drawText('Email, OTP Auth', {
-        x: half + 190,
-        y: yPosition2,
-        size: timeText,
-        font: timesRomanFont,
-        color: textValueColor,
-      });
-    }
+    page.drawText('Viewed on :', {
+      x: half + 45,
+      y: yPosition2,
+      size: timeText,
+      font: timesRomanFont,
+      color: textKeyColor,
+    });
+
+    //new Date(x.ViewedOn).toUTCString()
+    page.drawText(`${formatTimeInTimezone(x.ViewedOn, timezone)}`, {
+      x: half + 102,
+      y: yPosition2,
+      size: timeText,
+      font: timesRomanFont,
+      color: textValueColor,
+    });

    page.drawText('Email :', {
      x: 30,
      y: yPosition3,
-      size: signertext,
+      size: text,
      font: timesRomanFont,
      color: textKeyColor,
    });
@@ -328,70 +321,70 @@ export default async function GenerateCertificate(docDetails) {
    page.drawText(x?.Email, {
      x: 75,
      y: yPosition3,
-      size: signertext,
-      font: timesRomanFont,
-      color: textValueColor,
-    });
-
-    page.drawText('Viewed on :', {
-      x: 30,
-      y: yPosition4,
-      size: signertext,
-      font: timesRomanFont,
-      color: textKeyColor,
-    });
-
-    page.drawText(`${formatDateTime(x.ViewedOn, DateFormat, timezone, Is12Hr)}`, {
-      x: 97,
-      y: yPosition4,
-      size: signertext,
+      size: text,
      font: timesRomanFont,
      color: textValueColor,
    });

    page.drawText('Signed on :', {
-      x: 30,
-      y: yPosition5,
-      size: signertext,
+      x: half + 45,
+      y: yPosition3 + 5,
+      size: timeText,
      font: timesRomanFont,
      color: textKeyColor,
    });

-    page.drawText(`${formatDateTime(x.SignedOn, DateFormat, timezone, Is12Hr)}`, {
-      x: 95,
-      y: yPosition5,
-      size: signertext,
+    // new Date(x.SignedOn).toUTCString()
+    page.drawText(`${formatTimeInTimezone(x.SignedOn, timezone)}`, {
+      x: half + 98,
+      y: yPosition3 + 5,
+      size: timeText,
      font: timesRomanFont,
      color: textValueColor,
    });

    page.drawText('IP address :', {
      x: 30,
-      y: yPosition6,
-      size: signertext,
+      y: yPosition4,
+      size: text,
      font: timesRomanFont,
      color: textKeyColor,
    });

    page.drawText(x?.ipAddress, {
-      x: 95,
-      y: yPosition6,
-      size: signertext,
+      x: 100,
+      y: yPosition4,
+      size: 13,
      font: timesRomanFont,
      color: textValueColor,
    });
-
+    if (IsEnableOTP) {
+      page.drawText('Security level :', {
+        x: half + 45,
+        y: yPosition4 + 10,
+        size: timeText,
+        font: timesRomanFont,
+        color: textKeyColor,
+      });
+      page.drawText('Email, OTP Auth', {
+        x: half + 115,
+        y: yPosition4 + 10,
+        size: timeText,
+        font: timesRomanFont,
+        color: textValueColor,
+      });
+    }
    page.drawText('Signature :', {
      x: 30,
-      y: yPosition7,
-      size: signertext,
+      y: yPosition5,
+      size: text,
      font: timesRomanFont,
      color: textKeyColor,
    });

    page.drawRectangle({
      x: 98,
-      y: yPosition7 - 30,
+      y: yPosition5 - 30,
      width: 104,
      height: 44,
      borderColor: rgb(0.22, 0.18, 0.47),
@@ -400,26 +393,24 @@ export default async function GenerateCertificate(docDetails) {
    if (embedPng) {
      page.drawImage(embedPng, {
        x: 100,
-        y: yPosition7 - 27,
+        y: yPosition5 - 27,
        width: 100,
        height: 40,
      });
    }
    page.drawLine({
-      start: { x: 30, y: yPosition8 },
-      end: { x: width - 30, y: yPosition8 },
+      start: { x: 30, y: yPosition6 },
+      end: { x: width - 30, y: yPosition6 },
      color: rgb(0.12, 0.12, 0.12),
      thickness: 0.5,
    });

-    yPosition1 = yPosition8 - 20;
+    yPosition1 = yPosition6 - 20;
    yPosition2 = yPosition1 - 20;
    yPosition3 = yPosition2 - 20;
    yPosition4 = yPosition3 - 20;
    yPosition5 = yPosition4 - 20;
-    yPosition6 = yPosition5 - 20;
-    yPosition7 = yPosition6 - 20;
-    yPosition8 = yPosition8 - 174;
+    yPosition6 = yPosition6 - 140;
  });

  if (auditTrail.length > 3) {
@@ -429,7 +420,7 @@ export default async function GenerateCertificate(docDetails) {
      const embedPng = x.Signature ? await pdfDoc.embedPng(x.Signature) : '';

      // Calculate remaining space on current page
-      const remainingSpace = yPosition8;
+      const remainingSpace = yPosition6;

      // If there's not enough space for the next entry, create a new page
      if (remainingSpace < 90) {
@@ -449,10 +440,7 @@ export default async function GenerateCertificate(docDetails) {
        yPosition3 = yPosition2 - 20;
        yPosition4 = yPosition3 - 20;
        yPosition5 = yPosition4 - 20;
-        yPosition5 = yPosition4 - 20;
-        yPosition6 = yPosition5 - 20;
-        yPosition7 = yPosition6 - 20;
-        yPosition8 = currentPage.getHeight() - 190;
+        yPosition6 = currentPage.getHeight() - 160;
      }

      currentPage.drawText(`Signer ${4 + i}`, {
@@ -465,7 +453,7 @@ export default async function GenerateCertificate(docDetails) {
      currentPage.drawText('Name :', {
        x: 30,
        y: yPosition2,
-        size: signertext,
+        size: text,
        font: timesRomanFont,
        color: textKeyColor,
      });
@@ -473,32 +461,32 @@ export default async function GenerateCertificate(docDetails) {
      currentPage.drawText(x?.Name, {
        x: 75,
        y: yPosition2,
-        size: signertext,
+        size: text,
        font: timesRomanFont,
        color: textValueColor,
      });

-      if (IsEnableOTP) {
-        currentPage.drawText('Security level :', {
-          x: half + 120,
-          y: yPosition2,
-          size: timeText,
-          font: timesRomanFont,
-          color: textKeyColor,
-        });
-        currentPage.drawText(`Email, OTP Auth`, {
-          x: half + 190,
-          y: yPosition2,
-          size: timeText,
-          font: timesRomanFont,
-          color: textValueColor,
-        });
-      }
+      currentPage.drawText('Viewed on :', {
+        x: half + 45,
+        y: yPosition2,
+        size: timeText,
+        font: timesRomanFont,
+        color: textKeyColor,
+      });
+
+      // new Date(x.ViewedOn).toUTCString()
+      currentPage.drawText(`${formatTimeInTimezone(x.ViewedOn, timezone)}`, {
+        x: half + 102,
+        y: yPosition2,
+        size: timeText,
+        font: timesRomanFont,
+        color: textValueColor,
+      });

      currentPage.drawText('Email :', {
        x: 30,
        y: yPosition3,
-        size: signertext,
+        size: text,
        font: timesRomanFont,
        color: textKeyColor,
      });
@@ -506,68 +494,70 @@ export default async function GenerateCertificate(docDetails) {
      currentPage.drawText(x?.Email, {
        x: 75,
        y: yPosition3,
-        size: signertext,
+        size: text,
        font: timesRomanFont,
        color: textValueColor,
      });

-      currentPage.drawText('Viewed on :', {
-        x: 30,
-        y: yPosition4,
-        size: signertext,
-        font: timesRomanFont,
-        color: textKeyColor,
-      });
-
-      currentPage.drawText(`${formatDateTime(x.ViewedOn, DateFormat, timezone, Is12Hr)}`, {
-        x: 97,
-        y: yPosition4,
-        size: signertext,
-        font: timesRomanFont,
-        color: textValueColor,
-      });
      currentPage.drawText('Signed on :', {
-        x: 30,
-        y: yPosition5,
-        size: signertext,
+        x: half + 45,
+        y: yPosition3 + 5,
+        size: timeText,
        font: timesRomanFont,
        color: textKeyColor,
      });

-      currentPage.drawText(`${formatDateTime(x.SignedOn, DateFormat, timezone, Is12Hr)}`, {
-        x: 95,
-        y: yPosition5,
-        size: signertext,
+      // new Date(x.SignedOn).toUTCString()
+      currentPage.drawText(`${formatTimeInTimezone(x.SignedOn, timezone)}`, {
+        x: half + 98,
+        y: yPosition3 + 5,
+        size: timeText,
        font: timesRomanFont,
        color: textValueColor,
      });

      currentPage.drawText('IP address :', {
        x: 30,
-        y: yPosition6,
-        size: signertext,
+        y: yPosition4,
+        size: text,
        font: timesRomanFont,
        color: textKeyColor,
      });

      currentPage.drawText(x?.ipAddress, {
        x: 100,
-        y: yPosition6,
-        size: signertext,
+        y: yPosition4,
+        size: text,
        font: timesRomanFont,
        color: textValueColor,
      });

+      if (IsEnableOTP) {
+        currentPage.drawText('Security level :', {
+          x: half + 45,
+          y: yPosition4 + 10,
+          size: timeText,
+          font: timesRomanFont,
+          color: textKeyColor,
+        });
+        currentPage.drawText(`Email, OTP Auth`, {
+          x: half + 115,
+          y: yPosition4 + 10,
+          size: timeText,
+          font: timesRomanFont,
+          color: textValueColor,
+        });
+      }
      currentPage.drawText('Signature :', {
        x: 30,
-        y: yPosition7,
-        size: signertext,
+        y: yPosition5,
+        size: text,
        font: timesRomanFont,
        color: textKeyColor,
      });
      currentPage.drawRectangle({
        x: 98,
-        y: yPosition7 - 27,
+        y: yPosition5 - 27,
        width: 104,
        height: 44,
        borderColor: rgb(0.22, 0.18, 0.47),
@@ -576,28 +566,26 @@ export default async function GenerateCertificate(docDetails) {
      if (embedPng) {
        currentPage.drawImage(embedPng, {
          x: 100,
-          y: yPosition7 - 25,
+          y: yPosition5 - 25,
          width: 100,
          height: 40,
        });
      }

      currentPage.drawLine({
-        start: { x: 30, y: yPosition8 },
-        end: { x: width - 30, y: yPosition8 },
+        start: { x: 30, y: yPosition6 },
+        end: { x: width - 30, y: yPosition6 },
        color: rgb(0.12, 0.12, 0.12),
        thickness: 0.5,
      });

      // Update y positions for the next entry
-      yPosition1 = yPosition8 - 20;
+      yPosition1 = yPosition6 - 20;
      yPosition2 = yPosition1 - 20;
      yPosition3 = yPosition2 - 20;
      yPosition4 = yPosition3 - 20;
      yPosition5 = yPosition4 - 20;
-      yPosition6 = yPosition5 - 20;
-      yPosition7 = yPosition6 - 20;
-      yPosition8 = yPosition8 - 174;
+      yPosition6 = yPosition6 - 140;
    });
  }

@@ -1,5 +1,8 @@
 import fs from 'node:fs';
 import axios from 'axios';
+import { SignPdf } from '@signpdf/signpdf';
+import { P12Signer } from '@signpdf/signer-p12';
+import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib';
 import { PDFDocument } from 'pdf-lib';
 import {
  cloudServerUrl,
@@ -9,26 +12,24 @@ import {
  appName,
 } from '../../../Utils.js';
 import GenerateCertificate from './GenerateCertificate.js';
-import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib';
 import { Placeholder } from './Placeholder.js';
-import { SignPdf } from '@signpdf/signpdf';
-import { P12Signer } from '@signpdf/signer-p12';
-
 const serverUrl = cloudServerUrl; // process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
 const eSignName = 'OpenSign';
 const eSigncontact = 'hello@opensignlabs.com';
-
 // `updateDoc` is used to create url in from pdfFile
-async function uploadFile(pdfName, filepath) {
+async function uploadFile(
+  pdfName,
+  filepath,
+) {
  try {
    const filedata = fs.readFileSync(filepath);
    let fileUrl;
-    const file = new Parse.File(pdfName, [...filedata], 'application/pdf');
-    await file.save({ useMasterKey: true });
-    const fileRes = getSecureUrl(file.url());
-    fileUrl = fileRes.url;
+      const file = new Parse.File(pdfName, [...filedata], 'application/pdf');
+      await file.save({ useMasterKey: true });
+      const fileRes = getSecureUrl(file.url());
+      fileUrl = fileRes.url;

    return { imageUrl: fileUrl };
  } catch (err) {
@@ -90,12 +91,8 @@ async function updateDoc(docId, url, userId, ipAddress, data, className, sign) {
 }

 // `sendNotifyMail` is used to send notification mail of signer signed the document
-async function sendNotifyMail(doc, signUser, mailProvider, publicUrl) {
+async function sendNotifyMail(doc, signUser, mailProvider) {
  try {
-    const TenantAppName = appName;
-    const logo =
-      "<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' style='padding:20px'/>";
-    const opurl = ` <a href=www.opensignlabs.com target=_blank>here</a>`;
    const auditTrailCount = doc?.AuditTrail?.filter(x => x.Activity === 'Signed')?.length || 0;
    const signersCount = doc?.Placeholders?.length;
    const remaingsign = signersCount - auditTrailCount;
@@ -106,18 +103,22 @@ async function sendNotifyMail(doc, signUser, mailProvider, publicUrl) {
      const creatorEmail = doc.ExtUserPtr.Email;
      const signerName = signUser.Name;
      const signerEmail = signUser.Email;
-      const viewDocUrl = `${publicUrl}/recipientSignPdf/${doc.objectId}`; // ` ${process.env.PUBLIC_URL}/recipientSignPdf/${doc.objectId}`;
+      const viewDocUrl = `${process.env.PUBLIC_URL}/recipientSignPdf/${doc.objectId}`;
+      const logo =
+            `<div><img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' style='padding:20px' /></div>`;
+      const opurl =
+            ` <a href=www.opensignlabs.com target=_blank>here</a>`;
      const subject = `Document "${pdfName}" has been signed by ${signerName}`;
      const body =
        "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/></head><body><div style='background-color:#f5f5f5;padding:20px'><div style='background-color:white'>" +
-        `<div>${logo}</div><div style='padding:2px;font-family:system-ui;background-color:#47a3ad'><p style='font-size:20px;font-weight:400;color:white;padding-left:20px'>Document signed by ${signerName}</p>` +
+        `${logo}<div style='padding:2px;font-family:system-ui;background-color:#47a3ad'><p style='font-size:20px;font-weight:400;color:white;padding-left:20px'>Document signed by ${signerName}</p>` +
        `</div><div style='padding:20px;font-family:system-ui;font-size:14px'><p>Dear ${creatorName},</p><p>${pdfName} has been signed by ${signerName} "${signerEmail}" successfully</p>` +
-        `<p><a href=${viewDocUrl} target=_blank>View Document</a></p></div></div><div><p>This is an automated email from ${TenantAppName}. For any queries regarding this email, ` +
-        `please contact the sender ${creatorEmail} directly. If you think this email is inappropriate or spam, you may file a complaint with ${TenantAppName}${opurl}.</p></div></div></body></html>`;
+        `<p><a href=${viewDocUrl} target=_blank>View Document</a></p></div></div><div><p>This is an automated email from ${appName}. For any queries regarding this email, ` +
+        `please contact the sender ${creatorEmail} directly. If you think this email is inappropriate or spam, you may file a complaint with ${appName}${opurl}.</p></div></div></body></html>`;

      const params = {
        extUserId: sender.objectId,
-        from: TenantAppName,
+        from: appName,
        recipient: creatorEmail,
        subject: subject,
        pdfName: pdfName,
@@ -143,10 +144,6 @@ async function sendCompletedMail(obj) {
  const doc = obj.doc;
  const sender = obj.doc.ExtUserPtr;
  const pdfName = doc.Name;
-  const TenantAppName = appName;
-  const logo =
-    "<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' style='padding:20px'/>";
-  const opurl = ` <a href=www.opensignlabs.com target=_blank>here</a>`;
  let signersMail;
  if (doc?.Signers?.length > 0) {
    const isOwnerExistsinSigners = doc?.Signers?.find(x => x.Email === sender.Email);
@@ -157,13 +154,17 @@ async function sendCompletedMail(obj) {
    signersMail = sender.Email;
  }
  const recipient = signersMail;
+  const logo =
+        `<div><img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' style='padding:20px'/></div>`;
+  const opurl =
+        ` <a href=www.opensignlabs.com target=_blank>here</a>.</p></div></div></body></html>`;
  let subject = `Document "${pdfName}" has been signed by all parties`;
  let body =
    "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body><div style='background-color:#f5f5f5;padding:20px'><div style='background-color:white'>" +
-    `<div>${logo}</div><div style='padding:2px;font-family:system-ui;background-color:#47a3ad'><p style='font-size:20px;font-weight:400;color:white;padding-left:20px'>Document signed successfully</p></div><div>` +
+    `${logo}<div style='padding:2px;font-family:system-ui;background-color:#47a3ad'><p style='font-size:20px;font-weight:400;color:white;padding-left:20px'>Document signed successfully</p></div><div>` +
    `<p style='padding:20px;font-family:system-ui;font-size:14px'>All parties have successfully signed the document <b>"${pdfName}"</b>. Kindly download the document from the attachment.</p>` +
-    `</div></div><div><p>This is an automated email from ${TenantAppName}. For any queries regarding this email, please contact the sender ${sender.Email} directly.` +
-    `If you think this email is inappropriate or spam, you may file a complaint with ${TenantAppName}${opurl}.</p></div></div></body></html>`;
+    `</div></div><div><p>This is an automated email from ${appName}. For any queries regarding this email, please contact the sender ${sender.Email} directly.` +
+    `If you think this email is inappropriate or spam, you may file a complaint with ${appName}${opurl}`;

  if (obj?.isCustomMail) {
    const tenant = sender?.TenantId;
@@ -180,7 +181,7 @@ async function sendCompletedMail(obj) {
            className: '_User',
            objectId: userId,
          });
-          const tenantRes = await tenantQuery.first({ useMasterKey: true });
+          const tenantRes = await tenantQuery.first();
          if (tenantRes) {
            const _tenantRes = JSON.parse(JSON.stringify(tenantRes));
            subject = _tenantRes?.CompletionSubject || '';
@@ -201,7 +202,8 @@ async function sendCompletedMail(obj) {

    const variables = {
      document_title: pdfName,
-      sender_name: sender.Name,
+      sender_name:
+        sender.Name,
      sender_mail: doc?.SenderMail || sender.Email,
      sender_phone: sender?.Phone || '',
      receiver_name: sender.Name,
@@ -214,45 +216,49 @@ async function sendCompletedMail(obj) {
    subject = replaceVar.subject;
    body = replaceVar.body;
  }
-  const Bcc = doc?.Bcc?.length > 0 ? doc.Bcc.map(x => x.Email) : [];
-  const updatedBcc = doc?.SenderMail ? [...Bcc, doc?.SenderMail] : Bcc;
+  const Bcc = doc?.Bcc?.length > 0 ? doc.Bcc.map(x => x.Email) : '';
  const params = {
    extUserId: sender.objectId,
    url: url,
-    from: TenantAppName,
-    replyto: doc?.ExtUserPtr?.Email || '',
+    from:
+      appName,
+    replyto:
+      doc?.ExtUserPtr?.Email ||
+      '',
    recipient: recipient,
    subject: subject,
    pdfName: pdfName,
    html: body,
    mailProvider: obj.mailProvider,
-    bcc: updatedBcc?.length > 0 ? updatedBcc : '',
-    certificatePath: `./exports/signed_certificate_${doc.objectId}.pdf`,
+    bcc: Bcc,
+    certificatePath: `./exports/certificate_${doc.objectId}.pdf`,
    filename: obj?.filename,
  };
-  try {
-    const res = await axios.post(serverUrl + '/functions/sendmailv3', params, {
-      headers: {
-        'Content-Type': 'application/json',
-        'X-Parse-Application-Id': APPID,
-        'X-Parse-Master-Key': masterKEY,
-      },
-    });
-    // console.log('res', res.data.result);
-    if (res.data?.result?.status !== 'success') {
-      fs.unlinkSync(`./exports/signed_certificate_${doc.objectId}.pdf`);
-    }
-  } catch (err) {
-    fs.unlinkSync(`./exports/signed_certificate_${doc.objectId}.pdf`);
-  }
+  const res = await axios.post(serverUrl + '/functions/sendmailv3', params, {
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Parse-Application-Id': APPID,
+      'X-Parse-Master-Key': masterKEY,
+    },
+  });
 }

+
 // `sendMailsaveCertifcate` is used send completion mail and update complete status of document
-async function sendMailsaveCertifcate(doc, pfx, isCustomMail, mailProvider, filename) {
+async function sendMailsaveCertifcate(
+  doc,
+  P12Buffer,
+  isCustomMail,
+  mailProvider,
+  filename,
+) {
  const certificate = await GenerateCertificate(doc);
  const certificatePdf = await PDFDocument.load(certificate);
-  const P12Buffer = fs.readFileSync(pfx.name);
-  const p12 = new P12Signer(P12Buffer, { passphrase: pfx.passphrase || null });
+  let passphrase = process.env.PASS_PHRASE;
+  if (doc?.ExtUserPtr?.TenantId?.PfxFile?.password) {
+    passphrase = doc?.ExtUserPtr?.TenantId?.PfxFile?.password;
+  }
+  const p12 = new P12Signer(P12Buffer, { passphrase: passphrase || null });
  //  `pdflibAddPlaceholder` is used to add code of only digitial sign in certificate
  pdflibAddPlaceholder({
    pdfDoc: certificatePdf,
@@ -268,11 +274,13 @@ async function sendMailsaveCertifcate(doc, pfx, isCustomMail, mailProvider, file
  const certificateOBJ = new SignPdf();
  // `signedCertificate` is used to sign certificate digitally
  const signedCertificate = await certificateOBJ.sign(CertificateBuffer, p12);
-  const certificatePath = `./exports/signed_certificate_${doc.objectId}.pdf`;
-
+  const certificatePath = `./exports/certificate_${doc.objectId}.pdf`;
  //below is used to save signed certificate in exports folder
  fs.writeFileSync(certificatePath, signedCertificate);
-  const file = await uploadFile('certificate.pdf', certificatePath);
+  const file = await uploadFile(
+    'certificate.pdf',
+    certificatePath,
+  );
  const body = { CertificateUrl: file.imageUrl };
  await axios.put(serverUrl + '/classes/contracts_Document/' + doc.objectId, body, {
    headers: {
@@ -288,7 +296,6 @@ async function sendMailsaveCertifcate(doc, pfx, isCustomMail, mailProvider, file
    sendCompletedMail({ isCustomMail, doc, mailProvider, filename });
  }
  saveFileUsage(CertificateBuffer.length, file.imageUrl, doc?.CreatedBy?.objectId);
-  fs.unlinkSync(pfx.name);
 }
 /**
 *
@@ -297,16 +304,13 @@ async function sendMailsaveCertifcate(doc, pfx, isCustomMail, mailProvider, file
 * @returns if success {status, data} else {status, message}
 */
 async function PDF(req) {
-  const docId = req.params.docId;
-  const randomNumber = Math.floor(Math.random() * 5000);
-  const pfxname = `keystore_${randomNumber}.pfx`;
  try {
    const userIP = req.headers['x-real-ip']; // client IPaddress
+    const docId = req.params.docId;
    const reqUserId = req.params.userId;
    const isCustomMail = req.params.isCustomCompletionMail || false;
    const mailProvider = req.params.mailProvider || '';
    const sign = req.params.signature || '';
-    const publicUrl = req.headers.public_url;
    // below bode is used to get info of docId
    const docQuery = new Parse.Query('contracts_Document');
    docQuery.include('ExtUserPtr,Signers,ExtUserPtr.TenantId,Bcc');
@@ -350,9 +354,9 @@ async function PDF(req) {
        pfxFile = _resDoc?.ExtUserPtr?.TenantId?.PfxFile?.base64;
        passphrase = _resDoc?.ExtUserPtr?.TenantId?.PfxFile?.password;
      }
-      const pfx = { name: pfxname, passphrase: passphrase };
+      // const P12Buffer = fs.readFileSync();
      const P12Buffer = Buffer.from(pfxFile, 'base64');
-      fs.writeFileSync(pfxname, P12Buffer);
+      const p12Cert = new P12Signer(P12Buffer, { passphrase: passphrase || null });
      const UserPtr = { __type: 'Pointer', className: className, objectId: signUser.objectId };
      const obj = { UserPtr: UserPtr, SignedUrl: '', Activity: 'Signed', ipAddress: userIP };
      let updateAuditTrail;
@@ -371,12 +375,12 @@ async function PDF(req) {
      } else {
        isCompleted = true;
      }
+      const randomNumber = Math.floor(Math.random() * 5000);
      // below regex is used to replace all word with "_" except A to Z, a to z, numbers
      const docName = _resDoc?.Name?.replace(/[^a-zA-Z0-9._-]/g, '_')?.toLowerCase();
      const filename = docName?.length > 100 ? docName?.slice(0, 100) : docName;
-      const name = `${filename}_${randomNumber}.pdf`;
-      let filePath = `./exports/${name}`;
-      let signedFilePath = `./exports/signed_${name}`;
+      const name = `signed_${filename}_${randomNumber}.pdf`;
+      const filePath = `./exports/${name}`;
      let pdfSize = PdfBuffer.length;
      if (isCompleted) {
        const signersName = _resDoc.Signers?.map(x => x.Name + ' <' + x.Email + '>');
@@ -390,8 +394,6 @@ async function PDF(req) {
        form.updateFieldAppearances();
        // Flattens the form, converting all form fields into non-editable, static content
        form.flatten();
-        const p12Cert = new P12Signer(P12Buffer, { passphrase: passphrase || null });
-        signedFilePath = `./exports/signed_${name}`;
        Placeholder({
          pdfDoc: pdfDoc,
          reason: `Digitally signed by ${eSignName} for ${reason}`,
@@ -408,18 +410,19 @@ async function PDF(req) {
        const signedDocs = await OBJ.sign(PdfBuffer, p12Cert);

        //`saveUrl` is used to save signed pdf in exports folder
-        fs.writeFileSync(signedFilePath, signedDocs);
+        fs.writeFileSync(filePath, signedDocs);
        pdfSize = signedDocs.length;
-        console.log(`✅ PDF digitally signed created: ${signedFilePath} \n`);
      } else {
        //`saveUrl` is used to save signed pdf in exports folder
-        fs.writeFileSync(signedFilePath, PdfBuffer);
+        fs.writeFileSync(filePath, PdfBuffer);
        pdfSize = PdfBuffer.length;
-        console.log(`New Signed PDF created called: ${signedFilePath}`);
      }

      // `uploadFile` is used to upload pdf to aws s3 and get it's url
-      const data = await uploadFile(`signed_${name}`, signedFilePath);
+      const data = await uploadFile(
+        name,
+        filePath,
+      );

      if (data && data.imageUrl) {
        // `axios` is used to update signed pdf url in contracts_Document classes for given DocId
@@ -432,17 +435,21 @@ async function PDF(req) {
          className, // className based on flow
          sign // sign base64
        );
-        sendNotifyMail(_resDoc, signUser, mailProvider, publicUrl);
+        sendNotifyMail(_resDoc, signUser, mailProvider);
        saveFileUsage(pdfSize, data.imageUrl, _resDoc?.CreatedBy?.objectId);
        if (updatedDoc && updatedDoc.isCompleted) {
          const doc = { ..._resDoc, AuditTrail: updatedDoc.AuditTrail, SignedUrl: data.imageUrl };
-          sendMailsaveCertifcate(doc, pfx, isCustomMail, mailProvider, `signed_${name}`);
-        } else {
-          fs.unlinkSync(pfxname);
+          sendMailsaveCertifcate(
+            doc,
+            P12Buffer,
+            isCustomMail,
+            mailProvider,
+            name,
+          );
        }
        // `fs.unlinkSync` is used to remove exported signed pdf file from exports folder
-        fs.unlinkSync(signedFilePath);
-        // console.log(`New Signed PDF created called: ${filePath}`);
+        fs.unlinkSync(filePath);
+        console.log(`New Signed PDF created called: ${filePath}`);
        if (updatedDoc.message === 'success') {
          return { status: 'success', data: data.imageUrl };
        } else {
@@ -458,15 +465,6 @@ async function PDF(req) {
    }
  } catch (err) {
    console.log('Err in signpdf', err);
-    const body = { DebugginLog: err?.message };
-    try {
-      await axios.put(serverUrl + '/classes/contracts_Document/' + docId, body, {
-        headers: { 'X-Parse-Application-Id': APPID, 'X-Parse-Master-Key': masterKEY },
-      });
-    } catch (err) {
-      console.log('err in saving debugginglog', err);
-    }
-    fs.unlinkSync(pfxname);
    throw err;
  }
 }
@@ -1,87 +0,0 @@
-const randomId = () => Math.floor(1000 + Math.random() * 9000);
-export default async function saveAsTemplate(request) {
-  const docId = request.params.docId;
-  const Ip = request?.headers?.['x-real-ip'] || '';
-
-  if (!request.user) {
-    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'user is not authenticated.');
-  }
-  try {
-    const docQuery = new Parse.Query('contracts_Document');
-    docQuery.equalTo('objectId', docId);
-    docQuery.equalTo('CreatedBy', request.user);
-    docQuery.include('ExtUserPtr');
-    docQuery.include('ExtUserPtr.TenantId');
-    docQuery.notEqualTo('IsArchive', true);
-    const docRes = await docQuery.first({ useMasterKey: true });
-    if (docRes) {
-      const _docRes = docRes?.toJSON();
-      const templateCls = new Parse.Object('contracts_Template');
-      templateCls.set('URL', _docRes?.URL);
-      templateCls.set('Name', _docRes?.Name);
-      templateCls.set('Note', _docRes?.Note);
-      templateCls.set('Description', _docRes?.Description);
-      templateCls.set('OriginIp', Ip);
-      templateCls.set('SendinOrder', _docRes?.SendinOrder || false);
-      templateCls.set('AutomaticReminders', _docRes?.AutomaticReminders || false);
-      templateCls.set('ExtUserPtr', _docRes?.ExtUserPtr);
-      templateCls.set('CreatedBy', _docRes?.CreatedBy);
-      templateCls.set('IsEnableOTP', _docRes?.IsEnableOTP === true ? true : false);
-      templateCls.set('IsTourEnabled', _docRes?.IsTourEnabled === true ? true : false);
-      templateCls.set('AllowModifications', _docRes?.AllowModifications || false);
-      templateCls.set('EmailSenderName', _docRes?.EmailSenderName);
-      templateCls.set('SenderName', _docRes?.SenderName);
-      templateCls.set('SenderMail', _docRes?.SenderMail);
-      templateCls.set('FileAdapterId', _docRes?.FileAdapterId);
-      templateCls.set('RequestBody', _docRes?.RequestBody);
-      templateCls.set('RequestSubject', _docRes?.RequestSubject);
-      templateCls.set('NextReminderDate', _docRes?.NextReminderDate);
-      templateCls.set('RedirectUrl', _docRes?.RedirectUrl);
-      templateCls.set(
-        'NotifyOnSignatures',
-        _docRes?.NotifyOnSignatures !== undefined ? _docRes?.NotifyOnSignatures : false
-      );
-      templateCls.set(
-        'TimeToCompleteDays',
-        _docRes?.TimeToCompleteDays ? parseInt(_docRes?.TimeToCompleteDays) : 15
-      );
-      if (_docRes?.RemindOnceInEvery) {
-        templateCls.set('RemindOnceInEvery', parseInt(_docRes?.RemindOnceInEvery));
-      }
-
-      if (_docRes?.Placeholders?.length > 0) {
-        if (_docRes?.IsSignyourself) {
-          const placeHolders = {
-            signerObjId: '',
-            signerPtr: {},
-            Id: randomId(),
-            blockColor: '#93a3db',
-            Role: 'Role 1',
-            email: '',
-            placeHolder: _docRes?.Placeholders,
-          };
-          templateCls.set('Placeholders', [placeHolders]);
-        } else {
-          const placeHolders = _docRes?.Placeholders?.map((x, i) => {
-            const email = x.email ? { email: '' } : {};
-            return { ...x, signerObjId: '', signerPtr: {}, Role: 'Role ' + (i + 1), ...email };
-          });
-          templateCls.set('Placeholders', placeHolders);
-        }
-      }
-      if (_docRes?.SignatureType?.length > 0) {
-        templateCls.set('SignatureType', _docRes?.SignatureType);
-      }
-      if (_docRes?.Bcc?.length > 0) {
-        templateCls.set('Bcc', _docRes?.Bcc);
-      }
-      const res = await templateCls.save(null, { useMasterKey: true });
-      return res;
-    } else {
-      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'document not found.');
-    }
-  } catch (err) {
-    console.log('Err in save as template', err);
-    throw err;
-  }
-}
@@ -1,8 +1,7 @@
 export default async function savecontact(request) {
  const name = request.params.name;
  const phone = request.params.phone;
-  const requestemail = request.params?.email;
-  const email = requestemail?.toLowerCase()?.replace(/\s/g, '');
+  const email = request.params.email;
  const tenantId = request.params.tenantId;

  if (request.user) {
@@ -31,97 +31,120 @@ async function sendMailProvider(req, plan, monthchange) {
    if (req.params.url) {
      const randomNumber = Math.floor(Math.random() * 5000);
      const testPdf = `test_${randomNumber}.pdf`;
-      try {
-        let Pdf = fs.createWriteStream(testPdf);
-        const writeToLocalDisk = () => {
-          return new Promise((resolve, reject) => {
-            const isSecure =
-              new URL(req.params.url)?.protocol === 'https:' &&
-              new URL(req.params.url)?.hostname !== 'localhost';
-            if (isSecure) {
-              https
-                .get(req.params.url, async function (response) {
-                  response.pipe(Pdf);
-                  response.on('end', () => resolve('success'));
-                })
-                .on('error', e => {
-                  console.error(`error: ${e.message}`);
-                  resolve('error');
-                });
-            } else {
-              const httpsAgent = new https.Agent({ rejectUnauthorized: false }); // Disable SSL validation
-              axios
-                .get(req.params.url, { responseType: 'stream', httpsAgent })
-                .then(response => {
-                  response.data.pipe(Pdf);
-                  Pdf.on('finish', () => resolve('success'));
-                  Pdf.on('error', () => resolve('error'));
-                })
-                .catch(e => {
-                  console.log('error', e.message);
-                  resolve('error');
-                });
-            }
-          });
-        };
-        // `writeToLocalDisk` is used to create pdf file from doc url
-        const ress = await writeToLocalDisk();
-        if (ress) {
-          function readTolocal() {
-            return new Promise((resolve, reject) => {
-              setTimeout(() => {
-                let PdfBuffer = fs.readFileSync(Pdf.path);
-                resolve(PdfBuffer);
-              }, 100);
-            });
-          }
-          //  `PdfBuffer` used to create buffer from pdf file
-          let PdfBuffer = await readTolocal();
-          const pdfName = req.params.pdfName && `${req.params.pdfName}.pdf`;
-          const filename = req.params.filename;
-          const file = {
-            filename: filename || pdfName || 'exported.pdf',
-            content: smtpenable ? PdfBuffer : undefined,
-            data: smtpenable ? undefined : PdfBuffer,
-          };
-
-          let attachment;
-          const certificatePath = req.params.certificatePath || `./exports/certificate.pdf`;
-          if (fs.existsSync(certificatePath)) {
-            try {
-              //  `certificateBuffer` used to create buffer from pdf file
-              const certificateBuffer = fs.readFileSync(certificatePath);
-              const certificate = {
-                filename: 'certificate.pdf',
-                content: smtpenable ? certificateBuffer : undefined, //fs.readFileSync('./exports/exported_file_1223.pdf'),
-                data: smtpenable ? undefined : certificateBuffer,
-              };
-              attachment = [file, certificate];
-            } catch (err) {
-              attachment = [file];
-              console.log('Err in read certificate sendmailv3', err);
-            }
+      let Pdf = fs.createWriteStream(testPdf);
+      const writeToLocalDisk = () => {
+        return new Promise((resolve, reject) => {
+          const isSecure =
+            new URL(req.params.url)?.protocol === 'https:' &&
+            new URL(req.params.url)?.hostname !== 'localhost';
+          if (isSecure) {
+            https
+              .get(req.params.url, async function (response) {
+                response.pipe(Pdf);
+                response.on('end', () => resolve('success'));
+              })
+              .on('error', e => {
+                console.error(`error: ${e.message}`);
+                resolve('error');
+              });
          } else {
-            attachment = [file];
+            const httpsAgent = new https.Agent({ rejectUnauthorized: false }); // Disable SSL validation
+            axios
+              .get(req.params.url, { responseType: 'stream', httpsAgent })
+              .then(response => {
+                response.data.pipe(Pdf);
+                Pdf.on('finish', () => resolve('success'));
+                Pdf.on('error', () => resolve('error'));
+              })
+              .catch(e => {
+                console.log('error', e.message);
+                resolve('error');
+              });
          }
-          const from = req.params.from || '';
-          const mailsender = smtpenable ? process.env.SMTP_USER_EMAIL : process.env.MAILGUN_SENDER;
-          const replyto = req.params?.replyto || '';
-          const messageParams = {
-            from: from + ' <' + mailsender + '>',
-            to: req.params.recipient,
-            subject: req.params.subject,
-            text: req.params.text || 'mail',
-            html: req.params.html || '',
-            attachments: smtpenable ? attachment : undefined,
-            attachment: smtpenable ? undefined : attachment,
-            bcc: req.params.bcc ? req.params.bcc : undefined,
-            replyTo: replyto ? replyto : undefined,
-          };
-          if (transporterSMTP) {
-            const res = await transporterSMTP.sendMail(messageParams);
-            console.log('smtp transporter res: ', res?.response);
-            if (!res.err) {
+        });
+      };
+      // `writeToLocalDisk` is used to create pdf file from doc url
+      const ress = await writeToLocalDisk();
+      if (ress) {
+        function readTolocal() {
+          return new Promise((resolve, reject) => {
+            setTimeout(() => {
+              let PdfBuffer = fs.readFileSync(Pdf.path);
+              resolve(PdfBuffer);
+            }, 100);
+          });
+        }
+        //  `PdfBuffer` used to create buffer from pdf file
+        let PdfBuffer = await readTolocal();
+        const pdfName = req.params.pdfName && `${req.params.pdfName}.pdf`;
+        const filename = req.params.filename;
+        const file = {
+          filename: filename || pdfName || 'exported.pdf',
+          content: smtpenable ? PdfBuffer : undefined,
+          data: smtpenable ? undefined : PdfBuffer,
+        };
+
+        let attachment;
+        const certificatePath = req.params.certificatePath || `./exports/certificate.pdf`;
+        if (fs.existsSync(certificatePath)) {
+          try {
+            //  `certificateBuffer` used to create buffer from pdf file
+            const certificateBuffer = fs.readFileSync(certificatePath);
+            const certificate = {
+              filename: 'certificate.pdf',
+              content: smtpenable ? certificateBuffer : undefined, //fs.readFileSync('./exports/exported_file_1223.pdf'),
+              data: smtpenable ? undefined : certificateBuffer,
+            };
+            attachment = [file, certificate];
+          } catch (err) {
+            attachment = [file];
+            console.log('Err in read certificate sendmailv3', err);
+          }
+        } else {
+          attachment = [file];
+        }
+        const from = req.params.from || '';
+        const mailsender = smtpenable ? process.env.SMTP_USER_EMAIL : process.env.MAILGUN_SENDER;
+        const replyto = req.params?.replyto || '';
+        const messageParams = {
+          from: from + ' <' + mailsender + '>',
+          to: req.params.recipient,
+          subject: req.params.subject,
+          text: req.params.text || 'mail',
+          html: req.params.html || '',
+          attachments: smtpenable ? attachment : undefined,
+          attachment: smtpenable ? undefined : attachment,
+          bcc: req.params.bcc ? req.params.bcc : undefined,
+          replyTo: replyto ? replyto : undefined,
+        };
+        if (transporterSMTP) {
+          const res = await transporterSMTP.sendMail(messageParams);
+          console.log('smtp transporter res: ', res?.response);
+          if (!res.err) {
+            if (req.params?.extUserId) {
+              await updateMailCount(req.params.extUserId, plan, monthchange);
+            }
+            if (fs.existsSync(certificatePath)) {
+              try {
+                fs.unlinkSync(certificatePath);
+              } catch (err) {
+                console.log('Err in unlink certificate sendmailv3');
+              }
+            }
+            if (fs.existsSync(testPdf)) {
+              try {
+                fs.unlinkSync(testPdf);
+              } catch (err) {
+                console.log('Err in unlink pdf sendmailv3');
+              }
+            }
+            return { status: 'success' };
+          }
+        } else {
+          if (mailgunApiKey) {
+            const res = await mailgunClient.messages.create(mailgunDomain, messageParams);
+            console.log('mailgun res: ', res?.status);
+            if (res.status === 200) {
              if (req.params?.extUserId) {
                await updateMailCount(req.params.extUserId, plan, monthchange);
              }
@@ -142,60 +165,23 @@ async function sendMailProvider(req, plan, monthchange) {
              return { status: 'success' };
            }
          } else {
-            if (mailgunApiKey) {
-              const res = await mailgunClient.messages.create(mailgunDomain, messageParams);
-              console.log('mailgun res: ', res?.status);
-              if (res.status === 200) {
-                if (req.params?.extUserId) {
-                  await updateMailCount(req.params.extUserId, plan, monthchange);
-                }
-                if (fs.existsSync(certificatePath)) {
-                  try {
-                    fs.unlinkSync(certificatePath);
-                  } catch (err) {
-                    console.log('Err in unlink certificate sendmailv3');
-                  }
-                }
-                if (fs.existsSync(testPdf)) {
-                  try {
-                    fs.unlinkSync(testPdf);
-                  } catch (err) {
-                    console.log('Err in unlink pdf sendmailv3');
-                  }
-                }
-                return { status: 'success' };
+            if (fs.existsSync(certificatePath)) {
+              try {
+                fs.unlinkSync(certificatePath);
+              } catch (err) {
+                console.log('Err in unlink certificate sendmailv3');
              }
-            } else {
-              if (fs.existsSync(certificatePath)) {
-                try {
-                  fs.unlinkSync(certificatePath);
-                } catch (err) {
-                  console.log('Err in unlink certificate sendmailv3');
-                }
-              }
-              if (fs.existsSync(testPdf)) {
-                try {
-                  fs.unlinkSync(testPdf);
-                } catch (err) {
-                  console.log('Err in unlink pdf sendmailv3');
-                }
-              }
-              return { status: 'error' };
            }
+            if (fs.existsSync(testPdf)) {
+              try {
+                fs.unlinkSync(testPdf);
+              } catch (err) {
+                console.log('Err in unlink pdf sendmailv3');
+              }
+            }
+            return { status: 'error' };
          }
        }
-      } catch (err) {
-        console.log('err in sendmailv3', err);
-        if (fs.existsSync(testPdf)) {
-          try {
-            fs.unlinkSync(testPdf);
-          } catch (err) {
-            console.log('Err in unlink pdf sendmailv3');
-          }
-        }
-        if (err) {
-          return { status: 'error' };
-        }
      }
    } else {
      const from = req.params.from || '';
@@ -244,8 +230,8 @@ async function sendMailProvider(req, plan, monthchange) {
 }

 async function sendmailv3(req) {
-  const nonCustomMail = await sendMailProvider(req);
-  return nonCustomMail;
+    const nonCustomMail = await sendMailProvider(req);
+    return nonCustomMail;
 }

 export default sendmailv3;
@@ -42,18 +42,6 @@ export default async function updatePreferences(request) {
            newOrg.set('SignatureType', SignatureType);
          }
        }
-        if (request.params.SendinOrder !== undefined) {
-          newOrg.set('SendinOrder', request.params.SendinOrder);
-        }
-        if (request.params.IsTourEnabled !== undefined) {
-          newOrg.set('IsTourEnabled', request.params.IsTourEnabled);
-        }
-        if (request.params.DateFormat) {
-          newOrg.set('DateFormat', request.params.DateFormat);
-        }
-        if (request.params.Is12HourTime !== undefined) {
-          newOrg.set('Is12HourTime', request.params.Is12HourTime);
-        }
        const updateUserRes = await newOrg.save(null, { useMasterKey: true });
        if (updateUserRes) {
          const _updateUserRes = JSON.parse(JSON.stringify(updateUserRes));
@@ -1,27 +0,0 @@
-export default async function updateTenant(request) {
-  const { tenantId, details } = request.params;
-
-  if (!tenantId || !details) {
-    throw new Parse.Error(400, 'Missing tenantId or details.');
-  }
-
-  if (!request.user) {
-    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'unauthorized');
-  }
-  try {
-    const tenant = new Parse.Object('partners_Tenant');
-    tenant.id = tenantId;
-    // Update tenant details
-    Object.keys(details).forEach(key => {
-      tenant.set(key, details?.[key]);
-    });
-
-    const tenantRes = await tenant.save(null, { useMasterKey: true });
-    if (tenantRes) {
-      const res = JSON.parse(JSON.stringify(tenantRes));
-      return res;
-    }
-  } catch (error) {
-    throw error;
-  }
-}
@@ -1,5 +1,7 @@
 import axios from 'axios';
-import { cloudServerUrl } from '../../Utils.js';
+import {
+  cloudServerUrl,
+} from '../../Utils.js';
 const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
@@ -30,7 +32,7 @@ async function saveUser(userDetails) {
    const user = new Parse.User();
    user.set('username', userDetails.email);
    user.set('password', userDetails.password);
-    user.set('email', userDetails?.email?.toLowerCase()?.replace(/\s/g, ''));
+    user.set('email', userDetails.email);
    if (userDetails?.phone) {
      user.set('phone', userDetails.phone);
    }
@@ -71,7 +73,7 @@ export default async function usersignup(request) {
        partnerQuery.set('ContactNumber', userDetails.phone);
      }
      partnerQuery.set('TenantName', userDetails.company);
-      partnerQuery.set('EmailAddress', userDetails?.email?.toLowerCase()?.replace(/\s/g, ''));
+      partnerQuery.set('EmailAddress', userDetails.email);
      partnerQuery.set('IsActive', true);
      partnerQuery.set('CreatedBy', {
        __type: 'Pointer',
@@ -103,7 +105,7 @@ export default async function usersignup(request) {
        objectId: user.id,
      });
      newObj.set('UserRole', userDetails.role);
-      newObj.set('Email', userDetails?.email?.toLowerCase()?.replace(/\s/g, ''));
+      newObj.set('Email', userDetails.email);
      newObj.set('Name', userDetails.name);
      if (userDetails?.phone) {
        newObj.set('Phone', userDetails?.phone);
@@ -129,3 +131,4 @@ export default async function usersignup(request) {
    console.log('Err ', err);
  }
 }
+
@@ -15,6 +15,7 @@ import AWS from 'aws-sdk';
 import { app as customRoute } from './cloud/customRoute/customApp.js';
 import { exec } from 'child_process';
 import { createTransport } from 'nodemailer';
+import { PostHog } from 'posthog-node';
 import { appName, cloudServerUrl, smtpenable, smtpsecure, useLocal } from './Utils.js';
 import { SSOAuth } from './auth/authadapter.js';
 import createContactIndex from './migrationdb/createContactIndex.js';
@@ -160,8 +161,6 @@ app.use(express.json({ limit: '50mb' }));
 app.use(express.urlencoded({ limit: '50mb', extended: true }));
 app.use(function (req, res, next) {
  req.headers['x-real-ip'] = getUserIP(req);
-  const publicUrl = req.protocol + '://' + req.get('host');
-  req.headers['public_url'] = publicUrl; // process.env.PUBLIC_URL
  next();
 });
 function getUserIP(request) {
@@ -176,6 +175,16 @@ function getUserIP(request) {
    return request.socket.remoteAddress;
  }
 }
+app.use(function (req, res, next) {
+  const ph_project_api_key = process.env.PH_PROJECT_API_KEY;
+  try {
+    req.posthog = new PostHog(ph_project_api_key);
+  } catch (err) {
+    // console.log('Err', err);
+    req.posthog = '';
+  }
+  next();
+});

 app.use(async function (req, res, next) {
  const isFilePath = req.path.includes('files') || false;
@@ -216,6 +225,7 @@ if (!process.env.TESTING) {
 // Mount your custom express app
 app.use('/', customRoute);

+
 // Parse Server plays nicely with the rest of your web routes
 app.get('/', function (req, res) {
  res.status(200).send('opensign-server is running !!!');
@@ -18,26 +18,26 @@
    "watch": "nodemon index.js"
  },
  "dependencies": {
-    "@aws-sdk/client-s3": "^3.775.0",
-    "@aws-sdk/s3-request-presigner": "^3.775.0",
+    "@aws-sdk/client-s3": "^3.741.0",
+    "@aws-sdk/s3-request-presigner": "^3.741.0",
    "@parse/fs-files-adapter": "^3.0.0",
    "@parse/s3-files-adapter": "^4.1.0",
    "@pdf-lib/fontkit": "^1.1.1",
    "@signpdf/placeholder-pdf-lib": "^3.2.4",
    "@signpdf/signer-p12": "^3.2.4",
-    "@signpdf/signpdf": "^3.2.5",
+    "@signpdf/signpdf": "^3.2.4",
    "aws-sdk": "^2.1692.0",
-    "axios": "^1.8.4",
+    "axios": "^1.7.9",
    "cors": "^2.8.5",
    "date-fns-tz": "^3.2.0",
    "dotenv": "^16.4.7",
    "express": "^4.21.1",
-    "form-data": "^4.0.2",
+    "form-data": "^4.0.1",
    "generate-api-key": "^1.0.2",
-    "googleapis": "^148.0.0",
+    "googleapis": "^144.0.0",
    "mailgun.js": "^11.1.0",
-    "mongodb": "^6.15.0",
-    "multer": "^1.4.5-lts.2",
+    "mongodb": "^6.13.0",
+    "multer": "^1.4.5-lts.1",
    "multer-s3": "^3.0.1",
    "node-forge": "^1.3.1",
    "nodemailer": "^6.10.0",
@@ -46,18 +46,18 @@
    "parse-server": "^7.4.0",
    "parse-server-api-mail-adapter": "^4.1.0",
    "pdf-lib": "^1.17.1",
-    "posthog-node": "^4.10.2",
-    "ws": "^8.18.1"
+    "posthog-node": "^4.5.0",
+    "ws": "^8.18.0"
  },
  "type": "module",
  "devDependencies": {
-    "@babel/eslint-parser": "^7.27.0",
-    "eslint": "^9.23.0",
+    "@babel/eslint-parser": "^7.26.5",
+    "eslint": "^9.20.0",
    "jasmine": "^5.6.0",
-    "mongodb-runner": "^5.8.0",
+    "mongodb-runner": "^5.7.1",
    "nodemon": "^3.1.9",
    "nyc": "^17.1.0",
-    "prettier": "^3.5.3"
+    "prettier": "^3.5.0"
  },
  "overrides": {
    "ws": "$ws",
@@ -11,8 +11,7 @@ services:
    env_file: .env.prod
    environment:
      - NODE_ENV=production
-      - SERVER_URL=${HOST_URL:-https://localhost:3001}/api/app
-      - PUBLIC_URL=${HOST_URL:-https://localhost:3001}
+      - SERVER_URL=${HOST_URL:-https://localhost:3001}/app
    networks:
      - app-network
  mongo: