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 1/2] 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 2/2] 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',