ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Main Menu: Fix accounts appearing at the bottom (#5915)

Browse Source
This commit is contained in:
zubiden 2025-05-14 19:02:10 +03:00 committed by Alexander Zinchuk
parent 9fda32d1a7
commit b645f9460c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/left/main/AccountMenuItems.tsx
View File

@ -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>
);
};