Skip to content

fix: update hw activity explorer #1061

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
piotr-iohk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: update hw activity explorer #1061

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bd3d40
fix: update hw activity explorer
piotr-iohk Jul 3, 2026
9a7a406
fix: restore tx details loading
piotr-iohk Jul 3, 2026
2773c7d
fix: skip explore spinner for hw transfers
piotr-iohk Jul 3, 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
8 changes: 6 additions & 2 deletions app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand All @@ -187,6 +188,7 @@ fun ActivityExploreScreen(
@Composable
private fun ActivityExploreContent(
item: Activity,
isHardware: Boolean = false,
txDetails: TransactionDetails? = null,
boostTxDoesExist: Map<String, Boolean> = emptyMap(),
onCopy: (String) -> Unit = {},
Expand All @@ -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))
Expand All @@ -219,6 +221,7 @@ private fun ActivityExploreContent(
is Activity.Onchain -> {
OnchainDetails(
onchain = item,
isHardware = isHardware,
onCopy = onCopy,
txDetails = txDetails,
boostTxDoesExist = boostTxDoesExist,
Expand Down Expand Up @@ -281,6 +284,7 @@ private fun LightningDetails(
@Composable
private fun ColumnScope.OnchainDetails(
onchain: Activity.Onchain,
isHardware: Boolean,
onCopy: (String) -> Unit,
txDetails: TransactionDetails?,
boostTxDoesExist: Map<String, Boolean> = emptyMap(),
Expand Down Expand Up @@ -323,7 +327,7 @@ private fun ColumnScope.OnchainDetails(
}
},
)
} else {
} else if (!isHardware && !onchain.v1.isTransfer) {
CircularProgressIndicator(
strokeWidth = 2.dp,
modifier = Modifier
Expand Down
Loading