react-native-onyx 2.0.97 → 2.0.99

package/dist/Onyx.js

@@ -543,7 +543,7 @@ function clear(keysToPreserve = []) {
 function updateSnapshots(data) {
     const snapshotCollectionKey = OnyxUtils_1.default.getSnapshotKey();
     if (!snapshotCollectionKey)
-        return;
+        return [];
     const promises = [];
     const snapshotCollection = OnyxUtils_1.default.getCachedCollection(snapshotCollectionKey);
     const snapshotCollectionKeyLength = snapshotCollectionKey.length;
@@ -583,7 +583,7 @@ function updateSnapshots(data) {
         }
         promises.push(() => merge(snapshotKey, { data: updatedData }));
     });
-    return Promise.all(promises.map((p) => p()));
+    return promises;
 }
 /**
  * Insert API responses and lifecycle data into Onyx
@@ -699,10 +699,10 @@ function update(data) {
             promises.push(() => merge(key, batchedChanges));
         }
     });
-    return clearPromise
-        .then(() => Promise.all(promises.map((p) => p())))
-        .then(() => updateSnapshots(data))
-        .then(() => undefined);
+    const snapshotPromises = updateSnapshots(data);
+    // We need to run the snapshot updates before the other updates so the snapshot data can be updated before the loading state in the snapshot
+    const finalPromises = snapshotPromises.concat(promises);
+    return clearPromise.then(() => Promise.all(finalPromises.map((p) => p()))).then(() => undefined);
 }
 /**
  * Sets a collection by replacing all existing collection members with new values.

package/dist/useOnyx.js

@@ -193,8 +193,9 @@ function useOnyx(key, options, dependencies = []) {
             const newStatus = newFetchStatus !== null && newFetchStatus !== void 0 ? newFetchStatus : 'loaded';
             resultRef.current = [(_c = previousValueRef.current) !== null && _c !== void 0 ? _c : undefined, { status: newStatus }];
             // If `canBeMissing` is set to `false` and the Onyx value of that key is not defined,
-            // we log an alert so it can be acknowledged by the consumer.
-            if ((options === null || options === void 0 ? void 0 : options.canBeMissing) === false && newStatus === 'loaded' && !isOnyxValueDefined) {
+            // we log an alert so it can be acknowledged by the consumer. Additionally, we won't log alerts
+            // if there's a `Onyx.clear()` task in progress.
+            if ((options === null || options === void 0 ? void 0 : options.canBeMissing) === false && newStatus === 'loaded' && !isOnyxValueDefined && !OnyxCache_1.default.hasPendingTask(OnyxCache_1.TASK.CLEAR)) {
                 Logger.logAlert(`useOnyx returned no data for key with canBeMissing set to false.`, { key, showAlert: true });
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "2.0.97",
+  "version": "2.0.99",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",