- );
-
const hasSelection = selectedEmailKeys.size > 0;
// What plugin buttons in the selection toolbar act on: the JMAP ids of the
// selected messages, thread members included.
diff --git a/stores/__tests__/auth-store-switch-race.test.ts b/stores/__tests__/auth-store-switch-race.test.ts
index 1ad01d8a6..3b186e477 100644
--- a/stores/__tests__/auth-store-switch-race.test.ts
+++ b/stores/__tests__/auth-store-switch-race.test.ts
@@ -43,6 +43,7 @@ import { useAuthStore } from '@/stores/auth-store';
import { useAccountStore } from '@/stores/account-store';
import { useIdentityStore } from '@/stores/identity-store';
import { useEmailStore } from '@/stores/email-store';
+import { useSettingsStore } from '@/stores/settings-store';
import { evictAccount } from '@/lib/account-state-manager';
const acct = (username: string, host: string, slot: number) => ({
@@ -89,3 +90,29 @@ it("overlapping switches keep every account's data under its own key", async ()
expect(st.primaryIdentity?.email).toBe('a@x.test');
expect(useEmailStore.getState().emails.map((e) => e.subject)).toEqual(['mail of A']);
});
+
+it("keeps the outgoing account's mail on screen while its settings are saved", async () => {
+ useAccountStore.setState({ accounts: [A, B] as never, activeAccountId: A.id, defaultAccountId: A.id });
+ useAuthStore.setState({ isAuthenticated: true, activeAccountId: A.id, client: null });
+ const sw = (id: string) => useAuthStore.getState().switchAccount(id);
+ // Connect both, so the next switch takes the seamless path.
+ await sw(B.id); await sw(A.id);
+ useEmailStore.setState({ emails: [{ id: 'mA', subject: 'mail of A' }] as never });
+
+ // The flush is a request; whatever the store holds meanwhile is on screen.
+ const flushSync = useSettingsStore.getState().flushSync;
+ let onScreen: string[] = [];
+ useSettingsStore.setState({
+ flushSync: async () => {
+ await sleep(0);
+ onScreen = useEmailStore.getState().emails.map((e) => e.subject ?? '');
+ },
+ });
+ try {
+ await sw(B.id);
+ } finally {
+ useSettingsStore.setState({ flushSync });
+ }
+ expect(onScreen).toEqual(['mail of A']);
+ expect(useAuthStore.getState().activeAccountId).toBe(B.id);
+});
diff --git a/stores/__tests__/email-store-initial-loading.test.ts b/stores/__tests__/email-store-initial-loading.test.ts
new file mode 100644
index 000000000..fc6f89704
--- /dev/null
+++ b/stores/__tests__/email-store-initial-loading.test.ts
@@ -0,0 +1,32 @@
+import { beforeEach, describe, expect, it } from 'vitest';
+import { useEmailStore } from '@/stores/email-store';
+
+// On a first load the folders arrive before the first page of mail. If the
+// folder fetch turned isLoading off, the list showed "No emails" until the
+// page fetch turned it on again, then a fresh skeleton.
+
+const initialState = useEmailStore.getState();
+
+const clientWith = (mailboxes: unknown[]) => ({
+ getAllMailboxesWithState: async () => ({ mailboxes, states: {} }),
+});
+
+beforeEach(() => {
+ useEmailStore.setState(initialState, true);
+});
+
+describe('fetchMailboxes on a first load', () => {
+ it('leaves the list loading for the page fetch that follows', async () => {
+ const inbox = { id: 'inbox', name: 'Inbox', role: 'inbox', totalEmails: 3, unreadEmails: 0, sortOrder: 0 };
+ await useEmailStore.getState().fetchMailboxes(clientWith([inbox]) as never);
+
+ expect(useEmailStore.getState().selectedMailbox).toBe('inbox');
+ expect(useEmailStore.getState().isLoading).toBe(true);
+ });
+
+ it('stops loading when the server has no folders', async () => {
+ await useEmailStore.getState().fetchMailboxes(clientWith([]) as never);
+
+ expect(useEmailStore.getState().isLoading).toBe(false);
+ });
+});
diff --git a/stores/auth-store.ts b/stores/auth-store.ts
index 38d47723f..e3a78b048 100644
--- a/stores/auth-store.ts
+++ b/stores/auth-store.ts
@@ -2499,11 +2499,13 @@ export const useAuthStore = create()(
// clearing it), so snapshot + clear it now - synchronously, right before
// the restore and client swap below - so the UI never blanks between the
// two accounts. The network path already snapshotted and cleared above.
+ // The settings flush is a request, so it goes first: awaited after the
+ // clear, the list showed "No emails" until it came back.
if (wasConnected) {
- snapshotAndClearForSwitch(get().activeAccountId);
await useSettingsStore.getState().flushSync();
useSettingsStore.getState().disableSync();
if (superseded()) return;
+ snapshotAndClearForSwitch(get().activeAccountId);
}
// Restore cached state or fetch fresh
diff --git a/stores/email-store.ts b/stores/email-store.ts
index 1f2f03c6d..aecbea409 100644
--- a/stores/email-store.ts
+++ b/stores/email-store.ts
@@ -2449,7 +2449,10 @@ export const useEmailStore = create((set, get) => ({
|| isUnifiedMailboxId(currentSelectedMailbox)
|| isCrossViewId(currentSelectedMailbox)
|| (currentSelectedMailbox && mailboxes.some(m => m.id === currentSelectedMailbox));
- const loadingPatch = isInitialLoad
+ // A first load with folders leaves isLoading on: the first page is
+ // fetched next and turns it off. Dropping it here showed "No emails"
+ // between the two, and a new skeleton after it.
+ const loadingPatch = isInitialLoad && mailboxes.length === 0
? { isLoading: false, mailboxSyncStates: fetched.states }
: { mailboxSyncStates: fetched.states };
if (!selectionValid) {