feat(v2): card-style add-money method rows - #1226
Merged
Merged
Conversation
The nav bar hid whenever a BottomBar message showed, which collapsed the scaffold's bottom slot and re-laid-out the tab content beneath — visibly re-fanning the wallet's collapsing card stack when the Add Money modal opened. The modal's scrim already covers the bar via z-order, so the bar no longer needs to hide for modals; it now only hides for a presented bill/tip card.
Redesign the 'Add Money With' purchase-method sheet for v2 as card rows — title + subtitle + trailing icon — instead of the v1 filled buttons. - BottomBarAction gains an optional `content` slot; when set, BottomBarView renders it as a full-width card row (own surface, ripple, click) rather than a centered text button. No impact on existing actions. - Buttons.kt builds the cards (Debit Card / Cash Reserves / Phantom / Other Wallet) when NewUi is on, gated via a FeatureFlagController injected into the controller, which also titles the sheet 'Add Money With'. v1 buttons unchanged. - Icons: Debit Card -> Google Pay mark (with the 'Pay' wordmark recoloured white), Phantom -> ghost, Other Wallet -> the exact Figma QR export (ic_qr_code); all sized 32dp, monochrome glyphs tinted white.
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
Redesigns the "Add Money With" purchase-method sheet for v2 as card rows — title + subtitle + trailing icon — instead of the v1 filled buttons (per Figma
8966-2140).BottomBarActiongains an optionalcontent: @Composable RowScope.() -> Unitslot. When set,BottomBarViewrenders it as a full-width card row (own surface, ripple, click) rather than a centeredCodeButton. Existing text/inline-icon actions are untouched.Buttons.ktbuilds the cards — Debit Card / Cash Reserves / Phantom / Other Wallet — whenFeatureFlag.NewUiis on, gated via aFeatureFlagControllerinjected intoInternalPurchaseMethodController(which also titles the sheet "Add Money With"). The v1 buttons are unchanged. Reserves is preserved (it can appear in the Buy/swap flow whereshowReservesdefaults true).ic_qr_code.xml, node8965:5247). All 32dp; monochrome glyphs tinted white.Also includes a nav-layout fix (separate commit): the tab bar no longer hides for BottomBar modals — that hiding collapsed the scaffold's bottom slot and re-laid-out the wallet, visibly re-fanning the collapsing card stack when Add Money opened. The modal scrim covers the bar via z-order; the bar still hides for a presented bill.
Test Plan
:libs:messaging,:ui:components,:shared:funding, and the full app compile;:shared:fundingunit tests pass; installed on emulator.Notes
White10+shapes.medium; the content-slot approach keeps the card layout in the funding module and the shared renderer change minimal.