From d4d9da4a56ea25ad502fb9e595114cc4860af19a Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Fri, 8 May 2026 12:06:39 -0700
Subject: [PATCH] fix odometer receipt disappearing on confirm page after edit
 save

---
 src/hooks/useOdometerDraftHydrator.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useOdometerDraftHydrator.ts b/src/hooks/useOdometerDraftHydrator.ts
index ac52397f9932..2784b8c2f76b 100644
--- a/src/hooks/useOdometerDraftHydrator.ts
+++ b/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.