Merge pull request #37099 from codinggeek2023/issue-36067

[Fix]: Distance -When adding 'Stop' location the newly added location is added to 'Finish' location
Expensify · Feb 28, 2024 · d7d5630 · d7d5630
2 parents fd16476 + f92b845
commit d7d5630
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 8 deletions.
diff --git a/src/components/DistanceEReceipt.tsx b/src/components/DistanceEReceipt.tsx
@@ -75,8 +75,6 @@ function DistanceEReceipt({transaction}: DistanceEReceiptProps) {
                             let descriptionKey: TranslationPaths = 'distance.waypointDescription.stop';
                             if (index === 0) {
                                 descriptionKey = 'distance.waypointDescription.start';
-                            } else if (index === Object.keys(waypoints).length - 1) {
-                                descriptionKey = 'distance.waypointDescription.finish';
                             }
 
                             return (

diff --git a/src/components/DistanceRequest/DistanceRequestRenderItem.tsx b/src/components/DistanceRequest/DistanceRequestRenderItem.tsx
@@ -42,7 +42,7 @@ function DistanceRequestRenderItem({waypoints, item = '', onSecondaryInteraction
         descriptionKey += 'start';
         waypointIcon = Expensicons.DotIndicatorUnfilled;
     } else if (index === lastWaypointIndex) {
-        descriptionKey += 'finish';
+        descriptionKey += 'stop';
         waypointIcon = Expensicons.Location;
     } else {
         descriptionKey += 'stop';

diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -2238,7 +2238,6 @@ export default {
         address: 'Address',
         waypointDescription: {
             start: 'Start',
-            finish: 'Finish',
             stop: 'Stop',
         },
         mapPending: {

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -2727,7 +2727,6 @@ export default {
         address: 'Dirección',
         waypointDescription: {
             start: 'Comienzo',
-            finish: 'Final',
             stop: 'Parada',
         },
         mapPending: {

diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
@@ -82,12 +82,10 @@ function IOURequestStepWaypoint({
         switch (parsedWaypointIndex) {
             case 0:
                 return 'distance.waypointDescription.start';
-            case waypointCount - 1:
-                return 'distance.waypointDescription.finish';
             default:
                 return 'distance.waypointDescription.stop';
         }
-    }, [parsedWaypointIndex, waypointCount]);
+    }, [parsedWaypointIndex]);
 
     const locationBias = useLocationBias(allWaypoints, userLocation);
     const waypointAddress = currentWaypoint.address ?? '';