fix: Distance - Start and Stop labels do not change when dragging one over another. #44748

Krishna2323 · 2024-07-02T21:26:47Z

Details

Fixed Issues

$ #44153
PROPOSAL: #44153 (comment)

Tests

Go to FAB > Submit expense > Distance.
Drag empty Stop row over empty Start row.
Verify that the Stop label changes to Start and Start label changes to stop.
Tap on the Stop row.
Select a waypoint.
Verify the waypoint is displayed correctly.

Verify that no errors appear in the JS console

Offline tests

Go to FAB > Submit expense > Distance.
Drag empty Stop row over empty Start row.
Verify that the Stop label changes to Start and Start label changes to stop.
Tap on the Stop row.
Select a waypoint.
Verify the waypoint is displayed correctly.

QA Steps

Go to FAB > Submit expense > Distance.
Drag empty Stop row over empty Start row.
Verify that the Stop label changes to Start and Start label changes to stop.
Tap on the Stop row.
Select a waypoint.
Verify the waypoint is displayed correctly.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

… over another. Signed-off-by: Krishna Gupta <[email protected]>

melvin-bot · 2024-07-02T21:26:51Z

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

Signed-off-by: Krishna Gupta <[email protected]>

hoangzinh · 2024-07-05T11:08:08Z

src/pages/iou/request/step/IOURequestStepDistance.tsx

@@ -346,7 +361,9 @@ function IOURequestStepDistance({
            data.forEach((waypoint, index) => {
                newWaypoints[`waypoint${index}`] = waypoints[waypoint] ?? {};
                // Find waypoint that BECOMES empty after dragging
-                if (isEmpty(newWaypoints[`waypoint${index}`]) && !isEmpty(waypoints[`waypoint${index}`] ?? {})) {
+                const {keyForList, ...newWaypointsWithoutKey} = newWaypoints[`waypoint${index}`];
+                const {keyForList: waypointKey, ...waypointWithoutKey} = waypoints[`waypoint${index}`];


Is it possible if waypoints[waypoint${index}] empty here? I mean if there is any case that raise error here

sorry for delay, I will confirm this today.

@hoangzinh, I think there won't be any case when waypoints[waypoint${index}] is empty but I have added a if block to make sure that it won't throw any error if there is edge case.

Signed-off-by: krishna2323 <[email protected]>

hoangzinh · 2024-07-09T23:24:49Z

src/pages/iou/request/step/IOURequestStepDistance.tsx

+                const {keyForList, ...waypointWithoutKey} = waypoints[key];
+                return !isEmpty(waypointWithoutKey);


I think we can split it into a shareable method, that can be used in the below changes as well. A method like isEmptyWaypoint? (we should handle null/undefined inside that method as well)

const nonEmptyWaypointsCount = useMemo(() => Object.keys(waypoints).filter((key) => !isEmptyWaypoint(waypoints[key])).length, [waypoints]);

And

if (isEmptyWaypoint(newWaypoints[`waypoint${index}`]) && !isEmptyWaypoint(waypoints[`waypoint${index}`] ?? {})) { emptyWaypointIndex = index; }

What do you think?

I will check this in few hours.

@hoangzinh, suggestion looks good to me, code updated.

Signed-off-by: krishna2323 <[email protected]>

hoangzinh · 2024-07-12T10:21:27Z

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

Screen.Recording.2024-07-12.at.17.20.36.android.mov

Android: mWeb Chrome

Screen.Recording.2024-07-12.at.17.09.33.android.chrome.mov

iOS: Native

Screen.Recording.2024-07-12.at.17.11.01.ios.mov

iOS: mWeb Safari

Screen.Recording.2024-07-12.at.17.06.02.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2024-07-12.at.16.54.19.web.mov

MacOS: Desktop

Screen.Recording.2024-07-12.at.16.58.06.desktop.mov

MonilBhavsar

Thanks!

OSBotify · 2024-07-12T11:17:25Z

✋ 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:59Z

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

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

OSBotify · 2024-07-15T22:13:43Z

🚀 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:20: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:50:29Z

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

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

akinwale · 2024-08-14T05:23:52Z

This PR caused a regression. Quoting #45467 (comment):

Here waypoints were updated to have a default keyForList key when there is no selected waypoint.
- waypoint0: {},
- waypoint1: {},
+ waypoint0: {keyForList: 'start_waypoint'},
+ waypoint1: {keyForList: 'stop_waypoint'},

fix: Distance - Start and Stop labels do not change when dragging one…

00d5b26

… over another. Signed-off-by: Krishna Gupta <[email protected]>

Krishna2323 requested a review from a team as a code owner July 2, 2024 21:26

melvin-bot bot removed the request for review from a team July 2, 2024 21:26

melvin-bot bot requested a review from hoangzinh July 2, 2024 21:26

minor fix.

717e2ec

Signed-off-by: Krishna Gupta <[email protected]>

Krishna2323 marked this pull request as draft July 2, 2024 23:26

Krishna2323 marked this pull request as ready for review July 3, 2024 21:47

Krishna2323 mentioned this pull request Jul 3, 2024

[HOLD for payment 2024-07-24] [$250] Distance - Start and Stop labels do not change when dragging one over another #44153

Closed

6 tasks

hoangzinh reviewed Jul 5, 2024

View reviewed changes

Krishna2323 added 2 commits July 9, 2024 17:15

Merge branch 'Expensify:main' into krishna2323/issue/44153

0f16a6c

minor update.

82fc097

Signed-off-by: krishna2323 <[email protected]>

hoangzinh reviewed Jul 9, 2024

View reviewed changes

Krishna2323 added 3 commits July 11, 2024 03:01

Merge branch 'Expensify:main' into krishna2323/issue/44153

33a04fc

added isWaypointEmpty to check if a waypoint is empty or not.

e166e19

Signed-off-by: krishna2323 <[email protected]>

minor fix.

826e52f

Signed-off-by: krishna2323 <[email protected]>

hoangzinh approved these changes Jul 12, 2024

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar July 12, 2024 10:22

MonilBhavsar approved these changes Jul 12, 2024

View reviewed changes

MonilBhavsar merged commit cdbb01b into Expensify:main Jul 12, 2024
15 checks passed

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

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

Closed

etCoderDysto mentioned this pull request Aug 5, 2024

[HOLD for payment 2024-08-14] [$250] Distance - "Add stop" button is shown when Start and Stop points are empty #45467

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Distance - Start and Stop labels do not change when dragging one over another. #44748

fix: Distance - Start and Stop labels do not change when dragging one over another. #44748

Krishna2323 commented Jul 2, 2024 •

edited

Loading

melvin-bot bot commented Jul 2, 2024

hoangzinh Jul 5, 2024

Krishna2323 Jul 8, 2024

Krishna2323 Jul 9, 2024

hoangzinh Jul 9, 2024

Krishna2323 Jul 11, 2024

Krishna2323 Jul 12, 2024

hoangzinh commented Jul 12, 2024 •

edited

Loading

MonilBhavsar left a comment

OSBotify commented Jul 12, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

akinwale commented Aug 14, 2024

		const {keyForList, ...waypointWithoutKey} = waypoints[key];
		return !isEmpty(waypointWithoutKey);

fix: Distance - Start and Stop labels do not change when dragging one over another. #44748

fix: Distance - Start and Stop labels do not change when dragging one over another. #44748

Conversation

Krishna2323 commented Jul 2, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 2, 2024

hoangzinh Jul 5, 2024

Choose a reason for hiding this comment

Krishna2323 Jul 8, 2024

Choose a reason for hiding this comment

Krishna2323 Jul 9, 2024

Choose a reason for hiding this comment

hoangzinh Jul 9, 2024

Choose a reason for hiding this comment

Krishna2323 Jul 11, 2024

Choose a reason for hiding this comment

Krishna2323 Jul 12, 2024

Choose a reason for hiding this comment

hoangzinh commented Jul 12, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

MonilBhavsar left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 12, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

akinwale commented Aug 14, 2024

Krishna2323 commented Jul 2, 2024 •

edited

Loading

hoangzinh commented Jul 12, 2024 •

edited

Loading