Skip to content

fix: honor task cancellation in QRPairingSheet pairing flow #8210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashleeradka merged 1 commit into from
Feb 24, 2026
Merged

fix: honor task cancellation in QRPairingSheet pairing flow #8210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions clients/ios/Views/Settings/QRPairingSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,10 @@ struct QRPairingSheet: View {
handlePairingResponse(result, payload: payload, effectiveBaseURL: lanUrl)
return
}
// LAN failed, fall through to cloud gateway
// LAN failed — but if we were cancelled while waiting, stop here
// instead of falling through to the gateway path.
guard !Task.isCancelled else { return }
// Fall through to cloud gateway
}

// Cloud gateway
Expand All @@ -311,7 +314,7 @@ struct QRPairingSheet: View {
)
if let result = result {
handlePairingResponse(result, payload: payload, effectiveBaseURL: payload.gatewayURL)
} else {
} else if !Task.isCancelled {
await MainActor.run {
errorMessage = "Could not reach your Mac. Make sure the Vellum daemon is running."
phase = .error
Expand Down
Loading