Merge pull request Expensify#90068 from Expensify/jules-fix90026OdometerReceipt

Fix: Odometer receipt disappears on confirm page after edit save

Author: francoisl

src/hooks/useOdometerDraftHydrator.ts

@@ -1,7 +1,7 @@
 import {useEffect} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {IOURequestType} from '@userActions/IOU';
-import {hydrateOdometerDraftIntoTransaction} from '@userActions/OdometerTransactionUtils';
+import {hydrateOdometerDraftIntoTransaction, isOdometerDraftPendingHydration} from '@userActions/OdometerTransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {OdometerDraft, Transaction} from '@src/types/onyx';
@@ -39,6 +39,13 @@ function useOdometerDraftHydrator({
         if (lastHydratedDraft === odometerDraft) {
             return;
         }
+        // Skip when the comment already reflects the draft. saveOdometerDraft writes from the
+        // edit-from-confirmation flow otherwise mint fresh blob URLs via the serialize/deserialize
+        // round-trip and revoke the URLs the confirm page is currently displaying.
+        if (!isOdometerDraftPendingHydration(odometerDraft, transaction?.comment)) {
+            lastHydratedDraft = odometerDraft;
+            return;
+        }
         hydrateOdometerDraftIntoTransaction(transaction?.transactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID, odometerDraft, transaction?.comment);
         lastHydratedDraft = odometerDraft;
         // transaction.comment intentionally excluded — it changes after our own merge and would re-fire.