Reassure Phase 2

babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-    presets: ['module:metro-react-native-babel-preset'],
+    presets: ['module:@react-native/babel-preset'],
 };

jest.config.js

@@ -10,8 +10,8 @@ module.exports = {
         __DEV__: true,
         WebSocket: {},
     },
-    timers: 'fake',
     testEnvironment: 'jsdom',
-    setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect', './jestSetup.js'],
-    testTimeout: 10000,
+    setupFilesAfterEnv: ['./jestSetup.js'],
+    testTimeout: 60000,
+    transformIgnorePatterns: ['node_modules/(?!((@)?react-native|@ngneat/falso|uuid)/)'],
 };

lib/useOnyx.ts

@@ -6,7 +6,7 @@ import type {Connection} from './OnyxConnectionManager';
 import connectionManager from './OnyxConnectionManager';
 import OnyxUtils from './OnyxUtils';
 import * as GlobalSettings from './GlobalSettings';
-import type {CollectionKeyBase, KeyValueMapping, OnyxCollection, OnyxKey, OnyxValue} from './types';
+import type {CollectionKeyBase, OnyxKey, OnyxValue} from './types';
 import useLiveRef from './useLiveRef';
 import usePrevious from './usePrevious';
 import decorateWithMetrics from './metrics';
@@ -79,35 +79,6 @@ type ResultMetadata<TValue> = {
 
 type UseOnyxResult<TValue> = [NonNullable<TValue> | undefined, ResultMetadata<TValue>];
 
-/**
- * Gets the cached value from the Onyx cache. If the key is a collection key, it will return all the values in the collection.
- * It is a fork of `tryGetCachedValue` from `OnyxUtils` caused by different selector logic in `useOnyx`. It should be unified in the future, when `withOnyx` is removed.
- */
-function tryGetCachedValue<TKey extends OnyxKey>(key: TKey): OnyxValue<OnyxKey> {
-    if (!OnyxUtils.isCollectionKey(key)) {
-        return OnyxCache.get(key);
-    }
-
-    const allCacheKeys = OnyxCache.getAllKeys();
-
-    // It is possible we haven't loaded all keys yet so we do not know if the
-    // collection actually exists.
-    if (allCacheKeys.size === 0) {
-        return;
-    }
-
-    const values: OnyxCollection<KeyValueMapping[TKey]> = {};
-    allCacheKeys.forEach((cacheKey) => {
-        if (!cacheKey.startsWith(key)) {
-            return;
-        }
-
-        values[cacheKey] = OnyxCache.get(cacheKey);
-    });
-
-    return values;
-}
-
 function useOnyx<TKey extends OnyxKey, TReturnValue = OnyxValue<TKey>>(
     key: TKey,
     options?: BaseUseOnyxOptions & UseOnyxInitialValueOption<TReturnValue> & Required<UseOnyxSelectorOption<TKey, TReturnValue>>,
@@ -233,7 +204,7 @@ function useOnyx<TKey extends OnyxKey, TReturnValue = OnyxValue<TKey>>(
         // update `newValueRef` when `Onyx.connect()` callback is fired.
         if (isFirstConnectionRef.current || shouldGetCachedValueRef.current) {
             // Gets the value from cache and maps it with selector. It changes `null` to `undefined` for `useOnyx` compatibility.
-            const value = tryGetCachedValue(key) as OnyxValue<TKey>;
+            const value = OnyxUtils.tryGetCachedValue(key) as OnyxValue<TKey>;
             const selectedValue = selectorRef.current ? selectorRef.current(value) : value;
             newValueRef.current = (selectedValue ?? undefined) as TReturnValue | undefined;