From aebb437303f0dae43441711ea5cfbed0a08dadb1 Mon Sep 17 00:00:00 2001 From: DylanDylann Date: Tue, 9 Dec 2025 22:12:04 +0700 Subject: [PATCH 1/4] fix-77145 --- src/libs/ReportUtils.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index a605f50a9aaf..4dfd6c172038 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -6840,13 +6840,6 @@ function getExpenseReportStateAndStatus(policy: OnyxEntry, isEmptyOptimi }; } - if (isInstantSubmitEnabledLocal) { - return { - stateNum: CONST.REPORT.STATE_NUM.SUBMITTED, - statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED, - }; - } - return { stateNum: CONST.REPORT.STATE_NUM.OPEN, statusNum: CONST.REPORT.STATUS_NUM.OPEN, From 9413848ab5b8c70bd424018267a6084fff519df2 Mon Sep 17 00:00:00 2001 From: DylanDylann Date: Wed, 10 Dec 2025 00:27:55 +0700 Subject: [PATCH 2/4] update --- src/libs/ReportUtils.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index f8370d161228..bebbb70d91bb 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -6846,6 +6846,13 @@ function getExpenseReportStateAndStatus(policy: OnyxEntry, isEmptyOptimi }; } + if (isInstantSubmitEnabledLocal && !isEmptyOptimisticReport) { + return { + stateNum: CONST.REPORT.STATE_NUM.SUBMITTED, + statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED, + }; + } + return { stateNum: CONST.REPORT.STATE_NUM.OPEN, statusNum: CONST.REPORT.STATUS_NUM.OPEN, From 6959dd41ac844ab11f8f02c40da01a5f4761255f Mon Sep 17 00:00:00 2001 From: DylanDylann Date: Wed, 10 Dec 2025 00:34:49 +0700 Subject: [PATCH 3/4] prettier --- src/libs/ReportUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index bebbb70d91bb..403767209085 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -6846,7 +6846,7 @@ function getExpenseReportStateAndStatus(policy: OnyxEntry, isEmptyOptimi }; } - if (isInstantSubmitEnabledLocal && !isEmptyOptimisticReport) { + if (isInstantSubmitEnabledLocal && !isEmptyOptimisticReport) { return { stateNum: CONST.REPORT.STATE_NUM.SUBMITTED, statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED, From ba6bc3e33e09f371d8175299feff0358427b7793 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Tue, 9 Dec 2025 22:51:59 -0800 Subject: [PATCH 4/4] ESLint again --- src/libs/ReportUtils.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index b98ffd1a583c..3c539b840f65 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -131,6 +131,7 @@ import {rand64} from './NumberUtils'; import Parser from './Parser'; import {getParsedMessageWithShortMentions} from './ParsingUtils'; import Permissions from './Permissions'; +import {getReportName as getReportNameReportNameUtils} from '@libs/ReportNameUtils'; import { getAccountIDsByLogins, getDisplayNameOrDefault, @@ -7025,7 +7026,7 @@ function getMovedTransactionMessage(action: ReportAction) { const fromReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${fromReportID}`]; const report = fromReport ?? toReport; - const reportName = getReportName(report) ?? report?.reportName ?? ''; + const reportName = getReportNameReportNameUtils(report) ?? report?.reportName ?? ''; let reportUrl = getReportURLForCurrentContext(report?.reportID); if (typeof fromReportID === 'undefined') { // eslint-disable-next-line @typescript-eslint/no-deprecated @@ -7054,7 +7055,7 @@ function getUnreportedTransactionMessage(action: ReportAction) { const fromReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${fromReportID}`]; - const reportName = getReportName(fromReport) ?? fromReport?.reportName ?? ''; + const reportName = getReportNameReportNameUtils(fromReport) ?? fromReport?.reportName ?? ''; let reportUrl = `${environmentURL}/r/${fromReport?.reportID}`;