fixed 404 not found and loading bug on IOU track distance fields

Author: mukhrr

src/libs/TransactionUtils/index.ts

@@ -728,13 +728,17 @@ function getUpdatedTransaction({
         }
         shouldStopSmartscan = true;
 
-        if (!transactionChanges.routes?.route0?.geometry?.coordinates) {
+        // A manual-distance edit re-sends unchanged waypoints; when they truly didn't change, leave
+        // `amount`/`modifiedAmount` to the sibling `distance` branch instead of zeroing them here.
+        const waypointsActuallyChanged = !deepEqual(transactionChanges.waypoints, transaction?.comment?.waypoints);
+
+        if (waypointsActuallyChanged && !transactionChanges.routes?.route0?.geometry?.coordinates) {
             // The waypoints were changed, but there is no route – it is pending from the BE and we should mark the fields as pending
             updatedTransaction.amount = CONST.IOU.DEFAULT_AMOUNT;
             updatedTransaction.modifiedAmount = CONST.IOU.DEFAULT_AMOUNT;
             // eslint-disable-next-line @typescript-eslint/no-deprecated
             updatedTransaction.modifiedMerchant = translateLocal('iou.fieldPending');
-        } else {
+        } else if (transactionChanges.routes?.route0?.geometry?.coordinates) {
             const mileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy});
             const {unit, rate} = mileageRate;
 
@@ -881,6 +885,8 @@ function getUpdatedTransaction({
 
     if (Object.hasOwn(transactionChanges, 'distance') && typeof transactionChanges.distance === 'number') {
         const distance = roundToTwoDecimalPlaces(transactionChanges.distance ?? 0);
+        // Capture before mutating quantity below; needed by the fallback amount computation.
+        const previousDistanceInMeters = getDistanceInMeters(transaction, transaction?.comment?.customUnit?.distanceUnit);
 
         lodashSet(updatedTransaction, 'comment.customUnit.quantity', distance);
         lodashSet(updatedTransaction, 'routes.route0.distance', null);
@@ -906,9 +912,20 @@ function getUpdatedTransaction({
             isManualDistanceRequest(transaction),
         );
 
-        updatedTransaction.modifiedAmount = amount;
-        updatedTransaction.modifiedMerchant = updatedMerchant;
-        updatedTransaction.modifiedCurrency = updatedCurrency;
+        // No locally resolvable rate (e.g. track expense without policy loaded) → scale the previous
+        // amount by the distance ratio so the optimistic value isn't 0. `modifiedAmount` is `""` for
+        // unedited transactions, so coerce via Number() and fall through to `amount`.
+        const previousAmount = Number(transaction?.modifiedAmount) || transaction?.amount || 0;
+        const useFallback = !rate && !!previousDistanceInMeters && !!previousAmount && !!distanceInMeters;
+        if (useFallback) {
+            updatedTransaction.modifiedAmount = Math.round(previousAmount * (distanceInMeters / previousDistanceInMeters));
+            updatedTransaction.modifiedMerchant = updatedMerchant;
+            // Leave currency alone — without a resolvable rate we don't know the target currency.
+        } else {
+            updatedTransaction.modifiedAmount = amount;
+            updatedTransaction.modifiedMerchant = updatedMerchant;
+            updatedTransaction.modifiedCurrency = updatedCurrency;
+        }
     }
 
     if (Object.hasOwn(transactionChanges, 'odometerStart') && typeof transactionChanges.odometerStart === 'number') {

src/libs/actions/TransactionEdit.ts

@@ -39,7 +39,9 @@ function createBackupTransaction(transaction: OnyxEntry<Transaction>, isDraft: b
         key: `${ONYXKEYS.COLLECTION.TRANSACTION_BACKUP}${transaction.transactionID}`,
         callback: (transactionBackup) => {
             Onyx.disconnect(conn);
-            if (transactionBackup) {
+            // Treat a backup missing `transactionID` as corrupted (a partial route-fetch shape can
+            // leak in via Pusher) and overwrite it instead of restoring from it.
+            if (transactionBackup?.transactionID) {
                 // If the transactionBackup exists it means we haven't properly restored original value on unmount
                 // such as on page refresh, so we will just restore the transaction from the transactionBackup here.
                 Onyx.set(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transactionBackup);

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

@@ -203,22 +203,23 @@ function IOURequestStepDistance({
     // from overwriting in-progress manual input.
     const isManuallyEditing = useRef(false);
 
-    // Sync the manual tab input when the route recalculates (e.g. after waypoint edits on the map tab).
-    // Skip the sync if the user is actively editing on the manual tab to avoid overwriting their input.
-    // Skip the very first render so we don't clobber a previously-saved manual quantity with the route
-    // distance on edit re-open.
+    // Push the route distance into the manual tab input only on a real waypoint-driven recalculation
+    // (a non-null → different non-null transition). Skip the initial null → value transition, which
+    // is the post-save re-fetch, so we don't overwrite a saved manual quantity with the route distance.
     const routeDistance = currentTransaction?.routes?.route0?.distance;
-    const isInitialRouteSync = useRef(true);
+    const lastSyncedRouteDistance = useRef<number | null | undefined>(routeDistance);
     useEffect(() => {
-        if (isInitialRouteSync.current) {
-            isInitialRouteSync.current = false;
+        if (routeDistance == null || !distanceUnit || isManuallyEditing.current) {
+            lastSyncedRouteDistance.current = routeDistance;
             return;
         }
-        if (routeDistance == null || !distanceUnit || isManuallyEditing.current) {
+        if (lastSyncedRouteDistance.current == null || lastSyncedRouteDistance.current === routeDistance) {
+            lastSyncedRouteDistance.current = routeDistance;
             return;
         }
         const routeDistanceInUnit = roundToTwoDecimalPlaces(DistanceRequestUtils.convertDistanceUnit(routeDistance, distanceUnit));
         manualNumberFormRef.current?.updateNumber(routeDistanceInUnit.toString());
+        lastSyncedRouteDistance.current = routeDistance;
     }, [routeDistance, distanceUnit]);
 
     // Sets `amount` and `split` share data before moving to the next step to avoid briefly showing `0.00` as the split share for participants
@@ -625,6 +626,9 @@ function IOURequestStepDistance({
             recentWaypoints,
         });
         transactionWasSaved.current = true;
+        // Remove the backup eagerly so the parent report view reads the optimistic transaction
+        // immediately, instead of the stale backup, while the API request is still in flight.
+        removeBackupTransaction(transaction?.transactionID);
         navigateBackAfterSave();
     }, [
         translate,