Move MultiGestureIcon out of icon primitives by jmusial · Pull Request #95278 · Expensify/App

jmusial · 2026-07-03T13:33:41Z

Explanation of Change

MultiGestureIcon is now a standalone component under components/Attachments/ with its own props type, instead of an Icon primitive. Icon loses the enableMultiGestureCanvas prop and AttachmentView decides directly whether to render the gesture-enabled variant on touch devices.

As part of the cleanup, the canvas-measurement logic was extracted into a shared useCanvasSize hook, which Lightbox now reuses instead of its own inline copy.

Fixed Issues

$ #95158
PROPOSAL:

Tests

Open app
Make sure it has an custom svg profile picture set, if it does not upload one.
Navigate to Account -> Profile and press the avatar icon
Press Edit -> View photo
Verify that gestures (ex. pinch) work if your device has touch.

Offline tests

Same as tests.

QA Steps

Same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-07-08.at.13.01.03.mov

Android: mWeb Chrome

Screen.Recording.2026-07-08.at.12.59.34.mov

iOS: Native

Screen.Recording.2026-07-08.at.12.51.34.mov

iOS: mWeb Safari

Screen.Recording.2026-07-08.at.12.53.14.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-08.at.12.45.56.mov

codecov · 2026-07-03T13:38:17Z

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 Δ
...tachments/MultiGestureIcon/useIconCarouselPager.ts	`0.00% <ø> (ø)`
src/components/Icon/index.tsx	`100.00% <ø> (+9.67%)`	⬆️
src/components/Icon/primitives/InlineIcon.tsx	`100.00% <100.00%> (ø)`
src/components/Lightbox/index.tsx	`85.13% <100.00%> (-0.77%)`	⬇️
src/hooks/useCanvasSize.ts	`100.00% <100.00%> (ø)`
.../components/Attachments/MultiGestureIcon/index.tsx	`0.00% <0.00%> (ø)`
...rc/components/Attachments/AttachmentView/index.tsx	`52.75% <0.00%> (-1.72%)`	⬇️
... and 12 files with indirect coverage changes

…itives

jmusial · 2026-07-08T09:46:32Z

@codex review

chatgpt-codex-connector · 2026-07-08T09:52:19Z

Codex Review: Didn't find any major issues. Bravo.

Reviewed commit: 1273a86adb

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

jmusial · 2026-07-08T10:40:04Z

@codex review

chatgpt-codex-connector · 2026-07-08T10:44:36Z

Codex Review: Didn't find any major issues. Keep them coming!

Reviewed commit: 328798bd5a

ℹ️ 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-08T11:04:50Z

@aimane-chnaif 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-08T11:05:27Z

cc. @roryabraham this is the second PR for Icon decomp.

aimane-chnaif · 2026-07-08T14:59:30Z

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

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

roryabraham · 2026-07-08T16:00:59Z

+import {PixelRatio} from 'react-native';
+
+/**
+ * Discriminated on `isCanvasLoading` so that checking it narrows `canvasSize`


roryabraham · 2026-07-09T07:45:41Z

awaiting C+ review from @aimane-chnaif

jmusial · 2026-07-10T07:33:29Z

@aimane-chnaif bump

aimane-chnaif · 2026-07-10T07:40:35Z

Please merge main

…itives

MelvinBot · 2026-07-10T12:18:20Z

Review

Clean, well-scoped refactor — I verified it's behaviorally identical to the old enableMultiGestureCanvas path and all CI is green. No blocking issues. 👍

Verification of equivalence (the touch/avatar case in AttachmentView/index.tsx:218-227):

contentSize used to be {width: iconWidth, height: iconHeight} where iconWidth/iconHeight came from getIconWidthAndHeightStyle. With no preset size, that fell through to {width, height} (styles/utils/index.ts:583), i.e. defaultAvatarPreviewSize. Passing {defaultAvatarPreviewSize, defaultAvatarPreviewSize} directly is the same value.
The enableMultiGestureCanvas prop had exactly one caller (this one), so moving the canUseTouchScreen() branch into AttachmentView and dropping the prop from Icon is safe — no other usages remain.
!isCanvasLoading is equivalent to the old !!canvasSize guard, and the new discriminated-union return on useCanvasSize is a nice touch: canvasSize now narrows to Dimensions (non-optional) exactly where MultiGestureCanvas needs it.

Architecturally this is the right move — MultiGestureIcon and its useIconCarouselPager dependency (which reaches into AttachmentCarouselPagerContext) belong under Attachments/, not in the generic Icon primitives, and the useCanvasSize extraction removes the duplicate inline copy in Lightbox.

Minor / non-blocking observations

Dropped ImageSVG props — the new MultiGestureIcon no longer forwards contentFit, hovered/pressed, or testID to ImageSVG. All are effectively no-ops for this use case: ImageSVG never reads contentFit at all (it isn't destructured — ImageSVG/index.tsx:7), hovered/pressed defaulted to false, and testID was ''. So no behavior change — just confirming it was intentional.
Test coverage — Codecov flags MultiGestureIcon and the new AttachmentView branch at 0%. This is a pure move of a previously-uncovered, touch-only path, so it's consistent with the prior state; no regression, but no new unit test was added either.
additionalStyles is a required prop on MultiGestureIconProps — it's always passed today, so this is fine; just noting it could be optional if you ever reuse the component elsewhere.

One process note (already raised by aimane-chnaif): main hasn't been merged in yet.

chatgpt-codex-connector · 2026-07-10T12:19:09Z

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

Reviewed commit: f4e0f532c9

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

MelvinBot · 2026-07-10T12:21:21Z

Regression hunt: none found ✅

I traced every behavioral difference in this diff (web + iOS + Android) and confirmed it's a behavior-preserving refactor. Each prop dropped from the old code path is provably a no-op or resolves to the identical value.

What I checked (and why each is safe)

1. Dropped contentFit on the SVG — The touch path runs mostly on native, so I checked the native ImageSVG variants specifically. Both index.ios.tsx:10 and index.android.tsx:10 default contentFit = 'cover', and contentFit only applies to the static-image branch anyway (the SVG-component branch ignores it). The old code fed contentFit down from Icon's default of 'cover', so the value is unchanged. The web variant (index.tsx:7) never reads contentFit at all.

2. Dropped hovered / pressed — Not used by either native variant. On web they defaulted to false in this (avatar) usage and still do. No change.

3. Dropped testID — Old value was '' (Icon's default; AttachmentView never passed one), and no test targets it (grep of tests/ for MultiGestureIcon/enableMultiGestureCanvas/useCanvasSize → no hits). No change.

4. contentSize now passed directly — Old Icon computed contentSize = {iconWidth, iconHeight} via getIconWidthAndHeightStyle, which with no preset size falls through to {width, height} (styles/utils/index.ts:583) = defaultAvatarPreviewSize. AttachmentView now passes exactly that. Same values feed both ImageSVG and MultiGestureCanvas (zoom/fit).

5. canUseTouchScreen() branch moved into AttachmentView — Workspace-avatar fill/styles are computed before the branch (AttachmentView/index.tsx:213-227), so MultiGestureIcon still receives them — identical to when Icon forwarded them internally. enableMultiGestureCanvas had exactly one caller, now migrated; no orphaned usages.

6. Wrapper <View> — style={[additionalStyles]} → style={additionalStyles}; RN flattens nested style arrays, so rendering is identical.

7. !isCanvasLoading guard & shared useCanvasSize — Equivalent to the old !!canvasSize; the extracted hook is byte-for-byte the same logic as the inline copies, and the discriminated-union return narrows canvasSize to non-undefined exactly where MultiGestureCanvas needs it. Lightbox's remaining PixelRatio/useState/Dimensions imports are all still used elsewhere (no dead imports; knip is green).

All CI is green (typecheck, ESLint, knip, unused-styles, tests). The only outstanding item is the pending main merge already flagged by aimane-chnaif.

OSBotify · 2026-07-10T15:24:31Z

✋ 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-10T15:27:07Z

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

github-actions · 2026-07-10T15:33:05Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-3f52202fd71-a91d37b-d1037fdea11b950ecb45d665228520fb31485efd/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-3f52202-a91d37b-9fbe00e040aa4584f6afdd5aa486be085aed8183/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-14T11:36:51Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.4.34-0 🚀

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

MelvinBot · 2026-07-14T11:38:48Z

No help site changes required

I reviewed the changes in this PR and no updates to App/docs/articles are needed, so I did not create a draft docs PR.

Why: This is a purely internal code-organization refactor with no user-facing impact:

MultiGestureIcon was moved from src/components/Icon/primitives/ to a standalone component under src/components/Attachments/MultiGestureIcon/, with its own props type.
Icon dropped the enableMultiGestureCanvas prop; AttachmentView now decides directly whether to render the gesture-enabled variant on touch devices.
The canvas-measurement logic was extracted into a shared useCanvasSize hook that Lightbox reuses.

There are no new features, no UI/label/tab/button text changes, and no changes to product behavior that a user would need documented. The existing gesture behavior (pinch/pan/swipe on avatar/attachment previews on touch devices) is preserved — the change only reorganizes where that logic lives.

The help site documents product features and workflows, not the internal component structure, so nothing there is affected.

Note: I could not verify this in a browser (browser control was unavailable in this run). This conclusion is based on static analysis of the diff, which is a code-only refactor.

@jmusial, since this is a code-only refactor with no user-facing changes, there's no help site PR to review. If you believe a docs update is warranted, let me know what behavior changed and I'll draft one.

mitarachim · 2026-07-14T23:43:41Z

@jmusial This PR is failing in step 2 because of a regression issue #96148

The issue is reproducible in: iOS

Bug7208548_1784067649057!cat-face-emoji-svgrepo-com

Bug7208548_1784067649047.ScreenRecording_07-14-2026_15-42-12_1.mp4

OSBotify · 2026-07-16T05:13:29Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

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

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

Bundle Size Analysis (Sentry):

Android

Move Multi Gesture Icon out of icon primitives

8b90d10

melvin-bot Bot assigned jmusial Jul 3, 2026

fix knip

fd39252

jmusial mentioned this pull request Jul 3, 2026

Move inline icon out of icon primitives #95286

Merged

41 tasks

jmusial added 3 commits July 8, 2026 09:55

Merge branch 'main' into chore/move-MultiGestureIcon-out-of-icon-prim…

2217354

…itives

cleanup after merge

f858235

cleanup base icon props

1273a86

extract useCanvasSize

328798b

jmusial changed the title ~~Move multi gesture icon out of icon primitives~~ Move MultiGestureIcon out of icon primitives Jul 8, 2026

jmusial marked this pull request as ready for review July 8, 2026 11:04

jmusial requested review from a team as code owners July 8, 2026 11:04

melvin-bot Bot requested a review from aimane-chnaif July 8, 2026 11:04

melvin-bot Bot requested review from flaviadefaria and removed request for a team July 8, 2026 11:04

roryabraham requested changes Jul 8, 2026

View reviewed changes

update testID to be required

9bbda1d

roryabraham approved these changes Jul 9, 2026

View reviewed changes

roryabraham removed the request for review from flaviadefaria July 9, 2026 07:45

Merge branch 'main' into chore/move-MultiGestureIcon-out-of-icon-prim…

f4e0f53

…itives

aimane-chnaif approved these changes Jul 10, 2026

View reviewed changes

melvin-bot Bot requested a review from roryabraham July 10, 2026 12:20

roryabraham approved these changes Jul 10, 2026

View reviewed changes

roryabraham merged commit 3f52202 into Expensify:main Jul 10, 2026
35 checks passed

OSBotify mentioned this pull request Jul 14, 2026

Deploy Checklist: New Expensify 2026-07-14 #96044

Closed

applause-bot Bot mentioned this pull request Jul 14, 2026

[Due for payment 2026-07-22] [$250] iOS - Profile - Cannot upload SVG file as avatar #96148

Closed

7 tasks

melvin-bot Bot mentioned this pull request Jul 16, 2026

[Due for payment 2026-07-23] [M2] Migrate MultiGestureIcon usages #95158

Open

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 8, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 8, 2026

Uh oh!

jmusial commented Jul 8, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 8, 2026

Uh oh!

melvin-bot Bot commented Jul 8, 2026

Uh oh!

jmusial commented Jul 8, 2026

Uh oh!

aimane-chnaif commented Jul 8, 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!

roryabraham Jul 8, 2026

Choose a reason for hiding this comment

Uh oh!

roryabraham commented Jul 9, 2026

Uh oh!

jmusial commented Jul 10, 2026

Uh oh!

aimane-chnaif commented Jul 10, 2026

Uh oh!

MelvinBot commented Jul 10, 2026

Review

Uh oh!

chatgpt-codex-connector Bot commented Jul 10, 2026

Uh oh!

MelvinBot commented Jul 10, 2026

Regression hunt: none found ✅

Uh oh!

Uh oh!

OSBotify commented Jul 10, 2026

Uh oh!

github-actions Bot commented Jul 10, 2026

Uh oh!

github-actions Bot commented Jul 10, 2026

Uh oh!

OSBotify commented Jul 14, 2026

Uh oh!

MelvinBot commented Jul 14, 2026

No help site changes required

Uh oh!

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

Uh oh!

Uh oh!

OSBotify 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

aimane-chnaif commented Jul 8, 2026 •

edited

Loading

mitarachim commented Jul 14, 2026 •

edited

Loading