Repository navigation
fix: style "each" on the group send sheet and keep the pay sheet's amount until dismiss - #1243
Merged
Merged
Conversation
The confirm sheet drew "$1.00 each" as one `.appDisplayLarge` string, so "each" was as large as the amount. It now follows the chat cash card's amount line: "each" at half the amount's size, medium weight, in `textSecondary`, the total line's color. The line is one `Text`, so the amount and "each" shrink together on one line. `GroupSendViewModel` exposes the bare amount (`eachAmountLabel`) and `isSplitAcrossSelection` instead of a joined string. One recipient still shows only the amount. Refs code-payments/flipcash-client-orchestrator#126
The Swipe to Pay sheet read its amount from `PaymentRequestPayment.share`, which is nil once the share reads paid. `submit()` refreshes the request before returning success, so the amount went blank during the checkmark hold and dismiss. `prepare()` now stores the request and share it found payable in `sheetSnapshot`, and the presenter renders the sheet from that snapshot, whatever the live request does afterwards. The chat strip opens the same presenter, so both entry points are covered. Refs code-payments/flipcash-client-orchestrator#126
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.
Two sheet fixes from code-payments/flipcash-client-orchestrator#126 (group-send step 3, group-requests "Paying a share" step 5).
Group send confirm sheet: "each" was amount-sized.
GroupSendConfirmSheetdreweachLabel("$1.00 each") as one.appDisplayLargestring. It now matchesChatCashCardCell.amountLine: "each" follows the amount at half its size, medium weight, intextSecondary(the total line's color). Amount and "each" are oneText, so they shrink together on one line.GroupSendViewModelexposes the bare amount (eachAmountLabel) andisSplitAcrossSelectionin place of the joined string. One recipient still shows only the amount.Swipe to Pay sheet blanked its amount before dismissing. The presenter in
PaymentRequestDetailsScreen.swiftbuilt the amount fromPaymentRequestPayment.share, which is nil once the share reads paid.submit()refreshes the request before returning.success, so the amount went blank during the checkmark hold and dismiss.prepare()now stores the request and share it found payable insheetSnapshot, and the sheet renders from that snapshot whatever the live request does afterwards. The chat strip opens the same presenter, so both entry points are covered.PaymentRequestPaymentCurrencyTestscovers the snapshot outliving a refresh that marks the share paid.