diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 77507164fe03..3b0c6fcf8ca9 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -1,5 +1,5 @@ import _ from 'underscore'; -import {format} from 'date-fns'; +import {format, parseISO} from 'date-fns'; import Str from 'expensify-common/lib/str'; import lodashGet from 'lodash/get'; import lodashIntersection from 'lodash/intersection'; @@ -1344,7 +1344,7 @@ function getModifiedExpenseMessage(reportAction) { const hasModifiedCreated = _.has(reportActionOriginalMessage, 'oldCreated') && _.has(reportActionOriginalMessage, 'created'); if (hasModifiedCreated) { // Take only the YYYY-MM-DD value as the original date includes timestamp - let formattedOldCreated = new Date(reportActionOriginalMessage.oldCreated); + let formattedOldCreated = parseISO(reportActionOriginalMessage.oldCreated); formattedOldCreated = format(formattedOldCreated, CONST.DATE.FNS_FORMAT_STRING); return `changed the request date to ${reportActionOriginalMessage.created} (previously ${formattedOldCreated})`; } diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js index 90b6ca72bd4a..df04bc2cbeef 100644 --- a/src/libs/TransactionUtils.js +++ b/src/libs/TransactionUtils.js @@ -1,5 +1,5 @@ import Onyx from 'react-native-onyx'; -import {format} from 'date-fns'; +import {format, parseISO, isValid} from 'date-fns'; import lodashGet from 'lodash/get'; import _ from 'underscore'; import CONST from '../CONST'; @@ -175,9 +175,11 @@ function getCurrency(transaction) { */ function getCreated(transaction) { const created = lodashGet(transaction, 'modifiedCreated', '') || lodashGet(transaction, 'created', ''); - if (created) { - return format(new Date(created), CONST.DATE.FNS_FORMAT_STRING); + const createdDate = parseISO(created); + if (isValid(createdDate)) { + return format(createdDate, CONST.DATE.FNS_FORMAT_STRING); } + return ''; }