diff --git a/src/components/basicHeader/view/basicHeaderView.js b/src/components/basicHeader/view/basicHeaderView.js
index 95fc53c19..5d7b7968e 100644
--- a/src/components/basicHeader/view/basicHeaderView.js
+++ b/src/components/basicHeader/view/basicHeaderView.js
@@ -194,7 +194,7 @@ class BasicHeaderView extends Component {
                 <DatePicker
                   style={{ width: 50 }}
                   date={datePickerValue}
-                  mode="date"
+                  mode={datePickerValue ? 'time' : 'date'}
                   format="YYYY-MM-DD"
                   minDate={moment()}
                   maxDate="3000-06-01"
diff --git a/src/components/dateTimePicker/view/dateTimePickerStyles.js b/src/components/dateTimePicker/view/dateTimePickerStyles.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/dateTimePicker/view/dateTimePickerView.js b/src/components/dateTimePicker/view/dateTimePickerView.js
new file mode 100644
index 000000000..c60a8855b
--- /dev/null
+++ b/src/components/dateTimePicker/view/dateTimePickerView.js
@@ -0,0 +1,22 @@
+import React, { useState } from 'react';
+import { View } from 'react-native';
+
+// Styles
+import styles from './dateTimePickerStyles';
+
+const DateTimePickerView = (props) => {
+  const {
+    type,
+    isChecked,
+    onSubmit,
+  } = props;
+
+  const [date, setDate] = useState('');
+  const [time, setTime] = useState('');
+
+  return (
+    <View />
+  );
+};
+
+export default DateTimePickerView;
diff --git a/src/providers/esteem/esteem.js b/src/providers/esteem/esteem.js
index 799020b68..70141f143 100644
--- a/src/providers/esteem/esteem.js
+++ b/src/providers/esteem/esteem.js
@@ -2,6 +2,7 @@ import api from '../../config/api';
 import searchApi from '../../config/search';
 import imageApi from '../../config/imageApi';
 import serverList from '../../config/serverListApi';
+import { jsonStringify } from '../../utils/jsonUtils';
 
 export const getCurrencyRate = currency => api.get(`/currencyRate/${currency.toUpperCase()}/steem`).then(resp => resp.data);
 
diff --git a/src/screens/editor/container/editorContainer.js b/src/screens/editor/container/editorContainer.js
index 53947bba3..ac087125c 100644
--- a/src/screens/editor/container/editorContainer.js
+++ b/src/screens/editor/container/editorContainer.js
@@ -132,13 +132,15 @@ class EditorContainer extends Component {
     } else {
       await getDraftPost(username)
         .then((result) => {
-          this.setState({
-            draftPost: {
-              body: result.body,
-              title: result.title,
-              tags: result.tags.split(','),
-            },
-          });
+          if (result) {
+            this.setState({
+              draftPost: {
+                body: result.body,
+                title: result.title,
+                tags: result.tags.split(','),
+              },
+            });
+          }
         });
     }
   };