From 98efff65c92583772ecd7954b7c2a125b1a33f2a Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Wed, 17 Sep 2025 05:48:01 +0000 Subject: [PATCH] Merge pull request #1295 from nxglabs/sync-to-public_repo-17787708673 fix: show signer name in typed signature instead in selfsign flow --- apps/OpenSign/package.json | 12 +- .../src/components/pdf/WidgetsValueModal.jsx | 38 +- apps/OpenSign/src/pages/Form.jsx | 6 +- apps/OpenSign/src/pages/UserProfile.jsx | 2 +- apps/OpenSignServer/package-lock.json | 1634 ++++++++--------- apps/OpenSignServer/package.json | 14 +- 6 files changed, 852 insertions(+), 854 deletions(-) diff --git a/apps/OpenSign/package.json b/apps/OpenSign/package.json index 0d145cc84c..5b72d6240a 100644 --- a/apps/OpenSign/package.json +++ b/apps/OpenSign/package.json @@ -3,13 +3,13 @@ "version": "2.26.0", "private": true, "dependencies": { - "@formkit/auto-animate": "^0.8.4", + "@formkit/auto-animate": "^0.9.0", "@imgly/background-removal": "^1.7.0", - "@lottiefiles/dotlottie-react": "^0.15.2", + "@lottiefiles/dotlottie-react": "^0.16.2", "@pdf-lib/fontkit": "^1.1.1", "@radix-ui/themes": "^3.2.1", "@reduxjs/toolkit": "^2.8.2", - "axios": "^1.11.0", + "axios": "^1.12.2", "date-fns-tz": "^3.2.0", "file-saver": "^2.0.5", "i18next": "^25.4.0", @@ -42,7 +42,7 @@ "react-quill-new": "^3.6.0", "react-redux": "^9.2.0", "react-rnd": "^10.5.2", - "react-router": "^7.8.2", + "react-router": "^7.9.1", "react-scrollbars-custom": "^4.1.1", "react-select": "^5.10.2", "react-signature-canvas": "^1.1.0-alpha.2", @@ -101,7 +101,7 @@ "@testing-library/jest-dom": "^6.8.0", "@testing-library/react": "^16.3.0", "@testing-library/user-event": "^14.6.1", - "@types/react": "^19.1.12", + "@types/react": "^19.1.13", "@vitejs/plugin-react": "^4.7.0", "@vitest/ui": "^3.2.4", "autoprefixer": "^10.4.21", @@ -113,7 +113,7 @@ "eslint": "^9.34.0", "eslint-plugin-prettier": "^5.5.4", "eslint-plugin-react": "^7.37.5", - "jsdom": "^26.1.0", + "jsdom": "^27.0.0", "lint-staged": "^16.1.6", "postcss": "^8.5.6", "prettier": "^3.6.2", diff --git a/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx b/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx index ec352da213..24c5bbb21f 100644 --- a/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx +++ b/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx @@ -671,18 +671,21 @@ function WidgetsValueModal(props) { } } if (isTab === "type") { + const signerName = localStorage.getItem("signer") + ? JSON.parse(localStorage.getItem("signer"))?.Name + : currentUserName; //trim user name or typed name value to show in initial signature const trimmedName = typedSignature ? typedSignature?.trim() : props?.journey === "kiosk-signing" && kiosk_signer ? kiosk_signer[0]?.Name?.trim() - : currentUserName?.trim(); + : signerName?.trim(); //get full name of user const fullUserName = typedSignature || (props?.journey === "kiosk-signing" && kiosk_signer ? kiosk_signer[0]?.Name - : currentUserName); + : signerName); const firstCharacter = trimmedName?.charAt(0); const userName = currWidgetsDetails?.type === "initials" ? firstCharacter : fullUserName; @@ -1201,8 +1204,8 @@ function WidgetsValueModal(props) { ) ) : isTab === "type" ? ( <> -
- +
+ {currWidgetsDetails?.type === "initials" ? t("initial-teb") : t("signature-tab")} @@ -1229,7 +1232,7 @@ function WidgetsValueModal(props) { }} />
-
+
{fontOptions.map((font, ind) => { return (
{typedSignature ? typedSignature - : "Your signature"} + : t("Your-Signature")}
); @@ -1656,7 +1659,7 @@ function WidgetsValueModal(props) { } }, []); return ( - + {t("required-mssg", { leftRequiredWidget, totalWidget })} ); @@ -1888,15 +1891,15 @@ function WidgetsValueModal(props) { {isFinish ? ( <>
- {t("finish-mssg")} + + {t("finish-mssg")} +
@@ -1956,9 +1959,7 @@ function WidgetsValueModal(props) { @@ -1979,9 +1977,7 @@ function WidgetsValueModal(props) {