From f8e68412b53fcee4880779d7bb9a6eb9cb08a67d Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Mon, 19 Oct 2026 10:03:02 -0700 Subject: [PATCH] ready to merge buttons at bottom --- mac/Sources/Byre/Chat.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mac/Sources/Byre/Chat.swift b/mac/Sources/Byre/Chat.swift index 6a55df8..46ae824 100644 --- a/mac/Sources/Byre/Chat.swift +++ b/mac/Sources/Byre/Chat.swift @@ -1372,14 +1372,16 @@ private struct ReadyBubble: View { WhenText(when: when) .font(Fonts.font(11)) .foregroundStyle(Palette.muted) - Spacer(minLength: 0) - if current, let task { - let busy = store.taskBusy(task.id) + } + MarkdownView(blocks: blocks, ctx: MDContext(taskId: taskId)) + if current, let task { + let busy = store.taskBusy(task.id) + HStack(spacing: 8) { + Spacer(minLength: 0) MergeButton(task: task, busy: busy, unmerged: unmerged, small: true) DiscardButton(task: task, busy: busy, small: true) } } - MarkdownView(blocks: blocks, ctx: MDContext(taskId: taskId)) } .padding(.horizontal, 12) .padding(.vertical, 8)