Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Bitkit/AppScene.swift
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@ struct AppScene: View {
return false
}

await PaykitPaymentProofService.shared.reconcile()
let previousRequests = paykitPaymentRequestManager.pendingRequests
await paykitPaymentRequestManager.refreshEligibleTargets(savedPublicKeys: contactsManager.contacts.map(\.publicKey))
await paykitPaymentRequestManager.refresh()
Expand Down
3 changes: 2 additions & 1 deletion Bitkit/Components/Button/Button.swift
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ struct CustomButton: View {
icon: icon,
isDisabled: effectiveIsDisabled,
isPressed: isPressed,
isLoading: isLoading
isLoading: isLoading,
shouldExpand: shouldExpand
))
case .tertiary:
AnyView(TertiaryButtonView(
Expand Down
3 changes: 2 additions & 1 deletion Bitkit/Components/Button/SecondaryButtonView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ struct SecondaryButtonView: View {
let isDisabled: Bool
let isPressed: Bool
var isLoading: Bool = false
let shouldExpand: Bool

var body: some View {
HStack(spacing: 8) {
Expand All @@ -24,7 +25,7 @@ struct SecondaryButtonView: View {
BodySSBText(title, textColor: textColor)
}
}
.frame(maxWidth: size == .large ? .infinity : nil)
.frame(maxWidth: (size == .large || shouldExpand) ? .infinity : nil)
.frame(height: buttonHeight)
.padding(.horizontal, 16)
.background(isPressed ? Color.white10 : Color.clear)
Expand Down
Loading
Loading