fix: BUG: [distance] request confirmation offline doesn't show TBD #26836

paultsimura · 2023-09-05T23:50:35Z

Details

Implement map route re-fetch on going back online;
Show "TBD" on pending fields;

Fixed Issues

$ #26537
PROPOSAL: #26537 (comment)

Tests

Go offline
Click green plus, request money
Enter start and finish addresses
Click next
Click show more to see all fields

Verify that fields amount and distance are filled as "TBD"

Go back online

Verify that fields amount and distance are filled with valid values
Verify that no errors appear in the JS console

Offline tests

Go offline
Click green plus, request money
Enter start and finish addresses
Click next
Click show more to see all fields

Verify that fields amount and distance are filled as "TBD"

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 / 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: https://expensify.slack.com/archives/C01GTK53T8Q/p1693944607891839
- 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

3.New.Expensify.-.6.September.2023.mp4

Mobile Web - Chrome

chrome.mp4

Mobile Web - Safari

safari.mp4

Desktop

desktop.mp4

iOS

ios_success.mp4

Android

android.mp4

- Add 'TBD' to pending fields

melvin-bot · 2023-09-05T23:50:39Z

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

paultsimura · 2023-09-06T08:07:47Z

@Ollyws while working on this PR, I found 2 more issues with the distance flow (not regression, not caused by my changes). I'll try to fix one, but the other seems a bit complicated for me. Should I file both of them through the bug report?

Ollyws · 2023-09-06T08:26:12Z

@paultsimura Yeah if they're out of scope for this issue then best to just report them. Thanks!

paultsimura · 2023-09-06T08:27:58Z

@Ollyws they're kind-of related, but not directly. I will report them, tag you in threads, and let you decide what to do with it

Ollyws · 2023-09-06T08:53:00Z

@paultsimura Where did you get the Spanish copy from here? If it's something you generated yourself could you please ask for confirmation that the copy is correct in Slack? Thanks.

paultsimura · 2023-09-06T08:54:43Z

@Ollyws already done, the corresponding Slack thread is referenced in the PR checklist. Waiting for approval...

src/components/DistanceRequest.js

hayata-suenaga · 2023-09-06T20:40:16Z

@paultsimura does this PR also handles refetching of the route when the device comes back online?

paultsimura · 2023-09-06T21:34:27Z

@hayata-suenaga yes, you can see the result in the attached screen recordings - it includes the route re-fetch.

paultsimura · 2023-09-06T21:40:46Z

@hayata-suenaga @Ollyws could you guys please help with getting this tiny translation expedited?

https://expensify.slack.com/archives/C01GTK53T8Q/p1693944607891839

It'd be nice to have enough time for testing this feature for regression before the merge freeze ends.

paultsimura · 2023-09-07T16:43:09Z

@Ollyws the copies have been updated – this PR is ready for the final review

paultsimura · 2023-09-08T09:31:56Z

src/components/DistanceRequest.js

    const waypointMarkers = useMemo(
        () =>
            _.filter(
                _.map(waypoints, (waypoint, key) => {
-                    if (!waypoint || !lodashHas(waypoint, 'lat') || !lodashHas(waypoint, 'lng') || lodashIsNull(waypoint.lat) || lodashIsNull(waypoint.lng)) {
+                    if (!waypoint || lodashIsNil(lodashGet(waypoint, 'lng')) || lodashIsNil(lodashGet(waypoint, 'lat'))) {


This specific change is only for cosmetic purposes to reflect my changes in here:

App/src/components/ConfirmedRoute.js

Line 47 in 9ce8d13

if (!waypoint || lodashIsNil(lodashGet(waypoint, 'lng')) || lodashIsNil(lodashGet(waypoint, 'lat'))) {

And that fix was related not only to non-existing address. Without my change, going back online on the confirmation screen after entering any address points would crash the mobile app.

mobile_crash.mp4

Ollyws · 2023-09-08T12:36:19Z

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

MacOS_Chrome.mov

Mobile Web - Chrome

Android_Chrome.mov

Mobile Web - Safari

iOS_Safari.mov

Desktop

MacOS_Desktop.mov

iOS

iOS_Native.mov

Android

Android_Native.mov

Ollyws · 2023-09-08T14:45:50Z

One issue I've just come across, is that if you try to make an offline distance request to a workspace that you haven't previously accessed in this session (i.e has no saved onyx data for the milage rate), then come online when on the confirmation page the total will be $0 as the milage rate has not yet been fetched from the backend.
I supposed this could possibly be considered out of scope for this issue, any thoughts @paultsimura?

Screen.Recording.2023-09-08.at.15.38.45.mov

paultsimura · 2023-09-08T19:03:38Z

@Ollyws seems like I found the solution, though it was indeed a bit out of scope. Committed.

workspace_rate_fixed.mp4

# Conflicts: # src/components/ConfirmedRoute.js

dannymcclain · 2023-09-15T14:47:01Z

@Ollyws I think it is totally ok in this context for it to just say "Request".
cc @shawnborton because he designed the original mockup.

paultsimura · 2023-09-15T21:11:28Z

Updated with no "TBD" on the button
@dannymcclain @Ollyws @neil-marcellini

shawnborton · 2023-09-18T04:39:08Z

Agree, just "Request" works for me!

Ollyws · 2023-09-18T10:38:25Z

src/components/MoneyRequestConfirmationList.js

@@ -239,7 +239,7 @@ function MoneyRequestConfirmationList(props) {
            text = translate('iou.request');
        } else {
            const translationKey = props.hasMultipleParticipants ? 'iou.splitAmount' : 'iou.requestAmount';
-            text = translate(translationKey, {amount: formattedAmount});
+            text = translate(translationKey, {amount: isDistanceRequestWithoutRoute ? '' : formattedAmount});


@paultsimura Is there any point at which we have a distance request utilizing iou.splitAmount, or could we just modify above to something like if (props.receiptPath || isDistanceRequestWithoutRoute) { ?

You're right, at the moment the Distance request doesn't allow splitting the bill. Updated, ready for the final review.

# Conflicts: # src/components/DistanceRequest.js

Ollyws · 2023-09-18T13:28:58Z

@paultsimura Thanks for the changes, looks good but I think we have some merge conflicts.

# Conflicts: # src/pages/iou/steps/MoneyRequestConfirmPage.js

paultsimura · 2023-09-18T16:20:53Z

These conflicts appear with the speed of light.
Updated @Ollyws

Ollyws · 2023-09-18T16:25:16Z

@paultsimura Thanks but didn't that just overwrite these changes you made to the dependencies (isOffline and participants)?

This reverts commit 3c8d3a9.

paultsimura · 2023-09-18T17:06:15Z

@Ollyws thanks man, won't happen again.

Ollyws

LGTM

neil-marcellini

Great work everyone, thank you.

OSBotify · 2023-09-18T23:31:52Z

✋ 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 · 2023-09-20T08:46:18Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 1.3.72-0 🚀

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

OSBotify · 2023-09-22T13:28:13Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.72-11 🚀

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

neil-marcellini · 2023-10-02T17:16:20Z

I'm commenting for the checklist on this issue since we didn't catch something when merging main. Not a big deal.

- Implement map route re-fetch on going online

9d9cc6f

- Add 'TBD' to pending fields

paultsimura requested a review from a team as a code owner September 5, 2023 23:50

melvin-bot bot requested review from Ollyws and removed request for a team September 5, 2023 23:50

pradeepmdk mentioned this pull request Sep 6, 2023

[HOLD for payment 2023-10-09] [$500] [Distance] - Route is generated without green line connecting the points after going online #26589

Closed

6 tasks

Handle null waypoint coordinates correctly

05908dd

Ollyws reviewed Sep 6, 2023

View reviewed changes

src/components/DistanceRequest.js Outdated Show resolved Hide resolved

Add hasRouteError check for route re-fetch

7afdf80

Ollyws reviewed Sep 6, 2023

View reviewed changes

src/components/DistanceRequest.js Outdated Show resolved Hide resolved

Make the shouldFetchRoute condition more readable

0b9596d

Ollyws reviewed Sep 6, 2023

View reviewed changes

src/components/DistanceRequest.js Outdated Show resolved Hide resolved

Some refactoring

af2c13f

Translation change

9ce8d13

paultsimura commented Sep 8, 2023

View reviewed changes

paultsimura added 3 commits September 8, 2023 20:51

Formatting

5dc1d8e

Fix missing workspace rate

6d4592f

Fix missing workspace distance rate

6d35789

Merge branch 'main' into fix-26537

40585d5

# Conflicts: # src/components/ConfirmedRoute.js

Hide "TBD" on the Request button

c3117fc

Fix useMemo deps

383f2dd

Ollyws reviewed Sep 18, 2023

View reviewed changes

paultsimura added 2 commits September 18, 2023 14:03

Merge branch 'main' into fix-26537

d64b0f3

# Conflicts: # src/components/DistanceRequest.js

Change the request button text logic

0644152

Merge branch 'main' into fix-26537

9442b59

# Conflicts: # src/pages/iou/steps/MoneyRequestConfirmPage.js

paultsimura added 4 commits September 18, 2023 18:25

Remove redundant useNetwork

3c8d3a9

Revert "Remove redundant useNetwork"

e0bd72d

This reverts commit 3c8d3a9.

Revert distance rate fix

764bc16

Lint

38014f7

ntdiary mentioned this pull request Sep 18, 2023

map not loading when online #26998

Merged

59 tasks

Ollyws approved these changes Sep 18, 2023

View reviewed changes

melvin-bot bot requested a review from neil-marcellini September 18, 2023 18:41

neil-marcellini approved these changes Sep 18, 2023

View reviewed changes

neil-marcellini merged commit e23c181 into Expensify:main Sep 18, 2023
12 checks passed

OSBotify mentioned this pull request Sep 20, 2023

Deploy Checklist: New Expensify 2023-09-20 #27837

Closed

lanitochka17 mentioned this pull request Sep 20, 2023

[HOLD for payment 2023-10-02] [HOLD for payment 2023-09-29] IOU - Next button disabled when requesting a new distance IOU offline #27895

Closed

6 tasks

paultsimura mentioned this pull request Jan 31, 2024

[$500] Distance - Map preview in confirmation page does not show offline message in offline mode #35517

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: BUG: [distance] request confirmation offline doesn't show TBD #26836

fix: BUG: [distance] request confirmation offline doesn't show TBD #26836

paultsimura commented Sep 5, 2023 •

edited

Loading

melvin-bot bot commented Sep 5, 2023

paultsimura commented Sep 6, 2023

Ollyws commented Sep 6, 2023

paultsimura commented Sep 6, 2023

Ollyws commented Sep 6, 2023

paultsimura commented Sep 6, 2023

hayata-suenaga commented Sep 6, 2023

paultsimura commented Sep 6, 2023

paultsimura commented Sep 6, 2023

paultsimura commented Sep 7, 2023

paultsimura Sep 8, 2023

Ollyws commented Sep 8, 2023 •

edited

Loading

Ollyws commented Sep 8, 2023

paultsimura commented Sep 8, 2023

dannymcclain commented Sep 15, 2023

paultsimura commented Sep 15, 2023

shawnborton commented Sep 18, 2023

Ollyws Sep 18, 2023

paultsimura Sep 18, 2023

Ollyws commented Sep 18, 2023

paultsimura commented Sep 18, 2023

Ollyws commented Sep 18, 2023

paultsimura commented Sep 18, 2023

Ollyws left a comment

neil-marcellini left a comment

OSBotify commented Sep 18, 2023

OSBotify commented Sep 20, 2023

OSBotify commented Sep 22, 2023

neil-marcellini commented Oct 2, 2023

fix: BUG: [distance] request confirmation offline doesn't show TBD #26836

fix: BUG: [distance] request confirmation offline doesn't show TBD #26836

Conversation

paultsimura commented Sep 5, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 5, 2023

paultsimura commented Sep 6, 2023

Ollyws commented Sep 6, 2023

paultsimura commented Sep 6, 2023

Ollyws commented Sep 6, 2023

paultsimura commented Sep 6, 2023

hayata-suenaga commented Sep 6, 2023

paultsimura commented Sep 6, 2023

paultsimura commented Sep 6, 2023

paultsimura commented Sep 7, 2023

paultsimura Sep 8, 2023

Choose a reason for hiding this comment

Ollyws commented Sep 8, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

Ollyws commented Sep 8, 2023

paultsimura commented Sep 8, 2023

dannymcclain commented Sep 15, 2023

paultsimura commented Sep 15, 2023

shawnborton commented Sep 18, 2023

Ollyws Sep 18, 2023

Choose a reason for hiding this comment

paultsimura Sep 18, 2023

Choose a reason for hiding this comment

Ollyws commented Sep 18, 2023

paultsimura commented Sep 18, 2023

Ollyws commented Sep 18, 2023

paultsimura commented Sep 18, 2023

Ollyws left a comment

Choose a reason for hiding this comment

neil-marcellini left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 18, 2023

OSBotify commented Sep 20, 2023

OSBotify commented Sep 22, 2023

neil-marcellini commented Oct 2, 2023

paultsimura commented Sep 5, 2023 •

edited

Loading

Ollyws commented Sep 8, 2023 •

edited

Loading