react-native-onyx 1.0.48 → 1.0.50

package/dist/web.development.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("underscore"), require("expensify-common/lib/str"), require("fast-equals"), require("lodash/get"), require("localforage"), require("localforage-removeitems"), require("lodash/transform"), require("react"));
+		module.exports = factory(require("fast-equals"), require("lodash/get"), require("underscore"), require("localforage"), require("localforage-removeitems"), require("lodash/transform"), require("react"));
 	else if(typeof define === 'function' && define.amd)
-		define(["underscore", "expensify-common/lib/str", "fast-equals", "lodash/get", "localforage", "localforage-removeitems", "lodash/transform", "react"], factory);
+		define(["fast-equals", "lodash/get", "underscore", "localforage", "localforage-removeitems", "lodash/transform", "react"], factory);
 	else if(typeof exports === 'object')
-		exports["react-native-onyx/web"] = factory(require("underscore"), require("expensify-common/lib/str"), require("fast-equals"), require("lodash/get"), require("localforage"), require("localforage-removeitems"), require("lodash/transform"), require("react"));
+		exports["react-native-onyx/web"] = factory(require("fast-equals"), require("lodash/get"), require("underscore"), require("localforage"), require("localforage-removeitems"), require("lodash/transform"), require("react"));
 	else
-		root["react-native-onyx/web"] = factory(root["underscore"], root["expensify-common/lib/str"], root["fast-equals"], root["lodash/get"], root["localforage"], root["localforage-removeitems"], root["lodash/transform"], root["react"]);
-})(self, (__WEBPACK_EXTERNAL_MODULE_underscore__, __WEBPACK_EXTERNAL_MODULE_expensify_common_lib_str__, __WEBPACK_EXTERNAL_MODULE_fast_equals__, __WEBPACK_EXTERNAL_MODULE_lodash_get__, __WEBPACK_EXTERNAL_MODULE_localforage__, __WEBPACK_EXTERNAL_MODULE_localforage_removeitems__, __WEBPACK_EXTERNAL_MODULE_lodash_transform__, __WEBPACK_EXTERNAL_MODULE_react__) => {
+		root["react-native-onyx/web"] = factory(root["fast-equals"], root["lodash/get"], root["underscore"], root["localforage"], root["localforage-removeitems"], root["lodash/transform"], root["react"]);
+})(self, (__WEBPACK_EXTERNAL_MODULE_fast_equals__, __WEBPACK_EXTERNAL_MODULE_lodash_get__, __WEBPACK_EXTERNAL_MODULE_underscore__, __WEBPACK_EXTERNAL_MODULE_localforage__, __WEBPACK_EXTERNAL_MODULE_localforage_removeitems__, __WEBPACK_EXTERNAL_MODULE_lodash_transform__, __WEBPACK_EXTERNAL_MODULE_react__) => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -69,20 +69,19 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! underscore */ "underscore");
-/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(underscore__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! expensify-common/lib/str */ "expensify-common/lib/str");
-/* harmony import */ var expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var fast_equals__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! fast-equals */ "fast-equals");
-/* harmony import */ var fast_equals__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(fast_equals__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! lodash/get */ "lodash/get");
-/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(lodash_get__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _storage__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./storage */ "./lib/storage/index.web.js");
-/* harmony import */ var _Logger__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Logger */ "./lib/Logger.js");
-/* harmony import */ var _OnyxCache__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./OnyxCache */ "./lib/OnyxCache.js");
-/* harmony import */ var _createDeferredTask__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./createDeferredTask */ "./lib/createDeferredTask.js");
+/* harmony import */ var fast_equals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! fast-equals */ "fast-equals");
+/* harmony import */ var fast_equals__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fast_equals__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash/get */ "lodash/get");
+/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash_get__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! underscore */ "underscore");
+/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(underscore__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _Logger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Logger */ "./lib/Logger.js");
+/* harmony import */ var _OnyxCache__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./OnyxCache */ "./lib/OnyxCache.js");
+/* harmony import */ var _Str__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Str */ "./lib/Str.js");
+/* harmony import */ var _createDeferredTask__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./createDeferredTask */ "./lib/createDeferredTask.js");
 /* harmony import */ var _fastMerge__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./fastMerge */ "./lib/fastMerge.js");
 /* harmony import */ var _metrics_PerformanceUtils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./metrics/PerformanceUtils */ "./lib/metrics/PerformanceUtils.js");
+/* harmony import */ var _storage__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./storage */ "./lib/storage/index.web.js");
 /* eslint-disable no-continue */
 
 
@@ -127,7 +126,7 @@ const evictionBlocklist = {};
 let defaultKeyStates = {};
 
 // Connections can be made before `Onyx.init`. They would wait for this task before resolving
-const deferredInitTask = (0,_createDeferredTask__WEBPACK_IMPORTED_MODULE_4__["default"])();
+const deferredInitTask = (0,_createDeferredTask__WEBPACK_IMPORTED_MODULE_3__["default"])();
 
 /**
  * Uses a selector string or function to return a simplified version of sourceData
@@ -138,9 +137,9 @@ const deferredInitTask = (0,_createDeferredTask__WEBPACK_IMPORTED_MODULE_4__["de
  *      If it's a function, it is passed the sourceData and it should return the simplified data
  * @returns {Mixed}
  */
-const getSubsetOfData = (sourceData, selector, withOnyxInstanceState) => underscore__WEBPACK_IMPORTED_MODULE_0___default().isFunction(selector) ?
+const getSubsetOfData = (sourceData, selector, withOnyxInstanceState) => underscore__WEBPACK_IMPORTED_MODULE_2___default().isFunction(selector) ?
 selector(sourceData, withOnyxInstanceState) :
-lodash_get__WEBPACK_IMPORTED_MODULE_3___default()(sourceData, selector);
+lodash_get__WEBPACK_IMPORTED_MODULE_1___default()(sourceData, selector);
 
 /**
  * Takes a collection of items (eg. {testKey_1:{a:'a'}, testKey_2:{b:'b'}})
@@ -151,7 +150,7 @@ lodash_get__WEBPACK_IMPORTED_MODULE_3___default()(sourceData, selector);
  * @param {Object} [withOnyxInstanceState]
  * @returns {Object}
  */
-const reduceCollectionWithSelector = (collection, selector, withOnyxInstanceState) => underscore__WEBPACK_IMPORTED_MODULE_0___default().reduce(collection, (finalCollection, item, key) => {
+const reduceCollectionWithSelector = (collection, selector, withOnyxInstanceState) => underscore__WEBPACK_IMPORTED_MODULE_2___default().reduce(collection, (finalCollection, item, key) => {
   // eslint-disable-next-line no-param-reassign
   finalCollection[key] = getSubsetOfData(item, selector, withOnyxInstanceState);
 
@@ -167,26 +166,26 @@ const reduceCollectionWithSelector = (collection, selector, withOnyxInstanceStat
  */
 function get(key) {
   // When we already have the value in cache - resolve right away
-  if (_OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].hasCacheForKey(key)) {
-    return Promise.resolve(_OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].getValue(key));
+  if (_OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].hasCacheForKey(key)) {
+    return Promise.resolve(_OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].getValue(key));
   }
 
   const taskName = `get:${key}`;
 
   // When a value retrieving task for this key is still running hook to it
-  if (_OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].hasPendingTask(taskName)) {
-    return _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].getTaskPromise(taskName);
+  if (_OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].hasPendingTask(taskName)) {
+    return _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].getTaskPromise(taskName);
   }
 
   // Otherwise retrieve the value from storage and capture a promise to aid concurrent usages
-  const promise = _storage__WEBPACK_IMPORTED_MODULE_6__["default"].getItem(key).
+  const promise = _storage__WEBPACK_IMPORTED_MODULE_5__["default"].getItem(key).
   then((val) => {
-    _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].set(key, val);
+    _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].set(key, val);
     return val;
   }).
-  catch((err) => _Logger__WEBPACK_IMPORTED_MODULE_7__.logInfo(`Unable to get item from persistent storage. Key: ${key} Error: ${err}`));
+  catch((err) => _Logger__WEBPACK_IMPORTED_MODULE_6__.logInfo(`Unable to get item from persistent storage. Key: ${key} Error: ${err}`));
 
-  return _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].captureTask(taskName, promise);
+  return _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].captureTask(taskName, promise);
 }
 
 /**
@@ -196,7 +195,7 @@ function get(key) {
  */
 function getAllKeys() {
   // When we've already read stored keys, resolve right away
-  const storedKeys = _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].getAllKeys();
+  const storedKeys = _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].getAllKeys();
   if (storedKeys.length > 0) {
     return Promise.resolve(storedKeys);
   }
@@ -204,18 +203,18 @@ function getAllKeys() {
   const taskName = 'getAllKeys';
 
   // When a value retrieving task for all keys is still running hook to it
-  if (_OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].hasPendingTask(taskName)) {
-    return _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].getTaskPromise(taskName);
+  if (_OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].hasPendingTask(taskName)) {
+    return _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].getTaskPromise(taskName);
   }
 
   // Otherwise retrieve the keys from storage and capture a promise to aid concurrent usages
-  const promise = _storage__WEBPACK_IMPORTED_MODULE_6__["default"].getAllKeys().
+  const promise = _storage__WEBPACK_IMPORTED_MODULE_5__["default"].getAllKeys().
   then((keys) => {
-    underscore__WEBPACK_IMPORTED_MODULE_0___default().each(keys, (key) => _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].addKey(key));
+    underscore__WEBPACK_IMPORTED_MODULE_2___default().each(keys, (key) => _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].addKey(key));
     return keys;
   });
 
-  return _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].captureTask(taskName, promise);
+  return _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].captureTask(taskName, promise);
 }
 
 /**
@@ -227,7 +226,7 @@ function getAllKeys() {
  * @returns {Boolean}
  */
 function isCollectionKey(key) {
-  return underscore__WEBPACK_IMPORTED_MODULE_0___default().contains(underscore__WEBPACK_IMPORTED_MODULE_0___default().values(onyxKeys.COLLECTION), key);
+  return underscore__WEBPACK_IMPORTED_MODULE_2___default().contains(underscore__WEBPACK_IMPORTED_MODULE_2___default().values(onyxKeys.COLLECTION), key);
 }
 
 /**
@@ -236,7 +235,7 @@ function isCollectionKey(key) {
  * @returns {Boolean}
  */
 function isCollectionMemberKey(collectionKey, key) {
-  return expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_1___default().startsWith(key, collectionKey) && key.length > collectionKey.length;
+  return _Str__WEBPACK_IMPORTED_MODULE_7__.startsWith(key, collectionKey) && key.length > collectionKey.length;
 }
 
 /**
@@ -250,7 +249,7 @@ function isCollectionMemberKey(collectionKey, key) {
  */
 function isKeyMatch(configKey, key) {
   return isCollectionKey(configKey) ?
-  expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_1___default().startsWith(key, configKey) :
+  _Str__WEBPACK_IMPORTED_MODULE_7__.startsWith(key, configKey) :
   configKey === key;
 }
 
@@ -263,7 +262,7 @@ function isKeyMatch(configKey, key) {
  * @returns {Boolean}
  */
 function isSafeEvictionKey(testKey) {
-  return underscore__WEBPACK_IMPORTED_MODULE_0___default().some(evictionAllowList, (key) => isKeyMatch(key, testKey));
+  return underscore__WEBPACK_IMPORTED_MODULE_2___default().some(evictionAllowList, (key) => isKeyMatch(key, testKey));
 }
 
 /**
@@ -273,7 +272,7 @@ function isSafeEvictionKey(testKey) {
  * @param {String} key
  */
 function removeLastAccessedKey(key) {
-  recentlyAccessedKeys = underscore__WEBPACK_IMPORTED_MODULE_0___default().without(recentlyAccessedKeys, key);
+  recentlyAccessedKeys = underscore__WEBPACK_IMPORTED_MODULE_2___default().without(recentlyAccessedKeys, key);
 }
 
 /**
@@ -303,7 +302,7 @@ function addLastAccessedKey(key) {
  * @param {Number} connectionID
  */
 function removeFromEvictionBlockList(key, connectionID) {
-  evictionBlocklist[key] = underscore__WEBPACK_IMPORTED_MODULE_0___default().without(evictionBlocklist[key] || [], connectionID);
+  evictionBlocklist[key] = underscore__WEBPACK_IMPORTED_MODULE_2___default().without(evictionBlocklist[key] || [], connectionID);
 
   // Remove the key if there are no more subscribers
   if (evictionBlocklist[key].length === 0) {
@@ -340,8 +339,8 @@ function addToEvictionBlockList(key, connectionID) {
 function addAllSafeEvictionKeysToRecentlyAccessedList() {
   return getAllKeys().
   then((keys) => {
-    underscore__WEBPACK_IMPORTED_MODULE_0___default().each(evictionAllowList, (safeEvictionKey) => {
-      underscore__WEBPACK_IMPORTED_MODULE_0___default().each(keys, (key) => {
+    underscore__WEBPACK_IMPORTED_MODULE_2___default().each(evictionAllowList, (safeEvictionKey) => {
+      underscore__WEBPACK_IMPORTED_MODULE_2___default().each(keys, (key) => {
         if (!isKeyMatch(safeEvictionKey, key)) {
           return;
         }
@@ -357,12 +356,12 @@ function addAllSafeEvictionKeysToRecentlyAccessedList() {
  * @returns {Object}
  */
 function getCachedCollection(collectionKey) {
-  const collectionMemberKeys = underscore__WEBPACK_IMPORTED_MODULE_0___default().filter(_OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].getAllKeys(),
+  const collectionMemberKeys = underscore__WEBPACK_IMPORTED_MODULE_2___default().filter(_OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].getAllKeys(),
   (storedKey) => isCollectionMemberKey(collectionKey, storedKey));
 
 
-  return underscore__WEBPACK_IMPORTED_MODULE_0___default().reduce(collectionMemberKeys, (prev, curr) => {
-    const cachedValue = _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].getValue(curr);
+  return underscore__WEBPACK_IMPORTED_MODULE_2___default().reduce(collectionMemberKeys, (prev, curr) => {
+    const cachedValue = _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].getValue(curr);
     if (!cachedValue) {
       return prev;
     }
@@ -384,7 +383,7 @@ function keysChanged(collectionKey, partialCollection) {
   // We are iterating over all subscribers similar to keyChanged(). However, we are looking for subscribers who are subscribing to either a collection key or
   // individual collection key member for the collection that is being updated. It is important to note that the collection parameter cane be a PARTIAL collection
   // and does not represent all of the combined keys and values for a collection key. It is just the "new" data that was merged in via mergeCollection().
-  const stateMappingKeys = underscore__WEBPACK_IMPORTED_MODULE_0___default().keys(callbackToStateMapping);
+  const stateMappingKeys = underscore__WEBPACK_IMPORTED_MODULE_2___default().keys(callbackToStateMapping);
   for (let i = 0; i < stateMappingKeys.length; i++) {
     const subscriber = callbackToStateMapping[stateMappingKeys[i]];
     if (!subscriber) {
@@ -392,7 +391,7 @@ function keysChanged(collectionKey, partialCollection) {
     }
 
     // Skip iteration if we do not have a collection key or a collection member key on this subscriber
-    if (!expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_1___default().startsWith(subscriber.key, collectionKey)) {
+    if (!_Str__WEBPACK_IMPORTED_MODULE_7__.startsWith(subscriber.key, collectionKey)) {
       continue;
     }
 
@@ -411,7 +410,7 @@ function keysChanged(collectionKey, partialCollection) {
     const cachedCollection = getCachedCollection(collectionKey);
 
     // Regular Onyx.connect() subscriber found.
-    if (underscore__WEBPACK_IMPORTED_MODULE_0___default().isFunction(subscriber.callback)) {
+    if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isFunction(subscriber.callback)) {
       // If they are subscribed to the collection key and using waitForCollectionCallback then we'll
       // send the whole cached collection.
       if (isSubscribedToCollectionKey) {
@@ -422,7 +421,7 @@ function keysChanged(collectionKey, partialCollection) {
 
         // If they are not using waitForCollectionCallback then we notify the subscriber with
         // the new merged data but only for any keys in the partial collection.
-        const dataKeys = underscore__WEBPACK_IMPORTED_MODULE_0___default().keys(partialCollection);
+        const dataKeys = underscore__WEBPACK_IMPORTED_MODULE_2___default().keys(partialCollection);
         for (let j = 0; j < dataKeys.length; j++) {
           const dataKey = dataKeys[j];
           subscriber.callback(cachedCollection[dataKey], dataKey);
@@ -452,7 +451,7 @@ function keysChanged(collectionKey, partialCollection) {
             const previousData = prevState[subscriber.statePropertyName];
             const newData = reduceCollectionWithSelector(cachedCollection, subscriber.selector, subscriber.withOnyxInstance.state);
 
-            if (!(0,fast_equals__WEBPACK_IMPORTED_MODULE_2__.deepEqual)(previousData, newData)) {
+            if (!(0,fast_equals__WEBPACK_IMPORTED_MODULE_0__.deepEqual)(previousData, newData)) {
               return {
                 [subscriber.statePropertyName]: newData
               };
@@ -463,8 +462,8 @@ function keysChanged(collectionKey, partialCollection) {
         }
 
         subscriber.withOnyxInstance.setState((prevState) => {
-          const finalCollection = underscore__WEBPACK_IMPORTED_MODULE_0___default().clone(prevState[subscriber.statePropertyName] || {});
-          const dataKeys = underscore__WEBPACK_IMPORTED_MODULE_0___default().keys(partialCollection);
+          const finalCollection = underscore__WEBPACK_IMPORTED_MODULE_2___default().clone(prevState[subscriber.statePropertyName] || {});
+          const dataKeys = underscore__WEBPACK_IMPORTED_MODULE_2___default().keys(partialCollection);
           for (let j = 0; j < dataKeys.length; j++) {
             const dataKey = dataKeys[j];
             finalCollection[dataKey] = cachedCollection[dataKey];
@@ -483,7 +482,7 @@ function keysChanged(collectionKey, partialCollection) {
         // However, we only want to update this subscriber if the partial data contains a change.
         // Otherwise, we would update them with a value they already have and trigger an unnecessary re-render.
         const dataFromCollection = partialCollection[subscriber.key];
-        if (underscore__WEBPACK_IMPORTED_MODULE_0___default().isUndefined(dataFromCollection)) {
+        if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isUndefined(dataFromCollection)) {
           continue;
         }
 
@@ -494,7 +493,7 @@ function keysChanged(collectionKey, partialCollection) {
           subscriber.withOnyxInstance.setState((prevState) => {
             const prevData = prevState[subscriber.statePropertyName];
             const newData = getSubsetOfData(cachedCollection[subscriber.key], subscriber.selector, subscriber.withOnyxInstance.state);
-            if (!(0,fast_equals__WEBPACK_IMPORTED_MODULE_2__.deepEqual)(prevData, newData)) {
+            if (!(0,fast_equals__WEBPACK_IMPORTED_MODULE_0__.deepEqual)(prevData, newData)) {
               _metrics_PerformanceUtils__WEBPACK_IMPORTED_MODULE_8__.logSetStateCall(subscriber, prevData, newData, 'keysChanged', collectionKey);
               return {
                 [subscriber.statePropertyName]: newData
@@ -536,7 +535,7 @@ function keysChanged(collectionKey, partialCollection) {
  */
 function keyChanged(key, data, canUpdateSubscriber) {
   // Add or remove this key from the recentlyAccessedKeys lists
-  if (!underscore__WEBPACK_IMPORTED_MODULE_0___default().isNull(data)) {
+  if (!underscore__WEBPACK_IMPORTED_MODULE_2___default().isNull(data)) {
     addLastAccessedKey(key);
   } else {
     removeLastAccessedKey(key);
@@ -545,15 +544,15 @@ function keyChanged(key, data, canUpdateSubscriber) {
   // We are iterating over all subscribers to see if they are interested in the key that has just changed. If the subscriber's  key is a collection key then we will
   // notify them if the key that changed is a collection member. Or if it is a regular key notify them when there is an exact match. Depending on whether the subscriber
   // was connected via withOnyx we will call setState() directly on the withOnyx instance. If it is a regular connection we will pass the data to the provided callback.
-  const stateMappingKeys = underscore__WEBPACK_IMPORTED_MODULE_0___default().keys(callbackToStateMapping);
+  const stateMappingKeys = underscore__WEBPACK_IMPORTED_MODULE_2___default().keys(callbackToStateMapping);
   for (let i = 0; i < stateMappingKeys.length; i++) {
     const subscriber = callbackToStateMapping[stateMappingKeys[i]];
-    if (!subscriber || !isKeyMatch(subscriber.key, key) || underscore__WEBPACK_IMPORTED_MODULE_0___default().isFunction(canUpdateSubscriber) && !canUpdateSubscriber(subscriber)) {
+    if (!subscriber || !isKeyMatch(subscriber.key, key) || underscore__WEBPACK_IMPORTED_MODULE_2___default().isFunction(canUpdateSubscriber) && !canUpdateSubscriber(subscriber)) {
       continue;
     }
 
     // Subscriber is a regular call to connect() and provided a callback
-    if (underscore__WEBPACK_IMPORTED_MODULE_0___default().isFunction(subscriber.callback)) {
+    if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isFunction(subscriber.callback)) {
       if (isCollectionKey(subscriber.key) && subscriber.waitForCollectionCallback) {
         const cachedCollection = getCachedCollection(subscriber.key);
         cachedCollection[key] = data;
@@ -581,7 +580,7 @@ function keyChanged(key, data, canUpdateSubscriber) {
               ...prevData,
               ...newData
             };
-            if (!(0,fast_equals__WEBPACK_IMPORTED_MODULE_2__.deepEqual)(prevData, prevDataWithNewData)) {
+            if (!(0,fast_equals__WEBPACK_IMPORTED_MODULE_0__.deepEqual)(prevData, prevDataWithNewData)) {
               _metrics_PerformanceUtils__WEBPACK_IMPORTED_MODULE_8__.logSetStateCall(subscriber, prevData, newData, 'keyChanged', key);
               return {
                 [subscriber.statePropertyName]: prevDataWithNewData
@@ -612,7 +611,7 @@ function keyChanged(key, data, canUpdateSubscriber) {
         subscriber.withOnyxInstance.setState((prevState) => {
           const previousValue = getSubsetOfData(prevState[subscriber.statePropertyName], subscriber.selector, subscriber.withOnyxInstance.state);
           const newValue = getSubsetOfData(data, subscriber.selector, subscriber.withOnyxInstance.state);
-          if (!(0,fast_equals__WEBPACK_IMPORTED_MODULE_2__.deepEqual)(previousValue, newValue)) {
+          if (!(0,fast_equals__WEBPACK_IMPORTED_MODULE_0__.deepEqual)(previousValue, newValue)) {
             return {
               [subscriber.statePropertyName]: newValue
             };
@@ -680,7 +679,7 @@ function sendDataToConnection(mapping, val, matchedKey) {
     return;
   }
 
-  if (underscore__WEBPACK_IMPORTED_MODULE_0___default().isFunction(mapping.callback)) {
+  if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isFunction(mapping.callback)) {
     mapping.callback(val, matchedKey);
   }
 }
@@ -698,11 +697,11 @@ function addKeyToRecentlyAccessedIfNeeded(mapping) {
   }
 
   // Try to free some cache whenever we connect to a safe eviction key
-  _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].removeLeastRecentlyUsedKeys();
+  _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].removeLeastRecentlyUsedKeys();
 
   if (mapping.withOnyxInstance && !isCollectionKey(mapping.key)) {
     // All React components subscribing to a key flagged as a safe eviction key must implement the canEvict property.
-    if (underscore__WEBPACK_IMPORTED_MODULE_0___default().isUndefined(mapping.canEvict)) {
+    if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isUndefined(mapping.canEvict)) {
       throw new Error(
       `Cannot subscribe to safe eviction key '${mapping.key}' without providing a canEvict value.`);
 
@@ -720,8 +719,8 @@ function addKeyToRecentlyAccessedIfNeeded(mapping) {
  * @param {Object} mapping
  */
 function getCollectionDataAndSendAsObject(matchingKeys, mapping) {
-  Promise.all(underscore__WEBPACK_IMPORTED_MODULE_0___default().map(matchingKeys, (key) => get(key))).
-  then((values) => underscore__WEBPACK_IMPORTED_MODULE_0___default().reduce(values, (finalObject, value, i) => {
+  Promise.all(underscore__WEBPACK_IMPORTED_MODULE_2___default().map(matchingKeys, (key) => get(key))).
+  then((values) => underscore__WEBPACK_IMPORTED_MODULE_2___default().reduce(values, (finalObject, value, i) => {
     // eslint-disable-next-line no-param-reassign
     finalObject[matchingKeys[i]] = value;
     return finalObject;
@@ -772,7 +771,7 @@ function connect(mapping) {
     // We search all the keys in storage to see if any are a "match" for the subscriber we are connecting so that we
     // can send data back to the subscriber. Note that multiple keys can match as a subscriber could either be
     // subscribed to a "collection key" or a single key.
-    const matchingKeys = underscore__WEBPACK_IMPORTED_MODULE_0___default().filter(keys, (key) => isKeyMatch(mapping.key, key));
+    const matchingKeys = underscore__WEBPACK_IMPORTED_MODULE_2___default().filter(keys, (key) => isKeyMatch(mapping.key, key));
 
     // If the key being connected to does not exist we initialize the value with null. For subscribers that connected
     // directly via connect() they will simply get a null value sent to them without any information about which key matched
@@ -786,7 +785,7 @@ function connect(mapping) {
     // When using a callback subscriber we will either trigger the provided callback for each key we find or combine all values
     // into an object and just make a single call. The latter behavior is enabled by providing a waitForCollectionCallback key
     // combined with a subscription to a collection key.
-    if (underscore__WEBPACK_IMPORTED_MODULE_0___default().isFunction(mapping.callback)) {
+    if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isFunction(mapping.callback)) {
       if (isCollectionKey(mapping.key)) {
         if (mapping.waitForCollectionCallback) {
           getCollectionDataAndSendAsObject(matchingKeys, mapping);
@@ -887,9 +886,9 @@ function notifyCollectionSubscribersOnNextTick(key, value) {
  * @return {Promise}
  */
 function remove(key) {
-  _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].drop(key);
+  _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].drop(key);
   notifySubscribersOnNextTick(key, null);
-  return _storage__WEBPACK_IMPORTED_MODULE_6__["default"].removeItem(key);
+  return _storage__WEBPACK_IMPORTED_MODULE_5__["default"].removeItem(key);
 }
 
 /**
@@ -904,23 +903,23 @@ function remove(key) {
  * @return {Promise}
  */
 function evictStorageAndRetry(error, onyxMethod) {for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {args[_key - 2] = arguments[_key];}
-  _Logger__WEBPACK_IMPORTED_MODULE_7__.logInfo(`Handled error: ${error}`);
+  _Logger__WEBPACK_IMPORTED_MODULE_6__.logInfo(`Handled error: ${error}`);
 
-  if (error && expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_1___default().startsWith(error.message, 'Failed to execute \'put\' on \'IDBObjectStore\'')) {
-    _Logger__WEBPACK_IMPORTED_MODULE_7__.logAlert('Attempted to set invalid data set in Onyx. Please ensure all data is serializable.');
+  if (error && _Str__WEBPACK_IMPORTED_MODULE_7__.startsWith(error.message, 'Failed to execute \'put\' on \'IDBObjectStore\'')) {
+    _Logger__WEBPACK_IMPORTED_MODULE_6__.logAlert('Attempted to set invalid data set in Onyx. Please ensure all data is serializable.');
     throw error;
   }
 
   // Find the first key that we can remove that has no subscribers in our blocklist
-  const keyForRemoval = underscore__WEBPACK_IMPORTED_MODULE_0___default().find(recentlyAccessedKeys, (key) => !evictionBlocklist[key]);
+  const keyForRemoval = underscore__WEBPACK_IMPORTED_MODULE_2___default().find(recentlyAccessedKeys, (key) => !evictionBlocklist[key]);
 
   if (!keyForRemoval) {
-    _Logger__WEBPACK_IMPORTED_MODULE_7__.logAlert('Out of storage. But found no acceptable keys to remove.');
+    _Logger__WEBPACK_IMPORTED_MODULE_6__.logAlert('Out of storage. But found no acceptable keys to remove.');
     throw error;
   }
 
   // Remove the least recently viewed key that is not currently being accessed and retry.
-  _Logger__WEBPACK_IMPORTED_MODULE_7__.logInfo(`Out of storage. Evicting least recently accessed key (${keyForRemoval}) and retrying.`);
+  _Logger__WEBPACK_IMPORTED_MODULE_6__.logInfo(`Out of storage. Evicting least recently accessed key (${keyForRemoval}) and retrying.`);
   return remove(keyForRemoval).
   then(() => onyxMethod(...args));
 }
@@ -934,29 +933,29 @@ function evictStorageAndRetry(error, onyxMethod) {for (var _len = arguments.leng
  * @returns {Promise}
  */
 function set(key, value) {
-  if (underscore__WEBPACK_IMPORTED_MODULE_0___default().isNull(value)) {
+  if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isNull(value)) {
     return remove(key);
   }
 
   // eslint-disable-next-line no-use-before-define
   if (hasPendingMergeForKey(key)) {
-    _Logger__WEBPACK_IMPORTED_MODULE_7__.logAlert(`Onyx.set() called after Onyx.merge() for key: ${key}. It is recommended to use set() or merge() not both.`);
+    _Logger__WEBPACK_IMPORTED_MODULE_6__.logAlert(`Onyx.set() called after Onyx.merge() for key: ${key}. It is recommended to use set() or merge() not both.`);
   }
 
   // If the value in the cache is the same as what we have then do not update subscribers unless they
   // have initWithStoredValues: false then they MUST get all updates even if nothing has changed.
-  if (!_OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].hasValueChanged(key, value)) {
-    _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].addToAccessedKeys(key);
+  if (!_OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].hasValueChanged(key, value)) {
+    _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].addToAccessedKeys(key);
     notifySubscribersOnNextTick(key, value, (subscriber) => subscriber.initWithStoredValues === false);
     return Promise.resolve();
   }
 
   // Adds the key to cache when it's not available
-  _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].set(key, value);
+  _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].set(key, value);
   notifySubscribersOnNextTick(key, value);
 
   // Write the thing to persistent storage, which will trigger a storage event for any other tabs open on this domain
-  return _storage__WEBPACK_IMPORTED_MODULE_6__["default"].setItem(key, value).
+  return _storage__WEBPACK_IMPORTED_MODULE_5__["default"].setItem(key, value).
   catch((error) => evictStorageAndRetry(error, set, key, value));
 }
 
@@ -969,7 +968,7 @@ function set(key, value) {
  * @return {Array} an array of key - value pairs <[key, value]>
  */
 function prepareKeyValuePairsForStorage(data) {
-  return underscore__WEBPACK_IMPORTED_MODULE_0___default().map(data, (value, key) => [key, value]);
+  return underscore__WEBPACK_IMPORTED_MODULE_2___default().map(data, (value, key) => [key, value]);
 }
 
 /**
@@ -983,13 +982,13 @@ function prepareKeyValuePairsForStorage(data) {
 function multiSet(data) {
   const keyValuePairs = prepareKeyValuePairsForStorage(data);
 
-  underscore__WEBPACK_IMPORTED_MODULE_0___default().each(data, (val, key) => {
+  underscore__WEBPACK_IMPORTED_MODULE_2___default().each(data, (val, key) => {
     // Update cache and optimistically inform subscribers on the next tick
-    _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].set(key, val);
+    _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].set(key, val);
     notifySubscribersOnNextTick(key, val);
   });
 
-  return _storage__WEBPACK_IMPORTED_MODULE_6__["default"].multiSet(keyValuePairs).
+  return _storage__WEBPACK_IMPORTED_MODULE_5__["default"].multiSet(keyValuePairs).
   catch((error) => evictStorageAndRetry(error, multiSet, data));
 }
 
@@ -1019,18 +1018,18 @@ function hasPendingMergeForKey(key) {
  */
 function applyMerge(key, data) {
   const mergeValues = mergeQueue[key];
-  if (underscore__WEBPACK_IMPORTED_MODULE_0___default().isArray(data) || underscore__WEBPACK_IMPORTED_MODULE_0___default().every(mergeValues, (underscore__WEBPACK_IMPORTED_MODULE_0___default().isArray))) {
+  if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isArray(data) || underscore__WEBPACK_IMPORTED_MODULE_2___default().every(mergeValues, (underscore__WEBPACK_IMPORTED_MODULE_2___default().isArray))) {
     // Array values will always just concatenate
     // more items onto the end of the array
-    return underscore__WEBPACK_IMPORTED_MODULE_0___default().reduce(mergeValues, (modifiedData, mergeValue) => [
+    return underscore__WEBPACK_IMPORTED_MODULE_2___default().reduce(mergeValues, (modifiedData, mergeValue) => [
     ...modifiedData,
     ...mergeValue],
     data || []);
   }
 
-  if (underscore__WEBPACK_IMPORTED_MODULE_0___default().isObject(data) || underscore__WEBPACK_IMPORTED_MODULE_0___default().every(mergeValues, (underscore__WEBPACK_IMPORTED_MODULE_0___default().isObject))) {
+  if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isObject(data) || underscore__WEBPACK_IMPORTED_MODULE_2___default().every(mergeValues, (underscore__WEBPACK_IMPORTED_MODULE_2___default().isObject))) {
     // Object values are merged one after the other
-    return underscore__WEBPACK_IMPORTED_MODULE_0___default().reduce(mergeValues, (modifiedData, mergeValue) => {
+    return underscore__WEBPACK_IMPORTED_MODULE_2___default().reduce(mergeValues, (modifiedData, mergeValue) => {
       // lodash adds a small overhead so we don't use it here
       // eslint-disable-next-line prefer-object-spread, rulesdir/prefer-underscore-method
       const newData = Object.assign({}, (0,_fastMerge__WEBPACK_IMPORTED_MODULE_9__["default"])(modifiedData, mergeValue));
@@ -1038,13 +1037,13 @@ function applyMerge(key, data) {
       // We will also delete any object keys that are undefined or null.
       // Deleting keys is not supported by AsyncStorage so we do it this way.
       // Remove all first level keys that are explicitly set to null.
-      return underscore__WEBPACK_IMPORTED_MODULE_0___default().omit(newData, (value, finalObjectKey) => underscore__WEBPACK_IMPORTED_MODULE_0___default().isNull(mergeValue[finalObjectKey]));
+      return underscore__WEBPACK_IMPORTED_MODULE_2___default().omit(newData, (value, finalObjectKey) => underscore__WEBPACK_IMPORTED_MODULE_2___default().isNull(mergeValue[finalObjectKey]));
     }, data || {});
   }
 
   // If we have anything else we can't merge it so we'll
   // simply return the last value that was queued
-  return underscore__WEBPACK_IMPORTED_MODULE_0___default().last(mergeValues);
+  return underscore__WEBPACK_IMPORTED_MODULE_2___default().last(mergeValues);
 }
 
 /**
@@ -1087,7 +1086,7 @@ function merge(key, value) {
 
       return set(key, modifiedData);
     } catch (error) {
-      _Logger__WEBPACK_IMPORTED_MODULE_7__.logAlert(`An error occurred while applying merge for key: ${key}, Error: ${error}`);
+      _Logger__WEBPACK_IMPORTED_MODULE_6__.logAlert(`An error occurred while applying merge for key: ${key}, Error: ${error}`);
     }
 
     return Promise.resolve();
@@ -1100,13 +1099,13 @@ function merge(key, value) {
  * @returns {Promise}
  */
 function initializeWithDefaultKeyStates() {
-  return _storage__WEBPACK_IMPORTED_MODULE_6__["default"].multiGet(underscore__WEBPACK_IMPORTED_MODULE_0___default().keys(defaultKeyStates)).
+  return _storage__WEBPACK_IMPORTED_MODULE_5__["default"].multiGet(underscore__WEBPACK_IMPORTED_MODULE_2___default().keys(defaultKeyStates)).
   then((pairs) => {
-    const asObject = underscore__WEBPACK_IMPORTED_MODULE_0___default().object(pairs);
+    const asObject = underscore__WEBPACK_IMPORTED_MODULE_2___default().object(pairs);
 
     const merged = (0,_fastMerge__WEBPACK_IMPORTED_MODULE_9__["default"])(asObject, defaultKeyStates);
-    _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].merge(merged);
-    underscore__WEBPACK_IMPORTED_MODULE_0___default().each(merged, (val, key) => keyChanged(key, val));
+    _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].merge(merged);
+    underscore__WEBPACK_IMPORTED_MODULE_2___default().each(merged, (val, key) => keyChanged(key, val));
   });
 }
 
@@ -1144,19 +1143,19 @@ function clear() {let keysToPreserve = arguments.length > 0 && arguments[0] !==
     //      status, or activeClients need to remain in Onyx even when signed out)
     // 2. Any keys with a default state (because they need to remain in Onyx as their default, and setting them
     //      to null would cause unknown behavior)
-    underscore__WEBPACK_IMPORTED_MODULE_0___default().each(keys, (key) => {
-      const isKeyToPreserve = underscore__WEBPACK_IMPORTED_MODULE_0___default().contains(keysToPreserve, key);
-      const isDefaultKey = underscore__WEBPACK_IMPORTED_MODULE_0___default().has(defaultKeyStates, key);
+    underscore__WEBPACK_IMPORTED_MODULE_2___default().each(keys, (key) => {
+      const isKeyToPreserve = underscore__WEBPACK_IMPORTED_MODULE_2___default().contains(keysToPreserve, key);
+      const isDefaultKey = underscore__WEBPACK_IMPORTED_MODULE_2___default().has(defaultKeyStates, key);
 
       // If the key is being removed or reset to default:
       // 1. Update it in the cache
       // 2. Figure out whether it is a collection key or not,
       //      since collection key subscribers need to be updated differently
       if (!isKeyToPreserve) {
-        const oldValue = _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].getValue(key);
-        const newValue = underscore__WEBPACK_IMPORTED_MODULE_0___default().get(defaultKeyStates, key, null);
+        const oldValue = _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].getValue(key);
+        const newValue = underscore__WEBPACK_IMPORTED_MODULE_2___default().get(defaultKeyStates, key, null);
         if (newValue !== oldValue) {
-          _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].set(key, newValue);
+          _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].set(key, newValue);
           const collectionKey = key.substring(0, key.indexOf('_') + 1);
           if (collectionKey) {
             if (!keyValuesToResetAsCollection[collectionKey]) {
@@ -1178,18 +1177,18 @@ function clear() {let keysToPreserve = arguments.length > 0 && arguments[0] !==
     });
 
     // Notify the subscribers for each key/value group so they can receive the new values
-    underscore__WEBPACK_IMPORTED_MODULE_0___default().each(keyValuesToResetIndividually, (value, key) => {
+    underscore__WEBPACK_IMPORTED_MODULE_2___default().each(keyValuesToResetIndividually, (value, key) => {
       notifySubscribersOnNextTick(key, value);
     });
-    underscore__WEBPACK_IMPORTED_MODULE_0___default().each(keyValuesToResetAsCollection, (value, key) => {
+    underscore__WEBPACK_IMPORTED_MODULE_2___default().each(keyValuesToResetAsCollection, (value, key) => {
       notifyCollectionSubscribersOnNextTick(key, value);
     });
 
-    const defaultKeyValuePairs = underscore__WEBPACK_IMPORTED_MODULE_0___default().pairs(underscore__WEBPACK_IMPORTED_MODULE_0___default().omit(defaultKeyStates, keysToPreserve));
+    const defaultKeyValuePairs = underscore__WEBPACK_IMPORTED_MODULE_2___default().pairs(underscore__WEBPACK_IMPORTED_MODULE_2___default().omit(defaultKeyStates, keysToPreserve));
 
     // Remove only the items that we want cleared from storage, and reset others to default
-    underscore__WEBPACK_IMPORTED_MODULE_0___default().each(keysToBeClearedFromStorage, (key) => _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].drop(key));
-    return _storage__WEBPACK_IMPORTED_MODULE_6__["default"].removeItems(keysToBeClearedFromStorage).then(() => _storage__WEBPACK_IMPORTED_MODULE_6__["default"].multiSet(defaultKeyValuePairs));
+    underscore__WEBPACK_IMPORTED_MODULE_2___default().each(keysToBeClearedFromStorage, (key) => _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].drop(key));
+    return _storage__WEBPACK_IMPORTED_MODULE_5__["default"].removeItems(keysToBeClearedFromStorage).then(() => _storage__WEBPACK_IMPORTED_MODULE_5__["default"].multiSet(defaultKeyValuePairs));
   });
 }
 
@@ -1208,13 +1207,13 @@ function clear() {let keysToPreserve = arguments.length > 0 && arguments[0] !==
  * @returns {Promise}
  */
 function mergeCollection(collectionKey, collection) {
-  if (!underscore__WEBPACK_IMPORTED_MODULE_0___default().isObject(collection) || underscore__WEBPACK_IMPORTED_MODULE_0___default().isArray(collection) || underscore__WEBPACK_IMPORTED_MODULE_0___default().isEmpty(collection)) {
-    _Logger__WEBPACK_IMPORTED_MODULE_7__.logInfo('mergeCollection() called with invalid or empty value. Skipping this update.');
+  if (!underscore__WEBPACK_IMPORTED_MODULE_2___default().isObject(collection) || underscore__WEBPACK_IMPORTED_MODULE_2___default().isArray(collection) || underscore__WEBPACK_IMPORTED_MODULE_2___default().isEmpty(collection)) {
+    _Logger__WEBPACK_IMPORTED_MODULE_6__.logInfo('mergeCollection() called with invalid or empty value. Skipping this update.');
     return Promise.resolve();
   }
 
   // Confirm all the collection keys belong to the same parent
-  underscore__WEBPACK_IMPORTED_MODULE_0___default().each(collection, (_data, dataKey) => {
+  underscore__WEBPACK_IMPORTED_MODULE_2___default().each(collection, (_data, dataKey) => {
     if (isKeyMatch(collectionKey, dataKey)) {
       return;
     }
@@ -1225,13 +1224,13 @@ function mergeCollection(collectionKey, collection) {
   return getAllKeys().
   then((persistedKeys) => {
     // Split to keys that exist in storage and keys that don't
-    const [existingKeys, newKeys] = underscore__WEBPACK_IMPORTED_MODULE_0___default().chain(collection).
+    const [existingKeys, newKeys] = underscore__WEBPACK_IMPORTED_MODULE_2___default().chain(collection).
     keys().
     partition((key) => persistedKeys.includes(key)).
     value();
 
-    const existingKeyCollection = underscore__WEBPACK_IMPORTED_MODULE_0___default().pick(collection, existingKeys);
-    const newCollection = underscore__WEBPACK_IMPORTED_MODULE_0___default().pick(collection, newKeys);
+    const existingKeyCollection = underscore__WEBPACK_IMPORTED_MODULE_2___default().pick(collection, existingKeys);
+    const newCollection = underscore__WEBPACK_IMPORTED_MODULE_2___default().pick(collection, newKeys);
     const keyValuePairsForExistingCollection = prepareKeyValuePairsForStorage(existingKeyCollection);
     const keyValuePairsForNewCollection = prepareKeyValuePairsForStorage(newCollection);
 
@@ -1240,17 +1239,17 @@ function mergeCollection(collectionKey, collection) {
     // New keys will be added via multiSet while existing keys will be updated using multiMerge
     // This is because setting a key that doesn't exist yet with multiMerge will throw errors
     if (keyValuePairsForExistingCollection.length > 0) {
-      promises.push(_storage__WEBPACK_IMPORTED_MODULE_6__["default"].multiMerge(keyValuePairsForExistingCollection));
+      promises.push(_storage__WEBPACK_IMPORTED_MODULE_5__["default"].multiMerge(keyValuePairsForExistingCollection));
     }
 
     if (keyValuePairsForNewCollection.length > 0) {
-      promises.push(_storage__WEBPACK_IMPORTED_MODULE_6__["default"].multiSet(keyValuePairsForNewCollection));
+      promises.push(_storage__WEBPACK_IMPORTED_MODULE_5__["default"].multiSet(keyValuePairsForNewCollection));
     }
 
     // Prefill cache if necessary by calling get() on any existing keys and then merge original data to cache
     // and update all subscribers
-    Promise.all(underscore__WEBPACK_IMPORTED_MODULE_0___default().map(existingKeys, get)).then(() => {
-      _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].merge(collection);
+    Promise.all(underscore__WEBPACK_IMPORTED_MODULE_2___default().map(existingKeys, get)).then(() => {
+      _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].merge(collection);
       keysChanged(collectionKey, collection);
     });
 
@@ -1267,11 +1266,11 @@ function mergeCollection(collectionKey, collection) {
  */
 function update(data) {
   // First, validate the Onyx object is in the format we expect
-  underscore__WEBPACK_IMPORTED_MODULE_0___default().each(data, (_ref) => {let { onyxMethod, key } = _ref;
-    if (!underscore__WEBPACK_IMPORTED_MODULE_0___default().contains([METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION], onyxMethod)) {
+  underscore__WEBPACK_IMPORTED_MODULE_2___default().each(data, (_ref) => {let { onyxMethod, key } = _ref;
+    if (!underscore__WEBPACK_IMPORTED_MODULE_2___default().contains([METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION], onyxMethod)) {
       throw new Error(`Invalid onyxMethod ${onyxMethod} in Onyx update.`);
     }
-    if (onyxMethod !== METHOD.CLEAR && !underscore__WEBPACK_IMPORTED_MODULE_0___default().isString(key)) {
+    if (onyxMethod !== METHOD.CLEAR && !underscore__WEBPACK_IMPORTED_MODULE_2___default().isString(key)) {
       throw new Error(`Invalid ${typeof key} key provided in Onyx update. Onyx key must be of type string.`);
     }
   });
@@ -1279,7 +1278,7 @@ function update(data) {
   const promises = [];
   let clearPromise = Promise.resolve();
 
-  underscore__WEBPACK_IMPORTED_MODULE_0___default().each(data, (_ref2) => {let { onyxMethod, key, value } = _ref2;
+  underscore__WEBPACK_IMPORTED_MODULE_2___default().each(data, (_ref2) => {let { onyxMethod, key, value } = _ref2;
     switch (onyxMethod) {
       case METHOD.SET:
         promises.push(() => set(key, value));
@@ -1298,7 +1297,15 @@ function update(data) {
 
   });
 
-  return clearPromise.then(() => Promise.all(underscore__WEBPACK_IMPORTED_MODULE_0___default().map(promises, (p) => p())));
+  return clearPromise.then(() => Promise.all(underscore__WEBPACK_IMPORTED_MODULE_2___default().map(promises, (p) => p())));
+}
+
+/**
+ * When set these keys will not be persisted to storage
+ * @param {string[]} keyList
+ */
+function setMemoryOnlyKeys(keyList) {
+  _storage__WEBPACK_IMPORTED_MODULE_5__["default"].setMemoryOnlyKeys(keyList);
 }
 
 /**
@@ -1346,7 +1353,7 @@ function init()
   }
 
   if (maxCachedKeysCount > 0) {
-    _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].setRecentKeysLimit(maxCachedKeysCount);
+    _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].setRecentKeysLimit(maxCachedKeysCount);
   }
 
   // Let Onyx know about all of our keys
@@ -1365,9 +1372,9 @@ function init()
 
   then(deferredInitTask.resolve);
 
-  if (shouldSyncMultipleInstances && underscore__WEBPACK_IMPORTED_MODULE_0___default().isFunction(_storage__WEBPACK_IMPORTED_MODULE_6__["default"].keepInstancesSync)) {
-    _storage__WEBPACK_IMPORTED_MODULE_6__["default"].keepInstancesSync((key, value) => {
-      _OnyxCache__WEBPACK_IMPORTED_MODULE_5__["default"].set(key, value);
+  if (shouldSyncMultipleInstances && underscore__WEBPACK_IMPORTED_MODULE_2___default().isFunction(_storage__WEBPACK_IMPORTED_MODULE_5__["default"].keepInstancesSync)) {
+    _storage__WEBPACK_IMPORTED_MODULE_5__["default"].keepInstancesSync((key, value) => {
+      _OnyxCache__WEBPACK_IMPORTED_MODULE_4__["default"].set(key, value);
       keyChanged(key, value);
     });
   }
@@ -1384,11 +1391,12 @@ const Onyx = {
   clear,
   getAllKeys,
   init,
-  registerLogger: _Logger__WEBPACK_IMPORTED_MODULE_7__.registerLogger,
+  registerLogger: _Logger__WEBPACK_IMPORTED_MODULE_6__.registerLogger,
   addToEvictionBlockList,
   removeFromEvictionBlockList,
   isSafeEvictionKey,
-  METHOD
+  METHOD,
+  setMemoryOnlyKeys
 };
 
 /**
@@ -1664,6 +1672,52 @@ const instance = new OnyxCache();
 
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (instance);
 
+/***/ }),
+
+/***/ "./lib/Str.js":
+/*!********************!*\
+  !*** ./lib/Str.js ***!
+  \********************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "result": () => (/* binding */ result),
+/* harmony export */   "startsWith": () => (/* binding */ startsWith)
+/* harmony export */ });
+/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! underscore */ "underscore");
+/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(underscore__WEBPACK_IMPORTED_MODULE_0__);
+
+
+/**
+ * Returns true if the haystack begins with the needle
+ *
+ * @param {String} haystack  The full string to be searched
+ * @param {String} needle    The case-sensitive string to search for
+ * @return {Boolean} Returns true if the haystack starts with the needle.
+ */
+function startsWith(haystack, needle) {
+  return underscore__WEBPACK_IMPORTED_MODULE_0___default().isString(haystack) &&
+  underscore__WEBPACK_IMPORTED_MODULE_0___default().isString(needle) &&
+  haystack.startsWith(needle);
+}
+
+/**
+ * Checks if parameter is a string or function.
+ * If it is a string, then we will just return it.
+ * If it is a function, then we will call it with
+ * any additional arguments and return the result.
+ *
+ * @param {String|Function} parameter
+ * @returns {*}
+ */
+function result(parameter) {for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {args[_key - 1] = arguments[_key];}
+  return underscore__WEBPACK_IMPORTED_MODULE_0___default().isFunction(parameter) ? parameter(...args) : parameter;
+}
+
+
+
 /***/ }),
 
 /***/ "./lib/SyncQueue.js":
@@ -2087,7 +2141,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var localforage_removeitems__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! localforage-removeitems */ "localforage-removeitems");
 /* harmony import */ var localforage_removeitems__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(localforage_removeitems__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _SyncQueue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../SyncQueue */ "./lib/SyncQueue.js");
-/* harmony import */ var _fastMerge__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../fastMerge */ "./lib/fastMerge.js");
+/* harmony import */ var _Str__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../Str */ "./lib/Str.js");
+/* harmony import */ var _fastMerge__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../fastMerge */ "./lib/fastMerge.js");
 /**
  * @file
  * The storage provider based on localforage allows us to store most anything in its
@@ -2100,12 +2155,18 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 (0,localforage_removeitems__WEBPACK_IMPORTED_MODULE_2__.extendPrototype)((localforage__WEBPACK_IMPORTED_MODULE_0___default()));
 
 localforage__WEBPACK_IMPORTED_MODULE_0___default().config({
   name: 'OnyxDB'
 });
 
+/**
+ * Keys that will not ever be persisted to disk.
+ */
+let memoryOnlyKeys = [];
+
 const provider = {
   /**
    * Writing very quickly to IndexedDB causes performance issues and can lock up the page and lead to jank.
@@ -2113,6 +2174,10 @@ const provider = {
    * to the next.
    */
   setItemQueue: new _SyncQueue__WEBPACK_IMPORTED_MODULE_3__["default"]((_ref) => {let { key, value, shouldMerge } = _ref;
+    if (underscore__WEBPACK_IMPORTED_MODULE_1___default().find(memoryOnlyKeys, (noCacheKey) => _Str__WEBPACK_IMPORTED_MODULE_4__.startsWith(key, noCacheKey))) {
+      return Promise.resolve();
+    }
+
     if (shouldMerge) {
       return localforage__WEBPACK_IMPORTED_MODULE_0___default().getItem(key).
       then((existingValue) => {
@@ -2120,7 +2185,7 @@ const provider = {
 
         // lodash adds a small overhead so we don't use it here
         // eslint-disable-next-line prefer-object-spread, rulesdir/prefer-underscore-method
-        ? Object.assign({}, (0,_fastMerge__WEBPACK_IMPORTED_MODULE_4__["default"])(existingValue, value)) :
+        ? Object.assign({}, (0,_fastMerge__WEBPACK_IMPORTED_MODULE_5__["default"])(existingValue, value)) :
         value;
         return localforage__WEBPACK_IMPORTED_MODULE_0___default().setItem(key, newValue);
       });
@@ -2214,6 +2279,13 @@ const provider = {
    */
   setItem(key, value) {
     return this.setItemQueue.push({ key, value });
+  },
+
+  /**
+   * @param {string[]} keyList
+   */
+  setMemoryOnlyKeys(keyList) {
+    memoryOnlyKeys = keyList;
   }
 };
 
@@ -2232,15 +2304,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (/* export default binding */ __WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! underscore */ "underscore");
-/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(underscore__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! prop-types */ "./node_modules/prop-types/index.js");
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! expensify-common/lib/str */ "expensify-common/lib/str");
-/* harmony import */ var expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! prop-types */ "./node_modules/prop-types/index.js");
+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! underscore */ "underscore");
+/* harmony import */ var underscore__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(underscore__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _Onyx__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Onyx */ "./lib/Onyx.js");
+/* harmony import */ var _Str__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Str */ "./lib/Str.js");
 function _extends() {_extends = Object.assign ? Object.assign.bind() : function (target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i];for (var key in source) {if (Object.prototype.hasOwnProperty.call(source, key)) {target[key] = source[key];}}}return target;};return _extends.apply(this, arguments);} /**
  * This is a higher order component that provides the ability to map a state property directly to
  * something in Onyx (a key/value store). That way, as soon as data in Onyx changes, the state will be set and the view
@@ -2264,13 +2335,13 @@ function getDisplayName(component) {
 
 /* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__(mapOnyxToState) {
   // A list of keys that must be present in tempState before we can render the WrappedComponent
-  const requiredKeysForInit = underscore__WEBPACK_IMPORTED_MODULE_1___default().chain(mapOnyxToState).
+  const requiredKeysForInit = underscore__WEBPACK_IMPORTED_MODULE_2___default().chain(mapOnyxToState).
   omit((config) => config.initWithStoredValues === false).
   keys().
   value();
   return (WrappedComponent) => {
     const displayName = getDisplayName(WrappedComponent);
-    class withOnyx extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) {
+    class withOnyx extends (react__WEBPACK_IMPORTED_MODULE_1___default().Component) {
       constructor(props) {
         super(props);
 
@@ -2291,7 +2362,7 @@ function getDisplayName(component) {
 
       componentDidMount() {
         // Subscribe each of the state properties to the proper Onyx key
-        underscore__WEBPACK_IMPORTED_MODULE_1___default().each(mapOnyxToState, (mapping, propertyName) => {
+        underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping, propertyName) => {
           this.connectMappingToOnyx(mapping, propertyName);
         });
         this.checkEvictableKeys();
@@ -2300,9 +2371,9 @@ function getDisplayName(component) {
       componentDidUpdate(prevProps) {
         // If any of the mappings use data from the props, then when the props change, all the
         // connections need to be reconnected with the new props
-        underscore__WEBPACK_IMPORTED_MODULE_1___default().each(mapOnyxToState, (mapping, propertyName) => {
-          const previousKey = expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_3___default().result(mapping.key, prevProps);
-          const newKey = expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_3___default().result(mapping.key, this.props);
+        underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping, propertyName) => {
+          const previousKey = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, prevProps);
+          const newKey = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
 
           if (previousKey !== newKey) {
             _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].disconnect(this.activeConnectionIDs[previousKey], previousKey);
@@ -2315,8 +2386,8 @@ function getDisplayName(component) {
 
       componentWillUnmount() {
         // Disconnect everything from Onyx
-        underscore__WEBPACK_IMPORTED_MODULE_1___default().each(mapOnyxToState, (mapping) => {
-          const key = expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_3___default().result(mapping.key, this.props);
+        underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping) => {
+          const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
           const connectionID = this.activeConnectionIDs[key];
           _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].disconnect(connectionID, key);
         });
@@ -2339,7 +2410,7 @@ function getDisplayName(component) {
         this.tempState[statePropertyName] = val;
 
         // All state keys should exist and at least have a value of null
-        if (underscore__WEBPACK_IMPORTED_MODULE_1___default().some(requiredKeysForInit, (key) => underscore__WEBPACK_IMPORTED_MODULE_1___default().isUndefined(this.tempState[key]))) {
+        if (underscore__WEBPACK_IMPORTED_MODULE_2___default().some(requiredKeysForInit, (key) => underscore__WEBPACK_IMPORTED_MODULE_2___default().isUndefined(this.tempState[key]))) {
           return;
         }
 
@@ -2356,13 +2427,13 @@ function getDisplayName(component) {
         // We will add this key to our list of recently accessed keys
         // if the canEvict function returns true. This is necessary criteria
         // we MUST use to specify if a key can be removed or not.
-        underscore__WEBPACK_IMPORTED_MODULE_1___default().each(mapOnyxToState, (mapping) => {
-          if (underscore__WEBPACK_IMPORTED_MODULE_1___default().isUndefined(mapping.canEvict)) {
+        underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping) => {
+          if (underscore__WEBPACK_IMPORTED_MODULE_2___default().isUndefined(mapping.canEvict)) {
             return;
           }
 
-          const canEvict = expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_3___default().result(mapping.canEvict, this.props);
-          const key = expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_3___default().result(mapping.key, this.props);
+          const canEvict = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.canEvict, this.props);
+          const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
 
           if (!_Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].isSafeEvictionKey(key)) {
             throw new Error(`canEvict can't be used on key '${key}'. This key must explicitly be flagged as safe for removal by adding it to Onyx.init({safeEvictionKeys: []}).`);
@@ -2387,7 +2458,7 @@ function getDisplayName(component) {
        *  component
        */
       connectMappingToOnyx(mapping, statePropertyName) {
-        const key = expensify_common_lib_str__WEBPACK_IMPORTED_MODULE_3___default().result(mapping.key, this.props);
+        const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
 
         // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
         this.activeConnectionIDs[key] = _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].connect({
@@ -2406,15 +2477,15 @@ function getDisplayName(component) {
 
         // Remove any internal state properties used by withOnyx
         // that should not be passed to a wrapped component
-        let stateToPass = underscore__WEBPACK_IMPORTED_MODULE_1___default().omit(this.state, 'loading');
-        stateToPass = underscore__WEBPACK_IMPORTED_MODULE_1___default().omit(stateToPass, (value) => underscore__WEBPACK_IMPORTED_MODULE_1___default().isNull(value));
+        let stateToPass = underscore__WEBPACK_IMPORTED_MODULE_2___default().omit(this.state, 'loading');
+        stateToPass = underscore__WEBPACK_IMPORTED_MODULE_2___default().omit(stateToPass, (value) => underscore__WEBPACK_IMPORTED_MODULE_2___default().isNull(value));
 
         // Remove any null values so that React replaces them with default props
-        const propsToPass = underscore__WEBPACK_IMPORTED_MODULE_1___default().omit(this.props, (value) => underscore__WEBPACK_IMPORTED_MODULE_1___default().isNull(value));
+        const propsToPass = underscore__WEBPACK_IMPORTED_MODULE_2___default().omit(this.props, (value) => underscore__WEBPACK_IMPORTED_MODULE_2___default().isNull(value));
 
         // Spreading props and state is necessary in an HOC where the data cannot be predicted
         return /*#__PURE__*/(
-          react__WEBPACK_IMPORTED_MODULE_0___default().createElement(WrappedComponent
+          react__WEBPACK_IMPORTED_MODULE_1___default().createElement(WrappedComponent
           // eslint-disable-next-line react/jsx-props-no-spreading
           , _extends({}, propsToPass,
 
@@ -2426,19 +2497,19 @@ function getDisplayName(component) {
     }
 
     withOnyx.propTypes = {
-      forwardedRef: prop_types__WEBPACK_IMPORTED_MODULE_2___default().oneOfType([
-      (prop_types__WEBPACK_IMPORTED_MODULE_2___default().func),
-      prop_types__WEBPACK_IMPORTED_MODULE_2___default().shape({ current: prop_types__WEBPACK_IMPORTED_MODULE_2___default().instanceOf((react__WEBPACK_IMPORTED_MODULE_0___default().Component)) })])
+      forwardedRef: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOfType([
+      (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
+      prop_types__WEBPACK_IMPORTED_MODULE_0___default().shape({ current: prop_types__WEBPACK_IMPORTED_MODULE_0___default().instanceOf((react__WEBPACK_IMPORTED_MODULE_1___default().Component)) })])
 
     };
     withOnyx.defaultProps = {
       forwardedRef: undefined
     };
     withOnyx.displayName = `withOnyx(${displayName})`;
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef((props, ref) => {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().forwardRef((props, ref) => {
       const Component = withOnyx;
       // eslint-disable-next-line react/jsx-props-no-spreading
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, _extends({}, props, { forwardedRef: ref }));
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(Component, _extends({}, props, { forwardedRef: ref }));
     });
   };
 }
@@ -3515,17 +3586,6 @@ if (false) {} else {
 }
 
 
-/***/ }),
-
-/***/ "expensify-common/lib/str":
-/*!*******************************************!*\
-  !*** external "expensify-common/lib/str" ***!
-  \*******************************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = __WEBPACK_EXTERNAL_MODULE_expensify_common_lib_str__;
-
 /***/ }),
 
 /***/ "fast-equals":