refactor: move footer mode flags into ConfirmationFieldsContext by OlimpiaZurek · Pull Request #93047 · Expensify/App

OlimpiaZurek · 2026-06-09T11:30:36Z

Explanation of Change

This PR moves the expense-mode flags out of the prop chain on MoneyRequestConfirmationListFooter and into the existing ConfirmationFieldsContext. The footer was drilling them down to its sectionsand field groups even though they don't change during the flow — classic prop drilling for values that already had a natural home.

Fixed Issues

$ #90385
PROPOSAL:

Tests

FAB → Create expense → Manual. Enter an amount, pick a participant, reach the confirmation page.
Verify the confirmation page renders all expected fields (Amount, Merchant, Description, Date, Category/Tag/Tax for the workspace) and that each field is editable.
Add a receipt (or run a Scan expense) and verify the receipt thumbnail renders at the top.
Create a Distance expense with two waypoints and verify the route map renders on the confirmation page (
Submit and verify the expense is created correctly.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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

OlimpiaZurek · 2026-06-09T11:53:16Z

@codex

chatgpt-codex-connector · 2026-06-09T11:55:48Z

Codex Review: Didn't find any major issues. Bravo.

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

melvin-bot · 2026-06-10T12:46:30Z

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

melvin-bot · 2026-06-10T12:46:36Z

@Julesssss @cristipaval One of you needs to 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]

ShridharGoel · 2026-06-10T13:36:22Z

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 there are no new alerts related to the canBeMissing param for useOnyx
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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- 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)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
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)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
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.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
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

Screen.Recording.2026-06-16.at.2.05.56.AM.mov

iOS: mWeb Safari

Screen.Recording.2026-06-16.at.2.08.23.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-16.at.2.04.00.AM.mov

ShridharGoel · 2026-06-10T17:00:05Z

 };

-type PerDiemSectionContentProps = Omit<PerDiemSectionProps, 'isPerDiemRequest'>;
+type PerDiemSectionContentProps = PerDiemSectionProps;


Can't we use PerDiemSectionProps directly?

Good catch, fixed

codecov · 2026-06-11T09:21:38Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
...onents/MoneyRequestConfirmationFields/Provider.tsx	`100.00% <100.00%> (ø)`
...mponents/MoneyRequestConfirmationFields/context.ts	`80.00% <ø> (ø)`
.../components/MoneyRequestConfirmationListFooter.tsx	`100.00% <100.00%> (ø)`
...stConfirmationListFooter/ConfirmationFieldList.tsx	`94.73% <100.00%> (ø)`
...firmationListFooter/fieldGroups/SettingsFields.tsx	`100.00% <100.00%> (ø)`
...istFooter/fieldGroups/TransactionDetailsFields.tsx	`100.00% <100.00%> (ø)`
...irmationListFooter/sections/DistanceMapSection.tsx	`92.30% <100.00%> (ø)`
...ConfirmationListFooter/sections/ReceiptSection.tsx	`92.59% <100.00%> (ø)`
...ConfirmationListFooter/sections/PerDiemSection.tsx	`33.33% <66.66%> (ø)`
... and 10 files with indirect coverage changes

OlimpiaZurek · 2026-06-12T12:33:02Z

@ShridharGoel I addressed your comment. Could you take a second look when you get a chance? Thanks!

ShridharGoel · 2026-06-12T14:11:38Z

Sure

ShridharGoel · 2026-06-12T15:33:21Z

@OlimpiaZurek Can you add the test steps in the description?

ShridharGoel · 2026-06-12T17:10:49Z

Getting not found page when tapping on categories

Screen.Recording.2026-06-12.at.10.40.21.PM.mov

OlimpiaZurek · 2026-06-15T10:48:08Z

@OlimpiaZurek Can you add the test steps in the description?

Added

OlimpiaZurek · 2026-06-15T10:50:58Z

Getting not found page when tapping on categories

Screen.Recording.2026-06-12.at.10.40.21.PM.mov

I looked into it and the root cause turned out to be that my branch was behind main. This PR doesn't touch routing, so it wasn't related to the refactor itself. I've now synced with main and it works as expected. Could you re-test on the updated branch?

cristipaval · 2026-06-16T10:47:40Z

on you now, @Julesssss

github-actions · 2026-06-17T01:37:53Z

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

OSBotify · 2026-06-17T01:42:09Z

✋ 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-06-17T01:43:21Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-8a1752c0099-136c658-80cb7162da7abf7d5ade0e0e6ef690e30128b558/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-8a1752c-136c658-08188f56c4fd9e006affbdf8bdcc8619894ec254/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-17T18:42:25Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.4.10-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-17T18:44:20Z

Help site review — no changes required

I reviewed the changes in this PR and no updates are required to Expensify's help site files under App/docs/articles.

Why: This is a pure internal refactor. It moves the expense-mode flags (isDistanceRequest, isPerDiemRequest, isTimeRequest, isTypeInvoice, isManualDistanceRequest, isOdometerDistanceRequest, isGPSDistanceRequest) out of the prop chain on MoneyRequestConfirmationListFooter and into the existing ConfirmationFieldsContext. There is no change to user-facing behavior, UI, feature names, labels, or flows — only how internal components receive these values.

Since there is no behavioral or UI change for end users, no draft help site PR was created.

@OlimpiaZurek, please confirm whether you agree that no help site changes are needed. If you believe a doc update is warranted, let me know and I'll create the draft PR.

OSBotify · 2026-06-18T00:18:33Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.4.12-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-18T00:21:09Z

🤖 No help site changes required.

This PR is a pure internal refactor: it moves the expense-mode flags (isDistanceRequest, isPerDiemRequest, isTimeRequest, isTypeInvoice, isManualDistanceRequest, isOdometerDistanceRequest, isGPSDistanceRequest) out of the MoneyRequestConfirmationListFooter prop chain and into the existing ConfirmationFieldsContext.

The change is limited to how these values are passed between components — there is no change to any user-facing behavior, UI, field, label, or flow on the expense confirmation page. Since App/docs/articles documents product behavior rather than component architecture, no help site updates are needed, and no draft docs PR has been created.

@OlimpiaZurek, if you believe any user-facing behavior actually changed here that should be reflected on the help site, let me know and I'll create the docs PR.

OSBotify · 2026-06-18T03:04:08Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.4.14-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-06-18T17:14:53Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.14-1 🚀

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

refactor: move footer mode flags into ConfirmationFieldsContext

f6886c8

melvin-bot Bot assigned OlimpiaZurek Jun 9, 2026

OlimpiaZurek mentioned this pull request Jun 9, 2026

[Due for payment 2026-06-25] [Tracking] Refactor MoneyRequestConfirmationListFooter to reduce re-renders #90385

Closed

OlimpiaZurek added 2 commits June 9, 2026 15:54

Merge branch 'main' into refactor/footer-mode-flags-to-context

e52f406

Merge branch 'main' into refactor/footer-mode-flags-to-context

715ca33

OlimpiaZurek marked this pull request as ready for review June 10, 2026 12:46

OlimpiaZurek requested review from a team as code owners June 10, 2026 12:46

melvin-bot Bot requested review from ShridharGoel and heyjennahay June 10, 2026 12:46

melvin-bot Bot requested review from a team, Julesssss and cristipaval and removed request for a team June 10, 2026 12:46

ShridharGoel reviewed Jun 10, 2026

View reviewed changes

OlimpiaZurek added 2 commits June 11, 2026 11:14

drop redundant alias

3018149

Merge branch 'main' into refactor/footer-mode-flags-to-context

46dd3fb

Merge branch 'main' into refactor/footer-mode-flags-to-context

9f13440

ShridharGoel approved these changes Jun 15, 2026

View reviewed changes

cristipaval approved these changes Jun 16, 2026

View reviewed changes

Julesssss approved these changes Jun 17, 2026

View reviewed changes

Julesssss merged commit 8a1752c into Expensify:main Jun 17, 2026
35 checks passed

OSBotify mentioned this pull request Jun 17, 2026

Deploy Checklist: New Expensify 2026-06-17 #93863

Closed

67 tasks

Uh oh!

Conversation

OlimpiaZurek commented Jun 9, 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!

OlimpiaZurek commented Jun 9, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 9, 2026

Uh oh!

melvin-bot Bot commented Jun 10, 2026

Uh oh!

melvin-bot Bot commented Jun 10, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ShridharGoel Jun 10, 2026

Choose a reason for hiding this comment

Uh oh!

OlimpiaZurek Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Jun 11, 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!

OlimpiaZurek commented Jun 12, 2026

Uh oh!

ShridharGoel commented Jun 12, 2026

Uh oh!

ShridharGoel commented Jun 12, 2026

Uh oh!

ShridharGoel commented Jun 12, 2026

Uh oh!

OlimpiaZurek commented Jun 15, 2026

Uh oh!

OlimpiaZurek commented Jun 15, 2026

Uh oh!

cristipaval commented Jun 16, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 17, 2026

Uh oh!

OSBotify commented Jun 17, 2026

Uh oh!

github-actions Bot commented Jun 17, 2026

Uh oh!

OSBotify commented Jun 17, 2026

Uh oh!

MelvinBot commented Jun 17, 2026

Help site review — no changes required

Uh oh!

OSBotify commented Jun 18, 2026

Uh oh!

MelvinBot commented Jun 18, 2026

Uh oh!

OSBotify commented Jun 18, 2026

Uh oh!

OSBotify commented Jun 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

OlimpiaZurek commented Jun 9, 2026 •

edited

Loading

ShridharGoel commented Jun 10, 2026 •

edited

Loading

codecov Bot commented Jun 11, 2026 •

edited by github-actions Bot

Loading