From f2b4cb755c9bf0a73e4cd49412c5bb94906f667d Mon Sep 17 00:00:00 2001
From: Will Pfleger <wpfleger@block.xyz>
Date: Tue, 26 May 2026 19:54:58 -0400
Subject: [PATCH] revert: remove EditorContent null guards
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The null guards added conditional rendering that disrupted the mount
lifecycle — EditorContent was removed from the tree for one render
cycle, then re-added, racing with tiptap 3.23.6's scheduleDestroy
timeout. PureEditorContent already handles null editor gracefully
via optional chaining, so the guards are unnecessary.
---
 desktop/src/features/forum/ui/ForumComposer.tsx              | 2 +-
 desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx | 2 +-
 desktop/src/features/messages/ui/MessageComposer.tsx         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/desktop/src/features/forum/ui/ForumComposer.tsx b/desktop/src/features/forum/ui/ForumComposer.tsx
index 81d0d174d0..b88c1fe35c 100644
--- a/desktop/src/features/forum/ui/ForumComposer.tsx
+++ b/desktop/src/features/forum/ui/ForumComposer.tsx
@@ -451,7 +451,7 @@ export function ForumComposer({
             className="rich-text-composer max-h-32 overflow-y-auto"
             onKeyDown={handleEditorKeyDown}
           >
-            {richText.editor && <EditorContent editor={richText.editor} />}
+            <EditorContent editor={richText.editor} />
           </div>
 
           <MessageComposerToolbar
diff --git a/desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx b/desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx
index 7a4db22040..e482e01421 100644
--- a/desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx
+++ b/desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx
@@ -31,7 +31,7 @@ export function ForumComposerCompactLayout({
         className="rich-text-composer max-h-10 min-w-0 flex-1 overflow-y-auto"
         onKeyDown={onEditorKeyDown}
       >
-        {editor && <EditorContent editor={editor} />}
+        <EditorContent editor={editor} />
       </div>
       <Button
         aria-label={isSending ? "Sending" : "Send message"}
diff --git a/desktop/src/features/messages/ui/MessageComposer.tsx b/desktop/src/features/messages/ui/MessageComposer.tsx
index aa99b60fed..f44e684be9 100644
--- a/desktop/src/features/messages/ui/MessageComposer.tsx
+++ b/desktop/src/features/messages/ui/MessageComposer.tsx
@@ -720,7 +720,7 @@ export function MessageComposer({
             ref={composerScrollRef}
             onKeyDown={handleEditorKeyDown}
           >
-            {richText.editor && <EditorContent editor={richText.editor} />}
+            <EditorContent editor={richText.editor} />
           </div>
 
           <MessageComposerToolbar