fix: polish trezor send loading states#708

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

Open
ben-kaufman wants to merge 5 commits into
base:master
Choose a base branch
from
Open

fix: polish trezor send loading states #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
380cbb0
fix: polish trezor send loading states
ben-kaufman Aug 31, 2026
1399a5d
chore: rename changelog fragment
ben-kaufman Aug 31, 2026
b7b2444
fix: settle hardware source loading without fees
ben-kaufman Aug 31, 2026
bb94073
fix: settle trezor send preview state
ben-kaufman Sep 1, 2026
8e142b0
Merge branch 'master' into fix/trezor-send-ui-polish
ben-kaufman Sep 2, 2026
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
6 changes: 4 additions & 2 deletions Bitkit/Components/ActivityIndicator.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct ActivityIndicator: View {
let size: CGFloat
let theme: Theme
let tint: Color?

enum Theme {
case light
Expand All@@ -12,13 +13,14 @@ struct ActivityIndicator: View {
@State private var isRotating = false
@State private var opacity: Double = 0

init(size: CGFloat = 32, theme: Theme = .light) {
init(size: CGFloat = 32, theme: Theme = .light, tint: Color? = nil) {
self.size = size
self.theme = theme
self.tint = tint
}

var body: some View {
let color = theme == .light ? Color.white : Color.black
let color = tint ?? (theme == .light ? Color.white : Color.black)

ZStack {
Circle()
Expand Down
10 changes: 8 additions & 2 deletions Bitkit/Components/NumberPadActionButton.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ struct NumberPadActionButton: View {
var color: Color = .purpleAccent
var variant: NumberPadActionButtonVariant = .primary
var disabled: Bool = false
var isLoading: Bool = false
var action: () -> Void

@State private var isPressed = false
Expand All@@ -21,7 +22,10 @@ struct NumberPadActionButton: View {
action()
} label: {
HStack(spacing: 8) {
if let imageName {
if isLoading {
ActivityIndicator(size: 10, tint: color)
.frame(width: 16, height: 16)
} else if let imageName {
Image(imageName)
.resizable()
.aspectRatio(contentMode: .fit)
Expand All@@ -40,7 +44,7 @@ struct NumberPadActionButton: View {
)
.cornerRadius(8)
}
.disabled(disabled)
.disabled(disabled || isLoading)
.buttonStyle(NoAnimationButtonStyle())
.pressEvents(
onPress: {
Expand All@@ -50,6 +54,8 @@ struct NumberPadActionButton: View {
isPressed = false
}
)
.animation(.easeInOut(duration: 0.2), value: isLoading)
.animation(.easeInOut(duration: 0.2), value: text)
}

private var background: some View {
Expand Down
14 changes: 11 additions & 3 deletions Bitkit/Components/SwipeButton.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ import SwiftUI
struct SwipeButton: View {
let title: String
let accentColor: Color
/// Blocks the swipe and shows the knob spinner while a prerequisite is still loading.
/// Blocks interaction without presenting the post-swipe loading state.
var isDisabled = false
/// Blocks interaction and shows the knob spinner while an operation is running.
var isLoading = false
/// Optional binding for swipe progress (0...1), e.g. to drive animations in the parent.
var swipeProgress: Binding<CGFloat>?
Expand All@@ -13,6 +15,10 @@ struct SwipeButton: View {
@State private var isSubmitting = false

private var isBusy: Bool {
isDisabled || isLoading || isSubmitting
}

private var showsSpinner: Bool {
isLoading || isSubmitting
}

Expand DownExpand Up@@ -43,19 +49,20 @@ struct SwipeButton: View {
.frame(height: buttonHeight - innerPadding)
.padding(.horizontal, innerPadding / 2)
}
.opacity(isDisabled ? 0.5 : 1)

// Track text
BodySSBText(title)
.frame(maxWidth: .infinity, alignment: .center)
.opacity(Double(1.0 - textProgress))
.opacity(Double(1.0 - textProgress) * (isDisabled ? 0.5 : 1))

// Knob
Circle()
.fill(accentColor)
.frame(width: buttonHeight - innerPadding, height: buttonHeight - innerPadding)
.overlay(
ZStack {
if isBusy {
if showsSpinner {
ActivityIndicator(theme: .dark)
} else {
Image("arrow-right")
Expand All@@ -75,6 +82,7 @@ struct SwipeButton: View {
.accessibilityIdentifier("GRAB")
.offset(x: clampedOffset)
.padding(.horizontal, innerPadding / 2)
.opacity(isDisabled ? 0.5 : 1)
.gesture(
DragGesture()
.onChanged { value in
Expand Down
61 changes: 43 additions & 18 deletions Bitkit/ViewModels/HwFundingSigner.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,8 @@ final class HwSendCoordinator {

private(set) var availableSats: UInt64 = 0
private(set) var previewFeeSats: UInt64 = 0
private(set) var isFundingSourceLoading = false
private(set) var isPreviewLoading = false
private(set) var isSigning = false
private(set) var isBroadcastUnresolved = false
private(set) var isPassphraseRequired = false
Expand DownExpand Up@@ -346,7 +348,11 @@ final class HwSendCoordinator {
self.availableSats = availableSats
}

func selectWallet(_ walletId: String?, initialAvailableSats: UInt64 = 0) {
func selectWallet(
_ walletId: String?,
initialAvailableSats: UInt64 = 0,
showsLoading: Bool = false
) {
guard self.walletId != walletId else { return }
guard operationTask == nil, !isBroadcastUnresolved else { return }

Expand All@@ -356,6 +362,8 @@ final class HwSendCoordinator {
pendingPayment = nil
availableSats = walletId == nil ? 0 : initialAvailableSats
previewFeeSats = 0
isFundingSourceLoading = walletId != nil && showsLoading
isPreviewLoading = false
isSigning = false
isBroadcastUnresolved = false
isPassphraseRequired = false
Expand All@@ -365,23 +373,28 @@ final class HwSendCoordinator {
func refreshAvailable(
manager: HwWalletManager,
destinationAddress: String,
satsPerVByte: UInt64
satsPerVByte: UInt64?
) async {
guard let walletId else { return }

guard !destinationAddress.isEmpty else {
if self.walletId == walletId {
availableSats = manager.fundingBalance(walletId: walletId)
}
return
}

availabilityRequestId += 1
let requestId = availabilityRequestId
isFundingSourceLoading = true

func apply(_ available: UInt64) {
guard self.walletId == walletId, availabilityRequestId == requestId else { return }
availableSats = available
isFundingSourceLoading = false
}

guard let satsPerVByte else {
apply(availableSats)
return
}

guard !destinationAddress.isEmpty else {
apply(manager.fundingBalance(walletId: walletId))
return
}

do {
Expand All@@ -407,19 +420,27 @@ final class HwSendCoordinator {
guard let walletId else { return nil }
previewRequestId += 1
let requestId = previewRequestId
isPreviewLoading = true
previewFeeSats = 0
let request = PaymentRequest(address: address, sats: sats, satsPerVByte: satsPerVByte)
if pendingPayment?.request != request {
pendingPayment = nil
}
let fee = try await manager.estimateOfflineFundingMiningFee(
walletId: walletId,
address: address,
sats: sats,
satsPerVByte: satsPerVByte
)
guard self.walletId == walletId, previewRequestId == requestId else { return nil }
previewFeeSats = fee
return fee
do {
let signer = signerFactory(manager, address, satsPerVByte)
let fee = try await signer.estimateOfflineFundingMiningFee(walletId: walletId, address: address, sats: sats)
guard self.walletId == walletId, previewRequestId == requestId else { return nil }
previewFeeSats = fee
isFundingSourceLoading = false
isPreviewLoading = false
return fee
} catch {
if self.walletId == walletId, previewRequestId == requestId {
isFundingSourceLoading = false
isPreviewLoading = false
}
throw error
}
}

func signAndBroadcast(
Expand DownExpand Up@@ -512,6 +533,10 @@ final class HwSendCoordinator {
}

func cancel() {
availabilityRequestId += 1
previewRequestId += 1
isFundingSourceLoading = false
isPreviewLoading = false
isVerifyingPassphrase = false
isPassphraseRequired = false
guard !isBroadcastUnresolved else { return }
Expand Down
17 changes: 10 additions & 7 deletions Bitkit/Views/Wallets/Send/SendAmountView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -153,7 +153,8 @@ struct SendAmountView: View {
imageName: canSwitchFundingSource ? "arrow-up-down" : nil,
color: selectedSourceColor,
variant: canSwitchFundingSource ? .primary : .secondary,
disabled: !canSwitchFundingSource || isContinuing
disabled: !canSwitchFundingSource || isContinuing,
isLoading: hwSend.isFundingSourceLoading
) {
selectNextFundingSource()
}
Expand DownExpand Up@@ -183,7 +184,7 @@ struct SendAmountView: View {

CustomButton(
title: t("common__continue"),
isDisabled: !isValidAmount,
isDisabled: !isValidAmount || hwSend.isFundingSourceLoading,
isLoading: isContinuing
) {
await onContinue()
Expand DownExpand Up@@ -368,7 +369,8 @@ struct SendAmountView: View {
)
hwSend.selectWallet(
walletId,
initialAvailableSats: balance > reserve ? balance - reserve : 0
initialAvailableSats: balance > reserve ? balance - reserve : 0,
showsLoading: true
Comment thread
ben-kaufman marked this conversation as resolved.
)
app.selectedWalletToPayFrom = .onchain
}
Expand All@@ -387,18 +389,19 @@ struct SendAmountView: View {
private func calculateMaxSendableAmount() async {
// Make sure we have everything we need to calculate the max sendable amount
guard hwSend.isActive || app.selectedWalletToPayFrom == .onchain else { return }
guard let address = app.scannedOnchainInvoice?.address else { return }
guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

if hwSend.isActive {
await hwSend.refreshAvailable(
manager: hwWalletManager,
destinationAddress: address,
satsPerVByte: UInt64(feeRate)
destinationAddress: app.scannedOnchainInvoice?.address ?? "",
satsPerVByte: wallet.selectedFeeRateSatsPerVByte.map(UInt64.init)
)
return
}

guard let address = app.scannedOnchainInvoice?.address else { return }
guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

do {
let maxAmount = try await wallet.calculateMaxSendableAmount(
address: address,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: polish trezor send loading states#708

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

 Open

ben-kaufman
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


fix: polish trezor send loading states
#708
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
380cbb0

fix: polish trezor send loading states


ben-kaufman Aug 31, 2026
1399a5d

chore: rename changelog fragment


ben-kaufman Aug 31, 2026
b7b2444

fix: settle hardware source loading without fees


ben-kaufman Aug 31, 2026
bb94073

fix: settle trezor send preview state


ben-kaufman Sep 1, 2026
8e142b0

Merge branch 'master' into fix/trezor-send-ui-polish


ben-kaufman Sep 2, 2026

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


6 changes: 4 additions & 2 deletions
Bitkit/Components/ActivityIndicator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct ActivityIndicator: View {
 let size: CGFloat
 let theme: Theme
 let tint: Color?

 enum Theme {
 case light
Expand All@@ -12,13 +13,14 @@ struct ActivityIndicator: View {
 @State private var isRotating = false
 @State private var opacity: Double = 0

 init(size: CGFloat = 32, theme: Theme = .light) {
 init(size: CGFloat = 32, theme: Theme = .light, tint: Color? = nil) {
 self.size = size
 self.theme = theme
 self.tint = tint
 }

 var body: some View {
 let color = theme == .light ? Color.white : Color.black
 let color = tint ?? (theme == .light ? Color.white : Color.black)

 ZStack {
 Circle()
Expand Down

10 changes: 8 additions & 2 deletions
Bitkit/Components/NumberPadActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ struct NumberPadActionButton: View {
 var color: Color = .purpleAccent
 var variant: NumberPadActionButtonVariant = .primary
 var disabled: Bool = false
 var isLoading: Bool = false
 var action: () -> Void

 @State private var isPressed = false
Expand All@@ -21,7 +22,10 @@ struct NumberPadActionButton: View {
 action()
 } label: {
 HStack(spacing: 8) {
 if let imageName {
 if isLoading {
 ActivityIndicator(size: 10, tint: color)
 .frame(width: 16, height: 16)
 } else if let imageName {
 Image(imageName)
 .resizable()
 .aspectRatio(contentMode: .fit)
Expand All@@ -40,7 +44,7 @@ struct NumberPadActionButton: View {
 )
 .cornerRadius(8)
 }
 .disabled(disabled)
 .disabled(disabled || isLoading)
 .buttonStyle(NoAnimationButtonStyle())
 .pressEvents(
 onPress: {
Expand All@@ -50,6 +54,8 @@ struct NumberPadActionButton: View {
 isPressed = false
 }
 )
 .animation(.easeInOut(duration: 0.2), value: isLoading)
 .animation(.easeInOut(duration: 0.2), value: text)
 }

 private var background: some View {
Expand Down

14 changes: 11 additions & 3 deletions
Bitkit/Components/SwipeButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ import SwiftUI
struct SwipeButton: View {
 let title: String
 let accentColor: Color
 /// Blocks the swipe and shows the knob spinner while a prerequisite is still loading.
 /// Blocks interaction without presenting the post-swipe loading state.
 var isDisabled = false
 /// Blocks interaction and shows the knob spinner while an operation is running.
 var isLoading = false
 /// Optional binding for swipe progress (0...1), e.g. to drive animations in the parent.
 var swipeProgress: Binding<CGFloat>?
Expand All@@ -13,6 +15,10 @@ struct SwipeButton: View {
 @State private var isSubmitting = false

 private var isBusy: Bool {
 isDisabled || isLoading || isSubmitting
 }

 private var showsSpinner: Bool {
 isLoading || isSubmitting
 }

Expand DownExpand Up@@ -43,19 +49,20 @@ struct SwipeButton: View {
 .frame(height: buttonHeight - innerPadding)
 .padding(.horizontal, innerPadding / 2)
 }
 .opacity(isDisabled ? 0.5 : 1)

 // Track text
 BodySSBText(title)
 .frame(maxWidth: .infinity, alignment: .center)
 .opacity(Double(1.0 - textProgress))
 .opacity(Double(1.0 - textProgress) * (isDisabled ? 0.5 : 1))

 // Knob
 Circle()
 .fill(accentColor)
 .frame(width: buttonHeight - innerPadding, height: buttonHeight - innerPadding)
 .overlay(
 ZStack {
 if isBusy {
 if showsSpinner {
 ActivityIndicator(theme: .dark)
 } else {
 Image("arrow-right")
Expand All@@ -75,6 +82,7 @@ struct SwipeButton: View {
 .accessibilityIdentifier("GRAB")
 .offset(x: clampedOffset)
 .padding(.horizontal, innerPadding / 2)
 .opacity(isDisabled ? 0.5 : 1)
 .gesture(
 DragGesture()
 .onChanged { value in
Expand Down

61 changes: 43 additions & 18 deletions
Bitkit/ViewModels/HwFundingSigner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,8 @@ final class HwSendCoordinator {

 private(set) var availableSats: UInt64 = 0
 private(set) var previewFeeSats: UInt64 = 0
 private(set) var isFundingSourceLoading = false
 private(set) var isPreviewLoading = false
 private(set) var isSigning = false
 private(set) var isBroadcastUnresolved = false
 private(set) var isPassphraseRequired = false
Expand DownExpand Up@@ -346,7 +348,11 @@ final class HwSendCoordinator {
 self.availableSats = availableSats
 }

 func selectWallet(_ walletId: String?, initialAvailableSats: UInt64 = 0) {
 func selectWallet(
 _ walletId: String?,
 initialAvailableSats: UInt64 = 0,
 showsLoading: Bool = false
 ) {
 guard self.walletId != walletId else { return }
 guard operationTask == nil, !isBroadcastUnresolved else { return }

Expand All@@ -356,6 +362,8 @@ final class HwSendCoordinator {
 pendingPayment = nil
 availableSats = walletId == nil ? 0 : initialAvailableSats
 previewFeeSats = 0
 isFundingSourceLoading = walletId != nil && showsLoading
 isPreviewLoading = false
 isSigning = false
 isBroadcastUnresolved = false
 isPassphraseRequired = false
Expand All@@ -365,23 +373,28 @@ final class HwSendCoordinator {
 func refreshAvailable(
 manager: HwWalletManager,
 destinationAddress: String,
 satsPerVByte: UInt64
 satsPerVByte: UInt64?
 ) async {
 guard let walletId else { return }

 guard !destinationAddress.isEmpty else {
 if self.walletId == walletId {
 availableSats = manager.fundingBalance(walletId: walletId)
 }
 return
 }

 availabilityRequestId += 1
 let requestId = availabilityRequestId
 isFundingSourceLoading = true

 func apply(_ available: UInt64) {
 guard self.walletId == walletId, availabilityRequestId == requestId else { return }
 availableSats = available
 isFundingSourceLoading = false
 }

 guard let satsPerVByte else {
 apply(availableSats)
 return
 }

 guard !destinationAddress.isEmpty else {
 apply(manager.fundingBalance(walletId: walletId))
 return
 }

 do {
Expand All@@ -407,19 +420,27 @@ final class HwSendCoordinator {
 guard let walletId else { return nil }
 previewRequestId += 1
 let requestId = previewRequestId
 isPreviewLoading = true
 previewFeeSats = 0
 let request = PaymentRequest(address: address, sats: sats, satsPerVByte: satsPerVByte)
 if pendingPayment?.request != request {
 pendingPayment = nil
 }
 let fee = try await manager.estimateOfflineFundingMiningFee(
 walletId: walletId,
 address: address,
 sats: sats,
 satsPerVByte: satsPerVByte
 )
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 return fee
 do {
 let signer = signerFactory(manager, address, satsPerVByte)
 let fee = try await signer.estimateOfflineFundingMiningFee(walletId: walletId, address: address, sats: sats)
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 isFundingSourceLoading = false
 isPreviewLoading = false
 return fee
 } catch {
 if self.walletId == walletId, previewRequestId == requestId {
 isFundingSourceLoading = false
 isPreviewLoading = false
 }
 throw error
 }
 }

 func signAndBroadcast(
Expand DownExpand Up@@ -512,6 +533,10 @@ final class HwSendCoordinator {
 }

 func cancel() {
 availabilityRequestId += 1
 previewRequestId += 1
 isFundingSourceLoading = false
 isPreviewLoading = false
 isVerifyingPassphrase = false
 isPassphraseRequired = false
 guard !isBroadcastUnresolved else { return }
Expand Down

17 changes: 10 additions & 7 deletions
Bitkit/Views/Wallets/Send/SendAmountView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,7 +153,8 @@ struct SendAmountView: View {
 imageName: canSwitchFundingSource ? "arrow-up-down" : nil,
 color: selectedSourceColor,
 variant: canSwitchFundingSource ? .primary : .secondary,
 disabled: !canSwitchFundingSource || isContinuing
 disabled: !canSwitchFundingSource || isContinuing,
 isLoading: hwSend.isFundingSourceLoading
 ) {
 selectNextFundingSource()
 }
Expand DownExpand Up@@ -183,7 +184,7 @@ struct SendAmountView: View {

 CustomButton(
 title: t("common__continue"),
 isDisabled: !isValidAmount,
 isDisabled: !isValidAmount || hwSend.isFundingSourceLoading,
 isLoading: isContinuing
 ) {
 await onContinue()
Expand DownExpand Up@@ -368,7 +369,8 @@ struct SendAmountView: View {
 )
 hwSend.selectWallet(
 walletId,
 initialAvailableSats: balance > reserve ? balance - reserve : 0
 initialAvailableSats: balance > reserve ? balance - reserve : 0,
 showsLoading: true
Comment thread
ben-kaufman marked this conversation as resolved.

 )
 app.selectedWalletToPayFrom = .onchain
 }
Expand All@@ -387,18 +389,19 @@ struct SendAmountView: View {
 private func calculateMaxSendableAmount() async {
 // Make sure we have everything we need to calculate the max sendable amount
 guard hwSend.isActive || app.selectedWalletToPayFrom == .onchain else { return }
 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 if hwSend.isActive {
 await hwSend.refreshAvailable(
 manager: hwWalletManager,
 destinationAddress: address,
 satsPerVByte: UInt64(feeRate)
 destinationAddress: app.scannedOnchainInvoice?.address ?? "",
 satsPerVByte: wallet.selectedFeeRateSatsPerVByte.map(UInt64.init)
 )
 return
 }

 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 do {
 let maxAmount = try await wallet.calculateMaxSendableAmount(
 address: address,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: polish trezor send loading states#708

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

 Open

ben-kaufman
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


fix: polish trezor send loading states
#708
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
380cbb0

fix: polish trezor send loading states


ben-kaufman Aug 31, 2026
1399a5d

chore: rename changelog fragment


ben-kaufman Aug 31, 2026
b7b2444

fix: settle hardware source loading without fees


ben-kaufman Aug 31, 2026
bb94073

fix: settle trezor send preview state


ben-kaufman Sep 1, 2026
8e142b0

Merge branch 'master' into fix/trezor-send-ui-polish


ben-kaufman Sep 2, 2026

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


6 changes: 4 additions & 2 deletions
Bitkit/Components/ActivityIndicator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct ActivityIndicator: View {
 let size: CGFloat
 let theme: Theme
 let tint: Color?

 enum Theme {
 case light
Expand All@@ -12,13 +13,14 @@ struct ActivityIndicator: View {
 @State private var isRotating = false
 @State private var opacity: Double = 0

 init(size: CGFloat = 32, theme: Theme = .light) {
 init(size: CGFloat = 32, theme: Theme = .light, tint: Color? = nil) {
 self.size = size
 self.theme = theme
 self.tint = tint
 }

 var body: some View {
 let color = theme == .light ? Color.white : Color.black
 let color = tint ?? (theme == .light ? Color.white : Color.black)

 ZStack {
 Circle()
Expand Down

10 changes: 8 additions & 2 deletions
Bitkit/Components/NumberPadActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ struct NumberPadActionButton: View {
 var color: Color = .purpleAccent
 var variant: NumberPadActionButtonVariant = .primary
 var disabled: Bool = false
 var isLoading: Bool = false
 var action: () -> Void

 @State private var isPressed = false
Expand All@@ -21,7 +22,10 @@ struct NumberPadActionButton: View {
 action()
 } label: {
 HStack(spacing: 8) {
 if let imageName {
 if isLoading {
 ActivityIndicator(size: 10, tint: color)
 .frame(width: 16, height: 16)
 } else if let imageName {
 Image(imageName)
 .resizable()
 .aspectRatio(contentMode: .fit)
Expand All@@ -40,7 +44,7 @@ struct NumberPadActionButton: View {
 )
 .cornerRadius(8)
 }
 .disabled(disabled)
 .disabled(disabled || isLoading)
 .buttonStyle(NoAnimationButtonStyle())
 .pressEvents(
 onPress: {
Expand All@@ -50,6 +54,8 @@ struct NumberPadActionButton: View {
 isPressed = false
 }
 )
 .animation(.easeInOut(duration: 0.2), value: isLoading)
 .animation(.easeInOut(duration: 0.2), value: text)
 }

 private var background: some View {
Expand Down

14 changes: 11 additions & 3 deletions
Bitkit/Components/SwipeButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ import SwiftUI
struct SwipeButton: View {
 let title: String
 let accentColor: Color
 /// Blocks the swipe and shows the knob spinner while a prerequisite is still loading.
 /// Blocks interaction without presenting the post-swipe loading state.
 var isDisabled = false
 /// Blocks interaction and shows the knob spinner while an operation is running.
 var isLoading = false
 /// Optional binding for swipe progress (0...1), e.g. to drive animations in the parent.
 var swipeProgress: Binding<CGFloat>?
Expand All@@ -13,6 +15,10 @@ struct SwipeButton: View {
 @State private var isSubmitting = false

 private var isBusy: Bool {
 isDisabled || isLoading || isSubmitting
 }

 private var showsSpinner: Bool {
 isLoading || isSubmitting
 }

Expand DownExpand Up@@ -43,19 +49,20 @@ struct SwipeButton: View {
 .frame(height: buttonHeight - innerPadding)
 .padding(.horizontal, innerPadding / 2)
 }
 .opacity(isDisabled ? 0.5 : 1)

 // Track text
 BodySSBText(title)
 .frame(maxWidth: .infinity, alignment: .center)
 .opacity(Double(1.0 - textProgress))
 .opacity(Double(1.0 - textProgress) * (isDisabled ? 0.5 : 1))

 // Knob
 Circle()
 .fill(accentColor)
 .frame(width: buttonHeight - innerPadding, height: buttonHeight - innerPadding)
 .overlay(
 ZStack {
 if isBusy {
 if showsSpinner {
 ActivityIndicator(theme: .dark)
 } else {
 Image("arrow-right")
Expand All@@ -75,6 +82,7 @@ struct SwipeButton: View {
 .accessibilityIdentifier("GRAB")
 .offset(x: clampedOffset)
 .padding(.horizontal, innerPadding / 2)
 .opacity(isDisabled ? 0.5 : 1)
 .gesture(
 DragGesture()
 .onChanged { value in
Expand Down

61 changes: 43 additions & 18 deletions
Bitkit/ViewModels/HwFundingSigner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,8 @@ final class HwSendCoordinator {

 private(set) var availableSats: UInt64 = 0
 private(set) var previewFeeSats: UInt64 = 0
 private(set) var isFundingSourceLoading = false
 private(set) var isPreviewLoading = false
 private(set) var isSigning = false
 private(set) var isBroadcastUnresolved = false
 private(set) var isPassphraseRequired = false
Expand DownExpand Up@@ -346,7 +348,11 @@ final class HwSendCoordinator {
 self.availableSats = availableSats
 }

 func selectWallet(_ walletId: String?, initialAvailableSats: UInt64 = 0) {
 func selectWallet(
 _ walletId: String?,
 initialAvailableSats: UInt64 = 0,
 showsLoading: Bool = false
 ) {
 guard self.walletId != walletId else { return }
 guard operationTask == nil, !isBroadcastUnresolved else { return }

Expand All@@ -356,6 +362,8 @@ final class HwSendCoordinator {
 pendingPayment = nil
 availableSats = walletId == nil ? 0 : initialAvailableSats
 previewFeeSats = 0
 isFundingSourceLoading = walletId != nil && showsLoading
 isPreviewLoading = false
 isSigning = false
 isBroadcastUnresolved = false
 isPassphraseRequired = false
Expand All@@ -365,23 +373,28 @@ final class HwSendCoordinator {
 func refreshAvailable(
 manager: HwWalletManager,
 destinationAddress: String,
 satsPerVByte: UInt64
 satsPerVByte: UInt64?
 ) async {
 guard let walletId else { return }

 guard !destinationAddress.isEmpty else {
 if self.walletId == walletId {
 availableSats = manager.fundingBalance(walletId: walletId)
 }
 return
 }

 availabilityRequestId += 1
 let requestId = availabilityRequestId
 isFundingSourceLoading = true

 func apply(_ available: UInt64) {
 guard self.walletId == walletId, availabilityRequestId == requestId else { return }
 availableSats = available
 isFundingSourceLoading = false
 }

 guard let satsPerVByte else {
 apply(availableSats)
 return
 }

 guard !destinationAddress.isEmpty else {
 apply(manager.fundingBalance(walletId: walletId))
 return
 }

 do {
Expand All@@ -407,19 +420,27 @@ final class HwSendCoordinator {
 guard let walletId else { return nil }
 previewRequestId += 1
 let requestId = previewRequestId
 isPreviewLoading = true
 previewFeeSats = 0
 let request = PaymentRequest(address: address, sats: sats, satsPerVByte: satsPerVByte)
 if pendingPayment?.request != request {
 pendingPayment = nil
 }
 let fee = try await manager.estimateOfflineFundingMiningFee(
 walletId: walletId,
 address: address,
 sats: sats,
 satsPerVByte: satsPerVByte
 )
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 return fee
 do {
 let signer = signerFactory(manager, address, satsPerVByte)
 let fee = try await signer.estimateOfflineFundingMiningFee(walletId: walletId, address: address, sats: sats)
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 isFundingSourceLoading = false
 isPreviewLoading = false
 return fee
 } catch {
 if self.walletId == walletId, previewRequestId == requestId {
 isFundingSourceLoading = false
 isPreviewLoading = false
 }
 throw error
 }
 }

 func signAndBroadcast(
Expand DownExpand Up@@ -512,6 +533,10 @@ final class HwSendCoordinator {
 }

 func cancel() {
 availabilityRequestId += 1
 previewRequestId += 1
 isFundingSourceLoading = false
 isPreviewLoading = false
 isVerifyingPassphrase = false
 isPassphraseRequired = false
 guard !isBroadcastUnresolved else { return }
Expand Down

17 changes: 10 additions & 7 deletions
Bitkit/Views/Wallets/Send/SendAmountView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,7 +153,8 @@ struct SendAmountView: View {
 imageName: canSwitchFundingSource ? "arrow-up-down" : nil,
 color: selectedSourceColor,
 variant: canSwitchFundingSource ? .primary : .secondary,
 disabled: !canSwitchFundingSource || isContinuing
 disabled: !canSwitchFundingSource || isContinuing,
 isLoading: hwSend.isFundingSourceLoading
 ) {
 selectNextFundingSource()
 }
Expand DownExpand Up@@ -183,7 +184,7 @@ struct SendAmountView: View {

 CustomButton(
 title: t("common__continue"),
 isDisabled: !isValidAmount,
 isDisabled: !isValidAmount || hwSend.isFundingSourceLoading,
 isLoading: isContinuing
 ) {
 await onContinue()
Expand DownExpand Up@@ -368,7 +369,8 @@ struct SendAmountView: View {
 )
 hwSend.selectWallet(
 walletId,
 initialAvailableSats: balance > reserve ? balance - reserve : 0
 initialAvailableSats: balance > reserve ? balance - reserve : 0,
 showsLoading: true
Comment thread
ben-kaufman marked this conversation as resolved.

 )
 app.selectedWalletToPayFrom = .onchain
 }
Expand All@@ -387,18 +389,19 @@ struct SendAmountView: View {
 private func calculateMaxSendableAmount() async {
 // Make sure we have everything we need to calculate the max sendable amount
 guard hwSend.isActive || app.selectedWalletToPayFrom == .onchain else { return }
 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 if hwSend.isActive {
 await hwSend.refreshAvailable(
 manager: hwWalletManager,
 destinationAddress: address,
 satsPerVByte: UInt64(feeRate)
 destinationAddress: app.scannedOnchainInvoice?.address ?? "",
 satsPerVByte: wallet.selectedFeeRateSatsPerVByte.map(UInt64.init)
 )
 return
 }

 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 do {
 let maxAmount = try await wallet.calculateMaxSendableAmount(
 address: address,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: polish trezor send loading states#708

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

 Open

ben-kaufman
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


fix: polish trezor send loading states
#708
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
380cbb0

fix: polish trezor send loading states


ben-kaufman Aug 31, 2026
1399a5d

chore: rename changelog fragment


ben-kaufman Aug 31, 2026
b7b2444

fix: settle hardware source loading without fees


ben-kaufman Aug 31, 2026
bb94073

fix: settle trezor send preview state


ben-kaufman Sep 1, 2026
8e142b0

Merge branch 'master' into fix/trezor-send-ui-polish


ben-kaufman Sep 2, 2026

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


6 changes: 4 additions & 2 deletions
Bitkit/Components/ActivityIndicator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct ActivityIndicator: View {
 let size: CGFloat
 let theme: Theme
 let tint: Color?

 enum Theme {
 case light
Expand All@@ -12,13 +13,14 @@ struct ActivityIndicator: View {
 @State private var isRotating = false
 @State private var opacity: Double = 0

 init(size: CGFloat = 32, theme: Theme = .light) {
 init(size: CGFloat = 32, theme: Theme = .light, tint: Color? = nil) {
 self.size = size
 self.theme = theme
 self.tint = tint
 }

 var body: some View {
 let color = theme == .light ? Color.white : Color.black
 let color = tint ?? (theme == .light ? Color.white : Color.black)

 ZStack {
 Circle()
Expand Down

10 changes: 8 additions & 2 deletions
Bitkit/Components/NumberPadActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ struct NumberPadActionButton: View {
 var color: Color = .purpleAccent
 var variant: NumberPadActionButtonVariant = .primary
 var disabled: Bool = false
 var isLoading: Bool = false
 var action: () -> Void

 @State private var isPressed = false
Expand All@@ -21,7 +22,10 @@ struct NumberPadActionButton: View {
 action()
 } label: {
 HStack(spacing: 8) {
 if let imageName {
 if isLoading {
 ActivityIndicator(size: 10, tint: color)
 .frame(width: 16, height: 16)
 } else if let imageName {
 Image(imageName)
 .resizable()
 .aspectRatio(contentMode: .fit)
Expand All@@ -40,7 +44,7 @@ struct NumberPadActionButton: View {
 )
 .cornerRadius(8)
 }
 .disabled(disabled)
 .disabled(disabled || isLoading)
 .buttonStyle(NoAnimationButtonStyle())
 .pressEvents(
 onPress: {
Expand All@@ -50,6 +54,8 @@ struct NumberPadActionButton: View {
 isPressed = false
 }
 )
 .animation(.easeInOut(duration: 0.2), value: isLoading)
 .animation(.easeInOut(duration: 0.2), value: text)
 }

 private var background: some View {
Expand Down

14 changes: 11 additions & 3 deletions
Bitkit/Components/SwipeButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ import SwiftUI
struct SwipeButton: View {
 let title: String
 let accentColor: Color
 /// Blocks the swipe and shows the knob spinner while a prerequisite is still loading.
 /// Blocks interaction without presenting the post-swipe loading state.
 var isDisabled = false
 /// Blocks interaction and shows the knob spinner while an operation is running.
 var isLoading = false
 /// Optional binding for swipe progress (0...1), e.g. to drive animations in the parent.
 var swipeProgress: Binding<CGFloat>?
Expand All@@ -13,6 +15,10 @@ struct SwipeButton: View {
 @State private var isSubmitting = false

 private var isBusy: Bool {
 isDisabled || isLoading || isSubmitting
 }

 private var showsSpinner: Bool {
 isLoading || isSubmitting
 }

Expand DownExpand Up@@ -43,19 +49,20 @@ struct SwipeButton: View {
 .frame(height: buttonHeight - innerPadding)
 .padding(.horizontal, innerPadding / 2)
 }
 .opacity(isDisabled ? 0.5 : 1)

 // Track text
 BodySSBText(title)
 .frame(maxWidth: .infinity, alignment: .center)
 .opacity(Double(1.0 - textProgress))
 .opacity(Double(1.0 - textProgress) * (isDisabled ? 0.5 : 1))

 // Knob
 Circle()
 .fill(accentColor)
 .frame(width: buttonHeight - innerPadding, height: buttonHeight - innerPadding)
 .overlay(
 ZStack {
 if isBusy {
 if showsSpinner {
 ActivityIndicator(theme: .dark)
 } else {
 Image("arrow-right")
Expand All@@ -75,6 +82,7 @@ struct SwipeButton: View {
 .accessibilityIdentifier("GRAB")
 .offset(x: clampedOffset)
 .padding(.horizontal, innerPadding / 2)
 .opacity(isDisabled ? 0.5 : 1)
 .gesture(
 DragGesture()
 .onChanged { value in
Expand Down

61 changes: 43 additions & 18 deletions
Bitkit/ViewModels/HwFundingSigner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,8 @@ final class HwSendCoordinator {

 private(set) var availableSats: UInt64 = 0
 private(set) var previewFeeSats: UInt64 = 0
 private(set) var isFundingSourceLoading = false
 private(set) var isPreviewLoading = false
 private(set) var isSigning = false
 private(set) var isBroadcastUnresolved = false
 private(set) var isPassphraseRequired = false
Expand DownExpand Up@@ -346,7 +348,11 @@ final class HwSendCoordinator {
 self.availableSats = availableSats
 }

 func selectWallet(_ walletId: String?, initialAvailableSats: UInt64 = 0) {
 func selectWallet(
 _ walletId: String?,
 initialAvailableSats: UInt64 = 0,
 showsLoading: Bool = false
 ) {
 guard self.walletId != walletId else { return }
 guard operationTask == nil, !isBroadcastUnresolved else { return }

Expand All@@ -356,6 +362,8 @@ final class HwSendCoordinator {
 pendingPayment = nil
 availableSats = walletId == nil ? 0 : initialAvailableSats
 previewFeeSats = 0
 isFundingSourceLoading = walletId != nil && showsLoading
 isPreviewLoading = false
 isSigning = false
 isBroadcastUnresolved = false
 isPassphraseRequired = false
Expand All@@ -365,23 +373,28 @@ final class HwSendCoordinator {
 func refreshAvailable(
 manager: HwWalletManager,
 destinationAddress: String,
 satsPerVByte: UInt64
 satsPerVByte: UInt64?
 ) async {
 guard let walletId else { return }

 guard !destinationAddress.isEmpty else {
 if self.walletId == walletId {
 availableSats = manager.fundingBalance(walletId: walletId)
 }
 return
 }

 availabilityRequestId += 1
 let requestId = availabilityRequestId
 isFundingSourceLoading = true

 func apply(_ available: UInt64) {
 guard self.walletId == walletId, availabilityRequestId == requestId else { return }
 availableSats = available
 isFundingSourceLoading = false
 }

 guard let satsPerVByte else {
 apply(availableSats)
 return
 }

 guard !destinationAddress.isEmpty else {
 apply(manager.fundingBalance(walletId: walletId))
 return
 }

 do {
Expand All@@ -407,19 +420,27 @@ final class HwSendCoordinator {
 guard let walletId else { return nil }
 previewRequestId += 1
 let requestId = previewRequestId
 isPreviewLoading = true
 previewFeeSats = 0
 let request = PaymentRequest(address: address, sats: sats, satsPerVByte: satsPerVByte)
 if pendingPayment?.request != request {
 pendingPayment = nil
 }
 let fee = try await manager.estimateOfflineFundingMiningFee(
 walletId: walletId,
 address: address,
 sats: sats,
 satsPerVByte: satsPerVByte
 )
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 return fee
 do {
 let signer = signerFactory(manager, address, satsPerVByte)
 let fee = try await signer.estimateOfflineFundingMiningFee(walletId: walletId, address: address, sats: sats)
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 isFundingSourceLoading = false
 isPreviewLoading = false
 return fee
 } catch {
 if self.walletId == walletId, previewRequestId == requestId {
 isFundingSourceLoading = false
 isPreviewLoading = false
 }
 throw error
 }
 }

 func signAndBroadcast(
Expand DownExpand Up@@ -512,6 +533,10 @@ final class HwSendCoordinator {
 }

 func cancel() {
 availabilityRequestId += 1
 previewRequestId += 1
 isFundingSourceLoading = false
 isPreviewLoading = false
 isVerifyingPassphrase = false
 isPassphraseRequired = false
 guard !isBroadcastUnresolved else { return }
Expand Down

17 changes: 10 additions & 7 deletions
Bitkit/Views/Wallets/Send/SendAmountView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,7 +153,8 @@ struct SendAmountView: View {
 imageName: canSwitchFundingSource ? "arrow-up-down" : nil,
 color: selectedSourceColor,
 variant: canSwitchFundingSource ? .primary : .secondary,
 disabled: !canSwitchFundingSource || isContinuing
 disabled: !canSwitchFundingSource || isContinuing,
 isLoading: hwSend.isFundingSourceLoading
 ) {
 selectNextFundingSource()
 }
Expand DownExpand Up@@ -183,7 +184,7 @@ struct SendAmountView: View {

 CustomButton(
 title: t("common__continue"),
 isDisabled: !isValidAmount,
 isDisabled: !isValidAmount || hwSend.isFundingSourceLoading,
 isLoading: isContinuing
 ) {
 await onContinue()
Expand DownExpand Up@@ -368,7 +369,8 @@ struct SendAmountView: View {
 )
 hwSend.selectWallet(
 walletId,
 initialAvailableSats: balance > reserve ? balance - reserve : 0
 initialAvailableSats: balance > reserve ? balance - reserve : 0,
 showsLoading: true
Comment thread
ben-kaufman marked this conversation as resolved.

 )
 app.selectedWalletToPayFrom = .onchain
 }
Expand All@@ -387,18 +389,19 @@ struct SendAmountView: View {
 private func calculateMaxSendableAmount() async {
 // Make sure we have everything we need to calculate the max sendable amount
 guard hwSend.isActive || app.selectedWalletToPayFrom == .onchain else { return }
 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 if hwSend.isActive {
 await hwSend.refreshAvailable(
 manager: hwWalletManager,
 destinationAddress: address,
 satsPerVByte: UInt64(feeRate)
 destinationAddress: app.scannedOnchainInvoice?.address ?? "",
 satsPerVByte: wallet.selectedFeeRateSatsPerVByte.map(UInt64.init)
 )
 return
 }

 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 do {
 let maxAmount = try await wallet.calculateMaxSendableAmount(
 address: address,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: polish trezor send loading states#708

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

 Open

ben-kaufman
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


fix: polish trezor send loading states
#708
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
380cbb0

fix: polish trezor send loading states


ben-kaufman Aug 31, 2026
1399a5d

chore: rename changelog fragment


ben-kaufman Aug 31, 2026
b7b2444

fix: settle hardware source loading without fees


ben-kaufman Aug 31, 2026
bb94073

fix: settle trezor send preview state


ben-kaufman Sep 1, 2026
8e142b0

Merge branch 'master' into fix/trezor-send-ui-polish


ben-kaufman Sep 2, 2026

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


6 changes: 4 additions & 2 deletions
Bitkit/Components/ActivityIndicator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct ActivityIndicator: View {
 let size: CGFloat
 let theme: Theme
 let tint: Color?

 enum Theme {
 case light
Expand All@@ -12,13 +13,14 @@ struct ActivityIndicator: View {
 @State private var isRotating = false
 @State private var opacity: Double = 0

 init(size: CGFloat = 32, theme: Theme = .light) {
 init(size: CGFloat = 32, theme: Theme = .light, tint: Color? = nil) {
 self.size = size
 self.theme = theme
 self.tint = tint
 }

 var body: some View {
 let color = theme == .light ? Color.white : Color.black
 let color = tint ?? (theme == .light ? Color.white : Color.black)

 ZStack {
 Circle()
Expand Down

10 changes: 8 additions & 2 deletions
Bitkit/Components/NumberPadActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ struct NumberPadActionButton: View {
 var color: Color = .purpleAccent
 var variant: NumberPadActionButtonVariant = .primary
 var disabled: Bool = false
 var isLoading: Bool = false
 var action: () -> Void

 @State private var isPressed = false
Expand All@@ -21,7 +22,10 @@ struct NumberPadActionButton: View {
 action()
 } label: {
 HStack(spacing: 8) {
 if let imageName {
 if isLoading {
 ActivityIndicator(size: 10, tint: color)
 .frame(width: 16, height: 16)
 } else if let imageName {
 Image(imageName)
 .resizable()
 .aspectRatio(contentMode: .fit)
Expand All@@ -40,7 +44,7 @@ struct NumberPadActionButton: View {
 )
 .cornerRadius(8)
 }
 .disabled(disabled)
 .disabled(disabled || isLoading)
 .buttonStyle(NoAnimationButtonStyle())
 .pressEvents(
 onPress: {
Expand All@@ -50,6 +54,8 @@ struct NumberPadActionButton: View {
 isPressed = false
 }
 )
 .animation(.easeInOut(duration: 0.2), value: isLoading)
 .animation(.easeInOut(duration: 0.2), value: text)
 }

 private var background: some View {
Expand Down

14 changes: 11 additions & 3 deletions
Bitkit/Components/SwipeButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ import SwiftUI
struct SwipeButton: View {
 let title: String
 let accentColor: Color
 /// Blocks the swipe and shows the knob spinner while a prerequisite is still loading.
 /// Blocks interaction without presenting the post-swipe loading state.
 var isDisabled = false
 /// Blocks interaction and shows the knob spinner while an operation is running.
 var isLoading = false
 /// Optional binding for swipe progress (0...1), e.g. to drive animations in the parent.
 var swipeProgress: Binding<CGFloat>?
Expand All@@ -13,6 +15,10 @@ struct SwipeButton: View {
 @State private var isSubmitting = false

 private var isBusy: Bool {
 isDisabled || isLoading || isSubmitting
 }

 private var showsSpinner: Bool {
 isLoading || isSubmitting
 }

Expand DownExpand Up@@ -43,19 +49,20 @@ struct SwipeButton: View {
 .frame(height: buttonHeight - innerPadding)
 .padding(.horizontal, innerPadding / 2)
 }
 .opacity(isDisabled ? 0.5 : 1)

 // Track text
 BodySSBText(title)
 .frame(maxWidth: .infinity, alignment: .center)
 .opacity(Double(1.0 - textProgress))
 .opacity(Double(1.0 - textProgress) * (isDisabled ? 0.5 : 1))

 // Knob
 Circle()
 .fill(accentColor)
 .frame(width: buttonHeight - innerPadding, height: buttonHeight - innerPadding)
 .overlay(
 ZStack {
 if isBusy {
 if showsSpinner {
 ActivityIndicator(theme: .dark)
 } else {
 Image("arrow-right")
Expand All@@ -75,6 +82,7 @@ struct SwipeButton: View {
 .accessibilityIdentifier("GRAB")
 .offset(x: clampedOffset)
 .padding(.horizontal, innerPadding / 2)
 .opacity(isDisabled ? 0.5 : 1)
 .gesture(
 DragGesture()
 .onChanged { value in
Expand Down

61 changes: 43 additions & 18 deletions
Bitkit/ViewModels/HwFundingSigner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,8 @@ final class HwSendCoordinator {

 private(set) var availableSats: UInt64 = 0
 private(set) var previewFeeSats: UInt64 = 0
 private(set) var isFundingSourceLoading = false
 private(set) var isPreviewLoading = false
 private(set) var isSigning = false
 private(set) var isBroadcastUnresolved = false
 private(set) var isPassphraseRequired = false
Expand DownExpand Up@@ -346,7 +348,11 @@ final class HwSendCoordinator {
 self.availableSats = availableSats
 }

 func selectWallet(_ walletId: String?, initialAvailableSats: UInt64 = 0) {
 func selectWallet(
 _ walletId: String?,
 initialAvailableSats: UInt64 = 0,
 showsLoading: Bool = false
 ) {
 guard self.walletId != walletId else { return }
 guard operationTask == nil, !isBroadcastUnresolved else { return }

Expand All@@ -356,6 +362,8 @@ final class HwSendCoordinator {
 pendingPayment = nil
 availableSats = walletId == nil ? 0 : initialAvailableSats
 previewFeeSats = 0
 isFundingSourceLoading = walletId != nil && showsLoading
 isPreviewLoading = false
 isSigning = false
 isBroadcastUnresolved = false
 isPassphraseRequired = false
Expand All@@ -365,23 +373,28 @@ final class HwSendCoordinator {
 func refreshAvailable(
 manager: HwWalletManager,
 destinationAddress: String,
 satsPerVByte: UInt64
 satsPerVByte: UInt64?
 ) async {
 guard let walletId else { return }

 guard !destinationAddress.isEmpty else {
 if self.walletId == walletId {
 availableSats = manager.fundingBalance(walletId: walletId)
 }
 return
 }

 availabilityRequestId += 1
 let requestId = availabilityRequestId
 isFundingSourceLoading = true

 func apply(_ available: UInt64) {
 guard self.walletId == walletId, availabilityRequestId == requestId else { return }
 availableSats = available
 isFundingSourceLoading = false
 }

 guard let satsPerVByte else {
 apply(availableSats)
 return
 }

 guard !destinationAddress.isEmpty else {
 apply(manager.fundingBalance(walletId: walletId))
 return
 }

 do {
Expand All@@ -407,19 +420,27 @@ final class HwSendCoordinator {
 guard let walletId else { return nil }
 previewRequestId += 1
 let requestId = previewRequestId
 isPreviewLoading = true
 previewFeeSats = 0
 let request = PaymentRequest(address: address, sats: sats, satsPerVByte: satsPerVByte)
 if pendingPayment?.request != request {
 pendingPayment = nil
 }
 let fee = try await manager.estimateOfflineFundingMiningFee(
 walletId: walletId,
 address: address,
 sats: sats,
 satsPerVByte: satsPerVByte
 )
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 return fee
 do {
 let signer = signerFactory(manager, address, satsPerVByte)
 let fee = try await signer.estimateOfflineFundingMiningFee(walletId: walletId, address: address, sats: sats)
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 isFundingSourceLoading = false
 isPreviewLoading = false
 return fee
 } catch {
 if self.walletId == walletId, previewRequestId == requestId {
 isFundingSourceLoading = false
 isPreviewLoading = false
 }
 throw error
 }
 }

 func signAndBroadcast(
Expand DownExpand Up@@ -512,6 +533,10 @@ final class HwSendCoordinator {
 }

 func cancel() {
 availabilityRequestId += 1
 previewRequestId += 1
 isFundingSourceLoading = false
 isPreviewLoading = false
 isVerifyingPassphrase = false
 isPassphraseRequired = false
 guard !isBroadcastUnresolved else { return }
Expand Down

17 changes: 10 additions & 7 deletions
Bitkit/Views/Wallets/Send/SendAmountView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,7 +153,8 @@ struct SendAmountView: View {
 imageName: canSwitchFundingSource ? "arrow-up-down" : nil,
 color: selectedSourceColor,
 variant: canSwitchFundingSource ? .primary : .secondary,
 disabled: !canSwitchFundingSource || isContinuing
 disabled: !canSwitchFundingSource || isContinuing,
 isLoading: hwSend.isFundingSourceLoading
 ) {
 selectNextFundingSource()
 }
Expand DownExpand Up@@ -183,7 +184,7 @@ struct SendAmountView: View {

 CustomButton(
 title: t("common__continue"),
 isDisabled: !isValidAmount,
 isDisabled: !isValidAmount || hwSend.isFundingSourceLoading,
 isLoading: isContinuing
 ) {
 await onContinue()
Expand DownExpand Up@@ -368,7 +369,8 @@ struct SendAmountView: View {
 )
 hwSend.selectWallet(
 walletId,
 initialAvailableSats: balance > reserve ? balance - reserve : 0
 initialAvailableSats: balance > reserve ? balance - reserve : 0,
 showsLoading: true
Comment thread
ben-kaufman marked this conversation as resolved.

 )
 app.selectedWalletToPayFrom = .onchain
 }
Expand All@@ -387,18 +389,19 @@ struct SendAmountView: View {
 private func calculateMaxSendableAmount() async {
 // Make sure we have everything we need to calculate the max sendable amount
 guard hwSend.isActive || app.selectedWalletToPayFrom == .onchain else { return }
 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 if hwSend.isActive {
 await hwSend.refreshAvailable(
 manager: hwWalletManager,
 destinationAddress: address,
 satsPerVByte: UInt64(feeRate)
 destinationAddress: app.scannedOnchainInvoice?.address ?? "",
 satsPerVByte: wallet.selectedFeeRateSatsPerVByte.map(UInt64.init)
 )
 return
 }

 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 do {
 let maxAmount = try await wallet.calculateMaxSendableAmount(
 address: address,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: polish trezor send loading states#708

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

 Open

ben-kaufman
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


fix: polish trezor send loading states
#708
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
380cbb0

fix: polish trezor send loading states


ben-kaufman Aug 31, 2026
1399a5d

chore: rename changelog fragment


ben-kaufman Aug 31, 2026
b7b2444

fix: settle hardware source loading without fees


ben-kaufman Aug 31, 2026
bb94073

fix: settle trezor send preview state


ben-kaufman Sep 1, 2026
8e142b0

Merge branch 'master' into fix/trezor-send-ui-polish


ben-kaufman Sep 2, 2026

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


6 changes: 4 additions & 2 deletions
Bitkit/Components/ActivityIndicator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct ActivityIndicator: View {
 let size: CGFloat
 let theme: Theme
 let tint: Color?

 enum Theme {
 case light
Expand All@@ -12,13 +13,14 @@ struct ActivityIndicator: View {
 @State private var isRotating = false
 @State private var opacity: Double = 0

 init(size: CGFloat = 32, theme: Theme = .light) {
 init(size: CGFloat = 32, theme: Theme = .light, tint: Color? = nil) {
 self.size = size
 self.theme = theme
 self.tint = tint
 }

 var body: some View {
 let color = theme == .light ? Color.white : Color.black
 let color = tint ?? (theme == .light ? Color.white : Color.black)

 ZStack {
 Circle()
Expand Down

10 changes: 8 additions & 2 deletions
Bitkit/Components/NumberPadActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ struct NumberPadActionButton: View {
 var color: Color = .purpleAccent
 var variant: NumberPadActionButtonVariant = .primary
 var disabled: Bool = false
 var isLoading: Bool = false
 var action: () -> Void

 @State private var isPressed = false
Expand All@@ -21,7 +22,10 @@ struct NumberPadActionButton: View {
 action()
 } label: {
 HStack(spacing: 8) {
 if let imageName {
 if isLoading {
 ActivityIndicator(size: 10, tint: color)
 .frame(width: 16, height: 16)
 } else if let imageName {
 Image(imageName)
 .resizable()
 .aspectRatio(contentMode: .fit)
Expand All@@ -40,7 +44,7 @@ struct NumberPadActionButton: View {
 )
 .cornerRadius(8)
 }
 .disabled(disabled)
 .disabled(disabled || isLoading)
 .buttonStyle(NoAnimationButtonStyle())
 .pressEvents(
 onPress: {
Expand All@@ -50,6 +54,8 @@ struct NumberPadActionButton: View {
 isPressed = false
 }
 )
 .animation(.easeInOut(duration: 0.2), value: isLoading)
 .animation(.easeInOut(duration: 0.2), value: text)
 }

 private var background: some View {
Expand Down

14 changes: 11 additions & 3 deletions
Bitkit/Components/SwipeButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ import SwiftUI
struct SwipeButton: View {
 let title: String
 let accentColor: Color
 /// Blocks the swipe and shows the knob spinner while a prerequisite is still loading.
 /// Blocks interaction without presenting the post-swipe loading state.
 var isDisabled = false
 /// Blocks interaction and shows the knob spinner while an operation is running.
 var isLoading = false
 /// Optional binding for swipe progress (0...1), e.g. to drive animations in the parent.
 var swipeProgress: Binding<CGFloat>?
Expand All@@ -13,6 +15,10 @@ struct SwipeButton: View {
 @State private var isSubmitting = false

 private var isBusy: Bool {
 isDisabled || isLoading || isSubmitting
 }

 private var showsSpinner: Bool {
 isLoading || isSubmitting
 }

Expand DownExpand Up@@ -43,19 +49,20 @@ struct SwipeButton: View {
 .frame(height: buttonHeight - innerPadding)
 .padding(.horizontal, innerPadding / 2)
 }
 .opacity(isDisabled ? 0.5 : 1)

 // Track text
 BodySSBText(title)
 .frame(maxWidth: .infinity, alignment: .center)
 .opacity(Double(1.0 - textProgress))
 .opacity(Double(1.0 - textProgress) * (isDisabled ? 0.5 : 1))

 // Knob
 Circle()
 .fill(accentColor)
 .frame(width: buttonHeight - innerPadding, height: buttonHeight - innerPadding)
 .overlay(
 ZStack {
 if isBusy {
 if showsSpinner {
 ActivityIndicator(theme: .dark)
 } else {
 Image("arrow-right")
Expand All@@ -75,6 +82,7 @@ struct SwipeButton: View {
 .accessibilityIdentifier("GRAB")
 .offset(x: clampedOffset)
 .padding(.horizontal, innerPadding / 2)
 .opacity(isDisabled ? 0.5 : 1)
 .gesture(
 DragGesture()
 .onChanged { value in
Expand Down

61 changes: 43 additions & 18 deletions
Bitkit/ViewModels/HwFundingSigner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,8 @@ final class HwSendCoordinator {

 private(set) var availableSats: UInt64 = 0
 private(set) var previewFeeSats: UInt64 = 0
 private(set) var isFundingSourceLoading = false
 private(set) var isPreviewLoading = false
 private(set) var isSigning = false
 private(set) var isBroadcastUnresolved = false
 private(set) var isPassphraseRequired = false
Expand DownExpand Up@@ -346,7 +348,11 @@ final class HwSendCoordinator {
 self.availableSats = availableSats
 }

 func selectWallet(_ walletId: String?, initialAvailableSats: UInt64 = 0) {
 func selectWallet(
 _ walletId: String?,
 initialAvailableSats: UInt64 = 0,
 showsLoading: Bool = false
 ) {
 guard self.walletId != walletId else { return }
 guard operationTask == nil, !isBroadcastUnresolved else { return }

Expand All@@ -356,6 +362,8 @@ final class HwSendCoordinator {
 pendingPayment = nil
 availableSats = walletId == nil ? 0 : initialAvailableSats
 previewFeeSats = 0
 isFundingSourceLoading = walletId != nil && showsLoading
 isPreviewLoading = false
 isSigning = false
 isBroadcastUnresolved = false
 isPassphraseRequired = false
Expand All@@ -365,23 +373,28 @@ final class HwSendCoordinator {
 func refreshAvailable(
 manager: HwWalletManager,
 destinationAddress: String,
 satsPerVByte: UInt64
 satsPerVByte: UInt64?
 ) async {
 guard let walletId else { return }

 guard !destinationAddress.isEmpty else {
 if self.walletId == walletId {
 availableSats = manager.fundingBalance(walletId: walletId)
 }
 return
 }

 availabilityRequestId += 1
 let requestId = availabilityRequestId
 isFundingSourceLoading = true

 func apply(_ available: UInt64) {
 guard self.walletId == walletId, availabilityRequestId == requestId else { return }
 availableSats = available
 isFundingSourceLoading = false
 }

 guard let satsPerVByte else {
 apply(availableSats)
 return
 }

 guard !destinationAddress.isEmpty else {
 apply(manager.fundingBalance(walletId: walletId))
 return
 }

 do {
Expand All@@ -407,19 +420,27 @@ final class HwSendCoordinator {
 guard let walletId else { return nil }
 previewRequestId += 1
 let requestId = previewRequestId
 isPreviewLoading = true
 previewFeeSats = 0
 let request = PaymentRequest(address: address, sats: sats, satsPerVByte: satsPerVByte)
 if pendingPayment?.request != request {
 pendingPayment = nil
 }
 let fee = try await manager.estimateOfflineFundingMiningFee(
 walletId: walletId,
 address: address,
 sats: sats,
 satsPerVByte: satsPerVByte
 )
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 return fee
 do {
 let signer = signerFactory(manager, address, satsPerVByte)
 let fee = try await signer.estimateOfflineFundingMiningFee(walletId: walletId, address: address, sats: sats)
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 isFundingSourceLoading = false
 isPreviewLoading = false
 return fee
 } catch {
 if self.walletId == walletId, previewRequestId == requestId {
 isFundingSourceLoading = false
 isPreviewLoading = false
 }
 throw error
 }
 }

 func signAndBroadcast(
Expand DownExpand Up@@ -512,6 +533,10 @@ final class HwSendCoordinator {
 }

 func cancel() {
 availabilityRequestId += 1
 previewRequestId += 1
 isFundingSourceLoading = false
 isPreviewLoading = false
 isVerifyingPassphrase = false
 isPassphraseRequired = false
 guard !isBroadcastUnresolved else { return }
Expand Down

17 changes: 10 additions & 7 deletions
Bitkit/Views/Wallets/Send/SendAmountView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,7 +153,8 @@ struct SendAmountView: View {
 imageName: canSwitchFundingSource ? "arrow-up-down" : nil,
 color: selectedSourceColor,
 variant: canSwitchFundingSource ? .primary : .secondary,
 disabled: !canSwitchFundingSource || isContinuing
 disabled: !canSwitchFundingSource || isContinuing,
 isLoading: hwSend.isFundingSourceLoading
 ) {
 selectNextFundingSource()
 }
Expand DownExpand Up@@ -183,7 +184,7 @@ struct SendAmountView: View {

 CustomButton(
 title: t("common__continue"),
 isDisabled: !isValidAmount,
 isDisabled: !isValidAmount || hwSend.isFundingSourceLoading,
 isLoading: isContinuing
 ) {
 await onContinue()
Expand DownExpand Up@@ -368,7 +369,8 @@ struct SendAmountView: View {
 )
 hwSend.selectWallet(
 walletId,
 initialAvailableSats: balance > reserve ? balance - reserve : 0
 initialAvailableSats: balance > reserve ? balance - reserve : 0,
 showsLoading: true
Comment thread
ben-kaufman marked this conversation as resolved.

 )
 app.selectedWalletToPayFrom = .onchain
 }
Expand All@@ -387,18 +389,19 @@ struct SendAmountView: View {
 private func calculateMaxSendableAmount() async {
 // Make sure we have everything we need to calculate the max sendable amount
 guard hwSend.isActive || app.selectedWalletToPayFrom == .onchain else { return }
 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 if hwSend.isActive {
 await hwSend.refreshAvailable(
 manager: hwWalletManager,
 destinationAddress: address,
 satsPerVByte: UInt64(feeRate)
 destinationAddress: app.scannedOnchainInvoice?.address ?? "",
 satsPerVByte: wallet.selectedFeeRateSatsPerVByte.map(UInt64.init)
 )
 return
 }

 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 do {
 let maxAmount = try await wallet.calculateMaxSendableAmount(
 address: address,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: polish trezor send loading states#708

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

 Open

ben-kaufman
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


fix: polish trezor send loading states
#708
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
380cbb0

fix: polish trezor send loading states


ben-kaufman Aug 31, 2026
1399a5d

chore: rename changelog fragment


ben-kaufman Aug 31, 2026
b7b2444

fix: settle hardware source loading without fees


ben-kaufman Aug 31, 2026
bb94073

fix: settle trezor send preview state


ben-kaufman Sep 1, 2026
8e142b0

Merge branch 'master' into fix/trezor-send-ui-polish


ben-kaufman Sep 2, 2026

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


6 changes: 4 additions & 2 deletions
Bitkit/Components/ActivityIndicator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct ActivityIndicator: View {
 let size: CGFloat
 let theme: Theme
 let tint: Color?

 enum Theme {
 case light
Expand All@@ -12,13 +13,14 @@ struct ActivityIndicator: View {
 @State private var isRotating = false
 @State private var opacity: Double = 0

 init(size: CGFloat = 32, theme: Theme = .light) {
 init(size: CGFloat = 32, theme: Theme = .light, tint: Color? = nil) {
 self.size = size
 self.theme = theme
 self.tint = tint
 }

 var body: some View {
 let color = theme == .light ? Color.white : Color.black
 let color = tint ?? (theme == .light ? Color.white : Color.black)

 ZStack {
 Circle()
Expand Down

10 changes: 8 additions & 2 deletions
Bitkit/Components/NumberPadActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ struct NumberPadActionButton: View {
 var color: Color = .purpleAccent
 var variant: NumberPadActionButtonVariant = .primary
 var disabled: Bool = false
 var isLoading: Bool = false
 var action: () -> Void

 @State private var isPressed = false
Expand All@@ -21,7 +22,10 @@ struct NumberPadActionButton: View {
 action()
 } label: {
 HStack(spacing: 8) {
 if let imageName {
 if isLoading {
 ActivityIndicator(size: 10, tint: color)
 .frame(width: 16, height: 16)
 } else if let imageName {
 Image(imageName)
 .resizable()
 .aspectRatio(contentMode: .fit)
Expand All@@ -40,7 +44,7 @@ struct NumberPadActionButton: View {
 )
 .cornerRadius(8)
 }
 .disabled(disabled)
 .disabled(disabled || isLoading)
 .buttonStyle(NoAnimationButtonStyle())
 .pressEvents(
 onPress: {
Expand All@@ -50,6 +54,8 @@ struct NumberPadActionButton: View {
 isPressed = false
 }
 )
 .animation(.easeInOut(duration: 0.2), value: isLoading)
 .animation(.easeInOut(duration: 0.2), value: text)
 }

 private var background: some View {
Expand Down

14 changes: 11 additions & 3 deletions
Bitkit/Components/SwipeButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ import SwiftUI
struct SwipeButton: View {
 let title: String
 let accentColor: Color
 /// Blocks the swipe and shows the knob spinner while a prerequisite is still loading.
 /// Blocks interaction without presenting the post-swipe loading state.
 var isDisabled = false
 /// Blocks interaction and shows the knob spinner while an operation is running.
 var isLoading = false
 /// Optional binding for swipe progress (0...1), e.g. to drive animations in the parent.
 var swipeProgress: Binding<CGFloat>?
Expand All@@ -13,6 +15,10 @@ struct SwipeButton: View {
 @State private var isSubmitting = false

 private var isBusy: Bool {
 isDisabled || isLoading || isSubmitting
 }

 private var showsSpinner: Bool {
 isLoading || isSubmitting
 }

Expand DownExpand Up@@ -43,19 +49,20 @@ struct SwipeButton: View {
 .frame(height: buttonHeight - innerPadding)
 .padding(.horizontal, innerPadding / 2)
 }
 .opacity(isDisabled ? 0.5 : 1)

 // Track text
 BodySSBText(title)
 .frame(maxWidth: .infinity, alignment: .center)
 .opacity(Double(1.0 - textProgress))
 .opacity(Double(1.0 - textProgress) * (isDisabled ? 0.5 : 1))

 // Knob
 Circle()
 .fill(accentColor)
 .frame(width: buttonHeight - innerPadding, height: buttonHeight - innerPadding)
 .overlay(
 ZStack {
 if isBusy {
 if showsSpinner {
 ActivityIndicator(theme: .dark)
 } else {
 Image("arrow-right")
Expand All@@ -75,6 +82,7 @@ struct SwipeButton: View {
 .accessibilityIdentifier("GRAB")
 .offset(x: clampedOffset)
 .padding(.horizontal, innerPadding / 2)
 .opacity(isDisabled ? 0.5 : 1)
 .gesture(
 DragGesture()
 .onChanged { value in
Expand Down

61 changes: 43 additions & 18 deletions
Bitkit/ViewModels/HwFundingSigner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,8 @@ final class HwSendCoordinator {

 private(set) var availableSats: UInt64 = 0
 private(set) var previewFeeSats: UInt64 = 0
 private(set) var isFundingSourceLoading = false
 private(set) var isPreviewLoading = false
 private(set) var isSigning = false
 private(set) var isBroadcastUnresolved = false
 private(set) var isPassphraseRequired = false
Expand DownExpand Up@@ -346,7 +348,11 @@ final class HwSendCoordinator {
 self.availableSats = availableSats
 }

 func selectWallet(_ walletId: String?, initialAvailableSats: UInt64 = 0) {
 func selectWallet(
 _ walletId: String?,
 initialAvailableSats: UInt64 = 0,
 showsLoading: Bool = false
 ) {
 guard self.walletId != walletId else { return }
 guard operationTask == nil, !isBroadcastUnresolved else { return }

Expand All@@ -356,6 +362,8 @@ final class HwSendCoordinator {
 pendingPayment = nil
 availableSats = walletId == nil ? 0 : initialAvailableSats
 previewFeeSats = 0
 isFundingSourceLoading = walletId != nil && showsLoading
 isPreviewLoading = false
 isSigning = false
 isBroadcastUnresolved = false
 isPassphraseRequired = false
Expand All@@ -365,23 +373,28 @@ final class HwSendCoordinator {
 func refreshAvailable(
 manager: HwWalletManager,
 destinationAddress: String,
 satsPerVByte: UInt64
 satsPerVByte: UInt64?
 ) async {
 guard let walletId else { return }

 guard !destinationAddress.isEmpty else {
 if self.walletId == walletId {
 availableSats = manager.fundingBalance(walletId: walletId)
 }
 return
 }

 availabilityRequestId += 1
 let requestId = availabilityRequestId
 isFundingSourceLoading = true

 func apply(_ available: UInt64) {
 guard self.walletId == walletId, availabilityRequestId == requestId else { return }
 availableSats = available
 isFundingSourceLoading = false
 }

 guard let satsPerVByte else {
 apply(availableSats)
 return
 }

 guard !destinationAddress.isEmpty else {
 apply(manager.fundingBalance(walletId: walletId))
 return
 }

 do {
Expand All@@ -407,19 +420,27 @@ final class HwSendCoordinator {
 guard let walletId else { return nil }
 previewRequestId += 1
 let requestId = previewRequestId
 isPreviewLoading = true
 previewFeeSats = 0
 let request = PaymentRequest(address: address, sats: sats, satsPerVByte: satsPerVByte)
 if pendingPayment?.request != request {
 pendingPayment = nil
 }
 let fee = try await manager.estimateOfflineFundingMiningFee(
 walletId: walletId,
 address: address,
 sats: sats,
 satsPerVByte: satsPerVByte
 )
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 return fee
 do {
 let signer = signerFactory(manager, address, satsPerVByte)
 let fee = try await signer.estimateOfflineFundingMiningFee(walletId: walletId, address: address, sats: sats)
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 isFundingSourceLoading = false
 isPreviewLoading = false
 return fee
 } catch {
 if self.walletId == walletId, previewRequestId == requestId {
 isFundingSourceLoading = false
 isPreviewLoading = false
 }
 throw error
 }
 }

 func signAndBroadcast(
Expand DownExpand Up@@ -512,6 +533,10 @@ final class HwSendCoordinator {
 }

 func cancel() {
 availabilityRequestId += 1
 previewRequestId += 1
 isFundingSourceLoading = false
 isPreviewLoading = false
 isVerifyingPassphrase = false
 isPassphraseRequired = false
 guard !isBroadcastUnresolved else { return }
Expand Down

17 changes: 10 additions & 7 deletions
Bitkit/Views/Wallets/Send/SendAmountView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,7 +153,8 @@ struct SendAmountView: View {
 imageName: canSwitchFundingSource ? "arrow-up-down" : nil,
 color: selectedSourceColor,
 variant: canSwitchFundingSource ? .primary : .secondary,
 disabled: !canSwitchFundingSource || isContinuing
 disabled: !canSwitchFundingSource || isContinuing,
 isLoading: hwSend.isFundingSourceLoading
 ) {
 selectNextFundingSource()
 }
Expand DownExpand Up@@ -183,7 +184,7 @@ struct SendAmountView: View {

 CustomButton(
 title: t("common__continue"),
 isDisabled: !isValidAmount,
 isDisabled: !isValidAmount || hwSend.isFundingSourceLoading,
 isLoading: isContinuing
 ) {
 await onContinue()
Expand DownExpand Up@@ -368,7 +369,8 @@ struct SendAmountView: View {
 )
 hwSend.selectWallet(
 walletId,
 initialAvailableSats: balance > reserve ? balance - reserve : 0
 initialAvailableSats: balance > reserve ? balance - reserve : 0,
 showsLoading: true
Comment thread
ben-kaufman marked this conversation as resolved.

 )
 app.selectedWalletToPayFrom = .onchain
 }
Expand All@@ -387,18 +389,19 @@ struct SendAmountView: View {
 private func calculateMaxSendableAmount() async {
 // Make sure we have everything we need to calculate the max sendable amount
 guard hwSend.isActive || app.selectedWalletToPayFrom == .onchain else { return }
 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 if hwSend.isActive {
 await hwSend.refreshAvailable(
 manager: hwWalletManager,
 destinationAddress: address,
 satsPerVByte: UInt64(feeRate)
 destinationAddress: app.scannedOnchainInvoice?.address ?? "",
 satsPerVByte: wallet.selectedFeeRateSatsPerVByte.map(UInt64.init)
 )
 return
 }

 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 do {
 let maxAmount = try await wallet.calculateMaxSendableAmount(
 address: address,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: polish trezor send loading states#708

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

 Open

ben-kaufman
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


fix: polish trezor send loading states
#708
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
380cbb0

fix: polish trezor send loading states


ben-kaufman Aug 31, 2026
1399a5d

chore: rename changelog fragment


ben-kaufman Aug 31, 2026
b7b2444

fix: settle hardware source loading without fees


ben-kaufman Aug 31, 2026
bb94073

fix: settle trezor send preview state


ben-kaufman Sep 1, 2026
8e142b0

Merge branch 'master' into fix/trezor-send-ui-polish


ben-kaufman Sep 2, 2026

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


6 changes: 4 additions & 2 deletions
Bitkit/Components/ActivityIndicator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct ActivityIndicator: View {
 let size: CGFloat
 let theme: Theme
 let tint: Color?

 enum Theme {
 case light
Expand All@@ -12,13 +13,14 @@ struct ActivityIndicator: View {
 @State private var isRotating = false
 @State private var opacity: Double = 0

 init(size: CGFloat = 32, theme: Theme = .light) {
 init(size: CGFloat = 32, theme: Theme = .light, tint: Color? = nil) {
 self.size = size
 self.theme = theme
 self.tint = tint
 }

 var body: some View {
 let color = theme == .light ? Color.white : Color.black
 let color = tint ?? (theme == .light ? Color.white : Color.black)

 ZStack {
 Circle()
Expand Down

10 changes: 8 additions & 2 deletions
Bitkit/Components/NumberPadActionButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ struct NumberPadActionButton: View {
 var color: Color = .purpleAccent
 var variant: NumberPadActionButtonVariant = .primary
 var disabled: Bool = false
 var isLoading: Bool = false
 var action: () -> Void

 @State private var isPressed = false
Expand All@@ -21,7 +22,10 @@ struct NumberPadActionButton: View {
 action()
 } label: {
 HStack(spacing: 8) {
 if let imageName {
 if isLoading {
 ActivityIndicator(size: 10, tint: color)
 .frame(width: 16, height: 16)
 } else if let imageName {
 Image(imageName)
 .resizable()
 .aspectRatio(contentMode: .fit)
Expand All@@ -40,7 +44,7 @@ struct NumberPadActionButton: View {
 )
 .cornerRadius(8)
 }
 .disabled(disabled)
 .disabled(disabled || isLoading)
 .buttonStyle(NoAnimationButtonStyle())
 .pressEvents(
 onPress: {
Expand All@@ -50,6 +54,8 @@ struct NumberPadActionButton: View {
 isPressed = false
 }
 )
 .animation(.easeInOut(duration: 0.2), value: isLoading)
 .animation(.easeInOut(duration: 0.2), value: text)
 }

 private var background: some View {
Expand Down

14 changes: 11 additions & 3 deletions
Bitkit/Components/SwipeButton.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ import SwiftUI
struct SwipeButton: View {
 let title: String
 let accentColor: Color
 /// Blocks the swipe and shows the knob spinner while a prerequisite is still loading.
 /// Blocks interaction without presenting the post-swipe loading state.
 var isDisabled = false
 /// Blocks interaction and shows the knob spinner while an operation is running.
 var isLoading = false
 /// Optional binding for swipe progress (0...1), e.g. to drive animations in the parent.
 var swipeProgress: Binding<CGFloat>?
Expand All@@ -13,6 +15,10 @@ struct SwipeButton: View {
 @State private var isSubmitting = false

 private var isBusy: Bool {
 isDisabled || isLoading || isSubmitting
 }

 private var showsSpinner: Bool {
 isLoading || isSubmitting
 }

Expand DownExpand Up@@ -43,19 +49,20 @@ struct SwipeButton: View {
 .frame(height: buttonHeight - innerPadding)
 .padding(.horizontal, innerPadding / 2)
 }
 .opacity(isDisabled ? 0.5 : 1)

 // Track text
 BodySSBText(title)
 .frame(maxWidth: .infinity, alignment: .center)
 .opacity(Double(1.0 - textProgress))
 .opacity(Double(1.0 - textProgress) * (isDisabled ? 0.5 : 1))

 // Knob
 Circle()
 .fill(accentColor)
 .frame(width: buttonHeight - innerPadding, height: buttonHeight - innerPadding)
 .overlay(
 ZStack {
 if isBusy {
 if showsSpinner {
 ActivityIndicator(theme: .dark)
 } else {
 Image("arrow-right")
Expand All@@ -75,6 +82,7 @@ struct SwipeButton: View {
 .accessibilityIdentifier("GRAB")
 .offset(x: clampedOffset)
 .padding(.horizontal, innerPadding / 2)
 .opacity(isDisabled ? 0.5 : 1)
 .gesture(
 DragGesture()
 .onChanged { value in
Expand Down

61 changes: 43 additions & 18 deletions
Bitkit/ViewModels/HwFundingSigner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,8 @@ final class HwSendCoordinator {

 private(set) var availableSats: UInt64 = 0
 private(set) var previewFeeSats: UInt64 = 0
 private(set) var isFundingSourceLoading = false
 private(set) var isPreviewLoading = false
 private(set) var isSigning = false
 private(set) var isBroadcastUnresolved = false
 private(set) var isPassphraseRequired = false
Expand DownExpand Up@@ -346,7 +348,11 @@ final class HwSendCoordinator {
 self.availableSats = availableSats
 }

 func selectWallet(_ walletId: String?, initialAvailableSats: UInt64 = 0) {
 func selectWallet(
 _ walletId: String?,
 initialAvailableSats: UInt64 = 0,
 showsLoading: Bool = false
 ) {
 guard self.walletId != walletId else { return }
 guard operationTask == nil, !isBroadcastUnresolved else { return }

Expand All@@ -356,6 +362,8 @@ final class HwSendCoordinator {
 pendingPayment = nil
 availableSats = walletId == nil ? 0 : initialAvailableSats
 previewFeeSats = 0
 isFundingSourceLoading = walletId != nil && showsLoading
 isPreviewLoading = false
 isSigning = false
 isBroadcastUnresolved = false
 isPassphraseRequired = false
Expand All@@ -365,23 +373,28 @@ final class HwSendCoordinator {
 func refreshAvailable(
 manager: HwWalletManager,
 destinationAddress: String,
 satsPerVByte: UInt64
 satsPerVByte: UInt64?
 ) async {
 guard let walletId else { return }

 guard !destinationAddress.isEmpty else {
 if self.walletId == walletId {
 availableSats = manager.fundingBalance(walletId: walletId)
 }
 return
 }

 availabilityRequestId += 1
 let requestId = availabilityRequestId
 isFundingSourceLoading = true

 func apply(_ available: UInt64) {
 guard self.walletId == walletId, availabilityRequestId == requestId else { return }
 availableSats = available
 isFundingSourceLoading = false
 }

 guard let satsPerVByte else {
 apply(availableSats)
 return
 }

 guard !destinationAddress.isEmpty else {
 apply(manager.fundingBalance(walletId: walletId))
 return
 }

 do {
Expand All@@ -407,19 +420,27 @@ final class HwSendCoordinator {
 guard let walletId else { return nil }
 previewRequestId += 1
 let requestId = previewRequestId
 isPreviewLoading = true
 previewFeeSats = 0
 let request = PaymentRequest(address: address, sats: sats, satsPerVByte: satsPerVByte)
 if pendingPayment?.request != request {
 pendingPayment = nil
 }
 let fee = try await manager.estimateOfflineFundingMiningFee(
 walletId: walletId,
 address: address,
 sats: sats,
 satsPerVByte: satsPerVByte
 )
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 return fee
 do {
 let signer = signerFactory(manager, address, satsPerVByte)
 let fee = try await signer.estimateOfflineFundingMiningFee(walletId: walletId, address: address, sats: sats)
 guard self.walletId == walletId, previewRequestId == requestId else { return nil }
 previewFeeSats = fee
 isFundingSourceLoading = false
 isPreviewLoading = false
 return fee
 } catch {
 if self.walletId == walletId, previewRequestId == requestId {
 isFundingSourceLoading = false
 isPreviewLoading = false
 }
 throw error
 }
 }

 func signAndBroadcast(
Expand DownExpand Up@@ -512,6 +533,10 @@ final class HwSendCoordinator {
 }

 func cancel() {
 availabilityRequestId += 1
 previewRequestId += 1
 isFundingSourceLoading = false
 isPreviewLoading = false
 isVerifyingPassphrase = false
 isPassphraseRequired = false
 guard !isBroadcastUnresolved else { return }
Expand Down

17 changes: 10 additions & 7 deletions
Bitkit/Views/Wallets/Send/SendAmountView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,7 +153,8 @@ struct SendAmountView: View {
 imageName: canSwitchFundingSource ? "arrow-up-down" : nil,
 color: selectedSourceColor,
 variant: canSwitchFundingSource ? .primary : .secondary,
 disabled: !canSwitchFundingSource || isContinuing
 disabled: !canSwitchFundingSource || isContinuing,
 isLoading: hwSend.isFundingSourceLoading
 ) {
 selectNextFundingSource()
 }
Expand DownExpand Up@@ -183,7 +184,7 @@ struct SendAmountView: View {

 CustomButton(
 title: t("common__continue"),
 isDisabled: !isValidAmount,
 isDisabled: !isValidAmount || hwSend.isFundingSourceLoading,
 isLoading: isContinuing
 ) {
 await onContinue()
Expand DownExpand Up@@ -368,7 +369,8 @@ struct SendAmountView: View {
 )
 hwSend.selectWallet(
 walletId,
 initialAvailableSats: balance > reserve ? balance - reserve : 0
 initialAvailableSats: balance > reserve ? balance - reserve : 0,
 showsLoading: true
Comment thread
ben-kaufman marked this conversation as resolved.

 )
 app.selectedWalletToPayFrom = .onchain
 }
Expand All@@ -387,18 +389,19 @@ struct SendAmountView: View {
 private func calculateMaxSendableAmount() async {
 // Make sure we have everything we need to calculate the max sendable amount
 guard hwSend.isActive || app.selectedWalletToPayFrom == .onchain else { return }
 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 if hwSend.isActive {
 await hwSend.refreshAvailable(
 manager: hwWalletManager,
 destinationAddress: address,
 satsPerVByte: UInt64(feeRate)
 destinationAddress: app.scannedOnchainInvoice?.address ?? "",
 satsPerVByte: wallet.selectedFeeRateSatsPerVByte.map(UInt64.init)
 )
 return
 }

 guard let address = app.scannedOnchainInvoice?.address else { return }
 guard let feeRate = wallet.selectedFeeRateSatsPerVByte else { return }

 do {
 let maxAmount = try await wallet.calculateMaxSendableAmount(
 address: address,
Expand Down
Loading
Loading