Skip to content

Title field is not grayed out when edited offline #45969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aldo-expensify merged 5 commits into from
Jul 24, 2024
Merged

Title field is not grayed out when edited offline #45969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10c76cc
add reportName handling into titleField for ReportDetailsPage
cdOut Jul 22, 2024
488f8c8
fix prettier
cdOut Jul 22, 2024
c729ac3
refactor clearReportFieldErrors to use fieldKey instead
cdOut Jul 23, 2024
abd8ed8
Merge branch 'main' into @cdOut/title-field-offline
cdOut Jul 23, 2024
530343f
remove unused method to clear errors
cdOut Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/ReportActionItem/MoneyReportView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function MoneyReportView({report, policy, isCombinedReport = false, shouldShowTo
errors={report.errorFields?.[fieldKey]}
errorRowStyles={styles.ph5}
key={`menuItem-${fieldKey}`}
onClose={() => reportActions.clearReportFieldErrors(report.reportID, reportField)}
onClose={() => reportActions.clearReportFieldKeyErrors(report.reportID, fieldKey)}
>
<MenuItemWithTopDescription
description={Str.UCFirst(reportField.name)}
Expand Down
5 changes: 2 additions & 3 deletions src/libs/actions/Report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,8 +1838,7 @@ function updateReportName(reportID: string, value: string, previousValue: string
API.write(WRITE_COMMANDS.SET_REPORT_NAME, parameters, {optimisticData, failureData, successData});
}

function clearReportFieldErrors(reportID: string, reportField: PolicyReportField) {
const fieldKey = ReportUtils.getReportFieldKey(reportField.fieldID);
function clearReportFieldKeyErrors(reportID: string, fieldKey: string) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
pendingFields: {
[fieldKey]: null,
Expand Down Expand Up @@ -3887,7 +3886,7 @@ export {
updateReportField,
updateReportName,
deleteReportField,
clearReportFieldErrors,
clearReportFieldKeyErrors,
resolveActionableMentionWhisper,
resolveActionableReportMentionWhisper,
updateRoomVisibility,
Expand Down
11 changes: 8 additions & 3 deletions src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,11 +633,16 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD

const nameSectionTitleField = titleField && (
<OfflineWithFeedback
pendingAction={report.pendingFields?.[fieldKey]}
errors={report.errorFields?.[fieldKey]}
pendingAction={report.pendingFields?.[fieldKey] ?? report.pendingFields?.reportName}
errors={report.errorFields?.[fieldKey] ?? report.errorFields?.reportName}
errorRowStyles={styles.ph5}
key={`menuItem-${fieldKey}`}
onClose={() => Report.clearReportFieldErrors(report.reportID, titleField)}
onClose={() => {
if (report.errorFields?.reportName) {
Report.clearPolicyRoomNameErrors(report.reportID);
}
Report.clearReportFieldKeyErrors(report.reportID, fieldKey);
}}
>
<View style={[styles.flex1]}>
<MenuItemWithTopDescription
Expand Down