Conversation
Because: * Cancelling on desktop only closed the pairing channel, and a closed channel looks the same as an expired one from the mobile end. * Mobile fell back to "Looks like we timed out", blaming a wait the user never made; the designs call for "Canceled". This commit: * Sends pair:auth:cancel from the authority before it tears the channel down. * Fails the supplicant on that notice and records that the authority cancelled. * Routes the supplicant's dead-end screen with reason 'canceled' instead of falling through to 'timeout'. Closes: FXA-14453
dschom
marked this pull request as ready for review
September 4, 2026 20:17
Contributor
Author
|
I've manually validated this now works locally. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Because
like we timed out", blaming a wait the user never made.
stops the flow.
This pull request
pair:auth:cancelfrom the authority before it tears down the pairingchannel.
was the one that cancelled.
reasonon both supplicant exits totimeout_and_cancel, so thedead-end screen renders the Canceled variant.
close still reading as a timeout.
Issue that this pull request solves
Closes: FXA-14453
Checklist
Put an
xin the boxes that applyHow to review (Optional)
cancel()inpairing-authority-integration.tsand
handleAuthCancelinpairing-supplicant-integration.ts.channel closes;
cancel()swallows a failed send so a dead channel stilltears down.
Screenshots (Optional)
Please attach the screenshots of the changes made in case of change in user interface.
Other information (Optional)
mobile Cancel button, and landed the "Canceled" strings this PR now reaches.
pairingFlowV2.spec.tscovers supplicant-cancel end to end; theauthority-cancel mirror is a follow-up. That spec is gated behind Firefox
Nightly and does not run in CI.