Skip to content

[Avatars - Reports] If a report contains the expenses of one person, only display their avatar + fix isOneTransactionReport#64802

Merged
grgia merged 34 commits intoExpensify:mainfrom
software-mansion-labs:korytko/display-sender-avatar-next-to-preview
Jul 9, 2025
Merged

[Avatars - Reports] If a report contains the expenses of one person, only display their avatar + fix isOneTransactionReport#64802
grgia merged 34 commits intoExpensify:mainfrom
software-mansion-labs:korytko/display-sender-avatar-next-to-preview

Conversation

@JakubKorytko
Copy link
Contributor

@JakubKorytko JakubKorytko commented Jun 24, 2025

Explanation of Change

We want to display only the sender's avatar everywhere if it only contains one person's expenses. Initially the PR was to do it only for report preview, but right now it do that for report header as well. The rest of avatars in the app (LHN, details etc.) will be fixed as part of resolving this issue: #65559

We achieve that by a new local hook useReportAvatarDetails and SingleReportAvatar component. It performs the following checks to determine if the report preview is a single avatar:

There are still problems with Onyx actions that can lead to stale avatars, see summary here: #64802 (comment). If actions are always up to date, we can remove the two conditionals, and rely only on the following check:

  • If all actions are created by one person - either all actions are created by the current user or all actions are created by the user we have opened chat with.

There is also logic for the Send Money flow:

  • If the action is a 'Send Money' flow, it will only have one transaction, but the person who sent the money is the child manager account, not the child owner account.
  • If we have more than one IOU action, but they are 'Pay' actions, we consider it as a single avatar. The only place where 'Pay' actions are considered valid is in the 'Send Money' flow.

PR fixing isOneTransactionReport #64734 was merged into this PR as it is the same logic area. The problem is that the function getOneTransactionThreadReportID never returns null; it always returns undefined. Therefore, isOneTransactionReport always returns true.

What has been done to fix that:

  • ReportUtilsGetIconsTest was brought back and corrected.
  • Fixed EnforceActionExportRestrictions.
  • isOneTransactionReport return value was corrected.

Also fixed a comment mentioned here: #64228 (comment)

Fixed Issues

$ #62869
$ #64333
PROPOSAL: N/A

Tests

[Display only the sender's avatar next to the report preview if it only contains one person's expenses]

  1. Open Expensify app
  2. Log in with any account (User A)
  3. Click green + button > Create expense
  4. Choose any user without IOU in chat and create expense
  5. Verify that next to the Report Preview you see only one avatar and it's the sender.
  6. Verify that you see only the sender name above Report Preview.
  7. Log in as another user (User B)
  8. Go to chat with user A
  9. Create expense
  10. Verify that you see both user avatars & names.
  11. Create one more expense as both user A & B
  12. Delete every expense of one user
  13. Verify that you see one avatar again

[Fix isOneTransactionReport]

  1. Open Expensify App
  2. Open any DM's in the domain
  3. Enter the report with only one transaction
  4. Verify that in the header you see only one avatar
  5. Open any other report in DM's with more than 1 transaction
  6. Verify that you can see both users avatars
  7. Go to any workspace
  8. Open report with only one expense
  9. Verify that you see the simplified version of the icons in the header (workspace icon is smaller than the user avatar)
  10. Open other report with more than one expense
  11. Verify that you see the same.

Offline tests

Same as tests.

QA Steps

Same as tests.

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Web.mov
Web.mp4
Web_2.mov
MacOS: Desktop

@JakubKorytko JakubKorytko changed the title Display sender avatar only next to the Report Preview with only one person expenses Display only the sender's avatar next to the report preview if it only contains one person's expenses Jun 24, 2025
@JakubKorytko JakubKorytko marked this pull request as ready for review June 25, 2025 06:02
@JakubKorytko JakubKorytko requested a review from a team as a code owner June 25, 2025 06:02
@melvin-bot melvin-bot bot requested review from c3024 and removed request for a team June 25, 2025 06:02
@melvin-bot
Copy link

melvin-bot bot commented Jun 25, 2025

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

@shawnborton
Copy link
Contributor

Going to run a test build quickly 🚀

@github-actions
Copy link
Contributor

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

@JakubKorytko
Copy link
Contributor Author

Going to run a test build quickly 🚀

That was quick, the design team is always on its toes 😄

@shawnborton
Copy link
Contributor

You don't know how badly I want to fix this one 🤣

@c3024
Copy link
Contributor

c3024 commented Jun 25, 2025

The IOU report opens only after clicking on the report preview. So, when the receiver logs in and sees the preview in the DM, the iouReport and its actions are not yet available. As a result, areIOUActionsOnlyFromOnePerson returns false, and both names are shown (as seen at 00:00 in the video). Once the report preview is clicked and the IOU report opens, the report actions become available, and the display updates correctly.

Screen.Recording.2025-06-25.at.11.49.03.AM.mov

@JakubKorytko
Copy link
Contributor Author

@c3024 Ah, yes, missing data in Onyx. I believe this is a common scenario, and I have seen data missing until the report is opened before. A recent comment on another PR:

#64228 (comment)

I have to either open that iou report or refresh the chat to see from, to on each new report.

I think there should be a dedicated PR to fix the fact that Onyx is not up to date, but CC: @mountiny @luacmartins for opinion.

@github-actions

This comment has been minimized.

@shawnborton
Copy link
Contributor

Hmm I am seeing this on the test build:
CleanShot 2025-06-25 at 10 38 57@2x

CleanShot 2025-06-25 at 10 39 30@2x

@shawnborton
Copy link
Contributor

Ah, I think I am reporting the same thing as above. It seems to work after I view the report and then go back to the chat.

@JakubKorytko
Copy link
Contributor Author

Yeah, Onyx data is missing, same thing.

@c3024
Copy link
Contributor

c3024 commented Jun 25, 2025

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
avatarAndroid.mov
Android: mWeb Chrome
avatarAndroidmWeb.mov
iOS: HybridApp
avatariOS.mov
iOS: mWeb Safari
avatariOSmWeb.mov
MacOS: Chrome / Safari
avatarChrome1.mov
avatarChrome2.mov
MacOS: Desktop
avatarDesktop.mov

Copy link
Contributor

@c3024 c3024 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@melvin-bot melvin-bot bot requested a review from grgia June 25, 2025 13:49
@c3024
Copy link
Contributor

c3024 commented Jun 25, 2025

@JakubKorytko,

I think it would be better to include the step of opening the preview and then navigating back to the report in the QA steps, so that QA does not think that the PR did not fix it.

@JakubKorytko JakubKorytko changed the title [Avatars - Reports] Display only the sender's avatar next to the report preview if it only contains one person's expenses + fix isOneTransactionReport [Avatars - Reports] If a report contains the expenses of one person, only display their avatar + fix isOneTransactionReport Jul 8, 2025
@JakubKorytko JakubKorytko force-pushed the korytko/display-sender-avatar-next-to-preview branch from 0456598 to 84b21ba Compare July 8, 2025 10:45
@JakubKorytko
Copy link
Contributor Author

JakubKorytko commented Jul 8, 2025

FYI failing test also fails on main.

I also believe that this test is poorly written. Take a look at the results of running the GroupChatNameTests three times locally.

3 runs on main

Screenshot 2025-07-08 at 12 51 55

Screenshot 2025-07-08 at 12 52 17

Screenshot 2025-07-08 at 12 51 26

It is not reliable when a different test case fails every time. Also, in this PR, it sometimes failed and sometimes didn't.

cc: @mountiny

@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2025

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

@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2025

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/64802/index.html ❌ FAILED ❌
Android The QR code can't be generated, because the iOS build failed
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/64802/NewExpensify.dmg https://64802.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@shawnborton
Copy link
Contributor

In this IOU report I have, the report preview is using the correct diagonal avatar, but the report itself does not have the same diagonal avatar:

CleanShot.2025-07-08.at.11.41.45.mp4

@grgia
Copy link
Contributor

grgia commented Jul 8, 2025

@shawnborton

Are both expenses deleted? There's a bug with reports with deleted transactions

@shawnborton
Copy link
Contributor

Hmm not deleted but they were in a weird state because they became cancelled - the receiver didn't set up their wallet within 30 days, so the expense reimbursements (p2p, so a money transfer) got cancelled.

@shawnborton
Copy link
Contributor

It does seem to work fine elsewhere, so maybe we can chalk this up to an edge case scenario:
CleanShot 2025-07-08 at 11 58 07@2x

@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2025

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/64802/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/64802/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/64802/NewExpensify.dmg https://64802.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@JakubKorytko
Copy link
Contributor Author

JakubKorytko commented Jul 9, 2025

but they were in a weird state

If I got a penny every time @shawnborton had a weird Onyx state, I would already have at least three 😆

I think we should note this issue here just in case: #65559. However, it may be a specific edge case, so I would focus on it last.

@grgia grgia merged commit 4a5b141 into Expensify:main Jul 9, 2025
18 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jul 9, 2025

✋ 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
Copy link
Contributor

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

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

@nlemma
Copy link

nlemma commented Jul 10, 2025

@JakubKorytko This PR is failing with this issue.

@github-actions
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.1.79-11 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants