diff --git a/mailpoet/assets/js/src/help/tasks-list/tasks-list-actions.tsx b/mailpoet/assets/js/src/help/tasks-list/tasks-list-actions.tsx index 50bafc34ec..d3161b443c 100644 --- a/mailpoet/assets/js/src/help/tasks-list/tasks-list-actions.tsx +++ b/mailpoet/assets/js/src/help/tasks-list/tasks-list-actions.tsx @@ -6,8 +6,6 @@ import { import { MailPoet } from 'mailpoet'; import { useState } from 'react'; import { __, sprintf } from '@wordpress/i18n'; -import parseDate from 'date-fns/parse'; -import { isPast } from 'date-fns'; type TasksListDataRowProps = { id: number; @@ -37,13 +35,11 @@ function TaskButton({ task, type }: Props): JSX.Element { const isCancelButton = type === 'cancel'; const isRescheduleButton = type === 'reschedule'; - let scheduledDate = task.scheduledAt - ? parseDate(task.scheduledAt, 'yyyy-MM-dd HH:mm:ss', new Date()) - : undefined; - if (scheduledDate) { - scheduledDate = MailPoet.Date.adjustForTimezoneDifference(scheduledDate); - } - const isScheduledInPast = isPast(scheduledDate); + const scheduledDate = task.scheduledAt; + const isScheduledInPast = MailPoet.Date.isInPastGmt( + scheduledDate, + new Date().toISOString(), + ); return ( <> diff --git a/mailpoet/assets/js/src/help/tasks-list/tasks-list-data-row.tsx b/mailpoet/assets/js/src/help/tasks-list/tasks-list-data-row.tsx index d2e59a8bce..8893fddd6a 100644 --- a/mailpoet/assets/js/src/help/tasks-list/tasks-list-data-row.tsx +++ b/mailpoet/assets/js/src/help/tasks-list/tasks-list-data-row.tsx @@ -1,5 +1,4 @@ import { MailPoet } from 'mailpoet'; -import parseDate from 'date-fns/parse'; import { CancelTaskButton, RescheduleTaskButton } from './tasks-list-actions'; export type Props = { @@ -28,31 +27,6 @@ function TasksListDataRow({ type, task }: Props): JSX.Element { const canCancelTask = type === 'scheduled' || type === 'running'; const canRescheduleTask = type === 'cancelled'; - let scheduled: Date; - if (showScheduledAt) { - scheduled = parseDate(task.scheduledAt, 'yyyy-MM-dd HH:mm:ss', new Date()); - if (scheduled) { - scheduled = MailPoet.Date.adjustForTimezoneDifference(scheduled); - } - } - - let cancelled: Date; - if (showCancelledAt) { - cancelled = parseDate(task.cancelledAt, 'yyyy-MM-dd HH:mm:ss', new Date()); - if (cancelled) { - cancelled = MailPoet.Date.adjustForTimezoneDifference(cancelled); - } - } - - let updated: Date = parseDate( - task.updatedAt, - 'yyyy-MM-dd HH:mm:ss', - new Date(), - ); - if (updated) { - updated = MailPoet.Date.adjustForTimezoneDifference(updated); - } - return (