ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

dialog button labels

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-20 11:29:09 -07:00
parent 14aa3f2d98
commit 0438c9d329
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mac/Sources/Byre/MergeDialog.swift
+3 -3
View File
@@ -147,15 +147,15 @@ func confirmMerge(_ taskId: String, _ store: Store, _ overlays: Overlays, keepOp
return
}
if !model.running {
if await overlays.showModal(content, [ModalButton(label: "Cancel", value: "cancel"), ModalButton(label: "Merge", value: "ok", primary: true)], inPane: true, canSubmit: { model.valid }) == "ok" {
if await overlays.showModal(content, [ModalButton(label: "Cancel", value: "cancel"), ModalButton(label: "Merge & complete", value: "ok", primary: true)], inPane: true, canSubmit: { model.valid }) == "ok" {
await merge(false)
}
return
}
let choice = await overlays.showModal(content, [
ModalButton(label: "Cancel", value: "cancel"),
ModalButton(label: "Merge now", value: "now"),
ModalButton(label: "After review", value: "after", primary: true, help: "Merge once the running review finishes with no findings"),
ModalButton(label: "Merge & complete now", value: "now"),
ModalButton(label: "Merge & complete after review", value: "after", primary: true, help: "Merge once the running review finishes with no findings"),
], inPane: true, canSubmit: { model.valid })
if choice == "now" || choice == "after" {
await merge(choice == "after")