Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DelegatedKeystoreManager.kt

@@ -8,11 +8,15 @@ internal class DelegatedKeystoreManager(
     private val keystoreManagerProvider: Provider<KeystoreManager>,
 ) : KeystoreManager {
 
-    override suspend fun authenticateAndGetKey(keyAlias: String): SecretKey? {
+    override suspend fun get(keyAlias: String): SecretKey? {
-        return keystoreManagerProvider().authenticateAndGetKey(keyAlias)
+        return keystoreManagerProvider().get(keyAlias)
     }
 
-    override suspend fun storeKey(keyAlias: String, key: SecretKey) {
+    override suspend fun get(keyAliases: Collection<String>): Map<String, SecretKey> {
-        keystoreManagerProvider().storeKey(keyAlias, key)
+        return keystoreManagerProvider().get(keyAliases)
+    }
+
+    override suspend fun store(keyAlias: String, key: SecretKey) {
+        return keystoreManagerProvider().store(keyAlias, key)
     }
 }

app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt

@@ -81,41 +81,38 @@ internal class BiometricUserWalletsKeysRepository(
     }
 
     private suspend fun getAllInternal(): CompletionResult<List<UserWalletEncryptionKey>> {
-        return getUserWalletsIds()
+        return catching {
-            .map { userWalletId ->
+            val userWalletIds = getUserWalletsIds()
-                getEncryptionKey(userWalletId)
-                    .doOnFailure { error ->
-                        when (error) {
-                            is TangemSdkError.UserCanceledAuthentication -> {
-                                // If the user cancels biometric authentication, then cancel operation with error
-                                return CompletionResult.Failure(error)
-                            }
-                            is TangemSdkError.KeystoreInvalidated -> {
-                                // If the biometric cryptography key was invalidated,
-                                // then delete all user wallets encryption keys and cancel operation with error
-                                getUserWalletsIds().forEach { userWalletId ->
-                                    deleteEncryptionKey(userWalletId)
-                                }
 
-                                return CompletionResult.Failure(error)
+            getEncryptionKeys(userWalletIds)
-                            }
+        }
+            .doOnFailure { error ->
+                when (error) {
+                    is TangemSdkError.KeystoreInvalidated -> {
+                        // If the biometric cryptography key was invalidated, then delete all encryption keys
+                        getUserWalletsIds().forEach { userWalletId ->
+                            deleteEncryptionKey(userWalletId)
                         }
                     }
-            }
+                    else -> Unit
-            .fold(listOf()) { acc, data ->
+                }
-                if (data != null) acc + data else acc
             }
     }
 
-    private suspend fun getEncryptionKey(userWalletId: UserWalletId): CompletionResult<UserWalletEncryptionKey?> {
+    private suspend fun getEncryptionKeys(userWalletsIds: List<UserWalletId>): List<UserWalletEncryptionKey> {
-        return catching { authenticatedStorage.get(StorageKey.UserWalletEncryptionKey(userWalletId).name) }
+        val keys = userWalletsIds.map { userWalletId ->
-            .map { it.decodeToKey() }
+            StorageKey.UserWalletEncryptionKey(userWalletId).name
+        }
+
+        return authenticatedStorage.get(keys).mapNotNull { (_, encodedData) ->
+            encodedData.decodeToKey()
+        }
     }
 
     private suspend fun storeEncryptionKey(encryptionKey: UserWalletEncryptionKey): CompletionResult<Unit> {
         return catching {
             authenticatedStorage.store(
-                key = StorageKey.UserWalletEncryptionKey(encryptionKey.walletId).name,
+                keyAlias = StorageKey.UserWalletEncryptionKey(encryptionKey.walletId).name,
                 data = encryptionKey.encode(),
             )
         }

app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt

@@ -3,10 +3,12 @@ package com.tangem.tap.proxy
 import androidx.core.text.isDigitsOnly
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tangem.Message
+import com.tangem.blockchain.blockchains.algorand.AlgorandTransactionExtras
 import com.tangem.blockchain.blockchains.binance.BinanceTransactionExtras
 import com.tangem.blockchain.blockchains.cosmos.CosmosTransactionExtras
 import com.tangem.blockchain.blockchains.ethereum.EthereumTransactionExtras
 import com.tangem.blockchain.blockchains.ethereum.EthereumWalletManager
+import com.tangem.blockchain.blockchains.hedera.HederaTransactionBuilder
 import com.tangem.blockchain.blockchains.optimism.OptimismWalletManager
 import com.tangem.blockchain.blockchains.stellar.StellarMemo
 import com.tangem.blockchain.blockchains.stellar.StellarTransactionExtras
@@ -138,6 +140,8 @@ class TransactionManagerImpl(
             Blockchain.XRP -> memo.toLongOrNull()?.let { XrpTransactionBuilder.XrpTransactionExtras(it) }
             Blockchain.Cosmos -> CosmosTransactionExtras(memo)
             Blockchain.TON -> TonTransactionExtras(memo)
+            Blockchain.Hedera -> HederaTransactionBuilder.HederaTransactionExtras(memo)
+            Blockchain.Algorand -> AlgorandTransactionExtras(memo)
             else -> null
         }
     }

core/datasource/src/main/java/com/tangem/datasource/di/AccountCreatorModule.kt

@@ -16,7 +16,7 @@ internal object AccountCreatorModule {
 
     @Provides
     @Singleton
-    fun provideAccountCreator(authProvider: AuthProvider, @DevTangemApi tangemTechApi: TangemTechApi): AccountCreator {
+    fun provideAccountCreator(authProvider: AuthProvider, tangemTechApi: TangemTechApi): AccountCreator {
         return DefaultAccountCreator(authProvider, tangemTechApi)
     }
 }

features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt

@@ -915,10 +915,10 @@ internal class StateBuilder(
         )
     }
 
-    fun addAlert(uiState: SwapStateHolder, onClick: () -> Unit): SwapStateHolder {
+    fun addAlert(uiState: SwapStateHolder, message: TextReference? = null, onClick: () -> Unit): SwapStateHolder {
         return uiState.copy(
             alert = SwapWarning.GenericWarning(
-                message = null,
+                message = message,
                 onClick = onClick,
             ),
         )

features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt

@@ -9,6 +9,7 @@ import arrow.core.getOrElse
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.analytics.models.Basic
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.utils.InputNumberFormatter
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
@@ -119,7 +120,7 @@ internal class SwapViewModel @Inject constructor(
                 val cryptoCurrencyStatus =
                     getCryptoCurrencyStatusUseCase(it.walletId, initialCryptoCurrency.id).getOrNull()
                 if (cryptoCurrencyStatus == null) {
-                    uiState = stateBuilder.addAlert(uiState, swapRouter::back)
+                    uiState = stateBuilder.addAlert(uiState = uiState, onClick = swapRouter::back)
                 } else {
                     initialCryptoCurrencyStatus = cryptoCurrencyStatus
                     initTokens()
@@ -482,7 +483,12 @@ internal class SwapViewModel @Inject constructor(
             return
         }
         val fromCurrency = requireNotNull(dataState.fromCryptoCurrency)
-        val fee = requireNotNull(dataState.selectedFee)
+        val fee = dataState.selectedFee
+        // TODO: unexpected crash for some users, this workaround to prevent app crash and follow to support
+        if (fee == null) {
+            makeDefaultAlert(TextReference.Str("Fee estimation error. Please send feedback to support."))
+            return
+        }
         viewModelScope.launch(dispatchers.main) {
             runCatching(dispatchers.io) {
                 swapInteractor.onSwap(
@@ -821,6 +827,12 @@ internal class SwapViewModel @Inject constructor(
         }
     }
 
+    private fun makeDefaultAlert(message: TextReference) {
+        uiState = stateBuilder.addAlert(uiState, message) {
+            uiState = stateBuilder.clearAlert(uiState)
+        }
+    }
+
     @Suppress("LongMethod", "CyclomaticComplexMethod")
     private fun createUiActions(): UiActions {
         return UiActions(

gradle/dependencies.toml

@@ -85,9 +85,9 @@ web3j = "4.10.1"
 # endregion Other libraries
 
 # region Tangem
-tangemBlockchainSdk = "develop-510"
+tangemBlockchainSdk = "develop-514"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
-tangemCardSdk = "develop-331"
+tangemCardSdk = "develop-332"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^
 # endregion Tangem