fix: Android - Distance - Waypoint does not change position correctly by dragging. #41378

Krishna2323 · 2024-05-01T04:25:33Z

Details

Fixed Issues

$ #40105
PROPOSAL: #40105 (comment)

Tests

Go to FAB > Request money > Distance.
Add three waypoints (A, B and C)
Drag the waypoint C over waypoint A
Verify C is at the first waypoint and then A and then B

Verify that no errors appear in the JS console

Offline tests

Go to FAB > Request money > Distance.
Add three waypoints (A, B and C)
Drag the waypoint C over waypoint A
Verify C is at the first waypoint and then A and then B

QA Steps

Go to FAB > Request money > Distance.
Add three waypoints (A, B and C)
Drag the waypoint C over waypoint A
Verify C is at the first waypoint and then A and then B

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

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

melvin-bot · 2024-05-01T04:25:38Z

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

ishpaul777 · 2024-05-03T11:37: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

Record_2024-05-23-02-50-45.mp4

Android: mWeb Chrome

Record_2024-05-23-02-54-44.mp4

iOS: Native

Screen.Recording.2024-05-23.at.3.17.06.AM-1-1.mov

iOS: mWeb Safari

Screen.Recording.2024-05-23.at.3.02.30.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-23.at.2.22.08.AM-1.mov

MacOS: Desktop

Screen.Recording.2024-05-23.at.3.20.01.AM.mov

ishpaul777 · 2024-05-03T12:16:34Z

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

@@ -426,7 +426,7 @@ function IOURequestStepDistance({
                <View style={styles.flex1}>
                    <DraggableList
                        data={waypointsList}
-                        keyExtractor={(item) => item}
+                        keyExtractor={(item) => (waypoints[item]?.address ?? '') + item || item}


what about the case when the address is same for 2 location?

VIDEO-2024-05-03-17-48-20.mp4

sorry for delay, will look at this today.

@ishpaul777, I added keyForList for each waypoint when they are added and it works perfectly, should we do that?

can you please push change so i can evaluate ?

gentle bump @Krishna2323

will push changes in few hours, sorry for delay again, I missed you previous comment.

@ishpaul777, you can retest the changes now.

i'll test this within few hours

@ishpaul777, friendly bump.

Reviewing now 👀

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

ishpaul777 · 2024-05-17T19:33:42Z

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

@@ -119,6 +119,7 @@ function IOURequestStepWaypoint({
                name: values.name ?? '',
                lat: values.lat ?? 0,
                lng: values.lng ?? 0,
+                keyForList: `${new Date().getTime()}_${Math.random().toString(36).substring(2, 15)}`,


Why only when offline 🤔 if (isOffline && waypointValue) { ??

Also can we do something like keyForList: "waypoint-{Date.now()}" is there a reason to do such intensive string processing

We can use waypoint-${Date.now()} here, ~~but not when dragging. If there are three waypoints and we assign waypoint-${Date.now()} to keyForList, it will be the same for all three.~~

Ignore my previous comment, I thought the backend won't save the keyForList and we will have to add again but that's not the case. The keyForList is saved and returned from the backend.

Why only when offline 🤔 if (isOffline && waypointValue) { ??

I forgot to add to selectWaypoint function, now added.

ishpaul777 · 2024-05-17T19:35:51Z

src/types/onyx/RecentWaypoint.ts

@@ -10,6 +10,9 @@ type RecentWaypoint = {

    /** The longitude of the waypoint */
    lng?: number;
+
+    /** The longitude of the waypoint */


wrong comment

ishpaul777 · 2024-05-17T19:36:01Z

src/types/onyx/Transaction.ts

@@ -38,6 +38,9 @@ type Waypoint = {

    /** Address street line 2 */
    street2?: string;
+
+    /** The longitude of the waypoint */


wrong comment

ishpaul777 · 2024-05-17T19:38:33Z

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

-                newWaypoints[`waypoint${index}`] = waypoints[waypoint] ?? {};
+                const newWaypointObj = waypoints[waypoint].keyForList
+                    ? waypoints[waypoint]
+                    : {...waypoints[waypoint], keyForList: `${new Date().getTime()}_${Math.random().toString(36).substring(2, 15)}`};


shouldn't the keyForList be there always if added in waypoint page, why this check ?

I thought the backend won't save the keyForList property but thats not the case. This part is not updated.

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

Krishna2323 · 2024-05-21T12:49:28Z

@ishpaul777, friendly bump.

ishpaul777 · 2024-05-22T16:19:00Z

sorry i have been sick so on/off lately.. will review again today

ishpaul777 · 2024-05-22T20:35:38Z

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

+                const newWaypointObj = waypoints[waypoint];
+                newWaypoints[`waypoint${index}`] = newWaypointObj ?? {};


This change seems unnecessary

ishpaul777 · 2024-05-22T21:46:35Z

Please merge main when you got the chance : )

rlinoz · 2024-05-24T13:46:04Z

Friendly bump @Krishna2323

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

ishpaul777 · 2024-05-24T18:07:45Z

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

@@ -119,6 +119,7 @@ function IOURequestStepWaypoint({
                name: values.name ?? '',
                lat: values.lat ?? 0,
                lng: values.lng ?? 0,
+                keyForList: `${waypointValue as string}_${Date.now()}`,


Suggested change

keyForList: `${waypointValue as string}_${Date.now()}`,

keyForList: `${waypointValue ?? 'waypoint'}_${Date.now()}`,

Krishna2323 · 2024-05-24T18:07:48Z

@ishpaul777, merged main.

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

ishpaul777 · 2024-05-24T18:16:54Z

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

@@ -139,6 +140,7 @@ function IOURequestStepWaypoint({
            lng: values.lng ?? 0,
            address: values.address ?? '',
            name: values.name ?? '',
+            keyForList: `${values.name ?? 'waypoint'}_${Date.now()}`,


sorry i just notice this inconsistency, can you help me understand why here we use name and above it we use waypointValue (which is address) ??

different by mistake, updated now to values.name.

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

github-actions · 2024-05-27T13:23:26Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/41378/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/41378/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/41378/NewExpensify.dmg	https://41378.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

rlinoz

It is working great!

Just some minor comments.

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

src/types/onyx/RecentWaypoint.ts

src/types/onyx/Transaction.ts

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

rlinoz · 2024-05-27T17:12:31Z

@Krishna2323 thanks, just one type check now.

OSBotify · 2024-05-28T18: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-05-29T09:42:06Z

🚀 Deployed to staging by https://github.com/rlinoz in version: 1.4.77-0 🚀

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

OSBotify · 2024-05-30T21:24:55Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.77-11 🚀

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

OSBotify · 2024-05-30T22:36:53Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.77-11 🚀

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

fix: Android - Distance - Waypoint does not change position correctly…

7183083

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

Krishna2323 requested a review from a team as a code owner May 1, 2024 04:25

melvin-bot bot requested review from ishpaul777 and removed request for a team May 1, 2024 04:25

ishpaul777 reviewed May 3, 2024

View reviewed changes

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

15d52e2

Krishna2323 mentioned this pull request May 8, 2024

[$250] Distance - Gap displayed between start&finish after moving stops and deleting one #40753

Closed

6 tasks

Krishna2323 added 2 commits May 14, 2024 11:26

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

e1c6d5f

add unique keys for waypoints.

bbe32c4

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

ishpaul777 reviewed May 17, 2024

View reviewed changes

Krishna2323 added 2 commits May 19, 2024 01:08

add keyForList when address is selected.

e76180b

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

use Date.now() for keyForList.

111476d

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

ishpaul777 suggested changes May 22, 2024

View reviewed changes

Krishna2323 added 2 commits May 24, 2024 23:35

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

8124981

remove redundant code.

800c12e

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

ishpaul777 reviewed May 24, 2024

View reviewed changes

minor update.

56f13d8

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

ishpaul777 reviewed May 24, 2024

View reviewed changes

ishpaul777 mentioned this pull request May 24, 2024

[HOLD for payment 2024-06-06] [$250] Android - Distance - Waypoint does not change position correctly by dragging #40105

Closed

6 tasks

minor update.

a74c13d

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

ishpaul777 approved these changes May 26, 2024

View reviewed changes

melvin-bot bot requested a review from rlinoz May 26, 2024 20:19

rlinoz added the Ready To Build label May 27, 2024

war-in mentioned this pull request May 27, 2024

[HOLD for payment 2024-06-24][$1000] Correct chat is not opening when typing someone's name and hit Enter in chat switcher #39631

Closed

6 tasks

rlinoz requested changes May 27, 2024

View reviewed changes

src/pages/iou/request/step/IOURequestStepDistance.tsx Outdated Show resolved Hide resolved

src/types/onyx/RecentWaypoint.ts Outdated Show resolved Hide resolved

src/types/onyx/Transaction.ts Outdated Show resolved Hide resolved

minor fixes.

14f864f

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

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

257d956

rlinoz approved these changes May 28, 2024

View reviewed changes

rlinoz merged commit 322d6fe into Expensify:main May 28, 2024
15 checks passed

github-actions bot mentioned this pull request May 29, 2024

Deploy Checklist: New Expensify 2024-05-29 #42741

Closed

		const newWaypointObj = waypoints[waypoint];
		newWaypoints[`waypoint${index}`] = newWaypointObj ?? {};

	keyForList: `${waypointValue as string}_${Date.now()}`,
	keyForList: `${waypointValue ?? 'waypoint'}_${Date.now()}`,

fix: Android - Distance - Waypoint does not change position correctly by dragging. #41378

fix: Android - Distance - Waypoint does not change position correctly by dragging. #41378

Conversation

Krishna2323 commented May 1, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 1, 2024

ishpaul777 commented May 3, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

ishpaul777 May 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ishpaul777 May 17, 2024 • edited Loading

Choose a reason for hiding this comment

Krishna2323 May 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Krishna2323 commented May 21, 2024

ishpaul777 commented May 22, 2024 • edited Loading

ishpaul777 May 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ishpaul777 commented May 22, 2024

rlinoz commented May 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Krishna2323 commented May 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented May 27, 2024

rlinoz left a comment

Choose a reason for hiding this comment

rlinoz commented May 27, 2024

OSBotify commented May 28, 2024

OSBotify commented May 29, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

Krishna2323 commented May 1, 2024 •

edited

Loading

ishpaul777 commented May 3, 2024 •

edited

Loading

ishpaul777 May 3, 2024 •

edited

Loading

ishpaul777 May 17, 2024 •

edited

Loading

Krishna2323 May 18, 2024 •

edited

Loading

ishpaul777 commented May 22, 2024 •

edited

Loading

ishpaul777 May 22, 2024 •

edited

Loading