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

Load map when image is not loaded in Money Request view for distance request #34133

Merged
merged 30 commits into from
Feb 21, 2024

Conversation

shubham1206agra
Copy link
Contributor

@shubham1206agra shubham1206agra commented Jan 9, 2024

Details

Fixed Issues

$ #28965
PROPOSAL: #28965 (comment)

Tests

  1. Global create > request money > distance
  2. Enter a start/finish address > next > request
  3. Observe the map loading in preview.
  4. Wait 4-5s
  5. Observe the receipt preview update to the map thumbnail
  • Verify that no errors appear in the JS console

Offline tests

Same as 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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
Screen.Recording.2024-01-23.at.2.09.32.PM.mov
Android: mWeb Chrome
Screen.Recording.2024-01-23.at.1.21.32.PM.mov
iOS: Native
Screen.Recording.2024-01-23.at.2.09.32.PM.mov
iOS: mWeb Safari
Screen.Recording.2024-01-23.at.1.10.01.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-01-23.at.12.42.19.PM.mp4
MacOS: Desktop
Screen.Recording.2024-01-23.at.1.32.08.PM.mov

@shubham1206agra
Copy link
Contributor Author

@trjExpensify I am unable to pass these perf-test even after adding mock for ConfirmedRoute. I am not that proficient in jest test. Can you get someone to help in this? This has been a blocker in completing the PR for review.
cc @aimane-chnaif

@shubham1206agra shubham1206agra changed the title test map when image is not loaded in request view Load map when image is not loaded in Money Request view for distance request Jan 23, 2024
@shubham1206agra
Copy link
Contributor Author

@trjExpensify This is now fixed. I will prepare this PR for review in few hours.

@shubham1206agra shubham1206agra marked this pull request as ready for review January 23, 2024 09:00
@shubham1206agra shubham1206agra requested a review from a team as a code owner January 23, 2024 09:00
@melvin-bot melvin-bot bot requested review from aimane-chnaif and removed request for a team January 23, 2024 09:00
Copy link

melvin-bot bot commented Jan 23, 2024

@aimane-chnaif 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]

@trjExpensify
Copy link
Contributor

Sounds good, thanks for keeping us in the loop!

Copy link
Contributor

@aimane-chnaif aimane-chnaif left a comment

Choose a reason for hiding this comment

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

Please pull main to see if it fixes performance test failure

src/libs/actions/IOU.js Outdated Show resolved Hide resolved
@aimane-chnaif
Copy link
Contributor

Lint failing

@shubham1206agra
Copy link
Contributor Author

This would complicate the preview with multiple receipts, and is not much of use.

Why would it not be of much use? I think it makes sense to use the static map in the preview as well, but I realize that's slightly out-of-scope from the original issue. I'm OK with opening up a separate issue for that.

@tgolen This requires some more changes in current logic of pulling 3 images in ReportPreview. And we will have very little visual effect when the report reciepts are greater than 3.

@aimane-chnaif
Copy link
Contributor

This is minor but maybe considered as bug.

Offline distance request with Invalid addresses shows San Fransisco before getting error from backend after online

offline.mov

@shubham1206agra
Copy link
Contributor Author

@aimane-chnaif You can see this comment about invalid waypoints #32405 (comment).

Additionally, you can confirm the same behaviour in Request Confirmation View.

@aimane-chnaif
Copy link
Contributor

ok, I agree out of scope. Btw it's quick fix if needed.

@melvin-bot melvin-bot bot requested a review from grgia February 5, 2024 04:25
@shubham1206agra
Copy link
Contributor Author

@grgia Bump here.

@aimane-chnaif
Copy link
Contributor

There's conflict

@shubham1206agra
Copy link
Contributor Author

Conflicts resolved.

grgia
grgia previously approved these changes Feb 15, 2024
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.

one quick clarifying question about the test changes, but otherwise LGTM and initial tests pass

Comment on lines +3 to +6
// eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
function ConfirmedRoute(props: any) {
return <View />;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the purpose of this empty view mock?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's just to pass the UI tests, as Mapbox seems to break the tests.

@shubham1206agra
Copy link
Contributor Author

@grgia Please merge this PR

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.

Thank you for your patience

@grgia grgia merged commit badd227 into Expensify:main Feb 21, 2024
16 checks passed
@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.44-13 🚀

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

{hasReceipt && (
{showMapAsImage && (
<View style={styles.reportActionItemImages}>
<ConfirmedRoute transaction={transaction} />
Copy link
Contributor

Choose a reason for hiding this comment

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

Coming from #40318, we should've prevented interactivity here to avoid the map being movable whilst still loading.

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.

7 participants