Feat/custom avatar polish by jmusial · Pull Request #73412 · Expensify/App

jmusial · 2025-10-24T09:52:25Z

Explanation of Change

This PR cleans up the logic of upload / edit / preview button for new custom avatar.

When a user has an Expensify Avatar (whether default, initial, or F1) then the only button option should be Upload a photo
When a user has a photo uploaded, the button is Edit with the available options inside.

Fixed Issues

$ #73124

PROPOSAL:

Tests

Open app
Go to Account -> Profile
Select default avatar -> Upload button should be under preview
Upload custom avatar -> Upload & View buttons (dropdown) should be under preview
Save custom avatar -> Upload, View and Delete buttons (dropdown) should be under preview

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

0058.andorid.native.mov

Android: mWeb Chrome

0058.android.chrome.mov

iOS: Native

0058.ios.native.mov

iOS: mWeb Safari

0058.ios.safari.mov

MacOS: Chrome / Safari

0058.desktop.chrome.mov

MacOS: Desktop

0058.desktop.native.mov

codecov · 2025-10-24T10:40:04Z

Codecov Report

❌ Patch coverage is 26.08696% with 17 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/libs/UserUtils.ts	25.00%	9 Missing ⚠️
...ntModalScreen/routes/ProfileAvatarModalContent.tsx	0.00%	3 Missing ⚠️
src/hooks/useAvatarMenu.ts	0.00%	2 Missing ⚠️
src/pages/settings/Profile/Avatar/AvatarPage.tsx	0.00%	2 Missing ⚠️
src/components/Avatar.tsx	75.00%	1 Missing ⚠️

Files with missing lines	Coverage Δ
src/libs/actions/PersonalDetails.ts	`52.22% <ø> (ø)`
src/components/Avatar.tsx	`93.54% <75.00%> (-6.46%)`	⬇️
src/hooks/useAvatarMenu.ts	`0.00% <0.00%> (ø)`
src/pages/settings/Profile/Avatar/AvatarPage.tsx	`0.00% <0.00%> (ø)`
...ntModalScreen/routes/ProfileAvatarModalContent.tsx	`7.14% <0.00%> (-0.55%)`	⬇️
src/libs/UserUtils.ts	`76.98% <25.00%> (-4.38%)`	⬇️

... and 1421 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

melvin-bot · 2025-10-24T10:40:47Z

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

github-actions · 2025-10-24T13:37:18Z

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

grgia · 2025-10-24T15:00:44Z

src/libs/UserUtils.ts

+            avatarSource.includes('images/avatars/avatar_') ||
+            avatarSource.includes('images/avatars/default-avatar_') ||
+            avatarSource.includes('images/avatars/user/default') ||
+            avatarSource.includes('images/avatars/custom-avatars') || // F1 season avatars


should we add these to CONST?

will do in refactor

grgia

code looking good, will manually test next

grgia · 2025-10-24T15:02:01Z

cc @dannymcclain @dubielzyk-expensify got an avatar adhoc for ya #73412 (comment)

dukenv0307 · 2025-10-25T04:35:15Z

src/libs/UserUtils.ts

 * @param avatarSource - the avatar source from user's personalDetails
 */
-function isDefaultAvatar(avatarSource?: AvatarSource): avatarSource is string | undefined {
+function isDefaultAvatar(avatarSource?: AvatarSource, originalFileName?: string): avatarSource is string | undefined {


Why do we need to update this function? If it's a custom avatar, it won't show in the attachment modal

Screen.Recording.2025-10-25.at.11.35.02.mov

I think if we want to be consistent, we should not allow to see the avatar preview here at all if it's a default avatar.

cc @grgia what do you think ?

But on the second thought, yeah this one is influencing quite a lot of places :(

I'll refactor to not touch it for now...

I was thinking we could do this in the refactor issue, WDYT?

dukenv0307 · 2025-10-25T04:37:48Z

Custom avatar is not shown if we reset cache and restart. I think the RCA is also in isDefaultAvatar

Screen.Recording.2025-10-25.at.11.37.27.mov

dukenv0307 · 2025-10-25T04:41:05Z

When user deletes photo, should we save photo and close RHP automatically? This is different from when user changes profile picture, they have to click save button to update profile picture and close RHP.

Screen.Recording.2025-10-25.at.11.38.51.mov

dubielzyk-expensify · 2025-10-26T23:28:44Z

I think we should stick the error fixed to the footer button like we do a bunch of other places. It's easy to miss now:

Other areas we do it:

dubielzyk-expensify · 2025-10-26T23:29:26Z

I think this is looking real good 👍 cc @dannymcclain for extra thoughts, but otherwise it looks good to me. Awesome job!

grgia · 2025-10-27T10:27:27Z

@jmusial let me know when this is ready for the next build/review 😁

dannymcclain · 2025-10-27T13:18:17Z

When user deletes photo, should we save photo and close RHP automatically? This is different from when user changes profile picture, they have to click save button to update profile picture and close RHP.

I think instead of closing the RHP, we should keep it open and select the very first default avatar. But I don't feel super duper strongly.

I think this is looking real good 👍 cc @dannymcclain for extra thoughts, but otherwise it looks good to me. Awesome job!

Feeling good to me too! 👍

jmusial · 2025-10-27T13:38:22Z

@grgia I think you can run the build now

Current state:

Fixed:

error msg
clear cache & default avatar
workspace subscript avatar preview
Deleting avatar update - it sets the default default users avatar

Screen.Recording.2025-10-27.at.15.06.07.mov

FYI:

There is a backend issue when saving avatar. Exists on PROD as well, just posting for visibility.

Repro steps:

Have browser cache disabled.
Upload avatar or set a letter avatar and save.
Refresh page - > avatar is not there.

Reason:

Backed return empty data when updating avatar.

dukenv0307 · 2025-10-27T16:27:23Z

We can zoom in and out on custom avatars, but not on default avatars. Should we fix it here?

Screen.Recording.2025-10-27.at.23.25.11.mov

dubielzyk-expensify · 2025-10-27T23:45:01Z

I think instead of closing the RHP, we should keep it open and select the very first default avatar. But I don't feel super duper strongly.

Yeah that make sense to me. I guess we don't really close the RHP automatically in other places.

grgia

@jmusial cc @dukenv0307
Anything outstanding that needs clarifying / fixing before we can get this to a final build for design?

jmusial · 2025-10-29T09:41:57Z

We can zoom in and out on custom avatars, but not on default avatars. Should we fix it here?

Screen.Recording.2025-10-27.at.23.25.11.mov

I'd suggest aligning it in the refactor. To clean this up requires touching isDefaultAvatar :(

github-actions · 2025-10-29T09:52:29Z

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

github-actions · 2025-10-29T10:26:04Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/73412/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/73412/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/73412/NewExpensify.dmg	https://73412.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

grgia

@jmusial could you list out the next steps or anything that we decided to do after this PR in the refactor issue? I can update the refactor issue, or create separate ones, whichever is easiest.

jmusial · 2025-10-29T13:10:30Z

@grgia added here
I think would be reasonable to do beta removal in one PR and the rest in another. No need to create separate tasks though.

Also please let me know if you think I missed sth.

grgia · 2025-10-29T14:34:09Z

Tests LGTM, cc @dukenv0307

dukenv0307 · 2025-10-29T15:41:21Z

on it now

dukenv0307 · 2025-10-29T16:24:44Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

Screen.Recording.2025-10-29.at.23.13.34.mov

Android: mWeb Chrome

Screen.Recording.2025-10-29.at.23.08.41.mov

iOS: HybridApp

Screen.Recording.2025-10-29.at.23.12.08.mov

iOS: mWeb Safari

Screen.Recording.2025-10-29.at.23.06.50.mov

MacOS: Chrome / Safari

Screen.Recording.2025-10-29.at.23.03.54.mov

MacOS: Desktop

Screen.Recording.2025-10-29.at.23.14.05.mov

OSBotify · 2025-10-31T09:43:36Z

✋ 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 · 2025-10-31T21:47:29Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.2.42-0 🚀

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

OSBotify · 2025-11-03T22:40:42Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.42-11 🚀

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

jmusial added 2 commits October 24, 2025 11:46

Change the upload avatar button behaviour

4c7c135

Merge branch 'main' into feat/custom-avatar-polish

7c3bfcf

melvin-bot bot assigned jmusial Oct 24, 2025

fix prettier

13073d9

jmusial marked this pull request as ready for review October 24, 2025 10:40

jmusial requested a review from a team as a code owner October 24, 2025 10:40

melvin-bot bot requested review from dukenv0307 and removed request for a team October 24, 2025 10:40

jmusial mentioned this pull request Oct 24, 2025

[Avatar Customization] Polish & Release to Users #73124

Closed

grgia self-requested a review October 24, 2025 13:35

This comment has been minimized.

Sign in to view

grgia reviewed Oct 24, 2025

View reviewed changes

grgia requested a review from dannymcclain October 24, 2025 15:01

dukenv0307 reviewed Oct 25, 2025

View reviewed changes

jmusial added 2 commits October 27, 2025 10:37

Merge branch 'main' into feat/custom-avatar-polish

f1312a8

error is fixed to action button

7b0c1c3

fix defaultAvatar

59c016a

change avatar delete flow

67f1444

grgia reviewed Oct 28, 2025

View reviewed changes

jmusial added 2 commits October 29, 2025 10:18

Merge branch 'main' into feat/custom-avatar-polish

9f39e20

Remove redundant empty string checks

9460b05

fix lint

1bc5852

grgia requested a review from dukenv0307 October 29, 2025 10:46

grgia reviewed Oct 29, 2025

View reviewed changes

grgia approved these changes Oct 29, 2025

View reviewed changes

dukenv0307 approved these changes Oct 29, 2025

View reviewed changes

melvin-bot bot requested a review from grgia October 29, 2025 16:26

This was referenced Oct 30, 2025

[No QA] chore/refactor user avatar utils #73868

Merged

[Due for payment 2025-11-17] [Due for payment 2025-11-14] [Avatar Customization] Post Release Tidy Up #73221

Closed

grgia approved these changes Oct 31, 2025

View reviewed changes

grgia merged commit f6e0549 into Expensify:main Oct 31, 2025
25 of 27 checks passed

OSBotify mentioned this pull request Oct 31, 2025

Deploy Checklist: New Expensify 2025-10-31 #73985

Closed

jponikarchuk mentioned this pull request Nov 1, 2025

[Due for payment 2025-11-11] Account - Profile image does not display in preview after upload #74012

Closed

8 tasks

situchan mentioned this pull request Nov 2, 2025

Revert "Feat/custom avatar polish" #74046

Closed

daledah mentioned this pull request Nov 6, 2025

[$250] Account setting - Avatar error message is not aligned to the avatar or save button #73517

Closed

8 tasks

dukenv0307 mentioned this pull request Jan 14, 2026

[Tracking][New Feature][Avatar] - Expensify Avatar Customization #71653

Closed

Conversation

jmusial commented Oct 24, 2025 • 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 Oct 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot bot commented Oct 24, 2025

Uh oh!

github-actions bot commented Oct 24, 2025

Uh oh!

This comment has been minimized.

grgia Oct 24, 2025

Choose a reason for hiding this comment

Uh oh!

jmusial Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

Uh oh!

grgia commented Oct 24, 2025

Uh oh!

dukenv0307 Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

jmusial Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jmusial Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

grgia Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Oct 25, 2025

Uh oh!

dukenv0307 commented Oct 25, 2025

Uh oh!

dubielzyk-expensify commented Oct 26, 2025

Uh oh!

dubielzyk-expensify commented Oct 26, 2025

Uh oh!

grgia commented Oct 27, 2025

Uh oh!

dannymcclain commented Oct 27, 2025

Uh oh!

jmusial commented Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current state:

Fixed:

FYI:

Repro steps:

Reason:

Uh oh!

dukenv0307 commented Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dubielzyk-expensify commented Oct 27, 2025

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

Uh oh!

jmusial commented Oct 29, 2025

Uh oh!

github-actions bot commented Oct 29, 2025

Uh oh!

github-actions bot commented Oct 29, 2025

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

jmusial commented Oct 24, 2025 •

edited

Loading

codecov bot commented Oct 24, 2025 •

edited

Loading

jmusial Oct 27, 2025 •

edited

Loading

jmusial commented Oct 27, 2025 •

edited

Loading

dukenv0307 commented Oct 27, 2025 •

edited

Loading