[Avatars] Revert PR #50557 If two avatars, use `Name 1 & Name 2` pattern. #50697

grgia · 2024-10-14T03:47:40Z

This PR reverts the changes from PR #50557

Original PR - #50341

Uses Manager Icon instead of Owner icon for report headers to match the expense preview logic.
Match the number of icons shown to the report preview.

Working on Fixing these cases:
#50553
#50547

Details

Fixed Issues

$ #49956
$ #50547
$ #50553

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console
Create or locate a report preview that displays two avatars
✅ Verify that both names are displayed in Name 1 & Name 2 Format
Create or locate a report preview that displays a single avatar
✅ Verify that single name is displayed i.e. Name 1
Open in Android and IOS
✅ Verify that both names fit
Change both names to be very long
✅ Verify that both names use ... pattern

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 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 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.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 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.
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

MacOS: Desktop

…-heading" This reverts commit b70ad57, reversing changes made to ab5175c.

melvin-bot · 2024-10-14T03:48:07Z

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

grgia · 2024-10-14T05:43:07Z

Triggering a test build

eh2077 · 2024-10-14T12:07:57Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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.js 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.
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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

eh2077 · 2024-10-14T13:27:28Z

@grgia According to #49036 (comment), I think we should show Name 1.

At the meantime, the avatar should also be single right? As it's the case of DM: All requests are from a single user. I'm sorry this should be caught in the previous PR.

eh2077 · 2024-10-14T13:38:13Z

Just to confirm, we'll handle Workspace: Report with 2+ expenses separately right?

grgia · 2024-10-15T02:23:26Z

@eh2077 I agree with those, but this PR doesn't update which avatars are displayed, it mainly shows both names if both avatars are present. Should we tackle the single expense avatar case in a separate PR or do you think that would cause a revert

grgia · 2024-10-15T03:59:16Z

@eh2077 I tested locally with #50424 and it looks good

grgia · 2024-10-15T03:59:46Z

I also updated the logic to only show one icon for those cases for now

github-actions · 2024-10-15T04:54:58Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

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

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

👀 View the workflow run that generated this build 👀

eh2077 · 2024-10-15T12:33:40Z

@grgia Let's say, user Eric submits an expense to [email protected], the sender of the report preview should be Eric right?

eh2077 · 2024-10-15T12:43:07Z

src/libs/ReportUtils.ts

@@ -2371,7 +2371,7 @@ function getIcons(

        // For one transaction IOUs, display a simplified report icon
        if (isOneTransactionReport(report?.reportID ?? '-1')) {
-            return [ownerIcon];
+            return [managerIcon];


Just to confirm - this change fixes the header avatar of Report expense page right?

This should match the IOU case. For IOUs we use managerIcon, for expense reports, ownerIcon

eh2077 · 2024-10-23T14:21:16Z

@grgia Please take a moment to look into this when you're free. Thanks!

grgia · 2024-10-28T17:39:57Z

@eh2077 could you let me know if there's anything specific blocking this PR

eh2077 · 2024-10-29T00:46:16Z

@grgia Let's say, user Eric submits an expense to [email protected], the sender of the report preview should be Eric right?

@grgia Should we fix this? Please also help resolve the conflicts.

grgia · 2024-10-30T10:19:36Z

triggered a new test build...

github-actions · 2024-10-30T10:44:02Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

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

👀 View the workflow run that generated this build 👀

eh2077 · 2024-10-30T13:08:01Z

@grgia I tested again and confirmed that the icon is working as expected. The following example - User A submitted an expense to Eric Han. From both ends of them, the sender icon is User A, which is expected. But now I found that the owes text seems wrong. The staging has the same issue and I also agree we don't touch IOU here, so I think it can be handled separately.

The expected behaviour should be

src/libs/ReportUtils.ts

eh2077 · 2024-11-07T16:25:35Z

@grgia Please take a look at the comments when you get a chance, thank you

grgia · 2024-11-12T09:52:19Z

Going to take a look at these comments, thanks @eh2077

eh2077 · 2024-11-12T15:05:25Z

It's the end of the day for me, so I'll get to this tomorrow.

eh2077 · 2024-11-13T13:55:19Z

@grgia Long user name overflow in iOS app.

grgia · 2024-11-14T12:09:12Z

Thanks for testing @eh2077, I'll push a fix

eh2077 · 2024-11-15T15:10:40Z

@grgia I pulled the latest changes and there's still text overflow in iOS app

eh2077 · 2024-11-20T15:29:39Z

@grgia Please take a look at the above comment when you get a chance, thank you

grgia · 2024-11-22T16:04:18Z

oof okay let me take another look-

grgia · 2024-11-22T17:19:19Z

@eh2077 my ios dev environment is borked rn, trying to fix it now. But this is probably a react native flex issue- I remember theres a certain style that doesnt work on ios

github-actions · 2024-11-22T18:02:58Z

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

grgia · 2024-11-22T18:11:36Z

@eh2077 I pushed an attempted fix, but xcode is being grrr and I can't test it

github-actions · 2024-11-22T18:26:01Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

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

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

👀 View the workflow run that generated this build 👀

eh2077 · 2024-11-25T15:43:32Z

@grgia The display formats still look different between mobile Safari and iOS App, LongName 1... & LongName 2... vs LongName 1..., see

grgia · 2024-11-25T16:59:24Z

The display formats still look different between mobile Safari and iOS App
@eh2077 apologies, I cannot get my emulator running so I'm having to do some guessing

eh2077 · 2024-12-05T15:33:55Z

@grgia Did you get your emulator working?

eh2077 · 2024-12-10T14:37:55Z

@grgia Friendly bump

Revert "Merge pull request #50557 from Expensify/revert-50341-georgia…

4ba67b3

…-heading" This reverts commit b70ad57, reversing changes made to ab5175c.

grgia requested a review from a team as a code owner October 14, 2024 03:47

grgia self-assigned this Oct 14, 2024

melvin-bot bot requested review from blimpich and removed request for a team October 14, 2024 03:48

grgia changed the title ~~Revert PR #50557~~ [WIP] Revert PR #50557 Oct 14, 2024

grgia added 2 commits October 14, 2024 14:09

Fix text for long names

b544601

lint

c38868c

grgia changed the title ~~[WIP] Revert PR #50557~~ [WIP] Revert PR #50557 - Avatar Header for 2 Avatars using Name 1 & Name 2 Oct 14, 2024

grgia requested a review from eh2077 October 14, 2024 05:42

grgia added the Ready To Build label Oct 14, 2024

This comment has been minimized.

Sign in to view

grgia added 2 commits October 15, 2024 12:54

use managerIcon

7b38784

Merge branch 'main' into georgia-revert-50557

5ea5a4e

grgia changed the title ~~[WIP] Revert PR #50557 - Avatar Header for 2 Avatars using Name 1 & Name 2~~ [Avatars] Revert PR #50557 If two avatars, use Name 1 & Name 2 pattern. Oct 15, 2024

eh2077 reviewed Oct 15, 2024

View reviewed changes

eh2077 mentioned this pull request Oct 16, 2024

[Expense ReportPreview Avatar] Update report preview avatar to use owner #50424

Merged

52 tasks

eh2077 reviewed Oct 30, 2024

View reviewed changes

src/libs/ReportUtils.ts Show resolved Hide resolved

grgia added 2 commits November 12, 2024 12:58

Merge branch 'main' into georgia-revert-50557

55430fe

code review

4e1a806

grgia requested a review from eh2077 November 12, 2024 13:00

grgia added 2 commits November 14, 2024 17:59

Merge branch 'main' into georgia-revert-50557

c0d8bc6

IOS

e1ab6d6

Merge branch 'main' into georgia-revert-50557

fd1f3cc

grgia added 3 commits November 22, 2024 17:29

overflow hidden

22fb00a

flex to row

1787e14

lint

a759695

blimpich removed their request for review December 12, 2024 19:14

[Avatars] Revert PR #50557 If two avatars, use Name 1 & Name 2 pattern. #50697

Are you sure you want to change the base?

[Avatars] Revert PR #50557 If two avatars, use Name 1 & Name 2 pattern. #50697

Conversation

grgia commented Oct 14, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 14, 2024

grgia commented Oct 14, 2024

This comment has been minimized.

eh2077 commented Oct 14, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eh2077 commented Oct 14, 2024

eh2077 commented Oct 14, 2024

grgia commented Oct 15, 2024

grgia commented Oct 15, 2024

grgia commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

eh2077 commented Oct 15, 2024

eh2077 Oct 15, 2024

Choose a reason for hiding this comment

grgia Oct 28, 2024

Choose a reason for hiding this comment

grgia Oct 30, 2024

Choose a reason for hiding this comment

eh2077 commented Oct 23, 2024

grgia commented Oct 28, 2024

eh2077 commented Oct 29, 2024

grgia commented Oct 30, 2024

github-actions bot commented Oct 30, 2024

eh2077 commented Oct 30, 2024

eh2077 commented Nov 7, 2024

grgia commented Nov 12, 2024

eh2077 commented Nov 12, 2024

eh2077 commented Nov 13, 2024

grgia commented Nov 14, 2024

eh2077 commented Nov 15, 2024

eh2077 commented Nov 20, 2024

grgia commented Nov 22, 2024

grgia commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

grgia commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

eh2077 commented Nov 25, 2024

grgia commented Nov 25, 2024

eh2077 commented Dec 5, 2024

eh2077 commented Dec 10, 2024

[Avatars] Revert PR #50557 If two avatars, use `Name 1 & Name 2` pattern. #50697

[Avatars] Revert PR #50557 If two avatars, use `Name 1 & Name 2` pattern. #50697

grgia commented Oct 14, 2024 •

edited

Loading

eh2077 commented Oct 14, 2024 •

edited

Loading