Repository navigation
Pairing screen: first-use UX, wave 4 — fallback and conflict dialog - #487
Merged
Merged
Conversation
… device A tile the page service marks as dimmed (the trainer is kept but not used while the ride runs on a separate power meter or speed sensor) now gets the muted look of a switched-off tile: device name and role line, the footer copy as given, no value and no switch. A tap still calls the tile's onClick. The phone's status bars use the same dimmed look and state line, and a dimmed tile is never counted as connected.
…back action The header with title and close button, and the pinned area at the bottom, move into PairingSidePanel, so another panel can take the same slot beside the tiles with the same look. The helper renders as before. New fixtures and tests cover the helper offering to ride on a separate power meter: the action label comes from the page service as given, pinned below the tip.
…e list When the page service sends a conflict step for the open device list, the list is replaced, in the same dialog, by one row per slot already held by a different device, each with a keep and a replace choice, and a Done button. Done applies the choices; a tap outside or the back button applies the choices made so far through the step's own dismiss handler. The deprecated "For all capabilities" switch is gone from the list: a tap on a device now picks it without any argument, and the page service decides what happens to the other slots.
…tiles When the page service gives a pending conflict (a device found by the search wants slots another device holds), it is rendered as a card in the panel slot the helper uses: the title with how many more wait, the subline (phone or full copy), one row per slot with keep/replace, Done pinned at the bottom and a close button that keeps every current device. The card is non-modal, so the page's own buttons stay usable, and on a phone the required row collapses to status bars as it does for the helper. The page renders the card whenever it is given; the page service decides when. Tests now also guard that the page shows exactly the buttons the page service gives, and that no state of the page - helper, fallback, conflict card or the list's conflict step - shows a "try again" button.
…og's width The device list's conflict step body (subline and rows) moves next to the rows as ConflictStepBody, and the list dialog's width into a helper, so a second conflict dialog can render the same body at the same size. The body also shows how many more conflicts wait, when the page service says so. No change to how the device list behaves.
…not a card A device found by the search that wants slots held by another device now asks in the same dialog, at the same size, as the Resistance list's own conflict step, instead of a card in the panel beside the tiles. The automatic and manual conflicts now share one pattern. - the dialog shows the conflict's title, subline (short on a phone, full on a tablet), how many more wait, the rows, and Done; there is no close button - a tap outside or the back button go to the conflict's onDismiss right away - for half a second after a conflict appears, Keep, Use and Done ignore taps, since the dialog opens by itself and may catch a tap meant for the page; ignored taps are logged - as a modal, the dialog keeps OK out of reach while it is open - the tiles stay as they are behind it: only the helper still turns the required row into status bars on a phone - the conflict card is removed
Only the conflict card used it, to say how many more conflicts wait. The panel now holds just the helper, which never sets it.
… footer note
With scrollable={false}, the children scroll themselves, but the content
View around them never shrank: it grew to the children's full height and
ran under the footer on short screens. It now shrinks to the space between
header and footer. This also fixes the route details form at a short phone
height, whose last rows were drawn behind the Cancel/Start buttons and
could not be reached.
A new footerNote shows a short line on the footer's line, left of the
buttons, which stay centered.
The compact button stays about 34 high; its vertical hitSlop grows from 5 to 8, which takes the touch target to about 50, inside the bar's margin.
On a phone in landscape, a conflict with two or more rows was cut off below the first row, with no sign that more followed - in the device list's conflict step and in the dialog for a device found by the search alike. - the rows scroll in a view of their own below the subline, with a "More below" hint while rows are hidden; taps pass through the hint - in landscape, each row's Keep and Use share one line - on a phone, a conflict dialog may take nearly the whole height - how many more conflicts wait moves into the footer, left of Done, and says what it counts: "2 more to check" on a phone, "2 more devices to check" on a tablet; it no longer reads as part of the title
…' queued-count copy Real-device testing found two problems the Storybook screenshots had missed: the title wrapped to two lines on a phone, and only a few pixels between the choice rows could start a scroll drag (the choice buttons fill nearly the whole row height). - Dialog's title now shrinks to fit one line instead of wrapping (affects every dialog, not just this one - a title that already fits is unaffected). - Widened the gap between a conflict's rows, giving a reliably larger non-button strip to start scrolling from. - PairingConflictDialog and the device list's own conflict step now render the page service's own queued-count copy (queuedText.full/ .short) instead of building wording from the count themselves, matching services commit 5843db30. Removed the now-unused local wording helper.
…ut on phone Real-device testing found the earlier row-spacing fix still wasn't enough: the choice buttons leave too little non-button area to reliably start a scroll drag, and the ~480dp-wide dialog wraps long device names onto a second line. - On phone, the conflict step (both the automatic dialog and the device list's own step) now fills the screen, still the same modal Dialog - only its size changes. Tablet and desktop are unaffected. - Each row's layout changes from a title line above the choices to a fixed-width label column beside them, collapsing a row from two lines to one and turning the label column into the scroll-drag area every row needs. - A conflict with up to 3 rows never needs to scroll at this size; scrolling (with the existing "More below" hint) remains the backstop for a 4-row conflict at a larger font scale. Verified with real Storybook screenshots at phone and tablet landscape, 1 and 3 rows.
Extracts a nested ternary into its own statement, uses .at(-1) over length-indexing, and gives getConflictDialogStyle's insets default a stable module-level constant instead of a fresh object literal per call. Also fixes the Storybook stories file, left stale after the sideBySide boolean became the layout enum.
gdoumen
force-pushed
the
feat/pairing-screen-first-use-ux-wave4
branch
from
November 10, 2026 21:06
41076e4 to
1934c76
Compare
|
gdoumen
marked this pull request as ready for review
November 10, 2026 21:08
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.


Summary
PairingConflictDialog/updatedDeviceSelectorconflict step handle both a manual pick's conflict and one raised by a device the search finds mid-ride, in the same modalDialog{full, short}queued-count copy for the dialog's footer noteTest plan
npm test— 193/193 suites, 2036/2036 tests passing