Merge remote-tracking branch 'origin/main' into bugfix/reassure-flakiness

Author: fabioh8010

lib/OnyxCache.ts

@@ -47,7 +47,7 @@ class OnyxCache {
     private evictionBlocklist: Record<OnyxKey, string[] | undefined> = {};
 
     /** List of keys that have been directly subscribed to or recently modified from least to most recent */
-    private recentlyAccessedKeys: OnyxKey[] = [];
+    private recentlyAccessedKeys = new Set<OnyxKey>();
 
     constructor() {
         this.storageKeys = new Set();
@@ -312,7 +312,7 @@ class OnyxCache {
      * Remove a key from the recently accessed key list.
      */
     removeLastAccessedKey(key: OnyxKey): void {
-        this.recentlyAccessedKeys = this.recentlyAccessedKeys.filter((recentlyAccessedKey) => recentlyAccessedKey !== key);
+        this.recentlyAccessedKeys.delete(key);
     }
 
     /**
@@ -327,7 +327,7 @@ class OnyxCache {
         }
 
         this.removeLastAccessedKey(key);
-        this.recentlyAccessedKeys.push(key);
+        this.recentlyAccessedKeys.add(key);
     }
 
     /**
@@ -356,7 +356,12 @@ class OnyxCache {
      * Finds a key that can be safely evicted
      */
     getKeyForEviction(): OnyxKey | undefined {
-        return this.recentlyAccessedKeys.find((key) => !this.evictionBlocklist[key]);
+        for (const key of this.recentlyAccessedKeys) {
+            if (!this.evictionBlocklist[key]) {
+                return key;
+            }
+        }
+        return undefined;
     }
 }
 

package-lock.json

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