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-10-27 20:33:16 +03:00
commit b053babc4f
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
View file

@ -86,7 +86,7 @@ internal class DefaultCurrenciesRepository(
savedCurrencies = savedCurrencies.tokens,
)
val newCurrencies = newCoins + filteredCurrencies
val newCurrencies = (newCoins + filteredCurrencies).distinct()
storeAndPushTokens(
userWalletId = userWalletId,

31
features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/ScanCardToUnlockWalletClickHandler.kt
View file

@ -2,9 +2,9 @@ package com.tangem.feature.wallet.presentation.wallet.domain
import arrow.core.Either
import arrow.core.raise.either
import arrow.core.raise.ensure
import com.tangem.common.CompletionResult
import com.tangem.common.core.TangemSdkError
import com.tangem.common.doOnFailure
import com.tangem.common.doOnSuccess
import com.tangem.domain.card.ScanCardProcessor
import com.tangem.domain.userwallets.UserWalletBuilder
import com.tangem.domain.wallets.models.UserWalletId
@ -20,25 +20,28 @@ internal class ScanCardToUnlockWalletClickHandler @Inject constructor(
suspend operator fun invoke(walletId: UserWalletId): Either<ScanCardToUnlockWalletError, Unit> {
return either {
scanCardProcessor.scan()
.doOnSuccess { scanResponse ->
when (val result = scanCardProcessor.scan()) {
is CompletionResult.Failure -> {
if (result.error is TangemSdkError.UserCancelled) {
scanFailsCounter++
ensure(scanFailsCounter < 2) { ScanCardToUnlockWalletError.ManyScanFails }
}
}
is CompletionResult.Success -> {
scanFailsCounter = 0
// If card's public key is null then user wallet will be null
val scannedWallet = UserWalletBuilder(scanResponse = scanResponse).build()
val scannedWallet = UserWalletBuilder(scanResponse = result.data).build()
if (walletId == scannedWallet?.walletId) {
ensure(walletId == scannedWallet?.walletId) {
ScanCardToUnlockWalletError.WrongCardIsScanned
}
if (scannedWallet != null) {
saveWalletUseCase(userWallet = scannedWallet, canOverride = true)
} else {
raise(ScanCardToUnlockWalletError.WrongCardIsScanned)
}
}
.doOnFailure {
if (it is TangemSdkError.UserCancelled) {
scanFailsCounter++
if (scanFailsCounter >= 2) raise(ScanCardToUnlockWalletError.ManyScanFails)
}
}
}
}
}
}