fix(tip): render token/amount sheets over the tip card - #1230
Merged
Conversation
Relocate the tip token selector from a separate "of <token>" row beneath the presets up into the modal header next to the title, and square the pill's dropdown icon (width -> size) so the chevron isn't stretched.
…d it Sheets opened from the tip modal (token selection, custom amount) are hosted by the root NavDisplay, which BillOverlay is painted on top of as an app-root sibling — so they appeared behind the tip card and modal. Host the bill (and its scrim) as a NavDisplay entry decorator on non-sheet entries instead of an app-root sibling: the bill still floats above the current screen, but a sheet's overlay scene is painted above the base entry, so tip sheets now render over the card as normal, gesture-driven sheets. This avoids a separate window (a Popup broke the nested sheet NavDisplay's back dispatcher). Keep the bill's scrim decision keyed off the tab beneath any sheet so it stays constant across the sheet (no fade), and when a plain bill dim is already present the sheet no longer stacks its own dim, disables its drag, or redraws the bill scrim on top (which had been dismissing the bill).
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.
Problem
When opening the token selection (or custom amount) sheet from the Send-a-Tip modal, the sheet rendered behind the tip card and modal instead of over it — so it was effectively unusable.
Root cause: those sheets are hosted by the root
NavDisplay, butBillOverlay(the tip card + modal) was an app-root sibling painted on top of thatNavDisplay. Since the base screen and the sheet live in the sameNavDisplay, no simple reorder could sandwich the bill between them.Approach
NavDisplayentry decorator (NavBillOverlayEntryDecorator) drawn over each non-sheet entry, instead of an app-root sibling. The bill still floats above the current screen, but it's skipped for the sheet entry, soNavDisplaypaints the sheet's overlay scene above the bill-bearing base entry. Sheets opened over the bill now render on top as normal, gesture-driven sheets — in one window (aPopupwas tried first but broke the nested sheetNavDisplay's back dispatcher). Opening a sheet doesn't change the base entry, so the bill's animation state stays stable.Verification (on device, debug build)