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/26888: New design when adding stop waypoint #27657

Merged
merged 10 commits into from
Sep 21, 2023

Conversation

DylanDylann
Copy link
Contributor

@DylanDylann DylanDylann commented Sep 18, 2023

Details

When users click Add Stop, we will redirect them to waypoint editor immediately

Fixed Issues

$ #26888
PROPOSAL: #26888 (comment)

Tests

  1. Go to the distance request
  2. Fill start point and finish point
  3. Clicking Add Stop
  4. Verify that the App redirects to the waypoint editor
  5. Fill stop point
  6. Verify that stop point display in the between of start point and finish point
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Go to the distance request
  2. Fill start point and finish point
  3. Clicking Add Stop
  4. Verify that the App redirects to the waypoint editor
  5. Fill stop point
  6. Verify that stop point display in the between of start point and finish point
  • 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 / Chrome
    • iOS / native
    • iOS / 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
Screen-Recording-2023-09-18-at-17.57.06.mp4
Mobile Web - Chrome
Screen-Recording-2023-09-18-at-18.05.36.mp4
Mobile Web - Safari
Screen-Recording-2023-09-18-at-18.00.16.mp4
Desktop
Screen-Recording-2023-09-18-at-18.14.04.mp4
iOS
Screen-Recording-2023-09-18-at-18.35.43.mp4
Android
Screen-Recording-2023-09-18-at-23.26.59.mp4

@DylanDylann DylanDylann requested a review from a team as a code owner September 18, 2023 10:34
@melvin-bot melvin-bot bot requested review from deetergp and removed request for a team September 18, 2023 10:34
@melvin-bot
Copy link

melvin-bot bot commented Sep 18, 2023

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

@deetergp
Copy link
Contributor

Not sure how this got assigned to me. I'm adding @thienlnam & @0xmiroslav since they are the CME & C+ for the related GH.

@deetergp deetergp removed their request for review September 19, 2023 02:24
@DylanDylann
Copy link
Contributor Author

@0xmiroslav Bump

@0xmiros

This comment was marked as resolved.

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

There will be migration issue from old users.
Repro step:

  1. Add empty waypoints in old app
  2. Update app
  3. Visit /request/new/distance page directly
Screen.Recording.2023-09-20.at.5.57.37.PM.mov

I hope this would be fine as all waypoints will be cleared in next request and this actually doesn't affect users.

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

App crashes on latest main. Regression from #27729.
So testing after this revert

Screen.Recording.2023-09-20.at.6.13.48.PM.mov

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

@DylanDylann invalid waypoints still remaining in Onyx.
I think we should enable Next button only when all waypoints are filled.
cc: @thienlnam

Screen.Recording.2023-09-20.at.6.26.37.PM.mov

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

@DylanDylann Let's address #27657 (comment) and #27657 (comment).
And then all good!

@DylanDylann
Copy link
Contributor Author

@0xmiroslav thanks for this comment, why do you think it is a bug? And I see it isn't related to this PR. I am not sure but I remember that we had this bug before. If we decide to fix it on this PR we need to confirm if it is bug first to avoid regression

@DylanDylann
Copy link
Contributor Author

Thanks for lint fixing

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

invalid waypoints still remaining in Onyx

@DylanDylann you know this was OP before requirement change?

Screenshot 2023-09-20 at 7 41 50 PM

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

@0xmiroslav thanks for this comment, why do you think it is a bug? And I see it isn't related to this PR. I am not sure but I remember that we had this bug before. If we decide to fix it on this PR we need to confirm if it is bug first to avoid regression

We can wait for @thienlnam's feedback

@DylanDylann
Copy link
Contributor Author

@0xmiroslav Sorry, I miss it. I agree that we should disable next button if there is any empty waypoint.
I reproduced as your video in here and log waypoints
Screenshot 2023-09-21 at 00 44 45

My suggestion is that we will disable next button if there is any empty waypoint

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

Disabling button makes sense to me because if there is any empty waypoint case equals Either start or finish waypoint is missing.
From user perspective, it isn't confusing because they know they didn't fill start or finish waypoint. There's no valid route in the word which doesn't have start or destination address 😄

@DylanDylann
Copy link
Contributor Author

DylanDylann commented Sep 20, 2023

@0xmiroslav Could you help to check last commit with the logic to disable button if there is any empty waypoint

src/components/DistanceRequest.js Outdated Show resolved Hide resolved
src/components/DistanceRequest.js Outdated Show resolved Hide resolved
@DylanDylann
Copy link
Contributor Author

@0xmiroslav I updated, help to check again

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

Please merge main

Screenshot 2023-09-20 at 8 31 16 PM

@DylanDylann
Copy link
Contributor Author

@0xmiroslav Updated.

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

Sorry back and forth. We should really discuss this logic.
There's case when duplicated addresses added.
Next button is disabled because valid size is 2, while all size is 4

Screenshot 2023-09-20 at 9 11 35 PM

@0xmiros
Copy link
Contributor

0xmiros commented Sep 20, 2023

IMO, we should keep current button disable logic (don't disable even if invalid waypoints exist)
And to fix original issue of stale data in onyx, we should apply this solution.

So 2 options:

  • fix both issues together in this PR
  • consider onyx issue out of scope for this PR

cc: @thienlnam

@thienlnam
Copy link
Contributor

We have another issue that addresses the handling for invalid waypoints - so we can just

consider onyx issue out of scope for this PR

@0xmiros
Copy link
Contributor

0xmiros commented Sep 21, 2023

Thanks

@DylanDylann let's just revert button disable logic. And then we're good to go

@DylanDylann
Copy link
Contributor Author

@0xmiroslav I reverted

@0xmiros
Copy link
Contributor

0xmiros commented Sep 21, 2023

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 / Chrome
    • iOS / native
    • iOS / 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 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 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(themeColors.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 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.

Screenshots/Videos

Web
web.mov
Mobile Web - Chrome
mchrome.mov
Mobile Web - Safari
msafari.mov
Desktop
desktop.mov
iOS
ios.mov
Android
android.mov

Copy link
Contributor

@0xmiros 0xmiros left a comment

Choose a reason for hiding this comment

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

LGTM!

@thienlnam thienlnam merged commit 04215cb into Expensify:main Sep 21, 2023
12 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/thienlnam in version: 1.3.73-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.73-1 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.3.74-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.74-3 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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.

5 participants