Merge nucleic/zesty-pebble-raven-ergx into dev
This commit is contained in:
@@ -272,7 +272,7 @@ enum StatusStyle {
|
|||||||
|
|
||||||
static func label(_ status: SessionStatus, disposition: TurnDisposition? = nil) -> String {
|
static func label(_ status: SessionStatus, disposition: TurnDisposition? = nil) -> String {
|
||||||
if status == .awaitingInput, disposition == .completed { return "Done" }
|
if status == .awaitingInput, disposition == .completed { return "Done" }
|
||||||
if status == .awaitingInput, disposition == .waitingBackground { return "Waiting…" }
|
if status == .awaitingInput, disposition == .waitingBackground { return "Monitoring…" }
|
||||||
return status.displayName
|
return status.displayName
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -280,7 +280,7 @@ enum StatusStyle {
|
|||||||
static func sortRank(_ summary: WireSessionSummary) -> Int {
|
static func sortRank(_ summary: WireSessionSummary) -> Int {
|
||||||
switch summary.status {
|
switch summary.status {
|
||||||
case .awaitingApproval: return 0
|
case .awaitingApproval: return 0
|
||||||
// Both "Done" and "Waiting…" (parked on a background monitor) are calm — they sort below
|
// Both "Done" and "Monitoring…" (parked on a background monitor) are calm — they sort below
|
||||||
// running rather than up with the genuinely-needs-you turns.
|
// running rather than up with the genuinely-needs-you turns.
|
||||||
case .awaitingInput:
|
case .awaitingInput:
|
||||||
return (summary.disposition == .completed || summary.disposition == .waitingBackground)
|
return (summary.disposition == .completed || summary.disposition == .waitingBackground)
|
||||||
|
|||||||
Reference in New Issue
Block a user