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

fix: update grouped expense on search page #44674

Merged
merged 19 commits into from
Jul 12, 2024

Conversation

dominictb
Copy link
Contributor

@dominictb dominictb commented Jul 1, 2024

Details

Fixed Issues

$ #44131
PROPOSAL: #44131 (comment)

Tests

  1. Open /search/shared?sortBy=date&sortOrder=desc
  2. Verify:
  • With the grouped expenses title: Don't use bold for the report title, use the same font as everywhere else
  • With the grouped expenses title: There is no HR line that is above the expenses and below the title
  • There is no X grouped expenses text
  • The expense type icon is on the left of the row
  • The View button has no background color and the text's color is link color.
  • 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: 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

image

Android: mWeb Chrome

Screenshot 2024-07-02 at 15 12 02

iOS: Native
Screen.Recording.2024-07-11.at.16.11.41.mov
iOS: mWeb Safari

Screenshot 2024-07-02 at 15 06 11

MacOS: Chrome / Safari Screenshot 2024-07-02 at 14 59 28
MacOS: Desktop Screenshot 2024-07-02 at 15 00 08

@dominictb dominictb marked this pull request as ready for review July 2, 2024 08:12
@dominictb dominictb requested review from a team as code owners July 2, 2024 08:12
@melvin-bot melvin-bot bot requested review from sobitneupane and removed request for a team July 2, 2024 08:12
Copy link

melvin-bot bot commented Jul 2, 2024

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

Looks like we have some misalignment happening with the total column at the top:
CleanShot 2024-07-02 at 10 26 26@2x

For the blue-link style "View" buttons, we only want to use that style for the children expenses of a report grouping:
CleanShot 2024-07-02 at 10 27 03@2x

From the mocks:
image

@luacmartins luacmartins self-requested a review July 2, 2024 17:15
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

I noticed the style issues below:

  1. Report total is not aligned with column header
    Screenshot 2024-07-02 at 11 56 43 AM

  2. View button still has hover background. @shawnborton can you confirm if that's what we want? I'd think we'd only change the text color on hover.

Screenshot 2024-07-02 at 11 58 10 AM

  1. The link color/font weight seemed a bit off to me, but I'll let design confirm that one.

@dannymcclain
Copy link
Contributor

@shawnborton to confirm, but I thought we would always use one of our standard buttons in the "report header" of the grouped expenses?

image

Like in this mock:
CleanShot 2024-07-02 at 14 42 42

@shawnborton
Copy link
Contributor

@dannymcclain I totally agree, that's what I tried to point out in my mock at the bottom of this comment.

@shawnborton
Copy link
Contributor

View button still has hover background. @shawnborton can you confirm if that's what we want? I'd think we'd only change the text color on hover.

Good catch, I don't think it should have a background. This "link style" button should just get our link hover color for the button text on hover.

@dominictb
Copy link
Contributor Author

Will check this out by today or tomorrow.

@dominictb
Copy link
Contributor Author

Good catch, I don't think it should have a background. This "link style" button should just get our link hover color for the button text on hover.

@shawnborton Can you give me the hover color for the text in this case?

@shawnborton
Copy link
Contributor

shawnborton commented Jul 3, 2024 via email

@dominictb
Copy link
Contributor Author

@shawnborton I checked a few link component in our app but these do not have hover style. For example:

Screen.Recording.2024-07-03.at.18.29.08.mov

@dominictb
Copy link
Contributor Author

@shawnborton Also, please check @luacmartins 's comment above:

The link color/font weight seemed a bit off to me, but I'll let design confirm that one.

@shawnborton
Copy link
Contributor

Check our theme files out - both themes have linkHover values.

@shawnborton
Copy link
Contributor

Yeah, it might make more sense to make the "link button" style use regular weight font like most of our links do. Any strong thoughts there @Expensify/design? Quick comparison here:
image

image

@dannymcclain
Copy link
Contributor

I prefer the normal weight Label text quite a bit. I think it helps separate those actions from the button actions (which IMO is a good thing here) and since this page is so info-dense already, it feels like the less things trying to grab my eyes' attention the better.

@shawnborton
Copy link
Contributor

Okay cool, @dominictb let's try with regular font weight and see how it feels. Thanks!

@dominictb
Copy link
Contributor Author

I updated PR. Below are the changes:

  • Fix the misalignment happening with the total column at the top.
  • Make sure for the blue-link style "View" buttons, we only want to use that style for the children expenses of a report grouping.
  • Make sure the "link style" button should just get link hover color for the button text on hover and there is no background color. And its font weight is '400'.

Screenshot 2024-07-04 at 10 32 06

@dominictb
Copy link
Contributor Author

@shawnborton @sobitneupane

  • I fixed this comment.
  • Also, FYI, I just merged the latest main with a few changes in the ActionCell.

Copy link
Contributor

🧪🧪 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/44674/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/44674/index.html
Android iOS
Desktop 💻 Web 🕸️
❌ FAILED ❌ https://44674.pr-testing.expensify.com
The QR code can't be generated, because the Desktop build failed Web

👀 View the workflow run that generated this build 👀

@shawnborton
Copy link
Contributor

Feels good to me! Let's get this into final review!

@shawnborton
Copy link
Contributor

Actually sorry, one thing I am noticing is that it seems like the checkboxes are aligned slightly differently when there is grouped expenses vs when there isn't. Can you take a look?
CleanShot 2024-07-10 at 15 51 59@2x

I think maybe the grouped expenses have 4px of extra horizontal padding?

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

Looking good, one more comment from design though.

@dominictb
Copy link
Contributor Author

I think maybe the grouped expenses have 4px of extra horizontal padding?

@shawnborton Now the grouped expenses have padding-horizontal: 16px and the another one is 12px, that leads to the bug. Which style should we use?

@shawnborton
Copy link
Contributor

I think we want 12px here so it matches the individual expense rows. Thanks!

@dominictb
Copy link
Contributor Author

@shawnborton I updated

image

@shawnborton
Copy link
Contributor

Much better, thank you!

@luacmartins
Copy link
Contributor

@dominictb we have conflicts again. @sobitneupane could you please review this one once conflicts are resolved? Let's try to get this one merged today.

@dominictb
Copy link
Contributor Author

I fixed conflicts @sobitneupane

Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

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

Screenshots/Videos

Android: Native
Screen.Recording.2024-07-12.at.14.00.43.mov
iOS: Native
Screen.Recording.2024-07-12.at.13.54.21.mov
iOS: mWeb Safari
Screen.Recording.2024-07-12.at.13.50.32.mov
MacOS: Chrome / Safari
Screen.Recording.2024-07-12.at.13.40.43.mov
MacOS: Desktop
Screen.Recording.2024-07-12.at.13.57.27.mov

Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

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

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

@melvin-bot melvin-bot bot requested a review from luacmartins July 12, 2024 08:19
@shawnborton
Copy link
Contributor

Nice, this feels pretty good to me - hopefully we can get this merged today!

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

LGTM

@luacmartins luacmartins merged commit ac64d44 into Expensify:main Jul 12, 2024
15 of 16 checks passed
@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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.7-3 🚀

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

@mvtglobally
Copy link

mvtglobally commented Jul 15, 2024

@dominictb @shawnborton @luacmartins Do we need to QA this PR? Can you pls provide specific QA steps if Yes

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.7-4 🚀

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.8-6 🚀

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

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