Display both names for IOU Report Previews #23043

Gonals · 2023-07-17T21:13:09Z

cc @shawnborton , I'm using the existing/standard Multiple Avatar here, but you may want to take a look in case we want some tweaks

Details

Fixed Issues

$ #21102
PROPOSAL:

Tests

Log into an account (A)
Open a chat with a second account (B) and request money
Confirm the report preview displays with both avatars and both names:

Log into B and confirms it displays the same for them.
Log back into A and open a Workspace chat. Request money
Confirm both your name and the workspace name display, as well as both avatars

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

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 / Chrome
- iOS / native
- iOS / 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 verified the translation was requested/reviewed 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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(themeColors.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 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.
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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-07-17T21:13:14Z

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

Gonals · 2023-07-17T21:13:26Z

I'll add the screenshots tomorrow

Gonals · 2023-07-18T11:51:44Z

@aimane-chnaif, ngrok is being a pain today, so I haven't been able to take the screenshots, but this is ready for review, so feel free to go for it!

JmillsExpensify · 2023-07-18T20:12:03Z

@aimane-chnaif Up to you whether you want to start before or after the screenshots are added, though I wanted to give you a heads up that this is one of our more valuable PRs at the moment. Thanks!

aimane-chnaif · 2023-07-18T20:13:55Z

@aimane-chnaif Up to you whether you want to start before or after the screenshots are added, though I wanted to give you a heads up that this is one of our more valuable PRs at the moment. Thanks!

Got it. Will prioritize review today

aimane-chnaif · 2023-07-20T13:43:49Z

@Gonals there's conflict

Gonals · 2023-07-21T08:18:53Z

@Gonals there's conflict

Solved!

Gonals · 2023-07-21T09:56:06Z

Added screenshots. Android web is not launching for me for reasons unknown (not even in main), but I think it is safe to say this works 😁

aimane-chnaif · 2023-07-24T15:10:28Z

src/pages/home/report/ReportActionItemSingle.js

+    let secondaryAvatar = {};
+    const displayAllActors = props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && props.iouReport;
+    if (displayAllActors) {
+        const secondaryUserDetails = props.personalDetailsList[props.iouReport.ownerAccountID] || {};


This is not correct. action.actorAccountID and iouReport.ownerAccountID can be same.

aimane-chnaif · 2023-07-24T15:13:44Z

Some style issues:

aimane-chnaif · 2023-07-24T15:18:16Z

Same user info as I commented here - #23043 (comment)

Screen.Recording.2023-07-24.at.3.52.47.PM.mov

Gonals · 2023-07-25T11:34:13Z

Same user info as I commented here - #23043 (comment)

Screen.Recording.2023-07-24.at.3.52.47.PM.mov

That's a nice catch! How did you manage to get this situation? I see it correctly regardless of which account I'm logged into @aimane-chnaif

aimane-chnaif · 2023-07-25T11:37:31Z

@Gonals did you test with both payer account and payee account?

Gonals · 2023-07-25T11:46:51Z

@Gonals did you test with both payer account and payee account?

I did, yeah! That's why I'm surprised:

aimane-chnaif · 2023-07-25T11:49:21Z

ok, I will test again with 2 fresh accounts. Meanwhile, please check style issues

Gonals · 2023-08-07T08:44:29Z

@aimane-chnaif conflicts solved! Let's get this merged before we get more 😆

Gonals · 2023-08-07T18:53:57Z

@aimane-chnaif quick ping to get this merged!

aimane-chnaif · 2023-08-07T19:14:46Z

reviewing now

src/pages/home/report/ReportActionItem.js

Gonals · 2023-08-08T13:56:15Z

Travis happy!

aimane-chnaif · 2023-08-08T14:08:43Z

On mobile, it's almost impossible to see 2nd person name if 1st name is long. We can discuss how to improve this as a follow-up

Gonals · 2023-08-08T14:09:58Z

On mobile, it's almost impossible to see 2nd person name if 1st name is long. We can discuss how to improve this as a follow-up

Yep, this sounds like a follow-up issue

aimane-chnaif · 2023-08-08T14:14:54Z

Screenshots/Videos

IOU request

payer:

Screen.Recording.2023-08-08.at.3.09.38.PM.mov

payee:

Screen.Recording.2023-08-08.at.3.09.54.PM.mov

Expense request

payer:

Screen.Recording.2023-08-08.at.3.13.57.PM.mov

payee:

Screen.Recording.2023-08-08.at.3.14.11.PM.mov

aimane-chnaif · 2023-08-08T14:18:20Z

As discussed, tooltip issue is handled in follow-up PR (for tracking, let's create GH)
And there's possibility that same user is showing for old money requests - #23043 (comment) but as it's not constantly reproducible, let's consider this not regression for now.

melvin-bot · 2023-08-08T14:19:16Z

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

dangrous

LGTM! I see there are a number of follow up issues we'll have to work on (tooltips, etc.) but seems like this is a good base for those to come from

OSBotify · 2023-08-08T14:43:44Z

✋ 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 · 2023-08-09T09:11:32Z

🚀 Deployed to staging by https://github.com/dangrous in version: 1.3.52-0 🚀

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

OSBotify · 2023-08-09T09:50:15Z

🚀 Deployed to staging by https://github.com/dangrous in version: 1.3.52-0 🚀

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

OSBotify · 2023-08-10T20:08:41Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.52-5 🚀

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

jjcoffee · 2023-10-13T10:47:24Z

Just flagging that this PR introduced an issue where we'd end up with a duplicate participant name & avatar if a user who got a money request requests money back. This happened because secondaryUserDetails can end up being the same as the primary (actor) once they request money back.

App/src/pages/home/report/ReportActionItemSingle.js

Lines 117 to 118 in 329cac3

    
           const secondaryUserDetails = props.personalDetailsList[props.iouReport.ownerAccountID] || {}; 
        
           const secondaryDisplayName = lodashGet(secondaryUserDetails, 'displayName', '');

More details here.

Gonals added 4 commits July 10, 2023 13:17

changing branch

2818399

conflicts

fb72846

display both names and avatars

4873108

use helper

76a32ac

Gonals requested a review from a team as a code owner July 17, 2023 21:13

Gonals self-assigned this Jul 17, 2023

melvin-bot bot requested review from aimane-chnaif and removed request for a team July 17, 2023 21:13

Gonals added 4 commits July 17, 2023 23:31

lint

f1b45dc

style

f650caf

Merge branch 'main' into alberto-bothNames

4febd34

prettier

a948141

Gonals added 2 commits July 21, 2023 10:19

conflicts

933afa9

fix typo

6437e01

aimane-chnaif reviewed Jul 24, 2023

View reviewed changes

margin fix

c0cf92c

Gonals added 2 commits August 7, 2023 10:52

lint

b38111d

prettier

0a70b14

aimane-chnaif reviewed Aug 7, 2023

View reviewed changes

src/pages/home/report/ReportActionItem.js Outdated Show resolved Hide resolved

use action

e1b1c21

aimane-chnaif approved these changes Aug 8, 2023

View reviewed changes

melvin-bot bot requested a review from dangrous August 8, 2023 14:19

dangrous approved these changes Aug 8, 2023

View reviewed changes

dangrous merged commit dab2905 into main Aug 8, 2023

dangrous deleted the alberto-bothNames branch August 8, 2023 14:39

OSBotify mentioned this pull request Aug 9, 2023

Deploy Checklist: New Expensify 2023-08-09 #24307

Closed

87 tasks

melvin-bot bot mentioned this pull request Aug 10, 2023

[HOLD for payment 2023-08-17] Display both participants of top of Money Request Report actions #21102

Closed

trjExpensify mentioned this pull request Sep 1, 2023

[HOLD for payment 2023-09-11] [$500] Report message naming logic is messed up #26450

Closed

jjcoffee mentioned this pull request Oct 13, 2023

[HOLD for overpayment refund] [$1000] Web - Duplicate particpant name and avatar at the top of the Money request message. #25819

Closed

6 tasks

Display both names for IOU Report Previews #23043

Display both names for IOU Report Previews #23043

Uh oh!

Conversation

Gonals commented Jul 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jul 17, 2023

Uh oh!

Gonals commented Jul 17, 2023

Uh oh!

Gonals commented Jul 18, 2023

Uh oh!

JmillsExpensify commented Jul 18, 2023

Uh oh!

aimane-chnaif commented Jul 18, 2023

Uh oh!

aimane-chnaif commented Jul 20, 2023

Uh oh!

Gonals commented Jul 21, 2023

Uh oh!

Gonals commented Jul 21, 2023

Uh oh!

aimane-chnaif Jul 24, 2023

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Jul 24, 2023

Uh oh!

aimane-chnaif commented Jul 24, 2023

Uh oh!

Gonals commented Jul 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aimane-chnaif commented Jul 25, 2023

Uh oh!

Gonals commented Jul 25, 2023

Uh oh!

aimane-chnaif commented Jul 25, 2023

Uh oh!

Gonals commented Aug 7, 2023

Uh oh!

Gonals commented Aug 7, 2023

Uh oh!

aimane-chnaif commented Aug 7, 2023

Uh oh!

Uh oh!

Gonals commented Aug 8, 2023

Uh oh!

aimane-chnaif commented Aug 8, 2023

Uh oh!

Gonals commented Aug 8, 2023

Uh oh!

aimane-chnaif commented Aug 8, 2023

Screenshots/Videos

IOU request

Expense request

Uh oh!

aimane-chnaif commented Aug 8, 2023

Uh oh!

melvin-bot bot commented Aug 8, 2023

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Aug 8, 2023

Uh oh!

OSBotify commented Aug 9, 2023

Uh oh!

OSBotify commented Aug 9, 2023

Uh oh!

OSBotify commented Aug 10, 2023

Uh oh!

jjcoffee commented Oct 13, 2023

Gonals commented Jul 17, 2023 •

edited

Loading

Gonals commented Jul 25, 2023 •

edited

Loading