From 658c37cc4d137f74e6daa0177313f8d1c14f580b Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Wed, 22 May 2024 17:48:15 +0530
Subject: [PATCH 01/10] feat: add tour messages to request signatures flow

---
 .../src/components/pdf/DefaultSignature.js    |   2 +-
 apps/OpenSign/src/components/pdf/PdfHeader.js |  10 +-
 apps/OpenSign/src/components/pdf/RenderPdf.js |   2 +
 apps/OpenSign/src/constant/Utils.js           |   3 +-
 apps/OpenSign/src/pages/PdfRequestFiles.js    | 203 +++++++++++++++++-
 5 files changed, 206 insertions(+), 14 deletions(-)

diff --git a/apps/OpenSign/src/components/pdf/DefaultSignature.js b/apps/OpenSign/src/components/pdf/DefaultSignature.js
index a440e807e..1887d5164 100644
--- a/apps/OpenSign/src/components/pdf/DefaultSignature.js
+++ b/apps/OpenSign/src/components/pdf/DefaultSignature.js
@@ -17,7 +17,7 @@ function DefaultSignature({ defaultSignImg, xyPostion, setDefaultSignAlert }) {
   };
 
   return (
-    <div>
+    <div data-tut="reactourThird">
       <div
         style={{
           background: themeColor,
diff --git a/apps/OpenSign/src/components/pdf/PdfHeader.js b/apps/OpenSign/src/components/pdf/PdfHeader.js
index 7a019ed39..d3baeaf54 100644
--- a/apps/OpenSign/src/components/pdf/PdfHeader.js
+++ b/apps/OpenSign/src/components/pdf/PdfHeader.js
@@ -331,7 +331,7 @@ function Header({
                 user exist than show finish button else no
                 */}
                 {currentSigner && (
-                  <>
+                  <div className="flex" data-tut="reactourFifth">
                     {decline && (
                       <div
                         onClick={() => handleDeclinePdfAlert()}
@@ -399,7 +399,7 @@ function Header({
                         </DropdownMenu.Content>
                       </DropdownMenu.Portal>
                     </DropdownMenu.Root>
-                  </>
+                  </div>
                 )}
               </div>
             )}
@@ -464,8 +464,8 @@ function Header({
                   {completeBtnTitle
                     ? completeBtnTitle
                     : isMailSend
-                    ? "Sent"
-                    : "Send"}
+                      ? "Sent"
+                      : "Send"}
                 </button>
               </div>
             </>
@@ -505,7 +505,7 @@ function Header({
                 </button>
               </div>
             ) : (
-              <div className="flex">
+              <div className="flex" data-tut="reactourFifth">
                 <button
                   onClick={() => navigate(-1)}
                   type="button"
diff --git a/apps/OpenSign/src/components/pdf/RenderPdf.js b/apps/OpenSign/src/components/pdf/RenderPdf.js
index a8298d019..5118dfcc1 100644
--- a/apps/OpenSign/src/components/pdf/RenderPdf.js
+++ b/apps/OpenSign/src/components/pdf/RenderPdf.js
@@ -334,6 +334,7 @@ function RenderPdf({
       {successEmail && <Alert type={"success"}>Email sent successfully!</Alert>}
       {isMobile && scale ? (
         <div
+          data-tut="reactourForth"
           style={{
             border: "0.1px solid #ebe8e8",
             marginTop: isGuestSigner && "30px"
@@ -517,6 +518,7 @@ function RenderPdf({
           noScrollX={pdfNewWidth < pdfOriginalWidth ? false : true}
         >
           <div
+            data-tut="reactourForth"
             style={{
               border: "0.1px solid #ebe8e8",
               width: pdfOriginalWidth
diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js
index 93cefe04c..ffe3b813b 100644
--- a/apps/OpenSign/src/constant/Utils.js
+++ b/apps/OpenSign/src/constant/Utils.js
@@ -171,11 +171,10 @@ export const contractUsers = async (email) => {
     .then((Listdata) => {
       const json = Listdata.data;
       let data = [];
-
       if (json && json.result) {
         data.push(json.result);
-        return data;
       }
+      return data;
     })
     .catch((err) => {
       console.log("Err ", err);
diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js
index 1043d8eb5..c9a21ead5 100644
--- a/apps/OpenSign/src/pages/PdfRequestFiles.js
+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js
@@ -28,7 +28,8 @@ import {
   fetchSubscription,
   convertPdfArrayBuffer,
   contractUsers,
-  handleSendOTP
+  handleSendOTP,
+  contactBook
 } from "../constant/Utils";
 import Loader from "../primitives/LoaderWithMsg";
 import HandleError from "../primitives/HandleError";
@@ -39,6 +40,7 @@ import Title from "../components/Title";
 import DefaultSignature from "../components/pdf/DefaultSignature";
 import ModalUi from "../primitives/ModalUi";
 import VerifyEmail from "../components/pdf/VerifyEmail";
+import TourContentWithBtn from "../primitives/TourContentWithBtn";
 function useQuery() {
   return new URLSearchParams(useLocation().search);
 }
@@ -68,6 +70,8 @@ function PdfRequestFiles() {
   const [selectWidgetId, setSelectWidgetId] = useState("");
   const [otpLoader, setOtpLoader] = useState(false);
   const [isCelebration, setIsCelebration] = useState(false);
+  const [requestSignTour, setRequestSignTour] = useState(true);
+  const [tourStatus, setTourStatus] = useState([]);
   const [isLoading, setIsLoading] = useState({
     isLoad: true,
     message: "This might take some time"
@@ -85,6 +89,8 @@ function PdfRequestFiles() {
   const [isAlert, setIsAlert] = useState({ isShow: false, alertMessage: "" });
   const [unSignedWidgetId, setUnSignedWidgetId] = useState("");
   const [expiredDate, setExpiredDate] = useState("");
+  const [signerUserId, setSignerUserId] = useState();
+  const [isDontShow, setIsDontShow] = useState(false);
   const [defaultSignAlert, setDefaultSignAlert] = useState({
     isShow: false,
     alertMessage: ""
@@ -114,6 +120,7 @@ function PdfRequestFiles() {
   const [isEmailVerified, setIsEmailVerified] = useState(true);
   const [isVerifyModal, setIsVerifyModal] = useState(false);
   const [otp, setOtp] = useState("");
+  const [contractName, setContractName] = useState("");
   const divRef = useRef(null);
   const isMobile = window.innerWidth < 767;
   const rowLevel =
@@ -439,7 +446,62 @@ function PdfRequestFiles() {
             }, 5000);
           }
         }
-
+        //checking if condition current user already sign or owner does not exist as a signer or document has been declined by someone or document has been expired
+        //then stop to display tour message
+        if (
+          (checkAlreadySign &&
+            checkAlreadySign[0] &&
+            checkAlreadySign.length > 0) ||
+          !currUserId ||
+          declined ||
+          currDate > expireUpdateDate
+        ) {
+          setRequestSignTour(false);
+        } else {
+          //else condition to check current user exist in contracts_Users class and check tour message status
+          //if not then check user exist in contracts_Contactbook class and check tour message status
+          const currentUser = JSON.parse(JSON.stringify(Parse.User.current()));
+          const currentUserEmail = currentUser.email;
+          const res = await contractUsers(currentUserEmail);
+          if (res === "Error: Something went wrong!") {
+            setHandleError("Error: Something went wrong!");
+          } else if (res[0] && res?.length) {
+            setContractName("_Users");
+            currUserId = res[0].objectId;
+            setSignerUserId(currUserId);
+            const tourstatus = res[0].TourStatus && res[0].TourStatus;
+            if (tourstatus && tourstatus.length > 0) {
+              setTourStatus(tourstatus);
+              const checkTourRequestSign = tourstatus.filter(
+                (data) => data.requestSign
+              );
+              if (checkTourRequestSign && checkTourRequestSign.length > 0) {
+                setRequestSignTour(checkTourRequestSign[0].requestSign);
+              }
+            }
+          } else if (res?.length === 0) {
+            const res = await contactBook(currUserId);
+            if (res === "Error: Something went wrong!") {
+              setHandleError("Error: Something went wrong!");
+            } else if (res[0] && res.length) {
+              setContractName("_Contactbook");
+              const objectId = res[0].objectId;
+              setSignerUserId(objectId);
+              const tourstatus = res[0].TourStatus && res[0].TourStatus;
+              if (tourstatus && tourstatus.length > 0) {
+                setTourStatus(tourstatus);
+                const checkTourRequestSign = tourstatus.filter(
+                  (data) => data.requestSign
+                );
+                if (checkTourRequestSign && checkTourRequestSign.length > 0) {
+                  setRequestSignTour(checkTourRequestSign[0].requestSign);
+                }
+              }
+            } else if (res.length === 0) {
+              setHandleError("Error: User does not exist!");
+            }
+          }
+        }
         setIsUiLoading(false);
       } else {
         alert("No data found!");
@@ -1141,6 +1203,134 @@ function PdfRequestFiles() {
       alertMessage: ""
     });
   };
+  const handleDontShow = (isChecked) => {
+    setIsDontShow(isChecked);
+  };
+  //function to close tour and save tour status
+  const closeRequestSignTour = async () => {
+    setRequestSignTour(false);
+    if (isDontShow) {
+      let updatedTourStatus = [];
+      if (tourStatus.length > 0) {
+        updatedTourStatus = [...tourStatus];
+        const requestSignIndex = tourStatus.findIndex(
+          (obj) => obj["requestSign"] === false || obj["requestSign"] === true
+        );
+        if (requestSignIndex !== -1) {
+          updatedTourStatus[requestSignIndex] = { requestSign: true };
+        } else {
+          updatedTourStatus.push({ requestSign: true });
+        }
+      } else {
+        updatedTourStatus = [{ requestSign: true }];
+      }
+      try {
+        await axios.put(
+          `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
+            "_appName"
+          )}${contractName}/${signerUserId}`,
+          {
+            TourStatus: updatedTourStatus
+          },
+          {
+            headers: {
+              "Content-Type": "application/json",
+              "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+              "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+            }
+          }
+        );
+      } catch (e) {
+        console.log("update tour messages error", err);
+      }
+    }
+  };
+  const requestSignTourFunction = () => {
+    const tourConfig = [
+      {
+        selector: '[data-tut="reactourFirst"]',
+        content: () => (
+          <TourContentWithBtn
+            message={`List of signers who still need to sign the document .`}
+            isChecked={handleDontShow}
+          />
+        ),
+        position: "top",
+        style: { fontSize: "13px" }
+      },
+      {
+        selector: '[data-tut="reactourForth"]',
+        content: () => (
+          <TourContentWithBtn
+            message={`Click any of the placeholders appearing on the document to sign. You will then see options to draw your signature, type it, or upload an image .`}
+            isChecked={handleDontShow}
+          />
+        ),
+        position: "top",
+        style: { fontSize: "13px" }
+      },
+      {
+        selector: '[data-tut="reactourFifth"]',
+        content: () => (
+          <TourContentWithBtn
+            message={`Click the Back, Decline, or Finish buttons to navigate your document. Use the ellipsis menu for additional options, including the Download button .`}
+            isChecked={handleDontShow}
+          />
+        ),
+        position: "top",
+        style: { fontSize: "13px" }
+      }
+    ];
+    const signedByStep = {
+      selector: '[data-tut="reactourSecond"]',
+      content: () => (
+        <TourContentWithBtn
+          message={`List of signers who have already signed the document .`}
+          isChecked={handleDontShow}
+        />
+      ),
+      position: "top",
+      style: { fontSize: "13px" }
+    };
+    //checking if signed by user component exist then add signed step
+    const signedBy =
+      signedSigners.length > 0
+        ? [...tourConfig.slice(0, 0), signedByStep, ...tourConfig.slice(0)]
+        : tourConfig;
+
+    //checking if default signature component exist then add defaultSign step
+    const defaultSignStep = {
+      selector: '[data-tut="reactourThird"]',
+      content: () => (
+        <TourContentWithBtn
+          message={`You can click "Auto Sign All" to automatically sign at all the locations meant to be signed by you. Make sure that you review the document properly before you click this button .`}
+          isChecked={handleDontShow}
+        />
+      ),
+      position: "top",
+      style: { fontSize: "13px" }
+    };
+    //index is handle is signed by exist then 2 else 1 to add tour step
+    const index = signedSigners.length > 0 ? 2 : 1;
+    const defaultSignTour = defaultSignImg
+      ? [...signedBy.slice(0, index), defaultSignStep, ...signedBy.slice(index)]
+      : signedBy;
+
+    if (isMobile) {
+      tourConfig.shift();
+    }
+
+    return (
+      <Tour
+        onRequestClose={closeRequestSignTour}
+        steps={isMobile ? tourConfig : defaultSignTour}
+        isOpen={true}
+        closeWithMask={false}
+        rounded={5}
+      />
+    );
+  };
+
   return (
     <DndProvider backend={HTML5Backend}>
       <Title title={"Request Sign"} />
@@ -1209,6 +1399,7 @@ function PdfRequestFiles() {
                 }}
                 ref={divRef}
               >
+                {requestSignTour && requestSignTourFunction()}
                 <ModalUi
                   headerColor={"#dc3545"}
                   isOpen={isAlert.isShow}
@@ -1496,7 +1687,7 @@ function PdfRequestFiles() {
                       className="autoSignScroll"
                     >
                       {signedSigners.length > 0 && (
-                        <>
+                        <div data-tut="reactourSecond">
                           <div
                             style={{ background: themeColor }}
                             className="signedStyle"
@@ -1556,11 +1747,11 @@ function PdfRequestFiles() {
                               );
                             })}
                           </div>
-                        </>
+                        </div>
                       )}
 
                       {unsignedSigners.length > 0 && (
-                        <>
+                        <div data-tut="reactourFirst">
                           <div
                             style={{
                               background: themeColor,
@@ -1626,7 +1817,7 @@ function PdfRequestFiles() {
                               );
                             })}
                           </div>
-                        </>
+                        </div>
                       )}
                       {defaultSignImg && !alreadySign && (
                         <DefaultSignature

From ef5ac7d6262056f5d0d664a44a2e86acbb83d5cb Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Wed, 22 May 2024 17:49:24 +0530
Subject: [PATCH 02/10] fix: err is not defined

---
 apps/OpenSign/src/pages/PdfRequestFiles.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js
index c9a21ead5..7565d8669 100644
--- a/apps/OpenSign/src/pages/PdfRequestFiles.js
+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js
@@ -1241,7 +1241,7 @@ function PdfRequestFiles() {
           }
         );
       } catch (e) {
-        console.log("update tour messages error", err);
+        console.log("update tour messages error", e);
       }
     }
   };

From 2e5947279f518d87a0ed762f4e8cfe3337945c3d Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Wed, 22 May 2024 18:51:57 +0530
Subject: [PATCH 03/10] fix:onclick upgrade button navigate user to new window

---
 apps/OpenSign/src/pages/PlaceHolderSign.js |  5 +----
 apps/OpenSign/src/primitives/Upgrade.js    | 13 +++----------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js
index de91d2b92..a705d9525 100644
--- a/apps/OpenSign/src/pages/PlaceHolderSign.js
+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js
@@ -1804,10 +1804,7 @@ function PlaceHolderSign() {
 
                             {!isSubscribe && isEnableSubscription && (
                               <div className="mt-2">
-                                <Upgrade
-                                  message="Upgrade to customize Email"
-                                  newWindow={true}
-                                />
+                                <Upgrade message="Upgrade to customize Email" />
                               </div>
                             )}
                           </div>
diff --git a/apps/OpenSign/src/primitives/Upgrade.js b/apps/OpenSign/src/primitives/Upgrade.js
index 4915e6ff8..187d278f3 100644
--- a/apps/OpenSign/src/primitives/Upgrade.js
+++ b/apps/OpenSign/src/primitives/Upgrade.js
@@ -1,20 +1,13 @@
 import React from "react";
-import { useNavigate } from "react-router-dom";
 import { openInNewTab } from "../constant/Utils";
 
-function Upgrade({ message, newWindow }) {
-  const navigation = useNavigate();
-
+function Upgrade({ message }) {
   return (
     <sup>
       <span
         onClick={() => {
-          if (newWindow) {
-            const url = window.location.origin + "/subscription";
-            openInNewTab(url);
-          } else {
-            navigation("/subscription");
-          }
+          const url = window.location.origin + "/subscription";
+          openInNewTab(url);
         }}
         className="text-blue-800 text-sm cursor-pointer underline"
       >

From d75c1d7c0c7e6acff2fbbbb24474e087b60ee400 Mon Sep 17 00:00:00 2001
From: prafull-opensignlabs <prafull.navkar@nxglabs.com>
Date: Wed, 22 May 2024 19:19:33 +0530
Subject: [PATCH 04/10] fix: resend mail not working

---
 .../src/primitives/GetReportDisplay.js        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js
index fdfc4422f..28ae7822c 100644
--- a/apps/OpenSign/src/primitives/GetReportDisplay.js
+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js
@@ -551,6 +551,7 @@ const ReportTable = (props) => {
   };
   const handleResendMail = async (e, doc, user) => {
     e.preventDefault();
+    console.log("first");
     setActLoader({ [user.objectId]: true });
     const url = `${localStorage.getItem("baseUrl")}functions/sendmailv3`;
     const headers = {
@@ -955,20 +956,22 @@ const ReportTable = (props) => {
                                         onSubmit={(e) =>
                                           handleResendMail(e, item, user)
                                         }
-                                        className="w-full flex flex-col gap-2 p-3 text-black"
+                                        className="w-full flex flex-col gap-2 p-3 text-black relative"
                                       >
+                                        <div className="absolute right-5 text-xs z-40">
+                                          <Tooltip
+                                            id={`${user.objectId}_help`}
+                                            message={
+                                              "You can use following variables which will get replaced with their actual values:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}."
+                                            }
+                                          />
+                                        </div>
                                         <div>
                                           <label
                                             className="text-xs ml-1"
                                             htmlFor="mailsubject"
                                           >
                                             Subject{" "}
-                                            <Tooltip
-                                              id={isNextStep[user.objectId]}
-                                              message={
-                                                "You can use following variables which will get replaced with their actual values:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}."
-                                              }
-                                            />
                                           </label>
                                           <input
                                             id="mailsubject"
@@ -989,12 +992,6 @@ const ReportTable = (props) => {
                                             htmlFor="mailbody"
                                           >
                                             Body{" "}
-                                            <Tooltip
-                                              id={isNextStep[user.objectId]}
-                                              message={
-                                                "You can use following variables which will get replaced with their actual values:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}."
-                                              }
-                                            />
                                           </label>
                                           <EditorToolbar containerId="toolbar1" />
                                           <ReactQuill

From 950b74789cf53958f067bd4e98e34e9b81db2654 Mon Sep 17 00:00:00 2001
From: prafull-opensignlabs <prafull.navkar@nxglabs.com>
Date: Wed, 22 May 2024 19:46:09 +0530
Subject: [PATCH 05/10] fix: create contact API not working

---
 .../OpenSignServer/cloud/customRoute/v1/routes/createContact.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js
index 32d4683f5..9be0cd341 100644
--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js
+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js
@@ -128,7 +128,7 @@ export default async function createContact(request, response) {
                   userId: userRes.objectId,
                 };
                 await axios.post(roleurl, body, { headers: headers });
-                contactQuery.set('CreatedBy', userPtr.objectId);
+                contactQuery.set('CreatedBy', userPtr);
                 contactQuery.set('UserId', {
                   __type: 'Pointer',
                   className: '_User',

From c1468112b00540b381672cc24c47b1e7322fb1e4 Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Wed, 22 May 2024 19:46:22 +0530
Subject: [PATCH 06/10] fix: download menu is not wokring inProgress report in
 mobile view

---
 apps/OpenSign/src/components/pdf/PdfHeader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/OpenSign/src/components/pdf/PdfHeader.js b/apps/OpenSign/src/components/pdf/PdfHeader.js
index d3baeaf54..4d6a280f9 100644
--- a/apps/OpenSign/src/components/pdf/PdfHeader.js
+++ b/apps/OpenSign/src/components/pdf/PdfHeader.js
@@ -331,7 +331,7 @@ function Header({
                 user exist than show finish button else no
                 */}
                 {currentSigner && (
-                  <div className="flex" data-tut="reactourFifth">
+                  <div className="flex items-center" data-tut="reactourFifth">
                     {decline && (
                       <div
                         onClick={() => handleDeclinePdfAlert()}
@@ -372,7 +372,7 @@ function Header({
                     <DropdownMenu.Root>
                       <DropdownMenu.Trigger asChild>
                         <div
-                          className="border-none font-[650] text-[18px] pl-2"
+                          className="border-none font-[650] text-[18px] px-2 ml-[4px]"
                           style={{ color: themeColor }}
                         >
                           <i

From 74b81a53634717ff3a5415ce9778de0ac2ec57b6 Mon Sep 17 00:00:00 2001
From: prafull-opensignlabs <prafull.navkar@nxglabs.com>
Date: Wed, 22 May 2024 19:56:44 +0530
Subject: [PATCH 07/10] fix: issue in guestlogin of owner subscription has
 expired

---
 apps/OpenSign/src/constant/Utils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js
index 93cefe04c..c729d8674 100644
--- a/apps/OpenSign/src/constant/Utils.js
+++ b/apps/OpenSign/src/constant/Utils.js
@@ -21,7 +21,7 @@ export async function fetchSubscription(
   try {
     const extClass = localStorage.getItem("Extand_Class");
     let extUser;
-    if (extClass) {
+    if (extClass && extClass.length > 0) {
       const jsonSender = JSON.parse(extClass);
       extUser = jsonSender[0].objectId;
     } else {
@@ -1351,8 +1351,8 @@ export const multiSignEmbed = async (
           position.type === radioButtonWidget
             ? 10
             : position.type === "checkbox"
-              ? 10
-              : newUpdateHeight;
+            ? 10
+            : newUpdateHeight;
         const newHeight = ind ? (ind > 0 ? widgetHeight : 0) : widgetHeight;
 
         if (signyourself) {

From 32c75d1fc330a343e1206b127d50b2fb689f373e Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Thu, 23 May 2024 10:30:41 +0530
Subject: [PATCH 08/10] feat: add help button for text validation

---
 .../src/components/pdf/WidgetNameModal.js     | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/apps/OpenSign/src/components/pdf/WidgetNameModal.js b/apps/OpenSign/src/components/pdf/WidgetNameModal.js
index bde504d0e..dfcad24e6 100644
--- a/apps/OpenSign/src/components/pdf/WidgetNameModal.js
+++ b/apps/OpenSign/src/components/pdf/WidgetNameModal.js
@@ -6,6 +6,7 @@ import { textInputWidget } from "../../constant/Utils";
 import PremiumAlertHeader from "../../primitives/PremiumAlertHeader";
 import Upgrade from "../../primitives/Upgrade";
 import { isEnableSubscription } from "../../constant/const";
+import Tooltip from "../../primitives/Tooltip";
 
 const WidgetNameModal = (props) => {
   const [formdata, setFormdata] = useState({
@@ -140,16 +141,21 @@ const WidgetNameModal = (props) => {
           props.widgetName === textInputWidget) && (
           <>
             <div className="form-section">
-              <label
-                htmlFor="textvalidate"
-                className={
-                  !props.isSubscribe && isEnableSubscription && "disabled"
-                }
-                style={{ fontSize: 13 }}
-              >
-                Validation
-              </label>
-              {!props.isSubscribe && isEnableSubscription && <Upgrade />}
+              <div className="flex items-center gap-1">
+                <label
+                  htmlFor="textvalidate"
+                  className={
+                    !props.isSubscribe && isEnableSubscription && "disabled"
+                  }
+                  style={{ fontSize: 13 }}
+                >
+                  Validation
+                </label>
+                <Tooltip
+                  url={"https://www.w3schools.com/jsref/jsref_obj_regexp.asp"}
+                />
+                {!props.isSubscribe && isEnableSubscription && <Upgrade />}
+              </div>
               <div
                 className={
                   !props.isSubscribe && isEnableSubscription && "disabled"
@@ -165,7 +171,7 @@ const WidgetNameModal = (props) => {
                   <input
                     className="relative z-20 w-[87%] md:w-[92%] p-2.5 border-[1px] border-[#d1d5db] rounded-l-md outline-none text-xs"
                     name="textvalidate"
-                    placeholder="Enter custom expression"
+                    placeholder="Enter custom regular expression"
                     value={formdata.textvalidate}
                     onChange={(e) => handleChange(e)}
                     // onBlur={() => handleBlurRegex()}

From bf307abe9a98efdc0754b1b275adeef748d54c40 Mon Sep 17 00:00:00 2001
From: Amol <amol@nxglabs.in>
Date: Thu, 23 May 2024 18:17:00 +0530
Subject: [PATCH 09/10] Update plansArr.js

---
 apps/OpenSign/src/json/plansArr.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/OpenSign/src/json/plansArr.js b/apps/OpenSign/src/json/plansArr.js
index f2a116904..3cc7b1696 100644
--- a/apps/OpenSign/src/json/plansArr.js
+++ b/apps/OpenSign/src/json/plansArr.js
@@ -52,7 +52,8 @@ const plans = [
       "API Access",
       "100 API signatures included",
       "DocumentId removal from signed docs",
-      "Custom email templates"
+      "Custom email templates",
+      "Auto reminders"
     ]
   },
   {

From fffd907d637229e9d9cddd9f1bd8161120537314 Mon Sep 17 00:00:00 2001
From: prafull-opensignlabs <prafull.navkar@nxglabs.com>
Date: Fri, 24 May 2024 10:13:34 +0530
Subject: [PATCH 10/10] Fix: handle owner subscription has expired error in
 guest login

---
 apps/OpenSign/src/constant/Utils.js   | 7 ++++---
 apps/OpenSign/src/pages/GuestLogin.js | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js
index c729d8674..0a9a4e8f0 100644
--- a/apps/OpenSign/src/constant/Utils.js
+++ b/apps/OpenSign/src/constant/Utils.js
@@ -19,11 +19,12 @@ export async function fetchSubscription(
   isGuestSign = false
 ) {
   try {
-    const extClass = localStorage.getItem("Extand_Class");
+    const Extand_Class = localStorage.getItem("Extand_Class");
+    const extClass = Extand_Class && JSON.parse(Extand_Class);
+    // console.log("extClass ", extClass);
     let extUser;
     if (extClass && extClass.length > 0) {
-      const jsonSender = JSON.parse(extClass);
-      extUser = jsonSender[0].objectId;
+      extUser = extClass[0].objectId;
     } else {
       extUser = extUserId;
     }
diff --git a/apps/OpenSign/src/pages/GuestLogin.js b/apps/OpenSign/src/pages/GuestLogin.js
index ccd99aad0..c0d4bfc19 100644
--- a/apps/OpenSign/src/pages/GuestLogin.js
+++ b/apps/OpenSign/src/pages/GuestLogin.js
@@ -136,7 +136,8 @@ function GuestLogin() {
             `Parse/${parseId}/currentUser`,
             JSON.stringify(_user)
           );
-          if (contractUserDetails) {
+          // console.log("contractUserDetails ", contractUserDetails);
+          if (contractUserDetails && contractUserDetails.length > 0) {
             localStorage.setItem(
               "Extand_Class",
               JSON.stringify(contractUserDetails)