Merge pull request #29117 from tienifr/fix/regression-28748

Fix #28748 and Remove catching error in `SaveResponseInOnyx`
Expensify · Oct 10, 2023 · e559308 · e559308
2 parents 0ef24c0 + 9a6f29d
commit e559308
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 45 deletions.
diff --git a/src/libs/Middleware/HandleUnusedOptimisticID.ts b/src/libs/Middleware/HandleUnusedOptimisticID.ts
@@ -10,11 +10,7 @@ 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)) {
+            if (!key?.startsWith(ONYXKEYS.COLLECTION.REPORT)) {
                 return;
             }
 

diff --git a/src/libs/Middleware/SaveResponseInOnyx.js b/src/libs/Middleware/SaveResponseInOnyx.js
@@ -14,50 +14,46 @@ const requestsToIgnoreLastUpdateID = ['OpenApp', 'ReconnectApp', 'GetMissingOnyx
  * @returns {Promise}
  */
 function SaveResponseInOnyx(requestResponse, request) {
-    return requestResponse
-        .then((response = {}) => {
-            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);
+    return requestResponse.then((response = {}) => {
+        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;
             }
 
-            // 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);
-            }
+            MemoryOnlyKeys.enable();
+            return true;
+        });
 
-            // 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,
-            });
-        })
-        .catch((err) => {
-            console.error('Got exception while saving response in Onyx', err);
+        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,
         });
+    });
 }
 
 export default SaveResponseInOnyx;