From 3fb19cbe96360226ffb4185441dcdc798cdac028 Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Thu, 8 Aug 2024 17:36:08 +0530
Subject: [PATCH] fix: failed to load message issue while sign document in
 signyour-self flow

---
 .../public/locales/en/translation.json        |  6 +++++-
 .../public/locales/fr/translation.json        |  6 +++++-
 apps/OpenSign/src/components/pdf/RenderPdf.js | 20 ++++---------------
 apps/OpenSign/src/pages/PdfRequestFiles.js    | 15 +++++++-------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/apps/OpenSign/public/locales/en/translation.json b/apps/OpenSign/public/locales/en/translation.json
index c7189eb21..d9b185f64 100644
--- a/apps/OpenSign/public/locales/en/translation.json
+++ b/apps/OpenSign/public/locales/en/translation.json
@@ -582,7 +582,11 @@
         "Drafts":"This are documents you have started but have not finalized for sending."
          },
         "enter-email-plaholder":"Add an email address and hit enter",
-        "success-email-alert":"Email sent successfully!"
+        "success-email-alert":"Email sent successfully!",
+        "expired-doc-title":"Expired Document",
+        "expired-on-mssg" :"This document expired on {{expiredDate}} and is no longer available to sign.",
+        "signature-validate-alert":"Please confirm that you have selected at least {{minRequiredCount}} checkboxes.",
+        "signature-validate-alert-2" :"Ensure this field is accurately filled and meets all requirements."
        
      
           
diff --git a/apps/OpenSign/public/locales/fr/translation.json b/apps/OpenSign/public/locales/fr/translation.json
index b623121f2..13e1722aa 100644
--- a/apps/OpenSign/public/locales/fr/translation.json
+++ b/apps/OpenSign/public/locales/fr/translation.json
@@ -581,7 +581,11 @@
      "Drafts":"Il s'agit de documents que vous avez commencés mais que vous n'avez pas finalisés pour envoi."
     },
    "enter-email-plaholder":"Ajoutez une adresse email et appuyez sur Entrée",
-   "success-email-alert" :"E-mail envoyé avec succès!"
+   "success-email-alert" :"E-mail envoyé avec succès!",
+   "expired-doc-title" :"Document expiré",
+   "expired-on-mssg" :"Ce document a expiré le {{expiredDate}} et n'est plus disponible pour signature.",
+   "signature-validate-alert":"Veuillez confirmer que vous avez coché au moins {{minRequiredCount}} cases.",
+    "signature-validate-alert-2" :"Assurez-vous que ce champ est rempli avec précision et répond à toutes les exigences."
      
     
   
diff --git a/apps/OpenSign/src/components/pdf/RenderPdf.js b/apps/OpenSign/src/components/pdf/RenderPdf.js
index dd67530b2..d680761b3 100644
--- a/apps/OpenSign/src/components/pdf/RenderPdf.js
+++ b/apps/OpenSign/src/components/pdf/RenderPdf.js
@@ -398,7 +398,7 @@ function RenderPdf({
               onLoadError={() => {
                 setPdfLoad(false);
               }}
-              loading={"Loading Document.."}
+              loading={t("loading-doc")}
               onLoadSuccess={pageDetails}
               // ref={pdfRef}'
               onClick={() => {
@@ -406,13 +406,7 @@ function RenderPdf({
                   setSelectWidgetId("");
                 }
               }}
-              file={
-                pdfUrl
-                  ? pdfUrl
-                  : pdfDetails[0] && pdfDetails[0].SignedUrl
-                    ? pdfDetails[0].SignedUrl
-                    : pdfDetails[0].URL
-              }
+              file={pdfDetails[0]?.SignedUrl || pdfDetails[0]?.URL}
             >
               <Page
                 key={index}
@@ -585,7 +579,7 @@ function RenderPdf({
               onLoadError={() => {
                 setPdfLoad(false);
               }}
-              loading={"Loading Document.."}
+              loading={t("loading-doc")}
               onLoadSuccess={pageDetails}
               onClick={() => {
                 if (setSelectWidgetId) {
@@ -593,13 +587,7 @@ function RenderPdf({
                 }
               }}
               // ref={pdfRef}
-              file={
-                pdfUrl
-                  ? pdfUrl
-                  : pdfDetails[0] && pdfDetails[0].SignedUrl
-                    ? pdfDetails[0].SignedUrl
-                    : pdfDetails[0].URL
-              }
+              file={pdfDetails[0]?.SignedUrl || pdfDetails[0].URL}
             >
               <Page
                 key={index}
diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js
index 43ddddb3c..b2fedc8fd 100644
--- a/apps/OpenSign/src/pages/PdfRequestFiles.js
+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js
@@ -619,10 +619,10 @@ function PdfRequestFiles(props) {
         setMyInitial(defaultSignRes?.res?.defaultInitial);
       } else if (defaultSignRes?.status === "error") {
         setHandleError("Error: Something went wrong!");
-        setIsLoading({
-          isLoad: false
-        });
       }
+      setIsLoading({
+        isLoad: false
+      });
     } catch (err) {
       console.log("Error: error in getDocumentDetails", err);
       setHandleError("Error: Something went wrong!");
@@ -631,6 +631,7 @@ function PdfRequestFiles(props) {
       });
     }
   };
+
   //function for embed signature or image url in pdf
   async function embedWidgetsData() {
     //for emailVerified data checking first in localstorage
@@ -1077,8 +1078,8 @@ function PdfRequestFiles(props) {
     {
       selector: '[data-tut="IsSigned"]',
       content: minRequiredCount
-        ? `Please confirm that you have selected at least ${minRequiredCount} checkboxes.`
-        : "Ensure this field is accurately filled and meets all requirements.",
+        ? t("signature-validate-alert", { minRequiredCount })
+        : t("signature-validate-alert-2"),
       position: "top",
       style: { fontSize: "13px" }
     }
@@ -1678,8 +1679,8 @@ function PdfRequestFiles(props) {
                 {/* this modal is used for show expired alert */}
                 <PdfDeclineModal
                   show={isExpired}
-                  headMsg="Document expired"
-                  bodyMssg={`This document expired on ${expiredDate} and is no longer available to sign.`}
+                  headMsg={t("expired-doc-title")}
+                  bodyMssg={t("expired-on-mssg", { expiredDate })}
                 />
                 {!isEmailVerified && (
                   <VerifyEmail