[CP Staging] Fix invoice field visibility, count, and name collision issues by mollfpr · Pull Request #100850 · Expensify/App

mollfpr · 2026-09-10T13:42:46Z

Explanation of Change

The fix badge kept showing on paid invoices when a report field was empty, because the check that hides the badge for settled reports only applied to expense reports, not invoices. Now it applies to both.
The Copy settings page did not show the invoice field count, and hid the Invoices row entirely when the workspace had no bank account or company info. It now counts and shows invoice fields the same way the Duplicate workspace page already does.
An invoice field disappeared if you later created a report field with the same name. The backend stores fields by name only, not by target, so the two fields collided and the second one overwrote the first. The name uniqueness check now blocks this across both invoice and report fields, like it did before invoice fields existed.

Fixed Issues

$ #100790
$ #100772
$ #100756
PROPOSAL:

Tests

Fix badge is displayed for paid invoices in LHN when the report field is missing

Launch app
Keep login 2 account via track business expenses
In account B - enable invoice and enter invoice details
Send invoice to account A
Enable invoice field toggle and add a text field without entering initial value
Go to LHN and note Fix badge is shown
Open account A and pay the invoice
Open account B and note LHN shows fix badge in paid invoice
Open the invoice details and recheck lhn and note Fix badge is shown
Verify Fix badge is not displayed for paid invoices in LHN

On Copy settings RHP, Invoices menu item does not show "1 invoice fields"

Precondition:

Create two workspaces - A and B.
Enable Invoice in workspace A.
Enter Company name and website in workspace A settings > Invoices.
Create at least one invoice field in workspace A settings > Invoices.

Go to staging.new.expensify.com
Go to Workspaces tab.
Click 3-dot menu on workspace A > Duplicate workspace.
Click Next.
→ Invoices menu item shows "1 invoice fields".
Close the RHP.
Click 3-dot menu on workspace A > Copy settings.
Select workspace B > Next.
Verify Invoices menu item will show "1 invoice fields"

Invoice field disappears after creating the same report field with the same name

Precondition:

Enable Invoices in workspace settings.

Go to staging.new.expensify.com
Go to workspace settings > Invoices.
Enable Invoice fields and upgrade workspace if needed.
Click Add field.
Create a text report field.
Go to workspace settings > Reports.
Enable Report fields.
Click Add field.
Create a text report field with the same name as invoice text field in Step 5.
Verify adding the same name with existing invoice field is rejected

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Fix badge is displayed for paid invoices in LHN when the report field is missing

Fix.100790.mp4

On Copy settings RHP, Invoices menu item does not show "1 invoice fields"

Invoice field disappears after creating the same report field with the same name

Fix.100756.mp4

codecov · 2026-09-10T13:46:32Z

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/libs/ReportUtils.ts	`87.26% <100.00%> (+0.02%)`	⬆️
...ySettings/CopyPolicySettingsSelectFeaturesPage.tsx	`80.24% <66.66%> (-0.26%)`	⬇️
src/pages/workspace/fields/CreateFieldsPage.tsx	`0.00% <0.00%> (ø)`
... and 15 files with indirect coverage changes

…rgets

…blockers

melvin-bot · 2026-09-10T14:16:33Z

@rojiphil 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]

…blockers

ShridharGoel · 2026-09-10T15:27:40Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-09-10.at.8.56.46.PM.mov

ShridharGoel

Thanks

rojiphil

Thanks @ShridharGoel for chipping in. Changes LGTM too.

Just that it seems strange to prevent same name for report and invoice.
@mollfpr Is this a BE limitation or is this intentional?

[CP Staging] Fix invoice field visibility, count, and name collision issues (cherry picked from commit 386d199) (cherry-picked to staging by mountiny)

OSBotify · 2026-09-10T16:59:27Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-09-10T16:59:47Z

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

github-actions · 2026-09-10T17:03:44Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #100850.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-386d199-a8337d6-0c2241717482ed3134f864bcd9069b53359cae1e/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-386d199-a8337d6-40b17046e4ccb5f0c803aac4217a19646b655f39/index.html

Web 🕸️
https://100850.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

os-botify · 2026-09-10T17:29:56Z

🔁 Filed a Staging retest request for deploy blockers #100790, #100772, #100756 after this PR was cherry-picked to staging.

OSBotify · 2026-09-10T17:30:29Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.4.75-2 🚀

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

MelvinBot · 2026-09-10T17:58:54Z

🤖 Yes — help site changes are required. Draft PR: #100873

Two of the three fixes here change what users see, and the help site has no article covering invoice fields at all.

Change in this PR	Help site impact
Name uniqueness now spans invoice and report fields	Required. Users hit `A report field with this name already exists` with no field of that name on the page they're on. Nothing documented this.
Copy settings now counts invoice fields and shows the Invoices row without invoicing details	Required. No article said invoice fields are copied. `Duplicate-Workspace.md` only said invoicing details are not copied, which reads as "nothing invoice-related carries over."
`Fix` badge hidden on paid invoices in the LHN	None. Restores intended behavior; no documented behavior changes.

What the docs PR does

Adds docs/articles/new-expensify/workspaces/Add-Invoice-Fields.md — enabling Invoices and Invoice fields, adding a field, the shared name rule, editing and deleting, and how invoice fields carry over when settings are copied.
Enable-Report-Fields.md — notes that report field names share the same set of names as invoice fields, with the exact error text.
Copy-Workspace-Settings.md — FAQ confirming invoice fields are copied and the count is shown.
Duplicate-Workspace.md — clarifies invoice fields do carry over.

UI labels verified against a live Control workspace on web

Every label in the articles was checked in the running app, not inferred from source:

More features > Earn section > Invoices toggle
Workspace menu item and page heading: Invoices; toggle: Invoice fields
Add field button; form fields Name and Type; types Text, Date, List
Error text when reusing an invoice field name on a report field: A report field with this name already exists
Select settings page, Invoices row: 1 invoice fields

Articles follow docs/HELPSITE_NAMING_CONVENTIONS.md, docs/HELP_AUTHORING_GUIDELINES.md, and docs/TEMPLATE.md — single # title plus # FAQ, task-based ## headings only, relative links, bolded UI labels in sentence case.

@mollfpr, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

lanitochka17 · 2026-09-10T18:37:44Z

Deploy Blocker #100876 was identified to be related to this PR.

OSBotify · 2026-09-10T22:32:26Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.75-3 🚀

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

Bundle Size Analysis (Sentry):

Android

OSBotify · 2026-09-10T22:51:55Z

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

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

MelvinBot · 2026-09-10T22:59:10Z

🤖 Docs PR already exists — #100873 (draft, HelpDot, assigned to mollfpr). I updated it rather than opening a second one.

What changed since my last comment: deploy blocker #100876 reports that the duplicate-name error names the field type of the page you're on, not the field that actually holds the name. My articles quoted those exact strings, so they would have gone stale the moment that blocker is fixed. I reworded them to describe the error generically and tell users to check both their invoice fields and their report fields — accurate whichever way the copy lands.

Why help site changes are required, and what the PR does

Change in this PR	Help site impact
Name uniqueness now spans invoice and report fields	Required. Users hit a "name already exists" error with no field of that name on the page they're on. Nothing documented this.
Copy settings now counts invoice fields and shows the Invoices row without invoicing details	Required. No article said invoice fields are copied. `Duplicate-Workspace.md` only said invoicing details are not copied, which reads as "nothing invoice-related carries over."
`Fix` badge hidden on paid invoices in the LHN	None. Restores intended behavior; no documented behavior changes.

Files:

Adds docs/articles/new-expensify/workspaces/Add-Invoice-Fields.md — enabling Invoices and Invoice fields, adding a field, the shared name rule, editing and deleting, and how invoice fields carry over when settings are copied.
Enable-Report-Fields.md — notes that report field names share the same set of names as invoice fields.
Copy-Workspace-Settings.md — FAQ confirming invoice fields are copied and the count is shown.
Duplicate-Workspace.md — clarifies invoice fields do carry over.

UI labels verified against a live Control workspace on web: More features > Earn > Invoices; the workspace Invoices page and its Invoice fields toggle; the Add field button with Name and Type; types Text, Date, List; and 1 invoice fields on the Select settings page. Articles follow docs/HELPSITE_NAMING_CONVENTIONS.md, docs/HELP_AUTHORING_GUIDELINES.md, and docs/TEMPLATE.md.

One note on the title: automation prefixed it with [No QA] after creation, so it now reads [No QA] Docs updates for E/A#100850 invoice fields naming, setup, and copying. The required format is intact after that prefix.

@mollfpr, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

OSBotify · 2026-09-11T09:20:23Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.75-3 🚀

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

Bundle Size Analysis (Sentry):

Android

OSBotify · 2026-09-11T21:41:49Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.76-1 🚀

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

Bundle Size Analysis (Sentry):

Android

mollfpr added 3 commits September 10, 2026 20:06

Hide fix badge for paid invoices missing a report field

0db5a28

Add test for unpaid and paid invoice report

0529feb

Show invoice field count on the Copy settings invoices row

a3a4644

mollfpr self-assigned this Sep 10, 2026

Require report field names to be unique across invoice and expense ta…

6815a60

…rgets

mollfpr changed the title ~~Fix invoice field visibility, count, and name collision issues~~ [CP Staging] Fix invoice field visibility, count, and name collision issues Sep 10, 2026

Merge branch 'main' of github.com:Expensify/App into mollfpr-invoice-…

a7db4f2

…blockers

mollfpr marked this pull request as ready for review September 10, 2026 14:16

mollfpr requested review from a team as code owners September 10, 2026 14:16

melvin-bot Bot requested review from dylanexpensify and rojiphil and removed request for a team September 10, 2026 14:16

melvin-bot Bot requested review from a team and removed request for a team September 10, 2026 14:16

mollfpr added 2 commits September 10, 2026 21:20

Fix failing TS checks

f9e02d5

Merge branch 'main' of github.com:Expensify/App into mollfpr-invoice-…

94679b4

…blockers

ShridharGoel approved these changes Sep 10, 2026

View reviewed changes

ShridharGoel requested a review from mountiny September 10, 2026 15:28

rojiphil approved these changes Sep 10, 2026

View reviewed changes

mountiny approved these changes Sep 10, 2026

View reviewed changes

mountiny merged commit 386d199 into main Sep 10, 2026
36 of 39 checks passed

mountiny deleted the mollfpr-invoice-blockers branch September 10, 2026 16:56

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Sep 10, 2026

OSBotify mentioned this pull request Sep 10, 2026

Deploy Checklist: New Expensify 2026-09-09 #100739

Closed

83 tasks done

MelvinBot mentioned this pull request Sep 10, 2026

[No QA] Docs updates for E/A#100850 invoice fields naming, setup, and copying #100873

Closed

39 tasks

applause-bot Bot mentioned this pull request Sep 10, 2026

[Due for payment 2026-09-30] Invoices - Wrong error message when creating invoice field with the same name as report field #100876

Closed

1 of 7 tasks

lanitochka17 mentioned this pull request Sep 10, 2026

[Due for payment 2026-09-17] Invoice - Fix badge is displayed for paid invoices in LHN when the report field is missing. #100790

Closed

2 of 7 tasks

MelvinBot mentioned this pull request Sep 10, 2026

[Due for payment 2026-09-30] Invoices - No option to copy settings when invoice fields are enabled without invoice fields #100879

Closed

3 of 7 tasks

This was referenced Sep 10, 2026

[Due for payment 2026-09-17] Invoice - On Copy settings RHP, Invoices menu item does not show "1 invoice fields" #100772

Closed

[Due for payment 2026-09-17] Invoice - Invoice field disappears after creating the same report field with the same name #100756

Closed

rojiphil mentioned this pull request Oct 1, 2026

[Due for payment 2026-09-30] [$250] Report - Supplier Address & VAT Number report fields are shown in settings but not shown in the report #72584

Closed

8 of 16 tasks

Conversation

mollfpr commented Sep 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Sep 10, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Sep 10, 2026

Uh oh!

ShridharGoel commented Sep 10, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

ShridharGoel left a comment

Choose a reason for hiding this comment

Uh oh!

rojiphil left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Sep 10, 2026

Uh oh!

github-actions Bot commented Sep 10, 2026

Uh oh!

github-actions Bot commented Sep 10, 2026

Uh oh!

os-botify Bot commented Sep 10, 2026

Uh oh!

OSBotify commented Sep 10, 2026

Uh oh!

MelvinBot commented Sep 10, 2026

Uh oh!

lanitochka17 commented Sep 10, 2026

Uh oh!

OSBotify commented Sep 10, 2026

Uh oh!

OSBotify commented Sep 10, 2026

Uh oh!

MelvinBot commented Sep 10, 2026

Uh oh!

OSBotify commented Sep 11, 2026

Uh oh!

OSBotify commented Sep 11, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

mollfpr commented Sep 10, 2026 •

edited

Loading

codecov Bot commented Sep 10, 2026 •

edited by github-actions Bot

Loading