From 5bd3d40516621321fb10f99b13ab0ae33ad59440 Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Fri, 3 Jul 2026 15:38:17 +0200 Subject: [PATCH 1/3] fix: update hw activity explorer --- .../wallets/activity/ActivityExploreScreen.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt index 286d4b3a96..d39462abbe 100644 --- a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt @@ -164,6 +164,7 @@ fun ActivityExploreScreen( val toastMessage = stringResource(R.string.common__copied) ActivityExploreContent( item = item, + isHardware = uiState.isHardwareActivity, txDetails = txDetails, boostTxDoesExist = boostTxDoesExist, onCopy = { text -> @@ -187,6 +188,7 @@ fun ActivityExploreScreen( @Composable private fun ActivityExploreContent( item: Activity, + isHardware: Boolean = false, txDetails: TransactionDetails? = null, boostTxDoesExist: Map = emptyMap(), onCopy: (String) -> Unit = {}, @@ -210,7 +212,7 @@ private fun ActivityExploreContent( showBitcoinSymbol = false, modifier = Modifier.weight(1f), ) - ActivityIcon(activity = item, size = 48.dp) + ActivityIcon(activity = item, size = 48.dp, isHardware = isHardware) } Spacer(modifier = Modifier.height(16.dp)) @@ -323,14 +325,6 @@ private fun ColumnScope.OnchainDetails( } }, ) - } else { - CircularProgressIndicator( - strokeWidth = 2.dp, - modifier = Modifier - .padding(vertical = 16.dp) - .size(16.dp) - .align(Alignment.CenterHorizontally) - ) } // Display boosted transaction IDs from boostTxIds From 9a7a406496b37bd6583669f2541fd3021dd5b178 Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Fri, 3 Jul 2026 15:49:48 +0200 Subject: [PATCH 2/3] fix: restore tx details loading --- .../screens/wallets/activity/ActivityExploreScreen.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt index d39462abbe..2ac6c0facc 100644 --- a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt @@ -221,6 +221,7 @@ private fun ActivityExploreContent( is Activity.Onchain -> { OnchainDetails( onchain = item, + isHardware = isHardware, onCopy = onCopy, txDetails = txDetails, boostTxDoesExist = boostTxDoesExist, @@ -283,6 +284,7 @@ private fun LightningDetails( @Composable private fun ColumnScope.OnchainDetails( onchain: Activity.Onchain, + isHardware: Boolean, onCopy: (String) -> Unit, txDetails: TransactionDetails?, boostTxDoesExist: Map = emptyMap(), @@ -325,6 +327,14 @@ private fun ColumnScope.OnchainDetails( } }, ) + } else if (!isHardware) { + CircularProgressIndicator( + strokeWidth = 2.dp, + modifier = Modifier + .padding(vertical = 16.dp) + .size(16.dp) + .align(Alignment.CenterHorizontally) + ) } // Display boosted transaction IDs from boostTxIds From 2773c7d46be2c55dcfefe5e22a44be4c49649949 Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Fri, 3 Jul 2026 16:26:50 +0200 Subject: [PATCH 3/3] fix: skip explore spinner for hw transfers Hide the tx-details loading indicator for hardware wallet and transfer activities where inputs/outputs never load, while keeping it for regular on-chain transactions. Co-authored-by: Cursor --- .../bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt index 2ac6c0facc..45f2469ae4 100644 --- a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt @@ -327,7 +327,7 @@ private fun ColumnScope.OnchainDetails( } }, ) - } else if (!isHardware) { + } else if (!isHardware && !onchain.v1.isTransfer) { CircularProgressIndicator( strokeWidth = 2.dp, modifier = Modifier