Skip to content

Commit

Permalink
Merge pull request #50084 from Expensify/jasper-fixDuplicateWaypointE…
Browse files Browse the repository at this point in the history
…rror

[CP Staging] Ensure that round trips do not display the duplicate waypoint error incorrectly

(cherry picked from commit c7c8cd6)

(CP triggered by jasperhuangg)
  • Loading branch information
jasperhuangg authored and OSBotify committed Oct 2, 2024
1 parent fa97d80 commit 96952de
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/libs/TransactionUtils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,10 @@ function getValidWaypoints(waypoints: WaypointCollection | undefined, reArrangeI
let waypointIndex = -1;

return waypointValues.reduce<WaypointCollection>((acc, currentWaypoint, index) => {
const previousWaypoint = waypointValues.at(lastWaypointIndex);
// Array.at(-1) returns the last element of the array
// If a user does a round trip, the last waypoint will be the same as the first waypoint
// We want to avoid comparing them as this will result in an incorrect duplicate waypoint error.
const previousWaypoint = lastWaypointIndex !== -1 ? waypointValues.at(lastWaypointIndex) : undefined;

// Check if the waypoint has a valid address
if (!waypointHasValidAddress(currentWaypoint)) {
Expand Down

0 comments on commit 96952de

Please sign in to comment.