Merge branch 'hotfix/2022-02-14' into release/2022-02-18

2022-02-14 19:33:13 -08:00
parent 22e6d596e6 e79b9f9084
commit 680dd98f6d
2 changed files with 13 additions and 10 deletions
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -19,13 +19,14 @@ const DateTimePicker = (
  return (
    <div id={id}>
      <FormDatePicker
-      {...(onlyFuture && {
-        disabledDate: (d) => moment().subtract(1, "day").isAfter(d),
-      })}
-      value={value}
-      onBlur={onBlur}
-      onChange={onChange}
-      {...restProps}
+        {...restProps}
+        {...(onlyFuture && {
+          disabledDate: (d) => moment().subtract(1, "day").isAfter(d),
+        })}
+        value={value}
+        onBlur={onBlur}
+        onChange={onChange}
+        isDateOnly={false}
      />

      <TimePicker