From b645f9460cabdd6ba3b9339a660d9a3f95c1cb48 Mon Sep 17 00:00:00 2001
From: zubiden <19638254+zubiden@users.noreply.github.com>
Date: Wed, 14 May 2025 19:02:10 +0300
Subject: [PATCH] Main Menu: Fix accounts appearing at the bottom (#5915)

---
 src/components/left/main/AccountMenuItems.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/left/main/AccountMenuItems.tsx b/src/components/left/main/AccountMenuItems.tsx
index 9e46b141a..70b1b9421 100644
--- a/src/components/left/main/AccountMenuItems.tsx
+++ b/src/components/left/main/AccountMenuItems.tsx
@@ -37,6 +37,10 @@ const AccountMenuItems = ({
   const currentCount = getCurrentProdAccountCount();
   const maxCount = getCurrentMaxAccountCount();
 
+  const currentAccountInfo = useMemo(() => {
+    return Object.values(accounts).find((account) => account.userId === currentUser.id);
+  }, [accounts, currentUser.id]);
+
   const shouldShowLimit = currentCount >= maxCount;
 
   const handleLimitClick = useLastCallback(() => {
@@ -65,15 +69,16 @@ const AccountMenuItems = ({
   }, [accounts, currentCount, totalLimit]);
 
   return (
-    <>
+    <div>
       {Object.entries(accounts || {})
         .sort(([, account]) => (account.userId === currentUser.id ? -1 : 1))
         .map(([slot, account], index, arr) => {
+          const isSameServer = account.isTest === currentAccountInfo?.isTest;
           const mockUser: CustomPeer = {
             title: [account.firstName, account.lastName].filter(Boolean).join(' '),
             isCustomPeer: true,
             peerColorId: account.color,
-            emojiStatusId: account.emojiStatusId,
+            emojiStatusId: isSameServer ? account.emojiStatusId : undefined,
             isPremium: account.isPremium,
           };
 
@@ -111,7 +116,7 @@ const AccountMenuItems = ({
           {lang('MenuAddAccount')}
         </MenuItem>
       )}
-    </>
+    </div>
   );
 };