GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2025-11-11 13:42:29 +04:00
parent 1959636f2e
commit 4b62c933bf
17 changed files with 48 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcSelectWalletComponent.kt
View file

@ -119,7 +119,7 @@ private fun WcSelectWalletContent(
val baseModifier = Modifier
.clip(RoundedCornerShape(14.dp))
.clickable(onClick = state.onClick)
val itemModifier = if (state.id == selectedWalletId) {
val itemModifier = if (state.id == selectedWalletId.stringValue) {
baseModifier.border(
width = 1.dp,
color = TangemTheme.colors.text.accent,
@ -148,7 +148,7 @@ private fun WcSelectWalletContent(
private fun WcSelectWalletContent_Preview() {
val wallets = persistentListOf(
UserWalletItemUM(
id = UserWalletId("user_wallet_1".encodeToByteArray()),
id = "user_wallet_1",
name = stringReference("Tangem 2.0"),
information = getInformation(42),
balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@ -156,7 +156,7 @@ private fun WcSelectWalletContent_Preview() {
onClick = {},
),
UserWalletItemUM(
id = UserWalletId("user_wallet_2".encodeToByteArray()),
id = "user_wallet_2",
name = stringReference("Tangem White"),
information = getInformation(24),
balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@ -164,7 +164,7 @@ private fun WcSelectWalletContent_Preview() {
onClick = {},
),
UserWalletItemUM(
id = UserWalletId("user_wallet_3".encodeToByteArray()),
id = "user_wallet_3",
name = stringReference("Bitcoin"),
information = getInformation(1),
balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@ -172,7 +172,7 @@ private fun WcSelectWalletContent_Preview() {
onClick = {},
),
UserWalletItemUM(
id = UserWalletId("user_wallet_4".encodeToByteArray()),
id = "user_wallet_4",
name = stringReference("Tangem 1.0"),
information = getInformation(21),
balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@ -180,7 +180,7 @@ private fun WcSelectWalletContent_Preview() {
onClick = {},
),
UserWalletItemUM(
id = UserWalletId("user_wallet_4".encodeToByteArray()),
id = "user_wallet_4",
name = stringReference("Tangem 1.0"),
information = UserWalletItemUM.Information.Loading,
balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@ -188,7 +188,7 @@ private fun WcSelectWalletContent_Preview() {
onClick = {},
),
UserWalletItemUM(
id = UserWalletId("user_wallet_4".encodeToByteArray()),
id = "user_wallet_4",
name = stringReference("Tangem 1.0"),
information = UserWalletItemUM.Information.Failed,
balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@ -199,7 +199,7 @@ private fun WcSelectWalletContent_Preview() {
TangemThemePreview {
WcSelectWalletModalBS(
wallets = wallets,
selectedWalletId = wallets.first().id,
selectedWalletId = UserWalletId(wallets.first().id.encodeToByteArray()),
onBack = {},
onDismiss = {},
)

4
features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/utils/WcUserWalletsFetcher.kt
View file

@ -6,8 +6,8 @@ import com.tangem.core.decompose.di.ModelScoped
import com.tangem.core.decompose.ui.UiMessageSender
import com.tangem.core.ui.extensions.TextReference
import com.tangem.core.ui.extensions.wrappedList
import com.tangem.domain.tokens.GetTokenListUseCase
import com.tangem.domain.models.wallet.UserWalletId
import com.tangem.domain.tokens.GetTokenListUseCase
import com.tangem.features.wallet.utils.UserWalletsFetcher
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.toImmutableList
@ -41,7 +41,7 @@ internal class WcUserWalletsFetcher(
}
private fun getTokenListFlow(walletItem: UserWalletItemUM): Flow<UserWalletItemUM> {
return getTokenListUseCase.launch(walletItem.id).map { lce ->
return getTokenListUseCase.launch(UserWalletId(walletItem.id)).map { lce ->
val information = lce.fold(
ifLoading = { UserWalletItemUM.Information.Loading },
ifError = { UserWalletItemUM.Information.Failed },