Skip to content

Revert "Restore: Show up to three report fields per row and edit them inline" - #103929

Merged
AndrewGable merged 1 commit into
mainfrom
revert-102142-claude-reportFieldsGridInlineEditing-restore
Oct 13, 2026
Merged

AndrewGable merged 1 commit into
mainfrom
revert-102142-claude-reportFieldsGridInlineEditing-restore

Conversation

@AndrewGable

@AndrewGable AndrewGable commented Oct 13, 2026 •

Copy link
Copy Markdown
Contributor

Straight reverts #102142

$ #103913
$ #103917
$ #103918
$ #103926

@AndrewGable AndrewGable self-assigned this Oct 13, 2026
@AndrewGable
AndrewGable requested review from a team as code owners October 13, 2026 17:40
@melvin-bot

melvin-bot Bot commented Oct 13, 2026

Copy link
Copy Markdown

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

@melvin-bot
melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team October 13, 2026 17:40
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 13, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-13T17:52:19.371879Z 253253c PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@melvin-bot
melvin-bot Bot requested review from Gonals and removed request for a team October 13, 2026 17:40
@melvin-bot

melvin-bot Bot commented Oct 13, 2026

Copy link
Copy Markdown

@Gonals Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@codecov

codecov Bot commented Oct 13, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/CONST/index.ts 95.90% <ø> (ø)
src/components/DatePicker/index.tsx 63.20% <100.00%> (-0.35%) ⬇️
...equestReportView/MoneyRequestReportActionsList.tsx 96.73% <100.00%> (ø)
...estReportView/MoneyRequestReportEmptyStateView.tsx 100.00% <100.00%> (ø)
...nents/Search/FilterDropdowns/FilterPopupButton.tsx 100.00% <100.00%> (ø)
src/libs/ReportFieldOptionsListUtils.ts 96.15% <100.00%> (-3.85%) ⬇️
src/libs/actions/Report/index.ts 73.13% <ø> (ø)
src/styles/index.ts 61.81% <ø> (ø)
...rc/components/ReportActionItem/MoneyReportView.tsx 96.05% <86.36%> (-3.95%) ⬇️
src/pages/EditReportFieldDropdown.tsx 0.00% <0.00%> (-100.00%) ⬇️
... and 2 more
... and 9 files with indirect coverage changes

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

const isReportFieldDeletable = reportField.deletable && reportField?.fieldID !== CONST.REPORT_FIELD_TITLE_FIELD_ID;
if (isReportFieldDeletable) {

P2 Badge Keep deleted required report fields removable

When an administrator deletes a required date field from the workspace, its copy on an existing report can remain with deletable: false. Gating the menu on that stale flag removes the only deletion path, while handleReportFieldChange also ignores an empty value, so the obsolete field remains on the report permanently. Determine removability from whether the field still exists in the policy rather than relying only on the report copy's deletable flag.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +59 to +64
<OfflineWithFeedback
// Need to return undefined when we have pendingAction to avoid the duplicate pending action
pendingAction={pendingAction ? undefined : report?.pendingFields?.[reportField.fieldKey as keyof typeof report.pendingFields]}
errorRowStyles={styles.ph5}
key={`menuItem-${reportField.fieldKey}`}
onClose={() => clearReportFieldKeyErrors(report?.reportID, reportField.fieldKey)}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Pass report-field save errors to the feedback wrapper

When an UpdateReportField request fails after returning from the editor, the failure data writes report.errorFields[fieldKey] and rolls back the optimistic value, but this OfflineWithFeedback no longer receives that error. On multi-expense report views the save therefore appears to silently revert, unlike MoneyReportView, which still passes the same error field. Pass errors={report?.errorFields?.[reportField.fieldKey]} here so users can see and dismiss the failure.

Useful? React with 👍 / 👎.

addBottomSafeAreaPadding: isSmallScreenWidth && !isKeyboardActive,
addOfflineIndicatorBottomSafeAreaPadding: false,
});
const bottomSafeAreaPaddingStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: isSmallScreenWidth && !isKeyboardActive});

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Disable offline-indicator padding inside filter popovers

On a narrow screen while offline, this default enables addOfflineIndicatorBottomSafeAreaPadding, causing the hook to add CONST.OFFLINE_INDICATOR_HEIGHT to the popover content. The filter popover does not render an offline indicator, so users get a spurious blank gap that reduces the usable option-list area. Continue passing addOfflineIndicatorBottomSafeAreaPadding: false for this popover.

Useful? React with 👍 / 👎.

@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

No product review needed

@joekaufmanexpensify
joekaufmanexpensify removed their request for review October 13, 2026 18:19
@AndrewGable
AndrewGable merged commit c456cd8 into main Oct 13, 2026
46 of 50 checks passed
@AndrewGable
AndrewGable deleted the revert-102142-claude-reportFieldsGridInlineEditing-restore branch October 13, 2026 20:14
@github-actions

Copy link
Copy Markdown
Contributor

🚧 AndrewGable has triggered a test Expensify/App build. You can view the workflow run here.

@melvin-bot melvin-bot Bot added the Emergency label Oct 13, 2026
@melvin-bot

melvin-bot Bot commented Oct 13, 2026

Copy link
Copy Markdown

@AndrewGable looks like this was merged without a test passing. These checks had not passed on 253253c when it was merged:

Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@AndrewGable

Copy link
Copy Markdown
Contributor Author

Straight revert, no emergency.

OSBotify pushed a commit that referenced this pull request Oct 13, 2026
…FieldsGridInlineEditing-restore

Revert "Restore: Show up to three report fields per row and edit them inline"

(cherry picked from commit c456cd8)

(cherry-picked to staging by AndrewGable)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Oct 13, 2026
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 9.5.8-4 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This PR reverts Restore: Show up to three report fields per row and edit them inline, which never reached production, and no article in docs/articles describes the three-per-row layout or inline editing of report fields.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.5.8-5 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 9.5.9-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This PR and Restore: Show up to three report fields per row and edit them inline, the change it reverts, both reached production in the same release (9.5.8-5), so users never saw the change, and no article in docs/articles describes the three-per-row layout or inline editing of report fields.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.5.9-4 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

marufsharifi pushed a commit to marufsharifi/App that referenced this pull request Oct 20, 2026
Reverts the revert in Expensify#103929, putting back the changes from Expensify#102142 unchanged so the deploy blockers can be fixed one by one.

Co-authored-by: daledah <daledah@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants