starred/native
1
0
Fork 0
mirror of https://github.com/bulwarkmail/native.git synced 2026-11-06 00:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: only show the unified mailbox when it can hold more than one account's mail #843

Browse Source 
The drawer showed "All inboxes" and the Unified section as soon as a
second account was signed in, but with cross-account off the unified
views only cover the active account, so they repeated its own folders.
They now follow the webmail's rule: shown with cross-account on and
several accounts, or when group inboxes are merged in.
This commit is contained in:
Linus Rath
2026-09-24 19:36:41 +02:00
parent 4e6426171a
commit af6290fd4c
3 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/SidebarDrawer.tsx
+9 -5
View File
@@ -26,6 +26,7 @@ import {
buildMailboxTree, flattenVisible, mailboxSubtreeIds, ownMailboxes, type MailboxNode,
} from '../lib/mailbox-tree';
import { localizeMailboxName } from '../lib/mailbox-label';
import { showUnifiedSection } from '../lib/unified-section';
import { generateAvatarColor, getAccountInitials } from '../lib/avatar-utils';
import { jmapClient } from '../api/jmap-client';
import {
@@ -631,12 +632,15 @@ export default function SidebarDrawer({ visible, onClose }: SidebarDrawerProps)
};
// ── Unified rows ──────────────────────────────────────────────────────
// Shown with one account as soon as it has group inboxes to merge, and
// always with several accounts. Counts are projected from the mailbox
// lists we hold: the active account's (own + shared) plus, cross-account,
// the tucked-away snapshots of the other accounts.
// Shown only when the views hold more than this account's own folders:
// cross-account with several accounts, or group inboxes to merge (#843).
// Counts are projected from the mailbox lists we hold: the active
// account's (own + shared) plus, cross-account, the tucked-away snapshots
// of the other accounts.
const hasSharedInbox = mailboxes.some((m) => m.isShared && m.role === 'inbox');
const showUnified = accounts.length > 1 || (includeGroupInUnified && hasSharedInbox);
const showUnified = showUnifiedSection({
accountCount: accounts.length, unifiedCrossAccount, includeGroupInUnified, hasSharedInbox,
});
const unifiedCounts = React.useMemo(() => {
const pools: Mailbox[][] = [mailboxes];
if (unifiedCrossAccount) {