Skip to content

[NoQA] Button - Foundation: Figma alignment, padding, and loading-state consistency - #90242

Merged
mountiny merged 16 commits into
Expensify:mainfrom
software-mansion-labs:Guccio163/button/padding-gaps
May 22, 2026
Merged

mountiny merged 16 commits into
Expensify:mainfrom
software-mansion-labs:Guccio163/button/padding-gaps

Conversation

@Guccio163

@Guccio163 Guccio163 commented May 11, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Implements the foundation cleanup for from #90194:

  1. Changed gap/padding logic while preserving the pre-PR visual. Instead of compensating for icons with negative margins, the same visual result is achieved by splitting horizontal padding between a smaller paddingHorizontal on the wrapper button and paddingHorizontal on Button.Text. The wrapper no longer calls getButtonPaddingStyle, the per-icon mr/ml/pl adjustments are gone, and spacing between primitives comes from primitives' own paddings and conditional gap defined in the wrapper. Two intentional deltas from Button/index.tsx:

    • Equal gaps between all children (also fixes the asymmetric medium-size gap mentioned in the issue)
    • Horizontal padding aligned to Figma when text + both icons are present
  2. Unified loading-state policy. isLoading && opacity0 now lives on the wrapper in Button.tsx, so it uniformly hides all children - including Button.IconRight (previously unaffected) and any custom children. Removed from ButtonText, ButtonDoubleLineText, and the icon primitives; dropped isLoading from ButtonContext.

  3. Removed the extraSmall size due to no real usages in the codebase. Replaced CONST.DROPDOWN_BUTTON_SIZE with a new CONST.BUTTON_SIZE (small / medium / large only) inside ButtonComposed, and dropped the extraSmall branches in ButtonText, the icon primitive, the loading spinner, and style util tests.

  4. Merged ButtonIconLeft / ButtonIconRight into ButtonIcon. Once side-specific margins were gone, the side is already determined by JSX order. Exposed as Button.Icon; ButtonIcons.tsx is deleted.

Fixed Issues

$ #90194
PROPOSAL:

Tests

ButtonComposed that is being edited is not wired up to any production screen yet.

To verify the visual correctness of the new components, apply the attached patch file to your local branch and navigate to /debug/button-showcase. The page renders a side-by-side comparison of the old Button/index.tsx and the new ButtonWithIcons across the range of affected scenarios:

  • All sizes (small, medium, large)
  • All variants (default, success, danger, link)
  • Icon left / icon right / both / none
  • Disabled, loading, and shouldStayNormalOnDisable states
  • shouldBlendOpacity, pressOnEnter, isNested, shouldEnableHapticFeedback
  • Border radius removal (left, right, both)
  • secondLineText (double-line label)

Please verify that both sides (old and new Button implementations) look exactly the same, beside two cases:

  1. In "iconLeft + text + iconRight" and "text + iconRight (no left icon)" in medium size cases: old Button have right gap = 4px (between text and right icon) , in new Button it has 8px
  2. In all "iconLeft + text + iconRight" cases: Buttons' horizontal paddings are 4px smaller in new Button than in the old one (8/12/16px in new vs 12/16/20px in the old one)
  • 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

  • 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.mov
Android: mWeb Chrome
android_web.mov
iOS: Native
ios.mov
iOS: mWeb Safari
ios_web.mov
MacOS: Chrome / Safari
Screen.Recording.2026-05-18.at.21.58.01.mov

@Guccio163 Guccio163 changed the title proposed padding changes Button - Foundation: Figma alignment, padding, and loading-state consistency May 11, 2026
@codecov

codecov Bot commented May 14, 2026 •

Copy link
Copy Markdown

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/CONST/index.ts 92.30% <ø> (ø)
src/components/ButtonComposed/Button.tsx 98.79% <100.00%> (+0.06%) ⬆️
...onents/ButtonComposed/composed/ButtonWithIcons.tsx 0.00% <ø> (ø)
...components/ButtonComposed/context/ButtonContext.ts 100.00% <ø> (ø)
src/components/ButtonComposed/index.tsx 0.00% <ø> (ø)
src/styles/utils/index.ts 51.70% <100.00%> (-0.13%) ⬇️
...ButtonComposed/primitives/ButtonDoubleLineText.tsx 0.00% <0.00%> (ø)
...omponents/ButtonComposed/primitives/ButtonText.tsx 0.00% <0.00%> (ø)
...omponents/ButtonComposed/primitives/ButtonIcon.tsx 0.00% <0.00%> (ø)
... and 6 files with indirect coverage changes

@Guccio163
Guccio163 marked this pull request as ready for review May 19, 2026 07:02
@Guccio163
Guccio163 requested review from a team as code owners May 19, 2026 07:02
@melvin-bot
melvin-bot Bot requested review from ZhenjaHorbach, shawnborton and trjExpensify and removed request for a team May 19, 2026 07:02
@melvin-bot

melvin-bot Bot commented May 19, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot removed the request for review from a team May 19, 2026 07:02

@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


P2 Badge Keep right icons anchored to the trailing edge

For ButtonWithIcons calls that provide iconRight with a fixed or full-width button, replacing ButtonIconRight with the generic icon drops the old mlAuto/left-padding wrapper, so the right icon now sits immediately next to the text instead of at the trailing edge. That regresses the existing iconRight semantics used for disclosure/dropdown-style buttons; please preserve the right-icon wrapper spacing/alignment here.

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

@github-actions

Copy link
Copy Markdown
Contributor

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

@melvin-bot

melvin-bot Bot commented May 19, 2026

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@Guccio163

Copy link
Copy Markdown
Contributor Author

@shawnborton I pushed the testing patch, comparisons are under "/debug/button-showcase"

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@shawnborton

Copy link
Copy Markdown
Contributor

Just checked it out and it seems identical to me! No notes on my end, curious if the rest of the @Expensify/design might find anything though.

@dannymcclain

Copy link
Copy Markdown
Contributor

I agree everything is looking identical to me, but I thought we were going to give all the buttons the same left/right padding? I'm still seeing buttons with icons having less padding on the icon side.

CleanShot 2026-05-20 at 08 00 41@2x image

Did I misunderstand something?

@shawnborton

Copy link
Copy Markdown
Contributor

Yeah apologies - we went back and forth on that a few times and we left off saying that we would just leave it as it currently is for now, since that was technically easier for @Guccio163 to implement.

@dannymcclain

Copy link
Copy Markdown
Contributor

Ah ok. Cool. Down to keep pushing forward! But let the record show that I think I prefer having equal padding on both sides—makes them feel more button-y to me.

@ZhenjaHorbach

Copy link
Copy Markdown
Contributor

@Guccio163
Let's fix lint issues!

@Guccio163

Copy link
Copy Markdown
Contributor Author

@dannymcclain I think it actually depends on the icon being used. Here is a comparison of the old (uneven) vs. new (even) paddings. Since this icon is more vertical, the extra horizontal space adds to the right padding, ironically making it look visually unbalanced to me 😃

Screenshot 2026-05-18 at 16 33 57

@Guccio163
Guccio163 force-pushed the Guccio163/button/padding-gaps branch from e248aef to 5b5d058 Compare May 20, 2026 14:03
@Guccio163

Copy link
Copy Markdown
Contributor Author

@ZhenjaHorbach I just reverted the last commit with testing page and comparisons for designers, right now all checks should pass ✅

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Since this icon is more vertical, the extra horizontal space adds to the right padding, ironically making it look visually unbalanced to me 😃

1000% 😂

@ZhenjaHorbach

ZhenjaHorbach commented May 22, 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 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
2026-05-22.10.41.26.mov
Android: mWeb Chrome
2026-05-22.10.38.20.mov
iOS: HybridApp
2026-05-22.10.41.26.mov
iOS: mWeb Safari
2026-05-22.10.38.20.mov
MacOS: Chrome / Safari
2026-05-22.10.35.27.mov

@ZhenjaHorbach

ZhenjaHorbach commented May 22, 2026 •

Copy link
Copy Markdown
Contributor

@Guccio163 @mountiny
Let's add [No QA] here
Since nothing to test for QA here 😅

@ZhenjaHorbach

Copy link
Copy Markdown
Contributor

But changes look good!

@melvin-bot
melvin-bot Bot requested a review from mountiny May 22, 2026 08:54
@mountiny mountiny changed the title Button - Foundation: Figma alignment, padding, and loading-state consistency [NoQA] Button - Foundation: Figma alignment, padding, and loading-state consistency May 22, 2026
@mountiny
mountiny merged commit 5da5833 into Expensify:main May 22, 2026
40 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 @mountiny 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 OSBotify mentioned this pull request May 22, 2026
71 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

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

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site changes are required for this PR.

This is an internal refactoring of ButtonComposed (padding/gap logic, loading-state unification, extraSmall removal, icon primitive merge). The component isn't wired to any production screen yet, and none of the changes affect user-facing features, terminology, or workflows documented in App/docs/articles.

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

8 participants