Skip to content

Narrow confirmation leaves with selectors#90321

Merged
cristipaval merged 10 commits into
Expensify:mainfrom
callstack-internal:narrow-confirmation-leaves-with-selectors
May 21, 2026
Merged

Narrow confirmation leaves with selectors#90321
cristipaval merged 10 commits into
Expensify:mainfrom
callstack-internal:narrow-confirmation-leaves-with-selectors

Conversation

@OlimpiaZurek
Copy link
Copy Markdown
Contributor

@OlimpiaZurek OlimpiaZurek commented May 12, 2026

Explanation of Change

Follow-up to #90208. Narrows the remaining 10 leaf fields in MoneyRequestConfirmationList/sections/ from full-Transaction subscriptions to selector-scoped slices, so each leaf only re-renders when the specific fields it reads actually change.

  • Adds selectors.ts with one selector per leaf (and factories like createTagDisplaySelector(tagIndex) for index-keyed fields)
  • Adds useTransactionSelector — applies the same selector to both TRANSACTION_DRAFT_${id} and TRANSACTION_${id}, preserving the existing draft-then-existing fallback in a single hook
  • Migrates AmountField, AttendeeField, CategoryField, DateField, DescriptionField, MerchantField, TagFields, TaxFields, TimeFields, ToggleFields to read narrowed slices via the new hook
  • Drops the transaction prop pass-through from ConfirmationFieldListTransactionDetailsFields / ClassificationFields (no longer needed since leaves read their own slices). SettingsFields still receives transaction because ReportField reads it directly — that one will be addressed in a follow-up.
    PR 3 of 4. Base: Refactor: extract sections from MoneyRequestConfirmationListFooter #90208 (decomposition). Stacks on PR 2's structural changes. Next: add a ConfirmationFieldsProvider to remove remaining prop drilling.

Fixed Issues

$ #90385

Tests

  1. Open the create expense flow (FAB → Submit expense / Track expense / Split expense)
    • Verify the confirmation page renders correctly with all fields
    • Verify Amount, Description, Merchant, Date, Category, Tag, Tax, Attendees, Time, Toggles (billable/reimbursable) all display the right values
  2. Amount field: tap Amount → enter a new value → confirm → verify it updates and re-renders correctly
  3. Description field: tap Description → type text → save → verify it updates
  4. Merchant field: tap Merchant → enter merchant name → save → verify it updates
  5. Date field: tap Date → pick a different date → save → verify it updates
  6. Category field (on a workspace with categories): pick a category → verify it updates; clear it → verify the empty state
  7. Tag fields (on a workspace with multiple tag lists): pick tags across multiple lists → verify each one updates independently
  8. Tax field (on a workspace with tax enabled): change tax rate → verify amount/tax display update
  9. Attendees field: add/remove attendees → verify the list and per-attendee amount update
  10. Time fields (per-diem flow): edit start/end time → verify fields update
  11. Toggles: flip Billable and Reimbursable toggles → verify they update on the transaction
  12. Split bill flow: open a split bill → verify all fields render and behave correctly
  13. Edit existing expense: open an existing expense → confirm fields show the saved values and edits persist
  14. Workspace expense (policy expense chat): verify Report field still renders correctly (it still reads transaction directly — unchanged behavior expected)
  • 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

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@OlimpiaZurek OlimpiaZurek force-pushed the narrow-confirmation-leaves-with-selectors branch from 0a208b4 to f9e8600 Compare May 12, 2026 10:07
@codecov
Copy link
Copy Markdown

codecov Bot commented May 12, 2026

Codecov Report

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

Files with missing lines Coverage Δ
...RequestConfirmationList/sections/AttendeeField.tsx 92.85% <100.00%> (+0.26%) ⬆️
...oneyRequestConfirmationList/sections/DateField.tsx 88.88% <100.00%> (+1.38%) ⬆️
...uestConfirmationList/sections/DescriptionField.tsx 75.00% <100.00%> (+2.27%) ⬆️
...RequestConfirmationList/sections/MerchantField.tsx 72.34% <100.00%> (+1.22%) ⬆️
...oneyRequestConfirmationList/sections/TaxFields.tsx 86.66% <100.00%> (+0.95%) ⬆️
...neyRequestConfirmationList/sections/TimeFields.tsx 85.71% <100.00%> (+0.52%) ⬆️
...yRequestConfirmationList/sections/ToggleFields.tsx 83.33% <100.00%> (+1.51%) ⬆️
...onfirmationList/sections/useTransactionSelector.ts 100.00% <100.00%> (ø)
...stConfirmationListFooter/ConfirmationFieldList.tsx 93.33% <ø> (ø)
...ionListFooter/fieldGroups/ClassificationFields.tsx 50.00% <ø> (ø)
... and 6 more
... and 11 files with indirect coverage changes

@OlimpiaZurek
Copy link
Copy Markdown
Contributor Author

@codex

Copy link
Copy Markdown

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

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3975619b2c

ℹ️ 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".

function useTransactionSelector<TReturn>(transactionID: string | undefined, selector: (t: OnyxEntry<OnyxTypes.Transaction>) => TReturn): TReturn | undefined {
const [draft] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {selector});
const [existing] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {selector});
return draft ?? existing;
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Fall back to existing transaction when draft is absent

When there is no TRANSACTION_DRAFT entry, this still can return the draft selector result instead of the real transaction because several selectors added in this patch return truthy default objects for undefined input (for example dateStateSelector, merchantStateSelector, categoryStateSelector, toggleStateSelector). In the existing-expense/read-only paths where only TRANSACTION_${id} exists, those fields will render blanks/defaults and ignore the saved transaction values. The hook needs to distinguish “draft key exists” from “selector returned a default value” before preferring the draft.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed by guarding each selector to return undefined when the transaction is absent, so draft ?? existing correctly falls back to the existing transaction when only TRANSACTION_${id} exists.

@OlimpiaZurek OlimpiaZurek marked this pull request as ready for review May 15, 2026 13:41
@OlimpiaZurek OlimpiaZurek requested review from a team as code owners May 15, 2026 13:41
@melvin-bot melvin-bot Bot requested review from ShridharGoel and flaviadefaria and removed request for a team and flaviadefaria May 15, 2026 13:41
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 15, 2026

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

Copy link
Copy Markdown

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

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4312c9215b

ℹ️ 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".

Comment on lines 188 to 201
<CategoryField
isCategoryRequired={isCategoryRequired}
didConfirm={didConfirm}
isReadOnly={isReadOnly}
transactionID={transactionID}
action={action}
iouType={iouType}
reportID={reportID}
reportActionID={reportActionID}
policy={policy}
transaction={transaction}
formError={formError}
shouldNavigateToUpgradePath={shouldNavigateToUpgradePath}
shouldSelectPolicy={shouldSelectPolicy}
/>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This isn't passing isEditingSplitBill

Comment on lines 205 to 214
<DateField
shouldDisplayFieldError={shouldDisplayFieldError}
didConfirm={didConfirm}
isReadOnly={isReadOnly}
transactionID={transactionID}
action={action}
iouType={iouType}
reportID={reportID}
reportActionID={reportActionID}
transaction={transaction}
/>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This isn't passing isEditingSplitBill

Comment on lines 253 to 264
<TaxFields
policy={policy}
policyForMovingExpenses={policyForMovingExpenses}
transaction={transaction}
iouCurrencyCode={iouCurrencyCode}
canModifyTaxFields={canModifyTaxFields}
didConfirm={didConfirm}
transactionID={transactionID}
action={action}
iouType={iouType}
reportID={reportID}
formError={formError}
/>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same

Comment on lines 218 to 231
<TagFieldRow
key={`tag_${entry.name}`}
entry={entry}
policyTagLists={tagRowSharedProps.policyTagLists}
previousTagsVisibility={tagRowSharedProps.previousTagsVisibility}
didConfirm={tagRowSharedProps.didConfirm}
isReadOnly={tagRowSharedProps.isReadOnly}
transactionID={tagRowSharedProps.transactionID}
action={tagRowSharedProps.action}
iouType={tagRowSharedProps.iouType}
reportID={tagRowSharedProps.reportID}
reportActionID={tagRowSharedProps.reportActionID}
transaction={tagRowSharedProps.transaction}
formError={tagRowSharedProps.formError}
/>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same

@Julesssss Julesssss requested a review from ShridharGoel May 20, 2026 18:24
@github-actions
Copy link
Copy Markdown
Contributor

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

@ShridharGoel
Copy link
Copy Markdown
Contributor

ShridharGoel commented May 20, 2026

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
Screen.Recording.2026-05-21.at.3.25.44.AM.mov
Android: mWeb Chrome
Screen.Recording.2026-05-21.at.3.29.14.AM.mov
iOS: HybridApp
Screen.Recording.2026-05-21.at.3.17.43.AM.mov
iOS: mWeb Safari
Screen.Recording.2026-05-21.at.3.19.56.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-05-21.at.3.15.31.AM.mov

@github-actions

This comment has been minimized.

Julesssss
Julesssss previously approved these changes May 20, 2026
@Julesssss
Copy link
Copy Markdown
Contributor

Ready for your final review @cristipaval

@cristipaval cristipaval merged commit 390112f into Expensify:main May 21, 2026
35 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

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

@OSBotify
Copy link
Copy Markdown
Contributor

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

@OSBotify
Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.3.80-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

I reviewed all changes in this PR. This is a purely internal React refactoring that narrows Onyx subscriptions in MoneyRequestConfirmationList field components from full Transaction objects to selector-scoped slices for performance.

No help site changes are required — there are no user-facing behavior changes, no new features, no UI changes, and no terminology updates.

@OSBotify
Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.81-2 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants