From de26c2d71912b7c94e9eb6e5a539587ff7fe6652 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Fri, 29 Mar 2024 17:51:59 +0530 Subject: [PATCH] fix: handle condition of free validation warning message --- .../components/pdf/DropdownWidgetOption.js | 24 +++++++++-------- .../src/components/pdf/WidgetNameModal.js | 26 ++++++++++++------- apps/OpenSign/src/constant/Utils.js | 2 +- apps/OpenSign/src/pages/GenerateToken.js | 10 +++---- apps/OpenSign/src/pages/UserProfile.js | 18 +++++++------ apps/OpenSign/src/pages/Webhook.js | 10 +++---- apps/OpenSign/src/primitives/Tooltip.js | 3 ++- 7 files changed, 52 insertions(+), 41 deletions(-) diff --git a/apps/OpenSign/src/components/pdf/DropdownWidgetOption.js b/apps/OpenSign/src/components/pdf/DropdownWidgetOption.js index 08de190f7..3f95eaac4 100644 --- a/apps/OpenSign/src/components/pdf/DropdownWidgetOption.js +++ b/apps/OpenSign/src/components/pdf/DropdownWidgetOption.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { themeColor } from "../../constant/const"; +import { isEnableSubscription, themeColor } from "../../constant/const"; import ModalUi from "../../primitives/ModalUi"; import { radioButtonWidget } from "../../constant/Utils"; import PremiumAlertHeader from "../../primitives/PremiumAlertHeader"; @@ -254,7 +254,7 @@ function DropdownWidgetOption(props) { > Minimun check - {!props.isSubscribe && } + {!props.isSubscribe && isEnableSubscription && } )} - {props.type === "checkbox" && !props.isSignYourself && ( - - )} + {props.type === "checkbox" && + !props.isSignYourself && + !isEnableSubscription && ( + + )}
{ const [formdata, setFormdata] = useState({ @@ -101,13 +102,14 @@ const WidgetNameModal = (props) => { title={"Widget info"} > {(props.defaultdata?.type === textInputWidget || - props.widgetName === textInputWidget) && ( - - )} + props.widgetName === textInputWidget) && + !isEnableSubscription && ( + + )}
{
- {!props.isSubscribe && } + {!props.isSubscribe && isEnableSubscription && }
) : (
- + {!isEnableSubscription && }

- {!isSubscribe && } + {!isSubscribe && isEnableSubscription && }

    {" "} - {!isSubscribe && } + {!isSubscribe && isEnableSubscription && } {" "}
- + {!isEnableSubscription && ( + + )}
diff --git a/apps/OpenSign/src/pages/Webhook.js b/apps/OpenSign/src/pages/Webhook.js index b89bda460..12e4fef17 100644 --- a/apps/OpenSign/src/pages/Webhook.js +++ b/apps/OpenSign/src/pages/Webhook.js @@ -109,10 +109,10 @@ function Webhook() {
) : (
- + {!isEnableSubscription && }

- {!isSubscribe && } + {!isSubscribe && isEnableSubscription && }

    url ? (