ready to merge buttons at bottom

2026-10-19 10:03:02 -07:00
parent e08a32843e
commit f8e68412b5
1 changed files with 6 additions and 4 deletions
@@ -1372,14 +1372,16 @@ private struct ReadyBubble: View {
                WhenText(when: when)
                    .font(Fonts.font(11))
                    .foregroundStyle(Palette.muted)
-                Spacer(minLength: 0)
+            }
+            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)