From cef44b29d3cc89f15b1b0301aeec3b1c351a8438 Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Tue, 16 Dec 2025 09:08:17 +0800
Subject: [PATCH 1/4] Fix: Text Report title and Customize report titles are
 not grayed out while creating workspace in offline

---
 .../workspace/reports/WorkspaceReportsPage.tsx  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/pages/workspace/reports/WorkspaceReportsPage.tsx b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
index 272f3c22fea1..b030d4cfe2ae 100644
--- a/src/pages/workspace/reports/WorkspaceReportsPage.tsx
+++ b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
@@ -197,14 +197,21 @@ function WorkspaceReportFieldsPage({
                     <ScrollView contentContainerStyle={[styles.flexGrow1, styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                         <Section
                             isCentralPane
-                            title={translate('workspace.common.reportTitle')}
+                            renderTitle={() => (
+                                <OfflineWithFeedback pendingAction={reportTitlePendingFields.defaultValue}>
+                                    <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]}>
+                                        {translate('workspace.common.reportTitle')}
+                                    </Text>
+                                </OfflineWithFeedback>
+                            )}
                             renderSubtitle={() => (
-                                <View style={[[styles.renderHTML, styles.mt1]]}>
-                                    <RenderHTML html={translate('workspace.reports.customReportNamesSubtitle')} />
-                                </View>
+                                <OfflineWithFeedback pendingAction={reportTitlePendingFields.defaultValue}>
+                                    <View style={[[styles.renderHTML, styles.mt1]]}>
+                                        <RenderHTML html={translate('workspace.reports.customReportNamesSubtitle')} />
+                                    </View>
+                                </OfflineWithFeedback>
                             )}
                             containerStyles={shouldUseNarrowLayout ? styles.p5 : styles.p8}
-                            titleStyles={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]}
                         >
                             <OfflineWithFeedback
                                 pendingAction={reportTitlePendingFields.defaultValue}

From 0a80373231ffb8176b813a5d1ed6943f1443d783 Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Tue, 16 Dec 2025 11:59:56 +0800
Subject: [PATCH 2/4] Fix: Text Report title and Customize report titles are
 not grayed out while creating workspace in offline

---
 src/pages/workspace/reports/WorkspaceReportsPage.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/workspace/reports/WorkspaceReportsPage.tsx b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
index b030d4cfe2ae..884e4b522612 100644
--- a/src/pages/workspace/reports/WorkspaceReportsPage.tsx
+++ b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
@@ -198,14 +198,14 @@ function WorkspaceReportFieldsPage({
                         <Section
                             isCentralPane
                             renderTitle={() => (
-                                <OfflineWithFeedback pendingAction={reportTitlePendingFields.defaultValue}>
+                                <OfflineWithFeedback pendingAction={policy?.pendingAction}>
                                     <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]}>
                                         {translate('workspace.common.reportTitle')}
                                     </Text>
                                 </OfflineWithFeedback>
                             )}
                             renderSubtitle={() => (
-                                <OfflineWithFeedback pendingAction={reportTitlePendingFields.defaultValue}>
+                                <OfflineWithFeedback pendingAction={policy?.pendingAction}>
                                     <View style={[[styles.renderHTML, styles.mt1]]}>
                                         <RenderHTML html={translate('workspace.reports.customReportNamesSubtitle')} />
                                     </View>
@@ -214,7 +214,7 @@ function WorkspaceReportFieldsPage({
                             containerStyles={shouldUseNarrowLayout ? styles.p5 : styles.p8}
                         >
                             <OfflineWithFeedback
-                                pendingAction={reportTitlePendingFields.defaultValue}
+                                pendingAction={reportTitlePendingFields.defaultValue || policy?.pendingAction}
                                 shouldForceOpacity={!!reportTitlePendingFields.defaultValue}
                                 errors={reportTitleErrors}
                                 errorRowStyles={[styles.mh0]}
@@ -230,7 +230,7 @@ function WorkspaceReportFieldsPage({
                                 />
                             </OfflineWithFeedback>
                             <ToggleSettingOptionRow
-                                pendingAction={reportTitlePendingFields.deletable}
+                                pendingAction={reportTitlePendingFields.deletable || policy?.pendingAction}
                                 title={translate('workspace.reports.preventMembersFromChangingCustomNamesTitle')}
                                 switchAccessibilityLabel={translate('workspace.reports.preventMembersFromChangingCustomNamesTitle')}
                                 wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3]}

From 603950f0e986edb3ce7d675b9df6524b30b7f3d8 Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Tue, 16 Dec 2025 12:44:46 +0800
Subject: [PATCH 3/4] lint fix

---
 src/pages/workspace/reports/WorkspaceReportsPage.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/reports/WorkspaceReportsPage.tsx b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
index ebd888bab80f..a20220c766c9 100644
--- a/src/pages/workspace/reports/WorkspaceReportsPage.tsx
+++ b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
@@ -214,7 +214,7 @@ function WorkspaceReportFieldsPage({
                             containerStyles={shouldUseNarrowLayout ? styles.p5 : styles.p8}
                         >
                             <OfflineWithFeedback
-                                pendingAction={reportTitlePendingFields.defaultValue || policy?.pendingAction}
+                                pendingAction={reportTitlePendingFields.defaultValue ?? policy?.pendingAction}
                                 shouldForceOpacity={reportTitlePendingFields.defaultValue === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}
                                 errors={reportTitleErrors}
                                 errorRowStyles={[styles.mh0]}
@@ -230,7 +230,7 @@ function WorkspaceReportFieldsPage({
                                 />
                             </OfflineWithFeedback>
                             <ToggleSettingOptionRow
-                                pendingAction={reportTitlePendingFields.deletable || policy?.pendingAction}
+                                pendingAction={reportTitlePendingFields.deletable ?? policy?.pendingAction}
                                 title={translate('workspace.reports.preventMembersFromChangingCustomNamesTitle')}
                                 switchAccessibilityLabel={translate('workspace.reports.preventMembersFromChangingCustomNamesTitle')}
                                 wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3]}

From 7e5796f9012359a7b0c06d0a4aaed1fe9fd86da6 Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Tue, 16 Dec 2025 13:27:54 +0800
Subject: [PATCH 4/4] Memoize renderTitle and renderSubtitle

---
 .../reports/WorkspaceReportsPage.tsx          | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/pages/workspace/reports/WorkspaceReportsPage.tsx b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
index a20220c766c9..1c9adf70fdef 100644
--- a/src/pages/workspace/reports/WorkspaceReportsPage.tsx
+++ b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
@@ -168,6 +168,26 @@ function WorkspaceReportFieldsPage({
 
     const toggleTitleStyle = useMemo(() => [styles.pv2, styles.pr3], [styles.pv2, styles.pr3]);
 
+    const renderReportTitle = useCallback(
+        () => (
+            <OfflineWithFeedback pendingAction={policy?.pendingAction}>
+                <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]}>{translate('workspace.common.reportTitle')}</Text>
+            </OfflineWithFeedback>
+        ),
+        [policy?.pendingAction, styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1, translate],
+    );
+
+    const renderReportSubtitle = useCallback(
+        () => (
+            <OfflineWithFeedback pendingAction={policy?.pendingAction}>
+                <View style={[[styles.renderHTML, styles.mt1]]}>
+                    <RenderHTML html={translate('workspace.reports.customReportNamesSubtitle')} />
+                </View>
+            </OfflineWithFeedback>
+        ),
+        [policy?.pendingAction, styles.renderHTML, styles.mt1, translate],
+    );
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
@@ -197,20 +217,8 @@ function WorkspaceReportFieldsPage({
                     <ScrollView contentContainerStyle={[styles.flexGrow1, styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                         <Section
                             isCentralPane
-                            renderTitle={() => (
-                                <OfflineWithFeedback pendingAction={policy?.pendingAction}>
-                                    <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]}>
-                                        {translate('workspace.common.reportTitle')}
-                                    </Text>
-                                </OfflineWithFeedback>
-                            )}
-                            renderSubtitle={() => (
-                                <OfflineWithFeedback pendingAction={policy?.pendingAction}>
-                                    <View style={[[styles.renderHTML, styles.mt1]]}>
-                                        <RenderHTML html={translate('workspace.reports.customReportNamesSubtitle')} />
-                                    </View>
-                                </OfflineWithFeedback>
-                            )}
+                            renderTitle={renderReportTitle}
+                            renderSubtitle={renderReportSubtitle}
                             containerStyles={shouldUseNarrowLayout ? styles.p5 : styles.p8}
                         >
                             <OfflineWithFeedback