Resolve merge conflict

WordPress · Dec 10, 2024 · 4e02add · 4e02add
1 parent 6dcc644
commit 4e02add
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/packages/editor/src/components/collab-sidebar/index.js b/packages/editor/src/components/collab-sidebar/index.js
@@ -296,22 +296,16 @@ export default function CollabSidebar() {
 			return { resultComments: [], sortedThreads: [] };
 		}
 
-		const updatedResult = result.map( ( item ) => ( {
-			...item,
-			reply: [ ...item.reply ].reverse(),
-		} ) );
-
 		const blockCommentIds = getCommentIdsFromBlocks( blocks );
 		const blockCommentIdMap = new Map(
 			blockCommentIds.map( ( item ) => [ item.commentID, item ] )
 		);
 
-		const updatedResult = result.map( ( item ) => {
-			return {
-				...item,
-				clientId: blockCommentIdMap.get( item.id )?.clientID,
-			};
-		} );
+		const updatedResult = result.map( ( item ) => ( {
+			...item,
+			reply: [ ...item.reply ].reverse(),
+			clientId: blockCommentIdMap.get( item.id )?.clientID,
+		} ) );
 
 		const threadIdMap = new Map(
 			updatedResult.map( ( thread ) => [ thread.id, thread ] )