From 0217193a3a77a1fc1fea8e262703e61343effbb3 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Sat, 6 Dec 2025 23:11:02 +0700
Subject: [PATCH] Entire expense report is grayed out after paying expense
 offline on Reports

---
 .../MoneyRequestReportView/MoneyRequestReportView.tsx | 11 +++++++++--
 src/libs/ReportUtils.ts                               |  7 +------
 src/pages/home/ReportScreen.tsx                       |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportView.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportView.tsx
index 75ffcfa28805..90b99e698b41 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportView.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportView.tsx
@@ -206,6 +206,15 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe
 
     return (
         <View style={styles.flex1}>
+            <OfflineWithFeedback
+                pendingAction={reportPendingAction ?? report?.pendingFields?.reimbursed}
+                errors={reportErrors}
+                needsOffscreenAlphaCompositing
+                shouldShowErrorMessages={false}
+            >
+                <HeaderGap />
+                {reportHeaderView}
+            </OfflineWithFeedback>
             <OfflineWithFeedback
                 pendingAction={reportPendingAction}
                 errors={reportErrors}
@@ -215,8 +224,6 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe
                 contentContainerStyle={styles.flex1}
                 errorRowStyles={[styles.ph5, styles.mv2]}
             >
-                <HeaderGap />
-                {reportHeaderView}
                 <View style={[styles.overflowHidden, styles.justifyContentEnd, styles.flex1]}>
                     {shouldDisplayMoneyRequestActionsList ? (
                         <MoneyRequestReportActionsList
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 6dfc7d5dd4fe..18494cf6c7cf 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -10148,12 +10148,7 @@ function getOriginalReportID(reportID: string | undefined, reportAction: OnyxInp
  */
 function getReportOfflinePendingActionAndErrors(report: OnyxEntry<Report>): ReportOfflinePendingActionAndErrors {
     // It shouldn't be possible for all of these actions to be pending (or to have errors) for the same report at the same time, so just take the first that exists
-    const reportPendingAction =
-        report?.pendingFields?.addWorkspaceRoom ??
-        report?.pendingFields?.createChat ??
-        report?.pendingFields?.reimbursed ??
-        report?.pendingFields?.createReport ??
-        report?.pendingFields?.reportName;
+    const reportPendingAction = report?.pendingFields?.addWorkspaceRoom ?? report?.pendingFields?.createChat ?? report?.pendingFields?.createReport ?? report?.pendingFields?.reportName;
     const reportErrors = getCreationReportErrors(report);
     return {reportPendingAction, reportErrors};
 }
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 78cbe3f104c2..d7390908716b 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -952,7 +952,7 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
                     >
                         <DragAndDropProvider isDisabled={isEditingDisabled}>
                             <OfflineWithFeedback
-                                pendingAction={reportPendingAction}
+                                pendingAction={reportPendingAction ?? report?.pendingFields?.reimbursed}
                                 errors={reportErrors}
                                 shouldShowErrorMessages={false}
                                 needsOffscreenAlphaCompositing