1 files changed, 12 insertions, 10 deletions
diff --git a/src/components/common/TaggDatePicker.tsx b/src/components/common/TaggDatePicker.tsx
index d8010251..059bf620 100644
--- a/src/components/common/TaggDatePicker.tsx
+++ b/src/components/common/TaggDatePicker.tsx
@@ -1,3 +1,4 @@
+import moment from 'moment';
 import React, {useState} from 'react';
 import DatePicker from 'react-native-date-picker';
 
@@ -5,23 +6,24 @@ interface TaggDatePickerProps {
   handleDateUpdate: (_: Date) => void;
   maxDate: Date;
   textColor: string;
+  date: Date | undefined;
 }
 
-const TaggDatePicker: React.FC<TaggDatePickerProps> = ({
-  handleDateUpdate,
-  maxDate,
-  textColor,
-}) => {
-  const [date, setDate] = useState(new Date());
+const TaggDatePicker: React.FC<TaggDatePickerProps> = (props) => {
+  const [date, setDate] = useState(
+    props.date
+      ? new Date(moment(props.date).add(1, 'day').format('YYYY-MM-DD'))
+      : undefined,
+  );
   return (
     <DatePicker
-      date={date}
-      textColor={textColor}
+      date={date ? date : props.maxDate}
+      textColor={props.textColor}
       mode={'date'}
-      maximumDate={maxDate}
+      maximumDate={props.maxDate}
       onDateChange={(newDate) => {
         setDate(newDate);
-        handleDateUpdate(newDate);
+        props.handleDateUpdate(newDate);
       }}
     />
   );