fix: convert distance value to meters if necessary #43819

dominictb · 2024-06-17T02:21:42Z

Details

Fixed Issues

Tests

Pre-requisite: Enable canUseP2PDistanceRequests betas

Go to NewDot.
Go to self DM.
Track a distance expense.
Go to transaction thread of the distance expense.
Take note of the distance.
Return to the main chat.
Click Share it with my accountant (or categorize it) from actionable whisper.
Proceed to confirmation page.

Verify that: The distance in the confirmation page will be the same as the distance in the transaction thread because waypoints remain the same.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Pre-requisite: Enable canUseP2PDistanceRequests betas

Go to NewDot
Go to self DM.
Track a distance expense.
Go to transaction thread of the distance expense.
Take note of the distance.
Return to the main chat.
Click Share it with my accountant (or categorize it) from actionable whisper.
Proceed to confirmation page.

Verify that: The distance in the confirmation page will be the same as the distance in the transaction thread because waypoints remain the same.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

Signed-off-by: dominictb <tb-dominic@outlook.com>

melvin-bot · 2024-06-17T09:45:44Z

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

situchan · 2024-06-19T21:52:35Z

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 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 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(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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

iOS: Native

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

situchan

@dominictb please check this. I am getting wrong miles.

To reproduce, make sure to create the first distance request on this branch

dominictb · 2024-06-25T09:24:50Z

@situchan can you send the full video so I could follow to reproduce? Thanks!

situchan · 2024-06-25T16:19:35Z

@dominictb I am not able to reproduce original bug anymore on staging. Can you?

dominictb · 2024-06-26T02:32:09Z

@situchan haven't checked yet. I'll need to check and get back to you.

dominictb · 2024-06-27T04:19:38Z

@situchan this is still reproducible on main. Have you enabled the betas canUseP2PDistance...?

situchan · 2024-07-01T18:43:40Z

reproduced on main. Not reproducible on staging maybe because canUseP2PDistance is not enabled.
Still I think we should apply logic in this PR only when canUseP2PDistance is enabled, to avoid regression when canUseP2PDistance is not enabled.

dominictb · 2024-07-02T02:10:38Z

@situchan that's a bit redundant no? In here

App/src/components/MoneyRequestConfirmationListFooter.tsx

Lines 341 to 352 in eb8b251

    
           item: ( 
        
               <MenuItemWithTopDescription 
        
                   key={translate('common.distance')} 
        
                   shouldShowRightIcon={!isReadOnly} 
        
                   title={DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, rate, translate)} 
        
                   description={translate('common.distance')} 
        
                   style={[styles.moneyRequestMenuItem]} 
        
                   titleStyle={styles.flex1} 
        
                   onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))} 
        
                   disabled={didConfirm} 
        
                   interactive={!isReadOnly} 
        
               />

we only use the distance value if the canUseP2PDistanceRequest flag is true.

situchan · 2024-07-10T19:03:22Z

@situchan that's a bit redundant no? In here

App/src/components/MoneyRequestConfirmationListFooter.tsx

Lines 341 to 352 in eb8b251

item: (

<MenuItemWithTopDescription

key={translate('common.distance')}

shouldShowRightIcon={!isReadOnly}

title={DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, rate, translate)}

description={translate('common.distance')}

style={[styles.moneyRequestMenuItem]}

titleStyle={styles.flex1}

onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}

disabled={didConfirm}

interactive={!isReadOnly}

/>

we only use the distance value if the canUseP2PDistanceRequest flag is true.

We also use distance when canUseP2PDistanceRequest is false:

App/src/components/MoneyRequestConfirmationListFooter.tsx

Lines 328 to 342 in 98932a2

    
           item: ( 
        
               <MenuItemWithTopDescription 
        
                   key={translate('common.distance')} 
        
                   shouldShowRightIcon={!isReadOnly && !isMovingTransactionFromTrackExpense} 
        
                   title={isMerchantEmpty ? '' : iouMerchant} 
        
                   description={translate('common.distance')} 
        
                   style={[styles.moneyRequestMenuItem]} 
        
                   titleStyle={styles.flex1} 
        
                   onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))} 
        
                   disabled={didConfirm} 
        
                   // todo: handle edit for transaction while moving from track expense 
        
                   interactive={!isReadOnly && !isMovingTransactionFromTrackExpense} 
        
               /> 
        
           ), 
        
           shouldShow: isDistanceRequest && !canUseP2PDistanceRequests,

Why don't you try to test when canUseP2PDistanceRequest is false? It surely causes regression.

situchan · 2024-07-10T19:39:50Z

@dominictb here's full reproduction video: (Tip: do the actions very quickly, slower network if possible)

(canUseP2PDistanceRequest = true)

Screen.Recording.2024-07-10.at.12.38.12.PM.mov

dominictb · 2024-07-11T05:05:21Z

Why don't you try to test when canUseP2PDistanceRequest is false? It surely causes regression.

It couldn't, as when canUseP2PDistanceRequest = false, they are using iouMerchant value to display, and in here, we don't convert in case of isMovingToTrackExpense. Nonetheless, I guess it doesn't hurt to add that extra safeguard.

For this #43819 (comment), I'll get back to you later.

Signed-off-by: dominictb <tb-dominic@outlook.com>

dominictb · 2024-07-11T08:28:20Z

@situchan fixed. The issue is because if the backend API is slow, we still get the distance value in meters instead of unit. We should not convert the distance value to meters in case isFetchingWaypointFromServer is true

situchan

Nice! Tests well now.

retest.mov

thienlnam

Thanks!

OSBotify · 2024-07-11T21:03:19Z

✋ 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 · 2024-07-15T21:04:02Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 9.0.7-3 🚀

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

OSBotify · 2024-07-15T22:12:46Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.7-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-17T00:18:10Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀

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

OSBotify · 2024-07-18T13:49:15Z

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

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

fix: convert distance value to meters if necessary

3d70532

Signed-off-by: dominictb <tb-dominic@outlook.com>

dominictb marked this pull request as ready for review June 17, 2024 09:45

dominictb requested a review from a team as a code owner June 17, 2024 09:45

melvin-bot bot requested review from situchan and removed request for a team June 17, 2024 09:45

situchan approved these changes Jun 25, 2024

View reviewed changes

melvin-bot bot requested a review from thienlnam June 25, 2024 07:20

situchan suggested changes Jun 25, 2024

View reviewed changes

dominictb added 2 commits July 11, 2024 14:46

Merge remote-tracking branch 'origin/main' into fix/42959-distance-track

654b8b4

fix: do not convert distance in case API call is not finished

ca8d718

Signed-off-by: dominictb <tb-dominic@outlook.com>

situchan approved these changes Jul 11, 2024

View reviewed changes

thienlnam approved these changes Jul 11, 2024

View reviewed changes

thienlnam merged commit 9138d8b into Expensify:main Jul 11, 2024
15 checks passed

github-actions bot mentioned this pull request Jul 15, 2024

Deploy Checklist: New Expensify 2024-07-15 #45421

Closed

melvin-bot bot mentioned this pull request Jul 17, 2024

[HOLD for payment 2024-07-24] [$250] Track distance - Incorrect distance is displayed on confirmation page when submitting to WS #42959

Closed

6 tasks

lanitochka17 mentioned this pull request Jul 17, 2024

[$250] Android - Track expense - Error displayed when track distance expense in self DM #45605

Closed

6 tasks

dominictb deleted the fix/42959-distance-track branch July 18, 2024 02:44

bernhardoj mentioned this pull request Jul 25, 2024

Fix distance still shows Pending when preview and report header already show distance #46165

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: convert distance value to meters if necessary #43819

fix: convert distance value to meters if necessary #43819

dominictb commented Jun 17, 2024 •

edited

Loading

melvin-bot bot commented Jun 17, 2024

situchan commented Jun 19, 2024 •

edited

Loading

situchan left a comment

dominictb commented Jun 25, 2024

situchan commented Jun 25, 2024

dominictb commented Jun 26, 2024

dominictb commented Jun 27, 2024

situchan commented Jul 1, 2024

dominictb commented Jul 2, 2024

situchan commented Jul 10, 2024

situchan commented Jul 10, 2024

dominictb commented Jul 11, 2024

dominictb commented Jul 11, 2024

situchan left a comment

thienlnam left a comment

OSBotify commented Jul 11, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

fix: convert distance value to meters if necessary #43819

fix: convert distance value to meters if necessary #43819

Conversation

dominictb commented Jun 17, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 17, 2024

situchan commented Jun 19, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

situchan left a comment

Choose a reason for hiding this comment

dominictb commented Jun 25, 2024

situchan commented Jun 25, 2024

dominictb commented Jun 26, 2024

dominictb commented Jun 27, 2024

situchan commented Jul 1, 2024

dominictb commented Jul 2, 2024

situchan commented Jul 10, 2024

situchan commented Jul 10, 2024

dominictb commented Jul 11, 2024

dominictb commented Jul 11, 2024

situchan left a comment

Choose a reason for hiding this comment

thienlnam left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 11, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

dominictb commented Jun 17, 2024 •

edited

Loading

situchan commented Jun 19, 2024 •

edited

Loading