Skip to content

support trailing accessories in AmountFormField.Input - #105953

Merged
mountiny merged 5 commits into
Expensify:mainfrom
software-mansion-labs:jmgraa/amount-form-field-input-children
Nov 7, 2026
Merged

mountiny merged 5 commits into
Expensify:mainfrom
software-mansion-labs:jmgraa/amount-form-field-input-children

Conversation

@jmgraa

@jmgraa jmgraa commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

The composable AmountFormField.Input primitive previously lacked a way to house trailing accessories (such as CurrencyPickerButton or SignFlipButton) inside the input border. Because of this architectural gap, call sites that required an inline text input with a trailing dropdown or button could not fully leverage AmountFormField.

This PR expands AmountFormField.Input to accept trailing accessories as children, rendering them inside the input border via BaseTextInput's rightHandSideComponent. As a direct consequence of this feature, AmountForm's displayAsTextInput path has been migrated to route currency- and unit-button variants to AmountFormField, eliminating its fallback to the legacy NumberWithSymbolForm.

  • Trailing accessories as children in AmountFormField.Input: Added an optional children prop to AmountFormFieldInputProps. Trailing accessories passed as children are rendered inside BaseTextInput's rightHandSideComponent wrapped in a flex row container (styles.flexRow, styles.gap2, styles.alignItemsCenter). This neatly places accessory buttons inside the input border while preserving their full access to AmountFormField's state and action contexts.
  • Migration of AmountForm currency-button variants: Leveraged the new children capability in AmountForm by removing the !shouldShowCurrencyButton guard from the displayAsTextInput branch. When shouldShowCurrencyButton is enabled, <AmountFormField.CurrencyPickerButton> is composed directly as a child of <AmountFormField.Input>, supporting both standard currency codes and custom labels (currencyButtonLabel, e.g. duration units such as "hours" or "days").
  • Unit test coverage:
    • tests/ui/AmountFormFieldInputTest.tsx: Added tests verifying that multiple accessories render in composition order inside the input, trigger press handlers independently without affecting input value, and can reach and mutate the parent AmountFormField context.
    • tests/ui/AmountFormTest.tsx: Added tests verifying that displayAsTextInput with a currency button routes through AmountFormField, forwards click events, and properly displays custom unit labels.

Fixed Issues

$ #98171
PROPOSAL: #97970

Tests

  1. Open a 1:1 chat with Chronos (chronos@expensify.com) via search or the chat list.
  2. In the chat header / action area, click the arrow button next to Start timer to open the dropdown menu.
  3. Select Schedule OOO to open the "Schedule Out of Office" page.
  4. Locate the Duration input field (this tests AmountForm composing AmountFormField.Input with a trailing unit accessory).
  5. Verify that the duration input renders with the unit selector button (e.g. hours) positioned inside the right side of the input border.
    6 Enter a value (e.g. 4.5) and verify that numeric entry, caret movement, and decimal formatting work properly.
  6. Click the unit dropdown button (e.g. days) to open the duration unit modal. Select a different unit (e.g. days) and verify that the button label updates accordingly.
  • Verify that no errors appear in the JS console

Offline tests

N\A

QA Steps

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 verified any copy / text that was added to the app 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 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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.mov
Android: mWeb Chrome
android_mweb.mov
iOS: Native
ios.mov
iOS: mWeb Safari
ios_web.mov
MacOS: Chrome / Safari
web.mov

@jmgraa

jmgraa commented Nov 4, 2026

Copy link
Copy Markdown
Contributor Author

@MelvinBot review
@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 4, 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-11-04T21:09:28.788740Z 5216ae0 Draft marked ready
ℹ️ 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.

@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

Here are some automated review suggestions for this pull request.

Reviewed commit: 091a4a0775

ℹ️ 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 thread src/components/AmountForm.tsx Resolved
Comment thread tests/ui/AmountFormTest.tsx Resolved
@jmgraa
jmgraa marked this pull request as ready for review November 4, 2026 20:44
@jmgraa
jmgraa requested review from a team as code owners November 4, 2026 20:44
@melvin-bot
melvin-bot Bot requested review from bernhardoj and removed request for a team November 4, 2026 20:44
@melvin-bot

melvin-bot Bot commented Nov 4, 2026

Copy link
Copy Markdown

@bernhardoj 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
melvin-bot Bot requested review from twisterdotcom and removed request for a team November 4, 2026 20:44

@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

Here are some automated review suggestions for this pull request.

Reviewed commit: 5216ae0ae9

ℹ️ 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 thread src/components/AmountForm.tsx Resolved
@bernhardoj

bernhardoj commented Nov 5, 2026 •

Copy link
Copy Markdown
Contributor

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 any copy / text that was added to the app 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 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
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
web.mp4

@bernhardoj

Copy link
Copy Markdown
Contributor

@jmgraa please complete the checklist and address this

@jmgraa

jmgraa commented Nov 5, 2026

Copy link
Copy Markdown
Contributor Author

@bernhardoj done

@melvin-bot
melvin-bot Bot requested review from grgia and mountiny November 5, 2026 11:49
@twisterdotcom

Copy link
Copy Markdown
Contributor

No product review required. This is a component migration.

@twisterdotcom
twisterdotcom removed their request for review November 5, 2026 21:45
@mountiny

mountiny commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

@jmgraa can you address the review from Georgia please?

@jmgraa

jmgraa commented Nov 6, 2026

Copy link
Copy Markdown
Contributor Author

@grgia @mountiny Addressed!

@mountiny mountiny left a comment

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.

Lovely, thank you!

@mountiny
mountiny merged commit b7647d6 into Expensify:main Nov 7, 2026
38 of 40 checks passed
@github-actions

github-actions Bot commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

github-actions Bot commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

@OSBotify OSBotify mentioned this pull request Nov 7, 2026
85 tasks done
@OSBotify

OSBotify commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.5.34-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — this PR migrates existing amount inputs to a shared component without changing user workflows or making any existing article inaccurate.


view run

@MelvinBot

Copy link
Copy Markdown
Contributor

No FullStory changes needed — this PR migrates existing amount-input currency/unit controls to composable components without adding user-facing functionality or changing tracking or masking.


view run

@OSBotify

OSBotify commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.5.34-1 🚀

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

Bundle Size Analysis (Sentry):

@jmgraa
jmgraa deleted the jmgraa/amount-form-field-input-children branch November 13, 2026 12:39
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.

7 participants