diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js index 75c0cccf0dff..2e9ea66f7fd4 100644 --- a/src/libs/ReportActionsUtils.js +++ b/src/libs/ReportActionsUtils.js @@ -134,6 +134,11 @@ function isConsecutiveActionMadeByPreviousActor(reportActions, actionIndex) { function getLastVisibleAction(reportID, actionsToMerge = {}) { const actions = _.toArray(lodashMerge({}, allReportActions[reportID], actionsToMerge)); const visibleActions = _.filter(actions, action => (!isDeletedAction(action))); + + if (_.isEmpty(visibleActions)) { + return {}; + } + return _.max(visibleActions, action => moment.utc(action.created).valueOf()); } @@ -144,7 +149,8 @@ function getLastVisibleAction(reportID, actionsToMerge = {}) { */ function getLastVisibleMessageText(reportID, actionsToMerge = {}) { const lastVisibleAction = getLastVisibleAction(reportID, actionsToMerge); - const message = lodashGet(lastVisibleAction, ['message', 0]); + const message = lodashGet(lastVisibleAction, ['message', 0], {}); + if (isReportMessageAttachment(message)) { return CONST.ATTACHMENT_MESSAGE_TEXT; }