Fix: Distance - Unable to save distance when Start and Stop waypoints are valid address

src/hooks/useFetchRoute.ts

@@ -1,5 +1,5 @@
 import isEqual from 'lodash/isEqual';
-import {useEffect} from 'react';
+import {useEffect, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import * as TransactionAction from '@userActions/Transaction';
@@ -18,6 +18,7 @@ export default function useFetchRoute(
     transactionState: TransactionState = CONST.TRANSACTION.STATE.CURRENT,
 ) {
     const {isOffline} = useNetwork();
+    const [isInitialMount, setIsInitialMount] = useState(true);
     const hasRouteError = !!transaction?.errorFields?.route;
     const hasRoute = TransactionUtils.hasRoute(transaction);
     const isRouteAbsentWithoutErrors = !hasRoute && !hasRouteError;
@@ -26,14 +27,19 @@ export default function useFetchRoute(
     const previousValidatedWaypoints = usePrevious(validatedWaypoints);
     const haveValidatedWaypointsChanged = !isEqual(previousValidatedWaypoints, validatedWaypoints);
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
-    const shouldFetchRoute = isDistanceRequest && (isRouteAbsentWithoutErrors || haveValidatedWaypointsChanged) && !isLoadingRoute && Object.keys(validatedWaypoints).length > 1;
+    const shouldFetchRoute =
+        isDistanceRequest &&
+        (isRouteAbsentWithoutErrors || haveValidatedWaypointsChanged || (isInitialMount && hasRouteError)) &&
+        !isLoadingRoute &&
+        Object.keys(validatedWaypoints).length > 1;
 
     useEffect(() => {
         if (isOffline || !shouldFetchRoute || !transaction?.transactionID) {
             return;
         }
 
         TransactionAction.getRoute(transaction.transactionID, validatedWaypoints, transactionState);
+        setIsInitialMount(false);
     }, [shouldFetchRoute, transaction?.transactionID, validatedWaypoints, isOffline, action, transactionState]);
 
     return {shouldFetchRoute, validatedWaypoints};

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

@@ -81,7 +81,7 @@ function IOURequestStepDistance({
         [optimisticWaypoints, transaction],
     );
 
-    const backupWaypoints = transactionBackup?.pendingFields?.waypoints ? transactionBackup?.comment?.waypoints : undefined;
+    const backupWaypoints = transactionBackup?.comment?.waypoints;
     // When online, fetch the backup route to ensure the map is populated even if the user does not save the transaction.
     // Fetch the backup route first to ensure the backup transaction map is updated before the main transaction map.
     // This prevents a scenario where the main map loads, the user dismisses the map editor, and the backup map has not yet loaded due to delay.
@@ -441,7 +441,7 @@ function IOURequestStepDistance({
 
     const submitWaypoints = useCallback(() => {
         // If there is any error or loading state, don't let user go to next page.
-        if (duplicateWaypointsError || atLeastTwoDifferentWaypointsError || hasRouteError || isLoadingRoute || (!isEditing && isLoading)) {
+        if (duplicateWaypointsError || atLeastTwoDifferentWaypointsError || (hasRouteError && !isOffline) || isLoadingRoute || (!isEditing && isLoading)) {
             setShouldShowAtLeastTwoDifferentWaypointsError(true);
             return;
         }
@@ -487,6 +487,7 @@ function IOURequestStepDistance({
         transaction?.routes,
         report?.reportID,
         policy,
+        isOffline,
     ]);
 
     const renderItem = useCallback(