Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReportPreview / Avatars] Fix avatar styles and headline for Ecards, invoices, and group expense reports #49172

Merged
merged 25 commits into from
Sep 26, 2024

Conversation

grgia
Copy link
Contributor

@grgia grgia commented Sep 13, 2024

Details

It seems like the ReportPreview avatar and title is incorrect. The report headers look fine, so we need to match them.

DM

Type Image
IOU ReportPreview with 1 Expense
IOU ReportPreview with 2+ Expenses by same user
IOU ReportPreview with 2+ Expenses by different users

Workspace Chat

Type Image
Expense ReportPreview

Invoice Room

Type Image
ReportPreview

Trip Room

Type Image
ReportPreview
Screenshot 2024-09-19 at 9 28 21 PM Screenshot 2024-09-19 at 9 28 17 PM Screenshot 2024-09-19 at 9 28 03 PM Screenshot 2024-09-19 at 9 27 55 PM Screenshot 2024-09-19 at 9 27 52 PM Screenshot 2024-09-19 at 9 27 44 PM Screenshot 2024-09-19 at 9 27 37 PM

Fixed Issues

$ #49036

Tests

  • Verify that no errors appear in the JS console

Create a DM Chat from user A to user B
DM AVATAR CASE

  • Send a chat from user A
  • ✅ Verify that avatar is single avatar, user A
    SINGLE TRANSACTION IOU AVATAR CASE
  • Send a money request from user A
  • ✅ Verify that report preview avatar is single avatar, user A
  • Open the money report
  • ✅ Verify that report header avatar is single avatar, user A
    MULTI TRANSACTIONS FROM ONE USER (IOU) AVATAR CASE
  • Go back to the DM, Send a second money request from user A
  • ✅ Verify that report preview avatar is still single avatar, user A
  • Open the money report
  • ✅ Verify that report header avatar is single avatar, user A
    MULTI TRANSACTIONS FROM DIFFERENT USERS (IOU) AVATAR CASE
  • Log into user B in a separate session
  • Send a money request from user B
  • ✅ Verify that report preview avatar is both avatars, user A and B
  • ✅ Verify that report preview title is <name of user A> & <name of user B>
  • Open report
  • ✅ Verify that report preview avatar is both avatars, user A and B

Create a DM Chat from user A to user C
NEW USER CASE

  • Create a brand new account C
  • Create a request from A to C
  • ✅ Verify that report header avatar is single avatar, user A

Create a Policy Expense Chat from user A to a Workspace
CHAT AVATAR CASE

  • Send a chat from user A
  • ✅ Verify that avatar is single avatar, user A
    SINGLE TRANSACTION IOU AVATAR CASE
  • Send a money request from user A
  • ✅ Verify that report preview avatar is subscript avatar, user A with small workspace avatar
  • Open the money report
  • ✅ Verify that report header avatar matches the report preview avatar
    MULTI TRANSACTIONS FROM ONE USER (IOU) AVATAR CASE
  • Go back to the DM, Send a second money request from user A
  • ✅ Verify that report preview avatar is subscript avatar, user A with small workspace avatar
  • Open the money report
  • ✅ Verify that report header avatar matches the report preview avatar

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

@grgia grgia self-assigned this Sep 13, 2024
@grgia
Copy link
Contributor Author

grgia commented Sep 13, 2024

Running a test build to QA for various cases

This comment has been minimized.

This comment was marked as outdated.

This comment was marked as outdated.

@grgia

This comment was marked as outdated.

@grgia grgia changed the title Fix Report Avatar Fix ReportPreview Avatar Sep 16, 2024

This comment was marked as outdated.

@grgia grgia requested a review from a team September 18, 2024 17:03
@shawnborton
Copy link
Contributor

Small thing: we need to update the border color around the workspace avatar when we hover over the row with a report preview:
CleanShot 2024-09-19 at 00 07 00@2x

@shawnborton
Copy link
Contributor

For the IOU case, when only one person submits an expense, I think the avatar should just come from that person and not the diagonal:
CleanShot 2024-09-19 at 00 09 42@2x

Here is what I see in the report header of that same report for instance:
CleanShot 2024-09-19 at 00 10 12@2x

@grgia
Copy link
Contributor Author

grgia commented Sep 19, 2024

rebuilding

This comment was marked as outdated.

@grgia
Copy link
Contributor Author

grgia commented Sep 25, 2024

@dangrous I think we need to ignore these lint errors for this PR, if you look at them they are catch 22 (the lint error is saying to use the function that's triggering it) and I'd rather take these in a different PR

@dangrous
Copy link
Contributor

Okay I agree with you on all of them except potentially not the one on L1731 - can we use getOriginalMessage there?

@grgia
Copy link
Contributor Author

grgia commented Sep 25, 2024

@dangrous I opened a PR for that one #49734

@grgia grgia mentioned this pull request Sep 25, 2024
49 tasks
@grgia grgia requested a review from dangrous September 25, 2024 17:22
@dangrous
Copy link
Contributor

okay cool, then with those separate PRs I think we're ready to go here!

@grgia grgia merged commit b215aa8 into main Sep 26, 2024
19 of 20 checks passed
@grgia grgia deleted the georgia-fixIOUpreview branch September 26, 2024 09:23
@melvin-bot melvin-bot bot added the Emergency label Sep 26, 2024
Copy link

melvin-bot bot commented Sep 26, 2024

@grgia looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@grgia grgia removed the Emergency label Sep 26, 2024
@grgia
Copy link
Contributor Author

grgia commented Sep 26, 2024

Eslint error handled here

@OSBotify
Copy link
Contributor

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

Copy link
Contributor

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

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

grgia added a commit that referenced this pull request Sep 30, 2024
grgia added a commit that referenced this pull request Sep 30, 2024
jasperhuangg added a commit that referenced this pull request Sep 30, 2024
Revert "Merge pull request #49172 from Expensify/georgia-fixIOUpreview"
OSBotify pushed a commit that referenced this pull request Sep 30, 2024
Revert "Merge pull request #49172 from Expensify/georgia-fixIOUpreview"

(cherry picked from commit 95072dd)

(CP triggered by jasperhuangg)
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.41-10 🚀

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

Copy link
Contributor

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

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

Copy link
Contributor

github-actions bot commented Oct 2, 2024

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.42-3 🚀

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

grgia added a commit that referenced this pull request Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants