Skip to content

Commit 748e2a8

Browse files
authored
Merge pull request Expensify#73500 from samranahm/73084/concierge-missing-as-last-actor
2 parents 0619e4c + 1737549 commit 748e2a8

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

src/libs/OptionsListUtils/index.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,11 +438,14 @@ function getLastActorDisplayName(lastActorDetails: Partial<PersonalDetails> | nu
438438
* Should show the last actor display name from last actor details.
439439
*/
440440
function shouldShowLastActorDisplayName(report: OnyxEntry<Report>, lastActorDetails: Partial<PersonalDetails> | null, lastAction: OnyxEntry<ReportAction>) {
441+
const reportID = report?.reportID;
442+
const lastReportAction = reportID ? lastVisibleReportActions[reportID] : lastAction;
443+
441444
if (
442445
!lastActorDetails ||
443446
reportUtilsIsSelfDM(report) ||
444447
(isDM(report) && lastActorDetails.accountID !== currentUserAccountID) ||
445-
lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ||
448+
(lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && lastReportAction?.actorAccountID !== CONST.ACCOUNT_ID.CONCIERGE) ||
446449
(lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW &&
447450
Object.keys(report?.participants ?? {})?.some((participantID) => participantID === CONST.ACCOUNT_ID.MANAGER_MCTEST.toString()))
448451
) {

0 commit comments

Comments
 (0)