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 2025-12-05 18:49:34 +04:00
parent 14addc169c
commit a08e090a8f
26 changed files with 216 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/account/GetWalletAccountsResponse.kt
View file

@ -19,6 +19,7 @@ data class GetWalletAccountsResponse(
@Json(name = "group") val group: GroupType?,
@Json(name = "sort") val sort: SortType?,
@Json(name = "totalAccounts") val totalAccounts: Int,
@Json(name = "totalArchivedAccounts") val totalArchivedAccounts: Int,
)
}

1
data/account/src/main/kotlin/com/tangem/data/account/converter/AccountListConverter.kt
View file

@ -36,6 +36,7 @@ internal class AccountListConverter @AssistedInject constructor(
userWalletId = userWallet.walletId,
accounts = value.accounts.map(cryptoPortfolioConverter::convert),
totalAccounts = value.wallet.totalAccounts,
totalArchivedAccounts = value.wallet.totalArchivedAccounts,
sortType = sortType,
groupType = groupType,
)

1
data/account/src/main/kotlin/com/tangem/data/account/converter/GetWalletAccountsResponseConverter.kt
View file

@ -27,6 +27,7 @@ internal class GetWalletAccountsResponseConverter @AssistedInject constructor(
group = TokensGroupTypeConverter.convertBack(value.groupType),
sort = TokensSortTypeConverter.convertBack(value.sortType),
totalAccounts = value.totalAccounts,
totalArchivedAccounts = value.totalArchivedAccounts,
),
accounts = value.accounts
.filterIsInstance<Account.CryptoPortfolio>()

1
data/account/src/main/kotlin/com/tangem/data/account/utils/DefaultWalletAccountsResponseFactory.kt
View file

@ -43,6 +43,7 @@ internal class DefaultWalletAccountsResponseFactory @Inject constructor(
group = response.group,
sort = response.sort,
totalAccounts = accountDTOs.size,
totalArchivedAccounts = 0,
),
accounts = accountDTOs.assignTokens(userWalletId = userWalletId, tokens = response.tokens),
unassignedTokens = emptyList(),

2
data/account/src/test/java/com/tangem/data/account/converter/AccountConverterExt.kt
View file

@ -53,6 +53,7 @@ internal fun createGetWalletAccountsResponse(
group = groupType,
sort = sortType,
totalAccounts = 1,
totalArchivedAccounts = 0,
),
accounts = buildList {
createWalletAccountDTO(
@ -79,6 +80,7 @@ internal fun createAccountList(
userWalletId = userWalletId,
accounts = listOf(createCryptoPortfolio(userWalletId)),
totalAccounts = 1,
totalArchivedAccounts = 0,
sortType = sortType,
groupType = groupType,
)

1
data/account/src/test/java/com/tangem/data/account/converter/AccountListConverterTest.kt
View file

@ -137,6 +137,7 @@ class AccountListConverterTest {
group = UserTokensResponse.GroupType.NETWORK,
sort = UserTokensResponse.SortType.BALANCE,
totalAccounts = 1,
totalArchivedAccounts = 0,
),
accounts = emptyList(),
unassignedTokens = emptyList(),

1
data/account/src/test/java/com/tangem/data/account/fetcher/FetchWalletAccountsErrorHandlerTest.kt
View file

@ -182,6 +182,7 @@ class FetchWalletAccountsErrorHandlerTest {
group = UserTokensResponse.GroupType.NONE,
sort = UserTokensResponse.SortType.MANUAL,
totalAccounts = 1,
totalArchivedAccounts = 0,
),
accounts = listOf(accountDTO),
unassignedTokens = emptyList(),

1
data/account/src/test/java/com/tangem/data/account/token/DefaultMainAccountTokensMigrationTest.kt
View file

@ -179,6 +179,7 @@ class DefaultMainAccountTokensMigrationTest {
group = UserTokensResponse.GroupType.NONE,
sort = UserTokensResponse.SortType.MANUAL,
totalAccounts = 2,
totalArchivedAccounts = 0,
),
accounts = listOf(mainAccount, selectedAccount),
unassignedTokens = emptyList(),

4
data/account/src/test/java/com/tangem/data/account/utils/DefaultWalletAccountsResponseFactoryTest.kt
View file

@ -81,6 +81,7 @@ class DefaultWalletAccountsResponseFactoryTest {
group = UserTokensResponse.GroupType.NETWORK,
sort = UserTokensResponse.SortType.BALANCE,
totalAccounts = 0,
totalArchivedAccounts = 0,
),
accounts = emptyList(),
unassignedTokens = emptyList(),
@ -135,6 +136,7 @@ class DefaultWalletAccountsResponseFactoryTest {
group = defaultResponse.group,
sort = defaultResponse.sort,
totalAccounts = 1,
totalArchivedAccounts = 0,
),
accounts = listOf(accountsDTO.copy(tokens = listOf(token))),
unassignedTokens = emptyList(),
@ -190,6 +192,7 @@ class DefaultWalletAccountsResponseFactoryTest {
group = defaultResponse.group,
sort = defaultResponse.sort,
totalAccounts = 0,
totalArchivedAccounts = 0,
),
accounts = emptyList(),
unassignedTokens = emptyList(),
@ -228,6 +231,7 @@ class DefaultWalletAccountsResponseFactoryTest {
group = userTokensResponse.group,
sort = userTokensResponse.sort,
totalAccounts = 1,
totalArchivedAccounts = 0,
),
accounts = listOf(accountsDTO.copy(tokens = userTokensResponse.tokens)),
unassignedTokens = emptyList(),

8
data/account/src/test/java/com/tangem/data/account/utils/GetWalletAccountsResponseExtTest.kt
View file

@ -32,6 +32,7 @@ class GetWalletAccountsResponseExtTest {
group = UserTokensResponse.GroupType.NONE,
sort = UserTokensResponse.SortType.MANUAL,
totalAccounts = 0,
totalArchivedAccounts = 0,
),
accounts = emptyList(),
unassignedTokens = emptyList(),
@ -55,6 +56,7 @@ class GetWalletAccountsResponseExtTest {
group = UserTokensResponse.GroupType.NONE,
sort = UserTokensResponse.SortType.MANUAL,
totalAccounts = 1,
totalArchivedAccounts = 0,
),
accounts = listOf(account),
unassignedTokens = emptyList(),
@ -84,6 +86,7 @@ class GetWalletAccountsResponseExtTest {
group = UserTokensResponse.GroupType.NONE,
sort = UserTokensResponse.SortType.MANUAL,
totalAccounts = 2,
totalArchivedAccounts = 0,
),
accounts = listOf(account1, account2, account3),
unassignedTokens = emptyList(),
@ -110,6 +113,7 @@ class GetWalletAccountsResponseExtTest {
group = UserTokensResponse.GroupType.NONE,
sort = UserTokensResponse.SortType.MANUAL,
totalAccounts = 0,
totalArchivedAccounts = 0,
),
accounts = emptyList(),
unassignedTokens = emptyList(),
@ -141,6 +145,7 @@ class GetWalletAccountsResponseExtTest {
group = UserTokensResponse.GroupType.NETWORK,
sort = UserTokensResponse.SortType.BALANCE,
totalAccounts = 1,
totalArchivedAccounts = 0,
),
accounts = listOf(account),
unassignedTokens = listOf(token2),
@ -178,6 +183,7 @@ class GetWalletAccountsResponseExtTest {
group = UserTokensResponse.GroupType.NONE,
sort = UserTokensResponse.SortType.MANUAL,
totalAccounts = 2,
totalArchivedAccounts = 0,
),
accounts = listOf(account1, account2),
unassignedTokens = listOf(token1, token2),
@ -217,6 +223,7 @@ class GetWalletAccountsResponseExtTest {
group = UserTokensResponse.GroupType.NONE,
sort = UserTokensResponse.SortType.MANUAL,
totalAccounts = 1,
totalArchivedAccounts = 0,
),
accounts = listOf(account),
unassignedTokens = emptyList(),
@ -248,6 +255,7 @@ class GetWalletAccountsResponseExtTest {
group = UserTokensResponse.GroupType.NONE,
sort = UserTokensResponse.SortType.MANUAL,
totalAccounts = 2,
totalArchivedAccounts = 0,
),
accounts = listOf(account),
unassignedTokens = listOf(token1, token2),

7
domain/account/src/main/java/com/tangem/domain/account/models/AccountList.kt
View file

@ -28,6 +28,7 @@ data class AccountList private constructor(
val userWalletId: UserWalletId,
val accounts: List<Account>,
val totalAccounts: Int,
val totalArchivedAccounts: Int,
val sortType: TokensSortType,
val groupType: TokensGroupType,
) {
@ -60,6 +61,7 @@ data class AccountList private constructor(
userWalletId = this.userWalletId,
accounts = accounts,
totalAccounts = this.totalAccounts + if (isNewAccount) 1 else 0,
totalArchivedAccounts = this.totalArchivedAccounts,
sortType = this.sortType,
groupType = this.groupType,
)
@ -82,6 +84,7 @@ data class AccountList private constructor(
userWalletId = this.userWalletId,
accounts = accounts,
totalAccounts = this.totalAccounts - if (isExistingAccount) 1 else 0,
totalArchivedAccounts = this.totalArchivedAccounts,
sortType = this.sortType,
groupType = this.groupType,
)
@ -152,6 +155,7 @@ data class AccountList private constructor(
companion object {
const val MAX_ACCOUNTS_COUNT = 20
const val MAX_ARCHIVED_ACCOUNTS_COUNT = 1000
private const val MAX_MAIN_ACCOUNTS_COUNT = 1
/**
@ -166,6 +170,7 @@ data class AccountList private constructor(
userWalletId: UserWalletId,
accounts: List<Account>,
totalAccounts: Int,
totalArchivedAccounts: Int,
sortType: TokensSortType = TokensSortType.NONE,
groupType: TokensGroupType = TokensGroupType.NONE,
): Either<Error, AccountList> = either {
@ -200,6 +205,7 @@ data class AccountList private constructor(
userWalletId = userWalletId,
accounts = accounts,
totalAccounts = totalAccounts,
totalArchivedAccounts = totalArchivedAccounts,
sortType = sortType,
groupType = groupType,
)
@ -225,6 +231,7 @@ data class AccountList private constructor(
),
),
totalAccounts = 1,
totalArchivedAccounts = 0,
sortType = sortType,
groupType = groupType,
)

2
domain/account/src/main/java/com/tangem/domain/account/models/AccountStatusList.kt
View file

@ -26,6 +26,7 @@ data class AccountStatusList(
val userWalletId: UserWalletId,
val accountStatuses: List<AccountStatus>,
val totalAccounts: Int,
val totalArchivedAccounts: Int,
val totalFiatBalance: TotalFiatBalance,
val sortType: TokensSortType,
val groupType: TokensGroupType,
@ -47,6 +48,7 @@ data class AccountStatusList(
userWalletId = userWalletId,
accounts = accountStatuses.map(AccountStatus::account),
totalAccounts = totalAccounts,
totalArchivedAccounts = totalArchivedAccounts,
sortType = sortType,
groupType = groupType,
)

3
domain/account/src/main/java/com/tangem/domain/account/usecase/ApplyAccountListSortingUseCase.kt
View file

@ -55,10 +55,11 @@ class ApplyAccountListSortingUseCase(
val updatedAccountList = withError(
transform = { Error.DataOperationFailed("Unable to create AccountList: $it") },
) {
AccountList(
AccountList.invoke(
userWalletId = accountList.userWalletId,
accounts = sortedAccounts,
totalAccounts = accountList.totalAccounts,
totalArchivedAccounts = accountList.totalArchivedAccounts,
sortType = accountList.sortType,
groupType = accountList.groupType,
)

16
domain/account/src/test/kotlin/com/tangem/domain/account/models/AccountListTest.kt
View file

@ -87,6 +87,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = accounts,
totalAccounts = accounts.size,
totalArchivedAccounts = 0,
sortType = sortType,
groupType = groupType,
)
@ -96,6 +97,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = accounts,
totalAccounts = accounts.size,
totalArchivedAccounts = 0,
sortType = sortType,
groupType = groupType,
)
@ -110,6 +112,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = model.accounts,
totalAccounts = model.totalAccounts,
totalArchivedAccounts = 0,
)
// Assert
@ -206,12 +209,14 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = listOf(mainAccount),
totalAccounts = 1,
totalArchivedAccounts = 0,
).getOrNull()!!,
toAdd = newAccount,
expected = AccountList(
userWalletId = userWalletId,
accounts = listOf(mainAccount, newAccount),
totalAccounts = 2,
totalArchivedAccounts = 0,
),
)
},
@ -226,12 +231,14 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = listOf(mainAccount),
totalAccounts = 1,
totalArchivedAccounts = 0,
).getOrNull()!!,
toAdd = newAccount,
expected = AccountList(
userWalletId = userWalletId,
accounts = listOf(newAccount),
totalAccounts = 1,
totalArchivedAccounts = 0,
),
)
},
@ -252,6 +259,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = listOf(mainAccount),
totalAccounts = 1,
totalArchivedAccounts = 0,
).getOrNull()!!,
toAdd = newAccount,
expected = AccountList.Error.MainAccountNotFound.left(),
@ -268,6 +276,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = listOf(mainAccount),
totalAccounts = 1,
totalArchivedAccounts = 0,
).getOrNull()!!,
toAdd = newAccount,
expected = AccountList.Error.ExceedsMaxMainAccountsCount.left(),
@ -284,6 +293,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = listOf(mainAccount),
totalAccounts = 1,
totalArchivedAccounts = 0,
).getOrNull()!!,
toAdd = newAccount,
expected = AccountList.Error.DuplicateAccountNames.left(),
@ -296,6 +306,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = createAccounts(count = 20),
totalAccounts = 20,
totalArchivedAccounts = 0,
).getOrNull()!!,
toAdd = createAccount(derivationIndex = 21),
expected = AccountList.Error.ExceedsMaxAccountsCount.left(),
@ -335,12 +346,14 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = listOf(mainAccount, secondaryAccount),
totalAccounts = 2,
totalArchivedAccounts = 0,
).getOrNull()!!,
toRemove = secondaryAccount,
expected = AccountList(
userWalletId = userWalletId,
accounts = listOf(mainAccount),
totalAccounts = 1,
totalArchivedAccounts = 0,
),
)
},
@ -354,6 +367,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = listOf(mainAccount),
totalAccounts = 1,
totalArchivedAccounts = 0,
)
MinusTestModel(
@ -372,6 +386,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = listOf(mainAccount),
totalAccounts = 1,
totalArchivedAccounts = 0,
).getOrNull()!!,
toRemove = mainAccount,
expected = AccountList.Error.EmptyAccountsList.left(),
@ -388,6 +403,7 @@ internal class AccountListTest {
userWalletId = userWalletId,
accounts = listOf(mainAccount, secondaryAccount),
totalAccounts = 2,
totalArchivedAccounts = 0,
).getOrNull()!!,
toRemove = mainAccount,
expected = AccountList.Error.MainAccountNotFound.left(),

1
domain/account/src/test/kotlin/com/tangem/domain/account/usecase/ApplyAccountListSortingUseCaseTest.kt
View file

@ -157,6 +157,7 @@ class ApplyAccountListSortingUseCaseTest {
userWalletId = accountList.userWalletId,
accounts = accountList.accounts.reversed(),
totalAccounts = accountList.totalAccounts,
totalArchivedAccounts = accountList.totalArchivedAccounts,
sortType = accountList.sortType,
groupType = accountList.groupType,
).getOrNull()!!

2
domain/account/status/src/main/java/com/tangem/domain/account/status/producer/DefaultSingleAccountStatusListProducer.kt
View file

@ -68,6 +68,7 @@ internal class DefaultSingleAccountStatusListProducer @AssistedInject constructo
accountStatuses = accountStatuses.toList(),
totalAccounts = accountList.totalAccounts,
totalFiatBalance = TotalFiatBalanceCalculator.calculate(balances),
totalArchivedAccounts = accountList.totalArchivedAccounts,
sortType = accountList.sortType,
groupType = accountList.groupType,
)
@ -194,6 +195,7 @@ internal class DefaultSingleAccountStatusListProducer @AssistedInject constructo
}
},
totalAccounts = accountList.totalAccounts,
totalArchivedAccounts = accountList.totalArchivedAccounts,
totalFiatBalance = TotalFiatBalance.Loading,
sortType = accountList.sortType,
groupType = accountList.groupType,

1
domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/ApplyTokenListSortingUseCaseV2.kt
View file

@ -106,6 +106,7 @@ class ApplyTokenListSortingUseCaseV2(
userWalletId = accountList.userWalletId,
accounts = accountList.accounts.sortTokens(sortedTokensIdsByAccount, errors),
totalAccounts = accountList.totalAccounts,
totalArchivedAccounts = accountList.totalArchivedAccounts,
sortType = if (isSortedByBalance) TokensSortType.BALANCE else TokensSortType.NONE,
groupType = if (isGroupedByNetwork) TokensGroupType.NETWORK else TokensGroupType.NONE,
).getOrElse {

5
domain/account/status/src/test/kotlin/com/tangem/domain/account/status/producer/DefaultSingleAccountStatusListProducerTest.kt
View file

@ -90,6 +90,7 @@ class DefaultSingleAccountStatusListProducerTest {
),
),
totalAccounts = 1,
totalArchivedAccounts = accountList.totalArchivedAccounts,
totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal.ZERO, source = StatusSource.ACTUAL),
sortType = accountList.sortType,
groupType = accountList.groupType,
@ -132,6 +133,7 @@ class DefaultSingleAccountStatusListProducerTest {
),
),
totalAccounts = 1,
totalArchivedAccounts = accountList.totalArchivedAccounts,
totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal.ZERO, source = StatusSource.ACTUAL),
sortType = accountList.sortType,
groupType = accountList.groupType,
@ -153,6 +155,7 @@ class DefaultSingleAccountStatusListProducerTest {
),
),
totalAccounts = 1,
totalArchivedAccounts = accountList.totalArchivedAccounts,
totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal.ZERO, source = StatusSource.ACTUAL),
sortType = updatedAccountList.sortType,
groupType = updatedAccountList.groupType,
@ -192,6 +195,7 @@ class DefaultSingleAccountStatusListProducerTest {
),
),
totalAccounts = 1,
totalArchivedAccounts = accountList.totalArchivedAccounts,
totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal.ZERO, source = StatusSource.ACTUAL),
sortType = accountList.sortType,
groupType = accountList.groupType,
@ -273,6 +277,7 @@ class DefaultSingleAccountStatusListProducerTest {
),
),
totalAccounts = 1,
totalArchivedAccounts = accountList.totalArchivedAccounts,
totalFiatBalance = TotalFiatBalance.Loading,
sortType = accountList.sortType,
groupType = accountList.groupType,

1
domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/ApplyTokenListSortingUseCaseTest.kt
View file

@ -348,6 +348,7 @@ internal class ApplyTokenListSortingUseCaseTest {
customAccount, // unchanged due to error
),
totalAccounts = accountList.totalAccounts,
totalArchivedAccounts = accountList.totalArchivedAccounts,
sortType = TokensSortType.NONE,
groupType = TokensGroupType.NONE,
)

1
domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/ArchiveCryptoPortfolioUseCaseTest.kt
View file

@ -295,6 +295,7 @@ class ArchiveCryptoPortfolioUseCaseTest {
)
},
totalAccounts = totalAccounts,
totalArchivedAccounts = totalArchivedAccounts,
totalFiatBalance = TotalFiatBalance.Loading,
sortType = sortType,
groupType = groupType,

2
domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/ToggleTokenListGroupingUseCaseV2Test.kt
View file

@ -42,6 +42,7 @@ class ToggleTokenListGroupingUseCaseV2Test {
userWalletId = userWalletId,
accountStatuses = emptyList(),
totalAccounts = 0,
totalArchivedAccounts = 0,
totalFiatBalance = TotalFiatBalance.Failed,
sortType = TokensSortType.NONE,
groupType = TokensGroupType.NONE,
@ -205,6 +206,7 @@ class ToggleTokenListGroupingUseCaseV2Test {
userWalletId = userWalletId,
accountStatuses = listOf(accountStatus),
totalAccounts = 1,
totalArchivedAccounts = 0,
totalFiatBalance = tokenList.totalFiatBalance,
sortType = tokenList.sortedBy,
groupType = groupType,

2
domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/ToggleTokenListSortingUseCaseV2Test.kt
View file

@ -42,6 +42,7 @@ class ToggleTokenListSortingUseCaseV2Test {
userWalletId = userWalletId,
accountStatuses = emptyList(),
totalAccounts = 0,
totalArchivedAccounts = 0,
totalFiatBalance = TotalFiatBalance.Failed,
sortType = TokensSortType.NONE,
groupType = TokensGroupType.NONE,
@ -145,6 +146,7 @@ class ToggleTokenListSortingUseCaseV2Test {
userWalletId = userWalletId,
accountStatuses = listOf(accountStatus),
totalAccounts = 1,
totalArchivedAccounts = 0,
totalFiatBalance = tokenList.totalFiatBalance,
sortType = tokenList.sortedBy,
groupType = TokensGroupType.NONE,

35
features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/entity/AccountsUM.kt
View file

@ -13,11 +13,40 @@ internal data class AccountsUM(
) {
data class Button(
val title: String,
val id: ID,
val title: String = createTitle(id),
val isInProgress: Boolean = false,
val isEnabled: Boolean = true,
val onClick: (title: String) -> Unit,
)
val onClick: () -> Unit,
) {
enum class ID {
ShowAccountList,
FetchAccounts,
FillOutList,
FillOutArchivedList,
ArchiveAll,
SortByDerivationIndex,
ClearETag,
}
fun reset(): Button {
return copy(title = createTitle(id), isInProgress = false, isEnabled = true)
}
companion object {
private fun createTitle(id: ID): String = when (id) {
ID.ShowAccountList -> "Show the account list"
ID.FetchAccounts -> "Fetch accounts"
ID.FillOutList -> "Fill out the list (up to 20)"
ID.FillOutArchivedList -> "Fill out the archived list"
ID.ArchiveAll -> "Archive all"
ID.SortByDerivationIndex -> "Sort by derivation index"
ID.ClearETag -> "Clear ETag"
}
}
}
data class WalletSelector(
val selected: UserWallet?,

2
features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/ui/AccountsScreen.kt
View file

@ -206,7 +206,7 @@ private fun LazyListScope.ManageAccountsButtons(buttons: ImmutableList<AccountsU
items(buttons) { button ->
PrimaryButton(
text = button.title,
onClick = { button.onClick(button.title) },
onClick = button.onClick,
modifier = Modifier
.padding(horizontal = 16.dp, vertical = 8.dp)
.fillMaxWidth(),

200
features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/viewmodel/TesterAccountsViewModel.kt
View file

@ -60,7 +60,7 @@ internal class TesterAccountsViewModel @Inject constructor(
userWallets.firstOrNull()?.let(::onWalletSelect)
userWallets.mapIndexed { index, userWallet ->
userWallets.map { userWallet ->
singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId = userWallet.walletId))
.distinctUntilChanged()
.onEach { accountList ->
@ -102,12 +102,16 @@ internal class TesterAccountsViewModel @Inject constructor(
},
),
buttons = persistentListOf(
AccountsUM.Button(title = "Show the account list") { updateAccountsList() },
AccountsUM.Button(title = "Fetch accounts", onClick = ::fetchAccounts),
AccountsUM.Button(title = "Fill out the list (up to 20)", onClick = ::fillOutAccountList),
AccountsUM.Button(title = "Archive all", onClick = ::archiveAllAccounts),
AccountsUM.Button(title = "Sort by derivation index", onClick = ::sortAccountsByIndex),
AccountsUM.Button(title = "Clear ETag") { clearETag() },
AccountsUM.Button(id = AccountsUM.Button.ID.ShowAccountList, onClick = ::updateAccountsList),
AccountsUM.Button(id = AccountsUM.Button.ID.FetchAccounts, onClick = ::fetchAccounts),
AccountsUM.Button(id = AccountsUM.Button.ID.FillOutList, onClick = ::onFillOutClick),
AccountsUM.Button(
id = AccountsUM.Button.ID.FillOutArchivedList,
onClick = ::fillOutArchivedAccountList,
),
AccountsUM.Button(id = AccountsUM.Button.ID.ArchiveAll, onClick = ::onArchiveAllClick),
AccountsUM.Button(id = AccountsUM.Button.ID.SortByDerivationIndex, onClick = ::sortAccountsByIndex),
AccountsUM.Button(id = AccountsUM.Button.ID.ClearETag) { clearETag() },
),
)
}
@ -137,19 +141,15 @@ internal class TesterAccountsViewModel @Inject constructor(
}
}
private fun fetchAccounts(title: String) {
viewModelScope.launch {
val userWalletId = uiState.value.walletSelector.selected?.walletId ?: return@launch
toggleButtonProgress(title = title, isInProgress = true)
private fun fetchAccounts() {
val userWalletId = uiState.value.walletSelector.selected?.walletId ?: return
withProgress(id = AccountsUM.Button.ID.FetchAccounts) {
withContext(dispatchers.default) {
singleAccountListFetcher(
params = SingleAccountListFetcher.Params(userWalletId = userWalletId),
)
}
toggleButtonProgress(title = title, isInProgress = false)
}
}
@ -160,84 +160,113 @@ internal class TesterAccountsViewModel @Inject constructor(
}
}
private fun fillOutAccountList(title: String) {
private fun onFillOutClick() {
val userWalletId = getUserWallet()?.walletId ?: return
viewModelScope.launch {
toggleButtonProgress(title = title, isInProgress = true)
withProgress(id = AccountsUM.Button.ID.FillOutList) {
fillOutAccountList(userWalletId = userWalletId)
}
}
withContext(dispatchers.default) {
var accountList = walletAccounts.value[userWalletId] ?: return@withContext
val occupiedIndexes = accountList.accounts
.filterIsInstance<Account.CryptoPortfolio>()
.map { it.derivationIndex.value }
.toSet()
private fun fillOutArchivedAccountList() {
val userWalletId = getUserWallet()?.walletId ?: return
val accountList = walletAccounts.value[userWalletId] ?: return
if (accountList.totalArchivedAccounts == AccountList.MAX_ARCHIVED_ACCOUNTS_COUNT) return
var nextIndex = 0
@Suppress("LoopWithTooManyJumpStatements") // never mind for Tester Menu
while (accountList.canAddMoreAccounts) {
while (occupiedIndexes.contains(nextIndex)) {
nextIndex++
}
val id = AccountsUM.Button.ID.FillOutArchivedList
val derivationIndex = DerivationIndex(nextIndex).getOrNull() ?: break
viewModelScope.launch(dispatchers.default) {
var currentTotalArchived = accountList.totalArchivedAccounts
val newAccount = Account.CryptoPortfolio.invoke(
accountId = AccountId.forCryptoPortfolio(userWalletId, derivationIndex),
name = "Account #$nextIndex",
icon = CryptoPortfolioIcon.ofDefaultCustomAccount(),
derivationIndex = nextIndex,
cryptoCurrencies = emptySet(),
while (currentTotalArchived < AccountList.MAX_ARCHIVED_ACCOUNTS_COUNT) {
updateButton(id) { button ->
button.copy(
title = "In progress... ($currentTotalArchived/${AccountList.MAX_ARCHIVED_ACCOUNTS_COUNT})",
isEnabled = false,
)
.getOrNull()
?: break
(accountList + newAccount)
.onRight { accountList = it }
.getOrNull()
?: break
nextIndex++
}
accountsCRUDRepository.saveAccounts(accountList)
fillOutAccountList(userWalletId = userWalletId)
archiveAll(userWalletId = userWalletId)
accountsCRUDRepository.getAccountListSync(userWalletId).onSome {
currentTotalArchived = it.totalArchivedAccounts
}
}
toggleButtonProgress(title = title, isInProgress = false)
updateButton(id = id, button = AccountsUM.Button::reset)
}
}
private fun archiveAllAccounts(title: String) {
val userWalletId = getUserWallet()?.walletId ?: return
val accountList = walletAccounts.value[userWalletId] ?: return
private suspend fun fillOutAccountList(userWalletId: UserWalletId) {
withContext(dispatchers.default) {
var accountList = walletAccounts.value[userWalletId] ?: return@withContext
viewModelScope.launch {
toggleButtonProgress(title = title, isInProgress = true)
var nextIndex = accountList.totalAccounts
@Suppress("LoopWithTooManyJumpStatements") // never mind for Tester Menu
while (accountList.canAddMoreAccounts) {
val derivationIndex = DerivationIndex(nextIndex).getOrNull() ?: break
withContext(dispatchers.default) {
val updatedAccountList = AccountList.invoke(
userWalletId = accountList.userWalletId,
accounts = listOf(accountList.mainAccount),
totalAccounts = accountList.totalAccounts,
sortType = accountList.sortType,
groupType = accountList.groupType,
val newAccount = Account.CryptoPortfolio.invoke(
accountId = AccountId.forCryptoPortfolio(userWalletId, derivationIndex),
name = "Account #$nextIndex",
icon = CryptoPortfolioIcon.ofDefaultCustomAccount(),
derivationIndex = nextIndex,
cryptoCurrencies = emptySet(),
)
.getOrElse { return@withContext }
.getOrNull()
?: break
accountsCRUDRepository.saveAccounts(accountList = updatedAccountList)
(accountList + newAccount)
.onRight { accountList = it }
.getOrNull()
?: break
nextIndex++
}
toggleButtonProgress(title = title, isInProgress = false)
accountsCRUDRepository.saveAccounts(accountList)
}
}
private fun sortAccountsByIndex(title: String) {
private fun onArchiveAllClick() {
val userWalletId = getUserWallet()?.walletId ?: return
withProgress(id = AccountsUM.Button.ID.ArchiveAll) {
archiveAll(userWalletId = userWalletId)
}
}
private suspend fun archiveAll(userWalletId: UserWalletId) {
val accountList = walletAccounts.value[userWalletId] ?: return
val possibleToArchive = AccountList.MAX_ARCHIVED_ACCOUNTS_COUNT - accountList.totalArchivedAccounts
if (possibleToArchive == 0) return
withContext(dispatchers.default) {
val updatedAccountList = AccountList.invoke(
userWalletId = accountList.userWalletId,
accounts = if (possibleToArchive > AccountList.MAX_ACCOUNTS_COUNT - 1) {
listOf(accountList.mainAccount)
} else {
accountList.accounts.subList(fromIndex = 0, toIndex = accountList.accounts.size - possibleToArchive)
},
totalAccounts = accountList.totalAccounts,
totalArchivedAccounts = accountList.totalArchivedAccounts,
sortType = accountList.sortType,
groupType = accountList.groupType,
)
.getOrElse { return@withContext }
accountsCRUDRepository.saveAccounts(accountList = updatedAccountList)
}
}
private fun sortAccountsByIndex() {
val userWalletId = getUserWallet()?.walletId ?: return
val accountList = walletAccounts.value[userWalletId] ?: return
viewModelScope.launch {
toggleButtonProgress(title = title, isInProgress = true)
withProgress(id = AccountsUM.Button.ID.SortByDerivationIndex) {
withContext(dispatchers.default) {
val sortedAccountList = AccountList.invoke(
userWalletId = accountList.userWalletId,
@ -245,6 +274,7 @@ internal class TesterAccountsViewModel @Inject constructor(
.filterIsInstance<Account.CryptoPortfolio>()
.sortedBy { it.derivationIndex.value },
totalAccounts = accountList.totalAccounts,
totalArchivedAccounts = accountList.totalArchivedAccounts,
sortType = accountList.sortType,
groupType = accountList.groupType,
)
@ -252,8 +282,6 @@ internal class TesterAccountsViewModel @Inject constructor(
accountsCRUDRepository.saveAccounts(accountList = sortedAccountList)
}
toggleButtonProgress(title = title, isInProgress = false)
}
}
@ -266,22 +294,30 @@ internal class TesterAccountsViewModel @Inject constructor(
?: persistentListOf()
}
private fun toggleButtonProgress(title: String, isInProgress: Boolean) {
uiState.update { state ->
state.copy(
buttons = state.buttons.updateButton(title) {
it.copy(isInProgress = isInProgress)
},
)
private fun withProgress(id: AccountsUM.Button.ID, block: suspend () -> Unit) {
viewModelScope.launch {
toggleButtonProgress(id = id, isInProgress = true)
try {
block()
} finally {
toggleButtonProgress(id = id, isInProgress = false)
}
}
}
private fun ImmutableList<AccountsUM.Button>.updateButton(
title: String,
button: (AccountsUM.Button) -> AccountsUM.Button,
): ImmutableList<AccountsUM.Button> {
return this
.map { if (it.title == title) button(it) else it }
.toImmutableList()
private fun toggleButtonProgress(id: AccountsUM.Button.ID, isInProgress: Boolean) {
updateButton(id) {
it.copy(isInProgress = isInProgress)
}
}
private fun updateButton(id: AccountsUM.Button.ID, button: (AccountsUM.Button) -> AccountsUM.Button) {
uiState.update { state ->
state.copy(
buttons = state.buttons
.map { if (it.id == id) button(it) else it }
.toImmutableList(),
)
}
}
}

2
test/mock/src/main/java/com/tangem/test/mock/MockAccounts.kt
View file

@ -19,12 +19,14 @@ object MockAccounts {
fun createAccountList(
activeAccounts: Int,
totalAccounts: Int = activeAccounts,
totalArchivedAccounts: Int = 0,
userWalletId: UserWalletId = this.userWalletId,
): AccountList {
return AccountList(
userWalletId = userWalletId,
accounts = createAccounts(count = activeAccounts, userWalletId = userWalletId),
totalAccounts = totalAccounts,
totalArchivedAccounts = totalArchivedAccounts,
).getOrNull()!!
}