diff --git a/src/app/components/forms/FormDatePicker.js b/src/app/components/forms/FormDatePicker.js
index ce44d7a..753513c 100644
--- a/src/app/components/forms/FormDatePicker.js
+++ b/src/app/components/forms/FormDatePicker.js
@@ -23,8 +23,6 @@ const FormDatePicker = (props) => {
   const [mode, setMode] = useState("date");
   const [time, setTime] = useState(moment(defaultDate));
 
-  //-------------------------- Time picker ainda não está habilitado pra ios  --------------------------------
-
   const onChange = (e, selectedDate) => {
     setAuxDate(moment(selectedDate)); // variavel auxiliar para não alterar a data com a rolagem, apenas com o done
   };
@@ -51,14 +49,20 @@ const FormDatePicker = (props) => {
   };
 
   const onDonePress = () => {
-    setDate(moment(auxDate)); //atualizar a data com a variável auxiliar
-    props.onDateChange(auxDate);
     setShow(false);
-  };
 
-  const formatDate = (date, time) => {
-    time.getHours();
-    time.getMinuts();
+    if (mode == "date") {
+        setDate(moment(auxDate)); //atualizar a data com a variável auxiliar
+        props.onDateChange(auxDate);
+        setMode("time");
+        setShow(true); // to show the picker again in time mode
+      } 
+      else {
+        setTime(moment(auxDate));
+        props.onTimeChange(auxDate);
+        setShow(false);
+        setMode("date");
+      }
   };
 
   const renderDatePicker = () => {