expensify-common 2.0.127 → 2.0.129

package/dist/CONST.js

@@ -393,7 +393,7 @@ const CONST = {
          *
          * @type RegExp
          */
-        EMOJI_RULE: /[\p{Extended_Pictographic}](\u200D[\p{Extended_Pictographic}]|[\u{1F3FB}-\u{1F3FF}]|[\u{E0020}-\u{E007F}]|\uFE0F|\u20E3)*|[\u{1F1E6}-\u{1F1FF}]{2}|[#*0-9]\uFE0F?\u20E3/gu,
+        EMOJI_RULE: /[\p{Extended_Pictographic}\uE000-\uF8FF\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}](\u200D[\p{Extended_Pictographic}]|[\u{1F3FB}-\u{1F3FF}]|[\u{E0020}-\u{E007F}]|\uFE0F|\u20E3)*|[\u{1F1E6}-\u{1F1FF}]{2}|[#*0-9]\uFE0F?\u20E3/gu,
         /**
          * Regex to match a piece of text or @here, needed for both shortMention and userMention
          */

package/dist/ReportHistoryStore.d.ts

@@ -35,6 +35,13 @@ export default class ReportHistoryStore {
      * @param {Object[]} newHistory
      */
     mergeHistoryByTimestamp(reportID: number, newHistory: Object[]): void;
+    /**
+     * Merges history items by reportActionID into the cache and creates it if it doesn't yet exist.
+     *
+     * @param {Number} reportID
+     * @param {Object[]} newHistory
+     */
+    mergeHistoryByReportActionID(reportID: number, newHistory: Object[]): void;
     /**
      * Gets the history.
      *

package/dist/ReportHistoryStore.js

@@ -180,6 +180,25 @@ class ReportHistoryStore {
         // Sort items in case they have become out of sync
         this.cache[reportID] = newCache.sort((a, b) => b.reportActionTimestamp - a.reportActionTimestamp);
     }
+    /**
+     * Merges history items by reportActionID into the cache and creates it if it doesn't yet exist.
+     *
+     * @param {Number} reportID
+     * @param {Object[]} newHistory
+     */
+    mergeHistoryByReportActionID(reportID, newHistory) {
+        if (newHistory.length === 0) {
+            return;
+        }
+        const newCache = newHistory.reverse().reduce((prev, curr) => {
+            if (!prev.some((item) => item.reportActionID === curr.reportActionID)) {
+                prev.unshift(curr);
+            }
+            return prev;
+        }, this.cache[reportID] || []);
+        // Sort items in case they have become out of sync
+        this.cache[reportID] = newCache.sort((a, b) => b.reportActionTimestamp - a.reportActionTimestamp);
+    }
     /**
      * Gets the history.
      *
@@ -230,7 +249,7 @@ class ReportHistoryStore {
         })
             .done((recentHistory) => {
             // Update history with new items fetched
-            this.mergeHistoryByTimestamp(reportID, recentHistory);
+            this.mergeHistoryByReportActionID(reportID, recentHistory);
             // Return history for this report
             promise.resolve(this.cache[reportID]);
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify-common",
-  "version": "2.0.127",
+  "version": "2.0.129",
   "author": "Expensify, Inc.",
   "description": "Expensify libraries and components shared across different repos",
   "homepage": "https://expensify.com",