From 3bf35166fcdf1c181d5eddcd6262f4278f445e1b Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Fri, 10 May 2024 20:27:04 +0530
Subject: [PATCH] fix: bookmark color according to user's widget color

---
 .../src/components/pdf/RenderAllPdfPage.js    |  7 +++-
 apps/OpenSign/src/pages/PdfRequestFiles.js    | 34 +++++++++++--------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/apps/OpenSign/src/components/pdf/RenderAllPdfPage.js b/apps/OpenSign/src/components/pdf/RenderAllPdfPage.js
index 9c5d42b9c..2fae32a0d 100644
--- a/apps/OpenSign/src/components/pdf/RenderAllPdfPage.js
+++ b/apps/OpenSign/src/components/pdf/RenderAllPdfPage.js
@@ -14,6 +14,7 @@ function RenderAllPdfPage({
   signerObjectId
 }) {
   const [signPageNumber, setSignPageNumber] = useState([]);
+  const [bookmarkColor, setBookmarkColor] = useState("");
   //set all number of pages after load pdf
   function onDocumentLoad({ numPages }) {
     setAllPages(numPages);
@@ -22,6 +23,7 @@ function RenderAllPdfPage({
       const checkUser = signerPos.filter(
         (data) => data.signerObjId === signerObjectId
       );
+      setBookmarkColor(checkUser[0]?.blockColor);
       let pageNumberArr = [];
       if (checkUser?.length > 0) {
         checkUser[0]?.placeHolder?.map((data) => {
@@ -47,7 +49,10 @@ function RenderAllPdfPage({
             transform: "translate(50% -50%)"
           }}
         >
-          <i className="fa-solid fa-bookmark text-red-500"></i>
+          <i
+            style={{ color: bookmarkColor || "red" }}
+            className="fa-solid fa-bookmark"
+          ></i>
         </div>
       )
     );
diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js
index 388b564dc..31be42769 100644
--- a/apps/OpenSign/src/pages/PdfRequestFiles.js
+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js
@@ -560,14 +560,16 @@ function PdfRequestFiles() {
               if (requiredRadio && requiredRadio?.length > 0) {
                 let checkSigned;
                 for (let i = 0; i < requiredRadio?.length; i++) {
-                  checkSigned = requiredRadio[i]?.options.response;
-                  let checkDefaultSigned =
-                    requiredRadio[i]?.options.defaultValue;
-                  if (!checkSigned && !checkDefaultSigned && !showAlert) {
-                    showAlert = true;
-                    widgetKey = requiredRadio[i].key;
-                    pageNumber = updatePage;
-                    setminRequiredCount(null);
+                  checkSigned = requiredRadio[i]?.options?.response;
+                  if (!checkSigned) {
+                    let checkDefaultSigned =
+                      requiredRadio[i]?.options?.defaultValue;
+                    if (!checkDefaultSigned && !showAlert) {
+                      showAlert = true;
+                      widgetKey = requiredRadio[i].key;
+                      pageNumber = updatePage;
+                      setminRequiredCount(null);
+                    }
                   }
                 }
               }
@@ -587,13 +589,15 @@ function PdfRequestFiles() {
                   checkSigned = requiredWidgets[i]?.options?.response;
                   if (!checkSigned) {
                     const checkSignUrl = requiredWidgets[i]?.pos?.SignUrl;
-                    let checkDefaultSigned =
-                      requiredWidgets[i]?.options?.defaultValue;
-                    if (!checkSignUrl && !checkDefaultSigned && !showAlert) {
-                      showAlert = true;
-                      widgetKey = requiredWidgets[i].key;
-                      pageNumber = updatePage;
-                      setminRequiredCount(null);
+                    if (!checkSignUrl) {
+                      let checkDefaultSigned =
+                        requiredWidgets[i]?.options?.defaultValue;
+                      if (!checkDefaultSigned && !showAlert) {
+                        showAlert = true;
+                        widgetKey = requiredWidgets[i].key;
+                        pageNumber = updatePage;
+                        setminRequiredCount(null);
+                      }
                     }
                   }
                 }