From ea08a02271926aeeda41e15be7c7bf349922076e Mon Sep 17 00:00:00 2001
From: Brandon Stites <42391420+stitesExpensify@users.noreply.github.com>
Date: Fri, 5 Jan 2024 14:10:51 -0700
Subject: [PATCH] Merge pull request #34006 from
 Expensify/Rory-FixSuccessAndFailureData

[CP Stg] Don't skip successData or failureData even if OnyxData from server is up-to-date

(cherry picked from commit 1752b979b7d0fab987f7b2129c5298bbab2c6ef1)
---
 src/libs/actions/OnyxUpdates.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/OnyxUpdates.ts b/src/libs/actions/OnyxUpdates.ts
index 2291e6d0af4a..a0772db49585 100644
--- a/src/libs/actions/OnyxUpdates.ts
+++ b/src/libs/actions/OnyxUpdates.ts
@@ -7,6 +7,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {OnyxUpdateEvent, OnyxUpdatesFromServer, Request} from '@src/types/onyx';
 import type Response from '@src/types/onyx/Response';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as QueuedOnyxUpdates from './QueuedOnyxUpdates';
 
 // This key needs to be separate from ONYXKEYS.ONYX_UPDATES_FROM_SERVER so that it can be updated without triggering the callback when the server IDs are updated. If that
@@ -74,7 +75,18 @@ function apply({lastUpdateID, type, request, response, updates}: OnyxUpdatesFrom
     Log.info(`[OnyxUpdateManager] Applying update type: ${type} with lastUpdateID: ${lastUpdateID}`, false, {command: request?.command});
 
     if (lastUpdateID && lastUpdateIDAppliedToClient && Number(lastUpdateID) <= lastUpdateIDAppliedToClient) {
-        Log.info('[OnyxUpdateManager] Update received was older or the same than current state, returning without applying the updates', false);
+        Log.info('[OnyxUpdateManager] Update received was older than or the same as current state, returning without applying the updates other than successData and failureData');
+
+        // In this case, we're already received the OnyxUpdate included in the response, so we don't need to apply it again.
+        // However, we do need to apply the successData and failureData from the request
+        if (type === CONST.ONYX_UPDATE_TYPES.HTTPS && request && response && (!isEmptyObject(request.successData) || !isEmptyObject(request.failureData))) {
+            Log.info('[OnyxUpdateManager] Applying success or failure data from request without onyxData from response');
+
+            // We use a spread here instead of delete because we don't want to change the response for other middlewares
+            const {onyxData, ...responseWithoutOnyxData} = response;
+            return applyHTTPSOnyxUpdates(request, responseWithoutOnyxData);
+        }
+
         return Promise.resolve();
     }
     if (lastUpdateID && (lastUpdateIDAppliedToClient === null || Number(lastUpdateID) > lastUpdateIDAppliedToClient)) {