[CP Staging] Using the logical or operator instead nullish by mollfpr · Pull Request #75970 · Expensify/App

mollfpr · 2025-11-25T05:46:50Z

Explanation of Change

Fix the deploy blocker. Detailed here.

Fixed Issues

$ #75931
$ #75930
PROPOSAL:

Tests

Test for #75931

Go to FAB > Start chat
Verify the concierge avatar will be displayed.

Test for #75930

Go offline
Go to FAB > Start chat
Enter email of new user and select it
Verify it's showing the fallback avatar instead of blank

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test.

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

Screen.Recording.Nov.25.2025.1.mp4

…m fallbackIcon is use

melvin-bot · 2025-11-25T05:47:29Z

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

eh2077 · 2025-11-25T05:49:38Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-11-25.at.1.50.35.PM.mov

Screen.Recording.2025-11-25.at.1.51.37.PM.mov

codecov · 2025-11-25T05:55:04Z

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/components/Avatar.tsx	`90.00% <100.00%> (-0.63%)`	⬇️
... and 11 files with indirect coverage changes

eh2077 · 2025-11-25T05:55:45Z

Confirmed both issues are fixed.

Screen.Recording.2025-11-25.at.1.50.35.PM.mov

Screen.Recording.2025-11-25.at.1.51.37.PM.mov

mollfpr · 2025-11-25T05:56:33Z

Thank you @eh2077 for testing it 🙏

My local dev never show the concierge avatar 😅

MonilBhavsar · 2025-11-25T05:58:08Z

+1, thanks!

MonilBhavsar · 2025-11-25T05:58:54Z

My local dev never show the concierge avatar 😅

It might be because you have different concierge accountID in DB and your .env file. You need to update the .env file to have correct concierge account that is in your local DB

MonilBhavsar

Thanks! 🚀

melvin-bot · 2025-11-25T06:00:33Z

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

mollfpr · 2025-11-25T06:03:27Z

It might be because you have different concierge accountID in DB and your .env file. You need to update the .env file to have correct concierge account that is in your local DB

Yesss!! You are my SAVIOR, Monil! ❤️

mjasikowski · 2025-11-25T07:22:49Z

-        fallbackAvatar = fallbackIcon ?? defaultAvatars.FallbackAvatar;
-    }
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const fallbackAvatar = isWorkspace ? getDefaultWorkspaceAvatar(name) : fallbackIcon || defaultAvatars.FallbackAvatar;


NAB You could probably do something like this to not disable eslint rules:

const normalizedFallbackIcon = typeof fallbackIcon === 'string' && fallbackIcon.trim() === '' ? undefined : fallbackIcon; const fallbackAvatar = isWorkspace ? getDefaultWorkspaceAvatar(name) : normalizedFallbackIcon ?? defaultAvatars.FallbackAvatar;

OSBotify · 2025-11-25T07:49:03Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

…-avatar (cherry picked from commit 7799267) (cherry-picked to staging by lakchote)

OSBotify · 2025-11-25T08:45:44Z

🚀 Cherry-picked to staging by https://github.com/lakchote in version: 9.2.63-1 🚀

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

OSBotify · 2025-11-26T01:24:53Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.2.63-8 🚀

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

OSBotify · 2025-11-26T03:54:58Z

🚀 Cherry-picked to staging by https://github.com/lakchote in version: 9.2.64-0 🚀

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

OSBotify · 2025-11-27T01:23:14Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.2.64-5 🚀

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

using the logical or operator instead nullish to fix empty string fro…

378a0ba

…m fallbackIcon is use

melvin-bot Bot assigned mollfpr Nov 25, 2025

mollfpr requested review from MonilBhavsar and eh2077 November 25, 2025 05:47

mollfpr marked this pull request as ready for review November 25, 2025 05:47

mollfpr requested review from a team as code owners November 25, 2025 05:47

melvin-bot Bot requested review from JmillsExpensify and brunovjk and removed request for a team November 25, 2025 05:47

melvin-bot Bot removed the request for review from a team November 25, 2025 05:47

mollfpr removed request for JmillsExpensify and brunovjk November 25, 2025 05:47

MonilBhavsar approved these changes Nov 25, 2025

View reviewed changes

eh2077 approved these changes Nov 25, 2025

View reviewed changes

melvin-bot Bot requested a review from mjasikowski November 25, 2025 06:00

mjasikowski reviewed Nov 25, 2025

View reviewed changes

mjasikowski approved these changes Nov 25, 2025

View reviewed changes

mjasikowski merged commit 7799267 into main Nov 25, 2025
56 of 59 checks passed

mjasikowski deleted the mollfpr-fix-nullish-fallback-avatar branch November 25, 2025 07:23

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Nov 25, 2025

OSBotify pushed a commit that referenced this pull request Nov 25, 2025

Merge pull request #75970 from Expensify/mollfpr-fix-nullish-fallback…

be474c8

…-avatar (cherry picked from commit 7799267) (cherry-picked to staging by lakchote)

OSBotify mentioned this pull request Nov 25, 2025

Deploy Checklist: New Expensify 2025-11-24 #75927

Closed

98 tasks

mollfpr mentioned this pull request Nov 25, 2025

Android - Report - Arrows on every field of expense report flicker when report is opened #75941

Closed

16 tasks

This was referenced Nov 27, 2025

[Due for payment 2025-12-04] Chat - Concierge avatar is blank on start chat list #75931

Closed

[Due for payment 2025-12-04] Chat - Blank avatar on LHN when starting chat with new user offline #75930

Closed

Conversation

mollfpr commented Nov 25, 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!

melvin-bot Bot commented Nov 25, 2025

Uh oh!

eh2077 commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Nov 25, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

eh2077 commented Nov 25, 2025

Uh oh!

mollfpr commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MonilBhavsar commented Nov 25, 2025

Uh oh!

MonilBhavsar commented Nov 25, 2025

Uh oh!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Nov 25, 2025

Uh oh!

mollfpr commented Nov 25, 2025

Uh oh!

mjasikowski Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Nov 25, 2025

Uh oh!

OSBotify commented Nov 25, 2025

Uh oh!

OSBotify commented Nov 26, 2025

Uh oh!

OSBotify commented Nov 26, 2025

Uh oh!

OSBotify commented Nov 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mollfpr commented Nov 25, 2025 •

edited

Loading

eh2077 commented Nov 25, 2025 •

edited

Loading

codecov Bot commented Nov 25, 2025 •

edited by github-actions Bot

Loading

mollfpr commented Nov 25, 2025 •

edited

Loading