Align ButtonComposed wrapper props (variant/buttonVariant/buttonSize) by Guccio163 · Pull Request #99080 · Expensify/App

Guccio163 · 2026-08-20T15:13:18Z

Explanation of Change

Aligns several ButtonComposed wrapper components' public props to match ButtonComposed's own prop shapes, so no boolean->enum conversion happens at any layer between the caller and the actual <Button>. Pure rename/retype refactor, no intended behavior change.

ConfirmModal/ConfirmContent: success/danger booleans -> single variant/buttonVariant (ButtonVariant, default SUCCESS). Updated every call site (JSX props, showConfirmModal/showConfirmModalAfterMoreMenuDismiss object calls, getDiscardChangesModalConfig.ts).
EmptyStateComponent's EmptyStateButton config type (shared by Table.EmptyState, TableEmptyState, GenericEmptyStateComponent): success?: boolean -> buttonVariant?: ButtonVariant. Updated every button-config call site, including a duplicated inline type in SearchUIUtils.ts.
FormAlertWithSubmitButton + its Form/FormWrapper forwarding chain: isSubmitActionDangerous -> buttonVariant, shouldBlendOpacity -> blendButtonOpacity. Renamed through every layer (Form -> FormWrapper -> FormAlertWithSubmitButton) so the value reaches <Button> unconverted.
AmountFilterContent: largeButton -> buttonSize (ValueOf<typeof CONST.BUTTON_SIZE>, excluding SMALL — the old boolean only ever toggled MEDIUM/LARGE).
Removed two dead props found while doing the above: FormAlertWithSubmitButton's size flag (no caller ever set it) and FormWrapper's blend-opacity flag (not even declared on Form's public type, so unreachable from any <Form> caller).

Fixed Issues

$ #99057
PROPOSAL:

Tests

5 button testing categories with test steps

Open a destructive ConfirmModal (e.g. delete a workspace, or Settings -> Security -> Close Account) and verify the confirm button still renders red
- 1. Settings -> Security -> tap "Close account"
- 1. On the Close Account page, enter a reason in the text field
- 1. Tap the red "Close account" submit button at the bottom
- 1. A second confirm dialog pops up: title "Closing your account cannot be undone", confirm button "Yes, continue"
- 1. Verify that confirm button renders red
- 1. Tap Cancel — do not actually confirm (destructive, irreversible)
Open a non-destructive ConfirmModal with a cancel button and verify the confirm button still renders green
- 1. Go to a workspace with 2+ members
- 1. Workspaces list -> tap the "⋯" (three-dot) menu on that workspace row -> "Duplicate workspace"
- 1. On the "Select features to duplicate" page, check the "Members" feature
- 1. Tap "Continue" at the bottom
- 1. A confirm dialog appears: prompt mentions duplicating members, confirm button text "Proceed", cancel button "Cancel"
- 1. Verify the confirm button renders green
- 1. Tap Cancel
"Add expense" button in EmptyStateComponent still renders green and works
- 1. Go to Reports (Search)
- 1. Switch to / land on the "Expenses" view
- 1. If it has zero expenses (new account, or filter to a date range with none), you land on "No expenses yet" empty state
- 1. Verify the "Create expense" button renders green
Reject expense report / Close Account submit button still renders red and submits
- The same steps as "Open a destructive ConfirmModal"
Search -> Amount filter -> Confirm button still renders at expected large size
- 1. Shrink your browser window below the small-screen breakpoint (or test on mobile web/native)
- 1. Search -> tap "Filters"
- 1. Since it's small screen, this navigates to the full-screen "Advanced filters" page (not the popup)
- 1. Tap "Total amount"
- 1. Confirm button at the bottom

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

step2.mov

steps1_4.mov

…to ButtonComposed Rename isSubmitActionDangerous/useSmallerSubmitButtonSize/shouldBlendOpacity (and their Form/FormWrapper forwarding chain) to buttonVariant/buttonSize/ blendButtonOpacity, matching ButtonComposed's own prop shapes so no boolean-to-enum conversion happens along the way. Same for AmountFilterContent's largeButton -> buttonSize. Drop the dead buttonSize (FormAlertWithSubmitButton) and submitButtonBlendOpacity (FormWrapper) props that no caller ever set.

melvin-bot · 2026-08-20T19:05:06Z

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

CopyPolicySettingsProgressModalTest and LeaveWorkspaceFlowTest were left checking success/danger — missed earlier because the migration sweep only searched src/, not tests/. Update to assert buttonVariant.

codecov · 2026-08-20T19:24:26Z

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 Δ
...mponents/AccountingConnectionConfirmationModal.tsx	`0.00% <ø> (ø)`
src/components/ConfirmContent.tsx	`88.88% <100.00%> (-0.18%)`	⬇️
src/components/ConfirmModal.tsx	`100.00% <100.00%> (ø)`
src/components/EmptyStateComponent/index.tsx	`100.00% <100.00%> (ø)`
src/components/Form/FormWrapper.tsx	`90.32% <ø> (-0.31%)`	⬇️
src/components/FormAlertWithSubmitButton.tsx	`97.14% <100.00%> (+4.64%)`	⬆️
src/components/GPSInProgressModal/index.native.tsx	`100.00% <ø> (ø)`
...aderActions/MoneyReportHeaderSelectionDropdown.tsx	`0.92% <ø> (ø)`
.../components/MoneyRequestHeaderSecondaryActions.tsx	`0.45% <ø> (ø)`
...tReportView/SearchMoneyRequestReportEmptyState.tsx	`2.17% <ø> (ø)`
... and 111 more
... and 14 files with indirect coverage changes

melvin-bot · 2026-08-20T20:22:13Z

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

joekaufmanexpensify · 2026-08-20T22:04:36Z

No Product review needed.

ZhenjaHorbach · 2026-08-24T08:23:47Z

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

2026-08-27.11.08.04.mov

Android: mWeb Chrome

2026-08-27.11.08.04.mov

iOS: HybridApp

2026-08-27.11.06.39.mov

iOS: mWeb Safari

2026-08-27.10.56.59.mov

MacOS: Chrome / Safari

2026-08-27.10.52.53.mov

ZhenjaHorbach · 2026-08-26T15:16:52Z

Working on this PR
Will complete today or tomorrow!

ZhenjaHorbach · 2026-08-26T15:17:06Z

@Guccio163
But can you fix conflicts, please?

…-fork into Guccio163/button/propsCleanup

Guccio163 · 2026-08-26T15:35:18Z

@ZhenjaHorbach done

ZhenjaHorbach · 2026-08-27T09:20:21Z

Changes look good!

ZhenjaHorbach · 2026-08-27T09:20:38Z

@Guccio163
But can you fix the conflicts again, please?

…-fork into Guccio163/button/propsCleanup

Guccio163 · 2026-08-27T09:27:35Z

@ZhenjaHorbach done

mountiny

Thanks for this clean up

github-actions · 2026-08-30T19:41:28Z

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

github-actions · 2026-08-30T19:45:06Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-49ab2f3-cd2cd49-41eb8c0f215358b6284f6635e5327b8c7fc37dce/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-49ab2f3-cd2cd49-0012aa6a23d57f6a943b9a945845a1664ff3a52c/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-08-31T18:56:40Z

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

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

MelvinBot · 2026-08-31T19:01:05Z

No help site changes are required for this PR, so I did not create a draft docs PR.

This is a type-level refactor of internal React component props. Nothing a help site article describes has changed.

What I checked

No user-facing surface changed:

No files under docs/ were touched.
No files under src/languages/ were touched — no UI copy, button label, tab name, or setting label changed.
The only diff line touching translate() is a reformat of the existing translate('iou.addExpense') call, with the same key.

Every change is a 1:1 prop rename with an equivalent value:

success: true → buttonVariant: CONST.BUTTON_VARIANT.SUCCESS
danger: true → buttonVariant: CONST.BUTTON_VARIANT.DANGER
isSubmitActionDangerous → buttonVariant, shouldBlendOpacity → blendButtonOpacity
largeButton → buttonSize

Buttons keep the same text, the same colors, and the same actions. The two removed props were dead code with no callers.

Help site articles document workflows, settings, and features — for example how to close an account, delete a workspace, or use Advanced filters. None of those steps, screens, or labels changed here, so no article text becomes inaccurate.

@Guccio163, please confirm you agree that no help site updates are needed. If you think an article does need updating because of this change, reply with the article and what should change, and I'll open the draft PR.

view run

OSBotify · 2026-09-02T00:18:19Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.4.65-3 🚀

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

Bundle Size Analysis (Sentry):

Android

BookCallButton wrappers variant props

e059a3e

melvin-bot Bot assigned Guccio163 Aug 20, 2026

Guccio163 added 3 commits August 20, 2026 19:11

change name from variant do buttonVariant

8c891a2

migrate other Button-using components to buttonVariant prop

c3aacca

Guccio163 changed the title ~~BookCallButton wrappers variant props~~ Align ButtonComposed wrapper props (variant/buttonVariant/buttonSize) Aug 20, 2026

Fix tests still asserting old success/danger ConfirmModal props

b022579

CopyPolicySettingsProgressModalTest and LeaveWorkspaceFlowTest were left checking success/danger — missed earlier because the migration sweep only searched src/, not tests/. Update to assert buttonVariant.

Guccio163 marked this pull request as ready for review August 20, 2026 20:22

Guccio163 requested review from a team as code owners August 20, 2026 20:22

melvin-bot Bot requested review from a team, ZhenjaHorbach and joekaufmanexpensify and removed request for a team August 20, 2026 20:22

melvin-bot Bot requested review from flaviadefaria and removed request for a team August 20, 2026 20:22

joekaufmanexpensify removed their request for review August 20, 2026 22:04

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

cf1ed1f

…-fork into Guccio163/button/propsCleanup

ZhenjaHorbach approved these changes Aug 27, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny August 27, 2026 09:22

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

47fe0d7

…-fork into Guccio163/button/propsCleanup

mountiny approved these changes Aug 30, 2026

View reviewed changes

mountiny merged commit 49ab2f3 into Expensify:main Aug 30, 2026
34 of 35 checks passed

This was referenced Aug 30, 2026

Investigate workflow job failing on main: test / test (job 5) #99854

Closed

Investigate workflow job failing on main: test / test (job 4) #99855

Closed

Investigate workflow job failing on main: test / test (job 2) #99856

Closed

OSBotify mentioned this pull request Aug 31, 2026

Deploy Checklist: New Expensify 2026-08-31 #99948

Closed

75 tasks

MelvinBot mentioned this pull request Aug 31, 2026

[Due for payment 2026-09-09] Spend - Paid by column does not immediately show the payer after paying the report on Spend #99968

Closed

7 tasks

melvin-bot Bot mentioned this pull request Sep 2, 2026

[Due for payment 2026-09-09] Button wrappers: align legacy button-specific props (success/danger → variant) in ConfirmModal & FormAlertWithSubmitButton #99057

Closed

6 tasks

Conversation

Guccio163 commented Aug 20, 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!

melvin-bot Bot commented Aug 20, 2026

Uh oh!

codecov Bot commented Aug 20, 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 Aug 20, 2026

Uh oh!

joekaufmanexpensify commented Aug 20, 2026

Uh oh!

ZhenjaHorbach commented Aug 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented Aug 26, 2026

Uh oh!

ZhenjaHorbach commented Aug 26, 2026

Uh oh!

Guccio163 commented Aug 26, 2026

Uh oh!

ZhenjaHorbach commented Aug 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Aug 27, 2026

Uh oh!

Guccio163 commented Aug 27, 2026

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Aug 30, 2026

Uh oh!

github-actions Bot commented Aug 30, 2026

Uh oh!

OSBotify commented Aug 31, 2026

Uh oh!

MelvinBot commented Aug 31, 2026

Uh oh!

OSBotify commented Sep 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Guccio163 commented Aug 20, 2026 •

edited

Loading

codecov Bot commented Aug 20, 2026 •

edited by github-actions Bot

Loading

ZhenjaHorbach commented Aug 24, 2026 •

edited

Loading

ZhenjaHorbach commented Aug 27, 2026 •

edited

Loading