Skip to content

Commit a3157d9

Browse files
authored
Merge pull request #1061 from synonymdev/fix/hw-activity-explorer
fix: update hw activity explorer
2 parents 51a063d + 2773c7d commit a3157d9

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ fun ActivityExploreScreen(
164164
val toastMessage = stringResource(R.string.common__copied)
165165
ActivityExploreContent(
166166
item = item,
167+
isHardware = uiState.isHardwareActivity,
167168
txDetails = txDetails,
168169
boostTxDoesExist = boostTxDoesExist,
169170
onCopy = { text ->
@@ -187,6 +188,7 @@ fun ActivityExploreScreen(
187188
@Composable
188189
private fun ActivityExploreContent(
189190
item: Activity,
191+
isHardware: Boolean = false,
190192
txDetails: TransactionDetails? = null,
191193
boostTxDoesExist: Map<String, Boolean> = emptyMap(),
192194
onCopy: (String) -> Unit = {},
@@ -210,7 +212,7 @@ private fun ActivityExploreContent(
210212
showBitcoinSymbol = false,
211213
modifier = Modifier.weight(1f),
212214
)
213-
ActivityIcon(activity = item, size = 48.dp)
215+
ActivityIcon(activity = item, size = 48.dp, isHardware = isHardware)
214216
}
215217

216218
Spacer(modifier = Modifier.height(16.dp))
@@ -219,6 +221,7 @@ private fun ActivityExploreContent(
219221
is Activity.Onchain -> {
220222
OnchainDetails(
221223
onchain = item,
224+
isHardware = isHardware,
222225
onCopy = onCopy,
223226
txDetails = txDetails,
224227
boostTxDoesExist = boostTxDoesExist,
@@ -281,6 +284,7 @@ private fun LightningDetails(
281284
@Composable
282285
private fun ColumnScope.OnchainDetails(
283286
onchain: Activity.Onchain,
287+
isHardware: Boolean,
284288
onCopy: (String) -> Unit,
285289
txDetails: TransactionDetails?,
286290
boostTxDoesExist: Map<String, Boolean> = emptyMap(),
@@ -323,7 +327,7 @@ private fun ColumnScope.OnchainDetails(
323327
}
324328
},
325329
)
326-
} else {
330+
} else if (!isHardware && !onchain.v1.isTransfer) {
327331
CircularProgressIndicator(
328332
strokeWidth = 2.dp,
329333
modifier = Modifier

0 commit comments

Comments
 (0)