From b394b86efa89322c3ed960851e31a1e547c18912 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 22 May 2017 13:13:40 +0100
Subject: [PATCH] Post Schedule: Prefill the post schedule modal

---
 editor/sidebar/post-schedule/clock.js | 6 +++---
 editor/sidebar/post-schedule/index.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/editor/sidebar/post-schedule/clock.js b/editor/sidebar/post-schedule/clock.js
index 50ddb27bf45a64..209ce274e42ef7 100644
--- a/editor/sidebar/post-schedule/clock.js
+++ b/editor/sidebar/post-schedule/clock.js
@@ -5,9 +5,9 @@ import { __ } from 'i18n';
 import Button from 'components/button';
 
 function PostScheduleClock( { is12Hour, selected, onChange } ) {
-	const minutes = selected ? selected.format( 'mm' ) : '';
-	const am = selected ? selected.format( 'A' ) : 'AM';
-	const hours = selected ? selected.format( is12Hour ? 'hh' : 'HH' ) : '';
+	const minutes = selected.format( 'mm' );
+	const am = selected.format( 'A' );
+	const hours = selected.format( is12Hour ? 'hh' : 'HH' );
 
 	const updateHours = ( event ) => {
 		const value = parseInt( event.target.value, 10 );
diff --git a/editor/sidebar/post-schedule/index.js b/editor/sidebar/post-schedule/index.js
index f61f33f10251ed..7af2ae10d5423f 100644
--- a/editor/sidebar/post-schedule/index.js
+++ b/editor/sidebar/post-schedule/index.js
@@ -42,8 +42,8 @@ class PostSchedule extends Component {
 
 	render() {
 		const { date, onUpdateDate } = this.props;
-		const momentDate = date ? moment( date ) : date;
-		const label = momentDate
+		const momentDate = date ? moment( date ) : moment();
+		const label = date
 			? dateI18n( settings.formats.datetime, date )
 			: __( 'Immediately' );
 		const handleChange = ( newDate ) => {