Skip to content

Commit 56ae8bd

Browse files
committed
refactor: address hw fee pr review nits
1 parent 65e6abe commit 56ae8bd

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

app/src/main/java/to/bitkit/ui/screens/transfer/hardware/SpendingHwSignScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ private fun Content(
177177
@Composable
178178
internal fun SpendingHwFeeGrid(
179179
order: IBtOrder,
180-
miningFeeSats: ULong = 0uL,
181180
modifier: Modifier = Modifier,
181+
miningFeeSats: ULong = 0uL,
182182
) {
183183
val lspFee = order.feeSat.safe() - order.clientBalanceSat.safe()
184184
val total = order.feeSat.safe() + miningFeeSats.safe()

app/src/main/java/to/bitkit/viewmodels/TransferViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,8 @@ class TransferViewModel @Inject constructor(
532532
val deviceId = activeHwTransferDeviceId
533533
hwTransferSignJob?.cancel()
534534
hwTransferSignJob = null
535+
hwFeeEstimateJob?.cancel()
536+
hwFeeEstimateJob = null
535537
_spendingUiState.update { it.copy(isSigning = false) }
536538
if (deviceId != null) {
537539
viewModelScope.launch {
@@ -603,7 +605,6 @@ class TransferViewModel @Inject constructor(
603605
}
604606
}
605607
}.onFailure {
606-
if (it is CancellationException) throw it
607608
Logger.debug(
608609
"Skipped offline hardware funding fee estimate for '$deviceId'",
609610
context = TAG,

0 commit comments

Comments
 (0)