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] Create Trip Room Preview #38808

Merged
merged 67 commits into from
Jun 18, 2024

Conversation

WojtekBoman
Copy link
Contributor

@WojtekBoman WojtekBoman commented Mar 22, 2024

Details

This PR introduces a new component TripRoomPreview. It's available for testing only for accounts with the spotnanaTravel beta

Designs: https://www.figma.com/file/rOyUSHbLLyp64emz6WeoPW/Travel?type=design&node-id=154-14373&mode=design&t=xqcJ31MMIiDxsY0J-4

Fixed Issues

$ #37826
PROPOSAL: N/A

Tests

  • Verify that no errors appear in the JS console
  1. Log in to OldDot with an account with access to Travel.
  2. Go to https://staging.expensify.com/travel.
  3. Click on travel.
  4. Accept the terms and set an address again on your account.
  5. You'll be redirected to Spotnana (if redirect doesn't work use this link: https://staging.travel.expensify.com).
  6. Book a new travel (so on the selector to "select trip" you should create a new one).
  7. Log in to NewDot and open your default workspace chat.
  8. Verify whether the TripRoomPreview component is displayed correctly.

If some data is not loaded, please open the linked report first, this problem will be fixed on the backend side.

Offline tests

QA Steps

  • Verify that no errors appear in the JS console

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

Screenshot 2024-05-29 at 17 36 05

Screen.Recording.2024-05-29.at.17.35.27.mov
Android: mWeb Chrome

Screenshot 2024-05-29 at 17 48 59

Screen.Recording.2024-05-29.at.17.49.04.mov
iOS: Native

Screenshot 2024-05-29 at 17 58 43

Screen.Recording.2024-05-29.at.17.58.26.mov
iOS: mWeb Safari

Screenshot 2024-05-29 at 18 03 17

Screen.Recording.2024-05-29.at.18.03.22.mov
MacOS: Chrome / Safari
Screen.Recording.2024-05-29.at.17.36.32.mov

Screenshot 2024-05-29 at 17 36 59

MacOS: Desktop

Screenshot 2024-05-29 at 17 30 01

Screen.Recording.2024-05-29.at.17.29.22.mov

src/CONST.ts Outdated
@@ -613,6 +614,7 @@ const CONST = {
LIMIT: 50,
// OldDot Actions render getMessage from Web-Expensify/lib/Report/Action PHP files via getMessageOfOldDotReportAction in ReportActionsUtils.ts
TYPE: {
ACTION_TRIPPREVIEW: 'ACTION_TRIPPREVIEW',
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB

Suggested change
ACTION_TRIPPREVIEW: 'ACTION_TRIPPREVIEW',
ACTION_TRIP_PREVIEW: 'ACTION_TRIP_PREVIEW',

Copy link
Contributor Author

@WojtekBoman WojtekBoman Mar 29, 2024

Choose a reason for hiding this comment

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

I'll adjust it once the backend is ready to be sure that this value is correct


const dateInfo = DateUtils.getFormattedDateRange(new Date(basicTripInfo.startDate.iso8601), new Date(basicTripInfo.endDate.iso8601));

const getDisplayAmount = (): string => {
Copy link
Contributor

Choose a reason for hiding this comment

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

I would use useMemo here.

Comment on lines 162 to 163
// pendingAction={iouReport?.pendingFields?.preview}
shouldDisableOpacity={!!(action.pendingAction ?? action.isOptimisticAction)}
Copy link
Contributor

Choose a reason for hiding this comment

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

Why the pendingAction is commented out here?

onLongPress={(event) => showContextMenuForReport(event, contextMenuAnchor, chatReportID, action, checkIfContextMenuActive)}
shouldUseHapticsOnLongPress
style={[styles.flexRow, styles.justifyContentBetween, styles.reportPreviewBox, styles.cursorDefault]}
role="button"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
role="button"
role={CONST.ROLE.BUTTON}


const reservations: Reservation[] = TripReservationUtils.getReservationsFromTripTransactions(tripTransactions);

const dateInfo = DateUtils.getFormattedDateRange(new Date(basicTripInfo.startDate.iso8601), new Date(basicTripInfo.endDate.iso8601));
Copy link
Contributor

Choose a reason for hiding this comment

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

It might be worth putting into useMemo.

Comment on lines 4719 to 4721
tripDescriptionMargin: {
marginBottom: 2,
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this value valid? We usually have multiples of 4.
NAB: Do we need to create a new style with only one value? Shouldn't we just use styles.mb1 or something like this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Screenshot 2024-03-29 at 12 29 23

Following this design, I've created a new style where the gap value is 2

Copy link
Contributor

Choose a reason for hiding this comment

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

I think I would be fine using a gap of 4px since that technically adheres to the system better. And then this way we don't need to write a super specific style.

@@ -209,6 +244,8 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<

/** Indicates transaction loading */
isLoading?: boolean;

Copy link
Contributor

Choose a reason for hiding this comment

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

Missing comment

@kosmydel
Copy link
Contributor

kosmydel commented Mar 26, 2024

In designs here is a 12px margin between the icon and the text

Screenshot 2024-03-26 at 17 15 09

}
if (isSameMonth(date1, date2)) {
// Dates in the same month and year, differ by days
return `${format(date1, 'MMM d')} - ${format(date2, 'd')}`;
Copy link
Contributor

Choose a reason for hiding this comment

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

In designs, we don't have spaces between the days. We should confirm the other formats as well.

Suggested change
return `${format(date1, 'MMM d')} - ${format(date2, 'd')}`;
return `${format(date1, 'MMM d')}-${format(date2, 'd')}`;

@melvin-bot melvin-bot bot requested a review from grgia June 14, 2024 15:25
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.

Looks great! Think that we can remove the TODO-related code and then this is ready to go

Comment on lines 568 to 569
// @TODO: isTripRoomPreview condition has been added to make the TripRoomPreview component visible.
// Remove it when the reportAction.message array is not empty for this type, then !isDeleted will be true.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that it should always be visible

@WojtekBoman
Copy link
Contributor Author

Looks great! Think that we can remove the TODO-related code and then this is ready to go

Done :)

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
Copy link
Contributor

@WojtekBoman is it possible for our team to QA this? I noticed that section is not filled out

@WojtekBoman
Copy link
Contributor Author

@WojtekBoman is it possible for our team to QA this? I noticed that section is not filled out

QA steps are the same as Tests

Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

Changes LGTM

@grgia
Copy link
Contributor

grgia commented Jun 18, 2024

@shubham1206agra could you please take a quick look / retest since there's been commits since your final review

@shubham1206agra
Copy link
Contributor

@grgia You are good to merge here.

@grgia grgia merged commit f6085d2 into Expensify:main Jun 18, 2024
18 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/grgia in version: 1.4.86-0 🚀

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

1 similar comment
@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

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

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

@kbecciv
Copy link

kbecciv commented Jun 20, 2024

@grgia The QA team is encountering issues with this PR. Should we log the issue for the error message?

Recording.6251.mp4

@kavimuru
Copy link

@AndrewGable @stitesExpensify we tried with travel beta account and see the same issue we had in this PR

Recording.1999.mp4

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.0.0-9 🚀

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.