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-01-16 00:18:38 +07:00
parent 99cdc003c8
commit 533edc1d16
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
data/swap/src/main/java/com/tangem/data/swap/converter/transaction/SavedSwapTransactionListConverter.kt
View file

@ -17,6 +17,7 @@ import com.tangem.domain.models.network.Network
import com.tangem.domain.models.wallet.UserWallet
import com.tangem.domain.models.wallet.UserWalletId
import com.tangem.domain.swap.models.SwapTransactionListModel
import com.tangem.lib.crypto.derivation.AccountNodeRecognizer
import com.tangem.utils.converter.Converter
internal class SavedSwapTransactionListConverter(
@ -132,7 +133,7 @@ internal class SavedSwapTransactionListConverter(
blockchain = blockchain,
extraDerivationPath = token.derivationPath,
userWallet = userWallet,
accountIndex = token.accountId?.toIntOrNull()?.let { DerivationIndex(it).getOrNull() },
accountIndex = token.getDerivationIndex(),
)
}
}
@ -150,6 +151,10 @@ internal class SavedSwapTransactionListConverter(
}
private fun UserTokensResponse.Token.getDerivationIndex(): DerivationIndex? {
return accountId?.toIntOrNull()?.let { DerivationIndex(it).getOrNull() }
val blockchain = Blockchain.fromNetworkId(networkId) ?: return null
val accountNodeRecognizer = AccountNodeRecognizer(blockchain)
return derivationPath
?.let { accountNodeRecognizer.recognize(it) }
?.let { DerivationIndex(it.toInt()).getOrNull() }
}
}

6
features/swap/data/src/main/java/com/tangem/feature/swap/converters/SavedSwapTransactionListConverter.kt
View file

@ -170,6 +170,10 @@ internal class SavedSwapTransactionListConverter(
}
private fun UserTokensResponse.Token.getDerivationIndex(): DerivationIndex? {
return accountId?.toIntOrNull()?.let { DerivationIndex(it).getOrNull() }
val blockchain = Blockchain.fromNetworkId(networkId) ?: return null
val accountNodeRecognizer = AccountNodeRecognizer(blockchain)
return derivationPath
?.let { accountNodeRecognizer.recognize(it) }
?.let { DerivationIndex(it.toInt()).getOrNull() }
}
}