From f023b21ba411d9ce885f7c249e16381c41110820 Mon Sep 17 00:00:00 2001
From: abhishek-01k <abhishek@push.org>
Date: Wed, 28 Aug 2024 16:25:43 +0530
Subject: [PATCH] Fixed the validation error

---
 .../notifSettings/EditNotificationSetting.form.tsx   | 12 ++++++------
 .../components/NotificationSettingsFooter.tsx        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/notifSettings/EditNotificationSetting.form.tsx b/src/modules/notifSettings/EditNotificationSetting.form.tsx
index 92e98a5a4b..ead0d49ce7 100644
--- a/src/modules/notifSettings/EditNotificationSetting.form.tsx
+++ b/src/modules/notifSettings/EditNotificationSetting.form.tsx
@@ -68,7 +68,7 @@ export const NotificationSettingsSchema = Yup.object().shape({
             'Multi-range lower limit must be between lower limit and upper limit',
             function (value) {
               const { rangelowerlimit, rangeupperlimit } = this.parent;
-              return value >= rangelowerlimit && value <= rangeupperlimit;
+              return value > rangelowerlimit && value < rangeupperlimit;
             }
           ),
       otherwise: () => Yup.number(),
@@ -86,7 +86,7 @@ export const NotificationSettingsSchema = Yup.object().shape({
             'Multi-range upper limit must be between lower limit and upper limit',
             function (value) {
               const { rangelowerlimit, rangeupperlimit } = this.parent;
-              return value >= rangelowerlimit && value <= rangeupperlimit;
+              return value > rangelowerlimit && value < rangeupperlimit;
             }
           ),
       otherwise: () => Yup.number(),
@@ -94,11 +94,11 @@ export const NotificationSettingsSchema = Yup.object().shape({
 
 
   defaultValue: Yup.number()
-    .when('enableRange', {
-      is: true,
+    .when('enableMultiRange', {
+      is: false,
       then: () =>
         Yup.number()
-          .min(1, getMinCharLimitMessage(1))
+          .min(0, getMinCharLimitMessage(0))
           .required(getRequiredFieldMessage('Default Value'))
           .test(
             'is-within-range',
@@ -120,7 +120,7 @@ export const NotificationSettingsSchema = Yup.object().shape({
           'Slider step value must not be greater than upper limit',
           function (value) {
             const { rangeupperlimit } = this.parent;
-            return value <= rangeupperlimit;
+            return value < rangeupperlimit;
           }
         ),
       otherwise: () => Yup.number(),
diff --git a/src/modules/notifSettings/components/NotificationSettingsFooter.tsx b/src/modules/notifSettings/components/NotificationSettingsFooter.tsx
index bd43833be0..1783b615a6 100644
--- a/src/modules/notifSettings/components/NotificationSettingsFooter.tsx
+++ b/src/modules/notifSettings/components/NotificationSettingsFooter.tsx
@@ -138,7 +138,7 @@ const NotificationSettingsFooter: FC<NotificationSettingsFooterProps> = ({ newSe
           },
           onError: (error: any) => {
             console.log('Error in adding setting', error);
-            setErrorMessage(error.message);
+            setErrorMessage('Error in saving settings. Please try again later');
           },
         }
       );