Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into feat_bulksend

Author: prafull-opensignlabs

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,

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 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
@@ -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"

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

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()}

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) {
-      const jsonSender = JSON.parse(extClass);
-      extUser = jsonSender[0].objectId;
+    if (extClass && extClass.length > 0) {
+      extUser = extClass[0].objectId;
     } else {
       extUser = extUserId;
     }
@@ -171,11 +172,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);
@@ -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) {

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"
     ]
   },
   {

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)