Merge pull request #28800 from tienifr/fix/28748

[CP Staging] Fix: No notification when closing account

(cherry picked from commit 130e6d6)

src/libs/Middleware/HandleUnusedOptimisticID.ts

@@ -10,6 +10,10 @@ const handleUnusedOptimisticID: Middleware = (requestResponse, request, isFromSe
         const responseOnyxData = response?.onyxData ?? [];
         responseOnyxData.forEach((onyxData) => {
             const key = onyxData.key;
+            if (!key) {
+                return;
+            }
+
             if (!key.startsWith(ONYXKEYS.COLLECTION.REPORT)) {
                 return;
             }

src/libs/Middleware/SaveResponseInOnyx.js

@@ -14,50 +14,54 @@ const requestsToIgnoreLastUpdateID = ['OpenApp', 'ReconnectApp', 'GetMissingOnyx
  * @returns {Promise}
  */
 function SaveResponseInOnyx(requestResponse, request) {
-    return requestResponse.then((response) => {
-        // Make sure we have response data (i.e. response isn't a promise being passed down to us by a failed retry request and response undefined)
-        if (!response) {
-            return;
-        }
-        const onyxUpdates = response.onyxData;
-
-        // Sometimes we call requests that are successfull but they don't have any response or any success/failure data to set. Let's return early since
-        // we don't need to store anything here.
-        if (!onyxUpdates && !request.successData && !request.failureData) {
-            return Promise.resolve(response);
-        }
-
-        // If there is an OnyxUpdate for using memory only keys, enable them
-        _.find(onyxUpdates, ({key, value}) => {
-            if (key !== ONYXKEYS.IS_USING_MEMORY_ONLY_KEYS || !value) {
-                return false;
+    return requestResponse
+        .then((response) => {
+            // Make sure we have response data (i.e. response isn't a promise being passed down to us by a failed retry request and response undefined)
+            if (!response) {
+                return;
             }
+            const onyxUpdates = response.onyxData;
 
-            MemoryOnlyKeys.enable();
-            return true;
-        });
+            // Sometimes we call requests that are successfull but they don't have any response or any success/failure data to set. Let's return early since
+            // we don't need to store anything here.
+            if (!onyxUpdates && !request.successData && !request.failureData) {
+                return Promise.resolve(response);
+            }
+
+            // If there is an OnyxUpdate for using memory only keys, enable them
+            _.find(onyxUpdates, ({key, value}) => {
+                if (key !== ONYXKEYS.IS_USING_MEMORY_ONLY_KEYS || !value) {
+                    return false;
+                }
+
+                MemoryOnlyKeys.enable();
+                return true;
+            });
+
+            const responseToApply = {
+                type: CONST.ONYX_UPDATE_TYPES.HTTPS,
+                lastUpdateID: Number(response.lastUpdateID || 0),
+                previousUpdateID: Number(response.previousUpdateID || 0),
+                request,
+                response,
+            };
+
+            if (_.includes(requestsToIgnoreLastUpdateID, request.command) || !OnyxUpdates.doesClientNeedToBeUpdated(Number(response.previousUpdateID || 0))) {
+                return OnyxUpdates.apply(responseToApply);
+            }
+
+            // Save the update IDs to Onyx so they can be used to fetch incremental updates if the client gets out of sync from the server
+            OnyxUpdates.saveUpdateInformation(responseToApply);
 
-        const responseToApply = {
-            type: CONST.ONYX_UPDATE_TYPES.HTTPS,
-            lastUpdateID: Number(response.lastUpdateID || 0),
-            previousUpdateID: Number(response.previousUpdateID || 0),
-            request,
-            response,
-        };
-
-        if (_.includes(requestsToIgnoreLastUpdateID, request.command) || !OnyxUpdates.doesClientNeedToBeUpdated(Number(response.previousUpdateID || 0))) {
-            return OnyxUpdates.apply(responseToApply);
-        }
-
-        // Save the update IDs to Onyx so they can be used to fetch incremental updates if the client gets out of sync from the server
-        OnyxUpdates.saveUpdateInformation(responseToApply);
-
-        // Ensure the queue is paused while the client resolves the gap in onyx updates so that updates are guaranteed to happen in a specific order.
-        return Promise.resolve({
-            ...response,
-            shouldPauseQueue: true,
+            // Ensure the queue is paused while the client resolves the gap in onyx updates so that updates are guaranteed to happen in a specific order.
+            return Promise.resolve({
+                ...response,
+                shouldPauseQueue: true,
+            });
+        })
+        .catch((err) => {
+            console.error('Got exception while saving response in Onyx', err);
         });
-    });
 }
 
 export default SaveResponseInOnyx;