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-09-25 13:03:48 +08:00
parent f893da0fb9
commit 9a02d6a58a
11 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkStatusFactory.kt
View file

@ -26,6 +26,7 @@ internal class NetworkStatusFactory {
is UpdateWalletManagerResult.NoAccount -> NetworkStatus.NoAccount(
address = getNetworkAddress(result.defaultAddress, result.addresses),
amountToCreateAccount = result.amountToCreateAccount,
errorMessage = result.errorMessage,
)
is UpdateWalletManagerResult.Verified -> NetworkStatus.Verified(
address = getNetworkAddress(result.defaultAddress, result.addresses),

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

@ -180,7 +180,7 @@ class DefaultWalletManagersFacade(
resultFactory.getResult(walletManager)
} catch (e: BlockchainSdkError.AccountNotFound) {
resultFactory.getNoAccountResult(walletManager)
resultFactory.getNoAccountResult(walletManager = walletManager, customMessage = e.customMessage)
} catch (e: Throwable) {
Timber.w(e, "Unable to update a wallet manager for: ${walletManager.wallet.blockchain}")

1
domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/UpdateWalletManagerResult.kt
View file

@ -19,5 +19,6 @@ sealed class UpdateWalletManagerResult {
val defaultAddress: String,
val addresses: Set<String>,
val amountToCreateAccount: BigDecimal,
val errorMessage: String,
) : UpdateWalletManagerResult()
}

3
domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/UpdateWalletManagerResultFactory.kt
View file

@ -37,7 +37,7 @@ internal class UpdateWalletManagerResultFactory {
)
}
fun getNoAccountResult(walletManager: WalletManager): UpdateWalletManagerResult {
fun getNoAccountResult(walletManager: WalletManager, customMessage: String): UpdateWalletManagerResult {
val wallet = walletManager.wallet
val blockchain = wallet.blockchain
val firstWalletToken = wallet.getTokens().firstOrNull()
@ -51,6 +51,7 @@ internal class UpdateWalletManagerResultFactory {
defaultAddress = wallet.address,
addresses = getAvailableAddresses(wallet.addresses),
amountToCreateAccount = amountToCreateAccount,
errorMessage = customMessage,
)
}
}

14
domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt
View file

@ -59,8 +59,18 @@ data class CryptoCurrencyStatus(
/** Represents a state where the cryptocurrency's derivation is missed. */
object MissedDerivation : Status(isError = true)
/** Represents a state where there is no account associated with the cryptocurrency. */
object NoAccount : Status(isError = false)
/**
* Represents a state where there is no account associated with the cryptocurrency
*
* @property errorMessage error message
*/
data class NoAccount(val errorMessage: String) : Status(isError = false) {
override val amount: BigDecimal = BigDecimal.ZERO
override val fiatAmount: BigDecimal = BigDecimal.ZERO
override val fiatRate: BigDecimal = BigDecimal.ZERO
override val priceChange: BigDecimal = BigDecimal.ZERO
}
/**
* Represents a Loaded state of a cryptocurrency with complete information.

2
domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/NetworkStatus.kt
View file

@ -51,9 +51,11 @@ data class NetworkStatus(
*
* @property address Network addresses.
* @property amountToCreateAccount The amount required to create an account within the network.
* @property errorMessage error message
*/
data class NoAccount(
val address: NetworkAddress,
val amountToCreateAccount: BigDecimal,
val errorMessage: String,
) : Status()
}

2
domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt
View file

@ -20,7 +20,7 @@ internal class CurrencyStatusOperations(
null -> CryptoCurrencyStatus.Loading
is NetworkStatus.MissedDerivation -> CryptoCurrencyStatus.MissedDerivation
is NetworkStatus.Unreachable -> CryptoCurrencyStatus.Unreachable
is NetworkStatus.NoAccount -> CryptoCurrencyStatus.NoAccount
is NetworkStatus.NoAccount -> CryptoCurrencyStatus.NoAccount(errorMessage = status.errorMessage)
is NetworkStatus.Verified -> createStatus(status)
}
}

1
domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockNetworks.kt
View file

@ -51,6 +51,7 @@ internal object MockNetworks {
value = NetworkStatus.NoAccount(
amountToCreateAccount = amountToCreateAccount,
address = NetworkAddress.Single(defaultAddress = "mock"),
errorMessage = "",
),
)

8
domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokensStates.kt
View file

@ -39,22 +39,22 @@ internal object MockTokensStates {
val tokenState7 = CryptoCurrencyStatus(
currency = MockTokens.token7,
value = CryptoCurrencyStatus.NoAccount,
value = CryptoCurrencyStatus.NoAccount(errorMessage = ""),
)
val tokenState8 = CryptoCurrencyStatus(
currency = MockTokens.token8,
value = CryptoCurrencyStatus.NoAccount,
value = CryptoCurrencyStatus.NoAccount(errorMessage = ""),
)
val tokenState9 = CryptoCurrencyStatus(
currency = MockTokens.token9,
value = CryptoCurrencyStatus.NoAccount,
value = CryptoCurrencyStatus.NoAccount(errorMessage = ""),
)
val tokenState10 = CryptoCurrencyStatus(
currency = MockTokens.token10,
value = CryptoCurrencyStatus.NoAccount,
value = CryptoCurrencyStatus.NoAccount(errorMessage = ""),
)
val failedTokenStates = nonEmptyListOf(

2
features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/CryptoCurrencyStatusToTokenItemConverter.kt
View file

@ -25,10 +25,10 @@ internal class CryptoCurrencyStatusToTokenItemConverter(
is CryptoCurrencyStatus.Loaded,
is CryptoCurrencyStatus.Custom,
is CryptoCurrencyStatus.NoQuote,
is CryptoCurrencyStatus.NoAccount,
-> value.mapToTokenItemState()
// TODO: Add other token item states, currently not designed
is CryptoCurrencyStatus.MissedDerivation,
is CryptoCurrencyStatus.NoAccount,
is CryptoCurrencyStatus.Unreachable,
is CryptoCurrencyStatus.NoAmount,
-> value.mapToUnreachableTokenItemState()

19
features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletNotificationsListFactory.kt
View file

@ -159,13 +159,10 @@ internal class WalletNotificationsListFactory(
condition = cryptoCurrencyList.hasUnreachableNetworks(),
)
// TODO: [REDACTED_JIRA]
addIf(
element = WalletNotification.Warning.TopUpNote(
errorMessage = "To activate card top up it with at least 1 XLM",
),
condition = cryptoCurrencyList.hasNoAccountStatus(),
)
val errorMessage = cryptoCurrencyList.geNoAccountStatusMessage()
if (errorMessage != null) {
add(element = WalletNotification.Warning.TopUpNote(errorMessage = errorMessage))
}
addIf(
element = WalletNotification.Warning.NumberOfSignedHashesIncorrect,
@ -182,8 +179,12 @@ internal class WalletNotificationsListFactory(
return any { it.value is CryptoCurrencyStatus.Unreachable }
}
private fun List<CryptoCurrencyStatus>.hasNoAccountStatus(): Boolean {
return any { it.value is CryptoCurrencyStatus.NoAccount }
private fun List<CryptoCurrencyStatus>.geNoAccountStatusMessage(): String? {
return this
.map(CryptoCurrencyStatus::value)
.filterIsInstance<CryptoCurrencyStatus.NoAccount>()
.firstOrNull()
?.errorMessage
}
private fun checkSignedHashes(