[CP Staging][Avatars] Display subscript for single expenses & invoices in Workspace by JakubKorytko · Pull Request #67993 · Expensify/App

JakubKorytko · 2025-08-06T09:21:13Z

Explanation of Change

Fix for workspace's single expenses & invoices in Reports->Chats, header & details page not being displayed as a subscript.

Fixed Issues

$ #67975
$ #67750
PROPOSAL: N/A

Tests

Open Expensify App
Create a workspace
Create two expenses in the workspace chat
Open the expense report, the click on each expense to open expense details page
Verify there is an expense creator avatar with workspace icon in the expense details header
Go to Reports->Chats
Find created expense & report
Verify that proper subscript is displayed there as well

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Web.mov

MacOS: Desktop

melvin-bot · 2025-08-06T09:26:39Z

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

JakubKorytko · 2025-08-06T09:26:53Z

Unused styles check failing unrelated, it is failing on main as well.

grgia · 2025-08-06T09:30:52Z

src/components/ReportActionAvatars/useReportActionAvatars.ts

    const shouldShowAllActors = displayAllActors && !reportPreviewSenderID;
    const isChatThreadOutsideTripRoom = isChatThread(chatReport) && !isATripRoom;
-    const shouldShowSubscriptAvatar = shouldReportShowSubscript(iouReport ?? chatReport, isReportArchived) && policy?.type !== CONST.POLICY.TYPE.PERSONAL;
+    const shouldShowSubscriptAvatar = shouldReportShowSubscript(iouReport ?? chatReport, isReportArchived) && isWorkspacePolicy;


shouldReportShowSubscript

Instead of add the case outside of it, could we update this function?

Well, it's not that easy. It's more a matter of which report to pass and which report to pass to the icons function. For example, the invoice single expense view has no IOU report, and the invoice report is actually a parent of its chat report. The whole logic revolves around that. The function itself performs checks such as isExpenseRequest so it is correct.

But I agree that there are sooo many checks that it needs a refractor and some utils functions and I am willing to do such as well as the optimization but I think we should focus to cover everything and do refractor as a last PR, same as we did with Better Expense Report View and it worked well.

What do you think?

grgia · 2025-08-06T09:32:15Z

src/components/ReportActionAvatars/useReportActionAvatars.ts

+    if (shouldUseInvoiceExpenseIcons) {
+        avatars = getIconsWithDefaults(invoiceReport);
+    } else if (shouldUseMappedAccountIDs) {
+        avatars = avatarsForAccountIDs;


Is this the centralized place where these checks are made?

Yes, this hook is used inside a component that is used for every report or report action avatar in the app.

github-actions · 2025-08-06T09:37:22Z

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

QichenZhu · 2025-08-06T09:41:40Z

@JakubKorytko, I think the reviewers of #65740 will take care of this since it's a follow-up PR.

If it's time-sensitive or you'd like my input, I'm happy to help.

cc @grgia @c3024

github-actions · 2025-08-06T09:42:11Z

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

Android 🤖	iOS 🍎
⏩ SKIPPED ⏩	⏩ SKIPPED ⏩
The build for Android was skipped	The build for iOS was skipped

Desktop 💻	Web 🕸️
⏩ SKIPPED ⏩	https://67993.pr-testing.expensify.com
The build for Desktop was skipped

👀 View the workflow run that generated this build 👀

grgia · 2025-08-06T09:50:19Z

@QichenZhu yes no need for review, I will be testing!

grgia · 2025-08-06T10:03:38Z

Passes test

grgia · 2025-08-06T10:05:53Z

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

MacOS: Desktop

OSBotify · 2025-08-06T10:56: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.

…le-expense-no-subscript [CP Staging][Avatars] Display subscript for single expenses & invoices in Workspace (cherry picked from commit 9f165e6) (cherry-picked to staging by mountiny)

github-actions · 2025-08-06T14:08:47Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.1.89-19 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-08-06T19:34:56Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.89-21 🚀

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

github-actions · 2025-08-06T20:19:31Z

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

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-08-08T02:11:22Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.90-11 🚀

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

dukenv0307 · 2025-09-24T09:52:26Z

src/components/ReportActionAvatars/useReportActionAvatars.ts

    const defaultDisplayName = getDisplayNameForParticipant({accountID, personalDetailsData: personalDetails}) ?? '';
    const isAInvoiceReport = isInvoiceReport(iouReport ?? null);
+    const invoiceReport = [iouReport, chatReport, reportChatReport].find(isInvoiceReport);
+    const isNestedInInvoiceReport = !!invoiceReport;


Coming from #69343, we should add the check for the chat thread as well

Add a logic for single expense & invoices

2273b63

JakubKorytko changed the title ~~[Avatars] Display subscript for single expenses & invoices~~ [Avatars] Display subscript for single expenses & invoices in Workspace Aug 6, 2025

JakubKorytko marked this pull request as ready for review August 6, 2025 09:26

JakubKorytko requested a review from a team as a code owner August 6, 2025 09:26

melvin-bot bot requested review from QichenZhu and removed request for a team August 6, 2025 09:26

grgia reviewed Aug 6, 2025

View reviewed changes

grgia changed the title ~~[Avatars] Display subscript for single expenses & invoices in Workspace~~ [CP Staging][Avatars] Display subscript for single expenses & invoices in Workspace Aug 6, 2025

grgia approved these changes Aug 6, 2025

View reviewed changes

Merge branch 'main' into korytko/fix-single-expense-no-subscript

fc93f8a

grgia merged commit 9f165e6 into Expensify:main Aug 6, 2025
18 checks passed

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

github-actions bot mentioned this pull request Aug 6, 2025

Deploy Checklist: New Expensify 2025-08-04 #67808

Closed

dukenv0307 reviewed Sep 24, 2025

View reviewed changes

Conversation

JakubKorytko commented Aug 6, 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 Aug 6, 2025

Uh oh!

JakubKorytko commented Aug 6, 2025

Uh oh!

grgia Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

JakubKorytko Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

grgia Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

JakubKorytko Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Aug 6, 2025

Uh oh!

QichenZhu commented Aug 6, 2025

Uh oh!

github-actions bot commented Aug 6, 2025

Uh oh!

grgia commented Aug 6, 2025

Uh oh!

grgia commented Aug 6, 2025

Uh oh!

grgia commented Aug 6, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Aug 6, 2025

Uh oh!

github-actions bot commented Aug 6, 2025

Uh oh!

github-actions bot commented Aug 6, 2025

Uh oh!

github-actions bot commented Aug 6, 2025

Uh oh!

github-actions bot commented Aug 8, 2025

Uh oh!

dukenv0307 Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

JakubKorytko commented Aug 6, 2025 •

edited

Loading