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

[VIP-Travel] Trip room summary #41659

Merged
merged 73 commits into from
Jun 4, 2024

Conversation

rushatgabhane
Copy link
Member

@rushatgabhane rushatgabhane commented May 6, 2024

Details

Fixed Issues

$ #37825
PROPOSAL:

Tests

  1. Go to oldDot - staging.expensify.com
  2. Go to travel
  3. Book a flight, rail, car and hotel.
  4. Go to newDot and go to the trip room.
  5. Verify that you see trip room summary, and that it is as per figma
image
  • 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
iOS: Native image image
iOS: mWeb Safari

Backend having some performance issues, so im not getting pusher updates.

MacOS: Chrome / Safari image image image image image
MacOS: Desktop

@rushatgabhane rushatgabhane marked this pull request as ready for review May 6, 2024 00:47
@rushatgabhane rushatgabhane requested review from a team as code owners May 6, 2024 00:47
@melvin-bot melvin-bot bot removed the request for review from a team May 6, 2024 00:47
Copy link

melvin-bot bot commented May 6, 2024

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

import type {Reservation, ReservationTimeDetails} from '@src/types/onyx/Transaction';

// TODO: to be removed once backend is ready
const testReservationsList: Reservation[] = [
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you expand this test to cover all modes, i.e, car, rail, misc?

Copy link
Contributor

Choose a reason for hiding this comment

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

@rushatgabhane Can you confirm me whether you are working on this or not?

@shawnborton
Copy link
Contributor

This spacing from the first part of your PR comment looks good:
image

But further down in your screenshots section, the spacing here looks different:
image

@rushatgabhane
Copy link
Member Author

rushatgabhane commented May 6, 2024

The first image is from figma so it looks good 😄

the spacing here looks different

@shawnborton thank you! Let me fix it to match figma

@shubham1206agra
Copy link
Contributor

@rushatgabhane Bump here.

@rushatgabhane
Copy link
Member Author

@rushatgabhane
Copy link
Member Author

rushatgabhane commented May 13, 2024

Updated to match figma
image

@shawnborton
Copy link
Contributor

It's still not quite right. We are using 4px gaps between the three lines. The top line should be 16px tall since our label font uses a 16px line height. The middle line should be 20px tall since our regular font uses a 20px line height. And the bottom line should be 14px tall since our micro font size uses a 14px line height.

@rushatgabhane
Copy link
Member Author

rushatgabhane commented May 13, 2024

1. Top line lineHeight: 16

image

2. Middle lineHeight: 20

image

3. Bottom line: lineHeight: 14px

image

4. Fixed the gap to be 4px.

image

@rushatgabhane
Copy link
Member Author

rushatgabhane commented May 30, 2024

@stitesExpensify all done! Ready for a review again.

Verified that all looks fine -
image

Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

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

LGTM! @shubham1206agra can we get another review here and the checklist please?

@shubham1206agra
Copy link
Contributor

Screenshot 2024-05-31 at 9 13 02 PM

@Expensify/design Can you please confirm the hover design here of icon?

@rushatgabhane
Copy link
Member Author

rushatgabhane commented May 31, 2024

color used for icon is border

@shubham1206agra verified it here - #38808 (comment)

@melvin-bot melvin-bot bot requested a review from amyevans May 31, 2024 16:00
amyevans
amyevans previously approved these changes May 31, 2024
@dannymcclain
Copy link
Contributor

@rushatgabhane @shubham1206agra Yup—the container around the icon should use our border color. The icon itself should be colored icon, and then of course the hover background should be rowHover.

CleanShot 2024-05-31 at 11 18 37@2x

@rushatgabhane
Copy link
Member Author

@dannymcclain i just merged latest main, the colors now match the design.

image

@stitesExpensify
Copy link
Contributor

@shawnborton mind taking a look and making sure you like the UI here? :)

@shawnborton
Copy link
Contributor

Yup all good on my end, we can do another pass at design review in the other PR that is outstanding.

Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

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

LGTM!

@stitesExpensify stitesExpensify merged commit 594ae48 into Expensify:main Jun 4, 2024
15 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jun 4, 2024

✋ 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 production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

const styles = useThemeStyles();
const {translate} = useLocalize();

const tripTransactions = ReportUtils.getTripTransactions(tripRoomReportID);
Copy link
Contributor

Choose a reason for hiding this comment

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

Just noticed this, but I think this will not trigger a re-render of the component if the transaction gets updated.

@shubham1206agra
Copy link
Contributor

We forgot to handle the name of ReportPreview in this room. More details #45344

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.

8 participants