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 2026-04-21 16:20:46 +04:00
parent f8268dbe6e
commit cc78c7dde5
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/account/src/main/kotlin/com/tangem/data/account/converter/AccountConvertersExt.kt
View file

@ -1,6 +1,7 @@
package com.tangem.data.account.converter package com.tangem.data.account.converter
import arrow.core.getOrElse import arrow.core.getOrElse
import arrow.core.right
import com.tangem.datasource.api.tangemTech.models.account.WalletAccountDTO import com.tangem.datasource.api.tangemTech.models.account.WalletAccountDTO
import com.tangem.domain.models.account.AccountId import com.tangem.domain.models.account.AccountId
import com.tangem.domain.models.account.CryptoPortfolioIcon import com.tangem.domain.models.account.CryptoPortfolioIcon
@ -8,7 +9,10 @@ import com.tangem.domain.models.account.DerivationIndex
import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.models.wallet.UserWalletId
internal fun String.toAccountId(userWalletId: UserWalletId): AccountId { internal fun String.toAccountId(userWalletId: UserWalletId): AccountId {
return AccountId.forCryptoPortfolio(value = this, userWalletId = userWalletId).getOrElse { return when {
startsWith(AccountId.PaymentAccountIdPrefix) -> AccountId.forPaymentAccount(userWalletId).right()
else -> AccountId.forCryptoPortfolio(value = this, userWalletId = userWalletId)
}.getOrElse {
error("Unable to create AccountId from value: $this. Cause: $it") error("Unable to create AccountId from value: $this. Cause: $it")
} }
} }

4
domain/models/src/main/kotlin/com/tangem/domain/models/account/AccountId.kt
View file

@ -37,6 +37,8 @@ data class AccountId private constructor(
companion object { companion object {
const val PaymentAccountIdPrefix = "payment_"
private val sha256Digest: MessageDigest by lazy { MessageDigest.getInstance("SHA-256") } private val sha256Digest: MessageDigest by lazy { MessageDigest.getInstance("SHA-256") }
private val hexRegex = Regex("^[a-fA-F0-9]{64}$") private val hexRegex = Regex("^[a-fA-F0-9]{64}$")
@ -73,7 +75,7 @@ data class AccountId private constructor(
} }
fun forPaymentAccount(userWalletId: UserWalletId): AccountId { fun forPaymentAccount(userWalletId: UserWalletId): AccountId {
return AccountId(value = "payment_$userWalletId", userWalletId = userWalletId) return AccountId(value = "$PaymentAccountIdPrefix$userWalletId", userWalletId = userWalletId)
} }
} }
} }