Merge pull request #90238 from nabi-ebrahimi/fix/public-room-message-send-after-restart

fix: resolve public room message send failure after app restart with emoji text

Author: chuckdries

src/hooks/useLoadReportActions.ts

@@ -117,6 +117,11 @@ function useLoadReportActions({
         // (which may include Pusher-delivered actions like Concierge replies that skip gaps)
         if (newestFetchedReportActionID) {
             getNewerActions(reportID, newestFetchedReportActionID);
+
+            // Keep transaction thread in sync for mixed report+thread views.
+            if (isTransactionThreadReport) {
+                getNewerActions(transactionThreadReportID, transactionThreadNewestAction?.reportActionID);
+            }
             return;
         }
 

src/libs/PaginationUtils.ts

@@ -412,6 +412,19 @@ function getContinuousChain<TResource>(sortedItems: TResource[], pages: Pages, g
 
         const linkedPage = pagesWithIndexes.find((pageIndex) => index >= pageIndex.firstIndex && index <= pageIndex.lastIndex);
 
+        const newestPage = selectNewestPageWithIndex(pagesWithIndexes);
+
+        // If the linked action is newer than the newest page boundary, show the newest chain
+        // instead of collapsing to a single-item result.
+        if (!linkedPage && newestPage && index < newestPage.firstIndex) {
+            return {
+                data: sortedItems.slice(0, newestPage.lastIndex + 1),
+                hasNextPage: newestPage.lastID !== CONST.PAGINATION_END_ID,
+                hasPreviousPage: newestPage.firstID !== CONST.PAGINATION_START_ID,
+                resourceItem,
+            };
+        }
+
         // If we are linked to an action in a gap return it by itself
         if (!linkedPage && resourceItem) {
             return {data: [resourceItem.item], hasNextPage: false, hasPreviousPage: false, resourceItem};
@@ -432,8 +445,11 @@ function getContinuousChain<TResource>(sortedItems: TResource[], pages: Pages, g
         return {data: sortedItems, hasNextPage: false, hasPreviousPage: false, resourceItem};
     }
 
+    // For the default newest chain, include known newer items that sit before the first fetched page.
+    const startIndex = id ? page.firstIndex : 0;
+
     return {
-        data: sortedItems.slice(page.firstIndex, page.lastIndex + 1),
+        data: sortedItems.slice(startIndex, page.lastIndex + 1),
         hasNextPage: page.lastID !== CONST.PAGINATION_END_ID,
         hasPreviousPage: page.firstID !== CONST.PAGINATION_START_ID,
         resourceItem,

src/pages/inbox/report/ReportActionsView.tsx

@@ -67,6 +67,9 @@ function ReportActionsView({reportID, onLayout}: ReportActionsViewProps) {
     const canPerformWriteAction = !!canUserPerformWriteAction(report, isReportArchived);
 
     const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
+
+    const [reportPaginationState] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_PAGINATION_STATE}${reportID}`);
+
     const reportPreviewAction = useMemo(() => getReportPreviewAction(report?.chatReportID, report?.reportID), [report?.chatReportID, report?.reportID]);
     const didLayout = useRef(false);
 
@@ -92,6 +95,7 @@ function ReportActionsView({reportID, onLayout}: ReportActionsViewProps) {
         transactionThreadReportID,
         hasOlderActions,
         hasNewerActions,
+        newestFetchedReportActionID: reportPaginationState?.newestFetchedReportActionID,
     });
 
     const {sortedReportActions, sortedVisibleReportActions, isConciergeSidePanel, showConciergeSidePanelWelcome, showFullHistory, hasPreviousMessages, handleShowPreviousMessages} =

tests/unit/PaginationUtilsTest.ts

@@ -250,6 +250,67 @@ describe('PaginationUtils', () => {
             expect(result.hasNextPage).toBe(true);
         });
 
+        it('includes known newer actions before the first page for the default chain', () => {
+            const input = createItems([
+                // Given these sortedItems
+                '18',
+                '17',
+                '16',
+                '15',
+                '14',
+                // Gap
+                '12',
+                '11',
+                '10',
+                '9',
+            ]);
+
+            const pages = [
+                // Given these pages
+                ['17', '16', '15', '14'],
+                ['12', '11', '10', '9'],
+            ];
+
+            const expectedResult = createItems([
+                // Expect these sortedItems
+                '18',
+                '17',
+                '16',
+                '15',
+                '14',
+            ]);
+            const result = getContinuousChain(input, pages, getID, '');
+            expect(result.data).toStrictEqual(expectedResult);
+            expect(result.hasPreviousPage).toBe(true);
+            expect(result.hasNextPage).toBe(true);
+        });
+
+        it('when linked to an item newer than the newest page boundary, returns the newest chain instead of a single item', () => {
+            const input = createItems([
+                '18',
+                '17',
+                '16',
+                '15',
+                '14',
+                // Gap
+                '12',
+                '11',
+                '10',
+                '9',
+            ]);
+
+            const pages = [
+                ['17', '16', '15', '14'],
+                ['12', '11', '10', '9'],
+            ];
+
+            const expectedResult = createItems(['18', '17', '16', '15', '14']);
+            const result = getContinuousChain(input, pages, getID, '18');
+            expect(result.data).toStrictEqual(expectedResult);
+            expect(result.hasPreviousPage).toBe(true);
+            expect(result.hasNextPage).toBe(true);
+        });
+
         it('given a page with an empty firstItemID include actions until the start', () => {
             const input = createItems([
                 // Given these sortedItems