diff --git a/assets/js/src/help/tasks_list/tasks_list_data_row.jsx b/assets/js/src/help/tasks_list/tasks_list_data_row.jsx
index aa06b7b402..1be1ee70be 100644
--- a/assets/js/src/help/tasks_list/tasks_list_data_row.jsx
+++ b/assets/js/src/help/tasks_list/tasks_list_data_row.jsx
@@ -8,6 +8,9 @@ const TasksListDataRow = (props) => {
if (scheduled) {
scheduled = parseDate(scheduled, 'yyyy-MM-dd HH:mm:ss', new Date());
}
+
+ const updated = parseDate(props.task.updated_at, 'yyyy-MM-dd HH:mm:ss', new Date());
+
return (
@@ -38,7 +41,7 @@ const TasksListDataRow = (props) => {
|
) : null}
- {MailPoet.Date.format(props.task.updated_at * 1000)}
+ {`${MailPoet.Date.short(updated)} ${MailPoet.Date.time(updated)}`}
|
);
@@ -50,7 +53,7 @@ TasksListDataRow.propTypes = {
id: PropTypes.number.isRequired,
type: PropTypes.string.isRequired,
priority: PropTypes.number.isRequired,
- updated_at: PropTypes.number.isRequired,
+ updated_at: PropTypes.string.isRequired,
scheduled_at: PropTypes.string,
status: PropTypes.string,
newsletter: PropTypes.shape({
diff --git a/lib/Tasks/State.php b/lib/Tasks/State.php
index 42db00fd88..1a19cbfa32 100644
--- a/lib/Tasks/State.php
+++ b/lib/Tasks/State.php
@@ -7,7 +7,6 @@ use MailPoet\Models\Newsletter;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\SendingQueue;
use MailPoet\Newsletter\Url as NewsletterUrl;
-use MailPoetVendor\Carbon\Carbon;
class State {
/** @var NewsletterUrl */
@@ -91,7 +90,7 @@ class State {
'id' => (int)$task->id,
'type' => $task->type,
'priority' => (int)$task->priority,
- 'updated_at' => Carbon::createFromTimeString((string)$task->updatedAt)->timestamp,
+ 'updated_at' => $task->updatedAt,
'scheduled_at' => $task->scheduledAt ? $task->scheduledAt : null,
'status' => $task->status,
'newsletter' => (($queue instanceof SendingQueue) && ($newsletter instanceof Newsletter)) ? [
diff --git a/tests/integration/Tasks/StateTest.php b/tests/integration/Tasks/StateTest.php
index 0fbaf9e6d5..93d1b685a4 100644
--- a/tests/integration/Tasks/StateTest.php
+++ b/tests/integration/Tasks/StateTest.php
@@ -31,7 +31,7 @@ class StateTest extends \MailPoetTest {
expect($data[1]['id'])->equals(1);
expect($data[1]['type'])->equals(SendingTask::TASK_TYPE);
expect(is_int($data[1]['priority']))->true();
- expect(is_int($data[1]['updated_at']))->true();
+ expect(is_string($data[1]['updated_at']))->true();
expect($data[1])->hasKey('scheduled_at');
expect($data[1]['status'])->notEmpty();
expect($data[1])->hasKey('newsletter');