From eac23f8770c6a2e9c784958148a126264cbc0410 Mon Sep 17 00:00:00 2001
From: "junyoung.lim" <junyoung.lim@sendbird.com>
Date: Mon, 2 Dec 2024 11:40:53 +0900
Subject: [PATCH] Fix UI race condition

---
 src/modules/App/DesktopLayout.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/App/DesktopLayout.tsx b/src/modules/App/DesktopLayout.tsx
index 411055d1d..d68116ce0 100644
--- a/src/modules/App/DesktopLayout.tsx
+++ b/src/modules/App/DesktopLayout.tsx
@@ -167,9 +167,11 @@ export const DesktopLayout: React.FC<DesktopLayoutProps> = (props: DesktopLayout
             if (channel?.url !== currentChannel?.url) {
               setCurrentChannel(channel);
             }
-            if (message?.messageId !== highlightedMessage) {
-              setStartingPoint?.(message?.createdAt);
-            }
+            setTimeout(() => {
+              if (message?.messageId !== highlightedMessage) {
+                setStartingPoint?.(message?.createdAt);
+              }
+            }, 200);
             setTimeout(() => {
               setStartingPoint?.(null);
               setHighlightedMessage?.(message?.messageId);