Move inline icon out of icon primitives by jmusial · Pull Request #95286 · Expensify/App

jmusial · 2026-07-03T14:16:22Z

Explanation of Change

This PR extracts InlineIcon into its own standalone component (Icon/InlineIcon) and removes the inline-rendering path from the shared Icon primitives (dropping BaseIcon and the old inline prop). I

Call sites that previously passed inline to Icon — ButtonWithDropdownMenu, MenuItem, CopyTextToClipboard, PressableWithDelayToggle — use InlineIcon directly instead.

The result is a slimmer Icon component and a clearer, more explicit API for inline icon usage.

Fixed Issues

$ #95159
PROPOSAL:

Tests

Just regressions checks on icons, this PR does not change any user facing behaviour.

Open app
Go to Settings → Security → Two-factor authentication and start/enable the flow.
Verify that after Pressing Copy → label/icon toggle to the "copied" state, icon stays aligned.

and

Open App
Go to a conversation with another user
Click on 3 dots next to their comment and select Flag as offensive
Verify that icons are correct size (same as prod)

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-07-14.at.16.59.28.mov

codecov · 2026-07-03T14:21:23Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/ButtonWithDropdownMenu/index.tsx	`86.82% <100.00%> (ø)`
src/components/CopyTextToClipboard.tsx	`0.00% <ø> (ø)`
...nts/Icon/InlineIcon/IconWrapperStyles/index.ios.ts	`100.00% <ø> (ø)`
...ponents/Icon/InlineIcon/IconWrapperStyles/index.ts	`0.00% <ø> (ø)`
src/components/Icon/InlineIcon/index.tsx	`100.00% <100.00%> (ø)`
src/components/Icon/index.tsx	`100.00% <100.00%> (ø)`
src/components/Icon/utils/resolveIconSize.ts	`91.66% <ø> (ø)`
src/components/MenuItem.tsx	`88.56% <ø> (ø)`
.../components/Pressable/PressableWithDelayToggle.tsx	`89.47% <100.00%> (ø)`
... and 239 files with indirect coverage changes

…o chore/move-InlineIcon-out-of-icon-primitives

jmusial · 2026-07-14T13:08:58Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cd2d76da5f

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

chatgpt-codex-connector · 2026-07-14T13:15:36Z

-                                        width={shouldUseShortForm ? variables.iconSizeExtraSmall : undefined}
-                                        height={shouldUseShortForm ? variables.iconSizeExtraSmall : undefined}
+                                    <IconComponent
+                                        size={CONST.ICON_SIZE.EXTRA_SMALL}


Preserve split dropdown arrow sizing

When ButtonWithDropdownMenu renders a split button that is not short-form (the default, and also the large confirmation buttons), this hard-codes the chevron to EXTRA_SMALL. The previous logic used dropdownArrowIconSize, which resolves to SMALL for normal buttons and MEDIUM for large buttons, so those split dropdowns now render a 12px arrow instead of 16/20px while the surrounding arrow container still uses the normal/large sizing. Keep the existing dropdownArrowIconSize for the standard Icon path and only use the extra-small inline sizing for the short-form case.

Useful? React with 👍 / 👎.

jmusial · 2026-07-14T14:09:02Z

@codex review

chatgpt-codex-connector · 2026-07-14T14:16:41Z

Codex Review: Didn't find any major issues. Nice work!

Reviewed commit: 9280c97e3f

ℹ️ 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-07-14T15:06:33Z

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

jmusial · 2026-07-14T15:07:23Z

cc. @roryabraham 3 rd PR for Icon decomposition. After this one there will be 1 more with Icon props' cleanup

roryabraham · 2026-07-14T18:55:48Z

LGTM, awaiting C+ review from @Pujan92

Pujan92 · 2026-07-14T19:03: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 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 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 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.
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

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-07-15.at.01.13.21.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-07-15.at.01.12.03.mov

Pujan92

LGTM!

JmillsExpensify

LGTM

OSBotify · 2026-07-15T17:17:38Z

✋ 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-07-15T17:58:39Z

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

github-actions · 2026-07-15T18:04:53Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5cf8acc2fa5-7f5c319-36317501f57cfa9999bd9080be4d4deca9012618/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5cf8acc-7f5c319-b7a193cb3f667c1f38fc0a67f183a47b3150034c/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-16T06:48:04Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.4.35-1 🚀

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

MelvinBot · 2026-07-16T06:50:32Z

🤖 I reviewed the changes in this PR and no help site changes are required — so I did not create a docs PR.

Why: This is a purely internal component refactor. It extracts InlineIcon into a standalone Icon/InlineIcon component, drops BaseIcon and the old inline prop from the shared Icon primitives, and updates the call sites (ButtonWithDropdownMenu, MenuItem, CopyTextToClipboard, PressableWithDelayToggle) to use InlineIcon directly. As the PR description notes, it does not change any user-facing behavior.

The help site articles under App/docs/articles document end-user product behavior (workspaces, billing, features, integrations, etc.), none of which is affected by this developer-facing API/architecture cleanup.

jmusial, since there are no docs changes needed, there is no help site PR to review. If you believe some user-facing behavior did change here and warrants a docs update, let me know and I'll create one.

OSBotify · 2026-07-16T23:49:33Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.4.35-6 🚀

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

Move InlineIcon out of icon primitives

017338c

melvin-bot Bot assigned jmusial Jul 3, 2026

jmusial added 7 commits July 9, 2026 09:56

Merge branch 'chore/move-MultiGestureIcon-out-of-icon-primitives' int…

a23b537

…o chore/move-InlineIcon-out-of-icon-primitives

Merge branch 'chore/move-MultiGestureIcon-out-of-icon-primitives' int…

84ba6b2

…o chore/move-InlineIcon-out-of-icon-primitives

update inline icon

db18593

fix knip

8341bb0

Merge branch 'main' into chore/move-InlineIcon-out-of-icon-primitives

15583f4

fix merge issues

4c7085c

use size for InlineIcon

cd2d76d

chatgpt-codex-connector Bot reviewed Jul 14, 2026

View reviewed changes

fix sizing regression

9280c97

jmusial marked this pull request as ready for review July 14, 2026 15:06

jmusial requested review from a team as code owners July 14, 2026 15:06

melvin-bot Bot requested review from JmillsExpensify and Pujan92 and removed request for a team July 14, 2026 15:06

roryabraham previously approved these changes Jul 14, 2026

View reviewed changes

Pujan92 reviewed Jul 14, 2026

View reviewed changes

Comment thread src/components/ButtonWithDropdownMenu/index.tsx Outdated

bring back the conditional style

2cac30a

jmusial dismissed roryabraham’s stale review via 2cac30a July 15, 2026 08:15

Pujan92 approved these changes Jul 15, 2026

View reviewed changes

melvin-bot Bot requested a review from roryabraham July 15, 2026 11:51

JmillsExpensify approved these changes Jul 15, 2026

View reviewed changes

roryabraham approved these changes Jul 15, 2026

View reviewed changes

roryabraham merged commit 5cf8acc into Expensify:main Jul 15, 2026
36 of 37 checks passed

OSBotify mentioned this pull request Jul 16, 2026

Deploy Checklist: New Expensify 2026-07-16 #96243

Closed

94 tasks

MelvinBot mentioned this pull request Jul 21, 2026

[Due for payment 2026-07-29] Expense-More button is not aligned with the header in expense details in 1:1 chat #96575

Closed

7 tasks

Uh oh!

Conversation

jmusial commented Jul 3, 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!

codecov Bot commented Jul 3, 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!

jmusial commented Jul 14, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jul 14, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial commented Jul 14, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 14, 2026

Uh oh!

melvin-bot Bot commented Jul 14, 2026

Uh oh!

jmusial commented Jul 14, 2026

Uh oh!

roryabraham commented Jul 14, 2026

Uh oh!

Pujan92 commented Jul 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Pujan92 left a comment

Choose a reason for hiding this comment

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jul 15, 2026

Uh oh!

github-actions Bot commented Jul 15, 2026

Uh oh!

github-actions Bot commented Jul 15, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

MelvinBot commented Jul 16, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jmusial commented Jul 3, 2026 •

edited

Loading

codecov Bot commented Jul 3, 2026 •

edited by github-actions Bot

Loading

Pujan92 commented Jul 14, 2026 •

edited

Loading