From 45a7f2ec6a79912be2992378ab9f157fbe8a88e0 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Mon, 2 Nov 2026 22:30:02 +0100
Subject: [PATCH] fix: show an HTML-only signature in the identity list

---
 .../identity-list-signature.test.tsx          | 41 +++++++++++++++++++
 .../identity/identity-manager-modal.tsx       |  6 ++-
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 components/identity/__tests__/identity-list-signature.test.tsx

diff --git a/components/identity/__tests__/identity-list-signature.test.tsx b/components/identity/__tests__/identity-list-signature.test.tsx
new file mode 100644
index 000000000..d0aba1e38
--- /dev/null
+++ b/components/identity/__tests__/identity-list-signature.test.tsx
@@ -0,0 +1,41 @@
+import { render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { IdentityManagerModal } from '@/components/identity/identity-manager-modal';
+import { useAuthStore } from '@/stores/auth-store';
+import { useIdentityStore } from '@/stores/identity-store';
+
+// The identity list shows each identity's signature. One set only as HTML
+// showed as no signature at all; it shows as its text, without tags.
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+describe('identity list signature', () => {
+  const initial = { auth: useAuthStore.getState(), identity: useIdentityStore.getState() };
+  beforeEach(() => {
+    useAuthStore.setState({ client: null, refreshIdentities: vi.fn(), syncIdentities: vi.fn() } as never);
+  });
+  afterEach(() => {
+    useAuthStore.setState(initial.auth, true);
+    useIdentityStore.setState(initial.identity, true);
+  });
+
+  it('shows an HTML-only signature as text', () => {
+    useIdentityStore.setState({
+      identities: [{ id: 'i1', name: 'Work', email: 'work@example.com', textSignature: '', htmlSignature: '<p>Best, <b>Ann</b></p>', mayDelete: true }],
+    } as never);
+    render(<IdentityManagerModal isOpen onClose={vi.fn()} />);
+    const line = screen.getByText(/display\.signature/);
+    expect(line.textContent).toContain('Best, Ann');
+    expect(line.textContent).not.toContain('<');
+  });
+
+  it('shows a text signature as it is', () => {
+    useIdentityStore.setState({
+      identities: [{ id: 'i1', name: 'Work', email: 'work@example.com', textSignature: 'Cheers, Ann', htmlSignature: '', mayDelete: true }],
+    } as never);
+    render(<IdentityManagerModal isOpen onClose={vi.fn()} />);
+    expect(screen.getByText(/display\.signature/).textContent).toContain('Cheers, Ann');
+  });
+});
diff --git a/components/identity/identity-manager-modal.tsx b/components/identity/identity-manager-modal.tsx
index 97c674e81..f4f1b61c3 100644
--- a/components/identity/identity-manager-modal.tsx
+++ b/components/identity/identity-manager-modal.tsx
@@ -28,6 +28,7 @@ import { toast } from '@/stores/toast-store';
 import { useConfirmDialog } from '@/hooks/use-confirm-dialog';
 import { useDiscardChanges } from '@/components/settings/use-discard-changes';
 import { toUnicodeEmail } from '@/lib/idn';
+import { getPlainTextSignature } from '@/lib/signature-utils';
 import { sortIdentities } from '@/lib/identity-order';
 import { useRestriction } from '@/hooks/use-restriction';
 
@@ -301,9 +302,10 @@ export function IdentityManagerModal({ isOpen, onClose }: IdentityManagerModalPr
                               {t('display.bcc')} {identity.bcc.map((a) => toUnicodeEmail(a.email)).join(', ')}
                             </p>
                           )}
-                          {showOwnSignature && identity.textSignature && (
+                          {/* An HTML-only signature shows as its text, not as none. */}
+                          {showOwnSignature && getPlainTextSignature(identity) && (
                             <p className="line-clamp-2">
-                              {t('display.signature')} {identity.textSignature}
+                              {t('display.signature')} {getPlainTextSignature(identity)}
                             </p>
                           )}
                         </div>