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 2023-12-28 17:25:20 +04:00
commit 75c9a89de5
5 changed files with 39 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeStatusResponse.kt
View file

@ -49,7 +49,7 @@ enum class ExchangeStatus {
@Json(name = "verifying")
VERIFYING,
@Json(name = "cancelled")
@Json(name = "expired")
CANCELLED,
}

2
domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
View file

@ -251,7 +251,7 @@ class DefaultWalletManagersFacade(
derivationPath = derivationPath,
)
if (walletManager == null || blockchain == Blockchain.Unknown) {
Timber.w("Unable to get a wallet manager for blockchain: $blockchain")
Timber.w("Unable to create or find a wallet manager for $blockchain")
return UpdateWalletManagerResult.Unreachable
}

16
domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/WalletManagerFactory.kt
View file

@ -10,6 +10,7 @@ import com.tangem.domain.common.DerivationStyleProvider
import com.tangem.domain.common.extensions.makeWalletManagerForApp
import com.tangem.domain.common.util.derivationStyleProvider
import com.tangem.domain.models.scan.ScanResponse
import timber.log.Timber
internal class WalletManagerFactory(
private val configManager: ConfigManager,
@ -26,11 +27,16 @@ internal class WalletManagerFactory(
): WalletManager? {
val derivationParams = getDerivationParams(derivationPath, scanResponse.derivationStyleProvider)
return sdkWalletManagerFactory.makeWalletManagerForApp(
scanResponse = scanResponse,
blockchain = blockchain,
derivationParams = derivationParams,
)
return try {
sdkWalletManagerFactory.makeWalletManagerForApp(
scanResponse = scanResponse,
blockchain = blockchain,
derivationParams = derivationParams,
)
} catch (e: Throwable) {
Timber.w(e, "Failed to create wallet manager for $blockchain")
null
}
}
private fun getDerivationParams(

2
features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
View file

@ -293,7 +293,7 @@ internal class DefaultSwapRepository @Inject constructor(
if (txDetails.requestId != requestId) {
return@withContext DataError.InvalidRequestIdError().left()
}
if (toAddress != txDetails.payoutAddress) {
if (!toAddress.equals(txDetails.payoutAddress, ignoreCase = true)) {
return@withContext DataError.InvalidPayoutAddressError().left()
}
expressDataConverter.convert(

43
features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
View file

@ -852,19 +852,12 @@ internal class SwapInteractorImpl @Inject constructor(
amount: SwapAmount,
fromToken: CryptoCurrency,
): IncludeFeeInAmount {
if (fromToken is CryptoCurrency.Token) {
return IncludeFeeInAmount.Excluded
}
val tokenForFeeBalance =
userWalletManager.getNativeTokenBalance(
networkId,
fromToken.network.derivationPath.value,
) ?: ProxyAmount.empty()
if (amount.value > tokenForFeeBalance.value) {
return IncludeFeeInAmount.BalanceNotEnough
}
val feeValue = when (txFee) {
TxFeeState.Empty -> BigDecimal.ZERO
is TxFeeState.MultipleFeeState -> txFee.priorityFee.feeValue
@ -872,19 +865,33 @@ internal class SwapInteractorImpl @Inject constructor(
}
val amountWithFee = amount.value + feeValue
return if (amountWithFee < tokenForFeeBalance.value) {
IncludeFeeInAmount.Excluded
} else {
if (feeValue < amount.value) {
IncludeFeeInAmount.Included(
SwapAmount(
tokenForFeeBalance.value - feeValue,
transactionManager.getNativeTokenDecimals(networkId),
),
)
} else {
return when {
fromToken is CryptoCurrency.Token -> {
if (feeValue > tokenForFeeBalance.value) {
IncludeFeeInAmount.BalanceNotEnough
} else {
IncludeFeeInAmount.Excluded
}
}
amount.value > tokenForFeeBalance.value -> {
IncludeFeeInAmount.BalanceNotEnough
}
amountWithFee < tokenForFeeBalance.value -> {
IncludeFeeInAmount.Excluded
}
else -> {
if (feeValue < amount.value) {
IncludeFeeInAmount.Included(
SwapAmount(
tokenForFeeBalance.value - feeValue,
transactionManager.getNativeTokenDecimals(networkId),
),
)
} else {
IncludeFeeInAmount.BalanceNotEnough
}
}
}
}