Merge branch 'develop' into SDP-765_dashboard-tenent-aware

stellar · Oct 31, 2023 · f225120 · f225120
2 parents bf8b707 + 332c04e
commit f225120
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/components/SettingsEnablePaymentCancellation.tsx b/src/components/SettingsEnablePaymentCancellation.tsx
@@ -21,7 +21,7 @@ export const SettingsEnablePaymentCancellation = () => {
   const { organization } = useRedux("organization");
 
   const [paymentCancellationPeriodDays, setPaymentCancellationPeriodDays] =
-    useState(0);
+    useState<number | null>(null);
   const [isEditMode, setIsEditMode] = useState(false);
 
   const dispatch: AppDispatch = useDispatch();
@@ -51,7 +51,10 @@ export const SettingsEnablePaymentCancellation = () => {
     event: React.FormEvent<HTMLFormElement>,
   ) => {
     event.preventDefault();
-    mutateAsync(paymentCancellationPeriodDays);
+
+    if (paymentCancellationPeriodDays) {
+      mutateAsync(paymentCancellationPeriodDays);
+    }
   };
 
   const handlePaymentCancellationReset = (
@@ -108,13 +111,15 @@ export const SettingsEnablePaymentCancellation = () => {
                   id="payment-cancellation-period"
                   label="Payments Cancellation Period (days)"
                   type="number"
-                  value={paymentCancellationPeriodDays}
-                  onChange={(e) =>
-                    setPaymentCancellationPeriodDays(Number(e.target.value))
-                  }
+                  value={paymentCancellationPeriodDays ?? ""}
+                  onChange={(e) => {
+                    e.target.value !== ""
+                      ? setPaymentCancellationPeriodDays(Number(e.target.value))
+                      : setPaymentCancellationPeriodDays(null);
+                  }}
                   disabled={!isEditMode}
                   error={
-                    paymentCancellationPeriodDays === 0
+                    paymentCancellationPeriodDays == 0
                       ? "Cancellation period cannot be 0"
                       : ""
                   }

diff --git a/src/components/SettingsEnableSmsRetry.tsx b/src/components/SettingsEnableSmsRetry.tsx
@@ -20,7 +20,7 @@ import { getOrgInfoAction } from "store/ducks/organization";
 export const SettingsEnableSmsRetry = () => {
   const { organization } = useRedux("organization");
 
-  const [smsRetryInterval, setSmsRetryInterval] = useState(0);
+  const [smsRetryInterval, setSmsRetryInterval] = useState<number | null>(null);
   const [isEditMode, setIsEditMode] = useState(false);
 
   const dispatch: AppDispatch = useDispatch();
@@ -46,7 +46,10 @@ export const SettingsEnableSmsRetry = () => {
 
   const handleSmsRetrySubmit = (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault();
-    mutateAsync(smsRetryInterval);
+
+    if (smsRetryInterval) {
+      mutateAsync(smsRetryInterval);
+    }
   };
 
   const handleSmsRetryReset = (event: React.FormEvent<HTMLFormElement>) => {
@@ -94,11 +97,15 @@ export const SettingsEnableSmsRetry = () => {
                   id="sms-retry-interval"
                   label="SMS retry interval (days)"
                   type="number"
-                  value={smsRetryInterval}
-                  onChange={(e) => setSmsRetryInterval(Number(e.target.value))}
+                  value={smsRetryInterval ?? ""}
+                  onChange={(e) => {
+                    e.target.value !== ""
+                      ? setSmsRetryInterval(Number(e.target.value))
+                      : setSmsRetryInterval(null);
+                  }}
                   disabled={!isEditMode}
                   error={
-                    smsRetryInterval === 0 ? "Retry interval cannot be 0" : ""
+                    smsRetryInterval == 0 ? "Retry interval cannot be 0" : ""
                   }
                 />
                 {!isEditMode ? (