Fixed empty time case

Expensify · Jan 7, 2025 · ed00cdc · ed00cdc
1 parent c3688b4
commit ed00cdc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/components/TimeModalPicker.tsx b/src/components/TimeModalPicker.tsx
@@ -70,7 +70,7 @@ function TimeModalPicker({value, errorText, label, onInputChange = () => {}}: Ti
                         <TimePicker
                             defaultValue={value}
                             onSubmit={updateInput}
-                            shouldValidate={false}
+                            shouldValidateFutureTime={false}
                         />
                     </View>
                 </ScreenWrapper>

diff --git a/src/components/TimePicker/TimePicker.tsx b/src/components/TimePicker/TimePicker.tsx
@@ -37,6 +37,9 @@ type TimePickerProps = {
     /** Whether the time value should be validated */
     shouldValidate?: boolean;
 
+    /** Whether the time value should be validated for future time only */
+    shouldValidateFutureTime?: boolean;
+
     /** Whether the picker shows hours, minutes, seconds and milliseconds */
     showFullFormat?: boolean;
 };
@@ -118,7 +121,10 @@ function clearSelectedValue(
     setSelection({start: newCursorPosition, end: newCursorPosition});
 }
 
-function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shouldValidate = true, showFullFormat = false}: TimePickerProps, ref: ForwardedRef<TimePickerRef>) {
+function TimePicker(
+    {defaultValue = '', onSubmit, onInputChange = () => {}, shouldValidate = true, shouldValidateFutureTime = true, showFullFormat = false}: TimePickerProps,
+    ref: ForwardedRef<TimePickerRef>,
+) {
     const {numberFormat, translate} = useLocalize();
     const {isExtraSmallScreenHeight} = useResponsiveLayout();
     const styles = useThemeStyles();
@@ -166,12 +172,15 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}, shou
                 setErrorMessage(translate('common.error.invalidTimeRange'));
                 return false;
             }
+            if (!shouldValidateFutureTime) {
+                return true;
+            }
             const isValid = DateUtils.isTimeAtLeastOneMinuteInFuture({timeString, dateTimeString: defaultValue});
             setError(!isValid);
             setErrorMessage(translate('common.error.invalidTimeShouldBeFuture'));
             return isValid;
         },
-        [shouldValidate, hours, minutes, amPmValue, defaultValue, translate],
+        [shouldValidate, hours, minutes, amPmValue, shouldValidateFutureTime, defaultValue, translate],
     );
 
     const resetHours = () => {