Review feedback

Author: GCyganek

src/components/GPSTripStateChecker/index.native.tsx

@@ -27,7 +27,7 @@ function GPSTripStateChecker() {
 
     const reportID = gpsDraftDetails?.reportID ?? generateReportID();
 
-    useUpdateGpsTripOnReconnect();
+    useUpdateGpsTripOnReconnect({gpsPoints: getGpsPoints(gpsDraftDetails)});
     useUpdateGpsNotification();
 
     useEffect(() => {

src/components/GPSTripStateChecker/useUpdateGpsTripOnReconnect.ts

@@ -1,21 +1,12 @@
 import OnyxUtils from 'react-native-onyx/dist/OnyxUtils';
 import useNetwork from '@hooks/useNetwork';
-import useOnyx from '@hooks/useOnyx';
 import {updateGpsPoints} from '@libs/actions/GPSDraftDetails';
 import {addressFromGpsPoint, getGpsPoints} from '@libs/GPSDraftDetailsUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {GPSPoint} from '@src/types/onyx/GpsDraftDetails';
 
-function useUpdateGpsTripOnReconnect() {
-    const [gpsDraftDetails] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS);
-
+function useUpdateGpsTripOnReconnect({gpsPoints}: {gpsPoints: GPSPoint[][]}) {
     const updateAddressesToHumanReadable = async () => {
-        if (!gpsDraftDetails) {
-            return;
-        }
-
-        const gpsPoints = getGpsPoints(gpsDraftDetails);
-
         const waypointUpdates: Array<Promise<{point: GPSPoint; segmentIndex: number; type: 'start' | 'end'}>> = [];
 
         for (const [segmentIndex, tripSegment] of gpsPoints.entries()) {
@@ -49,9 +40,9 @@ function useUpdateGpsTripOnReconnect() {
 
         // To avoid race conditions, we need to get the latest gpsDraftDetails, because reverse geocoding may even take a few seconds
         const gpsDraftDetailsPromiseResult = await OnyxUtils.get(ONYXKEYS.GPS_DRAFT_DETAILS).catch(() => undefined);
-        const latestGpsDraftDetails = gpsDraftDetailsPromiseResult ?? gpsDraftDetails;
+        const latestGpsDraftDetails = gpsDraftDetailsPromiseResult;
 
-        const latestGpsPoints = getGpsPoints(latestGpsDraftDetails);
+        const latestGpsPoints = getGpsPoints(latestGpsDraftDetails) ?? gpsPoints;
         const newGpsPoints = [...latestGpsPoints];
 
         for (const {point, segmentIndex, type} of waypointAddresses) {

src/components/MapView/utils.ts

@@ -1,9 +1,9 @@
 import type {LngLat} from 'react-map-gl';
-import getArrayDepth from '@libs/getArrayDepth';
+import is2dArray from '@libs/is2dArray';
 import type {Coordinate} from './MapViewTypes';
 
 function isSingleSegmentRoute(directionCoordinates: Coordinate[] | Coordinate[][]): directionCoordinates is Coordinate[] {
-    return getArrayDepth(directionCoordinates) === 2;
+    return is2dArray(directionCoordinates);
 }
 
 function getBounds(waypoints: Coordinate[], directionCoordinates: undefined | Coordinate[]): {southWest: Coordinate; northEast: Coordinate} {

src/pages/iou/request/step/IOURequestStepDistanceGPS/useGPSWaypointMarkers.tsx

@@ -5,7 +5,7 @@ import type {WayPoint} from '@components/MapView/MapViewTypes';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useOnyx from '@hooks/useOnyx';
 import useTheme from '@hooks/useTheme';
-import {getGPSWaypoints, getTotalGpsTripSegments, isTripStopped as isTripStoppedUtil} from '@libs/GPSDraftDetailsUtils';
+import {getGPSWaypoints, isTripStopped as isTripStoppedUtil} from '@libs/GPSDraftDetailsUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type IconAsset from '@src/types/utils/IconAsset';
@@ -28,28 +28,32 @@ function useGPSWaypointMarkers(): WayPoint[] {
     );
 
     const gpsWaypoints = getGPSWaypoints(gpsDraftDetails);
+    const waypointEntries = Object.entries(gpsWaypoints);
+    const lastIndex = waypointEntries.length - 1;
+
+    return waypointEntries.flatMap(([key, waypoint], index): WayPoint[] => {
+        const isStart = index === 0;
+        const isEnd = index === lastIndex;
+
+        if (isEnd && !isTripStopped) {
+            return [];
+        }
 
-    const gpsWaypointMarkers = Object.entries(gpsWaypoints).map(([key, waypoint], index): WayPoint | null => {
-        const tripSegmentsCount = getTotalGpsTripSegments(gpsDraftDetails);
         let icon = DotIndicator;
-        if (index === 0) {
+        if (isStart) {
             icon = DotIndicatorUnfilled;
-        } else if (index === tripSegmentsCount * 2 - 1) {
+        } else if (isEnd) {
             icon = Location;
-
-            if (!isTripStopped) {
-                return null;
-            }
         }
 
-        return {
-            id: key,
-            coordinate: [waypoint.lng, waypoint.lat],
-            markerComponent: (): ReactNode => getMarkerComponent(icon),
-        };
+        return [
+            {
+                id: key,
+                coordinate: [waypoint.lng, waypoint.lat],
+                markerComponent: (): ReactNode => getMarkerComponent(icon),
+            },
+        ];
     });
-
-    return gpsWaypointMarkers.filter((waypoint): waypoint is WayPoint => !!waypoint);
 }
 
 export default useGPSWaypointMarkers;