Skip to content

fix(chat): merge Send Cash's glass back into the field #1019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Oct 7, 2026
Merged

fix(chat): merge Send Cash's glass back into the field #1019

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions Flipcash/Core/Screens/Conversation/ConversationBottomBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,21 @@ struct ConversationBottomBar: View {
Color.clear
.frame(maxWidth: .infinity, maxHeight: .infinity)
.composerGlass(in: field, id: "field", namespace: composerGlassNamespace)
if leadingControl == .cash, cashIsShown {
if leadingControl == .cash {
// Kept mounted and tucked into the field's trailing end while hidden. Removed, it
// stood past the join distance and dissolved in place under the widening field.
let side = BarMetrics.contentHeight
let tucked = side * 0.4
Color.clear
.frame(width: BarMetrics.contentHeight, height: BarMetrics.contentHeight)
.composerGlass(in: Circle(), id: "cash", namespace: composerGlassNamespace)
.frame(width: cashIsShown ? side : 0, height: side)
.padding(.leading, cashIsShown ? 0 : -Self.leadingSpacing)
.overlay(alignment: .trailing) {
Color.clear
.frame(width: cashIsShown ? side : tucked, height: cashIsShown ? side : tucked)
.composerGlass(in: Circle(), id: "cash", namespace: composerGlassNamespace)
// Centred in the field's rounded end, clear of its edge.
.padding(.trailing, cashIsShown ? 0 : (side - tucked) / 2)
}
}
}
if #available(iOS 26, *) {
Expand Down
Loading