Merge pull request #1105 from nxglabs/raktima-main-patch-2

fix: managesign report alignment and loader issue

apps/OpenSign/package.json

@@ -5,15 +5,15 @@
   "dependencies": {
     "@formkit/auto-animate": "^0.8.2",
     "@imgly/background-removal": "^1.6.0",
-    "@lottiefiles/dotlottie-react": "^0.14.0",
+    "@lottiefiles/dotlottie-react": "^0.14.2",
     "@pdf-lib/fontkit": "^1.1.1",
     "@radix-ui/themes": "^3.2.1",
     "@reduxjs/toolkit": "^2.8.2",
-    "axios": "^1.9.0",
+    "axios": "^1.10.0",
     "date-fns-tz": "^3.2.0",
     "file-saver": "^2.0.5",
-    "i18next": "^23.16.8",
+    "i18next": "^25.3.0",
-    "i18next-browser-languagedetector": "^8.1.0",
+    "i18next-browser-languagedetector": "^8.2.0",
     "i18next-http-backend": "^3.0.2",
     "jszip": "^3.10.1",
     "jwt-decode": "^4.0.0",
@@ -36,24 +36,24 @@
     "react-dom": "^18.3.1",
     "react-gtm-module": "^2.0.11",
     "react-helmet": "^6.1.0",
-    "react-i18next": "^15.5.2",
+    "react-i18next": "^15.5.3",
     "react-konva": "^18.2.10",
     "react-pdf": "^9.2.1",
     "react-quill-new": "^3.4.6",
     "react-redux": "^9.2.0",
     "react-rnd": "^10.5.2",
-    "react-router": "^7.6.1",
+    "react-router": "^7.6.3",
     "react-scrollbars-custom": "^4.1.1",
     "react-select": "^5.10.1",
     "react-signature-canvas": "^1.1.0-alpha.2",
     "react-timezone-select": "^3.2.8",
-    "react-tooltip": "^5.28.1",
+    "react-tooltip": "^5.29.1",
     "reactour": "^1.19.4",
     "redux": "^5.0.1",
     "regex-parser": "^2.3.1",
     "serve": "^14.2.4",
     "styled-components": "^5.3.11",
-    "web-vitals": "^5.0.2",
+    "web-vitals": "^5.0.3",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
   },
   "scripts": {
@@ -94,38 +94,38 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.27.4",
+    "@babel/core": "^7.27.7",
     "@babel/preset-env": "^7.27.2",
     "@babel/preset-react": "^7.27.1",
-    "@babel/runtime-corejs2": "^7.27.4",
+    "@babel/runtime-corejs2": "^7.27.6",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
     "@types/react": "^18.3.23",
-    "@vitejs/plugin-react": "^4.5.1",
+    "@vitejs/plugin-react": "^4.6.0",
-    "@vitejs/plugin-react-swc": "^3.10.1",
+    "@vitejs/plugin-react-swc": "^3.10.2",
-    "@vitest/ui": "^3.2.0",
+    "@vitest/ui": "^3.2.4",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
     "commitizen": "^4.3.1",
-    "concurrently": "^9.1.2",
+    "concurrently": "^9.2.0",
     "css-loader": "^7.1.2",
     "daisyui": "^4.12.24",
-    "dotenv": "^16.5.0",
+    "dotenv": "^16.6.1",
-    "eslint": "^9.28.0",
+    "eslint": "^9.30.0",
-    "eslint-plugin-prettier": "^5.4.1",
+    "eslint-plugin-prettier": "^5.5.1",
     "eslint-plugin-react": "^7.37.5",
     "jsdom": "^26.1.0",
-    "lint-staged": "^16.1.0",
+    "lint-staged": "^16.1.2",
-    "postcss": "^8.5.4",
+    "postcss": "^8.5.6",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.2",
     "pretty-quick": "^4.2.2",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "tailwindcss": "^3.4.17",
     "vite": "^6.3.5",
     "vite-plugin-svgr": "^4.3.0",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.2.0"
+    "vitest": "^3.2.4"
   },
   "engines": {
     "node": "18 || 20 || 22"

apps/OpenSign/public/locales/de/translation.json

@@ -26,6 +26,8 @@
     "Name": "Name",
     "Date": "Datum"
   },
+  "folder": "Ordner",
+  "pdf": "Pdf",
   "context-menu": {
     "Download": "Herunterladen",
     "Rename": "Umbenennen",
@@ -44,6 +46,10 @@
   "contact-now": "Jetzt kontaktieren",
   "upgrade-to": "Upgrade zu",
   "plan": "Plan",
+  "connect": "Verbinden",
+  "connect-to-g-drive": "Mit Google Drive verbinden",
+  "reconnect-to-g-drive": "Erneut mit Google Drive verbinden",
+  "gdrive-info-connect": "Wenn Google Drive verbunden ist, wird das abgeschlossene Dokument im Ordner {{appName}} auf Google Drive gespeichert.",
   "subscription-renew-warning": "Ihr Abonnement läuft in {{remainingDays}} Tagen ab. Bitte verlängern Sie Ihr Abonnement.",
   "subscribe-card-teamplan": "Entfesseln Sie die volle Kraft der Zusammenarbeit! Erstellen Sie unbegrenzt Organisationen, Teams und Hierarchien. Teilen Sie Vorlagen nahtlos zwischen Teams und weisen Sie benutzerdefinierte Benutzerrollen zu. Optimieren Sie Ihren Workflow noch heute!",
   "subscribe-card-plan": "Entsperren Sie Premium-Funktionen ab nur {{premiumPrice}}/Monat. Genießen Sie eine verbesserte Leistung und zahlen Sie nur {{addonPrice}} pro zusätzlichem Credit nach den enthaltenen Premium-Credits.",
@@ -58,7 +64,7 @@
   "welcome": "Willkommen zurück!",
   "Login-to-your-account": "Melden Sie sich bei Ihrem Konto an",
   "password": "Passwort",
-  "forgot-password": "Passwort vergessen?",
+  "forgot-password": "Passwort vergessen",
   "loading": "Wird geladen...",
   "of": "von",
   "sign-SSO": "Mit SSO anmelden",
@@ -181,7 +187,9 @@
     "created-date": "Erstellungsdatum",
     "Type": "Type",
     "Logs": "Protokolle",
-    "Expiry-date": "Ablaufdatum"
+    "Expiry-date": "Ablaufdatum",
+    "Company": "Unternehmen",
+    "JobTitle": "Berufsbezeichnung"
   },
   "report-help": {
     "Draft Documents": "Dies sind Dokumente, die Sie begonnen, aber noch nicht zum Versenden fertiggestellt haben.",
@@ -193,16 +201,15 @@
     "Contactbook": "Dies ist eine Liste von Kontakten/Unterzeichnern, die Sie hinzugefügt haben. Diese erscheinen als Vorschläge, wenn Sie neue Unterzeichner hinzufügen möchten.",
     "Templates": "Dies ist eine Liste von Vorlagen, die Ihnen zur Verfügung stehen, um Dokumente zu erstellen. Sie können die Schaltfläche 'Verwenden' anklicken, um ein neues Dokument mit einer Vorlage zu erstellen, das Dokument zu ändern und Unterzeichner im nächsten Schritt hinzuzufügen."
   },
-  "form-name": {
+  "Sign Yourself": "Selbst unterschreiben",
-    "Sign Yourself": "Selbst unterschreiben",
+  "Request Signatures": "Signaturen anfordern",
-    "Request Signatures": "Signaturen anfordern",
+  "New Template": "Neue Vorlage",
-    "New Template": "Neue Vorlage"
-  },
   "file-type": "pdf, png, jpg, jpeg",
   "docx": "docx",
   "file-selected": "Datei ausgewählt",
   "template-title": "Vorlagentitel",
   "document-title": "Dokumenttitel",
+  "title": "Titel",
   "description": "Beschreibung",
   "time-to-complete": "Bearbeitungszeit (Tage)",
   "send-in-order": "In der Reihenfolge senden",
@@ -379,6 +386,7 @@
   "certificate": "Zertifikat",
   "decline": "Ablehnen",
   "finish": "Fertigstellen",
+  "done": "Fertig",
   "mail": "E-Mail",
   "sign-now": "Jetzt unterzeichnen",
   "successfully-signed": "Erfolgreich unterzeichnet!",
@@ -388,6 +396,10 @@
   "Email-verified-alert-1": "E-Mail wurde verifiziert.",
   "Email-verified-alert-2": "E-Mail wurde bereits verifiziert.",
   "upload-stamp-image": "Stempelbild hochladen",
+  "draw-signature": "Unterschrift zeichnen",
+  "draw-initials": "Initialen zeichnen",
+  "enter-text": "Text eingeben",
+  "enter-widgettype": "{{widgetType}} eingeben",
   "draw": "Zeichnen",
   "type": "Schreiben",
   "color-type": {
@@ -728,7 +740,7 @@
   "public-tour-message": "Die Vorlage muss öffentlich sein, bevor Sie einen teilbaren Link generieren können.",
   "add-user-template": "Sie müssen eine Rolle hinzufügen, bevor Sie Felder dafür hinzufügen können.",
   "pdf-uncompatible": "Diese PDF-Datei ist nicht kompatibel, bitte kontaktieren Sie {{appName}}",
-  "text-field-tour": "Felder vom Typ 'Text' müssen im Voraus ausgefüllt werden, bevor das Dokument versendet wird. Wenn Sie möchten, dass die Unterzeichner Eingaben machen, verwenden Sie das Feld 'Texteingabe'.",
+  "text-field-tour": "Felder zum Vorabfüllen müssen vor dem Senden des Dokuments ausgefüllt werden. Wenn Sie Eingaben von den Unterzeichnern benötigen, verwenden Sie stattdessen die Felder für Unterzeichner.",
   "attach-signer-tour": "Sie müssen einen Unterzeichner jeder Rolle zuweisen. Dies können Sie durch Klicken auf dieses Symbol tun. Sobald Sie einen Unterzeichner auswählen, wird er allen Feldern der zugehörigen Rolle zugewiesen, die in derselben Farbe erscheinen.",
   "allowed-signature-types": "Erlaubte Signaturtypen",
   "at-least-one-signature-type": "Mindestens ein Signaturtyp sollte aktiviert sein.",
@@ -761,6 +773,8 @@
   "Rotation-alert": "Seite drehen",
   "bulk-import": "Massenimport",
   "contacts-file": "Kontaktdatei (xlsx, csv)",
+  "import-guideline": "Laden Sie eine CSV- oder Excel-Datei mit den Spalten Name, Email und optional Phone hoch. Es werden nur die ersten 100 Kontakte importiert.",
+  "download-sample": "Beispieldatei herunterladen",
   "100-records-only": "Derzeit können Sie nur bis zu 100 Datensätze importieren.",
   "csv-excel-support-only": "Laden Sie eine Datei in einem der folgenden Formate hoch: CSV, XLSX oder XLS.",
   "contact-imported": "{{imported}} Kontakte wurden importiert. {{failed}} Kontakte konnten nicht importiert werden.",
@@ -774,7 +788,7 @@
   "agree-p1": "Ich bestätige, dass ich die ",
   "agree-p2": "Offenlegung elektronischer Aufzeichnungen und Signaturen",
   "agree-p3": "gelesen und verstanden habe und der Verwendung elektronischer Aufzeichnungen und Signaturen zustimme.",
-  "agrre-button": "Zustimmen & Fortfahren",
+  "agrre-button": "Ich bestätige und stimme zu, fortzufahren",
   "term-cond-title": "Allgemeine Geschäftsbedingungen",
   "term-cond-h": "OFFENLEGUNG ELEKTRONISCHER AUFZEICHNUNGEN UND SIGNATUREN",
   "term-cond-p1": "Diese Offenlegung elektronischer Aufzeichnungen und Signaturen ('Offenlegung') ist eine Vereinbarung zwischen dem Dokumentersteller ('Sender') und dem Unterzeichner ('Ihnen'), bereitgestellt über die {{appName}} Plattform ('Plattform'). Durch das Signieren von Dokumenten über {{appName}} stimmen Sie den in dieser Offenlegung beschriebenen Bedingungen zu. Bitte lesen Sie sie sorgfältig durch, bevor Sie fortfahren.",
@@ -1033,5 +1047,99 @@
   "choose-one":"Wählen Sie eine aus",
   "search-templates": "Vorlagen durchsuchen…",
   "search-documents": "Dokumente suchen…",
-  "search-contacts": "Kontakte durchsuchen…"
+  "search-contacts": "Kontakte durchsuchen…",
+  "edit-draft": "Entwurf bearbeiten",
+  "add-role-alert": "Bitte fügen Sie mindestens eine Rolle hinzu",
+  "invalid-email-found": "Ungültige E-Mail gefunden: {{email}}",
+  "duplicate-email-found": "Doppelte E-Mail gefunden: {{email}}",
+  "vertical": "Vertikal",
+  "horizontal": "Horizontal",
+  "billing": "Abrechnung",
+  "console": "Konsole",
+  "prefill-widget": "Vorausgefüllte Widgets",
+  "action-prohibited": "Diese Aktion ist für Ihre E-Mail-Domain nicht erlaubt. Bitte wenden Sie sich an Ihren Administrator, um Hilfe zu erhalten.",
+  "must-have-at-least-one-vacant-role": "Mindestens eine Rolle muss unzugewiesen sein, bevor Sie ein template auf 'public' setzen.",
+  "remove-duplicate": "Bitte doppelte Option entfernen",
+  "prefill-bulk-error": "Der Massenversand ist nicht erlaubt, wenn Prefill-Widgets hinzugefügt wurden. Bitte entfernen Sie die Prefill-Widgets, um fortzufahren.",
+  "session-expired-title": "Sitzung abgelaufen",
+  "access-denied": "Zugriff verweigert",
+  "upgrade": "Upgrade",
+  "do-not-access-app": "Sie haben keinen Zugriff auf diese Anwendung.",
+  "dont-have-access": "Sie haben keinen Zugriff.",
+  "valid-email-alert": "Bitte geben Sie eine gültige E-Mail-Adresse ein.",
+  "otp-not-validate": "OTP ist ungültig.",
+  "domain-not-allowed": "Diese Domain ist nicht erlaubt",
+  "atleast-one-recipient-alert": "Bitte fügen Sie mindestens einen Empfänger hinzu!",
+  "incorrect-password-or-decryption-failed": "Falsches Passwort oder Entschlüsselung fehlgeschlagen.",
+  "incorrect-password-for-file": "Falsches Passwort für Datei: {{file}}",
+  "error-uploading-pdf": "Fehler beim Hochladen der PDF.",
+  "provide-password": "Bitte geben Sie das Passwort an.",
+  "only-pdf-allowed": "Nur PDF-Dateien sind erlaubt.",
+  "invalid-username-password-region": "Ungültiger Benutzername/Passwort oder Region.",
+  "pfx-extension-alert": "Bitte laden Sie eine Datei mit der Endung .pfx hoch.",
+  "email-already-exist": "E-Mail existiert bereits",
+  "branding": "Markenbildung",
+  "branding-help": "Branding ermöglicht White-Labeling für Ihre App",
+  "custom-sub-domain": "Benutzerdefinierte Subdomain",
+  "app-name": "App Name",
+  "provide-domain-name": "Geben Sie Ihren Domainnamen an",
+  "provide-app-name": "Geben Sie Ihren App-Namen an",
+  "logo": "Logo",
+  "upload-app-logo": "Laden Sie Ihr App-Logo hoch",
+  "prefill-unfilled-widget": "Die folgenden Pflichtfelder dürfen nicht leer sein: {{emptyWidget}}. Bitte füllen Sie diese aus, um fortzufahren.",
+  "Dashboard": "Armaturenbrett",
+  "Analytics": "Analytik",
+  "Templates": "Vorlagen",
+  "Need your sign": "Benötigt Ihre Unterschrift",
+  "In Progress": "In Bearbeitung",
+  "Completed": "Abgeschlossen",
+  "Drafts": "Entwürfe",
+  "Declined": "Abgelehnt",
+  "Expired": "Abgelaufen",
+  "Contactbook": "Kontaktbuch",
+  "My Signature": "Meine Unterschrift",
+  "API Token": "API-Token",
+  "Webhook": "Webhook",
+  "Preferences": "Einstellungen",
+  "Teams": "Teams",
+  "Users": "Benutzer",
+  "Drive": "Drive",
+  "Branding": "Markenbildung",
+  "Mail": "Mail",
+  "Storage": "Speicher",
+  "Signing certificate": "Signierzertifikat",
+  "General": "Allgemein",
+  "Organizations": "Organisationen",
+  "OrgAdmins": "OrgAdmins",
+  "Debug Pdf": "PDF debuggen",
+  "New Document": "Neues Dokument",
+  "subscription": "Abonnement",
+  "Draft document": "Dokumententwurf",
+  "Draft template": "Vorlagenentwurf",
+  "Public sign": "Öffentliche Signatur",
+  "Signup": "Registrieren",
+  "delete-contact": "Kontakt löschen",
+  "total-records-found": "Gesamtanzahl gefundener Einträge: {{count}}",
+  "Invalid-records-found": "Ungültige Einträge gefunden: {{records}}",
+  "previous": "Zurück",
+  "page-n-of-n": "Seite {{currentPage}} von {{totalPages}}",
+  "import": "Importieren",
+  "search": "Suchen",
+  "viewed-on": "Angesehen am: {{ViewedOn}}",
+  "signed-on": "Unterschrieben am: {{SignedOn}}",
+  "hide": "Ausblenden",
+  "show-more": "Mehr anzeigen",
+  "browse-or-drag-to-replace-existing-file": "Durchsuchen oder per Drag & Drop eine neue Datei ziehen, um die vorhandene zu ersetzen",
+  "optional-details": "Optionale Angaben",
+  "mail-adapter-subscription-alert": "Bitte upgraden Sie auf den Professional- oder Team-Plan, um den Mail-Adapter einzurichten.",
+  "connect-to-mail": "Mit Gmail verbinden",
+  "custom-smtp": "Benutzerdefiniertes SMTP",
+  "default-smtp": "{{appName}} Standard-SMTP",
+  "host": "Host",
+  "port": "Port",
+  "sender-email": "Absender-E-Mail",
+  "username": "Benutzername",
+  "use-default-mail-adapter": "Möchten Sie wirklich die Standard-Mailserver von {{appName}} verwenden, um Ihre Signaturanfragen zu versenden? Wir empfehlen, Ihre eigenen Gmail- oder SMTP-Server zu verwenden, um die Zustellbarkeit zu verbessern.",
+  "verification-code-sent-registered-email": "Ein Bestätigungscode wurde an Ihre registrierte E-Mail-Adresse <1>{{useremail}}</1> gesendet. Bitte geben Sie den Code unten ein, um Ihre Einstellungen zu bestätigen.",
+  "smpt-credentials": "SMTP-Zugangsdaten"
 }

apps/OpenSign/public/locales/en/translation.json

@@ -26,6 +26,8 @@
     "Name": "Name",
     "Date": "Date"
   },
+  "folder": "Folder",
+  "pdf": "Pdf",
   "context-menu": {
     "Download": "Download",
     "Rename": "Rename",
@@ -44,6 +46,10 @@
   "contact-now": "Contact now",
   "upgrade-to": "Upgrade to",
   "plan": "Plan",
+  "connect": "connect",
+  "connect-to-g-drive": "Connect to Google Drive",
+  "reconnect-to-g-drive": "Reconnect to Google Drive",
+  "gdrive-info-connect": "When Google Drive is connected, the completed document will be saved in the {{appName}} folder on Google Drive.",
   "subscription-renew-warning": "Your subscription will expire in {{remainingDays}} days. Please renew your subscription.",
   "subscribe-card-teamplan": "Unlock the full power of collaboration! Create unlimited organizations, teams, and hierarchies. Share templates seamlessly across teams and assign custom user roles. Elevate your workflow today!",
   "subscribe-card-plan": "Unlock premium features starting at just {{premiumPrice}}/month. Enjoy enhanced performance and only {{addonPrice}} per additional credit after your included premium credits.",
@@ -58,7 +64,7 @@
   "welcome": "Welcome back!",
   "Login-to-your-account": "Login to your account",
   "password": "Password",
-  "forgot-password": "Forgot password?",
+  "forgot-password": "Forgot password",
   "loading": "Loading...",
   "of": "of",
   "sign-SSO": "Sign in with SSO",
@@ -181,7 +187,9 @@
     "created-date": "Created date",
     "Type": "Type",
     "Logs": "Logs",
-    "Expiry-date": "Expiry date"
+    "Expiry-date": "Expiry date",
+    "Company": "Company",
+    "JobTitle": "Job title"
   },
   "report-help": {
     "Draft Documents": "These are documents you have started but have not finalized for sending.",
@@ -193,16 +201,15 @@
     "Contactbook": "This is a list of contacts/signers added by you. These will appear as suggestions when you try to add signers to a new document.",
     "Templates": "This is a list of templates that are available to you for creating documents. You can click the 'use' button to create a new document using a template, modify the document & add signers in the next step."
   },
-  "form-name": {
+  "Sign Yourself": "Sign yourself",
-    "Sign Yourself": "Sign yourself",
+  "Request Signatures": "Request signatures",
-    "Request Signatures": "Request signatures",
+  "New Template": "New template",
-    "New Template": "New template"
-  },
   "file-type": "pdf, png, jpg, jpeg",
   "docx": "docx",
   "file-selected": "file(s) selected",
   "template-title": "Template title",
   "document-title": "Document title",
+  "title": "Title",
   "description": "Description",
   "time-to-complete": "Time to complete (Days)",
   "send-in-order": "Send in order",
@@ -379,6 +386,7 @@
   "certificate": "Certificate",
   "decline": "Decline",
   "finish": "Finish",
+  "done": "Done",
   "mail": "Mail",
   "sign-now": "Sign now",
   "successfully-signed": "Successfully signed!",
@@ -388,6 +396,10 @@
   "Email-verified-alert-1": "Email is verified.",
   "Email-verified-alert-2": "Email is already verified.",
   "upload-stamp-image": "Upload stamp image",
+  "draw-signature": "Draw signature",
+  "draw-initials": "Draw initials",
+  "enter-text": "Enter text",
+  "enter-widgettype": "Enter {{widgetType}}",
   "draw": "Draw",
   "type": "Type",
   "color-type": {
@@ -408,6 +420,7 @@
   "reset-password-alert-3": "Reset Your Password",
   "faild-animation": "Failed to load animation",
   "apply": "Apply",
+  "select-columns": "Select columns",
   "copy-type": {
     "All pages": "All pages",
     "All pages but last": "All pages but last",
@@ -471,7 +484,7 @@
   "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-mail-alert-you": "Subsequent signers will get email(s) once you sign 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!",
@@ -728,7 +741,7 @@
   "public-tour-message": "The template needs to be public before you can generate a shareable link.",
   "add-user-template": "You need to add a role before you can add fields for it.",
   "pdf-uncompatible": "This pdf is not compatible, please contact {{appName}}",
-  "text-field-tour": "Fields of type 'Text' must be filled in advance before the document is sent. If you need the signers to provide input, use the 'Text Input' field instead.",
+  "text-field-tour":  "'Prefill' fields must be filled in advance before the document is sent. If you need the signers to provide input, use signers fields instead.",
   "attach-signer-tour": "You need to attach a Signer to every role. You can do that by clicking this icon. Once you select a Signer it will be attached to all the fields associated with that role which appear in the same colour.",
   "allowed-signature-types": "Allowed signature types",
   "at-least-one-signature-type": "At least one signature type should be enabled.",
@@ -761,6 +774,8 @@
   "Rotation-alert": "Rotate page",
   "bulk-import": "Bulk import",
   "contacts-file": "Contacts file (xlsx, csv)",
+  "import-guideline": "Upload a CSV or Excel file with columns Name, Email and optional Phone. Only the first 100 records will be imported.",
+  "download-sample": "Download sample file",
   "100-records-only": "Currently you can only import up to 100 records.",
   "csv-excel-support-only": "Upload a file in one of the following formats: CSV, XLSX or XLS.",
   "contact-imported": "{{imported}} contacts were imported. {{failed}} contacts failed to import.",
@@ -774,7 +789,7 @@
   "agree-p1": "I confirm that I have read and understood the ",
   "agree-p2": "Electronic Record and Signature Disclosure",
   "agree-p3": "and consent to use electronic records and signatures.",
-  "agrre-button": " Agree & Continue",
+  "agrre-button": "I confirm & agree to continue",
   "term-cond-title": "Terms and conditions",
   "term-cond-h": "ELECTRONIC RECORD AND SIGNATURE DISCLOSURE",
   "term-cond-p1": "This Electronic Record and Signature Disclosure ('Disclosure') is an agreement between the Document Creator ('Sender') and the Signer ('You'), facilitated through the {{appName}} platform ('Platform'). By signing documents via {{appName}}, you agree to the terms outlined in this Disclosure. Please read it carefully before proceeding.",
@@ -1033,5 +1048,99 @@
   "choose-one":"Choose One",
   "search-templates": "Search templates…",
   "search-documents": "Search documents…",
-  "search-contacts": "Search contacts…"
+  "search-contacts": "Search contacts…",
+  "add-role-alert":"Please add at least one role",
+  "edit-draft":"Edit draft",
+  "invalid-email-found": "Invalid email found: {{email}}",
+  "duplicate-email-found": "Duplicate email found: {{email}}",
+  "vertical": "Vertical",
+  "horizontal": "Horizontal",
+  "billing": "Billing",
+  "console": "Console",
+  "prefill-widget":"Prefill Widgets",
+  "action-prohibited": "This action isn't allowed for your email domain. Please contact your administrator for assistance.",
+  "must-have-at-least-one-vacant-role": "You must have at least one role unassigned before setting a template to 'public'.",
+  "remove-duplicate": "Please remove duplicate option",
+  "prefill-bulk-error":"Bulk send is not allowed when prefill widgets are added. Please remove the prefill widgets to proceed.",
+  "session-expired-title": "Session Expired",
+  "access-denied": "Access denied",
+  "upgrade": "Upgrade",
+  "do-not-access-app": "You don't have access to this application.",
+  "dont-have-access": "You don't have access.",
+  "valid-email-alert": "Please enter a valid email address.",
+  "otp-not-validate": "OTP is not valid.",
+  "domain-not-allowed": "This domain is not allowed",
+  "atleast-one-recipient-alert": "Please add at least one recipient!",
+  "incorrect-password-or-decryption-failed": "Incorrect password or decryption failed.",
+  "incorrect-password-for-file": "Incorrect password for file: {{file}}",
+  "error-uploading-pdf": "Error while uploading PDF.",
+  "provide-password": "Please provide password.",
+  "only-pdf-allowed": "Only PDF files are allowed.",
+  "invalid-username-password-region": "Invalid username/password or region.",
+  "pfx-extension-alert": "Please upload a file with a .pfx extension.",
+  "email-already-exist": "Email already exists",
+  "branding": "Branding",
+  "branding-help": "Branding provides white labelling to your app",
+  "custom-sub-domain": "Custom sub-domain",
+  "app-name": "App Name",
+  "provide-domain-name": "provide your domain name",
+  "provide-app-name": "provide your app name",
+  "logo":"Logo",
+  "upload-app-logo": "upload your app logo",
+  "prefill-unfilled-widget" :"The following required field(s) cannot be left empty: {{emptyWidget}} Please fill them out to proceed.",
+  "Dashboard": "Dashboard",
+  "Analytics": "Analytics",
+  "Templates": "Templates",
+  "Need your sign": "Need your sign",
+  "In Progress": "In progress",
+  "Completed": "Completed",
+  "Drafts": "Drafts",
+  "Declined": "Declined",
+  "Expired": "Expired",    
+  "Contactbook": "Contactbook",
+  "My Signature": "My signature",
+  "API Token": "API token",
+  "Webhook": "Webhook",
+  "Preferences": "Preferences",
+  "Teams": "Teams",
+  "Users": "Users",
+  "Drive": "Drive",
+  "Branding": "Branding",
+  "Mail": "Mail",
+  "Storage": "Storage",
+  "Signing certificate": "Signing certificate",
+  "General": "General",
+  "Organizations": "Organizations",
+  "OrgAdmins": "OrgAdmins",
+  "Debug Pdf": "Debug Pdf",
+  "New Document": "New Document",
+  "subscription": "subscription",
+  "Draft document": "Draft document",
+  "Draft template": "Draft template",
+  "Public sign": "Public sign",
+  "Signup": "Signup",
+  "delete-contact": "Delete Contact",
+  "total-records-found": "Total records found: {{count}}",
+  "Invalid-records-found": "Invalid records found: {{records}}",
+  "previous": "Previous",
+  "page-n-of-n": "Page {{currentPage}} of {{totalPages}}",
+  "import": "Import",
+  "search": "Search",
+  "viewed-on": "Viewed on: {{ViewedOn}}",
+  "signed-on": "Signed on: {{SignedOn}}",
+  "hide": "Hide",
+  "show-more": "Show More",
+  "browse-or-drag-to-replace-existing-file": "Browse or drag & drop a new file to replace the existing one",
+  "optional-details": "Optional details",
+  "mail-adapter-subscription-alert": "Please upgrade to Professional or Team plan to setup custom SMTP.",
+  "connect-to-mail": "Connect to Gmail",
+  "custom-smtp": "Custom SMTP",
+  "default-smtp": "{{appName}} default SMTP",
+  "host":"Host",
+  "port":"Port",
+  "sender-email": "Sender Email",
+  "username": "Username",
+  "use-default-mail-adapter": "Are you sure you want to use {{appName}}'s default mail servers to send your signature request emails? We recommend using your own  Gmail or SMTP servers for improved inbox deliverability.",
+  "verification-code-sent-registered-email": "A verification code has been sent to your registered email <1>{{useremail}}</1> confirm your settings. Please enter the code below.",
+  "smpt-credentials": "SMTP Credentials"
 }

apps/OpenSign/public/locales/es/translation.json

@@ -26,6 +26,8 @@
     "Name": "Nombre",
     "Date": "Fecha"
   },
+  "folder": "Carpeta",
+  "pdf": "Pdf",
   "context-menu": {
     "Download": "Descargar",
     "Rename": "Renombrar",
@@ -44,6 +46,10 @@
   "contact-now": "Contactar ahora",
   "upgrade-to": "Mejorar a",
   "plan": "Plan",
+  "connect": "Conectar",
+  "connect-to-g-drive": "Conectar con Google Drive",
+  "reconnect-to-g-drive": "Volver a conectar con Google Drive",
+  "gdrive-info-connect": "Cuando Google Drive está conectado, el documento completado se guardará en la carpeta {{appName}} de Google Drive.",
   "subscription-renew-warning": "Su suscripción vencerá en {{remainingDays}} días. Por favor, renueve su suscripción.",
   "subscribe-card-teamplan": "¡Libera todo el poder de la colaboración! Crea organizaciones, equipos y jerarquías ilimitadas. Comparte plantillas sin problemas entre equipos y asigna funciones de usuario personalizadas. ¡Mejora tu flujo de trabajo hoy mismo!",
   "subscribe-card-plan": "Desbloquea funciones premium desde solo {{premiumPrice}}/mes. Disfruta de un rendimiento mejorado y solo {{addonPrice}} por crédito adicional después de tus créditos premium incluidos.",
@@ -58,7 +64,7 @@
   "welcome": "¡Bienvenido de nuevo!",
   "Login-to-your-account": "Ingresa a tu cuenta",
   "password": "Contraseña",
-  "forgot-password": "¿Olvidaste la contraseña?",
+  "forgot-password": "¿Olvidaste la contraseña",
   "loading": "Cargando...",
   "of": "de",
   "sign-SSO": "Ingresar con SSO",
@@ -181,7 +187,9 @@
     "created-date": "Fecha de creación",
     "Type": "Tipo",
     "Logs": "Registros",
-    "Expiry-date": "Date d'expiration"
+    "Expiry-date": "Date d'expiration",
+    "Company": "Compañía",
+    "JobTitle": "Título del puesto"
   },
   "report-help": {
     "Draft Documents": "Estos son documentos que has iniciado pero no has finalizado para su envío.",
@@ -193,16 +201,15 @@
     "Contactbook": "Esta es una lista de contactos/firmantes añadidos por ti. Aparecerán como sugerencias cuando intentes añadir firmantes a un nuevo documento.",
     "Templates": "Esta es una lista de plantillas que están a tu disposición para crear documentos. Puedes hacer clic en el botón «usar» para crear un nuevo documento utilizando una plantilla, modifica el documento y añade firmantes en el siguiente paso."
   },
-  "form-name": {
+  "Sign Yourself": "Firmar",
-    "Sign Yourself": "Firmar",
+  "Request Signatures": "Solicitar firmas",
-    "Request Signatures": "Solicitar firmas",
+  "New Template": "Nueva plantilla",
-    "New Template": "Nueva plantilla"
-  },
   "file-type": "pdf, png, jpg, jpeg",
   "docx": "docx",
   "file-selected": "archivo seleccionado",
   "template-title": "Título de la plantilla",
   "document-title": "Título del documento",
+  "title": "Título",
   "description": "Descripción",
   "time-to-complete": "Plazo de finalización (días)",
   "send-in-order": "Enviar en orden",
@@ -380,6 +387,7 @@
   "certificate": "Certificado",
   "decline": "Rechazar",
   "finish": "Finalizar",
+  "done": "Hecho",
   "mail": "Correo",
   "sign-now": "Firmar ahora",
   "successfully-signed": "¡Firmado exitosamente!",
@@ -389,6 +397,10 @@
   "Email-verified-alert-1": "El correo está verificado.",
   "Email-verified-alert-2": "El correo ya ha sido verificado.",
   "upload-stamp-image": "Subir imagen del sello",
+  "draw-signature": "Dibujar firma",
+  "draw-initials": "Dibujar iniciales",
+  "enter-text": "Introducir texto",
+  "enter-widgettype": "Introduzca {{widgetType}}",
   "draw": "Dibujar",
   "type": "Escribir",
   "color-type": {
@@ -409,6 +421,7 @@
   "reset-password-alert-3": "Restablece tu contraseña",
   "faild-animation": "Error al cargar la animación",
   "apply": "Aplicar",
+  "select-columns": "Seleccionar columnas",
   "copy-type": {
     "All pages": "Todas las páginas",
     "All pages but last": "Todas las páginas menos la última",
@@ -471,7 +484,7 @@
   "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-mail-alert-you": "Los firmantes siguientes recibirán un correo electrónico una vez que usted 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!",
@@ -728,7 +741,7 @@
   },
   "form-title-1": "Configuración del flujo de documentos",
   "form-title-2": "Configuración de seguridad",
-  "text-field-tour": "Los campos de tipo 'Texto' deben completarse con anticipación antes de enviar el documento. Si necesita que los firmantes proporcionen información, utilice el campo 'Entrada de texto'",
+  "text-field-tour": "Los campos de 'Rellenado previo' deben completarse antes de enviar el documento. Si necesita que los firmantes proporcionen información, utilice los campos de firmantes.",
   "attach-signer-tour": "Debe adjuntar un firmante a cada función. Puede hacerlo haciendo clic en este icono. Una vez que seleccione un Firmante, se adjuntará a todos los campos asociados con ese rol que aparecen en el mismo color.",
   "allowed-signature-types": "Tipos de firma permitidos",
   "at-least-one-signature-type": "Se debe habilitar al menos un tipo de firma.",
@@ -761,6 +774,8 @@
   "Rotation-alert": "Girar página",
   "bulk-import": "Importación masiva",
   "contacts-file": "Archivo de contactos (xlsx, csv)",
+  "import-guideline": "Sube un archivo CSV o Excel con las columnas Name, Email y opcionalmente Phone. Solo se importarán los primeros 100 contactos.",
+  "download-sample": "Descargar archivo de ejemplo",
   "100-records-only": "Currently you can only import up to 100 records.",
   "csv-excel-support-only": "Cargue un archivo en uno de los siguientes formatos: CSV, XLSX o XLS.",
   "contact-imported": "Se importaron {{imported}} contactos. {{failed}} contactos no pudieron importarse.",
@@ -774,7 +789,7 @@
   "agree-p1": "Confirmo que he leído y comprendido el ",
   "agree-p2": "Registro Electrónico y Divulgación de Firma",
   "agree-p3": "y consentimiento para utilizar registros y firmas electrónicas.",
-  "agrre-button": "Aceptar y continuar",
+  "agrre-button": "Confirmo y acepto continuar",
   "term-cond-title": "Términos y condiciones",
   "term-cond-h": "DIVULGACIÓN DE REGISTRO ELECTRÓNICO Y FIRMA",
   "term-cond-p1": "Esta Divulgación de Firma y Registro Electrónico ('Divulgación') es un acuerdo entre el Creador del Documento ('Remitente') y el Firmante ('Usted'), facilitado a través de la plataforma {{appName}} ('Plataforma'). Al firmar documentos a través de {{appName}}, usted acepta los términos descritos en esta Divulgación. Léala detenidamente antes de continuar.",
@@ -1033,5 +1048,99 @@
   "choose-one":"Elige uno",
   "search-templates": "Buscar plantillas…",
   "search-documents": "Buscar documentos…",
-  "search-contacts": "Buscar contactos…"
+  "search-contacts": "Buscar contactos…",
+  "invalid-email-found": "Correo electrónico no válido encontrado: {{email}}",
+  "duplicate-email-found": "Correo electrónico duplicado encontrado: {{email}}",
+  "vertical": "Vertical",
+  "add-role-alert": "Por favor, agregue al menos un rol",
+   "edit-draft": "Editar borrador",
+  "horizontal": "Horizontal",
+  "billing": "Facturación",
+  "console": "Consola",
+  "prefill-widget": "Widgets de Relleno Previo",
+  "action-prohibited": "Esta acción no está permitida para su dominio de correo electrónico. Por favor, contacte con su administrador para obtener ayuda.",
+  "must-have-at-least-one-vacant-role": "Debe dejar al menos un rol sin asignar antes de establecer un template como 'public'.",
+  "remove-duplicate": "Por favor, elimina la opción duplicada",
+  "prefill-bulk-error": "El envío masivo no está permitido cuando se han agregado widgets de pre-rellenado. Por favor, elimine los widgets de pre-rellenado para continuar.",
+  "session-expired-title": "Sesión expirada",
+  "access-denied": "Acceso denegado",
+  "upgrade": "Actualizar",
+  "do-not-access-app": "No tienes acceso a esta aplicación.",
+  "dont-have-access": "No tienes acceso.",
+  "valid-email-alert": "Por favor ingresa una dirección de correo electrónico válida.",
+  "otp-not-validate": "OTP no es válido.",
+  "domain-not-allowed": "Este dominio no está permitido",
+  "atleast-one-recipient-alert": "¡Por favor agrega al menos un destinatario!",
+  "incorrect-password-or-decryption-failed": "Contraseña incorrecta o fallo de descifrado.",
+  "incorrect-password-for-file": "Contraseña incorrecta para el archivo: {{file}}",
+  "error-uploading-pdf": "Error al subir PDF.",
+  "provide-password": "Por favor proporciona la contraseña.",
+  "only-pdf-allowed": "Solo se permiten archivos PDF.",
+  "invalid-username-password-region": "Usuario/contraseña o región inválidos.",
+  "pfx-extension-alert": "Por favor sube un archivo con extensión .pfx.",
+  "email-already-exist": "El correo electrónico ya existe",
+  "branding": "Marca",
+  "branding-help": "El branding permite el white labelling de su aplicación",
+  "custom-sub-domain": "Subdominio personalizado",
+  "app-name": "Nombre de la aplicación",
+  "provide-domain-name": "Proporcione su nombre de dominio",
+  "provide-app-name": "Proporcione el nombre de su aplicación",
+  "logo": "Logo",
+  "upload-app-logo": "Suba el logotipo de su aplicación",
+  "prefill-unfilled-widget": "Los siguientes campos obligatorios no pueden quedar vacíos: {{emptyWidget}}. Por favor, complételos para continuar.",
+  "Dashboard": "Panel",
+  "Analytics": "Analítica",
+  "Templates": "Plantillas",
+  "Need your sign": "Necesitan tu firma",
+  "In Progress": "En progreso",
+  "Completed": "Completado",
+  "Drafts": "Borradores",
+  "Declined": "Rechazados",
+  "Expired": "Expirados",
+  "Contactbook": "Agenda de contactos",
+  "My Signature": "Mi firma",
+  "API Token": "Token API",
+  "Webhook": "Webhook",
+  "Preferences": "Preferencias",
+  "Teams": "Equipos",
+  "Users": "Usuarios",
+  "Drive": "Drive",
+  "Branding": "Marca",
+  "Mail": "Correo",
+  "Storage": "Almacenamiento",
+  "Signing certificate": "Certificado de firma",
+  "General": "General",
+  "Organizations": "Organizaciones",
+  "OrgAdmins": "OrgAdmins",
+  "Debug Pdf": "Depurar PDF",
+  "New Document": "Nuevo documento",
+  "subscription": "Suscripción",
+  "Draft document": "Borrador de documento",
+  "Draft template": "Borrador de plantilla",
+  "Public sign": "Firma pública",
+  "Signup": "Registrarse",
+  "delete-contact": "Eliminar contacto",
+  "total-records-found": "Total de registros encontrados: {{count}}",
+  "Invalid-records-found": "Registros inválidos encontrados: {{records}}",
+  "previous": "Anterior",
+  "page-n-of-n": "Página {{currentPage}} de {{totalPages}}",
+  "import": "Importar",
+  "search": "Buscar",
+  "viewed-on": "Visto el: {{ViewedOn}}",
+  "signed-on": "Firmado el: {{SignedOn}}",
+  "hide": "Ocultar",
+  "show-more": "Mostrar más",
+  "browse-or-drag-to-replace-existing-file": "Busque o arrastre y suelte un nuevo archivo para reemplazar el existente",
+  "optional-details": "Detalles opcionales",
+  "mail-adapter-subscription-alert": "Bitte upgraden Sie auf den Professional- oder Team-Plan, um ein benutzerdefiniertes SMTP einzurichten.",
+  "connect-to-mail": "Conectar con Gmail",
+  "custom-smtp": "SMTP personalizado",
+  "default-smtp": "SMTP predeterminado de {{appName}}",
+  "host": "Host",
+  "port": "Puerto",
+  "sender-email": "Correo del remitente",
+  "username": "Nombre de usuario",
+  "use-default-mail-adapter": "¿Está seguro de que desea usar los servidores de correo predeterminados de {{appName}} para enviar solicitudes de firma? Recomendamos usar su propio servidor de Gmail o SMTP para una mejor entregabilidad.",
+  "verification-code-sent-registered-email": "Se ha enviado un código de verificación a su correo registrado <1>{{useremail}}</1>. Ingrese el código a continuación para confirmar su configuración.",
+  "smpt-credentials": "Credenciales SMTP"
 }

apps/OpenSign/public/locales/fr/translation.json

@@ -26,6 +26,8 @@
     "Name": "Nom et Prénom",
     "Date": "Date"
   },
+  "folder": "Dossier",   
+  "pdf": "Pdf",
   "context-menu": {
     "Download": "Télécharger",
     "Rename": "Renommer",
@@ -45,6 +47,10 @@
   "upgrade-to": "Mettre à niveau vers",
   "pro": "PRO",
   "plan": "Offre",
+  "connect": "Connecter",
+  "connect-to-g-drive": "Se connecter à Google Drive",
+  "reconnect-to-g-drive": "Se reconnecter à Google Drive",
+  "gdrive-info-connect": "Lorsque Google Drive est connecté, le document complété sera enregistré dans le dossier {{appName}} sur Google Drive.",
   "subscription-renew-warning": "Votre abonnement expirera dans {{remainingDays}} jours. Veuillez renouveler votre abonnement.",
   "subscribe-card-teamplan": "Libérez toute la puissance de la collaboration ! Créez un nombre illimité d'organisations, d'équipes et de hiérarchies. Partagez des modèles de manière transparente entre les équipes et attribuez des rôles d'utilisateur personnalisés. Améliorez votre flux de travail dès aujourd'hui !",
   "subscribe-card-plan": "Débloquez des fonctionnalités premium à partir de seulement {{premiumPrice}}/mois. Bénéficiez de performances améliorées et de seulement {{addonPrice}} par crédit supplémentaire après vos crédits premium inclus.",
@@ -58,7 +64,7 @@
   "welcome": "Content de te revoir!",
   "Login-to-your-account": "Se connecter à son compte",
   "password": "Mot de passe",
-  "forgot-password": "Mot de passe oublié?",
+  "forgot-password": "Mot de passe oublié",
   "loading": "Chargement...",
   "of": "de",
   "sign-SSO": "Connectez-vous avec SSO",
@@ -155,7 +161,9 @@
     "created-date": "Date de création",
     "Type": "Saisir",
     "Logs": "Journaux",
-    "Expiry-date": "Fecha de caducidad"
+    "Expiry-date": "Fecha de caducidad",
+    "Company": "Organisation",
+    "JobTitle": "Votre Fonction"
   },
   "btnLabel": {
     "sign": "Signer",
@@ -192,16 +200,15 @@
     "Contactbook": "Il s'agit d'une liste de contacts/signataires que vous avez ajoutés. Ceux-ci apparaîtront sous forme de suggestions lorsque vous tenterez d'ajouter des signataires à un nouveau document.",
     "Templates": "Il s'agit d'une liste de modèles à votre disposition pour créer des documents. Vous pouvez cliquer sur le bouton 'Utiliser' pour créer un nouveau document à l'aide d'un modèle, modifier le document et ajouter des signataires à l'étape suivante."
   },
-  "form-name": {
+  "Sign Yourself": "signez vous-même",
-    "Sign Yourself": "signez vous-même",
+  "Request Signatures": "Demander des signatures",
-    "Request Signatures": "Demander des signatures",
+  "New Template": "Nouveau modèle",
-    "New Template": "Nouveau modèle"
-  },
   "file-type": "pdf, png, jpg, jpeg",
   "docx": "docx",
   "file-selected": "fichier sélectionné",
   "template-title": "Titre du modèle",
   "document-title": "Titre du document",
+  "title": "Titre",
   "description": "Description",
   "time-to-complete": "Temps de réalisation (jours)",
   "send-in-order": "Envoyer dans l'ordre ?",
@@ -379,6 +386,7 @@
   "certificate": "Certificat",
   "decline": "refusé",
   "finish": "terminé",
+  "done": "Terminé",
   "mail": "Mail",
   "sign-now": "Signez maintenant",
   "successfully-signed": "Signé avec succès !",
@@ -388,6 +396,10 @@
   "Email-verified-alert-1": "L'e-mail est vérifié.",
   "Email-verified-alert-2": "L'e-mail est déjà vérifié.",
   "upload-stamp-image": "Télécharger l'image du tampon",
+  "draw-signature": "Dessiner la signature",
+  "draw-initials": "Dessiner les initiales",
+  "enter-text": "Saisir du texte",
+  "enter-widgettype": "Saisir {{widgetType}}",
   "draw": "Dessiner",
   "type": "Taper",
   "color-type": {
@@ -471,7 +483,7 @@
   "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-mail-alert-you": "Les signataires suivants recevront un e-mail une fois que vous aurez signé 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é !",
@@ -696,7 +708,7 @@
   "quota-mail-info": "Pour maintenir la qualité du service et prévenir le spam, OpenSign permet jusqu'à 15 e-mails par mois avec le plan gratuit. Passez à l'offre supérieure pour un envoi illimité d'e-mails.",
   "quota-mail-reset": "Les crédits de votre email de demande de signature seront réinitialisés le",
   "quota-mail": "Vous avez atteint votre limite de 15 e-mails de demande de signature pour ce mois. Mettez à niveau maintenant pour continuer à envoyer des e-mails directement.",
-  "quota-mail-tip-tip": "Astuce: Vous pouvez toujours signer un nombre <1>illimité de documents</1> en partageant manuellement le lien de demande de signature.",
+  "quota-mail-tip": "Astuce: Vous pouvez toujours signer un nombre <1>illimité de documents</1> en partageant manuellement le lien de demande de signature.",
   "quota-mail-head": "Quota atteint",
   "unauthorized-modal": "Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminEmail}}.",
   "sent-this-month": "envoyé ce mois-ci",
@@ -728,7 +740,7 @@
   "public-tour-message": "Le modèle doit être public avant que vous puissiez générer un lien partageable.",
   "add-user-template": "Vous devez ajouter un rôle avant de pouvoir lui ajouter des champs. ",
   "pdf-uncompatible": "PDF n'est pas compatible, veuillez contacter {{appName}}",
-  "text-field-tour": "Les champs de type 'Texte' doivent être remplis à l'avance avant l'envoi du document. Si vous avez besoin que les signataires fournissent des informations, utilisez plutôt le champ 'Saisie de texte'.",
+  "text-field-tour": "Les champs 'Pré-remplissage' doivent être remplis avant l'envoi du document. Si vous avez besoin de l'intervention des signataires, utilisez plutôt les champs réservés aux signataires.",
   "attach-signer-tour": "Vous devez associer un signataire à chaque rôle. Vous pouvez le faire en cliquant sur cette icône. Une fois que vous avez sélectionné un signataire, il sera attaché à tous les champs associés à ce rôle qui apparaissent dans la même couleur.",
   "allowed-signature-types": "Types de signature autorisés",
   "at-least-one-signature-type": "Au moins un type de signature doit être activé.",
@@ -761,6 +773,8 @@
   "Rotation-alert": "Faire pivoter la page",
   "bulk-import": "Importation en masse",
   "contacts-file": "Fichier de contacts (xlsx, csv)",
+  "import-guideline": "Téléchargez un fichier CSV ou Excel avec les colonnes Name, Email et éventuellement Phone. Seuls les 100 premiers contacts seront importés.",
+  "download-sample": "Télécharger un fichier d'exemple",
   "100-records-only": "Actuellement, vous ne pouvez importer que 100 enregistrements.",
   "csv-excel-support-only": "Veuillez télécharger un fichier dans l'un des formats suivants : CSV, XLSX ou XLS.",
   "contact-imported": "{{imported}} contacts ont été importés. {{failed}} contacts n'ont pas pu être importés.",
@@ -774,7 +788,7 @@
   "agree-p1": "Je confirme avoir lu et compris les ",
   "agree-p2": "Divulgation des enregistrements électroniques et des signatures",
   "agree-p3": "et consentez à l'utilisation d'enregistrements et de signatures électroniques.",
-  "agrre-button": " Accepter et continuer ",
+  "agrre-button": "Je confirme et j'accepte de continuer",
   "term-cond-title": "Termes et conditions",
   "term-cond-h": "DIVULGATION D'ENREGISTREMENT ÉLECTRONIQUE ET DE SIGNATURE",
   "term-cond-p1": "Cette divulgation d'enregistrement électronique et de signature (' Divulgation ') est un accord entre le créateur du document (' Expéditeur ') et le signataire (' Vous '), facilité via la plateforme {{appName}} ( Plateforme ). En signant des documents via {{appName}}, vous acceptez les conditions décrites dans cette divulgation. Veuillez la lire attentivement avant de continuer.",
@@ -1033,5 +1047,99 @@
   "choose-one":"Choisissez-en un",
   "search-templates": "Rechercher des modèles…",
   "search-documents": "Rechercher des documents…",
-  "search-contacts": "Rechercher des contacts…"
+  "search-contacts": "Rechercher des contacts…",
+  "add-role-alert": "Veuillez ajouter au moins un rôle",
+  "edit-draft": "Modifier le brouillon",
+  "invalid-email-found": "Adresse e-mail invalide trouvée : {{email}}",
+  "duplicate-email-found": "Adresse e-mail en double trouvée : {{email}}",
+  "vertical": "Vertical",
+  "horizontal": "Horizontal",
+  "billing": "Facturation",
+  "console": "Console",
+  "prefill-widget": "Widgets de Préremplissage",
+  "action-prohibited": "Cette action n'est pas autorisée pour votre domaine de messagerie. Veuillez contacter votre administrateur pour obtenir de l'aide.",
+  "must-have-at-least-one-vacant-role": "Vous devez laisser au moins un rôle non attribué avant de définir un template comme 'public'.",
+  "remove-duplicate": "Veuillez supprimer l'option en double",
+  "prefill-bulk-error": "L'envoi en masse n'est pas autorisé lorsque des widgets de pré-remplissage sont ajoutés. Veuillez supprimer les widgets de pré-remplissage pour continuer.",
+  "session-expired-title": "Session expirée",
+  "access-denied": "Accès refusé",
+  "upgrade": "Mettre à jour",
+  "do-not-access-app": "Vous n'avez pas accès à cette application.",
+  "dont-have-access": "Vous n'avez pas accès.",
+  "valid-email-alert": "Veuillez saisir une adresse e-mail valide.",
+  "otp-not-validate": "OTP non valide.",
+  "domain-not-allowed": "Ce domaine n'est pas autorisé",
+  "atleast-one-recipient-alert": "Veuillez ajouter au moins un destinataire !",
+  "incorrect-password-or-decryption-failed": "Mot de passe incorrect ou échec du déchiffrement.",
+  "incorrect-password-for-file": "Mot de passe incorrect pour le fichier : {{file}}",
+  "error-uploading-pdf": "Erreur lors du téléchargement du PDF.",
+  "provide-password": "Veuillez fournir le mot de passe.",
+  "only-pdf-allowed": "Seuls les fichiers PDF sont autorisés.",
+  "invalid-username-password-region": "Nom d'utilisateur/mot de passe ou région invalide.",
+  "pfx-extension-alert": "Veuillez télécharger un fichier avec l'extension .pfx.",
+  "email-already-exist": "L'e-mail existe déjà",
+  "branding": "Image de marque",
+  "branding-help": "Le branding permet le white labelling de votre application",
+  "custom-sub-domain": "Sous-domaine personnalisé",
+  "app-name": "Nom de l'application",
+  "provide-domain-name": "Fournissez votre nom de domaine",
+  "provide-app-name": "Fournissez le nom de votre application",
+  "logo": "Logo",
+  "upload-app-logo": "Téléchargez le logo de votre application",
+  "prefill-unfilled-widget": "Les champs obligatoires suivants ne peuvent pas être vides : {{emptyWidget}}. Veuillez les remplir pour continuer.",
+  "Dashboard": "Tableau de bord",
+  "Analytics": "Analytique",
+  "Templates": "Modèles",
+  "Need your sign": "Besoin de votre signature",
+  "In Progress": "En cours",
+  "Completed": "Complété",
+  "Drafts": "Brouillons",
+  "Declined": "Signature refusé",
+  "Expired": "Expiré",
+  "Contactbook": "Carnet de contacts",
+  "My Signature": "Ma signature",
+  "API Token": "Jeton API",
+  "Webhook": "Webhook",
+  "Preferences": "Préférences",
+  "Teams": "Équipe",
+  "Users": "Utilisateurs",
+  "Drive": "Lecteur",
+  "Branding": "Image de marque",
+  "Mail": "Courrier",
+  "Storage": "Stockage",
+  "Signing certificate": "Certificat de signature",
+  "General": "Général",
+  "Organizations": "Organisations",
+  "OrgAdmins": "OrgAdmins",
+  "Debug Pdf": "Déboguer le PDF",
+  "New Document": "Nouveau document",
+  "subscription": "Abonnement",
+  "Draft document": "Brouillon de document",
+  "Draft template": "Brouillon de modèle",
+  "Public sign": "Signature publique",
+  "Signup": "Inscription",
+  "delete-contact": "Supprimer le contact",
+  "total-records-found": "Nombre total d'enregistrements trouvés : {{count}}",
+  "Invalid-records-found": "Enregistrements invalides trouvés : {{records}}",
+  "previous": "Précédent",
+  "page-n-of-n": "Page {{currentPage}} sur {{totalPages}}",
+  "import": "Importer",
+  "search": "Rechercher",
+  "viewed-on": "Consulté le : {{ViewedOn}}",
+  "signed-on": "Signé le : {{SignedOn}}",
+  "hide": "Masquer",
+  "show-more": "Afficher plus",
+  "browse-or-drag-to-replace-existing-file": "Parcourez ou faites glisser un nouveau fichier pour remplacer l'existant",
+  "optional-details": "Détails facultatifs",
+  "mail-adapter-subscription-alert": "Veuillez passer au plan Professionnel ou Équipe pour configurer un SMTP personnalisé.",
+  "connect-to-mail": "Se connecter à Gmail",
+  "custom-smtp": "SMTP personnalisé",
+  "default-smtp": "SMTP par défaut de {{appName}}",
+  "host": "Hôte",
+  "port": "Port",
+  "sender-email": "Email de l'expéditeur",
+  "username": "Nom d'utilisateur",
+  "use-default-mail-adapter": "Voulez-vous vraiment utiliser les serveurs de messagerie par défaut de {{appName}} pour envoyer vos demandes de signature ? Nous vous recommandons d'utiliser votre propre serveur Gmail ou SMTP pour une meilleure délivrabilité.",
+  "verification-code-sent-registered-email": "Un code de vérification a été envoyé à votre email enregistré <1>{{useremail}}</1>. Veuillez entrer le code ci-dessous pour confirmer vos paramètres.",
+  "smpt-credentials": "Identifiants SMTP"
 }

apps/OpenSign/public/locales/hi/translation.json

@@ -26,6 +26,8 @@
     "Name": "नाम",
     "Date": "दिनांक"
   },
+  "folder": "फ़ोल्डर",
+  "pdf": "पीडीएफ़",
   "context-menu": {
     "Download": "डाउनलोड करें",
     "Rename": "नाम बदलें",
@@ -44,6 +46,10 @@
   "contact-now": "अभी संपर्क करें",
   "upgrade-to": "इसमें अपग्रेड करें",
   "plan": "योजना",
+  "connect": "कनेक्ट करें",
+  "connect-to-g-drive": "Google Drive से कनेक्ट करें",
+  "reconnect-to-g-drive": "Google Drive से फिर से कनेक्ट करें",
+  "gdrive-info-connect": "जब Google Drive जुड़ा होता है, तो पूर्ण दस्तावेज़ {{appName}} फ़ोल्डर में Google Drive पर सहेजा जाएगा।",
   "subscription-renew-warning": "आपकी सदस्यता {{remainingDays}} दिनों में समाप्त हो जाएगी। कृपया अपनी सदस्यता नवीनीकृत करें।",
   "subscribe-card-teamplan": "सहयोग की पूरी शक्ति को अनलॉक करें! असीमित संगठन, टीम और पदानुक्रम बनाएं। टीमों में टेम्पलेट को निर्बाध रूप से साझा करें और कस्टम उपयोगकर्ता भूमिकाएँ असाइन करें। आज ही अपने वर्कफ़्लो को उन्नत करें!",
   "subscribe-card-plan": "केवल {{premiumPrice}}/माह से शुरू होने वाली प्रीमियम सुविधाओं को अनलॉक करें। अपने शामिल प्रीमियम क्रेडिट के बाद प्रति अतिरिक्त क्रेडिट केवल {{addonPrice}} पर बढ़ी हुई प्रदर्शन का आनंद लें।",
@@ -58,7 +64,7 @@
   "welcome": "वापसी पर स्वागत है!",
   "Login-to-your-account": "अपने खाते में प्रवेश करे",
   "password": "पासवर्ड",
-  "forgot-password": "पासवर्ड भूल गए?",
+  "forgot-password": "पासवर्ड भूल गए",
   "loading": "लोड हो रहा है...",
   "of": "का",
   "sign-SSO": "SSO के साथ साइन इन करें",
@@ -181,7 +187,9 @@
     "created-date": "निर्माण तिथि",
     "Type": "प्रकार",
     "Logs": "लॉग",
-    "Expiry-date": "समाप्ति तिथि"
+    "Expiry-date": "समाप्ति तिथि",
+    "Company": "कंपनी",
+    "JobTitle": "पद"
   },
   "report-help": {
     "Draft Documents": "ये वे दस्तावेज़ हैं जिन्हें आपने शुरू तो किया है लेकिन भेजने के लिए अंतिम रूप नहीं दिया है।",
@@ -193,16 +201,15 @@
     "Contactbook": "यह आपके द्वारा जोड़े गए संपर्कों/हस्ताक्षरकर्ताओं की सूची है। जब आप किसी नए दस्तावेज़ में हस्ताक्षरकर्ताओं को जोड़ने का प्रयास करेंगे तो ये सुझावों के रूप में दिखाई देंगे।",
     "Templates": "यह उन टेम्पलेट्स की सूची है जो दस्तावेज़ बनाने के लिए आपके लिए उपलब्ध हैं। आप टेम्पलेट का उपयोग करके एक नया दस्तावेज़ बनाने के लिए 'उपयोग करें' बटन पर क्लिक कर सकते हैं, दस्तावेज़ को संशोधित कर सकते हैं और अगले चरण में हस्ताक्षरकर्ताओं को जोड़ सकते हैं।"
   },
-  "form-name": {
+  "Sign Yourself": "स्वयं हस्ताक्षर करें",
-    "Sign Yourself": "स्वयं हस्ताक्षर करें",
+  "Request Signatures": "हस्ताक्षर का अनुरोध करें",
-    "Request Signatures": "हस्ताक्षर का अनुरोध करें",
+  "New Template": "नया टेम्पलेट",
-    "New Template": "नया टेम्पलेट"
-  },
   "file-type": "pdf, png, jpg, jpeg",
   "docx": "docx",
   "file-selected": "फ़ाइल चयनित",
   "template-title": "टेम्पलेट शीर्षक",
   "document-title": "दस्तावेज़ शीर्षक",
+  "title": "शीर्षक",
   "description": "विवरण",
   "time-to-complete": "पूरा करने का समय (दिन)",
   "send-in-order": "क्रम से भेजें",
@@ -355,7 +362,7 @@
   "widgets-name": {
     "signature": "हस्ताक्षर",
     "stamp": "मोहर",
-    "initials": "हस्ताक्षर",
+    "initials": "प्रारंभिक अक्षर",
     "name": "नाम",
     "job title": "पद",
     "company": "कंपनी",
@@ -379,6 +386,7 @@
   "certificate": "प्रमाण पत्र",
   "decline": "अस्वीकार करें",
   "finish": "समाप्त करें",
+  "done": "हो गया",
   "mail": "मेल",
   "sign-now": "अभी हस्ताक्षर करें",
   "successfully-signed": "सफलतापूर्वक हस्ताक्षर किए गए!",
@@ -388,8 +396,12 @@
   "Email-verified-alert-1": "ईमेल सत्यापित है।",
   "Email-verified-alert-2": "ईमेल पहले से ही सत्यापित है।",
   "upload-stamp-image": "मोहर छवि अपलोड करें",
+  "draw-signature": "हस्ताक्षर बनाएं",
+  "draw-initials": "इनिशियल्स बनाएं",
+  "enter-text": "पाठ दर्ज करें",
+  "enter-widgettype": "{{widgetType}} दर्ज करें",
   "draw": "आरेखित करें",
-  "type": "प्रकार",
+  "type": "टाइप",
   "color-type": {
     "red": "लाल",
     "blue": "नीला",
@@ -471,7 +483,7 @@
   "placeholder-alert-3": " क्या आप वाकई इस दस्तावेज़ को हस्ताक्षर के लिए भेजना चाहते हैं?",
   "placeholder-alert-4": "आपने सभी प्राप्तकर्ताओं को सफलतापूर्वक मेल भेज दिए हैं!",
   "placeholder-mail-alert": "आपने {{name}} को सफलतापूर्वक ईमेल भेज दिया है। {{name}} द्वारा दस्तावेज़ पर हस्ताक्षर करने के बाद बाद के हस्ताक्षरकर्ताओं को ईमेल प्राप्त होंगे",
-  "placeholder-mail-alert-you": "आपके द्वारा दस्तावेज़ पर हस्ताक्षर करने के बाद बाद के हस्ताक्षरकर्ताओं को ईमेल प्राप्त होंगे।",
+  "placeholder-mail-alert-you": "आपके दस्तावेज़ पर हस्ताक्षर करने के बाद अगले हस्ताक्षरकर्ता को ईमेल प्राप्त होगा।",
   "placeholder-alert-5": "क्या आप अभी दस्तावेज़ पर हस्ताक्षर करना चाहते हैं?",
   "placeholder-alert-6": "मेल भेजने के लिए कृपया मेल एडॉप्टर सेटअप करें!",
   "placeholder-alert-7": "प्लेसहोल्डर जोड़ने के लिए कृपया हस्ताक्षरकर्ता चुनें!",
@@ -728,7 +740,7 @@
   "public-tour-message": "साझा करने योग्य लिंक उत्पन्न करने से पहले टेम्पलेट को सार्वजनिक होना चाहिए।",
   "add-user-template": "इसके लिए फ़ील्ड जोड़ने से पहले आपको एक भूमिका जोड़ने की आवश्यकता है।",
   "pdf-uncompatible": "यह पीडीएफ संगत नहीं है, कृपया {{appName}} से संपर्क करें",
-  "text-field-tour": "दस्तावेज़ भेजे जाने से पहले 'टेक्स्ट' प्रकार के फ़ील्ड पहले से भरे जाने चाहिए। यदि आपको हस्ताक्षरकर्ताओं से इनपुट प्रदान करने की आवश्यकता है, तो इसके बजाय 'टेक्स्ट इनपुट' फ़ील्ड का उपयोग करें।",
+  "text-field-tour": "दस्तावेज़ सबमिट करने से पहले 'प्रीफ़िल' फ़ील्ड को पहले से भरना होगा। यदि आपको हस्ताक्षरकर्ताओं से इनपुट की आवश्यकता है, तो इसके बजाय हस्ताक्षरकर्ता फ़ील्ड का उपयोग करें।",
   "attach-signer-tour": "आपको प्रत्येक भूमिका में एक हस्ताक्षरकर्ता संलग्न करने की आवश्यकता है। आप इस आइकन पर क्लिक करके ऐसा कर सकते हैं। एक बार जब आप एक हस्ताक्षरकर्ता का चयन कर लेते हैं तो यह उस भूमिका से जुड़े सभी फ़ील्ड से जुड़ जाएगा जो एक ही रंग में दिखाई देते हैं।",
   "allowed-signature-types": "अनुमत हस्ताक्षर प्रकार",
   "at-least-one-signature-type": "कम से कम एक हस्ताक्षर प्रकार सक्षम होना चाहिए।",
@@ -761,6 +773,8 @@
   "Rotation-alert": "पृष्ठ घुमाएँ",
   "bulk-import": "थोक आयात",
   "contacts-file": "संपर्क फ़ाइल (xlsx, csv)",
+  "import-guideline": "नाम, ईमेल और वैकल्पिक फोन कॉलम वाली CSV या Excel फ़ाइल अपलोड करें। केवल पहले 100 संपर्क आयात किए जाएंगे.",
+  "download-sample": "उदाहरण फ़ाइल डाउनलोड करें",
   "100-records-only": "वर्तमान में आप केवल 100 रिकॉर्ड तक आयात कर सकते हैं।",
   "csv-excel-support-only": "निम्नलिखित प्रारूपों में से किसी एक में फ़ाइल अपलोड करें: CSV, XLSX या XLS।",
   "contact-imported": "{{imported}} संपर्क आयात किए गए। {{failed}} संपर्क आयात करने में विफल रहे।",
@@ -774,7 +788,7 @@
   "agree-p1": "मैं पुष्टि करता हूं कि मैंने पढ़ लिया है और समझ लिया है ",
   "agree-p2": "इलेक्ट्रॉनिक रिकॉर्ड और हस्ताक्षर प्रकटीकरण",
   "agree-p3": "और इलेक्ट्रॉनिक रिकॉर्ड और हस्ताक्षर का उपयोग करने के लिए सहमति।",
-  "agrre-button": " सहमत हूँ और जारी रखें",
+  "agrre-button": "मैं पुष्टि करता हूँ और आगे बढ़ने के लिए सहमत हूँ",
   "term-cond-title": "नियम और शर्तें",
   "term-cond-h": "इलेक्ट्रॉनिक रिकॉर्ड और हस्ताक्षर प्रकटीकरण",
   "term-cond-p1": "यह इलेक्ट्रॉनिक रिकॉर्ड और हस्ताक्षर प्रकटीकरण ('प्रकटीकरण') दस्तावेज़ निर्माता ('प्रेषक') और हस्ताक्षरकर्ता ('आप') के बीच एक समझौता है, जिसे {{appName}} प्लेटफ़ॉर्म ('प्लेटफ़ॉर्म') के माध्यम से सुगम बनाया गया है। {{appName}} के माध्यम से दस्तावेज़ों पर हस्ताक्षर करके, आप इस प्रकटीकरण में उल्लिखित शर्तों से सहमत होते हैं। कृपया आगे बढ़ने से पहले इसे ध्यान से पढ़ें।",
@@ -1033,5 +1047,99 @@
   "choose-one":"एक का चयन",
   "search-templates": "टेम्पलेट खोजें…",
   "search-documents": "दस्तावेज़ खोजें…",
-  "search-contacts": "संपर्क खोजें…"
+  "search-contacts": "संपर्क खोजें…",
+  "add-role-alert": "कृपया कम से कम एक भूमिका जोड़ें",
+   "edit-draft": "ड्राफ्ट संपादित करें",
+  "invalid-email-found": "अमान्य ईमेल पाया गया: {{email}}",
+  "duplicate-email-found": "डुप्लिकेट ईमेल पाया गया: {{email}}",
+  "vertical": "वर्टिकल",
+  "horizontal": "हॉरिज़ॉन्टल",
+  "billing": "बिलिंग",
+  "console": "कंसोल",
+  "prefill-widget": "पूर्व भराव विजेट्स",
+  "action-prohibited": "यह क्रिया आपके ईमेल डोमेन के लिए अनुमत नहीं है। कृपया सहायता के लिए अपने व्यवस्थापक से संपर्क करें।",
+  "must-have-at-least-one-vacant-role": "किसी टेम्पलेट को 'public' पर सेट करने से पहले कम से कम एक भूमिका खाली होनी चाहिए।",
+  "remove-duplicate": "कृपया डुप्लिकेट विकल्प हटाएं",
+  "prefill-bulk-error": "जब प्रीफ़िल विजेट जोड़े जाते हैं तो बल्क भेजना अनुमति नहीं है। कृपया आगे बढ़ने के लिए प्रीफ़िल विजेट हटा दें।",
+  "session-expired-title": "सत्र समाप्त हो गया",
+  "access-denied": "पहुंच अस्वीकृत",
+  "upgrade": "अपग्रेड",
+  "do-not-access-app": "आपको इस एप्लिकेशन तक पहुंच नहीं है।",
+  "dont-have-access": "आपको पहुंच नहीं है।",
+  "valid-email-alert": "कृपया एक मान्य ईमेल पता दर्ज करें।",
+  "otp-not-validate": "ओटीपी मान्य नहीं है।",
+  "domain-not-allowed": "यह डोमेन अनुमति नहीं है",
+  "atleast-one-recipient-alert": "कृपया कम से कम एक प्राप्तकर्ता जोड़ें!",
+  "incorrect-password-or-decryption-failed": "गलत पासवर्ड या डिक्रिप्शन विफल।",
+  "incorrect-password-for-file": "फ़ाइल के लिए गलत पासवर्ड: {{file}}",
+  "error-uploading-pdf": "PDF अपलोड करते समय त्रुटि।",
+  "provide-password": "कृपया पासवर्ड प्रदान करें।",
+  "only-pdf-allowed": "केवल PDF फ़ाइलें अनुमत हैं।",
+  "invalid-username-password-region": "अमान्य उपयोगकर्ता नाम/पासवर्ड या क्षेत्र।",
+  "pfx-extension-alert": ".pfx एक्सटेंशन वाली फ़ाइल अपलोड करें।",
+  "email-already-exist": "ईमेल पहले से मौजूद है",
+  "branding": "ब्रांडिंग",
+  "branding-help": "ब्रांडिंग आपकी ऐप में वाइट लेबलिंग की सुविधा देती है",
+  "custom-sub-domain": "कस्टम सब-डोमेन",
+  "app-name": "ऐप का नाम",
+  "provide-domain-name": "अपना डोमेन नाम दर्ज करें",
+  "provide-app-name": "अपना ऐप नाम दर्ज करें",
+  "logo": "लोगो",
+  "upload-app-logo": "अपने ऐप का लोगो अपलोड करें",
+  "prefill-unfilled-widget": "निम्न अनिवार्य फ़ील्ड खाली नहीं छोड़े जा सकते: {{emptyWidget}}। कृपया आगे बढ़ने के लिए इन्हें भरें।",
+  "Dashboard": "डैशबोर्ड",
+  "Analytics": "विश्लेषिकी",
+  "Templates": "टेम्पलेट्स",
+  "Need your sign": "आपके हस्ताक्षर की आवश्यकता है",
+  "In Progress": "प्रगति में है",
+  "Completed": "पूरा हुआ",
+  "Drafts": "ड्राफ्ट",
+  "Declined": "अस्वीकृत",
+  "Expired": "समाप्त",
+  "Contactbook": "संपर्क पुस्तिका",
+  "My Signature": "मेरा हस्ताक्षर",
+  "API Token": "एपीआई टोकन",
+  "Webhook": "वेबहूक",
+  "Preferences": "वरीयताएँ",
+  "Teams": "टीमें",
+  "Users": "उपयोगकर्ता",
+  "Drive": "ड्राइव",
+  "Branding": "ब्रांडिंग",
+  "Mail": "मेल",
+  "Storage": "भंडारण",
+  "Signing certificate": "हस्ताक्षर प्रमाण पत्र",
+  "General": "सामान्य",
+  "Organizations": "संगठन",
+  "OrgAdmins": "संगठन व्यवस्थापक",
+  "Debug Pdf": "पीडीएफ़ डीबग करें",
+  "New Document": "नया दस्तावेज़",
+  "subscription": "सब्सक्रिप्शन",
+  "Draft document": "ड्राफ्ट दस्तावेज़",
+  "Draft template": "ड्राफ्ट टेम्पलेट",
+  "Public sign": "पब्लिक साइन",
+  "Signup": "साइन अप करें",
+  "delete-contact": "संपर्क हटाएं",
+  "total-records-found": "कुल रिकॉर्ड मिले: {{count}}",
+  "Invalid-records-found": "अमान्य रिकॉर्ड मिले: {{records}}",
+  "previous": "पिछला",
+  "page-n-of-n": "पृष्ठ {{currentPage}} का {{totalPages}}",
+  "import": "आयात करें",
+  "search": "खोजें",
+  "viewed-on": "देखा गया: {{ViewedOn}}",
+  "signed-on": "हस्ताक्षर किया गया: {{SignedOn}}",
+  "hide": "छिपाएं",
+  "show-more": "और दिखाएं",
+  "browse-or-drag-to-replace-existing-file": "नई फ़ाइल ब्राउज़ करें या खींचकर छोड़ें ताकि मौजूदा फ़ाइल को बदला जा सके",
+  "optional-details": "वैकल्पिक विवरण",
+  "mail-adapter-subscription-alert": "कस्टम SMTP सेटअप करने के लिए कृपया प्रोफेशनल या टीम प्लान में अपग्रेड करें।",
+  "connect-to-mail": "Gmail से कनेक्ट करें",
+  "custom-smtp": "कस्टम SMTP",
+  "default-smtp": "{{appName}} डिफ़ॉल्ट SMTP",
+  "host": "होस्ट",
+  "port": "पोर्ट",
+  "sender-email": "प्रेषक ईमेल",
+  "username": "यूज़रनेम",
+  "use-default-mail-adapter": "क्या आप वाकई {{appName}} के डिफ़ॉल्ट मेल सर्वर का उपयोग करके सिग्नेचर अनुरोध भेजना चाहते हैं? बेहतर इनबॉक्स डिलीवरी के लिए हम अपने Gmail या SMTP सर्वर का उपयोग करने की सिफारिश करते हैं।",
+  "verification-code-sent-registered-email": "आपके पंजीकृत ईमेल <1>{{useremail}}</1> पर एक सत्यापन कोड भेजा गया है। कृपया अपनी सेटिंग की पुष्टि के लिए नीचे कोड दर्ज करें।",
+  "smpt-credentials": "SMTP क्रेडेंशियल्स"
 }

apps/OpenSign/public/locales/it/translation.json

@@ -26,6 +26,8 @@
     "Name": "Nome",
     "Date": "Data"
   },
+  "folder": "Cartella",
+  "pdf": "Pdf",
   "context-menu": {
     "Download": "Scarica",
     "Rename": "Rinomina",
@@ -44,6 +46,10 @@
   "contact-now": "Contatta ora",
   "upgrade-to": "Aggiorna a",
   "plan": "Piano",
+  "connect": "Connetti",
+  "connect-to-g-drive": "Connetti a Google Drive",
+  "reconnect-to-g-drive": "Riconnetti a Google Drive",
+  "gdrive-info-connect": "Quando Google Drive è connesso, il documento completato verrà salvato nella cartella {{appName}} su Google Drive.",
   "subscription-renew-warning": "Il tuo abbonamento scadrà tra {{remainingDays}} giorni. Ti preghiamo di rinnovarlo.",
   "subscribe-card-teamplan": "Sblocca tutto il potenziale della collaborazione! Crea organizzazioni, team e gerarchie illimitati. Condividi modelli senza problemi tra i team e assegna ruoli personalizzati agli utenti. Migliora il tuo flusso di lavoro oggi stesso!",
   "subscribe-card-plan": "Sblocca le funzionalità premium a partire da soli {{premiumPrice}}/mese. Approfitta di prestazioni migliorate e paga solo {{addonPrice}} per ogni credito aggiuntivo dopo quelli inclusi.",
@@ -58,7 +64,7 @@
   "welcome": "Bentornato!",
   "Login-to-your-account": "Accedi al tuo account",
   "password": "Password",
-  "forgot-password": "Password dimenticata?",
+  "forgot-password": "Password dimenticata",
   "loading": "Caricamento...",
   "of": "di",
   "sign-SSO": "Accedi con SSO",
@@ -181,7 +187,9 @@
     "created-date": "Data di creazione",
     "Type": "Tipo",
     "Logs": "Log",
-    "Expiry-date": "Data di scadenza"
+    "Expiry-date": "Data di scadenza",
+    "Company": "Azienda",
+    "JobTitle": "Titolo professionale"
   },
   "report-help": {
     "Draft Documents": "Questi sono documenti che hai iniziato ma non hai ancora finalizzato per l'invio.",
@@ -193,16 +201,15 @@
     "Contactbook": "Questa è una lista di contatti/firmatari aggiunti da te. Appariranno come suggerimenti quando provi ad aggiungere firmatari a un nuovo documento.",
     "Templates": "Questa è una lista di modelli disponibili per creare documenti. Puoi fare clic sul pulsante 'Usa' per creare un nuovo documento utilizzando un modello, modificare il documento e aggiungere firmatari nel passaggio successivo."
   },
-  "form-name": {
+  "Sign Yourself": "Firma tu stesso",
-    "Sign Yourself": "Firma tu stesso",
+  "Request Signatures": "Richiedi firme",
-    "Request Signatures": "Richiedi firme",
+  "New Template": "Nuovo modello",
-    "New Template": "Nuovo modello"
-  },
   "file-type": "pdf, png, jpg, jpeg",
   "docx": "docx",
   "file-selected": "file selezionato",
   "template-title": "Titolo del modello",
   "document-title": "Titolo del documento",
+  "title": "Titolo",
   "description": "Descrizione",
   "time-to-complete": "Tempo per completare (giorni)",
   "send-in-order": "Invia in ordine",
@@ -379,6 +386,7 @@
   "certificate": "Certificato",
   "decline": "Rifiuta",
   "finish": "Completa",
+  "done": "Fatto",
   "mail": "Email",
   "sign-now": "Firma ora",
   "successfully-signed": "Firmato con successo!",
@@ -388,6 +396,10 @@
   "Email-verified-alert-1": "Email verificata.",
   "Email-verified-alert-2": "Email già verificata.",
   "upload-stamp-image": "Carica immagine timbro",
+  "draw-signature": "Disegna la firma",
+  "draw-initials": "Disegna le iniziali",
+  "enter-text": "Inserisci testo",
+  "enter-widgettype": "Inserisci {{widgetType}}",
   "draw": "Disegno",
   "type": "Digitata",
   "color-type": {
@@ -471,7 +483,7 @@
   "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-mail-alert-you": "I firmatari successivi riceveranno un'email dopo che avrai firmato 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!",
@@ -728,7 +740,7 @@
   "public-tour-message": "Il modello deve essere pubblico prima di poter generare un link condivisibile.",
   "add-user-template": "Devi aggiungere un ruolo prima di poter aggiungere i campi per esso.",
   "pdf-uncompatible": "Questo PDF non è compatibile, contatta {{appName}}",
-  "text-field-tour": "I campi di tipo 'Testo' devono essere compilati in anticipo prima che il documento venga inviato. Se hai bisogno che i firmatari forniscano un input, usa invece il campo 'Testo di input'.",
+  "text-field-tour": "I campi 'Prefill' devono essere compilati in anticipo prima dell'invio del documento. Se hai bisogno che i firmatari forniscano input, usa invece i campi dei firmatari.",
   "attach-signer-tour": "Devi allegare un firmatario a ogni ruolo. Puoi farlo cliccando su questa icona. Una volta selezionato un firmatario, sarà associato a tutti i campi associati a quel ruolo che appariranno dello stesso colore.",
   "allowed-signature-types": "Tipi di firma consentiti",
   "at-least-one-signature-type": "Almeno un tipo di firma deve essere abilitato.",
@@ -761,6 +773,8 @@
   "Rotation-alert": "Ruota pagina",
   "bulk-import": "Importazione massiva",
   "contacts-file": "File contatti (xlsx, csv)",
+  "import-guideline": "Carica un file CSV o Excel con le colonne Name, Email e opzionale Phone. Verranno importati solo i primi 100 contatti.",
+  "download-sample": "Scarica file di esempio",
   "100-records-only": "Attualmente puoi importare solo fino a 100 record.",
   "csv-excel-support-only": "Carica un file nei seguenti formati: CSV, XLSX o XLS.",
   "contact-imported": "{{imported}} contatti importati. {{failed}} contatti non sono stati importati.",
@@ -774,7 +788,7 @@
   "agree-p1": "Confermo di aver letto e compreso il",
   "agree-p2": "Divulgazione sulle registrazioni e firme elettroniche",
   "agree-p3": "e acconsento all'uso di registrazioni e firme elettroniche.",
-  "agrre-button": "Accetta e Continua",
+  "agrre-button": "Confermo e accetto di continuare",
   "term-cond-title": "Termini e Condizioni",
   "term-cond-h": "DIVULGAZIONE SULLE REGISTRAZIONI E FIRME ELETTRONICHE",
   "term-cond-p1": "Questa Divulgazione sulle Registrazioni e Firme Elettroniche ('Divulgazione') è un accordo tra il Creatore del Documento ('Mittente') e il Firmatario ('Tu'), facilitato tramite la piattaforma {{appName}} (Piattaforma). Firmando documenti tramite {{appName}}, accetti i termini descritti in questa Divulgazione. Ti preghiamo di leggerla attentamente prima di procedere.",
@@ -1033,5 +1047,98 @@
   "choose-one":"Scegline uno",
   "search-templates": "Cerca modelli…",
   "search-documents": "Cerca documenti…",
-  "search-contacts": "Cerca contatti…"
+  "search-contacts": "Cerca contatti…",
+  "add-role-alert": "Si prega di aggiungere almeno un ruolo",
+  "edit-draft": "Modifica bozza",
+  "invalid-email-found": "Email non valida trovata: {{email}}",
+  "duplicate-email-found": "Email duplicata trovata: {{email}}",
+  "vertical": "Verticale",
+  "horizontal": "Orizzontale",
+  "billing": "Fatturazione",
+  "console": "Console",
+  "prefill-widget": "Widget Precompilati",
+  "action-prohibited": "Questa azione non è consentita per il tuo dominio email. Contatta il tuo amministratore per ricevere assistenza.",
+  "must-have-at-least-one-vacant-role": "Devi lasciare almeno un ruolo non assegnato prima di impostare un template su 'public'.",
+  "remove-duplicate": "Si prega di rimuovere l'opzione duplicata",
+  "prefill-bulk-error": "L'invio in blocco non è consentito quando sono stati aggiunti i widget di precompilazione. Si prega di rimuovere i widget di precompilazione per procedere.",
+  "session-expired-title": "Sessione scaduta",
+  "access-denied": "Accesso negato",
+  "upgrade": "Aggiorna",
+  "do-not-access-app": "Non hai accesso a questa applicazione.",
+  "dont-have-access": "Non hai accesso.",
+  "valid-email-alert": "Inserisci un indirizzo email valido.",
+  "otp-not-validate": "OTP non valido.",
+  "domain-not-allowed": "Questo dominio non è consentito",
+  "atleast-one-recipient-alert": "Aggiungi almeno un destinatario!",
+  "incorrect-password-or-decryption-failed": "Password errata o decrittazione non riuscita.",
+  "incorrect-password-for-file": "Password errata per il file: {{file}}",
+  "error-uploading-pdf": "Errore durante il caricamento del PDF.",
+  "provide-password": "Fornisci la password.",
+  "only-pdf-allowed": "Sono consentiti solo file PDF.",
+  "invalid-username-password-region": "Nome utente/password o regione non valida.",
+  "pfx-extension-alert": "Carica un file con estensione .pfx.",
+  "email-already-exist": "L'email esiste già",
+  "branding": "Marchio",
+  "branding-help": "Il branding consente il white labelling della tua app",
+  "custom-sub-domain": "Sottodominio personalizzato",
+  "app-name": "Nome dell'app",
+  "provide-domain-name": "Fornisci il tuo nome di dominio",
+  "provide-app-name": "Fornisci il nome della tua app",
+  "logo": "Logo",
+  "upload-app-logo": "Carica il logo della tua app",
+  "prefill-unfilled-widget": "I seguenti campi obbligatori non possono essere lasciati vuoti: {{emptyWidget}}. Per favore compilali per procedere.",
+  "Dashboard": "Dashboard",
+  "Analytics": "Analitica",
+  "Templates": "Modelli",
+  "Need your sign": "Necessita della tua firma",
+  "In Progress": "In corso",
+  "Completed": "Completati",
+  "Drafts": "Bozze",
+  "Declined": "Rifiutati",
+  "Expired": "Scaduti",
+  "Contactbook": "Rubrica",
+  "My Signature": "La mia firma",
+  "API Token": "Token API",
+  "Webhook": "Webhook",
+  "Preferences": "Preferenze",
+  "Teams": "Team",
+  "Users": "Utenti",
+  "Drive": "Drive",
+  "Branding": "Marchio",
+  "Mail": "Posta",
+  "Storage": "Archiviazione",
+  "Signing certificate": "Certificato di firma",
+  "General": "Generale",
+  "Organizations": "Organizzazioni",
+  "OrgAdmins": "OrgAdmins",
+  "Debug Pdf": "Debug PDF",
+  "New Document": "Nuovo documento",
+  "subscription": "Abbonamento",
+  "Draft document": "Bozza di documento",
+  "Draft template": "Bozza di modello",
+  "Public sign": "Firma pubblica",
+  "Signup": "Registrazione",
+  "delete-contact": "Elimina contatto",
+  "total-records-found": "Totale record trovati: {{count}}",
+  "Invalid-records-found": "Record non validi trovati: {{records}}",
+  "previous": "Precedente",
+  "page-n-of-n": "Pagina {{currentPage}} di {{totalPages}}",
+  "import": "Importa",
+  "search": "Cerca",
+  "viewed-on": "Visualizzato il: {{ViewedOn}}",
+  "signed-on": "Firmato il: {{SignedOn}}",
+  "hide": "Nascondi",
+  "show-more": "Mostra di più",
+  "browse-or-drag-to-replace-existing-file": "Sfoglia o trascina un nuovo file per sostituire quello esistente",
+  "optional-details": "Dettagli facoltativi",
+  "mail-adapter-subscription-alert": "Esegui l'upgrade al piano Professional o Team per configurare un SMTP personalizzato.",  "connect-to-mail": "Connetti a Gmail",
+  "custom-smtp": "SMTP personalizzato",
+  "default-smtp": "SMTP predefinito di {{appName}}",
+  "host": "Host",
+  "port": "Porta",
+  "sender-email": "Email del mittente",
+  "username": "Nome utente",
+  "use-default-mail-adapter": "Sei sicuro di voler usare i server di posta predefiniti di {{appName}} per inviare le richieste di firma? Ti consigliamo di usare i tuoi server Gmail o SMTP per una migliore consegna in posta in arrivo.",
+  "verification-code-sent-registered-email": "Un codice di verifica è stato inviato alla tua email registrata <1>{{useremail}}</1>. Inserisci il codice qui sotto per confermare le impostazioni.",
+  "smpt-credentials": "Credenziali SMTP"
 }

apps/OpenSign/public/sample_contacts.csv

@@ -0,0 +1,4 @@
+Name,Email,Phone
+John Doe,john@example.com,1234567890
+Jane Smith,jane@example.com,9876543210
+Foo Bar,foo@example.com,5555555555

apps/OpenSign/src/components/BulkSendUi.jsx

@@ -15,6 +15,8 @@ const BulkSendUi = (props) => {
   const [isSignatureExist, setIsSignatureExist] = useState();
   const [isDisableBulkSend, setIsDisableBulkSend] = useState(false);
   const [isLoader, setIsLoader] = useState(false);
+  const [signers, setSigners] = useState([]);
+  const [emails, setEmails] = useState([]);
   useEffect(() => {
     signatureExist();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -47,7 +49,14 @@ const BulkSendUi = (props) => {
     (() => {
       if (props?.Placeholders?.length > 0) {
         let users = [];
+        let emails = [];
         props?.Placeholders?.forEach((element) => {
+          const signerEmail = element?.email || element?.signerPtr?.Email;
+
+          // only add when there's a non-empty signerEmail
+          if (signerEmail) {
+            emails = [...emails, signerEmail];
+          }
           if (!element.signerObjId) {
             users = [
               ...users,
@@ -60,7 +69,10 @@ const BulkSendUi = (props) => {
             ];
           }
         });
+        setEmails(emails);
         setForms((prevForms) => [...prevForms, { Id: 1, fields: users }]);
+        const signer = props.item?.Signers?.filter((x) => x?.objectId);
+        setSigners(signer);
       }
     })();
     // eslint-disable-next-line
@@ -82,10 +94,16 @@ const BulkSendUi = (props) => {
 
   function validateEmails(data) {
     for (const item of data) {
+      let email = "";
       for (const field of item.fields) {
         if (!emailRegex.test(field.email)) {
-          alert(`Invalid email found: ${field.email}`);
+          alert(t("invalid-email-found", { email: field.email }));
           return false;
+        } else if (email === field.email || emails?.includes(field.email)) {
+          alert(t("duplicate-email-found", { email: field.email }));
+          return false;
+        } else {
+          email = field.email;
         }
       }
     }
@@ -143,15 +161,14 @@ const BulkSendUi = (props) => {
             Documents.push({
               ...props.item,
               Placeholders: updatedPlaceholders,
-              Signers: props.item.Signers
+              Signers: signers ? [...signers, ...existSigner] : [...existSigner]
-                ? [...props.item.Signers, ...existSigner]
-                : [...existSigner]
             });
           } else {
             Documents.push({
               ...props.item,
               Placeholders: updatedPlaceholders,
-              SignatureType: props.signatureType
+              SignatureType: props.signatureType,
+              Signers: signers
             });
           }
         });

apps/OpenSign/src/components/Header.jsx

@@ -19,8 +19,13 @@ const Header = ({ showSidebar, setIsMenu, isConsole }) => {
   const { width } = useWindowSize();
   const username = localStorage.getItem("username") || "";
   const image = localStorage.getItem("profileImg") || dp;
+  const isAdmin =
+    localStorage.getItem("Extand_Class") &&
+    JSON.parse(localStorage.getItem("Extand_Class"))?.[0]?.UserRole ===
+      "contracts_Admin";
   const [isOpen, setIsOpen] = useState(false);
   const [applogo, setAppLogo] = useState("");
+  const [isDarkTheme, setIsDarkTheme] = useState();
 
   const toggleDropdown = () => {
     setIsOpen(!isOpen);
@@ -88,22 +93,15 @@ const Header = ({ showSidebar, setIsMenu, isConsole }) => {
 
 
   useEffect(() => {
-    const updateLogoForTheme = () => {
+    const updateThemeStatus = () => {
-      const isDarkMode =
+      const isDarkTheme =
         document.documentElement.getAttribute("data-theme") === "opensigndark";
-      const logo = isDarkMode
+      setIsDarkTheme(isDarkTheme);
-        ? "/static/js/assets/images/logo-dark.png" // Path to the dark mode logo
-        : appInfo.applogo; // Use current logo for light mode
-      if (applogo !== logo) {
-        setAppLogo(logo);
-      }
     };
-
+    updateThemeStatus();
-    // Set the logo immediately based on the current theme
-    updateLogoForTheme();
 
     const observer = new MutationObserver(() => {
-      updateLogoForTheme();
+      updateThemeStatus();
     });
 
     observer.observe(document.documentElement, {
@@ -112,11 +110,11 @@ const Header = ({ showSidebar, setIsMenu, isConsole }) => {
     });
 
     return () => observer.disconnect();
-  }, [applogo]);
+  }, []);
 
   return (
     <div>
-      <div className="op-navbar bg-base-100 shadow">
+      <div className="op-navbar bg-base-100 shadow touch-none">
         <div className="flex-none">
           <button
             className="op-btn op-btn-square op-btn-ghost focus:outline-none hover:bg-transparent op-btn-sm no-animation"
@@ -130,7 +128,11 @@ const Header = ({ showSidebar, setIsMenu, isConsole }) => {
             {applogo && (
               <img
                 className="object-contain h-full w-auto"
-                src={applogo}
+                src={
+                      isDarkTheme
+                      ? "/static/js/assets/images/logo-dark.png"
+                      : applogo
+                }
                 alt="logo"
               />
             )}

apps/OpenSign/src/components/dashboard/DashboardCard.jsx

@@ -148,7 +148,7 @@ const DashboardCard = (props) => {
               );
               let arr = [];
               for (const obj of listData) {
-                const isSigner = obj.Signers.some(
+                const isSigner = obj.Signers?.some(
                   (item) => item.UserId.objectId === currentUser.id
                 );
                 if (isSigner) {

apps/OpenSign/src/components/dashboard/DashboardReport.jsx

@@ -134,7 +134,7 @@ function DashboardReport(props) {
           const listData = res.data?.result.filter((x) => x.Signers.length > 0);
           let arr = [];
           for (const obj of listData) {
-            const isSigner = obj.Signers.some(
+            const isSigner = obj.Signers?.some(
               (item) => item.UserId.objectId === currentUser
             );
             if (isSigner) {

apps/OpenSign/src/components/opensigndrive/DriveBody.jsx

@@ -405,7 +405,7 @@ function DriveBody(props) {
         </tr>
       )
     ) : listType === "list" && data.Type === "Folder" ? (
-      <div key={ind} className="relative w-[100px] h-[100px] mx-2 my-3">
+      <div className="relative w-[100px] h-[100px] mx-2 my-3">
         <ContextMenu.Root>
           <ContextMenu.Trigger className="flex flex-col justify-center items-center select-none-cls">
             {/* folder */}
@@ -447,7 +447,6 @@ function DriveBody(props) {
               )}
             </div>
           </ContextMenu.Trigger>
-
           <ContextMenu.Portal>
             <ContextMenu.Content
               className="ContextMenuContent"
@@ -641,7 +640,7 @@ function DriveBody(props) {
       ) : (
         <div className="flex flex-row flex-wrap items-center mt-1 pb-[20px] mx-[5px]">
           {props.pdfData.map((data, ind) => {
-            return <div key={ind}>{handleFolderData(data, ind, "list")}</div>;
+            return <React.Fragment key={ind}>{handleFolderData(data, ind, "list")}</React.Fragment>;
           })}
         </div>
       )}

apps/OpenSign/src/components/pdf/AgreementContent.jsx

@@ -9,7 +9,6 @@ function AgreementContent(props) {
   const h2Style = "text-base-content font-medium text-lg";
   const ulStyle = "list-disc px-4 py-3";
   const handleOnclick = () => {
-    props.setIsAgreeTour(false);
     props.setIsAgree(true);
     props.setIsShowAgreeTerms(false);
     props.showFirstWidget();

apps/OpenSign/src/components/pdf/AgreementSign.jsx

@@ -4,7 +4,6 @@ import AgreementContent from "./AgreementContent";
 
 function AgreementSign(props) {
   const { t } = useTranslation();
-  const [isChecked, setIsChecked] = useState(false);
   const [isShowAgreeTerms, setIsShowAgreeTerms] = useState(false);
 
   return (
@@ -12,39 +11,12 @@ function AgreementSign(props) {
       <div className="op-modal op-modal-open absolute z-[448]">
         <div className="w-[95%] md:w-[60%] lg:w-[40%] op-modal-box overflow-y-auto hide-scrollbar text-sm p-4">
           <div className="flex flex-row items-center">
-            <label className="inline-flex justify-center items-center cursor-pointer mb-0">
-              {/* 1) This div becomes the “fake” checkbox */}
-              <div
-                data-tut="IsAgree"
-                className={`w-6 h-6 border-2 mr-3 rounded-full flex text-center items-center justify-center ${isChecked ? "op-border-primary" : "border-red-500"}`}
-              >
-                {isChecked ? (
-                  <span className="op-text-primary text-sm font-bold">✓</span>
-                ) : (
-                  <span className="text-red-500 text-sm font-bold">X</span>
-                )}
-              </div>
-              {/* 2) Visually hide the native checkbox but keep it in the DOM */}
-              <input
-                className="sr-only"
-                type="checkbox"
-                checked={isChecked}
-                onChange={(e) => {
-                  setIsChecked(e.target.checked);
-                  if (e.target.checked) {
-                    props.setIsAgreeTour(false);
-                  }
-                  props.showFirstWidget();
-                }}
-              />
-            </label>
             <div className="text-[11px] md:text-base text-base-content">
               <span>{t("agree-p1")}</span>
               <span
                 className="font-bold text-blue-600 cursor-pointer"
                 onClick={() => {
                   setIsShowAgreeTerms(true);
-                  props.setIsAgreeTour(false);
                 }}
               >
                 {t("agree-p2")}
@@ -52,15 +24,11 @@ function AgreementSign(props) {
               <span> {t("agree-p3")}</span>
             </div>
           </div>
-          <div className="flex ml-[35px] mt-3">
+          <div className="flex mt-3">
             <button
               onClick={() => {
-                if (isChecked) {
+                props.setIsAgree(true);
-                  props.setIsAgreeTour(false);
+                props.showFirstWidget()
-                  props.setIsAgree(true);
-                } else {
-                  props.setIsAgreeTour(true);
-                }
               }}
               className="op-btn op-btn-primary op-btn-sm w-full md:w-auto"
             >
@@ -74,7 +42,6 @@ function AgreementSign(props) {
       </div>
       {isShowAgreeTerms && (
         <AgreementContent
-          setIsAgreeTour={props.setIsAgreeTour}
           setIsAgree={props.setIsAgree}
           setIsShowAgreeTerms={setIsShowAgreeTerms}
           showFirstWidget={props.showFirstWidget}

apps/OpenSign/src/components/pdf/DefaultSignature.jsx

@@ -3,43 +3,39 @@ import { useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
 function DefaultSignature(props) {
   const { t } = useTranslation();
-   const defaultSignImg = useSelector((state) => state.widget.defaultSignImg);
+  const defaultSignImg = useSelector((state) => state.widget.defaultSignImg);
-   const myInitial = useSelector((state) => state.widget.myInitial)
+  const myInitial = useSelector((state) => state.widget.myInitial);
   const tabName = ["my-signature", "my-initials"];
   const [activeTab, setActiveTab] = useState(0);
   const confirmToaddDefaultSign = (type) => {
-    if (!props.isAgree) {
+    if (props?.xyPosition.length > 0) {
-      props.setIsAgreeTour(true);
+      //check signature or initial widgets exist or not for auto signing
-    } else {
+      const getCurrentSignerXY = props?.xyPosition.filter(
-      if (props?.xyPosition.length > 0) {
+        (data) => data.Id === props.uniqueId
-        //check signature or initial widgets exist or not for auto signing
+      );
-        const getCurrentSignerXY = props?.xyPosition.filter(
+      const checkIsSignInitialExist = getCurrentSignerXY?.every(
-          (data) => data.Id === props.uniqueId
+        (placeholderObj) =>
-        );
+          placeholderObj?.placeHolder?.some((placeholder) =>
-        const checkIsSignInitialExist = getCurrentSignerXY?.every(
+            placeholder?.pos?.some((posItem) => posItem?.type === type)
-          (placeholderObj) =>
+          )
-            placeholderObj?.placeHolder?.some((placeholder) =>
+      );
-              placeholder?.pos?.some((posItem) => posItem?.type === type)
+      if (checkIsSignInitialExist) {
-            )
+        props?.setDefaultSignAlert({
-        );
+          isShow: true,
-        if (checkIsSignInitialExist) {
+          alertMessage: t("default-sign-alert", { widgetsType: type }),
-          props?.setDefaultSignAlert({
+          type: type
-            isShow: true,
+        });
-            alertMessage: t("default-sign-alert", { widgetsType: type }),
-            type: type
-          });
-        } else {
-          props?.setDefaultSignAlert({
-            isShow: true,
-            alertMessage: t("defaultSign-alert", { widgetsType: type })
-          });
-        }
       } else {
         props?.setDefaultSignAlert({
           isShow: true,
-          alertMessage: t("please-select-position!")
+          alertMessage: t("defaultSign-alert", { widgetsType: type })
         });
       }
+    } else {
+      props?.setDefaultSignAlert({
+        isShow: true,
+        alertMessage: t("please-select-position!")
+      });
     }
   };
 

apps/OpenSign/src/components/pdf/DropdownWidgetOption.jsx

@@ -389,8 +389,8 @@ function DropdownWidgetOption(props) {
                         checked={layout.toLowerCase() === data.toLowerCase()}
                         onChange={() => setLayout(data.toLowerCase())}
                       />
-                      <label className="text-[13px] font-500 mb-0 capitalize">
+                      <label className="text-[13px] font-500 mb-0">
-                        {data}
+                        {t(data)}
                       </label>
                     </div>
                   ))}

apps/OpenSign/src/components/pdf/EditTemplate.jsx

@@ -286,7 +286,7 @@ const EditTemplate = ({
                   htmlFor="fileUpload"
                   className="cursor-pointer text-center mb-0"
                 >
-                  Browse or drag & drop a new file to replace the existng one
+                  {t("browse-or-drag-to-replace-existing-file")}
                 </label>
               </div>
               <input

apps/OpenSign/src/components/pdf/PdfHeader.jsx

@@ -167,7 +167,7 @@ function Header(props) {
       {isMobile && props?.isShowHeader ? (
         <div
           id="navbar"
-          className="stickyHead"
+          className="stickyHead touch-none"
           style={{
             width: window.innerWidth + "px"
           }}

apps/OpenSign/src/components/pdf/Placeholder.jsx

@@ -14,7 +14,8 @@ import {
   radioButtonWidget,
   textInputWidget,
   cellsWidget,
-  textWidget
+  textWidget,
+  selectFormat
 } from "../../constant/Utils";
 import PlaceholderType from "./PlaceholderType";
 import moment from "moment";
@@ -25,37 +26,6 @@ import { useDispatch } from "react-redux";
 import { setIsShowModal } from "../../redux/reducers/widgetSlice";
 import { themeColor } from "../../constant/const";
 
-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";
-  }
-};
-
 //function to get default format
 const getDefaultFormat = (dateFormat) => dateFormat || "MM/dd/yyyy";
 
@@ -110,7 +80,9 @@ function Placeholder(props) {
     "MMM DD, YYYY",
     "LL",
     "DD MMM, YYYY",
-    "DD MMMM, YYYY"
+    "DD MMMM, YYYY",
+    "DD.MM.YYYY",
+    "DD/MM/YYYY"
   ];
 
   useEffect(() => {
@@ -132,15 +104,18 @@ function Placeholder(props) {
       if (selectDate && selectDate.format === "dd-MM-yyyy") {
         const [day, month, year] = selectDate.date.split("-");
         date = new Date(`${year}-${month}-${day}`);
+      } else if (selectDate && selectDate.format === "dd.MM.yyyy") {
+        const [day, month, year] = selectDate.date.split(".");
+        date = new Date(`${year}.${month}.${day}`);
+      } else if (selectDate && selectDate.format === "dd/MM/yyyy") {
+        const [day, month, year] = selectDate.date.split("/");
+        date = new Date(`${year}/${month}/${day}`);
       } else {
         date = new Date(selectDate?.date);
       }
       const milliseconds = date.getTime();
       const newDate = moment(milliseconds).format(data);
-      const dateObj = {
+      const dateObj = { date: newDate, format: selectFormat(data) };
-        date: newDate,
-        format: selectFormat(data)
-      };
       updateDate.push(dateObj);
     });
     setDateFormat(updateDate);
@@ -205,13 +180,8 @@ function Placeholder(props) {
 
   const widgetClickHandler = () => {
     props.setCurrWidgetsDetails && props.setCurrWidgetsDetails(props.pos);
-    //condition to check in request signing flow user click on agree or not
     if (props?.data?.signerObjId === props?.signerObjId && !props.isDragging) {
-      if (!props.isAgree && !props.isSelfSign) {
+      handleWidgetIdandPopup();
-        props.setIsAgreeTour && props.setIsAgreeTour(true);
-      } else {
-        handleWidgetIdandPopup();
-      }
     } //condition for open contact details popup when sign templet from public signing flow
     else if (props?.uniqueId && props.data?.Id === props?.uniqueId) {
       handleWidgetIdandPopup();
@@ -391,9 +361,12 @@ function Placeholder(props) {
 
   //function to save date and format on local array onchange date and onclick format
   const handleSaveDate = (data, isDateChange) => {
+    const isSpecialDateFormat =
+      data?.format &&
+      ["dd-MM-yyyy", "dd.MM.yyyy", "dd/MM/yyyy"].includes(data?.format);
     let updateDate = data.date;
     let date;
-    if (data?.format === "dd-MM-yyyy") {
+    if (isSpecialDateFormat) {
       date = isDateChange
         ? moment(updateDate).format(changeDateToMomentFormat(data.format))
         : updateDate;
@@ -859,8 +832,16 @@ function Placeholder(props) {
               props.isNeedSign && props.data?.Id !== props?.uniqueId && "0.4",
             background: handleBackground()
           }}
-          onDrag={() => {
+          onDrag={(_, d) => {
             props.handleTabDrag && props.handleTabDrag(props.pos.key);
+            props.showGuidelines &&
+              props.showGuidelines(
+                true,
+                d.x,
+                d.y,
+                d.node.offsetWidth,
+                d.node.offsetHeight
+              );
           }}
           size={{
             width:
@@ -881,8 +862,26 @@ function Placeholder(props) {
                 calculateFont(props.pos.options?.fontSize, true)
           }
           maxHeight="auto"
-          onResizeStart={() => {
+          onResizeStart={(e, dir, ref) => {
             props.setIsResize && props.setIsResize(true);
+            props.showGuidelines &&
+              props.showGuidelines(
+                true,
+                xPos(props.pos, props.isSignYourself),
+                yPos(props.pos, props.isSignYourself),
+                ref.offsetWidth,
+                ref.offsetHeight
+              );
+          }}
+          onResize={(e, dir, ref, delta, position) => {
+            props.showGuidelines &&
+              props.showGuidelines(
+                true,
+                position.x,
+                position.y,
+                ref.offsetWidth,
+                ref.offsetHeight
+              );
           }}
           onResizeStop={(e, direction, ref) => {
             setTimeout(() => {
@@ -900,6 +899,7 @@ function Placeholder(props) {
                 props.data && props.data.Id,
                 props.isResize
               );
+            props.showGuidelines && props.showGuidelines(false);
           }}
           onDragStop={(event, dragElement) => {
             props.handleStop &&
@@ -909,6 +909,9 @@ function Placeholder(props) {
                 props.data?.Id,
                 props.pos?.key
               );
+            props.isDragging &&
+              props.showGuidelines &&
+              props.showGuidelines(false);
           }}
           position={{
             x: xPos(props.pos, props.isSignYourself),
@@ -945,7 +948,6 @@ function Placeholder(props) {
             ![radioButtonWidget, "checkbox"].includes(props.pos.type) &&
             props.pos.key === props?.currWidgetsDetails?.key && <BorderResize />
           )}
-
           {/* 1- Show a border if props.pos.key === props?.currWidgetsDetails?.key, indicating the current user's selected widget.
               2- If props.isShowBorder is true, display border for all widgets. 
               3- Use the combination of props?.isAlllowModify and !props?.assignedWidgetId.includes(props.pos.key) to determine when to show border:

apps/OpenSign/src/components/pdf/PlaceholderType.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState, forwardRef, useRef } from "react";
+import React, { useEffect, useState, forwardRef } from "react";
 import {
   getMonth,
   getYear,
@@ -36,7 +36,6 @@ function PlaceholderType(props) {
   const widgetData =
     props.pos?.options?.response ?? props.pos?.options?.defaultValue ?? "";
   const widgetTypeTranslation = t(`widgets-name.${props?.pos?.type}`);
-  const inputRef = useRef(null);
   const [widgetValue, setwidgetValue] = useState();
   const [selectedCheckbox, setSelectedCheckbox] = useState([]);
   const [hint, setHint] = useState("");
@@ -109,7 +108,7 @@ function PlaceholderType(props) {
           alt="signature"
           draggable="false"
           src={props.pos.SignUrl}
-          className="w-full h-full select-none-cls "
+          className={`${props.pos.signatureType !== "type" ? "object-contain" : ""} w-full h-full select-none-cls`}
         />
       ) : (
         <div className={widgetCls}>
@@ -133,7 +132,7 @@ function PlaceholderType(props) {
           alt="stamp"
           draggable="false"
           src={props.pos.SignUrl}
-          className="w-full h-full select-none-cls"
+          className="w-full h-full select-none-cls object-contain"
         />
       ) : (
         <div className={widgetCls}>
@@ -158,7 +157,7 @@ function PlaceholderType(props) {
       const checkBoxWrapperClass = `flex items-start ${
         checkBoxLayout === "horizontal"
           ? `flex-row flex-wrap ${isMultipleCheckbox ? "gap-x-2" : ""}`
-          : `flex-col ${isMultipleCheckbox ? "gap-y-[5px]" : ""}`
+          : `flex-col ${isMultipleCheckbox ? "gap-y-[3px]" : ""}`
       }`; // Using gap-y-1 for consistency, adjust if needed
 
       return (
@@ -193,7 +192,6 @@ function PlaceholderType(props) {
     case textInputWidget:
       return props.isSignYourself || iswidgetEnable ? (
         <textarea
-          ref={inputRef}
           placeholder={hint || t("widgets-name.text")}
           rows={1}
           value={widgetValue}
@@ -255,7 +253,7 @@ function PlaceholderType(props) {
           alt="initials"
           draggable="false"
           src={props.pos.SignUrl}
-          className="w-full h-full select-none-cls"
+          className={`${props.pos.signatureType !== "type" ? "object-contain" : ""} w-full h-full select-none-cls`}
         />
       ) : (
         <div className={widgetCls}>
@@ -277,7 +275,6 @@ function PlaceholderType(props) {
       return iswidgetEnable ? (
         <textarea
           readOnly
-          ref={inputRef}
           placeholder={hint || widgetTypeTranslation}
           rows={1}
           value={widgetValue}
@@ -300,7 +297,6 @@ function PlaceholderType(props) {
       return iswidgetEnable ? (
         <textarea
           readOnly
-          ref={inputRef}
           placeholder={hint || widgetTypeTranslation}
           rows={1}
           value={widgetValue}
@@ -323,7 +319,6 @@ function PlaceholderType(props) {
       return iswidgetEnable ? (
         <textarea
           readOnly
-          ref={inputRef}
           placeholder={hint || widgetTypeTranslation}
           rows={1}
           value={widgetValue}
@@ -407,7 +402,7 @@ function PlaceholderType(props) {
           alt="image"
           draggable="false"
           src={props.pos.SignUrl}
-          className="w-full h-full select-none-cls"
+          className="w-full h-full select-none-cls object-contain"
         />
       ) : (
         <div className={widgetCls}>
@@ -429,7 +424,6 @@ function PlaceholderType(props) {
       return iswidgetEnable ? (
         <textarea
           readOnly
-          ref={inputRef}
           placeholder={hint || widgetTypeTranslation}
           rows={1}
           value={widgetValue}
@@ -453,7 +447,7 @@ function PlaceholderType(props) {
       const isOnlyOneBtn = props.pos.options?.values?.length > 0 ? true : false;
       const radioWrapperClass = `flex items-start ${
         radioLayout === "horizontal"
-          ? `flex-row flex-wrap ${isOnlyOneBtn ? "gap-x-2" : ""}`
+          ? `flex-row flex-wrap ${isOnlyOneBtn ? "gap-x-[10px]" : ""}`
           : `flex-col ${isOnlyOneBtn ? "gap-y-[5px]" : ""}`
       }`; // Using gap-y-1 for consistency, adjust if needed
       return (

apps/OpenSign/src/components/pdf/RecipientList.jsx

@@ -82,7 +82,7 @@ const RecipientList = (props) => {
   };
   return (
     <>
-      {props.signersdata.length > 0 &&
+      {props.signersdata?.length > 0 &&
         props.signersdata.map((obj, ind) => {
           return (
             <div
@@ -129,9 +129,9 @@ const RecipientList = (props) => {
                 }
               }}
             >
-              <div className="flex flex-row items-center w-full">
+              <div className="flex flex-row items-center w-full overflow-hidden pr-2">
                 <div
-                  className="flex w-[30px] h-[30px] rounded-full items-center justify-center mr-2"
+                  className="flex flex-shrink-0 w-[30px] h-[30px] rounded-full items-center justify-center mr-2"
                   style={{
                     background: obj?.blockColor
                       ? darkenColor(obj?.blockColor, 0.4)
@@ -153,7 +153,7 @@ const RecipientList = (props) => {
                 <div
                   className={`${
                     obj.Name ? "flex-col" : "flex-row"
-                  } flex items-center`}
+                  } flex overflow-hidden flex-grow-0`}
                 >
                   {obj.Name ? (
                     <span
@@ -162,7 +162,7 @@ const RecipientList = (props) => {
                         props.isSelectListId === ind
                           ? "text-[#424242]"
                           : "text-base-content"
-                      } text-[12px] font-bold w-[100px] whitespace-nowrap overflow-hidden text-ellipsis`}
+                      } text-[12px] font-bold truncate whitespace-nowrap`}
                     >
                       {obj.Name}
                     </span>
@@ -173,7 +173,7 @@ const RecipientList = (props) => {
                         props.isSelectListId === ind
                           ? "text-[#424242]"
                           : "text-base-content"
-                      } text-[12px] font-bold w-[100px] whitespace-nowrap overflow-hidden text-ellipsis cursor-pointer`}
+                      } text-[12px] font-bold truncate whitespace-nowrap cursor-pointer`}
                       onClick={() => {
                         setIsEdit({ [obj.Id]: true });
                         props.setRoleName(obj.Role);
@@ -182,7 +182,7 @@ const RecipientList = (props) => {
                       {isEdit?.[obj.Id] && props.handleRoleChange ? (
                         <input
                           ref={inputRef}
-                          className="bg-transparent p-[3px]"
+                          className="bg-transparent p-[3px] w-full"
                           value={obj.Role}
                           onChange={(e) => props.handleRoleChange(e, obj.Id)}
                           onBlur={() => {
@@ -210,7 +210,7 @@ const RecipientList = (props) => {
                         props.isSelectListId === ind
                           ? "text-[#424242]"
                           : "text-base-content"
-                      } text-[10px] font-medium w-[100px] whitespace-nowrap overflow-hidden text-ellipsis`}
+                      } text-[10px] font-medium truncate whitespace-nowrap`}
                     >
                       {obj?.Role || obj?.Email}
                     </span>

apps/OpenSign/src/components/pdf/RenderAllPdfPage.jsx

@@ -209,8 +209,8 @@ function RenderAllPdfPage(props) {
               onChange={handleFileUpload}
             />
             <i className="fa-light fa-plus text-gray-500"></i>
-            <span className="text-xs lg:text-sm text-base-content ">
+            <span className="text-xs lg:text-sm text-base-content">
-              Add pages
+              {t("add-pages")}
             </span>
           </button>
         )}

apps/OpenSign/src/components/pdf/RenderPdf.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState, useRef } from "react";
 import RSC from "react-scrollbars-custom";
 import { Document, Page } from "react-pdf";
 import {
@@ -11,13 +11,45 @@ import {
 import Placeholder from "./Placeholder";
 import Alert from "../../primitives/Alert";
 import { useTranslation } from "react-i18next";
+import usePdfPinchZoom from "../../hook/usePdfPinchZoom";
 
 function RenderPdf(props) {
   const { t } = useTranslation();
   const [scaledHeight, setScaledHeight] = useState();
+  const [guideline, setGuideline] = useState({
+    show: false,
+    x1: 0,
+    x2: 0,
+    y1: 0,
+    y2: 0
+  });
   //check isGuestSigner is present in local if yes than handle login flow header in mobile view
   const isGuestSigner = localStorage.getItem("isGuestSigner");
 
+  const pdfContainerRef = useRef(null);
+
+  // enable pinch to zoom only on actual pdf wrapper
+  usePdfPinchZoom(
+    pdfContainerRef,
+    props.scale,
+    props.setScale,
+    props.setZoomPercent
+  );
+
+  const handleGuideline = (isShow, x = 0, y = 0, width = 0, height = 0) => {
+    if (isShow) {
+      setGuideline({
+        show: true,
+        x1: x,
+        x2: x + width,
+        y1: y,
+        y2: y + height
+      });
+    } else {
+      setGuideline({ show: false, x1: 0, x2: 0, y1: 0, y2: 0 });
+    }
+  };
+
   // handle signature block width and height according to screen
   const posWidth = (pos, signYourself) => {
     const containerScale = getContainerScale(
@@ -115,6 +147,7 @@ function RenderPdf(props) {
                       isSignYourself={false}
                       posWidth={posWidth}
                       posHeight={posHeight}
+                      showGuidelines={handleGuideline}
                       isDragging={props.isDragging}
                       pdfDetails={props.pdfDetails}
                       unSignedWidgetId={props.unSignedWidgetId}
@@ -127,8 +160,6 @@ function RenderPdf(props) {
                       ispublicTemplate={props.ispublicTemplate}
                       handleUserDetails={props.handleUserDetails}
                       isResize={props.isResize}
-                      setIsAgreeTour={props.setIsAgreeTour}
-                      isAgree={props.isAgree}
                       handleTabDrag={props.handleTabDrag}
                       handleStop={props.handleStop}
                       setUniqueId={props.setUniqueId}
@@ -204,14 +235,17 @@ function RenderPdf(props) {
           data-tut={isMobile ? "reactourForth" : undefined}
           className={
             isMobile
-              ? `${isGuestSigner ? "30px" : ""} border-[0.1px] border-[#ebe8e8] overflow-x-auto`
+              ? `${isGuestSigner ? "30px" : ""} border-[0.1px] border-[#ebe8e8] overflow-x-auto relative`
-              : ""
+              : "relative"
           }
           style={{
             width:
               props.containerWH?.width && props.containerWH?.width * props.scale
           }}
-          ref={props.drop}
+          ref={(node) => {
+            pdfContainerRef.current = node;
+            props.drop && props.drop(node);
+          }}
           id="container"
         >
           {props.pdfLoad !== false &&
@@ -258,6 +292,7 @@ function RenderPdf(props) {
                                         isSignYourself={false}
                                         posWidth={posWidth}
                                         posHeight={posHeight}
+                                        showGuidelines={handleGuideline}
                                         isDragging={props.isDragging}
                                         setIsValidate={props.setIsValidate}
                                         setIsRadio={props.setIsRadio}
@@ -325,6 +360,7 @@ function RenderPdf(props) {
                                     isSignYourself={true}
                                     posWidth={posWidth}
                                     posHeight={posHeight}
+                                    showGuidelines={handleGuideline}
                                     pdfDetails={props.pdfDetails[0]}
                                     isDragging={props.isDragging}
                                     setIsCheckbox={props.setIsCheckbox}
@@ -389,6 +425,30 @@ function RenderPdf(props) {
               }}
             />
           </Document>
+          {guideline.show && (
+            <>
+              {/* top guide */}
+              <div
+                className="absolute pointer-events-none z-[1000] left-0 w-full border-t-[1px] border-dashed border-[#3b82f6]"
+                style={{ top: guideline.y1 }}
+              />
+              {/* bottom guide */}
+              <div
+                className="absolute pointer-events-none z-[1000] left-0 w-full border-t-[1px] border-dashed border-[#3b82f6]"
+                style={{ top: guideline.y2 }}
+              />
+              {/* left guide */}
+              <div
+                className="absolute pointer-events-none z-[1000] top-0 h-full border-l-[1px] border-dashed border-[#3b82f6]"
+                style={{ left: guideline.x1 }}
+              />
+              {/* right guide */}
+              <div
+                className="absolute pointer-events-none z-[1000] top-0 h-full border-l-[1px] border-dashed border-[#3b82f6]"
+                style={{ left: guideline.x2 }}
+              />
+            </>
+          )}
         </div>
       </RSC>
     </>

apps/OpenSign/src/components/pdf/SignerListComponent.jsx

@@ -27,12 +27,12 @@ function SignerListComponent(props) {
 
   return (
     <div
-      className="rounded-xl mx-1 flex flex-row items-center py-[10px] mt-1"
+      className="rounded-xl mx-1 flex flex-row flex-grow-0 items-center py-[10px] mt-1"
       style={{ background: checkSignerBackColor(props.obj) }}
     >
       <div
         style={{ background: checkUserNameColor(props.obj) }}
-        className="flex w-[30px] h-[30px] rounded-full justify-center items-center mx-1"
+        className="flex flex-shrink-0 w-[30px] h-[30px] rounded-full justify-center items-center mx-1"
       >
         <span className="text-[12px] text-center font-bold text-black uppercase">
           {getFirstLetter(
@@ -40,11 +40,11 @@ function SignerListComponent(props) {
           )}
         </span>
       </div>
-      <div className="flex flex-col">
+      <div className="flex flex-grow-0 flex-col overflow-hidden pr-2">
-        <span className="text-[12px] font-bold text-[#424242] w-[100px] whitespace-nowrap overflow-hidden text-ellipsis">
+        <span className="text-[12px] font-bold truncate whitespace-nowrap">
           {props.obj?.Name || props?.obj?.Role}
         </span>
-        <span className="text-[10px] font-medium text-[#424242] w-[100px] whitespace-nowrap overflow-hidden text-ellipsis">
+        <span className="text-[10px] font-medium truncate whitespace-nowrap">
           {props.obj?.Email || props.obj?.email}
         </span>
       </div>

apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx

@@ -17,7 +17,9 @@ import {
   textInputWidget,
   cellsWidget,
   textWidget,
-  years
+  years,
+  convertTextToImg,
+  convertJpegToPng
 } from "../../constant/Utils";
 import CellsWidget from "./CellsWidget";
 import DatePicker from "react-datepicker";
@@ -67,6 +69,11 @@ const fontOptions = [
   { value: "Delicious Handrawn" }
   // Add more font options as needed
 ];
+const allColor = ["blue", "red", "black"];
+const textInputcls =
+  "op-input op-input-bordered op-input-sm focus:outline-none text-base-content hover:border-base-content w-full text-xs";
+const isTabCls = "bg-[#002864] text-white rounded-[15px] px-[10px] py-[4px]";
+
 function WidgetsValueModal(props) {
   const dispatch = useDispatch();
   const saveSignCheckbox = useSelector(
@@ -104,7 +111,6 @@ function WidgetsValueModal(props) {
   const [signature, setSignature] = useState();
   const [isImageSelect, setIsImageSelect] = useState(false);
   const [isFinish, setIsFinish] = useState(false);
-  const [imgWH, setImgWH] = useState({});
   const [fontSelect, setFontSelect] = useState(fontOptions[0].value);
   const [isSavedSign, setIsSavedSign] = useState(false);
   const [isAutoSign, setIsAutoSign] = useState(false);
@@ -167,10 +173,7 @@ function WidgetsValueModal(props) {
         )
       : new Date()
   );
-  const allColor = ["blue", "red", "black"];
+
-  const textInputcls =
-    "op-input op-input-bordered op-input-sm focus:outline-none text-base-content hover:border-base-content w-full text-xs";
-  const isTabCls = "bg-[#002864] text-white rounded-[15px] px-[10px] py-[4px]";
   useEffect(() => {
     if (
       ["name", "email", "job title", "company", textInputWidget].includes(
@@ -187,6 +190,8 @@ function WidgetsValueModal(props) {
       } else {
         setHint(currWidgetsDetails?.type);
       }
+    } else if (["signature", "initials"].includes(currWidgetsDetails?.type)) {
+      setIsTab(currWidgetsDetails?.signatureType);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currWidgetsDetails]); // Added currWidgetsDetails to dependency array for reset logic
@@ -252,11 +257,11 @@ function WidgetsValueModal(props) {
       setOriginalImage(null); // Reset original image when a new file is selected
       setRemoveBgEnabled(false); // Optionally reset toggle
       // Ensure compressedFileSize calls setImage, which then triggers the useEffect for BG removal.
-      compressedFileSize(file, setImgWH, setImage);
+      compressedFileSize(file, setImage);
     }
   };
   //function is used to save image,stamp widgets data
-  const handleSaveImage = () => {
+  const handleSaveImage = (signatureType) => {
     const widgetsType = currWidgetsDetails?.type;
     //`isApplyAll` is used when user edit stamp then updated signature apply all existing drawn signatures
     const isApplyAll = true;
@@ -273,10 +278,10 @@ function WidgetsValueModal(props) {
 
           // Get updated placeholder list
           const updatedPlaceholders = onSaveImage(
+            signatureType,
             signer.placeHolder,
             index,
             currWidgetsDetails?.key,
-            imgWH,
             image,
             isAutoSign,
             widgetsType,
@@ -294,11 +299,13 @@ function WidgetsValueModal(props) {
         return object.pageNumber === pageNumber;
       });
       const getImage = onSaveImage(
+        signatureType,
         props?.xyPosition,
         index,
         currWidgetsDetails?.key,
-        imgWH,
+        image,
-        image
+        false,
+        widgetsType
       );
       setXyPosition(getImage);
     }
@@ -306,36 +313,28 @@ function WidgetsValueModal(props) {
   };
 
   //function is used to save draw type or initial type signature
-  const handleSaveSignature = (
+  const handleSaveSignature = async (
-    type,
+    signType,
     isDefaultSign,
     width,
     height,
     typedSignature
   ) => {
-    //get current click widget type
+    // get current click widget type
     const widgetsType = currWidgetsDetails?.type;
-    //if there are any width and height then it will typed signature
+    // if there are any width and height then it will typed signature
     const isTypeText = width && height ? true : false;
-    //final getting signature url via default select sign/default initial sign/self draw sign
+    // final getting signature url via default select sign/default initial sign/self draw sign
-    const signatureImg = isDefaultSign
+    const signUrl = isDefaultSign
       ? isDefaultSign === "initials"
-        ? myInitial
+        ? await convertJpegToPng(myInitial, "myinitials") // default initials set through my signature tab
-        : defaultSignImg
+        : await convertJpegToPng(defaultSignImg, "mysign") // default signature set through my signature tab
-      : signature;
+      : signature; // signature done by user thorugh draw, upload, typed
-
+    const signatureImg = signUrl;
     let imgWH = { width: width ? width : "", height: height ? height : "" };
     setIsImageSelect(false);
     setImage();
-    //set default signature image width and height
+    // `isApplyAll` is used when user edit signature/initial then updated signature apply all existing drawn signatures
-    if (isDefaultSign) {
-      const img = new Image();
-      img.src = defaultSignImg;
-      if (img.complete) {
-        imgWH = { width: img.width, height: img.height };
-      }
-    }
-    //`isApplyAll` is used when user edit signature/initial then updated signature apply all existing drawn signatures
     const isApplyAll = true;
     if (uniqueId) {
       setXyPosition((prevState) =>
@@ -345,20 +344,20 @@ function WidgetsValueModal(props) {
           const placeholderIndex = signer.placeHolder.findIndex(
             (x) => x.pageNumber === pageNumber
           );
-
           const updatedPlaceholders = onSaveSign(
-            type,
+            signType,
             signer.placeHolder,
             placeholderIndex,
             currWidgetsDetails?.key,
             signatureImg,
             imgWH,
-            isDefaultSign,
             isTypeText,
             typedSignature,
             isAutoSign,
             widgetsType,
-            isApplyAll
+            isApplyAll,
+            fontSelect,
+            penColor
           );
           return {
             ...signer,
@@ -371,15 +370,16 @@ function WidgetsValueModal(props) {
         return object.pageNumber === pageNumber;
       });
       const getUpdatePosition = onSaveSign(
-        type,
+        signType,
         props?.xyPosition,
         index,
         currWidgetsDetails?.key,
         signatureImg,
         imgWH,
-        isDefaultSign,
         isTypeText,
-        typedSignature
+        typedSignature,
+        false,
+        widgetsType
       );
       setXyPosition(getUpdatePosition);
     }
@@ -405,7 +405,9 @@ function WidgetsValueModal(props) {
     if (getIndex !== -1) {
       setIsSignTypes(true);
       const tab = signatureTypes?.[getIndex].name;
-      if (tab === "draw") {
+      if (currWidgetsDetails?.signatureType === "type") {
+        setIsTab("type");
+      } else if (tab === "draw") {
         setIsTab("draw");
       } else if (tab === "upload") {
         setIsImageSelect(true);
@@ -525,7 +527,7 @@ function WidgetsValueModal(props) {
     }
   };
 
-  // `handlesavesign` is used to save signaute, initials, stamp as a default
+  // `handlesavesign` is used to save signature, initials, stamp as a default
   const handleSaveSign = async () => {
     if (signature || image?.src) {
       setIsLoader(true);
@@ -546,7 +548,7 @@ function WidgetsValueModal(props) {
           objectId: User?.id
         };
         if (imageUrl) {
-          //  below code is used to save or update default signaute, initials, stamp
+          // below code is used to save or update default signature, initials, stamp
           try {
             const signCls = new Parse.Object("contracts_Signature");
             if (props?.saveSignCheckbox?.signId) {
@@ -619,7 +621,7 @@ function WidgetsValueModal(props) {
         if (isTab === "type") {
           setSignature("");
           handleSaveSignature(
-            null,
+            "type",
             false,
             !currWidgetsDetails?.type === "initials" && textWidth > 150
               ? 150
@@ -632,13 +634,14 @@ function WidgetsValueModal(props) {
         } else {
           setSignature("");
           canvasRef?.current?.clear();
-          handleSaveSignature(isTab);
+          const tab = isTab === "uploadImage" ? "image" : isTab;
+          handleSaveSignature(tab);
         }
       }
       setPenColor("blue");
     } else {
       setSignature("");
-      handleSaveImage();
+      handleSaveImage("image");
     }
     setIsImageSelect(false);
     setIsDefaultSign(false);
@@ -694,91 +697,43 @@ function WidgetsValueModal(props) {
       }
     }
     if (isTab === "type") {
+      //trim user name or typed name value to show in initial signature
       const trimmedName = typedSignature
         ? typedSignature?.trim()
         : currentUserName?.trim();
+      //get full name of user
+      const fullUserName = typedSignature || currentUserName;
       const firstCharacter = trimmedName?.charAt(0);
       const userName =
-        currWidgetsDetails?.type === "initials"
+        currWidgetsDetails?.type === "initials" ? firstCharacter : fullUserName;
-          ? firstCharacter
-          : typedSignature;
       const signatureValue = currWidgetsDetails?.typeSignature;
       setTypedSignature(signatureValue || userName || "");
-      convertToImg(fontSelect, userName);
+      convertToImg(fontSelect, signatureValue || userName || "");
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isTab]);
   // function for convert input text value in image
   const convertToImg = async (fontStyle, text, color) => {
-    // 1) Read the max widget dimensions:
+    const maxWidth = currWidgetsDetails?.Width;
-    const maxWidth = currWidgetsDetails.Width; // e.g. 150 px
+    const maxHeight = currWidgetsDetails?.Height;
-    const maxHeight = currWidgetsDetails.Height; // e.g.  40 px
+    const widgetDims = { Width: maxWidth, Height: maxHeight };
-
+    const fontFamily = fontStyle || fontSelect || "Fasthand";
-    // 2) Pick a “baseline” font size for measurement:
-    const baselineFontSizePx = 40;
-    const chosenFontFamily = fontStyle || fontSelect || "Fasthand";
     const fillColor = color || penColor;
-
+    const dataUrl = convertTextToImg(fontFamily, text, fillColor, widgetDims);
-    // 3) Create a temporary <span> (hidden) to measure the text at 40px:
-    const span = document.createElement("span");
-    span.textContent = text;
-    span.style.font = `${baselineFontSizePx}px ${chosenFontFamily}`;
-    span.style.visibility = "hidden"; // keep it in the DOM so offsetWidth/Height works
-    span.style.whiteSpace = "nowrap"; // so we measure a single line
-    document.body.appendChild(span);
-
-    // Measured size at 40px:
-    const measuredWidth = span.offsetWidth;
-    const measuredHeight = span.offsetHeight;
-    document.body.removeChild(span);
-
-    // 4) Compute uniform scale so that 40px‐sized text fits inside (maxWidth × maxHeight):
-    const scaleX = maxWidth / measuredWidth;
-    const scaleY = maxHeight / measuredHeight;
-    const scale = Math.min(scaleX, scaleY, 1); // never scale up beyond 1
-
-    // 5) Final text size in **CSS px**:
-    const finalFontSizePx = baselineFontSizePx * scale;
-
-    // 6) Create a <canvas> that is ALWAYS maxWidth × maxHeight in **CSS px**,
-    //    but use devicePixelRatio for sharpness.
-    const pixelRatio = window.devicePixelRatio || 1;
-    const canvas = document.createElement("canvas");
-
-    // ★ Instead of using `finalTextWidth/Height`, force it to be the max box:
-    canvas.width = Math.ceil(maxWidth * pixelRatio);
-    canvas.height = Math.ceil(maxHeight * pixelRatio);
-
-    const ctx = canvas.getContext("2d");
-    ctx.scale(pixelRatio, pixelRatio);
-
-    // 7) Draw the text **centered** inside the full maxWidth×maxHeight box:
-    ctx.font = `${finalFontSizePx}px ${chosenFontFamily}`;
-    ctx.fillStyle = fillColor;
-    ctx.textAlign = "center";
-    ctx.textBaseline = "middle";
-
-    // ★ Center = (maxWidth/2, maxHeight/2):
-    const centerX = maxWidth / 2;
-    const centerY = maxHeight / 2;
-
-    ctx.fillText(text, centerX, centerY);
-
-    // 8) Export to a PNG data-URL:
-    const dataUrl = canvas.toDataURL("image/png");
     setSignature(dataUrl);
+    setTextWidth(maxWidth);
+    setTextHeight(maxHeight);
   };
-  const PenColorComponent = (props) => {
+  const PenColorComponent = () => {
     return (
       <div className="flex flex-row items-center m-[5px] gap-3">
-        <span className="text-base-content">Options</span>
+        <span className="text-base-content">{t("options")}</span>
         {allColor.map((data, key) => {
           return (
             <i
               key={key}
               onClick={() => {
-                props?.convertToImg &&
+                convertToImg(fontSelect, typedSignature, data);
-                  props?.convertToImg(fontSelect, typedSignature, data);
                 setPenColor(allColor[key]);
               }}
               className={`border-b-[2px] cursor-pointer ${key === 0 && penColor === "blue" ? "border-blue-600" : key === 1 && penColor === "red" ? "border-red-500" : key === 2 && penColor === "black" ? "border-black" : "border-white"} text-[${data}] text-[16px] fa-light fa-pen-nib`}
@@ -789,17 +744,6 @@ function WidgetsValueModal(props) {
     );
   };
 
-  // `handleCancelBtn` function trigger when user click on cross button
-  const handleCancelBtn = () => {
-    setPenColor("blue");
-    setIsImageSelect(false);
-    setIsDefaultSign(false);
-    setImage(null);
-    setOriginalImage(null); // Add this
-    setRemoveBgEnabled(false); // Add this
-    handleTab();
-  };
-
   // Effect to store original image and apply initial BG removal if enabled
   useEffect(() => {
     if (
@@ -902,7 +846,7 @@ function WidgetsValueModal(props) {
         checked={isSavedSign}
         onChange={(e) => setIsSavedSign(e.target.checked)}
       />
-      {t("save")} {currWidgetsDetails?.type}
+      {t("save")} {t(`widgets-name.${currWidgetsDetails?.type}`)}
     </label>
   );
   //function for set checked and unchecked value of checkbox
@@ -1048,10 +992,28 @@ function WidgetsValueModal(props) {
                   currWidgetsDetails?.type !== "image" && (
                     <div className="text-base-content rounded-[4px] tabWidth">
                       <div className="ml-3 flex justify-start gap-4 text-[11px] md:text-base my-[3px]">
-                        <>
+                        {currWidgetsDetails?.type !== "initials" &&
-                          {currWidgetsDetails?.type !== "initials" &&
+                        defaultSignImg &&
-                          defaultSignImg &&
+                        isTabEnabled("default") ? (
-                          isTabEnabled("default") ? (
+                          <div>
+                            <span
+                              onClick={() => {
+                                setIsDefaultSign(true);
+                                setIsImageSelect(true);
+                                setIsTab("mysignature");
+                                setImage();
+                              }}
+                              className={`${
+                                isTab === "mysignature" && `${isTabCls}`
+                              } ml-[2px] cursor-pointer`}
+                            >
+                              {t("my-signature")}
+                            </span>
+                          </div>
+                        ) : (
+                          currWidgetsDetails?.type === "initials" &&
+                          myInitial &&
+                          isTabEnabled("default") && (
                             <div>
                               <span
                                 onClick={() => {
@@ -1062,84 +1024,64 @@ function WidgetsValueModal(props) {
                                 }}
                                 className={`${
                                   isTab === "mysignature" && `${isTabCls}`
-                                } ml-[2px] cursor-pointer`}
-                              >
-                                {t("my-signature")}
-                              </span>
-                            </div>
-                          ) : (
-                            currWidgetsDetails?.type === "initials" &&
-                            myInitial &&
-                            isTabEnabled("default") && (
-                              <div>
-                                <span
-                                  onClick={() => {
-                                    setIsDefaultSign(true);
-                                    setIsImageSelect(true);
-                                    setIsTab("mysignature");
-                                    setImage();
-                                  }}
-                                  className={`${
-                                    isTab === "mysignature" && `${isTabCls}`
-                                  }   ml-[2px] cursor-pointer`}
-                                >
-                                  {t("my-initials")}
-                                </span>
-                              </div>
-                            )
-                          )}
-                          {isTabEnabled("draw") && (
-                            <div>
-                              <span
-                                onClick={() => {
-                                  setIsDefaultSign(false);
-                                  setIsImageSelect(false);
-                                  setIsTab("draw");
-                                  setImage();
-                                  setSignature("");
-                                }}
-                                className={`${
-                                  isTab === "draw" && `${isTabCls}`
                                 }   ml-[2px] cursor-pointer`}
                               >
-                                {t("draw")}
+                                {t("my-initials")}
                               </span>
                             </div>
-                          )}
+                          )
-                          {isTabEnabled("upload") && (
+                        )}
-                            <div>
+                        {isTabEnabled("draw") && (
-                              <span
+                          <div>
-                                onClick={() => {
+                            <span
-                                  setIsDefaultSign(false);
+                              onClick={() => {
-                                  setIsImageSelect(true);
+                                setIsDefaultSign(false);
-                                  setIsTab("uploadImage");
+                                setIsImageSelect(false);
-                                }}
+                                setIsTab("draw");
-                                className={`${
+                                setImage();
-                                  isTab === "uploadImage" && `${isTabCls}`
+                                setSignature("");
-                                }  ml-[2px] cursor-pointer`}
+                              }}
-                              >
+                              className={`${
-                                {t("upload-image")}
+                                isTab === "draw" && `${isTabCls}`
-                              </span>
+                              }   ml-[2px] cursor-pointer`}
-                            </div>
+                            >
-                          )}
+                              {t("draw")}
-                          {isTabEnabled("typed") && (
+                            </span>
-                            <div>
+                          </div>
-                              <span
+                        )}
-                                onClick={() => {
+                        {isTabEnabled("upload") && (
-                                  setIsDefaultSign(false);
+                          <div>
-                                  setIsImageSelect(false);
+                            <span
-                                  setIsTab("type");
+                              onClick={() => {
-                                  setImage();
+                                setIsDefaultSign(false);
-                                }}
+                                setIsImageSelect(true);
-                                className={`${
+                                setIsTab("uploadImage");
-                                  isTab === "type" && `${isTabCls}`
+                              }}
-                                } ml-[2px] cursor-pointer`}
+                              className={`${
-                              >
+                                isTab === "uploadImage" && `${isTabCls}`
-                                {t("type")}
+                              }  ml-[2px] cursor-pointer`}
-                              </span>
+                            >
-                            </div>
+                              {t("upload-image")}
-                          )}
+                            </span>
-                        </>
+                          </div>
+                        )}
+                        {isTabEnabled("typed") && (
+                          <div>
+                            <span
+                              onClick={() => {
+                                setIsDefaultSign(false);
+                                setIsImageSelect(false);
+                                setIsTab("type");
+                                setImage();
+                              }}
+                              className={`${
+                                isTab === "type" && `${isTabCls}`
+                              } ml-[2px] cursor-pointer`}
+                            >
+                              {t("type")}
+                            </span>
+                          </div>
+                        )}
                       </div>
                     </div>
                   )}
@@ -1174,7 +1116,7 @@ function WidgetsValueModal(props) {
                               </div>
                             </div>
                             {/* Standalone autoSignAll for "My Signature/Initials" (isDefaultSign) if conditions met */}
-                            {setIsAutoSign && uniqueId && (
+                            {uniqueId && (
                               <div className="flex justify-center my-2">
                                 {autoSignAll}
                               </div>
@@ -1203,7 +1145,7 @@ function WidgetsValueModal(props) {
                               </div>
                             </div>
                             {/* Standalone autoSignAll for "My Signature/Initials" (isDefaultSign) if conditions met */}
-                            {setIsAutoSign && uniqueId && (
+                            {uniqueId && (
                               <div className="flex justify-center my-2">
                                 {autoSignAll}
                               </div>
@@ -1228,8 +1170,10 @@ function WidgetsValueModal(props) {
                             ref={imageRef}
                             hidden
                           />
-                          <i className="fa-light fa-cloud-upload-alt uploadImgLogo"></i>
+                          <i className="fa-light fa-cloud-upload-alt uploadImgLogo text-base-content"></i>
-                          <div className="text-[10px]">{t("upload")}</div>
+                          <div className="text-[10px] text-base-content">
+                            {t("upload")}
+                          </div>
                         </div>
                       </div>
                     ) : (
@@ -1248,14 +1192,14 @@ function WidgetsValueModal(props) {
                           </div>
                         </div>
                         {/* Shared container for autoSignAll and removeBackground when image is displayed for upload/stamp/image */}
-                        {((setIsAutoSign && uniqueId) ||
+                        {(uniqueId ||
                           (image &&
                             (isImageSelect ||
                               ["image", "stamp"].includes(
                                 currWidgetsDetails?.type
                               )))) && (
                           <div className="flex justify-center items-center gap-x-2 my-2">
-                            {setIsAutoSign && uniqueId && autoSignAll}
+                            {uniqueId && autoSignAll}
                             {image &&
                               (isImageSelect ||
                                 ["image", "stamp"].includes(
@@ -1345,7 +1289,7 @@ function WidgetsValueModal(props) {
                       </div>
                       <div className="flex flex-row ml-1 mt-2 gap-x-3 text-base-content">
                         {/* Standalone autoSignAll for "Type" tab if conditions met */}
-                        {setIsAutoSign && uniqueId && (
+                        {uniqueId && (
                           <div className="flex justify-start my-1">
                             {autoSignAll}
                           </div>
@@ -1375,13 +1319,12 @@ function WidgetsValueModal(props) {
                           dotSize={1}
                         />
                       </div>
-
                       <div className="flex flex-row justify-between mt-[10px]">
                         <PenColorComponent />
                       </div>
                       <div className="flex flex-row ml-1 mt-1 gap-x-3 text-base-content">
                         {/* Standalone autoSignAll for "Draw" tab if conditions met */}
-                        {setIsAutoSign && uniqueId && (
+                        {uniqueId && (
                           <div className="flex justify-start my-1">
                             {autoSignAll}
                           </div>
@@ -1778,6 +1721,7 @@ function WidgetsValueModal(props) {
         break;
     }
   };
+  // console.log("currwidgetdetails ", currWidgetsDetails )
   //function too use on click on next/finish button then update modal UI according to current widgets
   const handleClickOnNext = (isFinishDoc) => {
     if (
@@ -2038,7 +1982,7 @@ function WidgetsValueModal(props) {
                         handleClickOnNext(isFinishDoc);
                       }}
                     >
-                      {t("finish")}
+                      {t("done")}
                     </button>
                   ) : (
                     <button

apps/OpenSign/src/components/sidebar/Menu.jsx

@@ -18,16 +18,16 @@ 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 gap-x-5 items-center justify-start text-left p-3 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>
+          <i className={`${item.icon} text-[20px]`} aria-hidden="true"></i>
         </span>
-        <span className="ml-3 lg:ml-4">
+        <span className="flex items-center mb-0.5">
           {t(`sidebar.${item.title}`, { appName: drivename })}
         </span>
       </NavLink>

apps/OpenSign/src/components/sidebar/Sidebar.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import Menu from "./Menu";
 import Submenu from "./SubMenu";
 import SocialMedia from "../SocialMedia";
@@ -27,39 +27,18 @@ const Sidebar = ({ isOpen, closeSidebar }) => {
       if (localStorage.getItem("defaultmenuid")) {
         const Extand_Class = localStorage.getItem("Extand_Class");
         const extClass = Extand_Class && JSON.parse(Extand_Class);
-        // console.log("extClass ", extClass);
+        const userRole = extClass?.[0]?.UserRole || "contracts_User";
-        let userRole = "contracts_User";
+        const isAdmin =
-        if (extClass && extClass.length > 0) {
+          userRole === "contracts_Admin" || userRole === "contracts_OrgAdmin";
-          userRole = extClass[0].UserRole;
+        const newSidebarList = sidebarList.map((item) => {
-        }
+          if (item.title !== "Settings") return item;
-        if (
+          const newItem = { ...item };
-          userRole === "contracts_Admin" ||
+          const baseChildren = isAdmin ? subSetting : subSetting?.slice(0, 1);
-          userRole === "contracts_OrgAdmin"
+            const mysignature = newItem.children.slice(0, 1);
-        ) {
+            newItem.children = [...mysignature, ...baseChildren];
-          const newSidebarList = sidebarList.map((item) => {
+          return newItem;
-            if (item.title === "Settings") {
+        });
-              // Make a shallow copy of the item
+        setmenuList(newSidebarList);
-              const newItem = { ...item };
-                const arr = newItem.children.slice(0, 1);
-                newItem.children = [...arr, ...subSetting];
-              return newItem;
-            }
-            return item;
-          });
-          setmenuList(newSidebarList);
-        } else {
-            const newSidebarList = sidebarList.map((item) => {
-              if (item.title === "Settings") {
-                // Make a shallow copy of the item
-                const newItem = { ...item };
-                const arr = newItem.children.slice(0, 1);
-                newItem.children = arr;
-                return newItem;
-              }
-              return item;
-            });
-            setmenuList(newSidebarList);
-        }
       }
     } catch (e) {
       console.error("Problem", e);

apps/OpenSign/src/components/sidebar/SubMenu.jsx

@@ -12,16 +12,16 @@ 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 gap-x-5 items-center justify-start text-left p-3 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>
+          <i className={`${icon} text-[20px]`}></i>
         </span>
         <div className="flex justify-between items-center w-full">
-          <span className="ml-3 lg:ml-4 text-start">
+          <span className="flex items-center mb-0.5">
             {t(`sidebar.${item.title}`, { appName })}
           </span>
           <i
@@ -46,20 +46,20 @@ const Submenu = ({ item, closeSidebar, toggleSubmenu, submenuOpen }) => {
                 }
                 className={({ isActive }) =>
                   `${
-                    isActive ? "bg-base-300 text-base-content" : ""
+                    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`
+                  } pl-4 flex items-center gap-x-5 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">
+                <span className="w-[18px] h-[18px] flex justify-center">
                   <i
                     className={`${childItem.icon} text-[18px]`}
                     aria-hidden="true"
                   ></i>
                 </span>
-                <span className="ml-3 lg:ml-4">
+                <span className="mb-0.5">
                   {t(`sidebar.${item.title}-Children.${childItem.title}`, {
                     appName: drivename
                   })}

apps/OpenSign/src/constant/Utils.jsx

@@ -241,6 +241,13 @@ export const handleImageResize = (
   signerId,
   showResize
 ) => {
+  // Compute widget dimensions only once
+  const { offsetWidth, offsetHeight } = ref;
+  const factor = scale * containerScale || 1;
+  const widgetWidth = offsetWidth / factor;
+  const widgetHeight = offsetHeight / factor;
+  const widgetDims = { Width: widgetWidth, Height: widgetHeight };
+
   const filterSignerPos = signerPos.filter((data) => data.Id === signerId);
   if (filterSignerPos.length > 0) {
     const getPlaceHolder = filterSignerPos[0].placeHolder;
@@ -252,12 +259,28 @@ export const handleImageResize = (
       const getPosData = getXYdata;
       const addSignPos = getPosData.map((url) => {
         if (url.key === key) {
-          return {
+          // Base fields for every resized signature
+          const base = {
             ...url,
-            Width: ref.offsetWidth / (containerScale * scale),
+            Width: widgetWidth,
-            Height: ref.offsetHeight / (containerScale * scale),
+            Height: widgetHeight,
             IsResize: showResize ? true : false
           };
+          // If it's a “type” signature, regenerate the image and options
+          if (url.typeSignature && url.signatureType === "type") {
+            const signImg = convertTextToImg(
+              url.typeFont ?? "Fasthand",
+              url.typeSignature,
+              url.fontColor ?? "blue",
+              widgetDims
+            );
+            return {
+              ...base,
+              SignUrl: signImg,
+              options: { ...url.options, response: signImg }
+            };
+          }
+          return base;
         }
         return url;
       });
@@ -280,6 +303,7 @@ export const handleImageResize = (
     }
   }
 };
+
 export const widgets = [
   { type: "signature", icon: "fa-light fa-pen-nib", iconSize: "20px" },
   { type: "stamp", icon: "fa-light fa-stamp", iconSize: "19px" },
@@ -336,6 +360,8 @@ export const selectFormat = (data) => {
       return "MMMM dd, yyyy";
     case "DD MMMM, YYYY":
       return "dd MMMM, yyyy";
+    case "DD.MM.YYYY":
+      return "dd.MM.yyyy";
     default:
       return "MM/dd/yyyy";
   }
@@ -363,6 +389,8 @@ export const changeDateToMomentFormat = (format) => {
       return "MMM DD, YYYY";
     case "dd MMMM, yyyy":
       return "DD MMMM, YYYY";
+    case "dd.MM.yyyy":
+      return "DD.MM.YYYY";
     default:
       return "L";
   }
@@ -590,7 +618,6 @@ export async function getBase64FromIMG(url) {
     reader.readAsDataURL(blob);
     reader.onloadend = function () {
       const pdfBase = this.result;
-
       resolve(pdfBase);
     };
   });
@@ -632,27 +659,57 @@ export const handleSignYourselfImageResize = (
   containerScale,
   scale
 ) => {
-  const getXYdata = xyPosition[index].pos;
+  // Guard against bad index
-  const getPosData = getXYdata;
+  if (!xyPosition[index]) {
-  const addSign = getPosData.map((url) => {
+    console.log(`ImageResize invalid index ${index}`);
-    if (url.key === key) {
+    return;
-      return {
+  }
-        ...url,
-        Width: ref.offsetWidth / (scale * containerScale),
-        Height: ref.offsetHeight / (scale * containerScale),
-        IsResize: true
-      };
-    }
-    return url;
-  });
 
-  const newUpdateUrl = xyPosition.map((obj, ind) => {
+  // Compute widget dimensions only once
-    if (ind === index) {
+  const { offsetWidth, offsetHeight } = ref;
-      return { ...obj, pos: addSign };
+  const factor = scale * containerScale || 1;
-    }
+  const widgetWidth = offsetWidth / factor;
-    return obj;
+  const widgetHeight = offsetHeight / factor;
+  const widgetDims = { Width: widgetWidth, Height: widgetHeight };
+
+  // Single pass to update only the targeted index/key
+  const updated = xyPosition.map((item, idx) => {
+    if (idx !== index) return item;
+
+    return {
+      ...item,
+      pos: item.pos.map((url) => {
+        if (url.key !== key) return url;
+
+        // Base fields for every resized signature
+        const base = {
+          ...url,
+          Width: widgetWidth,
+          Height: widgetHeight,
+          IsResize: true
+        };
+
+        // If it's a “type” signature, regenerate the image and options
+        if (url.typeSignature && url.signatureType === "type") {
+          const signImg = convertTextToImg(
+            url.typeFont ?? "Fasthand",
+            url.typeSignature,
+            url.fontColor ?? "blue",
+            widgetDims
+          );
+
+          return {
+            ...base,
+            SignUrl: signImg,
+            options: { ...url.options, response: signImg }
+          };
+        }
+
+        return base;
+      })
+    };
   });
-  setXyPosition(newUpdateUrl);
+  setXyPosition(updated);
 };
 
 //function for call cloud function signPdf and generate digital signature
@@ -1205,57 +1262,108 @@ export const embedDocId = async (pdfOriginalWH, pdfDoc, documentId) => {
   }
 };
 
-//function for save button to save signature or image url
+// function for convert input text value in image
+export function convertTextToImg(fontStyle, text, color, widgetDims) {
+  // read your widget dimensions:
+  const maxWidth = widgetDims.Width;
+  const maxHeight = widgetDims.Height;
+  const baselineFontSizePx = maxHeight;
+  const fontFamily = fontStyle || "Fasthand";
+  const fillColor = color || "blue";
+
+  // 1. Use a temporary canvas to measure actual text size
+  const tempCanvas = document.createElement("canvas");
+  const tempCtx = tempCanvas.getContext("2d");
+  tempCtx.font = `${baselineFontSizePx}px ${fontFamily}`;
+  const metrics = tempCtx.measureText(text);
+
+  const actualHeight =
+    metrics.actualBoundingBoxAscent + metrics.actualBoundingBoxDescent;
+  const actualWidth = metrics.width;
+
+  // const renderscale = 3;
+  // 2. Scale font size so text height fills canvas
+  const scaleX = maxWidth / actualWidth;
+  const scaleY = maxHeight / actualHeight;
+  const scale = Math.min(scaleX, scaleY, 1);
+  // final font-size
+  // const finalFontSizePx = baselineFontSizePx * scale * renderscale;
+  const finalFontSizePx = baselineFontSizePx * scale;
+  // 3. Create the final canvas
+  const pxRatio = window.devicePixelRatio * 2 || 3;
+  const canvas = document.createElement("canvas");
+  canvas.width = Math.ceil(maxWidth * pxRatio);
+  canvas.height = Math.ceil(maxHeight * pxRatio);
+  const ctx = canvas.getContext("2d");
+  ctx.scale(pxRatio, pxRatio);
+
+  // 4. Setup text with final font
+  ctx.font = `${finalFontSizePx}px ${fontFamily}`;
+  ctx.fillStyle = fillColor;
+  ctx.textAlign = "center";
+  ctx.textBaseline = "alphabetic";
+
+  const newMetrics = ctx.measureText(text);
+  const ascent = newMetrics.actualBoundingBoxAscent;
+  const descent = newMetrics.actualBoundingBoxDescent;
+
+  // 5. Align text vertically so it touches top and bottom
+  const y = maxHeight / 2 + (ascent - descent) / 2;
+
+  ctx.clearRect(0, 0, maxWidth, maxHeight);
+  ctx.fillText(text, maxWidth / 2, y);
+
+  // 6. Output image
+  const dataUrl = canvas.toDataURL("image/png");
+  return dataUrl;
+}
+
+// `onSaveSign` trigger on save button to save for signature, initials widget for type: draw, typed, default
 export function onSaveSign(
   type,
   xyPosition,
   index,
   signKey,
   signatureImg,
-  defaultImgWH,
+  updatedImgWH,
-  isDefaultSign,
   isTypeText,
   typedSignature,
   isAutoSign,
   widgetsType,
-  isApplyAll
+  isApplyAll,
+  typeFont,
+  fontColor
 ) {
   let getIMGWH, posWidth, posHeight;
   let getXYdata = xyPosition[index].pos;
+  const isSignOrInitials =
+    widgetsType && ["signature", "initials"].includes(widgetsType);
   const updateXYData = getXYdata.map((position) => {
     if (position.key === signKey) {
-      if (isDefaultSign === "initials") {
+      if (isTypeText) {
-        let imgWH = { width: position.Width, height: position.Height };
-        getIMGWH = calculateImgAspectRatio(imgWH, position);
-      } else if (isDefaultSign === "default") {
-        getIMGWH = calculateImgAspectRatio(defaultImgWH, position);
-      } else if (isTypeText) {
         getIMGWH = {
-          newWidth: defaultImgWH.width,
+          newWidth: updatedImgWH.width,
-          newHeight: defaultImgWH.height
+          newHeight: updatedImgWH.height
         };
-      } else {
-        const defaultWidth = defaultWidthHeight(position?.type).width;
-        const defaultHeight = defaultWidthHeight(position?.type).height;
-
-        getIMGWH = calculateImgAspectRatio(
-          {
-            width: defaultWidth ? defaultWidth : 150,
-            height: defaultHeight ? defaultHeight : 60
-          },
-          position
-        );
       }
       posWidth = getIMGWH ? getIMGWH.newWidth : 150;
       posHeight = getIMGWH ? getIMGWH.newHeight : 60;
+      const widgetDims = { Width: posWidth, Height: posHeight };
+      const signImg = typedSignature
+        ? convertTextToImg(typeFont, typedSignature, fontColor, widgetDims)
+        : signatureImg;
       return {
         ...position,
-        Width: posWidth,
+        ...(type === "type" ? { Width: posWidth } : {}),
-        Height: posHeight,
+        ...(type === "type" ? { Height: posHeight } : {}),
-        SignUrl: signatureImg,
+        SignUrl: signImg,
-        ...(type && { signatureType: type }),
+        ...(isSignOrInitials && { signatureType: type || "" }),
-        options: { ...position.options, response: signatureImg },
+        options: { ...position.options, response: signImg },
-        ...(typedSignature && { typeSignature: typedSignature })
+        ...(typedSignature && {
+          typeSignature: typedSignature,
+          typeFont: typeFont ?? "Fasthand",
+          fontColor: fontColor ?? "blue"
+        })
       };
     }
     return position;
@@ -1267,24 +1375,30 @@ export function onSaveSign(
     }
     return obj;
   });
-  //condition  when draw/upload signature/initials then apply it all related to widgets (signature,image,typed signature or default signature)
+  //condition  when draw/upload signature/initials then apply it all related to widgets (draw, typed signature or default signature)
   if (isApplyAll || isAutoSign) {
     const updatedArray = updateXYposition.map((page) => ({
       ...page,
-      pos: page.pos.map(
+      pos: page.pos.map((item) => {
-        (item) =>
+        if (item.type === widgetsType) {
-          item.type === widgetsType
+          const widgetDims = { Width: item.Width, Height: item.Height };
-            ? {
+          const signImg = typedSignature
-                ...item,
+            ? convertTextToImg(typeFont, typedSignature, fontColor, widgetDims)
-                Width: posWidth,
+            : signatureImg;
-                Height: posHeight,
+          return {
-                SignUrl: signatureImg,
+            ...item,
-                ...(type && { signatureType: type }),
+            SignUrl: signImg,
-                options: { ...item.options, response: signatureImg },
+            ...(isSignOrInitials && { signatureType: type || "" }),
-                ...(typedSignature && { typeSignature: typedSignature })
+            options: { ...item.options, response: signImg },
-              }
+            ...(typedSignature && {
-            : item // Otherwise, keep it unchanged
+              typeSignature: typedSignature,
-      )
+              typeFont: typeFont || "Fasthand",
+              fontColor: fontColor || "blue"
+            })
+          };
+        }
+        return item; // Otherwise, keep it unchanged
+      })
     }));
     return updatedArray;
   } else {
@@ -1292,6 +1406,54 @@ export function onSaveSign(
   }
 }
 
+/**
+ * Scales and centers a base64‐encoded image into a fixed‐size widget
+ * and returns a new base64 PNG.
+ *
+ * @param {string} base64Image  A data-URL (e.g. "data:image/png;base64,…")
+ * @param {{ Width: number, Height: number }} widgetDims
+ * @returns {Promise<string>}  A Promise that resolves to a data-URL of the new image
+ */
+export async function convertBase64ToImg(base64Image, widgetDims) {
+  const { Width: maxWidth, Height: maxHeight } = widgetDims;
+
+  // Detect input format from data URL
+  const match = base64Image.match(/^data:(image\/(png|jpeg|jpg|webp));base64,/);
+  const inputMime = match ? match[1] : "image/png"; // fallback to PNG if unknown
+
+  // 1. Load the image off-DOM
+  const img = new Image();
+  img.src = base64Image;
+  await new Promise((resolve, reject) => {
+    img.onload = resolve;
+    img.onerror = reject;
+  });
+
+  // 2. Compute scale to fit within widget (preserving aspect ratio)
+  const { naturalWidth: imgW, naturalHeight: imgH } = img;
+  const scale = Math.min(maxWidth / imgW, maxHeight / imgH, 1);
+  const drawW = imgW * scale;
+  const drawH = imgH * scale;
+
+  // 3. Prepare a high-DPI canvas
+  const pxRatio = (window.devicePixelRatio || 1) * 2;
+  const canvas = document.createElement("canvas");
+  canvas.width = Math.ceil(maxWidth * pxRatio);
+  canvas.height = Math.ceil(maxHeight * pxRatio);
+  const ctx = canvas.getContext("2d");
+  ctx.scale(pxRatio, pxRatio);
+  ctx.clearRect(0, 0, maxWidth, maxHeight);
+
+  // 4. Center the image in the widget rectangle
+  const x = (maxWidth - drawW) / 2;
+  const y = (maxHeight - drawH) / 2;
+  ctx.drawImage(img, x, y, drawW, drawH);
+  // 5. Return new base64 in same format as input
+  const quality =
+    inputMime.includes("jpeg") || inputMime.includes("jpg") ? 0.9 : undefined;
+  return canvas.toDataURL(inputMime, quality);
+}
+
 //function to use After setting the signature URL for the first signature widget, clicking on subsequent
 //signature widgets should automatically apply and display the signature. apply for initial,signature and stamp widget
 export const handleCopySignUrl = (
@@ -1318,8 +1480,8 @@ export const handleCopySignUrl = (
     if (x.key === currentPos.key) {
       return {
         ...x,
-        Width: existSignPosition.Width,
+        // Width: existSignPosition.Width,
-        Height: existSignPosition.Height,
+        // Height: existSignPosition.Height,
         SignUrl: existSignPosition.SignUrl,
         signatureType: existSignPosition.signatureType,
         options: { ...x.options, response: existSignPosition.SignUrl },
@@ -1351,39 +1513,33 @@ export const calculateImgAspectRatio = (imgWH, pos) => {
   const aspectRatio = imgWH.width / imgWH.height;
   newWidth = aspectRatio * placeholderHeight;
   newHeight = placeholderHeight;
-
   return { newHeight, newWidth };
 };
 
-//function for upload stamp or image
+// `onSaveImage` trigger for upload image through stamp, image, signature, initials widgets
 export function onSaveImage(
+  signatureType,
   xyPosition,
   index,
   signKey,
-  imgWH,
   image,
   isAutoSign,
   widgetsType,
   isApplyAll
 ) {
-  let getIMGWH;
+  // let getIMGWH;
-
+  const isSignOrInitials =
+    widgetsType && ["signature", "initials"].includes(widgetsType);
   //get current page position
   const getXYData = xyPosition[index].pos;
   const updateXYData = getXYData.map((position) => {
     if (position.key === signKey) {
-      getIMGWH = calculateImgAspectRatio(imgWH, position);
-
       return {
         ...position,
-        Width: getIMGWH.newWidth,
-        Height: getIMGWH.newHeight,
         SignUrl: image.src,
         ImageType: image.imgType,
-        options: {
+        ...(isSignOrInitials && { signatureType: signatureType || "" }),
-          ...position.options,
+        options: { ...position.options, response: image.src }
-          response: image.src
-        }
       };
     }
     return position;
@@ -1395,17 +1551,16 @@ export function onSaveImage(
     }
     return obj;
   });
-  //condition  when user upload(stamp) then apply it all related to widgets
+  // condition when user upload(stamp) then apply it all related to widgets
   if (isApplyAll || isAutoSign) {
     const updatedArray = updateXYposition.map((page) => ({
       ...page,
       pos: page.pos.map(
         (item) =>
+          // below condition to exclude apply all for image widget
           item.type === widgetsType && item.type !== "image"
             ? {
                 ...item,
-                Width: getIMGWH.newWidth,
-                Height: getIMGWH.newHeight,
                 SignUrl: image.src,
                 ImageType: image.imgType,
                 options: {
@@ -1423,7 +1578,7 @@ export function onSaveImage(
 }
 
 //function for select image and upload image
-export const onImageSelect = (setImgWH, setImage, file) => {
+export const onImageSelect = (setImage, file) => {
   const reader = new FileReader();
   reader.readAsDataURL(file);
   reader.onloadend = function (e) {
@@ -1442,13 +1597,12 @@ export const onImageSelect = (setImgWH, setImage, file) => {
         width = 184 * imgR;
         height = 184;
       }
-      setImgWH({ width: width, height: height });
     };
     image.src = reader.result;
     setImage({ src: image.src, imgType: file.type });
   };
 };
-export const compressedFileSize = (file, setImgWH, setImage) => {
+export const compressedFileSize = (file, setImage) => {
   // Create a new FileReader instance to read the uploaded file
   const reader = new FileReader();
 
@@ -1473,7 +1627,7 @@ export const compressedFileSize = (file, setImgWH, setImage) => {
       // Draw the image onto the canvas with the specified dimensions
       ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
       // Get the original file type (default to "image/png" if not recognized)
-      const fileType = file.type || "image/png";
+      const fileType = "image/png"; //file.type || "image/png"
       // Compress the image and convert it into a Blob
       canvas.toBlob(
         (blob) => {
@@ -1483,7 +1637,7 @@ export const compressedFileSize = (file, setImgWH, setImage) => {
             lastModified: Date.now() // Update the last modified timestamp
           });
           // Pass the compressed file to a custom function for further processing
-          onImageSelect(setImgWH, setImage, compressedFile);
+          onImageSelect(setImage, compressedFile);
         },
         fileType, // Output format for the compressed image
         0.3 // Compression quality (30%)
@@ -1552,13 +1706,7 @@ const getWidgetsFontColor = (type) => {
   }
 };
 //function for embed multiple signature using pdf-lib
-export const multiSignEmbed = async (
+export const multiSignEmbed = async (widgets, pdfDoc, signyourself, scale) => {
-  pdfOriginalWH,
-  widgets,
-  pdfDoc,
-  signyourself,
-  scale
-) => {
   // `fontBytes` is used to embed custom font in pdf
   const fontBytes = await fileasbytes(
     "https://cdn.opensignlabs.com/webfonts/times.ttf"
@@ -1567,15 +1715,9 @@ export const multiSignEmbed = async (
   const font = await pdfDoc.embedFont(fontBytes, { subset: true });
   let hasError = false;
   for (let item of widgets) {
-    //pdfOriginalWH contained all pdf's pages width and height
-    //'getSize' is used to get particular pdf's page width and height
-    const getSize = pdfOriginalWH.find(
-      (page) => page?.pageNumber === item?.pageNumber
-    );
     if (hasError) break; // Stop the outer loop if an error occurred
     const typeExist = item.pos.some((data) => data?.type);
     let updateItem;
-
     if (typeExist) {
       if (signyourself) {
         updateItem = item.pos;
@@ -1601,14 +1743,31 @@ export const multiSignEmbed = async (
     const pages = pdfDoc.getPages();
     const form = pdfDoc.getForm();
     const page = pages[pageNo - 1];
+    // `page.getCropBox()` returns the visible area of the PDF page.
+    // It provides an object with the following properties:
+    // - x: the x-coordinate of the lower-left corner of the visible area
+    // - y: the y-coordinate of the lower-left corner of the visible area
+    // - width: the width of the visible area (x1 - x0)
+    // - height: the height of the visible area (y1 - y0)
+    // If the page does not explicitly define a CropBox, this method returns
+    // the MediaBox instead, which represents the full physical size of the page.
+    //
+    // Example CropBox: [0, 7.92, 612, 799.92]
+    // => x = 0, y = 7.92, width = 612 - 0 = 612, height = 799.92 - 7.92 = 792
+    // This is equivalent to `react-pdf`'s `page.view` array: [x0, y0, x1, y1]
+    const { _, y, width, height } = page.getCropBox();
+    const originalHeight = height + y;
+    const getSize = { height: originalHeight, width: width };
     const images = await Promise.all(
       widgetsPositionArr.map(async (widget) => {
         // `SignUrl` this is wrong nomenclature and maintain for older code in this options we save base64 of signature image from sign pad
         let signbase64 = widget.SignUrl && widget.SignUrl;
+        const widgetDims = { Width: widget.Width, Height: widget.Height };
         if (signbase64) {
           let arr = signbase64.split(","),
             mime = arr[0].match(/:(.*?);/)[1];
-          const res = await fetch(signbase64);
+          const signatureImg = await convertBase64ToImg(signbase64, widgetDims);
+          const res = await fetch(signatureImg);
           const arrayBuffer = await res.arrayBuffer();
           const obj = { mimetype: mime, arrayBuffer: arrayBuffer };
           return obj;
@@ -1701,8 +1860,8 @@ export const multiSignEmbed = async (
           let currentY = yPos(position) + 2;
           // Size and spacing settings
           const checkboxSize = fontSize - 1; // checkbox diameter
-          const checkboxTextGapFromLeft = fontSize + 5; // gap between box and its label
+          const checkboxTextGapFromLeft = fontSize + 3.4; // gap between box and its label
-          const verticalGap = fontSize + 3.2; // gap between two rows (vertical layout)
+          const verticalGap = fontSize + 3.4; // gap between two rows (vertical layout)
           let horizontalGap = 0; // will compute after drawing each label
           if (position?.options?.values.length > 0) {
             position.options.values.forEach((item, ind) => {
@@ -1766,8 +1925,10 @@ export const multiSignEmbed = async (
                 // Measure the width of this label text at `fontSize`
                 const textWidth = font.widthOfTextAtSize(item, fontSize);
                 // Next checkbox should come after: [box] + gap + [label text] + extra 10pt padding
-                horizontalGap =
+                const gap = position.options?.isHideLabel
-                  checkboxSize + checkboxTextGapFromLeft + textWidth;
+                  ? checkboxTextGapFromLeft - 5
+                  : checkboxTextGapFromLeft + textWidth;
+                horizontalGap = checkboxSize + gap;
               }
             });
           }
@@ -1912,13 +2073,13 @@ export const multiSignEmbed = async (
           const radioGroup = form.createRadioGroup(radioRandomId);
           //getting radio buttons options text font size
           const optionsFontSize = fontSize; // font size for option text
-          const radioTextGapFromLeft = fontSize + 6; // gap between circle and its label
+          const radioTextGapFromLeft = fontSize + 3; // gap between circle and its label
           const radioSize = fontSize; // circle diameter (square of width×height)
           // Initial “cursor” positions (from your existing helpers)
           let currentX = xPos(position) + 2;
-          let currentY = yPos(position);
+          let currentY = yPos(position) + 3;
           // Vertical gap between two radio‐rows
-          const verticalGap = fontSize + 6;
+          const verticalGap = fontSize + 3;
           // We’ll compute horizontalGap on the fly—after drawing each label
           // Initialize to zero (will be set after first option is placed)
           let horizontalGap = 0;
@@ -1974,7 +2135,10 @@ export const multiSignEmbed = async (
                 const textWidth = font.widthOfTextAtSize(item, optionsFontSize);
                 // radioSize = the circle.  radioTextGapFromLeft = gap between circle and label.
                 // Add a small extra padding (e.g. 10pt) before placing next circle.
-                horizontalGap = radioSize + radioTextGapFromLeft + textWidth;
+                const gap = position?.options?.isHideLabel
+                  ? radioTextGapFromLeft - 6
+                  : radioTextGapFromLeft + textWidth;
+                horizontalGap = radioSize + gap;
               }
             });
           }
@@ -2131,28 +2295,25 @@ export const addDefaultSignatureImg = (xyPosition, defaultSignImg, type) => {
   const img = new Image();
   img.src = defaultSignImg;
   if (img.complete) {
-    imgWH = {
+    imgWH = { width: img.width, height: img.height };
-      width: img.width,
-      height: img.height
-    };
   }
 
   let xyDefaultPos = [];
   for (let i = 0; i < xyPosition.length; i++) {
-    let getIMGWH;
+    // let getIMGWH;
     const getXYdata = xyPosition[i].pos;
     const getPageNo = xyPosition[i].pageNumber;
     const getPosData = getXYdata;
 
     const addSign = getPosData.map((position) => {
-      getIMGWH = calculateImgAspectRatio(imgWH, position);
+      // getIMGWH = calculateImgAspectRatio(imgWH, position);
       if (position.type) {
         if (position?.type === type) {
           return {
             ...position,
             SignUrl: defaultSignImg,
-            Width: getIMGWH.newWidth,
+            // Width: getIMGWH.newWidth,
-            Height: getIMGWH.newHeight,
+            // Height: getIMGWH.newHeight,
             ImageType: "default",
             options: {
               ...position.options,
@@ -2164,8 +2325,8 @@ export const addDefaultSignatureImg = (xyPosition, defaultSignImg, type) => {
         return {
           ...position,
           SignUrl: defaultSignImg,
-          Width: getIMGWH.newWidth,
+          // Width: getIMGWH.newWidth,
-          Height: getIMGWH.newHeight,
+          // Height: getIMGWH.newHeight,
           ImageType: "default",
           options: {
             ...position.options,
@@ -2273,7 +2434,10 @@ export const getAppLogo = async () => {
       });
       if (tenant) {
           localStorage.setItem("appname", "OpenSign™");
-        return { logo: tenant?.logo, user: tenant?.user };
+        return {
+          logo: tenant?.logo,
+          user: tenant?.user
+        };
       }
     } catch (err) {
       console.log("err in getlogo ", err);
@@ -2725,9 +2889,9 @@ function getWidgetPosition(page, image, sizeRatio, getSize) {
   let pageWidth;
   // pageHeight;
   if ([90, 270].includes(page.getRotation().angle)) {
-    pageWidth = page.getHeight();
+    pageWidth = getSize?.height || page.getHeight();
   } else {
-    pageWidth = page.getWidth();
+    pageWidth = getSize?.width || page.getWidth();
   }
   // eslint-disable-next-line
   if (!image?.hasOwnProperty("vpWidth")) {
@@ -2864,8 +3028,9 @@ export const convertBase64ToFile = async (
     }
 };
 export const onClickZoomIn = (scale, zoomPercent, setScale, setZoomPercent) => {
-  setScale(scale + 0.1 * scale);
+  const newPercent = zoomPercent + 10;
-  setZoomPercent(zoomPercent + 10);
+  setZoomPercent(newPercent);
+  setScale(1 + newPercent / 100);
 };
 export const onClickZoomOut = (
   zoomPercent,
@@ -2874,12 +3039,9 @@ export const onClickZoomOut = (
   setScale
 ) => {
   if (zoomPercent > 0) {
-    if (zoomPercent === 10) {
+    const newPercent = Math.max(0, zoomPercent - 10);
-      setScale(1);
+    setZoomPercent(newPercent);
-    } else {
+    setScale(1 + newPercent / 100);
-      setScale(scale - 0.1 * scale);
-    }
-    setZoomPercent(zoomPercent - 10);
   }
 };
 
@@ -3325,8 +3487,13 @@ export const getOriginalWH = async (pdf) => {
   for (let index = 0; index < totalPages; index++) {
     try {
       const getPage = await pdf.getPage(index + 1);
-      const width = getPage?.view[2];
+      const scale = 1;
-      const height = getPage?.view[3];
+      //getting extra height which is removed from viewPort height (letter type pdf have originial h-799.92 but using getPage.getViewport getting height-792 something diffrence-7.92px)
+      //getPage?.view[1] store diffrence of height (Page starts 7.92 from bottom)
+      const y0 = getPage?.view[1] || 0;
+      let { width, height } = getPage.getViewport({ scale });
+      //adding it on viewPort height then get original height ex- 792+7.92 = 799.92 orignial height
+      height = height + y0;
       pdfWHObj.push({ pageNumber: index + 1, width, height });
     } catch (e) {
       console.log(`Error getting page ${index + 1} of PDF: ${e.message}`);
@@ -3506,3 +3673,60 @@ export function getFileAsArrayBuffer(file) {
     reader.readAsArrayBuffer(file);
   });
 }
+
+/**
+ * Converts a JPEG/JPG File/Blob into a PNG File.
+ *
+ * @param {string} base64Image  - A data-URL (e.g. "data:image/jpeg;base64,…")
+ * @param {string} filename     - Desired filename (e.g. "input").
+ * @returns {Promise<File>}     - A promise that resolves with a new PNG File.
+ */
+export function convertJpegToPng(base64Image, filename) {
+  const arr = base64Image.split(",");
+  const mimeMatch = arr[0].match(/:(.*?);/);
+  if (!mimeMatch) throw new Error("Invalid dataURL");
+  const mime = mimeMatch[1];
+  const type = mime.split("/")[1];
+  if (type === "png") {
+    return base64Image;
+  } else {
+    const bstr = atob(arr[1]);
+    let n = bstr.length;
+    const u8arr = new Uint8Array(n);
+    while (n--) u8arr[n] = bstr.charCodeAt(n);
+    const inputFile = new File([u8arr], `${filename}.${type}`, { type: mime });
+    return new Promise((resolve, reject) => {
+      // ensure it’s JPEG/JPG (you can remove this check if not needed)
+      if (!/image\/jpe?g/.test(inputFile.type)) {
+        return reject(new Error("Input must be a JPEG or JPG image"));
+      }
+
+      // Read the file as a data URL
+      const reader = new FileReader();
+      reader.onerror = () => reject(new Error("Failed to read the file"));
+      reader.onload = () => {
+        const img = new Image();
+        img.onerror = () => reject(new Error("Failed to load image"));
+        img.onload = () => {
+          // draw image onto a canvas
+          const canvas = document.createElement("canvas");
+          canvas.width = img.width;
+          canvas.height = img.height;
+          const ctx = canvas.getContext("2d");
+          ctx.drawImage(img, 0, 0);
+
+          // directly get PNG as base64 data URL
+          try {
+            const pngDataUrl = canvas.toDataURL("image/png");
+            resolve(pngDataUrl);
+          } catch (err) {
+            reject(new Error("Failed to convert canvas to PNG"));
+          }
+        };
+        img.src = reader.result;
+      };
+      reader.readAsDataURL(inputFile);
+    });
+  }
+}
+

apps/OpenSign/src/hook/usePdfPinchZoom.js

@@ -0,0 +1,110 @@
+import { useEffect, useRef } from "react";
+
+export default function usePdfPinchZoom(ref, scale, setScale, setZoomPercent) {
+  const initialDistanceRef = useRef(null);
+  const startScaleRef = useRef(scale);
+  const currentScaleRef = useRef(scale);
+  const pinchScaleRef = useRef(null); // stores relative scale during a gesture
+  const frameRef = useRef(null);
+
+  // keep a reference to the latest scale value
+  useEffect(() => {
+    const element = ref.current;
+    currentScaleRef.current = scale;
+    // once React commits the new scale after a pinch we clear the transform
+    if (element && !pinchScaleRef.current) {
+      element.style.transform = "";
+    }
+  }, [scale, ref]);
+
+  useEffect(() => {
+    const element = ref.current;
+    if (!element) return;
+
+    const getDistance = (touches) => {
+      const [touch1, touch2] = touches;
+      const dx = touch1.clientX - touch2.clientX;
+      const dy = touch1.clientY - touch2.clientY;
+      return Math.hypot(dx, dy);
+    };
+
+    const handleTouchStart = (e) => {
+      if (e.touches.length === 2) {
+        initialDistanceRef.current = getDistance(e.touches);
+        startScaleRef.current = currentScaleRef.current;
+        element.style.transformOrigin = "0 0";
+      }
+    };
+
+    const handleTouchMove = (e) => {
+      if (e.touches.length === 2 && initialDistanceRef.current) {
+        e.preventDefault();
+        const newDistance = getDistance(e.touches);
+        const pinchScale = newDistance / initialDistanceRef.current;
+        const newScale = Math.max(1, startScaleRef.current * pinchScale);
+        // store relative scale so it can be applied on top of current width
+        pinchScaleRef.current = newScale / startScaleRef.current;
+
+        if (!frameRef.current) {
+          frameRef.current = requestAnimationFrame(() => {
+            element.style.transform = `scale(${pinchScaleRef.current})`;
+            frameRef.current = null;
+          });
+        }
+      }
+    };
+
+    const handleTouchEnd = () => {
+      if (pinchScaleRef.current) {
+        let relativeScale = pinchScaleRef.current;
+        const inlineTransform = element.style.transform;
+        if (inlineTransform && inlineTransform.startsWith("scale(")) {
+          const value = parseFloat(inlineTransform.slice(6, -1));
+          if (!isNaN(value)) {
+            relativeScale = value;
+          }
+        }
+        const finalScale = Math.max(1, startScaleRef.current * relativeScale);
+        const percent = parseFloat(((finalScale - 1) * 100).toFixed(2));
+        const unchanged =
+          Math.abs(finalScale - currentScaleRef.current) < 0.001;
+
+        pinchScaleRef.current = null;
+        if (frameRef.current) {
+          cancelAnimationFrame(frameRef.current);
+          frameRef.current = null;
+        }
+
+        if (unchanged) {
+          // if scale didn't actually change, reset transform right away
+          element.style.transform = "";
+        } else {
+          // keep transform applied until state update reflects the new scale
+          element.style.transform = `scale(${relativeScale})`;
+        }
+
+        setScale(finalScale);
+        setZoomPercent(percent);
+
+        // ensure refs reflect the latest value before next gesture starts
+        currentScaleRef.current = finalScale;
+        startScaleRef.current = finalScale;
+      }
+      initialDistanceRef.current = null;
+    };
+
+    element.addEventListener("touchstart", handleTouchStart, {
+      passive: false
+    });
+    element.addEventListener("touchmove", handleTouchMove, { passive: false });
+    element.addEventListener("touchend", handleTouchEnd);
+    element.addEventListener("touchcancel", handleTouchEnd);
+
+    return () => {
+      element.removeEventListener("touchstart", handleTouchStart);
+      element.removeEventListener("touchmove", handleTouchMove);
+      element.removeEventListener("touchend", handleTouchEnd);
+      element.removeEventListener("touchcancel", handleTouchEnd);
+    };
+  }, [ref, setScale, setZoomPercent]);
+}

apps/OpenSign/src/pages/Form.jsx

@@ -680,9 +680,7 @@ const Forms = (props) => {
           </ModalUi>
           <form onSubmit={handleSubmit}>
             <div className="mb-[11px]">
-              <h1 className="text-[20px] font-semibold">
+              <h1 className="text-[20px] font-semibold">{t(props?.title)}</h1>
-                {t(`form-name.${props?.title}`)}
-              </h1>
               {props.title === "Sign Yourself" && (
                 <div className="text-gray-500 text-xs mt-1">
                   {t("signyour-self-description")}

apps/OpenSign/src/pages/Login.jsx

@@ -125,7 +125,11 @@ function Login() {
       }
     } catch (error) {
       console.error("Error while logging in user", error);
-      showToast("danger", "Invalid username/password or region");
+      if (error?.code === 1001) {
+        showToast("danger", t("action-prohibited"));
+      } else {
+        showToast("danger", "Invalid username/password or region");
+      }
     }
   };
   const handleLoginBtn = async (event) => {
@@ -495,7 +499,7 @@ function Login() {
                               to="/forgetpassword"
                               className="text-[13px] op-link op-link-primary underline-offset-1 focus:outline-none ml-1"
                             >
-                              {t("forgot-password")}
+                              {t("forgot-password")}?
                             </NavLink>
                           </div>
                       </div>

apps/OpenSign/src/pages/Managesign.jsx

@@ -324,13 +324,8 @@ const ManageSign = () => {
                 hidden
               />
               <div className="relative">
-                {isLoader && (
-                  <div className="absolute bg-black bg-opacity-30 z-50 w-full h-full flex justify-center items-center">
-                    <Loader />
-                  </div>
-                )}
                 {image ? (
-                  <div className="signatureCanvas relative border-[2px] border-[#888] rounded-box overflow-hidden">
+                  <div className="mysignatureCanvas  relative border-[2px] border-[#888] rounded-box overflow-hidden">
                     <img
                       alt="signature"
                       src={image}
@@ -342,10 +337,8 @@ const ManageSign = () => {
                     ref={canvasRef}
                     penColor={penColor}
                     canvasProps={{
-                      width: "456px",
-                      height: "180px",
                       className:
-                        "signatureCanvas border-[2px] border-[#888] rounded-box"
+                        "mysignatureCanvas border-[2px] border-[#888] rounded-box"
                     }}
                     onEnd={() =>
                       handleSignatureChange(canvasRef.current.toDataURL())

apps/OpenSign/src/pages/Opensigndrive.jsx

@@ -712,14 +712,14 @@ function Opensigndrive() {
                       onClick={() => navigate("/form/sHAnZphf69")}
                     >
                       <i className="fa-light fa-pen-nib mr-[5px]"></i>
-                      {t("form-name.Sign Yourself")}
+                      {t("Sign Yourself")}
                     </span>
                     <span
                       className="dropdown-item text-[10px] md:text-[13px]"
                       onClick={() => navigate("/form/8mZzFxbG1z")}
                     >
                       <i className="fa-light fa-file-signature mr-[5px]"></i>
-                      {t("form-name.Request Signatures")}
+                      {t("Request Signatures")}
                     </span>
                   </div>
                 </div>
@@ -840,14 +840,14 @@ function Opensigndrive() {
                       onClick={() => navigate("/form/sHAnZphf69")}
                     >
                       <i className="fa-light fa-pen-nib mr-[5px]"></i>
-                      {t("form-name.Sign Yourself")}
+                      {t("Sign Yourself")}
                     </span>
                     <span
                       className="dropdown-item text-[10px] md:text-[13px]"
                       onClick={() => navigate("/form/8mZzFxbG1z")}
                     >
                       <i className="fa-light fa-file-signature mr-[5px]"></i>
-                      {t("form-name.Request Signatures")}
+                      {t("Request Signatures")}
                     </span>
                   </div>
                 </div>

apps/OpenSign/src/pages/PdfRequestFiles.jsx

@@ -144,7 +144,6 @@ function PdfRequestFiles(
   const [signatureType, setSignatureType] = useState([]);
   const [pdfBase64Url, setPdfBase64Url] = useState("");
   const [isAgree, setIsAgree] = useState(false);
-  const [isAgreeTour, setIsAgreeTour] = useState(false);
   const [redirectTimeLeft, setRedirectTimeLeft] = useState(5);
   const [isredirectCanceled, setIsredirectCanceled] = useState(true);
   const [isDragging, setIsDragging] = useState(false);
@@ -693,7 +692,6 @@ function PdfRequestFiles(
               }
               //embed all widgets in document
               const pdfBytes = await multiSignEmbed(
-                pdfOriginalWH,
                 widgets,
                 pdfDoc,
                 isSignYourSelfFlow,
@@ -1379,18 +1377,7 @@ function PdfRequestFiles(
       setIsUiLoading(false);
       alert(t("expiry-date-error"));
     }
-  };
+  }; 
-  const AgreementTour = [
-    {
-      selector: '[data-tut="IsAgree"]',
-      content: () => <p className="p-0">{t("agrrement-alert")}</p>,
-      position: "top",
-      style: { fontSize: "13px" }
-    }
-  ];
-  const handleCloseAgreeTour = () => {
-    setIsAgreeTour(false);
-  };
   // `handleRedirectCancel` is used to cancel redirecting to redirectUrl
   const handleRedirectCancel = () => {
     setIsredirectCanceled(true);
@@ -1600,7 +1587,7 @@ function PdfRequestFiles(
       }
     }
   };
-  //function to get first widget and page number to assign currect signer and tour message
+  //function to get first widget id and page number to assign correct signer and show tour message
   const showFirstWidget = () => {
     if (!requestSignTour) {
       const getCurrentUserPlaceholder = signerPos?.find(
@@ -1645,21 +1632,9 @@ function PdfRequestFiles(
                 !isDecline?.isDeclined && (
                   <AgreementSign
                     setIsAgree={setIsAgree}
-                    setIsAgreeTour={setIsAgreeTour}
                     showFirstWidget={showFirstWidget}
                   />
                 )}
-              <Tour
-                showNumber={false}
-                showNavigation={false}
-                showNavigationNumber={false}
-                onRequestClose={handleCloseAgreeTour}
-                steps={AgreementTour}
-                isOpen={isAgreeTour}
-                rounded={5}
-                closeWithMask={false}
-              />
-
               {isUiLoading && (
                 <div className="absolute h-[100vh] w-full flex flex-col justify-center items-center z-[999] bg-[#e6f2f2] bg-opacity-80">
                   <Loader />
@@ -2012,8 +1987,6 @@ function PdfRequestFiles(
                           scale={scale}
                           uniqueId={uniqueId}
                           pdfBase64Url={pdfBase64Url}
-                          setIsAgreeTour={setIsAgreeTour}
-                          isAgree={isAgree}
                           handleTabDrag={handleTabDrag}
                           handleStop={handleStop}
                           isDragging={isDragging}
@@ -2096,8 +2069,6 @@ function PdfRequestFiles(
                               signatureType?.find((x) => x.name === "default")
                                 ?.enabled || false
                             }
-                            isAgree={isAgree}
-                            setIsAgreeTour={setIsAgreeTour}
                           />
                         )}
                     </div>

apps/OpenSign/src/pages/PlaceHolderSign.jsx

@@ -863,7 +863,6 @@ function PlaceHolderSign() {
       try {
         //pdfOriginalWH contained all pdf's pages width,height & pagenumber in array format
         const pdfBase64 = await multiSignEmbed(
-          pdfOriginalWH,
           placeholder,
           pdfDoc,
           isSignYourSelfFlow,
@@ -1745,14 +1744,14 @@ function PlaceHolderSign() {
           objectId: data.objectId
         };
         const updatePlaceHolder = signerPos.map((x) => {
-          if (x.Id === id) {
+          if (x.Id === id || x.signerObjId === id) {
             return { ...x, signerPtr: signerPtr, signerObjId: data.objectId };
           }
           return { ...x };
         });
         setSignerPos(updatePlaceHolder);
         const updateSigner = signersdata.map((x) => {
-          if (x.Id === id) {
+          if (x.Id === id || x.objectId === id) {
             return { ...x, ...data, className: "contracts_Contactbook" };
           }
           return { ...x };
@@ -1767,7 +1766,9 @@ function PlaceHolderSign() {
           }
         }
         setSignersData(updateSigner);
-        const index = signersdata.findIndex((x) => x.Id === id);
+        const index = signersdata.findIndex(
+          (x) => x.Id === id || x.objectId === id
+        );
         setIsSelectId(index);
       }
       if (isNewContact.status) {
@@ -1931,7 +1932,9 @@ function PlaceHolderSign() {
   };
   //`handleInputChange` function to get signers list from dropdown
   const handleInputChange = (item, id) => {
-    const signerExist = forms.some((x) => x.value === item.value);
+    const signerExist = signersdata?.some(
+      (x) => x.objectId && x.objectId === item.value
+    );
     if (signerExist) {
       alert(t("already-exist-signer"));
     } else {

apps/OpenSign/src/pages/Preferences.jsx

@@ -56,6 +56,10 @@ const Preferences = () => {
   const [dateFormat, setDateFormat] = useState("MM/DD/YYYY");
   const [is12HourTime, setIs12HourTime] = useState(false);
   const [isLTVEnabled, setIsLTVEnabled] = useState(false);
+  const [isDefaultMail, setIsDefaultMail] = useState({
+    requestMail: false,
+    completionMail: false
+  });
   useEffect(() => {
     fetchSignType();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -213,7 +217,7 @@ const Preferences = () => {
   };
   const tenantEmailTemplate = async (tenantRes) => {
     if (tenantRes === "user does not exist!") {
-      alert("User does not exist");
+      alert(t("user-not-exist"));
     } else if (tenantRes) {
       setIsLoader(true);
       const updateRes = tenantRes;
@@ -227,6 +231,7 @@ const Preferences = () => {
         setRequestSubject(
           `{{sender_name}} has requested you to sign {{document_title}}`
         );
+        setIsDefaultMail((prev) => ({ ...prev, requestMail: true }));
       }
       setDefaultReqHtml({
         body: defaultRequestBody,
@@ -241,6 +246,7 @@ const Preferences = () => {
         setCompletionSubject(
           `Document {{document_title}} has been signed by all parties`
         );
+        setIsDefaultMail((prev) => ({ ...prev, completionMail: true }));
       }
       setDefaultCompHtml({
         body: defaultCompletionBody,
@@ -318,13 +324,45 @@ const Preferences = () => {
   };
 
   //function to use reset form
-  const handleReset = (request, completion) => {
+  const handleReset = async (request, completion) => {
-    if (request) {
+    let extUser =
+      localStorage.getItem("Extand_Class") &&
+      JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
+    handleModifyMail(request);
+    if (request && !isDefaultMail?.requestMail) {
       setRequestBody(defaultReqHtml?.body);
       setRequestSubject(defaultReqHtml?.subject);
-    } else if (completion) {
+      try {
+        await Parse.Cloud.run("updatetenant", {
+          tenantId: tenantId,
+          details: { RequestBody: "", RequestSubject: "" }
+        });
+        if (extUser && extUser?.objectId) {
+          extUser.TenantId.RequestBody = "";
+          extUser.TenantId.RequestSubject = "";
+          const _extUser = JSON.parse(JSON.stringify(extUser));
+          localStorage.setItem("Extand_Class", JSON.stringify([_extUser]));
+        }
+      } catch (err) {
+        console.log("Err in reseting request mail", err);
+      }
+    } else if (completion && !isDefaultMail?.completionMail) {
       setCompletionSubject(defaultCompHtml?.subject);
       SetCompletionBody(defaultCompHtml?.body);
+      try {
+        await Parse.Cloud.run("updatetenant", {
+          tenantId: tenantId,
+          details: { CompletionBody: "", CompletionSubject: "" }
+        });
+        if (extUser && extUser?.objectId) {
+          extUser.TenantId.CompletionBody = "";
+          extUser.TenantId.CompletionSubject = "";
+          const _extUser = JSON.parse(JSON.stringify(extUser));
+          localStorage.setItem("Extand_Class", JSON.stringify([_extUser]));
+        }
+      } catch (err) {
+        console.log("Err in reseting completion mail", err);
+      }
     }
   };
   //function for handle ontext change and save again text in delta
@@ -344,6 +382,11 @@ const Preferences = () => {
   const handleTourInput = () => setIsTourEnabled(!isTourEnabled);
   const handleSendinOrderInput = () => setSendinOrder(!sendinOrder);
   const tabName = (ind) => tab.find((t, i) => i === ind)?.name;
+  const handleModifyMail = (mode) => {
+    mode === "request"
+      ? setIsDefaultMail((p) => ({ ...p, requestMail: !p?.requestMail }))
+      : setIsDefaultMail((p) => ({ ...p, completionMail: !p?.completionMail }));
+  };
   return (
     <React.Fragment>
       <Title title={t("Preferences")} />
@@ -737,6 +780,18 @@ const Preferences = () => {
                         {t("request-email")}
                       </h1>
                       <div className="relative mt-2 mb-4">
+                        {
+                            isDefaultMail?.requestMail && (
+                              <div className="absolute backdrop-blur-[2px] flex w-full h-full justify-center items-center bg-black/10 rounded-box select-none z-20">
+                                <button
+                                  onClick={() => handleModifyMail("request")}
+                                  className="op-btn op-btn-primary shadow-lg"
+                                >
+                                  Modify
+                                </button>
+                              </div>
+                            )
+                        }
                         <form
                           onSubmit={handleSaveRequestEmail}
                           className="p-3 border-[1px] border-base-content rounded-box"
@@ -801,6 +856,18 @@ const Preferences = () => {
                         {t("completion-email")}
                       </h1>
                       <div className="relative my-2">
+                        {
+                            isDefaultMail?.completionMail && (
+                              <div className="absolute backdrop-blur-[2px] flex w-full h-full justify-center items-center bg-black/10 rounded-box select-none z-20">
+                                <button
+                                  onClick={() => handleModifyMail("completion")}
+                                  className="op-btn op-btn-primary shadow-lg"
+                                >
+                                  Modify
+                                </button>
+                              </div>
+                            )
+                        }
                         <form
                           onSubmit={handleSaveCompletionEmail}
                           className="p-3 border-[1px] border-base-content rounded-box"

apps/OpenSign/src/pages/Report.jsx

@@ -180,7 +180,7 @@ const Report = () => {
           const listData = res.data?.result.filter((x) => x.Signers.length > 0);
           let arr = [];
           for (const obj of listData) {
-            const isSigner = obj.Signers.some(
+            const isSigner = obj?.Signers?.some(
               (item) => item.UserId.objectId === currentUser
             );
             if (isSigner) {

apps/OpenSign/src/pages/SignyourselfPdf.jsx

@@ -648,7 +648,6 @@ function SignYourSelf() {
             }
             //embed all widgets in document
             const pdfBytes = await multiSignEmbed(
-              pdfOriginalWH,
               xyPosition,
               pdfDoc,
               isSignYourSelfFlow,

apps/OpenSign/src/pages/TemplatePlaceholder.jsx

@@ -833,7 +833,6 @@ const TemplatePlaceholder = () => {
       try {
         //pdfOriginalWH contained all pdf's pages width,height & pagenumber in array format
         const pdfBase64 = await multiSignEmbed(
-          pdfOriginalWH,
           placeholder,
           pdfDoc,
           isSignYourSelfFlow,

apps/OpenSign/src/primitives/GetReportDisplay.jsx

@@ -91,6 +91,7 @@ const ReportTable = (props) => {
   const [contact, setContact] = useState({ Name: "", Email: "", Phone: "" });
   const [isSuccess, setIsSuccess] = useState({});
   const [templateId, setTemplateId] = useState("");
+  const [sortOrder, setSortOrder] = useState("asc");
   const isTemplateReport = props.ReportName === "Templates";
   const recordsPerPage = 5;
   const startIndex = (currentPage - 1) * props.docPerPage;
@@ -437,7 +438,22 @@ const ReportTable = (props) => {
   // Get current list
   const indexOfLastDoc = currentPage * props.docPerPage;
   const indexOfFirstDoc = indexOfLastDoc - props.docPerPage;
-  const currentList = props.List?.slice(indexOfFirstDoc, indexOfLastDoc);
+  const sortedList = React.useMemo(() => {
+    if (props.ReportName === "Contactbook") {
+      const contacts = [...props.List];
+      contacts.sort((a, b) => {
+        const nameA = a?.Name?.toLowerCase() || "";
+        const nameB = b?.Name?.toLowerCase() || "";
+        if (nameA < nameB) return sortOrder === "asc" ? -1 : 1;
+        if (nameA > nameB) return sortOrder === "asc" ? 1 : -1;
+        return 0;
+      });
+      return contacts;
+    }
+    return props.List;
+  }, [props.List, sortOrder, props.ReportName]);
+
+  const currentList = sortedList?.slice(indexOfFirstDoc, indexOfLastDoc);
 
   // Change page
   const paginateFront = () => {
@@ -457,6 +473,10 @@ const ReportTable = (props) => {
     setIsContactform(!isContactform);
   };
 
+  const toggleSortOrder = () => {
+    setSortOrder(sortOrder === "asc" ? "desc" : "asc");
+  };
+
   const handleUserData = (data) => {
     props.setList((prevData) => [data, ...prevData]);
   };
@@ -974,6 +994,7 @@ const ReportTable = (props) => {
     const timezone = extClass?.[0]?.Timezone || "";
     const DateFormat = extClass?.[0]?.DateFormat || "MM/DD/YYYY";
     const Is12Hr = extClass?.[0]?.Is12HourTime || false;
+    const isCompletedReport = props?.ReportName === "Completed Documents";
     const signers = item?.Placeholders?.map((x, i) => {
       const audit = item?.AuditTrail?.find(
         (audit) => audit?.UserPtr?.objectId === x.signerObjId
@@ -999,22 +1020,26 @@ const ReportTable = (props) => {
         {displaySigners?.map((x, i) => (
           <div
             key={i}
-            className="text-sm font-medium flex flex-row gap-2 items-center"
+            className={`text-sm flex flex-row gap-2 items-center ${
+              i !== displaySigners.length - 1 ? "mb-2" : ""
+            }`}
           >
-            <button
+            {!isCompletedReport && (
-              onClick={() => setIsModal({ [`${item.objectId}_${i}`]: true })}
+              <button
-              className={`${
+                onClick={() => setIsModal({ [`${item.objectId}_${i}`]: true })}
-                x.Activity === "SIGNED"
+                className={`${
-                  ? "op-border-primary op-text-primary"
+                  x.Activity === "SIGNED"
-                  : x.Activity === "VIEWED"
+                    ? "op-border-primary op-text-primary"
-                    ? "border-green-400 text-green-400"
+                    : x.Activity === "VIEWED"
-                    : "border-base-content text-base-content"
+                      ? "border-green-400 text-green-400"
-              } focus:outline-none border-2 w-[60px] h-[30px] text-[11px] rounded-full`}
+                      : "border-base-content text-base-content"
-            >
+                } focus:outline-none border-2 w-[60px] h-[30px] text-[11px] rounded-full`}
-              {x?.Activity?.toUpperCase() || "-"}
+              >
-            </button>
+                {x?.Activity?.toUpperCase() || "-"}
-            <div className="py-2 font-bold text-[12px]">{x?.Email || "-"}</div>
+              </button>
-            {isModal[`${item.objectId}_${i}`] && (
+            )}
+            <div className="text-[12px]">{x?.Email || "-"}</div>
+            {!isCompletedReport && isModal[`${item.objectId}_${i}`] && (
               <ModalUi
                 isOpen
                 title={t("document-logs")}
@@ -1037,7 +1062,7 @@ const ReportTable = (props) => {
                 [item.objectId]: !isShowAllSigners[item.objectId]
               })
             }
-            className="ml-2 text-xs font-medium text-blue-500 underline focus:outline-none"
+             className="ml-2 mt-1 text-xs font-medium text-blue-500 underline focus:outline-none"
           >
             {isShowAllSigners[item.objectId] ? "Hide" : "Show More"}
           </button>
@@ -1536,6 +1561,17 @@ const ReportTable = (props) => {
                       required
                       className="op-file-input op-file-input-bordered op-file-input-sm focus:outline-none hover:border-base-content w-full text-xs"
                     />
+                    <p className="mt-1 ml-2 text-[11px] text-gray-600">
+                      {t("import-guideline")}{" "}
+                      <a
+                        href="/sample_contacts.csv"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="text-primary underline"
+                      >
+                        {t("download-sample")}
+                      </a>
+                    </p>
                   </div>
                   <div className="text-md m-2">
                     <div className="flex flex-col md:flex-row gap-1">
@@ -1624,7 +1660,25 @@ const ReportTable = (props) => {
               <tr className="border-y-[1px]">
                 {props.heading?.map((item, index) => (
                   <React.Fragment key={index}>
-                    <th className="p-2">{t(`report-heading.${item}`)}</th>
+                    <th className="p-2">
+                      {t(`report-heading.${item}`)}
+                      {props.ReportName === "Contactbook" &&
+                        item === "Name" && (
+                          <button
+                            type="button"
+                            onClick={toggleSortOrder}
+                            className="ml-1"
+                          >
+                            <i
+                              className={
+                                sortOrder === "asc"
+                                  ? "fa-light fa-arrow-down-a-z"
+                                  : "fa-light fa-arrow-up-a-z"
+                              }
+                            ></i>
+                          </button>
+                        )}
+                    </th>
                   </React.Fragment>
                 ))}
                 {props.actions?.length > 0 && (
@@ -1759,12 +1813,16 @@ const ReportTable = (props) => {
                           </td>
                         )}
                         {props.heading.includes("Signers") &&
-                        ["In-progress documents", "Need your sign"].includes(
+                        [
-                          props.ReportName
+                          "In-progress documents",
-                        ) ? (
+                          "Need your sign",
+                          "Completed Documents"
+                        ].includes(props.ReportName) ? (
                           <td className="px-1 py-2">
-                            {!item?.IsSignyourself && item?.Placeholders && (
+                            {!item?.IsSignyourself && item?.Placeholders ? (
                               <>{formatStatusRow(item)}</>
+                            ) : (
+                              <>-</>
                             )}
                           </td>
                         ) : (
@@ -1817,7 +1875,7 @@ const ReportTable = (props) => {
                                         {/* template report */}
                                         {isOption[item.objectId] &&
                                           act.action === "option" && (
-                                            <ul className="absolute -right-1 top-auto z-[70] w-52 op-dropdown-content op-menu shadow-black/20 shadow bg-base-100 text-base-content rounded-box">
+                                            <ul className="absolute -right-1 top-auto z-[70] w-52 op-dropdown-content op-menu op-menu-sm shadow-black/20 shadow bg-base-100 text-base-content rounded-box">
                                               {act.subaction?.map((subact) => (
                                                 <li
                                                   key={subact.btnId}
@@ -1908,7 +1966,7 @@ const ReportTable = (props) => {
                                         {/* doc report */}
                                         {isOption[item.objectId] &&
                                           act.action === "option" && (
-                                            <ul className="absolute -right-1 top-auto z-[70] w-max op-dropdown-content op-menu shadow-black/20 shadow bg-base-100 text-base-content rounded-box">
+                                            <ul className="absolute -right-1 top-auto z-[70] w-max op-dropdown-content op-menu op-menu-sm shadow-black/20 shadow bg-base-100 text-base-content rounded-box">
                                               {act.subaction?.map(
                                                 (subact) =>
                                                   !restrictBtn(

apps/OpenSign/src/styles/signature.css

@@ -6,18 +6,21 @@
 .react-datepicker__input-container {
   position: initial !important;
 }
+
 .select-none-cls {
   -webkit-user-select: none;
   /* Disable text selection in WebKit browsers */
   -moz-user-select: none;
   user-select: none;
 }
+
 .widgets {
   -webkit-user-select: none;
   /* Disable text selection in WebKit browsers */
   -moz-user-select: none;
   user-select: none;
 }
+
 .radioButton {
   width: 100%;
   height: 100%;
@@ -33,12 +36,18 @@
   width: 440px;
   height: 167px;
 }
+
 .tabWidth {
   border: 1px solid #f3f4f6;
   background-color: #f3f4f6;
   width: 440px;
 }
 
+.mysignatureCanvas {
+  width: 456px;
+  height: 180px;
+}
+
 [data-theme="opensigndark"] .tabWidth {
   border: 1px solid #1f2937 !important;
   background-color: #1f2937 !important;
@@ -48,6 +57,7 @@
   width: 150px;
   height: 150px;
 }
+
 .checked-radio::after {
   content: "";
   position: absolute;
@@ -56,14 +66,15 @@
   width: 50%;
   height: 50%;
   border-radius: 9999px;
-  background-color: #111111; /* blue-500 */
+  background-color: #111111;
+  /* blue-500 */
 }
 
 .intialSignature {
   border: 2px solid #888;
   background-color: rgb(255, 255, 255);
-  width: 183px;
+  width: 180px;
-  height: 183px;
+  height: 180px;
 }
 
 /* Dark mode support for initials box in /managesign */
@@ -100,6 +111,12 @@
   border-color: #4b5563 !important;
 }
 
+/* Also support signature canvas for consistency */
+[data-theme="opensigndark"] .mysignatureCanvas {
+  background-color: #1f2937 !important;
+  border-color: #4b5563 !important;
+}
+
 .penContainerDefault {
   width: 460px;
 }
@@ -115,6 +132,7 @@
 .ScrollbarsCustom-TrackY {
   width: 4px !important;
 }
+
 .ScrollbarsCustom-TrackX {
   height: 4px !important;
 }
@@ -143,6 +161,7 @@
   overflow: hidden !important;
   text-overflow: ellipsis;
 }
+
 .disabled {
   opacity: 0.5;
   /* Example: reduce opacity to visually indicate disabled state */
@@ -431,7 +450,7 @@ option {
   to prevent sudden quick movement (as the
   navigation bar gets a new position at the top of the
   page (position:fixed and top:0) */
-  .stickyHead + .content {
+  .stickyHead+.content {
     padding-top: 60px;
   }
 }
@@ -441,6 +460,12 @@ option {
     width: 300px;
     height: 120px;
   }
+
+  .mysignatureCanvas {
+    width: 300px;
+    height: 118px;
+  }
+
   .tabWidth {
     width: 300px;
   }
@@ -462,11 +487,18 @@ option {
 .scroll-hide::-webkit-scrollbar {
   display: none;
 }
+
 @media screen and (max-width: 350px) and (min-width: 311px) {
   .signatureCanvas {
     width: 280px;
     height: 112px;
   }
+
+  .mysignatureCanvas {
+    width: 280px;
+    height: 111px;
+  }
+
   .tabWidth {
     width: 280px;
   }
@@ -491,6 +523,12 @@ option {
     width: 230px;
     height: 92px;
   }
+
+  .mysignatureCanvas {
+    width: 230px;
+    height: 91px;
+  }
+
   .tabWidth {
     width: 230px;
   }
@@ -507,4 +545,4 @@ option {
   .uploadImgLogo {
     font-size: 20px;
   }
-}
+}

apps/OpenSign/vite.config.js

@@ -1,4 +1,4 @@
-import { defineConfig } from "vite";
+import { defineConfig, splitVendorChunkPlugin } from "vite";
 import react from "@vitejs/plugin-react";
 import svgr from "vite-plugin-svgr";
 import { resolve } from "path";
@@ -12,7 +12,8 @@ export default defineConfig(({ command, mode }) => {
   return {
     plugins: [
       react(),
-      svgr() // Transform SVGs into React components
+      svgr(), // Transform SVGs into React components
+      splitVendorChunkPlugin()
     ],
     resolve: {
       alias: {

apps/OpenSignServer/Utils.js

@@ -7,6 +7,7 @@ import axios from 'axios';
 dotenv.config();
 
 export const cloudServerUrl = 'http://localhost:8080/app';
+export const serverAppId = process.env.APP_ID || 'opensign';
 export const appName = 'OpenSign™';
 
 export const MAX_NAME_LENGTH = 250;
@@ -288,6 +289,8 @@ export const selectFormat = data => {
       return 'MMMM dd, yyyy';
     case 'DD MMMM, YYYY':
       return 'dd MMMM, yyyy';
+    case 'DD.MM.YYYY':
+      return 'dd.MM.yyyy';
     default:
       return 'MM/dd/yyyy';
   }

apps/OpenSignServer/cloud/customRoute/docxtopdf.js

@@ -3,7 +3,7 @@ import axios from 'axios';
 import multer from 'multer';
 import libre from 'libreoffice-convert';
 import util from 'node:util';
-import { cloudServerUrl, getSecureUrl } from '../../Utils.js';
+import { cloudServerUrl, getSecureUrl, serverAppId } from '../../Utils.js';
 
 libre.convertAsync = util.promisify(libre.convert);
 
@@ -29,7 +29,7 @@ function generatePdfName(length) {
 
 export default async function docxtopdf(req, res) {
   const serverUrl = cloudServerUrl;
-  const appId = process.env.APP_ID;
+  const appId = serverAppId;
   const masterKey = process.env.MASTER_KEY;
   const inputPath = req.file.path;
   const name = generatePdfName(16);

apps/OpenSignServer/cloud/customRoute/uploadFile.js

@@ -3,7 +3,7 @@ import multer from 'multer';
 import multerS3 from 'multer-s3';
 import aws from 'aws-sdk';
 import dotenv from 'dotenv';
-import { cloudServerUrl, useLocal } from '../../Utils.js';
+import { cloudServerUrl, serverAppId, useLocal } from '../../Utils.js';
 dotenv.config();
 
 function sanitizeFileName(fileName) {
@@ -50,7 +50,7 @@ async function uploadFile(req, res) {
     const DO_SPACE = process.env.DO_SPACE;
 
     const parseBaseUrl = cloudServerUrl; //process.env.SERVER_URL;
-    const parseAppId = process.env.APP_ID;
+    const parseAppId = serverAppId;
     let fileStorage;
     if (useLocal === 'true') {
       fileStorage = multer.diskStorage({

apps/OpenSignServer/cloud/parsefunction/AddAdmin.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
-import { cloudServerUrl } from '../../Utils.js';
+import { cloudServerUrl, serverAppId } from '../../Utils.js';
 const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
-const APPID = process.env.APP_ID;
+const APPID = serverAppId;
 const masterKEY = process.env.MASTER_KEY;
 async function addTeamAndOrg(extUser) {
   try {

apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js

@@ -1,10 +1,10 @@
 import axios from 'axios';
-import { cloudServerUrl } from '../../Utils.js';
+import { cloudServerUrl, serverAppId } from '../../Utils.js';
 async function AuthLoginAsMail(request) {
   try {
     //function for login user using user objectId without touching user's password
     const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
-    const APPID = process.env.APP_ID;
+    const APPID = serverAppId;
     const masterKEY = process.env.MASTER_KEY;
 
     let otpN = request.params.otp;
@@ -92,7 +92,7 @@ async function AuthLoginAsMail(request) {
   } catch (err) {
     console.log('err in Auth');
     console.log(err);
-    return 'Result not found', err;
+    return 'Result not found';
   }
 }
 export default AuthLoginAsMail;

apps/OpenSignServer/cloud/parsefunction/ForwardDoc.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { appName, cloudServerUrl } from '../../Utils.js';
+import { appName, cloudServerUrl, serverAppId } from '../../Utils.js';
 
 export default async function forwardDoc(request) {
   try {
@@ -58,7 +58,7 @@ export default async function forwardDoc(request) {
           mailRes = await axios.post(`${cloudServerUrl}/functions/sendmailv3`, params, {
             headers: {
               'Content-Type': 'application/json',
-              'X-Parse-Application-Id': process.env.APP_ID,
+              'X-Parse-Application-Id': serverAppId,
               'X-Parse-Master-Key': process.env.MASTER_KEY,
             },
           });

apps/OpenSignServer/cloud/parsefunction/GetTemplate.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { cloudServerUrl } from '../../Utils.js';
+import { cloudServerUrl, serverAppId } from '../../Utils.js';
 
 export default async function GetTemplate(request) {
   const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
@@ -10,7 +10,7 @@ export default async function GetTemplate(request) {
     if (sessiontoken) {
       const userRes = await axios.get(serverUrl + '/users/me', {
         headers: {
-          'X-Parse-Application-Id': process.env.APP_ID,
+          'X-Parse-Application-Id': serverAppId,
           'X-Parse-Session-Token': sessiontoken,
         },
       });

apps/OpenSignServer/cloud/parsefunction/createBatchContact.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
-import { cloudServerUrl } from '../../Utils.js';
+import { cloudServerUrl, serverAppId } from '../../Utils.js';
-const appId = process.env.APP_ID;
+const appId = serverAppId;
 const masterkey = process.env.MASTER_KEY;
 export default async function createBatchContact(req) {
   if (!req?.user) {

apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
-import { cloudServerUrl, mailTemplate, replaceMailVaribles } from '../../Utils.js';
+import { cloudServerUrl, mailTemplate, replaceMailVaribles, serverAppId } from '../../Utils.js';
 const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
-const appId = process.env.APP_ID;
+const appId = serverAppId;
 async function deductcount(docsCount, extUserId) {
   try {
     const extCls = new Parse.Object('contracts_Users');
@@ -84,7 +84,7 @@ async function sendMail(document, publicUrl) {
       };
       let params = {
         extUserId: document.ExtUserPtr.objectId,
-        recipient: objectId ? existSigner?.Email : signerMail[i].email,
+        recipient: existSigner?.Email || signerMail[i].email,
         subject: replaceVar?.subject ? replaceVar?.subject : mailTemplate(mailparam).subject,
         from: document.ExtUserPtr.Email,
         replyto: senderEmail || '',

apps/OpenSignServer/cloud/parsefunction/getDocument.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { cloudServerUrl } from '../../Utils.js';
+import { cloudServerUrl, serverAppId } from '../../Utils.js';
 export default async function getDocument(request) {
   const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   const docId = request.params.docId;
@@ -30,7 +30,7 @@ export default async function getDocument(request) {
               try {
                 const userRes = await axios.get(serverUrl + '/users/me', {
                   headers: {
-                    'X-Parse-Application-Id': process.env.APP_ID,
+                    'X-Parse-Application-Id': serverAppId,
                     'X-Parse-Session-Token': sessiontoken,
                   },
                 });

apps/OpenSignServer/cloud/parsefunction/getDrive.js

@@ -1,8 +1,8 @@
 import axios from 'axios';
-import { cloudServerUrl } from '../../Utils.js';
+import { cloudServerUrl, serverAppId } from '../../Utils.js';
 export default async function getDrive(request) {
   const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
-  const appId = process.env.APP_ID;
+  const appId = serverAppId;
   const limit = request.params.limit;
   const skip = request.params.skip;
   const docId = request.params.docId;

apps/OpenSignServer/cloud/parsefunction/getReport.js

@@ -1,4 +1,4 @@
-import { cloudServerUrl } from '../../Utils.js';
+import { cloudServerUrl, serverAppId } from '../../Utils.js';
 import reportJson from './reportsJson.js';
 import axios from 'axios';
 
@@ -14,7 +14,7 @@ export default async function getReport(request) {
   const searchTerm = request.params.searchTerm || '';
 
   const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
-  const appId = process.env.APP_ID;
+  const appId = serverAppId;
   const masterKey = process.env.MASTER_KEY;
   const sessionToken = request.headers['sessiontoken'] || request.headers['x-parse-session-token'];
   try {

apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.js

@@ -1,25 +1,5 @@
 // `saveRoleContact` is used to save user in contracts_Guest role and create contact
 const saveRoleContact = async contact => {
-  try {
-    const Role = new Parse.Query(Parse.Role);
-    const guestRole = await Role.equalTo('name', 'contracts_Guest').first();
-    if (guestRole) {
-      // Check if the user is already in the role
-      const relation = guestRole.relation('users');
-      const usersInRoleQuery = relation.query();
-      usersInRoleQuery.equalTo('objectId', contact.UserId.objectId);
-      const usersInRole = await usersInRoleQuery.find();
-      if (usersInRole.length > 0) {
-        console.log('User already added to Guest role.');
-      } else {
-        relation.add({ __type: 'Pointer', className: '_User', id: contact.UserId.objectId });
-        await guestRole.save(null, { useMasterKey: true });
-        // console.log('User added to Guest role successfully.');
-      }
-    }
-  } catch (err) {
-    console.log('err in role save', err);
-  }
   const contactQuery = new Parse.Object('contracts_Contactbook');
   contactQuery.set('Name', contact.Name);
   contactQuery.set('Email', contact.Email);

apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js

@@ -7,6 +7,7 @@ import {
   saveFileUsage,
   getSecureUrl,
   appName,
+  serverAppId,
 } from '../../../Utils.js';
 import GenerateCertificate from './GenerateCertificate.js';
 import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib';
@@ -15,7 +16,7 @@ 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 APPID = serverAppId;
 const masterKEY = process.env.MASTER_KEY;
 const eSignName = 'OpenSign';
 const eSigncontact = 'hello@opensignlabs.com';

apps/OpenSignServer/cloud/parsefunction/saveAsTemplate.js

@@ -59,6 +59,7 @@ export default async function saveAsTemplate(request) {
               options: {
                 ...p.options,
                 status: 'required',
+                ...(p?.options?.defaultValue ? { defaultValue: '' } : {}),
               },
             })),
           }));
@@ -73,10 +74,28 @@ export default async function saveAsTemplate(request) {
           };
           templateCls.set('Placeholders', [placeHolders]);
         } else {
-          const placeHolders = _docRes?.Placeholders?.map((x, i) => {
+          const placeHolders = _docRes?.Placeholders.map((signer, signerIndex) => ({
-            const email = x.email ? { email: '' } : {};
+            // copy everything else, then overwrite these fields:
-            return { ...x, signerObjId: '', signerPtr: {}, Role: 'Role ' + (i + 1), ...email };
+            ...signer,
-          });
+            signerObjId: '',
+            signerPtr: {},
+            Role: `Role ${signerIndex + 1}`,
+            email: '',
+
+            // rebuild placeHolder/pages
+            placeHolder: (signer.placeHolder || []).map(page => ({
+              ...page,
+              pos: (page.pos || []).map(widget => {
+                // if there is a defaultValue in options, zero it out
+                if (widget.options && widget.options.defaultValue !== undefined) {
+                  return { ...widget, options: { ...widget.options, defaultValue: '' } }; // reset only the value
+                }
+                // otherwise, return the widget unchanged
+                return widget;
+              }),
+            })),
+          }));
+
           templateCls.set('Placeholders', placeHolders);
         }
       }

apps/OpenSignServer/cloud/parsefunction/sendMailGmailProvider.js

@@ -38,7 +38,6 @@ const makeEmail = async (
   replyto,
   testPdf
 ) => {
-  const publicUrl = new URL(process.env.SERVER_URL);
   const htmlContent = html;
   const boundary = 'boundary_' + Date.now().toString(16);
   const bccHeader = bcc && bcc.length > 0 ? `BCC: ${bcc.join(',')}\n` : ''; // Construct BCC header if provided

apps/OpenSignServer/cloud/parsefunction/updateTenant.js

@@ -8,12 +8,15 @@ export default async function updateTenant(request) {
   if (!request.user) {
     throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'unauthorized');
   }
+  const validKeys = ['CompletionBody', 'CompletionSubject', 'RequestBody', 'RequestSubject'];
   try {
     const tenant = new Parse.Object('partners_Tenant');
     tenant.id = tenantId;
     // Update tenant details
     Object.keys(details).forEach(key => {
-      tenant.set(key, details?.[key]);
+      if (validKeys.includes(key)) {
+        tenant.set(key, details?.[key]);
+      }
     });
 
     const tenantRes = await tenant.save(null, { useMasterKey: true });

apps/OpenSignServer/cloud/parsefunction/usersignup.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
-import { cloudServerUrl } from '../../Utils.js';
+import { cloudServerUrl, serverAppId } from '../../Utils.js';
 const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
-const APPID = process.env.APP_ID;
+const APPID = serverAppId;
 const masterKEY = process.env.MASTER_KEY;
 
 async function saveUser(userDetails) {
@@ -43,9 +43,9 @@ async function saveUser(userDetails) {
 }
 export default async function usersignup(request) {
   const userDetails = request.params.userDetails;
-  const user = await saveUser(userDetails);
 
   try {
+    const user = await saveUser(userDetails);
     const extClass = userDetails.role.split('_')[0];
 
     const extQuery = new Parse.Query(extClass + '_Users');

apps/OpenSignServer/databases/migrations/20250621215000-add_creditalertlevel_field.cjs

@@ -0,0 +1,19 @@
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.up = async Parse => {
+  const schema = new Parse.Schema('contracts_Subscriptions');
+  schema.addNumber('CreditAlertLevel');
+  return schema.update();
+};
+
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.down = async Parse => {
+  const schema = new Parse.Schema('contracts_Subscriptions');
+  schema.deleteField('CreditAlertLevel');
+  return schema.update();
+};

apps/OpenSignServer/index.js

@@ -15,7 +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 { appName, cloudServerUrl, smtpenable, smtpsecure, useLocal } from './Utils.js';
+import { appName, cloudServerUrl, serverAppId, smtpenable, smtpsecure, useLocal } from './Utils.js';
 import { SSOAuth } from './auth/authadapter.js';
 import createContactIndex from './migrationdb/createContactIndex.js';
 import { validateSignedLocalUrl } from './cloud/parsefunction/getSignedUrl.js';
@@ -97,7 +97,7 @@ export const config = {
   cloud: function () {
     import('./cloud/main.js');
   },
-  appId: process.env.APP_ID || 'opensign',
+  appId: serverAppId,
   logLevel: ['error'],
   maxLimit: 500,
   maxUploadSize: '30mb',
@@ -232,10 +232,9 @@ if (!process.env.TESTING) {
     const isWindows = process.platform === 'win32';
     // console.log('isWindows', isWindows);
     createContactIndex();
-
     const migrate = isWindows
-      ? `set APPLICATION_ID=${process.env.APP_ID}&& set SERVER_URL=${cloudServerUrl}&& set MASTER_KEY=${process.env.MASTER_KEY}&& npx parse-dbtool migrate`
+      ? `set APPLICATION_ID=${serverAppId}&& set SERVER_URL=${cloudServerUrl}&& set MASTER_KEY=${process.env.MASTER_KEY}&& npx parse-dbtool migrate`
-      : `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=${cloudServerUrl} MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
+      : `APPLICATION_ID=${serverAppId} SERVER_URL=${cloudServerUrl} MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
     exec(migrate, (error, stdout, stderr) => {
       if (error) {
         console.error(`Error: ${error.message}`);

apps/OpenSignServer/package.json

@@ -18,8 +18,8 @@
     "watch": "nodemon index.js"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.828.0",
+    "@aws-sdk/client-s3": "^3.840.0",
-    "@aws-sdk/s3-request-presigner": "^3.828.0",
+    "@aws-sdk/s3-request-presigner": "^3.840.0",
     "@parse/fs-files-adapter": "^3.0.0",
     "@parse/s3-files-adapter": "^4.2.0",
     "@pdf-lib/fontkit": "^1.1.1",
@@ -31,42 +31,43 @@
     "coherentpdf": "^2.5.5",
     "cors": "^2.8.5",
     "date-fns-tz": "^3.2.0",
-    "dotenv": "^16.5.0",
+    "dotenv": "^16.6.1",
     "express": "^5.1.0",
     "form-data": "^4.0.3",
     "generate-api-key": "^1.0.2",
     "googleapis": "^150.0.1",
     "libreoffice-convert": "^1.6.1",
-    "mailgun.js": "^12.0.2",
+    "mailgun.js": "^12.0.3",
     "mongodb": "^6.17.0",
     "multer": "^2.0.1",
     "multer-s3": "^3.0.1",
     "node-forge": "^1.3.1",
-    "nodemailer": "^7.0.3",
+    "nodemailer": "^7.0.4",
     "parse": "^6.1.1",
     "parse-dbtool": "^1.2.0",
     "parse-server": "^8.2.1",
     "parse-server-api-mail-adapter": "^4.1.0",
     "pdf-lib": "^1.17.1",
-    "posthog-node": "^5.1.0",
+    "posthog-node": "^5.1.1",
     "qrcode": "^1.5.4",
     "rate-limiter-flexible": "^7.1.1",
     "speakeasy": "^2.0.0",
-    "ws": "^8.18.2"
+    "ws": "^8.18.3"
   },
   "type": "module",
   "devDependencies": {
     "@babel/eslint-parser": "^7.27.5",
     "eslint": "^9.29.0",
     "jasmine": "^5.8.0",
-    "mongodb-runner": "^5.9.0",
+    "mongodb-runner": "^5.9.2",
     "nodemon": "^3.1.10",
     "nyc": "^17.1.0",
-    "prettier": "^3.5.3"
+    "prettier": "^3.6.2"
   },
   "overrides": {
     "ws": "$ws",
-    "parse": "$parse"
+    "parse": "$parse",
+    "form-data": "$form-data"
   },
   "engines": {
     "node": "18 || 20 || 22"