Fix/27383: Prevent request money if empty waypoint #27826

DylanDylann · 2023-09-20T06:27:39Z

Details

In distance request, prevent request money if empty waypoint

Fixed Issues

$ #27383
PROPOSAL: #27383 (comment)

Tests

Request money -> distance
Change /distance in the URL to /participants
Verify that the App redirect to Distance request page

Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

Request money -> distance
Change /distance in the URL to /participants
Verify that the App redirect to Distance request page

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-20.at.10.48.28.mp4

Mobile Web - Chrome

Screen.Recording.2023-09-20.at.10.59.04.mp4

Mobile Web - Safari

Screen.Recording.2023-09-20.at.10.50.46.mp4

Desktop

Screen.Recording.2023-09-20.at.11.08.00.mp4

iOS

Screen.Recording.2023-09-20.at.11.31.37.mp4

Android

Screen.Recording.2023-09-20.at.12.32.07.mp4

melvin-bot · 2023-09-20T09:44:20Z

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

DylanDylann · 2023-09-21T05:50:27Z

@allroundexperts Bump, Could you help to review this PR?

allroundexperts · 2023-09-21T19:38:09Z

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js

@@ -75,7 +78,7 @@ function MoneyRequestParticipantsPage({iou, selectedTab, route}) {
        // ID in Onyx could change by initiating a new request in a separate browser tab or completing a request
        if (prevMoneyRequestId.current !== iou.id) {
            // The ID is cleared on completing a request. In that case, we will do nothing
-            if (iou.id && !isDistanceRequest && !isSplitRequest && !isNewReportIDSelectedLocally.current) {
+            if (iou.id && (!isDistanceRequest || (isDistanceRequest && isEmptyWaypoint)) && !isSplitRequest && !isNewReportIDSelectedLocally.current) {


The same condition is being used below as well. Can you please DRY it up?

allroundexperts · 2023-09-21T20:20:17Z

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

Screen.Recording.2023-09-22.at.12.55.49.AM.mov

Mobile Web - Chrome

Screen.Recording.2023-09-22.at.1.14.23.AM.mov

Mobile Web - Safari

Screen.Recording.2023-09-22.at.1.11.59.AM.mov

Desktop

Screen.Recording.2023-09-22.at.1.06.05.AM.mov

iOS

Screen.Recording.2023-09-22.at.1.12.39.AM.mov

Android

Screen.Recording.2023-09-22.at.1.16.09.AM.mov

allroundexperts

Minor change needed.

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js

allroundexperts

Looks good!

DylanDylann · 2023-09-22T00:42:45Z

@allroundexperts It works well after updating

Screen.Recording.2023-09-22.at.07.33.12.mov

Thanks so much for your reminders, I noted that for the next PR.

DylanDylann · 2023-09-25T06:16:44Z

@roryabraham Could you help to check this PR when you are free?

OSBotify · 2023-09-25T15:08:10Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js

tgolen · 2023-09-26T01:26:16Z

Hi @roryabraham @allroundexperts @DylanDylann I think this causes a major regression and should be reverted. There is no way to create a distance request now because it will never transition to the confirmation page due to isEmptyWaypoint being true the first time the component renders.

roryabraham · 2023-09-26T02:05:11Z

Created revert PR: #28208

DylanDylann · 2023-09-27T08:40:34Z

@tgolen @roryabraham @allroundexperts Hi, after investigating I see this is not a regression from my PR. It seems this is a regression from #25786. In our PR, I am using iou from ONYX to get transactionID. But #25786 make iou field reset to empty.
I created another PR with a bit of change in that don't use deprecated functions. I see that we have #28280 It also be a regression from #25786. We can hold my new PR until #28280 is resolved

tgolen · 2023-09-28T01:35:28Z

Thank you for making me aware of #25786 and I have commented there as well.

OSBotify · 2023-09-28T19:20:45Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.75-0 🚀

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

OSBotify · 2023-10-02T17:24:41Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.75-12 🚀

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

OSBotify · 2023-10-02T17:53:22Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.76-0 🚀

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

OSBotify · 2023-10-03T15:54:19Z

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

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

DylanDylann added 2 commits September 20, 2023 10:34

prevent request money if waypoint is empty

b009310

merge main

3c1aa35

DylanDylann changed the title ~~Fix/27383~~ Fix/27383: Prevent request money if empty waypoint Sep 20, 2023

DylanDylann added 3 commits September 20, 2023 13:37

fix lint

d133c4d

fix lint

7adde9f

fix lint

d88b6d8

DylanDylann marked this pull request as ready for review September 20, 2023 09:44

DylanDylann requested a review from a team as a code owner September 20, 2023 09:44

melvin-bot bot requested review from allroundexperts and removed request for a team September 20, 2023 09:44

DylanDylann mentioned this pull request Sep 20, 2023

[HOLD for payment 2023-10-09] [$500] [Distance] - Ability to request money without filling start and finish points #27383

Closed

6 tasks

allroundexperts reviewed Sep 21, 2023

View reviewed changes

allroundexperts suggested changes Sep 21, 2023

View reviewed changes

DylanDylann added 2 commits September 22, 2023 07:02

dry code

d031bd8

merge main

f51bdb4

allroundexperts reviewed Sep 22, 2023

View reviewed changes

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js Outdated Show resolved Hide resolved

DylanDylann added 2 commits September 22, 2023 07:14

clear name

6f96e15

clear name

d7ee1d2

allroundexperts reviewed Sep 22, 2023

View reviewed changes

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js Outdated Show resolved Hide resolved

clean logic

812ea40

allroundexperts reviewed Sep 22, 2023

View reviewed changes

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js Outdated Show resolved Hide resolved

DylanDylann added 2 commits September 22, 2023 07:35

correct dependency

d26408c

move isInvalidDistanceRequest to useEffect

f50cff6

allroundexperts approved these changes Sep 22, 2023

View reviewed changes

melvin-bot bot requested a review from roryabraham September 22, 2023 00:42

roryabraham approved these changes Sep 25, 2023

View reviewed changes

roryabraham merged commit 2f492e4 into Expensify:main Sep 25, 2023
12 checks passed

tgolen reviewed Sep 26, 2023

View reviewed changes

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js Show resolved Hide resolved

tgolen mentioned this pull request Sep 26, 2023

Allow Editing Distance Requests #26141

Merged

57 tasks

roryabraham mentioned this pull request Sep 26, 2023

Revert "Fix/27383: Prevent request money if empty waypoint" #28208

Merged

59 tasks

OSBotify mentioned this pull request Sep 28, 2023

Deploy Checklist: New Expensify 2023-09-28 #28412

Closed

OSBotify mentioned this pull request Oct 2, 2023

Deploy Checklist: New Expensify 2023-10-02 #28635

Closed

graylewis mentioned this pull request Oct 12, 2023

[$500] Deeplinking to distantce request money allows requesting 0 amount #29401

Closed

6 tasks

DylanDylann mentioned this pull request Dec 20, 2023

[$500] Distance - Request with empty distance can be created by changing the link to participant link #33319

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/27383: Prevent request money if empty waypoint #27826

Fix/27383: Prevent request money if empty waypoint #27826

DylanDylann commented Sep 20, 2023 •

edited

Loading

melvin-bot bot commented Sep 20, 2023

DylanDylann commented Sep 21, 2023

allroundexperts Sep 21, 2023

allroundexperts commented Sep 21, 2023 •

edited

Loading

allroundexperts left a comment

allroundexperts left a comment

DylanDylann commented Sep 22, 2023

DylanDylann commented Sep 25, 2023

OSBotify commented Sep 25, 2023

tgolen commented Sep 26, 2023

roryabraham commented Sep 26, 2023

DylanDylann commented Sep 27, 2023

tgolen commented Sep 28, 2023

OSBotify commented Sep 28, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

Fix/27383: Prevent request money if empty waypoint #27826

Fix/27383: Prevent request money if empty waypoint #27826

Conversation

DylanDylann commented Sep 20, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 20, 2023

DylanDylann commented Sep 21, 2023

allroundexperts Sep 21, 2023

Choose a reason for hiding this comment

allroundexperts commented Sep 21, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

allroundexperts left a comment

Choose a reason for hiding this comment

allroundexperts left a comment

Choose a reason for hiding this comment

DylanDylann commented Sep 22, 2023

DylanDylann commented Sep 25, 2023

OSBotify commented Sep 25, 2023

tgolen commented Sep 26, 2023

roryabraham commented Sep 26, 2023

DylanDylann commented Sep 27, 2023

tgolen commented Sep 28, 2023

OSBotify commented Sep 28, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

DylanDylann commented Sep 20, 2023 •

edited

Loading

allroundexperts commented Sep 21, 2023 •

edited

Loading