Add parseDateAsUTC helper to convert MYSQL to ISO8601

Author: tx2pnw

client/dashboard/me/billing-monetize-subscriptions/monetize-item.tsx

@@ -9,7 +9,7 @@ import { __, sprintf } from '@wordpress/i18n';
 import { isToday } from 'date-fns';
 import SiteIcon from '../../components/site-icon';
 import { Text } from '../../components/text';
-import { formatDate, getRelativeTimeString } from '../../utils/datetime';
+import { formatDate, getRelativeTimeString, parseDateAsUTC } from '../../utils/datetime';
 
 export const MonetizeSubscriptionTerms = ( {
 	subscription,
@@ -22,8 +22,8 @@ export const MonetizeSubscriptionTerms = ( {
 		return <>{ __( 'Never expires' ) }</>;
 	}
 
-	// Check if end_date is in the past (convert to ISO 8601 and append Z to parse as UTC)
-	const endDate = new Date( subscription.end_date.replace( ' ', 'T' ) + 'Z' );
+	// Check if end_date is in the past
+	const endDate = parseDateAsUTC( subscription.end_date );
 	const isExpired = endDate < new Date();
 
 	// Show "Expired" for past dates
@@ -44,14 +44,14 @@ export const MonetizeSubscriptionTerms = ( {
 			{ subscription.renew_interval === null
 				? // translators: %(date)s is the date the subscription expires. Format is LL (e.g. January 1, 2020).
 				  sprintf( __( 'Expires on %(date)s' ), {
-						date: formatDate( new Date( subscription.end_date.replace( ' ', 'T' ) + 'Z' ), locale, {
+						date: formatDate( endDate, locale, {
 							dateStyle: 'long',
 						} ),
 				  } )
 				: // translators: %(amount)s is the renewal price, %(date)s is the date the subscription renews. Format is LL (e.g. January 1, 2020).
 				  sprintf( __( 'Renews at %(amount)s on %(date)s' ), {
 						amount: formatCurrency( Number( subscription.renewal_price ), subscription.currency ),
-						date: formatDate( new Date( subscription.end_date.replace( ' ', 'T' ) + 'Z' ), locale, {
+						date: formatDate( endDate, locale, {
 							dateStyle: 'long',
 						} ),
 				  } ) }

client/dashboard/utils/datetime.ts

@@ -303,3 +303,17 @@ export function formatSiteYmd( date: Date ) {
 	const day = String( date.getDate() ).padStart( 2, '0' );
 	return `${ year }-${ month }-${ day }`;
 }
+
+/**
+ * Parse a date string as UTC, handling MySQL and ISO8601 formats.
+ */
+export function parseDateAsUTC( dateString: string ): Date {
+	// Handle datetime without timezone: "YYYY-MM-DD HH:MM:SS" or "YYYY-MM-DDTHH:MM:SS" (optional microseconds)
+	const match = /^(\d{4}-\d{2}-\d{2})[ T](\d{2}:\d{2}:\d{2}(?:\.\d+)?)$/.exec( dateString.trim() );
+	if ( match ) {
+		return new Date( `${ match[ 1 ] }T${ match[ 2 ] }Z` );
+	}
+
+	// Everything else - pass through unchanged
+	return new Date( dateString );
+}